From 3c79220506ecb42ae631c6da76ce6c15a3c006c2 Mon Sep 17 00:00:00 2001 From: Rocky Reed Date: Fri, 25 Apr 2014 13:20:50 -0500 Subject: [PATCH] Slight changes to windows build script --- windows/win32build.ps1 | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/windows/win32build.ps1 b/windows/win32build.ps1 index 8557ef5e..01c374a0 100644 --- a/windows/win32build.ps1 +++ b/windows/win32build.ps1 @@ -1,29 +1,32 @@ $script:scriptDir = $myinvocation.mycommand.path $script:baseDir = split-path (resolve-path "$scriptDir/..") -Parent $script:projectDir = split-path (resolve-path "$baseDir") -Parent -cd "$projectDir" +$numpy = "https://pypi.python.org/packages/2.7/n/numpy/numpy-1.7.1.win32-py2.7.exe#md5=dc11133ce1ce90ceb8f715e879a96e5f" +$numpyPath = "$projectDir\lib\site-packages\numpy-1.7.1.win32-py2.7.exe" +$pillow = "https://pypi.python.org/packages/cp27/P/Pillow/Pillow-2.3.0-cp27-none-win32.whl#md5=7e3f9c37920df5c4566d068fcc4e83f3" +$pillowPath = "$projectDir\lib\site-packages\Pillow-2.3.0-cp27-none-win32.whl" +Set-Location "$projectDir" git clone https://github.com/metacademy/metacademy-content.git mkdir "$projectDir\local_dbs\django_db" mkdir "$projectDir\local_dbs\content_index" mkdir "$projectDir\local_dbs\app_index" virtualenv . #Replacing django-incompatible PoSh activate script -If (test-path "$projectDir\scripts\activate.ps1") {Remove-Item "$projectDir\scripts\activate.ps1"} +If (test-path "$projectDir\scripts\activate.ps1") { + Remove-Item "$projectDir\scripts\activate.ps1" +} cp "$baseDir\windows\activate.ps1" "$projectDir\scripts\activate.ps1" cd "$projectDir\scripts" .\activate.ps1 #Workaround to make a compiler optional instead of a dependency -$url1 = "https://pypi.python.org/packages/2.7/n/numpy/numpy-1.7.1.win32-py2.7.exe#md5=dc11133ce1ce90ceb8f715e879a96e5f" -$path1 = "$projectDir\lib\site-packages\numpy-1.7.1.win32-py2.7.exe" -$url2 = "https://pypi.python.org/packages/cp27/P/Pillow/Pillow-2.3.0-cp27-none-win32.whl#md5=7e3f9c37920df5c4566d068fcc4e83f3" -$path2 = "$projectDir\lib\site-packages\Pillow-2.3.0-cp27-none-win32.whl" -(new-object System.Net.WebClient).DownloadFile( $url1, $path1) -(new-object System.Net.WebClient).DownloadFile( $url2, $path2) +(new-object System.Net.WebClient).DownloadFile( $numpy, $numpyPath) +(new-object System.Net.WebClient).DownloadFile( $pillow, $pillowPath) cd "$projectDir\lib\site-packages" easy_install numpy-1.7.1.win32-py2.7.exe pip install --use-wheel Pillow-2.3.0-cp27-none-win32.whl -(Get-Content "$baseDir\requirements.txt") -notmatch "numpy|pillow" | Set-Content "$projectDir\lib\site-packages\requirements.txt" -pip install -r requirements.txt +(Get-Content "$baseDir\requirements.txt") -notmatch "numpy|pillow" | Foreach-Object { + pip install $_ +} cd "$baseDir" git clone https://github.com/cjrd/kmap.git app_server/static/lib/kmap #Workaround to make kmap work without symlinks