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

Build system: Rename SCM_TYPE to VCS_TYPE

Browse Source 
Follow up of the 2 previous commits.
This commit is contained in:
Frank H. Ellenberger 2015-03-31 07:12:24 +02:00
parent a59b01b939
commit 10b3ac4489
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.am
View File

@ -209,12 +209,12 @@ if BUILDING_FROM_VCS
# change, so this should fit just fine.) # change, so this should fit just fine.)
ChangeLog: NEWS ChangeLog: NEWS
cd $(abs_srcdir) ; \ cd $(abs_srcdir) ; \
if test x$(SCM_TYPE) = xsvn ; then \ if test x$(VCS_TYPE) = xsvn ; then \
$(SVN) log -v --xml -r HEAD:'{2015-01-01}' http://svn.gnucash.org/repo/gnucash | \ $(SVN) log -v --xml -r HEAD:'{2015-01-01}' http://svn.gnucash.org/repo/gnucash | \
$(XSLTPROC) --stringparam strip-prefix "gnucash/trunk" \ $(XSLTPROC) --stringparam strip-prefix "gnucash/trunk" \
--stringparam include-rev "yes" $(abs_srcdir)/macros/svn2cl.xsl - > $(abs_builddir)/$@ ; \ --stringparam include-rev "yes" $(abs_srcdir)/macros/svn2cl.xsl - > $(abs_builddir)/$@ ; \
else \ else \
if test x$(SCM_TYPE) = xgit ; then \ if test x$(VCS_TYPE) = xgit ; then \
"$(GIT_CMD)" log --format="%ad %aN %n%n%x09* %s%d%n" --date=short --since=2013-01-01 > $(abs_builddir)/$@ ; \ "$(GIT_CMD)" log --format="%ad %aN %n%n%x09* %s%d%n" --date=short --since=2013-01-01 > $(abs_builddir)/$@ ; \
else \ else \
touch $(abs_builddir)/$@ ; \ touch $(abs_builddir)/$@ ; \

14
configure.ac
View File

@ -200,10 +200,10 @@ AC_MSG_CHECKING(if building from an scm managed directory)
"$srcdir/util/gnc-vcs-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 if test $? = 0 -o "x${BUILDING_FROM_VCS}" = "xyes" ; then
BUILDING_FROM_VCS=yes BUILDING_FROM_VCS=yes
SCM_TYPE=$("$srcdir/util/gnc-vcs-info" -t "$srcdir") VCS_TYPE=$("$srcdir/util/gnc-vcs-info" -t "$srcdir")
AC_MSG_RESULT($SCM_TYPE) AC_MSG_RESULT($VCS_TYPE)
if test "x${SCM_TYPE}" = "xgit"; then if test "x${VCS_TYPE}" = "xgit"; then
AC_MSG_CHECKING(git command to use due to detected git repo) AC_MSG_CHECKING(git command to use due to detected git repo)
# The windows build uses environment variable $GIT_CMD to invoke git (adding git # The windows build uses environment variable $GIT_CMD to invoke git (adding git
# to the PATH in Windows results in a build failure). # to the PATH in Windows results in a build failure).
@ -216,7 +216,7 @@ if test $? = 0 -o "x${BUILDING_FROM_VCS}" = "xyes" ; then
else else
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
BUILDING_FROM_VCS=no BUILDING_FROM_VCS=no
SCM_TYPE= VCS_TYPE=
# Make sure we've got swig-runtime.h and gnc-vcs-info.h # Make sure we've got swig-runtime.h and gnc-vcs-info.h
AC_CHECK_FILE(${srcdir}/src/swig-runtime.h, [], AC_CHECK_FILE(${srcdir}/src/swig-runtime.h, [],
@ -241,7 +241,7 @@ the tarball you downloaded is broken.
])]) ])])
fi fi
AM_CONDITIONAL(BUILDING_FROM_VCS, test "x$BUILDING_FROM_VCS" = "xyes") AM_CONDITIONAL(BUILDING_FROM_VCS, test "x$BUILDING_FROM_VCS" = "xyes")
AC_SUBST(SCM_TYPE) AC_SUBST(VCS_TYPE)
AC_SUBST(GIT_CMD) AC_SUBST(GIT_CMD)
# Build dir adjustments # Build dir adjustments
@ -503,7 +503,7 @@ then
if test "${gnc_have_swig_2_0_10}" = no if test "${gnc_have_swig_2_0_10}" = no
then then
AC_MSG_ERROR([ AC_MSG_ERROR([
You are building from ${SCM_TYPE} but swig was not found or too old. You are building from ${VCS_TYPE} but swig was not found or too old.
To build gnucash you need at least swig version 2.0.10. To build gnucash you need at least swig version 2.0.10.
]) ])
fi fi
@ -512,7 +512,7 @@ then
then then
AX_PKG_SWIG(1.3.31, [], AX_PKG_SWIG(1.3.31, [],
[AC_MSG_ERROR([ [AC_MSG_ERROR([
You are building from ${SCM_TYPE} but swig was not found or too old. You are building from ${VCS_TYPE} but swig was not found or too old.
To build gnucash with guile 1.8 you need at least swig version 1.3.31. To build gnucash with guile 1.8 you need at least swig version 1.3.31.
])]) ])])
fi fi