Merge pull request saltstack#33505 from twangboy/fix_build_script

Fix build script where pip didn't work
mcpanayides · May 25, 2016 · a43ffad · a43ffad
2 parents 4cf40da + 7d78e5d
commit a43ffad
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/pkg/windows/build.bat b/pkg/windows/build.bat
@@ -26,10 +26,10 @@ if [%1]==[] (
 )
 
 :: Create Build Environment
-cmd /c powershell -ExecutionPolicy RemoteSigned -File "%CurDir%build_env.ps1" -Silent
+PowerShell.exe -ExecutionPolicy RemoteSigned -File "%CurDir%build_env.ps1" -Silent
 
 :: Install Current Version of salt
-cmd /c "%PyDir%\python.exe %SrcDir%\setup.py" install --force
+"%PyDir%\python.exe" "%SrcDir%\setup.py" install --force
 
 :: Build the Salt Package
 call "%CurDir%build_pkg.bat" "%Version%"

diff --git a/pkg/windows/req_pip.txt b/pkg/windows/req_pip.txt
@@ -1,2 +1,2 @@
-pip==8.1.1
-setuptools==21.0.0
+pip==8.1.2
+setuptools==21.2.1