Bring Windows launch script in line with Unix scripts

Untested. Use at your own risk.

--- scripts/Windows/MoneroWallet.bat
+++ scripts/Windows/MoneroWallet.bat
@@ -9,17 +9,49 @@

 @echo off
 cls
-set FILE=ChromeWallet.bin
+set WALLET_FILENAME=wallet.bin
+set PROGRAM_DIR=C:\Program Files\MoneroWallet

 echo.
 echo ====================================================================================
-echo                             Monero Simplewallet Launcher
+echo                       Monero Simplewallet Launcher for Windows
 echo.
 echo Copyright (c) 2016 bigreddmachine.
 echo Released under the MIT License as part of Monero Wallet for Chrome.
 echo https://github.com/monero-monitor/monero-wallet-chrome
 echo ====================================================================================
 echo.
+
+set WALLET_DIR=%PROGRAM_DIR%\wallet
+IF not exist %WALLET_DIR% (mkdir %WALLET_DIR%)
+set FILE=%WALLET_DIR%\%WALLET_FILENAME%
+
+echo Which Monero daemon would you like to connect to?
+echo   1. remote (node.moneroclub.com:8880)
+echo   2. local  (127.0.0.1:18081)
+echo   3. custom
+echo.
+set /p DAEMON=Please make a selection:
+
+if NOT %DAEMON% == 1 if NOT %DAEMON% == 2 if NOT %DAEMO% == 3 (
+    set -p exitinput=Invalid daemon selection. Press enter to quit.
+    exit
+)
+
+if %DAEMON% == 1 (
+    set USE_DAEMON=node.moneroclub.com:8880
+)
+if %DAEMON% == 2 (
+    set USE_DAEMON=127.0.0.1:18081
+)
+if %DAEMON% == 3 (
+    set /p USE_DAEMON=Please enter custom daemon (ex: 192.168.0.1:18081):
+)
+
+echo.
+echo ----------------------
+echo.
+

 if exist %FILE% (
     REM If this script has been run previously, a wallet should already exist. Start it in RPC mode.
@@ -28,33 +60,21 @@
     echo.
     set /p PASS=Please enter your password:

-    start "simplewallet --wallet-file %FILE% --password %PASS% --rpc-bind-ip 127.0.0.1 --rpc-bind-port 18082"
-
     echo Launching simplewallet...
     echo.
-    sleep 3
-    echo ----------------------

+    start "%PROGRAM_DIR%\simplewallet --wallet-file %FILE% --password %PASS% --rpc-bind-ip 127.0.0.1 --rpc-bind-port 18082 --daemon-address %USE_DAEMON%"
+
+    echo Simplewallet should now be running in RPC mode. You can verify this by checking if
+    echo your Chrome extension says "online". It may take a few seconds for the wallet to
+    echo connect to simplewallet. If it fails to come online, please check your password
+    echo and try again.
     echo.
-    echo Returning wallet address:
+    echo To shutdown simplewallet, choose 'Stop Wallet' in the extension's menu.
+    echo.
+    echo Thank you for using Monero Wallet for Chrome! You may now close this window.
+    echo.

-    if (curl --fail -X POST http://127.0.0.1:18082/json_rpc -d '{"jsonrpc":"2.0","id":"0","method":"getaddress"}' -H 'Content-Type: application/json'; then
-
-        echo.
-        echo.
-        echo Simplewallet is now running in RPC mode. To shutdown simplewallet, choose 'Stop Wallet' in the extension's menu.
-        echo.
-        echo Thank you for using Monero Wallet for Chrome! You may now close this window.
-        echo.
-
-    ) else (
-
-        echo.
-        echo Please check if your extension shows that simplewallet online. If not,
-        echo please check your password and try again.
-        echo.
-
-    )
 ) else (
     REM The first time this script is run, open the command line wallet.

@@ -73,20 +93,32 @@
     echo.
     echo ----------
     set /p NEWPASS=Please pick a password for your new wallet:
+    echo.
+    set /p CONFIRM_NEWPASS=Confirm password:
+    if NOT %NEWPASS% == %CONFIRM_NEWPASS% (
+        echo Your passwords do not match. Please restart the script and try again.
+        echo.
+        set /p userinput=Press "enter" to exit.
+        exit
+    )
     echo ----------
     echo.

-    simplewallet --generate-new-wallet %FILE% --password %NEWPASS%
+    %PROGRAM_DIR%\simplewallet --generate-new-wallet %FILE% --password %NEWPASS%  --daemon-address %USE_DAEMON%

     echo.
     echo ----------
     echo.

     if exist %FILE% (
-        echo   Everything looks good. You can now start your wallet in RPC mode at any time by re-running this script.
+        echo Everything looks good. You can now start your wallet in RPC mode at any time by re-running this script.
         echo.
-        echo   Closing Monero Simplewallet Launcher...
+        set /p userinput=Press "enter" to exit Monero Simplewallet Launcher.
+    ) else (
+        echo There seems to have been an issue creating your wallet.
         echo.
-        echo.
+        set /p userinput=Press "enter" to exit.
     )
-)+)
+
+echo.


disable fsharp pending perl fix

disable fsharp pending perl fix

--- appveyor-build.cmd
+++ appveyor-build.cmd
@@ -76,8 +76,10 @@
 @echo on

 pushd tests
-call RunTests.cmd debug fsharp Smoke
-@if ERRORLEVEL 1 echo Error: 'RunTests.cmd debug fsharpqa Smoke' failed && goto :eof
+
+REM Disabled while working out perl problem, see https://github.com/Microsoft/visualfsharp/pull/169
+REM call RunTests.cmd debug fsharp Smoke
+REM @if ERRORLEVEL 1 echo Error: 'RunTests.cmd debug fsharpqa Smoke' failed && goto :eof

 REM Disabled while working out perl problem, see https://github.com/Microsoft/visualfsharp/pull/169
 REM call RunTests.cmd debug fsharpqa Smoke


Fixed full path issue

Fixed full path issue

--- cibuild.cmd
+++ cibuild.cmd
@@ -67,7 +67,7 @@
 call :TerminateBuildProcesses

 if defined TestDeterminism (
-    powershell -noprofile -executionPolicy RemoteSigned -command "%RoslynRoot%\build\scripts\test-determinism.ps1 %RoslynRoot%\%bindir%\Bootstrap" || goto :BuildFailed
+    powershell -noprofile -executionPolicy RemoteSigned -command "%RoslynRoot%\build\scripts\test-determinism.ps1 %bindir%\Bootstrap" || goto :BuildFailed
     exit /b 0
 )


add correct script search location (#17276)

* add correct script search location

* escape

--- cibuild.cmd
+++ cibuild.cmd
@@ -116,7 +116,7 @@

     call :TerminateBuildProcesses || goto :BuildFailed

-    .\Binaries\%BuildConfiguration%\Exes\Perf.Runner\Roslyn.Test.Performance.Runner.exe --no-trace-upload !EXTRA_PERF_RUNNER_ARGS! || goto :BuildFailed
+    .\Binaries\%BuildConfiguration%\Exes\Perf.Runner\Roslyn.Test.Performance.Runner.exe  --search-directory=".\\Binaries\\%BuildConfiguration%\\Dlls\\Perf.Tests\\" --no-trace-upload !EXTRA_PERF_RUNNER_ARGS! || goto :BuildFailed
     exit /b 0
 )


Adjust to version change of Commons IO

Adjust to version change of Commons IO

git-svn-id: 102839466c3b40dd9c7e25c0a1a6d26afc40150a@196594 13f79535-47bb-0310-9956-ffa450edef68

--- fop.bat
+++ fop.bat
@@ -11,7 +11,7 @@
 set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\xalan-2.4.1.jar
 set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\batik.jar
 set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\avalon-framework-4.1.4.jar
-set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\commons-io-1.0-dev.jar
+set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\commons-io-dev-20030703.jar
 set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\jimi-1.0.jar
 set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\jai_core.jar
 set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\jai_codec.jar


# GG-7633 gg scripts do not work

# GG-7633 gg scripts do not work

--- bin/ggvisorcmd.bat
+++ bin/ggvisorcmd.bat
@@ -81,7 +81,7 @@
 call "%GRIDGAIN_HOME%\os\bin\include\setenv.bat"

 set CP=%GRIDGAIN_LIBS%;%GRIDGAIN_HOME%\%ANT_AUGMENTED_GGJAR%
-
+set CP=%CP%;%GRIDGAIN_HOME%\os\modules\visor-console\libs\*
 ::
 :: Parse command line parameters.
 ::


Fix Path

Fix Path

[#114532269]

Signed-off-by: Jeff Pak <9d750c79dc1952140f693c4bda214b11dba3d64d@emc.com>

--- ci/tasks/cats-windows-diego.bat
+++ ci/tasks/cats-windows-diego.bat
@@ -4,7 +4,7 @@

 SET PATH=C:\Go\bin;%PATH%
 SET PATH=C:\Program Files\Git\cmd\;%PATH%
-SET PATH=%GOPATH%\bin;%PATH
+SET PATH=%GOPATH%\bin;%PATH%
 SET PATH=C:\Program Files\GnuWin32\bin;%PATH%
 SET PATH=C:\Program Files\cURL\bin;%PATH%
 SET PATH=%CD%;%PATH%


Edited to work with McStas miniconda3

Edited to work with McStas miniconda3

--- compile.bat
+++ compile.bat
@@ -1,9 +1,13 @@
+@echo off
+setlocal
+PATH=C:\mcstas-2.4.1\miniconda3\Scripts;%PATH%
+@echo on
 pyinstaller ^
 	--distpath=./__TEMP__/dist ^
 	--workpath=./__TEMP__/build ^
+	--specpath=./__TEMP__/ ^
 	--noconfirm ^
 	--clean ^
 	--onefile ^
-	--specpath=./__TEMP__/ ^
 	--icon=./icon.ico ^
 	SWINE.py


Update build script

Update build script

--- compile.bat
+++ compile.bat
@@ -1,3 +1,3 @@
-ghc --make site.hs
+ghc --make site.hs -O3
 upx site.exe --best
 pause


fix path

fix path

--- build/buildPDF.cmd
+++ build/buildPDF.cmd
@@ -5,7 +5,7 @@

 REM Put Tex in Path
 REM You can also use %TEMP% but it is cleared on site restart. Tools is persistent.
-SET PATH=%PATH%;D:\home\site\deployments\tools\t\miktex-portable\miktex\bin
+SET PATH=%PATH%;D:\home\site\deployments\tools\t\miktex-portable\texmfs\install\miktex\bin

 REM I am in the repository folder
 pushd D:\home\site\deployments\tools


1.2.0

--- Scripts/buildpackpush.bat
+++ Scripts/buildpackpush.bat
@@ -5,7 +5,7 @@

 CALL Scripts\buildpack %VERSION%
 ECHO buildpack done
-%NUGET% push .\Release\Mapsui.%VERSION%.nupkg -source nuget.org
+ECHO %NUGET% push .\Release\Mapsui.%VERSION%.nupkg -source nuget.org
 ECHO nuget push done
 git commit -m %VERSION% -a
 ECHO git commit done


script: build and test all

script: build and test all

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

--- build_test_all.cmd
+++ build_test_all.cmd
@@ -0,0 +1,16 @@
+cd obridge-main
+call mvn clean package assembly:single
+
+pause
+
+cd ..
+cd obridge-maven-plugin
+call mvn clean package install
+
+pause
+
+cd ..
+cd obridge-generator-test
+call mvn clean package
+
+pause


New Installation Scripts

New Installation Scripts

--- Windows/install_oasys.bat
+++ Windows/install_oasys.bat
@@ -50,8 +50,8 @@

 echo Installing Oasys...

+start /wait /b cmd /c %cd%\aux_bin\install_libraries.bat
 start /wait /b cmd /c %cd%\aux_bin\create_oasys_icon.bat
-start /wait /b cmd /c %cd%\aux_bin\install_libraries.bat

 echo --------------------------------------------------------------
 echo Oasys installation completed!
@@ -62,4 +62,4 @@

 :batch_exit

-exit \b+exit \b


Add search-rg integration tests to windows

--- scripts/test-integration.bat
+++ scripts/test-integration.bat
@@ -18,6 +18,9 @@
 call .\scripts\code.bat $%~dp0\..\extensions\emmet\test-fixtures --extensionDevelopmentPath=%~dp0\..\extensions\emmet --extensionTestsPath=%~dp0\..\extensions\emmet\out\test --disableExtensions --user-data-dir=%VSCODEUSERDATADIR% .
 if %errorlevel% neq 0 exit /b %errorlevel%

+call .\scripts\code.bat $%~dp0\..\extensions\search-rg\test-fixtures --extensionDevelopmentPath=%~dp0\..\extensions\search-rg --extensionTestsPath=%~dp0\..\extensions\search-rg\out\test --disableExtensions --user-data-dir=%VSCODEUSERDATADIR% .
+if %errorlevel% neq 0 exit /b %errorlevel%
+
 :: Integration & performance tests in AMD
 call .\scripts\test.bat --runGlob **\*.integrationTest.js %*
 if %errorlevel% neq 0 exit /b %errorlevel%


Added a system property for not monitoring the P2P service node with ic2d.

git-svn-id: 9146c88ff6d39b48099bf954d15d68f687b3fa69@2709 28e8926c-6b08-0410-baaa-805c5e19b8d6

error: pathspec 'scripts/windows/p2p/ic2d.bat' did not match any file(s) known to git

--- scripts/windows/p2p/ic2d.bat
+++ scripts/windows/p2p/ic2d.bat
@@ -0,0 +1,20 @@
+@echo off
+echo.
+echo --- ic2d ---------------------------------------------
+
+goto doit
+
+:usage
+echo.
+goto end
+
+
+:doit
+SETLOCAL
+call init.bat
+%JAVA_CMD%  -Dproactive.ic2d.hidep2pnode=true org.objectweb.proactive.ic2d.IC2D
+ENDLOCAL
+
+:end
+echo.
+echo -----------------------------------------------------------------


Set value for a reference given a variable

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

--- set-ref.bat
+++ set-ref.bat
@@ -0,0 +1,18 @@
+@ECHO OFF
+:USAGE
+:START
+:INITIALIZE
+    SETLOCAL ENABLEDELAYEDEXPANSION
+    SET BASE_DIR=%~DP0
+    SET IN_VAR_NAME=%1
+    SET IN_VALUE=%2
+
+:CODE
+    SET GLOBALS_FILE=%BASE_DIR%\globals.txt
+    SET REFERENCE=!%IN_VAR_NAME%!
+    CALL SET-GLOBAL %GLOBALS_FILE% %REFERENCE% %IN_VALUE%
+
+:RETURN
+    ENDLOCAL
+
+:EOF


Adding cpplint.bat to depot_tools.

Adding cpplint.bat to depot_tools.

so you can type only cpplint in console like the other scripts(gclient, gcl, etc)

BUG=None
TEST=None

Patch contributed by thiago.farina@gmail.com

git-svn-id: bd64dd6fa6f3f0ed0c0666d1018379882b742947@22576 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

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

--- cpplint.bat
+++ cpplint.bat
@@ -0,0 +1,4 @@
+@echo off
+:: This is required with cygwin only.
+PATH=%~dp0;%PATH%
+call python "%~dp0cpplint.py" %*


add nuget package publishing script

add nuget package publishing script

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

--- push-to-nuget.bat
+++ push-to-nuget.bat
@@ -0,0 +1,2 @@
+cd C:\projects\resin\src\Sir.Search\bin\Release
+dotnet nuget push Resin.Search.0.4.0.4.nupkg --api-key [apikey] --source https://api.nuget.org/v3/index.json


removed client batch file

removed client batch file

--- solidity/python/mongo/Client.bat
+++ solidity/python/mongo/Client.bat
@@ -1,2 +0,0 @@
-"%PROGRAMFILES%\MongoDB\Server\3.4\bin\mongo"
-pause


Fix conversion bat

Fix conversion bat

--- d2moddin/routine/php/convert.bat
+++ d2moddin/routine/php/convert.bat
@@ -1,2 +1,2 @@
-dos2unix 15mins.php
+dos2unix *
 @PAUSE


postinstall.cmd: Don't dedupe if NO_APM_DEDUPE set (#912)

This environment var is already used for this purpose on Linux/macOS.
We should respect this env var on Windows too.

--- script/postinstall.cmd
+++ script/postinstall.cmd
@@ -10,6 +10,11 @@
 echo ^>^> Rebuilding apm dependencies with bundled Node !bundledVersion!
 call .\bin\npm.cmd rebuild

-echo.
-echo ^>^> Deduping apm dependencies
-call .\bin\npm.cmd dedupe
+if defined NO_APM_DEDUPE (
+    echo.
+    echo ^>^> Deduplication disabled
+) else (
+    echo.
+    echo ^>^> Deduping apm dependencies
+    call .\bin\npm.cmd dedupe
+)


copy exe into tilemill to deploy

copy exe into tilemill to deploy

--- vcbuild.bat
+++ vcbuild.bat
@@ -1,2 +1,3 @@
 @rem msbuild cefclient.vcxproj /t:clean /p:Configuration=Release /p:Platform=Win32
-msbuild cefclient.vcxproj /p:Configuration=Release /p:Platform=Win32+msbuild cefclient.vcxproj /p:Configuration=Release /p:Platform=Win32
+copy Release\cefclient.exe ..\tilemill\node_modules\topcube\cefclient\cefclient.exe


makezip.bat fixes.

makezip.bat fixes.

--- makezip.bat
+++ makezip.bat
@@ -1,8 +1,8 @@
 @echo off
-rem
+rem Repack the installer contents into a ZIP archive.

 mkdir .\unpacked
-msiexec /a CormanLispInstaller.msi /qb TARGETDIR="%~dp0unpacked"
+msiexec /a CormanLispInstaller.msi /qn TARGETDIR="%~dp0unpacked"
 del CormanLispBinaries.zip
 powershell Compress-Archive -Path \"%~dp0unpacked\Corman Lisp\" -DestinationPath \"%~dp0CormanLispBinaries.zip\"
 rd /s /q .\unpacked


script to rebuild js packages

script to rebuild js packages

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

--- build-js.bat
+++ build-js.bat
@@ -0,0 +1,17 @@
+@echo off
+
+echo Building NUI via OneScript...
+call .\vendor\bin\nether-onescript build .\vendor\netherjs\nui\onescript.json
+
+echo Copying NUI.JS to public web...
+call copy .\vendor\netherjs\nui\dist\nui.js .\www\share\other\src\js\200-nui.js
+
+echo COPYING NUI.CSS to public web...
+call copy .\vendor\netherjs\nui\dist\nui.css .\www\share\other\src\css\200-nui.css
+
+echo Building Public Web Script Bundle via OneScript...
+call .\vendor\bin\nether-onescript build .\www\share\other\scripts.json
+
+echo Building Public Web Stylesheet Bundle via Onescript...
+call .\vendor\bin\nether-onescript build .\www\share\other\styles.json
+


fix paths in ci.bat

fix paths in ci.bat

--- build/ci.bat
+++ build/ci.bat
@@ -3,7 +3,7 @@
 setlocal EnableDelayedExpansion

 echo Unit Tests
-pushd %~dp0\..
+cd %~dp0\..

 echo ""
 echo Regular tests
@@ -13,33 +13,30 @@
 echo Light tests
 dub run -q -c unittest-light --build=unittest

-popd
-
-
 echo ""
 echo Integration tests
 echo ""

 echo Issue 61
-pushd %~dp0\..\tests\integration_tests\issue61
+pushd tests\integration_tests\issue61
 dub run --build=unittest
 if %errorlevel% neq 0 exit /b %errorlevel%
 popd

 echo Issue 109
-pushd %~dp0\..\tests\integration_tests\issue109
+pushd tests\integration_tests\issue109
 dub run --build=unittest
 if %errorlevel% neq 0 exit /b %errorlevel%
 popd

 echo Issue 116
-pushd %~dp0\..\tests\integration_tests\issue116
+pushd tests\integration_tests\issue116
 dub run --build=unittest
 if %errorlevel% neq 0 exit /b %errorlevel%
 popd

 echo runTestsMain
-pushd %~dp0\..\tests\integration_tests\runTestsMain
+pushd tests\integration_tests\runTestsMain
 dub run --build=unittest
 if %errorlevel% neq 0 exit /b %errorlevel%
 popd


autobuild tools for windows

autobuild tools for windows

--- src/EventStore/Scripts/windows/get-dev-on-win64.cmd
+++ src/EventStore/Scripts/windows/get-dev-on-win64.cmd
@@ -27,8 +27,7 @@
 popd || goto :Error

 pushd src\EventStore || goto :Error
-msbuild Y:\EventStore\src\EventStore\EventStore.sln
-
+msbuild src\EventStore\EventStore.sln || goto :Error
 popd || goto :Error

 popd || goto :Error
@@ -36,4 +35,5 @@
 exit /b 0
 :Error
 echo Something went wrong. See previous messages.
+pause
 exit /b 1


Added logging to the bat file

Added logging to the bat file

--- bin/start-sensei-node.bat
+++ bin/start-sensei-node.bat
@@ -1,4 +1,6 @@
-@ECHO OFF
+
+
+ECHO OFF
 rem usage="Usage: start-sensei-node.bat <conf-dir>"

@@ -20,7 +22,7 @@

 SET CLASSPATH=%resources%/;%lib%/*;%dist%/*;%1/ext/*
-
+echo "Starting the Sensei. Please make sure that the Zookeeper instance is up. Logs are in the logs directory"
 java %JAVA_OPTS% %JMX_OPTS% %HEAP_OPTS% %GC_OPTS% %JAVA_DEBUG% -classpath "%CLASSPATH%"  -Dlog.home=%logs% %MAIN_CLASS% %1

 goto EXIT


update build-core.bat

update build-core.bat

--- Source/build-core.bat
+++ Source/build-core.bat
@@ -1,3 +1,18 @@
-rm **\bin\* -re -fo
 gitversion /output buildserver /updateassemblyinfo
-call EasyNetQ.Core\build.cmd +set basePath=%~dp0
+cd %basePath%EasyNetQ
+call build.cmd
+cd %basePath%EasyNetQ.DI.Autofac
+call build.cmd
+cd %basePath%EasyNetQ.DI.LightInject
+call build.cmd
+cd %basePath%EasyNetQ.DI.Ninject
+call build.cmd
+cd %basePath%EasyNetQ.DI.SimpleInjector
+call build.cmd
+cd %basePath%EasyNetQ.DI.StructureMap
+call build.cmd
+cd %basePath%EasyNetQ.DI.Windsor
+call build.cmd
+cd %basePath%EasyNetQ.Serilog
+call build.cmd


Append to JRUBY_OPTS instead of overriding it

--- tools/bin/jruby.bat
+++ tools/bin/jruby.bat
@@ -5,6 +5,6 @@
 set GEM_PATH=
 set PATH=%TOOLS_BIN%\;%JRUBY_BASE%\bin;%PATH%

-set JRUBY_OPTS="-J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 -J-Djruby.compile.invokedynamic=false -J-Djruby.compile.mode=OFF"
+set JRUBY_OPTS='-J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 -J-Djruby.compile.invokedynamic=false -J-Djruby.compile.mode=OFF %JRUBY_OPTS%'
 %JRUBY_BASE%\bin\jruby.bat %*


curl built for ssl

curl built for ssl

--- windows_x64_vc12_setup.bat
+++ windows_x64_vc12_setup.bat
@@ -83,12 +83,18 @@

 cd winbuild
 SET INCLUDE=%INCLUDE%;..\..\%OPEN_SSL_VERSION%\include;..\include;..\..\%OPEN_SSL_VERSION%\include\openssl
-nmake /f makefile.vc mode=static VC=12 WITH_SSL=no ENABLE_SSPI=no ENABLE_WINSSL=no ENABLE_IDN=no DEBUG=yes MACHINE=x64
-nmake /f makefile.vc mode=static VC=12 WITH_SSL=no ENABLE_SSPI=no ENABLE_WINSSL=no ENABLE_IDN=no DEBUG=no MACHINE=x64
-cd ..
-
-copy builds\libcurl-vc%VISUALSTUDIO_VERSION_MAJOR%-x64-debug-static-ipv6\lib\libcurl_a_debug.lib libs\x64\Debug\libcurl.lib
-copy builds\libcurl-vc%VISUALSTUDIO_VERSION_MAJOR%-x64-release-static-ipv6\lib\libcurl_a.lib libs\x64\Release\libcurl.lib
+SET LIB=%LIB%;..\..\%OPEN_SSL_VERSION%\out32
+nmake /f makefile.vc mode=static VC=12 WITH_SSL=static ENABLE_SSPI=no ENABLE_WINSSL=no ENABLE_IDN=no DEBUG=yes MACHINE=x64
+nmake /f makefile.vc mode=static VC=12 WITH_SSL=static ENABLE_SSPI=no ENABLE_WINSSL=no ENABLE_IDN=no DEBUG=no MACHINE=x64
+cd ..
+
+#non ssl builds
+#copy builds\libcurl-vc%VISUALSTUDIO_VERSION_MAJOR%-x64-debug-static-ipv6\lib\libcurl_a_debug.lib libs\x64\Debug\libcurl.lib
+#copy builds\libcurl-vc%VISUALSTUDIO_VERSION_MAJOR%-x64-release-static-ipv6\lib\libcurl_a.lib libs\x64\Release\libcurl.lib
+
+#ssl static libs
+copy builds\libcurl-vc%VISUALSTUDIO_VERSION_MAJOR%-x64-debug-static-ssl-static-ipv6\lib\libcurl_a_debug.lib libs\x64\Debug\libcurl.lib
+copy builds\libcurl-vc%VISUALSTUDIO_VERSION_MAJOR%-x64-release-static-ssl-static-ipv6\lib\libcurl_a.lib libs\x64\Release\libcurl.lib
 cd ..
 @ECHO DONE WITH CURL


Fixed bug 3479505

Fixed bug 3479505

--- rest/startMZmine_Windows.bat
+++ rest/startMZmine_Windows.bat
@@ -44,7 +44,7 @@
 %JAVA_COMMAND% -version

 rem This command starts the Java Virtual Machine
-%JAVA_COMMAND% %JAVA_PARAMETERS% -classpath %CLASS_PATH% %MAIN_CLASS% (%*)
+%JAVA_COMMAND% %JAVA_PARAMETERS% -classpath %CLASS_PATH% %MAIN_CLASS% %*

 rem If there was an error, give the user chance to see it
 IF ERRORLEVEL 1 pause


ansi.bat: cursor positioning optimized

ansi.bat: cursor positioning optimized

--- bin/ansi.bat
+++ bin/ansi.bat
@@ -11,7 +11,7 @@

 $ProgName = if ( $MyInvocation.MyCommand.Name ) { $MyInvocation.MyCommand.Name } else { "ANSI" };

-$Version = "0.3 Beta";
+$Version = "0.4 Beta";

 $DemoURL = "http://www.robvanderwoude.com/files/apple_ansi.txt";

@@ -212,6 +212,13 @@

 # =========================================================================

+function set-cursor( $x, $y ) {
+    [System.Console]::CursorTop = $y;
+    [System.Console]::CursorLeft = $x;
+}
+
+# =========================================================================
+
 function set-cursor-position( [array]$position, [string]$movement ) {
 	if ($position.count -ne 2 ) {
 		$position += 1;
@@ -285,8 +292,7 @@
 		$col = [Math]::min( [Math]::max($col + $Host.UI.RawUI.WindowPosition.X, 0), $Host.UI.RawUI.BufferSize.Width - 1 );
 	}

-	[System.Console]::CursorTop = $row;
-	[System.Console]::CursorLeft = $col;
+	set-cursor $col $row;
 }

 # =========================================================================
@@ -319,8 +325,7 @@
 		}
 	1 {
 		# clear from cursor to beginning of the screen.
-		[System.Console]::CursorTop = $Host.UI.RawUI.WindowPosition.Y;
-		[System.Console]::CursorLeft = $Host.UI.RawUI.WindowPosition.X;
+		set-cursor $Host.UI.RawUI.WindowPosition.X $Host.UI.RawUI.WindowPosition.Y;

 		$s = " " * ( $y * $w + $x );
 		Write-Host -NoNewLine $s;
@@ -333,8 +338,7 @@
 	}

 	# Restore to the original cursor position
-	[System.Console]::CursorTop = $posY;
-	[System.Console]::CursorLeft = $posX;
+	set-cursor $posX $posY;
 }

 # =========================================================================
@@ -353,7 +357,7 @@

 	switch ( $mode[0] ) {
 	0 {
-		# clear from cursor to end of line.
+		# clear from cursor to end of the line.
 		$s = " " * ( $w - $x );
 		break;
 		}
@@ -373,14 +377,14 @@
 	}

 	if ( $mode[0] -ne 0 ) {
-		[System.Console]::CursorLeft = $Host.UI.RawUI.WindowPosition.X;
+		# Set the cursor to beginning of the line
+		set-cursor $Host.UI.RawUI.WindowPosition.X $posY;
 	}

 	Write-Host -NoNewLine $s;

 	# Restore to the original cursor position
-	[System.Console]::CursorTop = $posY;
-	[System.Console]::CursorLeft = $posX;
+	set-cursor $posX $posY;
 }

 # =========================================================================


documentation

documentation

--- open_ipython_notebook.bat
+++ open_ipython_notebook.bat
@@ -12,4 +12,4 @@

 :nextn:
 set path=%path%;%pythonexe%;%pythonexe%\Scripts
-ipython3 notebook --notebook-dir=_doc\notebooks+ipython3 notebook --notebook-dir=_doc\notebooks --matplotlib=inline


appveyor: log copying BLAST files

appveyor: log copying BLAST files

--- .appveyor/install_blast.bat
+++ .appveyor/install_blast.bat
@@ -13,6 +13,7 @@
     copy npge-0.3.0\blastn.exe c:\blast
     copy npge-0.3.0\makeblastdb.exe c:\blast
     copy npge-0.3.0\vcomp100.dll c:\blast
+    echo BLAST files were copied to c:\blast
 ) else (
     echo BLAST already installed at c:\blast
 )


support for multiple game directories

support for multiple game directories

--- sm_build.bat
+++ sm_build.bat
@@ -7,7 +7,6 @@

 IF EXIST compiler_directory.txt FOR /F %%i IN (compiler_directory.txt) DO SET SOURCEPAWN_COMPILER_DIRECTORY=%%i
 IF EXIST plugin_directory.txt FOR /F %%i IN (plugin_directory.txt) DO SET PLUGIN_DIRECTORY=%%i
-IF EXIST game_directory.txt FOR /F %%i IN (game_directory.txt) DO SET GAME_DIRECTORY=%%i

 SET BUILD_DIRECTORY=%PLUGIN_DIRECTORY%\build
 SET SOURCEMOD_DIRECTORY=%BUILD_DIRECTORY%\addons\sourcemod
@@ -22,9 +21,9 @@
 IF NOT EXIST %PLUGINS_DIRECTORY% MKDIR %PLUGINS_DIRECTORY%
 MOVE /Y %PLUGIN_NAME%.smx %PLUGINS_DIRECTORY%

-IF DEFINED GAME_DIRECTORY (
-	ECHO Copying build into %GAME_DIRECTORY%
-	XCOPY /Y /S /Q /D %BUILD_DIRECTORY% %GAME_DIRECTORY%
+IF EXIST game_directory.txt FOR /F %%i IN (game_directory.txt) DO (
+	ECHO Copying build into %%i
+	XCOPY /Y /S /Q /D %BUILD_DIRECTORY% %%i
 )

 PAUSE


Fix URL on puppet cmtool

Fix URL on puppet cmtool

--- script/cmtool.bat
+++ script/cmtool.bat
@@ -136,10 +136,10 @@
 ::::::::::::
 if not defined PUPPET_OPTIONS set PUPPET_OPTIONS=%CM_OPTIONS%

-:: if "%CM_VERSION%" == "latest" set CM_VERSION=3.8.7
-
-if not defined PUPPET_URL set PUPPET_64_URL=https://downloads.puppetlabs.com/windows/puppet-x64-%CM_VERSION%.msi
-if not defined PUPPET_URL set PUPPET_64_URL=https://downloads.puppetlabs.com/windows/puppet-%CM_VERSION%.msi
+if "%CM_VERSION%" == "latest" set CM_VERSION=6.3.0
+
+if not defined PUPPET_URL set PUPPET_64_URL=https://downloads.puppetlabs.com/windows/puppet/puppet-agent-%CM_VERSION%-x64.msi
+if not defined PUPPET_URL set PUPPET_32_URL=https://downloads.puppetlabs.com/windows/puppet/puppet-agent-%CM_VERSION%-x86.msi

 if defined ProgramFiles(x86) (
   set PUPPET_URL=%PUPPET_64_URL%


Added dotnet restore to the installation.

--- Tools/AppVeyor/Install.cmd
+++ Tools/AppVeyor/Install.cmd
@@ -12,4 +12,6 @@
 7z x -o%LIBDIR% AACQFGl4PKi9xnd15EbU5S1Ia
 if %errorlevel% neq 0 exit /b %errorlevel%

+dotnet restore ..\..\Tests\Magick.NET.Tests\Magick.NET.Tests.csproj
+
 :done


fix bug with vc redsistributable include

--- scripts/3.1_buildWindows.bat
+++ scripts/3.1_buildWindows.bat
@@ -127,7 +127,7 @@
 rem create copy of the Visual Studio runtime
 rem ===============================================
 if not exist deployment\packages\com.microsoft.vcredist.x64\data mkdir deployment\packages\com.microsoft.vcredist.x64\data
-move bin\vcredist_x64.exe deployment\packages\com.microsoft.vcredist.x64\data
+copy /Y %DEPLOYMENT_HELPER_PATH%\bin\vcredist_x64.exe deployment\packages\com.microsoft.vcredist.x64\data

 rem ===============================================
 rem create copy xaudio2 install


Fix clashing names, output filename was bad

--- gear360video.cmd
+++ gear360video.cmd
@@ -17,8 +17,8 @@
 set STITCHEDTEMPDIR=frames_stitched
 set OUTDIR="%SCRIPTPATH%\html\data"
 set FFMPEGPATH=c:\Program Files\ffmpeg\bin
-set FFMPEGQUALITYDEC="-q:v 2"
-set FFMPEGQUALITYENC="-c:v libx265 -crf 18"
+set FFMPEGQUALITYDEC=-q:v 2
+set FFMPEGQUALITYENC=-c:v libx265 -crf 18
 rem %% is an escape character (note: this will fail on wine's cmd.exe)
 set IMAGETMPLDEC=image%%05d.jpg
 set IMAGETMPLENC=image%%05d_pano.jpg
@@ -68,11 +68,11 @@
 ) else (
   if %PARAMCOUNT% EQU 0 (
     rem call :PRINT_DEBUG Input file: %_TMP%
-    set INNAME=%_TMP%
+    set VIDINNAME=%_TMP%
   )
   if %PARAMCOUNT% EQU 1 (
     rem call :PRINT_DEBUG Setting PTO: %_TMP%
-    set OUTNAME=%_TMP%
+    set OUTVIDNAME=%_TMP%
   )
   set /a PARAMCOUNT+=1
 )
@@ -83,13 +83,13 @@
 set start=%time%

 rem Check arguments
-IF "%INNAME%" == "" goto NOARGS
+IF "%VIDINNAME%" == "" goto NOARGS

 rem Check if second argument present, if not, set some default for output filename
-rem This is here, because for whatever reason OUTNAME gets overriden by
+rem This is here, because for whatever reason OUTVIDNAME gets overriden by
 rem the last iterated filename if this is at the beginning (for loop is buggy?)
-if "%OUTNAME%" neq "" goto SETNAMEOK
-set OUTNAME="%~n1_pano.mp4"
+if "%OUTVIDNAME%" neq "" goto SETNAMEOK
+call :MAKEOUTNAME %VIDINNAME%

 :SETNAMEOK
 rem Check ffmpeg...
@@ -109,7 +109,7 @@

 rem Execute commands (as simple as it is)
 echo "Converting video to images..."
-"%FFMPEGPATH%\ffmpeg.exe" -y -i %INNAME% %FRAMESTEMP%\%IMAGETMPLDEC%
+"%FFMPEGPATH%\ffmpeg.exe" -y -i %VIDINNAME% %FRAMESTEMP%\%IMAGETMPLDEC%
 if %ERRORLEVEL% EQU 1 GOTO FFMPEGERROR

 rem Detect video size and match Hugin template file
@@ -118,7 +118,7 @@
                            -of csv ^
                            -select_streams v:0 ^
                            -show_entries stream=height,width ^
-                           %INNAME% > %TMPVIDSIZE%
+                           %VIDINNAME% > %TMPVIDSIZE%

 for /f "tokens=1-18* delims=," %%A in (%TMPVIDSIZE%) do (
   set VIDSIZE=%%~B:%%~C
@@ -135,7 +135,7 @@
                            -of csv ^
                            -select_streams v:0 ^
                            -show_entries stream=r_frame_rate ^
-                           %INNAME% > %TMPFPS%
+                           %VIDINNAME% > %TMPFPS%

 for /f "tokens=1-18* delims=," %%A in (%TMPFPS%) do (
   set VIDFPS=%%~B
@@ -144,15 +144,10 @@

 rem Stitching
 echo "Stitching frames..."
-for %%f in (%FRAMESTEMP%\*.jpg) do (
-rem For whatever reason (this has to be at the beginning of the line!)
-  echo "Processing frame %%f"
-rem TODO: There should be some error checking
-  "%SCRIPTPATH%\gear360pano.cmd" /m /o "%STITCHEDTEMP%" "%%f" "%PTOTMPL%"
-)
+call "%SCRIPTPATH%\gear360pano.cmd" /m /o "%STITCHEDTEMP%" "%FRAMESTEMP%\*.jpg" "%PTOTMPL%"

 echo "Reencoding video..."
-"%FFMPEGPATH%/ffmpeg.exe" -y -f image2 -i %STITCHEDTEMP%/%IMAGETMPLENC% -r %VIDFPS% -s %VIDSIZE% %FFMPEGQUALITYENC% %STITCHEDTEMP%/%TMPVIDEO%
+"%FFMPEGPATH%\ffmpeg.exe" -y -f image2 -i %STITCHEDTEMP%\%IMAGETMPLENC% -r %VIDFPS% -s %VIDSIZE% %FFMPEGQUALITYENC% %STITCHEDTEMP%\%TMPVIDEO%
 if %ERRORLEVEL% EQU 1 GOTO FFMPEGERROR

 rem Check if there's audio
@@ -161,27 +156,32 @@
                           -of default=nw=1:nk=1 ^
                           -select_streams a ^
                           -show_entries stream=codec_type ^
-                          %INNAME% > %TMPHASAUDIO%
+                          %VIDINNAME% > %TMPHASAUDIO%

 set HASAUDIO=<%TMPHASAUDIO%
 del %TMPHASAUDIO%

-if %HASAUDIO% neq "" (
+if "%HASAUDIO%" neq "" (
   echo "Extracting audio..."
-  "%FFMPEGPATH%\ffmpeg.exe" -y -i %1 -vn -acodec copy %STITCHEDTEMP%/%TMPAUDIO%
+  "%FFMPEGPATH%\ffmpeg.exe" -y -i %1 -vn -acodec copy %STITCHEDTEMP%\%TMPAUDIO%
   if %ERRORLEVEL% EQU 1 GOTO FFMPEGERROR

   echo "Merging audio..."
-  "%FFMPEGPATH%\ffmpeg.exe" -y -i %STITCHEDTEMP%/%TMPVIDEO% -i %STITCHEDTEMP%/%TMPAUDIO% -c:v copy -c:a aac -strict experimental %OUTNAME%
+  "%FFMPEGPATH%\ffmpeg.exe" -y -i %STITCHEDTEMP%\%TMPVIDEO% -i %STITCHEDTEMP%\%TMPAUDIO% -c:v copy -c:a aac -strict experimental %OUTVIDNAME%
   if %ERRORLEVEL% EQU 1 GOTO FFMPEGERROR
 )

 rem Clean-up (f - force, read-only & dirs, q - quiet)
-del /f /q %FRAMESTEMPDIR%
-del /f /q %OUTTEMPDIR%
-
-echo Video written to %OUTNAME%
-goto eof
+del /f /q %FRAMESTEMP%
+del /f /q %STITCHEDTEMP%
+
+echo Video written to %OUTVIDNAME%
+goto eof
+
+rem Filename extraction works only with %1, we need this workaround
+:MAKEOUTNAME
+set OUTVIDNAME="%~n1_pano.mp4"
+exit /b 0

 :NOARGS
 echo Script to stitch raw panoramic videos.
@@ -218,7 +218,6 @@
 if %DEBUG% == "yes" (
   echo DEBUG: %1 %2 %3 %4 %5 %6 %7 %8 %9
 )
-
 exit /b 0

 :eof


Removed ReSharper 6.1 install script

Removed ReSharper 6.1 install script

--- resharper/install/install-resharper.v6.1.bat
+++ resharper/install/install-resharper.v6.1.bat
@@ -1,59 +0,0 @@
-@echo off
-setlocal enableextensions
-
-set PROGFILES=%PROGRAMFILES(x86)%
-if "%PROGFILES%"=="" set PROGFILES=%PROGRAMFILES%
-
-REM LOCALAPPDATA is only supported since Windows Vista
-if "%LOCALAPPDATA%"=="" set LOCALAPPDATA=%USERPROFILE%\Local Settings\Application Data
-if not exist "%LOCALAPPDATA%" (
-    echo Unable to find local application data directory
-    echo %LOCALAPPDATA%
-    echo Please check the LOCALAPPDATA environment variable and try again
-    goto :end
-)
-
-set VERSION=6.1
-set PRODUCT=resharper
-set BASEDIR=JetBrains\%PRODUCT%\v%VERSION%
-
-set INSTALL_SOURCEDIR=%~dp0\xunitcontrib-%PRODUCT%.%VERSION%
-
-set PER_USER_PRODUCTDIR=%LOCALAPPDATA%\%BASEDIR%
-
-set PER_MACHINE_PLUGINDIR=%PROGFILES%\%BASEDIR%\bin\plugins\xunitcontrib
-set PER_USER_PLUGINDIR=%PER_USER_PRODUCTDIR%\plugins\xunitcontrib
-set PER_USER_ANNOTATIONSDIR=%PER_USER_PRODUCTDIR%\ExternalAnnotations
-
-if not exist "%PER_MACHINE_PLUGINDIR%" goto make_per_user_plugindir
-rmdir /s /q "%PER_MACHINE_PLUGINDIR%"
-if exist "%PER_MACHINE_PLUGINDIR%" (
-    echo Unable to delete "%PER_MACHINE_PLUGINDIR%"
-    echo Please run again as administrator
-    goto :end
-)
-
-:make_per_user_plugindir
-if exist "%PER_USER_PLUGINDIR%" goto make_per_user_annotationsdir
-mkdir "%PER_USER_PLUGINDIR%"
-
-:make_per_user_annotationsdir
-if exist "%PER_USER_ANNOTATIONSDIR%" goto do_copy
-mkdir "%PER_USER_ANNOTATIONSDIR%"
-
-:do_copy
-echo Copying files...
-copy /y "%INSTALL_SOURCEDIR%\*.dll" "%PER_USER_PLUGINDIR%"
-copy /y "%INSTALL_SOURCEDIR%\*.pdb" "%PER_USER_PLUGINDIR%" 2> NUL
-copy /y "%INSTALL_SOURCEDIR%\*.dotSettings" "%PER_USER_PLUGINDIR%"
-copy /y "%INSTALL_SOURCEDIR%\xunit.xml" "%PER_USER_ANNOTATIONSDIR%"
-
-echo.
-
-echo Unblocking downloaded files...
-pushd "%PER_USER_PLUGINDIR%"
-for /r %%i in (*) do "%~dp0\UnblockZoneIdentifier" "%%i"
-popd
-
-:end
-pause


Create train_quick.bat

Create train_quick.bat

Add scripts for training cifar10 dataset on Windows

error: pathspec 'examples/cifar10/train_quick.bat' did not match any file(s) known to git

--- examples/cifar10/train_quick.bat
+++ examples/cifar10/train_quick.bat
@@ -0,0 +1,8 @@
+@echo off
+SET GLOG_logtostderr=1
+"../../bin/train_net.exe" cifar10_quick_solver.prototxt
+
+rem reduce learning rate by fctor of 10 after 8 epochs
+SET GLOG_logtostderr=1
+"../../bin/train_net.exe" cifar10_quick_solver_lr1.prototxt cifar10_quick_iter_4000.solverstate
+pause


updates

updates

--- bidmat.cmd
+++ bidmat.cmd
@@ -4,17 +4,15 @@
 :: Set as much memory as possible
 (SET JAVA_OPTS=-Xmx12G -Xms128M)
 :: Fix these if needed
-SET JCUDA_VERSION=0.5.0
+SET JCUDA_VERSION=0.5.5
 SET JCUDA_LIBDIR=%CD%\lib
 SET LIBDIR=%CD%\lib
 SET PATH=%LIBDIR%;%PATH%
-

 SET BIDMAT_LIBS=%CD%\BIDMat.jar;%LIBDIR%\ptplot.jar;%LIBDIR%\ptplotapplication.jar;%LIBDIR%\jhdf5.jar;%LIBDIR%\commons-math3-3.1.1.jar;%LIBDIR%\lz4-1.1.2.jar

 SET JCUDA_LIBS=%JCUDA_LIBDIR%\jcuda-%JCUDA_VERSION%.jar;%JCUDA_LIBDIR%\jcublas-%JCUDA_VERSION%.jar;%JCUDA_LIBDIR%\jcufft-%JCUDA_VERSION%.jar;%JCUDA_LIBDIR%\jcurand-%JCUDA_VERSION%.jar;%JCUDA_LIBDIR%\jcusparse-%JCUDA_VERSION%.jar

 SET ALL_LIBS=%BIDMAT_LIBS%;%JCUDA_LIBS%;%JAVA_HOME%\lib\tools.jar
-:: echo %ALL_LIBS%

 scala -nobootcp -cp "%ALL_LIBS%" -Yrepl-sync -i %LIBDIR%\bidmat_init.scala


Added basic wp.bat launcher for Windows environment.

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

--- bin/wp.bat
+++ bin/wp.bat
@@ -0,0 +1,2 @@
+@ECHO OFF
+php "%~dp0../php/boot-fs.php" %*


:chart: Ignore the coverage of code that cannot be covered

--- coverage.cmd
+++ coverage.cmd
@@ -48,7 +48,7 @@
 @SET test_assemblies=%~dp0test\Castle.Core.AsyncInterceptor.Tests\bin\%config%\net472\Castle.Core.AsyncInterceptor.Tests.dll
 ::@SET test_assemblies=%test_assemblies% %~dp0test\More.Tests\bin\%config%\net472\More.Tests.dll
 @SET xunit_results=%results_path%\Xunit.Tests.html
-@SET coverage_filter=+[Castle.Core.AsyncInterceptor*]* -[*.Tests]*
+@SET coverage_filter=+[Castle.Core.AsyncInterceptor*]* -[Castle.Core.AsyncInterceptor*]*.NoCoverage.* -[*.Tests]*
 @SET coverage_results=%results_path%\Test.Coverage.xml

 @IF NOT EXIST "%results_path%" MD "%results_path%"


now updated the sublime.bat file, it is a little more robust, it prompts me for the github dir, then does a git pull, and a git status. Next I should learn how to make the command line stick to the left, and the sublime stick to the right

--- sublime.bat
+++ sublime.bat
@@ -1 +1,6 @@
-START "" "C:\Program files\Sublime text 3\sublime_text.exe" & pushd C:\Users\testbuy\Documents\GitHub
+SET /P gitdir=Enter file directory: &
+START "" "C:\Program files\Sublime text 3\sublime_text.exe" &
+pushd C:\Users\testbuy\Documents\GitHub\%gitdir% &
+git pull &
+git status &
+


Automated commit by Speedy_Git on 22/04/2017 04:29


v1.8.3

v1.8.3

Add deletion of orphaned Java binaries in the Windows system folders. Thanks to /u/Mikkehy

--- java_runtime_nuker.bat
+++ java_runtime_nuker.bat
@@ -10,7 +10,8 @@
 ::                 - /u/MrYiff          : bug fix related to OS_VERSION variable
 ::                 - /u/cannibalkitteh  : additional registry & file cleaning locations
 ::                 - forums.oracle.com/people/mattmn : a lot of stuff from his Java removal script
-:: Version:       1.8.2 * IMPROVEMENT: Expand JRE8 mask to catch versions over 99 (3-digit identifier vs. 2). Thanks to /u/flash44007
+:: Version:       1.8.3 * IMPROVEMENT: Add deletion of orphaned Java binaries in the Windows system folders. Thanks to /u/Mikkehy
+::                1.8.2 * IMPROVEMENT: Expand JRE8 mask to catch versions over 99 (3-digit identifier vs. 2). Thanks to /u/flash44007
 ::                1.8.1 ! BUG FIX:     Fix crash error on unescaped "*" character
 ::                1.8.0 ! BUG FIX:     Fix uncommon failure where JRE uninstallers fail because they can't find certain files. Thanks to /u/GoogleDrummer
 ::                      * IMPROVEMENT: Import logging function used in Tron and convert all double "echo" statements to log calls
@@ -79,8 +80,8 @@
 :: PREP AND CHECKS ::
 :::::::::::::::::::::
 @echo off && cls
-set SCRIPT_VERSION=1.8.2
-set SCRIPT_UPDATED=2017-05-04
+set SCRIPT_VERSION=1.8.3
+set SCRIPT_UPDATED=2017-08-07
 :: Get the date into ISO 8601 standard format (yyyy-mm-dd) so we can use it
 FOR /f %%a in ('WMIC OS GET LocalDateTime ^| find "."') DO set DTS=%%a
 set CUR_DATE=%DTS:~0,4%-%DTS:~4,2%-%DTS:~6,2%
@@ -260,6 +261,7 @@
 call :log "%CUR_DATE% %TIME%   Specific targeting done. Now running WMIC wildcard catchall uninstallation..."
 %WMIC% product where "name like '%%J2SE Runtime%%'" call uninstall /nointeractive>> "%LOGPATH%\%LOGFILE%"
 %WMIC% product where "name like 'Java%%Runtime%%'" call uninstall /nointeractive>> "%LOGPATH%\%LOGFILE%"
+%WMIC% product where "name like 'Java%%Update%%'" call uninstall /nointeractive>> "%LOGPATH%\%LOGFILE%"
 %WMIC% product where "name like 'JavaFX%%'" call uninstall /nointeractive>> "%LOGPATH%\%LOGFILE%"
 call :log "%CUR_DATE% %TIME%   Done."

@@ -357,6 +359,11 @@
 if exist %WINDIR%\System32\tasks\Java*.job del /F /Q %WINDIR%\System32\tasks\Java*.job >> "%LOGPATH%\%LOGFILE%"
 if exist %WINDIR%\SysWOW64\tasks\Java*.job del /F /Q %WINDIR%\SysWOW64\tasks\Java*.job >> "%LOGPATH%\%LOGFILE%"
 echo.
+
+:: Kill any leftover binaries in the Windows system folders
+if exist %WINDIR%\System32\java.exe del /F /Q %WINDIR%\System32\java.exe >> "%LOGPATH%\%LOGFILE%"
+if exist %WINDIR%\System32\javaw.exe del /F /Q %WINDIR%\System32\javaw.exe >> "%LOGPATH%\%LOGFILE%"
+if exist %WINDIR%\System32\javaws.exe del /F /Q %WINDIR%\System32\javaws.exe >> "%LOGPATH%\%LOGFILE%"

 :: Kill the accursed Java Quickstarter service
 sc query JavaQuickStarterService >NUL


Uninstall the program in a complete way.

--- NotepadStarterUninstall.bat
+++ NotepadStarterUninstall.bat
@@ -1,9 +1,11 @@
 ::通过使用短文件路径，支持放在Unicode路径下。
 @echo off
+
+cd /d %~dps0..
+if exist "NotepadStarter\.git" (goto end)
+
 ::获取管理员权限
 call "%~dps0request-admin.bat" %~dpnxs0 %*
-
-cd /d %~dps0

 reg delete "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\notepad.exe" /f
 del /F /Q %SystemRoot%\NotepadStarter.exe
@@ -20,7 +22,7 @@

 :SysWOW64
 set NotepadFolder=%SystemRoot%\SysWOW64
-set NEXT=end
+set NEXT=deletePlugins
 goto RecoverNotepad

 :RecoverNotepad
@@ -41,8 +43,11 @@
 )
 goto %NEXT%

+:deletePlugins
+del /F /Q NotepadStarterPlugin.dll
+rd /s /q NotepadStarter
+
 :end
-
 ::pause

 goto :eof


update script

update script

--- gitpull.bat
+++ gitpull.bat
@@ -33,4 +33,7 @@
 cd python3_module_template
 git pull
 cd ..
+cd jupytalk
+git pull
+cd ..
 cd %current%


Add an echo.

Add an echo.

--- deploy01.cmd
+++ deploy01.cmd
@@ -0,0 +1 @@
+echo "Empty"


Fix to issue #85

Fix to issue #85

--- Install/InstallSettings.bat
+++ Install/InstallSettings.bat
@@ -78,11 +78,6 @@
 set ops_webBrowserExePath="C:\Program Files (x86)\Google\Chrome\Application\chrome.exe"

 REM ---------------------------------------------------------------------
-REM Define which text editor to use for installation steps which require you
-REM to work within a text editor.
-set ops_textEditorExePath="C:\Windows\System32\notepad.exe"
-
-REM ---------------------------------------------------------------------
 REM The variables below define which processes to execute.
 set ops_install_rdbms=YES
 set ops_install_server=YES


windows启动，端口号是默认java里面，要自己设置的，修改bat文件

windows启动，端口号是默认java里面，要自己设置的，修改bat文件

error: pathspec 'elastic-job-lite/elastic-job-lite-console/src/main/resources/bin/start.bat' did not match any file(s) known to git

--- elastic-job-lite/elastic-job-lite-console/src/main/resources/bin/start.bat
+++ elastic-job-lite/elastic-job-lite-console/src/main/resources/bin/start.bat
@@ -0,0 +1,7 @@
+@echo off
+set DDCFGDIR=%~dp0%..\conf
+set CLASSPATH=%DDCFGDIR%
+SET CLASSPATH=%~dp0..\lib\*;%CLASSPATH%
+set CONSOLE_MAIN=com.dangdang.ddframe.job.lite.console.ConsoleBootstrap
+echo on
+java  -cp "%CLASSPATH%" %CONSOLE_MAIN%


make edksetup.bat accept case-insensitive parameters.

git-svn-id: 5648d1bec6962b0a6d1d1b40eba8cf5cdb62da3d@2084 6f19259b-4bc3-4df7-8a09-765794883524

--- edksetup.bat
+++ edksetup.bat
@@ -84,14 +84,14 @@

 :path_ok

-@if "%1"=="-h" goto Usage
-@if "%1"=="-help" goto Usage
-@if "%1"=="--help" goto Usage
-@if "%1"=="/h" goto Usage
-@if "%1"=="/?" goto Usage
-@if "%1"=="/help" goto Usage
-@if "%1"=="ForceRebuild" goto ForceBuild
-@if "%1"=="Reconfig" goto Reconfig
+@if /I "%1"=="-h" goto Usage
+@if /I "%1"=="-help" goto Usage
+@if /I "%1"=="--help" goto Usage
+@if /I "%1"=="/h" goto Usage
+@if /I "%1"=="/?" goto Usage
+@if /I "%1"=="/help" goto Usage
+@if /I "%1"=="ForceRebuild" goto ForceBuild
+@if /I "%1"=="Reconfig" goto Reconfig

 @IF NOT EXIST "Tools\Jars\Common.jar" goto NormalBuild
 @IF NOT EXIST "Tools\Jars\PcdTools.jar" goto NormalBuild
@@ -132,7 +132,7 @@
 @IF NOT EXIST "Tools\bin\antlr.exe" goto NormalBuild
 @IF NOT EXIST "Tools\bin\dlg.exe" goto NormalBuild

-@if "%1"=="Rebuild" goto NormalBuild
+@if /I "%1"=="Rebuild" goto NormalBuild
 @if NOT "%1"=="" goto Usage

 goto skipbuild


add revision number in bat file commit comment

--- bat/bat_update_revision.bat
+++ bat/bat_update_revision.bat
@@ -16,7 +16,7 @@
 git reset
 git add ..\KM_Revision.inc
 git add ..\Installer\Revision.iss
-git commit -m "update revision number"
+git commit -m "r%kam_revision%: update revision number"
 git push

 @echo !


Re-order tests, skip test-all

Re-order tests, skip test-all

--- pkg_build_64.cmd
+++ pkg_build_64.cmd
@@ -45,18 +45,9 @@

 @set SSL_CERT_FILE=%PKG_RUBY%/ssl/cert.pem
 @set TEST_SSL=TRUE
-@cd %DP0%src/build%SUFFIX%

-@rem —————————————————————————————————————————————————————————————————— test-all
-@echo test-all

-@if "%R_VERS_2%" GEQ "25" (
-  set RUBY_FORCE_TEST_JIT=1
-  timeout.exe 25m make test-all "TESTOPTS=-a -j%M_JOBS% --job-status=normal --show-skip --retry --subprocess-timeout-scale=1.5" > %LOG_PATH_NAME%-test-all.log 2>&1
-@rem	timeout.exe 25m make test-all "TESTOPTS=--verbose -j%M_JOBS% --job-status=normal --show-skip --retry --subprocess-timeout-scale=1.5"
-) else (
-  make.exe test-all "TESTOPTS=-v --show-skip --retry" > %LOG_PATH_NAME%-test-all.log 2>&1
-)
+@if "%R_VERS_2%" GEQ "25" ( set RUBY_FORCE_TEST_JIT=1 )

 @rem ————————————————————————————————————————————————————————— btest, test-basic
 @cd %DP0%src/build%SUFFIX%
@@ -94,6 +85,20 @@
 @echo mspec
 @call ..\mspec\bin\mspec -rdevkit -j > %LOG_PATH_NAME%-test-mspec.log 2>&1

+@rem —————————————————————————————————————————————————————————————————— test-all
+@cd %DP0%src/build%SUFFIX%
+@echo test-all
+
+@if "%R_VERS_2%" GEQ "25" (
+  set RUBY_FORCE_TEST_JIT=1
+@rem  make test-all "TESTOPTS=-a -j%M_JOBS% --job-status=normal --show-skip --retry --subprocess-timeout-scale=1.5" > %LOG_PATH_NAME%-test-all.log 2>&1
+@rem	timeout.exe 25m make test-all "TESTOPTS=--verbose -j%M_JOBS% --job-status=normal --show-skip --retry --subprocess-timeout-scale=1.5"
+) else (
+	make.exe test-all "TESTOPTS=-v --show-skip --retry" > %LOG_PATH_NAME%-test-all.log 2>&1
+)
+
+@rem ————————————————————————————————————————————————————————————————————— done with tests
+
 @PATH=%PKG_RUBY%/bin;%GIT_PATH%;%ORIG_PATH%

 @cd %~dp0


Set bootstrap Python version to 2.6

Set bootstrap Python version to 2.6

Review URL: http://codereview.chromium.org/873002

git-svn-id: bd64dd6fa6f3f0ed0c0666d1018379882b742947@41303 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

--- bootstrap/win/win_tools.bat
+++ bootstrap/win/win_tools.bat
@@ -78,7 +78,7 @@
 :: Cleanup python directory if it was existing.
 if exist "%WIN_TOOLS_ROOT_DIR%\python\." rd /q /s "%WIN_TOOLS_ROOT_DIR%\python"
 if exist "%WIN_TOOLS_ROOT_DIR%\python_bin\." rd /q /s "%WIN_TOOLS_ROOT_DIR%\python_bin"
-call svn co -q %WIN_TOOLS_ROOT_URL%/third_party/python "%WIN_TOOLS_ROOT_DIR%\python_bin"
+call svn co -q %WIN_TOOLS_ROOT_URL%/third_party/python_26 "%WIN_TOOLS_ROOT_DIR%\python_bin"
 if errorlevel 1 goto :PYTHON_FAIL
 :: Create the batch file.
 call copy /y "%~dp0python.new.bat" "%WIN_TOOLS_ROOT_DIR%\python.bat" 1>nul


Update ssh.bat

Update ssh.bat

--- ps1/ssh.bat
+++ ps1/ssh.bat
@@ -5,7 +5,7 @@
 #
 # - Contents
 #     Simplify SSH Connect by Tera Term.
-#     <Windows> + <R> => ssh root@192.168.1.100
+#     Windows + R => ssh root@192.168.1.100
 #
 # - Install
 #     powershell.exe -Command "Invoke-RestMethod -Uri "https://initsh.github.io/ps1/ssh.bat" -OutFile "$env:USERPROFILE\ssh.bat""


No need for special windows version.

No need for special windows version.

Boot2Gecko provides MSYS which will execute also bash scripts in Windows environments.

--- run.bat
+++ run.bat
@@ -1,3 +0,0 @@
-@echo off
-docker build -t "jx/mockups-creator" .
-docker run -v ./app:/src/app "jx/mockups-creator"


cygwin_setup_config.bat: pip2 -> python2-pip, pip3 -> python3-pip

--- bin/cygwin_setup_config.bat
+++ bin/cygwin_setup_config.bat
@@ -4,7 +4,7 @@
 set _SETUP_EXE=setup-x86_64.exe

 rem Package list.
-set _PACKAGES=bc,cron,diffutils,dos2unix,git,nc,ncurses,openssh,p7zip,pip,pip3,procps,python,python3,rsync,screen,ssmtp,syslog-ng,tmux,unzip,vim,w3m,wget,zip
+set _PACKAGES=bc,cron,diffutils,dos2unix,git,nc,ncurses,openssh,p7zip,python2-pip,python3-pip,procps,python,python3,rsync,screen,ssmtp,syslog-ng,tmux,unzip,vim,w3m,wget,zip

 rem Root directory of installation.
 set _ROOTDIR=C:\cygwin64


v2.4 - add strlen check for prefs.js

v2.4 - add strlen check for prefs.js

cmd.exe has a command line length limit of 8192 characters. Abort if prefs.js contains strings that would get dropped while recreating the new prefs.js.

--- prefsCleaner.bat
+++ prefsCleaner.bat
@@ -3,7 +3,7 @@

 REM ### prefs.js cleaner for Windows
 REM ## author: @claustromaniac
-REM ## version: 2.3
+REM ## version: 2.4

 CD /D "%~dp0"

@@ -13,7 +13,7 @@
 ECHO                 ########################################
 ECHO                 ####  prefs.js cleaner for Windows  ####
 ECHO                 ####        by claustromaniac       ####
-ECHO                 ####              v2.3              ####
+ECHO                 ####              v2.4              ####
 ECHO                 ########################################
 ECHO:
 CALL :message "This script should be run from your Firefox profile directory."
@@ -28,6 +28,7 @@
 IF ERRORLEVEL 2 (GOTO :showhelp)
 IF NOT EXIST "user.js" (CALL :abort "user.js not found in the current directory." 30)
 IF NOT EXIST "prefs.js" (CALL :abort "prefs.js not found in the current directory." 30)
+CALL :strlenCheck
 CALL :FFcheck
 CALL :message "Backing up prefs.js..."
 SET "_time=%time: =0%"
@@ -49,6 +50,21 @@
 ECHO:
 ECHO:  %~1
 ECHO:
+GOTO :EOF
+REM ### string length Check Function ####
+:strlenCheck
+SET /a cnt=0
+setlocal ENABLEDELAYEDEXPANSION
+FOR /F "tokens=1,* delims=:" %%G IN ('FINDSTR /N "^" prefs.js') DO (
+	ECHO:%%H >nul
+	SET /a cnt += 1
+	IF /I "%%G" NEQ "!cnt!" (
+		ECHO:
+		CALL :message "ERROR: line !cnt! in prefs.js is too long."
+		(CALL :abort "Aborting ..." 30)
+	)
+)
+endlocal
 GOTO :EOF
 REM ####### Firefox Check Function ######
 :FFcheck


Typo in a directory name. Should help the AMD64 buildbots

--- Tools/buildbot/external-amd64.bat
+++ Tools/buildbot/external-amd64.bat
@@ -12,7 +12,7 @@
 )

 if not exist tcltk64\bin\tk85g.dll (
-    cd tk-8.5.2.1\win
+    cd tk-8.5.2.0\win
     nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.5.2.1 clean
     nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.5.2.1 all
     nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.5.2.1 install


Nonadmin v0.5

Nonadmin v0.5

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

--- user.sh.bat
+++ user.sh.bat
@@ -0,0 +1,36 @@
+@ 2>/dev/null # 2>nul&echo off&setlocal enabledelayedexpansion&title %~n0&cd %~dp0&echo|set /p=# >"%~nx0.temp.ps1"&type "%~nx0" >>"%~nx0.temp.ps1"
+# 2>nul&powershell -exec bypass -noprofile -file "%~nx0.temp.ps1" %*&set err=!errorlevel!
+# 2>nul&del "%~nx0.temp.ps1"&(if not !err! == 0 (if %0 == "%~0" (echo.&echo|set /p="Press any key to close..."&pause >nul)))&exit /b !err!
+echo \' >/dev/null ' >$null;[void]@'
+cd $(dirname $(realpath $0))
+### github.com/RefinedSoftwareLLC/sh.bat - v0.5 - DO NOT MODIFY THESE LINES ###
+
+################
+### .sh mode ###
+################
+echo "passed: $*"
+
+###############
+### .sh end ###
+###############
+
+'@ #' 2>/dev/null;exit 0
+if ($PSScriptRoot -eq $Null) {$PSScriptRoot = Split-Path -Parent -Path $MyInvocation.MyCommand.Definition}
+cd $PSScriptRoot
+function DropExt ($file,$repeat=1) {$a=$file.Split('.');[string]::Join('.', $a[0..($a.count-1-$repeat)])}
+$Host.UI.RawUI.WindowTitle = DropExt $MyInvocation.MyCommand.Name 3
+function pause {Write-Host -NoNewLine "`nPress any key to continue...";$null = $Host.UI.RawUI.ReadKey("NoEcho,IncludeKeyDown")}
+function Write-Throw {for($i = $Error.count-1; $i -ge 0; $i--){$Er = $Error[$i];$Ii=$Er.InvocationInfo;$Ex=$Er.Exception;Write-Warning "$($Ii.MyCommand) : $($Ex.Message)`nAt$([char]0x00A0)$($Ii.ScriptName):$($Ii.ScriptLineNumber) char:$($Ii.OffsetInline)`n$($Ii.Line)"}}
+try{
+### DO NOT MODIFY THESE LINES ###
+
+#################
+### .ps1 mode ###
+#################
+Write-Host passed: $args
+
+################
+### .ps1 end ###
+################
+}finally{if($Error[0]){Write-Throw;pause;exit 2}exit 0}
+### DO NOT MODIFY THIS LINE ###


fix batch changing dir + inconsistencies

git-svn-id: ab66a9de07fa9d47c5829c82992f5279466c775f@5203 63c20433-aa62-49bd-875c-5a186b69a8fb

--- version.bat
+++ version.bat
@@ -1,10 +1,16 @@
 @echo off
+set OLDDIR=%CD%
 cd /d %~dp0
 for /f "delims=" %%a in ('svnversion') do echo #define GPAC_SVN_REVISION "%%a" > test.h
 if not exist include\gpac\revision.h goto create
 ECHO n|COMP test.h include\gpac\revision.h > nul
 if errorlevel 1 goto create
 DEL test.h
-exit/b
+goto done
+
 :create
 MOVE /Y test.h include\gpac\revision.h
+
+:done
+cd /d %OLDDIR%
+exit/b


Windows version (untested)

Windows version (untested)

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

--- xenforo.bat
+++ xenforo.bat
@@ -0,0 +1,12 @@
+@echo off
+
+SET FILE=cmd.php
+if exist %FILE% (
+    php %FILE% %*
+) else (
+    if "%XENFORO_PATH%"=="" (
+        echo It does not appear you are in a valid XenForo 2 directory.
+    ) else (
+        php %XENFORO_PATH%%FILE% %*
+    )
+)


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


设置JAVAHOME

设置JAVAHOME

--- gradlew.bat
+++ gradlew.bat
@@ -7,7 +7,7 @@

 @rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal
-
+SET JAVA_HOME=E:\Java\jre1.8.0_66
 @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=


windows CI: use MinSizeRel to work around MSVC bug

See #3024

--- ci/azure/windows_script.bat
+++ ci/azure/windows_script.bat
@@ -17,8 +17,9 @@

 mkdir %ZIGBUILDDIR%
 cd %ZIGBUILDDIR%
-cmake.exe .. -Thost=x64 -G"Visual Studio 16 2019" -A x64 "-DCMAKE_INSTALL_PREFIX=%ZIGINSTALLDIR%" "-DCMAKE_PREFIX_PATH=%ZIGPREFIXPATH%" -DCMAKE_BUILD_TYPE=Release || exit /b
-msbuild /p:Configuration=Release INSTALL.vcxproj || exit /b
+REM Here we use MinSizeRel instead of Release to work around https://github.com/ziglang/zig/issues/3024
+cmake.exe .. -Thost=x64 -G"Visual Studio 16 2019" -A x64 "-DCMAKE_INSTALL_PREFIX=%ZIGINSTALLDIR%" "-DCMAKE_PREFIX_PATH=%ZIGPREFIXPATH%" -DCMAKE_BUILD_TYPE=MinSizeRel || exit /b
+msbuild /p:Configuration=MinSizeRel INSTALL.vcxproj || exit /b

 "%ZIGINSTALLDIR%\bin\zig.exe" build test || exit /b


changed it to work with mysql db

changed it to work with mysql db

--- src/main/config/sql/RELEASE-SCRIPTS/KC_Install.bat
+++ src/main/config/sql/RELEASE-SCRIPTS/KC_Install.bat
@@ -3,7 +3,7 @@
 :mode
 set /p mode="Enter Rice Mode (BUNDLE, EMBED) <%mode%>: "
 if /i "%mode%" == "BUNDLE" (
-	InstRice = 'Y'
+	set InstRice=Y
 	goto DBType
 )
 if /i "%mode%" == "EMBED" goto InstRice
@@ -279,14 +279,14 @@

 if /i "%version%" == "NEW" (
     if /i "%mode%" == "BUNDLE" (
-    mysql -u %un% -p%pw% -D %un% -s -f < mysql_server_rice.sql > KC-Release-3_0-Clean-Server-Rice-Mysql-Install.log 2>&1
+    mysql -u %un% -p%pw% -D %DBSvrNm% -s -f < mysql_server_rice.sql > KC-Release-3_0-Clean-Server-Rice-Mysql-Install.log 2>&1
     )
     if /i "%mode%%InstRice%" == "EMBEDY" (
-    mysql -u %Riceun% -p%Ricepw% -D %Riceun% -s -f < mysql_server_rice.sql > KC-Release-3_0-Clean-Server-Rice-Mysql-Install.log 2>&1
+    mysql -u %Riceun% -p%Ricepw% -D %RiceDBSvrNm% -s -f < mysql_server_rice.sql > KC-Release-3_0-Clean-Server-Rice-Mysql-Install.log 2>&1
     )
 )

-mysql -u %Riceun% -p%Ricepw% -D %Riceun% -s -f < krrelease/datasql/KR_00_SEQ_BS.sql > KR_SEQ_BS-Mysql-Install.log 2>&1
+mysql -u %Riceun% -p%Ricepw% -D %RiceDBSvrNm% -s -f < krrelease/datasql/KR_00_SEQ_BS.sql > KR_SEQ_BS-Mysql-Install.log 2>&1

 move *.log ../../LOGS/
 cd ../..
@@ -297,90 +297,90 @@
 :NEWMYSQL
 cd KC-RELEASE-3_0-CLEAN/mysql
 if /i "%InstRice%" == "Y" (
-	mysql -u %Riceun% -p%Ricepw% -D %Riceun% -s -f < mysql_server.sql > KC-Release-3_0-Clean-Server-Mysql-Install.log 2>&1
-) else (
-	mysql -u %Riceun% -p%Ricepw% -D %Riceun% -s -f < mysql_server_SR.sql > KC-Release-3_0-Clean-Server-SR-Mysql-Install.log 2>&1
-)
-mysql -u %un% -p%pw% -D %un% -s -f < mysql_client.sql > KC-Release-3_0-Clean-Client-Mysql-Install.log 2>&1
+	mysql -u %Riceun% -p%Ricepw% -D %RiceDBSvrNm% -s -f < mysql_server.sql > KC-Release-3_0-Clean-Server-Mysql-Install.log 2>&1
+) else (
+	mysql -u %Riceun% -p%Ricepw% -D %RiceDBSvrNm% -s -f < mysql_server_SR.sql > KC-Release-3_0-Clean-Server-SR-Mysql-Install.log 2>&1
+)
+mysql -u %un% -p%pw% -D %DBSvrNm% -s -f < mysql_client.sql > KC-Release-3_0-Clean-Client-Mysql-Install.log 2>&1

 move *.log ../../LOGS
 cd ../..

 cd KC-RELEASE-3_0_1-SCRIPT
-mysql -u %un% -p%pw% -D %un% -s -f < KC-Release-3_0-3_0_1-Upgrade-Mysql-Install.sql > KC-Release-3_0-3_0_1-Upgrade-Mysql-Install.log 2>&1
-if /i "%InstRice%" == "Y" (
-	mysql -u %Riceun% -p%Ricepw% -D %Riceun% -s -f < KR-Release-3_0-3_0_1-Upgrade-Mysql-Install.sql > KR-Release-3_0-3_0_1-Upgrade-Mysql-Install.log 2>&1
-) else (
-	mysql -u %Riceun% -p%Ricepw% -D %Riceun% -s -f < KR-Release-3_0-3_0_1-SR-Mysql-Install.sql > KR-Release-3_0-3_0_1-SR-Mysql-Install.log 2>&1
+mysql -u %un% -p%pw% -D %DBSvrNm% -s -f < KC-Release-3_0-3_0_1-Upgrade-Mysql-Install.sql > KC-Release-3_0-3_0_1-Upgrade-Mysql-Install.log 2>&1
+if /i "%InstRice%" == "Y" (
+	mysql -u %Riceun% -p%Ricepw% -D %RiceDBSvrNm% -s -f < KR-Release-3_0-3_0_1-Upgrade-Mysql-Install.sql > KR-Release-3_0-3_0_1-Upgrade-Mysql-Install.log 2>&1
+) else (
+	mysql -u %Riceun% -p%Ricepw% -D %RiceDBSvrNm% -s -f < KR-Release-3_0-3_0_1-SR-Mysql-Install.sql > KR-Release-3_0-3_0_1-SR-Mysql-Install.log 2>&1
 )
 move *.log ../LOGS
 cd ..

 cd KC-RELEASE-3_1_SP1-SCRIPT
-mysql -u %un% -p%pw% -D %un% -s -f < KC-Release-3_0_1-3_1_S1-Upgrade-Mysql-Install.sql > KC-Release-3_0_1-3_1_S1-Upgrade-Mysql-Install.log 2>&1
-
-if /i "%InstRice%" == "Y" (
-	mysql -u %Riceun% -p%Ricepw% -D %Riceun% -s -f < KR-Server-Release-1_0_3-1_0_3_1-Upgrade-Mysql-Install.sql > KR-Server-Release-1_0_3_1-Upgrade-Mysql-Install.log 2>&1
-	mysql -u %Riceun% -p%Ricepw% -D %Riceun% -s -f < KR-Release-3_0_1-3_1_S1-Upgrade-Mysql-Install.sql > KR-Release-3_0_1-3_1_S1-Upgrade-Mysql-Install.log 2>&1
-) else (
-	mysql -u %Riceun% -p%Ricepw% -D %Riceun% -s -f < KR-Release-3_0_1-3_1_S1-SR-Mysql-Install.sql > KR-Release-3_0_1-3_1_S1-SR-Mysql-Install.log 2>&1
+mysql -u %un% -p%pw% -D %DBSvrNm% -s -f < KC-Release-3_0_1-3_1_S1-Upgrade-Mysql-Install.sql > KC-Release-3_0_1-3_1_S1-Upgrade-Mysql-Install.log 2>&1
+
+if /i "%InstRice%" == "Y" (
+	mysql -u %Riceun% -p%Ricepw% -D %RiceDBSvrNm% -s -f < KR-Server-Release-1_0_3-1_0_3_1-Upgrade-Mysql-Install.sql > KR-Server-Release-1_0_3_1-Upgrade-Mysql-Install.log 2>&1
+	mysql -u %Riceun% -p%Ricepw% -D %RiceDBSvrNm% -s -f < KR-Release-3_0_1-3_1_S1-Upgrade-Mysql-Install.sql > KR-Release-3_0_1-3_1_S1-Upgrade-Mysql-Install.log 2>&1
+) else (
+	mysql -u %Riceun% -p%Ricepw% -D %RiceDBSvrNm% -s -f < KR-Release-3_0_1-3_1_S1-SR-Mysql-Install.sql > KR-Release-3_0_1-3_1_S1-SR-Mysql-Install.log 2>&1
 )

 move *.log ../LOGS
 cd ..

 cd KC-RELEASE-3_1_SP2-SCRIPT
-mysql -u %un% -p%pw% -D %un% -s -f < KRC-RELEASE-3_1_SP2-Upgrade-MYSQL.sql > KRC-RELEASE-3_1_SP2-Upgrade-MYSQL-Install.log 2>&1
-mysql -u %un% -p%pw% -D %un% -s -f < KC-RELEASE-3_1_SP2-Upgrade-MYSQL.sql > KC-RELEASE-3_1_SP2-Upgrade-MYSQL-Install.log 2>&1
-if /i "%InstRice%" == "Y" (
-	mysql -u %Riceun% -p%Ricepw% -D %Riceun% -s -f < KR-RELEASE-3_1_SP2-Upgrade-MYSQL.sql > KR-RELEASE-3_1_SP2-Upgrade-MYSQL-Install.log 2>&1
-) else (
-	mysql -u %Riceun% -p%Ricepw% -D %Riceun% -s -f < KR-RELEASE-3_1_SP2-SR-MYSQL.sql > KR-RELEASE-3_1_SP2-SR-MYSQL-Install.log 2>&1
+mysql -u %un% -p%pw% -D %DBSvrNm% -s -f < KRC-RELEASE-3_1_SP2-Upgrade-MYSQL.sql > KRC-RELEASE-3_1_SP2-Upgrade-MYSQL-Install.log 2>&1
+mysql -u %un% -p%pw% -D %DBSvrNm% -s -f < KC-RELEASE-3_1_SP2-Upgrade-MYSQL.sql > KC-RELEASE-3_1_SP2-Upgrade-MYSQL-Install.log 2>&1
+if /i "%InstRice%" == "Y" (
+	mysql -u %Riceun% -p%Ricepw% -D %RiceDBSvrNm% -s -f < KR-RELEASE-3_1_SP2-Upgrade-MYSQL.sql > KR-RELEASE-3_1_SP2-Upgrade-MYSQL-Install.log 2>&1
+) else (
+	mysql -u %Riceun% -p%Ricepw% -D %RiceDBSvrNm% -s -f < KR-RELEASE-3_1_SP2-SR-MYSQL.sql > KR-RELEASE-3_1_SP2-SR-MYSQL-Install.log 2>&1
 )
 move *.log ../LOGS
 cd ..

 cd KC-RELEASE-3_1_SP3-SCRIPT
-mysql -u %un% -p%pw% -D %un% -s -f < KRC-RELEASE-3_1_SP3-Upgrade-MYSQL.sql > KRC-RELEASE-3_1_SP3-Upgrade-MYSQL-Install.log 2>&1
-mysql -u %un% -p%pw% -D %un% -s -f < KC-RELEASE-3_1_SP3-Upgrade-MYSQL.sql > KC-RELEASE-3_1_SP3-Upgrade-MYSQL-Install.log 2>&1
-if /i "%InstRice%" == "Y" (
-	mysql -u %Riceun% -p%Ricepw% -D %Riceun% -s -f < KR-RELEASE-3_1_SP3-Upgrade-MYSQL.sql > KR-RELEASE-3_1_SP3-Upgrade-MYSQL-Install.log 2>&1
-) else (
-	mysql -u %Riceun% -p%Ricepw% -D %Riceun% -s -f < KR-RELEASE-3_1_SP3-SR-MYSQL.sql > KR-RELEASE-3_1_SP3-SR-MYSQL-Install.log 2>&1
+mysql -u %un% -p%pw% -D %DBSvrNm% -s -f < KRC-RELEASE-3_1_SP3-Upgrade-MYSQL.sql > KRC-RELEASE-3_1_SP3-Upgrade-MYSQL-Install.log 2>&1
+mysql -u %un% -p%pw% -D %DBSvrNm% -s -f < KC-RELEASE-3_1_SP3-Upgrade-MYSQL.sql > KC-RELEASE-3_1_SP3-Upgrade-MYSQL-Install.log 2>&1
+if /i "%InstRice%" == "Y" (
+	mysql -u %Riceun% -p%Ricepw% -D %RiceDBSvrNm% -s -f < KR-RELEASE-3_1_SP3-Upgrade-MYSQL.sql > KR-RELEASE-3_1_SP3-Upgrade-MYSQL-Install.log 2>&1
+) else (
+	mysql -u %Riceun% -p%Ricepw% -D %RiceDBSvrNm% -s -f < KR-RELEASE-3_1_SP3-SR-MYSQL.sql > KR-RELEASE-3_1_SP3-SR-MYSQL-Install.log 2>&1
 )
 move *.log ../LOGS
 cd ..

 cd KC-RELEASE-3_1_SP4-SCRIPT
-mysql -u %un% -p%pw% -D %un% -s -f < KRC-RELEASE-3_1_SP4-Upgrade-MYSQL.sql > KRC-RELEASE-3_1_SP4-Upgrade-MYSQL-Install.log 2>&1
-mysql -u %un% -p%pw% -D %un% -s -f < KC-RELEASE-3_1_SP4-Upgrade-MYSQL.sql > KC-RELEASE-3_1_SP4-Upgrade-MYSQL-Install.log 2>&1
-
-if /i "%InstRice%" == "Y" (
-	mysql -u %Riceun% -p%Ricepw% -D %Riceun% -s -f < RICE-1_0_3_1-1_0_3_2-Upgrade-MYSQL.sql > RICE-1_0_3_1-1_0_3_2-Upgrade-MYSQL-Install.log 2>&1
-	mysql -u %Riceun% -p%Ricepw% -D %Riceun% -s -f < KR-RELEASE-3_1_SP4-Upgrade-MYSQL.sql  > KR-RELEASE-3_1_SP4-Upgrade-MYSQL-Install.log 2>&1
-) else (
-	mysql -u %Riceun% -p%Ricepw% -D %Riceun% -s -f < KR-RELEASE-3_1_SP4-SR-MYSQL.sql  > KR-RELEASE-3_1_SP4-SR-MYSQL-Install.log 2>&1
+mysql -u %un% -p%pw% -D %DBSvrNm% -s -f < KRC-RELEASE-3_1_SP4-Upgrade-MYSQL.sql > KRC-RELEASE-3_1_SP4-Upgrade-MYSQL-Install.log 2>&1
+mysql -u %un% -p%pw% -D %DBSvrNm% -s -f < KC-RELEASE-3_1_SP4-Upgrade-MYSQL.sql > KC-RELEASE-3_1_SP4-Upgrade-MYSQL-Install.log 2>&1
+
+if /i "%InstRice%" == "Y" (
+	mysql -u %Riceun% -p%Ricepw% -D %RiceDBSvrNm% -s -f < RICE-1_0_3_1-1_0_3_2-Upgrade-MYSQL.sql > RICE-1_0_3_1-1_0_3_2-Upgrade-MYSQL-Install.log 2>&1
+	mysql -u %Riceun% -p%Ricepw% -D %RiceDBSvrNm% -s -f < KR-RELEASE-3_1_SP4-Upgrade-MYSQL.sql  > KR-RELEASE-3_1_SP4-Upgrade-MYSQL-Install.log 2>&1
+) else (
+	mysql -u %Riceun% -p%Ricepw% -D %RiceDBSvrNm% -s -f < KR-RELEASE-3_1_SP4-SR-MYSQL.sql  > KR-RELEASE-3_1_SP4-SR-MYSQL-Install.log 2>&1
 )

 move *.log ../LOGS
 cd ..

 cd KC-RELEASE-3_1_1-SCRIPT
-mysql -u %un% -p%pw% -D %un% -s -f < KC-RELEASE-3_1_1-Upgrade-MYSQL.sql > KC-RELEASE-3_1_1-Upgrade-MYSQL-Install.log 2>&1
-if /i "%InstRice%" == "Y" (
-	mysql -u %Riceun% -p%Ricepw% -D %Riceun% -s -f < KR-RELEASE-3_1_1-Upgrade-MYSQL.sql > KR-RELEASE-3_1_1-Upgrade-MYSQL-Install.log 2>&1
-) else (
-	mysql -u %Riceun% -p%Ricepw% -D %Riceun% -s -f < KR-RELEASE-3_1_1-SR-MYSQL.sql > KR-RELEASE-3_1_1-SR-MYSQL-Install.log 2>&1
+mysql -u %un% -p%pw% -D %DBSvrNm% -s -f < KC-RELEASE-3_1_1-Upgrade-MYSQL.sql > KC-RELEASE-3_1_1-Upgrade-MYSQL-Install.log 2>&1
+if /i "%InstRice%" == "Y" (
+	mysql -u %Riceun% -p%Ricepw% -D %RiceDBSvrNm% -s -f < KR-RELEASE-3_1_1-Upgrade-MYSQL.sql > KR-RELEASE-3_1_1-Upgrade-MYSQL-Install.log 2>&1
+) else (
+	mysql -u %Riceun% -p%Ricepw% -D %RiceDBSvrNm% -s -f < KR-RELEASE-3_1_1-SR-MYSQL.sql > KR-RELEASE-3_1_1-SR-MYSQL-Install.log 2>&1
 )
 move *.log ../LOGS/
 cd ..

 cd KC-RELEASE-3_2-SCRIPT
-mysql -u %un% -p%pw% -D %un% -s -f < KC-RELEASE-3_2-Upgrade-MYSQL.sql > KC-RELEASE-3_2-Upgrade-MYSQL-Install.log 2>&1
-if /i "%InstRice%" == "Y" (
-	mysql -u %Riceun% -p%Ricepw% -D %Riceun% -s -f < KR-RELEASE-3_2-Upgrade-MYSQL.sql > KR-RELEASE-3_2-Upgrade-MYSQL-Install.log 2>&1
-) else (
-	mysql -u %Riceun% -p%Ricepw% -D %Riceun% -s -f < KR-RELEASE-3_2-SR-MYSQL.sql > KR-RELEASE-3_2-SR-MYSQL-Install.log 2>&1
+mysql -u %un% -p%pw% -D %DBSvrNm% -s -f < KC-RELEASE-3_2-Upgrade-MYSQL.sql > KC-RELEASE-3_2-Upgrade-MYSQL-Install.log 2>&1
+if /i "%InstRice%" == "Y" (
+	mysql -u %Riceun% -p%Ricepw% -D %RiceDBSvrNm% -s -f < KR-RELEASE-3_2-Upgrade-MYSQL.sql > KR-RELEASE-3_2-Upgrade-MYSQL-Install.log 2>&1
+) else (
+	mysql -u %Riceun% -p%Ricepw% -D %RiceDBSvrNm% -s -f < KR-RELEASE-3_2-SR-MYSQL.sql > KR-RELEASE-3_2-SR-MYSQL-Install.log 2>&1
 )
 move *.log ../LOGS/
 cd ..
@@ -389,18 +389,18 @@
 cd KC-RELEASE-4_0-SCRIPT

 if /i "%mode%" == "EMBED" (
-	mysql -u %un% -p%pw% -D %un% -s -f < KRC_RICE-RELEASE-4_0-Upgrade-MYSQL.sql > KRC_RICE-RELEASE-4_0-Upgrade-MYSQL-Install.log 2>&1
-)
-
-mysql -u %un% -p%pw% -D %un% -s -f < KC_RICE-RELEASE-4_0-Upgrade-MYSQL.sql > KC_RICE-RELEASE-4_0-Upgrade-MYSQL-Install.log 2>&1
-
-if /i "%InstRice%" == "Y" (
-	mysql -u %Riceun% -p%Ricepw% -D %Riceun% -s -f < KR_RICE-RELEASE-4_0-Upgrade-MYSQL.sql > KR_RICE-RELEASE-4_0-Upgrade-MYSQL-Install.log 2>&1
-	mysql -u %Riceun% -p%Ricepw% -D %Riceun% -s -f < KR-RELEASE-4_0-Upgrade-MYSQL.sql > KR-RELEASE-4_0-Upgrade-MYSQL-Install.log 2>&1
-) else (
-	mysql -u %Riceun% -p%Ricepw% -D %Riceun% -s -f < KR-RELEASE-4_0-SR-MYSQL.sql > KR-RELEASE-4_0-SR-MYSQL-Install.log 2>&1
-)
-mysql -u %un% -p%pw% -D %un% -s -f < KC-RELEASE-4_0-Upgrade-MYSQL.sql > KC-RELEASE-4_0-Upgrade-MYSQL-Install.log 2>&1
+	mysql -u %un% -p%pw% -D %DBSvrNm% -s -f < KRC_RICE-RELEASE-4_0-Upgrade-MYSQL.sql > KRC_RICE-RELEASE-4_0-Upgrade-MYSQL-Install.log 2>&1
+)
+
+mysql -u %un% -p%pw% -D %DBSvrNm% -s -f < KC_RICE-RELEASE-4_0-Upgrade-MYSQL.sql > KC_RICE-RELEASE-4_0-Upgrade-MYSQL-Install.log 2>&1
+
+if /i "%InstRice%" == "Y" (
+	mysql -u %Riceun% -p%Ricepw% -D %RiceDBSvrNm% -s -f < KR_RICE-RELEASE-4_0-Upgrade-MYSQL.sql > KR_RICE-RELEASE-4_0-Upgrade-MYSQL-Install.log 2>&1
+	mysql -u %Riceun% -p%Ricepw% -D %RiceDBSvrNm% -s -f < KR-RELEASE-4_0-Upgrade-MYSQL.sql > KR-RELEASE-4_0-Upgrade-MYSQL-Install.log 2>&1
+) else (
+	mysql -u %Riceun% -p%Ricepw% -D %RiceDBSvrNm% -s -f < KR-RELEASE-4_0-SR-MYSQL.sql > KR-RELEASE-4_0-SR-MYSQL-Install.log 2>&1
+)
+mysql -u %un% -p%pw% -D %DBSvrNm% -s -f < KC-RELEASE-4_0-Upgrade-MYSQL.sql > KC-RELEASE-4_0-Upgrade-MYSQL-Install.log 2>&1

 move *.log ../LOGS/
 cd ..
@@ -408,23 +408,23 @@
 cd KC-RELEASE-5_0-SCRIPT

 if /i "%mode%" == "EMBED" (
-	mysql -u %un% -p%pw% -D %un% -s -f < KRC_RICE-RELEASE-5_0-Upgrade-MYSQL.sql > KRC_RICE-RELEASE-5_0-Upgrade-MYSQL-Install.log 2>&1
-)
-
-if /i "%InstRice%" == "Y" (
-	mysql -u %Riceun% -p%Ricepw% -D %Riceun% -s -f < KR_RICE-RELEASE-5_0-Upgrade-MYSQL.sql > KR_RICE-RELEASE-5_0-Upgrade-MYSQL-Install.log 2>&1
-)
-
-mysql -u %un% -p%pw% -D %un% -s -f < KC-RELEASE-5_0-Upgrade-MYSQL.sql > KC-RELEASE-5_0-Upgrade-MYSQL-Install.log 2>&1
-mysql -u %Riceun% -p%Ricepw% -D %Riceun% -s -f < KR-RELEASE-5_0-Upgrade-MYSQL.sql > KR-RELEASE-5_0-Upgrade-MYSQL-Install.log 2>&1
+	mysql -u %un% -p%pw% -D %DBSvrNm% -s -f < KRC_RICE-RELEASE-5_0-Upgrade-MYSQL.sql > KRC_RICE-RELEASE-5_0-Upgrade-MYSQL-Install.log 2>&1
+)
+
+if /i "%InstRice%" == "Y" (
+	mysql -u %Riceun% -p%Ricepw% -D %RiceDBSvrNm% -s -f < KR_RICE-RELEASE-5_0-Upgrade-MYSQL.sql > KR_RICE-RELEASE-5_0-Upgrade-MYSQL-Install.log 2>&1
+)
+
+mysql -u %un% -p%pw% -D %DBSvrNm% -s -f < KC-RELEASE-5_0-Upgrade-MYSQL.sql > KC-RELEASE-5_0-Upgrade-MYSQL-Install.log 2>&1
+mysql -u %Riceun% -p%Ricepw% -D %RiceDBSvrNm% -s -f < KR-RELEASE-5_0-Upgrade-MYSQL.sql > KR-RELEASE-5_0-Upgrade-MYSQL-Install.log 2>&1
 move *.log ../LOGS/
 cd ..

 :5.0MYSQL
 cd KC-RELEASE-5_0_1-SCRIPT

-mysql -u %un% -p%pw% -D %un% -s -f < KC-RELEASE-5_0_1-Upgrade-MYSQL.sql > KC-RELEASE-5_0_1-Upgrade-MYSQL-Install.log 2>&1
-mysql -u %Riceun% -p%Ricepw% -D %Riceun% -s -f < KR-RELEASE-5_0_1-Upgrade-MYSQL.sql > KR-RELEASE-5_0_1-Upgrade-MYSQL-Install.log 2>&1
+mysql -u %un% -p%pw% -D %DBSvrNm% -s -f < KC-RELEASE-5_0_1-Upgrade-MYSQL.sql > KC-RELEASE-5_0_1-Upgrade-MYSQL-Install.log 2>&1
+mysql -u %Riceun% -p%Ricepw% -D %RiceDBSvrNm% -s -f < KR-RELEASE-5_0_1-Upgrade-MYSQL.sql > KR-RELEASE-5_0_1-Upgrade-MYSQL-Install.log 2>&1
 move *.log ../LOGS/
 cd ..

@@ -432,20 +432,20 @@
 cd KC-RELEASE-5_1_0-SCRIPT

 if /i "%mode%" == "EMBED" (
-	mysql -u %un% -p%pw% -D %un% -s -f < KRC_RICE-RELEASE-5_1_0-Upgrade-MYSQL.sql > KRC_RICE-RELEASE-5_1_0-Upgrade-MYSQL-Install.log 2>&1
-)
-
-if /i "%InstRice%" == "Y" (
-	mysql -u %Riceun% -p%Ricepw% -D %Riceun% -s -f < KR_RICE-RELEASE-5_1_0-Upgrade-MYSQL.sql > KR_RICE-RELEASE-5_1_0-Upgrade-MYSQL-Install.log 2>&1
-)
-
-mysql -u %un% -p%pw% -D %un% -s -f < KC-RELEASE-5_1_0-Upgrade-MYSQL.sql > KC-RELEASE-5_1_0-Upgrade-MYSQL-Install.log 2>&1
-mysql -u %Riceun% -p%Ricepw% -D %Riceun% -s -f < KR-RELEASE-5_1_0-Upgrade-MYSQL.sql > KR-RELEASE-5_1_0-Upgrade-MYSQL-Install.log 2>&1
+	mysql -u %un% -p%pw% -D %DBSvrNm% -s -f < KRC_RICE-RELEASE-5_1_0-Upgrade-MYSQL.sql > KRC_RICE-RELEASE-5_1_0-Upgrade-MYSQL-Install.log 2>&1
+)
+
+if /i "%InstRice%" == "Y" (
+	mysql -u %Riceun% -p%Ricepw% -D %RiceDBSvrNm% -s -f < KR_RICE-RELEASE-5_1_0-Upgrade-MYSQL.sql > KR_RICE-RELEASE-5_1_0-Upgrade-MYSQL-Install.log 2>&1
+)
+
+mysql -u %un% -p%pw% -D %DBSvrNm% -s -f < KC-RELEASE-5_1_0-Upgrade-MYSQL.sql > KC-RELEASE-5_1_0-Upgrade-MYSQL-Install.log 2>&1
+mysql -u %Riceun% -p%Ricepw% -D %RiceDBSvrNm% -s -f < KR-RELEASE-5_1_0-Upgrade-MYSQL.sql > KR-RELEASE-5_1_0-Upgrade-MYSQL-Install.log 2>&1
 move *.log ../LOGS/
 cd ..

 cd KC-RELEASE-3_0-CLEAN/mysql
-mysql -u %Riceun% -p%Ricepw% -D %Riceun% -s -f < krrelease/datasql/KR_00_CLEAN_SEQ_BS.sql > KR_CLEAN_SEQ_BS-Mysql-Install.log 2>&1
+mysql -u %Riceun% -p%Ricepw% -D %RiceDBSvrNm% -s -f < krrelease/datasql/KR_00_CLEAN_SEQ_BS.sql > KR_CLEAN_SEQ_BS-Mysql-Install.log 2>&1
 move *.log ../../LOGS/
 cd ../..


Install clink and sudo

Install clink and sudo

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

--- install.bat
+++ install.bat
@@ -0,0 +1,5 @@
+@powershell -NoProfile -ExecutionPolicy unrestricted -Command "((new-object net.webclient).DownloadFile('https://raw.githubusercontent.com/LeovR/dotfiles/install/install.bat', '%Temp%\install.bat'))"
+call %Temp%\install.bat
+
+cinst clink
+cinst sudo


Create install.bat

Create install.bat

--- install.bat
+++ install.bat
@@ -0,0 +1,9 @@
+@echo off
+npm -v > nul
+if %errorlevel%==9009 (echo npm does not exist: exit)
+np
+node -v > nul
+if %errorlevel%==9009 (echo node does not exist: exit)
+
+npm install big-integer
+npm install colors


update build batch

update build batch

--- publish-core-command.bat
+++ publish-core-command.bat
@@ -1,4 +1,4 @@
-SET PACK_OUTPUT_DIR=E:\rp\local-nuget-packages
+SET PACK_OUTPUT_DIR=i:\rp\local-nuget-packages

 :: create corecmd lib package
 dotnet pack CoreCmd\CoreCmd.csproj -c Release -o %PACK_OUTPUT_DIR%


Enable sncExample

Enable sncExample

--- examples/iocBoot/iocExample/st.cmd
+++ examples/iocBoot/iocExample/st.cmd
@@ -26,4 +26,4 @@
 iocInit

 ## Start any sequence programs
-#seq sncExample, "user=training"
+seq sncExample, "user=training"


maybe one line will fix the glitch?

maybe one line will fix the glitch?

--- ci/tasks/cats-windows-diego.bat
+++ ci/tasks/cats-windows-diego.bat
@@ -22,6 +22,4 @@
 go get -v github.com/onsi/ginkgo/ginkgo

 cd %GATSPATH%
-ginkgo.exe -r -slowSpecThreshold=120 -nodes=2 ^
-  -skip=NO_DIEGO_SUPPORT ^
-  . apps backend_compatibility detect docker internet_dependent security_groups ssh routing
+ginkgo.exe -r -slowSpecThreshold=120 -nodes=2 -skip=NO_DIEGO_SUPPORT . apps backend_compatibility detect docker internet_dependent security_groups ssh routing


buildpdfium.bat: add ignore-space-change to patch application

--- contrib/build_pdfium/buildpdfium.bat
+++ contrib/build_pdfium/buildpdfium.bat
@@ -53,7 +53,7 @@
 cd %PDFium_SOURCE_DIR%
 copy "%PDFium_PATCH_DIR%\resources.rc" . || exit /b
 git.exe apply -v "%PDFium_PATCH_DIR%\shared_library.patch" || exit /b
-git.exe -C build apply -v "%PDFium_PATCH_DIR%\rc_compiler.patch" || exit /b
+git.exe -C build apply -v --ignore-space-change "%PDFium_PATCH_DIR%\rc_compiler.patch" || exit /b

 : Configure
 cd %PDFium_SOURCE_DIR%


build: fix misleading vcbuild.bat error message

--- vcbuild.bat
+++ vcbuild.bat
@@ -77,7 +77,7 @@
 goto have_gyp

 :gyp_install_failed
-echo Failed to download gyp. Make sure you have subversion installed, or
+echo Failed to download gyp. Make sure you have git installed, or
 echo manually install gyp into %~dp0build\gyp.
 goto exit


version of hdf5 for windows

version of hdf5 for windows

--- recipes-tag/h5py/bld.bat
+++ recipes-tag/h5py/bld.bat
@@ -1,4 +1,4 @@
-"%PYTHON%" setup.py configure --hdf5="%LIBRARY_PREFIX%"  --hdf5-version=1.8.18
+"%PYTHON%" setup.py configure --hdf5="%LIBRARY_PREFIX%"  --hdf5-version=1.10.1
 if errorlevel 1 exit 1

 "%PYTHON%" setup.py install --single-version-externally-managed --record record.txt


right build py win

right build py win

--- recipes/gau2grid/bld.bat
+++ recipes/gau2grid/bld.bat
@@ -14,7 +14,7 @@
       -DBUILD_SHARED_LIBS=ON ^
       -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON ^
       -DENABLE_GENERIC=ON ^
-      -DPYTHON_EXECUTABLE=%BUILD_PREFIX%/bin/python ^
+      -DPYTHON_EXECUTABLE=%BUILD_PREFIX%/python.exe ^
       -DMAX_AM=8
 if errorlevel 1 exit 1


Theme build script update

Theme build script update

--- Build/BuildTheme.cmd
+++ Build/BuildTheme.cmd
@@ -10,7 +10,10 @@

 git pull %ThemeRepository%

-call ".nuget\NuGet.exe" update %ProjectToBuild%
+call ".nuget\NuGet.exe" restore %ThemeDirectory%\\%ProjectToBuild%
+call ".nuget\NuGet.exe" update %ThemeDirectory%\\%ProjectToBuild% -Id YAPA.WPF.Shared
+call ".nuget\NuGet.exe" update %ThemeDirectory%\\%ProjectToBuild% -Id YAPA.WPF
+

 cd %ThemeDirectory%


PROACTIVE-221 Updated hello.bat to use GCM deployment descriptors

git-svn-id: 9146c88ff6d39b48099bf954d15d68f687b3fa69@7835 28e8926c-6b08-0410-baaa-805c5e19b8d6

--- scripts/windows/hello.bat
+++ scripts/windows/hello.bat
@@ -26,16 +26,18 @@
 ECHO.
 goto local

+set XMLDESCRIPTOR=%PROACTIVE%\descriptors\helloApplication.xml
+
 :local
-set XMLDESCRIPTOR=%PROACTIVE%\descriptors\helloLocal.xml
+set GCMD=helloDeploymentLocal.xml
 goto launch

 :remote
-set XMLDESCRIPTOR=%PROACTIVE%\descriptors\helloRemote.xml
+set GCMD=helloDeploymentRemote.xml

 :launch

-%JAVA_CMD% org.objectweb.proactive.examples.hello.Hello "%XMLDESCRIPTOR%"
+%JAVA_CMD% -Dgcmdfile=%GCMD% org.objectweb.proactive.examples.hello.Hello "%XMLDESCRIPTOR%"
 ENDLOCAL

 pause


Add initcfg.bat for windows

Add initcfg.bat for windows

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

--- initcfg.bat
+++ initcfg.bat
@@ -0,0 +1,4 @@
+@echo off
+If Not Exist "userapiconfig.py" Copy "apiconfig.py" "userapiconfig.py"
+If Not Exist "user-config.json" Copy "config.json" "user-config.json"
+If Not Exist "usermysql.json" Copy "mysql.json" "usermysql.json"


Make sure that Configuration is set in install.cmd

--- install.cmd
+++ install.cmd
@@ -1,4 +1,4 @@
-Configuration=%1
-@set path=%cd%\tools\VsixUtil;%path%
+@set Configuration=%1
+@if "%Configuration%" == "" echo Please specify Debug or Release
 tools\VsixUtil\vsixutil /install "build\%Configuration%\GitHub.VisualStudio.vsix"
 @echo Installed %Configuration% build of GitHub for Visual Studio


Update bld.bat

Update bld.bat

--- conda/python-scons/bld.bat
+++ conda/python-scons/bld.bat
@@ -2,3 +2,23 @@

 "%PYTHON%" setup.py install --standard-lib
 if errorlevel 1 exit 1
+
+if not exist %PREFIX%/etc/conda/activate.d mkdir %PREFIX%/etc/conda/activate.d
+if errorlevel 1 exit 1
+if not exist %PREFIX%/etc/conda/deactivate.d mkdir -p $PREFIX/etc/conda/dedeactivate.d
+type NUL > %PREFIX%/etc/conda/activate.d/scons_vars.bat
+if errorlevel 1 exit 1
+type NUL > %PREFIX%/etc/conda/deactivate.d/scons_vars.bat
+if errorlevel 1 exit 1
+
+echo set SCONSFLAGS="--sitedir=%CONDA_PREFIX%/share/site_scons" > %PREFIX%/etc/conda/activate.d/scons_vars.bat
+if errorlevel 1 exit 1
+echo set SCONSFLAGS= > %PREFIX%/etc/conda/deactivate.d/scons_vars.bat
+if errorlevel 1 exit 1
+
+if not exist %PREFIX%/share/site_scons mkdir %PREFIX%/share/site_scons
+if errorlevel 1 exit 1
+if not exist %PREFIX%/share/site_scons/site_init.py type NUL > %PREFIX%/share/site_scons/site_init.py
+if errorlevel 1 exit 1
+if not exist %PREFIX%/share/site_scons/site_tools mkdir %PREFIX%/share/site_scons/site_tools
+if errorlevel 1 exit 1


fixed conflict

fixed conflict

--- test/test_app.bat
+++ test/test_app.bat
@@ -1,6 +1,8 @@
 ### application.bat - 2015 - Merel ###
+
 echo "Copyright Benoit MEREL - 2015"

-version = "1.2.1"
+
+version = "2.0.0"

 echo "version ${version}"


Fix a bag that saving camera settings crashes Effekseer

--- release_tool.bat
+++ release_tool.bat
@@ -19,6 +19,8 @@
 copy Dev\release\Microsoft.Scripting.dll %RDIR%\Tool\.
 copy Dev\release\EffekseerMaterialEditor.exe %RDIR%\Tool\.
 copy Dev\release\Viewer.dll %RDIR%\Tool\.
+copy Dev\release\Newtonsoft.Json.dll %RDIR%\Tool\.
+

 mkdir %RDIR%\Tool\scripts
 mkdir %RDIR%\Tool\scripts\export


mv -> rename

mv -> rename


ivshmem: Don't run Static Driver Verifier on ivshmem-test

The project does not build a driver so subjecting it to SDV does not
make sense.

Build FAILED.

"C:\kvm-guest-drivers-windows\ivshmem\test\ivshmem-test.vcxproj" (sdv target) (1) ->
  C:\kvm-guest-drivers-windows\ivshmem\test\ivshmem-test.vcxproj : error MSB4057: The target "sdv" does not exist in the project.

    0 Warning(s)
    1 Error(s)

Signed-off-by: Ladi Prosek <727f16b97cf99ec0710180d99386e4875fb7e2eb@redhat.com>

--- buildAll.bat
+++ buildAll.bat
@@ -8,8 +8,6 @@
 call tools\build.bat viostor\viostor.vcxproj "Win8_SDV Win10_SDV" %*
 if errorlevel 1 goto :fail
 call tools\build.bat ivshmem\ivshmem.vcxproj "Win10_SDV" %*
-if errorlevel 1 goto :fail
-call tools\build.bat ivshmem\test\ivshmem-test.vcxproj "Win10_SDV" %*
 if errorlevel 1 goto :fail

 for %%D in (pciserial fwcfg packaging Q35) do (


Version Tag

Version Tag

--- versiontag.bat
+++ versiontag.bat
@@ -1,5 +1,5 @@
 git config user.email "%1@outlook.com"
 git config user.name "%2"
 git remote set-url origin https://%1:%2@github.com/wasteam/waslibs.git
-git tag -a %PackageVersionTag% -m "Version built. %PackageVersionTag%"
+git tag -a "%PackageVersionTag%" -m "Version built. %PackageVersionTag%"
 git push origin %PackageVersionTag%


Nuget package build script

Nuget package build script

--- build/build-nuget.bat
+++ build/build-nuget.bat
@@ -1 +1,26 @@
-..\src\Hatchet\.nuget\nuget.exe pack ..\src\Hatchet\Hatchet.csproj -Version 0.2.1 -Properties Configuration=Release
+@echo off
+if [%1]==[] goto noVersion
+
+msbuild ..\src\Hatchet\Hatchet.csproj /p:Configuration=Release
+if errorlevel 1 goto buildFailure
+
+..\src\Hatchet\.nuget\nuget.exe pack ..\src\Hatchet\Hatchet.csproj -Version %1 -Properties Configuration=Release
+if errorlevel 1 goto packageFailure
+
+echo ================================================
+echo.
+echo Package created for version %1
+
+goto :eof
+
+:noVersion
+echo Version number not specified.
+goto :eof
+
+:buildFailure
+echo Failed to build Hatchet.csproj
+goto :eof
+
+:packageFailure
+echo Failed to create .nupkg
+goto :eof


update

update

error: pathspec 'build/msvc.vendor.cmd' did not match any file(s) known to git

--- build/msvc.vendor.cmd
+++ build/msvc.vendor.cmd
@@ -0,0 +1,6 @@
+@echo off
+rem Public domain
+rem http://unlicense.org/
+rem Created by Grigore Stefan <g_stefan@yahoo.com>
+
+echo -^> vendor dll-inject


Upgrading script to current version.

Upgrading script to current version.

--- nu_push.bat
+++ nu_push.bat
@@ -1,6 +1,6 @@
 set dist_folder=packages-dist
 set nuget_source=https://www.nuget.org
-set version=0.9.3
+set version=0.9.4
 nuget push .\%dist_folder%\SlimMessageBus.%version%.*.nupkg -Source %nuget_source%
 nuget push .\%dist_folder%\SlimMessageBus.Host.%version%.*.nupkg -Source %nuget_source%
 nuget push .\%dist_folder%\SlimMessageBus.Host.ServiceLocator.%version%.*.nupkg -Source %nuget_source%


fix for PROACTIVE-188

fix for PROACTIVE-188

git-svn-id: 9146c88ff6d39b48099bf954d15d68f687b3fa69@7485 28e8926c-6b08-0410-baaa-805c5e19b8d6

--- scripts/windows/init.bat
+++ scripts/windows/init.bat
@@ -26,10 +26,10 @@
 IF EXIST "%PROACTIVE%\classes" (
 	SET CLASSPATH=%CLASSPATH%;%PROACTIVE%\classes\Core;%PROACTIVE%\classes\Extensions;%PROACTIVE%\classes\Extra;%PROACTIVE%\classes\Examples;%PROACTIVE%\classes\IC2D-old
 	SET JARS=%PROACTIVE%\lib\
-	FOR %%j IN (%PROACTIVE%\lib\*.jar) DO SET JARS=!JARS!;%%j
+	FOR %%j IN ("%PROACTIVE%\lib\*.jar") DO SET JARS=!JARS!;%%j
 ) ELSE (
 	SET JARS=%PROACTIVE%\dist\lib\
-	FOR %%j IN (%PROACTIVE%\dist\lib\*.jar) DO SET JARS=!JARS!;%%j
+	FOR %%j IN ("%PROACTIVE%\dist\lib\*.jar") DO SET JARS=!JARS!;%%j
 )

 SET CLASSPATH=%CLASSPATH%;%JARS%


[MNG-6648] 'mavenrc_pre' script does not receive arguments like mavenrc in Bourne shell does

This closes #511

--- apache-maven/src/assembly/shared/validate.cmd
+++ apache-maven/src/assembly/shared/validate.cmd
@@ -37,8 +37,8 @@
 @REM Execute a user defined script before this one
 if not "%MAVEN_SKIP_RC%"=="" goto skipRcPre
 @REM check for pre script, once with legacy .bat ending and once with .cmd ending
-if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat"
-if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd"
+if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %*
+if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %*
 :skipRcPre

 @setlocal


Update package.cmd

Update package.cmd

增加bubble-web编译并package脚本

--- package.cmd
+++ package.cmd
@@ -8,10 +8,10 @@
 rem cd ./bubble-persistence
 rem mvn -Dmaven.test.skip=true clean install

-rem cd ../bubble-remote
+rem cd ../bubble-web
 rem mvn -Dmaven.test.skip=true clean install

 rem cd ./bubble-application
 rem mvn -f bubble-application/pom.xml -Dmaven.test.skip=true clean package

-mvn -Dmaven.test.skip=true clean assembly:assembly+mvn -Dmaven.test.skip=true clean assembly:assembly


updated, requires PHP4.2 php-cgi

updated, requires PHP4.2 php-cgi

git-svn-id: 4b064e69dc630d28214c1e1442d27300cccf8e9a@77310 c90b9560-bf6c-de11-be94-00142212c4b1

--- scripts/pear.bat
+++ scripts/pear.bat
@@ -16,16 +16,16 @@
 REM  Authors:     Alexander Merz (alexmerz@php.net)
 REM ----------------------------------------------------------------------
 REM
-REM  $Id: pear.bat,v 1.4 2001/10/13 06:22:09 mj Exp $
+REM  $Id: pear.bat,v 1.5 2001/12/11 15:31:48 sebastian Exp $

 REM change this four lines to match the paths of your system
 REM -------------------
 set PHP_PATH=c:\php
 set PEAR_INSTALL_DIR=c:\php\pear
 set PEAR_EXTENSION_DIR=c:\php\extensions
-set PEAR_DOC_DIR=c:\php\pear
+set PEAR_DOC_DIR=c:\php\pear\docs
 REM -------------------
 set DIRECTORY_SEPARATOR=\

-%PHP_PATH%\php.exe -q %PEAR_INSTALL_DIR%\scripts\pearwin.php %1 %2 %3 %4 %5 %6
+%PHP_PATH%\php-cgi.exe -q %PEAR_INSTALL_DIR%\scripts\pear.in %1 %2 %3 %4 %5 %6 %7 %8 %9
 @ECHO ON


Poor man's touch. Uses touch.exe if available, else uses pure batch.

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

--- Batch/touch.bat
+++ Batch/touch.bat
@@ -0,0 +1,148 @@
+@echo off
+:#*****************************************************************************
+:#                                                                            *
+:#  Filename:	    touch.bat						      *
+:#                                                                            *
+:#  Description:    Same as Unix touch.exe, using pure batch		      *
+:#                                                                            *
+:#  Notes:	                                                              *
+:#                                                                            *
+:#  History:                                                                  *
+:#   2016-09-30 JFL Created this script, based on tricks used in nmake files. *
+:#                                                                            *
+:#         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=2016-09-30"
+set "SCRIPT=%~nx0"
+set "SPATH=%~dp0" & set "SPATH=!SPATH:~0,-1!"
+set "ARG0=%~f0"
+set  ARGS=%*
+
+set "POPARG=call :PopArg"
+set "PEEKARG=call :PeekArg"
+goto Main
+
+:#----------------------------------------------------------------------------#
+:#                                                                            #
+:#  Function        PopArg                                                    #
+:#                                                                            #
+:#  Description     Pop the first arguments from %ARGS% into %ARG%            #
+:#                                                                            #
+:#  Arguments       %ARGS%	    Command line arguments                    #
+:#                                                                            #
+:#  Returns         %ARG%           The unquoted argument                     #
+:#                  %"ARG"%         The actual argument, possibly quoted      #
+:#                                                                            #
+:#  Notes 	    Works around the defect of the shift command, which       #
+:#                  pops the first argument from the %* list, but does not    #
+:#                  remove it from %*.                                        #
+:#                                                                            #
+:#                  Use an inner call to make sure the argument parsing is    #
+:#                  done by the actual cmd.exe parser. This guaranties that   #
+:#                  arguments are split exactly as shift would have done.     #
+:#                                                                            #
+:#                  But call itself has a quirk, which requires a convoluted  #
+:#                  workaround to process the /? argument.                    #
+:#                                                                            #
+:#                  To do: Detect if the last arg has mismatched quotes, and  #
+:#                  if it does, append one.                                   #
+:#                  Right now such mismatched quotes will cause an error here.#
+:#                  It is easily feasible to work around this, but this is    #
+:#                  useless as passing back an invalid argument like this     #
+:#                  will only cause more errors further down.                 #
+:#                                                                            #
+:#  History                                                                   #
+:#   2015-04-03 JFL Bug fix: Quoted args with an & inside failed to be poped. #
+:#   2015-07-06 JFL Bug fix: Call quirk prevented inner call from popping /?. #
+:#                                                                            #
+:#----------------------------------------------------------------------------#
+
+:PopArg
+:# Gotcha: The call parser first scans its command line for an unquoted /?.
+:# If it finds one anywhere on the command line, then it ignores the target label and displays call help.
+:# To work around that, we initialize %ARG% and %"ARG"% with an impossible combination of values.
+set "ARG=Yes"
+set ""ARG"=No"
+call :PopArg.Helper %ARGS% >NUL 2>NUL &:# Output redirections ensure the call help is not actually output.
+:# Finding that impossible combination now is proof that the call was not executed.
+:# In this case, try again with the /? quoted, to prevent the call parser from processing it.
+:# Note that we can not systematically do this /? enquoting, else it's "/?" that would break the call.
+if "%ARG%"=="Yes" if [%"ARG"%]==[No] call :PopArg.Helper %ARGS:/?="/?"%
+goto :eof
+:PopArg.Helper
+set "ARG=%~1"	&:# Remove quotes from the argument
+set ""ARG"=%1"	&:# The same with quotes, if any, should we need them
+:# Rebuild the tail of the argument line, as shift does not do it
+:# Never quote the set ARGS command, else some complex quoted strings break
+set ARGS=%2
+:PopArg.GetNext
+shift
+if [%2]==[] goto :eof
+:# Leave quotes in the tail of the argument line
+set ARGS=%ARGS% %2
+goto :PopArg.GetNext
+
+:PeekArg
+set "ARG=Yes"
+set ""ARG"=No"
+call :PeekArg.Helper %ARGS% >NUL 2>NUL &:# Output redirections ensure the call help is not actually output.
+if "%ARG%"=="Yes" if [%"ARG"%]==[No] call :PeekArg.Helper %ARGS:/?="/?"%
+goto :eof
+:PeekArg.Helper
+set "ARG=%~1"	&:# Remove quotes from the argument
+set ""ARG"=%1"	&:# The same with quotes, if any, should we need them
+goto :eof
+
+:#----------------------------------------------------------------------------#
+:#                                                                            #
+:#  Function        Main                                                      #
+:#                                                                            #
+:#  Description     Process command line arguments, and main routine body     #
+:#                                                                            #
+:#  Arguments       %*	    Command line arguments                            #
+:#                                                                            #
+:#  Notes 	                                                              #
+:#                                                                            #
+:#  History                                                                   #
+:#                                                                            #
+:#----------------------------------------------------------------------------#
+
+:main
+set "DO="
+set "touch.exe=touch.exe"
+
+:# Special arguments for testing the script
+:peek_next
+%PEEKARG%
+if "%ARG%"=="-X" %POPARG% & set "DO=echo" & goto :peek_next
+if "%ARG%"=="-D" %POPARG% & set "touch.exe=DoNotFindTouch.exe" & goto :peek_next
+
+:# Test if touch.exe is available in the PATH
+for %%f in ("%touch.exe%") do set "touch.exe=%%~$PATH:f"
+if defined touch.exe (	:# Invoke the real touch.exe, which is more efficient
+  %DO% %touch.exe% %ARGS%
+) else (		:# Invoke the pure batch version, which copies the file
+  for %%a in (%ARGS%) do (
+    set "SKIP="
+    if "%%~a"=="-a" set "SKIP=Yes"	&rem :# Ignore touch.exe -a argument
+    if "%%~a"=="-f" set "SKIP=Yes"	&rem :# Ignore touch.exe -f argument
+    if "%%~a"=="-m" set "SKIP=Yes"	&rem :# Ignore touch.exe -m argument
+    if "%%~a"=="--" set "SKIP=Yes"	&rem :# Ignore touch.exe -- argument
+    if not defined SKIP %DO% copy /b %%a+NUL
+  )
+)
+exit /b
+
+:# One line versions for use in nmake files
+
+:# The trick I had used in nmake files
+touch $@ || copy /b $@+NUL &:# Use touch.exe if available, else use internal DOS commands for doing the same, albeit less efficiently.
+
+:# Improved version that avoids double errors when invoked with a bad argument
+touch $@ & if errorlevel 100 copy /b $@+NUL &:# Idem, but don't try again with copy if touch.exe exists, but did fail.
+
+:# Improved version that tests the PATH, and runs only the right command
+cmd /V:ON /c "set "T=" & for %f in (touch.exe) do set "T=%~$PATH:f" & if defined T (!T! $@) else (copy /b $@+NUL)"


Fix setting BUILD

Fix setting BUILD

--- bin/build.bat
+++ bin/build.bat
@@ -1,12 +1,11 @@
 @setlocal
-@set BUILD=%1
 @set debug=

 @if "%1x"=="--debugx" (
   shift
   set debug=--debug
-  set BUILD=%1
 )
+@set BUILD=%1

 @if "%BUILD:~-7%" == "_vmware" (
   set boxname=%BUILD:~0,-7%


Copy required files to source directory

Copy required files to source directory

--- recipes/cspice/bld.bat
+++ recipes/cspice/bld.bat
@@ -1,6 +1,7 @@
 mkdir %LIBRARY_INC%\cspice

-copy "makeDynamicSpice.bat" %SRC_DIR%\src\cspice
+copy "%RECIPE_DIR%\\makeDynamicSpice.bat" %SRC_DIR%\src\cspice
+copy "%RECIPE_DIR%\\cspice.def" %SRC_DIR%\src\cspice

 cd %SRC_DIR%\src\cspice