From 4b0cffaf8154a001a14a328dfc9a603a8bfcdc08 Mon Sep 17 00:00:00 2001 From: hendricks266 Date: Mon, 4 Mar 2013 07:49:47 +0000 Subject: [PATCH] Fix osxbuild.sh and wiibuild.bat after r3551. git-svn-id: https://svn.eduke32.com/eduke32@3554 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/platform/osxbuild.sh | 2 ++ polymer/eduke32/platform/wiibuild.bat | 9 ++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/polymer/eduke32/platform/osxbuild.sh b/polymer/eduke32/platform/osxbuild.sh index e548cf348..6fc3cddab 100755 --- a/polymer/eduke32/platform/osxbuild.sh +++ b/polymer/eduke32/platform/osxbuild.sh @@ -2,6 +2,8 @@ # build debug/release x86/x86_64/ppc versions of mapster32 and eduke32 on OS X +cd .. + # Variable presets: buildppc=1 build86=1 diff --git a/polymer/eduke32/platform/wiibuild.bat b/polymer/eduke32/platform/wiibuild.bat index b3b404590..d8a89bb29 100644 --- a/polymer/eduke32/platform/wiibuild.bat +++ b/polymer/eduke32/platform/wiibuild.bat @@ -4,6 +4,9 @@ setlocal ENABLEEXTENSIONS DISABLEDELAYEDEXPANSION set targets=eduke32 set PATH=C:\devkitPro\devkitPPC\bin;C:\devkitPro\msys\bin;C:\MinGW\bin;C:\MinGW\msys\1.0\bin;%PATH% +pushd "%~dp0.." +set wiidir=platform\Wii + :: Detect versioning systems and pull the revision number: for /f "delims=" %%G in ('svn info 2^>^&1 ^| grep Revision ^| cut -d " " -f 2') do @set rev=r%%G if not "%rev%"=="" set vc=svn @@ -26,16 +29,16 @@ for %%G in (%targets%) do if not exist "%%~G.elf" goto end :: Package data: if not exist apps mkdir apps -for %%G in (%targets%) do xcopy /e /q /y Wii\apps\%%~G apps\%%~G\ +for %%G in (%targets%) do xcopy /e /q /y %wiidir%\apps\%%~G apps\%%~G\ for %%G in (%targets%) do for %%H in (.elf) do if exist "%%~G%%~H" move /y "%%~G%%~H" "apps\%%~G\boot%%~H" for %%G in (%targets%) do for %%H in (.elf.map) do if exist "%%~G%%~H" del /f /q "%%~G%%~H" -for %%G in (%targets%) do "echo.exe" -e " %rev%\n %currentdate%" | "cat.exe" "Wii\%%~G_meta_1.xml" - "Wii\%%~G_meta_2.xml" >"apps\%%~G\meta.xml" +for %%G in (%targets%) do "echo.exe" -e " %rev%\n %currentdate%" | "cat.exe" "%wiidir%\%%~G_meta_1.xml" - "%wiidir%\%%~G_meta_2.xml" >"apps\%%~G\meta.xml" :: We don't want to package all the stuff, most of it is for Mapster32 and dev materials. :: However, do throw in the licenses: if exist "package\*.txt" copy /y "package\*.txt" "apps\eduke32\" -:: xcopy /e /q /y /EXCLUDE:Wii\xcopy_exclude.txt package apps\mapster32\ +:: xcopy /e /q /y /EXCLUDE:%wiidir%\xcopy_exclude.txt package apps\mapster32\ "ls.exe" -l -R apps 7z.exe a -mx9 -t7z eduke32-wii-%rev%.7z apps -xr!*.svn*