From f66e1f3a099cb3bee33137342d62e13a4b218702 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Wed, 17 Dec 2008 01:46:52 +0000 Subject: [PATCH] add ccache to windows build, better fail if executables don't run. Fix documentation build. Remove .cvsignore files removal as we are no longer using cvs. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@10986 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Tools/mkdist.py | 8 ++------ Tools/mkwindows.sh | 5 ++++- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Tools/mkdist.py b/Tools/mkdist.py index b35a841e0..3123adfea 100755 --- a/Tools/mkdist.py +++ b/Tools/mkdist.py @@ -43,11 +43,6 @@ os.system("svn export -r HEAD https://swig.svn.sourceforge.net/svnroot/swig/trun os.system("rm -Rf "+dirname+"/debian") == 0 or failed() -# Blow away all .cvsignore files - -print "Blowing away .cvsignore files" -os.system("find "+dirname+" -name .cvsignore -exec rm {} \\;") == 0 or failed() - # Go build the system print "Building system" @@ -61,7 +56,8 @@ os.system("find "+dirname+" -name autom4te.cache -exec rm -rf {} \\;") # Build documentation print "Building documentation" -os.system("cd "+dirname+" && make docs") == 0 or failed() +os.system("cd "+dirname+"/Doc/Manual && make all clean-baks") == 0 or failed() +os.system("cd "+dirname+"/CCache && yodl2man -o swig-ccache.1 ccache.yo && mkdir -p man && yodl2html -o web/ccache-man.html ccache.yo") == 0 or failed() # Build the tar-ball os.system("tar -cf "+dirname+".tar "+dirname) == 0 or failed() diff --git a/Tools/mkwindows.sh b/Tools/mkwindows.sh index 116e32d11..fb2547e14 100755 --- a/Tools/mkwindows.sh +++ b/Tools/mkwindows.sh @@ -82,10 +82,13 @@ if test -f "$tarball"; then echo "Compiling (quietly)..." make > build.log echo "Simple check to see if swig.exe runs..." - env LD_LIBRARY_PATH= PATH= ./swig.exe -version + env LD_LIBRARY_PATH= PATH= ./swig.exe -version || exit 1 + echo "Simple check to see if ccache-swig.exe runs..." + env LD_LIBRARY_PATH= PATH= ./CCache/ccache-swig.exe -V || exit 1 echo "Creating $swigwinbasename.zip..." cd .. cp $swigbasename/swig.exe $swigwinbasename + cp $swigbasename/CCache/ccache-swig.exe $swigwinbasename/CCache cp $swigbasename/Lib/swigwarn.swg $swigwinbasename/Lib sleep 2 # fix strange not finding swig.exe echo "Unzip into a directory of your choice. Please read the README file as well as Doc\Manual\Windows.html for installation instructions." > swig_windows_zip_comments.txt