Merge remote-tracking branch 'origin/etomic' into etomic

KomodoPlatform · Apr 11, 2018 · c230682 · c230682
2 parents 1928ad5 + d36d385
commit c230682
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 25 deletions.
diff --git a/marketmaker_build_depends.cmd b/marketmaker_build_depends.cmd
@@ -36,54 +36,66 @@ exit
 rem MSBuild /help
 echo.
 echo Decker will automatically download and build all needed *.dll and *.lib for you ;)
-timeout /t 5 /nobreak
 
 mkdir marketmaker_depends
 mkdir x64\Release
 
 rem --- pthreads ---
 :compile_pthreads
+if not exist marketmaker_depends\pthread-win32\bin\x64_MSVC2015.Release\pthread_lib.lib (
 cd marketmaker_depends
 git clone https://github.com/DeckerSU/pthread-win32
 cd pthread-win32
 MSBuild pthread.2015.sln /t:Rebuild /p:Configuration=Release /p:Platform=Win32
 MSBuild pthread.2015.sln /t:Rebuild /p:Configuration=Release /p:Platform=x64
 cd ../..
+)
 copy marketmaker_depends\pthread-win32\bin\x64_MSVC2015.Release\pthread_lib.lib OSlibs\win\x64\pthread_lib.lib 
 
 rem --- nanomsg ---
 :compile_nanomsg
-
-cd marketmaker_depends 
-git clone https://github.com/nanomsg/nanomsg
-cd nanomsg
-mkdir build_msvc_2015_win32
-mkdir build_msvc_2015_win64
-cd build_msvc_2015_win64
-cmake -G "Visual Studio 14 2015 Win64" ..
-cmake --build . --config Release --target nanomsg
-cd ../../..
+if not exist marketmaker_depends\nanomsg\build_msvc_2015_win64\Release\nanomsg.lib (
+	if not exist marketmaker_depends\nanomsg\build_msvc_2015_win64\Release\nanomsg.exp (
+		if not exist marketmaker_depends\nanomsg\build_msvc_2015_win64\Release\nanomsg.dll (
+			cd marketmaker_depends 
+			git clone https://github.com/nanomsg/nanomsg
+			cd nanomsg
+			mkdir build_msvc_2015_win32
+			mkdir build_msvc_2015_win64
+			cd build_msvc_2015_win64
+			cmake -G "Visual Studio 14 2015 Win64" ..
+			cmake --build . --config Release --target nanomsg
+			cd ../../..
+		)
+	)
+)
 copy marketmaker_depends\nanomsg\build_msvc_2015_win64\Release\nanomsg.lib OSlibs\win\x64\release\nanomsg.lib 
 copy marketmaker_depends\nanomsg\build_msvc_2015_win64\Release\nanomsg.exp OSlibs\win\x64\release\nanomsg.exp
 copy marketmaker_depends\nanomsg\build_msvc_2015_win64\Release\nanomsg.dll x64\Release\nanomsg.dll 
 
 rem --- curl ---
 :compile_curl
-cd marketmaker_depends 
-git clone https://github.com/curl/curl
-cd curl
-mkdir build_msvc_2015_win32
-mkdir build_msvc_2015_win64
-cd build_msvc_2015_win64
-cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_USE_WINSSL:BOOL=ON ..
-cmake --build . --config Release --target libcurl
+if not exist marketmaker_depends\curl\build_msvc_2015_win64\lib\Release\libcurl_imp.lib (
+	if not exist marketmaker_depends\curl\build_msvc_2015_win64\lib\Release\libcurl_imp.exp (
+		if not exist marketmaker_depends\curl\build_msvc_2015_win64\lib\Release\libcurl.dll (
+			cd marketmaker_depends 
+			git clone https://github.com/curl/curl
+			cd curl
+			mkdir build_msvc_2015_win32
+			mkdir build_msvc_2015_win64
+			cd build_msvc_2015_win64
+			cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_USE_WINSSL:BOOL=ON ..
+			cmake --build . --config Release --target libcurl
 
-rem cmake .. -G"Visual Studio 14 2015 Win64" -DCURL_STATICLIB=ON -DCURL_DISABLE_LDAP=ON -DCURL_STATIC_CRT=ON
-rem cmake .. -G"Visual Studio 14 2015 Win64" -DCURL_STATICLIB:BOOL=ON -DCURL_STATIC_CRT:BOOL=ON -DHTTP_ONLY:BOOL=ON -DCMAKE_BUILD_TYPE:STRING=RELEASE ..
-rem cmake --build . --config Release
-rem cmake --build . --config Release --target libcurl
+			rem cmake .. -G"Visual Studio 14 2015 Win64" -DCURL_STATICLIB=ON -DCURL_DISABLE_LDAP=ON -DCURL_STATIC_CRT=ON
+			rem cmake .. -G"Visual Studio 14 2015 Win64" -DCURL_STATICLIB:BOOL=ON -DCURL_STATIC_CRT:BOOL=ON -DHTTP_ONLY:BOOL=ON -DCMAKE_BUILD_TYPE:STRING=RELEASE ..
+			rem cmake --build . --config Release
+			rem cmake --build . --config Release --target libcurl
 
-cd ../../..
+			cd ../../..
+		)
+	)
+)
 copy marketmaker_depends\curl\build_msvc_2015_win64\lib\Release\libcurl_imp.lib OSlibs\win\x64\release\libcurl.lib
 copy marketmaker_depends\curl\build_msvc_2015_win64\lib\Release\libcurl_imp.exp OSlibs\win\x64\release\libcurl.exp
 copy marketmaker_depends\curl\build_msvc_2015_win64\lib\Release\libcurl.dll x64\Release\libcurl.dll
diff --git a/marketmaker_build_etomic.cmd b/marketmaker_build_etomic.cmd
@@ -10,7 +10,7 @@ echo [#2] Prepare build etomic needed things ...
 git submodule update --init --recursive
 cd cpp-ethereum
 call scripts\install_deps.bat
-cd .
+cd ..
 mkdir build_win64_release
 cd build_win64_release
 cmake .. -G "Visual Studio 14 2015 Win64" -DMM_VERSION="%APPVEYOR_BUILD_VERSION%"