fixed error with trailing spaces in env variables

ethereum · Apr 14, 2015 · f0bfef2 · f0bfef2
1 parent 0b37e30
commit f0bfef2
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 27 deletions.
diff --git a/bundle_jsonrpccpp.bat b/bundle_jsonrpccpp.bat
@@ -1,9 +1,9 @@
 REM packaging jsonrpccpp
 if not exist package\jsonrpccpp mkdir package\jsonrpccpp
 if not exist package\jsonrpccpp\%PLATFORM% mkdir package\jsonrpccpp\%PLATFORM%
-if not exist package\jsonrpccpp\lib\%PLATFORM% mkdir package\jsonrpccpp\lib\%PLATFORM%
-if not exist package\jsonrpccpp\include\%PLATFORM% mkdir package\jsonrpccpp\include\%PLATFORM%
-if not exist package\jsonrpccpp\include\jsonrpccpp\%PLATFORM% mkdir package\jsonrpccpp\include\jsonrpccpp\%PLATFORM%
+if not exist package\jsonrpccpp\%PLATFORM%\lib mkdir package\jsonrpccpp\%PLATFORM%\lib
+if not exist package\jsonrpccpp\%PLATFORM%\include mkdir package\jsonrpccpp\%PLATFORM%\include
+if not exist package\jsonrpccpp\%PLATFORM%\include\jsonrpccpp mkdir package\jsonrpccpp\%PLATFORM%\include\jsonrpccpp
 
 cd package\jsonrpccpp\%PLATFORM%
 

diff --git a/main.bat b/main.bat
@@ -9,47 +9,53 @@ if not exist build mkdir build
 if not exist package mkdir package
 if not exist install mkdir install
 
-set PLATFORM=Win32 & set CONFIGURATION=Debug   & call build_jsoncpp.bat     & call bundle_jsoncpp.bat || goto :error
-set PLATFORM=Win32 & set CONFIGURATION=Release & call build_jsoncpp.bat     & call bundle_jsoncpp.bat || goto :error
-set PLATFORM=x64   & set CONFIGURATION=Debug   & call build_jsoncpp.bat     & call bundle_jsoncpp.bat || goto :error
-set PLATFORM=x64   & set CONFIGURATION=Release & call build_jsoncpp.bat     & call bundle_jsoncpp.bat || goto :error
+call :setup Win32 Debug   & call build_jsoncpp.bat     & call bundle_jsoncpp.bat || goto :error
+call :setup Win32 Release & call build_jsoncpp.bat     & call bundle_jsoncpp.bat || goto :error
+call :setup x64 Debug     & call build_jsoncpp.bat     & call bundle_jsoncpp.bat || goto :error
+call :setup x64 Release   & call build_jsoncpp.bat     & call bundle_jsoncpp.bat || goto :error
 call install_jsoncpp.bat || goto :error
 
-set PLATFORM=Win32 & set CONFIGURATION=Debug   & call build_microhttpd.bat  & call bundle_microhttpd.bat || goto :error
-set PLATFORM=Win32 & set CONFIGURATION=Release & call build_microhttpd.bat  & call bundle_microhttpd.bat || goto :error
-set PLATFORM=x64   & set CONFIGURATION=Debug   & call build_microhttpd.bat  & call bundle_microhttpd.bat || goto :error
-set PLATFORM=x64   & set CONFIGURATION=Release & call build_microhttpd.bat  & call bundle_microhttpd.bat || goto :error
+call :setup Win32 Debug   & call build_microhttpd.bat  & call bundle_microhttpd.bat || goto :error
+call :setup Win32 Release & call build_microhttpd.bat  & call bundle_microhttpd.bat || goto :error
+call :setup x64 Debug     & call build_microhttpd.bat  & call bundle_microhttpd.bat || goto :error
+call :setup x64 Release   & call build_microhttpd.bat  & call bundle_microhttpd.bat || goto :error
 call install_microhttpd.bat || goto :error
 
-set PLATFORM=Win32 & set CONFIGURATION=Debug   & call build_curl.bat        & call bundle_curl.bat goto :error
-set PLATFORM=Win32 & set CONFIGURATION=Release & call build_curl.bat        & call bundle_curl.bat goto :error
-set PLATFORM=x64   & set CONFIGURATION=Debug   & call build_curl.bat        & call bundle_curl.bat goto :error
-set PLATFORM=x64   & set CONFIGURATION=Release & call build_curl.bat        & call bundle_curl.bat goto :error
+call :setup Win32 Debug   & call build_curl.bat        & call bundle_curl.bat goto :error
+call :setup Win32 Release & call build_curl.bat        & call bundle_curl.bat goto :error
+call :setup x64 Debug     & call build_curl.bat        & call bundle_curl.bat goto :error
+call :setup x64 Release   & call build_curl.bat        & call bundle_curl.bat goto :error
 call install_curl.bat || goto :error
 
-set PLATFORM=Win32 & set CONFIGURATION=Debug   & call build_jsonrpccpp.bat  & call bundle_jsonrpccpp.bat goto :error
-set PLATFORM=Win32 & set CONFIGURATION=Release & call build_jsonrpccpp.bat  & call bundle_jsonrpccpp.bat goto :error
-set PLATFORM=x64   & set CONFIGURATION=Debug   & call build_jsonrpccpp.bat  & call bundle_jsonrpccpp.bat goto :error
-set PLATFORM=x64   & set CONFIGURATION=Release & call build_jsonrpccpp.bat  & call bundle_jsonrpccpp.bat goto :error
+call :setup Win32 Debug   & call build_jsonrpccpp.bat  & call bundle_jsonrpccpp.bat goto :error
+call :setup Win32 Release & call build_jsonrpccpp.bat  & call bundle_jsonrpccpp.bat goto :error
+call :setup x64 Debug     & call build_jsonrpccpp.bat  & call bundle_jsonrpccpp.bat goto :error
+call :setup x64 Release   & call build_jsonrpccpp.bat  & call bundle_jsonrpccpp.bat goto :error
 call install_jsonrpccpp.bat || goto :error
 
-set PLATFORM=Win32 & set CONFIGURATION=Debug   & call build_leveldb.bat     & call bundle_leveldb.bat goto :error
-set PLATFORM=Win32 & set CONFIGURATION=Release & call build_leveldb.bat     & call bundle_leveldb.bat goto :error
-set PLATFORM=x64   & set CONFIGURATION=Debug   & call build_leveldb.bat     & call bundle_leveldb.bat goto :error
-set PLATFORM=x64   & set CONFIGURATION=Release & call build_leveldb.bat     & call bundle_leveldb.bat goto :error
+call :setup Win32 Debug   & call build_leveldb.bat     & call bundle_leveldb.bat goto :error
+call :setup Win32 Release & call build_leveldb.bat     & call bundle_leveldb.bat goto :error
+call :setup x64 Debug     & call build_leveldb.bat     & call bundle_leveldb.bat goto :error
+call :setup x64 Release   & call build_leveldb.bat     & call bundle_leveldb.bat goto :error
 call install_leveldb.bat || goto :error
 
-set PLATFORM=Win32 & set CONFIGURATION=Debug   & call build_cryptopp.bat    & call bundle_cryptopp.bat goto :error
-set PLATFORM=Win32 & set CONFIGURATION=Release & call build_cryptopp.bat    & call bundle_cryptopp.bat goto :error
-set PLATFORM=x64   & set CONFIGURATION=Debug   & call build_cryptopp.bat    & call bundle_cryptopp.bat goto :error
-set PLATFORM=x64   & set CONFIGURATION=Release & call build_cryptopp.bat    & call bundle_cryptopp.bat goto :error
+call :setup Win32 Debug   & call build_cryptopp.bat    & call bundle_cryptopp.bat goto :error
+call :setup Win32 Release & call build_cryptopp.bat    & call bundle_cryptopp.bat goto :error
+call :setup x64 Debug     & call build_cryptopp.bat    & call bundle_cryptopp.bat goto :error
+call :setup x64 Release   & call build_cryptopp.bat    & call bundle_cryptopp.bat goto :error
 call install_cryptopp.bat || goto :error
 
 set PLATFORM=Win32 & call build_boost.bat
 set PLATFORM=x64 & call build_boost.bat
 
 goto :EOF
 
+:setup
+set PLATFORM=%1
+set CONFIGURATION=%2
+
+goto :EOF
+
 :error
 echo Failed with error %errorlevel%
 exit /b %errorlevel%