Redo Windows via ssh, and actually get it to start compiling.

Still needs work.

1 files changed, 85 insertions, 23 deletions

diff --git a/BuildReleases.sh b/BuildReleases.sh
index 5f85383..fd83073 100755
--- a/BuildReleases.sh
+++ b/BuildReleases.sh
@@ -2,9 +2,9 @@
 
 # These control which ones get built.
 do_local=0
-do_linux64=1
-do_linux32=1
-do_windowsXP=0
+do_linux64=0
+do_linux32=0
+do_windowsXP=1
 do_mac=0
 
 # Where to find suitable disk images for the various OS's.
@@ -12,6 +12,8 @@ img_linux64=~/bin/ubuntu64_diff.qcow2
 img_linux32=~/bin/ubuntu32_diff.qcow2
 img_windowsXP=/media/sdb2/IMAGES/xp_diff.qcow2
 
+# Extra PATH for cygwin, coz it don't pick up the Windows PATH in the serial console.
+cw_path='/cygdrive/c/WINDOWS/system32:/cygdrive/c/WINDOWS:/cygdrive/c/WINDOWS/System32/Wbem:/cygdrive/c/Program Files/CMake 2.8/bin:/cygdrive/c/Python27:/cygdrive/c/Program Files/Git/cmd'
 
 unique_port()
 {
@@ -155,27 +157,87 @@ fi
 if [ $do_windowsXP -eq 1 ]
 then
     echo "Building in qemu, Windows XP."
+    qemu-system-i386 -M pc -cpu athlon -m 2G -hda ${img_windowsXP} -net nic -net user,vlan=0,hostfwd=tcp::2222-:22 -rtc base=localtime &
+    sleep 30
+    ssh -p 2222 me@localhost <<- zzzzEOFzzzz
+    PATH='/bin:/usr/local/bin:/usr/bin:'\$PATH':/cygdrive/c/Program Files/Microsoft Visual Studio 8/Common7/IDE:/cygdrive/c/Program Files/Microsoft Visual Studio 8/VC/bin:/cygdrive/c/Program Files/Microsoft Visual Studio 8/Common7/Tools/:/cygdrive/c/Program Files/Microsoft Visual Studio 8/SDK/v2.0/Bin'
+    ./.profile
+    ./.bash_profile
+    export DXSDK_DIR='C:\Program Files\Microsoft DirectX SDK (November 2008)\'
+    #vcvarsall.bat x86
+    export INCLUDE="C:\Program Files\Microsoft Visual Studio 8\VC\include;C:\Program Files\Microsoft SDKs\Windows\v6.1\Include"
+    export LIB="C:\Program Files\Microsoft Visual Studio 8\VC\lib;C:\Program Files\Microsoft Visual Studio 8\SDK\v2.0\Lib;C:\Program Files\Microsoft SDKs\Windows\v6.1\Lib"
+    export LIBPATH="C:\WINDOWS\Microsoft.NET\Framework\v2.0.50727"
+    echo \$PATH
+    set
+    cd /home/me
+    #rm -fr BUILD/SOURCE/linden/indra
+    #rm -fr BUILD
+    rm -fr TARBALLS
+    #mkdir -p BUILD
+    mkdir -p TARBALLS
+    lftp -c 'open -p ${FTP_PORT} ${FTP_SERVER} && lcd TARBALLS && get1 impy-release-source_${date}.tar.gz'
+    tar xzf TARBALLS/impy-release-source_${date}.tar.gz -C BUILD
+    cd /home/me/BUILD/SOURCE
+    rm linden/indra/CMakeCache.txt
+    cd linden/scripts/linux
+
+    ./0-patch-SL-source
+    ./1-get-libraries-from-SL
+    ./2-trim-libraries-from-SL
+    ./3-compile-SL-source
+    ls -la ../../indra
+    #cd ../../indra/viewer-windows-*
+    #make package
+
+    cd /home/me/BUILD/SOURCE
+    rm linden/indra/CMakeCache.txt
+    cd linden/indra
+    cmake -G "NMake Makefiles" .
+    nmake
+
+    ls -la
+    #cp Imprudence-* ../../../../../TARBALLS
+    cd /home/me/BUILD/TARBALLS
+    lftp -c 'open -p ${FTP_PORT} ${FTP_SERVER} && lcd TARBALLS && mput Imprudence-*'
+
+    shutdown -s now
+zzzzEOFzzzz
+
     # A here document would be preferable, but "interact" won't work then.
-    expect -c "
-        set timeout -1
-        set send_slow {1 .1}
-        spawn qemu-system-i386 -M pc -cpu athlon -m 2G -hda ${img_windowsXP} -serial stdio
-        match_max 100000
-        strace 1
-        expect -exact \"\$ \"; sleep .1; send -s -- \"cd /home/me\r\"
-        expect -exact \"\$ \"; sleep .1; send -s -- \"rm -fr BUILD\r\"
-        expect -exact \"\$ \"; sleep .1; send -s -- \"rm -fr TARBALLS\r\"
-        expect -exact \"\$ \"; sleep .1; send -s -- \"su - me -c 'mkdir -p BUILD'\r\"
-        expect -exact \"\$ \"; sleep .1; send -s -- \"su - me -c 'mkdir -p TARBALLS'\r\"
-        expect -exact \"\$ \"; sleep 2;  send -s -- \"lftp -c 'open -p ${FTP_PORT} ${FTP_SERVER} && lcd TARBALLS && get1 impy-release-source_${date}.tar.gz'\r\"
-        expect -exact \"\$ \"; sleep .1; send -s -- \"su - me -c 'tar xzf TARBALLS/impy-release-source_${date}.tar.gz -C BUILD'\r\"
-        expect -exact \"\$ \"; sleep .1; send -s -- \"su - me -c 'ls -la BUILD'\r\"
-        expect -exact \"\$ \"; sleep .1; send -s -- \"su - me -c 'ls -la TARBALLS'\r\"
-        expect -exact \"\$ \"; sleep .1; send -s -- \"cd /home/me/BUILD/SOURCE\r\"
-
-        interact quit return; sleep .1;  send -s -- \"\r\"
-        expect -exact \"\$ \"; sleep .1; send -s -- \"shutdown -s now\r\"
-        expect eof"
+#    expect -c "
+#       set timeout -1
+#       set send_slow {1 .1}
+#       spawn qemu-system-i386 -M pc -cpu athlon -m 2G -hda ${img_windowsXP} -serial stdio -rtc base=localtime
+#       match_max 100000
+#       strace 1
+#       expect -exact \"\$ \"; sleep .1; send -s -- \"PATH=\\\$PATH':${cw_path}'\r\"
+#       expect -exact \"\$ \"; sleep .1; send -s -- \"echo \\\$PATH\r\"
+#       expect -exact \"\$ \"; sleep .1; send -s -- \"cd /home/me\r\"
+#       expect -exact \"\$ \"; sleep .1; send -s -- \"rm -fr BUILD\r\"
+#       expect -exact \"\$ \"; sleep .1; send -s -- \"rm -fr TARBALLS\r\"
+#       expect -exact \"\$ \"; sleep .1; send -s -- \"mkdir -p BUILD\r\"
+#       expect -exact \"\$ \"; sleep .1; send -s -- \"mkdir -p TARBALLS\r\"
+#       expect -exact \"\$ \"; sleep 2;  send -s -- \"lftp -c 'open -p ${FTP_PORT} ${FTP_SERVER} && lcd TARBALLS && get1 impy-release-source_${date}.tar.gz'\r\"
+#       expect -exact \"\$ \"; sleep .1; send -s -- \"tar xzf TARBALLS/impy-release-source_${date}.tar.gz -C BUILD\r\"
+#       expect -exact \"\$ \"; sleep .1; send -s -- \"cd /home/me/BUILD/SOURCE\r\"
+#       expect -exact \"\$ \"; sleep .1; send -s -- \"cd linden/scripts/linux\r\"
+
+#       expect -exact \"\$ \"; sleep .1; send -s -- \"./0-patch-SL-source\r\"
+#       expect -exact \"\$ \"; sleep .1; send -s -- \"./1-get-libraries-from-SL\r\"
+#       expect -exact \"\$ \"; sleep .1; send -s -- \"./2-trim-libraries-from-SL\r\"
+#       expect -exact \"\$ \"; sleep .1; send -s -- \"./3-compile-SL-source\r\"
+#       expect -exact \"\$ \"; sleep .1; send -s -- \"cd ../../indra/viewer-windows-*\r\"
+#       expect -exact \"\$ \"; sleep .1; send -s -- \"make package\r\"
+
+#       expect -exact \"\$ \"; sleep .1; send -s -- \"cp Imprudence-* ../../../../../TARBALLS\r\"
+#       expect -exact \"\$ \"; sleep .1; send -s -- \"cd /home/me/BUILD/TARBALLS\r\"
+#       expect -exact \"\$ \"; sleep .1; send -s -- \"ls -la\r\"
+#       expect -exact \"\$ \"; sleep 2;  send -s -- \"lftp -c 'open -p ${FTP_PORT} ${FTP_SERVER} && lcd TARBALLS && mput Imprudence-*'\r\"
+
+#       interact quit return; sleep .1;  send -s -- \"\r\"
+#       expect -exact \"\$ \"; sleep .1; send -s -- \"shutdown -s now\r\"
+#       expect eof"
     echo ''
     sleep 10
 fi