another attempt at fixing the windows build for the buildserver...

jfaust · Apr 4, 2013 · 4756907 · 4756907
1 parent 03748af
commit 4756907
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/qtdeclarative b/qtdeclarative
diff --git a/st_build_windows_common.ps1 b/st_build_windows_common.ps1
@@ -17,10 +17,6 @@ if ($osname -eq "win64")
   $icu_bindir = "$(get-location)\icu\bin64"
 }
 
-# Copy the icu dlls to the qtbase bin dir so they're available during the build,
-# which seems to be necessary for Qt 5.1
-cp -Verbose $(ls "$icu_bindir/*.dll") "$(get-location)/qtbase/bin"
-
 # Grab OpenSSL, which is required for https support
 echo "downloading openssl..."
 $webclient.DownloadFile("http://repo.suitabletech.com/downloads/openssl-1.0.1e-$osname.zip", "$(get-location)/openssl.zip")
@@ -34,6 +30,9 @@ echo configuring ...
 
 if ($LastExitCode -ne 0) { exit $LastExitCode }
 
+# Setup PATH to include <qtbase>/lib and <icu>/bin, which seems to be necessary for Qt 5.1
+$env:PATH += ";$(icu_bindir);$(get-location)\qtbase\lib"
+
 echo building...
 nmake