r19928 - gnucash/trunk - Move gnc-version.h and gnc-svninfo.h from gnome-utils to core-utils.

Mike Alexander mta at code.gnucash.org
Sun Dec 12 01:48:21 EST 2010


Author: mta
Date: 2010-12-12 01:48:20 -0500 (Sun, 12 Dec 2010)
New Revision: 19928
Trac: http://svn.gnucash.org/trac/changeset/19928

Modified:
   gnucash/trunk/configure.ac
   gnucash/trunk/packaging/win32/build_package.sh
   gnucash/trunk/packaging/win32/dist-impl.sh
   gnucash/trunk/src/bin/Makefile.am
   gnucash/trunk/src/core-utils/Makefile.am
   gnucash/trunk/src/core-utils/gnc-main.c
   gnucash/trunk/src/gnome-utils/Makefile.am
Log:
Move gnc-version.h and gnc-svninfo.h from gnome-utils to core-utils.

Modified: gnucash/trunk/configure.ac
===================================================================
--- gnucash/trunk/configure.ac	2010-12-12 06:45:37 UTC (rev 19927)
+++ gnucash/trunk/configure.ac	2010-12-12 06:48:20 UTC (rev 19928)
@@ -151,7 +151,7 @@
 the tarball you downloaded is broken.
 
     ])])
-  AC_CHECK_FILE(${srcdir}/src/gnome-utils/gnc-svninfo.h, [],
+  AC_CHECK_FILE(${srcdir}/src/core-utils/gnc-svninfo.h, [],
     [AC_MSG_ERROR([
 
 It looks like you are NOT building from Subversion

Modified: gnucash/trunk/packaging/win32/build_package.sh
===================================================================
--- gnucash/trunk/packaging/win32/build_package.sh	2010-12-12 06:45:37 UTC (rev 19927)
+++ gnucash/trunk/packaging/win32/build_package.sh	2010-12-12 06:48:20 UTC (rev 19928)
@@ -47,7 +47,7 @@
 _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 `
-SVN_REV=`grep GNUCASH_SVN_REV ${_BUILD_UDIR}/src/gnome-utils/gnc-svninfo.h | cut -d" " -f3 | cut -d\" -f2 `
+SVN_REV=`grep GNUCASH_SVN_REV ${_BUILD_UDIR}/src/core-utils/gnc-svninfo.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!

Modified: gnucash/trunk/packaging/win32/dist-impl.sh
===================================================================
--- gnucash/trunk/packaging/win32/dist-impl.sh	2010-12-12 06:45:37 UTC (rev 19927)
+++ gnucash/trunk/packaging/win32/dist-impl.sh	2010-12-12 06:48:20 UTC (rev 19928)
@@ -286,7 +286,7 @@
     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 `
-        SVN_REV=`grep GNUCASH_SVN_REV ${_BUILD_UDIR}/src/gnome-utils/gnc-svninfo.h | cut -d" " -f3 | cut -d\" -f2 `
+        SVN_REV=`grep GNUCASH_SVN_REV ${_BUILD_UDIR}/src/core-utils/gnc-svninfo.h | cut -d" " -f3 | cut -d\" -f2 `
         SETUP_FILENAME="gnucash-${PKG_VERSION}-svn-r${SVN_REV}-setup.exe"
         qpushd ${_GNUCASH_UDIR}
             mv gnucash-${PKG_VERSION}-setup.exe ${SETUP_FILENAME}

Modified: gnucash/trunk/src/bin/Makefile.am
===================================================================
--- gnucash/trunk/src/bin/Makefile.am	2010-12-12 06:45:37 UTC (rev 19927)
+++ gnucash/trunk/src/bin/Makefile.am	2010-12-12 06:48:20 UTC (rev 19928)
@@ -15,7 +15,7 @@
   -I${top_srcdir}/src/gnome-utils \
   -I${top_srcdir}/src/engine \
   -I${top_srcdir}/src/gnome \
-  -I${top_builddir}/src/gnome-utils \
+  -I${top_builddir}/src/core-utils \
   -I${top_srcdir}/src/gnc-module \
   -I${top_srcdir}/src/libqof/qof \
   ${GUILE_INCS} \

Modified: gnucash/trunk/src/core-utils/Makefile.am
===================================================================
--- gnucash/trunk/src/core-utils/Makefile.am	2010-12-12 06:45:37 UTC (rev 19927)
+++ gnucash/trunk/src/core-utils/Makefile.am	2010-12-12 06:48:20 UTC (rev 19928)
@@ -50,7 +50,6 @@
   -I${top_srcdir}/src/libqof/qof \
   -I${top_srcdir}/src
 
-
 gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
 gncmod_DATA = core-utils.scm
 
@@ -75,8 +74,8 @@
 endif
 
 noinst_DATA = .scm-links
-BUILT_SOURCES = gncla-dir.h
-EXTRA_DIST = $(gncmod_DATA) core-utils.i gncla-dir.h.in
+BUILT_SOURCES = gncla-dir.h gnc-version.h
+EXTRA_DIST = $(gncmod_DATA) core-utils.i gncla-dir.h.in gnc-svninfo.h
 CLEANFILES = $(BUILT_SOURCES) gnucash .scm-links
 MAINTAINERCLEANFILES = swig-core-utils.c
 
@@ -93,3 +92,49 @@
 		-e 's#@-prefix-@#${prefix}#g'
 	mv $@.tmp $@
 
+## We borrow guile's convention and use @-...-@ as the substitution
+## brackets here, instead of the usual @... at .  This prevents autoconf
+## from substituting the values directly into the left-hand sides of
+## the sed substitutions.
+gnc-version.h: _gnc-version.h
+	-if [ ! -f gnc-version.h ]; then cp _gnc-version.h gnc-version.h; fi
+	-cmp -s _gnc-version.h gnc-version.h || cp _gnc-version.h gnc-version.h
+	-rm -f _gnc-version.h
+
+_gnc-version.h: gnc-svninfo.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
+	@svninfo=`${top_srcdir}/util/gnc-svnversion ${top_srcdir}` ; \
+	if [ $$? = 0 ] ; then \
+		echo "#define GNUCASH_SVN 1"		>> _gnc-version.h ; \
+	fi
+	@echo "#define GNUCASH_BUILD_DATE \"`date +%Y-%m-%d`\"" >> _gnc-version.h
+	@echo "#include \"gnc-svninfo.h\""		>> _gnc-version.h
+	@echo "#endif"					>> _gnc-version.h
+
+gnc-svninfo.h: _gnc-svninfo.h
+	-if [ ! -f gnc-svninfo.h ]; then cp _gnc-svninfo.h gnc-svninfo.h; fi
+	-cmp -s _gnc-svninfo.h gnc-svninfo.h || cp _gnc-svninfo.h gnc-svninfo.h
+	-rm -f _gnc-svninfo.h
+
+_gnc-svninfo.h: Makefile
+	@svninfo=`${top_srcdir}/util/gnc-svnversion ${top_srcdir}` ; \
+	if [ $$? = 0 ] ; then \
+		if [ -z "$$svninfo" ] ; then \
+			echo "gnc-svnversion failed.  figure out why." ; \
+			echo "can't determine svn revision from ${top_srcdir}." ; \
+			exit 1 ; \
+		fi ; \
+		echo "/* Autogenerated. Do not change. */" > _gnc-svninfo.h ; \
+		echo "#define GNUCASH_SVN_REV \"$$svninfo\"" >> _gnc-svninfo.h ; \
+	else \
+		if [ -r $(srcdir)/gnc-svninfo.h ] ; then \
+			cp $(srcdir)/gnc-svninfo.h _gnc-svninfo.h ; \
+		else \
+			echo "You're building from SVN...  But your build system is broken" ; \
+			echo "Don't do that.   Complain to your build-system creator." ; \
+			exit 1 ; \
+		fi ; \
+	fi

Modified: gnucash/trunk/src/core-utils/gnc-main.c
===================================================================
--- gnucash/trunk/src/core-utils/gnc-main.c	2010-12-12 06:45:37 UTC (rev 19927)
+++ gnucash/trunk/src/core-utils/gnc-main.c	2010-12-12 06:48:20 UTC (rev 19928)
@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include "config.h"
 #include "gnc-main.h"
-#include "gnome-utils/gnc-version.h"
+#include "gnc-version.h"
 
 static gchar *namespace_regexp = NULL;
 static gboolean is_debugging = 0;

Modified: gnucash/trunk/src/gnome-utils/Makefile.am
===================================================================
--- gnucash/trunk/src/gnome-utils/Makefile.am	2010-12-12 06:45:37 UTC (rev 19927)
+++ gnucash/trunk/src/gnome-utils/Makefile.am	2010-12-12 06:48:20 UTC (rev 19928)
@@ -12,6 +12,7 @@
   -I${top_srcdir}/src/app-utils \
   -I${top_srcdir}/src \
   -I${top_builddir}/src \
+  -I${top_builddir}/src/core-utils \
   -I${top_srcdir}/lib/libc \
   -I${top_srcdir}/src/libqof/qof \
   ${GLIB_CFLAGS} \
@@ -219,60 +220,11 @@
 gncscm_DATA = gnc-menu-extensions.scm
 
 EXTRA_DIST = \
-  gnc-svninfo.h \
   gnome-utils.i \
   ${gncmod_DATA} \
   ${gncscm_DATA}
 
-## We borrow guile's convention and use @-...-@ as the substitution
-## brackets here, instead of the usual @... at .  This prevents autoconf
-## from substituting the values directly into the left-hand sides of
-## the sed substitutions.
-gnc-version.h: _gnc-version.h
-	-if [ ! -f gnc-version.h ]; then cp _gnc-version.h gnc-version.h; fi
-	-cmp -s _gnc-version.h gnc-version.h || cp _gnc-version.h gnc-version.h
-	-rm -f _gnc-version.h
 
-_gnc-version.h: gnc-svninfo.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
-	@svninfo=`${top_srcdir}/util/gnc-svnversion ${top_srcdir}` ; \
-	if [ $$? = 0 ] ; then \
-		echo "#define GNUCASH_SVN 1"		>> _gnc-version.h ; \
-	fi
-	@echo "#define GNUCASH_BUILD_DATE \"`date +%Y-%m-%d`\"" >> _gnc-version.h
-	@echo "#include \"gnc-svninfo.h\""		>> _gnc-version.h
-	@echo "#endif"					>> _gnc-version.h
-
-gnc-svninfo.h: _gnc-svninfo.h
-	-if [ ! -f gnc-svninfo.h ]; then cp _gnc-svninfo.h gnc-svninfo.h; fi
-	-cmp -s _gnc-svninfo.h gnc-svninfo.h || cp _gnc-svninfo.h gnc-svninfo.h
-	-rm -f _gnc-svninfo.h
-
-_gnc-svninfo.h: Makefile
-	@svninfo=`${top_srcdir}/util/gnc-svnversion ${top_srcdir}` ; \
-	if [ $$? = 0 ] ; then \
-		if [ -z "$$svninfo" ] ; then \
-			echo "gnc-svnversion failed.  figure out why." ; \
-			echo "can't determine svn revision from ${top_srcdir}." ; \
-			exit 1 ; \
-		fi ; \
-		echo "/* Autogenerated. Do not change. */" > _gnc-svninfo.h ; \
-		echo "#define GNUCASH_SVN_REV \"$$svninfo\"" >> _gnc-svninfo.h ; \
-	else \
-		if [ -r $(srcdir)/gnc-svninfo.h ] ; then \
-			cp $(srcdir)/gnc-svninfo.h _gnc-svninfo.h ; \
-		else \
-			echo "You're building from SVN...  But your build system is broken" ; \
-			echo "Don't do that.   Complain to your build-system creator." ; \
-			exit 1 ; \
-		fi ; \
-	fi
-
-BUILT_SOURCES = gnc-version.h
-
 if GNUCASH_SEPARATE_BUILDDIR
 #For executing test cases
 SCM_FILE_LINKS = \



More information about the gnucash-changes mailing list