IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2024-11-26 02:40:43 -06:00
Code Issues Packages Projects Releases Wiki Activity

Change of mind. Use scm instead of vcs.

Browse Source 
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
This commit is contained in:
Geert Janssens 2012-11-01 10:35:34 +00:00
parent 27c76eccd5
commit 67b2a56855
29 changed files with 81 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.am
View File

@ -77,7 +77,7 @@ EXTRA_DIST = \
intltool-extract.in \ intltool-extract.in \
intltool-merge.in \ intltool-merge.in \
intltool-update.in \ intltool-update.in \
util/gnc-vcs-info util/gnc-scm-info
## We borrow guile's convention and use @-...-@ as the substitution ## We borrow guile's convention and use @-...-@ as the substitution
## brackets here, instead of the usual @...@. This prevents autoconf ## brackets here, instead of the usual @...@. This prevents autoconf
@ -186,7 +186,7 @@ intl-scm/guile-strings.c:
SVN = svn SVN = svn
XSLTPROC = xsltproc XSLTPROC = xsltproc
if BUILDING_FROM_VCS if BUILDING_FROM_SCM
# This rule will generate a ChangeLog of gnucash/trunk commits, plus # This rule will generate a ChangeLog of gnucash/trunk commits, plus
# all additional branches that are added in # all additional branches that are added in
# ./macros/svn2cl.xsl. (FIXME: Is the dependency on NEWS really a good # ./macros/svn2cl.xsl. (FIXME: Is the dependency on NEWS really a good

22
configure.ac
View File

@ -175,38 +175,38 @@ if test x$am_cv_scanf_lld = "xno"; then
fi fi
# test whether we are building directly from svn/svk/git/bzr # test whether we are building directly from svn/svk/git/bzr
${srcdir}/util/gnc-vcs-info -r ${srcdir} >/dev/null 2>&1 ${srcdir}/util/gnc-scm-info -r ${srcdir} >/dev/null 2>&1
if test $? = 0 -o "x${BUILDING_FROM_VCS}" = "xyes" ; then if test $? = 0 -o "x${BUILDING_FROM_SCM}" = "xyes" ; then
BUILDING_FROM_VCS=yes BUILDING_FROM_SCM=yes
# We need at least version 1.3.31 of SWIG because # We need at least version 1.3.31 of SWIG because
# that's when SWIG doesn't barf on the "inline" keyword in C headers anymore # that's when SWIG doesn't barf on the "inline" keyword in C headers anymore
AC_PROG_SWIG(1.3.31) AC_PROG_SWIG(1.3.31)
else else
BUILDING_FROM_VCS=no BUILDING_FROM_SCM=no
# Make sure we've got swig-runtime.h and gnc-vcs-info.h # Make sure we've got swig-runtime.h and gnc-scm-info.h
AC_CHECK_FILE(${srcdir}/src/swig-runtime.h, [], AC_CHECK_FILE(${srcdir}/src/swig-runtime.h, [],
[AC_MSG_ERROR([ [AC_MSG_ERROR([
It looks like you are NOT building from Subversion, svk, git or bzr 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 but I cannot find swig-runtime.h. Check your PATH and make sure
we can find gnc-vcs-info in your PATH! we can find gnc-scm-info in your PATH!
Either that or contact gnucash-devel@gnucash.org because Either that or contact gnucash-devel@gnucash.org because
the tarball you downloaded is broken. the tarball you downloaded is broken.
])]) ])])
AC_CHECK_FILE(${srcdir}/src/core-utils/gnc-vcs-info.h, [], AC_CHECK_FILE(${srcdir}/src/core-utils/gnc-scm-info.h, [],
[AC_MSG_ERROR([ [AC_MSG_ERROR([
It looks like you are NOT building from Subversion, svk, git or bzr It looks like you are NOT building from Subversion, svk, git or bzr
but I cannot find gnc-vcs-info.h. Check your PATH and make sure but I cannot find gnc-scm-info.h. Check your PATH and make sure
we can find gnc-vcs-info in your PATH! we can find gnc-scm-info in your PATH!
Either that or contact gnucash-devel@gnucash.org because Either that or contact gnucash-devel@gnucash.org because
the tarball you downloaded is broken. the tarball you downloaded is broken.
])]) ])])
fi fi
AM_CONDITIONAL(BUILDING_FROM_VCS, test "x$BUILDING_FROM_VCS" = "xyes") AM_CONDITIONAL(BUILDING_FROM_SCM, test "x$BUILDING_FROM_SCM" = "xyes")
# Build dir adjustments # Build dir adjustments
AM_CONDITIONAL(GNUCASH_SEPARATE_BUILDDIR, test "x${srcdir}" != "x.") AM_CONDITIONAL(GNUCASH_SEPARATE_BUILDDIR, test "x${srcdir}" != "x.")
@ -1112,7 +1112,7 @@ then
#warnFLAGS="${warnFLAGS} -Werror-implicit-function-declaration" # In -Wall #warnFLAGS="${warnFLAGS} -Werror-implicit-function-declaration" # In -Wall
# error-on-warning should not be active in (stable) release tarballs # error-on-warning should not be active in (stable) release tarballs
if test "x$BUILDING_FROM_VCS" = "xyes" if test "x$BUILDING_FROM_SCM" = "xyes"
then then
# This code is from svn/svk/git/bzr, so enable error-on-warning # This code is from svn/svk/git/bzr, so enable error-on-warning
error_on_warning_as_default="yes" error_on_warning_as_default="yes"

2
intl-scm/Makefile.am
View File

@ -12,7 +12,7 @@ BUILT_SOURCES = guile-strings.c
SCMFILES = $(shell find ${abs_top_srcdir}/src -name test -prune -o -name '*.scm' -print | sort) SCMFILES = $(shell find ${abs_top_srcdir}/src -name test -prune -o -name '*.scm' -print | sort)
if BUILDING_FROM_VCS if BUILDING_FROM_SCM
# This needs to be generated in srcdir # This needs to be generated in srcdir
guile-strings.c: $(SCMFILES) guile-strings.c: $(SCMFILES)
rm -f guile-strings.c rm -f guile-strings.c

4
packaging/win32/build_package.sh
View File

@ -65,12 +65,12 @@ rm -rf ${_DIST_UDIR}
_BUILD_UDIR=`unix_path $BUILD_DIR` _BUILD_UDIR=`unix_path $BUILD_DIR`
_GNUCASH_UDIR=`unix_path $GNUCASH_DIR` _GNUCASH_UDIR=`unix_path $GNUCASH_DIR`
PKG_VERSION=`grep PACKAGE_VERSION ${_BUILD_UDIR}/config.h | cut -d" " -f3 | cut -d\" -f2 ` 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 # Choose the output filename based on our "build_from_tarball" setting
# Make sure this logic matches the logic in dist.sh! # Make sure this logic matches the logic in dist.sh!
if [ "$BUILD_FROM_TARBALL" = "no" ]; then 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 else
SETUP_FILENAME="gnucash-${PKG_VERSION}-setup.exe" SETUP_FILENAME="gnucash-${PKG_VERSION}-setup.exe"
fi fi

4
packaging/win32/build_package_git.sh
View File

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

8
packaging/win32/defaults.sh
View File

@ -42,11 +42,11 @@ else
set_default REPOS_TYPE "git" set_default REPOS_TYPE "git"
if [ "$REPOS_TYPE" = "git" ]; then 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" set_default REPOS_URL "git://github.com/Gnucash/gnucash.git"
elif [ "$REPOS_TYPE" = "svn" ]; then elif [ "$REPOS_TYPE" = "svn" ]; then
# latest revision that should compile, use HEAD or vwxyz # 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" set_default REPOS_URL "http://svn.gnucash.org/repo/gnucash/trunk"
fi fi
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_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" set_default DOCBOOK_DTD_URL "http://www.oasis-open.org/docbook/xml/4.1.2/docbkx412.zip"
if [ "$REPOS_TYPE" = "git" ]; then 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" set_default DOCS_URL "git://github.com/Gnucash/gnucash-docs.git"
elif [ "$REPOS_TYPE" = "svn" ]; then elif [ "$REPOS_TYPE" = "svn" ]; then
# latest revision that should compile, use HEAD or vwxyz # 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" set_default DOCS_URL "http://svn.gnucash.org/repo/gnucash-docs/trunk"
fi fi
set_default UPDATE_DOCS yes set_default UPDATE_DOCS yes

2
packaging/win32/dist-impl.sh
View File

@ -297,7 +297,7 @@ function dist_finish() {
if [ "$BUILD_FROM_TARBALL" = "no" ]; then if [ "$BUILD_FROM_TARBALL" = "no" ]; then
# And changing output filename # And changing output filename
PKG_VERSION=`grep PACKAGE_VERSION ${_BUILD_UDIR}/config.h | cut -d" " -f3 | cut -d\" -f2 ` 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 if [ "$REPOS_TYPE" = "svn" ]; then
SETUP_FILENAME="gnucash-${PKG_VERSION}-${REPOS_TYPE}-r${REVISION}-setup.exe" SETUP_FILENAME="gnucash-${PKG_VERSION}-${REPOS_TYPE}-r${REVISION}-setup.exe"
else else

6
packaging/win32/install-impl.sh
View File

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

2
src/Makefile.am
View File

@ -53,7 +53,7 @@ noinst_HEADERS = \
noinst_DATA = gnc-test-env noinst_DATA = gnc-test-env
if BUILDING_FROM_VCS if BUILDING_FROM_SCM
swig-runtime.h: swig-runtime.h:
$(SWIG) -guile -external-runtime $@ $(SWIG) -guile -external-runtime $@
endif endif

2
src/app-utils/Makefile.am
View File

@ -93,7 +93,7 @@ libgncmod_app_utils_la_LIBADD = \
${GUILE_LIBS} \ ${GUILE_LIBS} \
${GLIB_LIBS} ${GLIB_LIBS}
if BUILDING_FROM_VCS if BUILDING_FROM_SCM
swig-app-utils-guile.c: app-utils.i ${top_srcdir}/src/base-typemaps.i swig-app-utils-guile.c: app-utils.i ${top_srcdir}/src/base-typemaps.i
$(SWIG) -guile $(SWIG_ARGS) -Linkage module \ $(SWIG) -guile $(SWIG_ARGS) -Linkage module \
-I${top_srcdir}/src -o $@ $< -I${top_srcdir}/src -o $@ $<

14
src/bin/gnucash-bin.c
View File

@ -65,8 +65,8 @@ static QofLogModule log_module = GNC_MOD_GUI;
# include <Foundation/Foundation.h> # include <Foundation/Foundation.h>
#endif #endif
/* GNUCASH_VCS is defined whenever we're building from an svn/svk/git/bzr tree */ /* GNUCASH_SCM is defined whenever we're building from an svn/svk/git/bzr tree */
#ifdef GNUCASH_VCS #ifdef GNUCASH_SCM
static int is_development_version = TRUE; static int is_development_version = TRUE;
#else #else
static int is_development_version = FALSE; static int is_development_version = FALSE;
@ -527,11 +527,11 @@ gnc_parse_command_line(int *argc, char ***argv)
fixed_message = g_strdup_printf(_("GnuCash %s development version"), VERSION); fixed_message = g_strdup_printf(_("GnuCash %s development version"), VERSION);
/* Translators: 1st %s is a fixed message, which is translated independently; /* Translators: 1st %s is a fixed message, which is translated independently;
2nd %s is the vcs type (svn/svk/git/bzr); 2nd %s is the scm type (svn/svk/git/bzr);
3rd %s is the vcs revision number; 3rd %s is the scm revision number;
4th %s is the build date */ 4th %s is the build date */
g_print ( _("%s\nThis copy was built from %s rev %s on %s."), g_print ( _("%s\nThis copy was built from %s rev %s on %s."),
fixed_message, GNUCASH_VCS, GNUCASH_VCS_REV, fixed_message, GNUCASH_SCM, GNUCASH_SCM_REV,
GNUCASH_BUILD_DATE ); GNUCASH_BUILD_DATE );
} }
else else
@ -539,10 +539,10 @@ gnc_parse_command_line(int *argc, char ***argv)
fixed_message = g_strdup_printf(_("GnuCash %s"), VERSION); fixed_message = g_strdup_printf(_("GnuCash %s"), VERSION);
/* Translators: 1st %s is a fixed message, which is translated independently; /* Translators: 1st %s is a fixed message, which is translated independently;
2nd %s is the vcs (svn/svk/git/bzr) revision number; 2nd %s is the scm (svn/svk/git/bzr) revision number;
3rd %s is the build date */ 3rd %s is the build date */
g_print ( _("%s\nThis copy was built from rev %s on %s."), g_print ( _("%s\nThis copy was built from rev %s on %s."),
fixed_message, GNUCASH_VCS_REV, GNUCASH_BUILD_DATE ); fixed_message, GNUCASH_SCM_REV, GNUCASH_BUILD_DATE );
} }
g_print("\n"); g_print("\n");
g_free (fixed_message); g_free (fixed_message);

36
src/core-utils/Makefile.am
View File

@ -40,7 +40,7 @@ noinst_HEADERS = \
gnc-path.h \ gnc-path.h \
gnc-uri-utils.h gnc-uri-utils.h
if BUILDING_FROM_VCS if BUILDING_FROM_SCM
swig-core-utils-guile.c: core-utils.i ${top_srcdir}/src/base-typemaps.i swig-core-utils-guile.c: core-utils.i ${top_srcdir}/src/base-typemaps.i
$(SWIG) -guile $(SWIG_ARGS) -Linkage module \ $(SWIG) -guile $(SWIG_ARGS) -Linkage module \
-I${top_srcdir}/src -o $@ $< -I${top_srcdir}/src -o $@ $<
@ -107,7 +107,7 @@ endif
noinst_DATA = .scm-links noinst_DATA = .scm-links
BUILT_SOURCES = gncla-dir.h gnc-version.h BUILT_SOURCES = gncla-dir.h gnc-version.h
EXTRA_DIST = $(gncmod_DATA) core-utils.i gncla-dir.h.in gnc-vcs-info.h EXTRA_DIST = $(gncmod_DATA) core-utils.i gncla-dir.h.in gnc-scm-info.h
clean-local: clean-local:
rm -rf gnucash rm -rf gnucash
@ -136,37 +136,37 @@ gnc-version.h: _gnc-version.h
-cmp -s _gnc-version.h gnc-version.h || cp _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 -rm -f _gnc-version.h
_gnc-version.h: gnc-vcs-info.h Makefile _gnc-version.h: gnc-scm-info.h Makefile
@echo "/* Autogenerated. Do not change. */" > _gnc-version.h @echo "/* Autogenerated. Do not change. */" > _gnc-version.h
@echo "#ifndef GNC_VERSION_H" >> _gnc-version.h @echo "#ifndef GNC_VERSION_H" >> _gnc-version.h
@echo "#define GNC_VERSION_H" >> _gnc-version.h @echo "#define GNC_VERSION_H" >> _gnc-version.h
@echo "" >> _gnc-version.h @echo "" >> _gnc-version.h
@vcs_info=`${top_srcdir}/util/gnc-vcs-info -t ${top_srcdir}` ; \ @scm_info=`${top_srcdir}/util/gnc-scm-info -t ${top_srcdir}` ; \
if [ $$? = 0 ] ; then \ if [ $$? = 0 ] ; then \
echo "#define GNUCASH_VCS \"$$vcs_info\"" >> _gnc-version.h ; \ echo "#define GNUCASH_SCM \"$$scm_info\"" >> _gnc-version.h ; \
fi fi
@echo "#define GNUCASH_BUILD_DATE \"`date +%Y-%m-%d`\"" >> _gnc-version.h @echo "#define GNUCASH_BUILD_DATE \"`date +%Y-%m-%d`\"" >> _gnc-version.h
@echo "#include \"gnc-vcs-info.h\"" >> _gnc-version.h @echo "#include \"gnc-scm-info.h\"" >> _gnc-version.h
@echo "#endif" >> _gnc-version.h @echo "#endif" >> _gnc-version.h
gnc-vcs-info.h: _gnc-vcs-info.h gnc-scm-info.h: _gnc-scm-info.h
-if [ ! -f gnc-vcs-info.h ]; then cp _gnc-vcs-info.h gnc-vcs-info.h; fi -if [ ! -f gnc-scm-info.h ]; then cp _gnc-scm-info.h gnc-scm-info.h; fi
-cmp -s _gnc-vcs-info.h gnc-vcs-info.h || cp _gnc-vcs-info.h gnc-vcs-info.h -cmp -s _gnc-scm-info.h gnc-scm-info.h || cp _gnc-scm-info.h gnc-scm-info.h
-rm -f _gnc-vcs-info.h -rm -f _gnc-scm-info.h
_gnc-vcs-info.h: Makefile _gnc-scm-info.h: Makefile
@vcs_info=`${top_srcdir}/util/gnc-vcs-info -r ${top_srcdir}` ; \ @scm_info=`${top_srcdir}/util/gnc-scm-info -r ${top_srcdir}` ; \
if [ $$? = 0 ] ; then \ if [ $$? = 0 ] ; then \
if [ -z "$$vcs_info" ] ; then \ if [ -z "$$scm_info" ] ; then \
echo "gnc-vcs-info failed. figure out why." ; \ echo "gnc-scm-info failed. figure out why." ; \
echo "can't determine svn/svk/git/bzr revision from ${top_srcdir}." ; \ echo "can't determine svn/svk/git/bzr revision from ${top_srcdir}." ; \
exit 1 ; \ exit 1 ; \
fi ; \ fi ; \
echo "/* Autogenerated. Do not change. */" > _gnc-vcs-info.h ; \ echo "/* Autogenerated. Do not change. */" > _gnc-scm-info.h ; \
echo "#define GNUCASH_VCS_REV \"$$vcs_info\"" >> _gnc-vcs-info.h ; \ echo "#define GNUCASH_SCM_REV \"$$scm_info\"" >> _gnc-scm-info.h ; \
else \ else \
if [ -r $(srcdir)/gnc-vcs-info.h ] ; then \ if [ -r $(srcdir)/gnc-scm-info.h ] ; then \
cp $(srcdir)/gnc-vcs-info.h _gnc-vcs-info.h ; \ cp $(srcdir)/gnc-scm-info.h _gnc-scm-info.h ; \
else \ else \
echo "You're building from svn/svk/git/bzr... But your build system is broken" ; \ 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." ; \ echo "Don't do that. Complain to your build-system creator." ; \

2
src/engine/Makefile.am
View File

@ -188,7 +188,7 @@ endif
noinst_DATA = .scm-links noinst_DATA = .scm-links
if BUILDING_FROM_VCS if BUILDING_FROM_SCM
# The generated file depends on various libqof headers. Out of # The generated file depends on various libqof headers. Out of
# laziness I only include a few here - more might be needed # laziness I only include a few here - more might be needed

2
src/gnc-module/Makefile.am
View File

@ -29,7 +29,7 @@ gncinclude_HEADERS = \
noinst_DATA = .scm-links noinst_DATA = .scm-links
if BUILDING_FROM_VCS if BUILDING_FROM_SCM
swig-gnc-module.c: gnc-module.i ${top_srcdir}/src/base-typemaps.i swig-gnc-module.c: gnc-module.i ${top_srcdir}/src/base-typemaps.i
$(SWIG) -guile $(SWIG_ARGS) -Linkage module \ $(SWIG) -guile $(SWIG_ARGS) -Linkage module \
-I${top_srcdir}/src -o $@ $< -I${top_srcdir}/src -o $@ $<

2
src/gnc-module/test/mod-bar/Makefile.am
View File

@ -22,7 +22,7 @@ libgncmodbar_la_LIBADD=libbar.la \
$(GUILE_LIBS) \ $(GUILE_LIBS) \
$(GLIB_LIBS) $(GLIB_LIBS)
if BUILDING_FROM_VCS if BUILDING_FROM_SCM
swig-bar.c: bar.i swig-bar.c: bar.i
$(SWIG) -guile $(SWIG_ARGS) -Linkage module -o $@ $< $(SWIG) -guile $(SWIG_ARGS) -Linkage module -o $@ $<
endif endif

2
src/gnc-module/test/mod-baz/Makefile.am
View File

@ -26,7 +26,7 @@ libgncmodbaz_la_LIBADD = \
$(GUILE_LIBS) \ $(GUILE_LIBS) \
$(GLIB_LIBS) $(GLIB_LIBS)
if BUILDING_FROM_VCS if BUILDING_FROM_SCM
swig-baz.c: baz.i swig-baz.c: baz.i
$(SWIG) -guile $(SWIG_ARGS) -Linkage module -o $@ $< $(SWIG) -guile $(SWIG_ARGS) -Linkage module -o $@ $<
endif endif

2
src/gnc-module/test/mod-foo/Makefile.am
View File

@ -27,7 +27,7 @@ EXTRA_DIST = \
foo.i \ foo.i \
gnucash/foo.scm gnucash/foo.scm
if BUILDING_FROM_VCS if BUILDING_FROM_SCM
swig-foo.c: foo.i swig-foo.c: foo.i
$(SWIG) -guile $(SWIG_ARGS) -Linkage module -o $@ $< $(SWIG) -guile $(SWIG_ARGS) -Linkage module -o $@ $<
endif endif

4
src/gnc/main.cpp
View File

@ -71,8 +71,8 @@ namespace gnc
#define APP_GNUCASH "/apps/gnucash" #define APP_GNUCASH "/apps/gnucash"
/* GNUCASH_VCS is defined whenever we're building from an svn/svk/git/bzr tree */ /* GNUCASH_SCM is defined whenever we're building from an svn/svk/git/bzr tree */
#ifdef GNUCASH_VCS #ifdef GNUCASH_SCM
static int is_development_version = TRUE; static int is_development_version = TRUE;
#else #else
static int is_development_version = FALSE; static int is_development_version = FALSE;

2
src/gnome-utils/Makefile.am
View File

@ -212,7 +212,7 @@ if HAVE_X11_XLIB_H
libgncmod_gnome_utils_la_LIBADD += -lX11 libgncmod_gnome_utils_la_LIBADD += -lX11
endif endif
if BUILDING_FROM_VCS if BUILDING_FROM_SCM
swig-gnome-utils.c: gnome-utils.i \ swig-gnome-utils.c: gnome-utils.i \
${top_srcdir}/src/base-typemaps.i ${top_srcdir}/src/base-typemaps.i
$(SWIG) -guile $(SWIG_ARGS) -Linkage module \ $(SWIG) -guile $(SWIG_ARGS) -Linkage module \

12
src/gnome-utils/gnc-main-window.c
View File

@ -4122,21 +4122,21 @@ gnc_main_window_cmd_help_about (GtkAction *action, GncMainWindow *window)
authors = get_file_strsplit("AUTHORS"); authors = get_file_strsplit("AUTHORS");
documenters = get_file_strsplit("DOCUMENTERS"); documenters = get_file_strsplit("DOCUMENTERS");
license = get_file("LICENSE"); license = get_file("LICENSE");
#ifdef GNUCASH_VCS #ifdef GNUCASH_SCM
/* Development version */ /* Development version */
/* Translators: 1st %s is a fixed message, which is translated independently; /* Translators: 1st %s is a fixed message, which is translated independently;
2nd %s is the vcs type (svn/svk/git/bzr); 2nd %s is the scm type (svn/svk/git/bzr);
3rd %s is the vcs revision number; 3rd %s is the scm revision number;
4th %s is the build date */ 4th %s is the build date */
message = g_strdup_printf(_("%s\nThis copy was built from %s rev %s on %s."), message = g_strdup_printf(_("%s\nThis copy was built from %s rev %s on %s."),
fixed_message, GNUCASH_VCS, GNUCASH_VCS_REV, fixed_message, GNUCASH_SCM, GNUCASH_SCM_REV,
GNUCASH_BUILD_DATE); GNUCASH_BUILD_DATE);
#else #else
/* Translators: 1st %s is a fixed message, which is translated independently; /* Translators: 1st %s is a fixed message, which is translated independently;
2nd %s is the vcs (svn/svk/git/bzr) revision number; 2nd %s is the scm (svn/svk/git/bzr) revision number;
3rd %s is the build date */ 3rd %s is the build date */
message = g_strdup_printf(_("%s\nThis copy was built from rev %s on %s."), message = g_strdup_printf(_("%s\nThis copy was built from rev %s on %s."),
fixed_message, GNUCASH_VCS_REV, GNUCASH_BUILD_DATE); fixed_message, GNUCASH_SCM_REV, GNUCASH_BUILD_DATE);
#endif #endif
gtk_show_about_dialog gtk_show_about_dialog
(GTK_WINDOW (window), (GTK_WINDOW (window),

12
src/gnome-utils/gnc-splash.c
View File

@ -85,22 +85,22 @@ gnc_show_splash_screen (void)
frame = gtk_frame_new (NULL); frame = gtk_frame_new (NULL);
vbox = gtk_vbox_new (FALSE, 3); vbox = gtk_vbox_new (FALSE, 3);
hbox = gtk_hbox_new (FALSE, 3); hbox = gtk_hbox_new (FALSE, 3);
#ifdef GNUCASH_VCS #ifdef GNUCASH_SCM
/* Development version */ /* Development version */
/* Translators: 1st %s is the GnuCash version (eg 2.4.11); /* Translators: 1st %s is the GnuCash version (eg 2.4.11);
2nd %s is the vcs type (svn/svk/git/bzr); 2nd %s is the scm type (svn/svk/git/bzr);
3rd %s is the vcs revision number; 3rd %s is the scm revision number;
4th %s is the build date */ 4th %s is the build date */
ver_string = g_strdup_printf(_("Version: GnuCash-%s %s (rev %s built %s)"), ver_string = g_strdup_printf(_("Version: GnuCash-%s %s (rev %s built %s)"),
VERSION, GNUCASH_VCS, GNUCASH_VCS_REV, VERSION, GNUCASH_SCM, GNUCASH_SCM_REV,
GNUCASH_BUILD_DATE); GNUCASH_BUILD_DATE);
#else #else
/* Dist Tarball */ /* Dist Tarball */
/* Translators: 1st %s is the GnuCash version (eg 2.4.11); /* Translators: 1st %s is the GnuCash version (eg 2.4.11);
2nd %s is the vcs (svn/svk/git/bzr) revision number; 2nd %s is the scm (svn/svk/git/bzr) revision number;
3rd %s is the build date */ 3rd %s is the build date */
ver_string = g_strdup_printf(_("Version: GnuCash-%s (rev %s built %s)"), ver_string = g_strdup_printf(_("Version: GnuCash-%s (rev %s built %s)"),
VERSION, GNUCASH_VCS_REV, GNUCASH_BUILD_DATE); VERSION, GNUCASH_SCM_REV, GNUCASH_BUILD_DATE);
#endif #endif
version = gtk_label_new(NULL); version = gtk_label_new(NULL);

2
src/gnome/Makefile.am
View File

@ -98,7 +98,7 @@ noinst_HEADERS = \
window-reconcile.h \ window-reconcile.h \
window-autoclear.h window-autoclear.h
if BUILDING_FROM_VCS if BUILDING_FROM_SCM
swig-gnome.c: gnome.i dialog-progress.h ${top_srcdir}/src/base-typemaps.i swig-gnome.c: gnome.i dialog-progress.h ${top_srcdir}/src/base-typemaps.i
$(SWIG) -guile $(SWIG_ARGS) -Linkage module \ $(SWIG) -guile $(SWIG_ARGS) -Linkage module \
-I${top_srcdir}/src -o $@ $< -I${top_srcdir}/src -o $@ $<

2
src/html/Makefile.am
View File

@ -61,7 +61,7 @@ libgncmod_html_la_LIBADD = \
${GUILE_LIBS} \ ${GUILE_LIBS} \
${REGEX_LIBS} ${REGEX_LIBS}
if BUILDING_FROM_VCS if BUILDING_FROM_SCM
swig-gnc-html.c: gnc-html.i gnc-html.h \ swig-gnc-html.c: gnc-html.i gnc-html.h \
${top_srcdir}/src/base-typemaps.i ${top_srcdir}/src/base-typemaps.i
$(SWIG) -guile $(SWIG_ARGS) -Linkage module \ $(SWIG) -guile $(SWIG_ARGS) -Linkage module \

2
src/optional/python-bindings/Makefile.am
View File

@ -37,7 +37,7 @@ _gnucash_core_c_la_LIBADD = \
${top_builddir}/src/libqof/qof/libgnc-qof.la \ ${top_builddir}/src/libqof/qof/libgnc-qof.la \
${top_builddir}/src/gnc-module/libgnc-module.la \ ${top_builddir}/src/gnc-module/libgnc-module.la \
${top_builddir}/src/engine/libgncmod-engine.la ${top_builddir}/src/engine/libgncmod-engine.la
if BUILDING_FROM_VCS if BUILDING_FROM_SCM
_gnucash_core_c_includes= \ _gnucash_core_c_includes= \
${top_builddir}/config.h \ ${top_builddir}/config.h \
${top_srcdir}/src/libqof/qof/qofsession.h \ ${top_srcdir}/src/libqof/qof/qofsession.h \

4
src/pixmaps/Makefile.am
View File

@ -78,7 +78,7 @@ gncextrasmallicon_DATA = 16x16/gnucash-icon.png
gncscalableicondir = ${datadir}/icons/hicolor/scalable/apps gncscalableicondir = ${datadir}/icons/hicolor/scalable/apps
gncscalableicon_DATA = scalable/gnucash-icon.svg gncscalableicon_DATA = scalable/gnucash-icon.svg
if BUILDING_FROM_VCS if BUILDING_FROM_SCM
256x256/gnucash-icon.png: gnucash-icon-256x256.png 256x256/gnucash-icon.png: gnucash-icon-256x256.png
-mkdir -p 256x256 -mkdir -p 256x256
cp ${srcdir}/gnucash-icon-256x256.png 256x256/gnucash-icon.png cp ${srcdir}/gnucash-icon-256x256.png 256x256/gnucash-icon.png
@ -161,7 +161,7 @@ EXTRA_DIST = \
${gncscalableicon_DATA} ${gncscalableicon_DATA}
# Only clean up if we're building from svn/svk/git/bzr # Only clean up if we're building from svn/svk/git/bzr
if BUILDING_FROM_VCS if BUILDING_FROM_SCM
clean-local: clean-local:
-rm -rf 256x256 128x128 96x96 64x64 48x48 32x32 24x24 22x22 16x16 scalable -rm -rf 256x256 128x128 96x96 64x64 48x48 32x32 24x24 22x22 16x16 scalable
endif endif

2
src/report/report-gnome/Makefile.am
View File

@ -51,7 +51,7 @@ libgncmod_report_gnome_la_LIBADD = \
${GCONF_LIBS} \ ${GCONF_LIBS} \
${GLIB_LIBS} ${GLIB_LIBS}
if BUILDING_FROM_VCS if BUILDING_FROM_SCM
swig-report-gnome.c: report-gnome.i ${top_srcdir}/src/base-typemaps.i swig-report-gnome.c: report-gnome.i ${top_srcdir}/src/base-typemaps.i
$(SWIG) -guile $(SWIG_ARGS) -Linkage module \ $(SWIG) -guile $(SWIG_ARGS) -Linkage module \
-I${top_srcdir}/src -o $@ $< -I${top_srcdir}/src -o $@ $<

2
src/report/report-system/Makefile.am
View File

@ -20,7 +20,7 @@ libgncmod_report_system_la_LIBADD = \
${GLIB_LIBS} \ ${GLIB_LIBS} \
${GTK_LIBS} ${GTK_LIBS}
if BUILDING_FROM_VCS if BUILDING_FROM_SCM
swig-report-system.c: report-system.i ${top_srcdir}/src/base-typemaps.i swig-report-system.c: report-system.i ${top_srcdir}/src/base-typemaps.i
$(SWIG) -guile $(SWIG_ARGS) -Linkage module \ $(SWIG) -guile $(SWIG_ARGS) -Linkage module \
-I${top_srcdir}/src -o $@ $< -I${top_srcdir}/src -o $@ $<

2
src/test-core/Makefile.am
View File

@ -23,7 +23,7 @@ libtest_core_la_CPPFLAGS = \
libtest_core_la_LDFLAGS = \ libtest_core_la_LDFLAGS = \
-rpath ${exec-prefix}/lib -rpath ${exec-prefix}/lib
if BUILDING_FROM_VCS if BUILDING_FROM_SCM
swig-unittest-support-guile.c: unittest-support.i $(top_srcdir)/src/base-typemaps.i swig-unittest-support-guile.c: unittest-support.i $(top_srcdir)/src/base-typemaps.i
$(SWIG) -guile $(SWIG_ARGS) -Linkage module \ $(SWIG) -guile $(SWIG_ARGS) -Linkage module \
-I${top_srcdir}/src \ -I${top_srcdir}/src \

0
util/gnc-vcs-info → util/gnc-scm-info
View File