[or-cvs] r18651: {torvm} Build automation fixes and typo fixes. (torvm/trunk/build/win32/files)

[coderman at seul.org]

Author: coderman
Date: 2009-02-19 12:14:48 -0500 (Thu, 19 Feb 2009)
New Revision: 18651

Modified:
   torvm/trunk/build/win32/files/buildall.sh
Log:
Build automation fixes and typo fixes.

Modified: torvm/trunk/build/win32/files/buildall.sh
===================================================================
--- torvm/trunk/build/win32/files/buildall.sh	2009-02-19 17:00:23 UTC (rev 18650)
+++ torvm/trunk/build/win32/files/buildall.sh	2009-02-19 17:14:48 UTC (rev 18651)
@@ -29,11 +29,15 @@
 echo "Using Windows system drive root /$sysdrive , ${sysdrive}:\\"
 export sysdrive
 if [[ "$ddir" == "" ]]; then
-  export ddir=/$sysdrive/Tor_VM
+  ddir=/$sysdrive/Tor_VM
 fi
 if [[ "$brootdir" == "" ]]; then
-  export brootdir=/$sysdrive/Tor_Win32
+  brootdir=/$sysdrive/Tor_Win32
 fi
+echo "Using Tor VM destination folder: $ddir"
+echo "Using Bundle destination folder: $brootdir"
+export ddir
+export brootdir
 
 # make sure some default windows paths are available too
 export PATH=$PATH:/$sysdrive/WINDOWS/system32:/$sysdrive/WINDOWS:/$sysdrive/WINDOWS/System32/Wbem
@@ -57,9 +61,9 @@
 export libdir="${ddir}/lib"
 export bindir="${ddir}/bin"
 export statedir="${ddir}/state"
-export instdir=$broot/Installer
-export thandir=$broot/Thandy
-export bundledir=$broot/Bundle
+export instdir="${brootdir}/Installer"
+export thandir="${brootdir}/Thandy"
+export bundledir="${brootdir}/Bundle"
 
 if [[ "$SEVNZIP_INST" == "" ]]; then
   export SEVNZIP_INST=true
@@ -702,6 +706,14 @@
     fi
   fi
 
+  # so it seems some things (marble) want to try and load
+  # image plugins that are not plugins, namely the .a libtool
+  # hooks for linking DLL's in mingw.  this is a hammer to
+  # prevent such mistakes that will halt an automated build with
+  # "Error not a library" warning when they try to OpenLibrary
+  # XXX Marble just needs a patch or config tweak to not do this.
+  find plugins/imageformats -name \*.a -exec rm {} \;
+
   pkgbuilt QT_BUILT
 fi