sfos/ledger
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes to makefiles and verification.

Browse source
This commit is contained in:
John Wiegley 2007-05-14 11:10:03 +00:00
parent 3fb5a1c320
commit 104fa5689b
2 changed files with 16 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Makefile.am
View file

@ -3,7 +3,7 @@ BUILT_SOURCES =
CLEANFILES = CLEANFILES =
EXTRA_DIST = LICENSE docs tests contrib scripts setup.py \ EXTRA_DIST = LICENSE docs tests contrib scripts setup.py \
acprep verify.sh run_verify.sh valgrind.sh \ acprep verify.sh run_verify.sh valgrind.sh \
src/TODO src/gnucash.cc src/TODO # src/gnucash.cc src/ofx.cc
ESC_srcdir=`echo "$(srcdir)" | sed 's/\//\\\\\//g'` ESC_srcdir=`echo "$(srcdir)" | sed 's/\//\\\\\//g'`
ESC_builddir=`echo "$(top_builddir)" | sed 's/\//\\\\\//g'` ESC_builddir=`echo "$(top_builddir)" | sed 's/\//\\\\\//g'`
@ -61,10 +61,10 @@ libledger_la_SOURCES = \
#libledger_la_CPPFLAGS += -DHAVE_XMLPARSE=1 #libledger_la_CPPFLAGS += -DHAVE_XMLPARSE=1
#libledger_la_SOURCES += src/gnucash.cc #libledger_la_SOURCES += src/gnucash.cc
#endif #endif
if HAVE_LIBOFX #if HAVE_LIBOFX
libledger_la_CPPFLAGS += -DHAVE_LIBOFX=1 #libledger_la_CPPFLAGS += -DHAVE_LIBOFX=1
libledger_la_SOURCES += src/ofx.cc #libledger_la_SOURCES += src/ofx.cc
endif #endif
if DEBUG if DEBUG
libledger_la_CPPFLAGS += -DDEBUG_MODE libledger_la_CPPFLAGS += -DDEBUG_MODE
endif endif
@ -102,12 +102,14 @@ pkginclude_HEADERS = \
src/builder.h \ src/builder.h \
src/commodity.h \ src/commodity.h \
src/context.h \ src/context.h \
src/document.h \
src/fdstream.hpp \ src/fdstream.hpp \
src/flags.h \ src/flags.h \
src/format.h \ src/format.h \
src/journal.h \ src/journal.h \
src/ledger.h \ src/ledger.h \
src/mask.h \ src/mask.h \
src/node.h \
src/option.h \ src/option.h \
src/parser.h \ src/parser.h \
src/pyfstream.h \ src/pyfstream.h \
@ -183,9 +185,9 @@ PYLIBS += boost_date_time$(BOOST_SUFFIX) \
#if HAVE_XMLPARSE #if HAVE_XMLPARSE
#PYLIBS += xmlparse xmltok #PYLIBS += xmlparse xmltok
#endif #endif
if HAVE_LIBOFX #if HAVE_LIBOFX
PYLIBS += ofx #PYLIBS += ofx
endif #endif
ledger.so: $(ledger_so_SOURCES) $(ledger_so_DEPENDENCIES) ledger.so: $(ledger_so_SOURCES) $(ledger_so_DEPENDENCIES)
CFLAGS="$(CPPFLAGS) -I$(srcdir) $(libledger_la_CPPFLAGS)" \ CFLAGS="$(CPPFLAGS) -I$(srcdir) $(libledger_la_CPPFLAGS)" \

24
verify.sh
View file

@ -22,20 +22,12 @@ cd $TMPDIR || exit 1
mkdir ledger || exit 1 mkdir ledger || exit 1
cd ledger || exit 1 cd ledger || exit 1
# Determine if we can use git to pull down Ledger, since it's very # Pull the Ledger sources from the Subversion repository.
# fast and efficient (and the trunk of ledger-git is more bleeding
# edge). Otherwise, fall back on the public sebversion repository.
USING_GIT=true
cmd=$(which git 2>&1)
if [ ! -x "$cmd" ]; then
USING_GIT=false
LEDGER_SVN=https://ledger.svn.sourceforge.net/svnroot/ledger LEDGER_SVN=https://ledger.svn.sourceforge.net/svnroot/ledger
elif [ -d $HOME/src/ledger/.git ]; then
LEDGER_GIT=$HOME/src/ledger if [ -d $HOME/Projects/ledger ]; then
else cp -Rp $HOME/Projects/ledger local_svn
LEDGER_GIT=http://newartisans.com/ledger.git
fi fi
# Create a reference copy of the sources in a pristine working tree # Create a reference copy of the sources in a pristine working tree
@ -44,18 +36,10 @@ fi
# `dup_working_tree' creates a copy for us, either cheaply using git, # `dup_working_tree' creates a copy for us, either cheaply using git,
# or via an ordinary copy if we're using subversion. # or via an ordinary copy if we're using subversion.
if [ "$USING_GIT" = "true" ]; then
git clone -l $LEDGER_GIT local_git || exit 1
else
svn checkout $LEDGER_SVN/trunk local_svn svn checkout $LEDGER_SVN/trunk local_svn
fi
function dup_working_tree() { function dup_working_tree() {
if [ "$USING_GIT" = "true" ]; then
git clone -l local_git "$1" || exit 1
else
cp -Rp local_svn "$1" || exit 1 cp -Rp local_svn "$1" || exit 1
fi
} }
# These functions understand how to do a distcheck build for ledger # These functions understand how to do a distcheck build for ledger