[SPARK-13673][WINDOWS] Fixed not to pollute environment variables.

## What changes were proposed in this pull request?

This patch fixes the problem that `bin\beeline.cmd` pollutes environment variables.
The similar problem is reported and fixed in https://issues.apache.org/jira/browse/SPARK-3943, but `bin\beeline.cmd` seems to be added later.

## How was this patch tested?

manual tests:
  I executed the new `bin\beeline.cmd` and confirmed that %SPARK_HOME% doesn't remain in the command prompt.

Author: Masayoshi TSUZUKI <tsudukim@oss.nttdata.co.jp>

Closes #11516 from tsudukim/feature/SPARK-13673.

--- bin/beeline.cmd
+++ bin/beeline.cmd
@@ -17,5 +17,4 @@
 rem limitations under the License.
 rem

-set SPARK_HOME=%~dp0..
-cmd /V /E /C "%SPARK_HOME%\bin\spark-class.cmd" org.apache.hive.beeline.BeeLine %*
+cmd /V /E /C "%~dp0spark-class.cmd" org.apache.hive.beeline.BeeLine %*


update cmd

update cmd

--- runserver.cmd
+++ runserver.cmd
@@ -1 +1,2 @@
+python manage.py migrate
 python manage.py runserver 0.0.0.0:80


HIVE-14440: Fix default value of USE_DEPRECATED_CLI in cli.cmd (Vihang Karajgaonkar, reviewed by Sergio Pena)

--- bin/ext/cli.cmd
+++ bin/ext/cli.cmd
@@ -29,7 +29,7 @@

 :update_cli
 	if [%USE_DEPRECATED_CLI%] == [] (
-		set USE_DEPRECATED_CLI=false
+		set USE_DEPRECATED_CLI=true
 	)

 	if /I "%USE_DEPRECATED_CLI%" == "true" (
@@ -55,4 +55,4 @@
 		set JAR=%HIVE_LIB%\%%a
 	)
 	popd
-goto :EOF+goto :EOF


# sp-27 remove comment since it is included in variable value

--- bin/ggstart.bat
+++ bin/ggstart.bat
@@ -75,7 +75,7 @@
 ::
 :: Set SCRIPTS_HOME - base path to scripts.
 ::
-set SCRIPTS_HOME=%GRIDGAIN_HOME%\os\bin :: Will be replace by SCRIPTS_HOME=${GRIDGAIN_HOME_TMP}\bin in release.
+set SCRIPTS_HOME=%GRIDGAIN_HOME%\os\bin

 if /i "%SCRIPTS_HOME%\" == "%~dp0" goto setProgName
     echo %0, WARN: GRIDGAIN_HOME environment variable may be pointing to wrong folder: %GRIDGAIN_HOME%


Support for Windows platforms

Support for Windows platforms

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

--- save_blip.bat
+++ save_blip.bat
@@ -0,0 +1,193 @@
+@echo off
+REM ##########################################
+REM This program is provided on an 'as-is' basis.
+REM No support is offered for any defects found
+REM in this program.
+REM No liability is accepted for any damage
+REM caused through the use of this program.
+REM ##########################################
+
+REM ##########################################
+REM
+REM ##########################################
+
+REM ##########################################
+REM
+REM  This code relies on two programs other than
+REM  the standard Windows command set, such as
+REM  mkdir, rmdir, del.
+REM
+REM  These two commands are: wkhtmltopdf and wget
+REM
+REM  You will need to install version 0.12.2.1 for
+REM  the print out to be faithful to the Blip page
+REM  layout. You can download that version from
+REM  http://wkhtmltopdf.org/downloads.html
+REM
+REM  You will also need to install wget. You can
+REM  download the windows version from here:
+REM  http://sourceforge.net/projects/gnuwin32/files/wget/1.11.4-1/wget-1.11.4-1-setup.exe/download
+REM
+REM  Bear in mind that you have to trust that this
+REM  download is safe!
+REM
+REM #############################################
+
+if -%3- == -- (
+	echo There are two forms of usage.
+	echo 	The first prints all entries in reverse chronological order
+	echo 	given an initial entry
+	echo
+	echo 	Usage: blip_username with_comments url_of_first_blip_to_print
+	echo 	Example:
+	echo 	%0 yourusername y https://www.polaroidblipfoto.com/entry/1234567890
+	echo
+	echo 	The second prints entries from an initial entry up to, but not
+	echo 	including, a final entry in reverse chronological order.
+	echo 	No check is made that the last entry is before the first.
+	echo
+	echo 	Usage: blip_username with_comments url_of_first_blip_to_print url_of_final_blip_to_stop_at"
+	echo 	Example:
+	echo 	%0 yourusername n https://www.polaroidblipfoto.com/entry/4321 https://www.polaroidblipfoto.com/entry/1234
+	exit /b
+)
+
+set base_url=https://www.polaroidblipfoto.com
+set user=%1
+set comments=%2
+set previous_url=%3
+set final_url=%4
+set tmp_file=.\blip_wget_tmp_file.tmp
+set output_log_file=.\output_log.txt
+set result_log_file=.\wkhtml_result.txt
+echo "" > %output_log_file%
+echo "" > %result_log_file%
+
+if -%final_url%- == -- (
+	set final_url=%base_url%
+)
+
+if not -%comments%- == -y- (
+	if not -%comments%- == -n- (
+		echo Comments option must be y or n
+		exit /b
+	)
+)
+
+REM  Use a 2 second delay between getting entries.
+REM  Note - producing the PDF may take several second though.
+
+set delay=2
+set blip_entries_dir=.\blip_entries
+
+
+if not exist %blip_entries_dir% (
+	echo Making directory %blip_entries_dir%
+	mkdir %blip_entries_dir%
+	if %errorlevel% neq 0 (
+		echo Failed to make directory %blip_entries_dir%
+		exit /b
+	)
+)
+
+REM Check that wkhtml and wget are installed
+
+for /f "delims= skip=2" %%i in ( 'reg query HKEY_LOCAL_MACHINE\SOFTWARE\wkhtmltopdf /v PdfPath' ) do set "wkhtml=%%i"
+set "wkhtml=%wkhtml:~19%"
+
+if "-%wkhtml%-" == -- (
+	echo Please download and install "%wkhtml%" >> %output_log_file%
+	exit /b
+)
+
+
+for /f "delims= skip=2" %%i in ( 'reg query HKEY_LOCAL_MACHINE\SOFTWARE\GnuWin32\Wget\1.11.4-1\setup /v InstallPath' ) do set "wget=%%i"
+set "wget=%wget:~23%\bin\wget"
+
+if "-%wget%-" == -- (
+	echo Please download and install wget >> %output_log_file%
+	exit /b
+)
+
+REM Start by printing a front cover
+
+echo Printing front cover for user %user%....
+"%wkhtml%" -q %base_url%/%user% %blip_entries_dir%\front_cover.pdf 2>> %output_log_file%
+
+
+:main_loop
+if %previous_url% == %final_url% goto :endofmainloop
+
+"%wget%" --no-check-certificate -q -O %tmp_file% %previous_url%  2>> %output_log_file%
+
+for /f "delims=" %%i in ( 'findstr JournalGallery %tmp_file%' ) do set line=%%i
+for /f "tokens=3 delims=:" %%i in ( 'echo %line%' ) do set part=%%i
+
+set "c=%part: =_%
+set "d=%c:"=%"
+set "entry_date=%d:_items=%"
+
+echo Printing entry %entry_date%....
+if -%comments%- == -n- (
+	call :nocomment
+)
+
+if -%comments%- == -y- (
+	call :comment
+)
+
+for /f "delims=" %%i in ( 'findstr "title=.Previous." %tmp_file%' ) do set "line=%%i"
+set "a=%line:<=%"
+set "b=%a:>=%"
+set "c=%b:"= %"
+for /f "tokens=3 delims= " %%i in ( 'echo %c%' ) do set "last_entry=%%i"
+
+set "previous_url=%base_url%%last_entry%"
+
+del %tmp_file%
+
+call :sleep
+goto :main_loop
+
+:endofmainloop
+
+REM Exit here
+exit /b
+
+REM Functions here
+:nocomment
+setlocal
+"%wkhtml%" -q %previous_url%  "%blip_entries_dir%\%entry_date%.pdf" 2>> %output_log_file%
+endlocal
+REM Return from call
+exit /b
+
+:comment
+setlocal
+:commentloop
+"%wkhtml%" %previous_url% --no-stop-slow-scripts --run-script "console.log(document.readyState);" --run-script "document.onload = load_comments.click();" --run-script "load_comments.click();" --run-script "load_comments.scrollIntoView(true);" --run-script "load_comments.click();" --javascript-delay 2000 --debug-javascript %blip_entries_dir%\%entry_date%.pdf 2>> %result_log_file%
+
+for /f "delims=" %%i in ( 'findstr "interactive" %result_log_file%' ) do set "line=%%i"
+del %result_log_file%
+set "result=%line: =%"
+set "result=%result::=%"
+set "result=%result:*Warning1=%"
+
+if not -%result%- == -- goto :success
+echo Retrying....
+call :sleep
+goto :commentloop
+
+:success
+endlocal
+REM Return from call
+exit /b
+
+
+:sleep
+setlocal
+REM fake 1 sec delay
+ping -n 1 127.0.0.1 >nul
+endlocal
+REM Return from call
+exit /b


move only necessary files on deploy

move only necessary files on deploy

--- build/deploy.cmd
+++ build/deploy.cmd
@@ -10,15 +10,18 @@
 )
 IF "%ERRORLEVEL%" NEQ "0" goto error

-:: xcopy %DEPLOYMENT_SOURCE%\* %DEPLOYMENT_TARGET% /Y /E
-%DEPLOYMENT_SOURCE%\build\7za.exe a -t7z %DEPLOYMENT_SOURCE%\deploy.7z %DEPLOYMENT_SOURCE%\* -mx0 -xr!node_modules -xr!.git
-IF "%ERRORLEVEL%" NEQ "0" goto error
+xcopy %DEPLOYMENT_SOURCE%\dist %DEPLOYMENT_TARGET%\dist /Y /E
+xcopy %DEPLOYMENT_SOURCE%\index.html %DEPLOYMENT_TARGET%\index.html /Y /E
+xcopy %DEPLOYMENT_SOURCE%\web.config %DEPLOYMENT_TARGET%\web.config /Y /E
+xcopy %DEPLOYMENT_SOURCE%\server.js %DEPLOYMENT_TARGET%\server.js /Y /E
+:: %DEPLOYMENT_SOURCE%\build\7za.exe a -t7z %DEPLOYMENT_SOURCE%\deploy.7z %DEPLOYMENT_SOURCE%\* -mx0 -xr!node_modules -xr!.git
+:: IF "%ERRORLEVEL%" NEQ "0" goto error

-%DEPLOYMENT_SOURCE%\build\7za.exe -y x %DEPLOYMENT_SOURCE%\deploy.7z -o%DEPLOYMENT_TARGET%
-IF "%ERRORLEVEL%" NEQ "0" goto error
+:: %DEPLOYMENT_SOURCE%\build\7za.exe -y x %DEPLOYMENT_SOURCE%\deploy.7z -o%DEPLOYMENT_TARGET%
+:: IF "%ERRORLEVEL%" NEQ "0" goto error

-del /q %DEPLOYMENT_SOURCE%\deploy.7z
-IF "%ERRORLEVEL%" NEQ "0" goto error
+:: del /q %DEPLOYMENT_SOURCE%\deploy.7z
+:: IF "%ERRORLEVEL%" NEQ "0" goto error

 call npm install --prefix %DEPLOYMENT_TARGET%/node_modules
 IF "%ERRORLEVEL%" NEQ "0" goto error


Find out what's there

Find out what's there

--- pre-build.bat
+++ pre-build.bat
@@ -1,2 +1,2 @@
 call %GitVersion% /output buildserver
-dir %MsBuildExe%\..\+dir "C:\Program Files (x86)\MSBuild\""


update script

update script

--- build_script.bat
+++ build_script.bat
@@ -4,7 +4,7 @@
 goto custom_python:

 :default_value_python:
-set pythonexe="c:\Python35_x64\python"
+set pythonexe="c:\Python36_x64\python"
 :custom_python:
 %pythonexe% -u setup.py build_script
 if %errorlevel% neq 0 exit /b %errorlevel%


Edit echo commands

Edit echo commands

changed "garbage collector" to "min/max value for heap space"

--- etc/tomcat/bin/setenv.bat
+++ etc/tomcat/bin/setenv.bat
@@ -24,14 +24,14 @@
 rem If it is, leave it be
 echo.%CATALINA_OPTS%|findstr /C:"-Xms"
 if not errorlevel 1 (
-    echo Already declared a garbage collector
+    echo Already declared a minimum value for heap space
 ) else (
     set CATALINA_OPTS=%CATALINA_OPTS% -Xms64m
 )

 echo.%CATALINA_OPTS%|findstr /C:"-Xmx"
 if not errorlevel 1 (
-    echo Already declared a garbage collector
+    echo Already declared a maximum value for heap space
 ) else (
     set CATALINA_OPTS=%CATALINA_OPTS% -Xmx512m
 )


CI: add full the path to vcvars64.bat script.

--- ci/build-windows-msvc.bat
+++ ci/build-windows-msvc.bat
@@ -1,7 +1,9 @@
 @echo on
+VS_PATH

 set "VSCMD_START_DIR=%CD%"
-call "vcvars64.bat"
+call "%VS_PATH%\VC\Auxiliary\Build\vcvars64.bat"
+
 mkdir build
 cd build
 cmake .. -G"Visual Studio 15 2017 Win64" %CMAKE_OPT% -DCMAKE_CXX_FLAGS="-D_CRT_SECURE_NO_DEPRECATE /MT /EHsc %CFLAGS%"


CI: fix multithreaded compilation on MSVC.

--- ci/build-windows-msvc.bat
+++ ci/build-windows-msvc.bat
@@ -5,10 +5,10 @@

 mkdir build
 cd build
-cmake .. -G"Visual Studio 15 2017 Win64" %CMAKE_OPT% -DCMAKE_CXX_FLAGS="-D_CRT_SECURE_NO_DEPRECATE /MT /EHsc %CFLAGS%"
+cmake .. -G"Visual Studio 15 2017 Win64" %CMAKE_OPT% -DCMAKE_CXX_FLAGS="-D_CRT_SECURE_NO_DEPRECATE /MT /EHsc /MP%THREADS% %CFLAGS%"
 if %ERRORLEVEL% neq 0 exit /B %ERRORLEVEL%
 rem devenv /build Release aff3ct.sln
-msbuild aff3ct.sln /maxcpucount:%THREADS% /t:Build /p:Configuration=Release
+msbuild aff3ct.sln /t:Build /p:Configuration=Release
 if %ERRORLEVEL% neq 0 exit /B %ERRORLEVEL%

 mkdir %NAME%


Update Travis CI

Update Travis CI

--- conda/install.bat
+++ conda/install.bat
@@ -1,6 +1,6 @@
 echo OFF

-DEFAULT_INSTALL_TARGETS=python-parse python-pkgtk
+set DEFAULT_INSTALL_TARGETS=python-parse python-pkgtk

 set ANACONDA_FLAGS="-c conda-forge "%ANACONDA_FLAGS%
 if "%ANACONDA_CHANNEL%" == "" (


Fixed typo

Fixed typo

--- engine/cpp/ext/vs2017-acquire-chakracore.cmd
+++ engine/cpp/ext/vs2017-acquire-chakracore.cmd
@@ -11,6 +11,6 @@
 xcopy src\ChakraCore\lib\Jsrt\ChakraCommon.h .\include\ /S /Y
 xcopy src\ChakraCore\lib\Jsrt\ChakraCommonWindows.h .\include\ /S /Y
 xcopy src\ChakraCore\lib\Jsrt\ChakraDebug.h .\include\ /S /Y
-xcopy rc\ChakraCore\Build\VcBuild\bin\x64_debug\ChakraCore.lib .\lib\debug-vs2017\ /S /Y
-xcopy rc\ChakraCore\Build\VcBuild\bin\x64_debug\ChakraCore.dll .\bin\debug-vs2017\ /S /Y
-xcopy rc\ChakraCore\Build\VcBuild\bin\x64_release\ChakraCore.lib .\lib\release-vs2017\ /S /Y
+xcopy src\ChakraCore\Build\VcBuild\bin\x64_debug\ChakraCore.lib .\lib\debug-vs2017\ /S /Y
+xcopy src\ChakraCore\Build\VcBuild\bin\x64_debug\ChakraCore.dll .\bin\debug-vs2017\ /S /Y
+xcopy src\ChakraCore\Build\VcBuild\bin\x64_release\ChakraCore.lib .\lib\release-vs2017\ /S /Y


Fixed UpdateDependencies.bat script to ignore .db files when copying database scripts from gpaweb.

git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/openpdc/Synchrophasor/Current Version-VS2012;C92764

--- Build/Scripts/UpdateDependencies.bat
+++ Build/Scripts/UpdateDependencies.bat
@@ -76,6 +76,7 @@

 ECHO.
 ECHO Updating database schema defintions...
+FOR /R "%sourceschema%" %%x IN (*.db) DO DEL "%%x"
 FOR /R "%sourceschema%" %%x IN (GSFSchema.*) DO REN "%%x" "openPDC.*"
 FOR /R "%sourceschema%" %%x IN (GSFSchema-InitialDataSet.*) DO REN "%%x" "openPDC-InitialDataSet.*"
 FOR /R "%sourceschema%" %%x IN (GSFSchema-SampleDataSet.*) DO REN "%%x" "openPDC-SampleDataSet.*"


Add logging to avoid timeout on Travis

Add logging to avoid timeout on Travis

--- conda/win_dev/win_dev.bat
+++ conda/win_dev/win_dev.bat
@@ -51,6 +51,6 @@
 echo %fcver%
 cd %copy_dir%\..
 ren %copy_dir% FreeCAD_%fcver:~0,10%-Win-Conda_vc14.x-x86_64
-"%ProgramFiles%\7-Zip\7z.exe" a -t7z -mmt=%NUMBER_OF_PROCESSORS% FreeCAD_%fcver:~0,10%-Win-Conda_vc14.x-x86_64.7z FreeCAD_%fcver:~0,10%-Win-Conda_vc14.x-x86_64\
+"%ProgramFiles%\7-Zip\7z.exe" a -t7z -mmt=%NUMBER_OF_PROCESSORS% FreeCAD_%fcver:~0,10%-Win-Conda_vc14.x-x86_64.7z FreeCAD_%fcver:~0,10%-Win-Conda_vc14.x-x86_64\ -bb
 certutil -hashfile "FreeCAD_%fcver:~0,10%-Win-Conda_vc14.x-x86_64.7z" SHA256 > "FreeCAD_%fcver:~0,10%-Win-Conda_vc14.x-x86_64.7z"-SHA256.txt
 echo  %date%-%time% >>"FreeCAD_%fcver:~0,10%-Win-Conda_vc14.x-x86_64.7z"-SHA256.txt


disable all AVG entries (though it pains my soul to do so)

sigh

--- resources/stage_2_de-bloat/oem/programs_to_target_by_GUID.bat
+++ resources/stage_2_de-bloat/oem/programs_to_target_by_GUID.bat
@@ -1,6 +1,6 @@
 :: Batch file to uninstall a specific list of programs by GUID
 :: Called by Tron in Stage 2: De-bloat
-:: Initial list by reddit.com/user/tuxedo_jack, modifications for use in Tron by reddit.com/user/vocatus
+:: Initial list by reddit.com/user/tuxedo_jack, modifications for use in Tron by reddit.com/user/vocatus and many, many, many others
 :: Add any GUID uninstall commands to this list to target them for removal
 @echo off

@@ -233,31 +233,31 @@
 :: Avery Toolbar
 start /wait msiexec /qn /norestart /x {8D20B4D7-3422-4099-9332-39F27E617A6F}

-:: AVG
-start /wait msiexec /qn /norestart /x {5893E1FC-A43A-4F82-8EB6-FF61DC84A92B
-
-:: AVG 2013
-start /wait msiexec /qn /norestart /x {C09E8C9E-A243-430E-8811-7C7C36BD8A71}
-start /wait msiexec /qn /norestart /x {9EF01972-D320-49A9-BA40-BED677587E32}
-
-:: AVG 2014
-start /wait msiexec /qn /norestart /x {FC3B3A5D-7058-4627-9F1E-F95CC38B6054}
-start /wait msiexec /qn /norestart /x {524569AC-B3EE-468B-BFD5-19A89EA7CE8E}
-start /wait msiexec /qn /norestart /x {91569630-3DDC-43EB-9425-E6C41431D535}
-start /wait msiexec /qn /norestart /x {A64D4055-F3E5-40E7-982A-C1FC10C3B4AF}
-start /wait msiexec /qn /norestart /x {B53BE722-137D-4A7C-BC7A-F495DF36AF59}
-start /wait msiexec /qn /norestart /x {F4735E8D-3570-4606-A4E9-0BE44F3B0DFC}
-
-:: AVG 2015
-start /wait msiexec /qn /norestart /x {3B3927B0-0A21-4B4C-9FF3-AB4C42E2AF79}
-start /wait msiexec /qn /norestart /x {966F007B-0D8A-44A6-A6C3-5395983C356D}
-start /wait msiexec /qn /norestart /x {0B7BE3CA-AF33-4CE3-BC27-1456C96EF996}
-start /wait msiexec /qn /norestart /x {7A5DB14B-14B0-4F09-A130-BF60503B4248}
-start /wait msiexec /qn /norestart /x {CEEAE734-B717-41D1-BF50-378EC081C6B1}
-start /wait msiexec /qn /norestart /x {6B171EFC-F41F-4055-A4DE-5B9480DA17AA}
-
-:: AVG 2016
-start /wait msiexec /qn /norestart /x {5F717F1E-A958-47A7-9602-4D9DDC8E0E03}
+:: AVG // Disabled for Tron by /u/vocatus on feedback from /u/ComputersByte, /u/spexdi, /u/Chimaera12 and /u/agent-squirrel
+:: start /wait msiexec /qn /norestart /x {5893E1FC-A43A-4F82-8EB6-FF61DC84A92B
+
+:: AVG 2013 // Disabled for Tron by /u/vocatus on feedback from /u/ComputersByte, /u/spexdi, /u/Chimaera12 and /u/agent-squirrel
+:: start /wait msiexec /qn /norestart /x {C09E8C9E-A243-430E-8811-7C7C36BD8A71}
+:: start /wait msiexec /qn /norestart /x {9EF01972-D320-49A9-BA40-BED677587E32}
+
+:: AVG 2014 // Disabled for Tron by /u/vocatus on feedback from /u/ComputersByte, /u/spexdi, /u/Chimaera12 and /u/agent-squirrel
+:: start /wait msiexec /qn /norestart /x {FC3B3A5D-7058-4627-9F1E-F95CC38B6054}
+:: start /wait msiexec /qn /norestart /x {524569AC-B3EE-468B-BFD5-19A89EA7CE8E}
+:: start /wait msiexec /qn /norestart /x {91569630-3DDC-43EB-9425-E6C41431D535}
+:: start /wait msiexec /qn /norestart /x {A64D4055-F3E5-40E7-982A-C1FC10C3B4AF}
+:: start /wait msiexec /qn /norestart /x {B53BE722-137D-4A7C-BC7A-F495DF36AF59}
+:: start /wait msiexec /qn /norestart /x {F4735E8D-3570-4606-A4E9-0BE44F3B0DFC}
+
+:: AVG 2015 // Disabled for Tron by /u/vocatus on feedback from /u/ComputersByte, /u/spexdi, /u/Chimaera12 and /u/agent-squirrel
+:: start /wait msiexec /qn /norestart /x {3B3927B0-0A21-4B4C-9FF3-AB4C42E2AF79}
+:: start /wait msiexec /qn /norestart /x {966F007B-0D8A-44A6-A6C3-5395983C356D}
+:: start /wait msiexec /qn /norestart /x {0B7BE3CA-AF33-4CE3-BC27-1456C96EF996}
+:: start /wait msiexec /qn /norestart /x {7A5DB14B-14B0-4F09-A130-BF60503B4248}
+:: start /wait msiexec /qn /norestart /x {CEEAE734-B717-41D1-BF50-378EC081C6B1}
+:: start /wait msiexec /qn /norestart /x {6B171EFC-F41F-4055-A4DE-5B9480DA17AA}
+
+:: AVG 2016 // Disabled for Tron by /u/vocatus on feedback from /u/ComputersByte, /u/spexdi, /u/Chimaera12 and /u/agent-squirrel
+:: start /wait msiexec /qn /norestart /x {5F717F1E-A958-47A7-9602-4D9DDC8E0E03}

 :: AVG PC TuneUp 2015
 start /wait msiexec /qn /norestart /x {4AC74ED1-719B-46DA-8B8A-340FBF892291}


Properly check that we're actually running windows-build-deps.cmd from the Visual Studio Command Prompt.

--- tools/windows-build-deps.cmd
+++ tools/windows-build-deps.cmd
@@ -2,7 +2,7 @@
 echo.

 :: Make sure we're running in Visual Studio Command Prompt
-IF NOT EXIST %VSVARSALL%. (
+IF "%VSINSTALLDIR%"=="" (
    cecho {0C}Batch file not executed from Visual Studio Command Prompt - cannot proceed!{# #}{\n}
    GOTO :ERROR
 )


Fixing possible copy problem of mingw dlls.

--- docs/win32_build_scripts/pokerth_download_libs.cmd
+++ docs/win32_build_scripts/pokerth_download_libs.cmd
@@ -314,8 +314,8 @@
 echo Copying DLLs
 copy /Y %PKTH_BaseDir%\SDL\bin\SDL.dll %PKTH_BaseDir%\pokerth\
 copy /Y %PKTH_BaseDir%\SDL_mixer\bin\SDL_mixer.dll %PKTH_BaseDir%\pokerth\
-copy /Y %PKTH_BaseDir%\mingw\bin\libgcc_s_dw2-1.dll %PKTH_BaseDir%\pokerth\
-copy /Y %PKTH_BaseDir%\mingw\bin\libstdc++-6.dll %PKTH_BaseDir%\pokerth\
+copy /Y "%PKTH_BaseDir%\mingw\bin\libgcc_s_dw2-1.dll" %PKTH_BaseDir%\pokerth\
+copy /Y "%PKTH_BaseDir%\mingw\bin\libstdc++-6.dll" %PKTH_BaseDir%\pokerth\
 copy /Y %PKTH_BaseDir%\boost\stage\lib\libboost_filesystem-mgw45-mt-1_44.dll %PKTH_BaseDir%\pokerth\
 copy /Y %PKTH_BaseDir%\boost\stage\lib\libboost_iostreams-mgw45-mt-1_44.dll %PKTH_BaseDir%\pokerth\
 copy /Y %PKTH_BaseDir%\boost\stage\lib\libboost_system-mgw45-mt-1_44.dll %PKTH_BaseDir%\pokerth\


Added arg check to deploy script

Added arg check to deploy script

--- BuildAndDeploy.bat
+++ BuildAndDeploy.bat
@@ -1,4 +1,7 @@
 @echo off
+
+if "%1"==""	GOTO INVALIDARGUMENTS
+if "%2"==""	GOTO INVALIDARGUMENTS

 SET DEPLOYERPATH=%1
 SET KERNELPATH=%2
@@ -14,13 +17,16 @@
 popd

 REM Build
+echo Building...
 c:/cygwin64/bin/bash.exe --login -c "cd f:;cd git/pios;make"

-echo Deployer path: %DEPLOYERPATH%\PiOSDeployer.exe
-echo Kernel path: %KERNELPATH%\kernel.img
-
-REM And launch the deployer
-REM %DEPLOYERPATH%\PiOSDeployer.exe %KERNELPATH%kernel.img
-
+echo Deploying kernel...
 start "Deployer" %DEPLOYERPATH%\PiOSDeployer.exe %KERNELPATH%\kernel.img
 echo Waiting for Deployer...
+
+GOTO DONE
+
+:INVALIDARGUMENTS
+echo Invalid arguments to deploy script, have you set up Visual Studio correctly?
+
+:DONE


Fixed #71

Fixed #71

--- nitrite-datagate/src/main/dist/bin/datagate.bat
+++ nitrite-datagate/src/main/dist/bin/datagate.bat
@@ -51,6 +51,6 @@

 IF NOT EXIST "%DATAGATE_LOG_DIR%" MD "%DATAGATE_LOG_DIR%"

-"%JAVA_EXE%" -jar "%DATAGATE_EXE%" --spring.config.location=file:\\\"%DATAGATE_CONF%" --datagate.log.dir="%DATAGATE_LOG_DIR%"
+"%JAVA_EXE%" -jar "%DATAGATE_EXE%" --spring.config.location=file:///"%DATAGATE_CONF%" -Ddatagate.log.dir="%DATAGATE_LOG_DIR%"

 SET PATH=%OLD_PATH%


Command for running tests with coverage

Command for running tests with coverage

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

--- test_with_coverage.bat
+++ test_with_coverage.bat
@@ -0,0 +1 @@
+nosetests --with-coverage --cover-html --cover-package=tuttle


fix windows build

fix windows build

--- build_windows/make.bat
+++ build_windows/make.bat
@@ -1,2 +1,2 @@
 cl /c /Ox /Os /GL /GF /GS- /Wall /EHsc ../src/msspi.cpp
-link /DLL /LTCG msspi.obj crypt32.lib /OUT:msspi.dll
+link /DLL /LTCG msspi.obj crypt32.lib advapi32.lib /OUT:msspi.dll


Add script to start all services at once.

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

--- startall.bat
+++ startall.bat
@@ -0,0 +1,7 @@
+start nodemon SimulationManager/server.js
+start nodemon FloodSim/server.js
+start nodemon CriticalObjectSim/server.js
+start nodemon ElectricalNetworkSim/server.js
+start nodemon HazardousObjectSim/server.js
+start nodemon RoadSim/server.js
+start nodemon CommunicationSim/server.js


Update upload.bat

Update upload.bat

--- conda/upload.bat
+++ conda/upload.bat
@@ -56,11 +56,6 @@

 for %%x in (%UPLOAD_TARGETS%) do (
   set UPLOAD_TARGET=%%x
-::  for /f %%i in ('conda build %%x -c %ANACONDA_CHANNEL% %ANACONDA_UPLOAD_FLAGS% --output') do (set UPLOAD_FILE=%%i)
-::    anaconda upload --user %ANACONDA_CHANNEL% %UPLOAD_FILE%
-::    if %errorlevel% neq 0 (
-::      echo "upload failed"
-::    )
 )

 anaconda logout


Append to JRUBY_OPTS instead of overriding it

--- tools/rails/bin/jruby.bat
+++ tools/rails/bin/jruby.bat
@@ -7,5 +7,5 @@
 set GEM_PATH=%JRUBY_BASE%\lib\ruby\gems\shared;%GEM_HOME%
 set PATH=%JRUBY_BASE%\bin;%PATH%

-set JRUBY_OPTS='-J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 -J-Djruby.compile.invokedynamic=false -J-Djruby.compile.mode=OFF'
+set JRUBY_OPTS='-J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 -J-Djruby.compile.invokedynamic=false -J-Djruby.compile.mode=OFF %JRUBY_OPTS%'
 %JRUBY_BASE%\bin\jruby.bat %*


ARROW-4185: [Rust] Change directory before running Rust examples on Windows

Author: Andy Grove <andygrove73@gmail.com>

Closes #3341 from andygrove/ARROW-4185 and squashes the following commits:

c9fa73e <Andy Grove> Change directory before running Rust examples

--- ci/rust-build-main.bat
+++ ci/rust-build-main.bat
@@ -36,6 +36,7 @@
 @echo
 @echo Run example (release)
 @echo ---------------------
+cd arrow
 cargo run --example builders --target %TARGET% --release || exit /B
 cargo run --example dynamic_types --target %TARGET% --release || exit /B
 cargo run --example read_csv --target %TARGET% --release || exit /B


Put back echo and python

Put back echo and python

--- start_archiver_access_cmd.bat
+++ start_archiver_access_cmd.bat
@@ -1,4 +1,4 @@
-
+@echo off
 setlocal
 set MYDIRBLOCK=%~dp0
 call %MYDIRBLOCK%..\..\..\config_env_base.bat
@@ -10,4 +10,4 @@

 set PYTHONUNBUFFERED=TRUE

-%PYTHON% %MYDIRBLOCK%ArchiverAccess\archiver_access.py
+%PYTHONW% %MYDIRBLOCK%ArchiverAccess\archiver_access.py


corrected output from createRelease.bat

corrected output from createRelease.bat

--- Build/createRelease.bat
+++ Build/createRelease.bat
@@ -28,7 +28,7 @@
 echo Created a new nuget package to output folder.
 echo.
 echo Remember to...
-echo * Tag current changeset with version %version%
+echo * Tag current changeset with version %nugetversion%
 echo * Update release notes
 echo * Push changes to server repo
 echo * Push nuget package to nuget server (and symbol server)


Initial version.

Initial version.

error: pathspec 'topographica-win/create_python_topo/setup.bat' did not match any file(s) known to git

--- topographica-win/create_python_topo/setup.bat
+++ topographica-win/create_python_topo/setup.bat
@@ -0,0 +1,40 @@
+@echo off
+REM assumes we're going to c:\Python24
+
+set startdir=%CD%
+
+..\util\gunzip -c ..\..\external\Pmw.tgz > ..\..\external\Pmw.tar
+..\util\tar xvf ..\..\external\Pmw.tar
+copy ..\..\external\Pmw .
+
+cd ..
+xcopy /E /I create_python_topo c:\create_python_topo
+REM CEBHACKALERT: because the msi won't run from this directory, at least
+REM on my PC! Why? Is it a path problem?
+c:
+cd create_python_topo
+
+
+start /w msiexec /i python-2.4.2.msi ALLUSERS=0 TARGETDIR=c:\python24 ADDLOCAL=DefaultFeature,TclTk
+start /w Numeric-24.2.win32-py2.4.exe
+start /w matplotlib-0.81.win32-py2.4.exe
+start /w PIL-1.1.5.win32-py2.4.exe
+
+xcopy /E /I Pmw c:\python24\Lib\site-packages\
+
+REM ** For fixedpoint, the patched version from unix is used.
+copy fixedpoint-0.1.2_patched.py c:\python24\Lib\site-packages\fixedpoint.py
+
+cd ..
+rmdir /Q /S create_python_topo
+
+echo.
+echo.
+echo Now test this has worked by renaming c:\Python24 to c:\python_topo
+echo and replacing your copy of Topographica's python_topo with this new one.
+echo.
+echo If successful, tar.gz this python_topo and add it to cvs at
+echo topographica-win\common\python_topo.tar.gz.
+echo.
+echo.
+pause


build on windows

build on windows

--- web/make.bat
+++ web/make.bat
@@ -7,7 +7,9 @@

 @rem build
 @pushd %SRC%
-@call tsc
+@call dir /b /s *.ts > src.txt
+@call tsc @src.txt --target ES5 --sourceMap --out ../dist/app.js
+@call rm src.txt
 @popd

 @rem copy web client files


10s mspdbsrv timeout

10s mspdbsrv timeout

--- vc-cmake.bat
+++ vc-cmake.bat
@@ -7,4 +7,4 @@
 set CXX=

 rem FIXME: https://bugs.winehq.org/show_bug.cgi?id=38859
-start mspdbsrv.exe -start -spawn -shutdowntime -1
+start mspdbsrv.exe -verbose -start -spawn -shutdowntime 10


add .cmd runner for psake

add .cmd runner for psake

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

--- psake.cmd
+++ psake.cmd
@@ -0,0 +1,11 @@
+@echo off
+
+if '%1'=='/?' goto help
+if '%1'=='-help' goto help
+if '%1'=='-h' goto help
+
+powershell -NoProfile -ExecutionPolicy Bypass -Command "& '%~dp0\psake.ps1' %*; if ($psake.build_success -eq $false) { exit 1 } else { exit 0 }"
+exit /B %errorlevel%
+
+:help
+powershell -NoProfile -ExecutionPolicy Bypass -Command "& '%~dp0\psake.ps1' -help"


解决发布失败的问题

解决发布失败的问题

--- tools/build-efront.bat
+++ tools/build-efront.bat
@@ -5,7 +5,7 @@
 pushd
 cd %~dp0..
 echo %cd%
-set coms_path=./coms,./
+set coms_path=./coms
 set page_path=./coms
 set public_path=./public
 set export_to=node


udpate major version

udpate major version

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


Fixing path issue in installer.bat.

Fixing path issue in installer.bat.

--- de.woq.osgi.java.installer/src/main/resources/install-service.bat
+++ de.woq.osgi.java.installer/src/main/resources/install-service.bat
@@ -8,7 +8,7 @@

 pushd
 set KARAF_HOME=%cd%
-set JAVA_HOME=%KARAF_HOME%\jre
+set KARAF_JAVA_HOME=%KARAF_HOME%\jre
 popd

 set CLASSPATH=
@@ -17,4 +17,4 @@
   set CLASSPATH=!CLASSPATH!;%%f
 )

-%JAVA_HOME%\bin\java -cp %CLASSPATH% -DKARAF_JAVA_HOME=%JAVA_HOME% de.woq.osgi.java.installer.ServiceInstaller -b %KARAF_HOME% -n %SERVICE_NAME%+%JAVA_HOME%\bin\java -cp %CLASSPATH% -DKARAF_JAVA_HOME=%KARAF_JAVA_HOME% de.woq.osgi.java.installer.ServiceInstaller -b %KARAF_HOME% -n %SERVICE_NAME%


src: add race.bat

src: add race.bat

R=golang-dev, dave, alex.brainman
CC=golang-dev
https://codereview.appspot.com/7133064

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

--- src/race.bat
+++ src/race.bat
@@ -0,0 +1,52 @@
+:: Copyright 2013 The Go Authors. All rights reserved.
+:: Use of this source code is governed by a BSD-style
+:: license that can be found in the LICENSE file.
+
+:: race.bash tests the standard library under the race detector.
+:: http://golang.org/doc/articles/race_detector.html
+
+@echo off
+
+setlocal
+
+if exist make.bat goto ok
+echo race.bat must be run from go\src
+:: cannot exit: would kill parent command interpreter
+goto end
+:ok
+
+call make.bat --dist-tool >NUL
+if errorlevel 1 goto fail
+.\cmd\dist\dist env -wp >env.bat
+if errorlevel 1 goto fail
+call env.bat
+del env.bat
+
+if %GOHOSTARCH% == amd64 goto continue
+echo Race detector is only supported on windows/amd64.
+goto fail
+
+:continue
+call make.bat --no-banner --no-local
+if %GOBUILDFAIL%==1 goto end
+echo # go install -race std
+go install -race std
+if errorlevel 1 goto fail
+echo # go test -race -short -std
+go test -race -short std
+if errorlevel 1 goto fail
+echo # go test -race -run=nothingplease -bench=.* -benchtime=.1s -cpu=4 std
+go test -race -run=nothingplease -bench=.* -benchtime=.1s -cpu=4 std
+if errorlevel 1 goto fail
+goto succ
+
+:fail
+set GOBUILDFAIL=1
+echo Fail.
+goto end
+
+:succ
+echo All tests passed.
+
+:end
+


fix comment syntax, add vagrant up command

--- create.bat
+++ create.bat
@@ -2,12 +2,15 @@

 if not exist tmp mkdir tmp

-set /p NAME="Username: "
-/* TODO: Make files with newlines. This would add a newline. echo %NAME% > tmp/user-name.txt */
-echo|set /p=%NAME% > tmp/user-name.txt
+set /p USER_NAME="User name: "
+:: TODO: Make files with newlines. This would add a newline.
+::echo %USER_NAME% > tmp/user-name.txt
+echo|set /p=%USER_NAME% > tmp/user-name.txt

 set /p FULL_NAME="Full name: "
 echo|set /p=%FULL_NAME% > tmp/full-name.txt

 set /p DOMAIN="Domain: "
 echo|set /p=%DOMAIN% > tmp/domain.txt
+
+vagrant up


Small change to doc build to output to alternate repo for pushing to gh-pages.

--- Doc/build.bat
+++ Doc/build.bat
@@ -1,3 +1,4 @@
 rmdir /S /Q Api
 mkdir Api
-"C:\Program Files\doxygen\bin\doxygen.exe" Doxyfile+"C:\Program Files\doxygen\bin\doxygen.exe" Doxyfile
+robocopy Api ..\..\NiceThreads.Doc /E /TEE /R:0


Fix dart2js bat to support paths with parenthesis in
Review URL: https://chromiumcodereview.appspot.com//57483004

git-svn-id: c93d8a2297af3b929165606efe145742a534bc71@29799 260f80e4-7a28-3924-810f-c04153c831b5

--- sdk/bin/dart2js.bat
+++ sdk/bin/dart2js.bat
@@ -54,8 +54,8 @@
 setlocal
 for %%i in (%1) do set result=%%~fi
 set current=
-for /f "tokens=2 delims=[]" %%i in ('dir /a:l ^"%~dp1^" 2^>nul ^
-                                     ^| find ">     %~n1 ["') do (
+for /f "usebackq tokens=2 delims=[]" %%i in (`dir /a:l "%~dp1" 2^>nul ^
+                                             ^| find ">     %~n1 ["`) do (
   set current=%%i
 )
 if not "%current%"=="" call :follow_links "%current%", result


Update bld.bat

Update bld.bat

--- libboost-python/bld.bat
+++ libboost-python/bld.bat
@@ -7,10 +7,10 @@
 CALL .\bootstrap.bat mingw
 IF errorlevel 1 exit 1
 dir .
-CALL .\b2.exe install toolset=gcc --prefix=..\..\b2_for_mingw
+CALL .\b2.exe install toolset=gcc --prefix=%LIBRARY_PREFIX%
 cd ..\..
 dir .
-set PATH=%PATH%;.\b2_for_mingw\bin
+set PATH=%PATH%;%LIBRARY_BIN%

 :: Build step
 CALL b2 install ^


Using .cmd comments

Using .cmd comments

--- tools/buildTemplatesNuget.cmd
+++ tools/buildTemplatesNuget.cmd
@@ -3,14 +3,17 @@
 nuget pack -Version 1.0.0
 dotnet new -i GeneticSharp.Templates.1.0.0.nupkg

-# GeneticSharpConsoleApp
+rem GeneticSharpConsoleApp
 dotnet new GeneticSharpConsoleApp -n ConsoleApp -o ConsoleApp
-dotnet build ConsoleApp/ConsoleApp.csproj # We don't run it, because this templates throw an exception asking to programmer to implement the Chromomosome representation.
+rem We don't run it, because this templates throw an exception asking to programmer to implement the Chromomosome representation.
+dotnet build ConsoleApp/ConsoleApp.csproj

-# GeneticSharpTspConsoleApp
+rem GeneticSharpTspConsoleApp
 dotnet new GeneticSharpTspConsoleApp -n TspConsoleApp -o TspConsoleApp
 dotnet run TspConsoleApp/TspConsoleApp.csproj

-# GeneticSharpTspUnity3d
+rem GeneticSharpTspUnity3d
 dotnet new GeneticSharpTspUnity3d -n TspUnity3d -o TspUnity3d
-# We don't build this template, because it needs Unity3d installed.+rem We don't build this template, because it needs Unity3d installed.
+
+cd -


Create build.bat

Create build.bat

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

--- deploy/win/build.bat
+++ deploy/win/build.bat
@@ -0,0 +1,35 @@
+:: builds
+set PATH=C:\Python36-x64;C:\projects\;%PATH%
+
+if "%PLATFORM%" == "mingw53_32" (
+	call %~dp0\build-mingw.bat || exit /B 1
+) else (
+	:: prepare vcvarsall
+	if "%APPVEYOR_BUILD_WORKER_IMAGE%" == "Visual Studio 2017" (
+		set VC_DIR="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat"
+	)
+	if "%APPVEYOR_BUILD_WORKER_IMAGE%" == "Visual Studio 2015" (
+		set VC_DIR="C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat"
+	)
+
+	:: winrt: skip tests
+	echo %PLATFORM% | findstr /C:"winrt" > nul && (
+		set NO_TESTS=true
+	)
+
+	:: find the varsall parameters
+	if "%PLATFORM%" == "msvc2017_64" set VC_VARSALL=amd64
+	if "%PLATFORM%" == "winrt_x64_msvc2017" set VC_VARSALL=amd64_x86
+	if "%PLATFORM%" == "winrt_x86_msvc2017" set VC_VARSALL=amd64_x86
+	if "%PLATFORM%" == "winrt_armv7_msvc2017" set VC_VARSALL=amd64_x86
+	if "%PLATFORM%" == "msvc2015_64" set VC_VARSALL=amd64
+	if "%PLATFORM%" == "msvc2015" set VC_VARSALL=amd64_x86
+	if "%PLATFORM%" == "static" (
+		set VC_VARSALL=amd64
+		set NO_TESTS=true
+		echo CONFIG += static_host_build >> .qmake.conf
+	)
+
+	:: build
+	call %~dp0\build-msvc.bat || exit /B 1
+)


e 2.0.0

e 2.0.0

--- e-upm/gradlew.bat
+++ e-upm/gradlew.bat
@@ -14,7 +14,7 @@
 set APP_HOME=%DIRNAME%

 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-@rem set  DEFAULT_JVM_OPTS=-Dfile.encoding=UTF-8
+@rem set DEFAULT_JVM_OPTS=-Dfile.encoding=UTF-8

 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome


The python3 bin directory no longer needs to be added to PATH.

Bug: 1003139
Change-Id: Iaa288b8b4b2090ac055f53b6b0e116a7874e8bee
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3570881
Reviewed-by: Chenlin Fan <ade7e59805b81f027d537665b2c12c1956198b97@chromium.org>
Reviewed-by: Bruce Dawson <fe9e26f3989304bf7275ed139c57fd059c63d22d@chromium.org>
Reviewed-by: Josip Sokcevic <4606aec58cba917397ff2e4738f995e4758694f8@google.com>
Commit-Queue: Brian Ryner <388ea68edb4d8f934960c128120aee09a8f854bf@google.com>

--- vpython3.bat
+++ vpython3.bat
@@ -3,11 +3,8 @@
 :: Use of this source code is governed by a BSD-style license that can be
 :: found in the LICENSE file.

-:: TODO(crbug.com/1003139): Remove.
-:: Add Python 3 to PATH to work around crbug.com/1003139.
 setlocal
 for /f %%i in (%~dp0python3_bin_reldir.txt) do set PYTHON3_BIN_RELDIR=%%i
-set PATH=%~dp0%PYTHON3_BIN_RELDIR%;%~dp0%PYTHON3_BIN_RELDIR%\Scripts;%~dp0%PYTHON3_BIN_RELDIR%\DLLs;%PATH%

 call "%~dp0\cipd_bin_setup.bat" > nul 2>&1
 "%~dp0\.cipd_bin\vpython3.exe" -vpython-interpreter "%~dp0\%PYTHON3_BIN_RELDIR%\python3.exe" %*


filesystem: use matching icon for console

Helps identifying window thumbnails when switching between MSYS and MINGW64 consoles

--- filesystem/msys2_shell.cmd
+++ filesystem/msys2_shell.cmd
@@ -93,13 +93,16 @@
 set msys2_shiftCounter=
 set msys2_full_cmd=

-rem Setup proper title
+rem Setup proper title and icon
 if "%MSYSTEM%" == "MINGW32" (
   set "CONTITLE=MinGW x32"
+  set "CONICON=mingw32.ico"
 ) else if "%MSYSTEM%" == "MINGW64" (
   set "CONTITLE=MinGW x64"
+  set "CONICON=mingw64.ico"
 ) else (
   set "CONTITLE=MSYS2 MSYS"
+  set "CONICON=msys2.ico"
 )

 if "x%MSYSCON%" == "xmintty.exe" goto startmintty
@@ -110,9 +113,9 @@
 set MSYSCON=mintty.exe
 :startmintty
 if not defined MSYS2_NOSTART (
-  start "%CONTITLE%" "%WD%mintty" -i /msys2.ico -t "%CONTITLE%" "/usr/bin/%LOGINSHELL%" --login !SHELL_ARGS!
-) else (
-  "%WD%mintty" -i /msys2.ico -t "%CONTITLE%" "/usr/bin/%LOGINSHELL%" --login !SHELL_ARGS!
+  start "%CONTITLE%" "%WD%mintty" -i "/%CONICON%" -t "%CONTITLE%" "/usr/bin/%LOGINSHELL%" --login !SHELL_ARGS!
+) else (
+  "%WD%mintty" -i "/%CONICON%" -t "%CONTITLE%" "/usr/bin/%LOGINSHELL%" --login !SHELL_ARGS!
 )
 exit /b %ERRORLEVEL%

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


Register The Silver Searcher installation, so that winget can list it and uninstall it.

--- win32/winget/setup.bat
+++ win32/winget/setup.bat
@@ -7,16 +7,21 @@
 :#                                                                            #
 :#  Notes 	                                                              #
 :#                                                                            #
-:#  Authors     JFL "Jean-Franois Larvoire" <jf.larvoire@free.fr>            #
+:#  Authors     JFL "Jean-François Larvoire" <jf.larvoire@free.fr>            #
 :#                                                                            #
 :#  History                                                                   #
 :#   2020-06-03 JFL Created this script.                                      #
 :#   2020-07-01 JFL Added support for versions with 4 parts: X.Y.Z.T          #
+:#   2021-07-08 JFL Store Ag uninstallation information in the registry.      #
+:#                  Added option -u for testing this uninstallation.          #
+:#                  Allow testing the script from within the source tree.     #
+:#   2021-07-09 JFL Improved the debugging framework.                         #
+:#                  Use regedit.exe instead of multiple calls to reg.exe.     #
 :#                                                                            #
 :##############################################################################

 setlocal EnableExtensions DisableDelayedExpansion &:# Make sure ! characters are preserved
-set "VERSION=2020-07-01"
+set "VERSION=2021-07-09"
 set "SCRIPT=%~nx0"		&:# Script name
 set "SNAME=%~n0"		&:# Script name, without its extension
 set "SPATH=%~dp0"		&:# Script path
@@ -26,54 +31,139 @@
 set ^"ARGS=%*^"			&:# Argument line
 setlocal EnableExtensions EnableDelayedExpansion &:# Use the ! expansion now on

+call :Debug.Init
 goto :Main

 :#----------------------------------------------------------------------------#
 :# Simple debug framework

-:# Do nothing
-:nop
+:Debug.Init
+set FOREACHLINE=for /f "delims="
+
+:# Define a LF variable containing a Line Feed ('\x0A')
+set LF=^
+%# The two blank lines here are necessary. #%
+%# The two blank lines here are necessary. #%
+
+:# Define a CR variable containing a Carriage Return ('\x0D')
+for /f %%a in ('copy /Z %COMSPEC% nul') do set "CR=%%a"
+
+:# Define variables for problematic characters, that cause parsing issues.
+:# Use the ASCII control character name, or the html entity name.
+:# Warning: The excl and hat characters need different quoting depending on context.
+set  "#percnt=%%"	&:# One percent sign
+set  "#excl=^!"		&:# One exclamation mark
+set  "#hat=^"		&:# One caret, aka. circumflex accent, or hat sign
+set ^"#quot=""		&:# One double quote
+set  "#apos='"		&:# One apostrophe
+set  "#amp=&"		&:# One ampersand
+set  "#vert=|"		&:# One vertical bar
+set  "#gt=>"		&:# One greater than sign
+set  "#lt=<"		&:# One less than sign
+set  "#sp= "		&:# One space
+set  "#tab=	"	&:# One tabulation
+set  "#cr=!CR!"		&:# One carrier return
+set  "#lf=!LF!"		&:# One line feed
+
+set "INDENT="
+set "+INDENT=call :IncIndent"
+set "-INDENT=call :DecIndent"
+set "ECHO=call :Echo"
+set "COMMENT=%ECHO% :#"
+set "ERROR=>&2 %ECHO% Error:"
+set "LOG=call :Log"
+set "LOGVARS=call :LogVars"
+set "LOGFILE=NUL"
+set "RETURN=call :Return"
+set "EXEC=call :Exec"
+set "PREPVAR=call :Prep2ExpandVar"
+
+:Debug.off
+set "ECHO.D=call :Log"
+set "ECHOVARS.D=call :LogVars"
+set "ENTER=call :Log call %%0 %%* & %+INDENT%"
+exit /b
+
+:Debug.on
+set "ECHO.D=call :Echo.d"
+set "ECHOVARS.D=call :EchoVars.d"
+set "ENTER=call :Echo call %%0 %%* & %+INDENT%"
+exit /b
+
+:# Change the debug output indentation
+:IncIndent
+set "INDENT=%INDENT%  "
+exit /b
+:DecIndent
+if defined INDENT set "INDENT=%INDENT:~2%"
 exit /b

 :# Trace the return from a subroutine, and do the actual return
 :Return
-setlocal
-set "ERR=%~1"
-if not defined ERR set "ERR=%ERRORLEVEL%"
-echo   exit /b %ERR%
-2>NUL (goto) & exit /b %ERR% &:# Pop one call stack, then return to the upper level
+:# gotcha: setlocal sometimes clears %ERRORLEVEL%, so the reading must be on same line
+setlocal & set "ERR=%~1" & if not defined ERR set "ERR=%ERRORLEVEL%"
+%ECHO.D% exit /b %ERR%
+endlocal & 2>NUL (goto) & %-INDENT% & exit /b %ERR% &:# Pop one call stack, then return to the upper level

 :# Display and log the definition of a multiple variables
 :EchoVars.d
-for %%v in (%*) do echo set %%v=!%%v!
+for %%v in (%*) do echo %INDENT%set "%%v=!%%v!"
 :LogVars
-for %%v in (%*) do %LOG% set %%v=!%%v!
+for %%v in (%*) do %LOG% set "%%v=!%%v!"
 exit /b

 :# Display and log a message
 :Echo
-echo %*
-%LOG% %*
-exit /b
-
-:# Display and log a batch comment
-:Comment
-%ECHO% :# %*
-exit /b
-
-:# Display a message, with a timestamp, into the log file
+setlocal EnableDelayedExpansion
+set ^"MSG=%*^"
+echo.!MSG!
+goto :Log.Msg
+
+:# Display and log a debug message
+:Echo.d
+setlocal EnableDelayedExpansion
+set ^"MSG=%*^"
+echo.%INDENT%!MSG!
+goto :Log.Msg
+
+:# Log a message, with a timestamp, into the log file
 :Log
-setlocal DisableDelayedExpansion
+setlocal EnableDelayedExpansion
+set ^"MSG=%*^"
+:Log.Msg
 call :Now
 set "NOW=%YEAR%-%MONTH%-%DAY% %HOUR%:%MINUTE%:%SECOND%.%MS%"
->>"%LOGFILE%" echo %NOW% %*
-endlocal
-exit /b
+>>"%LOGFILE%" echo %NOW% %INDENT%!MSG!
+endlocal & exit /b

 :# Display and log a batch command, and run it.
 :Exec
 %ECHO% %*
 %*
+exit /b
+
+:# Prepare one variable, in a local scope with !expansion! either on or off, for %expansion% in another scope with !expansion! on
+:Prep2ExpandVar     INVAR [OUTVAR]
+:# TO DO: Test and manage the case when the local expansion is off
+:# Prepare one variable, in a local scope with !expansion! on, for %expansion% in another scope with !expansion! on
+:Prep2ExpandVar.Eon INVAR [OUTVAR]
+if not [%2]==[] (
+  set "%~2="
+  if defined %1 set "%~2=!%~1!"
+  shift
+) &:# Fallthrough into :Prep2ExpandVars.Eon
+:# Prepare variables, in a local scope with !expansion! on, for %expansion% in another scope with !expansion! on
+:Prep2ExpandVars.Eon VAR [VAR ...]
+if defined %1 (
+  for %%e in (sp tab cr lf quot amp vert lt gt hat percnt) do ( :# Encode named character entities
+    for %%c in ("!#%%e!") do (
+      set "%~1=!%~1:%%~c= #%%e !"
+    )
+  )
+  call set "%~1=%%%~1:^!= #excl %%" 	& rem :# Encode exclamation points
+  call set "%~1=%%%~1: =^!%%"		& rem :# Encode final expandable entities
+)
+if not [%2]==[] shift & goto :Prep2ExpandVars.Eon
 exit /b

 :#----------------------------------------------------------------------------#
@@ -125,7 +215,82 @@
 if defined DIR goto :dirname.next
 set "DIR=."			&:# If empty, return the current directory
 :dirname.done
+%PREPVAR% DIR
 endlocal & set "%~2=%DIR%" & exit /b
+
+:#----------------------------------------------------------------------------#
+
+:IsAdmin
+>NUL 2>&1 "%SYSTEMROOT%\system32\cacls.exe" "%SYSTEMROOT%\system32\config\system"
+exit /b
+
+:#----------------------------------------------------------------------------#
+
+:# Get the current console code page.
+:GetCP %1=variable name
+for /f "tokens=2 delims=:" %%n in ('chcp') do for %%p in (%%n) do set "%1=%%p"
+exit /b
+
+:#----------------------------------------------------------------------------#
+
+:# Get a registry value content. Args: KEY NAME [VALUEVAR [TYPEVAR]]
+:GetRegistryValue
+%ENTER%
+setlocal enableextensions enabledelayedexpansion
+set "KEY=%~1"
+set "NAME=%~2"
+set "VALUEVAR=%~3"
+set "TYPEVAR=%~4"
+if not defined VALUEVAR set "VALUEVAR=VALUE"
+set "%VALUEVAR%="
+:# Returning the type is optional. Do not define a default for TYPEVAR.
+%ECHOVARS.D% KEY NAME VALUEVAR TYPEVAR
+if defined NAME (
+  set CMD=reg query "%KEY%" /v "%NAME%"
+) else (
+  set CMD=reg query "%KEY%" /ve
+)
+%ECHO.D% %CMD%
+set "RETCODE=1"
+:# For each line in CMD output...
+%FOREACHLINE% %%i in ('%CMD% 2^>NUL') do (
+  set "RETCODE=0"
+  set "LINE=%%i"
+  %ECHOVARS.D% LINE
+  :# Values are indented by 4 spaces.
+  set "HEAD=!LINE:~0,4!"
+  set "LINE=!LINE:~4!"
+  :# But extra lines of multi-lined values are indented by >20 spaces.
+  set "HEAD2=!LINE:~0,4!"
+  if "!HEAD!"=="    " if not "!HEAD2!"=="    " (
+    :# Some versions of reg.exe use 4 spaces as field separator; others use a TAB.
+    :# Change the 4-spaces around the REG_XX type word to a TAB.
+    set "TOKENS=!LINE:    =	!"
+    %ECHOVARS.D% TOKENS
+    :# Extract the value name as the first item before the first TAB.
+    :# Names can contain spaces, but assume they don't contain TABs.
+    for /f "tokens=1,2* delims=	" %%j in ("!TOKENS!") do (
+      set "NAME=%%j"
+      set "TYPE=%%k"
+      set "VALUE=%%l"
+      %ECHOVARS.D% NAME TYPE VALUE
+    )
+  )
+)
+%PREPVAR% VALUE
+endlocal & (if defined TYPEVAR set "%TYPEVAR%=%TYPE%") & set "%VALUEVAR%=%VALUE%" & %RETURN% %RETCODE%
+
+:#----------------------------------------------------------------------------#
+
+:# Append a file pathname to a list of pathnames if it's not already there
+:FileSet.append %1=LIST_VAR_NAME %2=VALUE
+setlocal EnableDelayedExpansion
+set "LIST=!%1!"
+set "FOUND=0"
+for %%e in (!LIST!) do if /i "%%~e"=="%~2" set "FOUND=1"
+if "%FOUND%"=="0" set "LIST=!LIST! %2"
+%PREPVAR% LIST
+endlocal & set "%1=%LIST%" & exit /b

 :#----------------------------------------------------------------------------#

@@ -179,19 +344,18 @@
 exit /b

 :CompareInteger %1=Integer1 %2=Integer2
-setlocal
-%ECHO.D% call %0 %*
 if "%1%2"=="" exit /b 0				&:# They're both empty, thus equal
 if "%2"=="" exit /b 1				&:# Integer1 > nothing
 if "%1"=="" exit /b -1				&:# nothing < Integer2
+setlocal
 set /a "DIFF=%1-%2"
 if "%DIFF%"=="0" endlocal & exit /b 0		&:# They're equal
 if "%DIFF:-=%"=="%DIFF%" endlocal & exit /b 1	&:# Integer1 > Integer2
 endlocal & exit /b -1				&:# Integer1 < Integer2

 :CompareVersions %1=Version1 %2=Version2
+%ENTER%
 setlocal
-%ECHO.D% call %0 %*
 call :SplitVer %1 V1MAJOR V1MINOR V1PATCH V1BUILD
 call :SplitVer %2 V2MAJOR V2MINOR V2PATCH V2BUILD
 call :CompareInteger %V1MAJOR% %V2MAJOR%
@@ -207,7 +371,8 @@

 :# Upgrade an existing instance of ag.exe
 :UpgradeAg %1=target_path
-%ECHO.D% call %0 %*
+%ENTER%
+:# Do not use setlocal, as we want to update many global variables
 call :GetAgVersion %1
 set "VERSIONS=%AG_VER%"
 for %%p in (MSVCLIBX PCRE PTHREADS ZLIB) do if defined %%p_VER set "VERSIONS=!VERSIONS!, %%p !%%p_VER!"
@@ -234,11 +399,13 @@
 ) else (
   %COMMENT% This is another unrelated port for Windows. Leaving it unchanged.
 )
-exit /b
+%RETURN%
+
+:#----------------------------------------------------------------------------#

 :# Install a new intance of ag.exe
 :InstallAg %1=source_dir %2=target_dir_var
-%ECHO.D% call %0 %*
+%ENTER%
 setlocal EnableDelayedExpansion
 set "SOURCE=%~1\ag.exe"
 set "DESTDIR=!%~2!"
@@ -246,8 +413,36 @@
 call :CondQuote DESTDIR
 if not exist !DESTDIR! %EXEC% md !DESTDIR!
 %EXEC% copy /y !SOURCE! !DESTDIR!
-endlocal & set "FOUND_%~1=%DESTDIR%"
-exit /b
+endlocal & set "FOUND_%~1=%DESTDIR%" & %RETURN%
+
+:#----------------------------------------------------------------------------#
+
+:# Uninstall a previous instance of Ag, using the uninstall command stored in the registry
+:UninstallAg
+%ENTER%
+setlocal EnableDelayedExpansion
+
+call :IsAdmin
+if errorlevel 1 (
+  %ERROR% This setup script must be run as Administrator
+  endlocal & %RETURN% 1
+)
+
+set "UNINSTALL_CMD="
+call :GetRegistryValue "%UNINSTALL_KEY%" UninstallString UNINSTALL_CMD
+if not defined UNINSTALL_CMD (
+  %ERROR% No previous instance of The Silver Searcher was found
+  endlocal & %RETURN% 1
+)
+%PREPVAR% UNINSTALL_CMD UNINSTALL_CMD_MSG &:# Make sure %ECHO% displays & characters correctly
+%ECHO% !UNINSTALL_CMD_MSG!
+%UNINSTALL_CMD%
+if errorlevel 1 (
+  %ERROR% The Silver Searcher uninstallation failed
+  endlocal & %RETURN% 1
+)
+%COMMENT% The Silver Searcher was uninstalled successfully
+endlocal & %RETURN% 0

 :#----------------------------------------------------------------------------#

@@ -258,6 +453,7 @@
 echo.
 echo Options:
 echo  -?    Display this help
+echo  -u    Uninstalls a previous instance of Ag, instead of installing a new one
 echo  -V    Display the script version
 echo  -X    Display the installation commands to execute, but don't run them
 echo.
@@ -271,22 +467,15 @@
 :#----------------------------------------------------------------------------#

 :Main
+set "LOGFILE=%TEMP%\ag_setup.log"
+
 set "SRCDIR[x86]=WIN32"
 set "SRCDIR[AMD64]=WIN64"

-set "COMMENT=call :Comment"
-set "ECHO=call :Echo"
-set "EXEC=call :Exec"
-set "RETURN=exit /b"
-set "ECHO.D=call :Log"
-set "ECHOVARS.D=call :LogVars"
-
-set "LOG=call :Log"
-set "LOGFILE=%TEMP%\ag_setup.log"
-
-set "QUIET=0"
-
-%LOG% --------------------------------------------------------
+set "UNINSTALL_KEY=HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\The Silver Searcher"
+set "INSTALLED_FILES="  &:# List of files installed or updated by this script
+
+%LOG% --------------------------------------------------------------------
 %LOG% %~f0 %*
 :# set >>"%LOGFILE%"

@@ -298,15 +487,28 @@
 if [%1]==[] goto :start
 if [%1]==[/?] goto :help
 if [%1]==[-?] goto :help
-if [%1]==[-d] set "ECHO.D=call :Echo" & set "ECHOVARS.D=call :EchoVars.d" & set "RETURN=call :Return" & goto :next_arg
+if [%1]==[-d] call :Debug.on & goto :next_arg
+if [%1]==[-u] call :UninstallAg & %RETURN%
 if [%1]==[-V] (echo %VERSION%) & exit /b 0
 if [%1]==[-X] set "EXEC=echo" & goto :next_arg
-if [%1]==[-y] set "QUIET=1" & goto :next_arg
->&2 echo Error: Unexpected argument: %1
-exit /b 1
+%ERROR% Unexpected argument: %1
+%RETURN% 1

 :start
+call :IsAdmin
+if errorlevel 1 (
+  %ERROR% This setup script must be run as Administrator
+  %RETURN% 1
+)
+
 cd "%SPATH%"
+:# In the winget package, ag.exe is there in the win32 subdirectory.
+:# But when testing setup.bat in the source tree, ag.exe is in "..\..\bin\win32".
+if not exist "win32\ag.exe" if exist "..\..\bin\win32\ag.exe" cd ..\..\bin
+if not exist "win32\ag.exe" (
+  %ERROR% Can't find ag.exe masters
+  %RETURN% 1
+)

 :# Get this new instance version
 call :GetAgVersion "win32\ag.exe"
@@ -325,6 +527,7 @@
   for %%a in ("%%~p\ag.exe") do if exist %%a (
     %COMMENT% Found %%~a
     call :UpgradeAg %%a
+    call :FileSet.append INSTALLED_FILES %%a
   )
 )

@@ -341,12 +544,16 @@
   for /f %%d in ("!SRCDIR[%%p]!") do if exist %%d\ag.exe ( :# Ex: %%d=WIN32 or %%d=WIN64
     %ECHOVARS.D% bindir_%%p FOUND_%%d
     if defined bindir_%%p if /i "!bindir_%%p!" neq "!FOUND_%%d!" (
-      for %%a in ("!bindir_%%p!\ag.exe") do if exist %%a (
-      	%COMMENT% Found %%~a
-	call :UpgradeAg %%a
-      ) else (
-      	%COMMENT% No ag.exe found in [bindir_%%p] = !bindir_%%p!
-	call :InstallAg %%d bindir_%%p
+      for %%a in ("!bindir_%%p!\ag.exe") do (
+      	if exist %%a (
+	  %COMMENT% Found %%~a
+	  call :UpgradeAg %%a
+	) else (
+	  %COMMENT% No ag.exe found in [bindir_%%p] = !bindir_%%p!
+	  call :InstallAg %%d bindir_%%p
+	  %ECHOVARS.D% FOUND_%%d
+	)
+	call :FileSet.append INSTALLED_FILES %%a
       )
     ) else (
       %LOG% Variable bindir_%%p is defined, but we already updated it as part of the PATH
@@ -358,9 +565,50 @@
 set "SRCDIR=!SRCDIR[%PROC%]!"
 if not defined SRCDIR set "SRCDIR=WIN32"
 if not defined bindir set "bindir=%windir%"
+set FOUND
+set SRCDIR
 if not defined FOUND_%SRCDIR% (
   %COMMENT% No ag.exe found for the %SRCDIR% architecture
   call :InstallAg %SRCDIR% bindir
-)
-
-exit /b 0
+  call :FileSet.append INSTALLED_FILES "%bindir%\ag.exe"
+)
+
+:# Make sure there's something to uninstall
+if not defined INSTALLED_FILES (
+  %ERROR% Nothing was installed
+  %RETURN% 1
+)
+set "INSTALLED_FILES=!INSTALLED_FILES:~1!" &:# Remove the initial space
+%ECHOVARS.D% INSTALLED_FILES
+
+:# Write the uninstall information into the registry
+:# This is used by winget.exe to locate previous installations.
+%COMMENT% Writing uninstall information into the registry
+call :SplitVer %NEW_AG_VER% V_MAJOR V_MINOR V_PATCH V_BUILD
+set QUOTED_KEY="!UNINSTALL_KEY!"
+set "UNINSTALL_STRING=%windir%\System32\cmd.exe /c del !INSTALLED_FILES! & reg delete !QUOTED_KEY! /f"
+set "UNINSTALL_STRING=!UNINSTALL_STRING:\=\\!"
+set "UNINSTALL_STRING=!UNINSTALL_STRING:"=\"!"
+%PREPVAR% UNINSTALL_STRING &:# Make sure all tricky characters like & get output correctly
+( :# The first echo begins with a UTF-8 BOM
+echo Windows Registry Editor Version 5.00
+echo.
+echo [!UNINSTALL_KEY!]
+echo "DisplayName"="The Silver Searcher"
+echo "DisplayVersion"="%NEW_AG_VER%"
+echo "Publisher"="Jean-François Larvoire"
+echo "UninstallString"="%UNINSTALL_STRING%"
+echo "URLInfoAbout"="https://github.com/JFLarvoire/the_silver_searcher"
+echo "VersionMajor"="%V_MAJOR%"
+echo "VersionMinor"="%V_MINOR%"
+) >"%TEMP%\ag_setup.reg"
+%LOG% type "%TEMP%\ag_setup.reg"
+>>"%LOGFILE%" type "%TEMP%\ag_setup.reg"
+%EXEC% regedit.exe /s "%TEMP%\ag_setup.reg"
+if errorlevel 1 (
+  %ERROR% Failed to import the uninstall information into the registry
+  %RETURN% 1
+)
+
+%COMMENT% The Silver Searcher was installed successfully
+%RETURN% 0


Dont run bash after bat command

Dont run bash after bat command

--- setup.bat
+++ setup.bat
@@ -1,2 +1 @@
 bash -c "./setup.sh"
-bash


add setting for windows

add setting for windows

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

--- setup.bat
+++ setup.bat
@@ -0,0 +1,7 @@
+mklink %USERPROFILE%\.vimrc %USERPROFILE%\dotfiles\.vimrc
+mklink %USERPROFILE%\.gvimrc %USERPROFILE%\dotfiles\.gvimrc
+mklink %USERPROFILE%\.gitignore %USERPROFILE%\dotfiles\.gitignore
+mklink %USERPROFILE%\.gitconfig %USERPROFILE%\dotfiles\.gitconfig
+mklink /d %USERPROFILE%\.vim %USERPROFILE%\dotfiles\.vim
+
+pause


Dont clear screen on startup

Dont clear screen on startup

--- init.bat
+++ init.bat
@@ -1,6 +1,4 @@
 @echo off
-
-cls

 chcp 65001>nul


- list delimiter under dos/win is a ; and not a :

git-svn-id: 4b3b87045ec33e1a2f7ddff44705baa56df11711@339 fee104cc-1dfa-8c0f-632d-d3b7e6b59fb0

--- shell.bat
+++ shell.bat
@@ -38,12 +38,12 @@
 set CP=%CP%;%shellPathLib%\js-1.6R1.jar

 REM Logging with log4j
-set CP=%CP%:%shellPathLib%\log4j-1.2.9.jar
+set CP=%CP%;%shellPathLib%\log4j-1.2.9.jar
 set CP=%CP%;%shellPathLib%\commons-logging-1.0.4.jar

 Rem digester to read xml files
-set CP=%CP%:%shellPathLib%\commons-digester-1.6.jar
-set CP=%CP%:%shellPathLib%\commons-beanutils-1.6.jar
+set CP=%CP%;%shellPathLib%\commons-digester-1.6.jar
+set CP=%CP%;%shellPathLib%\commons-beanutils-1.6.jar

 REM used for toString methods
 set CP=%CP%;%shellPathLib%\commons-lang-2.1.jar
@@ -67,7 +67,7 @@
 REM used for stores
 REM set CP=%CP%;%derbyLibPath%\commons-vfs-20050307052300.jar
 REM database driver
-REM set CP=%CP%;%JH%\oracle-drivers\ojdbc14_g.jar
+set CP=%CP%;%JH%\oracle-drivers\ojdbc14_g.jar

 echo Classpath:
 echo ~~~~~~~~~~


Fixed offline install

Fixed offline install

--- setup.bat
+++ setup.bat
@@ -9,18 +9,18 @@
 REM EXIT /B 0

 easy_install -q submodule\conveyor_bins\python\pyserial-2.7_mb2.1-py2.7.egg
-easy_install -q submodule\conveyor_bins\python\mock-1.0.1-py$PYVERSION.egg
-easy_install -q submodule\conveyor_bins\python\lockfile-0.9.1-py$PYVERSION.egg
-easy_install -q submodule\conveyor_bins\python\python_daemon-1.5.5-py$PYVERSION.egg
-easy_install -q submodule\conveyor_bins\python\argparse-1.2.1-py$PYVERSION.egg
-easy_install -q submodule\conveyor_bins\python\unittest2-0.5.1-py$PYVERSION.egg
-easy_install -q submodule\conveyor_bins\python\pyserial-2.7_mb2.1-py$PYVERSION.egg
+easy_install -q submodule\conveyor_bins\python\mock-1.0.1-py2.7.egg
+easy_install -q submodule\conveyor_bins\python\lockfile-0.9.1-py2.7.egg
+easy_install -q submodule\conveyor_bins\python\python_daemon-1.5.5-py2.7.egg
+easy_install -q submodule\conveyor_bins\python\argparse-1.2.1-py2.7.egg
+easy_install -q submodule\conveyor_bins\python\unittest2-0.5.1-py2.7.egg
+easy_install -q submodule\conveyor_bins\python\pyserial-2.7_mb2.1-py2.7.egg

 GOTO DONE

 :DIRNOTEXISTS
-python virtualenv.py virtualenv
+python virtualenv.py --extra-search-dir=submodule/conveyor_bins/python --never-download virtualenv
 GOTO DIREXISTS

 :DONE


commit on 11/06/2018 at 16:06:34

commit on 11/06/2018 at 16:06:34

--- ansys-APDL/tranverseCrackAndDelamination.cmd
+++ ansys-APDL/tranverseCrackAndDelamination.cmd
@@ -178,3 +178,33 @@
 ET,2,PLANE183,1,,2      ! Quadratic plane strain triangles

 ALLSEL
+
+! Generate mesh
+! MSHKEY, KEY (0 == free, 1 == mapped)
+! AMESH, NA1, NA2, NINC
+MSHKEY, 1
+AMESH, 1, 2, 1
+MSHKEY, 0
+AMESH, 3, 4, 1
+
+FINISH              ! Finish pre-processing
+
+/SOLU               ! Enter the solution processor
+
+ANTYPE,0            ! Analysis type,static
+
+! Define Displacement Constraints on Lines   (dl command)
+! DL, LINE, AREA, Lab, Value1, Value2
+DL, 1, ,SYMM
+DL, 7, ,SYMM
+DL, 8, ,SYMM
+DL, 2, ,UX,appliedDisp
+DL, 3, ,UX,appliedDisp
+DL, 4, ,UX,appliedDisp
+DL, 5, ,UX,appliedDisp
+
+! Apply pressure, if present
+! SFL, Line, Lab, VALI, VALJ, VAL2I, VAL2J
+*IF, uniP, GT, 0.0, THEN
+   SFL, 8, PRES, uniP
+*ENDIF


Run WinMerge when finished

Run WinMerge when finished

--- src/DiffProject.cmd
+++ src/DiffProject.cmd
@@ -1,4 +1,10 @@
 rem @echo off
+
+set nxslt=..\lib\nxslt\nxslt.exe
+set graphviz=..\lib\GraphViz-2.30.1\bin
+set dotml=..\lib\dotml-1.4
+set xsltproc=..\lib\libxml\bin\xsltproc.exe
+set winmerge="D:\Program Files (x86)\WinMerge\WinMergeU.exe"

 set project=AmplaProject.xml
 set authstore=AuthStore.xml
@@ -22,11 +28,6 @@
 :Working_development_create
 mkdir Working\Development

-set nxslt=..\lib\nxslt\nxslt.exe
-set graphviz=..\lib\GraphViz-2.30.1\bin
-set dotml=..\lib\dotml-1.4
-set xsltproc=..\lib\libxml\bin\xsltproc.exe
-
 set directory=%production%
 set type=Production

@@ -41,3 +42,6 @@
 %nxslt% %directory%%project% StyleSheets\Project.Normalize.xslt -o Working\%type%\project.xml
 %xsltproc% -o Working\%type%\output.files.xml StyleSheets\Output.Project.Files.xslt Working\%type%\project.xml

+%winmerge% Working\Development Working\Production /r
+
+


updated the scalatest.bat file

updated the scalatest.bat file


Updating the sample application packager to create .rar files instead of .zip.

--- Setup/Archiver/Samples.cmd
+++ Setup/Archiver/Samples.cmd
@@ -13,7 +13,7 @@
 :: Settings for complete and (libs-only) package creation
 :: ---------------------------------------------------------
 set rar="C:\Program Files\WinRAR\winrar"
-set opts=a -m5 -s -afzip -ibck
+set opts=a -m5 -s
 set sampleDir=..\..\Samples\
 set outputDir=..\bin\samples\
 set sampleBin=\bin\x86\Release\
@@ -51,6 +51,7 @@

 :: Remove old files
+forfiles /p %outputDir% /m *.rar /c "cmd /c del @file"
 forfiles /p %outputDir% /m *.zip /c "cmd /c del @file"

 :: For each sample application project
@@ -67,7 +68,7 @@
    for %%c in ("A=a" "B=b" "C=c" "D=d" "E=e" "F=f" "G=g" "H=h" "I=i" "J=j" "K=k" "L=l" "M=m" "N=n" "O=o" "P=p" "Q=q" "R=r" "S=s" "T=t" "U=u" "V=v" "W=w" "X=x" "Y=y" "Z=z" " =-") do set fileName=!fileName:%%~c!

    :: Create the binary package
-   set binFileName=!fileName!.zip
+   set binFileName=!fileName!.rar

    :: Get the binary files folder
    set binFolder=!cur!%sampleBin%
@@ -80,7 +81,7 @@
    popd

    :: Create the sources package
-   set srcFileName=!fileName!.zip
+   set srcFileName=!fileName!.rar

    :: Get the binary files folder
    set srcFolder=!cur!


add windows build bat file

add windows build bat file

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

--- winbuild.bat
+++ winbuild.bat
@@ -0,0 +1,19 @@
+@ECHO OFF
+SETLOCAL
+
+SET build_dir=build
+SET src_dir=src
+SET obj_dir=%build_dir%\obj
+
+SET cc=clang
+SET cflags=-Wall -Wextra -Wno-deprecated-declarations -pedantic -Werror -std=c11 -Os
+
+RMDIR /S /Q %build_dir%
+MKDIR %obj_dir%
+
+%cc% %cflags%  -iquote%src_dir% -c %src_dir%\ciny.c -o %obj_dir%\ciny.o -v
+IF "%ERRORLEVEL%" NEQ "0" GOTO end
+
+:end
+ENDLOCAL
+EXIT /B %ERRORLEVEL%


Adding missing call to vrpathreg to remove driver in SteamVR_UninstallDriver.bat

--- src/openvr_plugin/SteamVR_UninstallDriver.bat
+++ src/openvr_plugin/SteamVR_UninstallDriver.bat
@@ -3,6 +3,7 @@

 echo "Unstalling PSMoveService SteamVR driver..."
 IF NOT EXIST "%INSTALL_DIR%" goto done
+"%STEAMVR_RUNTIME_DIR%\bin\win32\vrpathreg" removedriver "%INSTALL_DIR%"
 del /F /S /Q "%INSTALL_DIR%*.*"
 rmdir /S /Q "%INSTALL_DIR%"


HTML5 branch for AppVeyor build of CsoundQt (#793).

--- msvc/build_csoundqt.bat
+++ msvc/build_csoundqt.bat
@@ -6,8 +6,8 @@
     CONFIG+=perfThread_build ^
     QT+=xml ^
     DEFINES+="USE_DOUBLE=1" ^
-    CSOUND_API_INCLUDE_DIR=%~dp0/"../include" ^
-    CSOUND_INTERFACES_INCLUDE_DIR=%~dp0/"../interfaces" ^
+    CSOUND_API_INCLUDE_DIR="%APPVEYOR_BUILD_FOLDER%\include" ^
+    CSOUND_INTERFACES_INCLUDE_DIR="%APPVEYOR_BUILD_FOLDER%\interfaces" ^
     CSOUND_LIBRARY_DIR=%APPVEYOR_BUILD_FOLDER%\msvc\csound-vs\Release\ ^
     DEFAULT_CSOUND_LIBS=csound64.lib ^
     CSOUND_LIBRARY=csound64.lib ^


#7, fixing geodb.bat uncommenting lines

#7, fixing geodb.bat uncommenting lines

--- bin/geodb.bat
+++ bin/geodb.bat
@@ -26,20 +26,20 @@
 set JAVA="%JAVA_HOME%\bin\java.exe"

 @REM change directory to the lib directory
-@REM set CWD=%CD%
-@REM cd %~dp0../lib
-@REM
-@REM @REM build up the classpath
-@REM set CLASSPATH=;
-@REM FOR /R %%G IN (*.jar) DO (
-@REM     SET CLASSPATH=!CLASSPATH!;%%G
-@REM     )
-@REM
-@REM     cd %CWD%
-@REM     %JAVA% -cp "%CLASSPATH%" geodb.Prompt %1
-@REM     goto end
-@REM
-@REM     :error
-@REM     set ERROR_CODE=1
-@REM
-@REM     :end
+set CWD=%CD%
+cd %~dp0../lib
+
+@REM build up the classpath
+set CLASSPATH=;
+FOR /R %%G IN (*.jar) DO (
+  SET CLASSPATH=!CLASSPATH!;%%G
+)
+
+cd %CWD%
+%JAVA% -cp "%CLASSPATH%" geodb.Prompt %1
+goto end
+
+:error
+set ERROR_CODE=1
+
+:end


Made jitpack output unbuffered.

Made jitpack output unbuffered.

--- bin/build.cmd
+++ bin/build.cmd
@@ -35,7 +35,8 @@

 def jitpack(): Unit = {
   println("Triggering jitpack ...")
-  val r = Os.proc(ISZ(mill.string, "jitPack", "--owner", "sireum", "--repo", "runtime", "--lib", "library")).at(home).run()
+  val r = Os.proc(ISZ(mill.string, "jitPack", "--owner", "sireum", "--repo", "runtime", "--lib", "library")).
+    at(home).console.run()
   r match {
     case r: Os.Proc.Result.Normal =>
       println(r.out)


Delete hubot.cmd

Delete hubot.cmd

--- bin/hubot.cmd
+++ bin/hubot.cmd
@@ -1,3 +0,0 @@
-@echo off
-
-npm install && node_modules\.bin\hubot.cmd --name "sambot" %*


Changed libm

Changed libm

Changed the file names.

--- build-win.bat
+++ build-win.bat
@@ -1,7 +1,7 @@
 @echo off
 title win-build
 cd src
-nasm -f elf -o ..\libm.a libm.asm
+nasm -f elf -o ..\mlib.a mlib.asm
 if %errorlevel%==0 goto skip
 color C


(internal) make.cmd: Make constant URL to download LuaBinaries

--- make.cmd
+++ make.cmd
@@ -3,6 +3,8 @@
 @exit /b %ERRORLEVEL%

 set CMD "Cmd" -option constant
+set LUA64URL "https://sourceforge.net/projects/luabinaries/files/5.3.4/Windows%20Libraries/Dynamic/lua-5.3.4_Win64_dllw4_lib.zip/download" -option constant
+set LUA32URL "https://sourceforge.net/projects/luabinaries/files/5.3.4/Windows%20Libraries/Dynamic/lua-5.3.4_Win32_dllw4_lib.zip/download" -option constant

 Set-PSDebug -strict
 $VerbosePreference = "Continue"
@@ -355,14 +357,6 @@
     Do-Copy (Join-Path $folder lua53.dll) .
 }

-function Get-Lua64{
-    Get-Lua "https://sourceforge.net/projects/luabinaries/files/5.3.4/Windows%20Libraries/Dynamic/lua-5.3.4_Win64_dllw4_lib.zip/download" "amd64"
-}
-
-function Get-Lua32{
-    Get-Lua "https://sourceforge.net/projects/luabinaries/files/5.3.4/Windows%20Libraries/Dynamic/lua-5.3.4_Win32_dllw4_lib.zip/download" "386"
-}
-
 function Split-LikeShell($s){
     $rx = [regex]'"[^"]*"'
     while( $true ){
@@ -564,16 +558,16 @@
         }
     }
     "get-lua64" {
-        Get-Lua64
+        Get-Lua $LUA64URL "amd64"
     }
     "get-lua32" {
-        Get-Lua32
+        Get-Lua $LUA32URL "386"
     }
     "get-lua" {
         if( (Get-GoArch) -eq "amd64" ){
-            Get-Lua64
+            Get-Lua $LUA64URL "amd64"
         }else{
-            Get-Lua32
+            Get-Lua $LUA32URL "386"
         }
     }
     "help" {


Add `make get`: `go get -u github.com/mattn/go-isatty`

--- make.cmd
+++ make.cmd
@@ -45,6 +45,7 @@
         go get -u github.com/shiena/ansicolor
         go get -u github.com/atotto/clipboard
         go get -u github.com/zetamatta/goutputdebugstring
+        go get -u github.com/mattn/go-isatty
         goto end

 :package


Force a clean build so that "old" XML files don't get used, if they're all that's changed.

--- builddocs.bat
+++ builddocs.bat
@@ -1,4 +1,7 @@
 REM TODO: Don't do this in a batch file!
+
+REM Really force a clean build...
+rmdir /s /q src\NodaTime\bin\Release

 msbuild "src\NodaTime VS2010.sln" /property:Configuration=Release
 msbuild "tools\NodaTime.Tools.sln" /property:Configuration=Release


change sonar keyname

change sonar keyname

--- sonar.bat
+++ sonar.bat
@@ -6,7 +6,7 @@

 IF "%appveyor_build_version%" == "" set appveyor_build_version=1.0.0

-.\tools\sonarqube\runner\MSBuild.SonarQube.Runner.exe begin /d:sonar.login=%SONARQUBE_NEMO_TOKEN% /d:sonar.host.url=https://nemo.sonarqube.org /d:sonar.cs.opencover.reportsPaths=".\Artefacts\Coverage\output.xml" /n:"myob-sdk" /k:"myob-sdk" /v:"%appveyor_build_version%"
+.\tools\sonarqube\runner\MSBuild.SonarQube.Runner.exe begin /d:sonar.login=%SONARQUBE_NEMO_TOKEN% /d:sonar.host.url=https://nemo.sonarqube.org /d:sonar.cs.opencover.reportsPaths=".\Artefacts\Coverage\output.xml" /n:"myob-ar-dotnet-sdk" /k:"myob-ar-dotnet-sdk" /v:"%appveyor_build_version%"
 @IF ERRORLEVEL 1 exit /b

 "%programfiles(x86)%\MSBuild\12.0\Bin\MSBuild.exe" MYOB.API.SDK.sln /p:Configuration=release /t:rebuild


no commit message

no commit message

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

--- doc/package.bat
+++ doc/package.bat
@@ -0,0 +1,19 @@
+cd UCKeFu-WebIM
+call mvn clean
+call mvn install
+cd ..\UCKeFu-WeiXin
+call mvn clean
+call mvn install
+cd ..\UCKeFu-WorkOrders
+call mvn clean
+call mvn install
+cd ..\UCKeFu-XiaoE
+call mvn clean
+call mvn install
+cd ..\UCKeFu-CallCenter
+call mvn clean
+call mvn install
+cd ..\UCKeFu-All
+call mvn clean
+call mvn package
+cd ..


Windows: git: fix glog

Windows: git: fix glog

--- git/gitdoskey.bat
+++ git/gitdoskey.bat
@@ -24,5 +24,5 @@

 :: DOSKEY gac=git add -A && git commit -m *

-DOSKEY glog=git log --graph --pretty=format:"%Cred%h%Creset %an: %s - %Creset %C(yellow)%d%Creset %Cgreen(%cr)%Creset" --abbrev-commit --date=relative
+DOSKEY glog=git log --graph --abbrev-commit --date=relative


restructured

restructured

--- start.cmd
+++ start.cmd
@@ -7,6 +7,7 @@
 set kernelconfig=-kernel inet_dist_listen_min 7000 -kernel inet_dist_listen_max 7020
 set kernelconfigsrv=%kernelconfig% -kernel error_logger {file,\\\""%CD%/log/kernel.txt\\\""}
 set commonparams=%erlpaths% -emu_args -setcookie dderl -dderl port 443 -imem tcp_port 8125 -imem mnesia_schema_name dderlstag -s dderl
+set commonparamsnoapp=%erlpaths% -emu_args -setcookie dderl

 set name=-name dderl@%2
 set extra=-imem erl_cluster_mgr 'dderl@%3'
@@ -16,15 +17,21 @@
         @echo Adding dderl service
         erlsrv.exe add dderl -c "DDErl Service" -stopaction "init:stop()." -debugtype new -w %CD% %name% -args "%kernelconfigsrv% %commonparams% %extra%"
     ) else if "%1" == "gui" (
-        @echo Starting dderl service
-        start /MAX werl.exe %name% %kernelconfig% %erlpaths% %commonparams% %extra%
+        @echo Starting dderl local GUI
+        start /MAX werl.exe %name% %kernelconfig% %commonparams% %extra%
     ) else if "%1" == "txt" (
-        @echo Starting dderl
-        erl.exe %name% %kernelconfig% %erlpaths% %commonparams% %extra%
+        @echo Starting dderl local TEXT
+        erl.exe %name% %kernelconfig% %commonparams% %extra%
     ) else (
         @echo "Bad Argument '%1' '%2' '%3'"
         @echo "usage: cmd //C start.cmd [add node_host cluster_host | remove | start | stop | list | gui node_host cluster_host | txt node_host cluster_host]"
     )
+) else if "%1" == "guit" (
+    @echo Starting dderl local GUI
+    start /MAX werl.exe -name dderlt@%2 %kernelconfig% %commonparamsnoapp%
+) else if "%1" == "txtt" (
+    @echo Starting dderl local TEXT
+    erl.exe -name dderlt@%2 %kernelconfig% %commonparamsnoapp%
 ) else if "%1" == "remove" (
     @echo Removing dderl service
    erlsrv.exe remove dderl
@@ -38,5 +45,13 @@
     erlsrv.exe list dderl
 ) else (
     @echo "Bad Argument '%1'"
-    @echo "usage: cmd //C start.cmd (add node_host cluster_host | remove | start | stop | list | gui node_host cluster_host | txt node_host cluster_host)"
+    @echo "usage: cmd //C start.cmd add node_host cluster_host"
+    @echo "                         | remove"
+    @echo "                         | start"
+    @echo "                         | stop"
+    @echo "                         | list"
+    @echo "                         | gui node_host cluster_host"
+    @echo "                         | txt node_host cluster_host"
+    @echo "                         | guit node_host"
+    @echo "                         | txtt node_host"
 )


Add pause to start.cmd

Add pause to start.cmd

--- start.cmd
+++ start.cmd
@@ -1 +1,2 @@
-node server+node server
+pause


Add Windows ADK

Add Windows ADK

--- windows/build.bat
+++ windows/build.bat
@@ -1,5 +1,5 @@
 @echo on
-choco install -y --allowEmptyChecksum firefox googlechrome wget notepadplusplus sublimetext3 mono monodevelop gtksharp visualstudiocode p4merge dotnet4.5 nodejs.install conemu dejavufonts ag golang
+choco install -y --allowEmptyChecksum firefox googlechrome wget notepadplusplus sublimetext3 mono monodevelop gtksharp visualstudiocode p4merge dotnet4.5 nodejs.install conemu dejavufonts ag golang windows-adk-all
 call refreshenv

 wget -c https://cygwin.com/setup-x86_64.exe


Build.bat fixed.

Build.bat fixed.

--- src/build.bat
+++ src/build.bat
@@ -3,7 +3,7 @@
 set version=4.0.0
 set prereleasePostfix=
 set buildNumber=0
-set copyrightYear=2016
+set copyrightYear=2017

 set version_Core=%version%
 set version_Packaging=%version_Core%
@@ -18,9 +18,14 @@
 set version_Integration_AspNetCore=%version_Core%
 set version_Integration_AspNetCore_Mvc=%version_Core%

-call "%PROGRAMFILES%\Microsoft Visual Studio 14.0\Common7\Tools\vsvars32.bat"
-
-set msbuild="%PROGRAMFILES%\MSBuild\14.0\Bin\MSBuild.exe"
+set vsvars32_bat="%programfiles(x86)%\Microsoft Visual Studio 14.0\Common7\Tools\vsvars32.bat"
+set msbuild="%programfiles(x86)%\MSBuild\14.0\Bin\MSBuild.exe"
+
+if not exist %vsvars32_bat% goto :vsvars32_bat_missing
+if not exist %msbuild% goto :msbuild_exe_missing
+
+call vsvars32_bat
+
 set buildToolsPath=BuildTools
 set nugetTemplatePath=%buildToolsPath%\NuGet
 set ilmerge=%buildToolsPath%\ILMerge.exe
@@ -61,6 +66,7 @@
 if exist Releases\v%named_version% goto :release_directory_already_exists
 if not exist SimpleInjector.snk goto :strong_name_key_missing

+
 echo BUILDING
 rmdir %targetPathNet% /s /q
 mkdir %targetPathNet%
@@ -284,3 +290,10 @@
 echo The strong name key SimpleInjector.snk does not exist. You should generate (a fake) one for this build script to work.
 GOTO :EOF

+:msbuild_exe_missing
+echo Couldn't locate MSBuild.exe. Expected  it  to be here: %msbuild%
+GOTO :EOF
+
+:vsvars32_bat_missing
+echo Couldn't locate vsvars32.bat. Expected it to be here: %vsvars32_bat%
+GOTO :EOF


fix submodule checking.

fix submodule checking.

--- Bld/build.bat
+++ Bld/build.bat
@@ -35,6 +35,7 @@
 set NoSync=
 set CleanOnly=
 set NoClean=
+set SubmoduleOutOfDate=false

 :parseargs
 if /I "%1"=="debug" set Configuration=Debug
@@ -52,12 +53,27 @@
 shift
 goto :parseargs

+:checksubmodule
+for /f "usebackq tokens=1,2*" %%i in (`git submodule summary %1`) do (
+  if "%%j"=="%1" echo #### Submodule is out of date: %1 & set SubmoduleOutOfDate=true
+)
+
+goto :eof
+
 :step2

 if "%NoSync%"=="true" goto :nosync

-git submodule init
-git submodule update
+call :checksubmodule Ext/Formula
+call :checksubmodule Ext/Zing
+
+if "%SubmoduleOutOfDate%"=="false" goto :nosync
+
+
+:sync
+echo ### Fixing your submodules so they are up to date...
+git submodule sync --recursive
+git submodule update --init --recursive

 :nosync
 cd ext\zing


v1.1.1-TRON

--- resources/stage_1_tempclean/tempfilecleanup/TempFileCleanup.bat
+++ resources/stage_1_tempclean/tempfilecleanup/TempFileCleanup.bat
@@ -94,7 +94,6 @@
 		del /F /S /Q "%%x\Local Settings\Temporary Internet Files\*" 2>NUL
 		del /F /S /Q "%%x\Recent\*" 2>NUL
 		del /F /Q "%%x\My Documents\*.tmp" 2>NUL
-
 	)
 ) else (
 	for /D %%x in ("%SystemDrive%\Users\*") do (
@@ -123,11 +122,8 @@
 		del /F /S /Q "%%x\Recent\*" 2>NUL
 		del /F /Q "%%x\Documents\*.tmp" 2>NUL
 	)
-	REM Internet Explorer cleanup // Disabled for Tron, since Tron runs this command natively
-	REM rundll32.exe inetcpl.cpl,ClearMyTracksByProcess 4351
-)
-
-echo. && echo   Done. && echo.
+)
+
 echo.  && echo   Done. && echo.

@@ -203,6 +199,8 @@
 	rmdir /S /Q %WINDIR%\Help\Tours 2>NUL
 )

+:: JOB: Disable Windows Tour bubble popup (Windows XP only; new user accounts only)
+if %WIN_VER_NUM% lss 6.0 reg add "HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Applets\Tour" /v RunCount /t REG_DWORD /d 00000000 /f

 :: JOB: Windows Server: remove built-in media files (all Server versions)
 echo %WIN_VER% | findstr /i /c:"server" >NUL


Can't handle "help info" this way. Ignore for now.

--- test/help.cmd
+++ test/help.cmd
@@ -7,7 +7,6 @@
 ### ***   help commands         ***
 ### *******************************
 help foo
-help info
 # FIXME - the below should work
 # help
 # help step


Adding Downloads to WebApps folder

Adding Downloads to WebApps folder

--- Utilities/CreateOpsServerReleaseFolderStructure.bat
+++ Utilities/CreateOpsServerReleaseFolderStructure.bat
@@ -94,7 +94,7 @@
 REM ---------------------------------------
 set ops_webappsRootPath=%ops_rootInstallPath%\WebApps

-mkdir %ops_webappsRootPath%
+mkdir %ops_webappsRootPath%\Downloads

 @echo Done.


Small wmake.bat bug

Small wmake.bat bug

--- wmake.bat
+++ wmake.bat
@@ -26,6 +26,7 @@
 :print
     echo OUTDIR = %OUTDIR%
     echo TARGET = %TARGET%
+    exit /b 0

 :test
     if not exist %OUTDIR%\%TARGET% (


Set working directory of app shortcuts on Windows to current directory

--- CMake/RunInstalledWin32App.bat
+++ CMake/RunInstalledWin32App.bat
@@ -1 +1 @@
-start "" /B /D "%~dp0bin" "%~dp0bin\%~n0.exe" %*
+start "" /B "%~dp0bin\%~n0.exe" %*


add satis.bat

add satis.bat

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

--- bin/satis.bat
+++ bin/satis.bat
@@ -0,0 +1,4 @@
+@echo OFF
+:: in case DelayedExpansion is on and a path contains !
+setlocal DISABLEDELAYEDEXPANSION
+php "%~dp0satis" %*


Add FullBuild.cmd

Add FullBuild.cmd

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

--- FullBuild.cmd
+++ FullBuild.cmd
@@ -0,0 +1 @@
+msbuild.exe /m /nologo /t:CI /v:m /fl xunit.performance.msbuild /p:BuildAssemblyVersion=0.1.0.0 /p:BuildSemanticVersion=0.1.0-dev0001


The current bin/shoes.bat doesn't work on Windows. So, I did the following.

- bring back swt-shooose.bat
- delete the current shoes.bat
- rename the file name from swt-shooose.bat to shoes.bat

Now `C:\tmp\shoes4>bin\shoes samples\simple-sound.rb` works on Windows.

--- bin/shoes.bat
+++ bin/shoes.bat
@@ -1 +1 @@
-call jruby --1.9 -e "$LOAD_PATH.unshift File.expand_path('../lib', __FILE__); require 'shoes/cli'; Shoes::CLI.new.run('%3'.empty? ? ['%2', '%1', '%2'] : ['%3', '%1', '%2', '%3'])"
+call jruby --1.9 -e "$:<< 'lib'; require 'shoes'; require 'shoes/configuration'; Shoes.configuration.backend = :swt; require '%1' "


Fix for when argument contains spaces and double-quotes.

--- dragom-cli-tools-windows/dist/bin/dragom.cmd
+++ dragom-cli-tools-windows/dist/bin/dragom.cmd
@@ -61,7 +61,10 @@

 rem When a variable is empty, its evaluation with replacement (see below in for)
 rem does not work correctly.
-if "%ORG_ARGS%" == "" goto continue1
+rem We use delayed expansion as normal expansion does not work when the variable
+rem contains some combinations of spaces and double-quotes, such as
+rem -DPARAM="MY VALUE".
+if "!ORG_ARGS!" == "" goto continue1

 for /f %%A in ("%ORG_ARGS: =!NEWLINE!%") do (
   if "!STATE!" == "" (
@@ -146,7 +149,13 @@
 rem which would need to be escaped. We neglect handling them, except for ARGS
 rem which could include a --reference-path-matcher option that includes ">".

-if "%ARGS%" == "" goto continue2
+rem The computed arguments and options could very well include reserved characters
+rem which would need to be escaped. We neglect handling them, except for ARGS
+rem which could include a --reference-path-matcher option that includes ">".
+rem We use delayed expansion as normal expansion does not work when the variable
+rem contains some combinations of spaces and double-quotes, such as
+rem -DPARAM="MY VALUE".
+if "!ARGS!" == "" goto continue2

 set "ARGS=%ARGS:>=^>%"


Update engageOriginal.cmd

Update engageOriginal.cmd

--- bootstrap/peterkir/win32/engageOriginal.cmd
+++ bootstrap/peterkir/win32/engageOriginal.cmd
@@ -1,4 +1,4 @@
-@ECHO off
+@ECHO on
 SETLOCAL EnableExtensions
 SETLOCAL EnableDelayedExpansion


Adding wpmvc.bat : Windows version of the "create a new plugin" script

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

--- wpmvc.bat
+++ wpmvc.bat
@@ -0,0 +1,6 @@
+@echo off
+rem usage : wpmvc.bat generate plugin MyPlugin
+rem Make sure the PHP directory is set in the PATH environement variable
+for %%F in ("%0") do set mvc_core_path=%%~dpF
+set "mvc_core_path=%mvc_core_path%core\"
+php -q "%mvc_core_path%wpmvc.php" %*


fontall sees all fonts

fontall sees all fonts

--- testing/basic-text.bat
+++ testing/basic-text.bat
@@ -68,3 +68,17 @@
 %TESTBASE%\object-placement.trizbort
 echo One-room lines
 %TESTBASE%\one-room-lines.trizbort
+echo Fills in different shaped rooms
+%TESTBASE%\fill-different-room-shapes.trizbort
+echo Fills in dark rooms
+%TESTBASE%\fills-orange-region-dark.trizbort
+echo Fills in light rooms
+%TESTBASE%\fills-orange-region.trizbort
+echo Line colors
+%TESTBASE%\line-colors.trizbort
+echo odd room links to itself
+%TESTBASE%\room-link-to-itself.trizbort
+echo use ctrl arrows to autolink
+%TESTBASE%\small-room-ctrl-arrow-test.trizbort
+echo stray line
+%TESTBASE%\stray-line.trizbort


add git permanently to PATH

add git permanently to PATH

--- scripts/install-packer-from-source.bat
+++ scripts/install-packer-from-source.bat
@@ -15,7 +15,15 @@
 set PATH=%PATH%;c:\go\bin

 call cinst git
-set PATH=%PATH%;c:\program files (x86)\git\cmd
+where git
+if ERRORLEVEL 1 call :addGitToUserPath
+goto GIT_DONE
+:addGitToUserPath
+for /F "tokens=2* delims= " %%f IN ('reg query "HKCU\Environment" /v Path ^| findstr /i path') do set OLD_USER_PATH=%%g
+reg add HKCU\Environment /v Path /d "%OLD_USER_PATH%;C:\Program Files (x86)\Git\cmd" /f
+set PATH=%PATH%;C:\Program Files (x86)\Git\cmd
+exit /b
+:GIT_DONE

 call cinst bzr
 set PATH=%PATH%;c:\program files (x86)\Bazaar


Подготовка блока отправки email к добавлению дополнительных условий отправки

--- backup-to-cloud-email-dev.cmd
+++ backup-to-cloud-email-dev.cmd
@@ -197,9 +197,14 @@
 if exist %Backup%\%DATE%.rar (forfiles /P %Backup% /M *.rar /D -%Number_Archives% /C "cmd /c del /q @PATH")

 rem  email    .
+::
+::
 if %Error%==1 (set Email_To_Subject="  "
-Email_To_Text=%Result%)
-
+Email_To_Text=%Result%
+goto Email_Send)
+
+
+:Email_Send
 rem   .
 ::  -smtp  - .
 ::  -port  - .


Update bld.bat

Update bld.bat

--- libboost-python/bld.bat
+++ libboost-python/bld.bat
@@ -5,61 +5,3 @@
 :: IF errorlevel 1 exit 1
 ECHO .\bootstrap.bat mingw
 CALL .\bootstrap.bat mingw
-:: IF errorlevel 1 exit 1
-:: ECHO .\b2.exe install toolset=gcc --prefix=%SRC_DIR%\b2_for_mingw
-:: CALL .\b2.exe install toolset=gcc --prefix=%SRC_DIR%\b2_for_mingw
-:: ECHO cd %SRCDIR%
-:: cd %SRCDIR%
-:: set PATH=%PATH%;%SRCDIR%\b2_for_mingw\bin
-:: ECHO b2 toolset=gcc --build-type=complete stage ^
-::      --build-dir=buildboost ^
-::      --prefix=%LIBRARY_PREFIX% ^
-::      address-model=%ARCH% ^
-::      variant=release ^
-::      threading=multi ^
-::      link=shared ^
-::      -j%CPU_COUNT% ^
-::      -s ZLIB_INCLUDE="%LIBRARY_INC%" ^
-::      -s ZLIB_LIBPATH="%LIBRARY_LIB%" ^
-::      --with-python
-:: CALL b2 toolset=gcc --build-type=complete stage ^
-::      --build-dir=buildboost ^
-::      --prefix=%LIBRARY_PREFIX% ^
-::      address-model=%ARCH% ^
-::      variant=release ^
-::      threading=multi ^
-::      link=shared ^
-::      -j%CPU_COUNT% ^
-::      -s ZLIB_INCLUDE="%LIBRARY_INC%" ^
-::      -s ZLIB_LIBPATH="%LIBRARY_LIB%" ^
-::      --with-python
-
-:: cd ..\..
-:: dir .
-:: CALL .\tools\build\b2.exe install toolset=gcc --prefix=%LIBRARY_PREFIX%
-:: dir .
-:: set PATH=%PATH%;%LIBRARY_BIN%
-::
-:: Build step
-:: CALL b2 install ^
-::     --build-dir=buildboost ^
-::     --prefix=%LIBRARY_PREFIX% ^
-::     toolset=gcc ^
-::     address-model=%ARCH% ^
-::     variant=release ^
-::     threading=multi ^
-::     link=shared ^
-::     -j%CPU_COUNT% ^
-::     -s ZLIB_INCLUDE="%LIBRARY_INC%" ^
-::     -s ZLIB_LIBPATH="%LIBRARY_LIB%" ^
-::     --with-python
-:: IF errorlevel 1 exit 1
-::
-:: :: Install fix-up for a non version-specific boost include
-:: move %LIBRARY_INC%\boost-1_61\boost %LIBRARY_INC%
-:: IF errorlevel 1 exit 1
-::
-:: Move dll's to LIBRARY_BIN
-:: move %LIBRARY_LIB%\*vc%LIB_VER%-mt-1_61.dll "%LIBRARY_BIN%"
-:: IF errorlevel 1 exit 1
-:: Status API Training Shop Blog About


Update bld.bat

Update bld.bat

--- libboost_python/bld.bat
+++ libboost_python/bld.bat
@@ -13,6 +13,8 @@
 call bootstrap.bat ^
     --with-libraries=python
 if errorlevel 1 exit 1
+
+echo %ARCH%

 CALL b2 install toolset=msvc-%MSVC_VER% ^
         address-model=%ARCH% ^


set the proxy in the boot2docker VM too

set the proxy in the boot2docker VM too

--- files/tools/scripts/b2d-start.bat
+++ files/tools/scripts/b2d-start.bat
@@ -40,8 +40,17 @@
 echo Mounting the shared folder inside the VM to %BK_ROOT_CYGPATH%
 boot2docker ssh -- sudo mount -t vboxsf billskitchen %BK_ROOT_CYGPATH%

-:: for proxies:
-:: see http://stackoverflow.com/a/29303930/2388971
+:: set / unset proxy in boot2docker VM
+:: for more on proxies, see http://stackoverflow.com/a/29303930/2388971
+if "%HTTP_PROXY%" == "" (
+  echo making sure no proxy is set in the boot2docker VM...
+  boot2docker ssh sudo rm -rf /var/lib/boot2docker/profile
+) else (
+  echo setting proxy in the boot2docker VM...
+  boot2docker ssh "echo 'export HTTP_PROXY=%HTTP_PROXY%; export HTTPS_PROXY=%HTTPS_PROXY%; export NO_PROXY=%NO_PROXY%;' | sudo tee /var/lib/boot2docker/profile"
+)
+boot2docker ssh sudo /etc/init.d/docker restart
+

 ENDLOCAL


Windows installer: no longer use the LR version in the target installation path. Fixes #151

--- install.bat
+++ install.bat
@@ -487,18 +487,17 @@
     temppath = os.getenv("temp").."\\LR-config-backup-"..tostring(math.random(10000))
     if exists(temppath) then temppath = nil end
   end
-  print("'"..temppath.."'")
   vars.CONFBACKUPDIR = temppath
   mkdir(vars.CONFBACKUPDIR)
   exec(S[[COPY "$PREFIX\config*.*" "$CONFBACKUPDIR" >NUL]])
-  exec(S[[COPY "$FULL_PREFIX\lua\luarocks\site_config*.*" "$CONFBACKUPDIR" >NUL]])
+  exec(S[[COPY "$PREFIX\lua\luarocks\site_config*.*" "$CONFBACKUPDIR" >NUL]])
 end

 -- restore previously backed up config files
 local function restore_config_files()
   if not vars.CONFBACKUPDIR then return end -- there is no backup to restore
   exec(S[[COPY "$CONFBACKUPDIR\config*.*" "$PREFIX" >NUL]])
-  exec(S[[COPY "$CONFBACKUPDIR\site_config*.*" "$FULL_PREFIX\lua\luarocks" >NUL]])
+  exec(S[[COPY "$CONFBACKUPDIR\site_config*.*" "$PREFIX\lua\luarocks" >NUL]])
   -- cleanup
   exec(S[[RD /S /Q "$CONFBACKUPDIR"]])
   vars.CONFBACKUPDIR = nil
@@ -610,11 +609,10 @@
 end

 vars.PREFIX = vars.PREFIX or os.getenv("PROGRAMFILES")..[[\LuaRocks]]
-vars.FULL_PREFIX = S"$PREFIX\\$VERSION"
-vars.BINDIR = vars.FULL_PREFIX
-vars.LIBDIR = vars.FULL_PREFIX
-vars.LUADIR = S"$FULL_PREFIX\\lua"
-vars.INCDIR = S"$FULL_PREFIX\\include"
+vars.BINDIR = vars.PREFIX
+vars.LIBDIR = vars.PREFIX
+vars.LUADIR = S"$PREFIX\\lua"
+vars.INCDIR = S"$PREFIX\\include"
 vars.LUA_SHORTV = vars.LUA_VERSION:gsub("%.", "")

 if INSTALL_LUA then
@@ -659,7 +657,7 @@
 ==========================

 Will configure LuaRocks with the following paths:
-LuaRocks        : $FULL_PREFIX
+LuaRocks        : $PREFIX
 Config file     : $CONFIG_FILE
 Rocktree        : $TREE_ROOT

@@ -689,18 +687,18 @@
 -- Install LuaRocks files
 -- ***********************************************************

-if exists(vars.FULL_PREFIX) then
+if exists(vars.PREFIX) then
   if not FORCE then
-    die(S"$FULL_PREFIX exists. Use /F to force removal and reinstallation.")
+    die(S"$PREFIX exists. Use /F to force removal and reinstallation.")
   else
     backup_config_files()
-    print(S"Removing $FULL_PREFIX...")
-    exec(S[[RD /S /Q "$FULL_PREFIX"]])
+    print(S"Removing $PREFIX...")
+    exec(S[[RD /S /Q "$PREFIX"]])
     print()
   end
 end

-print(S"Installing LuaRocks in $FULL_PREFIX...")
+print(S"Installing LuaRocks in $PREFIX...")
 if not exists(vars.BINDIR) then
 	if not mkdir(vars.BINDIR) then
 		die()
@@ -916,17 +914,17 @@
 	-- expand template with correct path information
 	print()
 	print([[Loading registry information for ".rockspec" files]])
-	exec( S[[win32\lua5.1\bin\lua5.1.exe "$FULL_PREFIX\LuaRocks.reg.lua" "$FULL_PREFIX\LuaRocks.reg.template"]] )
-	exec( S[[regedit /S "$FULL_PREFIX\\LuaRocks.reg"]] )
+	exec( S[[win32\lua5.1\bin\lua5.1.exe "$PREFIX\LuaRocks.reg.lua" "$PREFIX\LuaRocks.reg.template"]] )
+	exec( S[[regedit /S "$PREFIX\\LuaRocks.reg"]] )
 end

 -- ***********************************************************
 -- Cleanup
 -- ***********************************************************
 -- remove regsitry related files, no longer needed
-exec( S[[del "$FULL_PREFIX\LuaRocks.reg.*" >NUL]] )
+exec( S[[del "$PREFIX\LuaRocks.reg.*" >NUL]] )
 -- remove pe-parser module
-exec( S[[del "$FULL_PREFIX\pe-parser.lua" >NUL]] )
+exec( S[[del "$PREFIX\pe-parser.lua" >NUL]] )

 -- ***********************************************************
 -- Exit handlers
@@ -946,8 +944,8 @@
   PATH     :   $LUA_BINDIR
   PATHEXT  :   .LUA
 LuaRocks;
-  PATH     :   $FULL_PREFIX
-  LUA_PATH :   $FULL_PREFIX\lua\?.lua;$FULL_PREFIX\lua\?\init.lua
+  PATH     :   $PREFIX
+  LUA_PATH :   $PREFIX\lua\?.lua;$PREFIX\lua\?\init.lua
 Local user rocktree (Note: %APPDATA% is user dependent);
   PATH     :   %APPDATA%\LuaRocks\bin
   LUA_PATH :   %APPDATA%\LuaRocks\share\lua\$LUA_VERSION\?.lua;%APPDATA%\LuaRocks\share\lua\$LUA_VERSION\?\init.lua


Autodetect Lua version in install.bat

Autodetect Lua version in install.bat

--- install.bat
+++ install.bat
@@ -41,6 +41,8 @@
 local NOADMIN = false
 local PROMPT = true
 local SELFCONTAINED = false
+
+local lua_version_set = false

 ---
 -- Some helpers
@@ -220,6 +222,7 @@
 			vars.TREE_CMODULE = option.value
 		elseif name == "/LV" then
 			vars.LUA_VERSION = option.value
+			lua_version_set = true
 		elseif name == "/L" then
 			INSTALL_LUA = true
 		elseif name == "/MW" then
@@ -287,8 +290,31 @@
 -- ***********************************************************
 -- Detect Lua
 -- ***********************************************************
+local function detect_lua_version(interpreter_path)
+	local handler = io.popen(('type NUL && "%s" -e "io.stdout:write(_VERSION)" 2>NUL'):format(interpreter_path), "r")
+	if not handler then
+		return nil, "interpreter does not work"
+	end
+	local full_version = handler:read("*a")
+	handler:close()
+
+	local version = full_version:match("^Lua (5%.[123])$")
+	if not version then
+		return nil, "unknown interpreter version '" .. full_version .. "'"
+	end
+	return version
+end
+
 local function look_for_interpreter(directory)
-	local names = {S"lua$LUA_VERSION.exe", S"lua$LUA_SHORTV.exe", "lua.exe", "luajit.exe"}
+	local names
+	if lua_version_set then
+		names = {S"lua$LUA_VERSION.exe", S"lua$LUA_SHORTV.exe"}
+	else
+		names = {"lua5.3.exe", "lua53.exe", "lua5.2.exe", "lua52.exe", "lua5.1.exe", "lua51.exe"}
+	end
+	table.insert(names, "lua.exe")
+	table.insert(names, "luajit.exe")
+
 	local directories
 	if vars.LUA_BINDIR then
 		-- If LUA_BINDIR is specified, look only in that directory.
@@ -302,16 +328,31 @@
 		for _, name in ipairs(names) do
 			local full_name = dir .. "\\" .. name
 			if exists(full_name) then
-				vars.LUA_INTERPRETER = name
-				vars.LUA_BINDIR = dir
-				print("       Found " .. full_name)
-				return true
+				print("       Found " .. name .. ", testing it...")
+				local version, err = detect_lua_version(full_name)
+				if not version then
+					print("       Error: " .. err)
+				else
+					if version ~= vars.LUA_VERSION then
+						if lua_version_set then
+							die("Version of interpreter clashes with the value of /LV. Please check your configuration.")
+						else
+							vars.LUA_VERSION = version
+							vars.LUA_SHORTV = version:gsub("%.", "")
+							vars.LUA_LIB_NAMES = vars.LUA_LIB_NAMES:gsub("5([%.]?)[123]", "5%1" .. version:sub(-1))
+						end
+					end
+
+					vars.LUA_INTERPRETER = name
+					vars.LUA_BINDIR = dir
+					return true
+				end
 			end
 		end
 	end

 	if vars.LUA_BINDIR then
-		die(S"Lua executable lua.exe, luajit.exe, lua$LUA_SHORTV.exe or lua$LUA_VERSION.exe not found in $LUA_BINDIR")
+		die(("Working Lua executable (one of %s) not found in %s"):format(table.concat(names, ", "), vars.LUA_BINDIR))
 	end
 	return false
 end
@@ -559,12 +600,8 @@
 			look_for_headers(vars.LUA_INCDIR)
 		then
 			if get_runtime() then
-				print("Runtime check completed, now testing interpreter...")
-				if exec(S[["$LUA_BINDIR\$LUA_INTERPRETER" -v 2>NUL]]) then
-					print("    Ok")
-					return true
-				end
-				print("   Interpreter returned an error, not ok")
+				print("Runtime check completed.")
+				return true
 			end
 		end
 		return false
@@ -580,12 +617,8 @@
 					if look_for_headers(directory) then
 						print("Headers found, checking runtime to use...")
 						if get_runtime() then
-							print("Runtime check completed, now testing interpreter...")
-							if exec(S[["$LUA_BINDIR\$LUA_INTERPRETER" -v 2>NUL]]) then
-								print("    Ok")
-								return true
-							end
-							print("   Interpreter returned an error, not ok")
+							print("Runtime check completed.")
+							return true
 						end
 					end
 				end


#99053# update

#99053# update

--- odk/setsdkenv_windows.bat
+++ odk/setsdkenv_windows.bat
@@ -1,35 +1,69 @@
+@echo off
+
 REM This script sets all enviroment variables, which
 REM are necessary for building the examples of the Office Development Kit.
 REM The Script was developed for the operating systems Windows.
 REM Before the script could be executed the following variables have to be
 REM adjusted:

-REM Directory of the make command.
-set SDK_MAKE=D:\MOVING\NextGenerationMake\make
-
 REM Installation directory of the Software Development Kit.
-set SDK_HOME=D:\MOVING\RESCUE\CvsLaufwerkD\api\odk
+REM Example: set SDK_HOME=D:\api\odk
+set SDK_HOME=

 REM Office installation directory.
-set OFFICE_HOME=C:\Programme\StarOffice6.0
+REM Example: set OFFICE_HOME=C:\Programme\StarOffice6.0
+set OFFICE_HOME=
+
+REM Directory of the make command.
+REM Example: set SDK_MAKE=D:\NextGenerationMake\make
+set SDK_MAKE=

 REM Directory of the C++ tools.
-set SDK_CPP_HOME=C:\Programme\Microsoft Visual Studio\VC98\bin
+REM Example:set SDK_CPP_HOME=C:\Programme\Microsoft Visual Studio\VC98\bin
+set SDK_CPP_HOME=

 REM Java installation directory.
-set SDK_JAVA_HOME=C:\Programme\Java\J2SDK_Forte\jdk1.4.0
+REM Example: set SDK_JAVA_HOME=C:\Programme\Java\J2SDK_Forte\jdk1.4.0
+set SDK_JAVA_HOME=

 REM ANT installation directory.
-REM set SDK_ANT=D:\MOVING\jakarta-ant-1.4
+REM Example: set SDK_ANT=D:\jakarta-ant-1.4
+REM set SDK_ANT=
+
+
+REM Check installation path for the StarOffice Development Kit.
+if not defined SDK_HOME goto error
+
+REM Check installation path for the office.
+if not defined OFFICE_HOME goto error

 REM Set library path.
-set LIB=%LIB%;%OFFICE_HOME%\program;%SDK_HOME%\windows\lib
+set LIB=%LIB%;%SDK_HOME%\windows\lib

 REM Set office program path.
 set OFFICE_PROGRAM_PATH=%OFFICE_HOME%\program

-REM Add directories to the path.
-set PATH=%PATH%;%SDK_HOME%\windows\bin;%SDK_MAKE%;%SDK_CPP_HOME%;%SDK_JAVA_HOME%\bin;%SDK_ANT%\bin
+REM Add directory of the SDK tools to the path.
+set PATH=%PATH%;%SDK_HOME%\windows\bin

-REM Set environment for c++ tools.
-call "%SDK_CPP_HOME%"\VCVARS32.bat
+REM Add directory of the command make to the path, if necessary.
+if defined SDK_MAKE set PATH=%PATH%;%SDK_MAKE%
+
+REM Add directory of the C++ tools to the path, if necessary.
+if defined SDK_CPP_HOME set PATH=%PATH%;%SDK_CPP_HOME%
+
+REM Add directory of the Java tools to the path, if necessary.
+if defined SDK_JAVA_HOME set PATH=%PATH%;%SDK_JAVA_HOME%\bin
+
+REM Add directory of the ANT tools to the path, if necessary.
+if defined SDK_ANT set PATH=%PATH%;%SDK_ANT%\bin
+
+REM Set environment for C++ tools, if necessary.
+if defined SDK_CPP_HOME call "%SDK_CPP_HOME%"\VCVARS32.bat
+
+goto end
+
+:error
+echo Error: Please insert the necessary environment variables into the batch file.
+
+:end


removed reference to skip developer packages when running composer

--- run-me.bat
+++ run-me.bat
@@ -1 +1 @@
-d:\www\AppForDeveloper\Composer\composer.bat update --profile --no-dev+d:\www\AppForDeveloper\Composer\composer.bat update --profile


Added sample.cmd

Added sample.cmd

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

--- sample.cmd
+++ sample.cmd
@@ -0,0 +1 @@
+mvn exec:java -Dexec.args="application-form-ukr.jrxml in_dossier.xml"


Added missing quotes.

Added missing quotes.

--- example-run-Win-VS2015.bat
+++ example-run-Win-VS2015.bat
@@ -3,7 +3,7 @@
 REM Build project:
 echo "-> Building project..."
 call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x64
-%PYTHON%\python.exe build.py --clean --build-type="Debug" --build-generator="Visual Studio 14 2015 Win64" --static-build
+"%PYTHON%\python.exe build.py --clean --build-type="Debug" --build-generator="Visual Studio 14 2015 Win64" --static-build"

 REM Run build binary:
 echo "-> Running project binary..."


--- buildReleaseNuGetPackages.cmd
+++ buildReleaseNuGetPackages.cmd
@@ -2,7 +2,11 @@
 echo "Restore & Build API"
 cd ElectronNet.API
 dotnet restore
+dotnet build --configuration Release --force /property:Version=0.0.4
+dotnet pack /p:Version=0.0.4 --configuration Release --force --output "%~dp0artifacts"
 cd ..
 echo "Restore & Build API"
 cd ElectronNet.CLI
 dotnet restore
+dotnet build --configuration Release --force /property:Version=0.0.4
+dotnet pack /p:Version=0.0.4 --configuration Release --force --output "%~dp0artifacts"


invoke traceabilitytool in build.cmd instead of a 2nd build step in Jenkins windows_c job

--- c/build_all/windows/build.cmd
+++ c/build_all/windows/build.cmd
@@ -305,6 +305,8 @@
 	)
 )
 popd
+rem invoke the traceabilitytool here instead of the second build step in Jenkins windows_c job
+msbuild /m %build-root%\tools\traceabilitytool\traceabilitytool.sln
 goto :eof