From 115a256ff5a2f8a461eb3ebbbb20cd8da6930b1a Mon Sep 17 00:00:00 2001 From: Petr Mrázek Date: Tue, 15 Mar 2011 01:53:01 +0100 Subject: More build script rearrangement --- build/auto.bat | 5 ---- build/buildremote.expect | 40 -------------------------------- build/linux-MSVC-2008.sh | 51 ----------------------------------------- build/linux-remote-MSVC-2008.sh | 22 ------------------ build/linux-remote.bat | 5 ++++ build/linux-remote.expect | 40 ++++++++++++++++++++++++++++++++ build/linux-remote.sh | 22 ++++++++++++++++++ 7 files changed, 67 insertions(+), 118 deletions(-) delete mode 100644 build/auto.bat delete mode 100644 build/buildremote.expect delete mode 100755 build/linux-MSVC-2008.sh delete mode 100755 build/linux-remote-MSVC-2008.sh create mode 100644 build/linux-remote.bat create mode 100644 build/linux-remote.expect create mode 100755 build/linux-remote.sh (limited to 'build') diff --git a/build/auto.bat b/build/auto.bat deleted file mode 100644 index 6ce36433..00000000 --- a/build/auto.bat +++ /dev/null @@ -1,5 +0,0 @@ -mkdir build-real -cd build-real -cmake ..\.. -G"Visual Studio 10" -msbuild ALL_BUILD.vcxproj /p:Configuration=Release -echo FINISHED_BUILD \ No newline at end of file diff --git a/build/buildremote.expect b/build/buildremote.expect deleted file mode 100644 index 50e56aee..00000000 --- a/build/buildremote.expect +++ /dev/null @@ -1,40 +0,0 @@ -#!/usr/bin/expect -# procedure to attempt connecting; result 0 if OK, 1 otherwise -proc connect {} { - expect "login:" - send "kitteh\r" - expect "password:" - send "a\r" -expect { - kitteh {return 0} - failed return 1 - "invalid password" return 1 - timeout return 1 - connected -} - # timed out - return 1 -} - -spawn telnet win7 - -set rez [connect] -if { $rez == 0 } { - send "net use X: \\\\vboxsvr\\projects\r\n" - expect "The command completed successfully." - send "X:\r\n" - expect "X:" - send "cd X:\\dfhack\\build\r\n" - expect "build" - send "\"C:\\Program Files (x86)\\MSVC10\\VC\\vcvarsall.bat\" x86\r\n" - expect "build" - set timeout -1 - send "auto.bat\r\n" - # can detect build errors here, pass them out using 'exit' - expect "FINISHED_BUILD" - send "exit\r" - expect eof - exit 0 -} -puts "\nError connecting to server!\n" -exit 1 diff --git a/build/linux-MSVC-2008.sh b/build/linux-MSVC-2008.sh deleted file mode 100755 index a3000cb0..00000000 --- a/build/linux-MSVC-2008.sh +++ /dev/null @@ -1,51 +0,0 @@ -#/bin/sh - -#build with MSVC2008 under wine. VERY EXPERIMENTAL. - -# VARS -export WINEARCH=win32 -export WINEPREFIX=$HOME/.wine-mscv/ -export WINEDEBUG=-all -export DFHACK_VER=0.5.6 -export PKG=dfhack-bin-$DFHACK_VER -export VCBUILD="/home/peterix/.wine-mscv/drive_c/Program Files/Microsoft Visual Studio 9.0/VC/vcpackages/vcbuild.exe" -export TARGET=Release -export PROJECTS="library\\dfhack.vcproj -tools\\supported\\dfattachtest.vcproj -tools\\supported\\dfautosearch.vcproj -tools\\supported\\dfcleanmap.vcproj -tools\\supported\\dfcleartask.vcproj -tools\\supported\\dfdoffsets.vcproj -tools\\supported\\dfexpbench.vcproj -tools\\supported\\dfflows.vcproj -tools\\supported\\dfincremental.vcproj -tools\\supported\\dfliquids.vcproj -tools\\supported\\dfmode.vcproj -tools\\supported\\dfpause.vcproj -tools\\supported\\dfposition.vcproj -tools\\supported\\dfprobe.vcproj -tools\\supported\\dfprospector.vcproj -tools\\supported\\dfreveal.vcproj -tools\\supported\\dfsuspend.vcproj -tools\\supported\\dfunstuck.vcproj -tools\\supported\\dfvdig.vcproj -tools\\supported\\dfweather.vcproj" - -# let's build it all -rm -r build-real -mkdir build-real -cd build-real -wine cmake ..\\.. -G"Visual Studio 9 2008" -for proj in $PROJECTS -do -wine "$VCBUILD" $proj $TARGET -done - -echo "Creating package..." -cd ../../output/$TARGET -rm -r $PKG -rm $PKG.zip -mkdir $PKG -mv *.exe *.dll *.html *.txt *.xml $PKG -zip -r $PKG.zip $PKG -echo "DONE" \ No newline at end of file diff --git a/build/linux-remote-MSVC-2008.sh b/build/linux-remote-MSVC-2008.sh deleted file mode 100755 index 033bab16..00000000 --- a/build/linux-remote-MSVC-2008.sh +++ /dev/null @@ -1,22 +0,0 @@ -#/bin/sh -# Remote into a virtualbox VM to build with MSVC. -# Very specific to my own local setup. ~px - -# VARS. TODO: parametrize -export DFHACK_VER=0.5.7 -export PKG=dfhack-bin-$DFHACK_VER -export TARGET=Release - -# let's build it all -VBoxManage startvm "7 Prof" -sleep 20 -expect buildremote.expect $TARGET - -echo "Creating package..." -cd ../output/$TARGET -rm -r $PKG -rm $PKG.zip -mkdir $PKG -mv *.exe *.dll *.html *.txt *.xml $PKG -zip -r $PKG.zip $PKG -echo "DONE" diff --git a/build/linux-remote.bat b/build/linux-remote.bat new file mode 100644 index 00000000..bbf03d44 --- /dev/null +++ b/build/linux-remote.bat @@ -0,0 +1,5 @@ +mkdir linux-remote +cd linux-remote +cmake ..\.. -G"Visual Studio 10" +msbuild ALL_BUILD.vcxproj /p:Configuration=Release +echo FINISHED_BUILD \ No newline at end of file diff --git a/build/linux-remote.expect b/build/linux-remote.expect new file mode 100644 index 00000000..c694a755 --- /dev/null +++ b/build/linux-remote.expect @@ -0,0 +1,40 @@ +#!/usr/bin/expect +# procedure to attempt connecting; result 0 if OK, 1 otherwise +proc connect {} { + expect "login:" + send "kitteh\r" + expect "password:" + send "a\r" +expect { + kitteh {return 0} + failed return 1 + "invalid password" return 1 + timeout return 1 + connected +} + # timed out + return 1 +} + +spawn telnet win7 + +set rez [connect] +if { $rez == 0 } { + send "net use X: \\\\vboxsvr\\projects\r\n" + expect "The command completed successfully." + send "X:\r\n" + expect "X:" + send "cd X:\\dfhack\\build\r\n" + expect "build" + send "\"C:\\Program Files (x86)\\MSVC10\\VC\\vcvarsall.bat\" x86\r\n" + expect "build" + set timeout -1 + send "linux-remote.bat\r\n" + # can detect build errors here, pass them out using 'exit' + expect "FINISHED_BUILD" + send "exit\r" + expect eof + exit 0 +} +puts "\nError connecting to server!\n" +exit 1 diff --git a/build/linux-remote.sh b/build/linux-remote.sh new file mode 100755 index 00000000..333e682b --- /dev/null +++ b/build/linux-remote.sh @@ -0,0 +1,22 @@ +#/bin/sh +# Remote into a virtualbox VM to build with MSVC. +# Very specific to my own local setup. ~px + +# VARS. TODO: parametrize +export DFHACK_VER=0.5.7 +export PKG=dfhack-bin-$DFHACK_VER +export TARGET=Release + +# let's build it all +VBoxManage startvm "7 Prof" +sleep 20 +expect linux-remote.expect $TARGET + +echo "Creating package..." +cd ../output/$TARGET +rm -r $PKG +rm $PKG.zip +mkdir $PKG +mv *.exe *.dll *.html *.txt *.xml $PKG +zip -r $PKG.zip $PKG +echo "DONE" -- cgit v1.2.1