Remove get correct location code

Remove get correct location code

It's not needed. Chances that this file will be run outside of
repository are very low.

--- winAutolink.bat
+++ winAutolink.bat
@@ -14,10 +14,6 @@
   if %errorLevel% == 0 (
     echo Success: Administrative permissions confirmed.
     echo.
-
-    rem If exists remove file created by UAC_prompt
-    if exist "%temp%\getadmin.vbs" ( del "%temp%\getadmin.vbs" )
-
     goto select_links
   ) else (
     echo Requesting administrative privileges...
@@ -31,6 +27,7 @@
     echo UAC.ShellExecute "%~s0", "%params%", "", "runas", 1 >> "%temp%\getadmin.vbs"

     "%temp%\getadmin.vbs" >nul
+    if exist "%temp%\getadmin.vbs" ( del "%temp%\getadmin.vbs" )
     exit /B

 rem Select what to link ----------------------------------------------------
@@ -69,21 +66,7 @@
     )
   )

-  if %errorLevel% == 1 ( goto error )
-
-  echo Looks like repository is not here.
-  goto get_target
-
-rem Get from user location of repository -----------------------------------
-:get_target
-  set /p target="Please write correct path of repository: "
-
-  if %errorLevel% == 0 (
-    cls
-    goto check_path
-  ) else (
-    goto error
-  )
+  goto error

 rem Link vim files ---------------------------------------------------------
 :link_vim


Reverting cython build.py (cython can regenerate different files on the same input).

--- builders/org.python.pydev.build/build_cmd.bat
+++ builders/org.python.pydev.build/build_cmd.bat
@@ -62,7 +62,6 @@

 @echo Create builtin modules
 set PYTHONPATH=%BUILD_DIR%/Pydev/plugins/org.python.pydev/pysrc
-C:\tools\Miniconda32\envs\py27_32\python %BUILD_DIR%/Pydev/plugins/org.python.pydev/pysrc/build_tools/build.py
 C:\tools\Miniconda32\envs\py27_32\python %BUILD_DIR%/Pydev/plugins/org.python.pydev/pysrc/build_tools/build_binaries_windows.py

 @echo to clean after the build: -DcleanAfter.set=true


also install PowerCLI vCloud snapin

also install PowerCLI vCloud snapin

--- install.bat
+++ install.bat
@@ -123,7 +123,7 @@
     call wget -O "%TEMP%\VMware-PowerCLI-5.5.0-1295336.exe" http://roecloudsrv001/vmware/powercli/VMware-PowerCLI-5.5.0-1295336.exe
   )
   powershell -Command "Import-Module ServerManager; Add-WindowsFeature NET-Framework-Features"
-  "%TEMP%\VMware-PowerCLI-5.5.0-1295336.exe" /s /v/qn
+  "%TEMP%\VMware-PowerCLI-5.5.0-1295336.exe" /s /v/qn /vADDLOCAL=ALL
   del "%TEMP%\VMware-PowerCLI-5.5.0-1295336.exe"
 )


Refactor look_for_headers in install.bat

One side effect should be that LUA_INCDIR does not have
trailing backslash when inferred.

--- install.bat
+++ install.bat
@@ -343,30 +343,32 @@
 	return false
 end

-local function look_for_headers (directory)
+local function look_for_headers(directory)
+	local directories
 	if vars.LUA_INCDIR then
-		print(S"    checking for $LUA_INCDIR\\lua.h")
-		if exists(S"$LUA_INCDIR\\lua.h") then
+		directories = {vars.LUA_INCDIR}
+	else
+		directories = {
+			directory .. S"\\include\\lua\\$LUA_VERSION",
+			directory .. S"\\include\\lua$LUA_SHORTV",
+			directory .. S"\\include\\lua$LUA_VERSION",
+			directory .. "\\include",
+			directory
+		}
+	end
+
+	for _, dir in ipairs(directories) do
+		local full_name = dir .. "\\lua.h"
+		print("    checking for " .. full_name)
+		if exists(full_name) then
+			vars.LUA_INCDIR = dir
 			print("       Found lua.h")
 			return true
 		end
+	end
+
+	if vars.LUA_INCDIR then
 		die(S"lua.h not found in $LUA_INCDIR")
-	end
-
-	for _, e in ipairs{
-        S([[\include\lua\$LUA_VERSION]]),
-        S([[\include\lua$LUA_SHORTV]]),
-        S([[\include\lua$LUA_VERSION]]),
-        S([[\include\$LUA_VERSION]]),
-        [[\include\]],
-        [[\]],
-      } do
-		print("    checking for "..directory..e.."\\lua.h")
-		if exists(directory..e.."\\lua.h") then
-			vars.LUA_INCDIR = directory..e
-			print("       Found lua.h")
-			return true
-		end
 	end
 	return false
 end


adding initial install.bat to replace in-CF script

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

--- hosts/windows_ami/install.bat
+++ hosts/windows_ami/install.bat
@@ -0,0 +1,95 @@
+SET DOWNLOADS=C:\downloads
+SET PYTHON_TARGETDIR=C:\python
+
+msiexec /qb /i %DOWNLOADS%\7-zip.msi
+del %DOWNLOADS%\7-zip.msi
+
+SET PATH=%PATH%;C:\Program Files\7-zip;
+
+:: Prepare setuptools, pip and virtualenv
+7z x %DOWNLOADS%\setuptools-18.2.zip -o%DOWNLOADS%\
+7z x %DOWNLOADS%\pip-7.1.2.tar.gz -o%DOWNLOADS%
+7z x %DOWNLOADS%\dist\pip-7.1.2.tar -o%DOWNLOADS%
+move %DOWNLOADS%\pip-7.1.2 %DOWNLOADS\pip
+del %DOWNLOADS%\pip-7.1.2.tar.gz
+7z x %DOWNLOADS%\virtualenv-13.1.2.tar.gz -o%DOWNLOADS%
+7z x %DOWNLOADS%\dist\virtualenv-13.1.2.tar -o%DOWNLOADS%
+move %DOWNLOADS%\virtualenv-13.1.2 %DOWNLOADS\virtualenv
+del %DOWNLOADS%\virtualenv-13.1.2.tar.gz
+rmdir /s /q %DOWNLOADS%\dist
+
+:: Install CPython Interpreters
+CALL :install_cpython python-2.6.6.amd64 cpython-2.6.6-64
+CALL :install_cpython python-2.6.6 cpython-2.6.6-32
+CALL :install_cpython python-2.7.10.amd64 cpython-2.7.10-64
+CALL :install_cpython python-2.7.10 cpython-2.7.10-32
+CALL :install_cpython python-3.2.5.amd64 cpython-3.2.5-64
+CALL :install_cpython python-3.2.5 cpython-3.2.5-32
+CALL :install_cpython python-3.3.5.amd64 cpython-3.3.5-64
+CALL :install_cpython python-3.3.5 cpython-3.3.5-32
+CALL :install_cpython python-3.4.3.amd64 cpython-3.4.3-64
+CALL :install_cpython python-3.4.3 cpython-3.4.3-32
+
+:: Install PyPy Interpreters
+CALL :install_pypy pypy-2.6.0-win32 pypy3-2.4.0-32
+CALL :install_pypy pypy3-2.4.0-win32 pypy3-2.4.0-32
+
+:: Extract the ISO files
+CALL :extract_iso VS2008ExpressENUX1397868
+:: TODO: call install program
+CALL :extract_iso VS2010Express1
+:: TODO: call install program
+CALL :extract_iso GRMSDK_EN_DVD
+:: TODO: call install program
+
+dism /Online /Enable-Feature /Featurename:NetFX3 /All
+
+
+EXIT /B %ERRORLEVEL%
+GOTO:EOF
+
+::
+:: Functions
+::
+
+:install_cpython
+:: Install MSI
+msiexec /qb /i %DOWNLOADS%\%~1.msi ALLUSERS=1 TARGETDIR=%PYTHON_TARGETDIR%\%~2
+del %DOWNLOADS%\%~1.msi
+
+:: Install setuptools, pip and virtualenv
+cd %DOWNLOADS%\setuptools\
+%PYTHON_TARGETDIR%\%~2\python.exe setup.py install
+cd %DOWNLOADS%\pip\
+%PYTHON_TARGETDIR%\%~2\python.exe setup.py install
+cd %DOWNLOADS%\virtualenv\
+%PYTHON_TARGETDIR%\%~2\python.exe setup.py install
+
+:: De-associate file extensions
+assoc .py=
+assoc .pyc=
+assoc .pyo=
+assoc .pyw=
+GOTO:EOF
+
+:install_pypy
+:: Extract
+7z x %DOWNLOADS%\%~1.zip -o%PYTHON_TARGETDIR%
+move %PYTHON_TARGETDIR%\%~1 %PYTHON_TARGETDIR%\%~2
+del %DOWNLOADS%\%~1.zip
+
+:: Install setuptools, pip and virtualenv
+cd %DOWNLOADS%\setuptools\
+%PYTHON_TARGETDIR%\%~2\pypy.exe setup.py install
+cd %DOWNLOADS%\pip\
+%PYTHON_TARGETDIR%\%~2\pypy.exe setup.py install
+cd %DOWNLOADS%\virtualenv\
+%PYTHON_TARGETDIR%\%~2\pypy.exe setup.py install
+GOTO:EOF
+
+:extract_iso
+7x -o %DOWNLOADS%\%~1.iso -o %DOWNLOADS\%~1
+del %DOWNLOADS%\%~1.iso
+
+ENDLOCAL
+GOTO:EOF


Added "publish.bat" into Client\Angular

Added "publish.bat" into Client\Angular

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

--- Client/Angular/publish.bat
+++ Client/Angular/publish.bat
@@ -0,0 +1,5 @@
+@ECHO OFF
+CD /D %~dp0
+call ng build --prod dbwebapi-client-lib
+cd dist/dbwebapi-client-lib
+call npm publish


Fix windows build

Fix windows build

--- recipes/heavydb/build-heavydb.bat
+++ recipes/heavydb/build-heavydb.bat
@@ -41,11 +41,10 @@
       "%SRC_DIR%"
 if errorlevel 1 exit 1

-cmake --build . --target calciteserver_thrift initdb omnisci_server omnisql mapd_java_components StreamImporter KafkaImporter --config Release
+cmake --build . --target calciteserver_thrift initheavy heavydb heavysql mapd_java_components StreamImporter KafkaImporter --config Release
 if errorlevel 1 exit 1

 cmake --install . --component "exe" --prefix %PREFIX%
-COPY %PREFIX%\bin\initdb.exe %PREFIX%\bin\omnisci_initdb.exe
 if errorlevel 1 exit 1

 popd


Important single character fix

Important single character fix

--- samples/_winpack_build_sample.cmd
+++ samples/_winpack_build_sample.cmd
@@ -78,7 +78,7 @@
 POPD
 cl /? >NUL 2>NUL <NUL
 if %ERRORLEVEL% NEQ 0 (
-  set "MSG=Can't detect Microsoft Visial Studio C++ compiler (cl.exe). MSVS 2015/2017/2019 are supported only from standard locations"
+  set "MSG=Can't detect Microsoft Visual Studio C++ compiler (cl.exe). MSVS 2015/2017/2019 are supported only from standard locations"
   goto die
 )


Update appveyor.bat

Update appveyor.bat

introduced failing Mvc build

--- appveyor.bat
+++ appveyor.bat
@@ -6,11 +6,11 @@
 msbuild "SimpleInjector.Packaging\SimpleInjector.Packaging.csproj" /nologo
 msbuild "SimpleInjector.Extensions.LifetimeScoping\SimpleInjector.Extensions.LifetimeScoping.csproj" /nologo
 msbuild "SimpleInjector.Integration.Web\SimpleInjector.Integration.Web.csproj" /nologo
-rem msbuild "SimpleInjector.Integration.Web.Mvc\SimpleInjector.Integration.Web.Mvc.csproj" /nologo
+msbuild "SimpleInjector.Integration.Web.Mvc\SimpleInjector.Integration.Web.Mvc.csproj" /nologo
 msbuild "SimpleInjector.Integration.Wcf\SimpleInjector.Integration.Wcf.csproj" /nologo

 msbuild "SimpleInjector.NET.Tests.Unit\SimpleInjector.NET.Tests.Unit.csproj" /nologo
 msbuild "SimpleInjector.Extensions.LifetimeScoping.Tests.Unit\SimpleInjector.Extensions.LifetimeScoping.Tests.Unit.csproj" /nologo
 msbuild "SimpleInjector.Integration.Web.Tests.Unit\SimpleInjector.Integration.Web.Tests.Unit.csproj" /nologo

-ren SimpleInjector.snk fake.snk+ren SimpleInjector.snk fake.snk


Don't use JLine when inside_emacs.

Don't use JLine when inside_emacs.

--- bin/lein.bat
+++ bin/lein.bat
@@ -41,9 +41,10 @@
 if not "x%DEBUG%" == "x" echo CLASSPATH=%CLASSPATH%
 rem ##################################################

-if "x%1" == "xrepl"         goto SET_JLINE
-if "x%1" == "xinteractive"  goto SET_JLINE
-if "x%1" == "xint"          goto SET_JLINE
+if not "x%INSIDE_EMACS%" == "x" goto SKIP_JLINE
+if "x%1" == "xrepl"             goto SET_JLINE
+if "x%1" == "xinteractive"      goto SET_JLINE
+if "x%1" == "xint"              goto SET_JLINE
 goto :SKIP_JLINE

 :SET_JLINE


version hook script udpate path

version hook script udpate path

--- runversionhook.bat
+++ runversionhook.bat
@@ -1,2 +1,2 @@
-"%SYSTEMDRIVE%\Program Files (x86)\Git\bin\bash.exe" --login version.hook.sh
+"%SYSTEMDRIVE%\Program Files\Git\bin\bash.exe" --login version.hook.sh
 pause


build: script updated for new Windows image (#7)

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

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

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


build: update windows configuration to match new vm


updated env script

updated env script

--- scripts/build_windows_set_env.bat
+++ scripts/build_windows_set_env.bat
@@ -4,7 +4,7 @@

 cd ..

-set QTDIR=c:\Qt\5.10.0\msvc2017_64
+set QTDIR=c:\Qt\5.10.1\msvc2017_64
 set PATH=%QTDIR%\bin;%PATH%;
 set PATH=C:\Program Files (x86)\Inno Setup 5;%PATH%;


swarm-client 1.16

swarm-client 1.16

--- scripts/install-jenkins-slave.bat
+++ scripts/install-jenkins-slave.bat
@@ -38,7 +38,7 @@
   if exist c:\vagrant\resources\swarm-client.jar (
     copy c:\vagrant\resources\swarm-client.jar c:\jenkins\swarm-client.jar
   ) else (
-    call wget --no-verbose -O c:\jenkins\swarm-client.jar http://maven.jenkins-ci.org/content/repositories/releases/org/jenkins-ci/plugins/swarm-client/1.15/swarm-client-1.15-jar-with-dependencies.jar
+    call wget --no-verbose -O c:\jenkins\swarm-client.jar http://maven.jenkins-ci.org/content/repositories/releases/org/jenkins-ci/plugins/swarm-client/1.16/swarm-client-1.16-jar-with-dependencies.jar
   )
 )


copy_binaries.cmd changed.

copy_binaries.cmd changed.

--- Examples/copy_binaries.cmd
+++ Examples/copy_binaries.cmd
@@ -3,11 +3,11 @@

 mkdir yc

-xcopy /Y ..\YaccConstructor\Main\bin\Release\*.dll yc
-xcopy /Y ..\YaccConstructor\Main\bin\Release\*.exe yc
-xcopy /Y ..\YaccConstructor\CYK\bin\Release\*.exe yc
-xcopy /Y ..\YaccConstructor\CYK\bin\Release\*.dll yc
-xcopy /Y ..\YaccConstructor\RNGLRCommon\bin\Release\*.dll yc
-xcopy /Y ..\YaccConstructor\RNGLRParser\bin\Release\*.dll yc
-xcopy /Y ..\YaccConstructor\RNGLRGenerator\bin\Release\*.dll yc
+xcopy /Y ..\YaccConstructor\Main\bin\Debug\*.dll yc
+xcopy /Y ..\YaccConstructor\Main\bin\Debug\*.exe yc
+xcopy /Y ..\YaccConstructor\CYK\bin\Debug\*.exe yc
+xcopy /Y ..\YaccConstructor\CYK\bin\Debug\*.dll yc
+xcopy /Y ..\YaccConstructor\RNGLRCommon\bin\Debug\*.dll yc
+xcopy /Y ..\YaccConstructor\RNGLRParser\bin\Debug\*.dll yc
+xcopy /Y ..\YaccConstructor\RNGLRGenerator\bin\Debug\*.dll yc


Buildscript: - Typo fixes; - Better code segmentation; - Major style improvement; - Allow MSVC 2017 toolset build hack. Removed with d62bec5, now is an opt-in.

--- buildscript/build.cmd
+++ buildscript/build.cmd
@@ -11,31 +11,43 @@
 @set vsenv=%ProgramFiles%
 @if NOT "%ProgramW6432%"=="" set vsenv=%vsenv% (x86)
 @set vsenv15=%vsenv%\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars%minabi%.bat
-@if EXIST "%vsenv15%" @set toolchain=Visual Studio 15 2017
-@if NOT EXIST "%vsenv15%" @set toolchain=Visual Studio 14
 @set vsenv14=%VS140COMNTOOLS%..\..\VC\bin\vcvars%minabi%.bat
-@if %abi%==x64 @set toolchain=%toolchain% Win64
 @set gcc=%mesa%mingw-w64-%abi%\mingw%minabi%\bin
 @set vsenvloaded=0
 @set dxtnbuilt=0
-@set /p buildllvm=Begin LLVM build. Only needs to run once for each ABI and version. Proceed y/n?
-@if /I NOT %buildllvm%==y GOTO build_dxtn

 :build_llvm
+@set /p buildllvm=Begin LLVM build. Only needs to run once for each ABI and version. Proceed (y/n):
+@if /I NOT %buildllvm%==y GOTO build_dxtn
+@echo.
 @cd "%mesa%llvm"
 @RD /S /Q %abi%
+@echo.
 @RD /S /Q cmake-%abi%
+@echo.
 @md cmake-%abi%
 @cd cmake-%abi%
-@if EXIST "%vsenv15%" set vsenv=%vsenv15%
-@if NOT EXIST "%vsenv15%" set vsenv=%vsenv14%
-@set vsenvloaded=1
-@call "%vsenv%"
+@if EXIST "%vsenv15%" (
+@set vsenvloaded=%vsenvloaded%15
+@set toolchain=Visual Studio 15 2017
+@call "%vsenv15%"
+)
+@if NOT EXIST "%vsenv15%" (
+@set vsenvloaded=%vsenvloaded%14
+@set toolchain=Visual Studio 14
+@call "%vsenv14%"
+)
+@if %abi%==x64 @set toolchain=%toolchain% Win64
 @set PATH=%mesa%cmake\%abi%\bin\;%PATH%
+@echo.
 @cmake -G "%toolchain%" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_ENABLE_RTTI=1 -DLLVM_USE_CRT_RELEASE=MT -DLLVM_ENABLE_TERMINFO=OFF -DCMAKE_INSTALL_PREFIX=%mesa:\=/%llvm/%abi% ..
+@echo.
 @pause
+@echo.
 @msbuild /p:Configuration=Release INSTALL.vcxproj
+@echo.
 @pause
+@echo.

 :build_dxtn
 @if NOT EXIST "%gcc%" GOTO build_mesa
@@ -44,12 +56,13 @@
 @if /i NOT %builddxtn%==y GOTO build_mesa
 @set PATH=%gcc%\;%PATH%
 @cd "%mesa%dxtn"
+@echo.
 @RD /S /Q %abi%
+@echo.
 @MD %abi%
 @set dxtn=gcc -shared
 @if %abi%==x86 set dxtn=%dxtn% -m32
 @set dxtn=%dxtn% -v *.c *.h -I ..\mesa\include -Wl,--dll,--dynamicbase,--enable-auto-image-base,--nxcompat -o %abi%\dxtn.dll
-@echo.
 @%dxtn%
 @echo.
 @set dxtnbuilt=1
@@ -59,27 +72,21 @@
 @if /i NOT %buildmesa%==y GOTO exit
 @set LLVM=%mesa:\=/%llvm/%abi%
 @cd "%mesa%mesa"
-@RD /S /Q build\windows-%longabi%
 @set /p openswr=Do you want to build OpenSWR drivers? (y=yes):
 @set buildswr=0
 @if /i %openswr%==y @set buildswr=1
+@set mesatoolchain=default
+@echo.
+@GOTO build_with_vs
+
+:build_with_mingw
 @set mingw=n
 @set mingwtest=0
 @if EXIST "%gcc%" @set mingwtest=1
 @set msys2=%mesa%msys64\msys2_shell.cmd
 @if EXIST "%msys2%" @set mingwtest=%mingwtest%2
-@rem if %mingwtest%==12 @set /p mingw=Do you want to build with MinGW-W64 instead of Visual Studio (y=yes):
-@set mesatoolchain=default
-@set restartcond=0
-@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
-@pip install -r requirements.txt --upgrade
-@del requirements.txt
-@if /i NOT %mingw%==y GOTO build_with_vs
-
-:build_with_mingw
-@if %dxtnbuilt%==0 set PATH=%gcc%\;%PATH%
+@if %mingwtest%==12 @set /p mingw=Do you want to build with MinGW-W64 instead of Visual Studio (y=yes):
+@if %dxtnbuilt%==0 @set PATH=%gcc%\;%PATH%
 @set mesatoolchain=crossmingw
 @copy "%gcc%\%altabi%-w64-mingw32-gcc-ar.exe" "%gcc%\%altabi%-w64-mingw32-ar.exe"
 @copy "%gcc%\%altabi%-w64-mingw32-gcc-ranlib.exe" "%gcc%\%altabi%-w64-mingw32-ranlib.exe"
@@ -94,20 +101,37 @@
 pip install -r requirements.txt --upgrade
 cd $mesa
 cd mesa
-@GOTO build_mesa_exec
+

 :build_with_vs
-@if %vsenvloaded%==0 call "%vsenv14%"
-@if %vsenvloaded%==1 @set restartcond=1
-@if EXIST "%vsenv15%" @set restartcond=%restartcond%2
-@if %restartcond%==12 (
-@echo "A Visual Studio build environment is already loaded. The script will now restart to flush loaded environment.
+@RD /S /Q build\windows-%longabi%
+@echo.
+@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
+@pip install -r requirements.txt --upgrade
+@del requirements.txt
+@set restartcond=0
+@set vs2017toolset=n
+@echo.
+@if EXIST "%vsenv15%" set /p vs2017toolset=Do you want to build with Visual Studio 2017 toolset (y/n) - WARNING, this is a hack, it will break if Mesa MSVC build gets support for LLVM 4.0 before Scons gets support for MSVC 2017:
+@if /i %vs2017toolset%==y @set vsenvloaded=%vsenvloaded%15
+@if /i NOT %vs2017toolset%==y @set vsenvloaded=%vsenvloaded%14
+@if %vsenvloaded%==01514 set restartcond=1
+@echo.
+@if %vsenvloaded%==015 call "%vsenv15%"
+@if %vsenvloaded%==014 call "%vsenv14%"
+@if %restartcond%==1 (
+@echo.
+@echo A Visual Studio build environment is already loaded. The script will now restart to flush loaded environment.
 @pause
 @GOTO exit
 )
+@echo.

 :build_mesa_exec
-@python "%mesa%Python\%abi%\Scripts\scons.py" build=release platform=windows machine=%longabi% toolchain=%mesatoolchain% swr=%buildswr% libgl-gdi"
+@python "%mesa%Python\%abi%\Scripts\scons.py" build=release platform=windows machine=%longabi% toolchain=%mesatoolchain% swr=%buildswr% libgl-gdi
+@echo.
 @pause

 :exit


[DEVOPS-10]  Review:  drop a comment

[DEVOPS-10]  Review:  drop a comment

--- scripts/build-installer-win64.bat
+++ scripts/build-installer-win64.bat
@@ -41,9 +41,6 @@
 move   node_modules\daedalus-client-api\cardano-node.exe     installers\
 move   node_modules\daedalus-client-api\cardano-launcher.exe installers\
 del /f node_modules\daedalus-client-api\*.exe
-
-rem @echo Obtaining LibreSSL %LIBRESSL_VERSION%
-rem https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-%LIBRESSL_VERSION%-windows.zip

 @echo Packaging frontend
 call npm run package -- --icon installers/icons/64x64


Fix: Renderer config files were missing from the distro

--- scripts_win32/DistroCreate.bat
+++ scripts_win32/DistroCreate.bat
@@ -5,6 +5,8 @@
 robocopy app/ distro/ *.dll
 robocopy app/ distro/ Intrinsic.exe
 robocopy app/ distro/ IntrinsicEd.exe
+robocopy app/ distro/ renderer_config.json
+robocopy app/ distro/ renderer_config_simple.json
 robocopy app/ distro/ settings.json
 robocopy app/platforms/ distro/platforms /E
 robocopy app/managers/ distro/managers /E


Update 04_RunTests.bat

Update 04_RunTests.bat

--- build/04_RunTests.bat
+++ build/04_RunTests.bat
@@ -1,5 +1,10 @@
-dotnet test "%~dp0/../src\NJsonSchema.Tests\NJsonSchema.Tests.csproj" -c Release
-dotnet test "%~dp0/../src\NJsonSchema.CodeGeneration.Tests\NJsonSchema.CodeGeneration.Tests.csproj" -c Release
-dotnet test "%~dp0/../src\NJsonSchema.CodeGeneration.CSharp.Tests\NJsonSchema.CodeGeneration.CSharp.Tests.csproj" -c Release
-dotnet test "%~dp0/../src\NJsonSchema.CodeGeneration.TypeScript.Tests\NJsonSchema.CodeGeneration.TypeScript.Tests.csproj" -c Release
-dotnet test "%~dp0/../src\NJsonSchema.Yaml.Tests\NJsonSchema.Yaml.Tests.csproj" -c Release
+dotnet test "%~dp0/../src\NJsonSchema.Tests\NJsonSchema.Tests.csproj" -c Release || goto :error
+dotnet test "%~dp0/../src\NJsonSchema.CodeGeneration.Tests\NJsonSchema.CodeGeneration.Tests.csproj" -c Release || goto :error
+dotnet test "%~dp0/../src\NJsonSchema.CodeGeneration.CSharp.Tests\NJsonSchema.CodeGeneration.CSharp.Tests.csproj" -c Release || goto :error
+dotnet test "%~dp0/../src\NJsonSchema.CodeGeneration.TypeScript.Tests\NJsonSchema.CodeGeneration.TypeScript.Tests.csproj" -c Release || goto :error
+dotnet test "%~dp0/../src\NJsonSchema.Yaml.Tests\NJsonSchema.Yaml.Tests.csproj" -c Release || goto :error
+
+goto :EOF
+:error
+echo Failed with error #%errorlevel%.
+exit /b %errorlevel%


double quote added to avois pbs when JDK is in Program Files

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

--- compile/build.bat
+++ compile/build.bat
@@ -6,7 +6,7 @@
 SETLOCAL
 set CLASSPATH=%JAVA_HOME%\lib\tools.jar;ant.jar;ant-launcher.jar;xercesImpl.jar;xml-apis.jar;doclet.jar;%CLASSPATH%
 echo %CLASSPATH%
-%JAVA_HOME%\bin\java org.apache.tools.ant.Main -buildfile proactive.xml %1 %2 %3 %4 %5
+"%JAVA_HOME%\bin\java" org.apache.tools.ant.Main -buildfile proactive.xml %1 %2 %3 %4 %5
 ENDLOCAL
 goto end


Trigger

Trigger

--- CleanUp.bat
+++ CleanUp.bat
@@ -4,4 +4,4 @@
 FOR /d /r . %%d IN (bin,obj) DO @IF EXIST "%%d" RD /s/q "%%d"

 ECHO Done
-PAUSE+PAUSE


Update blynk-ser.bat

Update blynk-ser.bat

Fix #75

--- scripts/blynk-ser.bat
+++ scripts/blynk-ser.bat
@@ -28,9 +28,12 @@
 set PORTS=!PORTS:~1!

 rem Check port
-if "x!PORTS:%COMM_PORT%=!"=="x%PORTS%" (
-    echo %COMM_PORT% not found, or may be busy.
-    set /p COMM_PORT="Select serial port [ %PORTS% ]: "
+rem Skip check if no ports at all - Windows bug?
+if not "x%PORTS%"=="x~1" (
+    if "x!PORTS:%COMM_PORT%=!"=="x%PORTS%" (
+        echo %COMM_PORT% not found, or may be busy.
+        set /p COMM_PORT="Select serial port [ %PORTS% ]: "
+    )
 )

 rem Create exe


Started new folder for Mixed Reality samples and added an updated version of MakeLinks.bat

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

--- MixedReality/MakeLinks.bat
+++ MixedReality/MakeLinks.bat
@@ -0,0 +1,67 @@
+@ECHO OFF
+
+ECHO.
+ECHO ===============================================================================
+ECHO =                                 Make Links                                  =
+ECHO ===============================================================================
+ECHO.
+ECHO This batch file creates symbolic links for the MRTK and other Unity
+ECHO source-based libraries that are used by this project. The process for sharing
+ECHO MRTK across projects is documented here:
+ECHO.
+ECHO http://www.wikiholo.net/index.php?title=Sharing_HoloToolkit
+ECHO.
+ECHO The libraries used by this project are:
+ECHO.
+ECHO * Mixed Reality Toolkit (MRTK) for Unity
+ECHO.
+ECHO All libraries should be downloaded and extracted before running this batch file.
+ECHO If you continue you will be prompted for the full path of each of the above
+ECHO libraries.
+ECHO.
+ECHO Are you ready to continue?
+ECHO.
+CHOICE /C:YN
+IF ERRORLEVEL == 2 GOTO End
+
+
+:MRTK
+
+SET /p MRTKSource=MRTK for Unity Path?
+IF NOT EXIST "%MRTKSource%\Assets\mcs.rsp" (
+ECHO.
+ECHO MRTK for Unity not found at %MRTKSource%
+ECHO.
+GOTO MRTK
+)
+ECHO MRTK for Unity FOUND
+ECHO.
+
+
+ECHO.
+ECHO ===============================================================================
+ECHO =                            Copying MRTK RSPs                                =
+ECHO ===============================================================================
+ECHO.
+XCOPY /Y /Q "%MRTKSource%\Assets\*.rsp" "Unity\MRTKLearn\Assets"
+ECHO.
+
+ECHO.
+ECHO ===============================================================================
+ECHO =                               Linking MRTK                                  =
+ECHO ===============================================================================
+ECHO.
+mklink /J "Unity\MRTKLearn\Assets\HoloToolkit" "%MRTKSource%\Assets\HoloToolkit"
+ECHO.
+
+ECHO.
+ECHO ===============================================================================
+ECHO =                          Linking MRTK Examples                              =
+ECHO ===============================================================================
+ECHO.
+mklink /J "Unity\MRTKLearn\Assets\HoloToolkit-Examples" "%MRTKSource%\Assets\HoloToolkit-Examples"
+ECHO.
+
+PAUSE
+
+:End


Vss2Git

--- src/DataCollector/CollectData.bat
+++ src/DataCollector/CollectData.bat
@@ -1 +1,2 @@
-start DataCollector26.exe /config:DataCollectorSettings.xml /showmonitor /posn:0,0 /startAt:Sun22:00 /endAt:Fri22:00 /exitAt:Fri22:05+start DataCollector26.exe /config:"US Futures" /log:log.log /showmonitor /posn:0,0 /startAt:Sun22:00 /endAt:Fri22:00 /exitAt:Fri22:05 /loglevel:N /quantum:50
+rem start DataCollector26.exe /config:"Collect to files" /log:log.log /showmonitor /posn:0,0 /startAt:Sun22:00 /endAt:Fri22:00 /exitAt:Fri22:05 /loglevel:D /quantum:50


Actually fixing the .bat file. (#2264)

Actually fixing the .bat file. (#2264)

need to go twice up directory

--- Tools/Easy-Setup/setup.bat
+++ Tools/Easy-Setup/setup.bat
@@ -35,13 +35,13 @@
 popd

 "%PATH2%\python" get-pip.py
-cd ..
+cd ..\..
 "%PATH2%\Scripts\pip" install -r requirements.txt
 "%PATH2%\Scripts\pip" install -r requirements.txt --upgrade

-REM cd config
-REM set /p API= Enter your Google API key here:
-REM "%PATH2%\python" -c "print open('config.ini.example').read().replace('#gmaps-key:','gmaps-key:%API%')" > config.ini
+cd config
+set /p API= Enter your Google API key here:
+"%PATH2%\python" -c "print open('config.ini.example').read().replace('#gmaps-key:','gmaps-key:%API%')" > config.ini

 echo All done!
 pause


echo on

echo on

--- src/RNGLRParser.SimpleTest/gen.cmd
+++ src/RNGLRParser.SimpleTest/gen.cmd
@@ -1,4 +1,3 @@
-@echo off

 del log.txt


Updated `package.cmd` to allow explicit setting of `Configuration`.

--- package.cmd
+++ package.cmd
@@ -15,6 +15,7 @@

 :: Prompt for product version
 :: --------------------------------------------------
+set /p Configuration=Configuration: %=%
 set /p MajorVersion=Major Version: %=%
 set /p MinorVersion=Minor Version: %=%
 set /p RevisionNumber=Revision Number: %=%
@@ -22,7 +23,7 @@
 :: Run MSBuild
 :: --------------------------------------------------
 cd src
-%SYSTEMROOT%\Microsoft.NET\Framework\v4.0.30319\msbuild build.proj /target:Package /property:Configuration=Release /property:MajorVersion=%MajorVersion% /property:MinorVersion=%MinorVersion% /property:RevisionNumber=%RevisionNumber% /property:Commit=%Commit%
+%SYSTEMROOT%\Microsoft.NET\Framework\v4.0.30319\msbuild build.proj /target:Package /property:Configuration=%Configuration% /property:MajorVersion=%MajorVersion% /property:MinorVersion=%MinorVersion% /property:RevisionNumber=%RevisionNumber% /property:Commit=%Commit%
 if errorlevel 1 pause
 cd..


Update runMainReadFromFileCoordinates.bat

Minor changes. Remove unneeded "\", "." and ";" characters.

--- runMainReadFromFileCoordinates.bat
+++ runMainReadFromFileCoordinates.bat
@@ -1,4 +1,4 @@
 :: This file is for Windows only.

-java -cp .\bin;.\lib\graph.jar;.\lib\gral-core-0.11.jar tsp_plot.MainReadFromFileCoordinates
-pause;
+java -cp bin;lib\graph.jar;lib\gral-core-0.11.jar tsp_plot.MainReadFromFileCoordinates
+pause


Updated default values for running all persistence acceptance tests.

--- acceptance-persistence.cmd
+++ acceptance-persistence.cmd
@@ -8,17 +8,17 @@
 CALL :run_test InMemoryPersistence

 ECHO === RDBMS ===
-CALL :run_test MsSqlPersistence localhost 0 EventStore2 "" ""
-CALL :run_test SqlitePersistence localhost 0 EventStore2 "" ""
-CALL :run_test SqlCePersistence localhost 0 EventStore2 "" ""
-CALL :run_test AccessPersistence localhost 0 EventStore2 "" ""
-CALL :run_test MySqlPersistence localhost 0 EventStore2 "" ""
-CALL :run_test PostgreSqlPersistence localhost 0 EventStore2 "" ""
-CALL :run_test FirebirdPersistence localhost 0 /var/lib/firebird/data/EventStore2.fb SYSDBA masterkey
+CALL :run_test MsSqlPersistence localhost 0 EventStore "" ""
+CALL :run_test SqlitePersistence localhost 0 EventStore "" ""
+CALL :run_test SqlCePersistence localhost 0 EventStore "" ""
+CALL :run_test AccessPersistence localhost 0 EventStore "" ""
+CALL :run_test MySqlPersistence localhost 0 EventStore "" ""
+CALL :run_test PostgreSqlPersistence localhost 0 EventStore "" ""
+CALL :run_test FirebirdPersistence localhost 3050 EventStore SYSDBA masterkey

 ECHO === Document DBs ===
-CALL :run_test MongoPersistence localhost 0 EventStore2 "" ""
-CALL :run_test RavenPersistence localhost 0 EventStore2 "" ""
+CALL :run_test MongoPersistence localhost 0 EventStore "" ""
+CALL :run_test RavenPersistence localhost 0 EventStore "" ""

 ENDLOCAL
 GOTO :eof


add test helper

add test helper

error: pathspec 'benchmarks/rails/substruct/test.bat' did not match any file(s) known to git

--- benchmarks/rails/substruct/test.bat
+++ benchmarks/rails/substruct/test.bat
@@ -0,0 +1 @@
+rake test:plugins:all PLUGIN=substruct


Add jenkins script for windows

Add jenkins script for windows

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

--- build_tools/jenkins_win32_build.bat
+++ build_tools/jenkins_win32_build.bat
@@ -0,0 +1,24 @@
+cd %WORKSPACE%
+set PYTHON=c:\python26\python
+set EASY_INSTALL=c:\python26\scripts\easy_install.exe
+set NEXUSDIR="C:\Program Files (x86)\NeXus Data Format\"
+set PATH=c:\python26;c:\mingw\bin;%PATH%
+
+echo %SVN_REVISION%> svn_revision.txt
+
+%PYTHON% check_packages.py
+
+set PYTHONPATH=%WORKSPACE%\sansview-install;%PYTHONPATH%
+
+RD /S /Q sansview-install
+MD sansview-install
+RD /S /Q dist
+RD /S /Q build
+
+%PYTHON% setup.py build -cmingw32
+%PYTHON% setup.py bdist_egg --skip-build
+cd dist
+%EASY_INSTALL% -d ..\sansview-install sasview*.egg
+
+cd %WORKSPACE%\test
+%PYTHON% utest_sansview.py


buildscripts/1.2.x/mumble-win32.cmd: use MumbleNoMergeModule instead of MumbleNoMergeModuleDir.

The installer as always used "MumbleNoMergeNodule".

Without this change, the resulting installer will include both:

 - Individual MSVCRT DLLs
 - Merge modules for the MSVCRT DLLs

Merge modules are problematic, because they often cause "files in use"
warnings from the Windows Installer.

With this change in place, we simply bundle the MSVCRT DLLs,
and forego the merge modules, just as initially intended.

--- buildscripts/1.2.x/mumble-win32.cmd
+++ buildscripts/1.2.x/mumble-win32.cmd
@@ -52,7 +52,7 @@
 )

 echo Build installer
-SET MumbleNoMergeModuleDir=1
+SET MumbleNoMergeModule=1
 SET MumbleDebugToolsDir=C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE
 SET MumbleSourceDir=%cd%
 SET MumbleQtDir=%MUMBLE_PREFIX%\Qt4.8


5.4.0-alpha-014

--- pack.bat
+++ pack.bat
@@ -5,5 +5,5 @@
   && dotnet build src\Remote.Linq.Newtonsoft.Json ^
   && dotnet build test\Remote.Linq.Tests ^
   && dotnet test test\Remote.Linq.Tests\Remote.Linq.Tests.csproj ^
-  && dotnet pack src\Remote.Linq --output "..\..\artifacts" --configuration Debug --include-symbols --version-suffix 013 ^
-  && dotnet pack src\Remote.Linq.Newtonsoft.Json --output "..\..\artifacts" --configuration Debug --include-symbols --version-suffix 013+  && dotnet pack src\Remote.Linq --output "..\..\artifacts" --configuration Debug --include-symbols --version-suffix 014 ^
+  && dotnet pack src\Remote.Linq.Newtonsoft.Json --output "..\..\artifacts" --configuration Debug --include-symbols --version-suffix 014


5.4.0-alpha-019

--- pack.bat
+++ pack.bat
@@ -5,5 +5,5 @@
   && dotnet build src\Remote.Linq.Newtonsoft.Json ^
   && dotnet build test\Remote.Linq.Tests ^
   && dotnet test test\Remote.Linq.Tests\Remote.Linq.Tests.csproj ^
-  && dotnet pack src\Remote.Linq --output "..\..\artifacts" --configuration Debug --include-symbols --version-suffix 018 ^
-  && dotnet pack src\Remote.Linq.Newtonsoft.Json --output "..\..\artifacts" --configuration Debug --include-symbols --version-suffix 018+  && dotnet pack src\Remote.Linq --output "..\..\artifacts" --configuration Debug --include-symbols --version-suffix 019 ^
+  && dotnet pack src\Remote.Linq.Newtonsoft.Json --output "..\..\artifacts" --configuration Debug --include-symbols --version-suffix 019


pack.bat formatting

pack.bat formatting

--- pack.bat
+++ pack.bat
@@ -31,7 +31,7 @@
 xcopy licenses\*.*                                    %LICENS_PATH%

 ::ReleaseNotes
-xcopy release_notes.txt       					      %TARGET_PATH%
+xcopy release_notes.txt                               %TARGET_PATH%

 ::Qt
 xcopy bin\x64\Release\Qt5Core.dll                     %TARGET_PATH%


quick&dirty nuget pack script

quick&dirty nuget pack script

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

--- pack.bat
+++ pack.bat
@@ -0,0 +1,7 @@
+cd StaTypPocoQueries.Core
+dotnet pack StaTypPocoQueries.Core.fsproj -c Release
+cd ..
+
+cd StaTypPocoQueries.AsyncPoco
+dotnet pack StaTypPocoQueries.AsyncPoco.csproj -c Release
+cd ..


update to get correct username

update to get correct username

--- bin/_mb.bat
+++ bin/_mb.bat
@@ -29,7 +29,7 @@
 if "%PYBLISH_LITE%"=="" goto :missing
 if "%PYBLISH_QML%"=="" goto :missing
 if "%MINDBENDER_CORE%"=="" goto :missing
-:: if "%PYBLISH_USERNAME%"=="" goto :missing
+if "%PYBLISH_USERNAME%"=="" goto :missing

 :: Clear environment.
 ::
@@ -110,6 +110,6 @@
 	if "%PYBLISH_LITE%"=="" echo   - %%PYBLISH_LITE%%
 	if "%PYBLISH_QML%"=="" echo   - %%PYBLISH_QML%%
 	if "%MINDBENDER_CORE%"=="" echo   - %%MINDBENDER_CORE%%
-::	if "%PYBLISH_USERNAME%"=="" echo   - %%PYBLISH_USERNAME%%
+	if "%PYBLISH_USERNAME%"=="" echo   - %%PYBLISH_USERNAME%%

 	exit /b


Add project generation script.

Add project generation script.

Change-Id: I9f02d3d22150a0db67c13a77444f4e459791771a

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

--- tools/generate_msvc_projects.bat
+++ tools/generate_msvc_projects.bat
@@ -0,0 +1,140 @@
+@echo off
+setlocal
+
+REM Copyright (c) 2013 The WebM project authors. All Rights Reserved.
+REM
+REM Use of this source code is governed by a BSD-style license
+REM that can be found in the LICENSE file in the root of the source
+REM tree. An additional intellectual property rights grant can be found
+REM in the file PATENTS.  All contributing project authors may
+REM be found in the AUTHORS file in the root of the source tree.
+
+REM Generates webmlive MSVC projects. Note that GYP uses settings in the
+REM environment to control project file generation, and that they're going
+REM to be overridden here to force output of projects and solutions for
+REM multiple versions of MSVC.
+
+REM Make sure we are in the right place.
+IF NOT %~0==tools\generate_msvc_projects.bat (
+  echo This script must be run from your webmlive root.
+  REM Windows helpfully defines error code 10: ERROR_BAD_ENVIRONMENT
+  exit /B 10
+)
+
+REM Make sure GYP is defined, and that it points at a file that exists.
+IF NOT DEFINED GYP (
+  CALL :die "GYP environment variable not defined"
+)
+IF NOT EXIST %GYP% (
+  CALL :die "%GYP% does not exist"
+)
+
+
+set PERL=perl.exe
+REM Make sure perl.exe is in PATH and exists, since it's required.
+for %%X in (%PERL%) do (set PERL_FOUND=%%~$PATH:X)
+if NOT defined PERL_FOUND (
+  CALL :die "%PERL% must be in your PATH"
+)
+
+set original_dir=%cd%
+set dshow_name="direct_show_base_classes"
+set encoder_name="client_encoder"
+
+REM Make sure only MSVC projects are generated-- not supporting ninja
+REM in webmlive, for example.
+set GYP_GENERATORS=msvs
+
+REM Remove existing files
+del client_encoder\*.vcproj
+del client_encoder\*.vcxproj
+del client_encoder\*.vcxproj.filters
+del client_encoder\*.sln
+del client_encoder\win\*.vcproj
+del client_encoder\win\*.vcxproj
+del client_encoder\win\*.vcxproj.filters
+del client_encoder\win\*.sln
+
+REM TODO(tomfinegan): Move duped code into a function(s).
+
+REM
+REM Generate the MSVC 2008 projects and solutions.
+REM
+set GYP_MSVS_VERSION=2008
+chdir client_encoder
+
+REM Generate the projects and solutions.
+CALL %GYP%
+
+REM Rename the client_encoder files.
+CALL :RenameMSVCFiles %encoder_name% 2008 vcproj
+CALL :RenameMSVCFiles %encoder_name% 2008 sln
+
+REM Correct project file names in the client_encoder solution file.
+%PERL% -pi.orig -e "s/.vcproj/_2008.vcproj/g" %renamed_file%
+REM A backup file is stored because in place edits seem to trigger
+REM permissions issues on Win 7. Delete it.
+del %renamed_file%.orig
+
+REM Do the same for the direct_show_base_classes standalone solution.
+chdir win
+CALL :RenameMSVCFiles %dshow_name% 2008 vcproj
+CALL :RenameMSVCFiles %dshow_name% 2008 sln
+%PERL% -pi.orig -e "s/.vcproj/_2008.vcproj/g" %renamed_file%
+del %renamed_file%.orig
+
+REM
+REM Generate the MSVC 2010 project and solutions.
+REM
+set GYP_MSVS_VERSION=2010
+chdir %original_dir%\client_encoder
+
+REM Generate the projects and solutions.
+CALL %GYP%
+
+REM Rename the client_encoder files, and patch references to the vcxproj.
+CALL :RenameMSVCFiles %encoder_name% 2010 vcxproj
+%PERL% -pi.orig -e "s/.vcxproj/_2010.vcxproj/g" %renamed_file%
+del %renamed_file%.orig
+CALL :RenameMSVCFiles %encoder_name% 2010 sln
+%PERL% -pi.orig -e "s/.vcxproj/_2010.vcxproj/g" %renamed_file%
+del %renamed_file%.orig
+
+REM Do the same for the direct_show_base_classes standalone solution.
+chdir win
+CALL :RenameMSVCFiles %dshow_name% 2010 vcxproj
+CALL :RenameMSVCFiles %dshow_name% 2010 sln
+%PERL% -pi.orig -e "s/.vcxproj/_2010.vcxproj/g" %renamed_file%
+del %renamed_file%.orig
+
+chdir %original_dir%
+echo Done.
+goto :EOF
+
+REM Utility function used to rename project and solution files so that
+REM their names contain the year of the MSVC release they are intended
+REM for use within.
+:RenameMSVCFiles
+  set name=%~1
+  set year=%~2
+  set ext=%~3
+  set original=%name%.%ext%
+  set renamed=%name%_%year%.%ext%
+  rename %original% %renamed%
+  endlocal & set renamed_file=%renamed%
+  IF NOT EXIST %renamed_file% (
+    CALL :die "%renamed_file% does not exist"
+  )
+goto :EOF
+
+:die
+  set message=%~1
+  IF NOT ""=="%message%" (
+    echo ERROR: %message%, giving up.
+  ) ELSE (
+    echo ERROR: unspecified error, giving up.
+  )
+  endlocal
+  echo Ignore the syntax error: it's how this script kills itself.
+  () creates syntax error, and terminates script.
+goto :EOF


run_reinstall.bat: (template) batch file for reinstalling Tundra. Run silent uninstallation for possible existing Tundra installation (in Program Files), fetches new installer from networked, and runs the installer.

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

--- tools/installers/run_reinstall.bat
+++ tools/installers/run_reinstall.bat
@@ -0,0 +1,31 @@
+@echo off
+echo WARNING: This batch file performs unconfirmable uninstallation of possible existing Tundra 2 installation.
+echo Close the window if you wish to abort.
+pause
+chcp 1252
+SET ORIG_PATH=%CD%
+SET TUNDRA_PATH=""
+IF EXIST "C:\Program Files (x86)\Tundra 2.0\Tundra.exe" GOTO ProgFilesx86
+IF EXIST "C:\Program Files\Tundra 2.0\Tundra.exe" GOTO ProgFiles
+echo Previous Tundra installation not found from Program Files. Skipping uninstallation phase.
+GOTO Install
+
+:ProgFilesx86
+set TUNDRA_PATH="C:\Program Files (x86)\Tundra 2.0"
+GOTO Uninstall
+
+:ProgFiles
+set TUNDRA_PATH="C:\Program Files\Tundra 2.0"
+GOTO Uninstall
+
+:Uninstall
+echo Unistalling previous Tundra installation...
+%TUNDRA_PATH%\uninstaller.exe /S
+GOTO Install
+
+:Install
+pushd \\ServerAddress\TundraInstallerFolder\
+copy realXtend-Tundra-2.0.exe %ORIG_PATH%
+popd
+realXtend-Tundra-2.0.exe
+del realXtend-Tundra-2.0.exe


Fix problem deleting files

Fix problem deleting files

--- pkg/windows/build_pkg.bat
+++ pkg/windows/build_pkg.bat
@@ -94,389 +94,383 @@
 If Exist "%BinDir%\README.txt" del /Q "%BinDir%\README.txt" 1>nul

 :: Delete Non-Windows Modules
-If Exist "%BinDir%\Lib\site-packages\salt\modules\acme.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\acme.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\acme.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\alternatives.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\alternatives.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\alternatives.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\apf.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\apf.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\apf.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\aptpkg.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\aptpkg.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\aptpkg.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\at.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\at.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\at.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\bcache.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\bcache.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\bcache.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\blockdev.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\blockdev.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\blockdev.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\bluez.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\bluez.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\bluez.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\bridge.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\bridge.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\bridge.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\bsd_shadow.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\bsd_shadow.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\bsd_shadow.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\btrfs.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\btrfs.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\btrfs.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\ceph.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\ceph.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\ceph.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\container_resource.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\container_resource.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\container_resource.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\cron.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\cron.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\cron.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\csf.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\csf.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\csf.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\daemontools.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\daemontools.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\daemontools.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\deb*" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\deb*"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\deb*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\devmap.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\devmap.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\devmap.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\dpkg.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\dpkg.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\dpkg.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\ebuild.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\ebuild.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\ebuild.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\eix.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\eix.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\eix.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\eselect.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\eselect.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\eselect.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\ethtool.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\ethtool.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\ethtool.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\extfs.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\extfs.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\extfs.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\firewalld.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\firewalld.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\firewalld.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\freebsd*" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\freebsd*"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\freebsd*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\genesis.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\genesis.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\genesis.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\gentoo*" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\gentoo*"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\gentoo*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\glusterfs.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\glusterfs.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\glusterfs.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\gnomedesktop.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\gnomedesktop.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\gnomedesktop.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\groupadd.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\groupadd.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\groupadd.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\grub_legacy.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\grub_legacy.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\grub_legacy.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\guestfs.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\guestfs.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\guestfs.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\htpasswd.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\htpasswd.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\htpasswd.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\ilo.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\ilo.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\ilo.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\img.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\img.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\img.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\incron.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\incron.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\incron.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\inspector.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\inspector.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\inspector.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\ipset.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\ipset.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\ipset.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\iptables.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\iptables.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\iptables.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\iwtools.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\iwtools.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\iwtools.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\k8s.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\k8s.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\k8s.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\kapacitor.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\kapacitor.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\kapacitor.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\keyboard.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\keyboard.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\keyboard.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\keystone.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\keystone.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\keystone.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\kmod.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\kmod.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\kmod.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\layman.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\layman.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\layman.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\linux*" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\linux*"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\linux*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\localemod.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\localemod.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\localemod.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\locate.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\locate.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\locate.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\logadm.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\logadm.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\logadm.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\logrotate.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\logrotate.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\logrotate.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\lvs.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\lvs.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\lvs.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\lxc.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\lxc.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\lxc.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\mac*" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\mac*"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\mac*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\makeconf.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\makeconf.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\makeconf.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\mdadm.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\mdadm.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\mdadm.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\mdata.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\mdata.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\mdata.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\monit.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\monit.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\monit.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\moosefs.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\moosefs.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\moosefs.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\mount.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\mount.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\mount.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\napalm*" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\napalm*"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\napalm*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\netbsd*" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\netbsd*"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\netbsd*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\netscaler.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\netscaler.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\netscaler.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\network.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\network.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\network.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\neutron.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\neutron.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\neutron.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\nfs3.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\nfs3.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\nfs3.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\nftables.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\nftables.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\nftables.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\nova.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\nova.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\nova.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\nspawn.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\nspawn.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\nspawn.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\openbsd*" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\openbsd*"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\openbsd*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\openstack_mng.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\openstack_mng.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\openstack_mng.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\openvswitch.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\openvswitch.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\openvswitch.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\opkg.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\opkg.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\opkg.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\pacman.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\pacman.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\pacman.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\parallels.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\parallels.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\parallels.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\parted.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\parted.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\parted.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\pcs.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\pcs.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\pcs.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\pkgin.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\pkgin.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\pkgin.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\pkgng.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\pkgng.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\pkgng.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\pkgutil.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\pkgutil.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\pkgutil.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\portage_config.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\portage_config.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\portage_config.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\postfix.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\postfix.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\postfix.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\poudriere.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\poudriere.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\poudriere.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\powerpath.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\powerpath.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\powerpath.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\pw_*" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\pw_*"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\pw_*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\qemu_ndb.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\qemu_ndb.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\qemu_ndb.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\quota.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\quota.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\quota.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\redismod.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\redismod.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\redismod.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\restartcheck.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\restartcheck.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\restartcheck.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\rh_*" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\rh_*"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\rh_*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\riak.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\riak.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\riak.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\rpm*" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\rpm*"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\rpm*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\runit.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\runit.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\runit.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\s6.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\s6.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\s6.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\scsi.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\scsi.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\scsi.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\seed.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\seed.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\seed.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\selinux.py" ^
-    del /Q "%BinDir%\Lib\site-packages\salt\modules\selinux.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\sensors.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\sensors.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\sensors.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\service.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\service.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\service.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\shadow.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\shadow.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\shadow.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\smartos*" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\smartos*"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\smartos*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\smbios.py" ^
-    del /Q "%BinDir%\Lib\site-packages\salt\modules\smbios.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\smf.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\smf.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\smf.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\snapper.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\snapper.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\snapper.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\solaris*" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\solaris*"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\solaris*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\solr.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\solr.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\solr.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\ssh*" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\ssh*"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\ssh*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\supervisord.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\supervisord.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\supervisord.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\sysbench.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\sysbench.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\sysbench.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\sysfs.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\sysfs.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\sysfs.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\sysrc.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\sysrc.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\sysrc.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\system.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\system.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\system.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\test_virtual.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\test_virtual.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\test_virtual.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\timezone.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\timezone.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\timezone.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\trafficserver.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\trafficserver.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\trafficserver.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\tuned.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\tuned.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\tuned.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\udev.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\udev.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\udev.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\upstart.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\upstart.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\upstart.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\useradd.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\useradd.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\useradd.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\uswgi.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\uswgi.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\uswgi.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\varnish.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\varnish.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\varnish.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\vbox_guest.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\vbox_guest.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\vbox_guest.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\vboxmanage.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\vboxmanage.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\vboxmanage.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\virt.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\virt.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\virt.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\xapi.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\xapi.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\xapi.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\xbpspkg.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\xbpspkg.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\xbpspkg.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\xfs.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\xfs.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\xfs.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\yumpkg.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\yumpkg.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\yum.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\zabbix.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\zabbix.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\zabbix.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\zfs.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\zfs.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\zfs.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\znc.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\znc.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\znc.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\zpool.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\zpool.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\zpool.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\zypper.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\modules\zypper.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\zypper.*" 1>nul

 :: Delete Non-Windows States
-If Exist "%BinDir%\Lib\site-packages\salt\states\acme.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\states\acme.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\states\acme.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\states\alternatives.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\states\alternatives.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\states\alternatives.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\states\aptpkg.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\states\aptpkg.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\states\aptpkg.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\states\at.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\states\at.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\states\at.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\states\blockdev.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\states\blockdev.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\states\blockdev.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\states\ceph.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\states\ceph.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\states\ceph.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\states\cron.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\states\cron.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\states\cron.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\states\csf.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\states\csf.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\states\csf.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\states\debconfmod.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\states\debconfmod.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\states\debconfmod.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\states\eselect.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\states\eselect.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\states\eselect.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\states\ethtool.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\states\ethtool.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\states\ethtool.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\states\firewalld.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\states\firewalld.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\states\firewalld.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\states\glusterfs.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\states\glusterfs.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\states\glusterfs.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\states\gnomedesktop.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\states\gnomedesktop.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\states\gnomedesktop.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\states\htpasswd.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\states\htpasswd.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\states\htpasswd.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\states\incron.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\states\incron.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\states\incron.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\states\ipset.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\states\ipset.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\states\ipset.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\states\iptables.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\states\iptables.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\states\iptables.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\states\k8s.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\states\k8s.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\states\k8s.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\states\kapacitor.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\states\kapacitor.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\states\kapacitor.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\states\keyboard.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\states\keyboard.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\states\keyboard.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\states\keystone.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\states\keystone.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\states\keystone.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\states\kmod.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\states\kmod.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\states\kmod.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\states\layman.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\states\layman.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\states\layman.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\states\linux*" ^
+If Exist "%BinDir%\Lib\site-packages\salt\states\linux*"^
     del /Q "%BinDir%\Lib\site-packages\salt\states\linux*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\states\lxc.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\states\lxc.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\states\lxc.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\states\mac_*" ^
+If Exist "%BinDir%\Lib\site-packages\salt\states\mac_*"^
     del /Q "%BinDir%\Lib\site-packages\salt\states\mac_*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\states\makeconf.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\states\makeconf.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\states\makeconf.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\states\mdadm.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\states\mdadm.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\states\mdadm.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\states\monit.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\states\monit.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\states\monit.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\states\mount.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\states\mount.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\states\mount.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\states\nftables.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\states\nftables.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\states\nftables.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\states\pcs.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\states\pcs.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\states\pcs.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\states\pkgng.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\states\pkgng.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\states\pkgng.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\states\portage_config.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\states\portage_config.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\states\portage_config.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\states\powerpath.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\states\powerpath.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\states\powerpath.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\states\quota.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\states\quota.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\states\quota.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\states\redismod.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\states\redismod.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\states\redismod.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\states\selinux.py" ^
-    del /Q "%BinDir%\Lib\site-packages\salt\states\selinux.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\states\smartos.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\states\smartos.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\states\smartos.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\states\snapper.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\states\snapper.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\states\snapper.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\states\ssh*" ^
+If Exist "%BinDir%\Lib\site-packages\salt\states\ssh*"^
     del /Q "%BinDir%\Lib\site-packages\salt\states\ssh*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\states\supervisord.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\states\supervisord.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\states\supervisord.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\states\sysrc.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\states\sysrc.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\states\sysrc.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\states\trafficserver.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\states\trafficserver.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\states\trafficserver.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\states\tuned.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\states\tuned.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\states\tuned.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\states\vbox_guest.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\states\vbox_guest.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\states\vbox_guest.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\states\virt.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\states\virt.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\states\virt.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\states\zabbix*" ^
+If Exist "%BinDir%\Lib\site-packages\salt\states\zabbix*"^
     del /Q "%BinDir%\Lib\site-packages\salt\states\zabbix*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\states\zfs.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\states\zfs.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\states\zfs.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\states\zpool.py" ^
+If Exist "%BinDir%\Lib\site-packages\salt\states\zpool.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\states\zpool.*" 1>nul

-# Remove Unneeded Components
-If Exist "%BinDir%\Lib\site-packages\salt\cloud" ^
+:: Remove Unneeded Components
+If Exist "%BinDir%\Lib\site-packages\salt\cloud"^
     rd /S /Q "%BinDir%\Lib\site-packages\salt\cloud" 1>nul
-If Exist "%BinDir%\Scripts\salt-key*" ^
+If Exist "%BinDir%\Scripts\salt-key*"^
     del /Q "%BinDir%\Scripts\salt-key*" 1>nul
-If Exist "%BinDir%\Scripts\salt-master*" ^
+If Exist "%BinDir%\Scripts\salt-master*"^
     del /Q "%BinDir%\Scripts\salt-master*" 1>nul
-If Exist "%BinDir%\Scripts\salt-run*" ^
+If Exist "%BinDir%\Scripts\salt-run*"^
     del /Q "%BinDir%\Scripts\salt-run*" 1>nul
-If Exist "%BinDir%\Scripts\salt-unity*" ^
+If Exist "%BinDir%\Scripts\salt-unity*"^
     del /Q "%BinDir%\Scripts\salt-unity*" 1>nul

 @echo.


*** empty log message ***

*** empty log message ***

--- src/make_uname.bat
+++ src/make_uname.bat
@@ -6,8 +6,6 @@
 call tecmake %1 "MF=im_jp2" %2 %3 %4 %5 %6 %7 %8
 call tecmake %1 "MF=im_avi" %2 %3 %4 %5 %6 %7 %8
 call tecmake %1 "MF=im_fftw" %2 %3 %4 %5 %6 %7 %8
-
-REM call tecmake %1 "MF=imlua3" %2 %3 %4 %5 %6 %7 %8

 call tecmake %1 "MF=imlua5" %2 %3 %4 %5 %6 %7 %8
 call tecmake %1 "MF=imlua_process5" %2 %3 %4 %5 %6 %7 %8
@@ -21,3 +19,11 @@
 call tecmake %1 "MF=im_capture" %2 %3 %4 %5 %6 %7 %8
 call tecmake %1 "MF=imlua_wmv" %2 %3 %4 %5 %6 %7 %8
 call tecmake %1 "MF=imlua_capture5" %2 %3 %4 %5 %6 %7 %8
+
+if defined TECGRAF_INTERNAL goto tec_internal
+goto end
+
+:tec_internal
+call tecmake %1 "MF=imlua3" %2 %3 %4 %5 %6 %7 %8
+
+:end


Add EOF in collate.bat

Add EOF in collate.bat

--- collate.bat
+++ collate.bat
@@ -2,4 +2,4 @@

 java -jar Collate-TUI.jar collate from src/test to collated/test include java

-java -jar Collate-TUI.jar collate from unused to collated/unused include java, fxml, css+java -jar Collate-TUI.jar collate from unused to collated/unused include java, fxml, css


fix compiler name

fix compiler name

--- recipes/chargemol/bld.bat
+++ recipes/chargemol/bld.bat
@@ -4,7 +4,7 @@
 CD chargemol_FORTRAN_09_26_2017
 CD sourcecode_windows_command_line

-%FC% %FFLAGS% -fopenmp -o Chargemol_09_26_2017_windows_parallel Chargemol_09_26_2017_linux_parallel ^
+flang.exe -fopenmp -o Chargemol_09_26_2017_windows_parallel ^
   module_precision.f08 ^
   module_global_parameters.f08 ^
   module_common_variable_declarations.f08 ^


Adding OPENFIRE_HOME as a system property for the Windows start script. Log4j depends on this to locate the log files (OF-53)

git-svn-id: 2e83ce7f183c9abd424edb3952fab2cdab7acd7f@11501 b35dd754-fafc-0310-a699-88a17e54d16e

--- src/bin/openfire.bat
+++ src/bin/openfire.bat
@@ -8,6 +8,7 @@

 if "%JAVA_HOME%" == "" goto javaerror
 if not exist "%JAVA_HOME%\bin\java.exe" goto javaerror
+set OPENFIRE_HOME=%CD%\..
 goto run

 :javaerror
@@ -18,11 +19,11 @@

 :run
 if "%1" == "-debug" goto debug
-start "Openfire" "%JAVA_HOME%\bin\java" -server -jar ..\lib\startup.jar
+start "Openfire" "%JAVA_HOME%\bin\java" -server -DopenfireHome=%OPENFIRE_HOME% -jar ..\lib\startup.jar
 goto end

 :debug
-start "Openfire" "%JAVA_HOME%\bin\java" -Xdebug -Xint -server -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8000 -jar ..\lib\startup.jar
+start "Openfire" "%JAVA_HOME%\bin\java" -Xdebug -Xint -server -DopenfireHome=%OPENFIRE_HOME% -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8000 -jar ..\lib\startup.jar
 goto end
 :end


Fix typo for Windows build

Fix typo for Windows build

--- recipes/tcplotter/bld.bat
+++ recipes/tcplotter/bld.bat
@@ -22,4 +22,4 @@

 :: Install tcplotter
 cd "%SRC_DIR%"
-$PYTHON -m pip install . -vv+%PYTHON% -m pip install . -vv


Add comments to release_win.bat

Add comments to release_win.bat

--- tools/release_win.bat
+++ tools/release_win.bat
@@ -1,15 +1,27 @@
-PATH=C:\python26;C:\progra~1\7-zip;C:\progra~2\7-zip;%PATH%
+rem Tool to assemble Windows builds
+rem Requirements are 7-zip, py2exe, and FreeExtractor
+
+PATH=C:\python27;C:\python26;C:\progra~1\7-zip;C:\progra~2\7-zip;%PATH%
+
+rem ****** Clean out the old junk
 rmdir /q /s dist\*.*
 del /s /q dist\*.*
+
+rem ****** Compile our executable and core zipfile
 python setup.py py2exe
+
+rem ****** Remove extras from core zipfile
 cd dist
-#7z d namebench.zip jinja2\* dns\* 'graphy\*
 7z d namebench.zip tcl\*.*
 rmdir /s /q tcl\tcl8.5\tzdata tcl\tk8.5\demos
 del tcl\tk8.5\images\*.eps
+
+rem ****** Final assembly of zipfile
 copy ..\README.txt .
 7z a namebench_for_Windows.zip -r * >nul
-namebench -x -O 8.8.8.8 -t5 -o test.html
+
+rem ****** Test assembled zipfile
+namebench -x -O 8.8.8.8 -q5 -o test.html
 start test.html

 cd ..


Revert previous change.  Bug is actually elsewhere.

--- Build.bat
+++ Build.bat
@@ -3,4 +3,4 @@
 REM Builds everything and drops it into the Build folder.
 REM You may specify additional arguments for MetaBuild also.
 REM
-"%~dp0tools\MetaBuild\bin\MetaBuild.bat" /rootdir "%~dp0." /metabuildconfig "%~dp0bin\MetaBuild.config.custom" %*
+"%~dp0tools\MetaBuild\bin\MetaBuild.bat" /rootdir "%~dp0" /metabuildconfig "%~dp0bin\MetaBuild.config.custom" %*


Add nuget exec

Add nuget exec

--- Build.bat
+++ Build.bat
@@ -48,7 +48,7 @@
 @rem ---------------------------- {RUN NUGET} ----------------------------
 @rem Execute nuget
 echo Executing Nuget with command [nuget restore %PROJECTMAINPATH%] ...
-@rem nuget restore %PROJECTMAINPATH%
+nuget restore %PROJECTMAINPATH%
 echo Nuget done.
 echo.
 echo.


[C++]: fix for build type for Windows

[C++]: fix for build type for Windows

--- cppbuild/cppbuild.cmd
+++ cppbuild/cppbuild.cmd
@@ -1,3 +1,4 @@
+@echo off
 setlocal

 set SOURCE_DIR=%CD%
@@ -10,5 +11,5 @@

 cmake -G "Visual Studio 12 Win64" %SOURCE_DIR%
 #start aeron.sln
-cmake --build . --clean-first
+cmake --build . --clean-first --config Release
 ctest -C Release


Fixed Error in Naming

Fixed Error in Naming

--- MyGet.bat
+++ MyGet.bat
@@ -1,10 +1,10 @@
-msbuild src/GladNet.Common/GladLive.Common.csproj /p:DebugSymbols=False
+msbuild src/GladNet.Common/GladNet.Common.csproj /p:DebugSymbols=False
 msbuild src/GladNet.Encryption/GladNet.Encryption.csproj /p:DebugSymbols=False
 msbuild src/GladNet.Engine.Common/GladNet.Engine.Common.csproj /p:DebugSymbols=False
 msbuild src/GladNet.Engine.Server/GladNet.Engine.Server.csproj /p:DebugSymbols=False
-msbuild src/GladNet.Message/GladLive.Message.csproj /p:DebugSymbols=False
+msbuild src/GladNet.Message/GladNet.Message.csproj /p:DebugSymbols=False
 msbuild src/GladNet.Message.Handlers/GladNet.Message.Handlers.csproj /p:DebugSymbols=False
-msbuild src/GladNet.Payload/GladLive.Payload.csproj /p:DebugSymbols=False
+msbuild src/GladNet.Payload/GladNet.Payload.csproj /p:DebugSymbols=False
 msbuild src/GladNet.Serializer/GladNet.Serializer.csproj /p:DebugSymbols=False

 cd ./src/GladNet.Payload.Authentication


release batch

release batch

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

--- release.bat
+++ release.bat
@@ -0,0 +1 @@
+msbuild gdatadb.proj /m /t:clean;build;merge


build: start building static version of ICU for Windows

This builds ICU from source, statically builds and links it into the
toolchain image.  This removes the last piece that we were using that is
not auditable.  We now fully build the toolchain on the host on
swift-ci.

--- utils/build-windows-toolchain.bat
+++ utils/build-windows-toolchain.bat
@@ -45,13 +45,29 @@

 md "%BuildRoot%\Library"

-:: TODO(compnerd) build ICU from source
-curl.exe -sOL "https://github.com/unicode-org/icu/releases/download/release-67-1/icu4c-67_1-Win64-MSVC2017.zip" || (exit /b)
-"%SystemDrive%\Program Files\Git\usr\bin\unzip.exe" -o icu4c-67_1-Win64-MSVC2017.zip -d %BuildRoot%\Library\icu-67.1
-md %BuildRoot%\Library\icu-67.1\usr\bin
-copy %BuildRoot%\Library\icu-67.1\bin64\icudt67.dll %BuildRoot%\Library\icu-67.1\usr\bin || (exit /b)
-copy %BuildRoot%\Library\icu-67.1\bin64\icuin67.dll %BuildRoot%\Library\icu-67.1\usr\bin || (exit /b)
-copy %BuildRoot%\Library\icu-67.1\bin64\icuuc67.dll %BuildRoot%\Library\icu-67.1\usr\bin || (exit /b)
+:: Build ICU
+copy %SourceRoot%\swift-installer-scripts\shared\ICU\CMakeLists.txt %SourceRoot%\icu\icu4c\ || (exit /b)
+cmake ^
+  -B %BuildRoot%\icu ^
+
+  -D BUILD_SHARED_LIBS=NO ^
+  -D CMAKE_BUILD_TYPE=%CMAKE_BUILD_TYPE% ^
+  -D CMAKE_C_COMPILER=cl ^
+  -D CMAKE_C_FLAGS="/GS- /Oy /Gw /Gy" ^
+  -D CMAKE_CXX_COMPILER=cl ^
+  -D CMAKE_CXX_FLAGS="/GS- /Oy /Gw /Gy" ^
+  -D CMAKE_MT=mt ^
+  -D CMAKE_EXE_LINKER_FLAGS="/INCREMENTAL:NO" ^
+  -D CMAKE_SHARED_LINKER_FLAGS="/INCREMENTAL:NO" ^
+
+  -D CMAKE_INSTALL_PREFIX=%BuildRoot%\Library\icu-69.1\usr ^
+
+  -D BUILD_TOOLS=YES ^
+
+  -G Ninja ^
+  -S %SourceRoot%\icu\icu4c || (exit /b)
+cmake --build "%BuildRoot%\icu" || (exit /b)
+cmake --build "%BuildRoot%\icu" --target install || (exit /b)

 :: FIXME(compnerd) is there a way to build the sources without downloading the amalgamation?
 curl.exe -sOL "https://sqlite.org/2021/sqlite-amalgamation-3360000.zip" || (exit /b)
@@ -280,9 +296,10 @@
   -D CMAKE_INSTALL_PREFIX=%SDKInstallRoot%\usr ^

   -D CURL_DIR=%BuildRoot%\Library\curl-7.77.0\usr\lib\cmake\CURL ^
-  -D ICU_ROOT=%BuildRoot%\Library\icu-67.1 ^
-  -D ICU_UC_LIBRARY=%BuildRoot%\Library\icu-67.1\lib64\icuuc67.lib ^
-  -D ICU_I18N_LIBRARY=%BuildRoot%\Library\icu-67.1\lib64\icuin67.lib ^
+  -D ICU_ROOT=%BuildRoot%\Library\icu-69.1\usr ^
+  -D ICU_DATA_LIBRARY_RELEASE=%BuildRoot%\Library\icu-69.1\usr\lib\sicudt69.lib ^
+  -D ICU_UC_LIBRARY_RELEASE=%BuildRoot%\Library\icu-69.1\usr\lib\sicuuc69.lib ^
+  -D ICU_I18N_LIBRARY_RELEASE=%BuildRoot%\Library\icu-69.1\usr\lib\sicuin69.lib ^
   -D LIBXML2_LIBRARY=%BuildRoot%\Library\libxml2-2.9.12\usr\lib\libxml2s.lib ^
   -D LIBXML2_INCLUDE_DIR=%BuildRoot%\Library\libxml2-2.9.12\usr\include\libxml2 ^
   -D LIBXML2_DEFINITIONS="/DLIBXML_STATIC" ^
@@ -655,17 +672,6 @@
 :: TODO(compnerd) actually perform the code-signing
 :: signtool sign /f Apple_CodeSign.pfx /p Apple_CodeSign_Password /tr http://timestamp.digicert.com /fd sha256 %PackageRoot%\runtime\runtime.msi

-:: Package icu.msi
-msbuild %SourceRoot%\swift-installer-scripts\platforms\Windows\icu.wixproj ^
-  -p:RunWixToolsOutOfProc=true ^
-  -p:OutputPath=%PackageRoot%\icu\ ^
-  -p:IntermediateOutputPath=%PackageRoot%\icu\ ^
-  -p:ProductVersion=67.1 ^
-  -p:ProductVersionMajor=67 ^
-  -p:ICU_ROOT=%BuildRoot%
-:: TODO(compnerd) actually perform the code-signing
-:: signtool sign /f Apple_CodeSign.pfx /p Apple_CodeSign_Password /tr http://timestamp.digicert.com /fd sha256 %PackageRoot%\icu\icu.msi
-
 :: Package devtools.msi
 msbuild %SourceRoot%\swift-installer-scripts\platforms\Windows\devtools.wixproj ^
   -p:RunWixToolsOutOfProc=true ^
@@ -679,7 +685,6 @@
 move %PackageRoot%\toolchain\toolchain.msi %PackageRoot% || (exit /b)
 move %PackageRoot%\sdk\sdk.msi %PackageRoot% || (exit /b)
 move %PackageRoot%\runtime\runtime.msi %PackageRoot% || (exit /b)
-move %PackageRoot%\icu\icu.msi %PackageRoot% || (exit /b)
 move %PackageRoot%\devtools\devtools.msi %PackageRoot% || (exit /b)

 :: Build Installer
@@ -693,8 +698,6 @@

 :: Stage Artifacts
 md %BuildRoot%\artifacts
-:: ICU Dependency for runtime libraries
-move %PackageRoot%\icu.msi %BuildRoot%\artifacts || (exit /b)
 :: Redistributable libraries for developers
 move %PackageRoot%\runtime.msi %BuildRoot%\artifacts || (exit /b)
 :: Toolchain
@@ -708,7 +711,7 @@

 :: Test Swift
 :: TODO(compnerd) make lit adjust the path properly
-path %BuildRoot%\3;%BuildRoot%\1\bin;%BuildRoot%\Library\icu-67.1\usr\bin;%PATH%;%SystemDrive%\Program Files\Git\usr\bin
+path %BuildRoot%\3;%BuildRoot%\1\bin;%PATH%;%SystemDrive%\Program Files\Git\usr\bin
 cmake --build %BuildRoot%\1 --target check-swift || (exit /b)

 :: Test dispatch
@@ -735,9 +738,10 @@
   -D CMAKE_INSTALL_PREFIX=%SDKInstallRoot%\usr ^

   -D CURL_DIR=%BuildRoot%\Library\curl-7.77.0\usr\lib\cmake\CURL ^
-  -D ICU_ROOT=%BuildRoot%\Library\icu-67.1 ^
-  -D ICU_UC_LIBRARY=%BuildRoot%\Library\icu-67.1\lib64\icuuc67.lib ^
-  -D ICU_I18N_LIBRARY=%BuildRoot%\Library\icu-67.1\lib64\icuin67.lib ^
+  -D ICU_ROOT=%BuildRoot%\Library\icu-69.1\usr ^
+  -D ICU_DATA_LIBRARY_RELEASE=%BuildRoot%\Library\icu-69.1\usr\lib\sicudt69.lib ^
+  -D ICU_I18N_LIBRARY_RELEASE=%BuildRoot%\Library\icu-69.1\usr\lib\sicuin69.lib ^
+  -D ICU_UC_LIBRARY_RELEASE=%BuildRoot%\Library\icu-69.1\usr\lib\sicuuc69.lib ^
   -D LIBXML2_LIBRARY=%BuildRoot%\Library\libxml2-2.9.12\usr\lib\libxml2s.lib ^
   -D LIBXML2_INCLUDE_DIR=%BuildRoot%\Library\libxml2-2.9.12\usr\include\libxml2 ^
   -D LIBXML2_DEFINITIONS="/DLIBXML_STATIC" ^
@@ -832,7 +836,7 @@
 git clone --quiet --no-tags --depth 1 --branch v1.2.11 https://github.com/madler/zlib
 git clone --quiet --no-tags --depth 1 --branch v2.9.12 https://github.com/gnome/libxml2
 git clone --quiet --no-tags --depth 1 --branch version-3.36.0 https://github.com/sqlite/sqlite
-git clone --quiet --no-tags --depth 1 --branch maint/maint-67 https://github.com/unicode-org/icu
+git clone --quiet --no-tags --depth 1 --branch maint/maint-69 https://github.com/unicode-org/icu
 git clone --quiet --no-tags --depth 1 --branch curl-7_77_0 https://github.com/curl/curl

 goto :eof


Fix xpks for tests

Fix xpks for tests

--- vendors/checkout_deps_windows.bat
+++ vendors/checkout_deps_windows.bat
@@ -1,11 +1,10 @@
 @echo off
+rem fake submodule (exists only for appveyor tests)

 cd ..\
-mkdir xpiks-deps
+
+git clone --depth=10 --branch=vs2015 https://bitbucket.org/ribtoks/xpiks-deps.git
+
 cd xpiks-deps

-git init
-git remote add origin https://bitbucket.org/ribtoks/xpiks-deps.git
-
-git fetch --depth=30 origin master
-git merge 76c80a64ff15d6f67cabf37e4120d1a0c19a5e31
+git checkout 63b951d437c7b652c7bcefcd117d7d23724de4f3


Committing build script for Jenkins nightly builds as discussed.

Signed-off-by: Pankaj Goenka <c9ebb397bc7a5c5d359cb33a8e8b90c0da1a1af3@audience.com>

error: pathspec 'embedded/projects/SH-Xpresso-LPC54102/keil-mdk-build/Jenkins_Build.bat' did not match any file(s) known to git

--- embedded/projects/SH-Xpresso-LPC54102/keil-mdk-build/Jenkins_Build.bat
+++ embedded/projects/SH-Xpresso-LPC54102/keil-mdk-build/Jenkins_Build.bat
@@ -0,0 +1,11 @@
+REM text within <> needs to be replaced with original path on the test PC before using this batch file.
+
+set path=%path%;<Keil_v5 path>\UV4;
+cd <Jenkins path>\jobs\Coverity_test\workspace\embedded
+rd fmlib /s /q
+md fmlib
+
+REM fmlib is to be taken from \\fs2\Public\Host_Software\MotionQ\release_1.x.xx folder
+copy <FMLib release path>\FMLib_Embedded.lib fmlib\
+cd <Jenkins path>\jobs\Coverity_test\workspace
+UV4.exe -r embedded\projects\SH-Xpresso-LPC54102\keil-mdk-build\SH-Xpresso-LPC54102.uvprojx


bitbucketallbranchagent.bat to avoid name clash

--- PlatformAgents/com/cognizant/devops/platformagents/agents/scm/bitbucketallbranch/bitbucketallbranchagent.bat
+++ PlatformAgents/com/cognizant/devops/platformagents/agents/scm/bitbucketallbranch/bitbucketallbranchagent.bat
@@ -1,31 +0,0 @@
-goto comment
-Copyright 2017 Cognizant Technology Solutions
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may not
-use this file except in compliance with the License.  You may obtain a copy
-of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
-License for the specific language governing permissions and limitations under
-the License.
-:comment
-pushd %INSIGHTS_AGENT_HOME%\PlatformAgents
-setlocal ENABLEDELAYEDEXPANSION
-for /f "delims=" %%i in ('python -V ^2^>^&^1') do (
-   set PYTHON_VERSION=%%i
-   if "!PYTHON_VERSION:~0,8!" EQU "Python 2" (
-      echo Detected python 2 version
-	  python -c "from __AGENT_KEY__.com.cognizant.devops.platformagents.agents.scm.bitbucketAllBranch.BitBucketAgentAllBranches  import BitBucketAgentAllBranches; BitBucketAgentAllBranches()"
-   ) else (
-      if "!PYTHON_VERSION:~0,8!" EQU "Python 3" (
-         echo Detected python 3 version
-		 python -c "from __AGENT_KEY__.com.cognizant.devops.platformagents.agents.scm.bitbucketAllBranch.BitBucketAgentAllBranches3  import BitBucketAgentAllBranches; BitBucketAgentAllBranches()"
-      ) else (
-         echo python version not supported
-      )
-   )
-)


Deleting bitbucketallbranchagent.bat to avoid name clash


A convenience script to build release installers.

Review URL: http://codereview.appspot.com/204041

git-svn-id: db59699583a60be9a535cd09cdc9132301867226@30 15e8cca8-e42c-11de-a347-f34a4f72eb7d

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

--- sawbuck/build_release.bat
+++ sawbuck/build_release.bat
@@ -0,0 +1,83 @@
+@echo off
+rem = """
+:: Copyright 2009 Google Inc.
+::
+:: Licensed under the Apache License, Version 2.0 (the "License");
+:: you may not use this file except in compliance with the License.
+:: You may obtain a copy of the License at
+::
+::     http://www.apache.org/licenses/LICENSE-2.0
+::
+:: Unless required by applicable law or agreed to in writing, software
+:: distributed under the License is distributed on an "AS IS" BASIS,
+:: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+:: See the License for the specific language governing permissions and
+:: limitations under the License.
+:: Make sure the tools directory is in our python path.
+set PYTHONPATH=%~p0tools
+"%~p0..\third_party\python_24\python.exe" -x "%~f0" %*
+goto endofPython """
+'''This scripts builds the current version in debug and release, then
+copies the produced installers to sawbuck-<version>-{debug|release}.msi
+for easy archiving.
+'''
+#!python
+import os.path
+import shutil
+import sys
+import win32com.client
+from template_replace import ReadKeyFile
+
+
+_SCRIPT_DIR = os.path.dirname(__file__)
+_SAWBUCK_SOLUTION = os.path.join(_SCRIPT_DIR, 'sawbuck.sln')
+_INSTALLER_PROJECT = os.path.join(_SCRIPT_DIR, 'installer/sawbuck.vcproj')
+_VERSION_FILE = os.path.join(_SCRIPT_DIR, 'VERSION')
+
+
+def BuildProjectConfig(builder, config, project):
+  '''Builds a given project in a given configuration, exits on error.
+
+  Args:
+    builder: a Visual Studio SolutionBuild object.
+    config: the name of the configuration to build, f.ex. "Release".
+    project: the path of a solution to build, relative to the builder's
+        solution directory.
+  '''
+  print 'Building project "%s" in "%s" configuration' % (project, config)
+  project = os.path.normpath(project)
+  builder.BuildProject(config, project, True)
+  errors = builder.LastBuildInfo
+
+  if errors != 0:
+    print '%d errors while building config %s.' % (errors, config)
+    sys.exit(errors)
+
+
+def Main():
+  '''Builds the sawbuck installer in Debug and Release, and copies
+  the resultant installers to the Sawbuck solution directory.
+  '''
+  v = {}
+  ReadKeyFile(_VERSION_FILE, v)
+  version = map(int, (v['MAJOR'], v['MINOR'], v['BUILD'], v['PATCH']))
+  print "Building version %d.%d.%d.%d" % tuple(version)
+
+  solution = win32com.client.GetObject(_SAWBUCK_SOLUTION)
+  builder = solution.SolutionBuild
+
+  BuildProjectConfig(builder, 'Debug', _INSTALLER_PROJECT)
+  BuildProjectConfig(builder, 'Release', _INSTALLER_PROJECT)
+
+  basename = 'sawbuck-%d.%d.%d.%d' % tuple(version)
+  shutil.copyfile(os.path.join(_SCRIPT_DIR, 'Debug/sawbuck.msi'),
+                  os.path.join(_SCRIPT_DIR, '%s-debug.msi' % basename))
+  shutil.copyfile(os.path.join(_SCRIPT_DIR, 'Release/sawbuck.msi'),
+                  os.path.join(_SCRIPT_DIR, '%s-release.msi' % basename))
+
+
+if __name__ == "__main__":
+  sys.exit(Main())
+
+rem = """
+:endofPython """


Removed some stray double-quotes in script/cmtool.bat when informing the user about the Omnitruck API.

--- script/cmtool.bat
+++ script/cmtool.bat
@@ -101,7 +101,7 @@
 set url="https://omnitruck.chef.io/%OMNITRUCK_CHANNEL%/%OMNITRUCK_PRODUCT%/metadata?p=%OMNITRUCK_PLATFORM%&m=%OMNITRUCK_MACHINE_ARCH%&v=%OMNITRUCK_VERSION%"
 set filename="%TEMP%\omnitruck.txt"

-echo "==^> Using Chef Omnitruck API URL: !url!"
+echo ==^> Using Chef Omnitruck API URL: !url!
 powershell -command "(New-Object System.Net.WebClient).DownloadFile('!url!', '!filename!')"

 if not exist "%TEMP%\omnitruck.txt" (
@@ -117,7 +117,7 @@
   echo Could not determine the %OMNITRUCK_PRODUCT% %OMNITRUCK_VERSION% download url...
   goto exit1
 )
-echo "==^> Got %OMNITRUCK_PRODUCT% download URL: !CHEF_URL!"
+echo ==^> Got %OMNITRUCK_PRODUCT% download URL: !CHEF_URL!

 goto chef


* WindowsPlayer build for 64 bit now

* WindowsPlayer build for 64 bit now

--- BuildScripts/BuildWindowsPlayer.cmd
+++ BuildScripts/BuildWindowsPlayer.cmd
@@ -5,7 +5,7 @@
 IF "%UNITY_EXE%"=="" SET "UNITY_EXE=C:\Program Files\Unity\Editor\Unity.exe"

 mkdir %PROJECT%\Clients\Windows\
-"%UNITY_EXE%" -batchmode -quit -projectPath %PROJECT% -buildWindowsPlayer %PROJECT%\Clients\Windows\UnityTest.exe
+"%UNITY_EXE%" -batchmode -quit -projectPath %PROJECT% -buildWindows64Player %PROJECT%\Clients\Windows\UnityTest.exe
 IF NOT "%ERRORLEVEL%"=="0" goto error

 :success


Create build-windows-toolchain.bat

Create build-windows-toolchain.bat

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

--- utils/build-windows-toolchain.bat
+++ utils/build-windows-toolchain.bat
@@ -0,0 +1,10 @@
+:: build-windows-toolchain.bat
+::
+:: This source file is part of the Swift.org open source project
+::
+:: Copyright (c) 2014 - 2021 Apple Inc. and the Swift project authors
+:: Licensed under Apache License v2.0 with Runtime Library Exception
+::
+:: See https://swift.org/LICENSE.txt for license information
+:: See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+


Add script for publishing gh-pages

Add script for publishing gh-pages

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

--- scripts/pages.bat
+++ scripts/pages.bat
@@ -0,0 +1,25 @@
+
+set dir_root=%~dp0\..\
+pushd %dir_root%
+set dir_root=%CD%
+popd
+
+echo %dir_root%
+
+rmdir /s /q^
+  %dir_root%\pages\js^
+  %dir_root%\pages\css^
+  %dir_root%\pages\img^
+  %dir_root%\pages\lib^
+  %dir_root%\pages\templates
+
+del %dir_root%\index.html
+
+robocopy /s %dir_root%\www %dir_root%\pages
+
+del %dir_root%\pages\.buttlerc
+
+pushd %dir_root%\pages
+git commit -a -m "Publish pages"
+git push origin gh-pages
+popd