Merge pull request #599 from DeckerSU/dev-decker-dev

added marketmaker_build_depends.cmd script

.gitignore

@@ -255,3 +255,4 @@ iguana/DB/UNSPENTS/.tmpmarker
 iguana/DB/instantdex_RQ4z6KrMZeEnCSCsChv1ZoR9ExQitHjbpg_append.json
 
 iguana/DB/instantdex_RQ4z6KrMZeEnCSCsChv1ZoR9ExQitHjbpg.json
+Release/*

iguana/dexscripts.win32/1-client.cmd

@@ -6,10 +6,16 @@ rem set COINS=[{\"coin\":\"REVS\",\"active\":1,\"asset\":\"REVS\",\"rpcport\":10
 rem marketmaker "{\"gui\":\"nogui\",\"client\":1, \"userhome\":\"%USERHOME%\", \"passphrase\":\"mypassphrase\", \"coins\":%COINS%}"
 
 set COINS=\"\"
-set /p PASSPHRASE=<passphrase
+rem set /p PASSPHRASE=<passphrase
 rem , \"canbind\":1
 rem marketmaker "{\"gui\":\"nogui\",\"client\":1, \"userhome\":\"%USERHOME%\", \"passphrase\":\"%PASSPHRASE%\"}" 1> marketmaker.log 2>&1
-marketmaker "{\"gui\":\"nogui\",\"client\":1, \"userhome\":\"%USERHOME%\", \"passphrase\":\"%PASSPHRASE%\"}"
+rem marketmaker "{\"gui\":\"nogui\",\"client\":1, \"userhome\":\"%USERHOME%\", \"passphrase\":\"%PASSPHRASE%\"}" 1> marketmaker.log 2>&1
+
+rem echo "{\"gui\":\"nogui\",\"client\":1, \"userhome\":\"%USERHOME%\", \"passphrase\":\"%PASSPHRASE%\"}" 
+rem marketmaker "{\"gui\":\"nogui\",\"client\":1, \"userhome\":\"%USERHOME%\", \"passphrase\":\"%PASSPHRASE%\"}" 
+
+marketmaker "{\"gui\":\"nogui\",\"client\":1, \"userhome\":\"%USERHOME%\",\"passphrase\":\"default\"}" 
+
 
 
 

iguana/dexscripts.win32/2-getuserpass.cmd

@@ -1,7 +1,17 @@
 @echo off
-curl --url "http://127.0.0.1:7783" --data "{\"userpass\":null,\"method\":\"enable\",\"coin\":\" \"}" -s > userpass.json
-for /f "tokens=2 delims=:," %%a in (' find "userpass" "userpass.json" ') do (
+rem first time call to any method after started markemaker will return default userpass 1d8b27b21efabcd96571cd56f91a40fb9aa4cc623d273c63bf9223dc6f8cd81f
+rem by-default userpass is 1d8b27b21efabcd96571cd56f91a40fb9aa4cc623d273c63bf9223dc6f8cd81f from "default" passphrase
+
+rem first time call to marketmaker don't return anything now, so we disable it 
+rem curl --url "http://127.0.0.1:7783" --data "{\"userpass\":null,\"method\":\"enable\",\"coin\":\"\"}" -s > default_userpass.json
+rem curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"1d8b27b21efabcd96571cd56f91a40fb9aa4cc623d273c63bf9223dc6f8cd81f\",\"method\":\"hello\"}" -s > default_userpass.json
+
+rem echo - First time call to MM API finished, default userpass received
+set /p PASSPHRASE=<passphrase
+echo - Pushing passphrase to login
+curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"1d8b27b21efabcd96571cd56f91a40fb9aa4cc623d273c63bf9223dc6f8cd81f\",\"method\":\"passphrase\",\"passphrase\":\"%PASSPHRASE%\",\"gui\":\"nogui\"}" -s > userpass.json
+echo Getting userpass related to your passphrase finished
+for /f "tokens=4 delims=:," %%a in (' find "userpass" "userpass.json" ') do (
 echo UserPass: %%~a 
 echo %%~a > userpass
 )
-del userpass.json

marketmaker_build_depends.cmd

@@ -0,0 +1,89 @@
+@echo off
+rem [ Decker] Automatically download and build depends script for marketmaker.
+rem
+rem 1. Requires installed CMake for Windows (!)
+rem 2. Currently build only 64-bit release versions of .lib and .dll
+rem 3. Libraries available: pthreads, nanomsg, curl
+
+@REM Check for Visual Studio
+call set "VSPATH="
+if defined VS140COMNTOOLS ( if not defined VSPATH (
+ call set "VSPATH=%%VS140COMNTOOLS%%"
+) )
+
+@REM check if we already have the tools in the environment
+if exist "%VCINSTALLDIR%" (
+ goto compile
+)
+
+if not defined VSPATH (
+ echo You need Microsoft Visual Studio 15 installed
+ pause
+ exit
+)
+
+@REM set up the environment
+if exist "%VSPATH%..\..\vc\vcvarsall.bat" (
+ call "%%VSPATH%%..\..\vc\vcvarsall.bat" amd64
+ goto compile
+)
+
+echo Unable to set up the environment
+pause
+exit
+
+:compile
+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
+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 ../../..
+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" ..
+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 ../../..
+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