From 60a27d6bb0146efae3a55a4b538aa9890ee608ee Mon Sep 17 00:00:00 2001
From: hendricks266 <hendricks266@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Sun, 4 Mar 2012 09:33:23 +0000
Subject: [PATCH] synthesis.sh:  - Exclude "Apple/lib" rather than "Apple" so
 that required files are not left out of the tarball.  - Add one to
 $lastrevision before generating the ChangeLog so that it only includes what
 is new to an update. osxbuild.sh:  - Add stronger detection of the SVN
 revision by adding support for 1.7 (no longer relying on an ".svn" directory)
 and having a specific fallback in case the build location is neither svn nor
 git.  - Echo the SVN revision to source/rev.h before the build processes and
 revert it afterwards.

git-svn-id: https://svn.eduke32.com/eduke32@2402 1a8010ca-5511-0410-912e-c29ae57300e0
---
 polymer/eduke32/osxbuild.sh | 27 ++++++++++++++++++++++-----
 polymer/synthesis.sh        |  4 +++-
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/polymer/eduke32/osxbuild.sh b/polymer/eduke32/osxbuild.sh
index 3a63c75fb..7c15b73eb 100755
--- a/polymer/eduke32/osxbuild.sh
+++ b/polymer/eduke32/osxbuild.sh
@@ -18,6 +18,21 @@ if [ $1 ]; then
     fi
 fi
 
+rev=`svn info | grep Revision | awk '{ print $2 }'`
+vc=svn
+if [ -z "$ref" ]; then
+    vc=git
+    rev=`git svn info | grep 'Revision' | awk '{ print $2 }'`
+fi
+
+if [ -n "$ref" ]; then
+    # throw the svn revision into a header.  this is ugly.
+    echo "const char *s_buildRev = \"r$rev\";" > source/rev.h
+else
+    rev=unknown
+    vc=none
+fi
+
 if [ $onlyzip -eq 0 ]; then
     rm -f eduke32.x86 eduke32.x64 mapster32.x86 mapster32.x64
 
@@ -82,6 +97,13 @@ if [ $onlyzip -eq 0 ]; then
     # fi
 fi
 
+# clean up, clean up, everybody everywhere, clean up, clean up, everybody do your share
+if [ "$vc" == "svn" ]; then
+    svn revert "source/rev.h"
+elif [ "$vc" == "git" ]; then
+    git checkout "source/rev.h"
+fi
+
 # Duplicating .app bundles for debug build:
 # if [ -d "Mapster32.app" ]; then
     # cp "Mapster32.app" "Mapster32.debug.app"
@@ -106,11 +128,6 @@ if [ -f mapster32.x64 ] && [ -f eduke32.x86 ]; then # && [ -f eduke32.ppc ]; the
 #    lipo -create eduke32.debug.x64 eduke32.debug.x86 -output eduke32.debug
 #    cp -f eduke32 "EDuke32.debug.app/Contents/MacOS/eduke32"
 
-    if [ -d ".svn" ]; then
-        rev=`svn info | grep Revision | awk '{ print $2 }'`
-    else
-        rev=`git svn info | grep 'Revision:' | awk '{ print $2 }'`
-    fi
     arfilename="eduke32-osx-$rev.zip"
     echo "This archive was produced from revision $rev by the osxbuild.sh script." > README.OSX
     echo "EDuke32 home: http://www.eduke32.com" >> README.OSX
diff --git a/polymer/synthesis.sh b/polymer/synthesis.sh
index c35648e59..3bf8a103f 100755
--- a/polymer/synthesis.sh
+++ b/polymer/synthesis.sh
@@ -11,7 +11,7 @@ clean=veryclean
 # the following file paths are relative to $source
 targets=( eduke32.exe mapster32.exe )
 bin_packaged=( eduke32.exe eduke32.debug.exe mapster32.exe mapster32.debug.exe ebacktrace1.dll SEHELP.HLP STHELP.HLP names.h buildlic.txt GNU.TXT m32help.hlp nedmalloc.dll tiles.cfg samples/* )
-not_src_packaged=( psd source/jaudiolib/third-party/vorbis.framework/Versions/A/vorbis Apple )
+not_src_packaged=( psd source/jaudiolib/third-party/vorbis.framework/Versions/A/vorbis Apple/lib )
 
 # group that owns the resulting packages
 group=dukeworld
@@ -150,6 +150,8 @@ then
     # output the changelog since last snapshot in the output directory
     if [  $lastrevision ]
     then
+        # add one so that we only include what is new to this update
+        let lastrevision+=1
         cd $top/$source
         svn log -r $head:$lastrevision > $output/$date-$head/ChangeLog.txt
     fi