Change of mind. Use scm instead of vcs.

scm is the modern term. vcs is rather used to refer to archaic systems
such as cvs and older. I wish I remembered this before my previous
commit. Oh well...

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22476 57a11ea4-9604-0410-9ed3-97b8803252fd

packaging/win32/build_package.sh

@@ -65,12 +65,12 @@ rm -rf ${_DIST_UDIR}
 _BUILD_UDIR=`unix_path $BUILD_DIR`
 _GNUCASH_UDIR=`unix_path $GNUCASH_DIR`
 PKG_VERSION=`grep PACKAGE_VERSION ${_BUILD_UDIR}/config.h | cut -d" " -f3 | cut -d\" -f2 `
-GNC_VCS_REV=`grep GNUCASH_VCS_REV ${_BUILD_UDIR}/src/core-utils/gnc-vcs-info.h | cut -d" " -f3 | cut -d\" -f2 `
+GNUCASH_SCM_REV=`grep GNUCASH_SCM_REV ${_BUILD_UDIR}/src/core-utils/gnc-scm-info.h | cut -d" " -f3 | cut -d\" -f2 `
 
 # Choose the output filename based on our "build_from_tarball" setting
 # Make sure this logic matches the logic in dist.sh!
 if [ "$BUILD_FROM_TARBALL" = "no" ]; then
-  SETUP_FILENAME="gnucash-${PKG_VERSION}-svn-r${GNC_VCS_REV}-setup.exe"
+  SETUP_FILENAME="gnucash-${PKG_VERSION}-svn-r${GNUCASH_SCM_REV}-setup.exe"
 else
   SETUP_FILENAME="gnucash-${PKG_VERSION}-setup.exe"
 fi

packaging/win32/build_package_git.sh

@@ -23,7 +23,7 @@ function unix_path() { echo "$*" | sed 's,^\([A-Za-z]\):,/\1,;s,\\,/,g'; }
 . functions.sh
 . defaults.sh
 
-tag="${1:-$GNC_VCS_REV}"
+tag="${1:-$GNUCASH_SCM_REV}"
 
 # Determine where to upload to
 # NOTE: this assumes "tag" to be either a tag or a branch, not a
@@ -69,7 +69,7 @@ rm -rf ${_DIST_UDIR}
 _BUILD_UDIR=`unix_path $BUILD_DIR`
 _GNUCASH_UDIR=`unix_path $GNUCASH_DIR`
 PKG_VERSION=`grep PACKAGE_VERSION ${_BUILD_UDIR}/config.h | cut -d" " -f3 | cut -d\" -f2 `
-REVISION=`grep GNUCASH_VCS_REV ${_BUILD_UDIR}/src/core-utils/gnc-vcs-info.h | cut -d" " -f3 | cut -d\" -f2 `
+REVISION=`grep GNUCASH_SCM_REV ${_BUILD_UDIR}/src/core-utils/gnc-scm-info.h | cut -d" " -f3 | cut -d\" -f2 `
 
 # Choose the output filename based on our "build_from_tarball" setting
 # Make sure this logic matches the logic in dist.sh!

packaging/win32/defaults.sh

@@ -42,11 +42,11 @@ else
 
     set_default REPOS_TYPE "git"
     if [ "$REPOS_TYPE" = "git" ]; then
-      set_default GNC_VCS_REV "trunk"
+      set_default GNUCASH_SCM_REV "trunk"
       set_default REPOS_URL "git://github.com/Gnucash/gnucash.git"
     elif [ "$REPOS_TYPE" = "svn" ]; then
       # latest revision that should compile, use HEAD or vwxyz
-      set_default GNC_VCS_REV "HEAD"
+      set_default GNUCASH_SCM_REV "HEAD"
       set_default REPOS_URL "http://svn.gnucash.org/repo/gnucash/trunk"
     fi
 fi
@@ -409,11 +409,11 @@ set_default CMAKE_DIR $GLOBAL_DIR\\cmake
 set_default DOCBOOK_XSL_URL "$SF_MIRROR/docbook/docbook-xsl-1.76.1.zip"
 set_default DOCBOOK_DTD_URL "http://www.oasis-open.org/docbook/xml/4.1.2/docbkx412.zip"
 if [ "$REPOS_TYPE" = "git" ]; then
-  set_default DOCS_VCS_REV "trunk"
+  set_default DOCS_SCM_REV "trunk"
   set_default DOCS_URL "git://github.com/Gnucash/gnucash-docs.git"
 elif [ "$REPOS_TYPE" = "svn" ]; then
   # latest revision that should compile, use HEAD or vwxyz
-  set_default DOCS_VCS_REV "HEAD"
+  set_default DOCS_SCM_REV "HEAD"
   set_default DOCS_URL "http://svn.gnucash.org/repo/gnucash-docs/trunk"
 fi
 set_default UPDATE_DOCS yes

packaging/win32/dist-impl.sh

@@ -297,7 +297,7 @@ function dist_finish() {
     if [ "$BUILD_FROM_TARBALL" = "no" ]; then
         # And changing output filename
         PKG_VERSION=`grep PACKAGE_VERSION ${_BUILD_UDIR}/config.h | cut -d" " -f3 | cut -d\" -f2 `
-        REVISION=`grep GNUCASH_VCS_REV ${_BUILD_UDIR}/src/core-utils/gnc-vcs-info.h | cut -d" " -f3 | cut -d\" -f2 `
+        REVISION=`grep GNUCASH_SCM_REV ${_BUILD_UDIR}/src/core-utils/gnc-scm-info.h | cut -d" " -f3 | cut -d\" -f2 `
         if [ "$REPOS_TYPE" = "svn" ]; then
           SETUP_FILENAME="gnucash-${PKG_VERSION}-${REPOS_TYPE}-r${REVISION}-setup.exe"
         else

packaging/win32/install-impl.sh

@@ -1582,10 +1582,10 @@ function checkupd_docs_svn() {
     if [ "$UPDATE_DOCS" = "yes" ]; then
         if [ -x .svn ]; then
             setup "Docs - Update repository (svn)"
-            svn up -r $DOCS_VCS_REV
+            svn up -r $DOCS_SCM_REV
         else
             setup "Docs - Checkout repository (svn)"
-            svn co -r $DOCS_VCS_REV $DOCS_URL .
+            svn co -r $DOCS_SCM_REV $DOCS_URL .
         fi
     fi
 }
@@ -1599,7 +1599,7 @@ function checkupd_docs_git() {
         else
             setup "Docs - Checkout repository (git)"
             $GIT_CMD clone $DOCS_URL .
-            $GIT_CMD checkout $DOCS_VCS_REV
+            $GIT_CMD checkout $DOCS_SCM_REV
         fi
     fi
 }