Restructure so that everything packaged in a release build is stored in the package folder, instead of maintaining a list.

synthesis.sh, osxbuild.sh, and wiibuild.bat updated.

git-svn-id: https://svn.eduke32.com/eduke32@3235 1a8010ca-5511-0410-912e-c29ae57300e0

polymer/eduke32/osxbuild.sh

@@ -13,6 +13,7 @@ builddebug=0
 buildrelease=1
 pack=1
 iamhelix=0
+package=package
 
 # Enforce OS:
 if [ `uname -s` != Darwin ]; then
@@ -294,7 +295,7 @@ fi
 # The build process itself:
 if [ $buildmain == 1 ]; then
     rm -f {eduke32,mapster32}{.debug,}{.x86,.x64,.ppc,}
-    rm -rf {EDuke32,Mapster32}{.debug,}.app
+    rm -rf {$package/,}{EDuke32,Mapster32}{.debug,}.app
 
     if [ $iamhelix == 1 ]; then
         makecmd="make -j 2"
@@ -346,8 +347,6 @@ if [ $builddebug == 1 ] || [ $pack == 1 ]; then
 fi
 
 # Begin assembling archive contents:
-arcontents="README.OSX Changelog.txt tools/kextract tools/kgroup tools/arttool"
-
 echo Creating fat binaries.
 success=0
 for i in {eduke32,mapster32}{.debug,}; do
@@ -364,12 +363,14 @@ for i in {eduke32,mapster32}{.debug,}; do
         app=${i//eduke32/EDuke32}
         app=${app//mapster32/Mapster32}.app
         cp -f $i "$app/Contents/MacOS/${i%.debug}"
-        arcontents="$arcontents $app"
+        mv -f "$app" "$package/"
     fi
 done
 
 # Almost done...
 if [ $success == 1 ]; then
+    cd $package
+
     echo "Generating README.OSX and Changelog.txt"
 
     # Output README.OSX:
@@ -406,6 +407,7 @@ if [ $success == 1 ]; then
         arfilename="eduke32-osx-$rev.zip"
         echo "Packing distribution into $arfilename"
         rm -f "$arfilename"
-        zip -r -y "$arfilename" $arcontents -x "*.svn*" "*.git*"
+        zip -r -y "$arfilename" * -x "*.svn*" "*.git*" "*.dll"
     fi
+    cd ..
 fi

polymer/eduke32/wiibuild.bat

@@ -28,8 +28,12 @@ xcopy /e /q /y Wii\apps apps\
 for %%G in (eduke32) do for %%H in (.elf) do if exist "%%~G%%~H" move /y "%%~G%%~H" "apps\%%~G\boot%%~H"
 for %%G in (eduke32) do for %%H in (.elf.map) do if exist "%%~G%%~H" del /f /q "%%~G%%~H"
 "echo.exe" -e "    <version>%rev%</version>\n    <release_date>%currentdate%</release_date>" | "cat.exe" Wii\meta_1.xml - Wii\meta_2.xml >"apps\eduke32\meta.xml"
-if exist "*.txt" copy /y "*.txt" "apps\eduke32\"
+:: We don't want to package all the stuff, most of it is for Mapster32 and dev materials.
+:: xcopy /e /q /y /EXCLUDE:.dll package apps\eduke32\
+:: However, do throw in the licenses:
+if exist "package\*.txt" copy /y "package\*.txt" "apps\eduke32\"
 "ls.exe" -l -R apps
+7z.exe a -mx9 -t7z eduke32-wii-r%rev%.7z apps -xr!*.svn*
 
 :end
 

polymer/synthesis.sh

@@ -9,8 +9,8 @@ make=( make PLATFORM=WINDOWS CC='i586-mingw32msvc-gcc' CXX='i586-mingw32msvc-g++
 clean=veryclean
 
 # the following file paths are relative to $source
-targets=( eduke32.exe mapster32.exe samples/ivfrate.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/* )
+targets=( eduke32.exe mapster32.exe )
+package=package
 not_src_packaged=( psd source/jaudiolib/third-party/vorbis.framework/Versions/A/vorbis Apple/lib )
 
 # group that owns the resulting packages
@@ -67,12 +67,6 @@ then
 
     cd $top/$source
 
-    # remove possible old debug binaries
-    echo rm eduke32.debug.exe
-    rm eduke32.debug.exe
-    echo rm mapster32.debug.exe
-    rm mapster32.debug.exe
-
     # throw the svn revision into a header.  this is ugly.
     echo "s_buildRev = \"r$head\";" > source/rev.h
 
@@ -90,13 +84,13 @@ then
         fi
     done
 
-    # move the debug binaries out of the way
-    echo mv eduke32.exe eduke32.debug.exe
-    mv eduke32.exe eduke32.debug.exe
-    echo mv mapster32.exe mapster32.debug.exe
-    mv mapster32.exe mapster32.debug.exe
-    echo mv ebacktrace1.dll ebacktrace1.debug.dll
-    mv ebacktrace1.dll ebacktrace1.debug.dll
+    # move the targets to $package
+    echo mv -f eduke32.exe "$package/eduke32.debug.exe"
+    mv -f eduke32.exe "$package/eduke32.debug.exe"
+    echo mv -f mapster32.exe "$package/mapster32.debug.exe"
+    mv -f mapster32.exe "$package/mapster32.debug.exe"
+    echo mv -f ebacktrace1.dll "$package/ebacktrace1.dll"
+    mv -f ebacktrace1.dll "$package/ebacktrace1.dll"
 
     # clean the tree and build release
     echo "${make[@]}" $clean all
@@ -112,9 +106,11 @@ then
         fi
     done
 
-    # move this back where it belongs
-    echo mv ebacktrace1.debug.dll ebacktrace1.dll
-    mv ebacktrace1.debug.dll ebacktrace1.dll
+    # move the targets to $package
+    echo mv -f eduke32.exe "$package/eduke32.exe"
+    mv -f eduke32.exe "$package/eduke32.exe"
+    echo mv -f mapster32.exe "$package/mapster32.exe"
+    mv -f mapster32.exe "$package/mapster32.exe"
 
     # get the date in the YYYYMMDD format (ex: 20091001)
     date=`date +%Y%m%d`
@@ -123,8 +119,10 @@ then
     mkdir $output/$date-$head
     
     # package the binary snapshot
-    echo zip -9 $output/$date-$head/${basename}_${platform}_$date-$head.zip ${bin_packaged[@]}
-    zip -9 $output/$date-$head/${basename}_${platform}_$date-$head.zip ${bin_packaged[@]}
+    cd $package
+    echo zip -r -y -9 $output/$date-$head/${basename}_${platform}_$date-$head.zip * -x "*.svn*"
+    zip -r -y -9 $output/$date-$head/${basename}_${platform}_$date-$head.zip * -x "*.svn*"
+    cd $top/$source
 
     # hack to restore [e]obj/keep.me
     echo svn update -r $head
@@ -147,12 +145,16 @@ then
     tar cjf ${basename}_src_$date-$head.tar.bz2 ${basename}_$date-$head
     rm -r ${basename}_$date-$head
 
+    # clean up the revision header
+    cd $top/$source
+    echo svn revert "source/rev.h"
+    svn revert "source/rev.h"
+    
     # output the changelog since last snapshot in the output directory
-    if [  $lastrevision ]
+    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