gnucash maint: Multiple changes pushed

Mon Mar 30 20:16:54 EDT 2015

Updated	 via  https://github.com/Gnucash/gnucash/commit/a59b01b9 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/cc2e87ba (commit)
	from  https://github.com/Gnucash/gnucash/commit/5a3ea331 (commit)



commit a59b01b939f4f4a321f324b7297e66b2641b49df
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Mon Mar 30 23:05:49 2015 +0200

    Build system: rename gnc-scm-info to gnc-vcs-info
    
    Follow up of my previous patch to distinguish version control from
    scheme

diff --git a/Makefile.am b/Makefile.am
index e0cdb29..7427129 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -89,7 +89,7 @@ EXTRA_DIST = \
   intltool-extract.in \
   intltool-merge.in \
   intltool-update.in \
-  util/gnc-scm-info
+  util/gnc-vcs-info
 
 ## We borrow guile's convention and use @-...-@ as the substitution
 ## brackets here, instead of the usual @... at .  This prevents autoconf
diff --git a/configure.ac b/configure.ac
index 1551f1e..87ee5c5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -197,10 +197,10 @@ CFLAGS="${cflags_save}"
 
 # test whether we are building directly from svn/svk/git/bzr
 AC_MSG_CHECKING(if building from an scm managed directory)
-"$srcdir/util/gnc-scm-info" -r "$srcdir" >/dev/null 2>&1
+"$srcdir/util/gnc-vcs-info" -r "$srcdir" >/dev/null 2>&1
 if test $? = 0 -o "x${BUILDING_FROM_VCS}" = "xyes" ; then
   BUILDING_FROM_VCS=yes
-  SCM_TYPE=$("$srcdir/util/gnc-scm-info" -t "$srcdir")
+  SCM_TYPE=$("$srcdir/util/gnc-vcs-info" -t "$srcdir")
   AC_MSG_RESULT($SCM_TYPE)
 
   if test "x${SCM_TYPE}" = "xgit"; then
@@ -218,23 +218,23 @@ else
   BUILDING_FROM_VCS=no
   SCM_TYPE=
 
-  # Make sure we've got swig-runtime.h and gnc-scm-info.h
+  # Make sure we've got swig-runtime.h and gnc-vcs-info.h
   AC_CHECK_FILE(${srcdir}/src/swig-runtime.h, [],
     [AC_MSG_ERROR([
 
 It looks like you are NOT building from Subversion, svk, git or bzr
 but I cannot find swig-runtime.h.  Check your PATH and make sure
-we can find gnc-scm-info in your PATH!
+we can find gnc-vcs-info in your PATH!
 Either that or contact gnucash-devel at gnucash.org because
 the tarball you downloaded is broken.
 
     ])])
-  AC_CHECK_FILE(${srcdir}/src/core-utils/gnc-scm-info.h, [],
+  AC_CHECK_FILE(${srcdir}/src/core-utils/gnc-vcs-info.h, [],
     [AC_MSG_ERROR([
 
 It looks like you are NOT building from Subversion, svk, git or bzr
-but I cannot find gnc-scm-info.h.  Check your PATH and make sure
-we can find gnc-scm-info in your PATH!
+but I cannot find gnc-vcs-info.h.  Check your PATH and make sure
+we can find gnc-vcs-info in your PATH!
 Either that or contact gnucash-devel at gnucash.org because
 the tarball you downloaded is broken.
 
diff --git a/src/core-utils/Makefile.am b/src/core-utils/Makefile.am
index 84acca9..e207dff 100644
--- a/src/core-utils/Makefile.am
+++ b/src/core-utils/Makefile.am
@@ -130,7 +130,7 @@ endif
 
 noinst_DATA = .scm-links
 BUILT_SOURCES = gncla-dir.h gnc-version.h
-EXTRA_DIST = $(gncscmmod_DATA) core-utils.i gncla-dir.h.in gnc-scm-info.h
+EXTRA_DIST = $(gncscmmod_DATA) core-utils.i gncla-dir.h.in gnc-vcs-info.h
 clean-local:
 	rm -rf gnucash
 
@@ -160,37 +160,37 @@ gnc-version.h: _gnc-version.h
 	-cmp -s _gnc-version.h gnc-version.h || cp _gnc-version.h gnc-version.h
 	-rm -f _gnc-version.h
 
-_gnc-version.h: gnc-scm-info.h Makefile
+_gnc-version.h: gnc-vcs-info.h Makefile
 	@echo "/* Autogenerated. Do not change. */"   > _gnc-version.h
 	@echo "#ifndef GNC_VERSION_H"                >> _gnc-version.h
 	@echo "#define GNC_VERSION_H"                >> _gnc-version.h
 	@echo ""                                     >> _gnc-version.h
-	@scm_info=`${top_srcdir}/util/gnc-scm-info -t ${top_srcdir}` ; \
+	@scm_info=`${top_srcdir}/util/gnc-vcs-info -t ${top_srcdir}` ; \
 	if [ $$? = 0 ] ; then \
 		echo "#define GNUCASH_SCM \"$$scm_info\"" >> _gnc-version.h ; \
 	fi
 	@echo "#define GNUCASH_BUILD_DATE \"`date +%Y-%m-%d`\"" >> _gnc-version.h
-	@echo "#include \"gnc-scm-info.h\""          >> _gnc-version.h
+	@echo "#include \"gnc-vcs-info.h\""          >> _gnc-version.h
 	@echo "#endif"                               >> _gnc-version.h
 
-gnc-scm-info.h: _gnc-scm-info.h
-	-if [ ! -f gnc-scm-info.h ]; then cp _gnc-scm-info.h gnc-scm-info.h; fi
-	-cmp -s _gnc-scm-info.h gnc-scm-info.h || cp _gnc-scm-info.h gnc-scm-info.h
-	-rm -f _gnc-scm-info.h
+gnc-vcs-info.h: _gnc-vcs-info.h
+	-if [ ! -f gnc-vcs-info.h ]; then cp _gnc-vcs-info.h gnc-vcs-info.h; fi
+	-cmp -s _gnc-vcs-info.h gnc-vcs-info.h || cp _gnc-vcs-info.h gnc-vcs-info.h
+	-rm -f _gnc-vcs-info.h
 
-_gnc-scm-info.h: Makefile
-	@scm_info=`${top_srcdir}/util/gnc-scm-info -r ${top_srcdir}` ; \
+_gnc-vcs-info.h: Makefile
+	@scm_info=`${top_srcdir}/util/gnc-vcs-info -r ${top_srcdir}` ; \
 	if [ $$? = 0 ] ; then \
 		if [ -z "$$scm_info" ] ; then \
-			echo "gnc-scm-info failed.  figure out why." ; \
+			echo "gnc-vcs-info failed.  figure out why." ; \
 			echo "can't determine svn/svk/git/bzr revision from ${top_srcdir}." ; \
 			exit 1 ; \
 		fi ; \
-		echo "/* Autogenerated. Do not change. */"    > _gnc-scm-info.h ; \
-		echo "#define GNUCASH_SCM_REV \"$$scm_info\"" >> _gnc-scm-info.h ; \
+		echo "/* Autogenerated. Do not change. */"    > _gnc-vcs-info.h ; \
+		echo "#define GNUCASH_SCM_REV \"$$scm_info\"" >> _gnc-vcs-info.h ; \
 	else \
-		if [ -r $(srcdir)/gnc-scm-info.h ] ; then \
-			cp $(srcdir)/gnc-scm-info.h _gnc-scm-info.h ; \
+		if [ -r $(srcdir)/gnc-vcs-info.h ] ; then \
+			cp $(srcdir)/gnc-vcs-info.h _gnc-vcs-info.h ; \
 		else \
 			echo "You're building from svn/svk/git/bzr...  But your build system is broken" ; \
 			echo "Don't do that.   Complain to your build-system creator." ; \
diff --git a/util/gnc-scm-info b/util/gnc-vcs-info
similarity index 100%
rename from util/gnc-scm-info
rename to util/gnc-vcs-info

commit cc2e87baa051f412294a5d41d82830d31c0c0b01
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Mon Mar 30 22:13:41 2015 +0200

    Build system: Rename BUILDING_FROM_SCM to BUILDING_FROM_VCS
    
    This should avoid confunsion as in other variable SCM means scheme.

diff --git a/Makefile.am b/Makefile.am
index d56a34c..e0cdb29 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -201,7 +201,7 @@ po/gnucash.pot: po/POTFILES.in
 
 SVN = svn
 
-if BUILDING_FROM_SCM
+if BUILDING_FROM_VCS
 # This rule will generate a ChangeLog of gnucash/trunk commits, plus
 # all additional branches that are added in
 # ./macros/svn2cl.xsl. (FIXME: Is the dependency on NEWS really a good
diff --git a/configure.ac b/configure.ac
index 23e5a35..1551f1e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -198,8 +198,8 @@ CFLAGS="${cflags_save}"
 # test whether we are building directly from svn/svk/git/bzr
 AC_MSG_CHECKING(if building from an scm managed directory)
 "$srcdir/util/gnc-scm-info" -r "$srcdir" >/dev/null 2>&1
-if test $? = 0 -o "x${BUILDING_FROM_SCM}" = "xyes" ; then
-  BUILDING_FROM_SCM=yes
+if test $? = 0 -o "x${BUILDING_FROM_VCS}" = "xyes" ; then
+  BUILDING_FROM_VCS=yes
   SCM_TYPE=$("$srcdir/util/gnc-scm-info" -t "$srcdir")
   AC_MSG_RESULT($SCM_TYPE)
 
@@ -215,7 +215,7 @@ if test $? = 0 -o "x${BUILDING_FROM_SCM}" = "xyes" ; then
   fi
 else
   AC_MSG_RESULT(no)
-  BUILDING_FROM_SCM=no
+  BUILDING_FROM_VCS=no
   SCM_TYPE=
 
   # Make sure we've got swig-runtime.h and gnc-scm-info.h
@@ -240,7 +240,7 @@ the tarball you downloaded is broken.
 
     ])])
 fi
-AM_CONDITIONAL(BUILDING_FROM_SCM, test "x$BUILDING_FROM_SCM" = "xyes")
+AM_CONDITIONAL(BUILDING_FROM_VCS, test "x$BUILDING_FROM_VCS" = "xyes")
 AC_SUBST(SCM_TYPE)
 AC_SUBST(GIT_CMD)
 
@@ -494,7 +494,7 @@ the intltool-ltdl development packages ?])])
 # with that tarball so we have to prepare the tarball for guile 2
 # compatibility.
 #
-if test "${BUILDING_FROM_SCM}" = yes
+if test "${BUILDING_FROM_VCS}" = yes
 then
     AX_PKG_SWIG(2.0.10, [gnc_have_swig_2_0_10=yes], [gnc_have_swig_2_0_10=no])
 
@@ -1304,7 +1304,7 @@ then
   #warnFLAGS="${warnFLAGS} -Werror-implicit-function-declaration" # In -Wall
 
   # error-on-warning should not be active in (stable) release tarballs
-  if test "x$BUILDING_FROM_SCM" = "xyes"
+  if test "x$BUILDING_FROM_VCS" = "xyes"
   then
     # This code is from svn/svk/git/bzr, so enable error-on-warning
     error_on_warning_as_default="yes"
diff --git a/src/Makefile.am b/src/Makefile.am
index ab000a3..eb18b89 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -51,7 +51,7 @@ endif
 noinst_HEADERS = \
   swig-runtime.h
 
-if BUILDING_FROM_SCM
+if BUILDING_FROM_VCS
 swig-runtime.h:
 	$(SWIG) -guile -external-runtime $@
 endif
diff --git a/src/app-utils/Makefile.am b/src/app-utils/Makefile.am
index 4c3f8f8..8f6206b 100644
--- a/src/app-utils/Makefile.am
+++ b/src/app-utils/Makefile.am
@@ -105,7 +105,7 @@ libgncmod_app_utils_la_LIBADD = \
   ${LIBXML2_LIBS} \
   ${LIBXSLT_LIBS}
 
-if BUILDING_FROM_SCM
+if BUILDING_FROM_VCS
 swig-app-utils-guile.c: app-utils.i ${top_srcdir}/src/base-typemaps.i
 	$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
 	-I${top_srcdir}/src -o $@ $<
diff --git a/src/core-utils/Makefile.am b/src/core-utils/Makefile.am
index af19553..84acca9 100644
--- a/src/core-utils/Makefile.am
+++ b/src/core-utils/Makefile.am
@@ -42,7 +42,7 @@ noinst_HEADERS = \
   gnc-path.h \
   gnc-uri-utils.h
 
-if BUILDING_FROM_SCM
+if BUILDING_FROM_VCS
 swig-core-utils-guile.c: core-utils.i ${top_srcdir}/src/base-typemaps.i
 	$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
 	-I${top_srcdir}/src -o $@ $<
diff --git a/src/engine/Makefile.am b/src/engine/Makefile.am
index c6e3172..b3eacdd 100644
--- a/src/engine/Makefile.am
+++ b/src/engine/Makefile.am
@@ -210,7 +210,7 @@ endif
 
 noinst_DATA = .scm-links
 
-if BUILDING_FROM_SCM
+if BUILDING_FROM_VCS
 
 # The generated file depends on various libqof headers. Out of
 # laziness I only include a few here - more might be needed
diff --git a/src/gnc-module/Makefile.am b/src/gnc-module/Makefile.am
index dc155ad..8de3f7b 100644
--- a/src/gnc-module/Makefile.am
+++ b/src/gnc-module/Makefile.am
@@ -29,7 +29,7 @@ gncinclude_HEADERS = \
 
 noinst_DATA = .scm-links
 
-if BUILDING_FROM_SCM
+if BUILDING_FROM_VCS
 swig-gnc-module.c: gnc-module.i ${top_srcdir}/src/base-typemaps.i
 	$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
 	-I${top_srcdir}/src -o $@ $<
diff --git a/src/gnc-module/test/mod-bar/Makefile.am b/src/gnc-module/test/mod-bar/Makefile.am
index d076bae..fc626dd 100644
--- a/src/gnc-module/test/mod-bar/Makefile.am
+++ b/src/gnc-module/test/mod-bar/Makefile.am
@@ -22,7 +22,7 @@ libgncmodbar_la_LIBADD=libbar.la \
   $(GUILE_LIBS) \
   $(GLIB_LIBS)
 
-if BUILDING_FROM_SCM
+if BUILDING_FROM_VCS
 swig-bar.c: bar.i
 	$(SWIG) -guile $(SWIG_ARGS) -Linkage module -o $@ $<
 if ! OS_WIN32
diff --git a/src/gnc-module/test/mod-baz/Makefile.am b/src/gnc-module/test/mod-baz/Makefile.am
index 82d8a69..98474d5 100644
--- a/src/gnc-module/test/mod-baz/Makefile.am
+++ b/src/gnc-module/test/mod-baz/Makefile.am
@@ -26,7 +26,7 @@ libgncmodbaz_la_LIBADD = \
   $(GUILE_LIBS) \
   $(GLIB_LIBS)
 
-if BUILDING_FROM_SCM
+if BUILDING_FROM_VCS
 swig-baz.c: baz.i
 	$(SWIG) -guile $(SWIG_ARGS) -Linkage module -o $@ $<
 if ! OS_WIN32
diff --git a/src/gnc-module/test/mod-foo/Makefile.am b/src/gnc-module/test/mod-foo/Makefile.am
index cd06ed9..ee7862c 100644
--- a/src/gnc-module/test/mod-foo/Makefile.am
+++ b/src/gnc-module/test/mod-foo/Makefile.am
@@ -27,7 +27,7 @@ EXTRA_DIST = \
   foo.i \
   gnucash/foo.scm
 
-if BUILDING_FROM_SCM
+if BUILDING_FROM_VCS
 swig-foo.c: foo.i
 	$(SWIG) -guile $(SWIG_ARGS) -Linkage module -o $@ $<
 if ! OS_WIN32
diff --git a/src/gnome-utils/Makefile.am b/src/gnome-utils/Makefile.am
index 92af6fd..548a4e2 100644
--- a/src/gnome-utils/Makefile.am
+++ b/src/gnome-utils/Makefile.am
@@ -225,7 +225,7 @@ if HAVE_X11_XLIB_H
   libgncmod_gnome_utils_la_LIBADD += -lX11
 endif
 
-if BUILDING_FROM_SCM
+if BUILDING_FROM_VCS
 swig-gnome-utils.c: gnome-utils.i \
                     ${top_srcdir}/src/base-typemaps.i
 	$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
diff --git a/src/gnome/Makefile.am b/src/gnome/Makefile.am
index f8bf17b..a498323 100644
--- a/src/gnome/Makefile.am
+++ b/src/gnome/Makefile.am
@@ -112,7 +112,7 @@ noinst_HEADERS = \
   window-reconcile2.h \
   window-autoclear.h
 
-if BUILDING_FROM_SCM
+if BUILDING_FROM_VCS
 swig-gnome.c: gnome.i dialog-progress.h ${top_srcdir}/src/base-typemaps.i
 	$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
 	-I${top_srcdir}/src -o $@ $<
diff --git a/src/html/Makefile.am b/src/html/Makefile.am
index 5013e92..fc4885f 100644
--- a/src/html/Makefile.am
+++ b/src/html/Makefile.am
@@ -54,7 +54,7 @@ libgncmod_html_la_LIBADD = \
   ${GUILE_LIBS} \
   ${REGEX_LIBS}
 
-if BUILDING_FROM_SCM
+if BUILDING_FROM_VCS
 swig-gnc-html.c: gnc-html.i gnc-html.h \
                     ${top_srcdir}/src/base-typemaps.i
 	$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
diff --git a/src/optional/python-bindings/Makefile.am b/src/optional/python-bindings/Makefile.am
index ef624d2..8bd3178 100644
--- a/src/optional/python-bindings/Makefile.am
+++ b/src/optional/python-bindings/Makefile.am
@@ -38,7 +38,7 @@ _gnucash_core_c_la_LIBADD = \
   ${top_builddir}/src/gnc-module/libgnc-module.la \
   ${top_builddir}/src/engine/libgncmod-engine.la \
   ${top_builddir}/src/app-utils/libgncmod-app-utils.la
-if BUILDING_FROM_SCM
+if BUILDING_FROM_VCS
 _gnucash_core_c_includes= \
 	${top_builddir}/config.h \
 	${top_srcdir}/src/libqof/qof/qofsession.h \
diff --git a/src/pixmaps/Makefile.am b/src/pixmaps/Makefile.am
index 01343b8..183ae79 100644
--- a/src/pixmaps/Makefile.am
+++ b/src/pixmaps/Makefile.am
@@ -78,7 +78,7 @@ gncextrasmallicon_DATA = 16x16/gnucash-icon.png
 gncscalableicondir = ${datadir}/icons/hicolor/scalable/apps
 gncscalableicon_DATA = scalable/gnucash-icon.svg
 
-if BUILDING_FROM_SCM
+if BUILDING_FROM_VCS
 256x256/gnucash-icon.png: gnucash-icon-256x256.png
 	-mkdir -p 256x256
 	cp ${srcdir}/gnucash-icon-256x256.png 256x256/gnucash-icon.png
@@ -161,7 +161,7 @@ EXTRA_DIST = \
   ${gncscalableicon_DATA}
 
 # Only clean up if we're building from svn/svk/git/bzr
-if BUILDING_FROM_SCM
+if BUILDING_FROM_VCS
 clean-local:
 	-rm -rf 256x256 128x128 96x96 64x64 48x48 32x32 24x24 22x22 16x16 scalable
 endif
diff --git a/src/report/report-gnome/Makefile.am b/src/report/report-gnome/Makefile.am
index 82d1a04..2d0f6a0 100644
--- a/src/report/report-gnome/Makefile.am
+++ b/src/report/report-gnome/Makefile.am
@@ -49,7 +49,7 @@ libgncmod_report_gnome_la_LIBADD = \
   ${GUILE_LIBS} \
   ${GLIB_LIBS}
 
-if BUILDING_FROM_SCM
+if BUILDING_FROM_VCS
 swig-report-gnome.c: report-gnome.i ${top_srcdir}/src/base-typemaps.i
 	$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
 	-I${top_srcdir}/src -o $@ $<
diff --git a/src/report/report-system/Makefile.am b/src/report/report-system/Makefile.am
index 8582aa1..9a79871 100644
--- a/src/report/report-system/Makefile.am
+++ b/src/report/report-system/Makefile.am
@@ -23,7 +23,7 @@ libgncmod_report_system_la_LIBADD = \
   ${GLIB_LIBS} \
   ${GTK_LIBS}
 
-if BUILDING_FROM_SCM
+if BUILDING_FROM_VCS
 swig-report-system.c: report-system.i ${top_srcdir}/src/base-typemaps.i
 	$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
 	-I${top_srcdir}/src -o $@ $<
diff --git a/src/test-core/Makefile.am b/src/test-core/Makefile.am
index 72394fb..16bb21d 100644
--- a/src/test-core/Makefile.am
+++ b/src/test-core/Makefile.am
@@ -23,7 +23,7 @@ libtest_core_la_CPPFLAGS = \
 libtest_core_la_LDFLAGS = \
   -rpath ${exec-prefix}/lib
 
-if BUILDING_FROM_SCM
+if BUILDING_FROM_VCS
 swig-unittest-support-guile.c: unittest-support.i $(top_srcdir)/src/base-typemaps.i
 	$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
 	-I${top_srcdir}/src \
diff --git a/util/gnc-scm-info b/util/gnc-scm-info
index 05af96c..803d905 100755
--- a/util/gnc-scm-info
+++ b/util/gnc-scm-info
@@ -26,14 +26,14 @@ my_die()
   exit 1
 }
 
-if [ "$BUILDING_FROM_SCM" = "0" -o \
-     "$BUILDING_FROM_SCM" = "no" -o \
-     "$BUILDING_FROM_SCM" = "false" ]; then
+if [ "$BUILDING_FROM_VCS" = "0" -o \
+     "$BUILDING_FROM_VCS" = "no" -o \
+     "$BUILDING_FROM_VCS" = "false" ]; then
   # Something outside of the Gnucash build system knows that we
   # are NOT building from svn, svk or git checkout.
   # We should believe it (needed by packagers that maintain the
   # packaging code in svn, svk or git too)
-  echo "Environment variable BUILDING_FROM_SCM=$BUILDING_FROM_SCM" >&2
+  echo "Environment variable BUILDING_FROM_VCS=$BUILDING_FROM_VCS" >&2
   exit 1
 fi
 



Summary of changes:
 Makefile.am                              |  4 ++--
 configure.ac                             | 26 +++++++++++++-------------
 src/Makefile.am                          |  2 +-
 src/app-utils/Makefile.am                |  2 +-
 src/core-utils/Makefile.am               | 32 ++++++++++++++++----------------
 src/engine/Makefile.am                   |  2 +-
 src/gnc-module/Makefile.am               |  2 +-
 src/gnc-module/test/mod-bar/Makefile.am  |  2 +-
 src/gnc-module/test/mod-baz/Makefile.am  |  2 +-
 src/gnc-module/test/mod-foo/Makefile.am  |  2 +-
 src/gnome-utils/Makefile.am              |  2 +-
 src/gnome/Makefile.am                    |  2 +-
 src/html/Makefile.am                     |  2 +-
 src/optional/python-bindings/Makefile.am |  2 +-
 src/pixmaps/Makefile.am                  |  4 ++--
 src/report/report-gnome/Makefile.am      |  2 +-
 src/report/report-system/Makefile.am     |  2 +-
 src/test-core/Makefile.am                |  2 +-
 util/{gnc-scm-info => gnc-vcs-info}      |  8 ++++----
 19 files changed, 51 insertions(+), 51 deletions(-)
 rename util/{gnc-scm-info => gnc-vcs-info} (96%)

