[or-cvs] r18352: {torvm} Install the temporary 7zip into the msys path and fix a miss (torvm/trunk/build/win32/files)

[coderman at seul.org]

Author: coderman
Date: 2009-01-31 05:14:45 -0500 (Sat, 31 Jan 2009)
New Revision: 18352

Modified:
   torvm/trunk/build/win32/files/buildall.sh
   torvm/trunk/build/win32/files/install.bat
Log:
Install the temporary 7zip into the msys path and fix a missing header in the openssl 0.9.8j build.

Modified: torvm/trunk/build/win32/files/buildall.sh
===================================================================
--- torvm/trunk/build/win32/files/buildall.sh	2009-01-31 07:51:02 UTC (rev 18351)
+++ torvm/trunk/build/win32/files/buildall.sh	2009-01-31 10:14:45 UTC (rev 18352)
@@ -60,8 +60,8 @@
 export TORBUTTON_FILE=torbutton-1.2.0.xpi
 
 export NSIS_DIR=nsis-2.42
-export 7ZIP_DIR="/c/Program Files/7-Zip"
-export PATH="${PATH}:/${NSIS_DIR}/Bin:/${NSIS_DIR}:/${NSIS_DIR}/bin:${7ZIP_DIR}"
+export SEVENZIP_DIR=7-Zip
+export PATH="${PATH}:/${NSIS_DIR}/Bin:/${NSIS_DIR}:/${NSIS_DIR}/bin:/${SEVENZIP_DIR}"
 
 if [ -d "$VS80COMNTOOLS" ]; then
   export VSTOOLSDIR="$VS80COMNTOOLS"
@@ -417,12 +417,15 @@
 echo "Configuring OpenSSL header files for build ..."
 find crypto -name "*.h" -exec cp {} include/openssl/ \;
 find ssl -name "*.h" -exec cp {} include/openssl/ \;
+find fips -name "*.h" -exec cp {} include/openssl/ \;
 cp *.h include/openssl/
 make
 if (( $? != 0 )); then
+  # XXX Poor workaround for initial pass missing DLL dependencies during linkage
   cp *.a /lib
   find crypto -name "*.h" -exec cp {} include/openssl/ \;
   find ssl -name "*.h" -exec cp {} include/openssl/ \;
+  find fips -name "*.h" -exec cp {} include/openssl/ \;
   cp *.h include/openssl/
   make
   if (( $? != 0 )); then

Modified: torvm/trunk/build/win32/files/install.bat
===================================================================
--- torvm/trunk/build/win32/files/install.bat	2009-01-31 07:51:02 UTC (rev 18351)
+++ torvm/trunk/build/win32/files/install.bat	2009-01-31 10:14:45 UTC (rev 18352)
@@ -34,9 +34,9 @@
 cd %MDIR%\%MVER%\dl\
 bzip2 -d *.bz2
 gzip -d *.gz
-IF NOT EXIST "%PROGRAMFILES%\7-Zip" (
+IF NOT EXIST "%DDRV%%MDIR%\%MVER%\7-Zip" (
 IF EXIST 7zip.msi (
-  msiexec /i 7zip.msi /QN
+  msiexec /i 7zip.msi INSTALLDIR="%DDRV%%MDIR%\%MVER%\7-Zip" /QN
 )
 )
 cd /d %DDRV%
@@ -80,7 +80,7 @@
 
 %WD%bash --login %BUILDER%
 ECHO "Build completed."
-GOTO DONE
+GOTO CLEANUP
 
 :NOINSTALL
 ECHO "Found existing install directories.  Delete any previous install targets and try again."
@@ -88,6 +88,15 @@
 
 :FAILED
 ECHO "Unable to locate a functional installer CDROM with win32 build image."
-GOTO DONE
+GOTO CLEANUP
 
+:CLEANUP
+ECHO "Cleaning up after build..."
+cd %MDIR%\%MVER%\dl\
+IF EXIST "%DDRV%%MDIR%\%MVER%\7-Zip" (
+IF EXIST 7zip.msi (
+  msiexec /x 7zip.msi /QN
+)
+)
+
 :DONE