Reverted to local nuget instance as can't get environment nuget to work

--- build.bat
+++ build.bat
@@ -1,12 +1,7 @@
 @echo Off

-set nuget=
-if "%nuget%" == "" (
-    set nuget=nuget
-)
-
 echo BUILD.BAT - NuGet package restore started.
-"%nuget%" restore ".\src\OneCog.Io.Onkyo.sln" -OutputDirectory ".\src\packages"
+".\src\.nuget\NuGet.exe" restore ".\src\OneCog.Io.Onkyo.sln" -OutputDirectory ".\src\packages"
 echo BUILD.BAT - NuGet package restore finished.

 echo BUILD.BAT - FAKE build started.


Change SKIP_DOTNET_INSTALL to SKIP_KRE_INSTALL

--- build.cmd
+++ build.cmd
@@ -19,7 +19,7 @@
 .nuget\NuGet.exe install KoreBuild -ExcludeVersion -o packages -nocache -pre
 .nuget\NuGet.exe install Sake -version 0.2 -o packages -ExcludeVersion

-IF "%SKIP_DOTNET_INSTALL%"=="1" goto run
+IF "%SKIP_KRE_INSTALL%"=="1" goto run
 CALL packages\KoreBuild\build\kvm upgrade -runtime CLR -x86
 CALL packages\KoreBuild\build\kvm install default -runtime CoreCLR -x86


added build script for NuGet packaging

added build script for NuGet packaging

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

--- build.cmd
+++ build.cmd
@@ -0,0 +1,41 @@
+@ECHO OFF
+SET PATH=%PATH%;%SystemRoot%\Microsoft.NET\Framework\v4.0.30319
+
+PUSHD %~dp0
+
+WHERE msbuild >nul 2>nul
+IF %ERRORLEVEL% NEQ 0 (
+	ECHO MSBuild not found. Aborting.
+	GOTO ERROR
+)
+
+WHERE nuget >nul 2>nul
+IF %ERRORLEVEL% NEQ 0 (
+  ECHO NuGet not found. Aborting.
+  GOTO ERROR
+)
+
+CALL nuget restore .\Mastersign.Expressions.sln
+IF %ERRORLEVEL% NEQ 0 (
+	ECHO Installing NuGet dependencies failed. Aborting.
+	GOTO ERROR
+)
+
+CALL msbuild .\Mastersign.Expressions.sln /v:minimal /p:Configuration=Release
+IF %ERRORLEVEL% NEQ 0 (
+	ECHO Building solution failed. Aborting.
+	GOTO ERROR
+)
+
+PUSHD .\Mastersign.Expressions
+CALL nuget pack Mastersign.Expressions.csproj -Prop Configuration=Release -OutputDirectory ..\releases -Verbosity quiet
+POPD
+
+GOTO END
+
+:ERROR
+POPD
+EXIT /B 1
+
+:END
+POPD


Updated build script.

Updated build script.

--- build.cmd
+++ build.cmd
@@ -32,8 +32,7 @@
 SET FILES_TO_MERGE=%FILES_TO_MERGE% "src\proj\EventStore.Core\bin\%TARGET_CONFIG%\EventStore.Core.dll"
 SET FILES_TO_MERGE=%FILES_TO_MERGE% "src\proj\EventStore.Serialization\bin\%TARGET_CONFIG%\EventStore.Serialization.dll"
 SET FILES_TO_MERGE=%FILES_TO_MERGE% "src\proj\EventStore.Serialization\bin\%TARGET_CONFIG%\protobuf-net.dll"
-SET FILES_TO_MERGE=%FILES_TO_MERGE% "src\proj\EventStore.SqlStorage\bin\%TARGET_CONFIG%\EventStore.SqlStorage.dll"
-SET FILES_TO_MERGE=%FILES_TO_MERGE% "src\proj\EventStore.SqlStorage.DynamicSql\bin\%TARGET_CONFIG%\EventStore.SqlStorage.DynamicSql.dll"
+SET FILES_TO_MERGE=%FILES_TO_MERGE% "src\proj\EventStore.Persistence.SqlPersistence\bin\%TARGET_CONFIG%\EventStore.Persistence.SqlPersistence.dll"

 REM Echo exclude regex to exclude file *WITHOUT* any line breaks
 (echo.|set /p =EventStore.*)>exclude.txt


fix build script to use msbuild 14

fix build script to use msbuild 14

--- build.cmd
+++ build.cmd
@@ -16,6 +16,7 @@
 	)
 )

+set PATH=C:\Program Files (x86)\MSBuild\14.0\Bin;%PATH%

 if "%nuget%" == "" (
   set nuget=nuget.exe
@@ -28,7 +29,7 @@

 ECHO Running MSBUILD
 REM Build
-"%WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild" IsValid.sln /p:Configuration="%config%" /m /v:M /fl /flp:LogFile=msbuild.log;Verbosity=Normal /nr:false
+msbuild IsValid.sln /p:Configuration="%config%" /m /v:M /fl /flp:LogFile=msbuild.log;Verbosity=Normal /nr:false

 REM Package
 ECHO Building pacakges
@@ -39,12 +40,12 @@

 :success
 ECHO successfully built project
-exit 0
+REM exit 0
 goto end

 :failure
 ECHO failed to build.
-exit -1
+REM exit -1
 goto end

 :end


Sending build batch script tail args to MSBUILD

--- build.cmd
+++ build.cmd
@@ -30,4 +30,4 @@
     echo solution.
     exit /b 1
 )
-for %%i in (debug release) do if exist "%MSBUILDEXE%" "%MSBUILDEXE%" Elmah.sln /p:Configuration=%%i
+for %%i in (debug release) do if exist "%MSBUILDEXE%" "%MSBUILDEXE%" Elmah.sln /p:Configuration=%%i %*


NOJIRA: reverting the build script to point to universal master.

--- build.cmd
+++ build.cmd
@@ -10,7 +10,7 @@

 if not exist ..\node_modules\universal (
     cd ..\node_modules
-    git clone git://github.com/GPII/universal.git -b v0.2
+    git clone git://github.com/GPII/universal.git
     cd universal
     npm install
     cd ..\..\windows


Update BuildLib 0.3.1

Update BuildLib 0.3.1

--- build.cmd
+++ build.cmd
@@ -12,10 +12,10 @@
   COPY NUL %PACKAGEPATH%FAKE\Ver_4.25.4
 )

-IF NOT EXIST %PACKAGEPATH%FAKE.BuildLib\Ver_0.3.0 (
+IF NOT EXIST %PACKAGEPATH%FAKE.BuildLib\Ver_0.3.1 (
   RD /S/Q %PACKAGEPATH%FAKE.BuildLib
-  %NUGET% install FAKE.BuildLib -Version 0.3.0 %NUGETOPTIONS%
-  COPY NUL %PACKAGEPATH%FAKE.BuildLib\Ver_0.3.0
+  %NUGET% install FAKE.BuildLib -Version 0.3.1 %NUGETOPTIONS%
+  COPY NUL %PACKAGEPATH%FAKE.BuildLib\Ver_0.3.1
 )

 set encoding=utf-8


Fix casing

Fix casing

--- build.cmd
+++ build.cmd
@@ -1,6 +1,6 @@
 @echo off

-for /d %%F in ("%ProgramFiles(x86)%\Microsoft Visual Studio\2017\*") DO (
+for /d %%F in ("%ProgramFiles(x86)%\Microsoft Visual Studio\2017\*") do (
  set MSBuild="%%F\MSBuild\15.0\Bin\MSBuild.exe"
  goto validate
 )


Remove unsupported `-c` switch from `dotnet restore`

--- build.cmd
+++ build.cmd
@@ -662,8 +662,8 @@

 if "%NEEDS_DOTNET_CLI_TOOLS%" == "1" (
     :: Restore projects using dotnet CLI tool
-    echo %_dotnet20exe% restore -v:d build-everything.proj -c Proto %msbuildflags% %BUILD_DIAG%
-         %_dotnet20exe% restore -v:d build-everything.proj -c Proto %msbuildflags% %BUILD_DIAG%
+    echo %_dotnet20exe% restore -v:d build-everything.proj %msbuildflags% %BUILD_DIAG%
+         %_dotnet20exe% restore -v:d build-everything.proj %msbuildflags% %BUILD_DIAG%
 )


integrate

integrate

--- build.cmd
+++ build.cmd
@@ -566,7 +566,9 @@
 pushd tests

-setlocal DISABLEDELAYEDEXPANSION
+rem Turn off delayed expansion when manipulating variables where a ! may appear in the argument text (CMD batch file oddity)
+rem Note: each setlocal must be matched by an executed endlocal
+setlocal disableDelayedExpansion
 if "%INCLUDE_TEST_SPEC_NUNIT%" == "" (
     if NOT "%EXCLUDE_TEST_SPEC_NUNIT%" == "" (
         set WHERE_ARG_NUNIT=--where "!(%EXCLUDE_TEST_SPEC_NUNIT%)"
@@ -587,7 +589,9 @@
     set EXCLUDE_ARG_RUNALL=-nottags:%EXCLUDE_TEST_TAGS%
 )
 echo WHERE_ARG_NUNIT=%WHERE_ARG_NUNIT%
-setlocal ENABLEDELAYEDEXPANSION
+rem Re-enable delayed expansion. We can't use endlocal here since we want to keep the variables we've computed.
+rem Note: each setlocal must be matched by an executed endlocal
+setlocal enableDelayedExpansion

 set NUNITPATH=%~dp0tests\fsharpqa\testenv\bin\nunit\
@@ -620,7 +624,8 @@
 set command="%NUNIT3_CONSOLE%" --verbose "%FSCBINPATH%\FSharp.Tests.FSharp.dll" --framework:V4.0 --work:"%FSCBINPATH%"  --output:"!OUTPUTFILE!" --err:"!ERRORFILE!" --result:"!XMLFILE!;format=nunit2"

 if '%TEST_NET40_FSHARP_SUITE%' == '1' (
-    rem Turn off delayed expansion because a ! may appear in the argument text (!!!!!)
+	rem Turn off delayed expansion when manipulating variables where a ! may appear in the argument text (CMD batch file oddity)
+	rem Note: each setlocal must be matched by an executed endlocal
 	setlocal disableDelayedExpansion
     echo %command% %WHERE_ARG_NUNIT%
          %command%  %WHERE_ARG_NUNIT%
@@ -736,7 +741,8 @@
 set command="%NUNIT3_CONSOLE%" --verbose --framework:V4.0 --result:"!XMLFILE!;format=nunit2" --output:"!OUTPUTFILE!" --err:"!ERRORFILE!" --work:"%FSCBINPATH%" "%FSCBINPATH%\..\..\net40\bin\FSharp.Compiler.Unittests.dll"
 if '%TEST_NET40_COMPILERUNIT_SUITE%' == '1' (

-    rem Turn off delayed expansion because a ! may appear in the argument text (!!!!!)
+	rem Turn off delayed expansion when manipulating variables where a ! may appear in the argument text (CMD batch file oddity)
+	rem Note: each setlocal must be matched by an executed endlocal
 	setlocal disableDelayedExpansion
     echo %command% %WHERE_ARG_NUNIT%
          %command%  %WHERE_ARG_NUNIT%
@@ -759,7 +765,8 @@
 set command="%NUNIT3_CONSOLE%" --verbose --framework:V4.0 --result:"!XMLFILE!;format=nunit2" --output:"!OUTPUTFILE!" --err:"!ERRORFILE!" --work:"%FSCBINPATH%" "%FSCBINPATH%\FSharp.Core.Unittests.dll"
 if '%TEST_NET40_COREUNIT_SUITE%' == '1' (

-    rem Turn off delayed expansion because a ! may appear in the argument text (!!!!!)
+	rem Turn off delayed expansion when manipulating variables where a ! may appear in the argument text (CMD batch file oddity)
+	rem Note: each setlocal must be matched by an executed endlocal
 	setlocal disableDelayedExpansion
     echo %command% %WHERE_ARG_NUNIT%
          %command%  %WHERE_ARG_NUNIT%
@@ -782,7 +789,8 @@
 set command="%NUNIT3_CONSOLE%" /framework:V4.0 /result="!XMLFILE!;format=nunit2" /output="!OUTPUTFILE!" /err="!ERRORFILE!" /work="%FSCBINPATH%" "%FSCBINPATH%\..\..\portable7\bin\FSharp.Core.Unittests.dll" "%FSCBINPATH%\..\..\portable47\bin\FSharp.Core.Unittests.dll" "%FSCBINPATH%\..\..\portable78\bin\FSharp.Core.Unittests.dll" "%FSCBINPATH%\..\..\portable259\bin\FSharp.Core.Unittests.dll"

 if '%TEST_PORTABLE_COREUNIT_SUITE%' == '1' (
-    rem Turn off delayed expansion because a ! may appear in the argument text (!!!!!)
+	rem Turn off delayed expansion when manipulating variables where a ! may appear in the argument text (CMD batch file oddity)
+	rem Note: each setlocal must be matched by an executed endlocal
 	setlocal disableDelayedExpansion
     echo %command% %WHERE_ARG_NUNIT%
          %command%  %WHERE_ARG_NUNIT%
@@ -810,7 +818,8 @@
 set command="!CORERUNPATH!\corerun.exe" "%~dp0tests\testbin\!BUILD_CONFIG!\coreclr\fsharp.core.unittests\FSharp.Core.Unittests.exe"
 if '%TEST_CORECLR_COREUNIT_SUITE%' == '1' (

-    rem Turn off delayed expansion because a ! may appear in the argument text (!!!!!)
+	rem Turn off delayed expansion when manipulating variables where a ! may appear in the argument text (CMD batch file oddity)
+	rem Note: each setlocal must be matched by an executed endlocal
 	setlocal disableDelayedExpansion
     echo %command% %WHERE_ARG_NUNIT%
          %command%  %WHERE_ARG_NUNIT%
@@ -837,7 +846,8 @@
 set command="%NUNIT3_CONSOLE%" --verbose "%FSCBINPATH%\..\..\coreclr\bin\FSharp.Tests.FSharp.dll" --framework:V4.0 --work:"%FSCBINPATH%"  --output:"!OUTPUTFILE!" --err:"!ERRORFILE!" --result:"!XMLFILE!;format=nunit2"

 if '%TEST_CORECLR_FSHARP_SUITE%' == '1' (
-    rem Turn off delayed expansion because a ! may appear in the argument text (!!!!!)
+	rem Turn off delayed expansion when manipulating variables where a ! may appear in the argument text (CMD batch file oddity)
+	rem Note: each setlocal must be matched by an executed endlocal
 	setlocal disableDelayedExpansion
     echo %command% %WHERE_ARG_NUNIT%
          %command%  %WHERE_ARG_NUNIT%
@@ -861,7 +871,8 @@

 set command="%NUNIT3_CONSOLE%" --verbose --x86 --framework:V4.0 --result:"!XMLFILE!;format=nunit2" --output:"!OUTPUTFILE!" --err:"!ERRORFILE!" --work:"%FSCBINPATH%"  --workers=1 --agents=1 --full "%FSCBINPATH%\VisualFSharp.Unittests.dll"
 if '%TEST_VS_IDEUNIT_SUITE%' == '1' (
-    rem Turn off delayed expansion because a ! may appear in the argument text (!!!!!)
+	rem Turn off delayed expansion when manipulating variables where a ! may appear in the argument text (CMD batch file oddity)
+	rem Note: each setlocal must be matched by an executed endlocal
 	pushd %FSCBINPATH%
 	setlocal disableDelayedExpansion
     echo %command% %WHERE_ARG_NUNIT%


Fixed a bug in build.cmd: now we call pip as a python module instead of a cmd command to avoid the trouble adding new vars to system path

--- build.cmd
+++ build.cmd
@@ -54,12 +54,13 @@

 cd apps\rDSN.monitor
 echo "[rDSN.Python] install dependency packages"
-pip install -r requirement.txt || echo "install dependency packages failed!" && exit /b
+python -m pip install -r requirement.txt || echo "install dependency packages failed!" && exit /b

 cd ..\..\..
+echo "[rDSN.Python] Successfully installed."
 goto exit

 :error
     CALL %bin_dir%\echoc.exe 4  "Usage: build.cmd build_type(Debug|Release|RelWithDebInfo|MinSizeRel) build_dir"

-:exit+:exit


try multiproc build (#3068)

try multiproc build (#3068)

--- build.cmd
+++ build.cmd
@@ -527,8 +527,8 @@
     git fetch --all
 )

-REM set msbuildflags=/maxcpucount %_nrswitch% /nologo
-set msbuildflags=%_nrswitch% /nologo
+set msbuildflags=/maxcpucount %_nrswitch% /nologo
+REM set msbuildflags=%_nrswitch% /nologo
 set _ngenexe="%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\ngen.exe"
 if not exist %_ngenexe% echo Error: Could not find ngen.exe. && goto :failure


Update build script to react to dnvm changes

--- build.cmd
+++ build.cmd
@@ -30,7 +30,7 @@
 IF %BUILDCMD_DNX_VERSION%=="" (
 	CALL packages\KoreBuild\build\dnvm upgrade -runtime CLR -arch x86
 ) ELSE (
-	CALL packages\KoreBuild\build\dnvm install %BUILDCMD_DNX_VERSION% -runtime CLR -arch x86 -a default
+	CALL packages\KoreBuild\build\dnvm install %BUILDCMD_DNX_VERSION% -runtime CLR -arch x86 -alias default
 )
 CALL packages\KoreBuild\build\dnvm install default -runtime CoreCLR -arch x86


Do not use \ on Windows

Do not use \ on Windows

--- recipes/jkqtplotter/bld.bat
+++ recipes/jkqtplotter/bld.bat
@@ -1,12 +1,6 @@
 mkdir build
 cd build
-cmake \
-    -DCMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% \
-    -DCMAKE_PREFIX_PATH=%LIBRARY_PREFIX% \
-    -DJKQtPlotter_BUILD_EXAMPLES=OFF \
-    -DJKQtPlotter_BUILD_STATIC_LIBS=OFF \
-    -DCMAKE_BUILD_TYPE=Release \
-    ..
+cmake -DCMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% -DCMAKE_PREFIX_PATH=%LIBRARY_PREFIX% -DJKQtPlotter_BUILD_EXAMPLES=OFF -DJKQtPlotter_BUILD_STATIC_LIBS=OFF -DCMAKE_BUILD_TYPE=Release ..
 if errorlevel 1 exit 1
 cmake --build . --config Release --target install
 if errorlevel 1 exit 1


fix in installer.bat

fix in installer.bat

--- installer.bat
+++ installer.bat
@@ -2,5 +2,5 @@
 conda install basemap --yes
 conda install shapely --yes
 conda install gdal --yes
-pip install protobuf --yes
+pip install protobuf
 python setup.py install


Create ip_Config.bat

Create ip_Config.bat

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

--- ip_Config.bat
+++ ip_Config.bat
@@ -0,0 +1,7 @@
+
+@echo off
+set ip_address_string="IP Address"
+rem Uncomment the following line when using Windows 7 (with removing "rem")!
+rem set ip_address_string="IPv4 Address"
+echo Network Connection Test
+for /f "usebackq tokens=2 delims=:" %%f in (`ipconfig ^| findstr /c:%ip_address_string%`) do echo Your IP Address is: %%f


updated build-nuget-package.bat

updated build-nuget-package.bat

--- TypeConvert/build-nuget-package.bat
+++ TypeConvert/build-nuget-package.bat
@@ -1 +1,3 @@
-nuget pack TypeConvert.csproj -Prop Configuration=Release -Prop Platform=AnyCPU+SET OUTPUT_DIR=%1
+IF "%OUTPUT_DIR%"=="" SET OUTPUT_DIR=%CD%
+nuget pack TypeConvert.csproj -Prop Configuration=Release -Prop Platform=AnyCPU -OutputDirectory %OUTPUT_DIR%


Updates from Overleaf

Updates from Overleaf

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

--- Compile.bat
+++ Compile.bat
@@ -0,0 +1,115 @@
+@echo off
+
+chcp 65001 >nul
+
+call :setESC
+
+set THESIS=main
+
+set flag=%1
+if %flag%x == x (
+	set flag=thesis
+)
+
+if %flag%x == thesisx (
+	call :cleanall
+	call :thesis
+	if ERRORLEVEL 1 (
+		echo.
+		echo %ESC%[31mError! Please check the %ESC%[7m'%THESIS%.log'%ESC%[0;31m for more details . . .%ESC%[0m
+		pause
+	) else (
+		call :clean
+		echo %ESC%[32mFinished!%ESC%[0m
+		pause
+	)
+	goto :EOF
+)
+
+if %flag%x == cleanx (
+	call :clean
+	goto :EOF
+)
+
+if %flag%x == cleanallx (
+	call :cleanall
+	goto :EOF
+)
+
+if %flag%x == wordcountx (
+	call :wordcount
+	goto :EOF
+)
+
+:help
+	echo %ESC%[33mThis is the compile batch script for SJTUThesis.
+	echo Usage:
+	echo     compile.bat [option]
+	echo options:
+	echo   thesis    Compile the thesis (default)
+	echo   clean     Clean all work files
+	echo   cleanall  Clean all work files and main.pdf
+	echo   wordcount Count words in main.pdf
+	echo   help      Print this help message%ESC%[0m
+goto :EOF
+
+:thesis
+	echo %ESC%[33mCompile . . .%ESC%[0m
+	latexmk -quiet -file-line-error -halt-on-error -interaction=nonstopmode %THESIS% 2>nul
+goto :EOF
+
+:clean
+	echo %ESC%[33mClean files . . .%ESC%[0m
+	latexmk -quiet -c %THESIS% 2>nul
+goto :EOF
+
+:cleanall
+	echo %ESC%[33mClean files . . .%ESC%[0m
+	latexmk -quiet -C %THESIS% 2>nul
+	if exist %THESIS%.pdf (
+		echo %ESC%[31mClose the file: %ESC%[7m'%THESIS%.pdf'%ESC%[0;31m!%ESC%[0m
+		pause
+		call :cleanall
+	)
+goto :EOF
+
+:wordcount
+	set found=0
+	setlocal enabledelayedexpansion
+
+	findstr "\\documentclass\[[^\[]*english" %THESIS%.tex > nul
+	if %errorlevel% equ 0 (
+		for /f "delims=" %%i in ('texcount %THESIS%.tex -inc -char-only  2^>nul') do (
+			if !found! equ 1 (
+				echo %ESC%[33m英文字符数			:%ESC%[36m!%%i!%ESC%[0m
+				goto :total
+			)
+			echo %%i | findstr "total" > nul && set found=1
+		)
+	) else (
+		for /f "delims=" %%i in ('texcount %THESIS%.tex -inc -ch-only  2^>nul') do (
+			if !found! equ 1 (
+				echo %ESC%[33m纯中文字数			:%ESC%[36m!%%i!%ESC%[0m
+				goto :total
+			)
+			echo %%i | findstr "total" > nul && set found=1
+		)
+	)
+
+:total
+	set found=0
+	for /f "delims=" %%i in ('texcount %THESIS%.tex -inc -chinese 2^>nul') do (
+		if !found! equ 1 (
+			echo %ESC%[33m总字数（英文单词 + 中文字）	:%ESC%[36m!%%i!%ESC%[0m
+			goto :EOF
+		)
+		echo %%i | findstr "total" > nul && set found=1
+	)
+goto :EOF
+
+:setESC
+for /F "tokens=1,2 delims=#" %%a in ('"prompt #$H#$E# & echo on & for %%b in (1) do rem"') do (
+	set ESC=%%b
+	exit /B 0
+)
+exit /B 0


Use JAVA_HOME on Windows when running the recorder

JAVA_HOME is hanadled the same way as in gatling.bat

--- gatling-bundle/src/universal/bin/recorder.bat
+++ gatling-bundle/src/universal/bin/recorder.bat
@@ -43,7 +43,17 @@
 set CLASSPATH="%GATLING_HOME%"\lib\*;"%GATLING_HOME%"\conf;%JAVA_CLASSPATH%
 set COMMAND=-cp %CLASSPATH% io.gatling.recorder.GatlingRecorder

-java %JAVA_OPTS% %COMMAND% %1 %2 %3 %4 %5 %6 %7 %8 %9
+set JAVA=java
+if exist "%JAVA_HOME%\bin\java.exe" goto setJavaHome
+goto run
+
+:setJavaHome
+set JAVA="%JAVA_HOME%\bin\java.exe"
+
+:run
+echo JAVA = "%JAVA%"
+
+%JAVA% %JAVA_OPTS% %COMMAND% %1 %2 %3 %4 %5 %6 %7 %8 %9

 goto exit


Makes installation location dynamic for context menu link

--- src/add-to-context-menu.bat
+++ src/add-to-context-menu.bat
@@ -4,10 +4,13 @@
 ::
 :: (c) April 2015 Raymel Francisco
 ::
+:: Modified: Nov 2016
+@echo off

-set location=%1
+set location=%~dp0open-with-cmd.exe

 reg add "HKEY_CLASSES_ROOT\*\shell\Open with command prompt" /t REG_SZ /v "" /d "Open with command prompt" /f
-reg add "HKEY_CLASSES_ROOT\*\shell\Open with command prompt" /t REG_EXPAND_SZ /v "Icon" /d "%location%,0" /f
+reg add "HKEY_CLASSES_ROOT\*\shell\Open with command prompt" /t REG_EXPAND_SZ /v "Icon" /d "%~dp0terminal.ico,0" /f
 reg add "HKEY_CLASSES_ROOT\*\shell\Open with command prompt\command" /t REG_SZ /v "" /d "%location% \"%%1\"" /f

+pause


Fixed win link creation.

Fixed win link creation.

--- util/win/prepare.bat
+++ util/win/prepare.bat
@@ -5,7 +5,7 @@

 mkdir qtcreator-latest
-mklink /D %QT_DIR% qtcreator-latest\Qt
+mklink /D qtcreator-latest\Qt %QT_DIR%
 if "%VERSION%"=="" set VERSION=debug
 echo %VERSION%>qtcreator-latest\version


Fix warning message if HAMMER_XGE_PATH is set incorrectly.

--- hammer.bat
+++ hammer.bat
@@ -83,7 +83,8 @@
 if not defined HAMMER_XGE_PATH (
   set HAMMER_XGE_PATH="%ProgramFiles%\Xoreax\IncrediBuild"
 )
-if not exist "%HAMMER_XGE_PATH%\xgConsole.exe" (
+set XGCONSOLE_PATH=%HAMMER_XGE_PATH%\xgConsole.exe
+if not exist %XGCONSOLE_PATH% (
   echo Warning: xgConsole.exe not found in %HAMMER_XGE_PATH%
   echo Not using IncrediBuild.
   goto END_XGE_SETUP


Let doc build fail on appveyor, because it fails on readthedocs for the same reason This reverts commit 71529148f85184b0811435aa5e1f0272f1ff41ce.

--- appveyor-test.cmd
+++ appveyor-test.cmd
@@ -5,4 +5,6 @@
 if %errorlevel% neq 0 exit /b %errorlevel%
 coverage run -m unittest discover -v -p test*
 if %errorlevel% neq 0 exit /b %errorlevel%
+python setup.py build_sphinx
+if %errorlevel% neq 0 exit /b %errorlevel%
 coverage report


Create Install.bat

Create Install.bat

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

--- Install.bat
+++ Install.bat
@@ -0,0 +1 @@
+powershell -file ".\Install.ps1" %1 %2 %3 %4 %5 %6 %7 %8 %9 -ExecutionPolicy Bypass


create crude installer

create crude installer

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

--- splitexcel-installer.bat
+++ splitexcel-installer.bat
@@ -0,0 +1,9 @@
+@ECHO OFF
+mkdir -p C:\Progr\splitexcel
+copy splitexcel.vbs C:\Progr\splitexcel\
+
+reg add HKEY_CURRENT_USER\Software\Classes\Excel.Sheet.12\shell\split /ve /d "Split every sheet in a separate Excel file"
+reg add HKEY_CURRENT_USER\Software\Classes\Excel.Sheet.12\shell\split\command /ve /d "C:\Windows\System32\wscript.exe \"C:\\Progr\\splitexcel\\splitexcel.vbs\" \"%%1\""
+
+reg add HKEY_CURRENT_USER\Software\Classes\Excel.Sheet.8\shell\split /ve /d "Split every sheet in a separate Excel file"
+reg add HKEY_CURRENT_USER\Software\Classes\Excel.Sheet.8\shell\split\command /ve /d "C:\Windows\System32\wscript.exe \"C:\\Progr\\splitexcel\\splitexcel.vbs\" \"%%1\""


add back funktion with folders

add back funktion with folders

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

--- bin/back/back.bat
+++ bin/back/back.bat
@@ -0,0 +1,26 @@
+:: Terminal API
+::
+:: This file is called whenever a user enters a shell.
+::
+:: Dependencies:
+::   mb.bat add following = set PATH=%_GIT%\mindbender-core\bin\back\;%PATH%
+::
+:: Example:
+::   $ mb
+
+@echo off
+
+::IF %CD%
+IF "%PROJECTDIR%"=="" goto :return_to_mb
+
+IF "%ASSET%"=="" goto :return_to_mb
+
+IF NOT "%ASSET%"=="" goto :return_to_projects
+:return_to_mb
+    call %_MB% M:\f01_projects %*
+    SET PROJECTDIR=
+    exit /b
+:return_to_projects
+    call _mkproject.bat %curPROJECT% %curPROJECTNAME% %PROJECTSTAGE%
+    SET ASSET=
+    exit /b


make sure the X:\home\.boot2docker directory exists before trying to download

--- files/tools/scripts/b2d-start.bat
+++ files/tools/scripts/b2d-start.bat
@@ -3,6 +3,7 @@
 :: check if we have the .iso file (if we don't have it, the VM won't start!)
 if not exist %HOME%\.boot2docker\boot2docker.iso (
   echo boot2docker.iso not found in %HOME%\.boot2docker\, downloading version 1.7.1...
+  if not exist "%HOME%\.boot2docker" mkdir %HOME%\.boot2docker
   curl -L -o %HOME%\.boot2docker\boot2docker.iso https://github.com/boot2docker/boot2docker/releases/download/v1.7.1/boot2docker.iso
 )


Refactored the LSML-admin.cmd script in the svn example, so it now accepts an action argument.  The "get" action performs the existing functionality (downloading and unpacking a LSML release).  Added a new "help" action, which is the default if no action is specified.

--- examples/svn/third-party/LSML/LSML-admin.cmd
+++ examples/svn/third-party/LSML/LSML-admin.cmd
@@ -3,6 +3,14 @@
 rem  Run this script in the directory where it's located
 pushd %~dp0
 setlocal
+
+set Script=%~nx0
+call :processArgs %*
+if "%Action%" == "error" goto :exitScript
+if "%Action%" == "help" (
+  call :usage
+  goto :exitScript
+)

 rem  Read LSML version # and the SHA1 checksum for that version
 for /f "tokens=1,2" %%i in (version.txt) do (
@@ -20,4 +28,61 @@

 call WinPkgTools\getPackage.cmd %LibraryUrl% %LibraryPackage% %LibrarySHA1% %FileInPkg%

+
+:exitScript
+
 popd
+
+set ExitCode=0
+if "%Action%" == "error" (
+  set ExitCode=1
+) else (
+  set ExitCode=0
+)
+exit /b %ExitCode%
+
+rem  ------------------------------------------------------------------------
+
+:processArgs
+
+set Action=
+if "%~1" == "get"  set Action=get
+if "%~1" == "help" set Action=help
+if "%~1" == ""     set Action=help
+
+if "%Action%" == "" (
+  call :error unknown action "%~1"
+  goto :eof
+)
+if not "%~3" == "" (
+  call :error extra arguments after "%~1" action: %2 ...
+  goto :eof
+)
+if not "%~2" == "" (
+  call :error extra argument after "%~1" action: %2
+  goto :eof
+)
+
+goto :eof
+
+rem  ------------------------------------------------------------------------
+
+:error
+
+echo Error: %*
+call :usage
+set Action=error
+goto :eof
+
+rem  ------------------------------------------------------------------------
+
+:usage
+
+echo Usage: %Script% [ACTION]
+echo where ACTION is:
+echo   get  -- download and unpack LSML
+echo   help -- display this message (default)
+
+goto :eof
+
+rem  ------------------------------------------------------------------------


JBAS-9248

--- build/src/main/resources/bin/jboss-admin.bat
+++ build/src/main/resources/bin/jboss-admin.bat
@@ -61,16 +61,11 @@
 echo ===============================================================================
 echo.

-:RESTART
 "%JAVA%" %JAVA_OPTS% ^
     -jar "%JBOSS_HOME%\jboss-modules.jar" ^
     -mp "%JBOSS_HOME%\modules" ^
-     org.jboss.as.cli
+     org.jboss.as.cli ^
      %*
-
-if ERRORLEVEL 10 goto RESTART

 :END
 if "x%NOPAUSE%" == "x" pause
-
-:END_NO_PAUSE


GEODE-2741: Update Windows build to use Visual Studio 2015 / VC14.

--- packer/windows/buildenv.bat
+++ packer/windows/buildenv.bat
@@ -21,5 +21,5 @@
 if not exist %TEMP% mkdir %TEMP%

 @rem Setup VC
-call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" %*
+call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %*


Use AMD OpenCL

Use AMD OpenCL

Former-commit-id: b714337a92fea2fa21e72bc1598628d33cf9615e

--- openmm/bld.bat
+++ openmm/bld.bat
@@ -4,7 +4,15 @@
 mkdir build
 cd build

-cmake -G "NMake Makefiles" -DCMAKE_INSTALL_PREFIX=%PREFIX% -DOPENMM_BUILD_PME_PLUGIN=ON -DFFTW_LIBRARY=%LIBRARY_LIB%\libfftwf-3.3.lib -DFFTW_INCLUDES=%LIBRARY_INC% -DCMAKE_BUILD_TYPE=Release ..
+set CMAKE_FLAGS=-DCMAKE_INSTALL_PREFIX=%PREFIX%
+set CMAKE_FLAGS=%CMAKE_FLAGS% -DOPENMM_BUILD_PME_PLUGIN=ON
+set CMAKE_FLAGS=%CMAKE_FLAGS% -DFFTW_LIBRARY=%LIBRARY_LIB%\libfftwf-3.3.lib
+set CMAKE_FLAGS=%CMAKE_FLAGS% -DFFTW_INCLUDES=%LIBRARY_INC%
+set CMAKE_FLAGS=%CMAKE_FLAGS% -DCMAKE_BUILD_TYPE=Release
+set CMAKE_FLAGS=%CMAKE_FLAGS% -DOPENCL_INCLUDE_DIR="C:/Program Files (x86)/AMD APP SDK/2.9-1/include"
+set CMAKE_FLAGS=%CMAKE_FLAGS% -DOPENCL_LIBRARY="C:/Program Files (x86)/AMD APP SDK/2.9-1/lib/x86_64/OpenCL.lib"
+
+cmake -G "NMake Makefiles" %CMAKE_FLAGS% ..

 jom all DoxygenApiDocs :: sphinxpdf
 jom install
@@ -24,7 +32,7 @@
 :: Put docs into a subdirectory.
 cd %PREFIX%\docs
 mkdir openmm
-move *.html openmm
+move *.html openmm
 :: move *.pdf openmm
 :: move api-* openmm


Update initialize_environment.bat

Update initialize_environment.bat

--- resources/functions/initialize_environment.bat
+++ resources/functions/initialize_environment.bat
@@ -6,8 +6,8 @@

 :: Tron Project version and date. These two variables determine the overall project version and date
-set TRON_VERSION=11.0.0
-set TRON_DATE=2020-02-05
+set TRON_VERSION=11.1.0
+set TRON_DATE=2020-04-25

 :: Set window title
 title Tron v%TRON_VERSION% (%TRON_DATE%)
@@ -116,7 +116,7 @@
 if %SYSTEM_LANGUAGE%==de %WinDir%\system32\ipconfig /all | %FIND% /i "Subnetzmaske" >NUL 2>&1
 if /i not %ERRORLEVEL%==0 set NETWORK_AVAILABLE=no
 :: French
-if %SYSTEM_LANGUAGE%==fr %WinDir%\system32\ipconfig /all | %FIND% /i "Masque de sous" >NUL 2>&1
+if %SYSTEM_LANGUAGE%==fr %WinDir%\system32\ipconfig /all | %FIND% /i "Masque de" >NUL 2>&1
 if /i not %ERRORLEVEL%==0 set NETWORK_AVAILABLE=no
 :: Spanish
 if %SYSTEM_LANGUAGE%==es %WinDir%\system32\ipconfig /all | %FIND% /i "de subred" >NUL 2>&1


Added *.pdb and license.txt to the nuget package.

--- Tools/pack.cmd
+++ Tools/pack.cmd
@@ -1,4 +1,6 @@
 mkdir ..\Packages\HelixToolkit\lib
 copy ..\Output\HelixToolkit.Wpf.dll ..\Packages\HelixToolkit\lib
 copy ..\Output\HelixToolkit.Wpf.xml ..\Packages\HelixToolkit\lib
+copy ..\Output\HelixToolkit.Wpf.pdb ..\Packages\HelixToolkit\lib
+copy ..\license.txt ..\Packages\HelixToolkit
 nuget.exe pack ..\Packages\HelixToolkit\HelixToolkit.nuspec -OutputDirectory ..\Packages > pack.log


AGAIN WITH THE ERROR HANDLING

AGAIN WITH THE ERROR HANDLING

--- build-prepare.bat
+++ build-prepare.bat
@@ -3,6 +3,8 @@
 if errorlevel 1 goto failed

 git commit -am "Removing dev from version numbers"
+if errorlevel 1 goto failed
+
 call build.bat debug
 if errorlevel 1 goto failed


Add windows .bat file for gsutil.py.

Add windows .bat file for gsutil.py.

gsutil.py is cumbersome to use on Windows, unlike on Linux and Mac. This
change adds a batch file like the ones for gclient and other tools.

Bug: https://github.com/dart-lang/sdk/issues/35367
Change-Id: Ib33dc27573de5485ae93b525002f5fbcb3a5f4d1
Reviewed-on: https://chromium-review.googlesource.com/c/1370124
Commit-Queue: Jonas Termansen <092ec58085ae5e368bc39d18752740ff81a2d09c@google.com>
Reviewed-by: Ryan Tseng <2190fe9a39b4920ec7bd59c848ec5cccd163056f@chromium.org>

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

--- gsutil.py.bat
+++ gsutil.py.bat
@@ -0,0 +1,15 @@
+@echo off
+:: Copyright (c) 2018 The Chromium Authors. All rights reserved.
+:: Use of this source code is governed by a BSD-style license that can be
+:: found in the LICENSE file.
+setlocal
+
+:: Synchronize the root directory before deferring control back to gsutil.py.
+call "%~dp0update_depot_tools.bat" %*
+
+:: Ensure that "depot_tools" is somewhere in PATH so this tool can be used
+:: standalone, but allow other PATH manipulations to take priority.
+set PATH=%PATH%;%~dp0
+
+:: Defer control.
+python "%~dp0gsutil.py" %*


remove unused

remove unused

--- docs/make.bat
+++ docs/make.bat
@@ -1,242 +0,0 @@
-@ECHO OFF
-
-REM Command file for Sphinx documentation
-
-if "%SPHINXBUILD%" == "" (
-	set SPHINXBUILD=sphinx-build
-)
-set BUILDDIR=build
-set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS% source
-set I18NSPHINXOPTS=%SPHINXOPTS% source
-if NOT "%PAPER%" == "" (
-	set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS%
-	set I18NSPHINXOPTS=-D latex_paper_size=%PAPER% %I18NSPHINXOPTS%
-)
-
-if "%1" == "" goto help
-
-if "%1" == "help" (
-	:help
-	echo.Please use `make ^<target^>` where ^<target^> is one of
-	echo.  html       to make standalone HTML files
-	echo.  dirhtml    to make HTML files named index.html in directories
-	echo.  singlehtml to make a single large HTML file
-	echo.  pickle     to make pickle files
-	echo.  json       to make JSON files
-	echo.  htmlhelp   to make HTML files and a HTML help project
-	echo.  qthelp     to make HTML files and a qthelp project
-	echo.  devhelp    to make HTML files and a Devhelp project
-	echo.  epub       to make an epub
-	echo.  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter
-	echo.  text       to make text files
-	echo.  man        to make manual pages
-	echo.  texinfo    to make Texinfo files
-	echo.  gettext    to make PO message catalogs
-	echo.  changes    to make an overview over all changed/added/deprecated items
-	echo.  xml        to make Docutils-native XML files
-	echo.  pseudoxml  to make pseudoxml-XML files for display purposes
-	echo.  linkcheck  to check all external links for integrity
-	echo.  doctest    to run all doctests embedded in the documentation if enabled
-	goto end
-)
-
-if "%1" == "clean" (
-	for /d %%i in (%BUILDDIR%\*) do rmdir /q /s %%i
-	del /q /s %BUILDDIR%\*
-	goto end
-)
-
-
-%SPHINXBUILD% 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
-)
-
-if "%1" == "html" (
-	%SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The HTML pages are in %BUILDDIR%/html.
-	goto end
-)
-
-if "%1" == "dirhtml" (
-	%SPHINXBUILD% -b dirhtml %ALLSPHINXOPTS% %BUILDDIR%/dirhtml
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The HTML pages are in %BUILDDIR%/dirhtml.
-	goto end
-)
-
-if "%1" == "singlehtml" (
-	%SPHINXBUILD% -b singlehtml %ALLSPHINXOPTS% %BUILDDIR%/singlehtml
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The HTML pages are in %BUILDDIR%/singlehtml.
-	goto end
-)
-
-if "%1" == "pickle" (
-	%SPHINXBUILD% -b pickle %ALLSPHINXOPTS% %BUILDDIR%/pickle
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished; now you can process the pickle files.
-	goto end
-)
-
-if "%1" == "json" (
-	%SPHINXBUILD% -b json %ALLSPHINXOPTS% %BUILDDIR%/json
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished; now you can process the JSON files.
-	goto end
-)
-
-if "%1" == "htmlhelp" (
-	%SPHINXBUILD% -b htmlhelp %ALLSPHINXOPTS% %BUILDDIR%/htmlhelp
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished; now you can run HTML Help Workshop with the ^
-.hhp project file in %BUILDDIR%/htmlhelp.
-	goto end
-)
-
-if "%1" == "qthelp" (
-	%SPHINXBUILD% -b qthelp %ALLSPHINXOPTS% %BUILDDIR%/qthelp
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished; now you can run "qcollectiongenerator" with the ^
-.qhcp project file in %BUILDDIR%/qthelp, like this:
-	echo.^> qcollectiongenerator %BUILDDIR%\qthelp\hangman.qhcp
-	echo.To view the help file:
-	echo.^> assistant -collectionFile %BUILDDIR%\qthelp\hangman.ghc
-	goto end
-)
-
-if "%1" == "devhelp" (
-	%SPHINXBUILD% -b devhelp %ALLSPHINXOPTS% %BUILDDIR%/devhelp
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished.
-	goto end
-)
-
-if "%1" == "epub" (
-	%SPHINXBUILD% -b epub %ALLSPHINXOPTS% %BUILDDIR%/epub
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The epub file is in %BUILDDIR%/epub.
-	goto end
-)
-
-if "%1" == "latex" (
-	%SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished; the LaTeX files are in %BUILDDIR%/latex.
-	goto end
-)
-
-if "%1" == "latexpdf" (
-	%SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
-	cd %BUILDDIR%/latex
-	make all-pdf
-	cd %BUILDDIR%/..
-	echo.
-	echo.Build finished; the PDF files are in %BUILDDIR%/latex.
-	goto end
-)
-
-if "%1" == "latexpdfja" (
-	%SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
-	cd %BUILDDIR%/latex
-	make all-pdf-ja
-	cd %BUILDDIR%/..
-	echo.
-	echo.Build finished; the PDF files are in %BUILDDIR%/latex.
-	goto end
-)
-
-if "%1" == "text" (
-	%SPHINXBUILD% -b text %ALLSPHINXOPTS% %BUILDDIR%/text
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The text files are in %BUILDDIR%/text.
-	goto end
-)
-
-if "%1" == "man" (
-	%SPHINXBUILD% -b man %ALLSPHINXOPTS% %BUILDDIR%/man
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The manual pages are in %BUILDDIR%/man.
-	goto end
-)
-
-if "%1" == "texinfo" (
-	%SPHINXBUILD% -b texinfo %ALLSPHINXOPTS% %BUILDDIR%/texinfo
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The Texinfo files are in %BUILDDIR%/texinfo.
-	goto end
-)
-
-if "%1" == "gettext" (
-	%SPHINXBUILD% -b gettext %I18NSPHINXOPTS% %BUILDDIR%/locale
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The message catalogs are in %BUILDDIR%/locale.
-	goto end
-)
-
-if "%1" == "changes" (
-	%SPHINXBUILD% -b changes %ALLSPHINXOPTS% %BUILDDIR%/changes
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.The overview file is in %BUILDDIR%/changes.
-	goto end
-)
-
-if "%1" == "linkcheck" (
-	%SPHINXBUILD% -b linkcheck %ALLSPHINXOPTS% %BUILDDIR%/linkcheck
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Link check complete; look for any errors in the above output ^
-or in %BUILDDIR%/linkcheck/output.txt.
-	goto end
-)
-
-if "%1" == "doctest" (
-	%SPHINXBUILD% -b doctest %ALLSPHINXOPTS% %BUILDDIR%/doctest
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Testing of doctests in the sources finished, look at the ^
-results in %BUILDDIR%/doctest/output.txt.
-	goto end
-)
-
-if "%1" == "xml" (
-	%SPHINXBUILD% -b xml %ALLSPHINXOPTS% %BUILDDIR%/xml
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The XML files are in %BUILDDIR%/xml.
-	goto end
-)
-
-if "%1" == "pseudoxml" (
-	%SPHINXBUILD% -b pseudoxml %ALLSPHINXOPTS% %BUILDDIR%/pseudoxml
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The pseudo-XML files are in %BUILDDIR%/pseudoxml.
-	goto end
-)
-
-:end


update documentation

update documentation

--- docs/make.bat
+++ docs/make.bat
@@ -9,7 +9,7 @@
 )
 set SOURCEDIR=.
 set BUILDDIR=_build
-set SPHINXPROJ=GenIECMS
+set SPHINXPROJ=GenIESys

 if "%1" == "" goto help


2.7.0-b13

2.7.0-b13

fix divided by zero

--- iCatalyst.bat
+++ iCatalyst.bat
@@ -555,7 +555,9 @@
 :waitrandom
 setlocal
 if not defined istimeout goto:waitrandom2
-set /a "ww=%random%%%(%1/1000)"
+set "ww=%~1"
+if %~1 lss 1000 set "ww=1000"
+set /a "ww=%random%%%(%ww%/1000)"
 1>nul 2>&1 timeout /t %ww%
 endlocal & exit /b
 :waitrandom2


Empty configuration directory instead of erasing it in makebuild.bat. Otherwise configuration won't get saved.

git-svn-id: 65dd0ccd495961f396d5302e5521154b071f0302@916 5b2332b8-efa3-11de-8684-7d64432d61a3

--- makebuild.bat
+++ makebuild.bat
@@ -5,7 +5,7 @@
 rmdir build /S /Q
 md build
 xcopy bin\*.* build /S /C
-rmdir build\data\configuration /S /Q
+del build\data\configuration\*.xml
 rmdir build\testing /S /Q
 del build\*.dll
 del build\viewerd.exe


Windows: Fix label position in confvar.bat

The setting of the extracted package URLs is always skipped.
Fix a wrong last-minute change of end-of-loop label position that
causes that.

--- msvc/confvar.bat
+++ msvc/confvar.bat
@@ -51,11 +51,11 @@
 		)
 	)
 )
+:endconf
 set "PACKAGE_BUGREPORT=%x2%"
 set "PACKAGE_URL=%x4%"
 REM set PACKAGE_BUGREPORT 1>&2
 REM set PACKAGE_URL 1>&2
-:endconf

 setlocal DisableDelayedExpansion
 for /F "tokens=*" %%i in (%tmp%) do set %%i


The file

The file

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

--- mysql_backup.bat
+++ mysql_backup.bat
@@ -0,0 +1,45 @@
+@echo off
+
+REM  Simple mysqldump wrapper to save full database backup
+REM  in day-dirs ex. mysql_dump\2013-10-11\dump-2012-09-19_20-26-31,72.sql
+REM  easy to use, easy to search and organize, easy to modify
+REM  tested on MS Windows 7 Ultimate
+REM  some issues may occurs in date format after 2010 year on older systems
+
+
+REM
+REM  CONFIG
+REM
+
+
+REM mysqldump.exe command path, use absolute path if isn't in PATH
+set mysqldump_cmd=D:\xampp\mysql\bin\mysqldump.exe
+REM common repository dir, relative or absolute
+set repository=mysql_dump
+
+REM file prefix
+set prefix=dump-
+
+REM
+REM  ADVANCED SETTINGS
+REM
+
+REM today, current date, format: 2013-10-11
+set day="%DATE:/=-%"
+REM now, current time 2013-10-11_12:45:09.72
+set now="%DATE:/=-%_%TIME::=-%"
+REM output filename, without extension - see below why?
+set filename=%prefix%%now%
+REM dir of a day...
+set repository_day=%repository%\\%day%
+
+
+REM create destination dirs, could be 1 line with command extensions
+IF NOT EXIST %repository%  mkdir %repository%
+IF NOT EXIST %repository_day%  mkdir %repository_day%
+
+REM go
+REM modify mysqldump parameters as you want
+REM if you have gzip, you can filter output with pipe operator
+REM %mysqldump_cmd% -u root  --all-databases | gzip -9 >  %repository_day%\%filename%.sql.gz
+%mysqldump_cmd% -u root  --all-databases >  %repository_day%\%filename%.sql


Add wrapper batch file for Jenkins to build

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

--- Project/HEW/make/jenkins.bat
+++ Project/HEW/make/jenkins.bat
@@ -0,0 +1,10 @@
+mkdir ..\libm2dec\Release
+mkdir ..\libm2dec\Debug
+mkdir ..\h264dec\Release
+mkdir ..\h264dec\Debug
+mkdir ..\m2dec\Release
+mkdir ..\m2dec\Debug
+"C:\Program Files (x86)\Renesas\Hew\hmake.exe" m2dec.mak > buildlog.txt
+find "ERROR" buildlog.txt
+if errorlevel 1 exit /b 0
+exit /b 1


#18 runAs.sh is absent on linux agents

#18 runAs.sh is absent on linux agents

--- createPlugin.cmd
+++ createPlugin.cmd
@@ -8,6 +8,7 @@

 md %root%plugin\agent\new\bin
 copy %root%cmd\*.cmd %root%plugin\agent\new\bin /Y
+copy %root%cmd\*.sh %root%plugin\agent\new\bin /Y
 md %root%plugin\agent\new\bin\x86
 copy %root%win32\x64\JetBrains.runAs.exe %root%plugin\agent\new\bin\x86 /Y
 md %root%plugin\agent\new\bin\x64


Added switch to include subdirectories.

Added switch to include subdirectories.

--- Prototype/Html5RenderEngineTests.Web/UpdateIncludes.bat
+++ Prototype/Html5RenderEngineTests.Web/UpdateIncludes.bat
@@ -1 +1 @@
-..\..\JsSingularity.exe -DeployPath:%CD%\Scripts\Fayde.js -IncludesFile:test-includes.txt -ScriptsFolder:%CD%\Scripts\Framework -BaseIncludesPath:%CD%\tests\prototype+..\..\JsSingularity.exe -DeployPath:%CD%\Scripts\Fayde.js -IncludesFile:test-includes.txt -ScriptsFolder:%CD%\Scripts\Framework -BaseIncludesPath:%CD%\tests\prototype -IncludeSubdirectories:true


SCHEDULING-1685 scheduler-start-gui.bat doesn't work

Problem:
Hack 'choice /T %1 /d y > NUL' which is used to simulate 'sleep' works
only in english windows.

Fix:
Replaced sleep implementation with another hack: 'ping -n %1 127.0.0.1 >
NUL'. Also in this change I modified code finding RM and Scheduler urls
in the output file to make it more clear.

--- bin/windows/scheduler-start-gui.bat
+++ bin/windows/scheduler-start-gui.bat
@@ -1,5 +1,6 @@
 @echo off
 SETLOCAL
+SETLOCAL ENABLEDELAYEDEXPANSION

 call init.bat scheduler-log4j-server

@@ -152,14 +153,12 @@

 set SCHED_OUT=SchedulerStarter.output

-SETLOCAL ENABLEDELAYEDEXPANSION
 call init.bat scheduler-log4j-server
 echo %JAVA_CMD% %SCHED_JVM_D_OPTS% org.ow2.proactive.scheduler.util.SchedulerStarter > run.tmp.bat
 echo EXIT >> run.tmp.bat

 echo Starting the scheduler (starter output is redirected to the %SCHED_OUT%)
 START /B "Scheduler" run.tmp.bat > %SCHED_OUT%
-ENDLOCAL

 call :find_process_by_cmd SchedulerStarter
 IF [%_result%]==[] (
@@ -169,20 +168,22 @@
         set SCHED_PID=%_result%
 )

+set RM_MATCH=The resource manager with 4 local nodes created on
+set SCHED_MATCH=The scheduler created on
 set SCHED_URL_STR=
 set RM_URL_STR=
 :WaitLoop
-        for /f "tokens=*" %%i in ('FINDSTR /C:"The resource manager with 4 local nodes created on" %SCHED_OUT%') do set RM_URL_STR=%%i
+        for /f "tokens=*" %%i in ('FINDSTR /C:"%RM_MATCH%" %SCHED_OUT%') do set RM_URL_STR=%%i
         IF NOT ["%RM_URL_STR%"]==[""] (
-                SET RM_URL=%RM_URL_STR:~50%
-        )
-
-        for /f "tokens=*" %%i in ('FINDSTR /C:"The scheduler created on" %SCHED_OUT%') do set SCHED_URL_STR=%%i
+                 SET RM_URL=!RM_URL_STR:%RM_MATCH%=!
+        )
+
+        for /f "tokens=*" %%i in ('FINDSTR /C:"%SCHED_MATCH%" %SCHED_OUT%') do set SCHED_URL_STR=%%i
         IF ["%SCHED_URL_STR%"]==[""] (
                 echo Waiting for the scheduler...
                 call :delay 5
         ) ELSE (
-                SET SCHED_URL=%SCHED_URL_STR:~24%
+                SET SCHED_URL=!SCHED_URL_STR:%SCHED_MATCH%=!
                 GOTO :EndWaitLoop
         )

@@ -277,7 +278,7 @@
         goto :eof

 :delay
-        choice /T %1 /d y > NUL
+        ping -n %1 127.0.0.1 > NUL
         goto :eof

 :eof


add support for Bourne shell and bash scripts

--- bin/cmdize.bat
+++ bin/cmdize.bat
@@ -38,6 +38,10 @@
 :: .pl
 :: For details and better support see "pl2bat.bat" from Perl distribution
 ::
+:: .sh, .bash
+:: http://forum.script-coding.com/viewtopic.php?id=11535
+:: http://www.dostips.com/forum/viewtopic.php?f=3&t=7110#p46654
+::
 :: .ps1
 :: http://blogs.msdn.com/b/jaybaz_ms/archive/2007/04/26/powershell-polyglot.aspx
 :: http://stackoverflow.com/a/2611487/3627676
@@ -53,7 +57,7 @@
 :: http://www.dostips.com/forum/viewtopic.php?p=33963#p33963
 ::
 :: COPYRIGHTS
-:: Copyright (c) 2014, 2015 Ildar Shaimordanov
+:: Copyright (c) 2014, 2015, 2016 Ildar Shaimordanov

 @echo off

@@ -80,7 +84,7 @@
 	goto :cmdize.loop.continue
 )

-for %%x in ( .js .vbs .pl .ps1 .py .hta .htm .html .wsf ) do (
+for %%x in ( .js .vbs .pl .sh .bash .ps1 .py .hta .htm .html .wsf ) do (
 	if /i "%~x1" == "%%~x" (
 		call :cmdize%%~x "%~1" >"%~dpn1.bat"
 		goto :cmdize.loop.continue
@@ -180,6 +184,18 @@
 goto :EOF

+:: Convert Bourne shell and Bash scripts.
+:cmdize.sh
+:cmdize.bash
+echo:: ^<^< '____CMD____'
+echo:@echo off
+echo:bash "%%~f0" %%*
+echo:goto :eof
+echo:____CMD____
+type "%~f1"
+goto :EOF
+
+
 :: Convert the powershell file.
 :cmdize.ps1
 echo:^<# :


Bug 56292: fix check for missing Java

Bug 56292: fix check for missing Java

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

Former-commit-id: dc5f5406147902e4e2768063c41e5de77a02a116

--- bin/jmeter.bat
+++ bin/jmeter.bat
@@ -35,13 +35,12 @@
     rem @echo Debug Output: %%g
     set JAVAVER=%%g
 )
-set JAVAVER=%JAVAVER:"=%
 if not defined JAVAVER (
     @echo Not able to find Java executable or version. Please check your Java installation.
     set ERRORLEVEL=2
     goto pause
 )
-rem @echo JAVAVER %JAVAVER%
+set JAVAVER=%JAVAVER:"=%
 for /f "delims=. tokens=1-3" %%v in ("%JAVAVER%") do (
     set current_minor=%%w
 )


AMBARI-4525 - Fix Ambari MSI build process

--- contrib/ambari-scom/msi/build.cmd
+++ contrib/ambari-scom/msi/build.cmd
@@ -36,8 +36,12 @@
 pushd "%cd%\src" || exit /b 1
 start /wait /min candle "%cd%\ambari-scom.wxs"  || exit /b 1
 start /wait /min light "%cd%\ambari-scom.wixobj"  || exit /b 1
+if not exist "%cd%\ambari-scom.msi" (
+echo MSI build failed
+exit /b 1
+)
 popd || exit /b 1
-copy /y "..\management-pack\Hadoop_MP\Installer\bin\Debug\en-us\AmbariSCOMManagementPack.msi" "%cd%\ambari-scom.msi" || exit /b 1
+copy /y "..\management-pack\Hadoop_MP\Installer\bin\Debug\en-us\AmbariSCOMManagementPack.msi" "%cd%\ambari-scom-mp.msi" || exit /b 1

 echo Cleaning
 del /f /q "%cd%\src\ambari-scom.wixobj"  || exit /b 1


Add missing commas.

Add missing commas.

--- src/main/command/gib.bat
+++ src/main/command/gib.bat
@@ -1,2 +1,2 @@
 @echo off
-java -cp %~dp0\lib\* com.vackosar.gitflowincrementalbuild.Main %*+java -cp "%~dp0\lib\*" com.vackosar.gitflowincrementalbuild.Main ""%*"


Switch to non-parallel test-all for OpenSSL issue

--- pkg_build_64.cmd
+++ pkg_build_64.cmd
@@ -48,10 +48,9 @@
 @rem ------------------------------------------------------------------ test-all
 @echo test-all

-@make.exe test-all "TESTOPTS=-v -j%M_JOBS% --job-status=normal --show-skip --retry" > %LOG_PATH_NAME%-test-all.log 2>&1
+@rem make.exe test-all "TESTOPTS=-v -j%M_JOBS% --job-status=normal --show-skip --retry" > %LOG_PATH_NAME%-test-all.log 2>&1

-@rem make.exe -j%M_JOBS% test-all "TESTOPTS=-v --job-status=normal --show-skip --retry" > %LOG_PATH_NAME%-test-all.log 2>&1
-@rem make.exe test-all "TESTOPTS=-v --show-skip" > %LOG_PATH_NAME%-test-all.log 2>&1
+@make.exe test-all "TESTOPTS=-v --show-skip" > %LOG_PATH_NAME%-test-all.log 2>&1

 @rem --------------------------------------------------------- btest, test-basic
 @cd %DP0%src/build%SUFFIX%


fix bug

fix bug

--- deploy.bat
+++ deploy.bat
@@ -4,7 +4,7 @@
 mkdir .\tmp\speedreader\Engine
 xcopy '.\Speedreader\Engine\dll(x86)' .\tmp\speedreader\Engine
 copy .\Speedreader\speedreader.ini .\tmp\speedreader
-xcopy .\Speedreader\doc .\tmp\speedreader
+xcopy .\Speedreader\speedreader\doc .\tmp\speedreader
 cd tmp
 "C:\Program Files\7-Zip\7z.exe" a -r speedreader.zip speedreader
 copy speedreader.zip c:\Users\nishio\Desktop


deployment 2.0

deployment 2.0

--- deploy.cmd
+++ deploy.cmd
@@ -100,14 +100,15 @@
 :: 3. Install npm packages
 IF EXIST "%DEPLOYMENT_TARGET%\package.json" (
   pushd "%DEPLOYMENT_TARGET%"
-  call :ExecuteCmd !NPM_CMD! install rimraf -g
-  call :ExecuteCmd mkdir test
-  call :ExecuteCmd rimraf dist node_modules
   call :ExecuteCmd !NPM_CMD! install
+  call :ExecuteCmd !NPM_CMD! run clean:build
   call :ExecuteCmd !NPM_CMD! run build
   IF !ERRORLEVEL! NEQ 0 goto error
   popd
 )
+
+
+

 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 goto end


added bower install

added bower install

--- deploy.cmd
+++ deploy.cmd
@@ -58,6 +58,9 @@
 echo installing npm packages
 call :Executecmd npm install
 IF !ERRORLEVEL! NEQ 0 goto error
+echo installing bower packages
+call :Executecmd bower install
+IF !ERRORLEVEL! NEQ 0 goto error
 echo Spell Checking
 call :Executecmd npm run spellcheck
 IF !ERRORLEVEL! NEQ 0 goto error
@@ -70,6 +73,7 @@
 REM This creates the **index.html** which is deployed by Azure Websites.
 echo Building HTML Resume
 call :Executecmd npm run buildHtml
+IF !ERRORLEVEL! NEQ 0 goto error
 echo Building CSS files
 call :Executecmd npm run buildStyles
 IF !ERRORLEVEL! NEQ 0 goto error


start

start

--- deploy.cmd
+++ deploy.cmd
@@ -96,8 +96,7 @@

 :: 2. Select node version
 call :SelectNodeVersion
-echo 'gogogogoogogoog :)'
-echo %DEPLOYMENT_TARGET%
+
 :: 3. Install npm packages
 IF EXIST "%DEPLOYMENT_TARGET%\package.json" (
   pushd "%DEPLOYMENT_TARGET%"
@@ -137,3 +136,4 @@
 :end
 endlocal
 echo Finished successfully.
+npm start


Correct dist.bat

Correct dist.bat

--- build/dist.bat
+++ build/dist.bat
@@ -1,9 +1,11 @@
 echo off

+set GOPATH=%GOPATH%;%~dp0\..\server
+
 taskkill /f /t /im quanquan.exe
+cd ..\
 del client\quanquan.exe

-set GOPATH=%GOPATH%;%~dp0\server
 go build -a -v -o client\quanquan.exe server\src\main.go
 if %errorlevel% NEQ 0 (
 	echo on


fix proj.4 installation

fix proj.4 installation

--- build_proj.bat
+++ build_proj.bat
@@ -5,6 +5,7 @@

 cd proj-4.8.0

+set INSTDIR=%PREFIX%
 if "%compiler%" == "MINGW" (
   SET "PATH=%MSYSDIR%;%PATH%"
   if NOT EXIST Makefile (bash -c "./configure %CONFARGS%")
@@ -17,7 +18,6 @@
   ) else (
      set OPTFLAGS=	/nologo /Ox /Op /MD
   )
-  set INSTDIR=%PREFIX%
   set PROJ_LIB_DIR=%INSTDIR%\\share
   nmake /f makefile.vc install-all
   %ER%


Don't echo comments (follow-up to r1834853)

git-svn-id: 79cef5a5a257cc9dbe40a45ac190115b4780e2d0@1834992 13f79535-47bb-0310-9956-ffa450edef68

--- bin/makebase.bat
+++ bin/makebase.bat
@@ -1,3 +1,4 @@
+@echo off
 rem Licensed to the Apache Software Foundation (ASF) under one or more
 rem contributor license agreements.  See the NOTICE file distributed with
 rem this work for additional information regarding copyright ownership.


Test Runner

Test Runner

Added a test runner bat for ArcGIS Pro for Clearing Operations

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

--- utils/test/ClearingOperationsTestKickPro.bat
+++ utils/test/ClearingOperationsTestKickPro.bat
@@ -0,0 +1,62 @@
+@ECHO OFF
+rem ------------------------------------------------------------------------------
+rem  Copyright 2015-2017 Esri
+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 ------------------------------------------------------------------------------
+rem  TestKickPro.bat
+rem ------------------------------------------------------------------------------
+rem  requirements:
+rem  * ArcGIS Pro 1.3+
+rem  * Python Python 3.4+
+rem  author: ArcGIS Solutions
+rem  company: Esri
+rem ==================================================
+rem  description:
+rem  This file starts the test running for ArcGIS Pro (Python 3.4+).
+rem
+rem ==================================================
+rem  history:
+rem  10/06/2015 - MF - placeholder
+rem  10/30/2015 - MF - tests running
+rem  12/01/2015 - JH - added parameter for default log file name
+rem  07/05/2016 - MF - updates to changes for Pro 1.3+
+rem  02/24/2017 - MF - more updates for Pro 1.4.1/ArcMap 10.5
+rem  07/20/2017 - MF - split BAT into PRO and MAP versions
+rem ==================================================
+
+REM === TEST SETUP ===================================
+REM === TEST SETUP ===================================
+
+
+REM === LOG SETUP ====================================
+REM usage: set LOG=<defaultLogFileName.log>
+REM name is optional; if not specified, name will be specified for you
+set LOG=
+REM === LOG SETUP ====================================
+
+REM === RUN PRO TESTS ================================
+ECHO Python 3.4 Tests ================================
+REM The location of python.exe will depend upon your installation
+REM of ArcGIS Pro. Modify the following line as necessary:
+"C:\Program Files\ArcGIS\Pro\bin\Python\envs\arcgispro-py3\python.exe" ClearingOperationsTestRunner.py %LOG%
+REM check if ArcGIS Pro/Python 3.4 tests failed
+IF %ERRORLEVEL% NEQ 0 (
+   ECHO 'One or more tests failed'
+)
+REM === RUN PRO TESTS ================================
+
+
+REM === CLEANUP ======================================
+REM === CLEANUP ======================================
+
+EXIT /B %ERRORLEVEL%


windows [interpreter]: add cheddar.bat for executing files

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

--- cheddar.bat
+++ cheddar.bat
@@ -0,0 +1 @@
+@node "dist\cli\cheddar.js" < %1


NoRef GIT-ONLY: normalize all line endings for internal storage

--- tools/mergefromplugins.bat
+++ tools/mergefromplugins.bat
@@ -1,67 +1,67 @@
-echo off
-rem #####################################################################
-rem Licensed to the Apache Software Foundation (ASF) under one
-rem or more contributor license agreements.  See the NOTICE file
-rem distributed with this work for additional information
-rem regarding copyright ownership.  The ASF licenses this file
-rem to you under the Apache License, Version 2.0 (the
-rem "License"); you may not use this file except in compliance
-rem with the License.  You may obtain a copy of the License at
-rem
-rem http://www.apache.org/licenses/LICENSE-2.0
-rem
-rem Unless required by applicable law or agreed to in writing,
-rem software distributed under the License is distributed on an
-rem "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-rem KIND, either express or implied.  See the License for the
-rem specific language governing permissions and limitations
-rem under the License.
-rem #####################################################################
-rem interactive DOS version of mergefromtrunk.sh.
-rem to use : launch and pass the trunk version number to merge in release
-
-rem since we have now svn:mergeinfo changing root ("."), we need to update before merging
-cd ..
-svn up
-
-rem version to merge
-set /p version=version to merge :
-set /a prevRev=%version% - 1
-
-rem build the comment
-echo "Applied fix from trunk plugins for revision: %version%" > comment.tmp
-svn log https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk -r %version% > log.tmp
-copy comment.tmp + log.tmp = comment.tmp
-del log.tmp
-rem keep the comment.tmp file svn ignored. In case of trouble always happier to keep trace.  It will be overidden in next backport.
-
-rem commit the backport to release with comment fom file
-echo on
-cd specialpurpose
-svn merge https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk -c%version%
-cd ..
-echo off
-
-:menu
-echo y) tests
-echo n) exit
-
-echo Do you want to run tests (else the commit will be done automatically using the comment grabed from trunk by the merge)?
-choice /c:yn
-if errorlevel = 2 goto commit
-if errorlevel = 1 goto tests
-
-:commit
-echo on
-svn commit -F comment.tmp
-goto exit
-
-:tests
-echo on
-ant clean-all load-demo run-tests
-echo off
-
-echo You can now do the commit by hand if all is OK. The comment grabbed from trunk by the merge is in the file comment.tmp at root
-
-:exit
-pause
+echo off
+rem #####################################################################
+rem Licensed to the Apache Software Foundation (ASF) under one
+rem or more contributor license agreements.  See the NOTICE file
+rem distributed with this work for additional information
+rem regarding copyright ownership.  The ASF licenses this file
+rem to you under the Apache License, Version 2.0 (the
+rem "License"); you may not use this file except in compliance
+rem with the License.  You may obtain a copy of the License at
+rem
+rem http://www.apache.org/licenses/LICENSE-2.0
+rem
+rem Unless required by applicable law or agreed to in writing,
+rem software distributed under the License is distributed on an
+rem "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+rem KIND, either express or implied.  See the License for the
+rem specific language governing permissions and limitations
+rem under the License.
+rem #####################################################################
+rem interactive DOS version of mergefromtrunk.sh.
+rem to use : launch and pass the trunk version number to merge in release
+
+rem since we have now svn:mergeinfo changing root ("."), we need to update before merging
+cd ..
+svn up
+
+rem version to merge
+set /p version=version to merge :
+set /a prevRev=%version% - 1
+
+rem build the comment
+echo "Applied fix from trunk plugins for revision: %version%" > comment.tmp
+svn log https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk -r %version% > log.tmp
+copy comment.tmp + log.tmp = comment.tmp
+del log.tmp
+rem keep the comment.tmp file svn ignored. In case of trouble always happier to keep trace.  It will be overidden in next backport.
+
+rem commit the backport to release with comment fom file
+echo on
+cd specialpurpose
+svn merge https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk -c%version%
+cd ..
+echo off
+
+:menu
+echo y) tests
+echo n) exit
+
+echo Do you want to run tests (else the commit will be done automatically using the comment grabed from trunk by the merge)?
+choice /c:yn
+if errorlevel = 2 goto commit
+if errorlevel = 1 goto tests
+
+:commit
+echo on
+svn commit -F comment.tmp
+goto exit
+
+:tests
+echo on
+ant clean-all load-demo run-tests
+echo off
+
+echo You can now do the commit by hand if all is OK. The comment grabbed from trunk by the merge is in the file comment.tmp at root
+
+:exit
+pause


1703 | Subhas | Fix windows installer rubygems issue

--- lib/tasks/windows/Reset.bat
+++ lib/tasks/windows/Reset.bat
@@ -1,8 +1,8 @@
 SET PATH=%PATH%;"%*"
 SET RAILS_ENV=standalone
 cd App
-gem install vendor/windows/ruby/1.8/cache/rubygems-update-1.8.25.gem --no-ri --no-rdoc
-gem install vendor/windows/ruby/1.8/cache/bundler-1.2.5.gem --no-ri --no-rdoc
-update_rubygems
-bundle install
-bundle exec rake db:create_couch_sysadmin couchdb:create db:seed db:migrate
+call gem install vendor/windows/ruby/1.8/cache/rubygems-update-1.8.25.gem --no-ri --no-rdoc
+call gem install vendor/windows/ruby/1.8/cache/bundler-1.2.5.gem --no-ri --no-rdoc
+call update_rubygems
+call bundle install
+bundle exec rake db:create_couch_sysadmin[rapidftr,rapidftr] couchdb:create db:seed db:migrate


no autostart browser upon finish

no autostart browser upon finish

--- osmTileMachine/package/generate_example_stockholm_lazyupdate.bat
+++ osmTileMachine/package/generate_example_stockholm_lazyupdate.bat
@@ -1,3 +1,2 @@
 java -jar osmtilemachine.jar -source downloadsweden -update -renderarea box=17.6;59.1;18.6;59.6 -maxzoom 15 -lazyupdate
-start webroot\example_leaflet_Stockholm.html
 pause


cosmetics

cosmetics

--- wdkbuild/make_packages.bat
+++ wdkbuild/make_packages.bat
@@ -76,7 +76,7 @@
 MOVE /Y "Notepad2-mod.%NP2_VER%_r%VerRev%_%2.zip" "..\packages" >NUL 2>&1
 POPD
 RD /S /Q "temp_zip" >NUL 2>&1
-GOTO :EOF
+EXIT /B

 :SubInstaller
@@ -151,7 +151,7 @@
 RD /Q /S "tools\addon" "obj" >NUL 2>&1

 POPD
-GOTO :EOF
+EXIT /B

 :SubVersion
@@ -170,24 +170,24 @@
   SET "VerRev=%%N"&Call :SubVerRev %%VerRev:*Z=%%)

 SET NP2_VER=%VerMajor%.%VerMinor%.%VerBuild%
-GOTO :EOF
+EXIT /B

 :SubVerMajor
 SET VerMajor=%*
-GOTO :EOF
+EXIT /B

 :SubVerMinor
 SET VerMinor=%*
-GOTO :EOF
+EXIT /B

 :SubVerBuild
 SET VerBuild=%*
-GOTO :EOF
+EXIT /B

 :SubVerRev
 SET VerRev=%*
-GOTO :EOF
+EXIT /B

 :SUBMSG


Added *.bat file to allow the remote debugging of the product

error: pathspec 'eclipseProjects/AgentGui-RemoteDebugStart.bat' did not match any file(s) known to git

--- eclipseProjects/AgentGui-RemoteDebugStart.bat
+++ eclipseProjects/AgentGui-RemoteDebugStart.bat
@@ -0,0 +1 @@
+D:\AgentGUI\AgentGui.exe -vmargs -Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y


INFORCRM-15729: Use same version of D3 as sohoxi does

--- build/bundle.bat
+++ build/bundle.bat
@@ -29,7 +29,7 @@
 xcopy %SDK%\node_modules\@infor\icrm-js-customization\dist\bundles\customization.bundle.js %SDK%\deps\icrm-js-customization\ /E /Y
 xcopy %SDK%\node_modules\@infor\icrm-js-services\dist\bundles\services.bundle.js %SDK%\deps\icrm-js-services\ /E /Y
 xcopy %SDK%\node_modules\redux\dist\redux.min.js %SDK%\deps\redux\ /E /Y
-xcopy %SDK%\node_modules\d3\build\d3.js %SDK%\deps\d3\ /E /Y
+xcopy %SDK%\node_modules\@infor\sohoxi\js\vendor\d3.js %SDK%\deps\d3\ /E /Y
 xcopy %SDK%\node_modules\jquery\dist\jquery.js %SDK%\deps\jquery\ /E /Y
 xcopy %SDK%\node_modules\@infor\sohoxi\dist\js\sohoxi.js %SDK%\deps\sohoxijs\ /E /Y
 xcopy %SDK%\node_modules\@infor\sohoxi\dist\css\*.css %SDK%\deps\sohoxicss\ /E /Y


BLD: Create archives in windows build script

--- build_bdists.bat
+++ build_bdists.bat
@@ -4,3 +4,4 @@
 call tools\build_win_bdist32-py27.bat
 call tools\build_win_bdist32-py32.bat
 call tools\build_win_bdist64-py32.bat
+call python setup.py sdist --formats=zip,gztar


update script

update script

--- build_script.bat
+++ build_script.bat
@@ -1,10 +1,13 @@
+@echo off
 if "%1"=="" goto default_value_python:
 set pythonexe="%1"
 %pythonexe% setup.py write_version
 goto custom_python:

 :default_value_python:
-set pythonexe="c:\Python36_x64\python"
+set pythonexe="c:\Python363_x64\python"
+if not exist %pythonexe% set pythonexe="c:\Python36_x64\python"
 :custom_python:
+@echo [python] %pythonexe%
 %pythonexe% -u setup.py build_script
 if %errorlevel% neq 0 exit /b %errorlevel%


Stupid typo

Stupid typo

--- build_script.cmd
+++ build_script.cmd
@@ -15,7 +15,7 @@
 copy electron-main.js %PACKAGE_BASE%\electron-main.js
 copy omnisharp-setup.js %PACKAGE_BASE%\omnisharp-setup.js
 copy package.json %PACKAGE_BASE%\package.json
-copy node_modules\zone.jz\dist\zone.js %PACKAGE_BASE%\zone.js
+copy node_modules\zone.js\dist\zone.js %PACKAGE_BASE%\zone.js
 copy node_modules\reflect-metadata\Reflect.js %PACKAGE_BASE%\Reflect.js
 mkdir %PACKAGE_BASE%\node_modules\bootstrap\dist\fonts
 copy node_modules\bootstrap\dist\fonts\*.* %PACKAGE_BASE%\node_modules\bootstrap\dist\fonts\


use Windows shell command "FOR /F" instead of powershell

--- PostgreSQL/SQLScripts/SCHEMA/CREATE_SCHEMA.bat
+++ PostgreSQL/SQLScripts/SCHEMA/CREATE_SCHEMA.bat
@@ -57,7 +57,12 @@
 set TMP_DELETE_FILENAME=DELETE_TMP.sql
 set TMP_DELETE_FILE_PATH=DELETE\%TMP_DELETE_FILENAME%

-powershell -Command "(gc %DELETE_FILE_PATH%) -replace '%PLACEHOLDER%', '%SCHEMANAME%' | Out-File %TMP_DELETE_FILE_PATH% -encoding Ascii"
+setlocal enabledelayedexpansion
+for /f "tokens=* delims=" %%A in (%DELETE_FILE_PATH%) do (
+SET string=%%A
+SET "modified=!string:%PLACEHOLDER%=%SCHEMANAME%!"
+echo !modified! >> !TMP_DELETE_FILE_PATH!
+)

 REM Run CREATE_SCHEMA.sql to create a new data schema %var%
 "%PGBIN%\psql" -d "%CITYDB%" -f "CREATE_SCHEMA.sql" -v schemaname="%SCHEMANAME%" -v tmp_delete_filename="%TMP_DELETE_FILENAME%"


commit on 05/08/2019 at 18:33:10

commit on 05/08/2019 at 18:33:10

--- windows-cmd/startPipeE.cmd
+++ windows-cmd/startPipeE.cmd
@@ -1 +1 @@
-cd D:/01_Luca/06_WD/thinPlyMechanics/windows-cmd && startERVESimPipeEEIGM.cmd 1_144S5A0freeCOARED && cd D:/01_Luca/06_WD/thinPlyMechanics/windows-cmd && startERVESimPipeEEIGM.cmd 1_144S5A0vkCOARED && cd D:/01_Luca/06_WD/thinPlyMechanics/windows-cmd && startERVESimPipeEEIGM.cmd 1_144S5A0asymmCOARED && cd D:/01_Luca/06_WD/thinPlyMechanics/windows-cmd && startERVESimPipeEEIGM.cmd 1_144S5A0T1COARED && cd D:/01_Luca/06_WD/thinPlyMechanics/windows-cmd && startERVESimPipeEEIGM.cmd 1_144S5A1freeCOARED && cd D:/01_Luca/06_WD/thinPlyMechanics/windows-cmd && startERVESimPipeEEIGM.cmd 1_144S5A1vkCOARED && cd D:/01_Luca/06_WD/thinPlyMechanics/windows-cmd && startERVESimPipeEEIGM.cmd 1_144S5A1asymmCOARED && cd D:/01_Luca/06_WD/thinPlyMechanics/windows-cmd && startERVESimPipeEEIGM.cmd 1_144S5A1T1COARED && cd D:/01_Luca/06_WD/thinPlyMechanics/windows-cmd && startERVESimPipeEEIGM.cmd 1_144S5A5freeCOARED && cd D:/01_Luca/06_WD/thinPlyMechanics/windows-cmd && startERVESimPipeEEIGM.cmd 1_144S5A5vkCOARED && cd D:/01_Luca/06_WD/thinPlyMechanics/windows-cmd && startERVESimPipeEEIGM.cmd 1_144S5A5asymmCOARED && cd D:/01_Luca/06_WD/thinPlyMechanics/windows-cmd && startERVESimPipeEEIGM.cmd 1_144S5A5T1COARED && cd D:/01_Luca/06_WD/thinPlyMechanics/windows-cmd && startERVESimPipeEEIGM.cmd 1_144S5A10freeCOARED && cd D:/01_Luca/06_WD/thinPlyMechanics/windows-cmd && startERVESimPipeEEIGM.cmd 1_144S5A10vkCOARED && cd D:/01_Luca/06_WD/thinPlyMechanics/windows-cmd && startERVESimPipeEEIGM.cmd 1_144S5A10asymmCOARED && cd D:/01_Luca/06_WD/thinPlyMechanics/windows-cmd && startERVESimPipeEEIGM.cmd 1_144S5A10T1COARED && cd D:/01_Luca/06_WD/thinPlyMechanics/windows-cmd && startERVESimPipeEEIGM.cmd 1_144S5A100freeCOARED && cd D:/01_Luca/06_WD/thinPlyMechanics/windows-cmd && startERVESimPipeEEIGM.cmd 1_144S5A100vkCOARED && cd D:/01_Luca/06_WD/thinPlyMechanics/windows-cmd && startERVESimPipeEEIGM.cmd 1_144S5A100asymmCOARED && cd D:/01_Luca/06_WD/thinPlyMechanics/windows-cmd && startERVESimPipeEEIGM.cmd 1_144S5A100T1COARED
+cd D:/01_Luca/06_WD/thinPlyMechanics/windows-cmd && startERVESimPipeEEIGM.cmd 1_144S5A1freeCOARED && cd D:/01_Luca/06_WD/thinPlyMechanics/windows-cmd && startERVESimPipeEEIGM.cmd 1_144S5A1vkCOARED && cd D:/01_Luca/06_WD/thinPlyMechanics/windows-cmd && startERVESimPipeEEIGM.cmd 1_144S5A1asymmCOARED && cd D:/01_Luca/06_WD/thinPlyMechanics/windows-cmd && startERVESimPipeEEIGM.cmd 1_144S5A1T1COARED && cd D:/01_Luca/06_WD/thinPlyMechanics/windows-cmd && startERVESimPipeEEIGM.cmd 1_144S5A5freeCOARED && cd D:/01_Luca/06_WD/thinPlyMechanics/windows-cmd && startERVESimPipeEEIGM.cmd 1_144S5A5vkCOARED && cd D:/01_Luca/06_WD/thinPlyMechanics/windows-cmd && startERVESimPipeEEIGM.cmd 1_144S5A5asymmCOARED && cd D:/01_Luca/06_WD/thinPlyMechanics/windows-cmd && startERVESimPipeEEIGM.cmd 1_144S5A5T1COARED && cd D:/01_Luca/06_WD/thinPlyMechanics/windows-cmd && startERVESimPipeEEIGM.cmd 1_144S5A10freeCOARED && cd D:/01_Luca/06_WD/thinPlyMechanics/windows-cmd && startERVESimPipeEEIGM.cmd 1_144S5A10vkCOARED && cd D:/01_Luca/06_WD/thinPlyMechanics/windows-cmd && startERVESimPipeEEIGM.cmd 1_144S5A10asymmCOARED && cd D:/01_Luca/06_WD/thinPlyMechanics/windows-cmd && startERVESimPipeEEIGM.cmd 1_144S5A10T1COARED && cd D:/01_Luca/06_WD/thinPlyMechanics/windows-cmd && startERVESimPipeEEIGM.cmd 1_144S5A100freeCOARED && cd D:/01_Luca/06_WD/thinPlyMechanics/windows-cmd && startERVESimPipeEEIGM.cmd 1_144S5A100vkCOARED && cd D:/01_Luca/06_WD/thinPlyMechanics/windows-cmd && startERVESimPipeEEIGM.cmd 1_144S5A100asymmCOARED && cd D:/01_Luca/06_WD/thinPlyMechanics/windows-cmd && startERVESimPipeEEIGM.cmd 1_144S5A100T1COARED


Removing spaces

Removing spaces

--- Release-Builds/build-fyi-release-dot-net-4.bat
+++ Release-Builds/build-fyi-release-dot-net-4.bat
@@ -5,27 +5,15 @@
 REM ************* Begin x64 *********************************************

 "C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" "%CD%\..\DataProviders\DataProviders.sln" /toolsversion:4.0 /p:Configuration="Release";Platform="x64" /t:clean;rebuild /m:4
-
 REM "C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" "..\%CD%\..\OracleSP\OracleSp.sln" /toolsversion:4.0 /p:Configuration="Release";Platform="x64" /t:clean;rebuild /m:4
-
 "C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" "%CD%\..\RdlAsp\RdlAsp.sln" /toolsversion:4.0 /p:Configuration="Release";Platform="x64" /t:clean;rebuild /m:4
-
 "C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" "%CD%\..\RdlCmd\RdlCmd.sln" /toolsversion:4.0 /p:Configuration="Release";Platform="x64" /t:clean;rebuild /m:4
-
 "C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" "%CD%\..\RdlCri\RdlCri.sln" /toolsversion:4.0 /p:Configuration="Release";Platform="x64" /t:clean;rebuild /m:4
-
 "C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" "%CD%\..\RdlDesign\RdlDesign.sln" /toolsversion:4.0 /p:Configuration="Release";Platform="x64" /t:clean;rebuild /m:4
-
 "C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" "%CD%\..\RdlDesktop\RdlDesktop.sln" /toolsversion:4.0 /p:Configuration="Release";Platform="x64" /t:clean;rebuild /m:4
-
 "C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" "%CD%\..\RdlEngine\RdlEngine.sln" /toolsversion:4.0 /p:Configuration="Release";Platform="x64" /t:clean;rebuild /m:4
-
 "C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" "%CD%\..\RdlMapFile\RdlMapFile.sln" /toolsversion:4.0 /p:Configuration="Release";Platform="x64" /t:clean;rebuild /m:4
-
 "C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" "%CD%\..\RdlViewer\RdlViewer.sln" /toolsversion:4.0 /p:Configuration="Release";Platform="x64" /t:clean;rebuild /m:4
-
-
-

 del .\my-fyi-build-dot-net-4-x64 /Q
 mkdir .\my-fyi-build-dot-net-4-x64
@@ -57,27 +45,15 @@
 REM ************* Begin x86 *********************************************

 "C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" "%CD%\..\DataProviders\DataProviders.sln" /toolsversion:4.0 /p:Configuration="Release";Platform="x86" /t:clean;rebuild /m:4
-
 REM "C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" "..\%CD%\..\OracleSP\OracleSp.sln" /toolsversion:4.0 /p:Configuration="Release";Platform="x86" /t:clean;rebuild /m:4
-
 "C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" "%CD%\..\RdlAsp\RdlAsp.sln" /toolsversion:4.0 /p:Configuration="Release";Platform="x86" /t:clean;rebuild /m:4
-
 "C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" "%CD%\..\RdlCmd\RdlCmd.sln" /toolsversion:4.0 /p:Configuration="Release";Platform="x86" /t:clean;rebuild /m:4
-
 "C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" "%CD%\..\RdlCri\RdlCri.sln" /toolsversion:4.0 /p:Configuration="Release";Platform="x86" /t:clean;rebuild /m:4
-
 "C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" "%CD%\..\RdlDesign\RdlDesign.sln" /toolsversion:4.0 /p:Configuration="Release";Platform="x86" /t:clean;rebuild /m:4
-
 "C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" "%CD%\..\RdlDesktop\RdlDesktop.sln" /toolsversion:4.0 /p:Configuration="Release";Platform="x86" /t:clean;rebuild /m:4
-
 "C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" "%CD%\..\RdlEngine\RdlEngine.sln" /toolsversion:4.0 /p:Configuration="Release";Platform="x86" /t:clean;rebuild /m:4
-
 "C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" "%CD%\..\RdlMapFile\RdlMapFile.sln" /toolsversion:4.0 /p:Configuration="Release";Platform="x86" /t:clean;rebuild /m:4
-
 "C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" "%CD%\..\RdlViewer\RdlViewer.sln" /toolsversion:4.0 /p:Configuration="Release";Platform="x86" /t:clean;rebuild /m:4
-
-
-

 del .\my-fyi-build-dot-net-4-x86 /Q
 mkdir .\my-fyi-build-dot-net-4-x86


ISIXE-1562 updated boost

ISIXE-1562 updated boost

--- dependencies/build-boost.bat
+++ dependencies/build-boost.bat
@@ -1,3 +1,11 @@
+SET ARCH=32
+IF [%1] == [64] (
+	SET ARCH=64
+)
+IF [%1] == [32] (
+	SET ARCH=32
+)
+
 call build-common.bat

 Set ARCHIVE=boost_1_58_0.tar.bz2
@@ -32,7 +40,14 @@

 if not exist b2.exe exit /b

-b2 toolset=msvc --with-atomic --with-date_time --with-filesystem --with-log --with-python --with-regex --with-serialization --with-system --with-thread link=shared threading=multi --layout=system variant=release install --prefix=%PREFIX% stage > NUL
+IF [%ARCH%] == [64] (
+	echo using python : 2.7 : %PYTHON_PATH_x64% ; >> user-config.jam
+)
+IF [%ARCH%] == [32] (
+	echo using python : 2.7 : %PYTHON_PATH_x86% ; >> user-config.jam
+)
+
+b2 --user-config=user-config.jam toolset=msvc address-model=%ARCH% --with-atomic --with-date_time --with-filesystem --with-log --with-python --with-regex --with-serialization --with-system --with-thread link=shared threading=multi --layout=system variant=release install --prefix=%PREFIX% stage > D:\out

 echo "Cleaning up"
 cd %DEP_DIR%


adding wso2server.bat file

adding wso2server.bat file

error: pathspec 'modules/distribution/src/repository/conf/wso2server.bat' did not match any file(s) known to git

--- modules/distribution/src/repository/conf/wso2server.bat
+++ modules/distribution/src/repository/conf/wso2server.bat
@@ -0,0 +1,177 @@
+@echo off
+
+REM ---------------------------------------------------------------------------
+REM        Copyright 2005-2009 WSO2, Inc. http://www.wso2.org
+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 ---------------------------------------------------------------------------
+rem Main Script for WSO2 Carbon
+rem
+rem Environment Variable Prequisites
+rem
+rem   CARBON_HOME   Home of CARBON installation. If not set I will  try
+rem                   to figure it out.
+rem
+rem   JAVA_HOME       Must point at your Java Development Kit installation.
+rem
+rem   JAVA_OPTS       (Optional) Java runtime options used when the commands
+rem                   is executed.
+rem ---------------------------------------------------------------------------
+
+rem ----- if JAVA_HOME is not set we're not happy ------------------------------
+:checkJava
+
+if "%JAVA_HOME%" == "" goto noJavaHome
+if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome
+goto checkServer
+
+:noJavaHome
+echo "You must set the JAVA_HOME variable before running CARBON."
+goto end
+
+rem ----- Only set CARBON_HOME if not already set ----------------------------
+:checkServer
+rem %~sdp0 is expanded pathname of the current script under NT with spaces in the path removed
+if "%CARBON_HOME%"=="" set CARBON_HOME=%~sdp0..
+SET curDrive=%cd:~0,1%
+SET wsasDrive=%CARBON_HOME:~0,1%
+if not "%curDrive%" == "%wsasDrive%" %wsasDrive%:
+
+rem find CARBON_HOME if it does not exist due to either an invalid value passed
+rem by the user or the %0 problem on Windows 9x
+if not exist "%CARBON_HOME%\bin\version.txt" goto noServerHome
+
+set AXIS2_HOME=%CARBON_HOME%
+goto updateClasspath
+
+:noServerHome
+echo CARBON_HOME is set incorrectly or CARBON could not be located. Please set CARBON_HOME.
+goto end
+
+rem ----- update classpath -----------------------------------------------------
+:updateClasspath
+
+setlocal EnableDelayedExpansion
+cd %CARBON_HOME%
+set CARBON_CLASSPATH=
+FOR %%C in ("%CARBON_HOME%\bin\*.jar") DO set CARBON_CLASSPATH=!CARBON_CLASSPATH!;".\bin\%%~nC%%~xC"
+
+set CARBON_CLASSPATH="%JAVA_HOME%\lib\tools.jar";%CARBON_CLASSPATH%;
+
+FOR %%D in ("%CARBON_HOME%\lib\commons-lang*.jar") DO set CARBON_CLASSPATH=!CARBON_CLASSPATH!;".\lib\%%~nD%%~xD"
+
+rem ----- Process the input command -------------------------------------------
+
+rem Slurp the command line arguments. This loop allows for an unlimited number
+rem of arguments (up to the command line limit, anyway).
+
+
+:setupArgs
+if ""%1""=="""" goto doneStart
+
+if ""%1""==""-run""     goto commandLifecycle
+if ""%1""==""--run""    goto commandLifecycle
+if ""%1""==""run""      goto commandLifecycle
+
+if ""%1""==""-restart""  goto commandLifecycle
+if ""%1""==""--restart"" goto commandLifecycle
+if ""%1""==""restart""   goto commandLifecycle
+
+if ""%1""==""debug""    goto commandDebug
+if ""%1""==""-debug""   goto commandDebug
+if ""%1""==""--debug""  goto commandDebug
+
+if ""%1""==""version""   goto commandVersion
+if ""%1""==""-version""  goto commandVersion
+if ""%1""==""--version"" goto commandVersion
+
+shift
+goto setupArgs
+
+rem ----- commandVersion -------------------------------------------------------
+:commandVersion
+shift
+type "%CARBON_HOME%\bin\version.txt"
+type "%CARBON_HOME%\bin\wso2carbon-version.txt"
+goto end
+
+rem ----- commandDebug ---------------------------------------------------------
+:commandDebug
+shift
+set DEBUG_PORT=%1
+if "%DEBUG_PORT%"=="" goto noDebugPort
+if not "%JAVA_OPTS%"=="" echo Warning !!!. User specified JAVA_OPTS will be ignored, once you give the --debug option.
+set JAVA_OPTS=-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=%DEBUG_PORT%
+echo Please start the remote debugging client to continue...
+goto findJdk
+
+:noDebugPort
+echo Please specify the debug port after the --debug option
+goto end
+
+rem ----- commandLifecycle -----------------------------------------------------
+:commandLifecycle
+goto findJdk
+
+:doneStart
+if "%OS%"=="Windows_NT" @setlocal
+if "%OS%"=="WINNT" @setlocal
+
+rem ---------- Handle the SSL Issue with proper JDK version --------------------
+rem find the version of the jdk
+:findJdk
+
+set CMD=RUN %*
+
+:checkJdk17
+"%JAVA_HOME%\bin\java" -version 2>&1 | findstr /r "1.[7|8]" >NUL
+IF ERRORLEVEL 1 goto unknownJdk
+goto jdk17
+
+:unknownJdk
+echo Starting WSO2 Carbon (in unsupported JDK)
+echo [ERROR] CARBON is supported only on JDK 1.7 and 1.8
+goto jdk17
+
+:jdk17
+goto runServer
+
+rem ----------------- Execute The Requested Command ----------------------------
+
+:runServer
+cd %CARBON_HOME%
+
+rem ------------------ Remove tmp folder on startup -----------------------------
+set TMP_DIR=%CARBON_HOME%\tmp
+rmdir "%TMP_DIR%" /s /q
+
+rem ---------- Add jars to classpath ----------------
+
+set CARBON_CLASSPATH=.\lib;%CARBON_CLASSPATH%
+
+set JAVA_ENDORSED=".\lib\endorsed";"%JAVA_HOME%\jre\lib\endorsed";"%JAVA_HOME%\lib\endorsed"
+
+set CMD_LINE_ARGS=-Xbootclasspath/a:%CARBON_XBOOTCLASSPATH% -Xms256m -Xmx1024m -XX:MaxPermSize=256m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath="%CARBON_HOME%\repository\logs\heap-dump.hprof"  -Dcom.sun.management.jmxremote -classpath %CARBON_CLASSPATH% %JAVA_OPTS% -Djava.endorsed.dirs=%JAVA_ENDORSED% -Dcarbon.registry.root=/ -Dcarbon.home="%CARBON_HOME%" -Dwso2.server.standalone=true -Djava.command="%JAVA_HOME%\bin\java" -Djava.opts="%JAVA_OPTS%" -Djava.io.tmpdir="%CARBON_HOME%\tmp" -Dcatalina.base="%CARBON_HOME%\lib\tomcat" -Dwso2.carbon.xml=%CARBON_HOME%\repository\conf\carbon.xml -Dwso2.registry.xml="%CARBON_HOME%\repository\conf\registry.xml" -Dwso2.user.mgt.xml="%CARBON_HOME%\repository\conf\user-mgt.xml" -Dwso2.transports.xml="%CARBON_HOME%\repository\conf\mgt-transports.xml" -Djava.util.logging.config.file="%CARBON_HOME%\repository\conf\etc\logging-bridge.properties" -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager -Dcarbon.config.dir.path="%CARBON_HOME%\repository\conf" -Dcarbon.logs.path="%CARBON_HOME%\repository\logs" -Dcomponents.repo="%CARBON_HOME%\repository\components" -Dconf.location="%CARBON_HOME%\repository\conf" -Dcom.atomikos.icatch.file="%CARBON_HOME%\lib\transactions.properties" -Dcom.atomikos.icatch.hide_init_file_path="true" -Dorg.apache.jasper.runtime.BodyContentImpl.LIMIT_BUFFER=true -Dcom.sun.jndi.ldap.connect.pool.authentication=simple -Dcom.sun.jndi.ldap.connect.pool.timeout=3000 -Dorg.terracotta.quartz.skipUpdateCheck=true -Dorg.opensaml.httpclient.https.disableHostnameVerification=true -Dcarbon.classpath=%CARBON_CLASSPATH% -Dfile.encoding=UTF8 -Dorg.apache.jasper.compiler.Parser.STRICT_QUOTE_ESCAPING=false -DapplyPatches
+
+:runJava
+echo JAVA_HOME environment variable is set to %JAVA_HOME%
+echo CARBON_HOME environment variable is set to %CARBON_HOME%
+"%JAVA_HOME%\bin\java" %CMD_LINE_ARGS% org.wso2.carbon.bootstrap.Bootstrap %CMD%
+if "%ERRORLEVEL%"=="121" goto runJava
+:end
+goto endlocal
+
+:endlocal
+
+:END


make package using `nyagos --show-version-only`

--- make.cmd
+++ make.cmd
@@ -370,9 +370,7 @@
         }
     }
     "package" {
-        .\nyagos -e "print(nyagos.version or nyagos.stamp)" |
-            %{ $version = ($_ -replace "/","") } # get the last line only.
-        $private:zipname = ("nyagos-{0}-{1}.zip" -f $version,(Get-GoArch))
+        $zipname = ("nyagos-{0}.zip" -f (.\nyagos.exe --show-version-only))
         Write-Verbose ("$ zip -9 " + $zipname + " ....")
         zip -9 $zipname `
             nyagos.exe `


Use links from S3 to install CUDA (#1472)

--- packaging/windows/internal/cuda_install.bat
+++ packaging/windows/internal/cuda_install.bat
@@ -57,14 +57,14 @@
 :cuda101

 if not exist "%SRC_DIR%\temp_build\cuda_10.1.243_426.00_win10.exe" (
-    curl -k -L http://developer.download.nvidia.com/compute/cuda/10.1/Prod/local_installers/cuda_10.1.243_426.00_win10.exe --output "%SRC_DIR%\temp_build\cuda_10.1.243_426.00_win10.exe"
+    curl -k -L https://ossci-windows.s3.amazonaws.com/cuda_10.1.243_426.00_win10.exe --output "%SRC_DIR%\temp_build\cuda_10.1.243_426.00_win10.exe"
     if errorlevel 1 exit /b 1
     set "CUDA_SETUP_FILE=%SRC_DIR%\temp_build\cuda_10.1.243_426.00_win10.exe"
     set "ARGS=nvcc_10.1 cuobjdump_10.1 nvprune_10.1 cupti_10.1 cublas_10.1 cublas_dev_10.1 cudart_10.1 cufft_10.1 cufft_dev_10.1 curand_10.1 curand_dev_10.1 cusolver_10.1 cusolver_dev_10.1 cusparse_10.1 cusparse_dev_10.1 nvgraph_10.1 nvgraph_dev_10.1 npp_10.1 npp_dev_10.1 nvrtc_10.1 nvrtc_dev_10.1 nvml_dev_10.1"
 )

 if not exist "%SRC_DIR%\temp_build\cudnn-10.1-windows10-x64-v7.6.4.38.zip" (
-    curl -k -L https://www.dropbox.com/s/i3aur3wh9lykmgx/cudnn-10.1-windows10-x64-v7.6.4.38.zip?dl=1 --output "%SRC_DIR%\temp_build\cudnn-10.1-windows10-x64-v7.6.4.38.zip"
+    curl -k -L https://ossci-windows.s3.amazonaws.com/cudnn-10.1-windows10-x64-v7.6.4.38.zip --output "%SRC_DIR%\temp_build\cudnn-10.1-windows10-x64-v7.6.4.38.zip"
     if errorlevel 1 exit /b 1
     set "CUDNN_SETUP_FILE=%SRC_DIR%\temp_build\cudnn-10.1-windows10-x64-v7.6.4.38.zip"
 )


Incremented version

Incremented version

--- urbackupserver_installer_win/generate_msi.bat
+++ urbackupserver_installer_win/generate_msi.bat
@@ -2,7 +2,7 @@
 set data_dir=data_x64
 set data_common=data_common
 set data_python=data_python_x64
-set version=1.2.2-1
+set version=1.2.3-1

 cd "%~dp0"


Specware4.cmd

Specware4.cmd

git-svn-id: 9ecf60ce9baff443e30a0472d3fd222fcb8117cf@2586 7b97033b-253e-4a5c-9b07-e25f9089a9fd

--- Applications/Specware/bin/windows/Specware4.cmd
+++ Applications/Specware/bin/windows/Specware4.cmd
@@ -1,3 +1,3 @@
+rem last modified: Sep. 23. 3:24pm
 @echo off
-
 call start-in-xemacs run-specware4


Fixed java path in run.bat.

Fixed java path in run.bat.

Former-commit-id: 46d18917a33d5c68a29cd060272290b79f155ec9

--- build/windows/dist/run.bat
+++ build/windows/dist/run.bat
@@ -5,7 +5,7 @@

 set SAVEDCP=%CLASSPATH%
 set SAVEDPATH=%PATH%
-set JAVA_HOME=""
+set JAVA_HOME="java\bin"

 if %JAVA_HOME% == "" GOTO Error


added wrapper version in cmd

added wrapper version in cmd

--- mvnw.cmd
+++ mvnw.cmd
@@ -120,7 +120,7 @@
 set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
 set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain

-set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.0/maven-wrapper-0.4.0.jar"
+set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.1/maven-wrapper-0.4.1.jar"
 FOR /F "tokens=1,2 delims==" %%A IN (%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties) DO (
 	IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
 )


Ensure opencover runs

Ensure opencover runs

--- psake.NET.bat
+++ psake.NET.bat
@@ -3,5 +3,6 @@
 SET BATCH_FILE_PATH=%~dp0
 :: Override here psake.NET properties setting the related environment variables
 :: e.g. SET PSAKE_NET_DEFAULT_PROJECT_DIR=%BATCH_FILE_PATH:~0,-1%\foo\bar
+SET PSAKE_NET_RUN_OPENCOVER=true

 CMD /C "%BATCH_FILE_PATH%\.build\psake.NET.bat" %*


Add CONFIG in protos/generate.bat.

Add CONFIG in protos/generate.bat.

--- examples/protos/generate.bat
+++ examples/protos/generate.bat
@@ -1,10 +1,12 @@
 REM Generate source files from proto files.

-set PROTOC=..\..\third_party\grpc\third_party\protobuf\cmake\Release\protoc.exe
+set CONFIG=Release
+
+set PROTOC=..\..\third_party\grpc\third_party\protobuf\cmake\%CONFIG%\protoc.exe
 %PROTOC% -I. --cpp_out=..\cpp_cb\helloworld helloworld.proto
 %PROTOC% -I. --cpp_out=..\cpp_cb\route_guide route_guide.proto

-set PLUGIN_EXE=..\..\build\bin\Release\grpc_cpp_cb_plugin.exe
+set PLUGIN_EXE=..\..\build\bin\%CONFIG%\grpc_cpp_cb_plugin.exe
 %PROTOC% -I. --grpc_out=..\cpp_cb\helloworld ^
   --plugin=protoc-gen-grpc=%PLUGIN_EXE% ^
   helloworld.proto


Line break

Line break

--- code/bundle-skip-tests.bat
+++ code/bundle-skip-tests.bat
@@ -1 +1 @@
-call bundle.bat -DskipTests+call bundle.bat -DskipTests


Allow Ping also when Windows Firewall is enabled.

Windows Firewall blocks ICMP pings by default for which reason again?
Anyway.

--- check_mk/windows_install_script/check_mk_agent.bat
+++ check_mk/windows_install_script/check_mk_agent.bat
@@ -54,19 +54,27 @@
 echo Add firewall rule to allow external access to the agent. Note that this will add a new rule each time it is executed (not idempotent).
 netsh advfirewall firewall add rule name="Check_MK_Agent" dir=in action=allow protocol=TCP localport=6556 enable=yes

+rem https://superuser.com/questions/342822/enable-ping-in-windows-7-firewall/343111#343111
+echo Add firewall rule to allow ICMP to the host.
+netsh advfirewall firewall add rule name="ICMP Allow incoming V4 echo request" protocol=icmpv4:8,any dir=in action=allow
+
+rem Configure on x86-32 systems {{{
 if exist "%programfiles(x86)%" goto x64
 echo Configure agent on a x86-32 system.
 mkdir "%programfiles%\check_mk"
 copy .\check_mk.ini "%programfiles%\check_mk\check_mk.ini" /y
 net start Check_MK_Agent
 goto ende
+rem }}}

+rem Configure on x86-64 systems {{{
 :x64
 echo Configure agent on a x86-64 system.
 mkdir "%programfiles(x86)%\check_mk"
 copy .\check_mk.ini "%programfiles(x86)%\check_mk\check_mk.ini" /y
 net start Check_MK_Agent
 goto ende
+rem }}}

 :installed
 echo Agent was already installed.


Updates build.cmd with latest improvements

--- DevEnv/Building-nuget-package/Example/build.cmd
+++ DevEnv/Building-nuget-package/Example/build.cmd
@@ -4,29 +4,14 @@

 SET NUGET=%LocalAppData%\NuGet\NuGet.exe
 SET FAKE=%LocalAppData%\FAKE\tools\Fake.exe
-SET NYX=%LocalAppData%\Nyx\tools\build.fsx
+SET NYX=%LocalAppData%\Nyx\tools\build_next.fsx
 SET GITVERSION=%LocalAppData%\GitVersion.CommandLine\tools\GitVersion.exe
-SET MSBUILD14_TOOLS_PATH="%ProgramFiles(x86)%\MSBuild\14.0\bin\MSBuild.exe"
-
-IF NOT EXIST %MSBUILD14_TOOLS_PATH% (
-  echo In order to run this tool you need either Visual Studio 2015 or
-  echo Microsoft Build Tools 2015 tools installed.
-  echo.
-  echo Visit this page to download either:
-  echo.
-  echo http://www.visualstudio.com/en-us/downloads/visual-studio-2015-downloads-vs
-  echo.
-)

 echo Downloading NuGet.exe...
-IF NOT EXIST %LocalAppData%\NuGet md %LocalAppData%\NuGet
-@powershell -NoProfile -ExecutionPolicy unrestricted -Command "$ProgressPreference = 'SilentlyContinue'; Invoke-WebRequest 'https://dist.nuget.org/win-x86-commandline/latest/nuget.exe' -OutFile '%NUGET%'"
-
-echo Downloading latest version of NuGet.Core...
-IF NOT EXIST %LocalAppData%\NuGet.Core %NUGET% "install" "NuGet.Core" "-OutputDirectory" "%LocalAppData%" "-ExcludeVersion" "-Version" "2.11.1"
+IF NOT EXIST @powershell -NoProfile -ExecutionPolicy unrestricted -Command "New-Item -ItemType directory -Path %LocalAppData%\NuGet\; (New-Object System.Net.WebClient).DownloadFile('https://dist.nuget.org/win-x86-commandline/latest/nuget.exe','%NUGET%')"

 echo Downloading FAKE...
-IF NOT EXIST %LocalAppData%\FAKE %NUGET% "install" "FAKE" "-OutputDirectory" "%LocalAppData%" "-ExcludeVersion" "-Version" "4.32.0"
+IF NOT EXIST %LocalAppData%\FAKE %NUGET% "install" "FAKE" "-OutputDirectory" "%LocalAppData%" "-ExcludeVersion" "-Version" "4.50.0"

 echo Downloading GitVersion.CommandLine...
 IF NOT EXIST %LocalAppData%\GitVersion.CommandLine %NUGET% "install" "GitVersion.CommandLine" "-OutputDirectory" "%LocalAppData%" "-ExcludeVersion" "-Version" "3.6.1"
@@ -40,12 +25,10 @@
 %FAKE% %NYX% "target=RestoreBowerPackages" -st

 IF NOT [%1]==[] (set RELEASE_NUGETKEY="%1")
-IF NOT [%2]==[] (set RELEASE_TARGETSOURCE="%2")

-SET RELEASE_NOTES=RELEASE_NOTES.md
+SET NUGET_SOURCE_PUSH=URL_WITH_READONLY_KEY
+
 SET SUMMARY="Example Project Summary"
 SET DESCRIPTION="Example Project Description"

-%FAKE% %NYX% "target=%TARGET%" appName=Example-Project appSummary=%SUMMARY% appDescription=%DESCRIPTION% nugetPackageName=Example-Project nugetkey=%RELEASE_NUGETKEY% nugetserver=%RELEASE_TARGETSOURCE%
-
-IF NOT [%1]==[] (%FAKE% %NYX% "target=Release" -st appReleaseNotes=%RELEASE_NOTES%)
+%FAKE% %NYX% appName=APP_NAME appSummary=%SUMMARY% appDescription=%DESCRIPTION% nugetPackageName=APP_NAME nugetkey=%RELEASE_NUGETKEY% nugetserver=%RELEASE_TARGETSOURCE%


Fixed a problem with the build server finding git.exe.

--- GetCurrentVersion.bat
+++ GetCurrentVersion.bat
@@ -1 +1,4 @@
-git show HEAD
+setlocal
+set GIT_PATH=%1
+if not exist "%GIT_PATH%" set GIT_PATH=git
+%GIT_PATH% show --stat HEAD


* fixed: control external records separately to versioned/unversioned items

git-svn-id: e4e5150cbaae966e82617adf20e509dfc2de7bc3@39 c83cf141-d9d7-4975-98f5-23f3ee83e49f

--- Scripts/svn_has_changes.bat
+++ Scripts/svn_has_changes.bat
@@ -7,9 +7,15 @@
 rem   items.

 rem Flags:
-rem  -stat-exclude-? - exclude status lines for unversionned files (? prefixed) from "svn status" output.
-rem  -stat-exclude-versioned - exclude status lines for versionned files (non ? prefixed) from "svn status" output.
-rem     Versioned items has inclusion priority over unversioned items.
+rem  -r - process externals recursively.
+rem  -stat-exclude-? - exclude status lines for items not under version
+rem     control (? prefixed) from "svn status" output.
+rem  -stat-include-X - include status lines for unversioned directories created
+rem     by an externals definition (X prefixed) from "svn status" output.
+rem  -stat-exclude-versioned - exclude status lines for versioned files
+rem     (not ? or X prefixed) from "svn status" output.
+rem  By default, script does not print externals definition status lines
+rem  (X prefixed) and does not use recursion on them.

 rem Examples:
 rem 1. call svn_has_changes.bat branch/current subdir/project1
@@ -28,7 +34,13 @@

 rem exclude unversioned items
 set FLAG_SVN_STATUS_EXCLUDE_?=0
-rem ignore externals
+set "FLAG_TEXT_SVN_STATUS_INCLUDE_?=?"
+set "FLAG_TEXT_SVN_STATUS_EXCLUDE_?="
+rem show externals status (status with the X character)
+set FLAG_SVN_STATUS_INCLUDE_X=0
+set "FLAG_TEXT_SVN_STATUS_INCLUDE_X="
+set "FLAG_TEXT_SVN_STATUS_EXCLUDE_X=X"
+rem read status inexternals recursively (by default, ignore externals status)
 set FLAG_SVN_EXTERNALS_RECURSIVE=0
 set "FLAG_TEXT_SVN_IGNORE_EXTERNALS=--ignore-externals"
 rem exclude versioned changes
@@ -45,6 +57,12 @@
 if not "%FLAG%" == "" (
   if "%FLAG%" == "-stat-exclude-?" (
     set FLAG_SVN_STATUS_EXCLUDE_?=1
+    set "FLAG_TEXT_SVN_STATUS_INCLUDE_?="
+    set "FLAG_TEXT_SVN_STATUS_EXCLUDE_?=?"
+  ) else if "%FLAG%" == "-stat-include-X" (
+    set FLAG_SVN_STATUS_INCLUDE_X=1
+    set "FLAG_TEXT_SVN_STATUS_INCLUDE_X=X"
+    set "FLAG_TEXT_SVN_STATUS_EXCLUDE_X="
   ) else if "%FLAG%" == "-r" (
     set FLAG_SVN_EXTERNALS_RECURSIVE=1
     set "FLAG_TEXT_SVN_IGNORE_EXTERNALS="
@@ -60,8 +78,6 @@
   rem read until no flags
   goto FLAGS_LOOP
 )
-
-if %FLAG_SVN_STATUS_EXCLUDE_?% NEQ 0 set FLAG_SVN_STATUS_EXCLUDE_VERSIONED=0

 set "DIR_PATH_PREFIX=%~1"
 set "DIR_PATH_SUBDIR=%~2"
@@ -97,12 +113,10 @@
 rem So instead of call to the script you must check unversioned items in the parent path through the shell.

 rem always use not empty first filter
-set FINDSTR_EXP_FIRST_FILTER= ^| findstr.exe /R /C:"^[ ACDIMR?!~][ CM][ L][ +][ SX][ K][ KOTB][ C]."
+set FINDSTR_EXP_FIRST_FILTER= ^| findstr.exe /R /C:"^[ ACDIMR%FLAG_TEXT_SVN_STATUS_INCLUDE_X%%FLAG_TEXT_SVN_STATUS_INCLUDE_?%!~][ CM][ L][ +][ S%FLAG_TEXT_SVN_STATUS_INCLUDE_X%][ K][ KOTB][ C]."
 set "FINDSTR_EXP_SECOND_FILTER="
-if %FLAG_SVN_STATUS_EXCLUDE_?% NEQ 0 (
-  set FINDSTR_EXP_SECOND_FILTER= ^| findstr.exe /R /C:"^[^?]"
-) else if %FLAG_SVN_STATUS_EXCLUDE_VERSIONED% NEQ 0 (
-  set FINDSTR_EXP_SECOND_FILTER= ^| findstr.exe /R /C:"^?"
+if %FLAG_SVN_STATUS_EXCLUDE_VERSIONED% NEQ 0 (
+  set FINDSTR_EXP_SECOND_FILTER= ^| findstr.exe /R /C:"^[%FLAG_TEXT_SVN_STATUS_INCLUDE_X%%FLAG_TEXT_SVN_STATUS_INCLUDE_?%]" /C:"^....[%FLAG_TEXT_SVN_STATUS_INCLUDE_X%]"
 )

 set "SVN_STATUS_FILE_PATH=%DIR_PATH_PREFIX%"


v4.4.0

--- tron.bat
+++ tron.bat
@@ -4,8 +4,8 @@
 :: Requirements:  1. Administrator access
 ::                2. Safe mode is strongly recommended (though not required)
 :: Author:        vocatus on reddit.com/r/sysadmin ( vocatus.gate@gmail.com ) // PGP key ID: 0x82A211A2
-:: Version:       4.4.0 ! stage_4_patch:flash: Fix broken Flash installer (IE)
-::                      + stage_1_tempcleanup: Add unused USB device driver cleanup. Thanks to Uwe Sieber ( www.uwe-sieber.de )
+:: Version:       4.4.0 + stage_1_tempcleanup: Add unused USB device driver cleanup. Thanks to Uwe Sieber ( www.uwe-sieber.de )
+::                      ! stage_4_patch:flash: Fix broken Flash installer (IE)
 ::
 :: Usage:         Run this script in Safe Mode as an Administrator and reboot when finished. That's it.
 ::
@@ -52,11 +52,11 @@
 set QUARANTINE_PATH=%LOGPATH%\tron_quarantined_files

 :: ! All variables here are overridden if their respective command-line flag is used
-:: AUTORUN               (-a)  = Automatic execution (no welcome screen or prompts), implies -e.
+:: AUTORUN               (-a)  = Automatic execution (no welcome screen or prompts), implies -e
 :: DRY_RUN               (-d)  = Run through script but skip all actual actions (test mode)
 :: EULA_ACCEPTED         (-e)  = Accept EULA (suppress display of disclaimer warning screen)
 :: EMAIL_REPORT          (-er) = Email post-run report with log file. Requires you to have configured SwithMailSettings.xml prior to running
-:: PRESERVE_METRO_APPS   (-m)  = Don't remove stock Metro apps
+:: PRESERVE_METRO_APPS   (-m)  = Don't remove stock Metro apps
 :: AUTO_SHUTDOWN         (-o)  = Shutdown after the finishing. Overrides auto-reboot
 :: PRESERVE_POWER_SCHEME (-p)  = Preserve active power scheme. Default is to reset power scheme to Windows defaults at the end of Tron
 :: AUTO_REBOOT_DELAY     (-r)  = Post-run delay (in seconds) before rebooting. Set to 0 to disable auto-reboot
@@ -98,8 +98,8 @@
 :::::::::::::::::::::
 cls
 color 0f
-set SCRIPT_VERSION=4.3.4
-set SCRIPT_DATE=2015-01-xx
+set SCRIPT_VERSION=4.4.0
+set SCRIPT_DATE=2015-01-12
 title TRON v%SCRIPT_VERSION% (%SCRIPT_DATE%)

 :: Get the date into ISO 8601 standard date format (yyyy-mm-dd) so we can use it
@@ -608,7 +608,7 @@
 echo %CUR_DATE% %TIME%    Launch job 'TDSSKiller'...
 pushd tdss_killer
 if /i %DRY_RUN%==no (
-	"TDSSKiller v3.0.0.41.exe" -l %TEMP%\tdsskiller.log -silent -tdlfs -dcexact -accepteula -accepteulaksn
+	"TDSSKiller v3.0.0.42.exe" -l %TEMP%\tdsskiller.log -silent -tdlfs -dcexact -accepteula -accepteulaksn
 	:: Copy TDSSKiller log into the main Tron log
 	type "%TEMP%\tdsskiller.log" >> "%LOGPATH%\%LOGFILE%"
 	del "%TEMP%\tdsskiller.log" 2>NUL


remove @echo off from setup.cmd

remove @echo off from setup.cmd

--- setup.cmd
+++ setup.cmd
@@ -1,4 +1,3 @@
-@echo off
 pushd %~dp0
 git submodule update --init


Update CopyToKSPDirectory.bat

Update CopyToKSPDirectory.bat

--- Scripts/CopyToKSPDirectory.bat
+++ Scripts/CopyToKSPDirectory.bat
@@ -19,16 +19,16 @@
 mkdir "%KSPPATH%\GameData\LunaMultiPlayer\Button"
 IF DEFINED KSPPATH2 (mkdir "%KSPPATH2%\GameData\LunaMultiPlayer\Button")

-"%~dp0External\pdb2mdb\pdb2mdb.exe" "%~dp0\Client\bin\%SOLUTIONCONFIGURATION%\LunaClient.dll"
-xcopy /Y "%~dp0Client\bin\%SOLUTIONCONFIGURATION%\LunaClient.*" "%KSPPATH%\GameData\LunaMultiPlayer\Plugins"
-IF DEFINED KSPPATH2 (xcopy /Y "%~dp0Client\bin\%SOLUTIONCONFIGURATION%\LunaClient.*" "%KSPPATH2%\GameData\LunaMultiPlayer\Plugins")
+"%~dp0..\External\pdb2mdb\pdb2mdb.exe" "%~dp0..\Client\bin\%SOLUTIONCONFIGURATION%\LunaClient.dll"
+xcopy /Y "%~dp0..\Client\bin\%SOLUTIONCONFIGURATION%\LunaClient.*" "%KSPPATH%\GameData\LunaMultiPlayer\Plugins"
+IF DEFINED KSPPATH2 (xcopy /Y "%~dp0..\Client\bin\%SOLUTIONCONFIGURATION%\LunaClient.*" "%KSPPATH2%\GameData\LunaMultiPlayer\Plugins")

-"%~dp0External\pdb2mdb\pdb2mdb.exe" "%~dp0\Common\bin\%SOLUTIONCONFIGURATION%\LunaCommon.dll"
-xcopy /Y "%~dp0Common\bin\%SOLUTIONCONFIGURATION%\LunaCommon.*" "%KSPPATH%\GameData\LunaMultiPlayer\Plugins"
-IF DEFINED KSPPATH2 (xcopy /Y "%~dp0Common\bin\%SOLUTIONCONFIGURATION%\LunaCommon.*" "%KSPPATH2%\GameData\LunaMultiPlayer\Plugins")
+"%~dp0..\External\pdb2mdb\pdb2mdb.exe" "%~dp0..\\Common\bin\%SOLUTIONCONFIGURATION%\LunaCommon.dll"
+xcopy /Y "%~dp0..\Common\bin\%SOLUTIONCONFIGURATION%\LunaCommon.*" "%KSPPATH%\GameData\LunaMultiPlayer\Plugins"
+IF DEFINED KSPPATH2 (xcopy /Y "%~dp0..\Common\bin\%SOLUTIONCONFIGURATION%\LunaCommon.*" "%KSPPATH2%\GameData\LunaMultiPlayer\Plugins")

-xcopy /Y "%~dp0External\Dependencies\*.dll" "%KSPPATH%\GameData\LunaMultiPlayer\Plugins"
-IF DEFINED KSPPATH2 (xcopy /Y "%~dp0External\Dependencies\*.dll" "%KSPPATH2%\GameData\LunaMultiPlayer\Plugins")
+xcopy /Y "%~dp0..\External\Dependencies\*.dll" "%KSPPATH%\GameData\LunaMultiPlayer\Plugins"
+IF DEFINED KSPPATH2 (xcopy /Y "%~dp0..\External\Dependencies\*.dll" "%KSPPATH2%\GameData\LunaMultiPlayer\Plugins")

-xcopy /Y "%~dp0Client\Resources\*.png" "%KSPPATH%\GameData\LunaMultiPlayer\Button"
-IF DEFINED KSPPATH2 (xcopy /Y "%~dp0Client\Resources\*.png" "%KSPPATH2%\GameData\LunaMultiPlayer\Button")
+xcopy /Y "%~dp0..\Client\Resources\*.png" "%KSPPATH%\GameData\LunaMultiPlayer\Button"
+IF DEFINED KSPPATH2 (xcopy /Y "%~dp0..\Client\Resources\*.png" "%KSPPATH2%\GameData\LunaMultiPlayer\Button")


https://issues.jboss.org/browse/WFLY-3578 jboss-cli.bat always exits with return code 0 even after a cli failure

--- core-build/src/main/resources/bin/jboss-cli.bat
+++ core-build/src/main/resources/bin/jboss-cli.bat
@@ -1,4 +1,5 @@
 @echo off
+setlocal ENABLEEXTENSIONS
 rem -------------------------------------------------------------------------
 rem JBoss Admin CLI Script for Windows
 rem -------------------------------------------------------------------------
@@ -48,6 +49,7 @@
 if not exist "%JBOSS_RUNJAR%" (
   echo Could not locate "%JBOSS_RUNJAR%".
   echo Please check that you are in the bin directory when running this script.
+  set /A RC=1
   goto END
 )

@@ -71,5 +73,11 @@
      org.jboss.as.cli ^
      %*

+set /A RC=%errorlevel%
 :END
 if "x%NOPAUSE%" == "x" pause
+
+if "x%RC%" == "x" (
+  set /A RC=0
+)
+exit /B %RC%