Small fixes for jenkins build environment.

bitshares · Aug 26, 2014 · bae1b34 · bae1b34
1 parent aebb1cd
commit bae1b34
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/HelperScripts/jenkins_build64.bat b/HelperScripts/jenkins_build64.bat
@@ -1,10 +1,6 @@
 echo Available processor count: %NUMBER_OF_PROCESSORS%
 echo Starting build # %BUILD_NUMBER%
 cd bitshares_toolkit
-rem git reset --hard
-rem git pull
-rem reset and pull not needed because we assume
-rem that bitshares_toolkit was just cloned fresh
 git submodule init || exit /b 21
 git submodule update || exit /b 22
 
@@ -20,7 +16,6 @@ if exist leveldb-win (
 
 cd %WORKSPACE%
 call bitshares_toolkit/setenv_x64.bat || exit /b 26
-call "%VS120COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64 || exit /b 29
 
 call npm install grunt
 call npm install lineman -g --prefix=%NPM_INSTALL_PREFIX%

diff --git a/setenv.bat b/setenv.bat
@@ -12,7 +12,7 @@ set BOOST_ROOT=%BITSHARES_ROOT%\boost_1.55
 set TCL_ROOT=%BITSHARES_ROOT%\tcl
 set NPM_INSTALL_PREFIX=%BITSHARES_ROOT%\npm
 
-set PATH=%NPM_INSTALL_PREFIX%;%APPDATA%\npm;%QTDIR%\bin;%ICUROOT%\bin;%ICUROOT%\lib;%BITSHARES_ROOT%\bin;%BITSHARES_ROOT%\tcl\bin;%BITSHARES_ROOT%\Cmake\bin;%BOOST_ROOT%\stage\lib;%PATH%
+set PATH=%NPM_INSTALL_PREFIX%;"%APPDATA%"\npm;%QTDIR%\bin;%ICUROOT%\bin;%ICUROOT%\lib;%BITSHARES_ROOT%\bin;%TCL_ROOT%\bin;%BITSHARES_ROOT%\Cmake\bin;%BOOST_ROOT%\stage\lib;%PATH%
 set CMAKE_PREFIX_PATH=%QTDIR%
 set QT_QPA_PLATFORM_PLUGIN_PATH=%QTDIR%\plugins\platforms
 

diff --git a/setenv_x64.bat b/setenv_x64.bat
@@ -12,9 +12,9 @@ set BOOST_ROOT=%BITSHARES_ROOT%\boost_1.55.x64
 set TCL_ROOT=%BITSHARES_ROOT%\tcl.x64
 set NPM_INSTALL_PREFIX=%BITSHARES_ROOT%\npm
 
-set PATH=%NPM_INSTALL_PREFIX%;%APPDATA%\npm;%QTDIR%\bin;%ICUROOT%\bin;%ICUROOT%\lib;%BITSHARES_ROOT%\bin;%BITSHARES_ROOT%\tcl.x64\bin;%BITSHARES_ROOT%\Cmake\bin;%BOOST_ROOT%\stage\lib;%PATH%
+set PATH=%NPM_INSTALL_PREFIX%;"%APPDATA%"\npm;%QTDIR%\bin;%ICUROOT%\bin;%ICUROOT%\lib;%BITSHARES_ROOT%\bin;%TCL_ROOT%\bin;%BITSHARES_ROOT%\Cmake\bin;%BOOST_ROOT%\stage\lib;%PATH%
 set CMAKE_PREFIX_PATH=%QTDIR%
 set QT_QPA_PLATFORM_PLUGIN_PATH=%QTDIR%\plugins\platforms
 
 echo Setting up VS2013 environment...
-call "%VS120COMNTOOLS%\..\..\VC\vcvarsall.bat" amd64
+call "%VS120COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64