Fix NGEN

Fix NGEN

--- appveyor-build.cmd
+++ appveyor-build.cmd
@@ -12,6 +12,9 @@
 set _gacutilexe="%ProgramFiles(x86)%\Microsoft SDKs\Windows\v8.1A\bin\NETFX 4.5.1 Tools\gacutil.exe"
 if not exist %_gacutilexe% echo Error: Could not find gacutil.exe.  && goto :eof

+set _ngenexe="%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\ngen.exe"
+if not exist %_ngenexe% echo Error: Could not find ngen.exe. && goto :eof
+
 .\.nuget\NuGet.exe restore packages.config -PackagesDirectory packages
 @if ERRORLEVEL 1 echo Error: Nuget restore failed  && goto :eof

@@ -22,7 +25,7 @@
 %_msbuildexe% src\fsharp-proto-build.proj
 @if ERRORLEVEL 1 echo Error: compiler proto build failed && goto :eof

-ngen install lib\proto\fsc-proto.exe
+%_ngenexe% install lib\proto\fsc-proto.exe

 %_msbuildexe% src/fsharp-library-build.proj /p:UseNugetPackages=true
 @if ERRORLEVEL 1 echo Error: library debug build failed && goto :eof


fixed names for virtualbox

fixed names for virtualbox

--- bin/build.bat
+++ bin/build.bat
@@ -5,17 +5,20 @@

 set BUILD=%1
 if "%BUILD:~-7%" == "_vmware" (
-  set template=%BUILD:~0,-7%
+  set boxname=%BUILD:~0,-7%
+  set template=%boxname%
   set builder=vmware-iso
   set spec=vmware
 )
 if "%BUILD:~-7%" == "_vcloud" (
-  set template=%BUILD:~0,-7%
+  set boxname=%BUILD:~0,-7%
+  set template=%BUILD%
   set builder=vmware-iso
   set spec=vcloud
 )
 if "%BUILD:~-11%" == "_virtualbox" (
-  set template=%BUILD:~0,-11%
+  set boxname=%BUILD:~0,-11%
+  set template=%boxname%
   set builder=virtualbox-iso
   set spec=virtualbox
 )
@@ -39,9 +42,9 @@
   rmdir /S /Q "C:\Windows\system32\config\systemprofile\VirtualBox VMs\%template%"
 )

-packer build --only=%builder% %template%_%spec%.json
+packer build --only=%builder% %template%.json
 if ERRORLEVEL 1 goto :EOF

 if exist %~dp0\test-box-%spec%.bat (
-  call %~dp0\test-box-%spec%.bat %template%_%spec%.box %template%
+  call %~dp0\test-box-%spec%.bat %boxname%_%spec%.box %template%
 )


Modified UpdateDependencies.bat to update the MasterBuild.buildproj script with the version from the Grid Solutions Framework.

--- Build/Scripts/UpdateDependencies.bat
+++ Build/Scripts/UpdateDependencies.bat
@@ -31,6 +31,8 @@
 SET remote="git@github.com:GridProtectionAlliance/openXDA.git"
 SET source="\\GPAWEB\NightlyBuilds\GridSolutionsFramework\Beta\Libraries\*.*"
 SET target="Source\Dependencies\GSF"
+SET sourcemasterbuild="\\GPAWEB\NightlyBuilds\GridSolutionsFramework\Beta\Build Scripts\MasterBuild.buildproj"
+SET targetmasterbuild="Build\Scripts"

 ECHO.
 ECHO Entering working directory...
@@ -45,10 +47,11 @@
 ECHO.
 ECHO Updating dependencies...
 XCOPY %source% %target% /E /U /Y
+XCOPY %sourcemasterbuild% %targetmasterbuild% /E /Y

 ECHO.
 ECHO Committing updates to local repository...
-%git% add %target%
+%git% add .
 %git% commit -m "Updated GSF dependencies."

 ECHO.


修正批处理中的语法错误

修正批处理中的语法错误

--- example/src/main/bin/startup.bat
+++ example/src/main/bin/startup.bat
@@ -8,7 +8,7 @@
 set conf_dir=%ENV_PATH%\..\conf
 set logback_configurationFile=%conf_dir%\logback.xml
 set client_mode=Simple
-if "%1%" != "" set client_mode=%1%
+if "%1" != "" set client_mode=%1

 set CLASSPATH=%conf_dir%
 set CLASSPATH=%conf_dir%\..\lib\*;%CLASSPATH%
@@ -20,7 +20,8 @@

 set JAVA_OPTS= %JAVA_MEM_OPTS% %JAVA_OPTS_EXT% %JAVA_DEBUG_OPT% %CANAL_OPTS%

-if "%client_mode%" == "Cluster"
+if "%client_mode%" == "Cluster" （
 	java %JAVA_OPTS% -classpath "%CLASSPATH%" com.alibaba.otter.canal.example.ClusterCanalClientTest
-else
+） else （
 	java %JAVA_OPTS% -classpath "%CLASSPATH%" com.alibaba.otter.canal.example.SimpleCanalClientTest
+）


Changed most of the script to be more stable and tested endpoints

- Add pools information
- Tested endpoints and validate they work
- Changed the menu to be prettier

--- bbt-multiminer.bat
+++ bbt-multiminer.bat
@@ -1,4 +1,5 @@
-echo off
+@echo off
+setlocal EnableDelayedExpansion
 rem **********************************************************************
 rem *         BBT Multi-Miner Easy Batch File  v4 by BBT & Kunt Pukerd   *
 rem *     Featuring Claymore, SGMiner, CCMiner, EBWF's Miner and more    *
@@ -8,205 +9,418 @@
 rem * BEST VIEWED IN FULL SCREEN 1920x1080
 rem **********************************************************************
 rem * Environment Setup
-echo on
-setx GPU_FORCE_64BIT_PTR 0
-setx GPU_MAX_HEAP_SIZE 100
-setx GPU_USE_SYNC_OBJECTS 1
-setx GPU_MAX_ALLOC_PERCENT 100
-setx GPU_SINGLE_ALLOC_PERCENT 100
-echo off
+rem echo on
+
+SET ETH_WALLET_ADDRESS=0xF897EaFdb787AcD4Da5e2EB5003E42dc1Ef86d39
+SET ETC_WALLET_ADDRESS=0x89b455cfd5adb8ba4a69fd6bd082b3d61efe160f
+SET XMR_WALLET_ADDRESS=452eu5HWBcTEwQfwkRFHp9MgC39DhtAio5um8mEs6ZRgcyq9V3Gy3GbJfyASSxepSRQRe6SHcQ27xgorYzyZrn6DSVmWvuw.4d8ddccc40568d93
+SET SIA_WALLET_ADDRESS=6ce3c1dc8444ce3dc362425124853e0f32e930eaae1dedc6e919a08d8b6664bf71bd744dda24
+SET ZCASH_WALLET_ADDRESS=t1dBorBoRyznDaRyQzEEB4SkvmCFhmF2ZYk
+SET PASCAL_WALLET_ADDRESS=86646-64.59e76e7d7a498fbc
+SET HUSH_WALLET_ADDRESS=t1MmWWevkAxB282JqtpY4bK7njF7XPfcH2n
+SET LBRY_WALLET_ADDRESS=bitsbetrippin
+SET DECRED_WALLET_ADDRESS=bitsbetrippin
+SET DBIX_WALLET_ADDRESS=0x4c04f53f3bf154aa68f78f45b75f0c9dec120796
+SET UBIQ_WALLET_ADDRESS=0xb85150eb365e7df0941f0cf08235f987ba91506a
+
+SET MINER_NAME=bbtworker01
+
+SET EMAIL_ADDRESS=bitsbetrippin1@gmail.com
+
+setx GPU_FORCE_64BIT_PTR 0 >nul 2>&1
+setx GPU_MAX_HEAP_SIZE 100 >nul 2>&1
+setx GPU_USE_SYNC_OBJECTS 1 >nul 2>&1
+setx GPU_MAX_ALLOC_PERCENT 100 >nul 2>&1
+setx GPU_SINGLE_ALLOC_PERCENT 100 >nul 2>&1
+
+rem echo off
 rem **Instructions*******************************************************
 rem **Replace the wallet & POOL addresses!!!!                           *
 rem **Replace the miner name and the email address                      *
 rem **Then run and choose :)                                            *
 rem *********************************************************************

-SET ETH_WALLET_ADDRESS = 0xF897EaFdb787AcD4Da5e2EB5003E42dc1Ef86d39
-SET ETC_WALLET_ADDRESS = 0x89b455cfd5adb8ba4a69fd6bd082b3d61efe160f
-SET XMR_WALLET_ADDRESS = 452eu5HWBcTEwQfwkRFHp9MgC39DhtAio5um8mEs6ZRgcyq9V3Gy3GbJfyASSxepSRQRe6SHcQ27xgorYzyZrn6DSVmWvuw.4d8ddccc40568d93
-SET SIA_WALLET_ADDRESS = 6ce3c1dc8444ce3dc362425124853e0f32e930eaae1dedc6e919a08d8b6664bf71bd744dda24
-SET ZCASH_WALLET_ADDRESS = t1dBorBoRyznDaRyQzEEB4SkvmCFhmF2ZYk
-SET PASCAL_WALLET_ADDRESS = 86646-64.59e76e7d7a498fbc
-SET HUSH_WALLET_ADDRESS = t1MmWWevkAxB282JqtpY4bK7njF7XPfcH2n
-SET LBRY_WALLET_ADDRESS = bitsbetrippin
-SET DECRED_WALLET_ADDRESS = bitsbetrippin
-SET DBIX_WALLET_ADDRESS = 0x7681629aF4D657B462590fB0BdF82c76D7fC6878
-SET UBIQ_WALLET_ADDRESS = 0x21b75D1b449bd7dAE9B2C8730C7bEC8854409Cfb
-
-SET MINER_NAME = bbtworker01
-
-SET EMAIL_ADDRESS = bitsbetrippin1@gmail.com
-
-
-ECHO.
-ECHO ...............................................
-ECHO PRESS 1, 2 etc to select miner, or 99 to EXIT.
-ECHO ...............................................
-ECHO.
-ECHO 1 - NVIDIA ONLY - Optimized Ethminer - Eth Ethermine.org Only
-ECHO 2 - NVIDIA ONLY - Optimized Ethminer - Etc nanopool
-ECHO 3 - AMD ONLY - Claymore - XMR to Nanopool
-ECHO 4 - NVIDIA ONLY - TSIV CCMiner XMR to Nanopool
-ECHO 5 - AMD and NVIDIA Claymore - Eth Only Ethermine.org
-ECHO 6 - AMD and NVIDIA Claymore - Eth Ethermine.org and Siacoin to Nanopool
-ECHO 7 - AMD and NVIDIA Gominer - Siacoin to Nanopool Only
-ECHO 8 - AMD and NVIDIA Claymore - Eth Ethermine.org and Decred to Suprnova.cc Pool
-ECHO 9 - AMD and NVIDIA Claymore - Eth Ethermine.org and Lbry Credits to Coinmine.pl
-ECHO 10 - AMD and NVIDIA Claymore - Etc (ethereum classic) to Nanopool
-ECHO 11 - AMD and NVIDIA Claymore - Etc (ethereum classic) and Siacoin both to Nanopool
-ECHO 12 - AMD and NVIDIA Claymore - Etc (ethereum classic) Nanopool and Decred to Suprnova.cc Pool
-ECHO 13 - AMD ZCash Claymore - Zcash to Nanopool AMD Only
-ECHO 14 - NVIDIA Excavator - Zcash to Nanopool NVIDIA Only
-ECHO 15 - NVIDIA EWBF's CUDA Zcash Miner - Zcash to Nanopool NVIDIA Only
-ECHO 16 - AMD and NVIDIA Claymore - Eth Ethermine.org and PascalCoin to Nanopool
-ECHO 17 - AMD SGMiner PascalCoin (exchange address) - PascalCoin to Nanopool
-ECHO 18 - NVIDIA Excavator - PascalCoin to Nanopool
-ECHO 19 - AMD HUSH Claymore - Hush to zdash.miningpseed.com AMD Only
-ECHO 20 - NVIDIA EWBF's CUDA HUSH Miner - HUSH to zdash.miningspeed.com NVIDIA Only
-ECHO 21 - NVIDIA CCMiner Lbry Credits Miner - Lbry to coinmine.pl NVIDIA ONLY
-ECHO 22 - AMD SGMiner Lbry Credits Miner - Lbry to coinmine.pl AMD ONLY
-ECHO 23 - AMD and NVIDIA Claymore - DBIX to Sexy.Pool Only
-ECHO 24 - AMD and NVIDIA Claymore - DBIX to Sexy.Pool and Siacoin to Nanopool
-ECHO 25 - AMD and NVIDIA Claymore - Ubiq to Sexy.Pool Only
-ECHO 26 - AMD and NVIDIA Claymore - DBIX to Hodl.Pool Only
-ECHO 27 - AMD and NVIDIA Claymore - DBIX to Hodl Pool and Siacoin to Nanopool
-ECHO 28 - AMD and NVIDIA Claymore - Ubiq to Hodl Pool
-ECHO 29 - AMD and NVIDIA Claymore - Ubiq to ubiqpool and Siacoin to Nanopool
-ECHO 30 - AMD and NVIDIA Claymore - Ubiq to Hodl pool and Siacoin to Nanopool
-ECHO 31 - AMD and NVIDIA Claymore - Ubiq to pool sexy and Siacoin to Nanopool
+rem **Available pools****************************************************
+rem **You can change pool addresses to match your physical area         *
+rem *********************************************************************
+
+rem ** Ethereum *********************************************************
+rem ******* Ethermine.org:
+rem ************ North America (East): us1.ethermine.org:4444 or us1.ethermine.org:14444
+rem ************ North America (West): us2.ethermine.org:4444 or us2.ethermine.org:14444
+rem ************ Europe (France): eu1.ethermine.org:4444 or eu1.ethermine.org:14444
+rem ************ Europe (Germany): eu2.ethermine.org:4444 or eu2.ethermine.org:14444
+rem ************ Asia: asia1.ethermine.org:4444 or asia1.ethermine.org:14444
+rem ******* Nanopool.org:
+rem ** https://eth.nanopool.org/help
+rem ************ Europe (1): eth-eu1.nanopool.org:9999
+rem ************ Europe (2): eth-eu2.nanopool.org:9999
+rem ************ North America (East): eth-us-east1.nanopool.org:9999
+rem ************ North America (West): eth-us-west1.nanopool.org:9999
+rem ************ Asia: eth-asia1.nanopool.org:9999
+
+rem ** Ethereum Classic *************************************************
+rem ******* Ethermine.org:
+rem ************ North America: us1-etc.ethermine.org:4444 or us1-etc.ethermine.org:14444
+rem ************ Europe: eu1-etc.ethermine.org:4444 or eu1-etc.ethermine.org:14444
+rem ******* Nanopool.org:
+rem ** https://etc.nanopool.org/help
+rem ************ Europe (1): etc-eu1.nanopool.org:19999
+rem ************ Europe (2): etc-eu2.nanopool.org:19999
+rem ************ North America (East): etc-us-east1.nanopool.org:19999
+rem ************ North America (West): etc-us-west1.nanopool.org:19999
+rem ************ Asia: etc-asia1.nanopool.org:19999
+
+rem ** Monero (XMR)  *****************************************************
+rem ******* Nanopool.org:
+rem ** https://xmr.nanopool.org/help
+rem ************ Europe (1): xmr-eu1.nanopool.org:14444 or xmr-eu1.nanopool.org:14433
+rem ************ Europe (2): xmr-eu2.nanopool.org:14444 or xmr-eu2.nanopool.org:14433
+rem ************ North America (East): xmr-us-east1.nanopool.org:14444 or xmr-us-east1.nanopool.org:14433
+rem ************ North America (West): xmr-us-west1.nanopool.org:14444 or xmr-us-west1.nanopool.org:14433
+rem ************ Asia: xmr-asia1.nanopool.org:14444 or xmr-asia1.nanopool.org:14433
+
+rem ** ZCash  ************************************************************
+rem ******* Nanopool.org:
+rem ** https://zec.nanopool.org/help
+rem ************ Europe (1): zec-eu1.nanopool.org:6666 or zec-eu1.nanopool.org:6633
+rem ************ Europe (2): zec-eu2.nanopool.org:6666 or zec-eu2.nanopool.org:6633
+rem ************ North America (East): zec-us-east1.nanopool.org:6666 or zec-us-east1.nanopool.org:6633
+rem ************ North America (West): zec-us-west1.nanopool.org:6666 or zec-us-west1.nanopool.org:6633
+rem ************ Asia: zec-asia1.nanopool.org:6666 or zec-asia1.nanopool.org:6633
+
+rem ** SiaCoin  *********************************************************
+rem ******* Nanopool.org:
+rem ** https://sia.nanopool.org/help
+rem ************ Europe (1): sia-eu1.nanopool.org:7777
+rem ************ Europe (2): sia-eu2.nanopool.org:7777
+rem ************ North America (East): sia-us-east1.nanopool.org:7777
+rem ************ North America (West): sia-us-west1.nanopool.org:7777
+rem ************ Asia: sia-asia1.nanopool.org:7777
+
+rem ** PascalCoin  *********************************************************
+rem ******* Nanopool.org:
+rem ** https://pasc.nanopool.org/help
+rem ************ Europe (1): pasc-eu1.nanopool.org:15555
+rem ************ Europe (2): pasc-eu2.nanopool.org:15555
+rem ************ North America (East): pasc-us-east1.nanopool.org:15555
+rem ************ North America (West): pasc-us-west1.nanopool.org:15555
+rem ************ Asia: pasc-asia1.nanopool.org:15555
+
+rem ** Hush  ***************************************************************
+rem ******* http://zdash.miningspeed.com:
+rem ** http://zdash.miningspeed.com/getting_started
+rem ************ mining.miningspeed.com:3092
+
+rem ** Lbry  ***************************************************************
+rem ******* http://zdash.miningspeed.com:
+rem ** https://www2.coinmine.pl/lbc/
+rem ************ lbc-us.coinmine.pl:8787
+
+rem ** Dbix  ***************************************************************
+rem ******* http://dbix.pool.sexy/#/:
+rem ************ dbix.pool.sexy:7007
+rem ******* http://dbix.hodlpool.com/#/:
+rem ** http://dbix.hodlpool.com/#/
+rem ************ dbix.hodlpool.com:8007
+
+rem ** Ubiq  ***************************************************************
+rem ******* ubiqpool.io:
+rem ** http://ubiqpool.io/#/help
+rem ************ us.ubiqpool.io:8888
+rem ******* http://ubq.pool.sexy:
+rem ************ ubq.pool.sexy:9009
+rem ******* http://hodlpool.com/:
+rem ** http://ubiq.hodlpool.com/
+rem ************ ubiq.hodlpool.com:8009
+
+SET miner=%1
+
+IF NOT "%miner%"=="" (
+    SET /A M=%miner%
+    goto MinerSwitch
+)
+
+ECHO ====================================================
+ECHO *                     ETHEREUM                     *
+ECHO ====================================================
+ECHO 1.  NVIDIA ONLY - Optimized Ethminer - Eth Ethermine.org Only
+ECHO 2.  NVIDIA ONLY - Optimized Ethminer - Eth Nanopool Only
+ECHO 3.  AMD and NVIDIA Claymore - Eth Only Ethermine.org
+ECHO 4.  AMD and NVIDIA Claymore - Eth Ethermine.org and Siacoin to Nanopool
+ECHO 5.  AMD and NVIDIA Claymore - Eth Ethermine.org and Decred to Suprnova.cc Pool
+ECHO 6.  AMD and NVIDIA Claymore - Eth Ethermine.org and Lbry Credits to Coinmine.pl
+ECHO 7.  AMD and NVIDIA Claymore - Eth Ethermine.org and PascalCoin to Nanopool
+ECHO 8.  AMD and NVIDIA Claymore - Eth Nanopool Only
+ECHO 9.  AMD and NVIDIA Claymore - Eth Nanopool and Siacoin to Nanopool
+ECHO 10. AMD and NVIDIA Claymore - Eth Nanopool and Pascal to Nanopool
+ECHO ====================================================
+ECHO *                  ETHEREUM Classic                *
+ECHO ====================================================
+ECHO 11. NVIDIA ONLY - Optimized Ethminer - Etc nanopool
+ECHO 12. AMD and NVIDIA Claymore - Etc (ethereum classic) to Nanopool
+ECHO 13. AMD and NVIDIA Claymore - Etc (ethereum classic) and Siacoin both to Nanopool
+ECHO 14. AMD and NVIDIA Claymore - Etc (ethereum classic) Nanopool and Decred to Suprnova.cc Pool
+ECHO 15. AMD and NVIDIA Claymore - Etc (ethereum classic) and Pascal both to Nanopool
+ECHO ====================================================
+ECHO *                    Monero (XMR)                  *
+ECHO ====================================================
+ECHO 16.  AMD ONLY - Claymore - XMR to Nanopool
+ECHO 17.  NVIDIA ONLY - TSIV CCMiner XMR to Nanopool
+ECHO ====================================================
+ECHO *                       ZCASH                      *
+ECHO ====================================================
+ECHO 18.  AMD ZCash Claymore - Zcash to Nanopool AMD Only
+ECHO 19.  NVIDIA Excavator - Zcash to Nanopool NVIDIA Only
+ECHO 20.  NVIDIA EWBF's CUDA Zcash Miner - Zcash to Nanopool NVIDIA Only
+ECHO ====================================================
+ECHO *                      SIACOIN                     *
+ECHO ====================================================
+ECHO 21.   AMD and NVIDIA Gominer - Siacoin to Nanopool Only
+ECHO ====================================================
+ECHO *                    PASCALCOIN                    *
+ECHO ====================================================
+ECHO 22.  AMD SGMiner PascalCoin (exchange address) - PascalCoin to Nanopool
+ECHO 23.  NVIDIA Excavator - PascalCoin to Nanopool
+ECHO ====================================================
+ECHO *                       HUSH                       *
+ECHO ====================================================
+ECHO 24.  AMD HUSH Claymore - Hush to zdash.miningpseed.com AMD Only
+ECHO 25.  NVIDIA EWBF's CUDA HUSH Miner - HUSH to zdash.miningspeed.com NVIDIA Only
+ECHO ====================================================
+ECHO *                       LBRY                       *
+ECHO ====================================================
+ECHO 26.  NVIDIA CCMiner Lbry Credits Miner - Lbry to coinmine.pl NVIDIA ONLY
+ECHO 27.  AMD SGMiner Lbry Credits Miner - Lbry to coinmine.pl AMD ONLY
+ECHO ====================================================
+ECHO *                       DBIX                       *
+ECHO ====================================================
+ECHO 23.  AMD and NVIDIA Claymore - DBIX to Sexy.Pool Only
+ECHO 24.  AMD and NVIDIA Claymore - DBIX to Sexy.Pool and Siacoin to Nanopool
+ECHO 26.  AMD and NVIDIA Claymore - DBIX to Hodl.Pool Only
+ECHO 27.  AMD and NVIDIA Claymore - DBIX to Hodl Pool and Siacoin to Nanopool
+ECHO ====================================================
+ECHO *                       UBIQ                       *
+ECHO ====================================================
+ECHO 25.  AMD and NVIDIA Claymore - Ubiq to UbiqPool Only
+ECHO 25.  AMD and NVIDIA Claymore - Ubiq to Sexy.Pool Only
+ECHO 28.  AMD and NVIDIA Claymore - Ubiq to Hodl Pool
+ECHO 29.  AMD and NVIDIA Claymore - Ubiq to UbiqPool  and Siacoin to Nanopool
+ECHO 30.  AMD and NVIDIA Claymore - Ubiq to Hodl Pool and Siacoin to Nanopool
+ECHO 31.  AMD and NVIDIA Claymore - Ubiq to Sexy.Pool and Siacoin to Nanopool
+
 ECHO 99 - EXIT
 ECHO.

+:: Get input from user
 SET /P M=Type 1, 2, 3, or 4 then press ENTER:
-IF %M%==1 GOTO ethminer1
-IF %M%==2 GOTO ethminer2
-IF %M%==3 GOTO Claymore
-IF %M%==4 GOTO TSIV
-IF %M%==5 GOTO Claymore2
-IF %M%==6 GOTO ClaymoreSia
-IF %M%==7 GOTO Siacoin
-IF %M%==8 GOTO ETHDEC
-IF %M%==9 GOTO ETHLBRY
-IF %M%==10 GOTO ETC
-IF %M%==11 GOTO ETCSIA
-IF %M%==12 GOTO ETCDEC
-IF %M%==13 GOTO Zcash
-IF %M%==14 GOTO ZcashN
-IF %M%==15 GOTO ZcashEWBF
-IF %M%==16 GOTO EthPascal
-IF %M%==17 GOTO Pascal
-IF %M%==18 GOTO NPascal
-IF %M%==19 GOTO AMDHUSH
-IF %M%==20 GOTO NEWBF
-IF %M%==21 GOTO NCCLBRY
-IF %M%==22 GOTO AMDLBRY
-IF %M%==23 GOTO ClaymoreDBIX
-IF %M%==24 GOTO ClaymoreDBIXSia
-IF %M%==25 GOTO ClaymoreUBIQ
-IF %M%==26 GOTO ClaymoreDBIX2
-IF %M%==27 GOTO ClaymoreDBIXSia2
-IF %M%==28 GOTO ClaymoreUBIQ2
-IF %M%==29 GOTO ClaymoreUBIQSia
-IF %M%==30 GOTO ClaymoreUBIQSia2
-IF %M%==31 GOTO ClaymoreUBIQSia3
-IF %M%==99 GOTO EOF
-
-:ethminer1
-rem NVIDIA ONLY - Optimized Ethminer - Eth Ethermine.org Only
-ethminer-0.11.0.NvidiaOptimized\bin\ethminer.exe -U -S us1.ethermine.org:4444 -O %ETH_WALLET_ADDRESS%.%MINER_NAME%
-if %ERRORLEVEL% NEQ 0 goto exit
-pause
-:ethminer2
-rem NVIDIA ONLY - Optimized Ethminer - Etc nanopool Only
-ethminer-0.11.0.NvidiaOptimized\bin\ethminer.exe -U -S etc-us-east1.nanopool.org:19999 -O %ETC_WALLET_ADDRESS%.%MINER_NAME%
-if %ERRORLEVEL% NEQ 0 goto exit
-pause
-:Claymore
-rem AMD ONLY - Claymore - XMR to Nanopool
-Claymore_CryptoNote_GPU_Miner_v9.7\NsGpuCNMiner.exe -o ssl://xmr-us-east1.nanopool.org:14444 -u  %XMR_WALLET_ADDRESS%.%MINER_NAME%/%EMAIL_ADDRESS% -p z -ftime 1
-if %ERRORLEVEL% NEQ 0 goto exit
-pause
-:TSIV
-rem NVIDIA ONLY - TSIV CCMiner XMR to Nanopool
-tsiv-xmr-nvidia\ccminer -q -o stratum+tcp://xmr-us-east1.nanopool.org:14444 -u  %XMR_WALLET_ADDRESS%.%MINER_NAME%/%EMAIL_ADDRESS% -p x -l 4x84
-if %ERRORLEVEL% NEQ 0 goto exit
-pause
-:Claymore2
-rem AMD & NVIDIA Claymore - Eth Only Ethermine.org
-Claymore_Dual_Ethereum_v9.7\EthDcrMiner64.exe -epool us1.ethermine.org:4444 -ewal %ETH_WALLET_ADDRESS% -epsw x
-if %ERRORLEVEL% NEQ 0 goto exit
-pause
-:ClaymoreSia
-rem AMD & NVIDIA Claymore - Eth Ethermine.org & Siacoin to Nanopool
-Claymore_Dual_Ethereum_v9.7\EthDcrMiner64.exe -epool us1.ethermine.org:4444 -ewal %ETC_WALLET_ADDRESS% -epsw x -dpool stratum+tcp://sia-us-east1.nanopool.org:7777 -dwal  %SIA_WALLET_ADDRESS%/%MINER_NAME%/%EMAIL_ADDRESS% -dcoin sia
-if %ERRORLEVEL% NEQ 0 goto exit
-pause
-:Siacoin
-rem AMD & NVIDIA Gominer - Siacoin to Nanopool Only
+if %ERRORLEVEL% NEQ 0 goto EOF
+
+:: Is choice a number?
+SET "var="&for /f "delims=0123456789" %%i in ("%M%") do set var=%%i
+if defined var goto EOF
+
+:MinerSwitch
+IF %M%==1 GOTO ethereum1
+IF %M%==2 GOTO ethereum2
+IF %M%==3 GOTO ethereum3
+IF %M%==4 GOTO ethereum4
+IF %M%==5 GOTO ethereum5
+IF %M%==6 GOTO ethereum6
+IF %M%==7 GOTO ethereum7
+IF %M%==8 GOTO ethereum8
+IF %M%==9 GOTO ethereum9
+IF %M%==10 GOTO ethereum10
+IF %M%==11 GOTO ethereumc1
+IF %M%==12 GOTO ethereumc1
+IF %M%==13 GOTO ethereumc1
+IF %M%==14 GOTO ethereumc1
+IF %M%==15 GOTO ethereumc1
+IF %M%==16 GOTO monero1
+IF %M%==17 GOTO monero2
+IF %M%==18 GOTO zcash1
+IF %M%==19 GOTO zcash2
+IF %M%==20 GOTO zcash3
+IF %M%==21 GOTO siacoin1
+IF %M%==22 GOTO pascal1
+IF %M%==23 GOTO pascal2
+IF %M%==24 GOTO lbry1
+IF %M%==25 GOTO lbry2
+IF %M%==26 GOTO dbix1
+IF %M%==27 GOTO dbix2
+IF %M%==28 GOTO dbix3
+IF %M%==29 GOTO dbix4
+IF %M%==30 GOTO ubiq1
+IF %M%==31 GOTO ubiq2
+IF %M%==32 GOTO ubiq3
+IF %M%==33 GOTO ubiq4
+IF %M%==34 GOTO ubiq5
+IF %M%==35 GOTO ubiq6
+IF %M% GTR 35 GOTO EOF
+IF %M% LSS 0 GOTO EOF
+
+
+::
+:: Ethereum miners
+::
+:ethereum1
+ECHO NVIDIA ONLY - Optimized Ethminer - Eth Ethermine.org Only
+ethminer-0.11.0.NvidiaOptimized\bin\ethminer.exe --farm-recheck 200 -G -S eu1.ethermine.org:4444 -FS us1.ethermine.org:4444 -O %ETH_WALLET_ADDRESS%.%MINER_NAME%
+if %ERRORLEVEL% NEQ 0 goto exit
+pause
+
+:ethereum2
+ECHO NVIDIA ONLY - Optimized Ethminer - Eth Nanopool Only
+ethminer-0.11.0.NvidiaOptimized\bin\ethminer.exe --farm-recheck 200 -G -S eth-us-east1.nanopool.org:9999 -FS eth-eu1.nanopool.org:9999 -O %ETH_WALLET_ADDRESS%.%MINER_NAME%/%EMAIL_ADDRESS%
+if %ERRORLEVEL% NEQ 0 goto exit
+pause
+
+:ethereum3
+ECHO AMD and NVIDIA Claymore - Eth Only Ethermine.org
+Claymore_Dual_Ethereum_v9.7\EthDcrMiner64.exe -epool us1.ethermine.org:4444 -ewal %ETH_WALLET_ADDRESS%.%MINER_NAME% -epsw x
+if %ERRORLEVEL% NEQ 0 goto exit
+pause
+
+:ethereum4
+ECHO AMD and NVIDIA Claymore - Eth Ethermine.org and Siacoin to Nanopool
+Claymore_Dual_Ethereum_v9.7\EthDcrMiner64.exe -epool us1.ethermine.org:4444 -ewal %ETH_WALLET_ADDRESS%.%MINER_NAME% -epsw x -dpool stratum+tcp://sia-us-east1.nanopool.org:7777 -dwal %SIA_WALLET_ADDRESS%/%MINER_NAME%/%EMAIL_ADDRESS% -dcoin sia
+if %ERRORLEVEL% NEQ 0 goto exit
+pause
+
+:ethereum5
+ECHO AMD and NVIDIA Claymore - Eth Ethermine.org and Decred to Suprnova.cc Pool
+Claymore_Dual_Ethereum_v9.7\EthDcrMiner64.exe -epool us1.ethermine.org:4444 -ewal %ETH_WALLET_ADDRESS%.%MINER_NAME% -epsw x -dpool stratum+tcp://dcr.suprnova.cc:3252 -dwal %DECRED_WALLET_ADDRESS%.%MINER_NAME% -dpsw x -allpools 1
+if %ERRORLEVEL% NEQ 0 goto exit
+pause
+
+:ethereum6
+ECHO AMD and NVIDIA Claymore - Eth Ethermine.org and Lbry Credits to Coinmine.pl
+Claymore_Dual_Ethereum_v9.7\EthDcrMiner64.exe -epool us1.ethermine.org:4444 -ewal %ETH_WALLET_ADDRESS%.%MINER_NAME% -epsw x -dpool stratum+tcp://lbc-us.coinmine.pl:8787 -dwal %LBRY_WALLET_ADDRESS%.%MINER_NAME% -dpsw x -dcoin lbc
+if %ERRORLEVEL% NEQ 0 goto exit
+pause
+
+:ethereum7
+ECHO AMD and NVIDIA Claymore - Eth Ethermine.org and PascalCoin to Nanopool
+Claymore_Dual_Ethereum_v9.7\EthDcrMiner64.exe -epool us1.ethermine.org:4444 -ewal %ETH_WALLET_ADDRESS%.%MINER_NAME% -epsw x -dpool stratum+tcp://pasc-us-east1.nanopool.org:15555 -dwal %PASCAL_WALLET_ADDRESS%.%MINER_NAME%/%EMAIL_ADDRESS% -dpsw x -dcoin pasc -ftime 10
+if %ERRORLEVEL% NEQ 0 goto exit
+pause
+
+:ethereum8
+ECHO AMD and NVIDIA Claymore - Eth Nanopool Only
+Claymore_Dual_Ethereum_v9.7\EthDcrMiner64.exe -epool eth-us-east1.nanopool.org:9999 -ewal %ETH_WALLET_ADDRESS%/%MINER_NAME%/%EMAIL_ADDRESS% -mode 1
+if %ERRORLEVEL% NEQ 0 goto exit
+pause
+
+:ethereum9
+ECHO AMD and NVIDIA Claymore - Nanopool and Siacoin to Nanopool
+Claymore_Dual_Ethereum_v9.7\EthDcrMiner64.exe -epool eth-us-east1.nanopool.org:9999 -ewal %ETH_WALLET_ADDRESS%/%MINER_NAME%/%EMAIL_ADDRESS% -epsw x -dpool stratum+tcp://sia-us-east1.nanopool.org:7777 -dwal %SIA_WALLET_ADDRESS%/%MINER_NAME%/%EMAIL_ADDRESS% -dcoin sia
+if %ERRORLEVEL% NEQ 0 goto exit
+pause
+
+:ethereum10
+ECHO AMD and NVIDIA Claymore - Eth Nanopool and Pascal to Nanopool
+Claymore_Dual_Ethereum_v9.7\EthDcrMiner64.exe -epool eth-us-east1.nanopool.org:9999 -ewal %ETH_WALLET_ADDRESS%/%MINER_NAME%/%EMAIL_ADDRESS% -epsw x -dpool stratum+tcp://pasc-us-east1.nanopool.org:15555 -dwal %PASCAL_WALLET_ADDRESS%.%MINER_NAME%/%EMAIL_ADDRESS% -dcoin pasc -ftime 10
+if %ERRORLEVEL% NEQ 0 goto exit
+pause
+
+::
+:: Ethereum Classic miners
+::
+:ethereumc1
+ECHO NVIDIA ONLY - Optimized Ethminer - Etc nanopool Only
+ethminer-0.11.0.NvidiaOptimized\bin\ethminer.exe --farm-recheck 200 -G -S etc-us-east1.nanopool.org:19999 -O %ETC_WALLET_ADDRESS%.%MINER_NAME%/%EMAIL_ADDRESS%
+if %ERRORLEVEL% NEQ 0 goto exit
+pause
+
+:ethereumc1
+ECHO AMD and NVIDIA Claymore - Etc (ethereum classic) to Nanopool
+Claymore_Dual_Ethereum_v9.7\EthDcrMiner64.exe -epool etc-us-east1.nanopool.org:19999 -ewal %ETC_WALLET_ADDRESS%/%MINER_NAME%/%EMAIL_ADDRESS% -mode 1 -allpools 1
+if %ERRORLEVEL% NEQ 0 goto exit
+pause
+
+:ethereumc1
+ECHO AMD and NVIDIA Claymore - Etc (ethereum classic) and Siacoin both to Nanopool
+Claymore_Dual_Ethereum_v9.7\EthDcrMiner64.exe -epool etc-us-east1.nanopool.org:19999 -ewal %ETC_WALLET_ADDRESS%/%MINER_NAME%/%EMAIL_ADDRESS% -epsw x -dpool stratum+tcp://sia-us-east1.nanopool.org:7777 -dwal %SIA_WALLET_ADDRESS%/%MINER_NAME%/%EMAIL_ADDRESS% -dcoin sia -allpools 1
+if %ERRORLEVEL% NEQ 0 goto exit
+pause
+
+:ethereumc1
+ECHO AMD and NVIDIA Claymore - Etc (ethereum classic) Nanopool and Decred to Suprnova.cc Pool
+Claymore_Dual_Ethereum_v9.7\EthDcrMiner64.exe -epool etc-us-east1.nanopool.org:19999 -ewal %ETC_WALLET_ADDRESS%/%MINER_NAME%/%EMAIL_ADDRESS% -epsw x -dpool stratum+tcp://dcr.suprnova.cc:3252 -dwal %DECRED_WALLET_ADDRESS%.%MINER_NAME% -dpsw x -allpools 1
+if %ERRORLEVEL% NEQ 0 goto exit
+pause
+
+:ethereumc1
+ECHO AMD and NVIDIA Claymore - Etc (ethereum classic) and Pascal both to Nanopool
+Claymore_Dual_Ethereum_v9.7\EthDcrMiner64.exe -epool etc-us-east1.nanopool.org:19999 -ewal %ETC_WALLET_ADDRESS%/%MINER_NAME%/%EMAIL_ADDRESS% -epsw x -dpool stratum+tcp://pasc-us-east1.nanopool.org:15555 -dwal %PASCAL_WALLET_ADDRESS%.%MINER_NAME%/%EMAIL_ADDRESS% -dcoin pasc -ftime 10 -allpools 1
+if %ERRORLEVEL% NEQ 0 goto exit
+pause
+
+::
+:: Monero Miners
+::
+:monero1
+ECHO AMD ONLY - Claymore - XMR to Nanopool
+Claymore_CryptoNote_GPU_Miner_v9.7\NsGpuCNMiner.exe -o ssl://xmr-eu1.nanopool.org:14433 -u %XMR_WALLET_ADDRESS%.%MINER_NAME%/%EMAIL_ADDRESS% -p z -ftime 1 -allpools 1
+if %ERRORLEVEL% NEQ 0 goto exit
+pause
+
+:monero2
+ECHO NVIDIA ONLY - TSIV CCMiner XMR to Nanopool
+tsiv-xmr-nvidia\ccminer -q -o stratum+tcp://xmr-us-east1.nanopool.org:14444 -u %XMR_WALLET_ADDRESS%.%MINER_NAME%/%EMAIL_ADDRESS% -p x -l 4x84
+if %ERRORLEVEL% NEQ 0 goto exit
+pause
+
+::
+:: ZCash Miners
+::
+:zcash1
+ECHO ZCash Claymore - Zcash to Nanopool AMD Only
+Claymore_ZCash_AMD_GPU_Miner_v12.4\ZecMiner64.exe -zpool ssl://zec-us-east1.nanopool.org:6633 -zwal %ZCASH_WALLET_ADDRESS%.%MINER_NAME%/%EMAIL_ADDRESS% -zpsw z -ftime 1 -allpools 1
+if %ERRORLEVEL% NEQ 0 goto exit
+pause
+
+:zcash2
+ECHO NVIDIA Excavator - Zcash to Nanopool NVIDIA Only
+excavator_v1.1.0a_Win64\excavator -a equihash -s zec-us-east1.nanopool.org:6666 -u %ZCASH_WALLET_ADDRESS%/%MINER_NAME%/%EMAIL_ADDRESS% -p 0 -d 2 -ca -ca
+if %ERRORLEVEL% NEQ 0 goto exit
+pause
+
+:zcash3
+ECHO NVIDIA EWBF's CUDA Zcash Miner - Zcash to Nanopool NVIDIA Only
+ZEC_M0.3.4b\miner --server zec-us-east1.nanopool.org --user %ZCASH_WALLET_ADDRESS%.%MINER_NAME%.%EMAIL_ADDRESS% --pass z --port 6666
+if %ERRORLEVEL% NEQ 0 goto exit
+pause
+
+::
+:: SiaCoin Miners
+::
+:siacoin1
+ECHO AMD and NVIDIA Gominer - Siacoin to Nanopool Only
 gominer-windows-1.0.0\gominer.exe -I 28 -H sia-us-east1.nanopool.org:9980 -Q "address=%SIA_WALLET_ADDRESS%&worker=%MINER_NAME%&email=%EMAIL_ADDRESS%"
 if %ERRORLEVEL% NEQ 0 goto exit
 pause
-:ETHDEC
-rem AMD & NVIDIA Claymore - Eth Ethermine.org & Decred to Suprnova.cc Pool
-Claymore_Dual_Ethereum_v9.7\EthDcrMiner64.exe -epool us1.ethermine.org:4444 -ewal %ETC_WALLET_ADDRESS% -epsw x -dpool stratum+tcp://dcr.suprnova.cc:3252 -dwal %DECRED_WALLET_ADDRESS%.%MINER_NAME% -dpsw x
-if %ERRORLEVEL% NEQ 0 goto exit
-pause
-:ETHLBRY
-rem AMD & NVIDIA Claymore - Eth Ethermine.org & Lbry Credits to Coinmine.pl
-Claymore_Dual_Ethereum_v9.7\EthDcrMiner64.exe -epool us1.ethermine.org:4444 -ewal %ETH_WALLET_ADDRESS% -epsw x -dpool stratum+tcp://lbc-us.coinmine.pl:8787 -dwal %LBRY_WALLET_ADDRESS%.%MINER_NAME% -dpsw x -dcoin lbc
-if %ERRORLEVEL% NEQ 0 goto exit
-pause
-:ETC
-rem AMD & NVIDIA Claymore - Etc (ethereum classic) to Nanopool
-Claymore_Dual_Ethereum_v9.7\EthDcrMiner64.exe -epool etc-us-east1.nanopool.org:19999 -ewal %ETC_WALLET_ADDRESS% -epsw x
-if %ERRORLEVEL% NEQ 0 goto exit
-pause
-:ETCSIA
-rem AMD & NVIDIA Claymore - Etc (ethereum classic) & Siacoin both to Nanopool
-Claymore_Dual_Ethereum_v9.7\EthDcrMiner64.exe -epool etc-us-east1.nanopool.org:19999 -ewal %ETC_WALLET_ADDRESS% -epsw x -dpool stratum +tcp://sia-rem us-east1.nanopool.org:7777 -dwal %SIA_WALLET_ADDRESS%/%MINER_NAME%/%EMAIL_ADDRESS% -dcoin sia
-if %ERRORLEVEL% NEQ 0 goto exit
-pause
-:ETCDEC
-rem AMD & NVIDIA Claymore - Etc (ethereum classic) Nanopool & Decred to Suprnova.cc Pool
-Claymore_Dual_Ethereum_v9.7\EthDcrMiner64.exe -epool etc-us-east1.nanopool.org:19999 -ewal %ETC_WALLET_ADDRESS% -epsw x -dpool stratum +tcp://dcr.suprnova.cc:3252 -dwal %DECRED_WALLET_ADDRESS%.%MINER_NAME% -dpsw x
-if %ERRORLEVEL% NEQ 0 goto exit
-pause
-:Zcash
-rem AMD ZCash Claymore - Zcash to Nanopool AMD Only
-Claymore_ZCash_AMD_GPU_Miner_v12.4\ZecMiner64.exe
--zpool ssl://zec-us-east1.nanopool.org:6633
--zwal %ZCASH_WALLET_ADDRESS%.%MINER_NAME%/%EMAIL_ADDRESS%
--zpsw z
--ftime 1
-if %ERRORLEVEL% NEQ 0 goto exit
-pause
-:ZcashN
-rem NVIDIA Excavator - Zcash to Nanopool NVIDIA Only
-excavator_v1.1.0a_Win64\excavator -a equihash -s zec-us-east1.nanopool.org:6666 -u %ZCASH_WALLET_ADDRESS%/%MINER_NAME%/%EMAIL_ADDRESS% -p 0 -d rem 2 -ca rem -ca
-if %ERRORLEVEL% NEQ 0 goto exit
-pause
-:ZcashEWBF
-rem NVIDIA EWBF's CUDA Zcash Miner - Zcash to Nanopool NVIDIA Only
-ZEC_M0.3.4b\miner --server zec-us-east1.nanopool.org --user %ZCASH_WALLET_ADDRESS%.%MINER_NAME% --pass z --port 6666
-if %ERRORLEVEL% NEQ 0 goto exit
-pause
-:EthPascal
-rem AMD & NVIDIA Claymore - Eth Ethermine.org & PascalCoin to Nanopool
-Claymore_Dual_Ethereum_v9.7\EthDcrMiner64.exe -epool us1.ethermine.org:4444 -ewal %ETH_WALLET_ADDRESS% -epsw x -dpool stratum+tcp://pasc-us-east1.nanopool.org:15555 -dwal %PASCAL_WALLET_ADDRESS%.%MINER_NAME%/%EMAIL_ADDRESS% -dpsw x -dcoin pasc -ftime 10
-if %ERRORLEVEL% NEQ 0 goto exit
-pause
-:Pascal
-rem AMD SGMiner PascalCoin (exchange address) - PascalCoin to Nanopool
-sg-miner-5.5.0\sgminer.exe -k pascal -o stratum+tcp://pasc-us-east1.nanopool.org:15555 -u %PASCAL_WALLET_ADDRESS%.%MINER_NAME%/%EMAIL_ADDRESS% -p x -I 21 rem -w 64 rem -g2
-if %ERRORLEVEL% NEQ 0 goto exit
-pause
-:NPascal
-rem NVIDIA Excavator - PascalCoin to Nanopool
-excavator_v1.1.0a_Win64\excavator -a pascal -s pasc-us-east1.nanopool.org:15555 -u %PASCAL_WALLET_ADDRESS%.%MINER_NAME%/%EMAIL_ADDRESS% -p 0 -d 2 -ca -ca
-if %ERRORLEVEL% NEQ 0 goto exit
-pause
-:AMDHUSH
-rem AMD HUSH Claymore - Hush to zdash.miningpseed.com AMD Only
+
+::
+:: PascalCoin Miners
+::
+:pascal1
+ECHO AMD SGMiner PascalCoin (exchange address) - PascalCoin to Nanopool
+sg-miner-5.5.0\sgminer.exe -k pascal -o stratum+tcp://pasc-us-east1.nanopool.org:15555 -u %PASCAL_WALLET_ADDRESS%.%MINER_NAME%/%EMAIL_ADDRESS% -p x -I 21 -w 64 -g2
+if %ERRORLEVEL% NEQ 0 goto exit
+pause
+
+:pascal2
+ECHO NVIDIA Excavator - PascalCoin to Nanopool
+excavator_v1.1.0a_Win64\excavator -a pascal -s pasc-us-east1.nanopool.org:15555 -u %PASCAL_WALLET_ADDRESS%.%MINER_NAME%/%EMAIL_ADDRESS% -d 2 -ca
+if %ERRORLEVEL% NEQ 0 goto exit
+pause
+
+::
+:: Hush Miners
+::
+:hush1
+ECHO AMD HUSH Claymore - Hush to zdash.miningpseed.com AMD Only
 Claymore_ZCash_AMD_GPU_Miner_v12.4\ZecMiner64.exe
 -zpool mining.miningspeed.com:3062
 -zwal %HUSH_WALLET_ADDRESS%.%MINER_NAME%
@@ -214,67 +428,98 @@
 -allpools 1
 if %ERRORLEVEL% NEQ 0 goto exit
 pause
-:NEWBF
-rem NVIDIA EWBF's CUDA HUSH Miner - HUSH to zdash.miningspeed.com NVIDIA Only
+
+:hush2
+ECHO NVIDIA EWBF's CUDA HUSH Miner - HUSH to zdash.miningspeed.com NVIDIA Only
 ZEC_M0.3.4b\miner --server mining.miningspeed.com --user %HUSH_WALLET_ADDRESS%.%MINER_NAME% --pass z --port 3092
 if %ERRORLEVEL% NEQ 0 goto exit
 pause
-:NCCLBRY
-rem NVIDIA CCMiner Lbry Credits Miner - Lbry to coinmine.pl NVIDIA ONLY
+
+::
+:: Lbry Miners
+::
+:lbry1
+ECHO NVIDIA CCMiner Lbry Credits Miner - Lbry to coinmine.pl NVIDIA ONLY
 ccminer-2.0-release-x64-cuda-8.0\ccminer-x64.exe -o stratum+tcp://lbc-us.coinmine.pl:8787 -u %LBRY_WALLET_ADDRESS%.%MINER_NAME% -a lbry
 if %ERRORLEVEL% NEQ 0 goto exit
 pause
-:AMDLBRY
-rem AMD SGMiner Lbry Credits Miner - Lbry to coinmine.pl AMD ONLY
-ccminer-2.0-release-x64-cuda-8.0\sgminer.exe --kernel lbry -o stratum+tcp://lbc-us.coinmine.pl:8787 -u %LBRY_WALLET_ADDRESS%.%MINER_NAME% -p x -I 19 -w 64 -g 4
-if %ERRORLEVEL% NEQ 0 goto exit
-pause
-:ClaymoreDBIX
-rem AMD & NVIDIA Claymore - Dbix to Sexy.pool only
-Claymore_Dual_Ethereum_v9.7\EthDcrMiner64.exe -epool stratum+tcp://dbix.pool.sexy:7007 -ewal %DBIX_WALLET_ADDRESS% -allpools 1
-if %ERRORLEVEL% NEQ 0 goto exit
-pause
-:ClaymoreDBIXSia
-rem AMD & NVIDIA Claymore - Dbix to Sexy.Pool & Siacoin to Nanopool
-Claymore_Dual_Ethereum_v9.7\EthDcrMiner64.exe -epool stratum+tcp://dbix.pool.sexy:7007 -ewal %DBIX_WALLET_ADDRESS% -epsw x -dpool stratum+tcp://sia-us-east1.nanopool.org:7777 -dwal %SIA_WALLET_ADDRESS%/%MINER_NAME%/%EMAIL_ADDRESS% -dcoin sia -allpools 1
-if %ERRORLEVEL% NEQ 0 goto exit
-pause
-:ClaymoreUBIQ
-rem AMD & NVIDIA Claymore - ubiq to Sexy.Pool
-Claymore_Dual_Ethereum_v9.7\EthDcrMiner64.exe -epool stratum+tcp://ubq.pool.sexy:9009 -ewal %UBIQ_WALLET_ADDRESS% -allpools 1
-if %ERRORLEVEL% NEQ 0 goto exit
-pause
-:ClaymoreDBIX2
-rem AMD & NVIDIA Claymore - Dbix to hodl only
-Claymore_Dual_Ethereum_v9.7\EthDcrMiner64.exe -epool stratum+tcp://dbix.hodlpool.com:8007 -ewal %DBIX_WALLET_ADDRESS%.%MINER_NAME% -allpools 1
-if %ERRORLEVEL% NEQ 0 goto exit
-pause
-:ClaymoreDBIXSia2
-rem AMD & NVIDIA Claymore - Dbix to hodl & Siacoin to Nanopool
-Claymore_Dual_Ethereum_v9.7\EthDcrMiner64.exe -epool stratum+tcp://dbix.hodlpool.com:8007 -ewal %DBIX_WALLET_ADDRESS% -epsw x -dpool stratum+tcp://sia-us-east1.nanopool.org:7777 -dwal %SIA_WALLET_ADDRESS%/%MINER_NAME%/%EMAIL_ADDRESS% -dcoin sia -allpools 1
-if %ERRORLEVEL% NEQ 0 goto exit
-pause
-:ClaymoreUBIQ2
-rem AMD & NVIDIA Claymore - ubiq to hodl
-Claymore_Dual_Ethereum_v9.7\EthDcrMiner64.exe -epool stratum+tcp://ubiq.hodlpool.com:8009 -ewal %UBIQ_WALLET_ADDRESS% -allpools 1
-if %ERRORLEVEL% NEQ 0 goto exit
-pause
-:ClaymoreUBIQSia
-rem AMD & NVIDIA Claymore - ubiq to ubiqpool and siacoin to nanopool
-Claymore_Dual_Ethereum_v9.7\EthDcrMiner64.exe -epool stratum+tcp://eu.ubiqpool.io:8008 -ewal %UBIQ_WALLET_ADDRESS% -dpool stratum+tcp://sia-eu1.nanopool.org:7777 -dwal %SIA_WALLET_ADDRESS%/%MINER_NAME%/%EMAIL_ADDRESS% -dcoin sia -allpools 1
-if %ERRORLEVEL% NEQ 0 goto exit
-pause
-:ClaymoreUBIQSia2
-rem AMD & NVIDIA Claymore - ubiq to hodl pool and siacoin to nanopool
-Claymore_Dual_Ethereum_v9.7\EthDcrMiner64.exe -epool stratum+tcp://ubiq.hodlpool.com:8009 -ewal %UBIQ_WALLET_ADDRESS% -dpool stratum+tcp://sia-eu1.nanopool.org:7777 -dwal %SIA_WALLET_ADDRESS%/%MINER_NAME%/%EMAIL_ADDRESS% -dcoin sia -allpools 1
-if %ERRORLEVEL% NEQ 0 goto exit
-pause
-:ClaymoreUBIQSia3
-rem AMD & NVIDIA Claymore - ubiq to pool sexy and siacoin to nanopool
-Claymore_Dual_Ethereum_v9.7\EthDcrMiner64.exe -epool stratum+tcp://ubq.pool.sexy:9009 -ewal %UBIQ_WALLET_ADDRESS% -eworker %MINER_NAME% -dpool stratum+tcp://sia-eu1.nanopool.org:7777 -dwal %SIA_WALLET_ADDRESS%/%MINER_NAME%/%EMAIL_ADDRESS% -dcoin sia -allpools 1
+
+:lbry2
+:: Not working for now
+ECHO AMD SGMiner Lbry Credits Miner - Lbry to coinmine.pl AMD ONLY
+ccminer-2.0-release-x64-cuda-8.0\ccminer-x64.exe --kernel lbry -o stratum+tcp://lbc-us.coinmine.pl:8787 -u %LBRY_WALLET_ADDRESS%.%MINER_NAME% -p x -I 19 -w 64 -g 4
+if %ERRORLEVEL% NEQ 0 goto exit
+pause
+
+::
+:: Dbix Miners
+::
+:dbix1
+ECHO AMD and NVIDIA Claymore - Dbix to Sexy.pool only
+Claymore_Dual_Ethereum_v9.7\EthDcrMiner64.exe -epool stratum+tcp://dbix.pool.sexy:7007 -ewal %DBIX_WALLET_ADDRESS% -epsw x -eworker %MINER_NAME% -allpools 1 -allcoins 1 -mode 1
+if %ERRORLEVEL% NEQ 0 goto exit
+pause
+
+:dbix2
+ECHO AMD and NVIDIA Claymore - Dbix to Sexy.Pool and Siacoin to Nanopool
+Claymore_Dual_Ethereum_v9.7\EthDcrMiner64.exe -epool stratum+tcp://dbix.pool.sexy:7007 -ewal %DBIX_WALLET_ADDRESS% -epsw x -eworker %MINER_NAME% -dpool stratum+tcp://sia-us-east1.nanopool.org:7777 -dwal %SIA_WALLET_ADDRESS%/%MINER_NAME%/%EMAIL_ADDRESS% -dcoin sia -allpools 1
+if %ERRORLEVEL% NEQ 0 goto exit
+pause
+
+:dbix3
+ECHO AMD and NVIDIA Claymore - DBIX to Hodl.Pool Only
+Claymore_Dual_Ethereum_v9.7\EthDcrMiner64.exe -epool stratum+tcp://dbix.hodlpool.com:8007 -ewal %DBIX_WALLET_ADDRESS% -epsw x -eworker %MINER_NAME% -allpools 1 -allcoins 1 -mode 1
+if %ERRORLEVEL% NEQ 0 goto exit
+pause
+
+:dbix4
+ECHO AMD and NVIDIA Claymore - DBIX to Hodl Pool and Siacoin to Nanopool
+Claymore_Dual_Ethereum_v9.7\EthDcrMiner64.exe -epool stratum+tcp://dbix.hodlpool.com:8007 -ewal %DBIX_WALLET_ADDRESS% -epsw x -eworker %MINER_NAME% -dpool stratum+tcp://sia-us-east1.nanopool.org:7777 -dwal %SIA_WALLET_ADDRESS%/%MINER_NAME%/%EMAIL_ADDRESS% -dcoin sia -allpools 1
+if %ERRORLEVEL% NEQ 0 goto exit
+pause
+
+::
+:: Ubiq Miners
+::
+
+:ubiq1
+ECHO AMD and NVIDIA Claymore - Ubiq to UbiqPool Only
+Claymore_Dual_Ethereum_v9.7\EthDcrMiner64.exe -epool stratum+tcp://eu.ubiqpool.io:8008 -ewal %UBIQ_WALLET_ADDRESS% -epsw x -eworker %MINER_NAME% -allpools 1 -allcoins 1 -mode 1
+if %ERRORLEVEL% NEQ 0 goto exit
+pause
+
+:ubiq2
+ECHO AMD and NVIDIA Claymore - Ubiq to Hodl Pool Only
+Claymore_Dual_Ethereum_v9.7\EthDcrMiner64.exe -epool stratum+tcp://dbix.hodlpool.com:8007 -ewal %UBIQ_WALLET_ADDRESS% -epsw x -eworker %MINER_NAME% -allpools 1 -allcoins 1 -mode 1
+if %ERRORLEVEL% NEQ 0 goto exit
+pause
+
+:ubiq3
+ECHO AMD and NVIDIA Claymore - Ubiq to Sexy.Pool Only
+Claymore_Dual_Ethereum_v9.7\EthDcrMiner64.exe -epool stratum+tcp://ubq.pool.sexy:9009 -ewal %UBIQ_WALLET_ADDRESS% -epsw x -eworker %MINER_NAME% -allpools 1 -allcoins 1 -mode 1
+if %ERRORLEVEL% NEQ 0 goto exit
+pause
+
+:ubiq4
+ECHO AMD and NVIDIA Claymore - Ubiq to UbiqPool and Siacoin to Nanopool
+Claymore_Dual_Ethereum_v9.7\EthDcrMiner64.exe -epool stratum+tcp://eu.ubiqpool.io:8008 -ewal %UBIQ_WALLET_ADDRESS% -epsw x -eworker %MINER_NAME% -dpool stratum+tcp://sia-us-east1.nanopool.org:7777 -dwal %SIA_WALLET_ADDRESS%/%MINER_NAME%/%EMAIL_ADDRESS% -dcoin sia -allpools 1
+if %ERRORLEVEL% NEQ 0 goto exit
+pause
+
+:ubiq5
+ECHO AMD and NVIDIA Claymore - Ubiq to Hodl Pool and Siacoin to Nanopool
+Claymore_Dual_Ethereum_v9.7\EthDcrMiner64.exe -epool stratum+tcp://dbix.hodlpool.com:8007 -ewal %UBIQ_WALLET_ADDRESS% -epsw x -eworker %MINER_NAME% -dpool stratum+tcp://sia-us-east1.nanopool.org:7777 -dwal %SIA_WALLET_ADDRESS%/%MINER_NAME%/%EMAIL_ADDRESS% -dcoin sia -allpools 1
+if %ERRORLEVEL% NEQ 0 goto exit
+pause
+
+:ubiq6
+ECHO AMD and NVIDIA Claymore - Ubiq to Sexy.Pool and Siacoin to Nanopool
+Claymore_Dual_Ethereum_v9.7\EthDcrMiner64.exe -epool stratum+tcp://ubq.pool.sexy:9009 -ewal %UBIQ_WALLET_ADDRESS% -epsw x -eworker %MINER_NAME% -dpool stratum+tcp://sia-us-east1.nanopool.org:7777 -dwal %SIA_WALLET_ADDRESS%/%MINER_NAME%/%EMAIL_ADDRESS% -dcoin sia -allpools 1
 if %ERRORLEVEL% NEQ 0 goto exit
 pause

 :exit
 ECHO Error while running miner
 pause
+
+:EOF


added jdk executable

added jdk executable

--- src/main/resources/eclipse/start/start-eclipse.bat
+++ src/main/resources/eclipse/start/start-eclipse.bat
@@ -1,8 +1,11 @@
 set IDES_HOME="%HOME%/ides"
+set JDKS_HOME=%DEV_HOME%\jdks
+set JDK8_HOME=%JDKS_HOME%\jdk1.8.0_151
+set JDK8_EXECUTABLE=%JDK8_HOME%\bin\javaw.exe
 set ECLIPSE_VERSION_NAME="lunajee"
 set ECLIPSE_HOME="%IDES_HOME%/eclipse/%ECLIPSE_VERSION_NAME%/eclipse"
 set WORKSPACES_HOME="%HOME%/wss"
 set WORKSPACE_HOME="%WORKSPACES_HOME%/jaulp-core"
 set ECLIPSE_EXECUTABLE="%ECLIPSE_HOME%/eclipse.exe"
 set VM_ARGS="-Xms384m -Xmx1024m -XX:PermSize=128M -XX:MaxPermSize=512M"
-%ECLIPSE_EXECUTABLE% /i /max /high -data %WORKSPACE_HOME% -showlocation vmargs %VM_ARGS%
+%ECLIPSE_EXECUTABLE% /i /max /high -data %WORKSPACE_HOME% -showlocation -vm %JDK8_EXECUTABLE% vmargs %VM_ARGS%


DEV/FARRAGO:  fix Windoze installer script for Enki dependency

[git-p4: depot-paths = "//open/dev/": change = 11551]

--- farrago/dist/install/install.bat
+++ farrago/dist/install/install.bat
@@ -23,6 +23,7 @@
 echo set LCP="%JAVA_HOME%\lib\tools.jar">> "%BIN_DIR%\classpath.bat"
 for %%j in ("%LIB_DIR%\*.jar") do echo set LCP=%%LCP%%;"%%j">> "%BIN_DIR%\classpath.bat"
 for %%j in ("%LIB_DIR%\mdrlibs\*.jar") do echo set LCP=%%LCP%%;"%%j">> "%BIN_DIR%\classpath.bat"
+for %%j in ("%LIB_DIR%\enki\*.jar") do echo set LCP=%%LCP%%;"%%j">> "%BIN_DIR%\classpath.bat"

 echo Installation successful


Changed version number from 1.0 to 1.2; added command to generate documentation for the sniffer.

--- src/makedoc.bat
+++ src/makedoc.bat
@@ -1,2 +1,2 @@
-javadoc -d ..\doc\api -overview jade-main.html -author -windowtitle "JADE 1.0 API Reference" jade jade.core jade.core.behaviours jade.lang.acl jade.domain jade.proto jade.gui
-
+javadoc -d ..\doc\api -overview jade-main.html -author -windowtitle "JADE 1.2 API Reference" jade jade.core jade.core.behaviours jade.lang.acl jade.domain jade.proto jade.gui
+javadoc -d ..\doc\sniffer\html\jdoc -author -windowtitle "JADE 1.2 Sniffer Reference" jade.tools.sniffer


Windows batch file to generate HTML documentation.

error: pathspec 'src/makedoc.bat' did not match any file(s) known to git

--- src/makedoc.bat
+++ src/makedoc.bat
@@ -0,0 +1 @@
+javadoc -d ..\doc\html -overview jade-main.html -author -windowtitle "JADE 1.0 API Reference" jade jade.core jade.lang.acl jade.domain jade.proto


open browser at start hpcpfGUI(windows only)

--- bin/run_hpcpfGUI.bat
+++ bin/run_hpcpfGUI.bat
@@ -3,4 +3,6 @@
 chcp 850

 cd ../app
-node ptl_server.js+start node ptl_server.js
+start http://localhost:8080
+


System wide deployment: Supress REG QUERY output

--- bin/sydm/unreggl.cmd
+++ bin/sydm/unreggl.cmd
@@ -1,8 +1,8 @@
 @set "ERRORLEVEL="
 @CMD /C EXIT 0
-@REG QUERY "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\OpenGLDrivers\MSOGL" /d /f %1.dll
+@REG QUERY "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\OpenGLDrivers\MSOGL" /d /f %1.dll >nul 2>&1
 @if "%ERRORLEVEL%"=="0" REG DELETE "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\OpenGLDrivers\MSOGL" /f
 @CMD /C EXIT 0
-@IF /I %PROCESSOR_ARCHITECTURE%==AMD64 REG QUERY "HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Windows NT\CurrentVersion\OpenGLDrivers\MSOGL" /d /f %1.dll
+@IF /I %PROCESSOR_ARCHITECTURE%==AMD64 REG QUERY "HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Windows NT\CurrentVersion\OpenGLDrivers\MSOGL" /d /f %1.dll >nul 2>&1
 @if "%ERRORLEVEL%"=="0" IF /I %PROCESSOR_ARCHITECTURE%==AMD64 REG DELETE "HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Windows NT\CurrentVersion\OpenGLDrivers\MSOGL" /f
 @CMD /C EXIT 0


Added option -V

Added option -V

--- Batch/$.bat
+++ Batch/$.bat
@@ -15,13 +15,14 @@
 :#   2021-01-27 JFL Capture every line of output.                             *
 :#                  Quote lines that contain spaces, or other special chars.  *
 :#                  Added option -l to revert to the initial behavior.        *
+:#   2021-01-29 JFL Added option -V.                                          *
 :#                                                                            *
 :#         Copyright 2021 Hewlett Packard Enterprise Development LP          *
 :# Licensed under the Apache 2.0 license: www.apache.org/licenses/LICENSE-2.0 *
 :#*****************************************************************************

 setlocal EnableExtensions DisableDelayedExpansion
-set "VERSION=2021-01-27"
+set "VERSION=2021-01-29"
 set "SCRIPT=%~nx0"		&:# Script name
 set "SNAME=%~n0"		&:# Script name without the extension
 set "SPATH=%~dp0"
@@ -230,6 +231,7 @@
 if "%ARG%"=="/?" goto :help
 if "%ARG%"=="-l" set "CAPTURE=:CaptureLast" & goto :next_arg
 if "%ARG%"=="-q" set "DO=do" & goto :next_arg
+if "%ARG%"=="-V" (echo %VERSION%) & exit /b 0
 if "%ARG%"=="-X" set "EXEC=echo" & set "SET=set" & goto :next_arg

 :start


errorlevel

errorlevel

--- bin/cubes_test.bat
+++ bin/cubes_test.bat
@@ -5,6 +5,7 @@

 echo Running test 1/71
 dctest64.exe --test2 --mesh-size 2 --tex-size32 --var_cube_size --use-vbo
+if %errorlevel% neq 0 exit /b %errorlevel%
 echo Running test 2/71
 dctest64.exe --test2 --mesh-size 3 --tex-size32 --var_cube_size --use-vbo
 echo Running test 3/71
@@ -27,9 +28,11 @@
 dctest64.exe --test2 --mesh-size 12 --tex-size32 --var_cube_size --use-vbo
 echo Running test 12/71
 dctest64.exe --test2 --mesh-size 13 --tex-size32 --var_cube_size --use-vbo
+if %errorlevel% neq 0 exit /b %errorlevel%

 echo Running test 13/71
 dctest64.exe --test2 --mesh-size 2 --tex-size32 --var_cube_size
+if %errorlevel% neq 0 exit /b %errorlevel%
 echo Running test 14/71
 dctest64.exe --test2 --mesh-size 3 --tex-size32 --var_cube_size
 echo Running test 15/71
@@ -52,9 +55,11 @@
 dctest64.exe --test2 --mesh-size 12 --tex-size32 --var_cube_size
 echo Running test 24/71
 dctest64.exe --test2 --mesh-size 13 --tex-size32 --var_cube_size
+if %errorlevel% neq 0 exit /b %errorlevel%

 echo Running test 25/71
 dctest64.exe --test2 --mesh-size 2 --tex-size32
+if %errorlevel% neq 0 exit /b %errorlevel%
 echo Running test 26/71
 dctest64.exe --test2 --mesh-size 3 --tex-size32
 echo Running test 27/71
@@ -77,9 +82,11 @@
 dctest64.exe --test2 --mesh-size 12 --tex-size32
 echo Running test 36/71
 dctest64.exe --test2 --mesh-size 13 --tex-size32
+if %errorlevel% neq 0 exit /b %errorlevel%

 echo Running test 37/71
 dctest64.exe --test3 --mesh-size 2 --tex-size32
+if %errorlevel% neq 0 exit /b %errorlevel%
 echo Running test 38/71
 dctest64.exe --test3 --mesh-size 3 --tex-size32
 echo Running test 39/71
@@ -102,60 +109,79 @@
 dctest64.exe --test3 --mesh-size 12 --tex-size32
 echo Running test 48/71
 dctest64.exe --test3 --mesh-size 13 --tex-size32
+if %errorlevel% neq 0 exit /b %errorlevel%

 echo Running test 49/71
 dctest64.exe --tex-mode0 --test0 --tex-size32 --mesh-size 7 --var_cube_size
+if %errorlevel% neq 0 exit /b %errorlevel%
 echo Running test 50/71
 dctest64.exe --tex-mode0 --test1 --tex-size32 --mesh-size 7 --var_cube_size
 echo Running test 51/71
 dctest64.exe --tex-mode0 --test2 --tex-size32 --mesh-size 7 --var_cube_size
+if %errorlevel% neq 0 exit /b %errorlevel%

 echo Running test 52/71
 dctest64.exe --tex-mode1 --test0  --tex-size32 --mesh-size 7 --var_cube_size
+if %errorlevel% neq 0 exit /b %errorlevel%
 echo Running test 53/71
 dctest64.exe --tex-mode1 --test1 --tex-size32 --mesh-size 7 --var_cube_size
 echo Running test 54/71
 dctest64.exe --tex-mode1 --test4 --tex-size32 --mesh-size 7 --var_cube_size
+if %errorlevel% neq 0 exit /b %errorlevel%

 echo Running test 55/71
 dctest64.exe --tex-mode2 --test0 --tex-size32 --mesh-size 7 --var_cube_size
+if %errorlevel% neq 0 exit /b %errorlevel%
 echo Running test 56/71
 dctest64.exe --tex-mode2 --test1 --tex-size32 --mesh-size 7 --var_cube_size
 echo Running test 57/71
 dctest64.exe --tex-mode2 --test2 --tex-size32 --mesh-size 7 --var_cube_size
+if %errorlevel% neq 0 exit /b %errorlevel%

 echo Running test 58/71
 dctest64.exe --tex-mode3 --test0 --tex-size32 --mesh-size 7 --var_cube_size
+if %errorlevel% neq 0 exit /b %errorlevel%
 echo Running test 59/71
 dctest64.exe --tex-mode3 --test1 --tex-size32 --mesh-size 7 --var_cube_size
 echo Running test 60/71
 dctest64.exe --tex-mode3 --test2 --tex-size32 --mesh-size 7 --var_cube_size
+if %errorlevel% neq 0 exit /b %errorlevel%

 echo Running test 61/71
 dctest64.exe --tex-mode4 --test0 --tex-size32 --mesh-size 7 --var_cube_size
+if %errorlevel% neq 0 exit /b %errorlevel%
 echo Running test 62/71
 dctest64.exe --tex-mode4 --test1 --tex-size32 --mesh-size 7 --var_cube_size
 echo Running test 63/71
 dctest64.exe --tex-mode4 --test4 --tex-size32 --mesh-size 7 --var_cube_size
+if %errorlevel% neq 0 exit /b %errorlevel%

 echo Running test 64/71
 dctest64.exe --tex-freq0 --test2 --tex-size32 --mesh-size 7 --var_cube_size
+if %errorlevel% neq 0 exit /b %errorlevel%
 echo Running test 65/71
 dctest64.exe --tex-freq0 --test4 --tex-size32 --mesh-size 7 --var_cube_size
+if %errorlevel% neq 0 exit /b %errorlevel%

 echo Running test 66/71
 dctest64.exe --tex-freq1 --test2 --tex-size32 --mesh-size 7 --var_cube_size
+if %errorlevel% neq 0 exit /b %errorlevel%
 echo Running test 67/71
 dctest64.exe --tex-freq1 --test4 --tex-size32 --mesh-size 7 --var_cube_size
+if %errorlevel% neq 0 exit /b %errorlevel%

 echo Running test 68/71
 dctest64.exe --tex-freq2 --test2 --tex-size32 --mesh-size 7 --var_cube_size
+if %errorlevel% neq 0 exit /b %errorlevel%
 echo Running test 69/71
 dctest64.exe --tex-freq2 --test4 --tex-size32 --mesh-size 7 --var_cube_size
+if %errorlevel% neq 0 exit /b %errorlevel%

 echo Running test 70/71
 dctest64.exe --tex-freq3 --test2 --tex-size32 --mesh-size 7 --var_cube_size
+if %errorlevel% neq 0 exit /b %errorlevel%
 echo Running test 71/71
 dctest64.exe --tex-freq3 --test4 --tex-size32 --mesh-size 7 --var_cube_size
+if %errorlevel% neq 0 exit /b %errorlevel%

 dctest64.exe --send-cube-data


Port to Windows

Port to Windows

--- php_pdo/do_win32.bat
+++ php_pdo/do_win32.bat
@@ -11,8 +11,8 @@
 rmdir /Q /S RelWithDebInfo
 rmdir /Q /S php_nuodb.dir
 del /Q cmake_install.cmake
-del /Q NUOPHP.suo
-cmake -G "Visual Studio 9 2008" -D NUODB_ROOT=%NUODB_ROOT% -D NUODB_INCLUDE_DIR=%NUODB_ROOT%/include -D NUODB_LIB_DIR=%NUODB_ROOT%/lib -D NUODB_REMOTE_LIBRARY=%NUODB_ROOT%/lib -D PHP_ROOT=%PHP_INSTALL_DIR% -D PHP_INCLUDE_DIR=%PHP_INSTALL_DIR%/SDK/include .
+del /Q NuoPhpPdo.suo
+cmake -G "Visual Studio 10" -D NUODB_ROOT=%NUODB_ROOT% -D NUODB_INCLUDE_DIR=%NUODB_ROOT%/include -D NUODB_LIB_DIR=%NUODB_ROOT%/lib -D NUODB_REMOTE_LIBRARY=%NUODB_ROOT%/lib -D PHP_ROOT=%PHP_INSTALL_DIR% -D PHP_INCLUDE_DIR=%PHP_INSTALL_DIR%/SDK/include .
 devenv NuoPhpPdo.sln /build Debug /project NuoPhpPdo
 devenv NuoPhpPdo.sln /build RelWithDebInfo /project NuoPhpPdo
 copy /Y Debug\*.* %PHP_INSTALL_DIR%\debug


netkvm: Added example of WMI access to NetKvm

Signed-off-by: Yuri Benditovich <9668326cb042de5d91fd7679dac7ca5ea402812c@daynix.com>

error: pathspec 'NetKVM/DebugTools/WMI/netkvm-wmi.cmd' did not match any file(s) known to git

--- NetKVM/DebugTools/WMI/netkvm-wmi.cmd
+++ NetKVM/DebugTools/WMI/netkvm-wmi.cmd
@@ -0,0 +1,31 @@
+:: Example of accessing NetKvm internals via WMI commands:
+@echo off
+if "%1"=="" goto help
+if /i "%1"=="debug" goto debug
+if /i "%1"=="stat" goto stat
+if /i "%1"=="reset" goto reset
+goto help
+:debug
+call :dowmic netkvm_logging set level=%2
+goto :eof
+
+:stat
+call :dowmic netkvm_statistics get
+goto :eof
+
+:reset
+call :dowmic netkvm_statistics set rxChecksumOK=0
+goto :eof
+
+:dowmic
+wmic /namespace:\\root\wmi path %*
+goto :eof
+
+:help
+echo Example of WMI controls to NetKvm
+echo %~nx0 command parameter
+echo debug level            Controls debug level (use level 0..5)
+echo stat                   Retrieves internal statistics
+echo reset                  Resets internal statistics
+goto :eof
+


adding windows batch file for console

adding windows batch file for console

error: pathspec 'console.bat' did not match any file(s) known to git

--- console.bat
+++ console.bat
@@ -0,0 +1 @@
+@php console %*


Removed bat

Removed bat

--- naoko.bat
+++ naoko.bat
@@ -1,12 +0,0 @@
-@echo off
-if not exist python goto FALLBACK
-python naoko\main.py
-goto END
-:FALLBACK
-if not exist C:\Python27\python.exe goto NOPYTHON
-C:\Python27\python.exe naoko\main.py
-goto END
-:NOPYTHON
-echo No Python found.
-pause
-:END


Changing release number

Changing release number

--- src/nuget.bat
+++ src/nuget.bat
@@ -1,6 +1,6 @@
 rem packing web3 and dependencies
 del /S *.*.nupkg
-SET releaseSuffix=rc2
+SET releaseSuffix=rc3
 SET targetNet35=false

 cd Nethereum.Hex


Add progress output to runtest.cmd so you don't think it's hung

--- tests/runtest.cmd
+++ tests/runtest.cmd
@@ -189,6 +189,7 @@
 )

 REM Prepare the Test Drop
+echo %__MsgPrefix%Removing 'ni' files and 'lock' folders from %__TestWorkingDir%
 REM Cleans any NI from the last run
 powershell -NoProfile "Get-ChildItem -path %__TestWorkingDir% -Include '*.ni.*' -Recurse -Force | Remove-Item -force"
 REM Cleans up any lock folder used for synchronization from last run


Update bld.bat

Update bld.bat

--- recipes/icub-models/bld.bat
+++ recipes/icub-models/bld.bat
@@ -7,6 +7,7 @@
     -DCMAKE_BUILD_TYPE=Release ^
     -DBUILD_TESTING:BOOL=ON ^
     -DBUILD_SHARED_LIBS:BOOL=ON ^
+    -DPython3_EXECUTABLE:PATH=%PYTHON% ^
     -DICUB_MODELS_COMPILE_PYTHON_BINDINGS:BOOL=ON ^
     -DICUB_MODELS_DETECT_ACTIVE_PYTHON_SITEPACKAGES:BOOL=ON ^
     -DICUB_MODELS_PYTHON_PIP_METADATA_INSTALL:BOOL=ON ^


UTF8 BOM removed

UTF8 BOM removed

--- c-plus-plus.conf.bat
+++ c-plus-plus.conf.bat
@@ -1,4 +1,4 @@
-@echo off
+@echo off

 rem Если переменная среды уже установлена явно, то содержимое файла игнорируется
 if not "%CPPLINE%" == "" goto :EOF


Added tinycc to the windows build

Added tinycc to the windows build

--- build_tools/jenkins_win_build.bat
+++ build_tools/jenkins_win_build.bat
@@ -3,7 +3,6 @@
 set PATH=c:\python27;c:\mingw\bin;%PATH%
 set PYLINT= C:\Python27\Scripts\pylint
 set INNO="C:\Program Files (x86)\Inno Setup 5\ISCC.exe"
-

 set PYTHONPATH=%PYTHONPATH%;%WORKSPACE%\sasview\utils
 set PYTHONPATH=%PYTHONPATH%;%WORKSPACE%\sasview\sasview-install
@@ -67,6 +66,12 @@
 %EASY_INSTALL% -d %WORKSPACE%\sasview\sasview-install sasview.egg

+:: TINYCC build ####################################################
+cd %WORKSPACE%
+cd tinycc
+%PYTHON% setup.py build
+xcopy /S build\lib\* %WORKSPACE%\sasview\utils\
+
 :: SASVIEW INSTALLER ##################################################
 cd %WORKSPACE%
 cd sasview
@@ -77,7 +82,6 @@
 cd Output
 xcopy setupSasView.exe %WORKSPACE%\sasview\dist

-
 :: SASVIEW PYLINT #####################################################
 cd %WORKSPACE%\sasview
 %PYLINT% --rcfile "build_tools/pylint.rc" -f parseable sasview-install/sasview.egg/sas sasview > test/sasview.txt


Properly set env vars on Windows (fixes #81)

--- robozonky-app/src/main/assembly/filtered-resources/robozonky.bat
+++ robozonky-app/src/main/assembly/filtered-resources/robozonky.bat
@@ -1,2 +1,2 @@
-SET JAVA_OPTS = "%JAVA_OPTS% -Dlogback.configurationFile=logback.xml -Dfile.encoding=UTF-8 -Djava.net.preferIPv4Stack=true"
+set "JAVA_OPTS=%JAVA_OPTS% -Dlogback.configurationFile=logback.xml -Dfile.encoding=UTF-8 -Djava.net.preferIPv4Stack=true"
 java %JAVA_OPTS% -jar robozonky-app-${project.version}.jar %*


Removed batch file.

Removed batch file.

--- bgfx.sln.bat
+++ bgfx.sln.bat
@@ -1,2 +0,0 @@
-@echo off
-start .build/projects/vs2012/bgfx.sln


add beep.bat

add beep.bat

error: pathspec 'bin/beep.bat' did not match any file(s) known to git

--- bin/beep.bat
+++ bin/beep.bat
@@ -0,0 +1 @@
+@echo


add windwos test batch

add windwos test batch

error: pathspec 'print.bat' did not match any file(s) known to git

--- print.bat
+++ print.bat
@@ -0,0 +1,3 @@
+go.exe test -v print_test.go print.go format.go
+
+go.exe test -test.bench=.*  print_test.go print.go format.go


set ftpd to actual version

set ftpd to actual version

--- bin/ftpd.bat
+++ bin/ftpd.bat
@@ -2,7 +2,7 @@

 setlocal

-set "FTP_HOME=%~dp0..\vendors\FTP-0.9.53"
+set "FTP_HOME=%~dp0..\vendors\FTP"

 set "FTP_PROC_NAME=FileZilla Server"
 set "FTP_CTRL_NAME=FileZilla Server Interface"


Update 3_Chocolatey_packages_workstation.cmd

--- WorkstationSetup/3_Chocolatey_packages_workstation.cmd
+++ WorkstationSetup/3_Chocolatey_packages_workstation.cmd
@@ -1 +1 @@
-choco install googlechrome firefox 7zip vlc sysinternals inkscape fiddler opera visualstudiocode keepass fsviewer calibre terminals veracrypt sdformatter imgburn openscad altap-salamander teamviewer HandBrake Telegram resilio-sync-home winamp firacode -y+choco install googlechrome firefox 7zip vlc sysinternals inkscape fiddler opera visualstudiocode keepass fsviewer calibre terminals veracrypt sdformatter imgburn openscad altap-salamander teamviewer HandBrake Telegram resilio-sync-home winamp firacode arduino -y


script comment

script comment

--- jconsole.cmd
+++ jconsole.cmd
@@ -1,8 +1,7 @@
 @REM launcher script
 @REM Shi.Zhan @ 2013
-@REM use 'sbt copy-dep' to collect dependencies in "target\scala-2.10\lib"
-@REM load compiled classes from "target\scala-2.10" directly for development
-@REM if deploy with individual "jar" libs, update "set LIB" to lib directory.
+@REM use 'sbt copyDep' to collect dependencies in "target\scala-2.10\lib"
+@REM load packaged JAR from "target\scala-2.10\jenaconsole_2.10-1.0.jar"
 @echo off
 setlocal


Уточнено сообщение об ошибке в compatibility/run.bat

--- autotests/compatibility/run.bat
+++ autotests/compatibility/run.bat
@@ -273,7 +273,7 @@
   set EXE=%~n1.exe
   echo Y| %EXE% Hello "Hello, World" "" \ > stdout.txt 2>stderr.txt
   if errorlevel 1 (
-    echo TEST FAILED, SEE __dump.txt:
+    echo TEST FAILED, SEE __dump.txt or stderr.txt:
     type __dump.txt
     endlocal
     exit /b 1
@@ -360,7 +360,7 @@
   echo Y| refgo "%~n1"-crefal+external-crefal Hello "Hello, World" "" \ ^
     >stdout.txt 2>__dump.txt
   if errorlevel 1 (
-    echo TEST FAILED, SEE __dump.txt:
+    echo TEST FAILED, SEE __dump.txt or stderr.txt:
     type __dump.txt
     endlocal
     exit /b 1
@@ -410,7 +410,7 @@
 setlocal
   echo Y| refgo "%~n1"+external Hello "Hello, World" "" \ >stdout.txt 2>__dump.txt
   if errorlevel 1 (
-    echo TEST FAILED, SEE __dump.txt:
+    echo TEST FAILED, SEE __dump.txt or stderr.txt:
     type __dump.txt
     endlocal
     exit /b 1


cmd/intelsrv: Add debug command "debug_sleep"

error: pathspec 'cmd/intelsrv/cmds/debug_sleep.cmd' did not match any file(s) known to git

--- cmd/intelsrv/cmds/debug_sleep.cmd
+++ cmd/intelsrv/cmds/debug_sleep.cmd
@@ -0,0 +1,8 @@
+{
+	"description": "sleep 10s",
+	"cmd": "sleep",
+	"args": ["10"],
+	"input": "",
+	"output": "",
+	"group": "debug"
+}


Remove explicit Windows OS version check

--- installer/rtg.bat
+++ installer/rtg.bat
@@ -86,32 +86,6 @@
 :start
 IF /I "%PROCESSOR_ARCHITECTURE%" NEQ "AMD64" GOTO :no64bit

-REM   Following checks for supported OS
-REM   Windows XP 64 bit and Windows Server 2003
-ver | FIND "5.2" > nul
-IF %ERRORLEVEL% EQU 0 GOTO :os_ok
-
-REM   Windows Vista and Windows Sever 2008
-ver | FIND "6.0" > nul
-IF %ERRORLEVEL% EQU 0 GOTO :os_ok
-
-REM   Windows 7 and Windows Sever 2008 R2
-ver | FIND "6.1" > nul
-IF %ERRORLEVEL% EQU 0 GOTO :os_ok
-
-REM   Windows 8 and Windows Sever 2012
-ver | FIND "6.2" > nul
-IF %ERRORLEVEL% EQU 0 GOTO :os_ok
-
-REM   Windows 8.1 and Windows Sever 2012 R2
-ver | FIND "6.3" > nul
-IF %ERRORLEVEL% EQU 0 GOTO :os_ok
-
-REM   We have checked for all tested versions of Windows
-echo This is not a supported version of windows, please contact support@realtimegenomics.com for more information
-GOTO :no
-
-:os_ok

 SET ACCEPTED_NAME="%~dp0%.license_accepted"


fix bld.bat

fix bld.bat

--- recipes/pnab/bld.bat
+++ recipes/pnab/bld.bat
@@ -1,7 +1,4 @@
-setlocal EnableDelayedExpansion
-
-CALL "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86_amd64
-CALL %BUILD_PREFIX%\Library\bin\cmake -G "NMake Makefiles" -Bbuild -DCMAKE_BUILD_TYPE:STRING=Release -DOPENBABEL_DIR=%PREFIX%
+CALL %BUILD_PREFIX%\Library\bin\cmake -G "NMake Makefiles" -Bbuild -DCMAKE_BUILD_TYPE:STRING=Release -DOPENBABEL_DIR=%LIBRARY_PREFIX%
 CALL cd build
 CALL nmake
 CALL XCOPY /Y bind* ..\pnab


enhances the .bat to pause on error

enhances the .bat to pause on error

--- etc/run.bat
+++ etc/run.bat
@@ -1 +1,7 @@
-java -Xmx500M -jar rightfield-bin.jar+java -Xmx500M -jar rightfield-bin.jar
+@echo off
+if errorlevel = 1 goto Error
+Exit
+:Error
+pause
+Exit


installer | windows:  set _default_ branch to 'cardano-sl-1.0' (for dev mode)

--- scripts/build-installer-win64.bat
+++ scripts/build-installer-win64.bat
@@ -7,7 +7,7 @@
 set MIN_CARDANO_BYTES=50000000
 set LIBRESSL_VERSION=2.5.3
 set CURL_VERSION=7.54.0
-set CARDANO_BRANCH_DEFAULT=cardano-sl-0.6-staging
+set CARDANO_BRANCH_DEFAULT=cardano-sl-1.0
 set DAEDALUS_VERSION_DEFAULT=local-dev-build-%CARDANO_BRANCH_DEFAULT%

 set DAEDALUS_VERSION=%1


[DEVOPS-223] AppVeyor: revert stack.exe fix

When stack-1.5.0 was initially released the zip file for the Windows
build put stack.exe in a different place. They've since reverted that
change, so this reverts the now outdated fix as well.

--- scripts/build-installer-win64.bat
+++ scripts/build-installer-win64.bat
@@ -53,12 +53,9 @@
     @if %errorlevel% neq 0 (@echo powershell -Command "try { $wc = New-Object net.webclient; $wc.Downloadfile('http://www.stackage.org/stack/windows-x86_64', 'stack.zip'); } catch { exit 1; }"
 	popd & exit /b 1)
     del /f stack.exe
-    7z x stack.zip stack.exe\stack.exe
-    @if %errorlevel% neq 0 (@echo FAILED: 7z x stack.zip stack.exe\stack.exe
+    7z x stack.zip stack.exe
+    @if %errorlevel% neq 0 (@echo FAILED: 7z x stack.zip stack.exe
 	exit /b 1)
-    move stack.exe tmp
-    move tmp\stack.exe .
-    rmdir tmp
     del stack.zip

     @echo Copying DLLs


Change setup.bat to define build.dir.

Change setup.bat to define build.dir.

git-svn-id: ca8e9bb6f3f9b50a093b443c23951d3c25ca0913@2097 369101cc-9a96-11dd-8e58-870c635edf7a

--- setup.bat
+++ setup.bat
@@ -1,3 +1,3 @@
 @echo off
 echo @echo off >ant.bat
-echo %~dp0ant.bat -Dtopbuild.dir=%CD% %%* >>ant.bat
+echo %~dp0ant.bat -Dbuild.dir=%CD%\build %%* >>ant.bat


automatically limp build.ninja before automated builds

--- setup.cmd
+++ setup.cmd
@@ -20,4 +20,5 @@
 call %_vcvarsall% x64
 set PATH="%~dp0stage";"%~dp0bin";%PATH%
 copy /Y vc_win.ninja build.ninja
+limp -f build.ninja
 popd


change order for ConEmu and ConsoleZ

change order for ConEmu and ConsoleZ

--- shell.bat
+++ shell.bat
@@ -24,19 +24,18 @@
 	start "%~1 starting" "%~dp0vendors\%~1\%SHELL_RUNNER%"
 	goto :EOF
 )
+:: Check if ConEmu is available
+if exist "%~dp0vendors\ConEmu\ConEmu.exe" (
+	call :conemu FILE "%~1" && goto :EOF
+	call :conemu CONF "%~1" && goto :EOF
+	call :conemu TASK "%~1" && goto :EOF
+)

 :: Check if ConsoleZ is available
 if exist "%~dp0vendors\ConsoleZ.bat" call "%~dp0vendors\ConsoleZ.bat"
 if defined CONSOLEZ_NAME if exist "%~dp0vendors\%CONSOLEZ_NAME%\Console.exe" if exist "%~dp0etc\ConsoleZ\%~1.xml" (
 	start "%~1 starting" "%~dp0vendors\%CONSOLEZ_NAME%\Console.exe" -c "%~dp0etc\ConsoleZ\%~1.xml" -t "%~1"
 	goto :EOF
-)
-
-:: Check if ConEmu is available
-if exist "%~dp0vendors\ConEmu\ConEmu.exe" (
-	call :conemu FILE "%~1" && goto :EOF
-	call :conemu CONF "%~1" && goto :EOF
-	call :conemu TASK "%~1" && goto :EOF
 )

 :: Check if mintty is available


remove gradlew.bat

remove gradlew.bat

gitignore didn't work :( ?

--- consumer/gradlew.bat
+++ consumer/gradlew.bat
@@ -1,84 +0,0 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega


Refactoring before introducing Windows RT ARM build.

--HG--
branch : distribute
extra : rebase_source : 96035e75dcfab459652403b1001f34c12205fd7f

--- msvc-build-launcher.cmd
+++ msvc-build-launcher.cmd
@@ -1,15 +1,30 @@
 @echo off

 REM VCVARSALL may be in Program Files or Program Files (x86)
-PATH=C:\Program Files\Microsoft Visual Studio 9.0\VC;%PATH%
-PATH=C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC;%PATH%
+REM Use old Visual Studio 2008 so created .exe will be compatible with
+REM old Windows versions. Free express edition can be downloaded via:
+REM http://download.microsoft.com/download/8/B/5/8B5804AD-4990-40D0-A6AA-CE894CBBB3DC/VS2008ExpressENUX1397868.iso
+set PATH_OLD=%PATH%
+set PATH=C:\Program Files\Microsoft Visual Studio 9.0\VC;%PATH%
+set PATH=C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC;%PATH%

 REM set up the environment to compile to x86
-call VCVARSALL x86
-cl /D "GUI=0" /D "WIN32_LEAN_AND_MEAN" launcher.c /O2 /link /MACHINE:x86 /out:setuptools/cli-32.exe
-cl /D "GUI=1" /D "WIN32_LEAN_AND_MEAN" launcher.c /O2 /link /MACHINE:x86 /out:setuptools/gui-32.exe
+call VCVARSALL x86 >nul 2>&1
+if "%ERRORLEVEL%"=="0" (
+  cl /D "GUI=0" /D "WIN32_LEAN_AND_MEAN" launcher.c /O2 /link /MACHINE:x86 /out:setuptools/cli-32.exe
+  cl /D "GUI=1" /D "WIN32_LEAN_AND_MEAN" launcher.c /O2 /link /MACHINE:x86 /out:setuptools/gui-32.exe
+) else (
+  echo Visual Studio ^(Express^) 2008 not found to build Windows 32-bit version
+)

 REM now for 64-bit
-call VCVARSALL x86_amd64
-cl /D "GUI=0" /D "WIN32_LEAN_AND_MEAN" launcher.c /O2 /link /MACHINE:x64 /out:setuptools/cli-64.exe
-cl /D "GUI=1" /D "WIN32_LEAN_AND_MEAN" launcher.c /O2 /link /MACHINE:x64 /out:setuptools/gui-64.exe+call VCVARSALL x86_amd64 >nul 2>&1
+if "%ERRORLEVEL%"=="0" (
+  cl /D "GUI=0" /D "WIN32_LEAN_AND_MEAN" launcher.c /O2 /link /MACHINE:x64 /out:setuptools/cli-64.exe
+  cl /D "GUI=1" /D "WIN32_LEAN_AND_MEAN" launcher.c /O2 /link /MACHINE:x64 /out:setuptools/gui-64.exe
+) else (
+  echo Visual Studio ^(Express^) 2008 not found to build Windows 64-bit version
+)
+
+set PATH=%PATH_OLD%
+


Keep quiet while copying.

Keep quiet while copying.

--- copy-site-packages-to-blender.bat
+++ copy-site-packages-to-blender.bat
@@ -14,7 +14,7 @@
 rem remove old files
 rmdir /s /q "%DST%"
 rem copy files from python to blender
-xcopy "%SRC%" "%DST%" /e /i
+xcopy "%SRC%" "%DST%" /e /i /q
 endlocal
 goto end


Update bld.bat

Update bld.bat

--- conda/python-pkgtk/bld.bat
+++ conda/python-pkgtk/bld.bat
@@ -1,9 +1,9 @@
 if "%PY3K%" == "1" (
   2to3 --output-dir=src/py3 -W -n src/py
-  2to3 rmdir src/py /s /q
+  rmdir src/py /s /q
   move src/py3 src/py
   2to3 --output-dir=test3 -W -n test
-  2to3 rmdir test /s /q
+  rmdir test /s /q
   move test3 test
 )
 python setup.py install


Fix windows packager script

Fix windows packager script

--- win_package.bat
+++ win_package.bat
@@ -80,12 +80,8 @@
 copy %QT_LIBS%"\bin\libEGL.dll"
 copy %QT_LIBS%"\bin\libGLESv2.dll"

-echo [6] Copying Misc. files
-copy ..\vs_redist.README
-
+:EndInstall
 %QT_LIBS%/bin/windeployqt --release pip3line.exe
-
-:EndInstall
 cd ..
 GOTO End


Moved SoundStretch from "source/example" to "source" directory

git-svn-id: 87ddce29a8183c7ad43c19e760e054c92ee2c115@39 f3a24b6a-cf45-0410-b55a-8c22e2698227

--- make-win.bat
+++ make-win.bat
@@ -17,7 +17,7 @@
 md bin
 md lib
 msdev source\SoundTouch\SoundTouch.dsw /MAKE ALL
-msdev source\example\SoundStretch\SoundStretch.dsw /MAKE "SoundStretch - Win32 Release"
+msdev source\SoundStretch\SoundStretch.dsw /MAKE "SoundStretch - Win32 Release"

 goto end

@@ -32,8 +32,8 @@
 md lib
 devenv source\SoundTouch\SoundTouch.vcproj /build debug
 devenv source\SoundTouch\SoundTouch.vcproj /build release
-devenv source\example\SoundStretch\SoundStretch.vcproj /build debug
-devenv source\example\SoundStretch\SoundStretch.vcproj /build release
+devenv source\SoundStretch\SoundStretch.vcproj /build debug
+devenv source\SoundStretch\SoundStretch.vcproj /build release

 @goto end

@@ -50,4 +50,4 @@
 echo **
 echo *********************************************************************

-:end+:end


commit on 04/02/2019 at 14:15:18

commit on 04/02/2019 at 14:15:18

--- ansys-APDL/fiberCPstress.cmd
+++ ansys-APDL/fiberCPstress.cmd
@@ -131,6 +131,8 @@

 ! Areas

+AL, 6, 4, 5, 7                                      ! UD
+
 AL, 1, 7, 2*nAb+10                                  ! Quarter fiber

 *DO, i, 1, nAb, 1
@@ -173,8 +175,16 @@
 ! ASEL, Type, Item, Comp, VMIN, VMAX, VINC, KSWP
 ! AATT, MAT, REAL, TYPE, ESYS, SECN
 ASEL, S, AREA, , 1
+AATT, 3
+ASEL, S, AREA, , 2
 AATT, 1
-ASEL, S, AREA, , 2
+
+*DO, i, 1, nAb, 1
+ ASEL, S, AREA, , 2+i
+ AATT, 1
+*ENDDO
+
+ASEL, S, AREA, , nAb+3
 AATT, 2

 ALLSEL


debug more

debug more

--- mk-libev.bat
+++ mk-libev.bat
@@ -16,7 +16,7 @@
 sh --version

 del /s *.o *.a *.lo *.la *.lai *.Plo >> nul 2>&1
-sh -x "./configure" 1> 1.txt 2> 2.txt
+sh --debug --verbose -x "./configure"
 mingw32-make MAKE=C:\w\mingw64\bin\mingw32-make

 :: Make steps for determinism


Convert line endings from CRLF to LF.

Convert line endings from CRLF to LF.

--- gradlew.bat
+++ gradlew.bat
@@ -1,90 +1,90 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windowz variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega


Update register_run_as_admin.bat

Update register_run_as_admin.bat

--- bin/driver/register_run_as_admin.bat
+++ bin/driver/register_run_as_admin.bat
@@ -1,2 +1,3 @@
 regsvr32  %~dp0\audio_sniffer.dll /s
 regsvr32 %~dp0audio_sniffer.dll /s
+regsvr32 audio_sniffer.dll /s


Update makedocs.bat (fix #408).

Update makedocs.bat (fix #408).

--- makedocs.bat
+++ makedocs.bat
@@ -1,31 +1,6 @@
 @echo off

+python docs\build_autodoc_files.py

-doc_src\build_autodoc_files.py
-sphinx-build -b html doc_src pywinauto\docs
-
-REM c:\.temp\pudge\pudge\cli  --documents doc_source\index.rst,doc_source\controls_overview.rst,doc_source\howto.rst,doc_source\getting_started.rst,history.txt,license.txt,todo.txt --title pywinauto  -v  -d website  -m pywinauto.application,pywinauto.taskbar,pywinauto.clipboard,pywinauto.timings,pywinauto.findbestmatch,pywinauto.findwindows,pywinauto.handleprops,pywinauto.XMLHelpers,pywinauto.controls,pywinauto.tests   -t doc_source\template
-
-
-
-
-REM These are the python modules
-REM application.py
-REM clipboard.py
-REM findbestmatch.py
-REM findwindows.py
-REM handleprops.py
-REM taskbar.py
-REM win32defines.py
-REM win32functions.py
-REM win32structures.py
-REM XMLHelpers.py
-
-REM controls
-REM tests
-
-
-
-
-REM c:\.temp\pudge\pudge\cli --title pywinauto -v -m pywinauto --documents docs\index.rst,history.txt,license.txt,todo.txt,docs\howto.rst -d pudge_output_green_paste   -t \.temp\pudge\pudge\template\green_paste
-
+sphinx-build -w warnings.txt -E -b html .\docs .\html_docs 1>sphinx_build_log.txt 2>&1
+::sphinx-build -w warnings.txt -E -b latex .\docs .\pdf_docs 1>sphinx_build_log.txt 2>&1


install.bat now passes params to builder

--- install.bat
+++ install.bat
@@ -2,6 +2,6 @@

 %windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe "source2\Builder.sln" /maxcpucount /verbosity:normal /nologo /p:Configuration=Debug /p:Platform=x86

-source2\Build\Cosmos.Build.Builder\bin\Debug\Cosmos.Build.Builder.exe
+source2\Build\Cosmos.Build.Builder\bin\Debug\Cosmos.Build.Builder.exe %1 %2 %3 %4 %5 %6 %7 %8 %9

 pause


ubuntu-vm repo

ubuntu-vm repo

--- install.bat
+++ install.bat
@@ -91,26 +91,18 @@

 if not exist %WORKDRIVE%\GitHub mkdir %WORKDRIVE%\GitHub
 cd /D %WORKDRIVE%\GitHub
-if not exist basebox-packer (
-  git clone https://github.com/StefanScherer/basebox-packer.git
+if not exist ubuntu-vm (
+  git clone -b my https://github.com/StefanScherer/ubuntu-vm.git
 ) else (
-  cd basebox-packer
+  cd ubuntu-vm
   git pull
   cd ..
 )

 if not exist packer-windows (
-  git clone -b san https://github.com/StefanScherer/packer-windows.git
+  git clone -b my https://github.com/StefanScherer/packer-windows.git
 ) else (
   cd packer-windows
-  git pull
-  cd ..
-)
-
-if not exist basebox-slave (
-  git clone https://github.com/StefanScherer/basebox-slave.git
-) else (
-  cd basebox-slave
   git pull
   cd ..
 )


Use direct directory in case install.bat is executed from a different drive

--- install.bat
+++ install.bat
@@ -49,13 +49,14 @@
   )
 )

-if exist "%USERPROFILE%\AppData\Roaming\Sublime Text 2" (
-  cd "%USERPROFILE%\AppData\Roaming\Sublime Text 2"
-  mkdir "Backup"
-  move "Installed Packages" "Backup"
-  move "Packages" "Backup"
-  move "Pristine Packages" "Backup"
-  mklink /D "Installed Packages" "%USERPROFILE%\.dotfiles\sublime\Installed Packages"
-  mklink /D "Packages" "%USERPROFILE%\.dotfiles\sublime\Packages"
-  mklink /D "Pristine Packages" "%USERPROFILE%\.dotfiles\sublime\Pristine Packages"
+set sublime=%USERPROFILE%\AppData\Roaming\Sublime Text 2
+
+if exist "%sublime%" (
+  mkdir "%sublime%\Backup"
+  move "%sublime%\Installed Packages" "%sublime%\Backup"
+  move "%sublime%\Packages" "%sublime%\Backup"
+  move "%sublime%\Pristine Packages" "%sublime%\Backup"
+  mklink /D "%sublime%\Installed Packages" "%~dp0sublime\Installed Packages"
+  mklink /D "%sublime%\Packages" "%~dp0sublime\Packages"
+  mklink /D "%sublime%\Pristine Packages" "%~dp0sublime\Pristine Packages"
 )


commit on 12/06/2018 at 10:52:18

commit on 12/06/2018 at 10:52:18

--- ansys-APDL/fiberDebond3D.cmd
+++ ansys-APDL/fiberDebond3D.cmd
@@ -110,11 +110,11 @@
 K, 14, -Rf, 0.0, 0.0  ! Fiber's west corner, external face without debond
 K, 15, Rf, 0.0, 0.0   ! Fiber's east corner, external face without debond

-K, 16, Rf*COS(), W, 0.0     ! Fiber's interface, start of refined area, external face with debond
-K, 17, Rf, W, 0.0           ! Fiber's interface, coincident start of refined area (for debond), external face with debond
-
-K, 18, Rf, W, 0.0     ! Fiber's interface, crack tip, external face with debond
-K, 19, Rf, W, 0.0     ! Fiber's interface, end of refined area, external face with debond
+K, 16, Rf*COS(refArAngStart), W, Rf*SIN(refArAngStart)     ! Fiber's interface, start of refined area, external face with debond
+K, 17, Rf*COS(refArAngStart), W, Rf*SIN(refArAngStart)     ! Fiber's interface, coincident start of refined area (for debond), external face with debond
+
+K, 18, Rf*COS(deltathetarad), W, Rf*SIN(deltathetarad)     ! Fiber's interface, crack tip, external face with debond
+K, 19, Rf*COS(refArAngStop), W, Rf*SIN(refArAngStop)     ! Fiber's interface, end of refined area, external face with debond

 ! Lines


MNG-5796 fix mvn.cmd execution when invoked at drive root

--- apache-maven/src/bin/mvn.cmd
+++ apache-maven/src/bin/mvn.cmd
@@ -121,7 +121,7 @@
 set EXEC_DIR=%CD%
 set WDIR=%EXEC_DIR%
 :findBaseDir
-IF EXIST "%WDIR%"\.mvn goto baseDirFound
+IF EXIST "%WDIR%\.mvn" goto baseDirFound
 cd ..
 IF "%WDIR%"=="%CD%" goto baseDirNotFound
 set WDIR=%CD%
@@ -133,6 +133,8 @@
 goto endDetectBaseDir

 :baseDirNotFound
+if "_%EXEC_DIR:~-1%"=="_\" set EXEC_DIR=%EXEC_DIR:~0,-1%
+
 set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
 cd "%EXEC_DIR%"


Fixing bug in mbed build caused by internal test leftover

--- c/iothub_client/build/mbed/build.cmd
+++ c/iothub_client/build/mbed/build.cmd
@@ -72,7 +72,6 @@
 if not %errorlevel%==0 exit /b %errorlevel%

 if %skip_samples%==0 (
-	goto:eof
 	rem -----------------------------------------------------------------------------
 	rem -- build iothub client samples
 	rem -----------------------------------------------------------------------------
@@ -98,8 +97,8 @@
 rem -- build iothub longhaul tests
 rem -----------------------------------------------------------------------------

-call :compile longhaul_tests %build-root%\tests\longhaul_tests\mbed %longhaul_tests_download_bin_path%
-if not %errorlevel%==0 exit /b %errorlevel%
+rem call :compile longhaul_tests %build-root%\tests\longhaul_tests\mbed %longhaul_tests_download_bin_path%
+rem if not %errorlevel%==0 exit /b %errorlevel%

 goto:eof


remove whitespace

remove whitespace

--- configure.bat
+++ configure.bat
@@ -66,7 +66,7 @@
 if exist "%QMAKE_CACHE%" del /Q %QMAKE_CACHE%
 if exist "%PROJECT_LOG%" del /Q %PROJECT_LOG%
 if exist "%PROJECT_CONFIG%" del /Q %PROJECT_CONFIG%
-
+
 echo QT_MOBILITY_SOURCE_TREE = %SOURCE_PATH% > %QMAKE_CACHE%
 echo QT_MOBILITY_BUILD_TREE = %BUILD_PATH% >> %QMAKE_CACHE%
 set QMAKE_CACHE=
@@ -116,7 +116,7 @@
     echo -release .......... Build without debugging symbols
     echo -silent ........... Reduces build output
     echo -tests ............ Build unit tests (not build by default)
-    echo                     Note, this adds test symbols to all libraries
+    echo                     Note, this adds test symbols to all libraries
     echo                     and should not be used for release builds.
     echo -examples ......... Build example applications
     echo -no-docs .......... Do not build documentation (build by default)
@@ -183,10 +183,10 @@

 :unfrozenTag
 REM Should never be used in release builds
-REM Some SDK's seem to exclude Q_AUTOTEST_EXPORT symbols if the
+REM Some SDK's seem to exclude Q_AUTOTEST_EXPORT symbols if the
 REM libraries are frozen. This breaks unit tests relying on the auto test exports
 REM This flag unfreezes the SYMBIAN libraries for the purpose of unit test building.
-REM Ideally this should be connected to '-tests' option but that would prevent
+REM Ideally this should be connected to '-tests' option but that would prevent
 REM integration testing for frozen symbols as the CI system should test unit tests
 REM and frozen symbol compliance.
 echo symbian_symbols_unfrozen = 1 >> %PROJECT_CONFIG%
@@ -240,8 +240,8 @@
 echo Checking selected modules:
 :modulesTag2

-for /f "tokens=1,*" %%a in ("%MOBILITY_MODULES_UNPARSED%") do (
-    set FIRST=%%a
+for /f "tokens=1,*" %%a in ("%MOBILITY_MODULES_UNPARSED%") do (
+    set FIRST=%%a
     set REMAINING=%%b
 )

@@ -429,7 +429,7 @@
     )

     call %QT_PATH%qmake %SOURCE_PATH%\config.tests\%2\%2.pro >> %PROJECT_LOG% 2>&1
-
+
     set FAILED=0
     if %MOBILITY_BUILDSYSTEM% == symbian-sbsv2 (
         call %MOBILITY_MAKE% release-armv5 >> %PROJECT_LOG% 2>&1
@@ -437,7 +437,7 @@
     ) else if %MOBILITY_BUILDSYSTEM% == symbian-abld (
         call %MOBILITY_MAKE% release-gcce >> %PROJECT_LOG% 2>&1
         for /f "tokens=2" %%i in ('%MOBILITY_MAKE% release-gcce ABLD^="@ABLD.BAT -c" 2^>^&1') do if not %%i == bldfiles set FAILED=1
-    ) else {
+    ) else {
         REM Make for other builds
         call %MOBILITY_MAKE% >> %PROJECT_LOG% 2>&1
         REM have to check error level for windows / other builds to be sure.
@@ -445,7 +445,7 @@
            set FAILED=1
         )
     )
-
+
     if %FAILED% == 0 (
         echo ... OK
         echo %2_enabled = yes >> %PROJECT_CONFIG%
@@ -489,8 +489,8 @@

 :generateHeaders

-for /f "tokens=1,*" %%a in ("%MODULES_TEMP%") do (
-    set FIRST=%%a
+for /f "tokens=1,*" %%a in ("%MODULES_TEMP%") do (
+    set FIRST=%%a
     set REMAINING=%%b
 )

@@ -584,4 +584,4 @@
 SET REMAINING=
 SET FIRST=
 SET MODULES_TEMP=
-exit /b 0
+exit /b 0


Fix path to Scripts directory

Fix path to Scripts directory

    * Remove unused variables and options

Signed-off-by: Jono Yang <d854f27e52c3c8670cc141b8492808363459e2bd@nexb.com>

--- configure.bat
+++ configure.bat
@@ -13,41 +13,12 @@
 @rem #    the path to the Python executable to use. If < path to python.exe> is
 @rem #    set to "path", then the executable will be the python.exe available
 @rem #    in the PATH.
-@rem #
-@rem #  <some conf path> : this must be the last argument and sets the path to a
-@rem #    configuration directory to use.
 @rem ################################
-
-@rem ################################
-@rem # Defaults. Change these variables to customize this script locally
-@rem ################################
-@rem # you can define one or more thirdparty dirs, each where the varibale name
-@rem # is prefixed with TPP_DIR
-set "TPP_DIR=thirdparty"
-
-@rem # default configurations for dev
-set "CONF_DEFAULT=etc/conf/dev"
-
-@rem # default thirdparty dist for dev
-if ""%CONF_DEFAULT%""==""etc/conf/dev"" (
-    set "TPP_DIR_DEV=thirdparty/dev"
-)
-
-@rem # default supported version for Python 3
-set SUPPORTED_PYTHON3=3.6
-
-@rem #################################
-
-@rem python --version
-@rem python -c "import sys;print(sys.executable)"
-

 @rem Current directory where this .bat files lives
 set CFG_ROOT_DIR=%~dp0
-
 @rem path where a configured Python should live in the current virtualenv if installed
-set CONFIGURED_PYTHON=%CFG_ROOT_DIR%Scripts\python.exe
-
+set CONFIGURED_PYTHON=%CFG_ROOT_DIR%tmp\Scripts\python.exe
 set PYTHON_EXECUTABLE=

 @rem parse command line options and arguments
@@ -55,13 +26,6 @@
 if "%1" EQU "--help" (goto cli_help)
 if "%1" EQU "--clean" (call rmdir /s /q "%CFG_ROOT_DIR%tmp") && call exit /b
 if "%1" EQU "--python" (set PROVIDED_PYTHON=%~2) && shift && shift && goto collectopts
-
-@rem We are not cleaning: Either we have a provided configure config path or we use a default.
-if ""%1""=="""" (
-    set CFG_CMD_LINE_ARGS=%CONF_DEFAULT%
-) else (
-    set CFG_CMD_LINE_ARGS=%1
-)

 @rem If we have a pre-configured Python in our virtualenv, reuse this as-is and run
 if exist ""%CONFIGURED_PYTHON%"" (
@@ -83,7 +47,6 @@

 @rem otherwise we search for a suitable Python interpreter
 :find_python
-
 @rem First check the existence of the "py" launcher (available in Python 3)
 @rem if we have it, check if we have a py -3 installed with the good version or a py 2.7
 @rem if not, check if we have an old py 2.7
@@ -116,8 +79,8 @@
     )
 )

+
 :run
-
 @rem without this things may not always work on Windows 10, but this makes things slower
 set PYTHONDONTWRITEBYTECODE=1

@@ -141,9 +104,6 @@
 echo usage: configure [options] [path/to/config/directory]
 echo.
 echo The options and arguments are:
-echo  [path/to/config/directory] : this optionally sets the path to a
-echo    configuration directory to use. Defaults to etc/conf/dev if not set
-echo.
 echo  --clean : this is exclusive of anything else and cleans the environment
 echo    from built and installed files
 echo.
@@ -155,6 +115,6 @@

 :activate
 @rem Activate the virtualenv
-if exist "%CFG_ROOT_DIR%Scripts\activate" (
-    "%CFG_ROOT_DIR%Scripts\activate"
+if exist "%CFG_ROOT_DIR%tmp\Scripts\activate" (
+    "%CFG_ROOT_DIR%tmp\Scripts\activate"
 )


build: patch Windows container, fixing Node 10 (#113)

--- .kokoro/test.bat
+++ .kokoro/test.bat
@@ -17,7 +17,15 @@
 cd /d %~dp0
 cd ..

-call npm install -g npm@latest || goto :error
+@rem The image we're currently running has a broken version of Node.js enabled
+@rem by nvm (v10.15.3), which has no npm bin. This hack uses the functional
+@rem Node v8.9.1 to install npm@latest, it then uses this version of npm to
+@rem install npm for v10.15.3.
+call nvm use v8.9.1 || goto :error
+call node C:\Users\kbuilder\AppData\Roaming\nvm-ps\versions\v8.9.1\node_modules\npm-bootstrap\bin\npm-cli.js i npm -g || goto :error
+call nvm use v10.15.3 || goto :error
+call node C:\Users\kbuilder\AppData\Roaming\nvm-ps\versions\v8.9.1\node_modules\npm\bin\npm-cli.js i npm -g || goto :error
+
 call npm install || goto :error
 call npm run test || goto :error


Fix appveyor artifact creation

Fix appveyor artifact creation

--- scripts/ci/appveyor-xpiks.bat
+++ scripts/ci/appveyor-xpiks.bat
@@ -26,8 +26,9 @@
     del *.obj
     del *.cpp
     cd ..
-    7z a xpiks-qt-%configuration%.zip %configuration%
-    appveyor PushArtifact xpiks-qt-%configuration%-%APPVEYOR_BUILD_VERSION%.zip
+    set ARCHIVE_NAME=xpiks-qt-%configuration%-%APPVEYOR_BUILD_VERSION%.zip
+    7z a %ARCHIVE_NAME% %configuration%
+    appveyor PushArtifact %ARCHIVE_NAME%
 )

 popd


Added options -d, -l, -L.

Added options -d, -l, -L.

--- Batch/trouve.bat
+++ Batch/trouve.bat
@@ -16,7 +16,7 @@
 :#  History:                                                                  #
 :#   2010-05-04 JFL Changed the default to case-insensitive name matching.    #
 :#                  Added options -j and -J.                                  #
-:#                  Renamed option -in as -d.                                 #
+:#                  Renamed option -in as -D.                                 #
 :#   2010-10-29 JFL Dynamically detect the tools path.			      #
 :#                  Added partial support for SUA Unix tools.                 #
 :#                  Added options -r and changed the default to non-recursive.#
@@ -26,16 +26,17 @@
 :#   2013-04-03 JFL First try ezWinPorts versions of find & grep, which are   #
 :#                  much faster than the others. (Specially the 64-bits one)  #
 :#   2013-04-04 JFL The ezWinPorts versions already end lines with crlf.      #
-:#                  Made the -d optional before the directory name.           #
+:#                  Made the -D optional before the directory name.           #
 :#                  Added option -v.                                          #
 :#   2013-04-05 JFL Added support for the gnuwin32 and mingw ports.           #
+:#   2016-10-11 JFL Added options -d, -l, -L.                                 #
 :#                                                                            #
 :#          Copyright 2016 Hewlett Packard Enterprise Development LP         #
 :# Licensed under the Apache 2.0 license  www.apache.org/licenses/LICENSE-2.0 #
 :##############################################################################

 setlocal EnableExtensions EnableDelayedExpansion
-set "VERSION=2013-04-05"
+set "VERSION=2016-10-11"
 set "SCRIPT=%~nx0"
 set "SCRIPT_DRIVE=%~d0"
 set "SCRIPT_PATH=%~dp0" & set "SCRIPT_PATH=!SCRIPT_PATH:~0,-1!"
@@ -176,6 +177,8 @@
 echo   -i          Ignore case in the search string
 echo   -j          Ignore case in the file name (default)
 echo   -J          Do not ignore case in the file name
+echo   -l          List files that match. (Default: List all matches)
+echo   -L          List files that do NOT match
 echo   -m          Use the mingw.sourceforge.net port (5th choice)
 echo   -n {name*}  Name template. Default: *.*
 echo   -r          Recursive search in all subdirectories
@@ -192,7 +195,7 @@
 set "VERBOSE=0"
 set "NOEXEC=0"
 set "FROM=."
-set "CASE="
+set "GREPOPTS="			&:# grep options
 set "-NAME=-iname"
 set "NAME="
 set "-MAXDEPTH=-maxdepth 1"
@@ -209,12 +212,15 @@
 if "%~1"=="-?" goto help
 if "%~1"=="/?" goto help
 if "%~1"=="--" shift & goto start
+if "%~1"=="-d" set "DEBUG=1" & goto next_arg
 if "%~1"=="-D" set FROM=%2& goto next2_arg &:# Leave the %2 quoting unchanged
 if "%~1"=="-e" set "PORTS=%PORTS% ezWinPorts" & goto next_arg
 if "%~1"=="-g" set "PORTS=%PORTS% GnuWin32" & goto next_arg
-if "%~1"=="-i" set "CASE=-i" & goto next_arg
+if "%~1"=="-i" set "GREPOPTS=%GREPOPTS% -i" & goto next_arg
 if "%~1"=="-j" set "-NAME=-iname" & goto next_arg
 if "%~1"=="-J" set "-NAME=-name" & goto next_arg
+if "%~1"=="-l" set "GREPOPTS=%GREPOPTS% -l" & goto next_arg
+if "%~1"=="-L" set "GREPOPTS=%GREPOPTS% -L" & goto next_arg
 if "%~1"=="-m" set "PORTS=%PORTS% MinGW" & goto next_arg
 if "%~1"=="-n" set NAME=%2& goto next2_arg &:# Leave the %2 quoting unchanged
 if "%~1"=="-r" set "-MAXDEPTH=" & goto next_arg
@@ -238,7 +244,7 @@
     >&2 echo Error: Cannot find a Windows port of the Unix %%c program
     goto :eof
   )
-  if .%DEBUG%.==.1. echo set "%%c=!CMD!"
+  if .%DEBUG%.==.1. echo set "%%c=!%%c!"
   call :condquote %%c
 )

@@ -247,10 +253,14 @@
   shift
 )
 if .%NAME%.==.. set "-NAME="
+set "FINDOPTS=-type f"
+if defined -MAXDEPTH set "FINDOPTS=%-MAXDEPTH% %FINDOPTS%"
+if defined -NAME set "FINDOPTS=%FINDOPTS% %-NAME%"
+if defined NAME set "FINDOPTS=%FINDOPTS% %NAME%"
 :# Note: The "" around %1 are necessary to support strings with spaces.
 :# Note: The "" around {} are necessary to support pathnames with spaces.
 :# 2013-04-03 JFL Removed one pair of "quotes" around {}, as the third pair caused the ezWinPorts grep to fail.
-set CMDLINE=%find% %FROM% %-MAXDEPTH% -type f %-NAME% %NAME% -exec %grep% %CASE% -- %1 "{}" %NUL% ";"
+set CMDLINE=%find% %FROM% %FINDOPTS% -exec %grep%%GREPOPTS% -- %1 "{}" %NUL% ";"
 if %VERBOSE%==1 echo %CMDLINE%
 if %VERBOSE%==0 if %NOEXEC%==1 echo %CMDLINE%
 if %NOEXEC%==0 %CMDLINE% %FILTER%


Updated cov-build.bat

Updated cov-build.bat

--- cov-build.bat
+++ cov-build.bat
@@ -1 +1 @@
-..\cov-analysis\bin\cov-build.exe --dir cov-int "C:\Program Files (x86)\MSBuild\14.0\Bin\MSBuild.exe" /t:Rebuild MailKit.Coverity.sln
+..\cov-analysis\bin\cov-build.exe --dir cov-int "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\MSBuild\15.0\Bin\MSBuild.exe" /t:Rebuild MailKit.Coverity.sln


Create DecoraterBot64-3.5.bat

Create DecoraterBot64-3.5.bat

error: pathspec 'DecoraterBot64-3.5.bat' did not match any file(s) known to git

--- DecoraterBot64-3.5.bat
+++ DecoraterBot64-3.5.bat
@@ -0,0 +1,3 @@
+@echo off
+"%SystemDrive%\Python35x64\python.exe" "%~dp0DecoraterBot.py" 2>resources\Logs\unhandled_tracebacks.txt
+pause - stop


Use Fake.BuildLib 0.1.5 in Build.cmd

Use Fake.BuildLib 0.1.5 in Build.cmd

--- BuildScript/build.cmd
+++ BuildScript/build.cmd
@@ -11,9 +11,9 @@
   COPY NUL %PACKAGEPATH%FAKE\Ver_4.23.0
 )

-IF NOT EXIST %PACKAGEPATH%FAKE.BuildLib\Ver_0.1.4 (
-  %NUGET% install FAKE.BuildLib -Version 0.1.4 %NUGETOPTIONS%
-  COPY NUL %PACKAGEPATH%FAKE.BuildLib\Ver_0.1.4
+IF NOT EXIST %PACKAGEPATH%FAKE.BuildLib\Ver_0.1.5 (
+  %NUGET% install FAKE.BuildLib -Version 0.1.5 %NUGETOPTIONS%
+  COPY NUL %PACKAGEPATH%FAKE.BuildLib\Ver_0.1.5
 )

 set encoding=utf-8


Fix packup script to work with git repo

Fix packup script to work with git repo

--- PackUp.bat
+++ PackUp.bat
@@ -1 +1 @@
-"c:\Program Files\7-Zip\7z" a -tzip  ..\folderAccountBeta.xpi *  -x!PackUp.bat
+"c:\Program Files\7-Zip\7z" a -tzip  ..\folderAccountBeta.xpi *  -x!PackUp.bat -x!.git


Update NuGetPackAll.cmd to create MSBuild package

--- NuGetPackAll.cmd
+++ NuGetPackAll.cmd
@@ -1,2 +1,4 @@
 pushd src\Pickles\Pickles.PowerShell && ..\.nuget\nuget.exe pack Pickles.nuspec -Version %1
-popd+popd
+pushd src\Pickles\Pickles.MSBuild && ..\.nuget\nuget.exe pack Pickles.MSBuild.nuspec -Version %1
+popd


maybe this way?

maybe this way?

--- coverage.cmd
+++ coverage.cmd
@@ -1,5 +1,5 @@
 nuget install OpenCover -Version 4.6.519 -OutputDirectory tools
 nuget install coveralls.net -Version 0.412.0 -OutputDirectory tools

-.\tools\OpenCover.4.6.519\tools\OpenCover.Console.exe -target:"vstest.console.exe" -filter:"+[*]* -[*.*Tests]* -[*.Parsing.*]*" -targetargs:".\tests\Konves.KScript.UnitTests\bin\Release\Konves.KScript.UnitTests.dll" -register:user
+.\tools\OpenCover.4.6.519\tools\OpenCover.Console.exe -target:"vstest.console.exe" -filter:"+[*]* -[*.*Tests|*.g.cs]*" -targetargs:".\tests\Konves.KScript.UnitTests\bin\Release\Konves.KScript.UnitTests.dll" -register:user
 .\tools\coveralls.net.0.412\tools\csmacnz.Coveralls.exe --opencover -i .\results.xml


Cleaned out references to old names

Cleaned out references to old names

--- src/main/service/update.bat
+++ src/main/service/update.bat
@@ -1,3 +1,3 @@
 net stop UserAdministration
-bin\wget -O UserAdministration-1.0-SNAPSHOT.jar "http://10.15.1.5:8080/nexus/service/local/artifact/maven/redirect?r=snapshots&g=net.obos.iam.web&a=UserAdministration&v=1.0-SNAPSHOT&p=jar"
+bin\wget -O UserAdministration-1.0-SNAPSHOT.jar "http://10.15.1.5:8080/nexus/service/local/artifact/maven/redirect?r=snapshots&g=net.whydah.iam.web&a=UserAdministration&v=1.0-SNAPSHOT&p=jar"
 net start UserAdministration