Create bld.bat

Create bld.bat

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

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


undo revision 22284, which was a test for write permission

git-svn-id: acec3fd5b7ea1eb9e79d6329d318e8118ee2e14f@22286 27541ba8-7e3a-0410-8455-c3a389f83636

--- cint/tool/ifdef/setup.bat
+++ cint/tool/ifdef/setup.bat
@@ -1,4 +1,4 @@
-
+

 nmake -nologo -f ifdef.mak


[snapshot] it needs install by maven to local repository with project entity

--- build/package.bat
+++ build/package.bat
@@ -6,6 +6,10 @@

 pushd %BASEDIR%\..\src
   call mvn clean package
+popd
+
+pushd %BASEDIR%\..\src\entity
+  call mvn install
 popd

 call beep.bat


Fix batch script missing submodule

Fix batch script missing submodule

--- CreateBoilerPlate.bat
+++ CreateBoilerPlate.bat
@@ -6,4 +6,5 @@
 cd external
 git submodule add --depth 1 -- https://github.com/fmtlib/fmt.git
 git submodule add --depth 1 -- https://github.com/gabime/spdlog.git
+git submodule add --depth 1 -- https://github.com/onqtam/doctest.git
 cd ..


added dtdparser.jar and ow-deployment.jar in the classpath

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

--- scripts/windows/init.bat
+++ scripts/windows/init.bat
@@ -39,6 +39,8 @@
 IF EXIST %PROACTIVE%\lib\xercesImpl.jar set CLASSPATH=%CLASSPATH%;%PROACTIVE%\lib\xercesImpl.jar
 IF EXIST %PROACTIVE%\lib\fractal.jar set CLASSPATH=%CLASSPATH%;%PROACTIVE%\lib\fractal.jar
 IF EXIST %PROACTIVE%\lib\fractal-adl.jar set CLASSPATH=%CLASSPATH%;%PROACTIVE%\lib\fractal-adl.jar
+IF EXIST %PROACTIVE%\lib\dtdparser.jar set CLASSPATH=%CLASSPATH%;%PROACTIVE%\lib\dtdparser.jar
+IF EXIST %PROACTIVE%\lib\ow_deployment_scheduling.jar set CLASSPATH=%CLASSPATH%;%PROACTIVE%\lib\ow_deployment_scheduling.jar
 IF EXIST %PROACTIVE%\lib\bouncycastle.jar set CLASSPATH=%CLASSPATH%;%PROACTIVE%\lib\bouncycastle.jar
 echo CLASSPATH=%CLASSPATH%


[Nomad] Patch for version 0.92 update

[Nomad] Patch for version 0.92 update

--- Games/Other/Oxide.Game.Nomad/Files/Windows/_start-example.bat
+++ Games/Other/Oxide.Game.Nomad/Files/Windows/_start-example.bat
@@ -3,7 +3,7 @@
 :start
 echo Starting server...

-"Nomad Server\NomadServer.exe" -name "My Oxide Server" -port 5127 -slots 10 -clientVersion "0.91" -password "" -tcpLobby "149.202.51.185" 25565
+"Nomad Server\NomadServer.exe" -name "My Oxide Server" -port 5127 -slots 10 -clientVersion "0.92" -password "" -tcpLobby "149.202.51.185" 25565

 echo.
 echo Restarting server...


アーカイブ対象を修正

アーカイブ対象を修正

--- archive.bat
+++ archive.bat
@@ -1,3 +1,3 @@
 @echo off
 dub build -a %1 -b release
-powershell -Command Compress-Archive -Path fukuro.exe, LICENSE, README.md, resource, doc, libcurl.dll -DestinationPath moecoop-%1.zip
+powershell -Command Compress-Archive -Path fukuro.exe, LICENSE, README.md, resource, docs, libcurl.dll -DestinationPath moecoop-%1.zip


minor update

minor update

--- src/ledi.bat
+++ src/ledi.bat
@@ -16,8 +16,8 @@
 	goto done

 :starting
+	cls
 	@echo off
-	cls
 	setlocal enabledelayedexpansion
 	echo starting...
 	echo:


batch build for mingw build

batch build for mingw build

--- scripts/buildMSYS2.bat
+++ scripts/buildMSYS2.bat
@@ -1,9 +1,10 @@
 cd ..
-mkdir -p bin-mingw
+mkdir bin-mingw
+SET DIRE=%cd%
 cd bin-mingw
-cmake -G "MinGW Makefiles" -DCMAKE_MAKE_PROGRAM=mingw32-make -DCMAKE_BUILD_TYPE=MinSizeRel -DGDCM_BUILD_DOCBOOK_MANPAGES=0 -DGDCM_DOCUMENTATION=0 -DBUILD_DOC=0 -DTEST_BIG_ENDIAN=0 -DOPJ_BIG_ENDIAN=0 -DBUILD_SHARED_LIBS=OFF -DBUILD_CLAR=OFF -DTHREADSAFE=ON -DCMAKE_SYSTEM_NAME=Windows -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY -DDIRECTX=0 -DVIDEO_OPENGL=1 -DVIDEO_OPENGLES=0 -DBUILD_SHARED_LIBS=OFF -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_TOOLCHAIN_FILE=dependencies/polly/mingw-cxx17.cmake  .. || echo "retrying"
-cmake -G "MinGW Makefiles" -DCMAKE_MAKE_PROGRAM=mingw32-make -DCMAKE_BUILD_TYPE=MinSizeRel -DGDCM_BUILD_DOCBOOK_MANPAGES=0 -DGDCM_DOCUMENTATION=0 -DBUILD_DOC=0 -DTEST_BIG_ENDIAN=0 -DOPJ_BIG_ENDIAN=0 -DBUILD_SHARED_LIBS=OFF -DBUILD_CLAR=OFF -DTHREADSAFE=ON -DCMAKE_SYSTEM_NAME=Windows -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY -DDIRECTX=0 -DVIDEO_OPENGL=1 -DVIDEO_OPENGLES=0 -DBUILD_SHARED_LIBS=OFF -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_TOOLCHAIN_FILE=dependencies/polly/mingw-cxx17.cmake  .. || echo "retrying"
-make -j12
+cmake -G "MinGW Makefiles"  -DCMAKE_MAKE_PROGRAM=mingw32-make -DCMAKE_BUILD_TYPE=MinSizeRel -DGDCM_BUILD_DOCBOOK_MANPAGES=0 -DGDCM_DOCUMENTATION=0 -DBUILD_DOC=0 -DTEST_BIG_ENDIAN=0 -DOPJ_BIG_ENDIAN=0 -DBUILD_SHARED_LIBS=OFF -DBUILD_CLAR=OFF -DTHREADSAFE=ON -DCMAKE_SYSTEM_NAME=Windows -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY -DDIRECTX=0 -DVIDEO_OPENGL=1 -DVIDEO_OPENGLES=0 -DBUILD_SHARED_LIBS=OFF -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_TOOLCHAIN_FILE=%DIRE%\dependencies\polly\mingw-cxx17.cmake  .. || echo "retrying"
+cmake -G "MinGW Makefiles"  -DCMAKE_MAKE_PROGRAM=mingw32-make -DCMAKE_BUILD_TYPE=MinSizeRel -DGDCM_BUILD_DOCBOOK_MANPAGES=0 -DGDCM_DOCUMENTATION=0 -DBUILD_DOC=0 -DTEST_BIG_ENDIAN=0 -DOPJ_BIG_ENDIAN=0 -DBUILD_SHARED_LIBS=OFF -DBUILD_CLAR=OFF -DTHREADSAFE=ON -DCMAKE_SYSTEM_NAME=Windows -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY -DDIRECTX=0 -DVIDEO_OPENGL=1 -DVIDEO_OPENGLES=0 -DBUILD_SHARED_LIBS=OFF -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_TOOLCHAIN_FILE=%DIRE%\dependencies\polly\mingw-cxx17.cmake  .. || echo "retrying"
+mingw32-make -j12
 cd ..
 rm -rf win64mingw.zip
 zip -r win64mingw.zip bin-mingw/bin/*


Update purge_windows_7-8-81_telemetry.bat

--- resources/stage_4_repair/purge_windows_telemetry/purge_windows_7-8-81_telemetry.bat
+++ resources/stage_4_repair/purge_windows_telemetry/purge_windows_7-8-81_telemetry.bat
@@ -1,4 +1,9 @@
 @echo off
 cls
-echo This is only a placeholder file; all Windows 7/8/8.1 telemetry purging code is directly integrated into the main Tron script
+echo.
+echo This is a placeholder file; all Windows 7/8/8.1 telemetry purge code is directly integrated into the main
+
+Tron script
+echo.
+
 pause


make.bat: return exit code to dashboard builder

Fixes issue 7806.

LGTM=minux
R=golang-codereviews, minux
CC=golang-codereviews
https://codereview.appspot.com/104690043

--- src/make.bat
+++ src/make.bat
@@ -117,3 +117,4 @@
 set GOBUILDFAIL=1

 :end
+if x%GOBUILDEXIT%==x1 exit %GOBUILDFAIL%


extend help msg

extend help msg

--- phpsdk-starter.bat
+++ phpsdk-starter.bat
@@ -20,7 +20,7 @@
 goto skip_help

 :help
-	echo Usage: phpsdk-starter -c ^<crt^> -a ^<arch^> [-t ^<task_script.bat^>]
+	echo Usage: phpsdk-starter -c ^<crt^> -a ^<arch^> [-t ^<task_script.bat^> [task script args]]
 	exit /b 0

 :skip_help


Changed archive location.

Changed archive location.

--- scripts/post_build.bat
+++ scripts/post_build.bat
@@ -31,7 +31,7 @@
 	ECHO 7z not found being installed.
 	GOTO FINISH
 )
-7z a "%TARGETDIR%\zip\FreeLauncher.zip" "%TARGETDIR%\FreeLauncher.exe" "%TARGETDIR%\freelauncher-langs\" -r
+7z a "%TARGETDIR%\FreeLauncher.zip" "%TARGETDIR%\FreeLauncher.exe" "%TARGETDIR%\freelauncher-langs\" -r
 IF NOT DEFINED DLLS (
 	GOTO FINISH
 )


Update post-build batch file to work properly
- fix path to commands (sed.exe and ReplaceVistaIcon.exe)
- fix path to afxhelp.hm for VS2010
- fix path to output HexEditPro.exe (for icon replacement)

git-svn-id: c806da28ca781a1e2f2d0b1fde2a9d9a144b325a@1210 295070fd-a27b-da4f-a32e-77c6a882a0e3

--- HexEdit/MakehelpV.bat
+++ HexEdit/MakehelpV.bat
@@ -12,16 +12,17 @@
 echo // MAKEHELP.BAT generated Help Map file. >"HTMLHELP\CmdIdMap.h"
 echo // Commands (ID_* and IDM_*) >>"HTMLHELP\CmdIdMap.h"
 makehm ID_,HID_,0x10000 IDM_,HIDM_,0x10000 resource.h >"CmdIdMap.tmp"
-sed "s/^HID/#define HID/"  <"CmdIdMap.tmp" >>"HTMLHELP\CmdIdMap.h"
+"C:\Program Files\Utilities\sed"  "s/^HID/#define HID/"  <"CmdIdMap.tmp" >>"HTMLHELP\CmdIdMap.h"
 del "CmdIdMap.tmp"

 ECHO MFC Command IDs
 rem copy /y I:\Micros~1\vc98\mfc\include\afxhelp.hm  AfxIdMap.tmp
 rem copy /y "C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\include\afxhelp.hm"  AfxIdMap.tmp
 rem copy /y "C:\Program Files\Microsoft Visual Studio 8\VC\atlmfc\include\afxhelp.hm"  AfxIdMap.tmp
-copy /y "C:\Program Files\Microsoft Visual Studio 9.0\VC\atlmfc\include\afxhelp.hm"  AfxIdMap.tmp
-sed "s/^HID/#define HID/"  <AfxIdMap.tmp >AfxId2.tmp
-sed "s/^AFX_HID/#define AFX_HID/"  <AfxId2.tmp   >"HTMLHELP\AfxIdMap.h"
+rem copy /y "C:\Program Files\Microsoft Visual Studio 9.0\VC\atlmfc\include\afxhelp.hm"  AfxIdMap.tmp
+copy /y "C:\Program Files\Microsoft Visual Studio 10.0\VC\atlmfc\include\afxhelp.hm"  AfxIdMap.tmp
+"C:\Program Files\Utilities\sed"  "s/^HID/#define HID/"  <AfxIdMap.tmp >AfxId2.tmp
+"C:\Program Files\Utilities\sed"  "s/^AFX_HID/#define AFX_HID/"  <AfxId2.tmp   >"HTMLHELP\AfxIdMap.h"
 del AfxIdMap.tmp
 del AfxId2.tmp

@@ -29,7 +30,7 @@
 echo // MAKEHELP.BAT generated Help Map file. >"HTMLHELP\DlgIdMap.h"
 echo // Dialogs (IDD_*) >>"HTMLHELP\DlgIdMap.h"
 makehm IDD_,HIDD_,0x20000 resource.h >"DlgIdMap.tmp"
-sed "s/^HID/#define HID/"  <"DlgIdMap.tmp" >>"HTMLHELP\DlgIdMap.h"
+"C:\Program Files\Utilities\sed"  "s/^HID/#define HID/"  <"DlgIdMap.tmp" >>"HTMLHELP\DlgIdMap.h"
 del "DlgIdMap.tmp"

 ECHO Control IDs (for What's This help)
@@ -37,8 +38,9 @@

 rem ECHO BCG Control IDs
 rem copy /y "D:\Devel\BCG6_2\BCGControlBar\Help\BCGControlBar.hm" BcgIdMap.tmp
-rem sed "s/^HID/#define HID/"  <BcgIdMap.tmp >"HTMLHELP\BcgIdMap.h"
+rem "C:\Program Files\Utilities\sed"  "s/^HID/#define HID/"  <BcgIdMap.tmp >"HTMLHELP\BcgIdMap.h"
 rem del BcgIdMap.tmp

 ECHO Fix up hexedit.exe icon since the resource compiler cannot handle the new icon format
-ReplaceVistaIcon  D:\Andrew\cpp_out\HexEdit\ReleaseVS2005\hexedit.exe   res\hexedit2.ico
+rem ReplaceVistaIcon  D:\Andrew\cpp_out\HexEdit\ReleaseVS2005\hexedit.exe   res\hexedit2.ico
+"C:\Program Files\Utilities\ReplaceVistaIcon"  "C:\andrew\cpp_out\HexEdit\ReleaseVS2010\HexEditPro.exe"   res\hexedit2.ico


Generate full symbols for GenApi

Generate full symbols for GenApi

Attempting to run GenApi on an assembly with embedded symbols failed.
Until we can switch to using the compiler's new /refout:, just avoid
embedding symbols on the Core bootstrap pass.

--- cibuild.cmd
+++ cibuild.cmd
@@ -82,7 +82,7 @@
     set MSBUILD_CUSTOM_PATH=%~dp0Tools\MSBuild.exe
     :: The LKG MSBuild on Core is too old to support
     :: SourceLink targets, so disable them.
-    set SOURCE_LINK_ARGUMENT=/p:SourceLinkCreate=false
+    set SOURCE_LINK_ARGUMENT=/p:SourceLinkCreate=false /p:DebugType=full
 ) else if /i "%HOST%"=="Full" (
     set RUNTIME_HOST=
 ) else (


Add packaging command for windows store.


fixed debug build #2

fixed debug build #2

--- build_lib.bat
+++ build_lib.bat
@@ -2,9 +2,9 @@
 SET "GDK_WIN=%cd%"
 SET PATH=%GDK_WIN%\bin;%PATH%

-make -f %GDK_WIN%\makelib.gen clean
+make -f %GDK_WIN%\makelib.gen cleanrelease
 make -f %GDK_WIN%\makelib.gen release
-make -f %GDK_WIN%\makelib.gen clean
+make -f %GDK_WIN%\makelib.gen cleandebug
 make -f %GDK_WIN%\makelib.gen debug

 @ECHO.


Fix Windows build script

Fix Windows build script

--- lib/bin/compileANE.bat
+++ lib/bin/compileANE.bat
@@ -3,8 +3,7 @@
 set UNZIP_DIR=%ProgramFiles(x86)%\GnuWin32\bin

 "%FLEX_SDK%\bin\compc" +configname=air -source-path ..\src -optimize ^
-                       -include-classes com.amanitadesign.steam.FRESteamWorks ^
-                                        com.amanitadesign.steam.SteamConstants ^
+                       -include-sources ..\src\
                        -swf-version=11 -output FRESteamWorksLib.swc

 "%UNZIP_DIR%\unzip" -o FRESteamWorksLib.swc


Added option -E to delete environment variable STINCLUDE. Add %SPATH% to the STINCLUDE search paths. Bug fix: Recursion did not work if the path had spaces. Added variable IGNORE_NMAKEFILE.

--- C/include/configure.bat
+++ C/include/configure.bat
@@ -163,13 +163,17 @@
 :#                  (To do: Avoid searching our own libraries multiple times.)*
 :#                  Added option -p to set persistent library path variables. *
 :#   2017-02-15 JFL Added a mechanism for adding user-defined libraries.      *
+:#   2017-02-24 JFL Added option -E to delete environment variable STINCLUDE. *
+:#                  Add %SPATH% to the STINCLUDE search paths.                *
+:#   2017-02-28 JFL Bug fix: Recursion did not work if the path had spaces.   *
+:#   2017-03-01 JFL Added variable IGNORE_NMAKEFILE.                          *
 :#                                                                            *
 :#         Copyright 2016 Hewlett Packard Enterprise Development LP          *
 :# Licensed under the Apache 2.0 license  www.apache.org/licenses/LICENSE-2.0 *
 :#*****************************************************************************

 setlocal EnableExtensions EnableDelayedExpansion
-set "VERSION=2017-02-15"
+set "VERSION=2017-03-01"
 set "SCRIPT=%~nx0"				&:# Script name
 set "SPATH=%~dp0" & set "SPATH=!SPATH:~0,-1!"	&:# Script path, without the trailing \
 set  "ARG0=%~f0"				&:# Script full pathname
@@ -1477,21 +1481,21 @@
 )
 exit /b 1

-:lastvs								    &:#		Min SUBSYSVER	Default SUBSYSVER
-%SEARCH_IN% "Microsoft Visual Studio 16.0"	&& goto :foundvs    &:# VS 16
-%SEARCH_IN% "Microsoft Visual Studio 15.0"	&& goto :foundvs    &:# VS 15
-%SEARCH_IN% "Microsoft Visual Studio 14.0"	&& goto :foundvs    &:# VS 2015
+:lastvs	&:#  VS Installation directory					AKA.   _MSC_VER	 Min SUBSYSVER	Default SUBSYSVER	Notes
+%SEARCH_IN% "Microsoft Visual Studio 16.0"	&& goto :foundvs    &:# VS TBD
+%SEARCH_IN% "Microsoft Visual Studio 15.0"	&& goto :foundvs    &:# VS 2017	  2000
+%SEARCH_IN% "Microsoft Visual Studio 14.0"	&& goto :foundvs    &:# VS 2015	  1900
 :# %SEARCH_IN% "Microsoft Visual Studio 13.0"	&& goto :foundvs    &:# N/A
 :lastvsXP
-%SEARCH_IN% "Microsoft Visual Studio 12.0"	&& goto :foundvs    &:# VS 2013	5.01		6.00
-%SEARCH_IN% "Microsoft Visual Studio 11.0"	&& goto :foundvs    &:# VS 2012	5.00		5.00
-%SEARCH_IN% "Microsoft Visual Studio 10.0"	&& goto :foundvs    &:# VS 2010	5.00		5.00
-%SEARCH_IN% "Microsoft Visual Studio 9.0"	&& goto :foundvs    &:# VS 2008	5.00		5.00
+%SEARCH_IN% "Microsoft Visual Studio 12.0"	&& goto :foundvs    &:# VS 2013	  1800	    5.01	    6.00
+%SEARCH_IN% "Microsoft Visual Studio 11.0"	&& goto :foundvs    &:# VS 2012	  1700	    5.00	    5.00
+%SEARCH_IN% "Microsoft Visual Studio 10.0"	&& goto :foundvs    &:# VS 2010	  1600	    5.00	    5.00
+%SEARCH_IN% "Microsoft Visual Studio 9.0"	&& goto :foundvs    &:# VS 2008	  1500	    5.00	    5.00
 :lastvs95
-%SEARCH_IN% "Microsoft Visual Studio 8"		&& goto :foundvs    &:# VS 2005	4.00		5.00		Tested and known to work fine
-%SEARCH_IN% "Microsoft Visual Studio .NET 2003"	&& goto :foundoldvs &:# VS 7.1	4.00		4.00 		Tested. Some problems worked around.
-%SEARCH_IN% "Microsoft Visual Studio .NET"	&& goto :foundoldvs &:# VS 7.0
-:# %SEARCH_IN% "Microsoft Visual Studio"	&& goto :foundoldvs &:# VS 6					Tested. MsvcLibX compilation fails. Support
+%SEARCH_IN% "Microsoft Visual Studio 8"		&& goto :foundvs    &:# VS 2005	  1400	    4.00	    5.00	Tested and known to work fine
+%SEARCH_IN% "Microsoft Visual Studio .NET 2003"	&& goto :foundoldvs &:# VS 7.1	  1310	    4.00	    4.00	Tested. Some problems worked around.
+%SEARCH_IN% "Microsoft Visual Studio .NET"	&& goto :foundoldvs &:# VS 7.0	  1300
+:# %SEARCH_IN% "Microsoft Visual Studio"	&& goto :foundoldvs &:# VS 6	  1200					Tested. MsvcLibX compilation fails. Unsupported.
 SET "%VS%="
 %RETURN0%

@@ -1815,16 +1819,17 @@
 echo   -?^|-h         This help
 echo   -c CONFIG     Name the output file config.CONFIG.bat
 echo   -d            Debug mode. Display internal variables and function calls
+echo   -E            Ignore environment variable STINCLUDE, and redefine it
 echo   -l LOGFILE    Log output into a file. Default: Don't
 echo   -L            Disable logging. Default: Use the parent script log file, if any
 echo   -masm PATH    Path to MASM install dir. Default: C:\MASM
 echo   -msvc PATH    Path to MSVC 16-bits tools install dir. Default: C:\MSVC
 echo   -o OUTDIR     Output base directory. Default: .
-echo   -p            Set persistent project path variables in HKCU\Environment.
-echo   -r            Recursively configure all subprojects. Default.
-echo   -R            Do not recursively configure all subprojects.
+echo   -p            Set persistent project path variables in HKCU\Environment
+echo   -r            Recursively configure all subprojects. Default
+echo   -R            Do not recursively configure all subprojects
 echo   -v            Verbose mode. Display what this script does
-echo   -vs PATH      Path to Visual Studio install dir. Default: Latest avail.
+echo   -vs PATH      Path to Visual Studio install dir. Default: Latest avail
 echo   -V            Display %SCRIPT% version
 echo.
 exit /b 0
@@ -1846,6 +1851,7 @@
 if "!ARG!"=="/?" goto help
 if "!ARG!"=="-c" %POPARG% & set "CONFIG.BAT=config.!ARG!.bat" & goto next_arg
 if "!ARG!"=="-d" call :Debug.On & call :Verbose.On & goto next_arg
+if "!ARG!"=="-E" set "STINCLUDE=" & goto next_arg
 if "!ARG!"=="-h" goto help
 if "!ARG!"=="-l" %POPARG% & call :Debug.SetLog !"ARG"! & goto next_arg
 if "!ARG!"=="-L" call :Debug.SetLog & goto next_arg
@@ -2043,6 +2049,7 @@
     :# but not available in parent nmake environment.
     if not defined %%v call :Reg.GetValue HKCU\Environment %%v %%v :# Get value from the master environment in the registry
     if defined %%v call :lappend PATH_LIST "!%%v!"
+    if "%%v"=="STINCLUDE" call :lappend PATH_LIST "%SPATH%" &rem :# configure.bat normally is in the STINCLUDE dir
     if defined MY_SDKS for %%s in (%MY_SDKS%) do call :lappend PATH_LIST "%%~s\!DIR!"
     call :lappend PATH_LIST ..\!DIR!
     call :lappend PATH_LIST "%PF64%\!DIR!"
@@ -2327,10 +2334,12 @@
   %CONFIG% SET "%%k_WINSDKINC=!%%l.WINSDKINC!" ^&:# Microsoft Windows %%m SDK Include directory
 )

-:# Output base directory
-if defined OUTDIR (
-  %CONFIG%.
-  %CONFIG% SET "OUTDIR=%OUTDIR%" ^&:# Output base directory
+:# A few special variables
+for %%v in (OUTDIR IGNORE_NMAKEFILE) do (
+  if defined %%v (
+    %CONFIG%.
+    %CONFIG% SET "%%v=!%%v!" ^&:# Output base directory
+  )
 )

 if defined POST_MAKE_ACTIONS (
@@ -2347,11 +2356,13 @@

 :# Optionally repeat the configuration recursively using the makefile's config pseudo target
 if "%RECURSE%"=="1" (
-  set CMD=call %ARG0:configure.bat=make.bat% list_dirs
+  set CMD=call "%ARG0:configure.bat=make.bat%" list_dirs
+  %ECHOVARS.D% CMD
+  set ">DEBUGOUT=>&2"
   %FOREACHLINE% %%d in ('%XCALL% :Do -V !CMD! 2^>NUL') do if exist "%%d" (
     %ECHO.V% :# Configuring %%d
     %_DO.XD% pushd "%%d"
-    %EXEC% -V call %ARG0%
+    %EXEC% -V call "%ARG0%"
     %_DO.XD% popd
   )
 )


Updated psake build script to work with automatic package restore

--- psake.bat
+++ psake.bat
@@ -1,3 +1,4 @@
-@echo off
-.nuget\NuGet.exe install .nuget\packages.config -OutputDirectory packages
-powershell.exe -NoProfile -ExecutionPolicy unrestricted -Command "& {Import-Module '.\packages\psake.*\tools\psake.psm1'; invoke-psake .\default.ps1 %*; if ($LastExitCode -ne 0) {write-host "ERROR: $LastExitCode" -fore RED; exit $lastexitcode} }"+@echo off
+.nuget\NuGet.exe install .nuget\packages.config -OutputDirectory packages
+.nuget\NuGet.exe restore Glimpse.All.sln
+powershell.exe -NoProfile -ExecutionPolicy unrestricted -Command "& {Import-Module '.\packages\psake.*\tools\psake.psm1'; invoke-psake .\default.ps1 %*; if ($LastExitCode -ne 0) {write-host "ERROR: $LastExitCode" -fore RED; exit $lastexitcode} }"


MGenTest: Fix autotest.bat for x86

MGenTest: Fix autotest.bat for x86


Fix typo

Fix typo

--- JShellOverlayIcon/build.handler.net4.x86.cmd
+++ JShellOverlayIcon/build.handler.net4.x86.cmd
@@ -1 +1 @@
-"c:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\msbuild.exe" JShellOverlayIconHandler.csproj /p:TargetFrameworkVersion=v4.0;Platform=x86;AssemblyName=JShellOverlayIconHandler.net4.x84.dll /tv:15.0
+"c:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\msbuild.exe" JShellOverlayIconHandler.csproj /p:TargetFrameworkVersion=v4.0;Platform=x86;AssemblyName=JShellOverlayIconHandler.net4.x86.dll /tv:15.0


Few fixes for deploy-mingw.bat

Few fixes for deploy-mingw.bat

--- Deploy/deploy-mingw.bat
+++ Deploy/deploy-mingw.bat
@@ -1,10 +1,11 @@
 set /p LATEST_RELEASE=<Deploy\latest_release.version
-for /f %%i in ('C:\MinGW\bin\g++ -dumpversion') do set COMPILER_VERSION=%%i
+for /f %%i in ('g++ -dumpversion') do set COMPILER_VERSION=%%i
 set DIST_DIR_NAME=PcapPlusPlus-%LATEST_RELEASE%-windows-%compiler%-gcc-%COMPILER_VERSION%

 move Dist %DIST_DIR_NAME%

 move %DIST_DIR_NAME%\mk\PcapPlusPlus.mk %DIST_DIR_NAME%\mk\temp.mk
+powershell -Command "(gc %DIST_DIR_NAME%\mk\temp.mk) -replace '/Dist', '' | Out-File %DIST_DIR_NAME%\mk\temp.mk"
 echo PCAPPLUSPLUS_HOME := Drive:/your/PcapPlusPlus/folder> %DIST_DIR_NAME%\mk\PcapPlusPlus.mk
 echo MINGW_HOME := Drive:/MinGW/folder>> %DIST_DIR_NAME%\mk\PcapPlusPlus.mk
 echo WINPCAP_HOME := Drive:/WpdPack/folder>> %DIST_DIR_NAME%\mk\PcapPlusPlus.mk


fixed tomcat start on Windows (#599)

fixed tomcat start on Windows (#599)

On Windows (at least without WLS), its catalina.bat instead of .sh. Also set CATALINA_HOME since tomcat guessing it didn't work for some reason.


Updated cleaning script to automatically find the externals and clean-out the build directories, if requested.

--- msconfig/clean.bat
+++ msconfig/clean.bat
@@ -23,8 +23,8 @@
 REM Usage: clean [type], where type can be: release, debug or externals
 REM ======================================================================

-REM Configure the environment
-REM call set_vars.bat
+REM Configure the environment (for %EXTERN_DIR%)
+call set_vars.bat

 REM Determine which build to clean
 set CONFIGURATION=Release


Test index file

Test index file

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

--- UI/Web/ResetIndex.bat
+++ UI/Web/ResetIndex.bat
@@ -0,0 +1,2 @@
+copy "index-Before June 2010 Patch.db" index.db
+pause


Re add install.bat

Re add install.bat

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

--- Installer.bat
+++ Installer.bat
@@ -0,0 +1 @@
+pip install -r requirements.txt


Java binding: add example testing file for Windows.

error: pathspec 'java-binding/example/test-example.bat' did not match any file(s) known to git

--- java-binding/example/test-example.bat
+++ java-binding/example/test-example.bat
@@ -0,0 +1,9 @@
+@echo off
+
+SETLOCAL
+
+set LOCAL_CLASSPATH="../build/editorconfig.jar;.;%CLASSPATH%"
+javac -cp %LOCAL_CLASSPATH% TestEditorConfig.java
+java -cp %LOCAL_CLASSPATH% TestEditorConfig
+
+ENDLOCAL


add entries based on user feedback

add entries based on user feedback

--- resources/stage_2_de-bloat/oem/programs_to_target_by_GUID.bat
+++ resources/stage_2_de-bloat/oem/programs_to_target_by_GUID.bat
@@ -241,6 +241,10 @@

 :: AVG
 start /wait msiexec /qn /norestart /x {5893E1FC-A43A-4F82-8EB6-FF61DC84A92B
+
+:: AVG 2013
+start /wait msiexec /qn /norestart /x {C09E8C9E-A243-430E-8811-7C7C36BD8A71}
+start /wait msiexec /qn /norestart /x {9EF01972-D320-49A9-BA40-BED677587E32}

 :: AVG 2014
 start /wait msiexec /qn /norestart /x {FC3B3A5D-7058-4627-9F1E-F95CC38B6054}
@@ -1876,6 +1880,7 @@
 start /wait msiexec /qn /norestart /x {32A4CF00-9FAC-47c8-9B37-91CC23815D64}
 start /wait msiexec /qn /norestart /x {6357D25F-A9C9-4CC7-A1FB-0DCF344E7C40}
 start /wait msiexec /qn /norestart /x {1F670068-9589-4DC7-8FE4-1D0D13AF2526}
+start /wait msiexec /qn /norestart /x {E1AE0CB7-1333-4728-8520-CB3F88A252B4}

 :: HP Insight Diagnostics Online Edition for Windows 9.3.0
 start /wait msiexec /qn /norestart /x {DBE16A07-DDFF-4453-807A-212EF93916E0}
@@ -1953,6 +1958,7 @@
 start /wait msiexec /qn /norestart /x {FEB2C4AA-661E-483F-9626-21A8ACFD10F2}
 start /wait msiexec /qn /norestart /x {D2064264-3162-4DB1-AFE0-167BEFBBCD9C}
 start /wait msiexec /qn /norestart /x {32797608-0840-4645-BE1B-37AFFB18908A}
+start /wait msiexec /qn /norestart /x {988D55BB-08DE-43C9-8D16-3751361E2A79}

 :: HP PostScript Converter
 start /wait msiexec /qn /norestart /x {6E14E6D6-3175-4E1A-B934-CAB5A86367CD}
@@ -2093,6 +2099,7 @@

 :: HP Support Solutions Framework
 start /wait msiexec /qn /norestart /x {D7D5F438-26EF-45AB-AB89-C476FBCF8584}
+start /wait msiexec /qn /norestart /x {348A1F5B-07B3-4436-9A47-FFE44EFE856E}

 :: HP System Default Settings
 start /wait msiexec /qn /norestart /x {5C90D8CF-F12A-41C6-9007-3B651A1F0D78}
@@ -2258,6 +2265,7 @@
 :: Intel(R) Smart Connect Technology
 start /wait msiexec /qn /norestart /x {9B5FD763-5074-474C-B898-24567E6450C8}
 start /wait msiexec /qn /norestart /x {DE788AD4-F7CE-4995-ADF8-56174A7B613C}
+start /wait msiexec /qn /norestart /x {DBECAE94-4C04-40AC-9AFB-FA9953258EAF}

 :: Intel(R) Technology Access
 start /wait msiexec /qn /norestart /x {413fe921-b226-41c8-bc3c-574074ceec4d}
@@ -2314,6 +2322,7 @@
 start /wait msiexec /qn /norestart /x {0D01BDA8-C995-40AD-95F8-26B7EA4DCF9F}
 start /wait msiexec /qn /norestart /x {83F793B5-8BBF-42FD-A8A6-868CB3E2AAEA}
 start /wait msiexec /qn /norestart /x {43A76F9B-48F1-4E0D-A9B4-8E4F6C42E28C}
+start /wait msiexec /qn /norestart /x {12914061-EB9B-4AE7-AC7E-0B8A607C7DF4}

 :: Intel Viiv(TM) various software GUIDs
 start /wait msiexec /qn /norestart /x {A6C48A9F-694A-4234-B3AA-62590B668927}
@@ -2383,6 +2392,9 @@
 :: Lenovo Patch Utility
 start /wait msiexec /qn /norestart /x {C6FB6B4A-1378-4CD3-9CD3-42BA69FCBD43}

+:: Lenovo Quick Control
+start /wait msiexec /qn /norestart /x {4855C42F-5197-4AAD-A50D-5066D2CC4647}
+
 :: Lenovo QuickOptimizer
 start /wait msiexec /qn /norestart /x {8D2C871B-1B9F-45AC-9C43-2BB18089CDFA}

@@ -2390,6 +2402,9 @@
 start /wait msiexec /qn /norestart /x {3245D8C8-7FE0-4FD4-B04B-2720A333D592}
 start /wait msiexec /qn /norestart /x {0B5E0E89-4BCA-4035-BBA1-D1439724B6E2}
 start /wait msiexec /qn /norestart /x {4532E4C5-C84D-4040-A044-ECFCC5C6995B}
+
+:: Lenovo Recovery Media
+start /wait msiexec /qn /norestart /x {50DC5136-21E8-48BC-97E5-1AD055F6B0B6}

 :: Lenovo Registration
 start /wait msiexec /qn /norestart /x {6707C034-ED6B-4B6A-B21F-969B3606FBDE}
@@ -2533,6 +2548,9 @@
 start /wait msiexec /qn /norestart /x {E20B2752-0909-4B28-B8A9-A9BE519CA1A1}
 start /wait msiexec /qn /norestart /x {22F9A831-CA56-4406-85FE-47FFB0472804}

+:: Microsoft Online Services Sign-in Assistant
+start /wait msiexec /qn /norestart /x {5D62CA9E-C68A-4BED-A1E9-7D38D9DDC2DB}
+
 :: Microsoft Office 15 Click-to-Run Extensibility Component (various versions)
 start /wait msiexec /qn /norestart /x {90150000-008C-0000-0000-0000000FF1CE}
 start /wait msiexec /qn /norestart /x {90150000-007E-0000-1000-0000000FF1CE}
@@ -2542,6 +2560,11 @@
 start /wait msiexec /qn /norestart /x {90150000-008C-0000-1000-0000000FF1CE}
 start /wait msiexec /qn /norestart /x {90150000-008C-0409-0000-0000000FF1CE}
 start /wait msiexec /qn /norestart /x {90150000-008F-0000-1000-0000000FF1CE}
+
+:: Microsoft Office 16 Click-to-Run
+start /wait msiexec /qn /norestart /x {90160000-008C-0000-0000-0000000FF1CE}
+start /wait msiexec /qn /norestart /x {90160000-008C-0409-0000-0000000FF1CE}
+start /wait msiexec /qn /norestart /x {90160000-008F-0000-1000-0000000FF1CE}

 :: Microsoft Office 2003 Web Components
 start /wait msiexec /qn /norestart /x {90120000-00A4-0409-0000-0000000FF1CE}


Update programs_to_target_by_GUID.bat

Update programs_to_target_by_GUID.bat

--- resources/stage_2_de-bloat/oem/programs_to_target_by_GUID.bat
+++ resources/stage_2_de-bloat/oem/programs_to_target_by_GUID.bat
@@ -246,6 +246,9 @@
 :: ASUS Ai Charger
 start /wait msiexec /qn /norestart /x {7FB64E72-9B0E-4460-A821-040C341E414A}

+:: ASUS AI Suite II
+start /wait msiexec /qn /norestart /x {34D3688E-A737-44C5-9E2A-FF73618728E1}
+
 :: ASUS App Box
 start /wait msiexec /qn /norestart /x {F0CE6060-50B1-401E-8357-B6E24DB98D21}

@@ -255,6 +258,12 @@
 :: ASUS Device Setup
 start /wait msiexec /qn /norestart /x {1F07F2C7-596F-4F34-B805-2C61A3E50E5A}

+:: ASUS Easy Update 2 ALU Application
+start /wait msiexec /qn /norestart /x {E7AA854E-6756-424E-84C2-4E47D5729AFF}
+
+:: ASUS eManual
+start /wait msiexec /qn /norestart /x {0C84E634-EB68-4A54-B21E-A05EC87A4CC5}
+
 :: ASUS Fast Boot by ASUS
 start /wait msiexec /qn /norestart /x {13F4A7F3-EABC-4261-AF6B-1317777F0755}

@@ -267,6 +276,12 @@
 :: ASUS HiPost
 start /wait msiexec /qn /norestart /x {04768366-F421-4BA5-8423-B84F644B5249}

+:: ASUS Key Suite
+start /wait msiexec /qn /norestart /x {71E2F4D6-191A-4A36-8A5C-8AFEA92729C9}
+
+:: ASUS LifeFrame
+start /wait msiexec /qn /norestart /x {1DBD1F12-ED93-49C0-A7CC-56CBDE488158}
+
 :: ASUS Live Update
 start /wait msiexec /qn /norestart /x {FA540E67-095C-4A1B-97BA-4D547DEC9AF4}

@@ -282,6 +297,12 @@
 :: ASUS Manager - Update
 start /wait msiexec /qn /norestart /x {675BBE8A-0ED3-4048-8723-BA51EAB8E1A8}

+:: ASUS Music Maker
+start /wait msiexec /qn /norestart /x {AB515018-7F9D-4047-B0C0-F26BAC30F3E1}
+
+:: ASUS MX Suite MAGIX Media Suite
+start /wait msiexec /qn /norestart /x {CFA9C800-9B0B-42E3-92E7-08B5AF2E192E}
+
 :: ASUS Security Protect Manager
 start /wait msiexec /qn /norestart /x {DF21F1DB-80C6-11D3-9483-B03D0EC10000}

@@ -296,6 +317,12 @@

 :: ASUS USB Charger Plus
 start /wait msiexec /qn /norestart /x {A859E3E5-C62F-4BFA-AF1D-2B95E03166AF}
+
+:: ASUS Video easy
+start /wait msiexec /qn /norestart /x {E3185090-8796-46FB-A27F-6C844F106DAC}
+
+:: ASUS Virtual Camera
+start /wait msiexec /qn /norestart /x {EC8BD21F-0CA0-4BBF-97D9-4A52B30041A1}

 :: ASUS Windows 7 Starter Helper
 start /wait msiexec /qn /norestart /x {D381FF29-7CFB-4D4E-B92A-C4EDDC696614}
@@ -1322,6 +1349,50 @@
 start /wait msiexec /qn /norestart /x {2B642F70-BA82-5E78-41CE-BDFFD5C37530}
 start /wait msiexec /qn /norestart /x {2EA40F3D-0D93-A391-F383-6F1C708B80BF}
 start /wait msiexec /qn /norestart /x {5681FF4A-5469-D41F-F990-D1AC1037AB02}
+start /wait msiexec /qn /norestart /x {9A296A4E-7899-5943-DFE6-7BD10DBEFC6F}
+start /wait msiexec /qn /norestart /x {0A8DB8CA-F3B3-E5D1-F3FD-2FF28C7853F7}
+start /wait msiexec /qn /norestart /x {5A71D24C-F270-DBD7-8A16-3724A0D6C578}
+start /wait msiexec /qn /norestart /x {31268F66-FCBD-D7DE-C4E1-9212DAAB0902}
+start /wait msiexec /qn /norestart /x {61994F21-7B1A-C59D-AE19-C65B3B28372F}
+start /wait msiexec /qn /norestart /x {10275199-ED06-3ACA-2500-800238E02713}
+start /wait msiexec /qn /norestart /x {09E09088-C027-8C6D-24D6-E864B7EFD0C7}
+start /wait msiexec /qn /norestart /x {23A6EFAC-F45F-76B3-0A7E-A2725502EF5C}
+start /wait msiexec /qn /norestart /x {AD3106C0-2A5D-347F-8BD5-B8A0F8AF3D9F}
+start /wait msiexec /qn /norestart /x {FC49484F-0FCB-F096-28B6-E2EDDB05582C}
+start /wait msiexec /qn /norestart /x {E7190BDA-4614-0373-C5EF-CDF08705A48C}
+start /wait msiexec /qn /norestart /x {490F177A-CBFB-CDD8-6999-B2FBB43DB65F}
+start /wait msiexec /qn /norestart /x {DBA2460A-94C2-A5BF-335E-F10597F316E9}
+start /wait msiexec /qn /norestart /x {64F49FEA-46A4-E0EA-36E0-E7792DB29302}
+start /wait msiexec /qn /norestart /x {13BBAD29-D5CC-3FB1-4D32-42CD55835BA8}
+start /wait msiexec /qn /norestart /x {132C4D55-82C9-AC7E-6A11-42E6C54DC882}
+start /wait msiexec /qn /norestart /x {8B6AFB6D-0D8D-C49F-F103-60AB9DB81447}
+start /wait msiexec /qn /norestart /x {135F7D3A-C932-7BC2-F658-E5988517257B}
+start /wait msiexec /qn /norestart /x {E66FD60C-5873-1904-4A00-726D8EAA0A19}
+start /wait msiexec /qn /norestart /x {50D91C29-5AB6-3DCD-8338-C9A7ABF44B33}
+start /wait msiexec /qn /norestart /x {0FB54E7B-E864-F741-A13A-7E682891B31C}
+start /wait msiexec /qn /norestart /x {0AA432F3-7761-8DEA-CCE4-0BA1D1D89910}
+start /wait msiexec /qn /norestart /x {497D7F1F-22D7-3BBF-5DA1-A2E01B3FA99F}
+start /wait msiexec /qn /norestart /x {D5C8E580-C2D5-F457-CB3F-A05195FA556F}
+start /wait msiexec /qn /norestart /x {FA954F79-9F5F-C062-D60B-F3AB99CBDAF6}
+start /wait msiexec /qn /norestart /x {643677D1-3E33-0C9B-FA97-4226E512B7B3}
+start /wait msiexec /qn /norestart /x {10AB7F4D-ECCD-AC5D-D777-7EDEF7988375}
+start /wait msiexec /qn /norestart /x {79A407A1-F121-5A5F-6825-B55363A38A62}
+start /wait msiexec /qn /norestart /x {33A68EF9-2654-9930-EDB5-9DC714F05D5A}
+start /wait msiexec /qn /norestart /x {2D152AF7-856E-13AE-B6EF-15598C4AC7F8}
+start /wait msiexec /qn /norestart /x {A9CD695B-B730-CC02-067B-0C5737F5F4CC}
+start /wait msiexec /qn /norestart /x {5A7A707B-BC18-253F-A347-5B5C67D3504E}
+start /wait msiexec /qn /norestart /x {4DA0141D-9081-1CAC-2C38-E32BD7E69BFA}
+start /wait msiexec /qn /norestart /x {49CC9650-573C-775B-34D0-C716DEB5FA15}
+start /wait msiexec /qn /norestart /x {BBD6219B-C455-1291-B399-52BC69AD4F44}
+start /wait msiexec /qn /norestart /x {79BC8CD7-9CF2-0217-E14C-6F2EF0DA52EA}
+start /wait msiexec /qn /norestart /x {C5E77038-9644-580F-13E6-4F3C4FCA08E9}
+start /wait msiexec /qn /norestart /x {C5B5791A-17BD-0136-8A38-0405FE65C680}
+start /wait msiexec /qn /norestart /x {520F5284-9F72-D43D-0871-46377E624781}
+start /wait msiexec /qn /norestart /x {15AAD730-E115-1050-A894-987BF5CE3B2A}
+start /wait msiexec /qn /norestart /x {05A58326-ED31-10B1-44CD-224C8FD2E3CE}
+start /wait msiexec /qn /norestart /x {8A77B756-325B-F675-6DFD-BF7B67010175}
+start /wait msiexec /qn /norestart /x {43914AB6-FA86-2D31-2FCA-6AB76626DB63}
+start /wait msiexec /qn /norestart /x {509A86C9-FA75-52C2-22D7-AE695C197475}

 :: Catalyst Control Center Profiles Mobile
 start /wait msiexec /qn /norestart /x {5A6CB42D-AFB6-989E-E7EB-B3FF928C707F}
@@ -1362,6 +1433,7 @@
 start /wait msiexec /qn /norestart /x {44C72B93-46FA-6D17-4020-E796E8D9C808}
 start /wait msiexec /qn /norestart /x {2041A685-F8DC-A7C7-2AF4-CE646D1E2161}
 start /wait msiexec /qn /norestart /x {103729AF-35B8-7567-2739-905128A38CFE}
+start /wait msiexec /qn /norestart /x {05443FF3-D54B-2240-7546-73D96B7A63AE}

 :: CITIZEN bloatware (printer)
 start /wait msiexec /qn /norestart /x {546D97C7-9DF6-4A2D-BE02-2C0B25FFE1E3}
@@ -1993,9 +2065,6 @@
 start /wait msiexec /qn /norestart /x {133CD5EF-A4A1-442a-8D50-910B5DEF76BD}
 start /wait msiexec /qn /norestart /x {9A0DCD97-9648-45ed-A52C-133C728AB2FF}
 start /wait msiexec /qn /norestart /x {68A2A8FC-2CA0-4b6c-BE09-CC7ABE2A8DDC}
-
-
-

 :: HP 3.00.xxxx (various versions)
 start /wait msiexec /qn /norestart /x {2F518061-89DB-4AF0-9A7A-2BF73B60E6F0}
@@ -2064,6 +2133,9 @@
 :: HP App Studio
 start /wait msiexec /qn /norestart /x {565E7B0E-B76B-4EAD-9753-F1E72A5CF12E}

+:: HP Application Assistant
+start /wait msiexec /qn /norestart /x {B34A07DD-C6F7-414A-AE63-01019482EAF0}
+
 :: HP Auto
 start /wait msiexec /qn /norestart /x {CB7D766C-879F-4800-BB09-3D29E306EF63}
 start /wait msiexec /qn /norestart /x {CC4D56B7-6F18-470B-8734-ABCD75BCF4F1}
@@ -2088,6 +2160,9 @@

 :: HP C4400_Help
 start /wait msiexec /qn /norestart /x {4F923F90-46D1-4492-9CC6-13FBBA00E7EC}
+
+:: HP Calendar
+start /wait msiexec /qn /norestart /x {2B38E0FA-D8A5-4EBF-A018-E3C1C8E7A2E2}

 :: HP Cards_Calendar_OrderGift_DoMorePlugout 1.00.0000
 start /wait msiexec /qn /norestart /x {C918E3D8-208F-43DB-B346-6299D59336D7}
@@ -2165,6 +2240,10 @@
 start /wait msiexec /qn /norestart /x {C9EF1AAF-B542-41C8-A537-1142DA5D4AEC}
 start /wait msiexec /qn /norestart /x {57A5AEC1-97FC-474D-92C4-908FCC2253D4}
 start /wait msiexec /qn /norestart /x {0CC8AE1D-F5AA-4143-8FAD-E017E0E9EE70}
+start /wait msiexec /qn /norestart /x {FB8B6754-3AF9-4B13-9DE3-544553B2F274}
+start /wait msiexec /qn /norestart /x {11C982F6-159E-4CF4-8191-2F80C9AF230C}
+start /wait msiexec /qn /norestart /x {07FA4960-B038-49EB-891B-9F95930AA544}
+start /wait msiexec /qn /norestart /x {07FA4960-B038-49EB-891B-9F95930AA544}

 :: HP CustomerResearchQFolder
 start /wait msiexec /qn /norestart /x {7206B668-FEE0-455B-BB1F-9B5A2E0EC94A}
@@ -2331,6 +2410,9 @@
 :: HP Launch Box
 start /wait msiexec /qn /norestart /x {9CAB2212-0732-4827-8EC4-61D8EF0AA65B}
 start /wait msiexec /qn /norestart /x {5A847522-375C-4D05-BD3D-88C450CC047F}
+
+:: HP LinkUp
+start /wait msiexec /qn /norestart /x {DB3147AB-4024-4773-8EC0-A1FE5B44933D}

 :: HP Help, eDocs and User Guide GUIDs (various versions for various products; most of these should be caught in the wildcard scan)
 start /wait msiexec /qn /norestart /x {11C9A461-DD9D-4C71-85A4-6DCE7F99CC44}
@@ -2377,6 +2459,9 @@
 start /wait msiexec /qn /norestart /x {A5763105-D1D5-4862-A3FE-EC058F9AA73E}
 start /wait msiexec /qn /norestart /x {F4BD608A-8296-43DA-A400-1E8432AB1304}
 start /wait msiexec /qn /norestart /x {37EE481E-E4E9-4F1D-8CEA-4089E8D5280D}
+start /wait msiexec /qn /norestart /x {A2F95F8C-CDA9-4B08-BAD1-CA9656E4EC14}
+start /wait msiexec /qn /norestart /x {037CD593-D760-4A00-B030-7BBAFA1123FE}
+start /wait msiexec /qn /norestart /x {08295D09-E002-48F8-905D-34E4B08509BA}

 :: HP PC Hardware Diagnostics UEFI
 start /wait msiexec /qn /norestart /x {DD43EA67-DAF3-4879-BFF7-E534675BDEA5}
@@ -2409,6 +2494,7 @@
 start /wait msiexec /qn /norestart /x {88E60521-1E4E-4785-B9F1-1798A4BD0C30}
 start /wait msiexec /qn /norestart /x {9DEF9686-CCB2-47B7-BF83-B49EA21FA016}
 start /wait msiexec /qn /norestart /x {731A1D36-BF17-4C76-B7E7-CC055AF8C54E}
+start /wait msiexec /qn /norestart /x {26280024-DFB7-4967-90DB-7F9C6660D01E}

 :: HP MediaSmart DVD
 start /wait msiexec /qn /norestart /x {DCCAD079-F92C-44DA-B258-624FC6517A5A}
@@ -2418,10 +2504,16 @@
 start /wait msiexec /qn /norestart /x {2D5E3D2B-919F-407C-8757-E64827518BB6}
 start /wait msiexec /qn /norestart /x {BB1C717E-376C-4AA1-8940-81BFC38D9778}

+:: HP MovieStore
+start /wait msiexec /qn /norestart /x {9008D736-35CA-40DB-A2BE-5F32D954E5AA}
+
 :: HP MyRoom
 start /wait msiexec /qn /norestart /x {BB760C1D-98F4-4E38-8CC4-3B67329AA981}
 start /wait msiexec /qn /norestart /x {9B9B8EE4-2EDB-41C2-AF2E-63E75D37CDDF}
 start /wait msiexec /qn /norestart /x {9C35EDE5-4B0F-45E7-A438-314BA889948E}
+
+:: HP Notes
+start /wait msiexec /qn /norestart /x {86BAB08A-5E66-4C53-82E3-C1E91673C7CA}

 :: HPProductAssistant (shows up as Network, hidden)
 start /wait msiexec /qn /norestart /x {7910018D-02CF-4410-A7E5-CF5C10D05B7F}
@@ -2444,6 +2536,9 @@
 start /wait msiexec /qn /norestart /x {BC98D70F-CFF3-4B83-9551-7FF6748F90FC}
 start /wait msiexec /qn /norestart /x {10D81B04-1F2E-4F98-A7E9-C1A413E1610E}
 start /wait msiexec /qn /norestart /x {99039186-EBEB-4127-BFA2-18B10A05ACE2}
+start /wait msiexec /qn /norestart /x {85CB0687-0239-473E-943B-E8AFEE6E044C}
+start /wait msiexec /qn /norestart /x {8F3591D0-074B-4F7B-A269-39FE61C9CB5C}
+start /wait msiexec /qn /norestart /x {16B872EE-C458-41BD-BEAE-52758A3F3168}

 :: HP PrintScreen
 start /wait msiexec /qn /norestart /x {57C7C46A-D35D-492d-A328-4F8C9B5B4B52}
@@ -2462,6 +2557,7 @@

 :: HP Setup
 start /wait msiexec /qn /norestart /x {E2831862-F131-4327-B9CC-FA30F587EB6C}
+start /wait msiexec /qn /norestart /x {210A03F5-B2ED-4947-B27E-516F50CBB292}

 :: HP Software Framework
 start /wait msiexec /qn /norestart /x {1DFA0C99-6E2E-46F4-B242-51C7CF41DDE5}
@@ -2619,6 +2715,7 @@

 :: HP Remote Solution
 start /wait msiexec /qn /norestart /x {C611CF88-969D-43E6-A877-D6D6439DD081}
+start /wait msiexec /qn /norestart /x {ADCBF7A8-716E-4B21-AF03-E3F11C06C309}

 :: HP Rescue and Recovery
 start /wait msiexec /qn /norestart /x {C81D8576-F1B1-4E3A-9DC3-DF1B664962F0}
@@ -2626,20 +2723,23 @@

 :: HP RSS
 start /wait msiexec /qn /norestart /x {A35E58D6-2A0F-4051-983B-79342081338E}
+start /wait msiexec /qn /norestart /x {452479C5-0118-48E9-AA69-0A7339F95FC8}
+
+:: HP Security Assistant 3.0.4
+start /wait msiexec /qn /norestart /x {ED1BD69A-07E3-418C-91F1-D856582581BF}

 :: HP Setup
 start /wait msiexec /qn /norestart /x {438363A8-F486-4C37-834C-4955773CB3D3}
 start /wait msiexec /qn /norestart /x {F5E7D9AF-60F6-4A30-87E3-4EA94D322CE1}
 start /wait msiexec /qn /norestart /x {5036764A-435D-40C9-869C-31085A3D741D}
-
-:: HP Security Assistant 3.0.4
-start /wait msiexec /qn /norestart /x {ED1BD69A-07E3-418C-91F1-D856582581BF}
-
-:: HP Setup 9.1.15453.4066
+start /wait msiexec /qn /norestart /x {F5E7D9AF-60F6-4A30-87E3-4EA94D322CE1}
 start /wait msiexec /qn /norestart /x {42D10994-A566-495D-A5E7-D0C6B5C6B35C}
-
-:: HP Setup Manager 1.1.13253.3682
+start /wait msiexec /qn /norestart /x {F3B912F5-EB57-45AA-B3D1-EB532BCF6EF8}
+
+:: HP Setup Manager
 start /wait msiexec /qn /norestart /x {AE2F1669-5B1F-47C5-B639-78D74DD0BCE4}
+start /wait msiexec /qn /norestart /x {AE856388-AFAD-4753-81DF-D96B19D0A17C}
+start /wait msiexec /qn /norestart /x {AE856388-AFAD-4753-81DF-D96B19D0A17C}

 :: HP Shop for Supplies (HPSSupply)
 start /wait msiexec /qn /norestart /x {AC35A885-0F8F-4857-B7DA-6E8DFB43E6B3}
@@ -2693,6 +2793,8 @@
 start /wait msiexec /qn /norestart /x {A36CD345-625C-4d6c-B3E2-76E1248CB451}

 :: HP Support Assistant (various versions)
+start /wait msiexec /qn /norestart /x {78E2C850-ADA6-420D-BA35-2F4A9BE733CC}
+start /wait msiexec /qn /norestart /x {E35A3B13-78CD-4967-8AC8-AA9FDA693EDE}
 start /wait msiexec /qn /norestart /x {8C696B4B-6AB1-44BC-9416-96EAC474CABE}
 start /wait msiexec /qn /norestart /x {61EB474B-67A6-47F4-B1B7-386851BAB3D0}
 start /wait msiexec /qn /norestart /x {4EDD5F10-3961-48C2-ACD9-63D5C125EA8F}
@@ -2722,6 +2824,7 @@
 start /wait msiexec /qn /norestart /x {E959FD01-BD01-4CC4-9BB8-4EBE8309BF37}
 start /wait msiexec /qn /norestart /x {78E2C850-ADA6-420D-BA35-2F4A9BE733CC}
 start /wait msiexec /qn /norestart /x {E02FBF01-0DE3-4BCB-89E8-D300FEFC3289}
+start /wait msiexec /qn /norestart /x {6F44AF95-3CDE-4513-AD3F-6D45F17BF324}

 :: HP Support Information
 start /wait msiexec /qn /norestart /x {B2B7B1C8-7C8B-476C-BE2C-049731C55992}
@@ -2791,6 +2894,7 @@
 start /wait msiexec /qn /norestart /x {70F9BF10-3729-4333-BCBE-5218F69582FA}
 start /wait msiexec /qn /norestart /x {A535F266-291E-447F-ABE6-0BE17D0CB036}
 start /wait msiexec /qn /norestart /x {19484EF1-E27A-43D1-9EEB-685D41888AC8}
+start /wait msiexec /qn /norestart /x {20714B53-FC73-4F9C-9687-49EB237D6FD7}

 :: HP TrayApp (various versions)
 start /wait msiexec /qn /norestart /x {FF075778-6E50-47ed-991D-3B07FD4E3250}
@@ -2813,7 +2917,7 @@
 :: HP UnloadSupport (hidden)
 start /wait msiexec /qn /norestart /x {E06F04B9-45E6-4AC0-8083-85F7515F40F7}

-:: HP Update, various versions (also called HP Software Update)
+:: HP Update, various versions (also called HP Software Update or HP Update Client)
 start /wait msiexec /qn /norestart /x {787D1A33-A97B-4245-87C0-7174609A540C}
 start /wait msiexec /qn /norestart /x {97486FBE-A3FC-4783-8D55-EA37E9D171CC}
 start /wait msiexec /qn /norestart /x {117BBDE7-472E-4DCD-BAAE-410A0794A335}
@@ -2828,6 +2932,7 @@
 start /wait msiexec /qn /norestart /x {8C6027FD-53DC-446D-BB75-CACD7028A134}
 start /wait msiexec /qn /norestart /x {2EFA4E4C-7B5F-48F7-A1C0-1AA882B7A9C3}
 start /wait msiexec /qn /norestart /x {34957B51-9676-41CE-9E52-44AE91B73F1C}
+start /wait msiexec /qn /norestart /x {912D30CF-F39E-4B31-AD9A-123C6B794EE2}

 :: HP USB Docking Video (wtf?)
 start /wait msiexec /qn /norestart /x {B0069CFA-5BB9-4C03-B1C6-89CE290E5AFE}
@@ -3396,7 +3501,7 @@
 start /wait msiexec /qn /norestart /x {AB706D91-2242-4E1D-B4D0-1ED35387F5A7}
 start /wait msiexec /qn /norestart /x {68B52EFD-86CC-486E-A8D0-A3A1554CB5BC}

-:: Microsoft Office Click-to-Run 2010 14.0.4763.1000
+:: Microsoft Office Click-to-Run 2010
 start /wait msiexec /qn /norestart /x {90140000-006D-0409-1000-0000000FF1CE}
 start /wait msiexec /qn /norestart /x {90140000-0054-0409-1000-0000000FF1CE}
 start /wait msiexec /qn /norestart /x {90140000-006D-0409-0000-0000000FF1CE}
@@ -3988,7 +4093,7 @@
 :: TOSHIBA Blu-ray Disc Player
 start /wait msiexec /qn /norestart /x {FF07604E-C860-40E9-A230-E37FA41F103A}

-:: Toshiba Book Place
+:: Toshiba Book Place Blio
 start /wait msiexec /qn /norestart /x {92C7DC44-DAD3-49FE-B89B-F92C6BA9A331}
 start /wait msiexec /qn /norestart /x {39187A4B-7538-4BE7-8BAD-9E83303793AA}
 start /wait msiexec /qn /norestart /x {05A55927-DB9B-4E26-BA44-828EBFF829F0}


Merg dev

Merg dev

--- test/test_app.bat
+++ test/test_app.bat
@@ -1,5 +1,5 @@
 ### application.bat - 2015 - Nouailletas ###
 "Copyright company - 2015"
 echo "Build : 10:00"
-echo "version 1.2.1"
+echo "version 2.0.0"


Fix error propagation in T4 batch script [ci skip]

--- MoreLinq/tt.cmd
+++ MoreLinq/tt.cmd
@@ -6,3 +6,4 @@
 )
 :end
 popd
+exit /b %ERRORLEVEL%


remove old less compiler bat

remove old less compiler bat

--- less-compile.bat
+++ less-compile.bat
@@ -1 +1 @@
-lessc less\bootstrap.less > D:\talent_to_fame\ttf\vendor\assets\stylesheets\bootstrap.min.css+lessc less\bootstrap.less > ..\ttf\vendor\assets\stylesheets\bootstrap.min.css


Changed setup.py parameter call

Changed setup.py parameter call

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

 REM Developer's Note: Install Python then call the setup.py script
 REM inside the external/win32 directory.
-REM $Id: setup.bat,v 1.2 2004/06/26 02:41:38 judah Exp $
+REM $Id: setup.bat,v 1.3 2004/06/28 23:09:51 judah Exp $

 external\win32\util\Y_OR_N /Q /A "Do you wish to continue? [Y/n]"

@@ -25,10 +25,12 @@

 :RUN_SETUP
 cd external/win32
-start /wait setup.py -pyth
-start /wait setup.py -pack
+start /wait setup.py configure
+start /wait setup.py install
 cd ../..
 copy topographica-script.py topographica.py

 :EXIT
 ECHO Install Complete
+
+pause


Remove setup.bat in favor of setup.ps1 (#154)

--- setup.bat
+++ setup.bat
@@ -1,49 +0,0 @@
-set TO_CHECKOUT=%1
-
-if "%APPVEYOR%"=="True" (
-    pip install virtualenv
-    virtualenv -p C:\Python35\python.exe env
-    call env\scripts\activate.bat
-
-    move %APPVEYOR_BUILD_FOLDER% .
-    set TO_CHECKOUT=%APPVEYOR_REPO_BRANCH%
-
-    if "%APPVEYOR_PULL_REQUEST_NUMBER%"=="" (
-        set TO_CHECKOUT=
-    )
-)
-
-if not exist angr git clone https://github.com/angr/angr.git || goto :error
-if not exist ailment git clone https://github.com/angr/ailment.git || goto :error
-if not exist claripy git clone https://github.com/angr/claripy.git || goto :error
-if not exist cle git clone https://github.com/angr/cle.git || goto :error
-if not exist pyvex git clone --recursive https://github.com/angr/pyvex.git || goto :error
-if not exist archinfo git clone https://github.com/angr/archinfo.git || goto :error
-if not exist angr-doc git clone https://github.com/angr/angr-doc.git || goto :error
-if not exist binaries git clone https://github.com/angr/binaries.git || goto :error
-if not exist wheels git clone https://github.com/angr/wheels.git || goto :error
-if not exist angr-management git clone --recursive https://github.com/angr/angr-management.git || goto :error
-
-if not "%TO_CHECKOUT%" == "" (
-    call git_all.bat checkout %TO_CHECKOUT%
-)
-
-:: Install build dependencies until build isolation can be enabled
-pip install -U pip "setuptools>=59" wheel cffi unicorn==1.0.2rc4
-
-pip install -e .\archinfo || goto :error
-pip install -e .\pyvex || goto :error
-pip install -e .\cle || goto :error
-pip install -e .\claripy || goto :error
-pip install -e .\ailment || goto :error
-pip install --no-build-isolation -e .\angr[angrdb] || goto :error
-pip install -e .\angr-management || goto :error
-
-pip install nose nose2 flaky monkeyhex ipdb || goto :error
-
-echo "Development install success!"
-exit /b 0
-
-:error
-echo "Development install failed!"
-exit /b 1


fix shell java path

fix shell java path

--- shell.bat
+++ shell.bat
@@ -1,2 +1,2 @@
-@set PATH=C:\Program Files\Java\jdk1.7.0_25\bin;%PATH%
+@set PATH=C:\Program Files\Java\jdk1.8.0_77\bin;%PATH%
 @c:\Windows\system32\cmd.exe /c %USERPROFILE%\Desktop\sh.exe -l


[UPDATE] update batch file to copy all required assemblies

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

--- assemblies/update.bat
+++ assemblies/update.bat
@@ -0,0 +1,22 @@
+SET _=%~dp0
+SET mode=Debug
+copy /Y "%_%..\..\Builder\Build\bin\%mode%\Bridge.Build.dll" "%_%"
+copy /Y "%_%..\..\Builder\Builder\bin\%mode%\Bridge.Builder.exe" "%_%"
+copy /Y "%_%..\Core\CLR\bin\%mode%\Bridge.CLR.dll" "%_%"
+copy /Y "%_%..\Core\CLR\bin\%mode%\Bridge.CLR.xml" "%_%"
+copy /Y "%_%..\Core\Html5\bin\%mode%\Bridge.Html5.dll" "%_%"
+copy /Y "%_%..\Core\Html5\bin\%mode%\Bridge.Html5.xml" "%_%"
+copy /Y "%_%..\Core\Plugin\bin\%mode%\Bridge.Plugin.dll" "%_%"
+copy /Y "%_%..\Core\Translator\bin\%mode%\AjaxMin.dll" "%_%"
+copy /Y "%_%..\Core\Translator\bin\%mode%\Ext.Net.Utilities.dll" "%_%"
+copy /Y "%_%..\Core\Translator\bin\%mode%\ICSharpCode.NRefactory.dll" "%_%"
+copy /Y "%_%..\Core\Translator\bin\%mode%\ICSharpCode.NRefactory.CSharp.dll" "%_%"
+copy /Y "%_%..\Core\Translator\bin\%mode%\ICSharpCode.NRefactory.Cecil.dll" "%_%"
+copy /Y "%_%..\Core\Translator\bin\%mode%\Mono.Cecil.dll" "%_%"
+copy /Y "%_%..\Core\Translator\bin\%mode%\Mono.Cecil.Mdb.dll" "%_%"
+copy /Y "%_%..\Core\Translator\bin\%mode%\Mono.Cecil.Pdb.dll" "%_%"
+copy /Y "%_%..\Core\Translator\bin\%mode%\Mono.Cecil.Rocks.dll" "%_%"
+copy /Y "%_%..\Core\Translator\bin\%mode%\Newtonsoft.Json.dll" "%_%"
+copy /Y "%_%..\Core\Translator\bin\%mode%\Bridge.Translator.dll" "%_%"
+if not exist "%_%plugins\" mkdir "%_%plugins\"
+copy /Y "%_%..\..\Plugins\Aspects\bin\%mode%\Bridge.Aspects.dll" "%_%plugins\"


Created release 2015-04-14.

Created release 2015-04-14.

--- create-release.bat
+++ create-release.bat
@@ -57,6 +57,7 @@
 	goto COMPLETED
 )

+echo.
 git status

 :COMPLETED


Fixed MOB-2347

Fixed MOB-2347

--- src/bin/mmx-server.bat
+++ src/bin/mmx-server.bat
@@ -18,9 +18,6 @@
 set PROGNAME="Messaging server"
 set PROG=mmx-server

-cd ..
-call :touchPlugins 1>NUL 2>NUL
-cd .\bin

 call :check2Args %*

@@ -32,6 +29,9 @@
 )

 if "start"=="%1" (
+	cd ..
+	call :touchPlugins 1>NUL 2>NUL
+	cd .\bin
 	call :start
 ) else (
 	if "stop"=="%1" (


Fix compile test check in configure.bat on Symbian

SymbianContactSIM compile test should be done if contacts or systeminfo
module is selected.

Reviewed-by: Pasi Pentikainen

--- configure.bat
+++ configure.bat
@@ -638,7 +638,14 @@
     call :compileTest SNAP snap
 )

-if "%MODULE_CONTACTS_REQUESTED%" == "yes" IF "%MODULE_SYSTEMINFO_REQUESTED%" == "yes" (
+set doSymbianContactSIM=
+if "%MODULE_CONTACTS_REQUESTED%" == "yes" (
+    set doSymbianContactSIM=yes
+)
+if "%MODULE_SYSTEMINFO_REQUESTED%" == "yes" (
+    set doSymbianContactSIM=yes
+)
+if "%doSymbianContactSIM%" == "yes" (
     echo.
     echo Running compile tests for contacts / systeminfo module ...
     call :compileTest SymbianContactSIM symbiancntsim


* minor fix

* minor fix

git-svn-id: 8286f1aa0849172a171b18e797a5983a17159a76@82 699b1267-f50e-4533-8e1b-323e5631ef88

--- configure.bat
+++ configure.bat
@@ -5,13 +5,14 @@
 set "CONFIGURE_ROOT=%~dp0"
 set "CONFIGURE_ROOT=%CONFIGURE_ROOT:~0,-1%"

-if exist "%CONFIGURE_ROOT%/Scripts/Tools/scm/svn/__init__.bat" exit /b 1
-
-rem generate __init__.bat in "Tools/scm/svn"
-(
-  echo.@echo off
-  echo.
-  echo.call "%%%%~dp0..\..\__init__.bat" ^|^| goto :EOF
-) > "%CONFIGURE_ROOT%/Scripts/Tools/scm/svn/__init__.bat"
+if not exist "%CONFIGURE_ROOT%/Scripts/Tools/scm/svn/__init__.bat" ^
+if exist "%CONFIGURE_ROOT%/Scripts/Tools/scm/svn\" (
+  rem generate __init__.bat in "Tools/scm/svn"
+  (
+    echo.@echo off
+    echo.
+    echo.call "%%%%~dp0..\..\__init__.bat" ^|^| goto :EOF
+  ) > "%CONFIGURE_ROOT%/Scripts/Tools/scm/svn/__init__.bat"
+)

 exit /b 0


fix spacing on log message

fix spacing on log message

--- resources/stage_4_repair/disable_windows_telemetry/purge_windows_7-8-81_telemetry.bat
+++ resources/stage_4_repair/disable_windows_telemetry/purge_windows_7-8-81_telemetry.bat
@@ -77,7 +77,7 @@

 :::::::::::::::::::::::::::::::::::::::::::::::
 :: REMOVE BAD UPDATES
-call functions\log.bat "%CUR_DATE% %TIME%    Uninstalling bad updates, please wait..."
+call functions\log.bat "%CUR_DATE% %TIME%     Uninstalling bad updates, please wait..."

 if "%VERBOSE%"=="yes" (
 	REM Updated capabilities to upgrade Windows 8.1 and Windows 7
@@ -223,13 +223,13 @@
 	start /wait "" wusa /uninstall /kb:3112343 /quiet /norestart >> "%LOGPATH%\%LOGFILE%" 2>&1
 )

-call functions\log.bat "%CUR_DATE% %TIME%    Done."
+call functions\log.bat "%CUR_DATE% %TIME%     Done."

 ::::::::::::::::::::::::::::::::::::::::::::::::
 :: BLOCK BAD UPDATES
-call functions\log.bat "%CUR_DATE% %TIME%    Blocking bad updates, please wait..."
+call functions\log.bat "%CUR_DATE% %TIME%     Blocking bad updates, please wait..."
 echo.

 :: This line needed if we're being called from Tron. In standalone mode we'll already be in the appropriate directory
@@ -244,13 +244,13 @@

 popd

-call functions\log.bat "%CUR_DATE% %TIME%    Done."
+call functions\log.bat "%CUR_DATE% %TIME%     Done."

 ::::::::::::::::::::::::::::::::::::::::::::::::
 :: SCHEDULED TASKS
-call functions\log.bat "%CUR_DATE% %TIME%    Removing telemetry-related scheduled tasks..."
+call functions\log.bat "%CUR_DATE% %TIME%     Removing telemetry-related scheduled tasks..."

 if "%VERBOSE%"=="yes" (
 	schtasks /delete /F /TN "\Microsoft\Windows\Application Experience\Microsoft Compatibility Appraiser"
@@ -276,13 +276,13 @@
 	schtasks /delete /F /TN "\Microsoft\Windows\Windows Error Reporting\QueueReporting" >> "%LOGPATH%\%LOGFILE%" 2>&1
 )

-call functions\log.bat "%CUR_DATE% %TIME%    Done."
+call functions\log.bat "%CUR_DATE% %TIME%     Done."

 ::::::::::::::::::::::::::::::::::::::::::::::::
 :: SERVICES
-call functions\log.bat "%CUR_DATE% %TIME%    Removing bad services, please wait..."
+call functions\log.bat "%CUR_DATE% %TIME%     Removing bad services, please wait..."

 if "%VERBOSE%"=="yes" (
 	:: Diagnostic Tracking
@@ -302,29 +302,29 @@
 	sc stop RemoteRegistry >> "%LOGPATH%\%LOGFILE%" 2>&1
 )

-call functions\log.bat "%CUR_DATE% %TIME%    Done."
+call functions\log.bat "%CUR_DATE% %TIME%     Done."

 ::::::::::::::::::::::::::::::::::::::::::::::::::
 :: REGISTRY ENTRIES
-call functions\log.bat "%CUR_DATE% %TIME%    Toggling official MS telemetry registry entries..."
+call functions\log.bat "%CUR_DATE% %TIME%     Toggling official MS telemetry registry entries..."

 :: Disable telemetry via master registry key
 reg import stage_4_repair\disable_windows_telemetry\disable_telemetry_registry_entries.reg >nul 2>&1
 regedit /S stage_4_repair\disable_windows_telemetry\disable_telemetry_registry_entries.reg >nul 2>&1

-call functions\log.bat "%CUR_DATE% %TIME%    Done."
+call functions\log.bat "%CUR_DATE% %TIME%     Done."

 ::::::::::::::::::::::::::::::::::::::::::::::::
 :: MISC
-call functions\log.bat "%CUR_DATE% %TIME%    Miscellaneous cleanup, please wait..."
+call functions\log.bat "%CUR_DATE% %TIME%     Miscellaneous cleanup, please wait..."

 :: Kill pending tracking reports
 if not exist %ProgramData%\Microsoft\Diagnosis\ETLLogs\AutoLogger\ mkdir %ProgramData%\Microsoft\Diagnosis\ETLLogs\AutoLogger\
 echo. > %ProgramData%\Microsoft\Diagnosis\ETLLogs\AutoLogger\AutoLogger-Diagtrack-Listener.etl 2>NUL
 echo y|cacls.exe "%programdata%\Microsoft\Diagnosis\ETLLogs\AutoLogger\AutoLogger-Diagtrack-Listener.etl" /d SYSTEM >NUL 2>&1

-call functions\log.bat "%CUR_DATE% %TIME%    Done."
+call functions\log.bat "%CUR_DATE% %TIME%     Done."


Fixed path issue

Fixed path issue

--- prepare-webrtc.bat
+++ prepare-webrtc.bat
@@ -168,7 +168,7 @@

 :setup_python

-if NOT EXIST \Python27\nul call:failure -1 "Could not locate python path"
+if NOT EXIST C:\Python27\nul call:failure -1 "Could not locate python path"
 if "%failure%" neq "0" goto:eof

 call:set_path "C:\Python27"
@@ -268,8 +268,86 @@
 echo Downloaded %~1
 echo.
 goto:eof
-
 :set_path
+if "%~1"=="" exit /b 2
+if not defined path exit /b 2
+echo called method with paramter %~1
+::
+:: Determine if function was called while delayed expansion was enabled
+setlocal
+set "NotDelayed=!"
+::
+:: Prepare to safely parse PATH into individual paths
+setlocal DisableDelayedExpansion
+set "var=%path:"=""%"
+set "var=%var:^=^^%"
+set "var=%var:&=^&%"
+set "var=%var:|=^|%"
+set "var=%var:<=^<%"
+set "var=%var:>=^>%"
+set "var=%var:;=^;^;%"
+set var=%var:""="%
+set "var=%var:"=""Q%"
+set "var=%var:;;="S"S%"
+set "var=%var:^;^;=;%"
+set "var=%var:""="%"
+setlocal EnableDelayedExpansion
+set "var=!var:"Q=!"
+set "var=!var:"S"S=";"!"
+::
+:: Remove quotes from pathVar and abort if it becomes empty
+rem set "new=!%~1:"^=!"
+set new=%~1
+
+if not defined new exit /b 2
+::
+:: Determine if pathVar is fully qualified
+echo("!new!"|findstr /i /r /c:^"^^\"[a-zA-Z]:[\\/][^\\/]" ^
+                           /c:^"^^\"[\\][\\]" >nul ^
+  && set "abs=1" || set "abs=0"
+::
+:: For each path in PATH, check if path is fully qualified and then
+:: do proper comparison with pathVar. Exit if a match is found.
+:: Delayed expansion must be disabled when expanding FOR variables
+:: just in case the value contains !
+for %%A in ("!new!\") do for %%B in ("!var!") do (
+  if "!!"=="" setlocal disableDelayedExpansion
+  for %%C in ("%%~B\") do (
+    echo(%%B|findstr /i /r /c:^"^^\"[a-zA-Z]:[\\/][^\\/]" ^
+                           /c:^"^^\"[\\][\\]" >nul ^
+      && (if %abs%==1 if /i "%%~sA"=="%%~sC" exit /b 0) ^
+      || (if %abs%==0 if /i %%A==%%C exit /b 0)
+  )
+)
+::
+:: Build the modified PATH, enclosing the added path in quotes
+:: only if it contains ;
+setlocal enableDelayedExpansion
+if "!new:;=!" neq "!new!" set new="!new!"
+if /i "%~2"=="/B" (set "rtn=!new!;!path!") else set "rtn=!path!;!new!"
+::
+:: rtn now contains the modified PATH. We need to safely pass the
+:: value accross the ENDLOCAL barrier
+::
+:: Make rtn safe for assignment using normal expansion by replacing
+:: % and " with not yet defined FOR variables
+set "rtn=!rtn:%%=%%A!"
+set "rtn=!rtn:"=%%B!"
+::
+:: Escape ^ and ! if function was called while delayed expansion was enabled.
+:: The trailing ! in the second assignment is critical and must not be removed.
+if not defined NotDelayed set "rtn=!rtn:^=^^^^!"
+if not defined NotDelayed set "rtn=%rtn:!=^^^!%" !
+::
+:: Pass the rtn value accross the ENDLOCAL barrier using FOR variables to
+:: restore the % and " characters. Again the trailing ! is critical.
+for /f "usebackq tokens=1,2" %%A in ('%%^ ^"') do (
+  endlocal & endlocal & endlocal & endlocal & endlocal
+  set "path=%rtn%" !
+)
+Powershell.exe -NoProfile -ExecutionPolicy Bypass -command "[Environment]::SetEnvironmentVariable('PATH', $env:PATH, [EnvironmentVariableTarget]::User)"
+goto:eof
+:set_path4

 for /F "tokens=2* delims= " %%f IN ('reg query "HKLM\SYSTEM\CurrentControlSet\Control\Session Manager\Environment" /v Path ^| findstr /i path') do set OLD_SYSTEM_PATH=%%g
 setx.exe PATH ";%OLD_SYSTEM_PATH%;%~1"


Permanently save updated path variable

Permanently save updated path variable

--- prepare-webrtc.bat
+++ prepare-webrtc.bat
@@ -135,7 +135,7 @@
 if NOT EXIST \Python27\nul call:failure -1 "Could not locate python path"
 if "%failure%" neq "0" goto:eof

-set PATH=%PATH%;\Python27
+setx PATH=%PATH%;\Python27

 goto:eof


CI restore script fixes

CI restore script fixes

--- src/Tools/CI/restore.cmd
+++ src/Tools/CI/restore.cmd
@@ -48,10 +48,16 @@
 cd ../DotVVM.Tracing.ApplicationInsights
 dotnet restore

+cd ../DotVVM.Tracing.ApplicationInsights.Owin
+dotnet restore
+
 cd ../DotVVM.Tracing.ApplicationInsights.AspNetCore
 dotnet restore

 cd ../DotVVM.Samples.ApplicationInsights.AspNetCore
+dotnet restore
+
+cd ../DotVVM.Tracing.MiniProfiler.Owin
 dotnet restore

 cd ../DotVVM.Tracing.MiniProfiler.AspNetCore


gradle update

gradle update

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


Delete gradlew.bat

Delete gradlew.bat

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


Delete gradlew.bat

Delete gradlew.bat

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


Update local PATH var before checking py version

--- PlistTool.bat
+++ PlistTool.bat
@@ -33,7 +33,25 @@
 )
 goto checkpy

+:updatepath
+set "spath="
+set "upath="
+for /f "tokens=2* delims= " %%i in ('reg.exe query "HKCU\Environment" /v "Path" 2^> nul') do ( if not "%%j" == "" set "upath=%%j" )
+for /f "tokens=2* delims= " %%i in ('reg.exe query "HKLM\SYSTEM\CurrentControlSet\Control\Session Manager\Environment" /v "Path" 2^> nul') do ( if not "%%j" == "" set "spath=%%j" )
+if not "!spath!" == "" (
+    REM We got something in the system path
+    set "PATH=!spath!"
+    if not "!upath!" == "" (
+        REM We also have something in the user path
+        set "PATH=!PATH!;!upath!"
+    )
+) else if not "!upath!" == "" (
+    set "PATH=!upath!"
+)
+goto :EOF
+
 :checkpy
+call :updatepath
 for /f "tokens=*" %%x in ('where python') do ( call :checkpyversion "%%x" "py2v" "py2path" "py3v" "py3path" )
 set "targetpy=3"
 if /i "!use_py3!" == "FALSE" (
@@ -213,20 +231,7 @@
 REM If it worked, then we should have python in our PATH
 REM this does not get updated right away though - let's try
 REM manually updating the local PATH var
-set "spath="
-set "upath="
-for /f "tokens=2* delims= " %%i in ('reg.exe query "HKCU\Environment" /v "Path" 2^> nul') do ( if not "%%j" == "" set "upath=%%j" )
-for /f "tokens=2* delims= " %%i in ('reg.exe query "HKLM\SYSTEM\CurrentControlSet\Control\Session Manager\Environment" /v "Path" 2^> nul') do ( if not "%%j" == "" set "spath=%%j" )
-if not "!spath!" == "" (
-    REM We got something in the system path
-    set "PATH=!spath!"
-    if not "!upath!" == "" (
-        REM We also have something in the user path
-        set "PATH=!PATH!;!upath!"
-    )
-) else if not "!upath!" == "" (
-    set "PATH=!upath!"
-)
+call :updatepath
 goto checkpy
 exit /b


* tools/buildbot/slaves/win32-SharpSvn/svntest-bindings.cmd
  Make swig-perl test errors report a failed build for 1.9+.

git-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@1643096 13f79535-47bb-0310-9956-ffa450edef68

--- tools/buildbot/slaves/win32-SharpSvn/svntest-bindings.cmd
+++ tools/buildbot/slaves/win32-SharpSvn/svntest-bindings.cmd
@@ -75,7 +75,7 @@

     IF ERRORLEVEL 1 (
         echo [Perl tests reported error !ERRORLEVEL!] 1>&2
-        REM SET result=1
+        SET result=1
     ) ELSE (
         echo Done.
     )


Fix Batchfile && operator position

Fix Batchfile && operator position


bootstrap

bootstrap

--- bootstrap.cmd
+++ bootstrap.cmd
@@ -18,8 +18,8 @@
 :restore
 .\tools\.nuget\NuGet.exe update -self
 .\tools\.nuget\NuGet.exe install Cake -OutputDirectory .\tools -ExcludeVersion
-.\tools\.nuget\NuGet.exe install xunit.runner.console -OutputDirectory .\tools -ExcludeVersion
-REM .\tools\.nuget\NuGet.exe restore ..\Pyra.RiskProfiler.sln
+REM .\tools\.nuget\NuGet.exe install xunit.runner.console -OutputDirectory .\tools -ExcludeVersion
+REM REM .\tools\.nuget\NuGet.exe restore ..\Pyra.RiskProfiler.sln

 :buildsolution
 set encoding=utf-8


Try with MSYS Makefiles

Try with MSYS Makefiles

--- recipes/6s/bld.bat
+++ recipes/6s/bld.bat
@@ -1,5 +1,5 @@
 :: Configure.
-cmake -G "MinGW Makefiles" -D CMAKE_INSTALL_PREFIX=%PREFIX% .
+cmake -G "MSYS Makefiles" -D CMAKE_INSTALL_PREFIX=%PREFIX% .
 if errorlevel 1 exit 1

 :: Build.


removed unnecessary mongo-server batch file

--- mongo-server.bat
+++ mongo-server.bat
@@ -1 +0,0 @@
-f:\mongodb\bin\mongod.exe --config f:\mongodb\mongod.conf


added VC2013 support

added VC2013 support

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

--- win32_msvc13_build.bat
+++ win32_msvc13_build.bat
@@ -0,0 +1,35 @@
+@echo off
+
+echo ############################################################
+echo ### Build script for installation inside MEDITEC_LIBS    ###
+echo ###                                                      ###
+echo ### Specify command line parameters for build options:   ###
+echo ###    "-DBUILD_DEMO=ON"     Build interactive demo      ###
+echo ###    "-DBUILD_TEST=ON"     Build unit tests            ###
+echo ###    "-DBUILD_DOC=ON"      Build API documentation     ###
+echo ###                                                      ###
+echo ### !! You must put all parameters in quotation marks !! ###
+echo ############################################################
+timeout /t 5
+
+call "%VS120COMNTOOLS%\vsvars32.bat"
+
+mkdir build
+mkdir build\nmake_debug
+mkdir build\nmake_release
+mkdir build\VisualStudio2013
+
+cd build\nmake_debug
+cmake -G"NMake Makefiles" %1 %2 %3 -DCMAKE_INSTALL_PREFIX="%MEDITEC_LIBS%" ..\..
+nmake
+nmake install
+
+cd ..\nmake_release
+cmake -G"NMake Makefiles" %1 %2 %3 -DCMAKE_INSTALL_PREFIX="%MEDITEC_LIBS%" -DBUILD_DOC=OFF -DCMAKE_BUILD_TYPE=Release ..\..
+nmake
+nmake install
+
+cd ..\VisualStudio2013
+cmake -G"Visual Studio 12 2013" -DCMAKE_INSTALL_PREFIX="%MEDITEC_LIBS%" -DBUILD_TEST=ON -DBUILD_DEMO=ON ..\..
+
+cd ..\..


echo off

echo off

--- build-vc-programs.cmd
+++ build-vc-programs.cmd
@@ -1,3 +1,4 @@
+@ECHO OFF
 REM build-vc-programs.cmd

 REM This script does the following:


Testing a continous build script.

Testing a continous build script.

--- buildscript/build.bat
+++ buildscript/build.bat
@@ -1,17 +1,26 @@
 @echo off
+
+:: Save the path of the build script.
+set BuildScriptPath=%~dp0
+
+:: Strip trailing backslash.
+set RootPath=%BuildScriptPath:~0,-1%\..
+
 echo Build the library.
 echo ==================

-dotnet build ..\src\Google.Ads.GoogleAds.csproj
+dotnet build "%RootPath%\src\Google.Ads.GoogleAds.csproj"
+if %errorlevel% neq 0 exit /b %errorlevel%

 echo Build the examples.
 echo ===================
-dotnet build ..\examples\Services\Google.Ads.GoogleAds.Examples.csproj
+dotnet build "%RootPath%\examples\Services\Google.Ads.GoogleAds.Examples.csproj"
+if %errorlevel% neq 0 exit /b %errorlevel%

 echo Run the tests.
 echo ==============
-dotnet build ..\tests\Google.Ads.GoogleAds.Tests.csproj
+dotnet build "%RootPath%\tests\Google.Ads.GoogleAds.Tests.csproj"
+if %errorlevel% neq 0 exit /b %errorlevel%
+
 @echo on
-
-exit /b %ERRORLEVEL%
-
+exit /b 0


Buildscript: Remove unneded @s.

Buildscript: Remove unneded @s.

--- buildscript/build.cmd
+++ buildscript/build.cmd
@@ -1,11 +1,11 @@
 @set mesa=%cd%\
 @set abi=x86
 @set /p x64=Do you want to build for x64?(y/n) Otherwise build for x86:
-@if /I %x64%==y @set abi=x64
+@if /I %x64%==y set abi=x64
 @set longabi=%abi%
-@if %abi%==x64 @set longabi=x86_64
+@if %abi%==x64 set longabi=x86_64
 @set altabi=i686
-@if %abi%==x64 @set altabi=%longabi%
+@if %abi%==x64 set altabi=%longabi%
 @set minabi=32
 @if %abi%==x64 set minabi=64
 @set vsenv="%ProgramFiles%


Buildscript: Validate files and folders existence on removal and access

--- buildscript/build.cmd
+++ buildscript/build.cmd
@@ -16,8 +16,7 @@
 @set vsenvloaded=0
 @set dxtnbuilt=0
 @set toolset=14
-@set /p toolset=<toolset.ini
-@echo.
+@if EXIST toolset.ini set /p toolset=<toolset.ini
 @set vsenv=%vsenv14%
 @if %toolset%==15 @set vsenv=%vsenv15%

@@ -26,10 +25,8 @@
 @if /I NOT %buildllvm%==y GOTO build_dxtn
 @echo.
 @cd "%mesa%llvm"
-@RD /S /Q %abi%
-@echo.
-@RD /S /Q cmake-%abi%
-@echo.
+@if EXIST %abi% RD /S /Q %abi%
+@if EXIST cmake-%abi% RD /S /Q cmake-%abi%
 @md cmake-%abi%
 @cd cmake-%abi%
 @set toolchain=Visual Studio 14
@@ -70,8 +67,7 @@
 @set PATH=%gcc%\;%PATH%
 @cd "%mesa%dxtn"
 @echo.
-@RD /S /Q %abi%
-@echo.
+@if EXIST %abi% RD /S /Q %abi%
 @MD %abi%
 @set dxtn=gcc -shared
 @if %abi%==x86 set dxtn=%dxtn% -m32
@@ -117,8 +113,7 @@

 :build_with_vs
-@RD /S /Q build\windows-%longabi%
-@echo.
+@if EXIST build\windows-%longabi% RD /S /Q build\windows-%longabi%
 @set PATH=%mesa%Python\%abi%\;%mesa%Python\%abi%\Scripts\;%mesa%flexbison\;%mesa%m4\%abi%\usr\bin\;%PATH%
 @pip install -U mako
 @pip freeze > requirements.txt


changed iniciar.bat script

changed iniciar.bat script

--- iniciar.bat
+++ iniciar.bat
@@ -5,5 +5,14 @@
 ECHO.

 chcp 65001
-REM --safe because GitHub Pages runs it like that (no plugins, ignore symbolic links)
-bundle exec jekyll serve --safe --watch --incremental
+
+ECHO local(l) or build(b)?
+set /p INPUT=": "
+
+:: The /I switch makes the comparisons case-insensitive
+If /I "%INPUT%"=="l" (
+	bundle exec jekyll serve --watch --incremental
+)
+If /I "%INPUT%"=="b" (
+	bundle exec jekyll build
+)


Use pushd instead of cd

Use pushd instead of cd

--- install.bat
+++ install.bat
@@ -1,8 +1,9 @@
 git flow version > NUL
 if %ERRORLEVEL% GEQ 1 (
   copy gitflow-windows-dependencies\* "C:\Program Files (x86)\Git\bin"
-  cd gitflow
+  pushd gitflow
   contrib\msysgit-install.cmd "C:\Program Files (x86)\Git"
+  popd
 )

 echo "Installing..."


重构Bat

重构Bat

--- install.bat
+++ install.bat
@@ -15,10 +15,6 @@
 @title Nepxion Coroutine
 @color 0a

-@echo Please ensure to config JAVA_HOME with Java 7
-@set JAVA_HOME=E:\Tool\JDK-1.7.0
-@echo Found JAVA_HOME=%JAVA_HOME%
-
 call mvn clean install -DskipTests

 pause


fixed a bug in the ceatest.bat file

fixed a bug in the ceatest.bat file

--- bin/ceatest.bat
+++ bin/ceatest.bat
@@ -10,7 +10,7 @@
 conda env create -q --name ceatest
 set PATH=%LOCALAPPDATA%\conda\conda\envs\ceatest;%PATH%
 set PATH=%LOCALAPPDATA%\conda\conda\envs\ceatest\Scripts;%PATH%
-set CONDA_DEFAULT_ENV=ceatestall
+set CONDA_DEFAULT_ENV=ceatest
 %LOCALAPPDATA%\conda\conda\envs\ceatest\Scripts\pip.exe install .[dev]
 where cea
 cea test


update script

update script

--- bin/gitpull.bat
+++ bin/gitpull.bat
@@ -43,4 +43,7 @@
 cd tkinterquickhelper
 git pull
 cd ..
+cd code_beatrix
+git pull
+cd ..
 cd %current%


Build 79

Build 79


* Do not build boost dependencies (I will provide precompiled binaries with the repo).

--- InitializeRepo.bat
+++ InitializeRepo.bat
@@ -1,15 +1,9 @@
 @ECHO OFF
 PUSHD %~dp0

-ECHO Initialize and update submodules (and submodules of submodules)...
+ECHO Initialize and update submodules...
 git submodule update --init --recursive
 ECHO Done initilizing submodules.
-
-PUSHD .\externals\boost\
-CALL .\bootstrap.bat
-CALL .\b2 headers
-CALL .\b2 --with-serialization --stagedir=./ link=static runtime-link=shared threading=multi address-model=64 -j8 stage
-POPD
 POPD

 PAUSE


fix for build path

fix for build path

--- build.mingw.bat
+++ build.mingw.bat
@@ -316,9 +316,9 @@
 	setlocal
 		IF [%1] == [luajit] (
 			set luaverdef=-DLUA_JIT_51
-			set luaverout=-lluajit
+			set luaverout=%dlldir%\libluajit.dll
 		) ELSE (
-			set luaverout=-llua%1
+			set luaverout=%dlldir%\liblua%1.dll
 		)

 		echo Compiling luaw driver package %1...


Improve book variable

Improve book variable

--- build/build.bat
+++ build/build.bat
@@ -1,14 +1,15 @@
 Set DecorateName=DecorateName
-Set Book=mencius_TraditionalFont
+Set Book=mencius
+Set FontType=Traditional
 Set FontSize=FontSize48
-Set Output1=%Book%_%FontSize%_%DecorateName%
-Set Output2=%Book%_%FontSize%
+Set Output1=%Book%_%FontType%_%FontSize%_%DecorateName%
+Set Output2=%Book%_%FontType%_%FontSize%
 Set HTMLExt=.html
 Set HTMLOutput1=%Output1%%HTMLExt%
 Set HTMLOutput2=%Output2%%HTMLExt%

-Call pandoc ..\source\mencius.md -o %HTMLOutput1% --standalone --toc --css=..\css\%DecorateName%.css --css=..\css\FontSize.css --verbose
+Call pandoc ..\source\%Book%.md -o %HTMLOutput1% --standalone --toc --css=..\css\%DecorateName%.css --css=..\css\FontSize.css --verbose
 call wkhtmltopdf.exe %HTMLOutput1% %Output1%.pdf

-Call pandoc ..\source\mencius.md -o %HTMLOutput2% --standalone --toc --css=..\css\FontSize.css --verbose
+Call pandoc ..\source\%Book%.md -o %HTMLOutput2% --standalone --toc --css=..\css\FontSize.css --verbose
 call wkhtmltopdf.exe %HTMLOutput2% %Output2%.pdf


Add RUBY_FORCE_TEST_JIT

Add RUBY_FORCE_TEST_JIT

--- pkg_build_64.cmd
+++ pkg_build_64.cmd
@@ -51,6 +51,7 @@
 @echo test-all

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


Refactored cmd script

Refactored cmd script


add build.bat

add build.bat

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

--- csharp/build.bat
+++ csharp/build.bat
@@ -0,0 +1,16 @@
+call "%ProgramFiles%\Microsoft Visual Studio 10.0\Common7\Tools\vsvars32.bat"
+IF ERRORLEVEL 1 GOTO TRYX86
+GOTO BUILD
+
+:TRYX86
+call "%ProgramFiles(x86)%\Microsoft Visual Studio 10.0\Common7\Tools\vsvars32.bat"
+IF ERRORLEVEL 1 GOTO NEEDSVS
+
+:BUILD
+nmake -f makefile.msvc
+goto END
+
+:NEEDSVS
+echo Visual Studio 2010 doesn't seem to be installed
+
+:END


Use RtD theme

Use RtD theme

--- docs/make.bat
+++ docs/make.bat
@@ -4,6 +4,7 @@

 REM Command file for Sphinx documentation

+set SPHINXOPTS=-Dhtml_theme=sphinx_rtd_theme
 if "%SPHINXBUILD%" == "" (
 	set SPHINXBUILD=sphinx-build
 )


Set Path to CMake

Set Path to CMake

--- tools/internal_ci/helper_scripts/prepare_build_windows.bat
+++ tools/internal_ci/helper_scripts/prepare_build_windows.bat
@@ -14,7 +14,8 @@

 @rem make sure msys binaries are preferred over cygwin binaries
 @rem set path to python 2.7
-set PATH=C:\tools\msys64\usr\bin;C:\Python27;%PATH%
+@rem set path to CMake
+set PATH=C:\tools\msys64\usr\bin;C:\Python27;C:\Program Files\CMake\bin;%PATH%

 @rem If this is a PR using RUN_TESTS_FLAGS var, then add flags to filter tests
 if defined KOKORO_GITHUB_PULL_REQUEST_NUMBER if defined RUN_TESTS_FLAGS (


changed -a=gProgram

changed -a=gProgram

--- src/glslPrecompiler/precompiler.bat
+++ src/glslPrecompiler/precompiler.bat
@@ -1 +1 @@
-Release\glslPrecompiler.exe -o=shader.h -a=glProgram -v=shader.vert -f=shader.frag+Debug\glslPrecompiler.exe -o=shader.h -a=gProgram -v=shader.vert -f=shader.frag


got rexster.bat running on windows with support for extensions.

--- src/main/bin/rexster.bat
+++ src/main/bin/rexster.bat
@@ -4,22 +4,12 @@
 cd ..\lib
 set LIBDIR=%CD%

-set CP=
+cd ..\ext
+set EXTDIR=%CD%

-for %%i in (*.jar) do call :concatsep %%i
 cd ..\..\..\

 set JAVA_OPTIONS=-Xms32M -Xmx512M

 :: Launch the application
-java %JAVA_OPTIONS% %JAVA_ARGS% -cp %CP% com.tinkerpop.rexster.WebServer %*
-goto :eof
-
-:concatsep
-if "%CP%" == "" (
-set CP=%LIBDIR%\%1
-)else (
-set CP=%CP%;%LIBDIR%\%1
-)
-
-:skip
+java %JAVA_OPTIONS% %JAVA_ARGS% -cp %LIBDIR%/*;%EXTDIR%/*  com.tinkerpop.rexster.WebServer %*


Fix windows spacemacs script

Fix windows spacemacs script

--- windows/runspacemacs.bat
+++ windows/runspacemacs.bat
@@ -1,3 +1,4 @@

 set HOME=C:\Users\ctjhoa\dotfiles\spacemacs
-start C:\"Program Files (x86)"\Emacs\emacs-24.3\bin\runemacs.exe+start C:\"Program Files (x86)"\Emacs\emacs-24.3\bin\runemacs.exe
+set HOME=C:\Users\ctjhoa


switch to relative paths for the post deployment actions

--- Scripts/deploy.cmd
+++ Scripts/deploy.cmd
@@ -62,17 +62,19 @@
 )

 IF NOT DEFINED POST_DEPLOYMENT_SOURCE (
-  SET POST_DEPLOYMENT_SOURCE=%DEPLOYMENT_SOURCE%\Scripts\PostDeploymentActions\
+  SET POST_DEPLOYMENT_SOURCE=.\Scripts\PostDeploymentActions\
 )

 IF NOT DEFINED POST_DEPLOYMENT_TARGET (
-  SET POST_DEPLOYMENT_TARGET=%DEPLOYMENT_SOURCE%\..\deployments\tools\PostDeploymentActions\
+  SET POST_DEPLOYMENT_TARGET=..\deployments\tools\PostDeploymentActions\
   SET CLEAN_POST_DEPLOYMENT_TARGET=true
 )

 IF DEFINED CLEAN_POST_DEPLOYMENT_TARGET (
+  pushd "%DEPLOYMENT_SOURCE%"
   IF EXIST "%POST_DEPLOYMENT_TARGET%" rd /s /q "%POST_DEPLOYMENT_TARGET%"
   mkdir "%POST_DEPLOYMENT_TARGET%"
+  popd
 )

 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
@@ -130,9 +132,11 @@

 :: 5. Copy the post deployment scripts
 IF /I "%IN_PLACE_DEPLOYMENT%" NEQ "1" (
+  pushd "%DEPLOYMENT_SOURCE%"
   echo Copy the post deployment scripts...
   call :ExecuteCmd xcopy %POST_DEPLOYMENT_SOURCE% %POST_DEPLOYMENT_TARGET% /Y
   IF !ERRORLEVEL! NEQ 0 goto error
+  popd
 )

 goto end


Cat creation - add cat creation for viostor driver

--- viostor/packOne.bat
+++ viostor/packOne.bat
@@ -50,6 +50,34 @@
 copy /Y %PDB_PATH_AND_NAME% .\Install\%INST_OS%\%INST_ARC%
 copy /Y %INF_PATH_AND_NAME% .\Install\%INST_OS%\%INST_ARC%\%SYS_NAME%.inf

+:create_cat
+echo "Setting OS mask for:" %1 %2
+
+if /i "%1"=="wlh" goto create_vista
+if /i "%1"=="win7" goto create_vista
+if /i "%1"=="wnet" goto create_xp
+if /i "%1"=="wxp" goto create_xp
+goto error_cat2inf
+
+:create_xp
+if /i "%2"=="x86" set _OSMASK_=XP_X86,Server2003_X86
+if /i "%2"=="x64" set _OSMASK_=XP_X64,Server2003_X64
+goto run_cat2inf
+
+:create_vista
+if /i "%2"=="x86" set _OSMASK_=Vista_X86,Server2008_X86,7_X86
+if /i "%2"=="x64" set _OSMASK_=Vista_X64,Server2008_X64,7_X64,Server2008R2_X64
+goto run_cat2inf
+
+:error_cat2inf
+echo "Error setting OS mask for inf2cat"
+goto after_cat2inf
+
+:run_cat2inf
+inf2cat /driver:Install\%INST_OS%\%INST_ARC% /os:%_OSMASK_%
+
+:after_cat2inf
+
 set INST_OS=
 set INST_ARC=
 set SYS_NAME=


project: Fix get dependencies batch file to only select lib archives.

--- SMP/project_get_dependencies.bat
+++ SMP/project_get_dependencies.bat
@@ -115,9 +115,12 @@
 FOR /F "tokens=2 delims=: " %%F in ("%TAG%") DO SET TAG=%%F
 IF "%TAG%"=="" ( ECHO Failed getting latest %REPONAME% release tag information & EXIT /B 1 )
 REM Get download name of latest release
-FOR /F "tokens=* USEBACKQ" %%F IN (`TYPE latest.json ^| FINDSTR "name="`) DO SET LIBNAME=%%F
-SET LIBNAME=%LIBNAME:*name=%
-FOR /F "tokens=1 delims=_" %%F in ("%LIBNAME:~1%") DO SET LIBNAME=%%F
+SET LIBNAME=
+FOR /F "tokens=* USEBACKQ" %%F IN (`TYPE latest.json ^| FINDSTR "name="`) DO ( SET TEMPF=%%F
+    SET TEMPF=!TEMPF:*name=!
+    IF "!TEMPF:~1,3!"=="lib" ( SET LIBNAME=!TEMPF:~1! )
+)
+FOR /F "tokens=1 delims=_" %%F in ("%LIBNAME%") DO SET LIBNAME=%%F
 IF "%LIBNAME%"=="" ( ECHO Failed getting latest %REPONAME% release name information & EXIT /B 1 )
 DEL /F /Q latest.json
 REM Get the download location for the required tag


Build script: Better error handling if cannot locate Visual Studio.

--- Tools/Build/FindVisualStudio.bat
+++ Tools/Build/FindVisualStudio.bat
@@ -10,7 +10,11 @@
 )

 @REM VS2015 uses %VS140COMNTOOLS% for locating the installation.
-IF "%VS140COMNTOOLS%" NEQ "" (CALL "%VS140COMNTOOLS%VsDevCmd.bat" x86 && GOTO OkRestoreEcho || GOTO Error)
+IF "%VS140COMNTOOLS%" NEQ "" (
+  IF EXIST "%VS140COMNTOOLS%VsDevCmd.bat" (
+    CALL "%VS140COMNTOOLS%VsDevCmd.bat" x86 && GOTO OkRestoreEcho || GOTO Error
+  )
+)

 :Error
 @ECHO ERROR: Cannot find Visual Studio.


Adjust path

Adjust path

--- recipes/arccommander/bld.bat
+++ recipes/arccommander/bld.bat
@@ -4,5 +4,5 @@
 set DOTNET_ROOT="%PREFIX%\lib\dotnet"
 set TOOL_ROOT="%DOTNET_ROOT%\tools\arccommander"
 mkdir %PREFIX%\bin %TOOL_ROOT%
-robocopy /E %SRC_DIR%\src\ArcCommander\bin\Release\net6.0\ %TOOL_ROOT%
+robocopy /E %SRC_DIR%\src\ArcCommander\X64\bin\Release\net6.0\publish %TOOL_ROOT%
 copy "%RECIPE_DIR%\arc.bat" "%PREFIX%\bin\arc.bat"


Update purge_windows_10_telemetry.bat

Update purge_windows_10_telemetry.bat

--- resources/stage_4_repair/disable_windows_telemetry/purge_windows_10_telemetry.bat
+++ resources/stage_4_repair/disable_windows_telemetry/purge_windows_10_telemetry.bat
@@ -422,7 +422,7 @@
 ::::::::::::::::::::::::::::::::::::::::::::::::::
 :: OandOShutUp10 IMMUNIZATIONS
 call functions\log.bat "%CUR_DATE% %TIME%     Applying OandOShutUp10 protections, please wait..."
-	disable_windows_telemetry\OOShutUp10.exe disable_windows_telemetry\ooshutup10_tron_settings.cfg /quiet >> "%LOGPATH%\%LOGFILE%" 2>&1
+	stage_4_repair\disable_windows_telemetry\OOShutUp10.exe stage_4_repair\disable_windows_telemetry\ooshutup10_tron_settings.cfg /quiet >> "%LOGPATH%\%LOGFILE%" 2>&1
 call functions\log.bat "%CUR_DATE% %TIME%     Done

@@ -686,7 +686,7 @@
 )

 :: Kill pending tracking reports
-if not exist %ProgramData%\Microsoft\Diagnosis\ETLLogs\AutoLogger\ mkdir %ProgramData%\Microsoft\Diagnosis\ETLLogs\AutoLogger\
+if not exist %ProgramData%\Microsoft\Diagnosis\ETLLogs\AutoLogger\ mkdir %ProgramData%\Microsoft\Diagnosis\ETLLogs\AutoLogger\ >NUL 2>&1
 echo. > %ProgramData%\Microsoft\Diagnosis\ETLLogs\AutoLogger\AutoLogger-Diagtrack-Listener.etl 2>NUL
 echo y|cacls.exe "%programdata%\Microsoft\Diagnosis\ETLLogs\AutoLogger\AutoLogger-Diagtrack-Listener.etl" /d SYSTEM >NUL 2>&1


Fixup windows install.

Fixup windows install.

--- windows/install.bat
+++ windows/install.bat
@@ -15,12 +15,17 @@
 copy /Y drmemory-env.bat c:\src\
 copy /Y env.bat          c:\src\

-pushd c:\src
-call env.bat
-popd
+where git.exe > NUL 2>&1
+if errorlevel 1 (
+  pushd c:\src
+  call env.bat
+  popd
+  git.exe pull --rebase
+  install.bat
+)

 pushd c:\src\dotfiles\
-mkdir %APPDATA\Console\
+mkdir %APPDATA%\Console\
 copy  /Y third_party\console2\console.xml %APPDATA%\Console\
 copy  /Y     cvsignore    %USERPROFILE%\.cvsignore
 copy  /Y     emacs        %USERPROFILE%\.emacs
@@ -51,5 +56,7 @@
 )

 pushd %USERPROFILE%\.emacs.d\
-emacs.exe -Q --script %HOME%\.third_party\cask\cask-cli.el -- install
+emacs.exe -Q --script %USERPROFILE%\.third_party\cask\cask-cli.el -- install
 popd
+
+reg add HKCU\Environment /v HOME /d %USERPROFILE% /f


Remove extraneous quote

Remove extraneous quote

--- run.bat
+++ run.bat
@@ -1,5 +1,5 @@
 docker run --rm -t^
-  -v %cd%:/var/www/html"^
+  -v %cd%:/var/www/html^
   -c 2^
   --cpuset-cpus="0-1"^
   -m 2g^


changes run.cmd

changes run.cmd

--- run.cmd
+++ run.cmd
@@ -1,4 +1,13 @@
 @echo off
+
+cd cmaki
+git pull origin master
+cd ..
+
+cd cmaki_generator
+git pull origin master
+cd ..
+
 set GENERATOR=Visual Studio 14 2015
 set MODE=Debug
 echo running in mode %MODE% ...


Added git shell

Added git shell

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


Appveyor CI: be slightly less verbose when building LuaJIT


Removed file that was added by accident.

--- tpdatasrc/MyPackFiles.bat
+++ tpdatasrc/MyPackFiles.bat
@@ -1,20 +0,0 @@
-Rem generate the files: tpgamefiles.dat, co8fixes.dat,  co8infra.dat and kotbfixes.dat in ..\tpdata
-Rem Note:  ..\tpdata\clearances.dat is checked in and not generated by this sciprt
-set basedir=%~dp0
-cd %basedir%
-REM cd tpgamefiles
-%basedir%..\dependencies\bin\datpack.exe tpgamefiles.dat %basedir%tpgamefiles
-move /Y tpgamefiles.dat %basedir%..\tpdata\
-REM cd ..
-REM cd co8fixes
-REM %basedir%..\dependencies\bin\datpack.exe co8fixes.dat %basedir%co8fixes
-REM move /Y co8fixes.dat %basedir%..\tpdata\
-REM cd ..
-REM cd co8infra
-REM %basedir%..\dependencies\bin\datpack.exe co8infra.dat %basedir%co8infra
-REM move /Y co8infra.dat %basedir%..\tpdata\
-REM cd ..
-REM cd kotbfixes
-REM %basedir%..\dependencies\bin\datpack.exe kotbfixes.dat %basedir%kotbfixes
-REM move /Y kotbfixes.dat %basedir%..\tpdata\
-REM cd ..\


AppVeyor: fixing node install by lowercasing %PLATFORM%

--- scripts/build-appveyor.bat
+++ scripts/build-appveyor.bat
@@ -44,6 +44,12 @@
 ECHO using MSBuild^: && msbuild /version && ECHO.
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR

+
+::activating VS command prompt seems to uppercase PLATFORM, but only for x64 not x86
+::with X64 AppVeyor cannot install node
+ECHO platform^: %platform%
+IF /I "%PLATFORM%"=="x64" ECHO lowercasing platform && SET PLATFORM=x64
+ECHO platform^: %platform%

 ECHO downloading/installing node
 ::only use Install-Product when using VS2013


ok, different path on AppVeyor

ok, different path on AppVeyor

--- scripts/build-appveyor.bat
+++ scripts/build-appveyor.bat
@@ -81,6 +81,10 @@
 SET NODE_EXE_PRG=%ProgramFiles(x86)%\nodejs\node_modules\npm-windows-upgrade\bin
 IF EXIST "%NODE_EXE_PRG%" ECHO found %NODE_EXE_PRG%, copying... && COPY /Y scripts\npm-windows-upgrade "%NODE_EXE_PRG%\npm-windows-upgrade"
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR
+SET NODE_EXE_PRG=%APPDATA%\npm\node_modules\npm-windows-upgrade\bin
+IF EXIST "%NODE_EXE_PRG%" ECHO found %NODE_EXE_PRG%, copying... && COPY /Y scripts\npm-windows-upgrade "%NODE_EXE_PRG%\npm-windows-upgrade"
+IF %ERRORLEVEL% NEQ 0 GOTO ERROR
+

 ECHO upgrading npm... && CALL npm-windows-upgrade --version:3.2.1


using static reference to folder for AppVeyor tests

--- scripts/appveyor-tests.bat
+++ scripts/appveyor-tests.bat
@@ -1,6 +1 @@
-echo "scanning tests in %APPVEYOR_BUILD_FOLDER%\test\"
-
-for %%f in (%APPVEYOR_BUILD_FOLDER%\test\**\*.csproj) do (
-	echo "testing %%~nf"
-	dotnet test %%~nf -c Release
-)+dotnet test %APPVEYOR_BUILD_FOLDER%\test\DeveelDb.Core.Tests


[Nomad] Patch for version 0.93 update

[Nomad] Patch for version 0.93 update

--- Games/Other/Oxide.Game.Nomad/Files/_start-example.bat
+++ Games/Other/Oxide.Game.Nomad/Files/_start-example.bat
@@ -3,7 +3,7 @@
 :start
 echo Starting server...

-"Nomad Server\NomadServer.exe" -name "My Oxide Server" -port 5127 -slots 10 -clientVersion "0.92" -password "" -tcpLobby "149.202.51.185" 25565
+"Nomad Server\NomadServer.exe" -name "My Oxide Server" -port 5127 -slots 10 -clientVersion "0.93" -password "" -tcpLobby "149.202.51.185" 25565

 echo.
 echo Restarting server...


Fix Issue In For Loop

Fix Issue In For Loop

--- scripts/vm-guest-tools.bat
+++ scripts/vm-guest-tools.bat
@@ -16,7 +16,7 @@
 if not exist "C:\Windows\Temp\windows.iso" (
   powershell -Command "(New-Object System.Net.WebClient).DownloadFile('http://softwareupdate.vmware.com/cds/vmw-desktop/ws/10.0.1/1379776/windows/packages/tools-windows-9.6.1.exe.tar', 'C:\Windows\Temp\vmware-tools.exe.tar')" <NUL
   cmd /c ""C:\Program Files\7-Zip\7z.exe" x C:\Windows\Temp\vmware-tools.exe.tar -oC:\Windows\Temp"
-  FOR /r "C:\Windows\Temp" %a in (tools-windows-*.exe) DO REN "%~a" "tools-windows.exe"
+  FOR /r "C:\Windows\Temp" %%a in (tools-windows-*.exe) DO REN "%%~a" "tools-windows.exe"
   cmd /c C:\Windows\Temp\tools-windows
   move /Y "C:\Program Files (x86)\VMware\tools-windows\windows.iso" C:\Windows\Temp
   rd /S /Q "C:\Program Files (x86)\VMWare"


Removed superfluous file.

Removed superfluous file.

--- mk-2013.cmd
+++ mk-2013.cmd
@@ -1,4 +0,0 @@
-@echo off
-
-rem Ocaml is VS2013, so need VS2013 command prompt for it to work!
-python scripts/mk_make.py -b bld_dbg_2013 --java --ml --debug --vs --parallel=12


fix patch ref

fix patch ref

--- mk-curl.bat
+++ mk-curl.bat
@@ -17,10 +17,10 @@
 set CURL_LDFLAG_EXTRAS=-static-libgcc
 rem   -flto -ffat-lto-objects

-if exist ..\..\curl.diff (
-   dos2unix ..\..\curl.diff
-   patch -p0 -i ../../curl.diff
-   del ..\..\curl.diff
+if exist ..\curl.diff (
+   dos2unix ..\curl.diff
+   patch -p0 -i ../curl.diff
+   del ..\curl.diff
 )

 mingw32-make mingw32-clean


Create start script for windows

Create start script for windows

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

--- start_game_win.cmd
+++ start_game_win.cmd
@@ -0,0 +1,2 @@
+cd src
+start python Game.py