update deploy for new csv files

update deploy for new csv files

--- Devices/GatewayConnectedDevices/BLEMoisture/deploy_next.cmd
+++ Devices/GatewayConnectedDevices/BLEMoisture/deploy_next.cmd
@@ -41,6 +41,8 @@
 echo Copying file that starts up python script to read hydrology sensors and format as JSON
 %PSCP_CMD% SensorAgent.py  %rpi_usr%@%rpi_ip%:%Staging%/
 %PSCP_CMD% BLEMoistureSensor.py  %rpi_usr%@%rpi_ip%:%Staging%/
+%PSCP_CMD% SensorAgentConfig.csv  %rpi_usr%@%rpi_ip%:%Staging%/
+%PSCP_CMD% DeviceConfig.csv  %rpi_usr%@%rpi_ip%:%Staging%/
 %PSCP_CMD% Modified\autorun2.sh  %rpi_usr%@%rpi_ip%:%Staging%/

 echo Marking autorun2.sh as executable


Updated the list of JDOM .jar files.  Protect against %TWEEK_BASE_DIR%
containing spaces.

git-svn-id: 769d22dfa2d22aad706b9a451492fb87c0735f19@15949 08b38cba-cd3b-11de-854e-f91c5b6e4272

--- modules/tweek/java/tweek.bat
+++ modules/tweek/java/tweek.bat
@@ -42,9 +42,9 @@
 ECHO [ERR] Please check the path and try again.
 GOTO ERREXIT
 :RUNJAVA
-set TWEEK_CLASSPATH=%TWEEK_BASE_DIR%/bin/jdom.jar;%TWEEK_BASE_DIR%/bin/xerces.jar;%TWEEK_BASE_DIR%/bin/Tweek.jar;%TWEEK_BASE_DIR%/bin/TweekBeans.jar;%TWEEK_BASE_DIR%/bin/TweekEvents.jar;%TWEEK_BASE_DIR%/bin/TweekNet.jar;%TWEEK_BASE_DIR%/bin/TweekBeanDelivery.jar;%TWEEK_BASE_DIR%/bin/TweekServices.jar;%TWEEK_BASE_DIR%/bin/kunststoff-mod.jar;%TWEEK_BASE_DIR%/bin/liquidlnf.jar;%TWEEK_BASE_DIR%/bin/metouia.jar;%TWEEK_BASE_DIR%/bin/looks.jar
+set TWEEK_CLASSPATH=%TWEEK_BASE_DIR%/bin/jaxen-core.jar;%TWEEK_BASE_DIR%/bin/jaxen-jdom.jar;%TWEEK_BASE_DIR%/bin/jdom.jar;%TWEEK_BASE_DIR%/bin/saxpath.jar;%TWEEK_BASE_DIR%/bin/xalan.jar;%TWEEK_BASE_DIR%/bin/xerces.jar;%TWEEK_BASE_DIR%/bin/xml-apis.jar;%TWEEK_BASE_DIR%/bin/Tweek.jar;%TWEEK_BASE_DIR%/bin/TweekBeans.jar;%TWEEK_BASE_DIR%/bin/TweekEvents.jar;%TWEEK_BASE_DIR%/bin/TweekNet.jar;%TWEEK_BASE_DIR%/bin/TweekBeanDelivery.jar;%TWEEK_BASE_DIR%/bin/TweekServices.jar;%TWEEK_BASE_DIR%/bin/kunststoff-mod.jar;%TWEEK_BASE_DIR%/bin/liquidlnf.jar;%TWEEK_BASE_DIR%/bin/metouia.jar;%TWEEK_BASE_DIR%/bin/looks.jar

-java -DTWEEK_BASE_DIR=%TWEEK_BASE_DIR% -Djava.security.policy=%TWEEK_BASE_DIR%/bin/java.security.policy.txt -cp %TWEEK_CLASSPATH% org.vrjuggler.tweek.Tweek %*
+java -DTWEEK_BASE_DIR="%TWEEK_BASE_DIR%" -Djava.security.policy="%TWEEK_BASE_DIR%/bin/java.security.policy.txt" -cp "%TWEEK_CLASSPATH%" org.vrjuggler.tweek.Tweek %*
 GOTO DONE
 :ERREXIT
 ECHO [ERR] Tweek exiting due to previous errors.


build: update windows configuration to match new vm

--- .kokoro/test.bat
+++ .kokoro/test.bat
@@ -17,14 +17,12 @@
 cd /d %~dp0
 cd ..

-@rem The image we're currently running has a broken version of Node.js enabled
-@rem by nvm (v10.15.3), which has no npm bin. This hack uses the functional
-@rem Node v8.9.1 to install npm@latest, it then uses this version of npm to
-@rem install npm for v10.15.3.
-call nvm use v8.9.1 || goto :error
-call node C:\Users\kbuilder\AppData\Roaming\nvm-ps\versions\v8.9.1\node_modules\npm-bootstrap\bin\npm-cli.js i npm -g || goto :error
-call nvm use v10.15.3 || goto :error
-call node C:\Users\kbuilder\AppData\Roaming\nvm-ps\versions\v8.9.1\node_modules\npm\bin\npm-cli.js i npm -g || goto :error
+@rem npm path is not currently set in our image, we should fix this next time
+@rem we upgrade Node.js in the image:
+SET PATH=%PATH%;/cygdrive/c/Program Files/nodejs/npm
+
+call nvm use v12.14.1
+call which node

 call npm install || goto :error
 call npm run test || goto :error


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

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

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


Create Shutdown_PC.bat

Create Shutdown_PC.bat

Shutdown Windows PC with this batch script.

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

--- Shutdown_PC.bat
+++ Shutdown_PC.bat
@@ -0,0 +1 @@
+shutdown.exe /s /t 00


tscompile.bat

tscompile.bat

--HG--
branch : typescript_migration

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

--- tscompile.bat
+++ tscompile.bat
@@ -0,0 +1 @@
+tsc ts/config.ts ts/main.ts ts/converters/all.ts --module amd --outDir binjs


Signed-off-by: Alborz A. Amir-Khalili <alborza@bisicl.ad.ece.ubc.ca>

--- Azure_client.bat
+++ Azure_client.bat
@@ -1,22 +1,18 @@
 rem echo off
 set PATH=C:\Program Files\Matlab\R2016b\bin\win64;C:\TDM-GCC-64\bin;%PATH%
 set DBPATH=%GOPATH%\src\github.com\4180122\distbayes
-set SERVERADD=10.1.0.4:12456
-rem set SERVERADD=%DBPATH%\serverlist-azure.txt
+
+rem set SERVERADD=10.1.0.4:12456
+set SERVERADD=%DBPATH%\serverlist-azure.txt
+
 for /f "usebackq tokens=2 delims=:" %%f in (`ipconfig ^| findstr /c:"IPv4 Address"`) do set LOCALADD=%%f
 set XDATA=%DBPATH%\testdata\x1.txt
 set YDATA=%DBPATH%\testdata\y1.txt

-rem go build -o %DBPATH%\clientbayes.exe %DBPATH%\clientMatlab_raft\clientM_raft.go
-go build -o %DBPATH%\clientbayes.exe %DBPATH%\clientMatlab\client_azure.go
+go build -o %DBPATH%\clientbayes.exe %DBPATH%\clientMatlab_raft\clientM_raft.go
+rem go build -o %DBPATH%\clientbayes.exe %DBPATH%\clientMatlab\client_azure.go

 %DBPATH%\clientbayes.exe %LOCALADD% %LOCALADD%:12456 %SERVERADD% %XDATA% %YDATA% log 0
-:loop
-timeout 10
-%DBPATH%\clientbayes.exe %LOCALADD% %LOCALADD%:12456 %SERVERADD% %XDATA% %YDATA% log 1
-goto loop
-
-rem %DBPATH%\clientbayes.exe %LOCALADD% %LOCALADD%:12456 %SERVERADD% %XDATA% %YDATA% log 0
 rem :loop
 rem timeout 10
 rem %DBPATH%\clientbayes.exe %LOCALADD% %LOCALADD%:12456 %SERVERADD% %XDATA% %YDATA% log 1


Little script to start one instance of the aiclient_python


simple package batch script which assembles dlls build through VS (MSBUILD)

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

--- package.bat
+++ package.bat
@@ -0,0 +1,18 @@
+set /p versionNumber=
+
+rd /q /s builds\FsEye-%versionNumber%
+
+mkdir builds\FsEye-%versionNumber%
+mkdir builds\FsEye-%versionNumber%\plugins
+
+copy LICENSE builds\FsEye-%versionNumber%
+copy NOTICE builds\FsEye-%versionNumber%
+
+copy FsEye\bin\Release\FsEye.fsx builds\FsEye-%versionNumber%
+copy FsEye\bin\Release\FsEye.dll builds\FsEye-%versionNumber%
+copy FsEye\bin\Release\FsEye.xml builds\FsEye-%versionNumber%
+
+copy "FsEye.PropertyGrid.Plugin\bin\Release\FsEye.PropertyGrid.Plugin.dll" builds\FsEye-%versionNumber%\plugins
+copy "FsEye.TreeView.Plugin\bin\Release\FsEye.TreeView.Plugin.dll" builds\FsEye-%versionNumber%\plugins
+
+pause


Remove package.cmd

Remove package.cmd

--- package.cmd
+++ package.cmd
@@ -1,103 +0,0 @@
-tools\nuget.exe update -self
-
-rd download /s /q
-
-if not exist download mkdir download
-if not exist download\WindowsPhone mkdir download\WindowsPhone
-if not exist download\Silverlight mkdir download\Silverlight
-if not exist download\package mkdir download\package
-if not exist download\package\twilio mkdir download\package\twilio
-if not exist download\package\twilioauth mkdir download\package\twilioauth
-if not exist download\package\twiliomvc mkdir download\package\twiliomvc
-if not exist download\package\twiliotwiml mkdir download\package\twiliotwiml
-if not exist download\package\twiliowebmatrix mkdir download\package\twiliowebmatrix
-if not exist download\package\twilioclient mkdir download\package\twilioclient
-if not exist download\package\twiliotaskrouter mkdir download\package\twiliotaskrouter
-if not exist download\package\twiliolookups mkdir download\package\twiliolookups
-if not exist download\package\twiliopricing mkdir download\package\twiliopricing
-if not exist download\package\twiliomonitor mkdir download\package\twiliomonitor
-if not exist download\package\twiliotrunking mkdir download\package\twiliotrunking
-
-if not exist download\package\twilio\lib mkdir download\package\twilio\lib
-if not exist download\package\twilio\lib\3.5 mkdir download\package\twilio\lib\3.5
-if not exist download\package\twilio\lib\WINDOWSPHONE8 mkdir download\package\twilio\lib\WINDOWSPHONE8
-if not exist download\package\twilio\lib\SL5 mkdir download\package\twilio\lib\SL5
-
-if not exist download\package\twilioauth\lib mkdir download\package\twilioauth\lib
-if not exist download\package\twilioauth\lib\3.5 mkdir download\package\twilioauth\lib\3.5
-
-if not exist download\package\twiliomvc\lib mkdir download\package\twiliomvc\lib
-if not exist download\package\twiliomvc\lib\3.5 mkdir download\package\twiliomvc\lib\3.5
-
-if not exist download\package\twiliotwiml\lib mkdir download\package\twiliotwiml\lib
-if not exist download\package\twiliotwiml\lib\3.5 mkdir download\package\twiliotwiml\lib\3.5
-
-if not exist download\package\twiliowebmatrix\lib mkdir download\package\twiliowebmatrix\lib
-if not exist download\package\twiliowebmatrix\lib\3.5 mkdir download\package\twiliowebmatrix\lib\3.5
-
-if not exist download\package\twilioclient\lib mkdir download\package\twilioclient\lib
-if not exist download\package\twilioclient\lib\3.5 mkdir download\package\twilioclient\lib\3.5
-
-if not exist download\package\twiliotaskrouter\lib mkdir download\package\twiliotaskrouter\lib
-if not exist download\package\twiliotaskrouter\lib\3.5 mkdir download\package\twiliotaskrouter\lib\3.5
-
-if not exist download\package\twiliolookups\lib mkdir download\package\twiliolookups\lib
-if not exist download\package\twiliolookups\lib\3.5 mkdir download\package\twiliolookups\lib\3.5
-
-if not exist download\package\twiliopricing\lib mkdir download\package\twiliopricing\lib
-if not exist download\package\twiliopricing\lib\3.5 mkdir download\package\twiliopricing\lib\3.5
-
-if not exist download\package\twiliomonitor\lib mkdir download\package\twiliomonitor\lib
-if not exist download\package\twiliomonitor\lib\3.5 mkdir download\package\twiliomonitor\lib\3.5
-
-if not exist download\package\twiliotrunking\lib mkdir download\package\twiliotrunking\lib
-if not exist download\package\twiliotrunking\lib\3.5 mkdir download\package\twiliotrunking\lib\3.5
-
-if not exist download\package\twilioipmessaging\lib mkdir download\package\twilioipmessaging\lib
-if not exist download\package\twilioipmessaging\lib\3.5 mkdir download\package\twilioipmessaging\lib\3.5
-
-REM tools\ilmerge.exe /lib:src\Twilio.Api\bin\Release /internalize /ndebug /v2 /out:download\Twilio.Api.dll Twilio.Api.dll RestSharp.dll
-REM tools\ilmerge.exe /lib:src\Twilio.Api.Silverlight\bin\Release /internalize /ndebug /targetplatform:v4,"C:\Program Files (x86)\Microsoft Silverlight\4.1.10111.0" /out:download\Twilio.Api.Silverlight.dll RestSharp.Silverlight.dll
-
-copy src\Twilio.Api\bin\Release\*.* download
-copy src\Twilio.Api.Silverlight\bin\Release\*.* download\Silverlight\
-copy src\Twilio.Api.WindowsPhone\bin\Release\*.* download\WindowsPhone\
-copy src\Twilio.Auth\bin\Release\*.* download
-copy src\Twilio.Mvc\bin\Release\*.* download
-copy src\Twilio.Twiml\bin\Release\*.* download
-copy src\Twilio.WebMatrix\bin\Release\*.* download
-copy src\Twilio.Client.Capability\bin\Release\*.* download
-copy src\Twilio.TaskRouter\bin\Release\*.* download
-copy src\Twilio.Lookups\bin\Release\*.* download
-copy src\Twilio.Pricing\bin\Release\*.* download
-copy src\Twilio.Monitor\bin\Release\*.* download
-copy src\Twilio.Trunking\bin\Release\*.* download
-copy LICENSE.txt download
-
-copy src\Twilio.Api\bin\Release\Twilio.Api.* download\package\twilio\lib\3.5\
-copy src\Twilio.Api.Silverlight\bin\Release\Twilio.Api.Silverlight.* download\package\twilio\lib\SL5\
-copy src\Twilio.Api.WindowsPhone\bin\Release\Twilio.Api.WindowsPhone.* download\package\twilio\lib\\WINDOWSPHONE8\
-copy src\Twilio.Auth\bin\Release\Twilio.Auth.* download\package\twilioauth\lib\3.5\
-copy src\Twilio.Mvc\bin\Release\Twilio.Mvc.* download\package\twiliomvc\lib\3.5\
-copy src\Twilio.Twiml\bin\Release\Twilio.Twiml.* download\package\twiliotwiml\lib\3.5\
-copy src\Twilio.WebMatrix\bin\Release\Twilio.WebMatrix.* download\package\twiliowebmatrix\lib\3.5\
-copy src\Twilio.Client.Capability\bin\Release\Twilio.Client.Capability.* download\package\twilioclient\lib\3.5\
-copy src\Twilio.TaskRouter\bin\Release\Twilio.TaskRouter.* download\package\twiliotaskrouter\lib\3.5\
-copy src\Twilio.Lookups\bin\Release\Twilio.Lookups.* download\package\twiliolookups\lib\3.5\
-copy src\Twilio.Pricing\bin\Release\Twilio.Pricing.* download\package\twiliopricing\lib\3.5\
-copy src\Twilio.Monitor\bin\Release\Twilio.Monitor.* download\package\twiliomonitor\lib\3.5\
-copy src\Twilio.Trunking\bin\Release\Twilio.Trunking.* download\package\twiliotrunking\lib\3.5\
-copy src\Twilio.IpMessaging\bin\Release\Twilio.IpMessaging.* download\package\twilioipmessaging\lib\3.5\
-
-tools\nuget.exe pack Twilio.nuspec -BasePath download\package\twilio -o download
-tools\nuget.exe pack Twilio.Auth.nuspec -BasePath download\package\twilioauth -o download
-tools\nuget.exe pack Twilio.Mvc.nuspec -BasePath download\package\twiliomvc -o download
-tools\nuget.exe pack Twilio.TwiML.nuspec -BasePath download\package\twiliotwiml -o download
-tools\nuget.exe pack Twilio.WebMatrix.nuspec -BasePath download\package\twiliowebmatrix -o download
-tools\nuget.exe pack Twilio.Client.nuspec -BasePath download\package\twilioclient -o download
-tools\nuget.exe pack Twilio.TaskRouter.nuspec -BasePath download\package\twiliotaskrouter -o download
-tools\nuget.exe pack Twilio.Lookups.nuspec -BasePath download\package\twiliolookups -o download
-tools\nuget.exe pack Twilio.Pricing.nuspec -BasePath download\package\twiliopricing -o download
-tools\nuget.exe pack Twilio.Monitor.nuspec -BasePath download\package\twiliomonitor -o download
-tools\nuget.exe pack Twilio.Trunking.nuspec -BasePath download\package\twiliotrunking -o download
-tools\nuget.exe pack Twilio.IpMessaging.nuspec -BasePath download\package\twilioipmessaging -o download


add screencap.bat

add screencap.bat

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

--- screencap.bat
+++ screencap.bat
@@ -0,0 +1,7 @@
+set DEVICE=127.0.0.1:62001
+set ADB=%APPDATA%\Nox\bin\nox_adb
+
+%ADB% -s %DEVICE% shell screencap -p /sdcard/screen.png
+%ADB% -s %DEVICE% pull /sdcard/screen.png .
+%ADB% -s %DEVICE% shell rm /sdcard/screen.png
+pause


remove path to flang in bld.bat

remove path to flang in bld.bat

--- recipes/fastscapelib-f2py/bld.bat
+++ recipes/fastscapelib-f2py/bld.bat
@@ -9,7 +9,6 @@
 mkdir "%SRC_DIR%\dist"

 "%PYTHON%" setup.py bdist_wheel --dist-dir="%SRC_DIR%\dist" -- ^
-           -DCMAKE_Fortran_COMPILER:FILEPATH="%BUILD_PREFIX%\Library\bin\flang.exe" ^
            -DF2PY_EXECUTABLE:FILEPATH="%F2PY%"

 "%PYTHON%" -m pip install ^


chore: update reportgenerator dep to 4.4.6

--- tools/testcoverage.bat
+++ tools/testcoverage.bat
@@ -9,7 +9,7 @@

 cd ../../%destination%

-set "reportgenerator=%UserProfile%\.nuget\packages\reportgenerator\4.4.5\tools\net47\ReportGenerator.exe"
+set "reportgenerator=%UserProfile%\.nuget\packages\reportgenerator\4.4.6\tools\net47\ReportGenerator.exe"
 set "targetdir=."

 "%reportGenerator%" -reports:coverage.xml -reporttypes:HtmlInline -targetdir:%targetdir%


Fix msys2_shell.cmd argument-handling with spaces (#1836)

* Fix msys2_shell.cmd argument-handling with spaces

Commit 11ba641bed28 intended to preserve [`cmd.exe` delimiter characters](https://ss64.com/nt/syntax-esc.html#delimiters) in the command line passed on to `bash`, but broke the handling of `-where` directories with spaces in them. Fix this by:

 - Incrementing `shiftCounter` with any quoted arguments treated as separate words, because the `FOR /F ... IN`-loop at the end cannot treat them (in the full command) as single parameters.
 - Using the full list of `cmd.exe` delimiters in the `FOR /F ... IN`-loop when skipping the initial tokens.

Tested this with:

```
C:\msys2\msys2_shell.cmd -defterm -no-start -mingw64 -where <DIR> -shell bash -c $@ -- echo hello there, --world=windows
```

where `<DIR>` is the following:

 - C:\Users
 - C:\Progra~1
 - "C:\Program Files"
 - "C:\Program Files (x86)"
 - "C:\Users\T-17\Documents\Projects and Learning\test,dir"

Fixes #1826

* Clean up `FOR /F ... IN`-command

* Clean up working variables

* Adhere to lowercase CALL convention

* Prefix working variables with `msys2_` to prevent collisions with user-defined variables

* Don't clobber quotes and parentheses in final Bash command line

* Prevent warning trace on no arguments

* Handle cmd.exe metacharacters (e.g. parentheses) in Bash command line

--- filesystem/msys2_shell.cmd
+++ filesystem/msys2_shell.cmd
@@ -1,10 +1,10 @@
 @echo off
-setlocal
+setlocal EnableDelayedExpansion

 set "WD=%__CD__%"
 if NOT EXIST "%WD%msys-2.0.dll" set "WD=%~dp0usr\bin\"
 set "LOGINSHELL=bash"
-set /a shiftCounter=0
+set /a msys2_shiftCounter=0

 rem To activate windows native symlinks uncomment next line
 rem set MSYS=winsymlinks:nativestrict
@@ -35,19 +35,19 @@
   exit /b %ERRORLEVEL%
 )
 rem Shell types
-if "x%~1" == "x-msys" shift& set /a shiftCounter+=1& set MSYSTEM=MSYS& goto :checkparams
-if "x%~1" == "x-msys2" shift& set /a shiftCounter+=1& set MSYSTEM=MSYS& goto :checkparams
-if "x%~1" == "x-mingw32" shift& set /a shiftCounter+=1& set MSYSTEM=MINGW32& goto :checkparams
-if "x%~1" == "x-mingw64" shift& set /a shiftCounter+=1& set MSYSTEM=MINGW64& goto :checkparams
-if "x%~1" == "x-mingw" shift& set /a shiftCounter+=1& (if exist "%WD%..\..\mingw64" (set MSYSTEM=MINGW64) else (set MSYSTEM=MINGW32))& goto :checkparams
+if "x%~1" == "x-msys" shift& set /a msys2_shiftCounter+=1& set MSYSTEM=MSYS& goto :checkparams
+if "x%~1" == "x-msys2" shift& set /a msys2_shiftCounter+=1& set MSYSTEM=MSYS& goto :checkparams
+if "x%~1" == "x-mingw32" shift& set /a msys2_shiftCounter+=1& set MSYSTEM=MINGW32& goto :checkparams
+if "x%~1" == "x-mingw64" shift& set /a msys2_shiftCounter+=1& set MSYSTEM=MINGW64& goto :checkparams
+if "x%~1" == "x-mingw" shift& set /a msys2_shiftCounter+=1& (if exist "%WD%..\..\mingw64" (set MSYSTEM=MINGW64) else (set MSYSTEM=MINGW32))& goto :checkparams
 rem Console types
-if "x%~1" == "x-mintty" shift& set /a shiftCounter+=1& set MSYSCON=mintty.exe& goto :checkparams
-if "x%~1" == "x-conemu" shift& set /a shiftCounter+=1& set MSYSCON=conemu& goto :checkparams
-if "x%~1" == "x-defterm" shift& set /a shiftCounter+=1& set MSYSCON=defterm& goto :checkparams
+if "x%~1" == "x-mintty" shift& set /a msys2_shiftCounter+=1& set MSYSCON=mintty.exe& goto :checkparams
+if "x%~1" == "x-conemu" shift& set /a msys2_shiftCounter+=1& set MSYSCON=conemu& goto :checkparams
+if "x%~1" == "x-defterm" shift& set /a msys2_shiftCounter+=1& set MSYSCON=defterm& goto :checkparams
 rem Other parameters
-if "x%~1" == "x-full-path" shift& set /a shiftCounter+=1& set MSYS2_PATH_TYPE=inherit& goto :checkparams
-if "x%~1" == "x-use-full-path" shift& set /a shiftCounter+=1& set MSYS2_PATH_TYPE=inherit& goto :checkparams
-if "x%~1" == "x-here" shift& set /a shiftCounter+=1& set CHERE_INVOKING=enabled_from_arguments& goto :checkparams
+if "x%~1" == "x-full-path" shift& set /a msys2_shiftCounter+=1& set MSYS2_PATH_TYPE=inherit& goto :checkparams
+if "x%~1" == "x-use-full-path" shift& set /a msys2_shiftCounter+=1& set MSYS2_PATH_TYPE=inherit& goto :checkparams
+if "x%~1" == "x-here" shift& set /a msys2_shiftCounter+=1& set CHERE_INVOKING=enabled_from_arguments& goto :checkparams
 if "x%~1" == "x-where" (
   if "x%~2" == "x" (
     echo Working directory is not specified for -where parameter. 1>&2
@@ -58,18 +58,39 @@
     exit /b 2
   )
   set CHERE_INVOKING=enabled_from_arguments
-)& shift& shift& set /a shiftCounter+=2& goto :checkparams
-if "x%~1" == "x-no-start" shift& set /a shiftCounter+=1& set MSYS2_NOSTART=yes& goto :checkparams
+
+  rem Ensure parentheses in argument do not interfere with FOR IN loop below.
+  set msys2_arg="%~2"
+  call :substituteparens msys2_arg
+  call :removequotes msys2_arg
+
+  rem Increment msys2_shiftCounter by number of words in argument (as cmd.exe saw it).
+  rem (Note that this form of FOR IN loop uses same delimiters as parameters.)
+  for %%a in (!msys2_arg!) do set /a msys2_shiftCounter+=1
+)& shift& shift& set /a msys2_shiftCounter+=1& goto :checkparams
+if "x%~1" == "x-no-start" shift& set /a msys2_shiftCounter+=1& set MSYS2_NOSTART=yes& goto :checkparams
 if "x%~1" == "x-shell" (
   if "x%~2" == "x" (
     echo Shell not specified for -shell parameter. 1>&2
     exit /b 2
   )
   set LOGINSHELL="%~2"
-)& shift& shift& set /a shiftCounter+=2& goto :checkparams
+
+  set msys2_arg="%~2"
+  call :substituteparens msys2_arg
+  call :removequotes msys2_arg
+  for %%a in (!msys2_arg!) do set /a msys2_shiftCounter+=1
+)& shift& shift& set /a msys2_shiftCounter+=1& goto :checkparams

 rem Collect remaining command line arguments to be passed to shell
-for /f "tokens=%shiftCounter%,*" %%i in ("%*") do set SHELL_ARGS=%%j
+if %msys2_shiftCounter% equ 0 set SHELL_ARGS=%* & goto cleanvars
+set msys2_full_cmd=%*
+for /f "tokens=%msys2_shiftCounter%,* delims=,;=	 " %%i in ("!msys2_full_cmd!") do set SHELL_ARGS=%%j
+
+:cleanvars
+set msys2_arg=
+set msys2_shiftCounter=
+set msys2_full_cmd=

 rem Setup proper title
 if "%MSYSTEM%" == "MINGW32" (
@@ -88,9 +109,9 @@
 set MSYSCON=mintty.exe
 :startmintty
 if not defined MSYS2_NOSTART (
-  start "%CONTITLE%" "%WD%mintty" -i /msys2.ico -t "%CONTITLE%" "/usr/bin/%LOGINSHELL%" --login %SHELL_ARGS%
-) else (
-  "%WD%mintty" -i /msys2.ico -t "%CONTITLE%" "/usr/bin/%LOGINSHELL%" --login %SHELL_ARGS%
+  start "%CONTITLE%" "%WD%mintty" -i /msys2.ico -t "%CONTITLE%" "/usr/bin/%LOGINSHELL%" --login !SHELL_ARGS!
+) else (
+  "%WD%mintty" -i /msys2.ico -t "%CONTITLE%" "/usr/bin/%LOGINSHELL%" --login !SHELL_ARGS!
 )
 exit /b %ERRORLEVEL%

@@ -100,18 +121,18 @@
   exit /b 1
 )
 if not defined MSYS2_NOSTART (
-  start "%CONTITLE%" "%ComEmuCommand%" /Here /Icon "%WD%..\..\msys2.ico" /cmd "%WD%\%LOGINSHELL%" --login %SHELL_ARGS%
-) else (
-  "%ComEmuCommand%" /Here /Icon "%WD%..\..\msys2.ico" /cmd "%WD%\%LOGINSHELL%" --login %SHELL_ARGS%
+  start "%CONTITLE%" "%ComEmuCommand%" /Here /Icon "%WD%..\..\msys2.ico" /cmd "%WD%\%LOGINSHELL%" --login !SHELL_ARGS!
+) else (
+  "%ComEmuCommand%" /Here /Icon "%WD%..\..\msys2.ico" /cmd "%WD%\%LOGINSHELL%" --login !SHELL_ARGS!
 )
 exit /b %ERRORLEVEL%

 :startsh
 set MSYSCON=
 if not defined MSYS2_NOSTART (
-  start "%CONTITLE%" "%WD%\%LOGINSHELL%" --login %SHELL_ARGS%
-) else (
-  "%WD%\%LOGINSHELL%" --login %SHELL_ARGS%
+  start "%CONTITLE%" "%WD%\%LOGINSHELL%" --login !SHELL_ARGS!
+) else (
+  "%WD%\%LOGINSHELL%" --login !SHELL_ARGS!
 )
 exit /b %ERRORLEVEL%

@@ -184,3 +205,17 @@
 echo following parameters are passed as login shell command parameters.
 echo.
 exit /b 0
+
+:removequotes
+FOR /F "delims=" %%A IN ('echo %%%1%%') DO set %1=%%~A
+GOTO :eof
+
+:substituteparens
+SETLOCAL
+FOR /F "delims=" %%A IN ('echo %%%1%%') DO (
+    set value=%%A
+    set value=!value:^(=x!
+    set value=!value:^)=x!
+)
+ENDLOCAL & set %1=%value%
+GOTO :eof


create marker on error; use /SKIP_DIALOGS option in installer to run without user input.

--- indra/viewer_components/updater/scripts/windows/update_install.bat
+++ indra/viewer_components/updater/scripts/windows/update_install.bat
@@ -1,2 +1,2 @@
-start /WAIT %1
+start /WAIT %1 /SKIP_DIALOGS
 IF ERRORLEVEL 1 ECHO ERRORLEVEL > %2


Initial version of start script for windows.

error: pathspec 'deegree-misc/deegree-tomcat/src/main/resources/start-deegree.bat' did not match any file(s) known to git

--- deegree-misc/deegree-tomcat/src/main/resources/start-deegree.bat
+++ deegree-misc/deegree-tomcat/src/main/resources/start-deegree.bat
@@ -0,0 +1,24 @@
+@ECHO OFF
+
+::IF "%JAVA_HOME%" == "" (
+::SET JAVA_HOME=""
+::ECHO "JAVA_HOME not set. Looking up in registry."
+::set KeyName=HKEY_LOCAL_MACHINE\SOFTWARE\JavaSoft\Java Development Kit
+::set Cmd=reg query "%KeyName%" /s
+::for /f "tokens=2*" %%i in ('%Cmd% ^| find "JavaHome"') do set JAVA_HOME=%%j
+::)
+
+IF "%JAVA_HOME%" == "" (
+  ECHO ******************************************************
+  ECHO "No Java Development Kit (JDK) installation found.   "
+  ECHO "Please install Oracle (Sun) JDK 1.6.0_04 or greater."
+  ECHO ******************************************************
+  PAUSE
+  START http://www.oracle.com/technetwork/java/javase/downloads/index.html
+) ELSE (
+  ECHO "Using %JAVA_HOME%"
+  SET PATH=%JAVA_HOME%\bin;%PATH%
+  bin\catalina.bat start
+  START http://localhost:8080
+)
+::EXIT


add checkpoints to release.bat

add checkpoints to release.bat

--- release.bat
+++ release.bat
@@ -1,3 +1,5 @@
+echo "Start with release?"
+pause
 git submodule update
 cd dist
 git checkout master
@@ -10,6 +12,8 @@
 git commit -a -m %*
 git tag %*
 cd dist
+echo "Push release to github?"
+pause
 git push origin HEAD:master
 git push origin tags/%*
 cd ..


Create bld.bat

Create bld.bat

error: pathspec 'recipes/websocketpp/bld.bat' did not match any file(s) known to git

--- recipes/websocketpp/bld.bat
+++ recipes/websocketpp/bld.bat
@@ -0,0 +1,20 @@
+:: MSVC is preferred.
+set CC=cl.exe
+set CXX=cl.exe
+
+mkdir build
+cd build
+cmake ^
+    -G "Ninja" ^
+    -DCMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% ^
+    -DCMAKE_BUILD_TYPE=Release ^
+    %SRC_DIR%
+if errorlevel 1 exit 1
+
+:: Build.
+cmake --build . --config Release
+if errorlevel 1 exit 1
+
+:: Install.
+cmake --build . --config Release --target install
+if errorlevel 1 exit 1


* removed stale batch file

* removed stale batch file

--- makescopes.bat
+++ makescopes.bat
@@ -1,74 +0,0 @@
-@echo off
-rem you need msys2 and the llvm, clang 4.0, libffi and vim packages installed.
-rem see documentation for detailed installation instructions.
-rem additionally, the built executable depends on
-rem libstdc++-6.dll, libgcc_s_seh-1.dll, libffi-6.dll and libwinpthread-1.dll
-setlocal
-set DIR=%~dp0
-set MSYSPATH=C:\msys64
-set MINGWPATH=%MSYSPATH%\mingw64
-set PATH=%MINGWPATH%\bin;%PATH%
-rem set DEBUGOPTS=-O2 -DNDEBUG
-set DEBUGOPTS=-O0 -g -DSCOPES_DEBUG
-clang -x c -o %DIR%scopes.h -P -E %DIR%scopes.cpp -DSCOPES_WIN32 -I%DIR%win32 -I%MINGWPATH%/lib/libffi-3.2.1/include
-if errorlevel 1 goto :fail
-echo mman.o
-clang -c -o mman.o %DIR%win32\mman.c -O2 -Wno-shift-count-overflow
-if errorlevel 1 goto :fail
-echo realpath.o
-clang -c -o realpath.o %DIR%win32\realpath.c -O2
-if errorlevel 1 goto :fail
-echo dlfcn.o
-clang -c -o dlfcn.o %DIR%win32\dlfcn.c -O2
-if errorlevel 1 goto :fail
-echo linenoise.o
-clang -c -o linenoise.o %DIR%external\linenoise-ng\src\linenoise.cpp -O2 ^
-    -I%DIR%external\linenoise-ng\include -std=gnu++11 -fno-rtti
-if errorlevel 1 goto :fail
-echo ConvertUTF.o
-clang -c -o ConvertUTF.o %DIR%external\linenoise-ng\src\ConvertUTF.cpp -O2 ^
-    -I%DIR%external\linenoise-ng\include -std=gnu++11 -fno-rtti
-if errorlevel 1 goto :fail
-echo wcwidth.o
-clang -c -o wcwidth.o %DIR%external\linenoise-ng\src\wcwidth.cpp -O2 ^
-    -I%DIR%external\linenoise-ng\include -std=gnu++11 -fno-rtti
-if errorlevel 1 goto :fail
-echo scopes.exe
-clang++ -o scopes.exe ^
-    %DIR%scopes.cpp ^
-    -I%DIR%win32 ^
-    -I%MINGWPATH%/lib/libffi-3.2.1/include -I%MINGWPATH%/include ^
-    -Wno-vla -DSCOPES_CPP_IMPL -DSCOPES_MAIN_CPP_IMPL ^
-    -D_GNU_SOURCE -pedantic -DSCOPES_DEBUG -ferror-limit=1 ^
-    -D_LIBCPP_HAS_NO_CONSTEXPR -DSCOPES_WIN32 ^
-    -std=gnu++11 %DEBUGOPTS% ^
-    -fno-exceptions -fno-rtti ^
-    -Wl,--allow-multiple-definition ^
-    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS ^
-    -L%MINGWPATH%/lib -lclangFrontend -lclangDriver -lclangSerialization ^
-    -lclangCodeGen -lclangParse -lclangSema -lclangAnalysis -lclangEdit ^
-    -lclangAST -lclangLex -lclangBasic ^
-    -Wl,--whole-archive ^
-    -Wl,--export-all-symbols ^
-    -Wl,--no-whole-archive ^
-    mman.o realpath.o dlfcn.o linenoise.o ConvertUTF.o wcwidth.o ^
-    -lLLVMCoverage -lLLVMObjCARCOpts -lLLVMOption -lLLVMPasses -lLLVMipo ^
-    -lLLVMVectorize -lLLVMLinker -lLLVMIRReader -lLLVMAsmParser ^
-    -lLLVMX86Disassembler -lLLVMX86AsmParser -lLLVMX86CodeGen ^
-    -lLLVMSelectionDAG -lLLVMAsmPrinter -lLLVMDebugInfoCodeView -lLLVMCodeGen ^
-    -lLLVMDebugInfoMSF -lLLVMCoroutines -lLLVMGlobalISel -lLLVMLTO ^
-    -lLLVMScalarOpts -lLLVMInstCombine -lLLVMInstrumentation ^
-    -lLLVMTransformUtils -lLLVMBitWriter -lLLVMX86Desc -lLLVMMCDisassembler ^
-    -lLLVMX86Info -lLLVMX86AsmPrinter -lLLVMX86Utils -lLLVMMCJIT ^
-    -lLLVMExecutionEngine -lLLVMTarget -lLLVMAnalysis -lLLVMProfileData ^
-    -lLLVMRuntimeDyld -lLLVMObject -lLLVMMCParser -lLLVMBitReader -lLLVMMC ^
-    -lLLVMCore -lLLVMSupport ^
-    -lffi -lole32 -luuid -lversion -lpsapi
-if errorlevel 1 goto :fail
-%DIR%scopes.exe %DIR%testing\test_all.sc
-if errorlevel 1 goto :fail
-echo success.
-goto :done
-:fail
-echo failed.
-:done


fix run.bat

fix run.bat

--- src/main/resources/run.bat
+++ src/main/resources/run.bat
@@ -1 +1 @@
-java -Djava.library.path=dll -jar d2tm-1.0-SNAPSHOT-jar-with-dependencies.jar+java -Djava.library.path=dll -jar dune2themaker-1.0-SNAPSHOT-jar-with-dependencies.jar


mk-openssl.bat: fix invoking via sh and using a parameter

--- mk-openssl.bat
+++ mk-openssl.bat
@@ -27,8 +27,8 @@
 del /s *.o *.a *.exe >> nul 2>&1
 if "%_CPU%" == "win32" perl Configure mingw   shared no-unit-test no-ssl2 no-ssl3 no-rc5 no-idea no-dso no-sse2 "--prefix=%CD:\=/%"
 if "%_CPU%" == "win64" perl Configure mingw64 shared no-unit-test no-ssl2 no-ssl3 no-rc5 no-idea no-dso no-asm  "--prefix=%CD:\=/%"
-sh -c mingw32-make depend
-sh -c mingw32-make
+sh -c "mingw32-make depend"
+sh -c "mingw32-make"

 :: Make steps for determinism


CP-13394: Build DotNetPackages & C# SDK with .NET 4.5

Changed sign-ps PowerShell script to look for certificates not only in CurrentUser\ but in LocalMachine\ as well (different build environments may have them at different level)

Signed-off-by: Gabor Apati-Nagy <fea1aad7ceb67d3aeb88acb6b51e51467c21418e@citrix.com>

--- mk/sign-ps.bat
+++ mk/sign-ps.bat
@@ -30,6 +30,6 @@
 @echo on
 if not exist C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe goto done

-C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -Command "$c = Get-ChildItem \"cert:\\CurrentUser\\My\" | where { $_.Subject -like \"*Citrix Systems, Inc*\" } ; Set-AuthenticodeSignature -cert $c %1" <NUL
+C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -Command "$c = Get-ChildItem -Path cert:\CurrentUser\My, cert:\\LocalMachine\My | where { $_.Subject -like "*Citrix Systems, Inc*" }; Set-AuthenticodeSignature -cert $c %1" <NUL

 :done


Windows support for the Github example

Windows support for the Github example

--- examples/modularinputs/github_commits/bin/github_commits.cmd
+++ examples/modularinputs/github_commits/bin/github_commits.cmd
@@ -1 +1 @@
-@"%SPLUNK_HOME%"\bin\splunk cmd node "%~dp0app\github_commits.js" %*+@"%SPLUNK_HOME%"\bin\splunk cmd node "%~dp0\app\github_commits.js" %*


update nuget package commands

update nuget package commands

--- nuget/build.cmd
+++ nuget/build.cmd
@@ -23,7 +23,11 @@
 IF %ERRORLEVEL% NEQ 0 goto error

 echo Building solution...
-call :ExecuteCmd %msbuild% "..\Wheatech.Activation.sln" /p:Configuration="%config%" /m /v:M /fl /flp:LogFile=msbuild.log;Verbosity=Normal /nr:false
+call :ExecuteCmd %msbuild% "..\src\Wheatech.Activation.35.csproj" /p:Configuration="%config%" /m /v:M /fl /flp:LogFile=msbuild.log;Verbosity=Normal /nr:false
+IF %ERRORLEVEL% NEQ 0 goto error
+call :ExecuteCmd %msbuild% "..\src\Wheatech.Activation.40.csproj" /p:Configuration="%config%" /m /v:M /fl /flp:LogFile=msbuild.log;Verbosity=Normal /nr:false
+IF %ERRORLEVEL% NEQ 0 goto error
+call :ExecuteCmd %msbuild% "..\src\Wheatech.Activation.451.csproj" /p:Configuration="%config%" /m /v:M /fl /flp:LogFile=msbuild.log;Verbosity=Normal /nr:false
 IF %ERRORLEVEL% NEQ 0 goto error

 echo Packaging...
@@ -32,9 +36,17 @@
 if not exist %libtmp% mkdir %libtmp%
 if not exist %packagestmp% mkdir %packagestmp%

-if not exist %libtmp%\net461 mkdir %libtmp%\net461
-copy ..\src\bin\%config%\Wheatech.Activation.dll %libtmp%\net461 /Y
-copy ..\src\bin\%config%\Wheatech.Activation.xml %libtmp%\net461 /Y
+if not exist %libtmp%\net35 mkdir %libtmp%\net35
+copy ..\src\bin\%config%\net35\Wheatech.Activation.dll %libtmp%\net35 /Y
+copy ..\src\bin\%config%\net35\Wheatech.Activation.xml %libtmp%\net35 /Y
+
+if not exist %libtmp%\net40 mkdir %libtmp%\net40
+copy ..\src\bin\%config%\net40\Wheatech.Activation.dll %libtmp%\net40 /Y
+copy ..\src\bin\%config%\net40\Wheatech.Activation.xml %libtmp%\net40 /Y
+
+if not exist %libtmp%\net451 mkdir %libtmp%\net451
+copy ..\src\bin\%config%\net451\Wheatech.Activation.dll %libtmp%\net451 /Y
+copy ..\src\bin\%config%\net451\Wheatech.Activation.xml %libtmp%\net451 /Y

 call :ExecuteCmd ..\tools\nuget.exe pack "%cd%\Wheatech.Activation.nuspec" -OutputDirectory %packagestmp% %version%
 IF %ERRORLEVEL% NEQ 0 goto error


Fix timestamp comparison in BAT file (#8407)

--- bin/flutter.bat
+++ bin/flutter.bat
@@ -65,10 +65,14 @@
   IF NOT EXIST "%stamp_path%" GOTO do_snapshot
   SET /p stamp_value=<"%stamp_path%"
   IF !stamp_value! NEQ !revision! GOTO do_snapshot
-  REM Get modified timestamps
-  FOR %%f IN ("%flutter_tools_dir%\pubspec.yaml") DO SET yamlt=%%~tf
-  FOR %%a IN ("%flutter_tools_dir%\pubspec.lock") DO SET lockt=%%~ta
-  IF !lockt! LSS !yamlt! GOTO do_snapshot
+  REM Compare "last modified" timestamps
+  SET pubspec_yaml_path=%flutter_tools_dir%\pubspec.yaml
+  SET pubspec_lock_path=%flutter_tools_dir%\pubspec.lock
+  FOR %%i IN ("%pubspec_yaml_path%") DO SET yaml_timestamp=%%~ti
+  FOR %%i IN ("%pubspec_lock_path%") DO SET lock_timestamp=%%~ti
+  IF !yaml_timestamp! EQU !lock_timestamp! GOTO do_snapshot
+  FOR /F %%i IN ('DIR /B /O:D "%pubspec_yaml_path%" "%pubspec_lock_path%"') DO SET newer_file=%%i
+  IF "%newer_file%" EQU "pubspec.yaml" GOTO do_snapshot

   REM Everything is uptodate - exit subroutine
   EXIT /B


Import comment block explaining function from tron.bat

--- resources/functions/log.bat
+++ resources/functions/log.bat
@@ -1,3 +1,8 @@
+:: Description: Tron's log function
+
+:: %1 reference contains the first argument passed to the function. When the
+:: whole argument string is wrapped in double quotes, it is sent as an argument.
+:: The tilde syntax (%~1) removes the double quotes around the argument.
 @echo off
 echo:%~1 >> "%LOGPATH%\%LOGFILE%"
 echo:%~1


added oblivion skill reset script

added oblivion skill reset script

error: pathspec 'oblivion/reset-skills.bat' did not match any file(s) known to git

--- oblivion/reset-skills.bat
+++ oblivion/reset-skills.bat
@@ -0,0 +1,21 @@
+player.setav Acrobatics 1
+player.setav Alchemy 1
+player.setav Alteration 1
+player.setav Armorer 1
+player.setav Athletics 1
+player.setav Blade 1
+player.setav Block 1
+player.setav Blunt 1
+player.setav Conjuration 1
+player.setav Destruction 1
+player.setav HandToHand 1
+player.setav HeavyArmor 1
+player.setav Illusion 1
+player.setav LightArmor 1
+player.setav Marksman 1
+player.setav Mercantile 1
+player.setav Mysticism 1
+player.setav Restoration 1
+player.setav Security 1
+player.setav Sneak 1
+player.setav Speechcraft 1


Test runner batch now takes optional command-line arguments.

--- Testing/Tests/run_v2.cmd
+++ Testing/Tests/run_v2.cmd
@@ -1,7 +1,7 @@
 @echo off
-..\..\Tools\PhpNetTester.exe /compiler:..\..\Deployment\Debug\phpc.exe /php:..\..\Tools\PHP\php.exe
+..\..\Tools\PhpNetTester.exe /compiler:..\..\Deployment\Debug\phpc.exe /php:..\..\Tools\PHP\php.exe %*
 del /s *.pdb *.exe EmittedNodes.csv LibraryCalls.csv UnknownCalls.csv __input.txt Debug.log > nul

-@echo Deleting empty log files...
-for /f "delims=" %%i in ('dir /s/b/a-d *.log') do if %~zi==0 del %%i
+@rem Deleting empty log files...
+for /f "delims=" %%i in ('dir /s/b/a-d *.log') do if %%~zi==0 del %%i
 pause


netgen: update win to work with newly rebased version

--- netgen/bld.bat
+++ netgen/bld.bat
@@ -1,4 +1,4 @@
-mkdir build -p
+mkdir build
 cd build

 cmake .. -G "Ninja" ^
@@ -22,4 +22,4 @@
 rem this line is not correct. There is already a mydef.hpp in the include files
 rem better just move the config.h and make FreeCAD-cmake look for a congfig.h instead of
 rem a mydefs.hpp
-Copy %SRC_DIR%\build\config.h %LIBRARY_PREFIX%\include\netgen\mydefs.hpp+Copy %LIBRARY_PREFIX%\include\include\mydefs.hpp %LIBRARY_PREFIX%\include\netgen\mydefs.hpp


fix typo

fix typo

--- resources/stage_4_repair/disable_windows_telemetry/purge_windows_10_telemetry.bat
+++ resources/stage_4_repair/disable_windows_telemetry/purge_windows_10_telemetry.bat
@@ -7,7 +7,7 @@
 ::                  - WindowsLies:   https://github.com/WindowsLies/BlockWindows
 ::                  - ... and many other places around the web
 :: Version:       1.1.6-TRON ! Fix broken path on setacl.exe call. Thanks to /u/Seascan
-::                           * Embed contents of 'disable_windows_10_upgrade_registry_entries.reg' directly into the script. Removes dependence on an external file
+::                           * Embed contents of 'disable_telemetry_registry_entries.reg' directly into the script. Removes dependence on an external file
 ::                1.1.5-TRON ! Fix incorrect path in call to 'disable_telemetry_registry_entries.reg.' Thanks to /u/T_Belfs
 ::                1.1.4-TRON + Add log messages explaining each step in the process. These will error out in stand-alone mode (since no log function) but can be safely ignored
 ::                1.1.3-TRON + Add job "Spybot Anti-Beacon." Tron now automatically applies all immunizations from Spybot Anti-Beacon on Windows 10 systems


-de switch removed from run.bar of alimod test

--- transcrypt/development/manual_tests/import_export_aliases/run.bat
+++ transcrypt/development/manual_tests/import_export_aliases/run.bat
@@ -1,2 +1,2 @@
-call run_transcrypt -n -am -b -de test
+call run_transcrypt -n -am -b test
 call python -m http.server


Homewrok #13 commit fix

Homewrok #13 commit fix

--- workspace/addressbook-selenium-tests/TestNG_runner.cmd
+++ workspace/addressbook-selenium-tests/TestNG_runner.cmd
@@ -1,3 +1 @@
-java -cp bin;C:\pft\libraries\xstream-1.4.7\lib\xstream-1.4.7.jar;C:\pft\libraries\xstream-1.4.7\lib\xstream\xpp3_min-1.1.4c.jar;C:\pft\libraries\selenium-server-standalone-2.39.0.jar com.example.tests.GroupDataGenerator 3 groups.xml xml
-
 java -cp bin;C:\pft\libraries\xstream-1.4.7\lib\xstream-1.4.7.jar;C:\pft\libraries\xstream-1.4.7\lib\xstream\xmlpull-1.1.3.1.jar;C:\pft\libraries\xstream-1.4.7\lib\xstream\xpp3_min-1.1.4c.jar;C:\pft\libraries\selenium-server-standalone-2.39.0.jar org.testng.TestNG testng-customsuite.xml


ADd pymatgen-db to windwos build.

ADd pymatgen-db to windwos build.

--- build_win64.bat
+++ build_win64.bat
@@ -2,5 +2,5 @@
 conda install conda-build anaconda-client
 conda config --add channels matsci
 conda config --set anaconda_upload yes
-FOR %%A IN (latexcodec pybtex spglib pyhull pymatgen seekpath) DO conda build --user matsci %%A
+FOR %%A IN (latexcodec pybtex spglib pyhull pymatgen pymatgen-db seekpath) DO conda build --user matsci %%A
 cd ..


Explicitly use GraalVM to run native image script on Windows

--- .github/scripts/windows-native-image.bat
+++ .github/scripts/windows-native-image.bat
@@ -1,2 +1,2 @@
 @call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
-bin\amm launcher.sc uploadNativeImage
+bin\cs launch ammonite:2.1.4-11-307f3d8 --scala 2.12.12 --jvm graalvm-ce-java11:20.1.0 -- launcher.sc uploadNativeImage


name differently optimized binaries differently

--- .appveyor/rsqueak-build.bat
+++ .appveyor/rsqueak-build.bat
@@ -4,4 +4,4 @@
 echo %SDL_PREFIX%
 echo %PYTHONPATH%
 %~dp0\pypy-win32\pypy.exe %~dp0\pypy\rpython\bin\rpython --batch %OPTLVL% %~dp0\targetrsqueak.py
-copy %~dp0\rsqueak.exe %~dp0\rsqueak-win32-%APPVEYOR_REPO_COMMIT%.exe
+copy %~dp0\rsqueak.exe %~dp0\rsqueak-win32%OPTLVL%-%APPVEYOR_REPO_COMMIT%.exe


CI: disable python support in lldb

CI: disable python support in lldb

LLDB is currently not running tests, and the python detection logic is
atrociously broken.  Simply disable the python support until that is
fixed (which is already done in upstream).

--- utils/build-windows.bat
+++ utils/build-windows.bat
@@ -290,6 +290,7 @@
     -DCMAKE_CXX_FLAGS:STRING="/GS- /Oy"^
     -DCMAKE_EXE_LINKER_FLAGS:STRING=/INCREMENTAL:NO^
     -DCMAKE_SHARED_LINKER_FLAGS:STRING=/INCREMENTAL:NO^
+    -DLLDB_DISABLE_PYTHON=YES^
     -DLLDB_INCLUDE_TESTS:BOOL=NO %exitOnError%

 popd


debug

debug

--- vendor/lib/lib_path.cmd
+++ vendor/lib/lib_path.cmd
@@ -112,6 +112,10 @@

     :end_enhance_path
     set "PATH=%PATH:;;=;%"
+
+    echo add_to_path: %add_to_path%
+    echo position: %position%
+    echo PATH: %PATH%
     if NOT "%OLD_PATH%" == "%PATH%" (
       %lib_console% debug_output  :enhance_path "END Env Var - PATH=%path%"
       %lib_console% debug_output  :enhance_path "Env Var %find_query% - found=%found%"


Set environment variables for current process

setx command doesn't affect current process, so use also 'set VAR=VALUE'

--- bin/install.cmd
+++ bin/install.cmd
@@ -1,7 +1,9 @@
 @echo off
 set /P NVM_PATH="Enter the absolute path where the zip file is extracted/copied to: "
-setx /M NVM_HOME "%NVM_PATH%"
-setx /M NVM_SYMLINK "C:\Program Files\nodejs"
+set NVM_HOME=%NVM_PATH%
+set NVM_SYMLINK=C:\Program Files\nodejs
+setx /M NVM_HOME "%NVM_HOME%"
+setx /M NVM_SYMLINK "%NVM_SYMLINK%"
 setx /M PATH "%PATH%;%NVM_HOME%;%NVM_SYMLINK%"

 if exist "%SYSTEMDRIVE%\Program Files (x86)\" (


Build/nuget-publish.bat: Add -NoProfile to powershell

--- Build/nuget-publish.bat
+++ Build/nuget-publish.bat
@@ -1,2 +1,2 @@
 @echo off
-call powershell .\nuget-publish.ps1+call powershell -NoProfile .\nuget-publish.ps1


Try na.pool.sks-keyservers.net

Try na.pool.sks-keyservers.net

--- av_install/trunk_msys2.cmd
+++ av_install/trunk_msys2.cmd
@@ -10,7 +10,7 @@
 @set openssl=mingw-w64-x86_64-openssl-1.1.0.f-1-any.pkg.tar.xz

 @echo --------------------------------------------------------------- Adding GPG key
-@bash -lc "pacman-key -r 77D8FA18 && pacman-key -f 77D8FA18 && pacman-key --lsign-key 77D8FA18"
+@bash -lc "pacman-key -r 77D8FA18 --keyserver na.pool.sks-keyservers.net && pacman-key -f 77D8FA18 && pacman-key --lsign-key 77D8FA18"

 @md C:\pkgs


git-svn-id: https://notepad2-mod.googlecode.com/svn/trunk@155 28bd50df-7adb-d945-0439-6e466c6a13cc

--- wdkbuild/build_base.bat
+++ wdkbuild/build_base.bat
@@ -4,7 +4,7 @@

 rem create the objects and output directory and delete any files from previous build
 MD "%OBJDIR%" >NUL 2>&1
-DEL "%OUTDIR%\Notepad2.exe"
+DEL "%OUTDIR%\Notepad2.exe" >NUL 2>&1
 DEL "%OBJDIR%\*.idb" "%OBJDIR%\*.obj" "%OBJDIR%\*.pdb" "%OBJDIR%\*.res" >NUL 2>&1

 TITLE Building Notepad2 %1...


Build script for Windows users

Build script for Windows users

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

--- flash/build.bat
+++ flash/build.bat
@@ -0,0 +1,22 @@
+@echo off
+
+
+:: Requirements for building
+:: Download "Open Source Flex SDK" from http://www.adobe.com/devnet/flex/flex-sdk-download-all.html
+:: file similar to: flex_sdk_4.1.0.16076_mpl.zip
+::
+:: create directory on disc e.g "C:\Program Files\FlexSdk"
+:: Copy and extract downloaded .zip to this location
+::
+:: Go to Start>My Computer (right click)>Properties>Advanced System Settings>Environment Variables
+:: Edit System variable called "Path"
+:: Add ";C:\Program Files\FlexSdk\bin" (without quotes) at the end of its value
+
+
+echo ----- Generating new SWF -----
+mxmlc Recorder.as -output recorder.swf
+
+echo ----- Copying SWF file to demo -----
+xcopy /s/y "recorder.swf" "..\html\recorder.swf"
+
+exit


Add dev.bat for Windows development without bash.

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

--- dev.bat
+++ dev.bat
@@ -0,0 +1,19 @@
+
+REM Licensed to Pioneers in Engineering under one
+REM or more contributor license agreements.  See the NOTICE file
+REM distributed with this work for additional information
+REM regarding copyright ownership.  Pioneers in Engineering licenses
+REM this file to you under the Apache License, Version 2.0 (the
+REM "License"); you may not use this file except in compliance
+REM  with the License.  You may obtain a copy of the License at
+REM
+REM    http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM Unless required by applicable law or agreed to in writing,
+REM software distributed under the License is distributed on an
+REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+REM KIND, either express or implied.  See the License for the
+REM specific language governing permissions and limitations
+REM under the License
+
+"%programfiles(x86)%\Mozilla Firefox\firefox.exe" --app angel-player/src/application.ini -jsconsole -purgecaches


revert publish.bat

revert publish.bat

--- Src/publish/publish.bat
+++ Src/publish/publish.bat
@@ -1 +1 @@
-nuget push *.snupkg -Source https://www.nuget.org+nuget push *.nupkg -Source https://www.nuget.org


#2247, fix Batch Comment in Sharding-Proxy start.bat

--- sharding-distribution/sharding-proxy-distribution/src/main/resources/bin/start.bat
+++ sharding-distribution/sharding-proxy-distribution/src/main/resources/bin/start.bat
@@ -1,19 +1,19 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
+@rem
+@rem Licensed to the Apache Software Foundation (ASF) under one or more
+@rem contributor license agreements.  See the NOTICE file distributed with
+@rem this work for additional information regarding copyright ownership.
+@rem The ASF licenses this file to You under the Apache License, Version 2.0
+@rem (the "License"); you may not use this file except in compliance with
+@rem the License.  You may obtain a copy of the License at
+@rem
+@rem     http://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem

 @echo off & setlocal enabledelayedexpansion


https://issues.shibboleth.net/jira/browse/EDS-13 Kitting of the EDS.

This includes the "minifying" jar and a windows script to create the target (including the zip file).  Unix script coming right up.

Also adds the LICENSE.txt file and moves the source down to src/javascript and src/resources

git-svn-id: 0bdcebde0e9b7b544b7033ade083e822b90fa2c6@71 7a317f17-d332-475d-8e12-9585b3027fa7

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

--- build/build.bat
+++ build/build.bat
@@ -0,0 +1,47 @@
+@echo off
+setlocal
+
+REM We need a JVM
+if not defined JAVA_HOME  (
+  echo Error: JAVA_HOME is not defined.
+  exit /b
+)
+
+set JARCMD="%JAVA_HOME%\bin\jar.exe"
+set JAVACMD="%JAVA_HOME%\bin\java.exe"
+
+if not exist %JARCMD% (
+  echo "Error: JAVA_HOME is not defined correctly (has to point to a JDK)
+  echo Cannot execute %JARCMD%
+  exit /b
+)
+
+
+rem Tidy up from previous build
+
+rd /s /q ..\target
+mkdir ..\target
+
+rem Build js
+
+copy /b /y ..\src\javascript\json2.js+..\src\javascript\idpselect.js+..\src\javascript\typeahead.js %TEMP%\idpselect.js
+java -jar yuicompressor-2.4.2.jar -o ..\target\idpselect.js %TEMP%\idpselect.js
+del/q %TEMP%\idpselect.js
+
+rem Build CSS
+
+java -jar yuicompressor-2.4.2.jar -o ..\target\idpselect.css  ..\src\resources\idpselect.css
+
+rem Copy other files
+
+copy ..\LICENSE.txt ..\target
+copy ..\src\resources\index.html ..\target
+copy ..\src\javascript\idpselect_config.js ..\target
+
+rem Zip it up
+
+cd ..\target
+
+%JARCMD% cfM  %TEMP%\EDS.zip *
+copy %TEMP%\EDS.zip
+del/q  %TEMP%\EDS.zip


Don't build broken plugins

Don't build broken plugins

git-svn-id: 03a8048b5ee8463be5048a3801110fb50f378627@7333 d0ab736e-dc22-4aeb-8dc9-08def0aa14fd

--- buildscripts/buildJars.bat
+++ buildscripts/buildJars.bat
@@ -11,10 +11,6 @@
 PUSHD autofocus
 call ant -buildfile build.xml %cleantarget% compile build
 POPD
-
-pushd plugins\Bleach
-call ant -buildfile build.xml %cleantarget% compile build
-popd

 echo building pixelcalibrator
 pushd plugins\PixelCalibrator
@@ -37,10 +33,6 @@
 call ant -buildfile build.xml %cleantarget% compile build
 popd

-pushd plugins\Tracker
-call ant -buildfile build.xml %cleantarget% compile build
-popd
-
 pushd plugins\Big
 call ant -buildfile build.xml %cleantarget% compile build
 popd
@@ -53,4 +45,12 @@
 call build.bat
 popd

+rem pushd plugins\Bleach
+rem call ant -buildfile build.xml %cleantarget% compile build
+rem popd
+
+rem pushd plugins\Tracker
+rem call ant -buildfile build.xml %cleantarget% compile build
+rem popd
+
 POPD


Added a batch file that performs the same function as 'serve-local.sh' for Windows. (#32)

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

--- serve-local.bat
+++ serve-local.bat
@@ -0,0 +1,2 @@
+rem docker build --pull -t phyloref/jekyll .
+docker run --rm --volume=%CD%:/srv/jekyll -it -e JEKYLL_ENV=production -p 127.0.0.1:4000:4000 phyloref/jekyll jekyll serve --config _config.yml,_config-dev.yml --drafts


update build path

update build path

--- LuaJIT_mobile/build_win.bat
+++ LuaJIT_mobile/build_win.bat
@@ -2,7 +2,7 @@
 if exist "%VS140COMNTOOLS%" (
 	set VCVARS="%VS140COMNTOOLS%..\..\VC\bin\"
 	goto build
-	)
+	)
 else (goto missing)

 :build
@@ -14,14 +14,14 @@
 echo Swtich to x86 build env
 cd luajit\src
 call msvcbuild.bat
-copy /Y lua51.dll ..\..\prebuilt\x86\slua.dll
+copy /Y lua51.dll ..\..\prebuilt\win\x86\slua.dll
 cd ..\..

 call "%ENV64%"
 echo Swtich to x64 build env
 cd luajit\src
 call msvcbuild.bat
-copy /Y lua51.dll ..\..\prebuilt\x64\slua.dll
+copy /Y lua51.dll ..\..\prebuilt\win\x64\slua.dll
 cd ..\..

@@ -29,4 +29,4 @@

 :missing
 echo Can't find Visual Studio 2015.
-goto :eof+goto :eof


fix test-integration comment

fix test-integration comment

--- scripts/test-integration.bat
+++ scripts/test-integration.bat
@@ -22,7 +22,7 @@
 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%

-# Tests in commonJS (HTML, CSS, JSON language server tests...)
+:: Tests in commonJS (HTML, CSS, JSON language server tests...)
 call .\scripts\node-electron.bat .\node_modules\mocha\bin\_mocha .\extensions\*\server\out\test\**\*.test.js
 if %errorlevel% neq 0 exit /b %errorlevel%


:table_flip:

--- scripts/test-integration.bat
+++ scripts/test-integration.bat
@@ -66,7 +66,7 @@
 call "%INTEGRATION_TEST_ELECTRON_PATH%" %~dp0\..\extensions\markdown-language-features\test-workspace --extensionDevelopmentPath=%~dp0\..\extensions\markdown-language-features --extensionTestsPath=%~dp0\..\extensions\markdown-language-features\out\test %ALL_PLATFORMS_API_TESTS_EXTRA_ARGS%
 if %errorlevel% neq 0 exit /b %errorlevel%

-call "%INTEGRATION_TEST_ELECTRON_PATH%" %~dp0\..\extensions\emmet\test-workspace --extensionDevelopmentPath=%~dp0\..\extensions\emmet --extensionTestsPath=%~dp0\..\extensions\emmet\out\test %ALL_PLATFORMS_API_TESTS_EXTRA_ARGS% .
+call "%INTEGRATION_TEST_ELECTRON_PATH%" %~dp0\..\extensions\emmet\test-workspace --extensionDevelopmentPath=%~dp0\..\extensions\emmet --extensionTestsPath=%~dp0\..\extensions\emmet\out\test %ALL_PLATFORMS_API_TESTS_EXTRA_ARGS%
 if %errorlevel% neq 0 exit /b %errorlevel%

 call "%INTEGRATION_TEST_ELECTRON_PATH%" %~dp0\..\extensions\vscode-notebook-tests\test --enable-proposed-api=vscode.vscode-notebook-tests --extensionDevelopmentPath=%~dp0\..\extensions\vscode-notebook-tests --extensionTestsPath=%~dp0\..\extensions\vscode-notebook-tests\out %ALL_PLATFORMS_API_TESTS_EXTRA_ARGS%


Fixes #112164

Fixes #112164

--- scripts/test-integration.bat
+++ scripts/test-integration.bat
@@ -40,8 +40,8 @@
 )

 :: Integration & performance tests in AMD
-@REM ::call .\scripts\test.bat --runGlob **\*.integrationTest.js %*
-@REM ::if %errorlevel% neq 0 exit /b %errorlevel%
+call .\scripts\test.bat --runGlob **\*.integrationTest.js %*
+if %errorlevel% neq 0 exit /b %errorlevel%

 :: Tests in the extension host


t/batchtst.cmd: add echo environment variable and current directory for test


DEV | added quality controller

DEV | added quality controller

--- run_quality.cmd
+++ run_quality.cmd
@@ -1,4 +1,4 @@
 choco install "msbuild-sonarqube-runner" -y
-MSBuild.SonarQube.Runner.exe begin /k:"skible:Alfred" /n:"Alfred" /v:"1.0.0" /d:sonar.host.url=https://sonarqube.com /d:sonar.login=[SonarQube_Token]
+MSBuild.SonarQube.Runner.exe begin /k:"skible:Alfred" /n:"Alfred" /v:%APPVEYOR_BUILD_VERSION% /d:sonar.host.url=https://sonarqube.com /d:sonar.login=[SonarQube_Token]
 "C:\Program Files (x86)\MSBuild\14.0\Bin\MSBuild.exe" /t:Rebuild
-MSBuild.SonarQube.Runner.exe end /d:sonar.login=[SonarQube_Token]+MSBuild.SonarQube.Runner.exe end /d:sonar.login=%SonarQube_Token%


Create bld.bat

Create bld.bat

error: pathspec 'recipes/tl-optional/bld.bat' did not match any file(s) known to git

--- recipes/tl-optional/bld.bat
+++ recipes/tl-optional/bld.bat
@@ -0,0 +1,22 @@
+mkdir build
+cd build
+
+cmake ^
+    -G "Ninja" ^
+    -DCMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% ^
+    -DCMAKE_BUILD_TYPE=Release ^
+    -DBUILD_TESTING=ON ^
+    %SRC_DIR%
+if errorlevel 1 exit 1
+
+:: Build.
+cmake --build . --config Release
+if errorlevel 1 exit 1
+
+:: Install.
+cmake --build . --config Release --target install
+if errorlevel 1 exit 1
+
+:: Test.
+ctest -C Release
+if errorlevel 1 exit 1


Remove conflict markers

Remove conflict markers

Had problem with notepad during commit from command line. So edit the
file now to remove lines I no longer want to keep.

--- Install/InstallSettings.bat
+++ Install/InstallSettings.bat
@@ -106,18 +106,11 @@
 set ops_userName=admin

 REM ---------------------------------------------------------------------
-<<<<<<< HEAD
 REM This variable is used for the following passwords:
 REM     PostgreSQL superuser
 REM     ArcGIS Server site administrator
 REM     Portal for ArcGIS initial administrator account
 REM     "sde" user password that owns the ops server geodatabases.
-=======
-REM This variable is used for the following passwords: PostgreSQL superuser,
-REM PostgreSQL service account, ArcGIS Server service account, ArcGIS Server
-REM site administrator, Portal for ArcGIS initial administrator account, and the
-REM "sde" user password that owns the ops server geodatabases.
->>>>>>> 366985a7f2fa46aeae3fb815c348e36ed5c20f35
 REM
 REM   ***** WARNING ***** WARNING ***** WARNING ***** WARNING *****
 REM


Building the correct file on Windows

Building the correct file on Windows

--- scripts/run.bat
+++ scripts/run.bat
@@ -12,4 +12,4 @@

 popd

-msbuild ./build/becoming_portland.sln
+msbuild ./build/becoming_portland.vcxproj


Vss2Git

--- src/makeTradeBuildEXEs.bat
+++ src/makeTradeBuildEXEs.bat
@@ -8,39 +8,49 @@
 rem pause
 vb6 /m TradeSkilDemo\TradeSkilDemo.vbp
 rem pause
-vb6 /m CommandLineUtils\gbd\gbd.vbp
+
+vb6 /m CommandLineUtils\gbd\gbd.vbp
 rem pause
-link /EDIT /SUBSYSTEM:CONSOLE CommandLineUtils\gbd\gbd.exe
+link /EDIT /SUBSYSTEM:CONSOLE CommandLineUtils\gbd\gbd27.exe
+copy CommandLineUtils\gbd\gbd27.exe CommandLineUtils\

 vb6 /m CommandLineUtils\gccd\gccd.vbp
 rem pause
-link /EDIT /SUBSYSTEM:CONSOLE CommandLineUtils\gccd\gccd.exe
+link /EDIT /SUBSYSTEM:CONSOLE CommandLineUtils\gccd\gccd27.exe
+copy CommandLineUtils\gccd\gccd27.exe CommandLineUtils\

 vb6 /m CommandLineUtils\gcd\gcd.vbp
 rem pause
-link /EDIT /SUBSYSTEM:CONSOLE CommandLineUtils\gcd\gcd.exe
+link /EDIT /SUBSYSTEM:CONSOLE CommandLineUtils\gcd\gcd27.exe
+copy CommandLineUtils\gcd\gcd27.exe CommandLineUtils\

 vb6 /m CommandLineUtils\gtd\gtd.vbp
 rem pause
-link /EDIT /SUBSYSTEM:CONSOLE CommandLineUtils\gtd\gtd.exe
+link /EDIT /SUBSYSTEM:CONSOLE CommandLineUtils\gtd\gtd27.exe
+copy CommandLineUtils\gtd\gtd27.exe CommandLineUtils\

 vb6 /m CommandLineUtils\gxd\gxd.vbp
 rem pause
-link /EDIT /SUBSYSTEM:CONSOLE CommandLineUtils\gxd\gxd.exe
+link /EDIT /SUBSYSTEM:CONSOLE CommandLineUtils\gxd\gxd27.exe
+copy CommandLineUtils\gxd\gxd27.exe CommandLineUtils\

 vb6 /m CommandLineUtils\ltz\ltz.vbp
 rem pause
-link /EDIT /SUBSYSTEM:CONSOLE CommandLineUtils\ltz\ltz.exe
+link /EDIT /SUBSYSTEM:CONSOLE CommandLineUtils\ltz\ltz27.exe
+copy CommandLineUtils\ltz\ltz27.exe CommandLineUtils\

 vb6 /m CommandLineUtils\uccd\uccd.vbp
 rem pause
-link /EDIT /SUBSYSTEM:CONSOLE CommandLineUtils\uccd\uccd.exe
+link /EDIT /SUBSYSTEM:CONSOLE CommandLineUtils\uccd\uccd27.exe
+copy CommandLineUtils\uccd\uccd27.exe CommandLineUtils\

 vb6 /m CommandLineUtils\ucd\ucd.vbp
 rem pause
-link /EDIT /SUBSYSTEM:CONSOLE CommandLineUtils\ucd\ucd.exe
+link /EDIT /SUBSYSTEM:CONSOLE CommandLineUtils\ucd\ucd27.exe
+copy CommandLineUtils\ucd\ucd27.exe CommandLineUtils\

 vb6 /m CommandLineUtils\uxd\uxd.vbp
 rem pause
-link /EDIT /SUBSYSTEM:CONSOLE CommandLineUtils\uxd\uxd.exe
+link /EDIT /SUBSYSTEM:CONSOLE CommandLineUtils\uxd\uxd27.exe
+copy CommandLineUtils\uxd\uxd27.exe CommandLineUtils\


Fixes issue #15; Release script must run unit-tests from Release build, not Debug build

--- release.bat
+++ release.bat
@@ -27,7 +27,7 @@
 msbuild %PROJECT%.sln /target:Clean,Rebuild /p:Configuration=Release /p:Version=%VERSION%%SUFFIX% /p:AssemblyVersion=%VERSION% /p:FileVersion=%VERSION% /p:DefineConstants="RELEASE;USE_RELEASE_KEY"
 if errorlevel 1 goto error

-set TESTDLL=%PROJECT%.Tests\bin\Debug\%PROJECT%.Tests.dll
+set TESTDLL=%PROJECT%.Tests\bin\Release\%PROJECT%.Tests.dll
 if exist "%TESTDLL%" nunit3-console "%TESTDLL%"
 if errorlevel 1 goto error

@@ -60,4 +60,4 @@

 :exitwitherror
 git checkout "%PROJECT%\Lasse V. Karlsen.snk"
-exit /B 1+exit /B 1


more testing with cmake

more testing with cmake

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

--- cmake/build.cmd
+++ cmake/build.cmd
@@ -0,0 +1,9 @@
+set MINGW_PATH=c:\MinGW
+set PATH=%PATH%;%MINGW_PATH%\bin
+set PATH=%PATH%;%MINGW_PATH%\dll
+
+mkdir build
+pushd build
+cmake -G"MinGW Makefiles" ..
+mingw32-make %*
+popd


Hide process running test

Hide process running test

--- startgimp.cmd
+++ startgimp.cmd
@@ -2,7 +2,7 @@
 title Push script to Gimp plugins folder, start Gimp

 rem We should pause at this point, if Gimp is still open
-echo tasklist | find "gimp" 2>NUL
+echo tasklist | find "gimp" >NUL 2>&1
 rem echo %ERRORLEVEL%
 if "%ERRORLEVEL%"=="1" goto notRunning
 	echo .


concatenate.bat

concatenate.bat

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

--- concatenate.bat
+++ concatenate.bat
@@ -0,0 +1 @@
+SET FILES=%FILES% %1


Do not install gitconfig

Do not install gitconfig

--- install-win.bat
+++ install-win.bat
@@ -13,7 +13,7 @@

 set dotfilesDir=%~dp0
 set backupDir=%USERPROFILE%\dotfiles_backup
-set dotfiles=bashrc bash_profile config minttyrc gitconfig zshenv puppet-lint.rc
+set dotfiles=bashrc bash_profile config minttyrc zshenv puppet-lint.rc

 :: add registry key for init.bat
 reg add "HKCU\Software\Microsoft\Command Processor" /v AutoRun /t REG_SZ /d "%dotfilesDir%init.bat" /f


new version

new version

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

--- scripts/windows/compile.bat
+++ scripts/windows/compile.bat
@@ -44,7 +44,7 @@

 set PROACTIVE=..\.
-call init.bat
+call %PROACTIVE%\scripts\windows\init.bat

 echo CLASSPATH=%CLASSPATH%


- Make server started by run_server.bat listen on all interfaces

--- run_server.bat
+++ run_server.bat
@@ -1,3 +1,3 @@
 @echo off
 call %~dp0%configure_environment.bat
-start python manage.py runserver
+start python manage.py runserver 0.0.0.0:8000


Remove merged symbols

Remove merged symbols

--- src/main/scripts/install.bat
+++ src/main/scripts/install.bat
@@ -1,229 +1,213 @@
-@echo off
-:: Copyright (c) 2012 - 2014, Andres Gomez Casanova (AngocA)
-:: All rights reserved.
-::
-:: Redistribution and use in source and binary forms, with or without
-:: modification, are permitted provided that the following conditions are met:
-::
-:: 1. Redistributions of source code must retain the above copyright notice,
-::    this list of conditions and the following disclaimer.
-:: 2. Redistributions in binary form must reproduce the above copyright notice,
-::    this list of conditions and the following disclaimer in the documentation
-::    and/or other materials provided with the distribution.
-::
-:: THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-:: AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-:: IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-:: ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-:: LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-:: CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-:: SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-:: INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-:: CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-:: ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-:: POSSIBILITY OF SUCH DAMAGE.
-
-
-:: Installs all scripts of the utility.
-::
-:: Version: 2014-02-14 1-RC
-:: Author: Andres Gomez Casanova (AngocA)
-:: Made in COLOMBIA.
-
-:: Global variables
-set continue=1
-set adminInstall=1
-set temporalTable=0
-set v9_7=0
-set retValue=0
-
-:: Main call.
-:: Checks if there is already a connection established
-db2 connect > NUL
-if %ERRORLEVEL% EQU 0 (
- call:init %1 %2 %3
-) else (
- echo Please connect to a database before the execution of the installation.
- set retValue=2
-)
-exit /B %retValue%
-goto:eof
-
-:: Installs a given script in DB2.
-:: It uses the continue global variable to stop the execution if an error occurs.
-:installScript
- set script=%~1
- echo %script%
- db2 -tsf %script%
- if %ERRORLEVEL% NEQ 0 (
-  set continue=0
- )
- set script=
-goto:eof
-
-:: Function that install the utility for version 10.1.
-:: DB2 v10.1
-:v10.1
- echo Installing utility for v10.1
- if %adminInstall% EQU 1 (
-  if %continue% EQU 1 call:installScript %LOG4DB2_SRC_MAIN_CODE_PATH%\00-AdminObjects.sql
- )
- if %continue% EQU 1 call:installScript %LOG4DB2_SRC_MAIN_CODE_PATH%\01-Tables.sql
- if %continue% EQU 1 call:installScript %LOG4DB2_SRC_MAIN_CODE_PATH%\02-UtilityHeader.sql
- if %continue% EQU 1 call:installScript %LOG4DB2_SRC_MAIN_CODE_PATH%\03-UtilityBody.sql
- if %continue% EQU 1 call:installScript %LOG4DB2_SRC_MAIN_CODE_PATH%\04-Appenders.sql
- if %continue% EQU 1 call:installScript %LOG4DB2_SRC_MAIN_CODE_PATH%\05-LOG.sql
- if %continue% EQU 1 call:installScript %LOG4DB2_SRC_MAIN_CODE_PATH%\06-GET_LOGGER.sql
- if %continue% EQU 1 call:installScript %LOG4DB2_SRC_MAIN_CODE_PATH%\07-Trigger.sql
-
- if %continue% EQU 1 call:installScript %LOG4DB2_SRC_MAIN_CODE_PATH%\08-AdminHeader.sql
- if %continue% EQU 1 call:installScript %LOG4DB2_SRC_MAIN_CODE_PATH%\09-AdminBody.sql
-
- cd %LOG4DB2_SRC_MAIN_CODE_PATH%
- cd ..
- cd xml
- if %continue% EQU 1 call:installScript 10-AppendersXML.sql
- cd ..
- cd scripts 2> NUL
-
- :: Temporal capabilities for tables.
- if %temporalTable% EQU 1 if %continue% EQU 1 (
-  echo Create table for Time Travel
-  call:installScript %LOG4DB2_SRC_MAIN_CODE_PATH%\11-TablesTimeTravel.sql
- )
-
- if %continue% EQU 1 call:installScript %LOG4DB2_SRC_MAIN_CODE_PATH%\12-Version.sql
-<<<<<<< HEAD
-
- set retValue=%continue%
- set continue=
-=======
->>>>>>> 7d5e1d2eb87b13701048f918f919cf0400f6ad0f
-goto:eof
-
-:: Function that install the utility for version 9.7.
-:: DB2 v9.7
-:v9.7
- echo Installing utility for v9.7
- if %adminInstall% EQU 1 (
-  if %continue% EQU 1 call:installScript %LOG4DB2_SRC_MAIN_CODE_PATH%\00-AdminObjects.sql
- )
- if %continue% EQU 1 call:installScript %LOG4DB2_SRC_MAIN_CODE_PATH%\01-Tables_v9_7.sql
- if %continue% EQU 1 call:installScript %LOG4DB2_SRC_MAIN_CODE_PATH%\02-UtilityHeader.sql
- if %continue% EQU 1 call:installScript %LOG4DB2_SRC_MAIN_CODE_PATH%\03-UtilityBody.sql
- if %continue% EQU 1 call:installScript %LOG4DB2_SRC_MAIN_CODE_PATH%\04-Appenders.sql
- if %continue% EQU 1 call:installScript %LOG4DB2_SRC_MAIN_CODE_PATH%\05-LOG.sql
- if %continue% EQU 1 call:installScript %LOG4DB2_SRC_MAIN_CODE_PATH%\06-GET_LOGGER_v9_7.sql
- if %continue% EQU 1 call:installScript %LOG4DB2_SRC_MAIN_CODE_PATH%\07-Trigger.sql
-
- if %continue% EQU 1 call:installScript %LOG4DB2_SRC_MAIN_CODE_PATH%\08-AdminHeader.sql
- if %continue% EQU 1 call:installScript %LOG4DB2_SRC_MAIN_CODE_PATH%\09-AdminBody.sql
-
- cd %LOG4DB2_SRC_MAIN_CODE_PATH%
- cd ..
- cd xml
- if %continue% EQU 1 call:installScript 10-AppendersXML.sql
- cd ..
- cd scripts 2> NUL
-
- if %continue% EQU 1 call:installScript %LOG4DB2_SRC_MAIN_CODE_PATH%\12-Version.sql
-<<<<<<< HEAD
-
- set retValue=%continue%
- set continue=
-=======
->>>>>>> 7d5e1d2eb87b13701048f918f919cf0400f6ad0f
-goto:eof
-
-:: This functions checks all parameters and assign them to global variables.
-:checkParam
- set param1=%1
- set param2=%2
- set param3=%3
- if /I "%param1%" == "-A" (
-  set adminInstall=0
- )
- if /I "%param2%" == "-A" (
-  set adminInstall=0
- )
- if /I "%param3%" == "-A" (
-  set adminInstall=0
- )
- if /I "%param1%" == "-t" (
-  set temporalTable=1
- )
- if /I "%param2%" == "-t" (
-  set temporalTable=1
- )
- if /I "%param3%" == "-t" (
-  set temporalTable=1
- )
- if /I "%param1%" == "-v9_7" (
-  set v9_7=1
- )
- if /I "%param2%" == "-v9_7" (
-  set v9_7=1
- )
- if /I "%param3%" == "-v9_7" (
-  set v9_7=1
- )
- set param1=
- set param2=
- set param3=
-goto:eof
-
-:: Main function that starts the installation.
-:init
- :: Initialize the environment.
- if EXIST init.bat (
-  call init.bat
- )
-
- echo log4db2 is licensed under the terms of the Simplified-BSD license
-
- :: Check the given parameters.
- call:checkParam %1 %2 %3
-
- :: Checks in which DB2 version the utility will be installed.
- :: DB2 v10.1 is the default version.
- if %v9_7% EQU 1 (
-  call:v9.7
- ) else (
-  call:v10.1
- )
-
- echo Please visit the wiki to learn how to use and configure this utility
- echo https://github.com/angoca/log4db2/wiki
- echo To report an issue or provide feedback, please visit:
- echo https://github.com/angoca/log4db2/issues
- echo.
-<<<<<<< HEAD
- if %retValue% EQU 1 (
-=======
- if %continue% EQU 1 (
->>>>>>> 7d5e1d2eb87b13701048f918f919cf0400f6ad0f
-  echo log4db2 was successfully installed
-  db2 -x "values 'Database: ' || current server"
-  db2 -x "values 'Version: ' || logger.version"
-  db2 -x "select 'Schema: ' || base_moduleschema from syscat.modules where moduleschema = 'SYSPUBLIC' and modulename = 'LOGGER'"
-<<<<<<< HEAD
-=======
-  set retValue=0
->>>>>>> 7d5e1d2eb87b13701048f918f919cf0400f6ad0f
- ) else (
-  echo "Check the error(s) and reinstall the utility"
-  set retValue=1
- )
-<<<<<<< HEAD
-
- :: Clean environment.
- set v9_7=
- set adminInstall=
- set temporalTable=
-=======
->>>>>>> 7d5e1d2eb87b13701048f918f919cf0400f6ad0f
- if EXIST uninit.bat (
-  call uninit.bat
- )
-goto:eof
-
+@echo off
+:: Copyright (c) 2012 - 2014, Andres Gomez Casanova (AngocA)
+:: All rights reserved.
+::
+:: Redistribution and use in source and binary forms, with or without
+:: modification, are permitted provided that the following conditions are met:
+::
+:: 1. Redistributions of source code must retain the above copyright notice,
+::    this list of conditions and the following disclaimer.
+:: 2. Redistributions in binary form must reproduce the above copyright notice,
+::    this list of conditions and the following disclaimer in the documentation
+::    and/or other materials provided with the distribution.
+::
+:: THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+:: AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+:: IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+:: ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+:: LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+:: CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+:: SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+:: INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+:: CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+:: ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+:: POSSIBILITY OF SUCH DAMAGE.
+
+
+:: Installs all scripts of the utility.
+::
+:: Version: 2014-02-14 1-RC
+:: Author: Andres Gomez Casanova (AngocA)
+:: Made in COLOMBIA.
+
+:: Global variables
+set continue=1
+set adminInstall=1
+set temporalTable=0
+set v9_7=0
+set retValue=0
+
+:: Main call.
+:: Checks if there is already a connection established
+db2 connect > NUL
+if %ERRORLEVEL% EQU 0 (
+ call:init %1 %2 %3
+) else (
+ echo Please connect to a database before the execution of the installation.
+ set retValue=2
+)
+exit /B %retValue%
+goto:eof
+
+:: Installs a given script in DB2.
+:: It uses the continue global variable to stop the execution if an error occurs.
+:installScript
+ set script=%~1
+ echo %script%
+ db2 -tsf %script%
+ if %ERRORLEVEL% NEQ 0 (
+  set continue=0
+ )
+ set script=
+goto:eof
+
+:: Function that install the utility for version 10.1.
+:: DB2 v10.1
+:v10.1
+ echo Installing utility for v10.1
+ if %adminInstall% EQU 1 (
+  if %continue% EQU 1 call:installScript %LOG4DB2_SRC_MAIN_CODE_PATH%\00-AdminObjects.sql
+ )
+ if %continue% EQU 1 call:installScript %LOG4DB2_SRC_MAIN_CODE_PATH%\01-Tables.sql
+ if %continue% EQU 1 call:installScript %LOG4DB2_SRC_MAIN_CODE_PATH%\02-UtilityHeader.sql
+ if %continue% EQU 1 call:installScript %LOG4DB2_SRC_MAIN_CODE_PATH%\03-UtilityBody.sql
+ if %continue% EQU 1 call:installScript %LOG4DB2_SRC_MAIN_CODE_PATH%\04-Appenders.sql
+ if %continue% EQU 1 call:installScript %LOG4DB2_SRC_MAIN_CODE_PATH%\05-LOG.sql
+ if %continue% EQU 1 call:installScript %LOG4DB2_SRC_MAIN_CODE_PATH%\06-GET_LOGGER.sql
+ if %continue% EQU 1 call:installScript %LOG4DB2_SRC_MAIN_CODE_PATH%\07-Trigger.sql
+
+ if %continue% EQU 1 call:installScript %LOG4DB2_SRC_MAIN_CODE_PATH%\08-AdminHeader.sql
+ if %continue% EQU 1 call:installScript %LOG4DB2_SRC_MAIN_CODE_PATH%\09-AdminBody.sql
+
+ cd %LOG4DB2_SRC_MAIN_CODE_PATH%
+ cd ..
+ cd xml
+ if %continue% EQU 1 call:installScript 10-AppendersXML.sql
+ cd ..
+ cd scripts 2> NUL
+
+ :: Temporal capabilities for tables.
+ if %temporalTable% EQU 1 if %continue% EQU 1 (
+  echo Create table for Time Travel
+  call:installScript %LOG4DB2_SRC_MAIN_CODE_PATH%\11-TablesTimeTravel.sql
+ )
+
+ if %continue% EQU 1 call:installScript %LOG4DB2_SRC_MAIN_CODE_PATH%\12-Version.sql
+
+ set retValue=%continue%
+ set continue=
+goto:eof
+
+:: Function that install the utility for version 9.7.
+:: DB2 v9.7
+:v9.7
+ echo Installing utility for v9.7
+ if %adminInstall% EQU 1 (
+  if %continue% EQU 1 call:installScript %LOG4DB2_SRC_MAIN_CODE_PATH%\00-AdminObjects.sql
+ )
+ if %continue% EQU 1 call:installScript %LOG4DB2_SRC_MAIN_CODE_PATH%\01-Tables_v9_7.sql
+ if %continue% EQU 1 call:installScript %LOG4DB2_SRC_MAIN_CODE_PATH%\02-UtilityHeader.sql
+ if %continue% EQU 1 call:installScript %LOG4DB2_SRC_MAIN_CODE_PATH%\03-UtilityBody.sql
+ if %continue% EQU 1 call:installScript %LOG4DB2_SRC_MAIN_CODE_PATH%\04-Appenders.sql
+ if %continue% EQU 1 call:installScript %LOG4DB2_SRC_MAIN_CODE_PATH%\05-LOG.sql
+ if %continue% EQU 1 call:installScript %LOG4DB2_SRC_MAIN_CODE_PATH%\06-GET_LOGGER_v9_7.sql
+ if %continue% EQU 1 call:installScript %LOG4DB2_SRC_MAIN_CODE_PATH%\07-Trigger.sql
+
+ if %continue% EQU 1 call:installScript %LOG4DB2_SRC_MAIN_CODE_PATH%\08-AdminHeader.sql
+ if %continue% EQU 1 call:installScript %LOG4DB2_SRC_MAIN_CODE_PATH%\09-AdminBody.sql
+
+ cd %LOG4DB2_SRC_MAIN_CODE_PATH%
+ cd ..
+ cd xml
+ if %continue% EQU 1 call:installScript 10-AppendersXML.sql
+ cd ..
+ cd scripts 2> NUL
+
+ if %continue% EQU 1 call:installScript %LOG4DB2_SRC_MAIN_CODE_PATH%\12-Version.sql
+
+ set retValue=%continue%
+ set continue=
+goto:eof
+
+:: This functions checks all parameters and assign them to global variables.
+:checkParam
+ set param1=%1
+ set param2=%2
+ set param3=%3
+ if /I "%param1%" == "-A" (
+  set adminInstall=0
+ )
+ if /I "%param2%" == "-A" (
+  set adminInstall=0
+ )
+ if /I "%param3%" == "-A" (
+  set adminInstall=0
+ )
+ if /I "%param1%" == "-t" (
+  set temporalTable=1
+ )
+ if /I "%param2%" == "-t" (
+  set temporalTable=1
+ )
+ if /I "%param3%" == "-t" (
+  set temporalTable=1
+ )
+ if /I "%param1%" == "-v9_7" (
+  set v9_7=1
+ )
+ if /I "%param2%" == "-v9_7" (
+  set v9_7=1
+ )
+ if /I "%param3%" == "-v9_7" (
+  set v9_7=1
+ )
+ set param1=
+ set param2=
+ set param3=
+goto:eof
+
+:: Main function that starts the installation.
+:init
+ :: Initialize the environment.
+ if EXIST init.bat (
+  call init.bat
+ )
+
+ echo log4db2 is licensed under the terms of the Simplified-BSD license
+
+ :: Check the given parameters.
+ call:checkParam %1 %2 %3
+
+ :: Checks in which DB2 version the utility will be installed.
+ :: DB2 v10.1 is the default version.
+ if %v9_7% EQU 1 (
+  call:v9.7
+ ) else (
+  call:v10.1
+ )
+
+ echo Please visit the wiki to learn how to use and configure this utility
+ echo https://github.com/angoca/log4db2/wiki
+ echo To report an issue or provide feedback, please visit:
+ echo https://github.com/angoca/log4db2/issues
+ echo.
+ if %retValue% EQU 1 (
+  echo log4db2 was successfully installed
+  db2 -x "values 'Database: ' || current server"
+  db2 -x "values 'Version: ' || logger.version"
+  db2 -x "select 'Schema: ' || base_moduleschema from syscat.modules where moduleschema = 'SYSPUBLIC' and modulename = 'LOGGER'"
+  set retValue=0
+ ) else (
+  echo "Check the error(s) and reinstall the utility"
+  set retValue=1
+ )
+
+ :: Clean environment.
+ set v9_7=
+ set adminInstall=
+ set temporalTable=
+ if EXIST uninit.bat (
+  call uninit.bat
+ )
+goto:eof
+


Fix SQL CLI on Windows

Fix SQL CLI on Windows

This commit fixes the classpath for the SQL CLI tool on Windows. As the
x-pack bin folder was collapsed into the distribution bin folder, the
location of the classpath here needed to no longer contain the old
plugins directory.

--- x-pack/plugin/sql/src/main/bin/elasticsearch-sql-cli.bat
+++ x-pack/plugin/sql/src/main/bin/elasticsearch-sql-cli.bat
@@ -11,7 +11,7 @@

 call "%~dp0x-pack-env.bat" || exit /b 1

-set CLI_JAR=%ES_HOME%/plugins/bin/*
+set CLI_JAR=%ES_HOME%/bin/*

 %JAVA% ^
   -cp "%CLI_JAR%" ^


Fixed issue with commented-out user_pref lines

It ended up being a mixture of the previous commit and the fix. It writes a temporary file on the go that only holds preferences, and generates the target file at once at the end. It's slower than before, but it works.

--- updater.bat
+++ updater.bat
@@ -207,38 +207,40 @@

 REM ###### Merge function ######
 :merge
-DEL /F %2 2>nul
 SETLOCAL disabledelayedexpansion
-FOR /F "tokens=1,* delims=]" %%G IN ('find /n /v "" ^< "%~1"') DO (
-	SET "_pref=%%H"
-	SETLOCAL enabledelayedexpansion
-	SET "_temp=!_pref: =!"
-	IF /I "user_pref"=="!_temp:~0,9!" (
-		IF /I NOT "user.js.parrot"=="!_temp:~12,14!" (
-			FOR /F "delims=," %%S IN ("!_pref!") DO (
-				SET "_pref=%%S"
+(
+	FOR /F "tokens=1,* delims=]" %%G IN ('find /n /v "" ^< "%~1"') DO (
+		SET "_pref=%%H"
+		SETLOCAL enabledelayedexpansion
+		SET "_temp=!_pref: =!"
+		IF /I "user_pref"=="!_temp:~0,9!" (
+			IF /I NOT "user.js.parrot"=="!_temp:~12,14!" (
+				FOR /F "delims=," %%S IN ("!_pref!") DO (
+					SET "_pref=%%S"
+				)
+				SET _pref=!_pref:"=""!
+				FIND /I "!_pref!" updatertempfile1 >nul 2>&1
+				IF ERRORLEVEL 1 (
+					FOR /F "tokens=* delims=" %%X IN ('FIND /I "!_pref!" %~1') DO (
+						SET "_temp=%%X"
+						SET "_temp=!_temp: =!"
+						IF /I "user_pref"=="!_temp:~0,9!" (
+							SET "_pref=%%X"
+						)
+					)
+					ECHO(!_pref!
+					ECHO(!_pref!>>updatertempfile1
+				)
+			) ELSE (
+				ECHO(!_pref!
 			)
-			SET _pref=!_pref:"=""!
-			FIND /I "!_pref!" %~2 >nul 2>&1
-			IF ERRORLEVEL 1 (
-				FOR /F "tokens=* delims=" %%X IN ('FIND /I "!_pref!" %~1') DO (
-					SET "_temp=%%X"
-					SET "_temp=!_temp: =!"
-					IF /I "user_pref"=="!_temp:~0,9!" (
-						SET "_pref=%%X"
-					)
-				)
-				ECHO(!_pref!>>%~2
-			)
-		) ELSE (
-			ECHO(!_pref!>>%~2
-		)
-	) ELSE (
-		ECHO(!_pref!>>%~2
-	)
-	ENDLOCAL
-)
+		) ELSE (
+			ECHO(!_pref!
+		)
+		ENDLOCAL
+	)
+)>%~2
 ENDLOCAL
-DEL /F %1 >nul
+DEL /F %1 updatertempfile1 >nul
 GOTO :EOF
 REM ############################


Update Windows python binary to use py

Update Windows python binary to use py

--- bundledApps/MAKEFILE.bat
+++ bundledApps/MAKEFILE.bat
@@ -1,6 +1,6 @@
-pip install --upgrade wxPython
-pip install -r requirements.txt
-pip install pywin32
+py -m pip install --upgrade wxPython
+py -m pip install -r requirements.txt
+py -m pip install pywin32

 pyinstaller -p bundledApps --onefile --windowed --clean --version-file=build/version.txt --icon=build/icons/wail_blue.ico bundledApps/WAIL.py


Fixing Windows build.

Fixing Windows build.

--- vcbuild.bat
+++ vcbuild.bat
@@ -35,7 +35,7 @@
 		--with-openssl=../nodejs/deps/openssl ^
 		--with-pcre=../deps/pcre ^
 		--with-zlib=../nodejs/deps/zlib ^
-		--with-cc-opt="-I../libnodejs -DFD_SETSIZE=1024 -D_WINSOCK_DEPRECATED_NO_WARNINGS /wd4307"
+		--with-cc-opt="-I../libnodejs -DFD_SETSIZE=1024 /wd4307"
 cd ..
 if /i "%1"=="configure" goto exit


Oops.  Forgot about Windows users.

Oops.  Forgot about Windows users.

--- OpenSim/Tools/LaunchSLClient/runprebuild.bat
+++ OpenSim/Tools/LaunchSLClient/runprebuild.bat
@@ -1,2 +1,2 @@
-bin\Prebuild.exe /target nant
-bin\Prebuild.exe /target vs2005+..\..\..\bin\Prebuild.exe /target nant
+..\..\..\bin\Prebuild.exe /target vs2005


adding some output and fixing output directory

--- Build/build.bat
+++ Build/build.bat
@@ -9,18 +9,18 @@
    set version=-Version %PackageVersion%
 )

-REM Build
+echo Build
 %WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild Zirpl.FluentReflection.sln /p:Configuration="%config%" /m /v:M /fl /flp:LogFile=msbuild.log;Verbosity=Normal /nr:false
 if not "%errorlevel%"=="0" goto failure

-REM Unit tests
+echo Unit tests
 call %nuget% install NUnit.Runners -Version 2.6.4 -OutputDirectory packages
 packages\NUnit.Runners.2.6.4\tools\nunit-console.exe /config:%config% /framework:net-4.5 Zirpl.FluentReflection.Tests\bin\%config%\Zirpl.FluentReflection.Tests.dll
 if not "%errorlevel%"=="0" goto failure

-REM Package
-mkdir Build
-call %nuget% pack ".nuget\Zirpl.FluentReflection.nuspec" -symbols -o Build -p Configuration=%config% %version%
+echo Package
+mkdir Output
+call %nuget% pack ".nuget\Zirpl.FluentReflection.nuspec" -symbols -o Output -p Configuration=%config% %version%
 if not "%errorlevel%"=="0" goto failure

 :success


[linux] Popup para produtos complementar

--- autocommit.bat
+++ autocommit.bat
@@ -1,9 +1,10 @@
 @echo off
+
 For /f "tokens=1-4 delims=/ " %%a in ('date /t') do (set mydate=%%a%%b%%c)
 For /f "tokens=1-2 delims=/:" %%a in ('time /t') do (set mytime=%%a%%b)
 set _my_datetime=#%mydate%%mytime%
+
 git add --all
 git commit -m "%_my_datetime%"
 git push origin master
-
 PAUSE


Updated the build script.

Updated the build script.


Rem ADW leftovers + add uninstallview

Rem ADW leftovers + add uninstallview

--- autoclean-startclean.bat
+++ autoclean-startclean.bat
@@ -120,8 +120,8 @@
 	%chillout%
 	color E0

-	if EXIST autoclean-mbam goto :pcd
-	if EXIST autoclean-startclean goto :adw
+	if EXIST autoclean-mbam goto :uninstallview
+	if EXIST autoclean-startclean goto :mbam

 	:noflagfile
 	color 1f
@@ -130,14 +130,12 @@
 	echo,
 	copy /y NUL autoclean-startclean >NUL
 	%chillout%
-	goto adw
-
-	:adw
+	goto mbam
+
+	:mbam
 	color E0
-	echo At :adw
-	echo Launching ADWCLeaner... NOTE: Will request reboot after a clean.
-	echo Command: move %workingdir%\Tron\tron\resources\stage_9_manual_tools\adwcleaner*.exe %workingdir%\adwcleaner.exe
-	move %workingdir%\Tron\tron\resources\stage_9_manual_tools\adwcleaner*.exe %workingdir%\adwcleaner.exe
+	echo At :mbam
+	echo Launching MBAM...

 	copy /y NUL autoclean-mbam >NUL
 :: JOB: MBAM (Malwarebytes Anti-Malware)
@@ -167,7 +165,8 @@
 :skip_mbam
 pause

-	:pcd
+	:uninstallview
+	call %workingdir%/NirSoft/uninstallview.exe
 	echo Command running: del autoclean-mbam
 	del autoclean-mbam
 	echo,


Cygwin setup.exe -q 只會安裝 Base 的套件，因此要透過 -P 指定要額外安裝的套件

git-svn-id: 60919531258cec2acc45a87f88c9f6291c0cb8de@7 93027196-e06e-408b-8539-b5ef0f54f2f3

--- hadoop4win-setup/hadoop4win-setup.bat
+++ hadoop4win-setup/hadoop4win-setup.bat
@@ -78,9 +78,9 @@
 REM -- Note that last-* must *not* containing whitespace, e.g. " " etc.
 REM -- This is why there below is no space in front of ">".

-echo Install> "%CYGWIN_ROOT%\etc\setup\last-action"
-echo %LOCAL_REPOSITORY%> "%CYGWIN_ROOT%\etc\setup\last-cache"
-echo cygwin_mirror> "%CYGWIN_ROOT%\etc\setup\last-mirror"
+echo Install > "%CYGWIN_ROOT%\etc\setup\last-action"
+echo %LOCAL_REPOSITORY% > "%CYGWIN_ROOT%\etc\setup\last-cache"
+echo cygwin_mirror > "%CYGWIN_ROOT%\etc\setup\last-mirror"

 REM - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 REM Finally, run Cygwin setup quietly
@@ -90,7 +90,7 @@

 REM real do cygwin installation

-"%CYGWIN_SETUP%" -q -d -L -l "%LOCAL_REPOSITORY%\cygwin_mirror" -R "%CYGWIN_ROOT%"
+"%CYGWIN_SETUP%" -q -d -L -l "%LOCAL_REPOSITORY%\cygwin_mirror" -R "%CYGWIN_ROOT%" -P cygrunsrv,file,openssh,perl,procps,ncurses,rsync,sharutils,shutdown,subversion,tcp_wrappers,termcap,unzip,wget,zip,zlib

 REM - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 REM Installation of Hadoop and JDK


Windows: Don't link .osx config

Windows: Don't link .osx config

--- bootstrap/bootstrap.bat
+++ bootstrap/bootstrap.bat
@@ -12,7 +12,6 @@
 mklink C:\Users\Trent\.gitignore C:\Users\Trent\.dotfiles\.gitignore
 mklink C:\Users\Trent\.jscs.json C:\Users\Trent\.dotfiles\.jscs.json
 mklink C:\Users\Trent\.jshintrc C:\Users\Trent\.dotfiles\.jshintrc
-mklink C:\Users\Trent\.osx C:\Users\Trent\.dotfiles\.osx
 mklink C:\Users\Trent\.vimrc C:\Users\Trent\.dotfiles\.vimrc
 ::mklink C:\Windows\System32\WindowsPowerShell\v1.0\profile.ps1 C:\Users\Trent\.dotfiles\PowerShell\profile.ps1
 ::mklink C:\Users\Trent\Documents\WindowsPowerShell\PowerTabConfig.xml C:\Users\Trent\.dotfiles\PowerShell\PowerTabConfig.xml


Document JM_START

Document JM_START

git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1570183 13f79535-47bb-0310-9956-ffa450edef68

Former-commit-id: e6224d08c2c3c1c19483a614a0e7e6400a29be07

--- bin/jmeter.bat
+++ bin/jmeter.bat
@@ -21,6 +21,8 @@
 rem   JMETER_BIN - JMeter bin directory (must end in \)
 rem   JM_LAUNCH - java.exe (default) or javaw.exe
 rem   JVM_ARGS - additional java options, e.g. -Dprop=val
+rem   JM_START - set this to "start" to launch JMeter in a separate window
+rem              this is used by the jmeterw.cmd script.
 rem
 rem   =====================================================


initial version

initial version

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

--- bin/mallet.bat
+++ bin/mallet.bat
@@ -0,0 +1,64 @@
+@echo off
+
+rem This batch file serves as a wrapper for several
+rem  MALLET command line tools.
+
+if not "%MALLET_HOME%" == "" goto gotMalletHome
+
+echo MALLET requires an environment variable MALLET_HOME.
+goto :eof
+
+:gotMalletHome
+
+set MALLET_CLASSPATH=%MALLET_HOME%\class;%MALLET_HOME%\lib\mallet-deps.jar
+set MALLET_MEMORY=1G
+set MALLET_ENCODING=UTF-8
+
+set CMD=%1
+shift
+
+set CLASS=
+if "%CMD%"=="import-dir" set CLASS=cc.mallet.classify.tui.Text2Vectors
+if "%CMD%"=="import-file" set CLASS=cc.mallet.classify.tui.Csv2Vectors
+if "%CMD%"=="train-classifier" set CLASS=cc.mallet.classify.tui.Vectors2Classify
+if "%CMD%"=="train-topics" set CLASS=cc.mallet.topics.tui.Vectors2Topics
+if "%CMD%"=="infer-topics" set CLASS=cc.mallet.topics.tui.InferTopics
+if "%CMD%"=="hlda" set CLASS=cc.mallet.topics.tui.HierarchicalLDATUI
+if "%CMD%"=="prune" set CLASS=cc.mallet.classify.tui.Vectors2Vectors
+if "%CMD%"=="split" set CLASS=cc.mallet.classify.tui.Vectors2Vectors
+if "%CMD%"=="bulk-load" set CLASS=cc.mallet.util.BulkLoader
+if "%CMD%"=="run" set CLASS=%1 & shift
+
+if not "%CLASS%" == "" goto gotClass
+
+
+echo Mallet 2.0 commands:
+echo   import-dir        load the contents of a directory into mallet instances (one per file)
+echo   import-file       load a single file into mallet instances (one per line)
+echo   train-classifier  train a classifier from Mallet data files
+echo   train-topics      train a topic model from Mallet data files
+echo   infer-topics      use a trained topic model to infer topics for new documents
+echo   hlda              train a topic model using Hierarchical LDA
+echo   prune             remove features based on frequency or information gain
+echo   split             divide data into testing, training, and validation portions
+echo Include --help with any option for more information
+
+
+goto :eof
+
+:gotClass
+
+set MALLET_ARGS=
+
+:getArg
+
+if "%1"=="" goto run
+set MALLET_ARGS=%MALLET_ARGS% %1
+shift
+goto getArg
+
+:run
+
+java -Xmx%MALLET_MEMORY% -ea -Dfile.encoding=%MALLET_ENCODING% -classpath %MALLET_CLASSPATH% %CLASS% %MALLET_ARGS%
+
+:eof


Commenting

Commenting

--- src/nuget_push_template.bat
+++ src/nuget_push_template.bat
@@ -6,6 +6,8 @@
 dotnet build AppSoftware.LicenceEngine.KeyGenerator/AppSoftware.LicenceEngine.KeyGenerator.csproj --configuration Release
 dotnet build AppSoftware.LicenceEngine.KeyVerification/AppSoftware.LicenceEngine.KeyVerification.csproj --configuration Release

+REM TODO: Replace with equivalent dotnet nuget commands
+
 nuget pack AppSoftware.LicenceEngine.KeyGenerator/AppSoftware.LicenceEngine.KeyGenerator.csproj -OutputDirectory packages -Properties Configuration=Release
 nuget pack AppSoftware.LicenceEngine.KeyVerification/AppSoftware.LicenceEngine.KeyVerification.csproj -OutputDirectory packages -Properties Configuration=Release


Update cygwin version to 1.7.24

Update cygwin version to 1.7.24

BUG= 274655
TEST= bots

Review URL: https://codereview.chromium.org/22857007

git-svn-id: 721b910a23eff8a86f00c8fd261a7587cddf18f8@12031 fcba33aa-ac0c-11dd-b9e7-8d5594d729c2

--- buildbot/cygwin_env.bat
+++ buildbot/cygwin_env.bat
@@ -4,7 +4,7 @@

 @echo off
 setlocal
-set HERMETIC_CYGWIN=hermetic_cygwin_1_7_15-0_1-with-20120827-cygwin
+set HERMETIC_CYGWIN=hermetic_cygwin_1_7_24-1_0
 if exist "%~dp0..\cygwin\%HERMETIC_CYGWIN%.installed" goto :skip_cygwin_install
 if exist "%~dp0..\tools\BUILD\.gcc-extras-version" del "%~dp0..\tools\BUILD\.gcc-extras-version"
 if exist "%~dp0..\tools\BACKPORTS\binutils" rmdir /s /q "%~dp0..\tools\BACKPORTS\binutils"


don't include deprecated functions in test coverage

--- test/test_coverage_win.bat
+++ test/test_coverage_win.bat
@@ -1,7 +1,7 @@
 REM this is just to get libtorrent built
-bjam -j8 msvc-12.0 boost=source invariant-checks=off asserts=off link=shared boost-link=shared test_primitives linkflags=/profile
+bjam -j8 msvc-12.0 boost=source invariant-checks=off asserts=off link=shared boost-link=shared test_primitives linkflags=/profile deprecated-functions=off

-Vsinstr -coverage ..\bin\msvc-12.0\debug\asserts-off\boost-link-shared\boost-source\debug-iterators-on\export-extra-on\invariant-checks-off\threading-multi\torrent.dll @vsinstr_excludes.rsp
+Vsinstr -coverage ..\bin\msvc-12.0\debug\asserts-off\boost-link-shared\boost-source\debug-iterators-on\deprecated-functions-off\export-extra-on\invariant-checks-off\threading-multi\torrent.dll @vsinstr_excludes.rsp

 REM prepare for running all the tests again
 del /s /q bin
@@ -13,7 +13,7 @@
 Start vsperfmon -coverage -output:test.coverage

 REM Now we run all the unit tests to record test coverage
-bjam -j8 msvc-12.0 boost=source invariant-checks=off asserts=off link=shared boost-link=shared linkflags=/profile
+bjam -j8 msvc-12.0 boost=source invariant-checks=off asserts=off link=shared boost-link=shared linkflags=/profile deprecated-functions=off

 vsperfcmd -shutdown


Do not build qxmpp docs, tests and samples as part of the windows-build-deps.cmd call to reduce build times.

--- tools/windows-build-deps.cmd
+++ tools/windows-build-deps.cmd
@@ -812,10 +812,10 @@
   IF NOT %ERRORLEVEL%==0 GOTO :ERROR
    IF %USE_JOM%==TRUE (
       cecho {0D}- Building qxmpp with jom{# #}{\n}
-      "%DEPS%\qt\jom\jom.exe"
+      "%DEPS%\qt\jom\jom.exe" sub-src-all-ordered
    ) ELSE (
       cecho {0D}- Building qxmpp with nmake{# #}{\n}
-      nmake /nologo
+      nmake /nologo sub-src-all-ordered
    )
    IF NOT %ERRORLEVEL%==0 GOTO :ERROR
    IF NOT EXIST "%DEPS%\qxmpp\include\qxmpp". mkdir %DEPS%\qxmpp\include\qxmpp


Degski: Found a bug in the config.cmd: on VS08, the 64 environment set command is in a different directory. Updated the year in the welcome message to 2010.

--- src/config.cmd
+++ src/config.cmd
@@ -47,7 +47,7 @@

 :start_create_welcome
 echo Welcome to SWI-Prolog Windows Build Environment Configuration Utility > welcome.txt
-echo Copyright (c) 1990-2009 University of Amsterdam. >> welcome.txt
+echo Copyright (c) 1990-2010 University of Amsterdam. >> welcome.txt
 echo SWI-Prolog comes with ABSOLUTELY NO WARRANTY. This is free software, >> welcome.txt
 echo and you are welcome to redistribute it under certain conditions. >> welcome.txt
 echo Please visit http://www.swi-prolog.org for details. >> welcome.txt
@@ -97,12 +97,12 @@
 if "%VCXX%_%TYPE%_%BITS%"=="VC08_STU_64" (@echo call "%EP!PROGRAM_FILES_32%\Microsoft Visual Studio 8\VC\vcvarsall.bat" x86_amd64 ^> nul > call_vcvars.cmd)
 if "%VCXX%_%TYPE%_%BITS%"=="VC08_STU_32" (@echo call "%EP!PROGRAM_FILES_32%\Microsoft Visual Studio 8\VC\vcvarsall.bat" x86 ^> nul > call_vcvars.cmd)
 ::set_vc9_or_sdk2008_sdkwin7_environment_file
-if exist "%EP!PROGRAM_FILES_32%\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" (set "TYPE=STU")
-if "%VCXX%_%TYPE%_%BITS%"=="VC09_STU_64" (@echo call "%EP!PROGRAM_FILES_32%\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" x86_amd64 ^> nul > call_vcvars.cmd)
-if "%VCXX%_%TYPE%_%BITS%"=="VC09_STU_32" (@echo call "%EP!PROGRAM_FILES_32%\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" x86 ^> nul > call_vcvars.cmd)
-if "%VCXX%_%BITS%"=="VC09_64" (@echo call "%EP!PROGRAM_FILES_32%\Microsoft Visual Studio 9.0\VC\bin\vcvarsx86_amd64.bat" ^> nul > call_vcvars.cmd)
+if exist "%EP!PROGRAM_FILES_32%\Microsoft Visual Studio 9.0\VC\vcvarsx86_amd64.bat" (set "TYPE=SDK") else (set "TYPE=STU")
+if "%VCXX%_%TYPE%_%BITS%"=="VC09_STU_64" (@echo call "%EP!PROGRAM_FILES_32%\Microsoft Visual Studio 9.0\VC\bin\x86_amd64\vcvarsx86_amd64.bat" ^> nul > call_vcvars.cmd)
+if "%VCXX%_%TYPE%_%BITS%"=="VC09_SDK_64" (@echo call "%EP!PROGRAM_FILES_32%\Microsoft Visual Studio 9.0\VC\bin\vcvarsx86_amd64.bat" ^> nul > call_vcvars.cmd)
 if "%VCXX%_%BITS%"=="VC09_32" (@echo call "%EP!PROGRAM_FILES_32%\Microsoft Visual Studio 9.0\VC\bin\vcvars32.bat" ^> nul > call_vcvars.cmd)
 ::set_vc10_or_sdkwin7_environment_file
+if exist "%EP!PROGRAM_FILES_32%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" (set "TYPE=STU")
 if "%VCXX%_%BITS%"=="VC10_64" (@echo call "%EP!PROGRAM_FILES_32%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" x86_amd64 ^> nul > call_vcvars.cmd)
 if "%VCXX%_%BITS%"=="VC10_32" (@echo call "%EP!PROGRAM_FILES_32%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" x86 ^> nul > call_vcvars.cmd)
 :is_vc_version_determined


route error messages to NUL on two wmic commands

--- resources/stage_2_de-bloat/programs_to_target_by_GUID.bat
+++ resources/stage_2_de-bloat/programs_to_target_by_GUID.bat
@@ -1239,7 +1239,7 @@
 start /wait msiexec /qn /norestart /x {7EC66A95-AC2D-4127-940B-0445A526AB2F}

 :: Dell Digital Delivery
-WMIC product where name="Dell Digital Delivery" call uninstall /nointeractive
+WMIC product where name="Dell Digital Delivery" call uninstall /nointeractive 2>nul

 :: Dell Dock
 start /wait msiexec /qn /norestart /x {E60B7350-EA5F-41E0-9D6F-E508781E36D2}
@@ -1267,7 +1267,7 @@
 start /wait msiexec /qn /norestart /x {CAC1E444-ECC4-4FF8-B328-5E547FD608F8}

 :: Dell Protected Workspace
-wmic product where name="Dell Protected Workspace" call uninstall /nointeractive
+wmic product where name="Dell Protected Workspace" call uninstall /nointeractive 2>nul

 :: Dell QuickSet32 and QuickSet64
 start /wait msiexec /qn /norestart /x {ED2A3C11-3EA8-4380-B59C-F2C1832731B0}


Fix for rebasing OpenCover original return codes was added

--- build/CalculateCoverage.bat
+++ build/CalculateCoverage.bat
@@ -1,10 +1,10 @@
 powershell.exe -file build\SetFullDebugType.ps1

 nuget install OpenCover -ExcludeVersion -OutputDirectory tools
-tools\OpenCover\tools\OpenCover.Console.exe -target:"C:\Program Files\dotnet\dotnet.exe" -targetargs:" test ""test\GfPolynoms.Tests\project.json"" -c Debug" -register:user -filter:"+[*]* -[xunit*]*" -threshold:100 -oldstyle -returntargetcode -output:coverage.xml
-tools\OpenCover\tools\OpenCover.Console.exe -target:"C:\Program Files\dotnet\dotnet.exe" -targetargs:" test ""test\GfAlgorithms.Tests\project.json"" -c Debug" -register:user -filter:"+[*]* -[xunit*]*" -threshold:100 -oldstyle -returntargetcode -mergeoutput -output:coverage.xml
-tools\OpenCover\tools\OpenCover.Console.exe -target:"C:\Program Files\dotnet\dotnet.exe" -targetargs:" test ""test\RsCodesTools.Tests\project.json"" -c Debug" -register:user -filter:"+[*]* -[xunit*]*" -threshold:100 -oldstyle -returntargetcode -mergeoutput -output:coverage.xml
-tools\OpenCover\tools\OpenCover.Console.exe -target:"C:\Program Files\dotnet\dotnet.exe" -targetargs:" test ""test\WaveletCodesTools.Tests\project.json"" -c Debug" -register:user -filter:"+[*]* -[xunit*]*" -threshold:100 -oldstyle -returntargetcode -mergeoutput -output:coverage.xml
+tools\OpenCover\tools\OpenCover.Console.exe -target:"C:\Program Files\dotnet\dotnet.exe" -targetargs:" test ""test\GfPolynoms.Tests\project.json"" -c Debug" -register:user -filter:"+[*]* -[xunit*]*" -threshold:100 -oldstyle -returntargetcode:1000 -output:coverage.xml
+tools\OpenCover\tools\OpenCover.Console.exe -target:"C:\Program Files\dotnet\dotnet.exe" -targetargs:" test ""test\GfAlgorithms.Tests\project.json"" -c Debug" -register:user -filter:"+[*]* -[xunit*]*" -threshold:100 -oldstyle -returntargetcode:1000 -mergeoutput -output:coverage.xml
+tools\OpenCover\tools\OpenCover.Console.exe -target:"C:\Program Files\dotnet\dotnet.exe" -targetargs:" test ""test\RsCodesTools.Tests\project.json"" -c Debug" -register:user -filter:"+[*]* -[xunit*]*" -threshold:100 -oldstyle -returntargetcode:1000 -mergeoutput -output:coverage.xml
+tools\OpenCover\tools\OpenCover.Console.exe -target:"C:\Program Files\dotnet\dotnet.exe" -targetargs:" test ""test\WaveletCodesTools.Tests\project.json"" -c Debug" -register:user -filter:"+[*]* -[xunit*]*" -threshold:100 -oldstyle -returntargetcode:1000 -mergeoutput -output:coverage.xml

 SET PATH=C:\\Python34;C:\\Python34\\Scripts;%PATH%
 pip install codecov


Fixing the non release build

Fixing the non release build

--- VersionNumber.bat
+++ VersionNumber.bat
@@ -1,5 +1,5 @@
 IF "%APPVEYOR_REPO_TAG_NAME%"=="" (
-ECHO ^<Project^>^<Import Project=^"./releasenotes/%APPVEYOR_REPO_TAG_NAME%.props^" /^>^<PropertyGroup^>^<VersionPrefix^>%APPVEYOR_REPO_TAG_NAME%^</VersionPrefix^>^<VersionSuffix^>%APPVEYOR_BUILD_NUMBER%^</VersionSuffix^>^</PropertyGroup^>^</Project^> > version.props
+ECHO ^<Project^>^<PropertyGroup^>^<VersionSuffix^>%APPVEYOR_BUILD_NUMBER%^</VersionSuffix^>^</PropertyGroup^>^</Project^> > version.props
 ) ELSE (
 ECHO ^<Project^>^<Import Project=^"./releasenotes/%APPVEYOR_REPO_TAG_NAME%.props^" /^>^<PropertyGroup^>^<VersionPrefix^>%APPVEYOR_REPO_TAG_NAME%^</VersionPrefix^>^</PropertyGroup^>^</Project^> > version.props
 )


Update msvc_mysqlpp_install.bat

Update msvc_mysqlpp_install.bat

--- ci/msvc_mysqlpp_install.bat
+++ ci/msvc_mysqlpp_install.bat
@@ -1,4 +1,4 @@
-msiexec /i c:\projects\mysql-connector-c-6.1.6-winx64.msi /quiet /qn /norestart /log c:\projects\mysql-connector-c-6.1.6.log
+msiexec /i mysql-connector-c-6.1.6-winx64.msi /quiet /qn /norestart /log mysql-connector-c-6.1.6.log

 REM 7z e mysqlpp.tar.gz && 7z x mysqlpp.tar -pC:\projects\mysqlpp -y > C:\projects\mysqlpp_install.txt
 REM mkdir C:/projects/osIROSE/mysqlpp


run.bat: use double-colon to comment text

LGTM=rsc
R=golang-codereviews, rsc
CC=golang-codereviews
https://golang.org/cl/64980043

--- src/run.bat
+++ src/run.bat
@@ -52,10 +52,10 @@
 if errorlevel 1 goto fail
 echo.

-# Race detector only supported on Linux and OS X,
-# and only on amd64, and only when cgo is enabled.
-# Disabled due to golang.org/issue/7334; remove XXX below
-# and in run.bash to reenable.
+:: Race detector only supported on Linux and OS X,
+:: and only on amd64, and only when cgo is enabled.
+:: Disabled due to golang.org/issue/7334; remove XXX below
+:: and in run.bash to reenable.
 if not "%GOHOSTOS%-%GOOS%-%GOARCH%-%CGO_ENABLED%" == "XXXwindows-windows-amd64-1" goto norace
 echo # Testing race detector.
 go test -race -i runtime/race flag


build: give windows builders extra time for tests

In the tests, the runtime test fails after 2 minutes.
On an unloaded VM it only takes 45 seconds.
I think the difference is all the other build work going on
simultaneously with the running of the runtime test.

Change-Id: I41e95d2e4daea44ceaa8505f81aa7b5bcfa9ec77
Reviewed-on: https://go-review.googlesource.com/6364
Reviewed-by: David Crawshaw <a2f0bf29257797dd66800b4fbb9945c3e216c004@golang.org>
Reviewed-by: Minux Ma <72d850dbd8858b791995463d8539b5a379577f28@golang.org>
Reviewed-by: Alex Brainman <54ba58c8441b5eff861de6b4e5ee46baf086b142@gmail.com>

--- src/run.bat
+++ src/run.bat
@@ -38,7 +38,7 @@
 echo.

 echo ##### Testing packages.
-go test std cmd -short -timeout=120s
+go test std cmd -short -timeout=240s
 if errorlevel 1 goto fail
 echo.

@@ -48,7 +48,7 @@
 :: creation of first goroutines and first garbage collections in the parallel setting.
 echo ##### GOMAXPROCS=2 runtime -cpu=1,2,4
 set GOMAXPROCS=2
-go test runtime -short -timeout=300s -cpu=1,2,4
+go test runtime -short -timeout=600s -cpu=1,2,4
 if errorlevel 1 goto fail
 echo.

@@ -56,7 +56,7 @@
 set OLDGOMAXPROCS=

 echo ##### sync -cpu=10
-go test sync -short -timeout=120s -cpu=10
+go test sync -short -timeout=240s -cpu=10
 if errorlevel 1 goto fail
 echo.