From cb86f5299366afeb85cd12a8f4bce76f051d0699 Mon Sep 17 00:00:00 2001 From: Petr Mrázek Date: Sun, 13 Mar 2011 19:38:32 +0100 Subject: minor liquids bugfix, added typedef for planecoord so that stonesense builds. Build system bits. Doxygen bits. --- build/auto.bat | 5 +++++ build/buildremote.expect | 39 ++++++++++++++++++++++++++++++++ build/linux-MSVC-2008.sh | 49 +++++++++++++++++++++++++++++++++++++++++ build/linux-remote-MSVC-2008.sh | 20 +++++++++++++++++ 4 files changed, 113 insertions(+) create mode 100644 build/auto.bat create mode 100644 build/buildremote.expect create mode 100755 build/linux-MSVC-2008.sh create mode 100755 build/linux-remote-MSVC-2008.sh (limited to 'build') diff --git a/build/auto.bat b/build/auto.bat new file mode 100644 index 00000000..6ce36433 --- /dev/null +++ b/build/auto.bat @@ -0,0 +1,5 @@ +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 new file mode 100644 index 00000000..4b5b6425 --- /dev/null +++ b/build/buildremote.expect @@ -0,0 +1,39 @@ +#!/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" + 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 new file mode 100755 index 00000000..d953de5f --- /dev/null +++ b/build/linux-MSVC-2008.sh @@ -0,0 +1,49 @@ +#/bin/sh + +# 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 new file mode 100755 index 00000000..274436e5 --- /dev/null +++ b/build/linux-remote-MSVC-2008.sh @@ -0,0 +1,20 @@ +#/bin/sh + +# VARS +export DFHACK_VER=0.5.6 +export PKG=dfhack-bin-$DFHACK_VER +export TARGET=Release + +# let's build it all +VBoxManage startvm "7 Prof" +sleep 5 +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" \ No newline at end of file -- cgit v1.2.1