[NetKVM] Fixing packaging issues introduced by lates script cleanup

--- NetKVM/buildAll.bat
+++ NetKVM/buildAll.bat
@@ -89,9 +89,9 @@
 popd
 call :preparebuild Common wlh VirtIO CoInstaller
 build -cZg
-endlocal

 if exist wlh\objfre_win7_x86\i386\netkvm.sys call tools\makeinstall x86 wlh\objfre_win7_x86\i386\netkvm.sys wlh\netkvm.inf %_VERSION_% Win7 CoInstaller\objfre_win7_x86\i386\netkvmco.dll CoInstaller\readme.doc
+endlocal
 if not exist wlh\objfre_win7_x86\i386\netkvm.sys goto :eof
 if not exist CoInstaller\objfre_win7_x86\i386\netkvmco.dll goto :eof
 goto continue
@@ -104,9 +104,9 @@
 popd
 call :preparebuild Common wlh VirtIO CoInstaller
 build -cZg
-endlocal

 if exist wlh\objfre_win7_amd64\amd64\netkvm.sys call tools\makeinstall amd64 wlh\objfre_win7_amd64\amd64\netkvm.sys wlh\netkvm.inf %_VERSION_% Win7 CoInstaller\objfre_win7_amd64\amd64\netkvmco.dll CoInstaller\readme.doc
+endlocal
 if not exist wlh\objfre_win7_amd64\amd64\netkvm.sys goto :eof
 if not exist CoInstaller\objfre_win7_amd64\amd64\netkvmco.dll goto :eof
 goto continue
@@ -119,9 +119,9 @@
 popd
 call :preparebuild Common wlh VirtIO CoInstaller
 build -cZg
-endlocal

 if exist wlh\objfre_wlh_x86\i386\netkvm.sys call tools\makeinstall x86 wlh\objfre_wlh_x86\i386\netkvm.sys wlh\netkvm.inf %_VERSION_% Vista CoInstaller\objfre_wlh_x86\i386\netkvmco.dll CoInstaller\readme.doc
+endlocal
 if not exist wlh\objfre_wlh_x86\i386\netkvm.sys goto :eof
 if not exist CoInstaller\objfre_wlh_x86\i386\netkvmco.dll goto :eof
 goto continue
@@ -137,9 +137,9 @@
 popd
 call :preparebuild Common wlh VirtIO CoInstaller
 build -cZg
-endlocal

 if exist wlh\objfre_wlh_amd64\amd64\netkvm.sys call tools\makeinstall amd64 wlh\objfre_wlh_amd64\amd64\netkvm.sys wlh\netkvm.inf %_VERSION_% Vista CoInstaller\objfre_wlh_amd64\amd64\netkvmco.dll CoInstaller\readme.doc
+endlocal
 if not exist wlh\objfre_wlh_amd64\amd64\netkvm.sys goto :eof
 if not exist CoInstaller\objfre_wlh_amd64\amd64\netkvmco.dll goto :eof
 goto continue
@@ -152,9 +152,9 @@
 popd
 call :preparebuild Common wxp VirtIO
 build -cZg
-endlocal

 if exist wxp\objfre_wxp_x86\i386\netkvm.sys call tools\makeinstall x86 wxp\objfre_wxp_x86\i386\netkvm.sys wxp\netkvm.inf %_VERSION_% XP
+endlocal
 if not exist wxp\objfre_wxp_x86\i386\netkvm.sys goto :eof
 goto continue

@@ -166,15 +166,16 @@
 popd
 call :preparebuild Common wxp VirtIO
 build -cZg
-endlocal

 if exist wxp\objfre_wnet_amd64\amd64\netkvm.sys call tools\makeinstall amd64 wxp\objfre_wnet_amd64\amd64\netkvm.sys wxp\netkvm.inf %_VERSION_% XP
+endlocal
 if not exist wxp\objfre_wnet_amd64\amd64\netkvm.sys goto :eof
 goto continue

 :Win2K compilation is no longer supported by Windows 7 DDK
 :Win2K
+:setlocal
 :set DDKBUILDENV=
 :pushd %BUILDROOT%
 :call %BUILDROOT%\bin\setenv.bat %BUILDROOT% fre W2K
@@ -183,6 +184,7 @@
 :build -cZg

 :if exist wxp\objfre_w2k_x86\i386\netkvm.sys call tools\makeinstall x86 wxp\objfre_w2k_x86\i386\netkvm.sys wxp\netkvm2k.inf %_VERSION_% 2K
+:endlocal
 :if not exist wxp\objfre_w2k_x86\i386\netkvm.sys goto :eof
 :goto continue


add JPDA debug port at 9999

add JPDA debug port at 9999

--- framework/build.bat
+++ framework/build.bat
@@ -3,4 +3,4 @@
 set p=%~dp0
 set p=%p:\=/%

-java -Xms512M -Xmx1024M -Xss1M -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=256M -Dfile.encoding=UTF8 -Dsbt.ivy.home="%~dp0..\repository" -Dplay.home="%~dp0." -Dsbt.boot.properties="file:///%p%sbt/sbt.boot.properties" -jar "%~dp0sbt\sbt-launch.jar" %*
+java -Xms512M -Xmx1024M -Xss1M -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=256M -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=9999 -Dfile.encoding=UTF8 -Dsbt.ivy.home="%~dp0..\repository" -Dplay.home="%~dp0." -Dsbt.boot.properties="file:///%p%sbt/sbt.boot.properties" -jar "%~dp0sbt\sbt-launch.jar" %*


stub: check for Dot Net testing

stub: check for Dot Net testing

--- SysAdmin/deployment/install-Pro.bat
+++ SysAdmin/deployment/install-Pro.bat
@@ -3,6 +3,7 @@
 echo.
 echo.   Installing ArcGIS Pro without prompts, according to ENV Yukon standards
 echo.
+setlocal
 set root=%~dp0
 pushd %~dp0

@@ -17,6 +18,7 @@
   )
   @echo Success: this script is running elevated.

+call :checkDotNet
 call :install_pro

 timeout /t 15
@@ -44,4 +46,20 @@
       /qb
   popd
   echo. Logfile: "%TEMP%\%~nx0.log"
+  goto :eof
+
+:checkDotNet
+:: Check for .NET
+  set x64key=HKLM\SOFTWARE\Microsoft\.NETFramework
+  :: 4.6.1 x64
+  %WINDIR%\system32\reg.exe query %x64key%  /f ".NETFramework,Version=v4.6.1" /k /s >NUL ^
+    || ( echo. & echo ** Microsoft .NET Framework 4.6.1 ^(x64^) not installed! ** & goto dotnet_fail)
+  echo Microsoft .NET Framework 4.6.1 ^(x64^) verified
+  goto dotnet_ok
+
+:dotnet_fail
+  echo ** .NET Check Failed -- Cannot Install ArcGIS Pro **
+  goto :eof
+:dotnet_ok
+  echo ** .NET Check Passed **
   goto :eof


Update elWorld region flags script (lost them again...)

--- src/main/resources/examples/elworld/regions.cmd
+++ src/main/resources/examples/elworld/regions.cmd
@@ -1,4 +1,5 @@
 region flag welcome_mobs -w world server-enter-command /castp @p recall unlock town
+region flag capital -w world server-enter-command /castp @p recall unlock town
 region flag lodge -w world server-enter-command /castp @p recall unlock lodge
 region flag battle -w world server-enter-command /castp @p recall unlock battle
 region flag engineering -w world server-enter-command /castp @p recall unlock engineering
@@ -18,4 +19,13 @@
 region flag wolfcastle -w world server-enter-command /castp @p recall unlock wolfcastle
 region flag spleef -w world server-enter-command /castp @p recall unlock spleef
 region flag dueling -w world server-enter-command /castp @p recall unlock dueling
-region flag endtemple -w world server-enter-command /castp @p recall unlock endtemple+region flag end_temple -w world server-enter-command /castp @p recall unlock endtemple
+region flag welcome -w world allowed-spells missile,recall,blast
+region flag arena -w world blocked-spell-categories master,engineering
+region flag arena -w world allowed-spells * blocked-spell-categories master,engineering
+region flag dueling -w world allowed-spells *
+region flag dueling -w world blocked-spell-categories master,engineering
+region flag spleef -w world allowed-spells recall,day
+region flag spleef -w world blocked-spells *
+region flag spleef_arena -w world allowed-spells recall,blast,collapse,harden,laser,earthquake
+region flag refugees -w world allowed-spells *


* batch file to build both win32 and win64 versions


Echo the package being pushed for more feedback.

--- common/platform-dotnet/push-packages.cmd
+++ common/platform-dotnet/push-packages.cmd
@@ -3,7 +3,10 @@
 if "%NUGET_API_KEY%" == "" goto NO_KEY
 if "%1" == "" goto MISSING_INPUT_FOLDER

-for %%f in (%1\*.nupkg %1\*.snupkg) do dotnet nuget push %%f --api-key %NUGET_API_KEY% --source https://nuget.org/
+for %%f in (%1\*.nupkg %1\*.snupkg) do (
+    ECHO Pushing %%f
+    dotnet nuget push %%f --api-key %NUGET_API_KEY% --source https://nuget.org/
+)

 GOTO END


gb.bat: call go (in canse go is a go.bat), echo doskey

--- gb.bat
+++ gb.bat
@@ -15,6 +15,6 @@
 set GOPATH=%~dp0/deps
 set GOBIN=%~dp0/bin
 cd "%~dp0"
-go install
+call go install
 endlocal
-doskey seec=%~dp0\bin\seec.exe $*
+echo doskey seec=%~dp0bin\seec.exe $*


[Build] Reverted local rebuild to use VS2012 environment instead of VS2013 as this breaks WP8 platform build.

--- MakeSharpDX_localbuild.cmd
+++ MakeSharpDX_localbuild.cmd
@@ -1,7 +1,7 @@
 @echo off
 setlocal
 set PATH=C:\Program Files (x86)\Git\bin\;%PATH%
-call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\vc\vcvarsall.bat" x86
+call "C:\Program Files (x86)\Microsoft Visual Studio 11.0\vc\vcvarsall.bat" x86
 msbuild /tv:4.0 /p:BuildSignedSharpDX=false /t:Build;BuildSamples /verbosity:quiet /clp:ErrorsOnly /fl /flp:logfile=BuildErrors.log;ErrorsOnly %* SharpDX.build
 if NOT ERRORLEVEL 0 {
 	pause


disable entry for Acer Launch Manager

disable entry for Acer Launch Manager

--- resources/stage_2_de-bloat/oem/programs_to_target_by_GUID.bat
+++ resources/stage_2_de-bloat/oem/programs_to_target_by_GUID.bat
@@ -49,8 +49,8 @@
 :: Acer Instant Update Service
 start /wait msiexec /qn /norestart /x {D32367AC-8FCA-4DE8-A2C6-037AE14B4001}

-:: Acer Launch Manager
-start /wait msiexec /qn /norestart /x {C18D55BD-1EC6-466D-B763-8EEDDDA9100E}
+:: Acer Launch Manager // disabled by /u/vocatus for Tron, after user reports that it broke wireless button functionality
+::start /wait msiexec /qn /norestart /x {C18D55BD-1EC6-466D-B763-8EEDDDA9100E}

 :: Acer Portal
 start /wait msiexec /qn /norestart /x {A5AD0B17-F34D-49BE-A157-C8B3D52ACD13}


Create make.bat

Create make.bat

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

--- doc/make.bat
+++ doc/make.bat
@@ -0,0 +1,35 @@
+@ECHO OFF
+
+pushd %~dp0
+
+REM Command file for Sphinx documentation
+
+if "%SPHINXBUILD%" == "" (
+	set SPHINXBUILD=sphinx-build
+)
+set SOURCEDIR=.
+set BUILDDIR=_build
+
+if "%1" == "" goto help
+
+%SPHINXBUILD% >NUL 2>NUL
+if errorlevel 9009 (
+	echo.
+	echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
+	echo.installed, then set the SPHINXBUILD environment variable to point
+	echo.to the full path of the 'sphinx-build' executable. Alternatively you
+	echo.may add the Sphinx directory to PATH.
+	echo.
+	echo.If you don't have Sphinx installed, grab it from
+	echo.http://sphinx-doc.org/
+	exit /b 1
+)
+
+%SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%
+goto end
+
+:help
+%SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%
+
+:end
+popd


reflect renaming of file LICENSE to LICENSE.txt in batch file

--- CMSIS/Utilities/gen_pack.bat
+++ CMSIS/Utilities/gen_pack.bat
@@ -40,7 +40,7 @@
 COPY ..\..\ARM.CMSIS.pdsc %RELEASE_PATH%\ARM.CMSIS.pdsc

 :: Copy LICENSE file
-COPY ..\..\LICENSE %RELEASE_PATH%\LICENSE
+COPY ..\..\LICENSE.txt %RELEASE_PATH%\LICENSE.txt

 :: Copy Device folder
 XCOPY /Q /S /Y ..\..\Device\*.* %RELEASE_PATH%\Device\*.*


Use release configuration file.

Use release configuration file.

--- src/Build-Release.bat
+++ src/Build-Release.bat
@@ -2,16 +2,6 @@
 rem > Build-Release [cfg file]

 rem  Note: compiling twice the same sources gives different binaries.
-
-rem Utiliser DragoDelphi7se.cfg
-
-rem Rajouter à la main SpTBXGlyphs.res et VirtualTrees.res dans src sinon marche pas
-
-rem Il faut faire un build sous l'IDE pour avoir les dcu des 3rd (TNT, etc)
-rem en l'état le build par batch avec DragoD7Lite.cfg ne recompile pas les dc 3rd
-rem et le build échoue.
-rem DONC: ne pas effacer les dcu tant que le build batch ne sait pas recompiler
-rem les 3rd.

 rem clean output directory
 del ..\dcu\*.dcu
@@ -19,11 +9,14 @@
 if '%1' NEQ '' goto use_cfg_argument

 :use_default_cfg
-dcc32 Drago
-goto return
-
+set cfg=DragoRelease.cfg
+goto compile
 :use_cfg_argument
 set cfg=%1
+
+rem drago.cfg is saved and restored. Note however, it will be overiden each time new options are saved in the IDE.
+
+:compile
 copy Drago.cfg Drago.cfg.bak > nul
 copy %cfg% Drago.cfg > nul
 dcc32 Drago


fix path when current dir is not in devtools dir

--- phalcon.bat
+++ phalcon.bat
@@ -1,4 +1,4 @@
 @echo off

-set PTOOLSPATH=%CD%
+set PTOOLSPATH=%~dp0\
 php %PTOOLSPATH%\phalcon.php %*


This fix makes sure Gatling exits with the error code of the Java process if it fails. Prior to this the process would always signal that it succeeded, making it hard to detect failed tests on Jenkins on top Windows.

--- gatling-bundle/src/universal/bin/gatling.bat
+++ gatling-bundle/src/universal/bin/gatling.bat
@@ -64,6 +64,8 @@
 %JAVA% %COMPILER_OPTS% -cp %COMPILER_CLASSPATH% io.gatling.compiler.ZincCompiler -ccp %COMPILATION_CLASSPATH% %USER_ARGS%  2>NUL
 rem Run Gatling
 %JAVA% %JAVA_OPTS% -cp %GATLING_CLASSPATH% io.gatling.app.Gatling %USER_ARGS%
+if %errorlevel% neq 0 exit /b %errorlevel%
+rem The above line will forward any potential exit codes from Java if Gatling failed

 goto exit


add comment

add comment

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

-
+REM We probably should clean up these huge files or we will run out of quota

 :end
 popd


Bundles do not need to be signed.

Bundles do not need to be signed.

--- archive/org.osgi.test.cases.deploymentadmin.res/gendp.bat
+++ archive/org.osgi.test.cases.deploymentadmin.res/gendp.bat
@@ -1,34 +1,14 @@
 @ECHO OFF

 ECHO cleaning up before begin
+del /q ..\org.osgi.test.cases.deploymentadmin.tc1\res\*.dp
+del /q ..\org.osgi.test.cases.deploymentadmin.tc2\res\*.dp
 del /q bundles\*.jar
 del /q bundles_update\*.jar

 ECHO Building
 call ..\cnf\ant\bin\ant
 cd bundles
-
-ECHO Signing bundles
-jarsigner -keystore ..\megtck_keystore -storepass megtck -keypass megtck bundle001.jar megtck
-jarsigner -keystore ..\megtck_keystore -storepass megtck -keypass megtck bundle002.jar megtck
-jarsigner -keystore ..\megtck_keystore -storepass megtck -keypass megtck bundle003.jar megtck
-jarsigner -keystore ..\megtck_keystore -storepass megtck -keypass megtck bundle004.jar megtck
-jarsigner -keystore ..\megtck_keystore -storepass megtck -keypass megtck bundle005.jar megtck
-jarsigner -keystore ..\megtck_keystore -storepass megtck -keypass megtck bundle006.jar megtck
-jarsigner -keystore ..\megtck_keystore -storepass megtck -keypass megtck ..\bundles_update\bundle001.jar megtck
-jarsigner -keystore ..\megtck_keystore -storepass megtck -keypass megtck ..\bundles_update\bundle002.jar megtck
-jarsigner -keystore ..\megtck_keystore -storepass megtck -keypass megtck ..\bundles_update\bundle005.jar megtck
-jarsigner -keystore ..\megtck_keystore -storepass megtck -keypass megtck rp_bundle_tc1_rp1.jar megtck
-jarsigner -keystore ..\megtck_keystore -storepass megtck -keypass megtck rp_bundle_tc1_rp2.jar megtck
-jarsigner -keystore ..\megtck_keystore -storepass megtck -keypass megtck rp_bundle_tc2_rp1.jar megtck
-jarsigner -keystore ..\megtck_keystore -storepass megtck -keypass megtck rp_bundle_tc2_rp2.jar megtck
-jarsigner -keystore ..\megtck_keystore -storepass megtck -keypass megtck rp_bundle_tc2_rp3.jar megtck
-
-ECHO Signing resources
-jarsigner -keystore ..\megtck_keystore -storepass megtck -keypass megtck conf.txt megtck
-jarsigner -keystore ..\megtck_keystore -storepass megtck -keypass megtck simple_resource.xml megtck
-jarsigner -keystore ..\megtck_keystore -storepass megtck -keypass megtck resource_processor_file.txt megtck
-jarsigner -keystore ..\megtck_keystore -storepass megtck -keypass megtck OSGI-INF\AUTOCONF.xml megtck

 copy bundle001.jar wrong(path)\


Updates run.bat for moonshot.exe if available.

--- run.bat
+++ run.bat
@@ -1 +1,7 @@
-nw .\source+@echo off
+
+if exist{moonshot.exe} (
+  moonshot
+) else (
+  nw .\source
+)


cleanup

cleanup

--- import.bat
+++ import.bat
@@ -1,4 +0,0 @@
-copy ..\..\github\corex-js\corex-jquery\corex-jquery.* desktopbrowser-client\lib\corex-jquery\ /Y
-copy ..\..\github\corex-js\corex-js\corex.* desktopbrowser-client\lib\corex-js\ /Y
-copy ..\..\github\corex-js\grid\grid.* desktopbrowser-client\lib\grid\ /Y
-copy ..\..\github\corex-js\corex-js\sk.* desktopbrowser-client\lib\corex-js\ /Y


Fix windows installer

Fix windows installer

--- install_windows.bat
+++ install_windows.bat
@@ -1,6 +1,6 @@
 @echo off
+pip install -r requirements.txt
 cd src
-pip install -r requirements.txt
 copy src\settings\local.py.example src\settings\local.py
 pause


Added 0 to codes.

Added 0 to codes.

--- installer/build.cmd
+++ installer/build.cmd
@@ -45,7 +45,7 @@
 cscript "%ProgramFiles(x86)%\Windows Kits\10\bin\%SDK_VERSION%\x86\wisubstg.vbs" "%1\aspia-console-en-us.msi" "%1\console-zh-cn.mst" 2052
 cscript "%ProgramFiles(x86)%\Windows Kits\10\bin\%SDK_VERSION%\x86\wisubstg.vbs" "%1\aspia-console-en-us.msi" "%1\console-zh-tw.mst" 1028

-cscript "%ProgramFiles(x86)%\Windows Kits\10\bin\%SDK_VERSION%\x86\wilangid.vbs" "%1\aspia-console-en-us.msi" Package 1033,1031,1043,1046,1049,1058,2052,1028
+cscript "%ProgramFiles(x86)%\Windows Kits\10\bin\%SDK_VERSION%\x86\wilangid.vbs" "%1\aspia-console-en-us.msi" Package 1033,1031,1043,1046,1049,1058,2052,1028,0

 echo "Creating MSI packages for Aspia Client"
 "%WIX%\bin\candle" -out "%1\\" -ext WixUtilExtension -ext WixUIExtension client.wxs
@@ -76,7 +76,7 @@
 cscript "%ProgramFiles(x86)%\Windows Kits\10\bin\%SDK_VERSION%\x86\wisubstg.vbs" "%1\aspia-client-en-us.msi" "%1\client-zh-cn.mst" 2052
 cscript "%ProgramFiles(x86)%\Windows Kits\10\bin\%SDK_VERSION%\x86\wisubstg.vbs" "%1\aspia-client-en-us.msi" "%1\client-zh-tw.mst" 1028

-cscript "%ProgramFiles(x86)%\Windows Kits\10\bin\%SDK_VERSION%\x86\wilangid.vbs" "%1\aspia-client-en-us.msi" Package 1033,1031,1043,1046,1049,1058,2052,1028
+cscript "%ProgramFiles(x86)%\Windows Kits\10\bin\%SDK_VERSION%\x86\wilangid.vbs" "%1\aspia-client-en-us.msi" Package 1033,1031,1043,1046,1049,1058,2052,1028,0

 echo "Creating MSI packages for Aspia Host"
 "%WIX%\bin\candle" -out "%1\\" -ext WixUtilExtension -ext WixUIExtension host.wxs
@@ -107,7 +107,7 @@
 cscript "%ProgramFiles(x86)%\Windows Kits\10\bin\%SDK_VERSION%\x86\wisubstg.vbs" "%1\aspia-host-en-us.msi" "%1\host-zh-cn.mst" 2052
 cscript "%ProgramFiles(x86)%\Windows Kits\10\bin\%SDK_VERSION%\x86\wisubstg.vbs" "%1\aspia-host-en-us.msi" "%1\host-zh-tw.mst" 1028

-cscript "%ProgramFiles(x86)%\Windows Kits\10\bin\%SDK_VERSION%\x86\wilangid.vbs" "%1\aspia-host-en-us.msi" Package 1033,1031,1043,1046,1049,1058,2052,1028
+cscript "%ProgramFiles(x86)%\Windows Kits\10\bin\%SDK_VERSION%\x86\wilangid.vbs" "%1\aspia-host-en-us.msi" Package 1033,1031,1043,1046,1049,1058,2052,1028,0

 echo "Creating MSI packages for Aspia Router"
 "%WIX%\bin\candle" -out "%1\\" -ext WixUtilExtension -ext WixUIExtension router.wxs


add entries based on user feedback

add entries based on user feedback

--- resources/stage_2_de-bloat/programs_to_target_by_GUID.bat
+++ resources/stage_2_de-bloat/programs_to_target_by_GUID.bat
@@ -9,6 +9,24 @@
 :: GUID LIST ::
 :::::::::::::::

+:: Adobe Bridge 1.0
+start /wait msiexec /x {B74D4E10-1033-0000-0000-000000000001} /qn /norestart
+
+:: Adobe Content Viewer
+start /wait msiexec /x {483A865C-A74A-12BF-1276-D0111A488F50} /qn /norestart
+
+:: Adobe Common File Installer
+start /wait msiexec /x {8EDBA74D-0686-4C99-BFDD-F894678E5B39} /qn /norestart
+
+:: Adobe Help Center 1.0
+start /wait msiexec /x {E9787678-1033-0000-8E67-000000000001} /qn /norestart
+
+:: Adobe Help Manager
+start /wait msiexec /x {AF37176A-78CA-545B-34EF-8B6A21514DD1} /qn /norestart
+
+:: Adobe Media Player
+start /wait msiexec /x {39F6E2B4-CFE8-C30A-66E8-489651F0F34C} /qn /norestart
+
 :: Adobe Refresh Manager
 start /wait msiexec /x {AC76BA86-0804-1033-1959-001824147215} /qn /norestart

@@ -96,7 +114,7 @@
 :: Dell Dock
 start /wait msiexec /x {E60B7350-EA5F-41E0-9D6F-E508781E36D2} /qn /norestart

-:: Dell "Feature Enhancement" Pack
+:: Dell Feature Enhancement Pack
 start /wait msiexec /x {992D1CE7-A20F-4AB0-9D9D-AFC3418844DA} /qn /norestart

 :: Dell Getting Started Guide
@@ -157,6 +175,7 @@

 :: HP 64 Bit HP CIO Components Installer
 start /wait msiexec /x {FF21C3E6-97FD-474F-9518-8DCBE94C2854} /qn /norestart
+start /wait msiexec /x {BC741628-0AFC-405C-8946-DD46D1005A0A} /qn /norestart

 :: HP BufferChm
 start /wait msiexec /x {FA0FF682-CC70-4C57-93CD-E276F3E7537E} /qn /norestart
@@ -170,6 +189,9 @@

 :: HP CoolSense
 start /wait msiexec /x {1504CF6F-8139-497F-86FC-46174B67CF7F} /qn /norestart
+
+:: HP Deskjet 2510 series Setup Guide
+start /wait msiexec /x {216C7F38-4BBC-4E9A-8392-C9FA21B54386} /qn /norestart

 :: HP Documentation
 start /wait msiexec /x {C8D60CF4-BE7A-487E-BD36-535111BDB0FE} /qn /norestart
@@ -231,6 +253,9 @@
 :: HP Utility Center
 start /wait msiexec /x {B7B82520-8ECE-4743-BFD7-93B16C64B277} /qn /norestart

+:: Instant Housecall Specialist Sign-in
+start /wait msiexec /x {4A89B7B3-EB5B-4B33-B7B4-99E69792C081} /qn /norestart
+
 :: Intel Trusted Connect Client
 start /wait msiexec /x {44B72151-611E-429D-9765-9BA093D7E48A} /qn /norestart

@@ -271,6 +296,9 @@
 :: Java Auto Updater
 start /wait msiexec /x {4A03706F-666A-4037-7777-5F2748764D10} /qn /norestart
 start /wait msiexec /x {CCB6114E-9DB9-BD54-5AA0-BC5123329C9D} /qn /norestart
+
+:: Kaspersky Lab Network Agent
+start /wait msiexec /x {786A9F7E-CFEC-451F-B3C4-22EB11550FD8} /qn /norestart

 :: Kaspersky Internet Security
 start /wait msiexec /x {793B70D2-41E9-46AB-9DDC-B34C99D07DB5} /qn /norestart
@@ -316,10 +344,16 @@
 :: Lenovo Web Start
 if exist "%LOCALAPPDATA%\Pokki\Engine\HostAppService.exe" "%LOCALAPPDATA%\Pokki\Engine\HostAppService.exe" /UNINSTALL04bb6df446330549a2cb8d67fbd1a745025b7bd1

+:: SSN Librarian (some sketchy Russian program)
+start /wait msiexec /x {1D425886-3FE1-41AA-8D7A-E432CE29A4AE} /qn /norestart
+
 :: McAfee LiveSafe - Internet Security
 if exist %ProgramFiles(x86)%\McAfee\MSC\mcuihost.exe %ProgramFiles(x86)%\McAfee\MSC\mcuihost.exe /body:misp://MSCJsRes.dll::uninstall.html /id:uninstall
 if exist %ProgramFiles%\McAfee\MSC\mcuihost.exe %ProgramFiles%\McAfee\MSC\mcuihost.exe /body:misp://MSCJsRes.dll::uninstall.html /id:uninstall

+:: Microsoft Application Error Reporting
+start /wait msiexec /x {95120000-00B9-0409-1000-0000000FF1CE} /qn /norestart
+
 :: Microsoft Search Enhancement Pack
 start /wait msiexec /x {4CBA3D4C-8F51-4D60-B27E-F6B641C571E7} /qn /norestart

@@ -339,6 +373,9 @@
 :: PlayReady PC Runtime amd64
 start /wait msiexec /x {BCA9334F-B6C9-4F65-9A73-AC5A329A4D04} /qn /norestart

+:: QuickTime 7
+start /wait msiexec /x {3D2CBC2C-65D4-4463-87AB-BB2C859C1F3E} /qn /norestart
+
 :: Recovery Manager
 start /wait msiexec /x {44B2A0AB-412E-4F8C-B058-D1E8AECCDFF5} /qn /norestart
 start /wait msiexec /x {C7231F7C-6530-4E65-ADA6-5B392CF5BEB1} /qn /norestart
@@ -360,6 +397,9 @@

 :: Skype Click 2 Call
 start /wait msiexec /x {6D1221A9-17BF-4EC0-81F2-27D30EC30701} /qn /norestart
+
+:: Symantec WebReg
+start /wait msiexec /x {CCB9B81A-167F-4832-B305-D2A0430840B3} /qn /norestart

 :: Toshiba Audio Enhancement
 start /wait msiexec /x {1515F5E3-29EA-4CD1-A981-032D88880F09} /qn /norestart
@@ -451,9 +491,15 @@
 start /wait msiexec /x {36AC0D1D-9715-4F13-B6A4-86F1D35FB4DF} /qn /norestart
 start /wait msiexec /x {03D562B5-C4E2-4846-A920-33178788BE00} /qn /norestart

+:: Windows 7 USB/DVD Download Tool
+start /wait msiexec /x {CCF298AF-9CE1-4B26-B251-486E98A34789} /qn /norestart
+
 :: Windows Live Family Safety // Disabled by Vocatus for Tron (some family systems may be using this)
 ::start /wait msiexec /x {5F611ADA-B98C-4DBB-ADDE-414F08457ECF} /qn /norestart

+:: Windows Live Sign-in Assistant
+start /wait msiexec /x {CE52672C-A0E9-4450-8875-88A221D5CD50} /qn /norestart
+
 :: Windows Live Toolbar
 start /wait msiexec /x {995F1E2E-F542-4310-8E1D-9926F5A279B3} /qn /norestart


fixed mcast -> rmcast typos

fixed mcast -> rmcast typos

--- RMCastPlugin/rmcastplugin.bat
+++ RMCastPlugin/rmcastplugin.bat
@@ -11,7 +11,7 @@
 %JAVA_CMD% -version
 if %ERRORLEVEL% NEQ 0 (
   echo ------------------- ERROR -------------------
-  echo MCastPlugin.bat requires Java
+  echo RMCastPlugin.bat requires Java
   exit /b 1
 )

@@ -20,7 +20,7 @@
 if defined GATEWAY_ROOT (
   echo Found GATEWAY_ROOT ... running MCastPlugin from there ...

-  pushd "%GATEWAY_ROOT%\Gateway\MCastPlugin"
+  pushd "%GATEWAY_ROOT%\Gateway\RMCastPlugin"

   %JAVA_CMD% -Djava.net.preferIPv4Stack=true -cp ^
       libs\gatewaypluginapi.jar;libs\slf4j-api-1.6.4.jar;libs\slf4j-simple-1.6.4.jar;libs\json-20090211.jar;libs\jgroups-gw.jar;libs\protobuf-java-2.3.0.jar;dist\lib\rmcastplugin.jar ^
@@ -32,7 +32,7 @@
 )

-echo Running MCastPlugin from system directory ...
+echo Running RMCastPlugin from system directory ...

 set PLUGIN_BASE=%PROGRAMFILES%\ammo-gateway\bin
 if defined PROGRAMFILES(X86) (


commit on 31/01/2019 at 14:20:52

commit on 31/01/2019 at 14:20:52


changedCVS: ----------------------------------------------------------------------

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

--- scripts/windows/init.bat
+++ scripts/windows/init.bat
@@ -31,6 +31,8 @@
 IF EXIST %PROACTIVE%\lib\iaik_jce_full.jar set CLASSPATH=%CLASSPATH%;%PROACTIVE%\lib\iaik_jce_full.jar
 IF EXIST %PROACTIVE%\lib\iaik_ssl.jar set CLASSPATH=%CLASSPATH%;%PROACTIVE%\lib\iaik_ssl.jar
 IF EXIST %PROACTIVE%\lib\log4j-core.jar set CLASSPATH=%CLASSPATH%;%PROACTIVE%\lib\log4j-core.jar
+IF EXIST %PROACTIVE%\lib\javaxCrypto.jar set CLASSPATH=%CLASSPATH%;%PROACTIVE%\lib\javaxCrypto.jar
+IF EXIST %PROACTIVE%\lib\ibis.jar set CLASSPATH=%CLASSPATH%;%PROACTIVE%\lib\ibis.jar
 IF EXIST %PROACTIVE%\lib\xercesImpl.jar set CLASSPATH=%CLASSPATH%;%PROACTIVE%\lib\xercesImpl.jar
 IF EXIST %PROACTIVE%\lib\xmlParserAPIs.jar set CLASSPATH=%CLASSPATH%;%PROACTIVE%\lib\xmlParserAPIs.jar
 echo CLASSPATH=%CLASSPATH%


Update user_install.bat

Update user_install.bat

--- doc/user/user_install.bat
+++ doc/user/user_install.bat
@@ -1,16 +1,14 @@
-setlocal EnableDelayedExpansion
-
 echo OFF

 if "%CONDA_VERSION%"=="" set CONDA_VERSION=2
-if "%CONDA_DIR%"=="" set CONDA_DIR=%USERPROFILE%\Miniconda!CONDA_VERSION!
+if "%CONDA_DIR%"=="" set CONDA_DIR=%USERPROFILE%\Miniconda%CONDA_VERSION%

 if "%PLATFORM%"=="" set PLATFORM=%PROCESSOR_ARCHITECTURE%
-if not "!PLATFORM!"=="x86" set PLATFORM=x86_64
+if not "%PLATFORM%"=="x86" set PLATFORM=x86_64

 where curl
 if errorlevel 1 (
-    if not exist Miniconda!CONDA_VERSION!-latest-Windows-!PLATFORM!.exe (
+    if not exist Miniconda%CONDA_VERSION%-latest-Windows-%PLATFORM%.exe (
         echo "You must first install the cURL program or download manually the Miniconda!CONDA_VERSION!-latest-Windows-!PLATFORM!.exe file"
         echo "User installation failed."
         exit 1
@@ -19,8 +17,8 @@

 if "%BATCH_MODE%"=="" set BATCH_MODE=false

-if not exist !CONDA_DIR! (
-    if exist Miniconda!CONDA_VERSION!-latest-Windows-!PLATFORM!.exe (
+if not exist %CONDA_DIR% (
+    if exist Miniconda%CONDA_VERSION%-latest-Windows-%PLATFORM%.exe (
         set CLEAN_MINICONDA=0
     ) else (
         curl https://repo.continuum.io/miniconda/Miniconda!CONDA_VERSION!-latest-Windows-!PLATFORM!.exe -o miniconda.exe
@@ -44,11 +42,11 @@
     if "%CLEAN_MINICONDA%"=="1" del miniconda.exe
 )

-attrib +h !CONDA_DIR!
-if errorlevel 1 echo "Failed to hide the "!CONDA_DIR!" directory"
+attrib +h %CONDA_DIR%
+if errorlevel 1 echo "Failed to hide the "%CONDA_DIR%" directory"

-set PATH=!CONDA_DIR!;!CONDA_DIR!\Scripts;%PATH%
-call !CONDA_DIR!\Scripts\activate.bat root
+set PATH=%CONDA_DIR%;%CONDA_DIR%\Scripts;%PATH%
+call %CONDA_DIR%\Scripts\activate.bat root
 if errorlevel 1 (
     echo "Activation of Conda failed"
     echo "User installation failed."
@@ -58,13 +56,13 @@
 if "%CONDA_ALWAYS_YES%"=="" set CONDA_ALWAYS_YES=no
 if "%CONDA_CHANGE_PS1%"=="" set CONDA_CHANGE_PS1=yes

-conda config --set always_yes !CONDA_ALWAYS_YES!
+conda config --set always_yes %CONDA_ALWAYS_YES%
 if errorlevel 1 (
     echo "Configuration of Conda failed"
     echo "User installation failed."
     exit 1
 )
-conda config --set changeps1 !CONDA_CHANGE_PS1!
+conda config --set changeps1 %CONDA_CHANGE_PS1%
 if errorlevel 1 (
     echo "Configuration of Conda failed"
     echo "User installation failed."


Adding parallella dir

Adding parallella dir

--- common/dv/libs.cmd
+++ common/dv/libs.cmd
@@ -16,6 +16,7 @@
 -y ../../emailbox/hdl
 -y ../../memory/hdl
 -y ../../xilibs/hdl
+-y ../../parallella/hdl

 #INCLUDE PATHS (FOR CONSTANTS)
 +incdir+../../emesh/hdl


@ characters before elses were causing the script to not run

--- priv/templates/simplenode.windows.start_erl.cmd
+++ priv/templates/simplenode.windows.start_erl.cmd
@@ -22,13 +22,13 @@

 @if exist %releases_dir%\%release_version%\sys.config (
     @set app_config=%releases_dir%\%release_version%\sys.config
-) @else (
+) else (
     @set app_config=%node_root%\etc\app.config
 )

 @if exist %releases_dir%\%release_version%\vm.args (
     @set vm_args=%releases_dir%\%release_version%\vm.args
-) @else (
+) else (
     @set vm_args=%node_root%\etc\vm.args
 )


added "sleep" in windows universal install script after deleting directories ...

--- script/download-and-install-package/install.bat
+++ script/download-and-install-package/install.bat
@@ -44,10 +44,12 @@

   if EXIST "%PACKAGE_SUB_DIR%" (
     rmdir /s /q %PACKAGE_SUB_DIR%
+    sleep 2
   )

   if EXIST "%PACKAGE_SUB_DIR%" (
     rmdir %PACKAGE_SUB_DIR%
+    sleep 2
   )

   git clone %PACKAGE_URL% %PACKAGE_SUB_DIR%
@@ -132,10 +134,12 @@

   if EXIST "%PACKAGE_SUB_DIR%" (
     rmdir /s /q %PACKAGE_SUB_DIR%
+    sleep 2
   )

   if EXIST "%PACKAGE_SUB_DIR%" (
     rmdir %PACKAGE_SUB_DIR%
+    sleep 2
   )

   tar xvf %PACKAGE_NAME1%
@@ -206,9 +210,11 @@

   if EXIST install (
     rmdir /s /q install
+    sleep 2
   )
   if EXIST install (
     rmdir install
+    sleep 2
   )

 )
@@ -217,9 +223,11 @@

   if EXIST obj (
     rmdir /s /q obj
+    sleep 2
   )
   if EXIST obj (
     rmdir obj
+    sleep 2
   )

 )
@@ -358,9 +366,11 @@

   if EXIST obj (
     rmdir /s /q obj
+    sleep 2
   )
   if EXIST obj (
     rmdir obj
+    sleep 2
   )
 )


Added timeout option

Added timeout option

--- Setup/Portable/Compile.cmd
+++ Setup/Portable/Compile.cmd
@@ -7,6 +7,8 @@
 echo This Windows batch file will use Visual Studio 2013 to
 echo compile the Release versions of the Portable framework.
 echo.
+
+timeout /T 5

 @if "%VS120COMNTOOLS%"=="" goto error_no_VS120COMNTOOLSDIR
 @call "%VS120COMNTOOLS%VsDevCmd.bat"


Added echo off, and comments.

Added echo off, and comments.

--- Batch/n.bat
+++ Batch/n.bat
@@ -1 +1,4 @@
+@echo off
+:# Start Windows Notepad
+:# Do not use %* to remain compatible with Windows 95
 start notepad.exe %1 %2 %3 %4


Backwards compatibility

Backwards compatibility

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

--- mb-gui.bat
+++ mb-gui.bat
@@ -0,0 +1,5 @@
+@echo off
+
+set AVALON_LABEL=Mindbender
+
+%~dp0bin\windows\python36\python.exe -u %~dp0avalon.py


Added publishing script

Added publishing script

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

--- publish.cmd
+++ publish.cmd
@@ -0,0 +1,21 @@
+@setlocal
+@echo off
+
+echo Files in directory:
+dir . /a-d
+
+echo Looking for nuget package...
+FOR %%F IN (Metrolib.*.nupkg) DO (
+ set NUGET_PACKAGE=%%F
+)
+
+if not %NUGET_PACKAGE%=="" (
+	if "%APPVEYOR_REPO_BRANCH%"=="master" (
+		echo Publishing nuget package...
+		@nuget push -Source https://api.nuget.org/v3/index.json -ApiKey %NUGET_API_KEY% %NUGET_PACKAGE%
+	) else (
+		echo Not publishing from this branch...
+	)
+) else (
+	echo Did not find anything to publish!
+)


Fix Windows start.bat file

Fix Windows start.bat file

When starting midPoint, the stop procedure was immediately executed
as well. (In real life no one should be affected, as there's no time
to start midPoint, so there's nothing to stop at that moment.)

Also, the "end" label was missing.

--- dist/src/main/bin/midpoint.bat
+++ dist/src/main/bin/midpoint.bat
@@ -63,7 +63,10 @@
 :execStart
 echo "%cd%\lib\midpoint.war"
 start /b javaw -jar -Xms2048M -Xmx2048M -Dpython.cachedir=%MIDPOINT_HOME%\tmp -Djavax.net.ssl.trustStore=%MIDPOINT_HOME%\keystore.jceks -Djavax.net.ssl.trustStoreType=jceks -Dmidpoint.home=%MIDPOINT_HOME% %cd%\lib\midpoint.war > %BOOT_OUT% 2>&1 &
+goto end

 :execStop
 echo "%cd%\lib\midpoint.war"
-FOR /F "usebackq tokens=5" %%i IN (`netstat -aon ^| findstr "0.0.0.0:8080"`) DO taskkill /F /PID %%i+FOR /F "usebackq tokens=5" %%i IN (`netstat -aon ^| findstr "0.0.0.0:8080"`) DO taskkill /F /PID %%i
+
+:end


Replaced fixed path python 2.7 executable calls

--- update_external_sources.bat
+++ update_external_sources.bat
@@ -300,7 +300,7 @@
    cd %GLSLANG_DIR%
    git clone %GLSLANG_GITURL% .
    git checkout %GLSLANG_REVISION%
-   C:\Python27\python.exe .\update_glslang_sources.py
+   python.exe .\update_glslang_sources.py
    if not exist %GLSLANG_DIR%\SPIRV (
       echo glslang source download failed!
       set errorCode=1
@@ -313,7 +313,7 @@
    cd %GLSLANG_DIR%
    git fetch --all
    git checkout %GLSLANG_REVISION%
-   C:\Python27\python.exe .\update_glslang_sources.py
+   python.exe .\update_glslang_sources.py
 goto:eof

 :create_spirv-tools


Fix character corruption in Windows

Fix character corruption in Windows

--- redpen-cli/bin/redpen.bat
+++ redpen-cli/bin/redpen.bat
@@ -9,7 +9,7 @@
 for %%I in ("%SCRIPT_DIR%..") do set REDPEN_HOME=%%~dpfI

 set REDPEN_CLASSPATH=%REDPEN_HOME%/conf;%REDPEN_HOME%/lib/*
-set JAVA_OPTS=%JAVA_OPTS%
+set JAVA_OPTS=%JAVA_OPTS% -Dfile.encoding=UTF-8

 "%JAVA_HOME%\bin\java" %JAVA_OPTS% -classpath "%REDPEN_CLASSPATH%" cc.redpen.Main %*
 goto finally


Fix to #927

Fix to #927

Change portal security to "Allow access to the portal through SSL only".

--- Install/ArcGISServer/SupportFiles/FederateAGS.bat
+++ Install/ArcGISServer/SupportFiles/FederateAGS.bat
@@ -87,8 +87,7 @@
 echo    1. Click "Security" tab on side panel.
 echo.
 echo.
-echo    2. Make sure the "Allow access to the portal through SSL only" option is UNCHECKED.
-echo       ^(unchecked allows both http and https^)
+echo    2. Make sure the "Allow access to the portal through SSL only" option is CHECKED.
 echo.
 echo.
 echo    ^-^-^-^-^-^- Utility Services ^-^-^-^-^-^-


bat_revision number

bat_revision number

--- bat/bat_get_kam_folder.bat
+++ bat/bat_get_kam_folder.bat
@@ -23,8 +23,8 @@

 REM Replace ' with nothing to get the version info
 REM @SET kam_revision=%verinfo:'=%
-@SET kam_revision=1
+@SET kam_revision=2

 REM Now we can have a constant with the right folder name
-@SET kam_folder=%BetaVersionsDir%\kam%YYYY%-%MM%-%DD% (%kam_version% br%kam_revision%)
+@SET kam_folder=%BetaVersionsDir%\kam%YYYY%-%MM%-%DD% (%kam_version% rev%kam_revision%)
 echo kam_folder: "%kam_folder%"


ProcessGoldenImages.bat: reworked application list to make it more flexible

--- Tests/ProcessGoldenImages.bat
+++ Tests/ProcessGoldenImages.bat
@@ -41,12 +41,12 @@
 set golden_img_mode=%1
 shift

-set rest_args=
+set test_modes=
 :loop1
     :: ~ removes surrounding quotes
     if "%~1"=="" goto end_loop1
     :: Do not remove quotes yet as this will ungroup arguments
-    set rest_args=%rest_args% %1
+    set test_modes=%test_modes% %1
     shift
     goto loop1
 :end_loop1
@@ -57,36 +57,35 @@
 echo Img mode:    %golden_img_mode%
 echo Img dir:     %golden_images_dir%
 echo Img size:    %GOLDEN_IMAGE_WIDTH% x %GOLDEN_IMAGE_HEIGHT%
-echo Test modes:  %rest_args%
+echo Test modes:  %test_modes%
 echo.

 cd ..

-set Tutorials=Tutorial01_HelloTriangle^
-              Tutorial02_Cube^
-              Tutorial03_Texturing^
-              Tutorial03_Texturing-C^
-              Tutorial04_Instancing^
-              Tutorial05_TextureArray^
-              Tutorial06_Multithreading^
-              Tutorial07_GeometryShader^
-              Tutorial08_Tessellation^
-              Tutorial09_Quads^
-              Tutorial10_DataStreaming^
-              Tutorial11_ResourceUpdates^
-              Tutorial12_RenderTarget^
-              Tutorial13_ShadowMap^
-              Tutorial14_ComputeShader^
-              Tutorial16_BindlessResources^
-              Tutorial17_MSAA^
-			  Tutorial18_Queries^
-              Tutorial19_RenderPasses^
-              Tutorial23_CommandQueues
-
-set Samples=Atmosphere^
-            GLTFViewer^
-            NuklearDemo^
-            Shadows
+set TestApps="Tutorials/Tutorial01_HelloTriangle"^
+             "Tutorials/Tutorial02_Cube"^
+             "Tutorials/Tutorial03_Texturing"^
+             "Tutorials/Tutorial03_Texturing-C"^
+             "Tutorials/Tutorial04_Instancing"^
+             "Tutorials/Tutorial05_TextureArray"^
+             "Tutorials/Tutorial06_Multithreading"^
+             "Tutorials/Tutorial07_GeometryShader"^
+             "Tutorials/Tutorial08_Tessellation"^
+             "Tutorials/Tutorial09_Quads"^
+             "Tutorials/Tutorial10_DataStreaming"^
+             "Tutorials/Tutorial11_ResourceUpdates"^
+             "Tutorials/Tutorial12_RenderTarget"^
+             "Tutorials/Tutorial13_ShadowMap"^
+             "Tutorials/Tutorial14_ComputeShader"^
+             "Tutorials/Tutorial16_BindlessResources"^
+             "Tutorials/Tutorial17_MSAA"^
+			 "Tutorials/Tutorial18_Queries --show_ui 0"^
+             "Tutorials/Tutorial19_RenderPasses"^
+             "Tutorials/Tutorial23_CommandQueues --show_ui 0"^
+             "Samples/Atmosphere --show_ui 0"^
+             "Samples/GLTFViewer --show_ui 0"^
+             "Samples/NuklearDemo --show_ui 0"^
+             "Samples/Shadows --show_ui 0"

 rem  ImguiDemo has fps counter in the UI, so we have to skip it

@@ -95,8 +94,8 @@
 set OVERAL_STATUS=

-for %%X in (%Tutorials%) do (
-    call :gen_golden_img Tutorials %%X %rest_args%
+for %%X in (%TestApps%) do (
+    call :gen_golden_img %%X
     if "!ERRORLEVEL!" == "0" (
         set /a TESTS_PASSED=!TESTS_PASSED!+1
     ) else (
@@ -104,15 +103,6 @@
     )
 )

-for %%X in (%Samples%) do (
-    call :gen_golden_img Samples %%X %rest_args%
-    if "!ERRORLEVEL!" == "0" (
-        set /a TESTS_PASSED=!TESTS_PASSED!+1
-    ) else (
-        set /a TESTS_FAILED=!TESTS_FAILED!+1
-    )
-)
-
 cd Tests

 for %%X in (%OVERAL_STATUS%) do (
@@ -138,33 +128,20 @@

 :gen_golden_img
-
-    set app_folder=%1
+    :: https://ss64.com/nt/for_f.html
+    :: Tutorials/Tutorial18_Queries --show_ui 0
+    :: |-------| |----------------| |---------|
+    ::     ^            ^                ^
+    ::     1            2                *
+    for /F "tokens=1,2,* delims=/ " %%a in (%1) do (
+        set app_folder=%%a
+        set app_name=%%b
+        set extra_args=%%c
+    )
     shift

-    set app_name=%1
-    shift
-
-    rem  Who knows why, but without the echos below, the script fails on Appveyor.
-    @echo Testing %app_folder%/%app_name%...
+    @echo Testing %app_folder%/%app_name% %extra_args%
     @echo.
-
-    set show_ui=1
-    if "%app_folder%" == "Samples" (
-        set show_ui=0
-        if "%app_name%" == "ImguiDemo" set show_ui=1
-    )
-	if "%app_name%" == "Tutorial18_Queries" set show_ui=0
-    if "%app_name%" == "Tutorial23_CommandQueues" set show_ui=0
-
-    set test_modes=
-    :loop2
-	    :: Do not remove quotes as this will ungroup arguments
-        if "%~1"=="" goto end_loop2
-        set test_modes=%test_modes% %1
-        shift
-        goto loop2
-    :end_loop2

     cd "%app_folder%/%app_name%/assets"

@@ -175,6 +152,8 @@

     set EXIT_CODE=0
     for %%X in (%test_modes%) do (
+        :: ~ removes quotes from %%X
+        set test_mode=%%~X

         set app_path=%DILIGENT_BUILD_DIR%/DiligentSamples/%app_folder%/%app_name%
         if exist "!app_path!/%DILIGENT_BUILD_TYPE%" (
@@ -183,17 +162,18 @@
         set app_path=!app_path!/%app_name%.exe

         :: Get the backend name and extra arguments
-        set extra_args=
         set mode_param=0
-        for %%Y in (%%~X) do (
+        for %%Y in (!test_mode!) do (
             if "%%Y" == "--mode" (
                 set mode_param=1
             ) else (
-                if "!mode_param!" == "1" (
-                    set backend_name=%%Y
-                    set mode_param=0
+                if "%%Y" == "-m" (
+                    set mode_param=1
                 ) else (
-                    set extra_args=!extra_args! %%Y
+                    if "!mode_param!" == "1" (
+                        set backend_name=%%Y
+                        set mode_param=0
+                    )
                 )
             )
         )
@@ -203,25 +183,26 @@
         rem   !!!   ERRORLEVEL doesn't get updated inside control blocks like IF statements unless           !!!
         rem   !!!   !ERRORLEVEL! is used instead of %ERRORLEVEL% and delayed expansion is enabled as below:  !!!
         rem   !!!   setlocal ENABLEDELAYEDEXPANSION                                                          !!!
-        rem   ~ removes quotes from %%~X
-        !app_path! %%~X --width %GOLDEN_IMAGE_WIDTH% --height %GOLDEN_IMAGE_HEIGHT% --golden_image_mode %golden_img_mode% --capture_path %golden_img_dir% --capture_name !capture_name! --capture_format png --adapters_dialog 0 --show_ui %show_ui%
+        set cmd_args=!test_mode! --width %GOLDEN_IMAGE_WIDTH% --height %GOLDEN_IMAGE_HEIGHT% --golden_image_mode %golden_img_mode% --capture_path %golden_img_dir% --capture_name !capture_name! --capture_format png --adapters_dialog 0 %extra_args%
+        echo !app_path! !cmd_args!
+        !app_path! !cmd_args!

         if !ERRORLEVEL! NEQ 0 (set EXIT_CODE=1)

         if "%golden_img_mode%" == "compare" (
-            if !ERRORLEVEL! EQU 0 (set STATUS=%FONT_GREEN%Golden image validation PASSED for %app_name% [!backend_name!!extra_args!].%FONT_DEFAULT%)
-            if !ERRORLEVEL! GTR 0 (set STATUS=%FONT_RED%Golden image validation FAILED for %app_name% [!backend_name!!extra_args!]: !ERRORLEVEL! inconsistent pixels found.%FONT_DEFAULT%)
-            if !ERRORLEVEL! LSS 0 (set STATUS=%FONT_RED%Golden image validation FAILED for %app_name% [!backend_name!!extra_args!]. Error code: !ERRORLEVEL!.%FONT_DEFAULT%)
+            if !ERRORLEVEL! EQU 0 (set STATUS=%FONT_GREEN%Golden image validation PASSED for %app_name% [!test_mode!].%FONT_DEFAULT%)
+            if !ERRORLEVEL! GTR 0 (set STATUS=%FONT_RED%Golden image validation FAILED for %app_name% [!test_mode!]: !ERRORLEVEL! inconsistent pixels found.%FONT_DEFAULT%)
+            if !ERRORLEVEL! LSS 0 (set STATUS=%FONT_RED%Golden image validation FAILED for %app_name% [!test_mode!]. Error code: !ERRORLEVEL!.%FONT_DEFAULT%)
         )
         if "%golden_img_mode%" == "capture" (
-            if !ERRORLEVEL! EQU 0 (set STATUS=%FONT_GREEN%Successfully generated golden image for %app_name% [!backend_name!!extra_args!].%FONT_DEFAULT%)
-            if !ERRORLEVEL! GTR 0 (set STATUS=%FONT_RED%FAILED to generate golden image for %app_name% [!backend_name!!extra_args!]. Error code: !ERRORLEVEL!.%FONT_DEFAULT%)
-            if !ERRORLEVEL! LSS 0 (set STATUS=%FONT_RED%FAILED to generate golden image for %app_name% [!backend_name!!extra_args!]. Error code: !ERRORLEVEL!.%FONT_DEFAULT%)
+            if !ERRORLEVEL! EQU 0 (set STATUS=%FONT_GREEN%Successfully generated golden image for %app_name% [!test_mode!].%FONT_DEFAULT%)
+            if !ERRORLEVEL! GTR 0 (set STATUS=%FONT_RED%FAILED to generate golden image for %app_name% [!test_mode!]. Error code: !ERRORLEVEL!.%FONT_DEFAULT%)
+            if !ERRORLEVEL! LSS 0 (set STATUS=%FONT_RED%FAILED to generate golden image for %app_name% [!test_mode!]. Error code: !ERRORLEVEL!.%FONT_DEFAULT%)
         )
         if "%golden_img_mode%" == "compare_update" (
-            if !ERRORLEVEL! EQU 0 (set STATUS=%FONT_GREEN%Golden image validation PASSED for %app_name%. Image updated. [!backend_name!!extra_args!].%FONT_DEFAULT%)
-            if !ERRORLEVEL! GTR 0 (set STATUS=%FONT_RED%Golden image validation FAILED for %app_name% [!backend_name!!extra_args!]: !ERRORLEVEL! inconsistent pixels found. Image updated.%FONT_DEFAULT%)
-            if !ERRORLEVEL! LSS 0 (set STATUS=%FONT_RED% FAILED to validate or update golden image for %app_name% [!backend_name!!extra_args!]. Error code: !ERRORLEVEL!.%FONT_DEFAULT%)
+            if !ERRORLEVEL! EQU 0 (set STATUS=%FONT_GREEN%Golden image validation PASSED for %app_name%. Image updated. [!test_mode!].%FONT_DEFAULT%)
+            if !ERRORLEVEL! GTR 0 (set STATUS=%FONT_RED%Golden image validation FAILED for %app_name% [!test_mode!]: !ERRORLEVEL! inconsistent pixels found. Image updated.%FONT_DEFAULT%)
+            if !ERRORLEVEL! LSS 0 (set STATUS=%FONT_RED% FAILED to validate or update golden image for %app_name% [!test_mode!]. Error code: !ERRORLEVEL!.%FONT_DEFAULT%)
         )

         :: For some reason, colored font does not work after the line that starts the sample app


Build showing errors

Build showing errors

--- builders/org.python.pydev.build/build_cmd.bat
+++ builders/org.python.pydev.build/build_cmd.bat
@@ -67,7 +67,7 @@
 C:\tools\Miniconda32\envs\py27_32\python %BUILD_DIR%/Pydev/plugins/org.python.pydev/pysrc/build_tools/build_binaries_windows.py

 @echo to clean after the build: -DcleanAfter.set=true
-mvn install
+mvn install -e -X


increased revision number

increased revision number

OK that's it. This time it's for reals.

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

 REM ## ghacks-user.js updater for Windows
 REM ## author: @claustromaniac
-REM ## version: 4.3
+REM ## version: 4.4
 REM ## instructions: https://github.com/ghacksuserjs/ghacks-user.js/wiki/3.3-Updater-Scripts

 SET _myname=%~n0
@@ -77,7 +77,7 @@
 ECHO:                ########################################
 ECHO:                ####  user.js Updater for Windows   ####
 ECHO:                ####       by claustromaniac        ####
-ECHO:                ####             v4.3               ####
+ECHO:                ####             v4.4               ####
 ECHO:                ########################################
 ECHO:
 SET /A "_line=0"


run.bat fixed

run.bat fixed


[FIX] Under Windows 64-bit, the variable %ProgramFiles% is set to "C:\Program Files (x86)" as CMake is compiled in 32-bit.

git-svn-id: ed06c97986a68fa016311908f99ed1538fbb9b5d@442 93be6e1e-6fcc-11de-baec-69240fdc299a

--- Batch/EasyInstall_MSVC.bat
+++ Batch/EasyInstall_MSVC.bat
@@ -9,26 +9,39 @@
 VER | FIND /I "6.1" >NUL
 IF NOT ERRORLEVEL 1 SET REQUIRE_PRIVILEGES=1

+:: 32 or 64 bits?
+:: Force PROGFILES to be set to "C:\Program Files" instead of using "C:\Program Files (x86)"
+:: under Windows 64-bit. CMake is compiled in 32-bit and then due to the Windows-on-Windows
+:: 64-bit redirection, %ProgramFiles% is set to "C:\Program Files (x86)".
+SET ARCH=
+SET PROGFILES=
+IF EXIST %SYSTEMROOT%\SysWOW64 (
+  SET ARCH=x64
+  SET PROGFILES=%ProgramW6432%
+) ELSE (
+  SET PROGFILES=%ProgramFiles%
+)
+
 :: Detect MSVC. If MSVC is not present, the script looks for Windows SDK 7.0 (or greater)
 SET MSVS=""
 IF (%3) == () (
   :: Create a temporary file to list the known MSVC directories
   > %TEMP%.\BTK-MSVC.txt ECHO Known MSVC directories
-  >> %TEMP%.\BTK-MSVC.txt ECHO "%ProgramFiles%\Microsoft Visual Studio 10.0"
-  >> %TEMP%.\BTK-MSVC.txt ECHO "%ProgramFiles%\Microsoft Visual Studio 9.0"
-  >> %TEMP%.\BTK-MSVC.txt ECHO "%ProgramFiles%\Microsoft Visual Studio 8"
-  >> %TEMP%.\BTK-MSVC.txt ECHO "%ProgramFiles%\Microsoft Visual Studio .NET 2003"
-  >> %TEMP%.\BTK-MSVC.txt ECHO "%ProgramFiles% (x86)\Microsoft Visual Studio 10.0"
-  >> %TEMP%.\BTK-MSVC.txt ECHO "%ProgramFiles% (x86)\Microsoft Visual Studio 9.0"
-  >> %TEMP%.\BTK-MSVC.txt ECHO "%ProgramFiles% (x86)\Microsoft Visual Studio 8"
-  >> %TEMP%.\BTK-MSVC.txt ECHO "%ProgramFiles% (x86)\Microsoft Visual Studio .NET 2003"
+  >> %TEMP%.\BTK-MSVC.txt ECHO "!PROGFILES!\Microsoft Visual Studio 10.0"
+  >> %TEMP%.\BTK-MSVC.txt ECHO "!PROGFILES!\Microsoft Visual Studio 9.0"
+  >> %TEMP%.\BTK-MSVC.txt ECHO "!PROGFILES!\Microsoft Visual Studio 8"
+  >> %TEMP%.\BTK-MSVC.txt ECHO "!PROGFILES!\Microsoft Visual Studio .NET 2003"
+  >> %TEMP%.\BTK-MSVC.txt ECHO "!PROGFILES! (x86)\Microsoft Visual Studio 10.0"
+  >> %TEMP%.\BTK-MSVC.txt ECHO "!PROGFILES! (x86)\Microsoft Visual Studio 9.0"
+  >> %TEMP%.\BTK-MSVC.txt ECHO "!PROGFILES! (x86)\Microsoft Visual Studio 8"
+  >> %TEMP%.\BTK-MSVC.txt ECHO "!PROGFILES! (x86)\Microsoft Visual Studio .NET 2003"
   :: Look for MSVC
   FOR	/F "eol=;delims=" %%i IN (%TEMP%.\BTK-MSVC.txt) DO IF EXIST %%i\VC\vcvarsall.bat SET MSVS=%%i
   DEL %TEMP%.\BTK-MSVC.txt
   IF !MSVS! == "" (
     :: Create a temporary file to list the known Windows SDK directories
     > %TEMP%.\BTK-WINSDK.txt ECHO Known Windows SDK directories
-    >> %TEMP%.\BTK-WINSDK.txt ECHO "%ProgramFiles%\Microsoft SDKs\Windows\v7.0
+    >> %TEMP%.\BTK-WINSDK.txt ECHO "!PROGFILES!\Microsoft SDKs\Windows\v7.0
     :: Look for Windows SDK
     FOR	/F "eol=;delims=" %%i IN (%TEMP%.\BTK-WINSDK.txt) DO IF EXIST %%i\Bin\SetEnv.Cmd SET MSVS=%%i
     DEL %TEMP%.\BTK-WINSDK.txt
@@ -45,10 +58,10 @@
 IF (%4) == () (
   :: Create a temporary file to list the known CMAKE directories
   > %TEMP%.\BTK-CMAKE.txt ECHO Known CMAKE directories
-  >> %TEMP%.\BTK-CMAKE.txt ECHO "%ProgramFiles%\CMake 2.6"
-  >> %TEMP%.\BTK-CMAKE.txt ECHO "%ProgramFiles%\CMake 2.8"
-  >> %TEMP%.\BTK-CMAKE.txt ECHO "%ProgramFiles% (x86)\CMake 2.6"
-  >> %TEMP%.\BTK-CMAKE.txt ECHO "%ProgramFiles% (x86)\CMake 2.8"
+  >> %TEMP%.\BTK-CMAKE.txt ECHO "!PROGFILES!\CMake 2.6"
+  >> %TEMP%.\BTK-CMAKE.txt ECHO "!PROGFILES!\CMake 2.8"
+  >> %TEMP%.\BTK-CMAKE.txt ECHO "!PROGFILES! (x86)\CMake 2.6"
+  >> %TEMP%.\BTK-CMAKE.txt ECHO "!PROGFILES! (x86)\CMake 2.8"
   :: Look for CMAKE
   FOR	/F "eol=;delims=," %%i IN (%TEMP%.\BTK-CMAKE.txt) DO IF EXIST %%i\bin\cmake.exe SET CMAKE=%%i
   DEL %TEMP%.\BTK-CMAKE.txt
@@ -61,16 +74,13 @@
 :: MSVC EE doesn't contains a 64 bits compiler.
 :: Trying to use Windows SDK for Windows 7 64 bits ...
 IF NOT EXIST !setEnvCmd! (
-  SET setEnvCmd="%ProgramW6432%\Microsoft SDKs\Windows\v7.0\Bin\SetEnv.Cmd"
+  SET setEnvCmd="!PROGFILES!\Microsoft SDKs\Windows\v7.0\Bin\SetEnv.Cmd"
 )

 CD ..
 IF EXIST !setEnvCmd! (
   CALL !setEnvCmd!
 ) ELSE (
-  :: 32 or 64 bits?
-  SET ARCH=
-  IF EXIST %SYSTEMROOT%\SysWOW64 SET ARCH=x64
   CALL !MSVS!\VC\vcvarsall.bat !ARCH!
 )
 IF EXIST %2 RMDIR /S /Q %2


Pointed NCIm property files for my environment but commented out.

SVN-Revision: 526

--- software/build/build.cmd
+++ software/build/build.cmd
@@ -42,10 +42,12 @@
 )
 if "%1" == "dev" (
     ant -Dproperties.file=C:\SVN-Projects\ncim-properties\properties\dev-upgrade.properties deploy:remote:upgrade
+    @rem ant -Dproperties.file=C:\@\src\browsers\ncim.properties\dev-upgrade.properties deploy:remote:upgrade
     goto DONE
 )
 if "%1" == "qa" (
     ant -Dproperties.file=C:\SVN-Projects\ncim-properties\properties\qa-upgrade.properties deploy:remote:upgrade
+    @rem ant -Dproperties.file=C:\@\src\browsers\ncim.properties\qa-upgrade.properties deploy:remote:upgrade
     goto DONE
 )


do not use bundled srs data by default on windows, assuming instead another fully packaged GDAL will be present and it will set GDAL_DATA

--- vcbuild.bat
+++ vcbuild.bat
@@ -7,7 +7,7 @@
 msbuild build.sln
 copy Default\\_srs.node lib\\_srs.node
 rem test!
-echo module.exports.static_osr = true; > lib\settings.js
+echo module.exports.static_osr = false; > lib\settings.js
 set NODE_PATH=lib
 node node_modules\expresso\bin\expresso
 rem node -e "console.log(require('mapnik'))"


Delete app.bat

Delete app.bat

--- app.bat
+++ app.bat
@@ -1,3 +0,0 @@
-@echo off
-node app.js
-pause


Failure text now takes a single line on email, for better readability. Fixed failed echo of the initial working directory/newline.

--- automate_builds.bat
+++ automate_builds.bat
@@ -46,10 +46,8 @@
 REM ---------------------------------------------------------------------------------------------------------------------#

 (ECHO Auto Build Robot is going to try building projects in)>%abs_summary_report_file%
-(
-	ECHO %originalCurrentDirectory%
- 	ECHO.
- )>>%abs_summary_report_file%
+(ECHO %originalCurrentDirectory%)>>%abs_summary_report_file%
+(ECHO.)>>%abs_summary_report_file%

 REM Above: Making the immediate report nice and tidy including introduction stuff.
 REM Below: Search the current directory for the build scripts before child directories, special case: duplicate code.
@@ -103,9 +101,7 @@
 				IF 0==!abs_return_value! (
 					REM Continue on to the next build phase.
 				) ELSE (
-					(ECHO FAILED: "!pathLocalToCurrent!\%%f")>>%abs_summary_report_file%
-					(ECHO FAILED: error condition: !abs_return_value!)>>%abs_summary_report_file%
-					(ECHO FAILED: Skipping other build scripts within this directory.)>>%abs_summary_report_file%
+					(ECHO FAILED: "!pathLocalToCurrent!\%%f"   ERROR: !abs_return_value! [stopping current project])>>%abs_summary_report_file%
 				)
 			)
 		)


added base dir argument

added base dir argument

git-svn-id: 29aad96320b2a07b98332cd568fc1316025c072f@5166 1cfb16fd-6d17-0410-8ff1-b7e8e1e2867d

--- bin/startGrails.bat
+++ bin/startGrails.bat
@@ -138,6 +138,7 @@
 if "%JAVA_OPTS%" == "" set JAVA_OPTS="-Xmx128m"
 set JAVA_OPTS=%JAVA_OPTS% -Dprogram.name="%PROGNAME%"
 set JAVA_OPTS=%JAVA_OPTS% -Dgrails.home="%GRAILS_HOME%"
+set JAVA_OPTS=%JAVA_OPTS% -Dbase.dir="."
 set JAVA_OPTS=%JAVA_OPTS% -Dtools.jar="%TOOLS_JAR%"
 set JAVA_OPTS=%JAVA_OPTS% -Dgroovy.starter.conf="%STARTER_CONF%"


Remove sed

Remove sed

--- recipes/ri/bld.bat
+++ recipes/ri/bld.bat
@@ -1,5 +1,4 @@
-mv "%RECIPE_DIR%\sys" "%SRC_DIR%\sys"
-sed -i '66s/.*/#include \"sys\/time.h\"/' include\timer.h
+mv "%RECIPE_DIR%\sys" "%SRC_DIR%\sys"

 make -B


combine coverage reports

combine coverage reports

--- scripts/appveyor-test.cmd
+++ scripts/appveyor-test.cmd
@@ -7,5 +7,5 @@
 rem coverage run --rcfile=../../.coveragerc -p run.py
 rem cd ../../
 rem copy integrationtests/mayavi/.coverage.* ./
-rem coverage combine
+coverage combine
 coverage report


update major version

update major version

--- test/test_app.bat
+++ test/test_app.bat
@@ -0,0 +1 @@
+2.0.0


launch active mq

launch active mq

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

--- HelloStarter/launchActiveMQ.bat
+++ HelloStarter/launchActiveMQ.bat
@@ -0,0 +1,11 @@
+@echo off
+set time_start_launch_active_mq=%TIME%
+
+rem shell:startup
+
+d:
+cd D:\software\apache-activemq-5.15.11
+bin\activemq start
+
+@echo Finished, start: %time_start_launch_active_mq%, end: %TIME%
+rem pause


GF33095 NCI RAI to download files

GF33095 NCI RAI to download files

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

--- jcrasher.cmd
+++ jcrasher.cmd
@@ -0,0 +1,5 @@
+call setEnv.cmd
+
+ant -f jcrasher.xml
+
+pause


fix an error when executing startup.bat when the log directory exists (#5213)

Co-authored-by: 吴晟 Wu Sheng <68a3242e186709d17f336804861ef8db5265f4bc@foxmail.com>

--- dist-material/bin/webappService.bat
+++ dist-material/bin/webappService.bat
@@ -22,7 +22,7 @@
 set JARPATH=%WEBAPP_HOME%\webapp
 set WEBAPP_LOG_DIR=%WEBAPP_HOME%\logs

-if exist "%WEBAPP_LOG_DIR%" (
+if not exist "%WEBAPP_LOG_DIR%" (
     mkdir "%WEBAPP_LOG_DIR%"
 )


update_repository.bat improved

update_repository.bat improved

--- update_repository.bat
+++ update_repository.bat
@@ -1,9 +1,11 @@
-REM Update the main repo
-git pull
-
 REM Init the subrepos
 git submodule update --init --recursive
 git submodule foreach --recursive "git checkout master"

+REM Update the main repo
+git checkout master
+git fetch
+git pull
+
 REM Update the subrepos
 git submodule foreach --recursive "git pull"


batch exit

batch exit

--- recipes/7za/bld.bat
+++ recipes/7za/bld.bat
@@ -1,2 +1,2 @@
-dir .
 copy 7za.exe %LIBRARY_BIN%\\7za.exe
+if %errorlevel% neq 0 exit %errorlevel%


Add stylecop on windows

Add stylecop on windows

--- windows_cygwin/build.bat
+++ windows_cygwin/build.bat
@@ -1,5 +1,5 @@
 @echo on
-choco install -y --allowEmptyChecksum firefox googlechrome wget notepadplusplus sublimetext3 mono monodevelop gtksharp visualstudiocode microsoft-build-tools visualstudio2015community p4merge dotnet4.5 ruby nodejs
+choco install -y --allowEmptyChecksum firefox googlechrome wget notepadplusplus sublimetext3 mono monodevelop gtksharp visualstudiocode microsoft-build-tools visualstudio2015community p4merge dotnet4.5 ruby nodejs stylecop

 wget -c https://cygwin.com/setup-x86_64.exe
 setup-x86_64.exe -R "C:\cygwin64" -s http://cygwin.netbet.org/ -q -g -P curl,zsh,git,vim,wget,xz,tar,gawk,bzip2,subversion,zlib,fontconfig,clang,cmake,lua,perl


update back.bat

update back.bat

--- bin/back/back.bat
+++ bin/back/back.bat
@@ -1,12 +1,12 @@
 :: Terminal API
 ::
-:: This file is called whenever a user enters a shell.
+:: This file is called whenever a user wants to go up one step in the terminal
 ::
 :: Dependencies:
 ::   mb.bat add following = set PATH=%_GIT%\mindbender-core\bin\back\;%PATH%
 ::
 :: Example:
-::   $ mb
+::   $ back

 @echo off

@@ -16,11 +16,14 @@
 IF "%ASSET%"=="" goto :return_to_mb

 IF NOT "%ASSET%"=="" goto :return_to_projects
+
 :return_to_mb
     call %_MB% M:\f01_projects %*
     SET PROJECTDIR=
+    endlocal
     exit /b
 :return_to_projects
     call _mkproject.bat %curPROJECT% %curPROJECTNAME% %PROJECTSTAGE%
     SET ASSET=
+    endlocal
     exit /b


Add copyright notice to metatrace.bat

Add copyright notice to metatrace.bat

--- bin/metatrace.bat
+++ bin/metatrace.bat
@@ -1,3 +1,17 @@
+@rem Copyright 2015 Google Inc. All Rights Reserved.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem 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 Use this batch file to profile the ETW profiler. If the save or merge
 @rem steps of UIforETW or wprui are very slow then this batch file can profile
 @rem them. Save this batch file for special occasions. This works by using


Create bld.bat

Create bld.bat

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

--- recipes/jquery/bld.bat
+++ recipes/jquery/bld.bat
@@ -0,0 +1,12 @@
+npm install --user "%USERNAME%"  ^
+            --python=python2.7   ^
+            --loglevel warn      ^
+            .
+npm start
+npm prune --production
+del /s /q %PREFIX%\share\man\man1\gulp.1
+robocopy build %PREFIX%/static /s /e
+:: OS X installs node-gyp globally for some reason which means it ends up in ${PREFIX}
+if exist %PREFIX%\lib\node_modules del /s /q %PREFIX%\lib\node_modules
+:: Seems some other cruft is left lying around ..
+if exist %PREFIX%\build\tmp del /s /q %PREFIX%\build\tmp


Update bld.bat

Update bld.bat

--- recipes/pdal-c/bld.bat
+++ recipes/pdal-c/bld.bat
@@ -1,23 +1,13 @@

-if not defined BUILD_TYPE set BUILD_TYPE=Release
-set ARCH=x64
-if not defined TARGET_OS set TARGET_OS=windows
-
-set TRIPLET=%ARCH%-%TARGET_OS%
-
-set BUILD_DIR=%SCRIPT_DIR%\build\%TRIPLET%
-
-if exist "%BUILD_DIR%\pdal-c.sln" (
-	pushd "%BUILD_DIR%"
-) else (
-	mkdir "%BUILD_DIR%"
-	pushd "%BUILD_DIR%"
+set BUILD_TYPE=Release

 	cmake ../.. ^
 		-G "Visual Studio 15 2017"  ^
-		-DCMAKE_BUILD_TYPE=%BUILD_TYPE% ^
+		-DCMAKE_BUILD_TYPE=$BUILD_TYPE ^
+		-DCMAKE_INSTALL_PREFIX=$PREFIX ^
+		-DCMAKE_LIBRARY_PATH=$PREFIX/lib ^
+		-DCMAKE_INCLUDE_PATH=$PREFIX/include ^
 		-DCONDA_BUILD=ON
-
 )

 :: Build and install solution


Delete click-1.3.4.1-NoMeteor.bat

Delete click-1.3.4.1-NoMeteor.bat

--- click-1.3.4.1-NoMeteor.bat
+++ click-1.3.4.1-NoMeteor.bat
@@ -1,7 +0,0 @@
-del /Q Domoticasite.json
-rmdir Domoticasite /S /Q
-
-rename Domo*.json Domoticasite.json
-meteor-kitchen ./Domoticasite.json ./Domoticasite --meteor-release 1.3.4.1  2>io.txt
-cd ./Domoticasite
-


auntahun

auntahun

--- scripts/ci/appveyor/setup_cppdb.bat
+++ scripts/ci/appveyor/setup_cppdb.bat
@@ -7,8 +7,10 @@

 cd "%USERPROFILE%\cppdb\build"

-cmake -DDISABLE_SQLITE="ON" -DDISABLE_PQ="ON" -DDISABLE_ODBC="ON" -G "Visual Studio 14" ..
+cmake -DDISABLE_SQLITE="ON" -DDISABLE_PQ="ON" -DDISABLE_ODBC="ON" -DDISABLE_MYSQL="OFF" -DMYSQL_BACKEND_INTERNAL="ON" -G "Visual Studio 14" ..
 cmake --build .

 xcopy "%USERPROFILE%\cppdb\build\Debug\cppdb.dll" "C:\cpp_rest" /Y

+dir C:\cpp_rest
+


Revert "fix build"

Revert "fix build"

This reverts commit fb533a2db82ceb4e2b13440dfe8263554d0388e5.

--- build-release.bat
+++ build-release.bat
@@ -1,13 +1,14 @@
-pushd src
-
-set PATH=C:\Program Files (x86)\MSBuild\14.0\Bin;%PATH%
-
-msbuild /p:Configuration=Release full-build.sln || goto :ko
-
-:ok
-popd
-exit /b 0
-
-:ko
-popd
-exit /b 5
+pushd src
+
+set PATH=C:\Program Files (x86)\MSBuild\14.0\Bin;%PATH%
+
+.nuget\nuget restore || goto :ko
+msbuild /p:Configuration=Release full-build.sln || goto :ko
+
+:ok
+popd
+exit /b 0
+
+:ko
+popd
+exit /b 5


Update ssh.bat

Update ssh.bat

--- ps1/ssh.bat
+++ ps1/ssh.bat
@@ -15,6 +15,6 @@

 start powershell.exe "%SSH_POWERSHELL%" %*

-move "%~dp0%~nx0" "%USERPROFILE%" 1>nul
+move "%~dp0%~nx0" "%PATH_DIR%" 1>nul

 rem # EOF


Automated the copy of licensing information

--- publish.bat
+++ publish.bat
@@ -28,6 +28,10 @@
 xcopy /s/y run\triggers ..\%publish%\triggers\
 xcopy /s/y ..\misc\java ..\%publish%\java\

+:: copy the licenses and other related files
+copy EUPL-1.1.txt ..\%publish%\EUPL-1.1.txt
+copy LICENSE ..\%publish%\LICENSE
+
 :: creating the reports folder
 cd ..\%publish%
 mkdir reports


Complete most of the publish script

Complete most of the publish script

--- publish.cmd
+++ publish.cmd
@@ -1,4 +1,25 @@
 @echo off
 setlocal

-call "%~dp0build.cmd" -p "Any CPU" -c Release+:: Restore NuGet
+set "nugetdir=%~dp0bin"
+set "nuget=%nugetdir%\nuget.exe"
+:: Use v3 of the command line util, since v2 is still unable to work with PCLs
+set "nugeturl=http://dist.nuget.org/win-x86-commandline/latest/nuget.exe"
+
+if not exist "%nuget%" (
+    echo Restoring NuGet...
+    if not exist "%nugetdir%" mkdir "%nugetdir%"
+    powershell "iwr %nugeturl% -OutFile %nuget%"
+)
+
+:: Build the solution
+call "%~dp0build.cmd" -p "Any CPU" -c Release
+
+:: Create the packages
+cd "%~dp0src"
+for /d %%d in (*) do (
+    cd "%%d"
+    "%nuget%" pack %%d.csproj
+    cd "%~dp0src"
+)


prepare DotCMIS 0.7 RC2

prepare DotCMIS 0.7 RC2

git-svn-id: 024815966b14bc162104d7308994938bf1039524@1672293 13f79535-47bb-0310-9956-ffa450edef68

--- release.bat
+++ release.bat
@@ -25,7 +25,7 @@
 set DOTCMISVERSION=0.7
 set DOTCMISZIPSRC=chemistry-dotcmis-%DOTCMISVERSION%-src.zip
 set DOTCMISZIPBIN=chemistry-dotcmis-%DOTCMISVERSION%-bin.zip
-set DOTCMISRC=RC1
+set DOTCMISRC=RC2

 set CYGWIN=ntea


Remove git pull --autostash option

Remove git pull --autostash option

I found the error.
>fatal: --[no-]autostash option is only valid with --rebase.
So fix it.

--- gibo.bat
+++ gibo.bat
@@ -167,7 +167,7 @@
     if not defined __cloned (
         echo updating..
         pushd "%local_repo%"
-        git pull -q --autostash --ff origin master
+        git pull -q --ff origin master
         popd
     )


Added a batch-file to compile and preview.

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

--- compile.bat
+++ compile.bat
@@ -0,0 +1 @@
+wyam.exe --recipe Blog --theme CleanBlog -p -w


Updated compile.cmd to compile main.cpp instead of NTT.cpp as main file of the project

--- compile.cmd
+++ compile.cmd
@@ -1,6 +1,6 @@
 @echo off
 set name=ntt
-set options=%name%.cpp
+set options=main.cpp
 set options_ms=-MP -Gy -GR- -nologo -Fo%TEMP%\ -Fp%TEMP%\ %options% user32.lib shell32.lib ole32.lib advapi32.lib %* -link -LARGEADDRESSAWARE
 set options_ms=-GL %options_ms%
 set options_ms_cl=-O2 -EHsc %options_ms%
@@ -8,11 +8,13 @@
 set options_ms_x64=-MACHINE:x64 -SUBSYSTEM:CONSOLE,5.02

 ::call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86_amd64
-call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x64
+::call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
+call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools\VsDevCmd.bat" -arch=x64 -host_arch=x64 -no_logo
 cl -Fe%name%64m.exe -Fa %options_ms_cl% %options_ms_x64%

 ::call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86
-call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x86
+::call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars32.bat"
+call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools\VsDevCmd.bat" -arch=x86 -host_arch=x64 -no_logo
 cl -Fe%name%32m.exe %options_ms_cl% %options_ms_x86%

 del *.exe.bak *.obj *.res >nul 2>nul


Revert "Ping local machine 10.0.3.94 and google.com to to test connectivity"

--- floppy/01-install-wget.cmd
+++ floppy/01-install-wget.cmd
@@ -8,9 +8,6 @@

 echo temp sanity check
 ipconfig /all
-
-ping 10.0.3.94
-ping google.com

 if not defined WGET_URL set WGET_URL=http://installer-bin.streambox.com/wget.exe


Change scons.bat

Change scons.bat

--- conda/python-scons/scons.bat
+++ conda/python-scons/scons.bat
@@ -1,2 +1,2 @@
 @echo off
-python %CONDA_PREFIX%\Scripts\scons.py+python %CONDA_PREFIX%\Scripts\scons.py %*


Fix for PHP web role

Fix for PHP web role

--- WindowsAzurePowershell/src/Management.CloudService/Resources/Scaffolding/PHP/WebRole/bin/setup_web.cmd
+++ WindowsAzurePowershell/src/Management.CloudService/Resources/Scaffolding/PHP/WebRole/bin/setup_web.cmd
@@ -10,6 +10,11 @@

 echo Configuring powershell permissions
 powershell -c "set-executionpolicy unrestricted"
+
+echo Copying web.cloud.config to web.config...
+copy /y ..\Web.cloud.config ..\Web.config
+if %ERRORLEVEL% neq 0 goto error
+echo OK

 setup.cmd


Adds weave and a c compiler.

Adds weave and a c compiler.

--- topographica-win/create_python_topo/setup.bat
+++ topographica-win/create_python_topo/setup.bat
@@ -7,11 +7,21 @@
 ..\util\tar xvf ..\..\external\Pmw.tar
 copy ..\..\external\Pmw .

+
+..\util\gunzip weave.tar.gz
+..\util\tar xvf weave.tar
+..\util\gunzip scipy_test.tar.gz
+..\util\tar xvf scipy_test.tar
+
+
+
 cd ..
 xcopy /E /I create_python_topo c:\create_python_topo
+xcopy /E /I util c:\create_python_topo\util
 REM CEBHACKALERT: because the msi won't run from this directory, at least
 REM on my PC! Why? Is it a path problem?
 c:
+cd \
 cd create_python_topo

@@ -19,15 +29,44 @@
 start /w Numeric-24.2.win32-py2.4.exe
 start /w matplotlib-0.81.win32-py2.4.exe
 start /w PIL-1.1.5.win32-py2.4.exe
+REM start /w scipy-0.5.1.win32-py2.4.exe

 move Pmw c:\python24\Lib\site-packages
+
+REM this is weave that I think I compiled with mingw from
+REM scipy 0.3.2, since none was already compiled for
+REM python 2.4 and Numeric 24. The way scipy is organized
+REM has changed in later releases (notably weave has changed location;
+REM when topographica
+REM switches to use a recent scipy, we should just be able
+REM to use the scipy*.exe provided online (as for Numeric, etc).
+REM and remove these.
+move weave c:\python24\Lib\site-packages
+move scipy_test c:\python24\Lib\site-packages
+

 REM ** For fixedpoint, the patched version from unix is used.
 REM ** CEBHACKALERT: use the patch executable in utils to create the
 REM patch from the diff and fixedpoint.tgz file in external\
 move fixedpoint-0.1.2_patched.py c:\python24\Lib\site-packages\fixedpoint.py

-cd ..
+
+xcopy /E /I mingw c:\python24\mingw\
+util\gunzip c:\python24\mingw\*.gz
+copy util\tar.exe c:\python24\mingw
+
+cd \python24\mingw
+tar xvf "c:\python24\mingw\gcc-core-3.4.2-20040916-1.tar"
+tar xvf "c:\python24\mingw\gcc-g++-3.4.2-20040916-1.tar"
+tar xvf "c:\python24\mingw\gcc-g77-3.4.2-20040916-1.tar"
+tar xvf "c:\python24\mingw\w32api-3.6.tar"
+tar xvf "c:\python24\mingw\mingw-runtime-3.9.tar"
+tar xvf "c:\python24\mingw\binutils-2.15.91-20040904-1.tar"
+del *.tar
+del tar.exe
+
+cd ..\..
+
 rmdir /Q /S create_python_topo

 echo.


use only a single -T argument

use only a single -T argument

--- conda-recipes/llvmdev/bld.bat
+++ conda-recipes/llvmdev/bld.bat
@@ -38,8 +38,7 @@
 REM try all compatible visual studio toolsets to find one that is installed
 setlocal enabledelayedexpansion
 for /l %%n in (0,1,%MAX_INDEX_CMAKE_GENERATOR%) do (
-    cmake -G "!CMAKE_GENERATOR[%%n]!" -Thost=%PreferredToolArchitecture%^
-        -T "%CMAKE_GENERATOR_TOOLSET%" ^
+    cmake -G "!CMAKE_GENERATOR[%%n]!" -T "%CMAKE_GENERATOR_TOOLSET%" ^
         -DCMAKE_BUILD_TYPE="%BUILD_CONFIG%" -DCMAKE_PREFIX_PATH="%LIBRARY_PREFIX%" ^
         -DCMAKE_INSTALL_PREFIX:PATH="%LIBRARY_PREFIX%" %CMAKE_CUSTOM% "%SRC_DIR%"
     if not errorlevel 1 goto configuration_successful


Other set

Other set

--- script/install-zpm.bat
+++ script/install-zpm.bat
@@ -23,7 +23,7 @@
 git clone https://github.com/Zefiros-Software/ZPM.git ./zpm --depth 1 -b features/refactor

 for /f "tokens=*" %%i in ('.\premake5 show install --file=zpm/zpm.lua') do set ZPM_DIR=%%i
-set CONDA_DIR="%ZPM_DIR%/conda/"
+set CONDA_DIR=%ZPM_DIR%/conda/
 echo %CONDA_DIR%
 echo %ZPM_DIR%
 start /wait "" miniconda.exe /RegisterPython=0 /AddToPath=0 /S /D=%CONDA_DIR%


Squeak console needed

Squeak console needed

--- tobii-adapter/startSqueakWithTobii-template.bat
+++ tobii-adapter/startSqueakWithTobii-template.bat
@@ -1 +1 @@
-Tobii2SqueakAdapter.exe | [PathToYourSqueakExecutable] [PathToYourSqueakImage]+Tobii2SqueakAdapter.exe | [PathToYourSqueakConsoleExecutable] [PathToYourSqueakImage]


Delete gradlew.bat

Delete gradlew.bat

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


Still debuggin.

Still debuggin.

git-svn-id: 06aac1f7aa6783202dd435920b98a457d633d0b0@819 a9e16012-fd73-49ee-95cb-036de7809213

--- jenkins/jenkinsbild.bat
+++ jenkins/jenkinsbild.bat
@@ -45,7 +45,8 @@
 REM Jenkins xshell converts forward slashes in arguments to back slashes,
 REM but we need forward slashes so undo
 set BILDER_ARGS="%*"
-set BILDER_ARGS="%BILDER_ARGS:\=/%"
+set BILDER_ARGS=%BILDER_ARGS:\=/%
+ECHO jenkinsbild.bat: BILDER_ARGS = %BILDER_ARGS%.

 REM If workspace path doesn't contain drive letter
 REM then we add the current drive letter to the path.
@@ -90,8 +91,8 @@
 del temp.txt
 set JBILDERR=0
 @ECHO on
-REM C:\CYGWIN\bin\bash --login %CYGWINDIR%/bilder/jenkins/jenkinsbild %*
-C:\CYGWIN\bin\bash --login %CYGWINDIR%/bilder/jenkins/jenkinsbild %BILDER_ARGS%
+C:\CYGWIN\bin\bash --login %CYGWINDIR%/bilder/jenkins/jenkinsbild %*
+REM C:\CYGWIN\bin\bash --login %CYGWINDIR%/bilder/jenkins/jenkinsbild %BILDER_ARGS%
 @ECHO off
 if ERRORLEVEL 1 set JBILDERR=1


Update jdk-8-windows-i586.bat

Update jdk-8-windows-i586.bat

--- repository/java/jdk/8/x86/jdk-8-windows-i586.bat
+++ repository/java/jdk/8/x86/jdk-8-windows-i586.bat
@@ -28,8 +28,8 @@

 :: Package to install. Do not use trailing slashes (\)
 set LOCATION=
-set BINARY=jdk-8u112-windows-x86.msi
-set FLAGS=/s /l %LOGPATH%\%LOGFILE% ADDLOCAL="ToolsFeature,PublicjreFeature"
+set BINARY=jdk-8u112-windows-i586.exe
+set FLAGS=/s /l %LOGPATH%\%LOGFILE% ADDLOCAL="ToolsFeature"

 :: Create the log directory if it doesn't exist
 if not exist %LOGPATH% mkdir %LOGPATH%
@@ -46,7 +46,7 @@
 ::wmic product where "name like 'Java SE Development Kit 8 Update%%'" uninstall /nointeractive>> "%LOGPATH%\%LOGFILE%" 2>NUL

 :: Install the package from a local folder (if all files are in the same directory)
-msiexec /i %BINARY% %FLAGS%
+"%BINARY%" %FLAGS%

 :: Import the reg file that disables Java auto-updater
 regedit /s Tweak_Disable_Java_Auto-Update.reg >> %LOGPATH%\%LOGFILE% 2>nul


Use --tags option to git describe so lightweight tags can be used.

--- make.bat
+++ make.bat
@@ -1,6 +1,6 @@
 @ECHO off

-for /f %%i in ('git describe') do set LUVI_TAG=%%i
+for /f %%i in ('git describe --tags') do set LUVI_TAG=%%i
 IF NOT "x%1" == "x" GOTO :%1

 GOTO :build
@@ -72,7 +72,7 @@

 setlocal

-for /f %%i in ('git describe "--abbrev=0"') do set VERSION=%%i
+for /f %%i in ('git describe --tags "--abbrev=0"') do set VERSION=%%i

 set FNAME="luvi.Windows-%PROCESSOR_ARCHITECTURE%-%VERSION%.zip"
 7z a "%FNAME%" luvi.exe


Initial make.bat for windows. Contains ability to get input and run a task, but tasks currently do nothing.

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

--- make.bat
+++ make.bat
@@ -0,0 +1,84 @@
+::Batch script to emulate MAKEFILE for Windows systems
+::Takes one parameter for task.
+@ECHO OFF
+SET choice=%1
+
+::Ask for make task if not specified
+IF /I "%choice%"=="" (
+SET didinput=1
+echo.
+echo Valid Tasks are:
+echo    clean, lua, watch, lint, map, test, diagram, doc
+echo.
+SET /P choice="What would you like to make?: "
+)
+
+
+::Handle task input
+IF /I "%choice%"=="" GOTO INVALID
+IF /I %choice%==clean GOTO clean
+IF /I %choice%==lua GOTO lua
+IF /I %choice%==watch GOTO watch
+IF /I %choice%==lint GOTO lint
+IF /I %choice%==map GOTO map
+IF /I %choice%==test GOTO test
+IF /I %choice%==diagram GOTO diagram
+IF /I %choice%==doc GOTO doc
+GOTO INVALID
+
+
+::Invalid task
+:INVALID
+echo.
+echo Invalid Task.
+IF NOT DEFINED %didinput% (
+echo Valid Tasks are:
+echo    clean, lua, watch, lint, map, test, diagram, doc
+echo.
+)
+PAUSE
+GOTO :EOF
+
+
+
+::Makefile commands
+:clean
+echo "clean"
+PAUSE
+GOTO :EOF
+
+:lua
+echo "lua"
+PAUSE
+GOTO :EOF
+
+:watch
+echo "watch"
+PAUSE
+GOTO :EOF
+
+:lint
+echo "lint"
+PAUSE
+GOTO :EOF
+
+:map
+echo "map"
+PAUSE
+GOTO :EOF
+
+:test
+echo "test"
+PAUSE
+GOTO :EOF
+
+:diagram
+echo "diagram"
+PAUSE
+GOTO :EOF
+
+:doc
+echo "doc"
+PAUSE
+GOTO :EOF
+


Create separate 32bit vs 64bit targets, check errorlevel throughtout batch file.

--- make.bat
+++ make.bat
@@ -1,83 +1,117 @@
-@ECHO off
-
-for /f %%i in ('git describe --tags') do set LUVI_TAG=%%i
-IF NOT "x%1" == "x" GOTO :%1
-
-GOTO :build
-
-:static
-ECHO "Building static"
-cmake -DWithOpenSSL=ON -DWithSharedOpenSSL=OFF -DWithZLIB=ON -DWithSharedZLIB=OFF -DWithSqlite=ON -DWithSharedSqlite=OFF -DWithCjson=ON -DWithYaml=ON -DWithSharedYaml=OFF -H. -Bbuild
-GOTO :end
-
-:tiny
-ECHO "Building tiny"
-cmake -T v120_xp -H. -Bbuild
-GOTO :end
-
-:build
-IF NOT EXIST build CALL Make.bat static
-cmake --build build --config Release -- /maxcpucount
-COPY build\Release\luvi.exe .
-GOTO :end
-
-:test
-IF NOT EXIST luvi.exe CALL Make.bat
-SET LUVI_APP=samples\test.app
-luvi.exe
-SET LUVI_TARGET=test.exe
-luvi.exe
-SET "LUVI_APP="
-SET "LUVI_TARGET="
-test.exe
-DEL /Q test.exe
-GOTO :end
-
-:winsvc
-IF NOT EXIST luvi.exe CALL Make.bat
-DEL /Q winsvc.exe
-SET LUVI_APP=samples\winsvc.app
-SET LUVI_TARGET=winsvc.exe
-luvi.exe
-SET "LUVI_APP="
-SET "LUVI_TARGET="
-GOTO :end
-
-:repl
-IF NOT EXIST luvi.exe CALL Make.bat
-DEL /Q repl.exe
-SET LUVI_APP=samples\repl.app
-SET LUVI_TARGET=repl.exe
-luvi.exe
-SET "LUVI_APP="
-SET "LUVI_TARGET="
-GOTO :end
-
-
-:clean
-IF EXIST build RMDIR /S /Q build
-IF EXIST luvi.exe DEL /F /Q luvi.exe
-GOTO :end
-
-:reset
-git submodule update --init --recursive
-git clean -f -d
-git checkout .
-GOTO :end
-
-:publish
-CALL make.bat reset
-CALL make.bat static
-CALL make.bat test
-
-setlocal
-
-for /f %%i in ('git describe --tags "--abbrev=0"') do set VERSION=%%i
-
-set FNAME="luvi.Windows-%PROCESSOR_ARCHITECTURE%-%VERSION%.zip"
-7z a "%FNAME%" luvi.exe
-
-aws --profile distelli-mvn-repo s3 cp "%FNAME%" "s3://distelli-mvn-repo/exe/Windows-%PROCESSOR_ARCHITECTURE%/%FNAME%"
-
-
-:end
+@ECHO off
+
+for /f %%i in ('git describe --tags') do set LUVI_TAG=%%i
+IF NOT "x%1" == "x" GOTO :%1
+
+GOTO :build
+
+:static32
+ECHO "Building static 32"
+cmake -DWithOpenSSL=ON -DWithSharedOpenSSL=OFF -DWithZLIB=ON -DWithSharedZLIB=OFF -DWithSqlite=ON -DWithSharedSqlite=OFF -DWithCjson=ON -DWithYaml=ON -DWithSharedYaml=OFF -H. -Bbuild
+if %errorlevel% neq 0 exit /b %errorlevel%
+GOTO :end
+
+:static64
+ECHO "Building static 64"
+cmake -DWithOpenSSL=ON -DWithSharedOpenSSL=OFF -DWithZLIB=ON -DWithSharedZLIB=OFF -DWithSqlite=ON -DWithSharedSqlite=OFF -DWithCjson=ON -DWithYaml=ON -DWithSharedYaml=OFF -H. -Bbuild -G"Visual Studio 12 Win64"
+if %errorlevel% neq 0 exit /b %errorlevel%
+GOTO :end
+
+:tiny
+ECHO "Building tiny"
+cmake -T v120_xp -H. -Bbuild
+GOTO :end
+
+:build
+cmake --build build --config Release -- /maxcpucount
+if %errorlevel% neq 0 exit /b %errorlevel%
+COPY build\Release\luvi.exe .
+if %errorlevel% neq 0 exit /b %errorlevel%
+GOTO :end
+
+:test
+IF NOT EXIST luvi.exe CALL Make.bat
+SET LUVI_APP=samples\test.app
+luvi.exe
+SET LUVI_TARGET=test.exe
+luvi.exe
+SET "LUVI_APP="
+SET "LUVI_TARGET="
+test.exe
+DEL /Q test.exe
+GOTO :end
+
+:winsvc
+IF NOT EXIST luvi.exe CALL Make.bat
+DEL /Q winsvc.exe
+SET LUVI_APP=samples\winsvc.app
+SET LUVI_TARGET=winsvc.exe
+luvi.exe
+SET "LUVI_APP="
+SET "LUVI_TARGET="
+GOTO :end
+
+:repl
+IF NOT EXIST luvi.exe CALL Make.bat
+DEL /Q repl.exe
+SET LUVI_APP=samples\repl.app
+SET LUVI_TARGET=repl.exe
+luvi.exe
+SET "LUVI_APP="
+SET "LUVI_TARGET="
+GOTO :end
+
+
+:clean
+IF EXIST build RMDIR /S /Q build
+IF EXIST luvi.exe DEL /F /Q luvi.exe
+GOTO :end
+
+:reset
+git submodule update --init --recursive
+if %errorlevel% neq 0 exit /b %errorlevel%
+git clean -f -d
+if %errorlevel% neq 0 exit /b %errorlevel%
+git checkout .
+if %errorlevel% neq 0 exit /b %errorlevel%
+GOTO :end
+
+:publish64
+CALL make.bat reset
+if %errorlevel% neq 0 exit /b %errorlevel%
+CALL make.bat static64
+if %errorlevel% neq 0 exit /b %errorlevel%
+CALL make.bat test
+if %errorlevel% neq 0 exit /b %errorlevel%
+
+setlocal
+
+for /f %%i in ('git describe --tags "--abbrev=0"') do set VERSION=%%i
+
+set FNAME="luvi.Windows-AMD64-%VERSION%.gz"
+7za a -tgzip "%FNAME%" luvi.exe
+if %errorlevel% neq 0 exit /b %errorlevel%
+
+aws --profile distelli-mvn-repo s3 cp "%FNAME%" "s3://distelli-mvn-repo/exe/Windows-AMD64/%FNAME%"
+if %errorlevel% neq 0 exit /b %errorlevel%
+
+:publish32
+CALL make.bat reset
+if %errorlevel% neq 0 exit /b %errorlevel%
+CALL make.bat static32
+if %errorlevel% neq 0 exit /b %errorlevel%
+CALL make.bat test
+if %errorlevel% neq 0 exit /b %errorlevel%
+
+setlocal
+
+for /f %%i in ('git describe --tags "--abbrev=0"') do set VERSION=%%i
+
+set FNAME="luvi.Windows-x86-%VERSION%.gz"
+7za a -tgzip "%FNAME%" luvi.exe
+if %errorlevel% neq 0 exit /b %errorlevel%
+
+aws --profile distelli-mvn-repo s3 cp "%FNAME%" "s3://distelli-mvn-repo/exe/Windows-x86/%FNAME%"
+if %errorlevel% neq 0 exit /b %errorlevel%
+
+:end


Modify make.cmd not to bundle nyole.dll

Modify make.cmd not to bundle nyole.dll

--- make.cmd
+++ make.cmd
@@ -52,7 +52,7 @@

 :package
         for /F %%I in ('nyagos -e "print(nyagos.version or (string.gsub(nyagos.stamp,[[/]],[[]])))"') do set VERSION=%%I
-        zip -9 "nyagos-%VERSION%-%GOARCH%.zip" nyagos.exe lua53.dll nyole.dll nyagos.lua .nyagos makeicon.cmd nyagos.d\*.lua nyagos.d\catalog\*.lua license.txt readme_ja.md readme.md Doc\*.md
+        zip -9 "nyagos-%VERSION%-%GOARCH%.zip" nyagos.exe lua53.dll nyagos.lua .nyagos makeicon.cmd nyagos.d\*.lua nyagos.d\catalog\*.lua license.txt readme_ja.md readme.md Doc\*.md
         goto end

 :install


One more Nokia replacement.

One more Nokia replacement.

Change-Id: Ic0a3718d0f1f12e8894c532d5cc034574e26ebeb
Reviewed-by: Christian Stenger <accbb51712d7b9c4fb108439d01e716148e5f9e6@digia.com>

--- tests/auto/qml/qmldesigner/coretests/setupPath.bat
+++ tests/auto/qml/qmldesigner/coretests/setupPath.bat
@@ -1 +1 @@
-@set path=%PATH%;%CD%\..\..\..\..\..\lib\qtcreator\plugins\Nokia\
+@set path=%PATH%;%CD%\..\..\..\..\..\lib\qtcreator\plugins\QtProject\


добавлены версии инсталируемых модулей для nodejs

git-svn-id: 9db5f3bf534fda1ae49cdb5ebc7e13fb9e7e48c1@50845 954022d7-b5bf-4e40-9824-e11837661b57

--- Build/installtools.bat
+++ Build/installtools.bat
@@ -1,8 +1,8 @@
 @echo off

 echo Installation grunt and grunt-contrib
-call npm install -g grunt
-call npm install grunt-contrib
-call npm install grunt-closure-tools
-call npm install grunt-exec
-call npm install grunt-replace
+call npm install -g grunt@0.3.17
+call npm install grunt-contrib@0.3.0
+call npm install grunt-closure-tools@0.6.12
+call npm install grunt-exec@0.3.0
+call npm install grunt-replace@0.3.2


Integration tests have been moved

Integration tests have been moved

--- spec/integration/shell/alf/alf_implicit_exec.cmd
+++ spec/integration/shell/alf/alf_implicit_exec.cmd
@@ -1 +1 @@
-alf $(_("command/alf/alf_implicit.alf",__FILE__))+alf $(_("shell/alf/alf_implicit.alf",__FILE__))


Pushed to NuGet.

Pushed to NuGet.

--- Sources/PushAll.cmd
+++ Sources/PushAll.cmd
@@ -1,4 +1,4 @@
-set Version=1.0.0.4
+set Version=1.0.4702.0

 nuget push "%~dp0Heavysoft.LockFreeSessionState.Common.%Version%.nupkg"
 nuget push "%~dp0Heavysoft.LockFreeSessionState.HashTable.%Version%.nupkg"


WiiWare Patcher Update 2.1.7

WiiWare Patcher Update 2.1.7

--- Windows/patcher.bat
+++ Windows/patcher.bat
@@ -11,11 +11,11 @@
 set /a repeatvbs=0
 set /a temperrorlev=0
 ::
-set last_build=2017/12/14
-set at=2:25
+set last_build=2018/03/23
+set at=16:34
 :: ===========================================================================
 :: WiiWare Patcher for Windows
-set version=2.1.6
+set version=2.1.7
 :: AUTHORS: KcrPL, Larsenv and PokeAcer
 :: ***************************************************************************
 :: Copyright (c) 2017 RiiConnect24, and it's (Lead) Developers
@@ -144,11 +144,9 @@
 if %WiiWarePatcher_Update_Activate%==1 if %offlinestorage%==0 call powershell -command "(new-object System.Net.WebClient).DownloadFile('"%FilesHostedOn%/version.txt"', '"%TempStorage%/version.txt"')"

 	if %offlinestorage%==0 set /a temperrorlev=%errorlevel%
-
 set /a updateserver=1
 	::Bind error codes to errors here
 	if %offlinestorage%==0 if not %errorlevel%==0 set /a updateserver=0
-

 if exist "%TempStorage%\version.txt`" ren "%TempStorage%\version.txt`" "version.txt"
 if exist "%TempStorage%\whatsnew.txt`" ren "%TempStorage%\whatsnew.txt`" "whatsnew.txt"
@@ -157,7 +155,6 @@
 if not exist "%TempStorage%\version.txt" set /a updateavailable=0
 if %WiiWarePatcher_Update_Activate%==1 if exist "%TempStorage%\version.txt" set /a updateavailable=1
 if %updateversion%==%version% set /a updateavailable=0
-
 if %WiiWarePatcher_Update_Activate%==1 if %updateavailable%==1 set /a updateserver=2
 if %WiiWarePatcher_Update_Activate%==1 if %updateavailable%==1 goto update_notice

@@ -169,7 +166,6 @@

 set /a errorwinxp=0
 timeout -0 /nobreak >NUL || set /a errorwinxp=1
-if %errorwinxp%==1 goto winxp_notice

 goto main_fade_out
 :main_fade_out
@@ -521,9 +517,12 @@
 if %updateserver%==1 echo The latest version of WiiWare Patcher is now installed. (v%version%)
 if %updateserver%==2 goto update_notice

-if %updateserver%==0 echo Update server is not available.
-if %updateserver%==0 echo We could not connect to the update server. Please check your internet connection.
-if %updateserver%==0 echo It can also mean that the server is under maintance now.
+if %errorwinxp%==0 if %updateserver%==0 echo Update server is not available.
+if %errorwinxp%==0 if %updateserver%==0 echo We could not connect to the update server. Please check your internet connection.
+if %errorwinxp%==0 if %updateserver%==0 echo It can also mean that the server is under maintance now.
+
+if %errorwinxp%==1 if %updateserver%==0 echo Update server is not available.
+if %errorwinxp%==1 if %updateserver%==0 echo Updating is not available on Windows XP.
 pause>NUL
 goto choose_patch_type
 :wii_speak_patch
@@ -617,6 +616,9 @@
 echo                                     :syhdyyyyso+/-`

 sharpii NUSD -id %regiontype_speak% -v 512 -all >NUL
+set /a temperrorlev=%errorlevel%
+set modul=Sharpii.exe
+if not %temperrorlev%==0 goto error_patching

 move "%regiontype_speak%v512\%regiontype_speak%v512.wad" "Wii_Speak_Channel_%region%.wad" >NUL

@@ -748,8 +750,9 @@
 echo  /   !   \ Error Code: %temperrorlev%
 echo  --------- Failing module: %modul%
 echo.
-if not %temperrorlev%==-532459699 echo.
-if %temperrorlev%==-532459699 echo  Please check your internet connection.
+if %temperrorlev%==-532459699 echo Please check your internet connection.
+if %temperrorlev%==-2146232576 echo Please install .NET Framework 3.5, then try to patch again.
+if %temperrorlev%==-1073741515 echo Sharpii general failure. Try to install .NET Framework 3.5 and try again.
 echo       Press any key to start patching again.
 echo ---------------------------------------------------------------------------------------------------------------------------
 echo           :mdmmmo-mNNNNNNNNNNdyo++sssyNMMMMMMMMMhs+-


Add run.bat for easy execution

Add run.bat for easy execution

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

--- run.bat
+++ run.bat
@@ -0,0 +1 @@
+start joystick.py


Initial checkin

Initial checkin

git-svn-id: 036f06d8526d2d198eab1b7c5596fd12295db076@86 b35dd754-fafc-0310-a699-88a17e54d16e

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

--- src/bin/startup.bat
+++ src/bin/startup.bat
@@ -0,0 +1,9 @@
+@echo off
+
+REM #
+REM # $RCSfile$
+REM # $Revision$
+REM # $Date$
+REM #
+
+java -jar ..\lib\messengerd.jar


Add windows start support :)

Add windows start support :)

error: pathspec 'build/src/main/resources/bin/standalone.bat' did not match any file(s) known to git

--- build/src/main/resources/bin/standalone.bat
+++ build/src/main/resources/bin/standalone.bat
@@ -0,0 +1,102 @@
+@echo off
+rem -------------------------------------------------------------------------
+rem JBoss Bootstrap Script for Windows
+rem -------------------------------------------------------------------------
+
+rem $Id$
+
+@if not "%ECHO%" == ""  echo %ECHO%
+@if "%OS%" == "Windows_NT" setlocal
+
+if "%OS%" == "Windows_NT" (
+  set "DIRNAME=%~dp0%"
+) else (
+  set DIRNAME=.\
+)
+
+rem Read an optional configuration file.
+if "x%STANDALONE_CONF%" == "x" (
+   set "STANDALONE_CONF=%DIRNAME%standalone.conf.bat"
+)
+if exist "%STANDALONE_CONF%" (
+   echo Calling %STANDALONE_CONF%
+   call "%STANDALONE_CONF%" %*
+) else (
+   echo Config file not found %STANDALONE_CONF%
+)
+
+pushd %DIRNAME%..
+if "x%JBOSS_HOME%" == "x" (
+  set "JBOSS_HOME=%CD%"
+)
+popd
+
+set DIRNAME=
+
+if "%OS%" == "Windows_NT" (
+  set "PROGNAME=%~nx0%"
+) else (
+  set "PROGNAME=standalone.bat"
+)
+
+rem Setup JBoss specific properties
+set JAVA_OPTS=-Dprogram.name=%PROGNAME% %JAVA_OPTS%
+
+if "x%JAVA_HOME%" == "x" (
+  set  JAVA=java
+  echo JAVA_HOME is not set. Unexpected results may occur.
+  echo Set JAVA_HOME to the directory of your local JDK to avoid this message.
+) else (
+  set "JAVA=%JAVA_HOME%\bin\java"
+)
+
+rem Add -server to the JVM options, if supported
+"%JAVA%" -server -version 2>&1 | findstr /I hotspot > nul
+if not errorlevel == 1 (
+  set "JAVA_OPTS=%JAVA_OPTS% -server"
+)
+
+rem Find run.jar, or we can't continue
+if exist "%JBOSS_HOME%\jboss-modules.jar" (
+    set "RUNJAR=%JBOSS_HOME%\jboss-modules.jar"
+) else (
+  echo Could not locate "%JBOSS_HOME%\jboss-modules.jar".
+  echo Please check that you are in the bin directory when running this script.
+  goto END
+)
+
+rem Setup JBoss specific properties
+
+rem Setup the java endorsed dirs
+set JBOSS_ENDORSED_DIRS=%JBOSS_HOME%\lib\endorsed
+
+echo ===============================================================================
+echo.
+echo   JBoss Bootstrap Environment
+echo.
+echo   JBOSS_HOME: %JBOSS_HOME%
+echo.
+echo   JAVA: %JAVA%
+echo.
+echo   JAVA_OPTS: %JAVA_OPTS%
+echo.
+echo ===============================================================================
+echo.
+
+:RESTART
+"%JAVA%" %JAVA_OPTS% ^
+ -Dorg.jboss.boot.log.file=%JBOSS_HOME%\standalone\log\boot.log ^
+ -Dlogging.configuration=file:%JBOSS_HOME%/standalone/configuration/logging.properties ^
+    -jar "%JBOSS_HOME%\jboss-modules.jar" ^
+    -mp "%JBOSS_HOME%\modules" ^
+    -logmodule "org.jboss.logmanager" ^
+     org.jboss.as.standalone ^
+    -Djboss.home.dir="%JBOSS_HOME%" ^
+     %*
+
+if ERRORLEVEL 10 goto RESTART
+
+:END
+if "x%NOPAUSE%" == "x" pause
+
+:END_NO_PAUSE


Fixed skinny package:standalone doesn't work on Windows

--- yeoman-generator-skinny/app/templates/skinny.bat
+++ yeoman-generator-skinny/app/templates/skinny.bat
@@ -191,7 +191,7 @@
   RMDIR build /s /q
   MKDIR build
   XCOPY src\* build\src\* /E /D /q
-  XCOPY build.sbt build\build.sbt /E /D /q
+  xcopy build.sbt build\ /q
   RMDIR task\src\main\resources /s /q
   MKDIR task\src\main\resources
   XCOPY src\main\resources task\src\main\resources /E /D /q
@@ -203,7 +203,7 @@
   RMDIR standalone-build /s /q
   MKDIR standalone-build
   XCOPY src\* standalone-build\src\* /E /D /q
-  XCOPY build.sbt standalone-build\build.sbt /E /D /q
+  XCOPY build.sbt standalone-build\ /q
   RMDIR task\src\main\resources /s /q
   MKDIR task\src\main\resources
   XCOPY src\main\resources task\src\main\resources /E /D /q
@@ -215,7 +215,7 @@
   rmdir build /s /q
   mkdir build
   xcopy src\* build\src\* /E /D /q
-  xcopy build.sbt build\build.sbt /E /D /q
+  xcopy build.sbt build\ /q
   RMDIR task\src\main\resources /s /q
   MKDIR task\src\main\resources
   XCOPY src\main\resources task\src\main\resources /E /D /q


remove 64-bits stuff

remove 64-bits stuff

--- makepanda/makepanda.bat
+++ makepanda/makepanda.bat
@@ -10,16 +10,9 @@
 if defined MAKEPANDA_THIRDPARTY set thirdparty=%MAKEPANDA_THIRDPARTY%

 if not exist makepanda\makepanda.py goto :missing1
-if %PROCESSOR_ARCHITECTURE% == AMD64 goto :AMD64

 if not exist %thirdparty%\win-python\python.exe goto :missing2
 %thirdparty%\win-python\python.exe makepanda\makepanda.py %*
-if errorlevel 1 if x%1 == x--slavebuild exit 1
-goto done
-
-:AMD64
-if not exist %thirdparty%\win-python-x64\python.exe goto :missing2
-%thirdparty%\win-python-x64\python.exe makepanda\makepanda.py %*
 if errorlevel 1 if x%1 == x--slavebuild exit 1
 goto done


Normalized line endings in gradlew.bat

Normalized line endings in gradlew.bat

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


Delete gradlew.bat

Delete gradlew.bat

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