Improve Windows Bootstrap by automating Visual Studio environment setup

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

--- Bootstrap.bat
+++ Bootstrap.bat
@@ -0,0 +1,101 @@
+@ECHO OFF
+SETLOCAL
+SETLOCAL ENABLEDELAYEDEXPANSION
+
+SET vsversion=%1
+IF "%vsversion%" == "" (
+	SET vsversion=vs2015
+)
+
+IF "%vsversion%" == "vs2010" (
+	CALL :LegacyVisualBootstrap "%vsversion%" "100"
+
+) ELSE IF "%vsversion%" == "vs2012" (
+	CALL :LegacyVisualBootstrap "%vsversion%" "110"
+
+) ELSE IF "%vsversion%" == "vs2013" (
+	CALL :LegacyVisualBootstrap "%vsversion%" "120"
+
+) ELSE IF "%vsversion%" == "vs2015" (
+	CALL :LegacyVisualBootstrap "%vsversion%" "140"
+
+) ELSE IF "%vsversion%" == "vs2017" (
+	CALL :VsWhereVisualBootstrap "%vsversion%" "15.0" "16.0"
+
+) ELSE (
+	ECHO Unrecognized Visual Studio version %vsversion%
+	EXIT /B 2
+)
+
+REM On error, pause to allow user to notice it if script was launched through explorer
+IF %ERRORLEVEL% NEQ 0 (
+	PAUSE
+)
+
+EXIT /B %ERRORLEVEL%
+
+REM ===========================================================================
+
+REM Utils
+
+REM ===========================================================================
+
+REM %1: PremakeVsVersion -> ex: vs2015
+REM %2: VsVersion envvar -> ex: 140
+:LegacyVisualBootstrap
+
+SET "VsVersion_NoPoint=%~2"
+SET "VsEnvVar=VS%VsVersion_NoPoint%COMNTOOLS"
+SET "VsPath=!%VsEnvVar%!"
+
+IF NOT EXIST "%VsPath%vsdevcmd.bat" (
+	ECHO Could not find vsdevcmd.bat to setup Visual Studio environment
+	EXIT /B 2
+)
+
+CALL "%VsPath%vsdevcmd.bat" && nmake MSDEV="%~1" -f Bootstrap.mak windows
+EXIT /B %ERRORLEVEL%
+
+REM :LegacyVisualBootstrap
+
+
+REM ===========================================================================
+
+REM %1: PremakeVsVersion -> ex: vs2010
+REM %2: VisualStudio-style VSversionMin -> ex: 15.0
+REM %3: VisualStudio-style VSversionMax -> ex: 16.0
+:VsWhereVisualBootstrap
+SET "PremakeVsVersion=%~1"
+SET "VsVersionMin=%~2"
+SET "VsVersionMax=%~3"
+
+REM ref: https://github.com/Microsoft/vswhere/wiki/Start-Developer-Command-Prompt
+
+SET VsWherePath="C:/Program Files (x86)/Microsoft Visual Studio/Installer/vswhere.exe"
+
+IF NOT EXIST %VsWherePath% (
+	ECHO Could not find vswhere.exe
+	EXIT /B 2
+)
+
+SET VsWhereCmdLine="%VsWherePath% -nologo -latest -version [%VsVersionMin%,%VsVersionMax%) -property installationPath"
+
+FOR /F "usebackq delims=" %%i in (`!VsWhereCmdLine!`) DO (
+
+	IF EXIST "%%i\VC\Auxiliary\Build\vcvars32.bat" (
+		CALL "%%i\VC\Auxiliary\Build\vcvars32.bat" && nmake MSDEV="%PremakeVsVersion%" -f Bootstrap.mak windows
+		EXIT /B %ERRORLEVEL%
+	)
+)
+
+ECHO Could not find vcvars32.bat to setup Visual Studio environment
+EXIT /B 2
+
+REM :VsWhereVisualBootstrap
+
+REM ===========================================================================
+
+REM SETLOCAL ENABLEDELAYEDEXPANSION
+ENDLOCAL
+REM SETLOCAL
+ENDLOCAL


Addition of clean command. Really cleans by removing \target.

SVN-Revision: 582

--- software/build/build.cmd
+++ software/build/build.cmd
@@ -16,9 +16,17 @@
     ant deploy:hot
     goto DONE
 )
+if "%1" == "clean" (
+    ant clean
+    if exist ..\target\*.* (
+       rmdir /Q /S ..\target
+    )
+    goto DONE
+)
 if "%1" == "dev" (
     ant -Dproperties.file=C:\SVN-Projects\ncit-properties\properties\dev-upgrade.properties deploy:remote:upgrade
     goto DONE
 )
+
 :DONE
 endlocal


added run_autotest.bat scripts

added run_autotest.bat scripts

git-svn-id: b8fc24f0e115b9c9c7e557c0b7b5b4cfa6bf3faf@99 387f9f67-f869-4f5a-9dd1-25509efca32b

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

--- test/run_autotest.bat
+++ test/run_autotest.bat
@@ -0,0 +1,27 @@
+@echo off
+setlocal
+set TMP_EC_SCRIPT_FILENAME=%~dp0.tmp_ec_scripting
+
+cd %~dp0autotest\test_suite
+set TMP_EC_CMD=ec -config test_suite-safe.ecf -target test_suite -batch
+
+echo # Fresh Compilation
+%TMP_EC_CMD% -batch -clean -freeze -c_compile -project_path . > %~dp0autotest.compile.log 2>&1
+
+rem Build scripting for freeze + testing
+rem ------------------------------------
+rem Testing
+echo T > %TMP_EC_SCRIPT_FILENAME%
+rem Execute
+echo e >> %TMP_EC_SCRIPT_FILENAME%
+rem Quit
+echo Q >> %TMP_EC_SCRIPT_FILENAME%
+
+echo # Execute test_suite
+type %TMP_EC_SCRIPT_FILENAME% | %TMP_EC_CMD% -loop 1> :NULL 2> %~dp0autotest.testing.log
+type %~dp0autotest.testing.log
+
+cd %~dp0
+
+del %TMP_EC_SCRIPT_FILENAME%
+endlocal


Issue #9:Added batch file to run test program for reading all the mp3s starting froma root directory

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

--- ReadTest.bat
+++ ReadTest.bat
@@ -0,0 +1,2 @@
+set classpath=%classpath%;.\classes;\dist\jaudiotagger.jar
+java org.jaudiotagger.test.TestAudioTagger %1


Update Lavalink repo url

Update Lavalink repo url

--- StartBot.bat
+++ StartBot.bat
@@ -24,7 +24,7 @@
     echo does not exist!
     echo.
     echo You can get it from:
-    echo   https://github.com/Frederikam/Lavalink/releases/latest
+    echo   https://github.com/freyacodes/Lavalink/releases/latest
     pause
     exit /b
 )
@@ -42,4 +42,4 @@
 )
 echo.
 echo Done.
-timeout %wait%+timeout %wait%


Issue #17386 make.bat must run with Python 2 until Sphinx runs with Python 3. If PYTHON is undefined, this fails without the launcher (installed with 3.3 or from PyPI), but this is better than always failing. Patch from Zachary Ware.

--- Doc/make.bat
+++ Doc/make.bat
@@ -2,7 +2,7 @@
 setlocal

 set SVNROOT=http://svn.python.org/projects
-if "%PYTHON%" EQU "" set PYTHON=..\pcbuild\python
+if "%PYTHON%" EQU "" set PYTHON=py -2
 if "%HTMLHELP%" EQU "" set HTMLHELP=%ProgramFiles%\HTML Help Workshop\hhc.exe
 if "%DISTVERSION%" EQU "" for /f "usebackq" %%v in (`%PYTHON% tools/sphinxext/patchlevel.py`) do set DISTVERSION=%%v


new default meta data

new default meta data


Add welcome.bat, for Windows developers

Add welcome.bat, for Windows developers

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

--- welcome.bat
+++ welcome.bat
@@ -0,0 +1,4 @@
+@echo off
+echo Try editing the markdown file in samples/welcome and see the
+echo results instantly in the browser at http://localhost:3000/
+.\algernon.exe --dev --conf serverconf.lua --dir samples\welcome --httponly --debug --autorefresh --bolt --server


Add comments to release_win.bat

Add comments to release_win.bat

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

 cd ..


Add Program Files\7-Zip to path

Add Program Files\7-Zip to path

--- tools/release_win.bat
+++ tools/release_win.bat
@@ -1,4 +1,4 @@
-PATH=C:\python26;C:\progra~2\7-zip;%PATH%
+PATH=C:\python26;C:\progra~1\7-zip;C:\progra~2\7-zip;%PATH%
 del /q /s dist\*.*
 python setup.py py2exe
 cd dist


+ added script to create release zip files and checksums

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

--- create_bin_release.bat
+++ create_bin_release.bat
@@ -0,0 +1,23 @@
+@echo off
+
+jam -j3 install
+jam -sARCH=win64 -j3 install
+
+cd bin
+
+del *.zip
+del *.sha256
+
+rem zip -9 sif2.zip sif2.exe
+7z a -tzip -mx=9 sif2.zip sif2.exe
+del sif2.exe
+
+ren sif2_x64.exe sif2.exe
+
+rem zip -9 sif2_x64.zip sif2.exe
+7z a -tzip -mx=9 sif2_x64.zip sif2.exe
+del sif2.exe
+
+sha256sum *.zip > sif2.sha256
+
+copy *.zip ..\pkg-src\embedded\tools\


gsea windows

gsea windows

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

--- scripts/gsea-cli.bat
+++ scripts/gsea-cli.bat
@@ -0,0 +1,4 @@
+setlocal
+
+cd C:\Tools\GSEA_4.2.1\
+jdk-11\bin\javaw --module-path=modules -Xmx4g -Djava.awt.headless=true @gsea.args --patch-module=jide.common=lib\jide-components-3.7.4.jar;lib\jide-dock-3.7.4.jar;lib\jide-grids-3.7.4.jar --module=org.gsea_msigdb.gsea/xapps.gsea.CLI  %*


Corrected error in nuget pack script

Corrected error in nuget pack script

--- Tools/pack.cmd
+++ Tools/pack.cmd
@@ -2,10 +2,10 @@
 copy ..\Output\OxyPlot.xml ..\Packages\OxyPlot.Wpf\lib
 copy ..\Output\OxyPlot.Wpf.dll ..\Packages\OxyPlot.Wpf\lib
 copy ..\Output\OxyPlot.Wpf.xml ..\Packages\OxyPlot.Wpf\lib
-nuget.exe pack ..\Packages\OxyPlot.Wpf\OxyPlot.Wpf.nuspec
+nuget.exe pack ..\Packages\OxyPlot.Wpf\OxyPlot.Wpf.nuspec -OutputDirectory ..\Packages > pack.log

 copy ..\Output\OxyPlotSL.dll ..\Packages\OxyPlot.Silverlight\lib
 copy ..\Output\OxyPlotSL.xml ..\Packages\OxyPlot.Silverlight\lib
 copy ..\Output\OxyPlot.Silverlight.dll ..\Packages\OxyPlot.Silverlight\lib
 copy ..\Output\OxyPlot.Silverlight.xml ..\Packages\OxyPlot.Silverlight\lib
-nuget.exe pack ..\Packages\OxyPlot.Silverlight\OxyPlot.Silverlight.nuspec
+nuget.exe pack ..\Packages\OxyPlot.Silverlight\OxyPlot.Silverlight.nuspec -OutputDirectory ..\Packages > pack.log


Added additional input file to build

Added additional input file to build

--- CSCache/buildLib.bat
+++ CSCache/buildLib.bat
@@ -1 +1 @@
-mcs -r:System.Configuration.dll -r:Options.dll -t:library Config.cs ConsoleTools.cs CSCacheLib.cs FilesTools.cs MD5Tools.cs LibArgs.cs -out:CSCacheLib.dll  & mcs -r:CSCacheLib.dll CSCache.cs & pause+mcs -r:System.Configuration.dll -r:dependencies/Options.dll -t:library Config.cs ConsoleTools.cs CSCacheLib.cs FilesTools.cs MD5Tools.cs LibArgs.cs ParseTools.cs -out:CSCacheLib.dll  & mcs -r:CSCacheLib.dll CSCache.cs & pause


fixing Appveyor logic #8

fixing Appveyor logic #8

--- appveyor.bat
+++ appveyor.bat
@@ -61,7 +61,7 @@
 )

 PUSHD src
-make %MAKEFLAGS%
+cmd /c make %MAKEFLAGS%
 POPD

 ECHO -- generating build tree


fixing Appveyor logic #7

fixing Appveyor logic #7

--- appveyor.bat
+++ appveyor.bat
@@ -1,9 +1,13 @@
 @ECHO off
+
+SET WINFLEXBISON=0

 ECHO -- [ running ] "stage: prepare"

 ECHO -- installing flex/bison
-cinst winflexbison
+IF WINFLEXBISON==1 (
+	cinst winflexbison
+)

 ECHO -- setting paths
 SET MINGW_BIN=C:\mingw-w64\i686-5.3.0-posix-dwarf-rt_v4-rev0\mingw32\bin
@@ -16,11 +20,13 @@
 RENAME mingw32-make.exe make.exe
 POPD

-ECHO -- renaming winflexbison exes in-place
-PUSHD %WINFLEXBISON_BIN%
-RENAME win_bison.exe bison.exe
-RENAME win_flex.exe flex.exe
-POPD
+IF WINFLEXBISON==1 (
+	ECHO -- renaming winflexbison exes in-place
+	PUSHD %WINFLEXBISON_BIN%
+	RENAME win_bison.exe bison.exe
+	RENAME win_flex.exe flex.exe
+	POPD
+)

 ECHO -- ensuring proper tree
 IF NOT EXIST build MKDIR build
@@ -33,7 +39,17 @@

 ECHO -- selecting build target

-SET MAKEFLAGS=WINFLAGS=--wincompat FLEX=C:\ProgramData\chocolatey\lib\winflexbison\tools\win_flex.exe BISON=C:\ProgramData\chocolatey\lib\winflexbison\tools\win_bison.exe
+IF WINFLEXBISON==1 (
+	SET FLEX=C:\ProgramData\chocolatey\lib\winflexbison\tools\win_flex.exe
+	SET BISON=C:\ProgramData\chocolatey\lib\winflexbison\tools\win_bison.exe
+	SET WINFLAGS=--wincompat
+) ELSE (
+	SET FLEX=c:\MinGW\msys\1.0\bin\flex.exe
+	SET BISON=c:\MinGW\msys\1.0\bin\bison.exe
+	SET WINFLAGS=
+)
+
+SET MAKEFLAGS=WINFLAGS=%WINFLAGS% FLEX=%FLEX% BISON=%BISON%

 IF "%APPVEYOR_REPO_TAG%"=="true" (
 	ECHO -- building for release


commit on 06/06/2018 at 12:47:00

commit on 06/06/2018 at 12:47:00

--- ansys-APDL/transverseCrack.cmd
+++ ansys-APDL/transverseCrack.cmd
@@ -7,6 +7,16 @@
 ! Parameters

 ! ===> START INPUT DATA
+
+CFFileCoordDisp = 'C:/Ansys_WD/Debug/debug_CFCoordDisp'
+CFFileStressStrain = 'C:/Ansys_WD/Debug/debug_CFStressStrain'
+
+YsymmLow = 'C:/Ansys_WD/Debug/ysymmLowerData'
+YsymmUp = 'C:/Ansys_WD/Debug/ysymmUpperData'
+XsymmLeft = 'C:/Ansys_WD/Debug/xsymmLeftData'
+XsymmRight = 'C:/Ansys_WD/Debug/xsymmRightData'
+loadUp = 'C:/Ansys_WD/Debug/loadUpperData'
+loadLow = 'C:/Ansys_WD/Debug/loadLowerData'

 wd = 'C:/Ansys_WD/Debug'
 basename = 'debug_'
@@ -41,19 +51,6 @@
 elSize = daOvera*a ! [mm] size of element in refined region close to crack tip

 appliedDisp = epsx*L ! [mm] applied displacement
-
-fileSep = '/'
-
-subname = 'CFCoordDisp'
-CFFileCoordDisp = %wd%%fileSep%%basename%%subname%
-subname = 'CFStressStrain'
-CFFileStressStrain = %wd%%filesep%%basename%%subname%
-YsymmLow = 'C:/Ansys_WD/Debug/ysymmLowerData'
-YsymmUp = 'C:/Ansys_WD/Debug/ysymmUpperData'
-XsymmLeft = 'C:/Ansys_WD/Debug/xsymmLeftData'
-XsymmRight = 'C:/Ansys_WD/Debug/xsymmRightData'
-loadUp = 'C:/Ansys_WD/Debug/loadUpperData'
-loadLow = 'C:/Ansys_WD/Debug/loadLowerData'

 ! Create Geometry


convert-pillow.bat

convert-pillow.bat

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

--- convert-pillow.bat
+++ convert-pillow.bat
@@ -0,0 +1 @@
+C:\Python27\python.exe convert-pillow.py sample.png sample.gif


And of course get rid of the stupid goto begin :-)

--- CreateTestresults.cmd
+++ CreateTestresults.cmd
@@ -1,6 +1,5 @@
 @pushd %~dp0

-goto begin
 ECHO Remember to build the solution first!
 REM pause

@@ -11,8 +10,6 @@
 Cd "%~dp0\TestHarness\packages\SpecRun.Runner.*\tools"
 "specrun.exe" run default.srprofile "/baseFolder:%~dp0\TestHarness\SpecRun\bin\Debug" /log:specrun.log /report:"%~dp0\results-example-specrun.html"

-:begin
-
 Cd "%~dp0\TestHarness\packagesNonNuget\xunit.runner"
 "xunit.console.clr4.exe" "%~dp0\TestHarness\xunit\bin\Debug\xunitHarness.dll" /xml "%~dp0\results-example-xunit.xml"


OSG-3.4.0: update beautify command.

OSG-3.4.0: update beautify command.

By: ying.huang.

--- beautify.bat
+++ beautify.bat
@@ -1,4 +1,4 @@
 REM find . -name "*.c" -o -name "*.cpp" -o -name "*.h" -o -name "*.hpp" -o -name "*.m" > source.files
-..\..\..\..\tools\uncrustify-0.62.0-g5987f22-win32\uncrustify.exe -c "..\..\..\tools\hy_c_c++.cfg" --no-backup -F source.files
+..\..\..\tools\uncrustify.exe -c "..\..\..\tools\hy_c_c++.cfg" --no-backup -F source.files
 REM find ./include -name "*" > header.files
-REM ..\..\..\..\tools\uncrustify-0.62.0-g5987f22-win32\uncrustify.exe -c "..\..\..\tools\hy_c_c++.cfg" --no-backup -F header.files
+REM ..\..\..\tools\uncrustify.exe -c "..\..\..\tools\hy_c_c++.cfg" --no-backup -F header.files


Migrate buck and buck_common to Windows batch.

Summary: bin/buck is written in bash and not compatible with Windows.
In order to get it working, I translated the minimal part of bin/buck into bin/buck.cmd.

Test Plan: Run bin\buck.cmd -V on Windows.

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

--- bin/buck.cmd
+++ bin/buck.cmd
@@ -0,0 +1,93 @@
+@echo off
+set ORIGINAL_WORKING_DIRECTORY=%cd%
+set PROJECT_ROOT=%cd%
+set BUCK_BIN_DIRECTORY=%~dp0
+cd %BUCK_BIN_DIRECTORY%\..
+set BUCK_DIRECTORY=%cd%
+
+set BUCKD_DIR=%PROJECT_ROOT%\.buckd
+set BUCKD_LOG_FILE=%PROJECT_ROOT%\buckd.log
+set BUCKD_PID_FILE=%PROJECT_ROOT%\buckd.pid
+set BUCKD_PORT_FILE=%PROJECT_ROOT%\buckd.port
+set BUCKD_RUNNING=0
+rem kill -0 `cat "$BUCKD_PID_FILE" 2> /dev/null` &> /dev/null || BUCKD_RUNNING=1
+
+if not exist %PROJECT_ROOT%\.buckversion goto SET_BUCK_REQUIRED_VERSION_END
+  if exist %PROJECT_ROOT%\.nobuckcheck goto SET_BUCK_REQUIRED_VERSION_END
+  set /p BUCK_REQUIRED_VERSION=<%PROJECT_ROOT%\.buckversion
+  rem TODO checkout the required version
+:SET_BUCK_REQUIRED_VERSION_END
+
+set BUCK_REPOSITORY_DIRTY=0
+set BUCK_CURRENT_VERSION=N/A
+set BUCK_VERSION_TIMESTAMP=-1
+if not exist .git goto GET_BUCK_VERSION_END
+  git rev-parse HEAD >%TEMP%\BUCK_CURRENT_VERSION
+  set /p BUCK_CURRENT_VERSION=<%TEMP%\BUCK_CURRENT_VERSION
+  git log --pretty=format:%%ct -1 HEAD >%TEMP%\BUCK_VERSION_TIMESTAMP
+  set /p BUCK_VERSION_TIMESTAMP=<%TEMP%\BUCK_VERSION_TIMESTAMP
+:GET_BUCK_VERSION_END
+
+set BUCK_VERSION_UID=N/A
+
+set DEFAULT_PYTHON_INTERP=python
+set PYTHON_INTERP=%DEFAULT_PYTHON_INTERP%
+
+set RELATIVE_PATH_TO_BUCK_PY=src/com/facebook/buck/parser/buck.py
+set PATH_TO_BUCK_PY=%BUCK_DIRECTORY%\%RELATIVE_PATH_TO_BUCK_PY%
+
+set BUCK_JAVA_ARGS=^
+-XX:MaxPermSize=256m ^
+-Xmx1000m ^
+-Djava.awt.headless=true ^
+-Dbuck.testrunner_classes=%BUCK_DIRECTORY%\build\testrunner\classes ^
+-Dbuck.abi_processor_classes=%BUCK_DIRECTORY%\build\abi_processor\classes ^
+-Dbuck.path_to_emma_jar=%BUCK_DIRECTORY%\third-party\java\emma-2.0.5312\out\emma-2.0.5312.jar ^
+-Dbuck.test_util_no_tests_dir=true ^
+-Dbuck.path_to_python_interp=%PYTHON_INTERP% ^
+-Dbuck.path_to_buck_py=%PATH_TO_BUCK_PY% ^
+-Dbuck.path_to_intellij_py=%BUCK_DIRECTORY%\src\com\facebook\buck\command\intellij.py ^
+-Dbuck.git_commit=%BUCK_CURRENT_VERSION% ^
+-Dbuck.git_commit_timestamp=%BUCK_VERSION_TIMESTAMP% ^
+-Dbuck.git_dirty=%BUCK_REPOSITORY_DIRTY% ^
+-Dbuck.version_uid=%BUCK_VERSION_UID% ^
+-Dbuck.buckd_dir=%BUCKD_DIR% ^
+-Dlog4j.configuration=file:%BUCK_DIRECTORY%\config\log4j.properties
+
+set BUCK_JAVA_CLASSPATH=^
+%BUCK_DIRECTORY%\src;^
+%BUCK_DIRECTORY%\build\classes;^
+%BUCK_DIRECTORY%\lib\args4j.jar;^
+%BUCK_DIRECTORY%\lib\guava-14.0.1.jar;^
+%BUCK_DIRECTORY%\lib\ini4j-0.5.2.jar;^
+%BUCK_DIRECTORY%\lib\jackson-annotations-2.0.5.jar;^
+%BUCK_DIRECTORY%\lib\jackson-core-2.0.5.jar;^
+%BUCK_DIRECTORY%\lib\jackson-databind-2.0.5.jar;^
+%BUCK_DIRECTORY%\lib\jsr305.jar;^
+%BUCK_DIRECTORY%\lib\sdklib.jar;^
+%BUCK_DIRECTORY%\lib\ddmlib-r21.jar;^
+%BUCK_DIRECTORY%\lib\sdklib.jar;^
+%BUCK_DIRECTORY%\third-party\java\astyanax\astyanax-cassandra-1.56.38.jar;^
+%BUCK_DIRECTORY%\third-party\java\astyanax\astyanax-core-1.56.38.jar;^
+%BUCK_DIRECTORY%\third-party\java\astyanax\astyanax-thrift-1.56.38.jar;^
+%BUCK_DIRECTORY%\third-party\java\astyanax\cassandra-1.2.3.jar;^
+%BUCK_DIRECTORY%\third-party\java\astyanax\cassandra-thrift-1.2.3.jar;^
+%BUCK_DIRECTORY%\third-party\java\astyanax\commons-cli-1.1.jar;^
+%BUCK_DIRECTORY%\third-party\java\astyanax\commons-codec-1.2.jar;^
+%BUCK_DIRECTORY%\third-party\java\astyanax\commons-lang-2.6.jar;^
+%BUCK_DIRECTORY%\third-party\java\astyanax\high-scale-lib-1.1.2.jar;^
+%BUCK_DIRECTORY%\third-party\java\astyanax\joda-time-2.2.jar;^
+%BUCK_DIRECTORY%\third-party\java\astyanax\libthrift-0.7.0.jar;^
+%BUCK_DIRECTORY%\third-party\java\astyanax\log4j-1.2.16.jar;^
+%BUCK_DIRECTORY%\third-party\java\astyanax\slf4j-api-1.7.2.jar;^
+%BUCK_DIRECTORY%\third-party\java\astyanax\slf4j-log4j12-1.7.2.jar;^
+%BUCK_DIRECTORY%\third-party\java\xz-java-1.3\xz-1.3.jar
+
+java ^
+  -classpath %BUCK_JAVA_CLASSPATH% ^
+  %BUCK_JAVA_ARGS% ^
+  -Dbuck.daemon=false ^
+  com.facebook.buck.cli.Main ^
+  %*
+
+cd %ORIGINAL_WORKING_DIRECTORY%


[C] Disable system tests for Windows build.

--- cppbuild/cppbuild-vs.cmd
+++ cppbuild/cppbuild-vs.cmd
@@ -7,6 +7,7 @@
 set BUILD_DIR=%CD%\cppbuild\Release
 set ZLIB_BUILD_DIR=%BUILD_DIR%\zlib-build
 set ZLIB_INSTALL_DIR=%BUILD_DIR%\zlib64
+set EXTRA_CMAKE_ARGS=-DAERON_SYSTEM_TESTS=OFF

 for %%o in (%*) do (

@@ -15,7 +16,7 @@
     if "%%o"=="--help" (
 	    echo cppbuild.cmd [--c-warnings-as-errors] [--cxx-warnings-as-errors] [--build-aeron-driver]
 		exit /b
-	)
+	)

 	if "%%o"=="--c-warnings-as-errors" (
 	    set EXTRA_CMAKE_ARGS=!EXTRA_CMAKE_ARGS! -DC_WARNINGS_AS_ERRORS=ON


Fix start daemon script if there is already forever log files

--- startRestServerAsDaemon.cmd
+++ startRestServerAsDaemon.cmd
@@ -1,2 +1 @@
-forever stopall
-forever start server.js+forever -a start server.js


fixed python call

fixed python call

--- build_v8.bat
+++ build_v8.bat
@@ -101,7 +101,7 @@
 :: Run gyp to update the Visual Studio project files to contain links
 :: to the latest v8 source files.
 ECHO on
-python build\gyp_v8 -D"target_arch=%target_arch%" -D"component=shared_library" -Dv8_enable_i18n_support=0
+CALL python build\gyp_v8 -D"target_arch=%target_arch%" -D"component=shared_library" -Dv8_enable_i18n_support=0
 "%vs%\Common7\IDE\devenv.com" /Build "%profile%" build\All.sln
 @ECHO off
 popd


Create mnc-batch_run.bat

Create mnc-batch_run.bat

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

--- mnc-batch_run.bat
+++ mnc-batch_run.bat
@@ -0,0 +1,6 @@
+%~d0
+cd %~p0
+chcp 65001
+set _JAVA_OPTIONS="-Dfile.encoding=UTF-8"
+pause
+play debug run


Fix a Java=>Oracle URL

Fix a Java=>Oracle URL

git-svn-id: 7c053b8fbd1fb5868f764c6f9536fc6a9bbe7da9@1125926 13f79535-47bb-0310-9956-ffa450edef68

--- bin/jmeter.bat
+++ bin/jmeter.bat
@@ -62,8 +62,9 @@
 rem and for NT handling to skip to.

 rem The following link describes the -XX options:
-rem http://java.sun.com/javase/technologies/hotspot/vmoptions.jsp
+rem http://www.oracle.com/technetwork/java/javase/tech/vmoptions-jsp-140102.html
 rem http://java.sun.com/developer/TechTips/2000/tt1222.html has some more descriptions
+rem Unfortunately TechTips no longer seem to be available

 rem See the unix startup file for the rationale of the following parameters,
 rem including some tuning recommendations


Removing two empty lines

Removing two empty lines

--- Setup/Pack.cmd
+++ Setup/Pack.cmd
@@ -1,84 +1,82 @@
-@ECHO OFF
-SETLOCAL EnableDelayedExpansion
-
-SET TOOLS_MSBUILD="%PROGRAMFILES(X86)%\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\amd64\msbuild.exe"
-SET   TOOLS_NUGET="%USERPROFILE%\Downloads\nuget.exe"
-
-
-ECHO --- DISCOVER TOOLS
-ECHO:
-
-FOR %%I IN (%TOOLS_MSBUILD%) DO (
-    IF EXIST %%I IF NOT DEFINED TOOL_MSBUILD SET TOOL_MSBUILD=%%I
-)
-ECHO MSBuild: %TOOL_MSBUILD%
-IF [%TOOL_MSBUILD%]==[] ECHO Not found^^! & GOTO Error
-
-FOR %%I IN (%TOOLS_NUGET%) DO (
-    IF EXIST %%I IF NOT DEFINED TOOL_NUGET SET TOOL_NUGET=%%I
-)
-ECHO NuGet: %TOOL_NUGET%
-IF [%TOOL_NUGET%]==[] ECHO Not found^^! & GOTO Error
-
-ECHO:
-ECHO:
-
-
-ECHO --- PACK
-ECHO:
-
-RMDIR /Q /S ".\Temp" 2> NUL
-MKDIR ".\Temp"
-
-DEL "..\Binaries\*.0.0.0.nupkg" 2> NUL
-
-%TOOL_MSBUILD% ..\Source\PasswordSafe\PasswordSafe.csproj /t:pack /p:IncludeSymbols=true /p:IncludeSource=true /p:Configuration=Release /p:OutputPath=..\..\Setup\Temp\
-
-ECHO:
-ECHO:
-
-
-IF NOT [%TOOL_NUGET%]==[] (
-    ECHO --- PUSH
-    ECHO:
-
-    ECHO Set API key if needed
-    ECHO %TOOL_NUGET% SetApiKey ^<key^>
-    ECHO:
-    IF EXIST ".\Temp\*.0.0.0.nupkg" (
-        ECHO "Not pushing unversioned package."
-    ) ELSE (
-        ECHO Proceed with pushing packaged to Internet^?
-        PAUSE
-        IF EXIST ".\Temp\*.nupkg" (
-            MKDIR "..\Releases" 2> NUL
-            FOR %%I IN (".\Temp\*.nupkg") DO (
-                ECHO:
-                SET FILE_NAME=%%~nI%%~xI
-                IF [!FILE_NAME:~-14!]==[.symbols.nupkg] (
-                    ECHO Pushing symbols in !FILE_NAME!
-                    %TOOL_NUGET% push .\Temp\!FILE_NAME! -source https://nuget.smbsrc.net/
-                ) ELSE (
-                    ECHO Pushing package in !FILE_NAME!
-                    %TOOL_NUGET% push .\Temp\!FILE_NAME! -source https://nuget.org/
-                )
-                MOVE .\Temp\!FILE_NAME! ..\Releases\!FILE_NAME! > NUL
-            )
-            RMDIR /Q /S ".\Temp" 2> NUL
-
-
-        ) ELSE (
-            ECHO "No packages found."
-        )
-    )
-)
-
-
-ENDLOCAL
-EXIT /B 0
-
-
-:Error
-ENDLOCAL
-PAUSE
-EXIT /B 1
+@ECHO OFF
+SETLOCAL EnableDelayedExpansion
+
+SET TOOLS_MSBUILD="%PROGRAMFILES(X86)%\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\amd64\msbuild.exe"
+SET   TOOLS_NUGET="%USERPROFILE%\Downloads\nuget.exe"
+
+
+ECHO --- DISCOVER TOOLS
+ECHO:
+
+FOR %%I IN (%TOOLS_MSBUILD%) DO (
+    IF EXIST %%I IF NOT DEFINED TOOL_MSBUILD SET TOOL_MSBUILD=%%I
+)
+ECHO MSBuild: %TOOL_MSBUILD%
+IF [%TOOL_MSBUILD%]==[] ECHO Not found^^! & GOTO Error
+
+FOR %%I IN (%TOOLS_NUGET%) DO (
+    IF EXIST %%I IF NOT DEFINED TOOL_NUGET SET TOOL_NUGET=%%I
+)
+ECHO NuGet: %TOOL_NUGET%
+IF [%TOOL_NUGET%]==[] ECHO Not found^^! & GOTO Error
+
+ECHO:
+ECHO:
+
+
+ECHO --- PACK
+ECHO:
+
+RMDIR /Q /S ".\Temp" 2> NUL
+MKDIR ".\Temp"
+
+DEL "..\Binaries\*.0.0.0.nupkg" 2> NUL
+
+%TOOL_MSBUILD% ..\Source\PasswordSafe\PasswordSafe.csproj /t:pack /p:IncludeSymbols=true /p:IncludeSource=true /p:Configuration=Release /p:OutputPath=..\..\Setup\Temp\
+
+ECHO:
+ECHO:
+
+
+IF NOT [%TOOL_NUGET%]==[] (
+    ECHO --- PUSH
+    ECHO:
+
+    ECHO Set API key if needed
+    ECHO %TOOL_NUGET% SetApiKey ^<key^>
+    ECHO:
+    IF EXIST ".\Temp\*.0.0.0.nupkg" (
+        ECHO "Not pushing unversioned package."
+    ) ELSE (
+        ECHO Proceed with pushing packaged to Internet^?
+        PAUSE
+        IF EXIST ".\Temp\*.nupkg" (
+            MKDIR "..\Releases" 2> NUL
+            FOR %%I IN (".\Temp\*.nupkg") DO (
+                ECHO:
+                SET FILE_NAME=%%~nI%%~xI
+                IF [!FILE_NAME:~-14!]==[.symbols.nupkg] (
+                    ECHO Pushing symbols in !FILE_NAME!
+                    %TOOL_NUGET% push .\Temp\!FILE_NAME! -source https://nuget.smbsrc.net/
+                ) ELSE (
+                    ECHO Pushing package in !FILE_NAME!
+                    %TOOL_NUGET% push .\Temp\!FILE_NAME! -source https://nuget.org/
+                )
+                MOVE .\Temp\!FILE_NAME! ..\Releases\!FILE_NAME! > NUL
+            )
+            RMDIR /Q /S ".\Temp" 2> NUL
+        ) ELSE (
+            ECHO "No packages found."
+        )
+    )
+)
+
+
+ENDLOCAL
+EXIT /B 0
+
+
+:Error
+ENDLOCAL
+PAUSE
+EXIT /B 1


fix typing mistake which kills ALL speedup

git-svn-id: e2e1a767b54e5f731ad8ac18fa5089ee37d5625a@240 7ec92016-0320-0410-acc4-a06ded1c099a

--- test/SmallObj/make.msvc.bat
+++ test/SmallObj/make.msvc.bat
@@ -1,5 +1,5 @@
 if not exist tmp\ mkdir tmp

-cl -c -Zm200 -O2 -MT -EHsc -GR -W0 -wd4710 -I"." -I"..\..\include" -I"..\..\include\loki" -Fotmp\ SmallObjBench.cpp
+cl -c -DNDEBUG -Zm200 -O2 -MT -EHsc -GR -W0 -wd4710 -I"." -I"..\..\include" -I"..\..\include\loki" -Fotmp\ SmallObjBench.cpp ..\..\src\SmallObj.cpp

-link /NOLOGO /SUBSYSTEM:CONSOLE /incremental:no /OUT:"main-msvc.exe" tmp\SmallObjBench.obj ..\..\lib\SmallObj.obj ..\..\lib\Singleton.obj+link /NOLOGO /SUBSYSTEM:CONSOLE /incremental:no /OUT:"main-msvc.exe" tmp\SmallObjBench.obj tmp\SmallObj.obj


_cmd/cmdrc.bat :add ex command(open in explorer)

--- _cmd/cmdrc.bat
+++ _cmd/cmdrc.bat
@@ -21,6 +21,16 @@

 ::Additional macros
+doskey ex=if exist "%%CD%%$*\" (^
+Explorer /root, "%%CD%%$*\"^
+) else if exist "%%CD%%\$*\" (^
+Explorer /root, "%%CD%%\$*\"^
+) else if exist "$*\" (^
+Explorer /root, "$*"^
+) else (^
+Explorer /select, "$*"^
+)
+

 :: Navigation
 doskey ..=cd ..


sipXsdpLib added to buildmsvs6.bat

sipXsdpLib added to buildmsvs6.bat

git-svn-id: 5274dacc98e2a95d0b0452670772bfdffe61ca90@8509 a612230a-c5fa-0310-af8b-88eea846685b

--- buildmsvs6.bat
+++ buildmsvs6.bat
@@ -25,6 +25,16 @@
 cd sipXportLib
 del %releaseType%\sipXportLibTest.exe
 msdev sipXportLibTest.dsp /MAKE "sipXportLibTest - Win32 %releaseType%" %doClean%
+cd ..
+
+cd sipXsdpLib
+del %releaseType%\sipXsdpLib%libPrefix%.lib
+msdev sipXsdpLib.dsp /MAKE "sipXsdpLib - Win32 %releaseType%" %doClean%
+cd ..
+
+cd sipXsdpLib
+del %releaseType%\sipXsdpLibTest.exe
+msdev sipXsdpLibTest.dsp /MAKE "sipXsdpLibTest - Win32 %releaseType%" %doClean%
 cd ..

 cd sipXtackLib


Jet another try to fix path setting in rsuite.cmd

--- cli/rsuite.cmd
+++ cli/rsuite.cmd
@@ -4,7 +4,7 @@
 Rscript.exe --version 1> nul 2>&1
 if ERRORLEVEL 1 (
     for /f "skip=1 tokens=2* " %%a in ('reg query HKLM\SOFTWARE\R-core\R /v InstallPath') do (
-		set PATH="%%~sb\bin;%PATH%"
+		set "PATH=%%~sb\bin;%PATH%"
 	)
 	Rscript.exe --version 1> nul 2>&1
     if ERRORLEVEL 1 (


git-svn-id: svn://svn.code.sf.net/p/mediainfo/code/MediaInfoLib/trunk@1162 45c5ae6f-87cc-4fd0-92ee-e4f023fd80da

--- Release/Release_DLL_Windows_i386.bat
+++ Release/Release_DLL_Windows_i386.bat
@@ -35,6 +35,7 @@
 xcopy ..\Project\BCB\Example\*.dfm MediaInfoDLL_Windows_i386\Developpers\Project\BCB\Example\
 xcopy ..\Project\BCB\Example\*.h MediaInfoDLL_Windows_i386\Developpers\Project\BCB\Example\
 xcopy ..\Project\BCB\Example\*.cpp MediaInfoDLL_Windows_i386\Developpers\Project\BCB\Example\
+xcopy ..\Project\CodeBlocks\Example\*.cbp MediaInfoDLL_Windows_i386\Developpers\Project\CodeBlocks\Example\
 xcopy ..\Project\Delphi\Example\*.dpr MediaInfoDLL_Windows_i386\Developpers\Project\Delphi\Example\
 xcopy ..\Project\Delphi\Example\*.dfm MediaInfoDLL_Windows_i386\Developpers\Project\Delphi\Example\
 xcopy ..\Project\Delphi\Example\*.res MediaInfoDLL_Windows_i386\Developpers\Project\Delphi\Example\


cmdize: vbs engine support improved

cmdize: vbs engine support improved

--- bin/cmdize.bat
+++ bin/cmdize.bat
@@ -66,6 +66,12 @@
 	goto :cmdize.loop.continue
 )

+if /i "%~1" == "/vbs" (
+	set "CMDIZE_ENGINE_VBS=%~2"
+	shift
+	goto :cmdize.loop.continue
+)
+
 if not exist "%~f1" (
 	echo:%~n0: File not found: "%~1">&2
 	goto :cmdize.loop.continue
@@ -114,10 +120,17 @@

 :cmdize.vbs
+if not defined CMDIZE_ENGINE_VBS set "CMDIZE_ENGINE_VBS=cscript"
+set "CMDIZE_ENGINE_VBSOPTS="
+for %%e in ( "%CMDIZE_ENGINE_VBS%" ) do (
+	if /i "%%~ne" == "cscript" set "CMDIZE_ENGINE_VBSOPTS=//nologo //e:vbscript"
+	if /i "%%~ne" == "wscript" set "CMDIZE_ENGINE_VBSOPTS=//nologo //e:vbscript"
+)
+
 copy /y nul + nul /a "%TEMP%\%~n0.$$" /a 1>nul

 call :cmdize.vbs.h @echo off
-call :cmdize.vbs.h "%%%%windir%%%%\System32\cscript.exe" //nologo //e:vbscript "%%%%~f0" %%%%*
+call :cmdize.vbs.h %CMDIZE_ENGINE_VBS% %CMDIZE_ENGINE_VBSOPTS% "%%%%~f0" %%%%*
 call :cmdize.vbs.h goto :EOF

 del /q "%TEMP%\%~n0.$$"


:chart: Show info logging for report generation

--- coverage.cmd
+++ coverage.cmd
@@ -77,5 +77,5 @@
    EXIT /B 2
 )

-@echo "%report_exe%" -verbosity:Error "-reports:%coverage_results%" "-targetdir:%results_path%\Report" -reporttypes:Html
-@"%report_exe%" -verbosity:Error "-reports:%coverage_results%" "-targetdir:%results_path%\Report" -reporttypes:Html
+@echo "%report_exe%" -verbosity:Info "-reports:%coverage_results%" "-targetdir:%results_path%\Report" -reporttypes:Html
+@"%report_exe%" -verbosity:Info "-reports:%coverage_results%" "-targetdir:%results_path%\Report" -reporttypes:Html


Add batch file to test if imports from packages work with package restore

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

--- testpackagerestore.bat
+++ testpackagerestore.bat
@@ -0,0 +1,5 @@
+rmdir /S /Q %~dp0packages
+msbuild %~dp0src\PaketTestApp\PaketTestApp.csproj
+
+@rem If the assembly is signed then the targets file from the StrongNamer package was included correctly
+sn -T %~dp0src\PaketTestApp\bin\Debug\Octokit.dll


Fix coverage script

Fix coverage script

--- coverage.cmd
+++ coverage.cmd
@@ -1,5 +1,5 @@
 nuget install OpenCover -Version 4.6.519 -OutputDirectory tools
 nuget install coveralls.net -Version 0.412.0 -OutputDirectory tools

-.\tools\OpenCover.4.6.519\tools\OpenCover.Console.exe -target:"vstest.console.exe" -filter:"+[*]* -[*.*Tests]*" -excludebyfile:"*.g.cs" -targetargs:".\tests\Konves.TextGraph.UnitTests\bin\Release\Konves.TextGraph.UnitTests.dll .\tests\Konves.TextGraph.UnitTests\bin\Release\Konves.TextGraph.HtmlParser.UnitTests.dll .\tests\Konves.TextGraph.UnitTests\bin\Release\Konves.TextGraph.MarkdownParser.UnitTests.dll" -register:user
+.\tools\OpenCover.4.6.519\tools\OpenCover.Console.exe -target:"vstest.console.exe" -filter:"+[*]* -[*.*Tests]*" -excludebyfile:"*.g.cs" -targetargs:".\tests\Konves.TextGraph.UnitTests\bin\Release\Konves.TextGraph.UnitTests.dll .\tests\Konves.TextGraph.HtmlParser.UnitTests\bin\Release\Konves.TextGraph.HtmlParser.UnitTests.dll .\tests\Konves.TextGraph.MarkdownParser.UnitTests\bin\Release\Konves.TextGraph.MarkdownParser.UnitTests.dll" -register:user
 .\tools\coveralls.net.0.412\tools\csmacnz.Coveralls.exe --opencover -i .\results.xml


use call

use call

--- tools/cmake/invoke.bat
+++ tools/cmake/invoke.bat
@@ -3,4 +3,4 @@
 set batchdir=%~dp0
 set buildtool=mingw

-%batchdir%invoke_%buildtool% %*
+call %batchdir%invoke_%buildtool% %*


Fixed for passwords containing spaces

Fixed for passwords containing spaces

--- paswordspray.bat
+++ paswordspray.bat
@@ -5,6 +5,6 @@
 SET "PASS=Summer2018"

 FOR /F %%U IN (users.txt) DO (
-  NET USE \\%DC%\IPC$ /USER:DOMAIN\%%U %PASS% 1>NUL 2>&1 && echo [*] %%U:%PASS% success && @NET USE /DELETE \\%DC%\IPC$ >NUL
+  NET USE \\%DC%\IPC$ /USER:DOMAIN\%%U "%PASS%" 1>NUL 2>&1 && echo [*] %%U:"%PASS%" success && @NET USE /DELETE \\%DC%\IPC$ >NUL
 )


Run just specific tests

Run just specific tests

--- alltests.cmd
+++ alltests.cmd
@@ -1,31 +1,31 @@
 call \ned\bin\switchpy 23
 python setup.py -q develop
 set COVERAGE_TEST_TRACER=c
-nosetests
+nosetests %1
 del coverage\tracer.pyd
 set COVERAGE_TEST_TRACER=py
-nosetests
+nosetests %1

 call \ned\bin\switchpy 24
 python setup.py -q develop
 set COVERAGE_TEST_TRACER=c
-nosetests
+nosetests %1
 del coverage\tracer.pyd
 set COVERAGE_TEST_TRACER=py
-nosetests
+nosetests %1

 call \ned\bin\switchpy 25
 python setup.py -q develop
 set COVERAGE_TEST_TRACER=c
-nosetests
+nosetests %1
 del coverage\tracer.pyd
 set COVERAGE_TEST_TRACER=py
-nosetests
+nosetests %1

 call \ned\bin\switchpy 26
 python setup.py -q develop
 set COVERAGE_TEST_TRACER=c
-nosetests
+nosetests %1
 del coverage\tracer.pyd
 set COVERAGE_TEST_TRACER=py
-nosetests
+nosetests %1


Create d-androidCreate.cmd

Create d-androidCreate.cmd

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

--- d-androidCreate.cmd
+++ d-androidCreate.cmd
@@ -0,0 +1,19 @@
+
+set APP_NAME=myTest2
+
+
+
+set ANT_HOME=C:\phonegapmain\ant
+set ANDROID_HOME=C:\phonegapmain\androidDec2013\sdk
+set ANDROID_SDK_HOME=%USERPROFILE%
+set GIT_HOME=C:\Progra~1\Git
+set JAVA_HOME=C:\phonegapmain\java
+set NODE_HOME=C:\Users\myComp\Documents\myFolder\nodejs\node
+set NPM_HOME=c:\users\myComp\AppData\Roaming\npm
+
+set PATH=C:\Windows;C:\Windows\System32;%ANT_HOME%\bin;%ANDROID_HOME%\tools;%ANDROID_HOME%\platform-tools;%GIT_HOME%\bin;%GIT_HOME%\cmd;%JAVA_HOME%\bin;%NODE_HOME%;%NPM_HOME%;
+
+set CLASSPATH=
+
+
+phonegap create %APP_NAME% com.mysite.&APP_NAME% %APP_NAME% > xoutput.txt  2>&1


updated publish-docs to use the ProjectWebsite mode

--- publish-docs.cmd
+++ publish-docs.cmd
@@ -1,4 +1,4 @@
-packages\storyteller\tools\ST.exe doc-export c:\code\marten-docs Website --version 0.5.0
+packages\storyteller\tools\ST.exe doc-export c:\code\marten-docs ProjectWebsite --version 0.5.0 --project marten

 cd \code\marten-docs


repo name

repo name

--- push-release.bat
+++ push-release.bat
@@ -11,16 +11,16 @@
 echo pushing %APPVEYOR_PROJECT_NAME% %CONFIGURATION% %PLATFORM% %APPVEYOR_BUILD_VERSION% from %HERE%

 %HERE%tools\github-release.exe release ^
-                         --user pchalamet ^
-                         --repo full-build ^
+                         --user %APPVEYOR_REPO_COMMIT_AUTHOR% ^
+                         --repo %APPVEYOR_PROJECT_NAME% ^
 						 --tag %APPVEYOR_BUILD_VERSION% ^
 						 --name "full-build %APPVEYOR_BUILD_VERSION%" ^
                          --description "%APPVEYOR_PROJECT_NAME% %APPVEYOR_BUILD_VERSION% (%APPVEYOR_REPO_COMMIT%)- %PLATFORM% %CONFIGURATION%" ^
                          --pre-release || goto :ko

 %HERE%tools\github-release upload ^
-                     --user pchalamet ^
-					 --repo full-build ^
+                     --user %APPVEYOR_REPO_COMMIT_AUTHOR% ^
+					 --repo %APPVEYOR_PROJECT_NAME% ^
                      --tag %APPVEYOR_BUILD_VERSION% ^
                      --name "%APPVEYOR_PROJECT_NAME%-net45-%PLATFORM%" ^
                      --file %HERE%/src/bin/%CONFIGURATION%.zip || goto :ko


Fix borked script file

Fix borked script file

--- cmake/scripts/msvc_build.bat
+++ cmake/scripts/msvc_build.bat
@@ -1,4 +1,4 @@
-@call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools\VsDevCmd.bat x64"
+@call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools\VsDevCmd.bat" x64
 SET PATH=%PROJECT_PATH%\3rdparty\bin;%MYSQL_CONNECTOR_PATH%\lib;%MYSQL_PATH%\bin;%PYTHON_PATH%\Scripts;%PATH%

 cp "%MYSQL_CONNECTOR_PATH%\lib\libmysql.dll" "%PROJECT_PATH%\build\bin\"


do local checkout only, when doing the second time checkout on windows

--- windows_cygwin/build.bat
+++ windows_cygwin/build.bat
@@ -1,11 +1,16 @@
-choco install -y firefox googlechrome wget notepadplusplus
+@echo on
+choco install -y firefox googlechrome wget notepadplusplus sublimetext3

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

-c:\cygwin64\bin\bash.exe --login -c "cp -vr `cygpath $HOMEPATH`/.ssh $HOME/"
-c:\cygwin64\bin\bash.exe --login -c "mkdir -pv $HOME/dev/"
-c:\cygwin64\bin\bash.exe --login -c "git clone git@github.com:cyplo/dotfiles.git dev/dotfiles"
+set bash=c:\cygwin64\bin\bash.exe --login -c
+for /f "delims=" %%A in ('%bash% "cd `cygpath $HOMEPATH`/dev/dotfiles && git rev-parse --abbrev-ref HEAD"') do set "branch=%%A"
+%bash% 'echo "branch is $branch"'
+%bash% "cp -vr `cygpath $HOMEPATH`/.ssh $HOME/"
+%bash% "mkdir -pv $HOME/dev/"

-c:\cygwin64\bin\bash.exe --login -c "export DIR=$HOME/dev/dotfiles && export NOSUDO=true && export DONT_CHANGE_SHELL=true && bash $DIR/common/configure_fresh_system"
+%bash% "git clone `cygpath $HOMEPATH`/dev/dotfiles $HOME/dev/dotfiles"
+%bash% "cd $HOME/dev/dotfiles && git checkout $branch"
+%bash% "export DIR=$HOME/dev/dotfiles && export NOSUDO=true && export DONT_CHANGE_SHELL=true && bash $DIR/common/configure_fresh_system"


Rebuild the solution if needed for com registration

com-register script now checks for existence of the dll file and
rebuilds the project if needed

--- Src/scripts/com-register.cmd
+++ Src/scripts/com-register.cmd
@@ -17,8 +17,12 @@
 REM
 REM ---------------------------------------------------------------------------

-REM Either run this from Vistual Studio command line, or set correct environment path for Gacutil first
+REM Either run this from Vistual Studio command line, or set correct environment path for Gacutil and MSBuild tools first
 REM If you do not have Gacutil tool, you can download it as part of Winsows SDK
+
+IF NOT EXIST ..\Couchbase.ComClient\bin\Release\Couchbase.ComClient.dll (
+    MSBuild.exe ..\Couchbase.ComClient\Couchbase.ComClient.csproj /t:Rebuild /p:Configuration=Release
+)

 echo on


Enable echo for Gradle to debug.

Enable echo for Gradle to debug.

--- byte-buddy-gradle-plugin/gradlew.bat
+++ byte-buddy-gradle-plugin/gradlew.bat
@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem

-@if "%DEBUG%" == "" @echo off
+@echo on
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -131,7 +131,7 @@
         )
     ) else (
         if "%GRADLEW_VERBOSE%" == "true" (
-            echo Couldn't find %WRAPPER_URL%, downloading it ...
+            echo Couldn't find %WRAPPER_TARGET%, downloading it ...
             echo Downloading from: %WRAPPER_URL%
         )


Add context-menu-disable-vim.bat

Add context-menu-disable-vim.bat

error: pathspec 'context-menu-disable-vim.bat' did not match any file(s) known to git

--- context-menu-disable-vim.bat
+++ context-menu-disable-vim.bat
@@ -0,0 +1,8 @@
+@echo off
+
+setlocal EnableDelayedExpansion
+
+set registryRoot=HKCU\Software\Classes
+set key=Vim
+
+reg add "%registryRoot%\*\shell\%key%" /v LegacyDisable /t REG_SZ /f


remove unused file

remove unused file

--- fmpp/lcp.bat
+++ fmpp/lcp.bat
@@ -1,38 +0,0 @@
-REM   Copyright 2014 Attila Szegedi, Daniel Dekany, Jonathan Revusky
-REM
-REM   Licensed under the Apache License, Version 2.0 (the "License");
-REM   you may not use this file except in compliance with the License.
-REM   You may obtain a copy of the License at
-REM
-REM   http://www.apache.org/licenses/LICENSE-2.0
-REM
-REM   Unless required by applicable law or agreed to in writing, software
-REM   distributed under the License is distributed on an "AS IS" BASIS,
-REM   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-REM   See the License for the specific language governing permissions and
-REM   limitations under the License.
-REM
-REM   ------------------------------------------------------------------------
-REM
-REM   This file is a modified version of the file that comes with Ant 1.5.
-REM   The original version is copyrighted by The Apache Software Foundation.
-REM   The original copyright notice follows:
-REM
-REM   Copyright (c) 2001-2003 The Apache Software Foundation.  All rights
-REM   reserved.
-
-if "%FMPP_BAT_DEBUG%" == "on" echo [DEBUG] lcp.bat invoked with: %1
-
-set _CLASSPATHCOMPONENT=%1
-if ""%1""=="""" goto gotAllArgs
-shift
-
-:argCheck
-if ""%1""=="""" goto gotAllArgs
-set _CLASSPATHCOMPONENT=%_CLASSPATHCOMPONENT% %1
-shift
-goto argCheck
-
-:gotAllArgs
-set LOCALCLASSPATH=%_CLASSPATHCOMPONENT%;%LOCALCLASSPATH%
-


removing output capture from ci script to assist in troubleshooting

--- build-ci.cmd
+++ build-ci.cmd
@@ -3,5 +3,4 @@
 REM 'test'
 REM 'test-integration'

-@ECHO OFF
-tools\nant\bin\nant.exe -f:Common.Logging.build test-integration > buildlog.txt+tools\nant\bin\nant.exe -f:Common.Logging.build test-integration


* test

* test

--- build/ci.bat
+++ build/ci.bat
@@ -12,7 +12,7 @@
 	grep -i 'Already up-to-date' pull.txt > grep.txt
 	for %%A in (grep.txt) do set size=%%~zA
 	if "%size%" EQU "0" (
-		cmd /c build\run-tests-ci.bat
+		cmd /c build\run-tests.bat
 		echo ci.bat
 		echo %ERRORLEVEL%
 		if %ERRORLEVEL% NEQ 0 goto end


more debug

more debug

--- mk-libev.bat
+++ mk-libev.bat
@@ -13,7 +13,7 @@

 :: Build

-set > env_env.txt
+sh --version

 del /s *.o *.a *.lo *.la *.lai *.Plo >> nul 2>&1
 sh -x "./configure"


Upgrade build script

Upgrade build script

--- Scripts/test-coverage.bat
+++ Scripts/test-coverage.bat
@@ -27,7 +27,7 @@

 @Rem OpenCover Nuget Package
 @Rem set OpenCoverNugetPackage=".\packages\OpenCover.4.6.166\tools\OpenCover.Console.exe"
-@set OpenCoverNugetPackage=".\packages\OpenCover.4.6.434-rc\tools\OpenCover.Console.exe"
+@set OpenCoverNugetPackage=".\packages\OpenCover.4.6.515-rc\tools\OpenCover.Console.exe"

 @Rem OpenCover Command
 @set OpenCoverCommand=%OpenCoverNugetPackage%


METIS-24 updated build-gmock.bat

METIS-24 updated build-gmock.bat

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

 Set ARCHIVE=gmock-1.7.0.zip
@@ -10,7 +18,7 @@

 echo "Configuring GoogleMock with GoogleTest"
 cd %BUILD_DIR%
-cmake . -DCMAKE_INSTALL_PREFIX=%PREFIX% -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DGTEST_CREATE_SHARED_LIBRARY=1 .
+cmake . -DCMAKE_INSTALL_PREFIX=%PREFIX% -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DGTEST_CREATE_SHARED_LIBRARY=1 -G "%ARCH%" .

 echo "Building GoogleMock with GoogleTest"
 MSBuild.exe gmock.sln /p:Configuration=Release > NUL


Do not pass in CLANG envs on Windows anymore

--- recipes/standardese/bld.bat
+++ recipes/standardese/bld.bat
@@ -2,20 +2,12 @@

 mkdir build
 cd build
-
-llvm-config
-llvm-config --bindir
-llvm-config

 :: Configure
 cmake -G "NMake Makefiles" ^
       -DCMAKE_INSTALL_PREFIX:PATH="%LIBRARY_PREFIX%" ^
       -DCMAKE_PREFIX_PATH:PATH="%LIBRARY_PREFIX%" ^
       -DCMAKE_BUILD_TYPE:STRING=Release ^
-      -DLLVM_VERSION_EXPLICIT="9.0.0" ^
-      -DLIBCLANG_LIBRARY="%LIBRARY_BIN%\libclang.dll" ^
-      -DLIBCLANG_INCLUDE_DIR="%LIBRARY_INC%" ^
-      -DCLANG_BINARY="%LIBRARY_BIN%\clang.exe" ^
       ..
 if errorlevel 1 exit 1


cleanup help

cleanup help

cleanup help message

--- release/win/bin/process.bat
+++ release/win/bin/process.bat
@@ -3,10 +3,10 @@
 echo.
 echo Usage: process ^<configuration directory^> ^[batch process bean id^]
 echo.
-echo      configuration directory -- directory that contains configuration files,
+echo      configuration directory -- required -- directory that contains configuration files,
 echo          i.e. config.properties, process-conf.xml, database-conf.xml
 echo.
-echo      batch process bean id -- optional bean id of a batch process bean in process-conf.xml,
+echo      batch process bean id -- optional -- id of a batch process bean in process-conf.xml,
 echo          for example:
 echo.
 echo              process ../myconfigdir AccountInsert


Remove DownloadDeps.bat file

Remove DownloadDeps.bat file

--- build/DownloadDeps.bat
+++ build/DownloadDeps.bat
@@ -1,6 +0,0 @@
-"premake5" --file=scripts/LLVM.lua download_llvm
-goto quit
-
-:quit
-pause
-:end


JBTM-1944 Corrected typo on wildfly variable

--- scripts/hudson/narayana.bat
+++ scripts/hudson/narayana.bat
@@ -43,12 +43,9 @@
 if not defined JBOSSAS_IP_ADDR echo "JBOSSAS_IP_ADDR not set" & for /f "delims=" %%a in ('hostname') do @set JBOSSAS_IP_ADDR=%%a

 rem INITIALIZE JBOSS
-call ant -f blacktie/scripts/hudson/initializeJBoss.xml -DJBOSS_HOME=%WORKSPACE%\blacktie\wildfly-${WILDFLY_MASTER_VERSION} initializeJBoss -debug || (call:fail_build && exit -1)
+call ant -f blacktie\scripts\hudson\initializeJBoss.xml -DJBOSS_HOME=%WORKSPACE%\blacktie\wildfly-%WILDFLY_MASTER_VERSION% initializeJBoss -debug || (call:fail_build && exit -1)

-rem wget -P jboss-as\standalone\deployments\ -N http://172.17.131.2/job/narayana-populateM2-taconic/lastSuccessfulBuild/artifact/rts/at/webservice/target/restat-web-5.0.0.M2-SNAPSHOT.war
-rem IF %ERRORLEVEL% NEQ 0 call:comment_on_pull "Can not wget restat-web war" & exit -1
-
-set JBOSS_HOME=%WORKSPACE%\blacktie\wildfly-${WILDFLY_MASTER_VERSION}
+set JBOSS_HOME=%WORKSPACE%\blacktie\wildfly-%WILDFLY_MASTER_VERSION%

 rem START JBOSS
 rem set JAVA_OPTS="%JAVA_OPTS% -Xmx1024m -XX:MaxPermSize=512m"
@@ -57,7 +54,7 @@
 @ping 127.0.0.1 -n 20 -w 1000 > nul

 rem BUILD BLACKTIE
-call build.bat -f blacktie/pom.xml clean install "-Djbossas.ip.addr=%JBOSSAS_IP_ADDR%" || (call:fail_build && exit -1)
+call build.bat -f blacktie\pom.xml clean install "-Djbossas.ip.addr=%JBOSSAS_IP_ADDR%" || (call:fail_build && exit -1)

 rem SHUTDOWN ANY PREVIOUS BUILD REMNANTS
 tasklist & FOR /F "usebackq tokens=5" %%i in (`"netstat -ano|findstr 9999.*LISTENING"`) DO taskkill /F /PID %%i


excape path separators to be more gyp friendly

--- utils/mapnik-config/mapnik-config.bat
+++ utils/mapnik-config/mapnik-config.bat
@@ -2,10 +2,10 @@

 set MAPNIK_VERSION=v2.2.0
 set MAPNIK_PREFIX=c:\\mapnik-%MAPNIK_VERSION%
-set MAPNIK_LIBS=%MAPNIK_PREFIX%\lib
-set MAPNIK_INCLUDES=%MAPNIK_PREFIX%\include
-set MAPNIK_INPUT_PLUGINS_DIRECTORY=%MAPNIK_PREFIX%\input
-set MAPNIK_FONTS_DIRECTORY=%MAPNIK_PREFIX%\fonts
+set MAPNIK_LIBS=%MAPNIK_PREFIX%\\lib
+set MAPNIK_INCLUDES=%MAPNIK_PREFIX%\\include
+set MAPNIK_INPUT_PLUGINS_DIRECTORY=%MAPNIK_PREFIX%\\input
+set MAPNIK_FONTS_DIRECTORY=%MAPNIK_PREFIX%\\fonts

 if /i "%1"=="" goto help
 if /i "%1"=="help" goto help


error fixed in helloworld.bat

error fixed in helloworld.bat

--- examples/node/windows/helloworld.bat
+++ examples/node/windows/helloworld.bat
@@ -1,3 +1,3 @@
-start node1.exe ..\..\taskServer\stdio2socketServ.js "python ..\..\tasks\helloworld.py" -w 8800 -h "..\..\taskServer\helloworld.html"
+start node.exe ..\..\taskServer\stdio2socketServ.js "python ..\..\tasks\helloworld.py" -w 8800 -h "..\..\taskServer\helloworld.html"
 timeout 3
 start ..\..\taskServer\helloworld.html


Added Receiver Sample App missing file.

Added Receiver Sample App missing file.


Adding WebExtras.Mvc.T4 package building to post-build steps.

--- build/appveyor-postbuild.bat
+++ build/appveyor-postbuild.bat
@@ -26,6 +26,7 @@
 cd build
 nuget pack WebExtras.nuspec -OutputDirectory ..\artifacts
 nuget pack WebExtras.Mvc.nuspec -OutputDirectory ..\artifacts
+nuget pack WebExtras.Mvc.T4.nuspec -OutputDirectory ..\artifacts
 nuget pack WebExtras.Nancy.nuspec -OutputDirectory ..\artifacts
 cd ..


Remove obsolete appveyor script 'run_with_env.cmd' (#1452)

--- appveyor/run_with_env.cmd
+++ appveyor/run_with_env.cmd
@@ -1,86 +0,0 @@
-:: To build extensions for 64 bit Python 3, we need to configure environment
-:: variables to use the MSVC 2010 C++ compilers from GRMSDKX_EN_DVD.iso of:
-:: MS Windows SDK for Windows 7 and .NET Framework 4 (SDK v7.1)
-::
-:: To build extensions for 64 bit Python 2, we need to configure environment
-:: variables to use the MSVC 2008 C++ compilers from GRMSDKX_EN_DVD.iso of:
-:: MS Windows SDK for Windows 7 and .NET Framework 3.5 (SDK v7.0)
-::
-:: 32 bit builds, and 64-bit builds for 3.5 and beyond, do not require specific
-:: environment configurations.
-::
-:: Note: this script needs to be run with the /E:ON and /V:ON flags for the
-:: cmd interpreter, at least for (SDK v7.0)
-::
-:: More details at:
-:: https://github.com/cython/cython/wiki/64BitCythonExtensionsOnWindows
-:: http://stackoverflow.com/a/13751649/163740
-::
-:: Author: Olivier Grisel
-:: License: CC0 1.0 Universal: http://creativecommons.org/publicdomain/zero/1.0/
-::
-:: Notes about batch files for Python people:
-::
-:: Quotes in values are literally part of the values:
-::      SET FOO="bar"
-:: FOO is now five characters long: " b a r "
-:: If you don't want quotes, don't include them on the right-hand side.
-::
-:: The CALL lines at the end of this file look redundant, but if you move them
-:: outside of the IF clauses, they do not run properly in the SET_SDK_64==Y
-:: case, I don't know why.
-@ECHO OFF
-
-SET COMMAND_TO_RUN=%*
-SET WIN_SDK_ROOT=C:\Program Files\Microsoft SDKs\Windows
-SET WIN_WDK=c:\Program Files (x86)\Windows Kits\10\Include\wdf
-
-:: Extract the major and minor versions, and allow for the minor version to be
-:: more than 9.  This requires the version number to have two dots in it.
-SET MAJOR_PYTHON_VERSION=%PYTHON_VERSION:~0,1%
-IF "%PYTHON_VERSION:~3,1%" == "." (
-    SET MINOR_PYTHON_VERSION=%PYTHON_VERSION:~2,1%
-) ELSE (
-    SET MINOR_PYTHON_VERSION=%PYTHON_VERSION:~2,2%
-)
-:: Based on the Python version, determine what SDK version to use, and whether
-:: to set the SDK for 64-bit.
-IF %MAJOR_PYTHON_VERSION% == 2 (
-    SET WINDOWS_SDK_VERSION="v7.0"
-    SET SET_SDK_64=Y
-) ELSE (
-    IF %MAJOR_PYTHON_VERSION% == 3 (
-        SET WINDOWS_SDK_VERSION="v7.1"
-        IF %MINOR_PYTHON_VERSION% LEQ 4 (
-            SET SET_SDK_64=Y
-        ) ELSE (
-            SET SET_SDK_64=N
-            IF EXIST "%WIN_WDK%" (
-                :: See: https://connect.microsoft.com/VisualStudio/feedback/details/1610302/
-                REN "%WIN_WDK%" 0wdf
-            )
-        )
-    ) ELSE (
-        ECHO Unsupported Python version: "%MAJOR_PYTHON_VERSION%"
-        EXIT 1
-    )
-)
-IF %PYTHON_ARCH% == 64 (
-    IF %SET_SDK_64% == Y (
-        ECHO Configuring Windows SDK %WINDOWS_SDK_VERSION% for Python %MAJOR_PYTHON_VERSION% on a 64 bit architecture
-        SET DISTUTILS_USE_SDK=1
-        SET MSSdk=1
-        "%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Setup\WindowsSdkVer.exe" -q -version:%WINDOWS_SDK_VERSION%
-        "%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Bin\SetEnv.cmd" /x64 /release
-        ECHO Executing: %COMMAND_TO_RUN%
-        call %COMMAND_TO_RUN% || EXIT 1
-    ) ELSE (
-        ECHO Using default MSVC build environment for 64 bit architecture
-        ECHO Executing: %COMMAND_TO_RUN%
-        call %COMMAND_TO_RUN% || EXIT 1
-    )
-) ELSE (
-    ECHO Using default MSVC build environment for 32 bit architecture
-    ECHO Executing: %COMMAND_TO_RUN%
-    call %COMMAND_TO_RUN% || EXIT 1
-)


extracted jenkins job script code into build.bat

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

--- bin/build.bat
+++ bin/build.bat
@@ -0,0 +1,40 @@
+set local
+set BUILD=%1
+set "var1=%BUILD:*_=%"
+echo var1 = %var1%
+
+set BUILD=%1
+if "%BUILD:~-7%" == "_vmware" (
+  set template=%BUILD:~0,-7%
+  set builder=vmware-iso
+  set spec=vmware
+)
+if "%BUILD:~-7%" == "_vcloud" (
+  set template=%BUILD:~0,-7%
+  set builder=vmware-iso
+  set spec=vcloud
+)
+if "%BUILD:~-11%" == "_virtualbox" (
+  set template=%BUILD:~0,-11%
+  set builder=virtualbox-iso
+  set spec=virtualbox
+)
+
+if "%spec%x"=="x" (
+  echo Wrong build parameter!
+  goto :EOF
+)
+
+echo template = %template%
+echo builder = %builder%
+echo spec = %spec%
+
+if exist output-%builder% (
+  rmdir /S /Q output-%builder%
+)
+packer build --only=%builder% %template%_%spec%.json
+if ERRORLEVEL 1 goto :EOF
+
+if exist %~dp0\test-box-%spec%.bat (
+  call %~dp0\test-box-%spec%.bat %template%_%spec%.box %template%
+)


flash debug firmware option

flash debug firmware option

--- bin/flash.bat
+++ bin/flash.bat
@@ -4,6 +4,7 @@
 echo - [1] Flash Generic Firmware
 echo - [2] Flash Firmware for Official Hardware (v2)
 echo - [3] Erase the Firmware on ESP8266 by flashing empty file
+echo - [4] Flash Generic DEBUG Firmware

 set /p opt=Please choose an option eg. 1:

@@ -13,18 +14,26 @@
 :1
   set /p com=Enter which COM Port your ESP is connected eg. COM1 COM2 COM7:
   esptool.exe -vv -cd nodemcu -cb 921600 -cp %com% -ca 0x00000 -cf generic.bin
+  GOTO EXIT_CASE
 :2
   set /p com=Enter which COM Port your ESP is connected eg. COM1 COM2 COM7:
   esptool.exe -vv -cd nodemcu -cb 921600 -cp %com% -ca 0x00000 -cf forV2Board.bin
+  GOTO EXIT_CASE
 :3
   set /p com=Enter which COM Port your ESP is connected eg. COM1 COM2 COM7:
   esptool.exe -vv -cd nodemcu -cb 921600 -cp %com% -ca 0x00000 -cf blank4mb.bin
+  GOTO EXIT_CASE
+:4
+  set /p com=Enter which COM Port your ESP is connected eg. COM1 COM2 COM7:
+  esptool.exe -vv -cd nodemcu -cb 921600 -cp %com% -ca 0x00000 -cf debug.bin
+  GOTO EXIT_CASE
 :DEFAULT_CASE
   ECHO Unknown option "%opt%"
   GOTO END_CASE
 :END_CASE
   VER > NUL # reset ERRORLEVEL
   GOTO :EOF # return from CALL
+:EXIT_CASE
+  exit

-


set ver status

set ver status

--- build-all.cmd
+++ build-all.cmd
@@ -17,7 +17,7 @@

 :build
 call build.cmd %1 || goto :ko
-call publish.cmd %1 || goto :ko
+call publish.cmd %1 %2 || goto :ko
 goto :eof

 :test


Redirect stderr to compilation.log in compile-d.bat

--- compile-d.bat
+++ compile-d.bat
@@ -12,4 +12,4 @@
     call concatenate %%i
 )

-dmd -O -release -inline -noboundscheck %FILES% -of%name%
+dmd -O -release -inline -noboundscheck %FILES% -of%name% 2>compilation.log


fixed typo.

fixed typo.

--- src/tomcat/bin/setenv.bat
+++ src/tomcat/bin/setenv.bat
@@ -1,9 +1,9 @@
 set JAVA_OPTS=%JAVA_OPTS% -Dsolr.solr.home="%CATALINA_HOME%\solr" -Dfess.log.file="%CATALINA_HOME%\webapps\fess\WEB-INF\logs\fess.out" -Dsolr.log.file="%CATALINA_HOME%\logs\solr.log" -Djava.awt.headless=true -server -Xmx1g -XX:+UseTLAB -XX:+DisableExplicitGC

 for /f tokens^=2-5^ delims^=.-_^" %%j in ('java -fullversion 2^>^&1') do set "jver=%%j%%k"
-if %jver% GTR "17" (~
+if %jver% GTR "17" (
 set JAVA_OPTS=%JAVA_OPTS% -XX:MaxMetaspaceSize=128m -XX:+UseG1GC -XX:InitiatingHeapOccupancyPercent=45 -XX:MaxGCPauseMillis=200
- ) else (~
+ ) else (
 set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=128m -XX:-UseGCOverheadLimit -XX:+UseConcMarkSweepGC -XX:CMSInitiatingOccupancyFraction=75 -XX:+CMSIncrementalMode -XX:+CMSIncrementalPacing -XX:CMSIncrementalDutyCycleMin=0 -XX:+UseParNewGC -XX:+UseStringCache -XX:+UseCompressedOops
 rem -XX:+UseCompressedStrings if java6u20 or above
 rem -XX:+OptimizeStringConcat if java6u21 or above


testend

testend

--- mpg-config.bat
+++ mpg-config.bat
@@ -1,5 +1,5 @@
 @echo off
-
+
 set COMPILER="Visual Studio 10 Win64"
 set COMPILER="Visual Studio 10"


Removing Tool suffix from stratos.bat file

--- products/stratos-cli/distribution/src/main/bin/stratos.bat
+++ products/stratos-cli/distribution/src/main/bin/stratos.bat
@@ -32,5 +32,5 @@

 cd %STRATOS_CLI_HOME%

-java -jar "org.apache.stratos.cli-4.0.0-Tool.jar" %*
+java -jar "org.apache.stratos.cli-4.0.0.jar" %*


changed generated excel file extension to xml

Xml file must be opened with Office XML Handler.

--- src/AnalyseProject.cmd
+++ src/AnalyseProject.cmd
@@ -57,7 +57,7 @@
 %nxslt% Working\project.links.xml StyleSheets\Project.Downtime.xslt -o Working\downtime.xml
 %nxslt% Working\downtime.xml StyleSheets\Document.Downtime.xslt -o Output\Project.Downtime.html
 %nxslt% Working\downtime.xml StyleSheets\Bootstrap.Downtime.xslt -o Output\Bootstrap.Downtime.html
-%nxslt% Working\downtime.xml StyleSheets\Excel.Downtime.xslt -o Output\Excel.Downtime.xlsx
+%nxslt% Working\downtime.xml StyleSheets\Excel.Downtime.xslt -o Output\Excel.Downtime.xml

 @echo === Interfaces ===
 %nxslt% Working\project.xml       StyleSheets\Document.Interfaces.xslt  -o Output\Project.Interfaces.html


mk-librtmp.bat: fix to build rtmp exes, fix to clean

--- mk-librtmp.bat
+++ mk-librtmp.bat
@@ -14,11 +14,16 @@
 :: Build

 set INC=-I../../openssl/include -I../../zlib
-if "%_CPU%" == "win32" set XCFLAGS=-m32
-if "%_CPU%" == "win64" set XCFLAGS=-m64
-if "%_CPU%" == "win32" set XLDFLAGS=-m32 -L../../openssl -L../../zlib
-if "%_CPU%" == "win64" set XLDFLAGS=-m64 -L../../openssl -L../../zlib
-set LDFLAGS=%XLDFLAGS%
+if "%_CPU%" == "win32" (
+   set XCFLAGS=-m32
+   set XLDFLAGS=-m32 -L../openssl -L../zlib
+   set  LDFLAGS=-m32 -L../../openssl -L../../zlib
+) else (
+   set XCFLAGS=-m64
+   set XLDFLAGS=-m64 -L../openssl -L../zlib
+   set  LDFLAGS=-m64 -L../../openssl -L../../zlib
+)
+del /s *.o *.a *.dll *.so *.exe >> nul 2>&1
 mingw32-make SYS=mingw SODEF_yes=

 :: Make steps for determinism


add 1.bat

add 1.bat

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

--- vendor/bin/1.bat
+++ vendor/bin/1.bat
@@ -0,0 +1,2 @@
+doctrine-module orm:convert-mapping annotation module/Blog/src --namespace="Blog\Entity\\" --from-database
+<!--doctrine-module orm:generate-entities /module/Blog/src/ --generate-annotations=true-->


lib dir is needed in Classpath for Matlab (access to ptolemy.dll)

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

--- scripts/windows/init.bat
+++ scripts/windows/init.bat
@@ -28,7 +28,7 @@

 set JARS=
 FOR %%j IN (%PROACTIVE%\lib\*.jar) DO SET JARS=!JARS!;%%j
-SET CLASSPATH=%CLASSPATH%;%JARS%
+SET CLASSPATH=%CLASSPATH%;%PROACTIVE%\lib;%JARS%

 set JAVA_CMD="%JAVA_HOME%\bin\java.exe" -Djava.security.manager -Djava.security.policy="%PROACTIVE%\scripts\proactive.java.policy" -Dlog4j.configuration=file:"%PROACTIVE%\scripts\proactive-log4j"


now using jpg file instead of paa

now using jpg file instead of paa

--- makedist.bat
+++ makedist.bat
@@ -9,7 +9,7 @@

 robocopy .\data      .\..\%THE_TMP_DIR%\data %FLAGS%
 robocopy .\functions .\..\%THE_TMP_DIR%\functions %FLAGS%
-robocopy .\images    .\..\%THE_TMP_DIR%\images mission-wait-08.paa %FLAGS%
+robocopy .\images    .\..\%THE_TMP_DIR%\images mission-wait-08.jpg %FLAGS%
 robocopy .\scripts   .\..\%THE_TMP_DIR%\scripts %FLAGS%
 robocopy .\sounds    .\..\%THE_TMP_DIR%\sounds %FLAGS%
 robocopy .\          .\..\%THE_TMP_DIR%\ description.ext init.sqf LICENSE mission.sqm  /NP /NDL /NFL /NJH /NJS


Update bld.bat

Update bld.bat

--- recipes/r-adaptgauss/bld.bat
+++ recipes/r-adaptgauss/bld.bat
@@ -1,2 +1,2 @@
-"%R%" CMD INSTALL --build . %R_ARGS%
+"%R%" CMD INSTALL --build . %R_ARGS%
 IF %ERRORLEVEL% NEQ 0 exit /B 1


try updating bld.bat

try updating bld.bat

--- recipes/zaber-motion/bld.bat
+++ recipes/zaber-motion/bld.bat
@@ -5,9 +5,9 @@
 if errorlevel 1 exit 1

 rem Look at gulpfil.js, protobuf_py
-protoc -I=. --python_out="py/zaber_motion/zaber_motion" ^
-    --plugin="protoc-gen-mypy=tools\protoc-gen-mypy.bat" ^
-    --mypy_out="py/zaber_motion/zaber_motion" protobufs\main.proto
+protoc -I=. --python_out="py\zaber_motion\zaber_motion"      ^
+    --plugin="protoc-gen-mypy=tools\protoc-gen-mypy.bat"     ^
+    --mypy_out="py\zaber_motion\zaber_motion" protobufs\main.proto
 if errorlevel 1 exit 1

 echo.> py\zaber_motion\zaber_motion\protobufs\__init__.py


Remove the AuthenticationBBTest from the .bat

--- SctPkg/CommonGenFramework.bat
+++ SctPkg/CommonGenFramework.bat
@@ -174,7 +174,7 @@
 rem copy %ProcessorType%\UsbHcTest.efi                            %Framework%\Test\ > NUL
 copy %ProcessorType%\UsbIoTest.efi                            %Framework%\Test\ > NUL
 copy %ProcessorType%\Usb2HcTest.efi                           %Framework%\Test\ > NUL
-copy %ProcessorType%\AuthenticationBBTest.efi                 %Framework%\Test\ > NUL
+rem copy %ProcessorType%\AuthenticationBBTest.efi                 %Framework%\Test\ > NUL
 rem copy %ProcessorType%\HashBBTest.efi                           %Framework%\Test\ > NUL
 copy %ProcessorType%\TapeBBTest.efi                           %Framework%\Test\ > NUL
 copy %ProcessorType%\AcpiTableProtocolBBTest.efi              %Framework%\Test\ > NUL


new generate installer for win32 x64

new generate installer for win32 x64

git-svn-id: ab66a9de07fa9d47c5829c82992f5279466c775f@4509 63c20433-aa62-49bd-875c-5a186b69a8fb

--- generate_installer.bat
+++ generate_installer.bat
@@ -6,6 +6,13 @@
 REM ============================================

+:begin
+IF "%1"=="win32" GOTO next
+IF "%1"=="x64" GOTO next
+echo You must specified target architecture : win32 or x64
+GOTO Abort
+
+:next
 echo:
 REM ============================================
 echo Check NSIS is in your PATH
@@ -44,23 +51,23 @@
 if !"%VarRevisionBuild%"==!"%VarRevisionSVN%" goto Abort
 REM echo   version found: %VarRevisionSVN%

-move bin\win32\release\nsis_install\default.out bin\win32\release\nsis_install\default.out_
-echo Name "GPAC Framework ${GPAC_VERSION} revision %VarRevisionSVN%" > bin\win32\release\nsis_install\default.out
-echo OutFile "GPAC.Framework.Setup-${GPAC_VERSION}-rev%VarRevisionSVN%.exe" >> bin\win32\release\nsis_install\default.out
+move bin\%1\release\nsis_install\default.out bin\%1\release\nsis_install\default.out_
+echo Name "GPAC Framework ${GPAC_VERSION} revision %VarRevisionSVN%" > bin\%1\release\nsis_install\default.out
+echo OutFile "GPAC.Framework.Setup-${GPAC_VERSION}-rev%VarRevisionSVN%.exe" >> bin\%1\release\nsis_install\default.out

 echo:
 REM ============================================
 echo Executing NSIS
 REM ============================================
-call %NSIS_EXEC% bin\win32\release\nsis_install\gpac_installer.nsi
+call %NSIS_EXEC% bin\%1\release\nsis_install\gpac_installer.nsi

 echo:
 REM ============================================
 echo Removing temporary files
 REM ============================================
-move bin\win32\release\nsis_install\default.out_ bin\win32\release\nsis_install\default.out
+move bin\%1\release\nsis_install\default.out_ bin\%1\release\nsis_install\default.out

 echo:


Add pyscripter batch file

Add pyscripter batch file

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

--- pyscripter.cmd
+++ pyscripter.cmd
@@ -0,0 +1,10 @@
+@echo off
+SETLOCAL ENABLEDELAYEDEXPANSION
+call "%~DP0\setenv.bat"
+set PYTHONDLL=%PYTHONHOME%
+set PYTHONHOME=
+set PYTHONPATH=%PYTHONPATH%;C:\Software\PyScripter\Lib
+REM start "PyScripter MetaGETA" /B "C:\Software\PyScripter\PyScripter.exe" --PYTHON27  --PYTHONDLLPATH "%PYTHONDLL%" --newinstance %1 %2 %3 %4 %5
+CALL "C:\Software\PyScripter\PyScripter.exe" --PYTHON27  --PYTHONDLLPATH "%PYTHONDLL%" --newinstance %1 %2 %3 %4 %5
+PAUSE
+ENDLOCAL


Update VMware tools and VBoxAdditions

Update VMware tools and VBoxAdditions

--- scripts/vm-guest-tools.bat
+++ scripts/vm-guest-tools.bat
@@ -3,12 +3,10 @@
 )
 msiexec /qb /i C:\Windows\Temp\7z920-x64.msi

+if "%PACKER_BUILDER_TYPE%" equ "vmware-iso" goto :vmware
+if "%PACKER_BUILDER_TYPE%" equ "virtualbox-iso" goto :virtualbox
 if "%PACKER_BUILDER_TYPE%" equ "parallels-iso" goto :parallels
-if "%PACKER_BUILDER_TYPE%" equ "virtualbox-iso" goto :virtualbox
-if "%PACKER_BUILDER_TYPE%" equ "vmware-iso" goto :vmware
-
-rem default is vmware
-rem rem goto :done
+goto :done

 :vmware

@@ -17,7 +15,7 @@
 )

 if not exist "C:\Windows\Temp\windows.iso" (
-    powershell -Command "(New-Object System.Net.WebClient).DownloadFile('http://softwareupdate.vmware.com/cds/vmw-desktop/ws/12.5.1/4542065/windows/packages/tools-windows.tar', 'C:\Windows\Temp\vmware-tools.tar')" <NUL
+    powershell -Command "(New-Object System.Net.WebClient).DownloadFile('http://softwareupdate.vmware.com/cds/vmw-desktop/ws/12.5.5/5234757/windows/packages/tools-windows.tar', 'C:\Windows\Temp\vmware-tools.tar')" <NUL
     cmd /c ""C:\Program Files\7-Zip\7z.exe" x C:\Windows\Temp\vmware-tools.tar -oC:\Windows\Temp"
     FOR /r "C:\Windows\Temp" %%a in (VMware-tools-windows-*.iso) DO REN "%%~a" "windows.iso"
     rd /S /Q "C:\Program Files (x86)\VMWare"
@@ -26,6 +24,9 @@
 cmd /c ""C:\Program Files\7-Zip\7z.exe" x "C:\Windows\Temp\windows.iso" -oC:\Windows\Temp\VMWare"
 cmd /c C:\Windows\Temp\VMWare\setup.exe /S /v"/qn REBOOT=R\"

+rd /Q "C:\Windows\Temp\vmware-tools.tar"
+rd /Q "C:\Windows\Temp\windows.iso"
+rd /S /Q "C:\Windows\Temp\VMware"
 goto :done

 :virtualbox
@@ -39,10 +40,13 @@
 )

 if not exist "C:\Windows\Temp\VBoxGuestAdditions.iso" (
-    powershell -Command "(New-Object System.Net.WebClient).DownloadFile('http://download.virtualbox.org/virtualbox/5.1.8/VBoxGuestAdditions_5.1.8.iso', 'C:\Windows\Temp\VBoxGuestAdditions.iso')" <NUL
+    powershell -Command "(New-Object System.Net.WebClient).DownloadFile('http://download.virtualbox.org/virtualbox/5.1.20/VBoxGuestAdditions_5.1.20.iso', 'C:\Windows\Temp\VBoxGuestAdditions.iso')" <NUL
 )

 cmd /c ""C:\Program Files\7-Zip\7z.exe" x C:\Windows\Temp\VBoxGuestAdditions.iso -oC:\Windows\Temp\virtualbox"
+certutil -addstore -f "TrustedPublisher" C:\Windows\Temp\virtualbox\cert\vbox-sha256-r3.cer
+certutil -addstore -f "TrustedPublisher" C:\Windows\Temp\virtualbox\cert\vbox-sha256.cer
+certutil -addstore -f "TrustedPublisher" C:\Windows\Temp\virtualbox\cert\vbox-sha1.cer
 cmd /c C:\Windows\Temp\virtualbox\VBoxWindowsAdditions.exe /S
 rd /S /Q "C:\Windows\Temp\virtualbox"
 goto :done


Windows: Fix JOM path

Windows: Fix JOM path

--- build-windows.cmd
+++ build-windows.cmd
@@ -1,7 +1,7 @@
 set SOURCE_DIR=%CD%
 set BUILD_DIR=../build-sqlitewrapper
 set CMAKE_COMMAND=cmake.exe
-set MAKE_COMMAND=C:\Qt\Tools\QtCreator\bin\jom.exe /J 2
+set MAKE_COMMAND=C:\Qt-Installation\Tools\QtCreator\bin\jom.exe /J 2

 call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\Tools\VsDevCmd.bat"

@@ -16,7 +16,7 @@
 %MAKE_COMMAND% || goto error

 cd "%SOURCE_DIR%"
-exit /b 0
+goto :EOF

 :error
 cd "%SOURCE_DIR%"


More Windows fixes

More Windows fixes

--- recipe/bld.bat
+++ recipe/bld.bat
@@ -1,18 +1,6 @@
 @echo on
 setlocal EnableDelayedExpansion
 set SHORT_VERSION=%PKG_VERSION:~0,-2%
-
-:: conda-forge/obviousci's obvci_appveyor_python_build_env.cmd used
-:: so we shouldn't include it finally.  I use it to set the correct
-:: Windows SDK, but conda-build should take care of that probably??
-:: It requires TARGET_ARCH to be one of x64 or x86.  On conda-forge
-:: this script is run *before* bld.bat.
-if "%ARCH%" == "64" (
-  set TARGET_ARCH=x64
-) else (
-  set TARGET_ARCH=x86
-)
-call %RECIPE_DIR%\obvci_appveyor_python_build_env.cmd

 :: if "%DXSDK_DIR%" == "" (
 ::   echo You do not appear to have the DirectX SDK installed.  Please get it from
@@ -32,14 +20,7 @@
 :: `set QT_OPENGL=software` forces Qt5 to use that but
 :: but when I tried it it was too buggy; Spyder crashed a
 :: little bit later, though it worked for Carlos.
-set AVOID_WEBENGINE=yes
 set WEBBACKEND=qtwebengine
-if %VS_MAJOR% LSS 14 (
-  set WEBBACKEND=qtwebkit
-)
-if "%AVOID_WEBENGINE%" == "yes" (
-  set WEBBACKEND=qtwebkit
-)

 where perl.exe
 if %ERRORLEVEL% neq 0 (
@@ -85,25 +66,11 @@
   rmdir /s /q qtwebengine
 )

-:: Angle requires C++11 compilers so vc9 Qt5 must only use DesktopGL
-:: QT_OPENGL=software *may* work too given non-broken opengl32sw.dll
-if %VS_MAJOR% LSS 10 (
-  set OPENGLVER=desktop
-) else (
-  set OPENGLVER=dynamic
-)
+set OPENGLVER=dynamic

 :: Patch does not apply cleanly.  Copy file.
 :: https://codereview.qt-project.org/#/c/141019/
 copy %RECIPE_DIR%\tst_compiler.cpp qtbase\tests\auto\other\compiler\
-
-:: A check here for msinttypes
-if %VS_MAJOR% LSS 10 (
-  if not exist %PREFIX%/Library/include/stdint.h (
-    echo %PREFIX%/include/stdint.h does not exist, please use msinttypes
-    exit /b 1
-  )
-)

 :: TODO: should we always be rebuilding configure.exe anyway
 :: Mentioned patch no longer applied
@@ -202,7 +169,6 @@
 :: To rewrite qt.conf contents per conda environment
 copy "%RECIPE_DIR%\write_qtconf.bat" "%PREFIX%\Scripts\.qt-post-link.bat"
 if errorlevel 1 exit /b 1
-onda remove` also causes immediate build failure.
 if "%WEBBACKEND%" == "qtwebengine" (
   conda remove -y -n python27_qt5_build --all
 )
@@ -210,5 +176,3 @@
 :: To rewrite qt.conf contents per conda environment
 copy "%RECIPE_DIR%\write_qtconf.bat" "%PREFIX%\Scripts\.qt-post-link.bat"
 if errorlevel 1 exit /b 1
-k.bat"
-if errorlevel 1 exit /b 1


Vlv2TbltDevicePkg/bat: add capsule generation in bat.

If OPENSSL_PATH is set, the build process generates capsule.

Cc: David Wei <b5f26b2a2cdf37ab487a7004176f1783629975b0@intel.com>
Cc: Feng Tian <e66bb7e9f36c82a029035c5885acf75500d07e68@intel.com>
Cc: Star Zeng <5c6bb72efe464613af94e84c05522a361b23844a@intel.com>
Cc: Michael D Kinney <fd20bc543a9f65bb633fac7d08a403c1f1c8eb6c@intel.com>
Cc: Liming Gao <6480311aeeb4b006862f6d13ebabddc03f51e507@intel.com>
Cc: Chao Zhang <fed49a7a524fbe970930fd44cd2de5a9d4952d81@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jiewen Yao <364a90bfebd1f362ebb7b48e4bf8ec010adef203@intel.com>
Reviewed-by: David Wei <b5f26b2a2cdf37ab487a7004176f1783629975b0@intel.com>

--- Vlv2TbltDevicePkg/bld_vlv.bat
+++ Vlv2TbltDevicePkg/bld_vlv.bat
@@ -1,7 +1,7 @@
 @REM @file
 @REM   Windows batch file to build BIOS ROM
 @REM
-@REM Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.

+@REM Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.

 @REM This program and the accompanying materials
 @REM are licensed and made available under the terms and conditions of the BSD License
 @REM which accompanies this distribution.  The full text of the license may be found at
@@ -234,6 +234,7 @@

 set BIOS_Name=%BOARD_ID%_%Arch%_%BUILD_TYPE%_%VERSION_MAJOR%_%VERSION_MINOR%.ROM
 copy /y/b %BUILD_PATH%\FV\Vlv%Arch%.fd  %WORKSPACE%\%BIOS_Name% >nul
+copy /y/b %BUILD_PATH%\FV\Vlv%Arch%.fd  %BUILD_PATH%\FV\Vlv.ROM >nul

 echo.
 echo Build location:     %BUILD_PATH%
@@ -241,6 +242,12 @@
 echo.
 echo -------------------- The EDKII BIOS build has successfully completed. --------------------
 echo.
+
+@REM build capsule here
+if "%openssl_path%" == "" goto Exit
+echo > %BUILD_PATH%\FV\SYSTEMFIRMWAREUPDATECARGO.Fv
+build -p %PLATFORM_PACKAGE%\PlatformCapsule.dsc
+
 goto Exit

 :Usage


avoid collision with pre-installed protoc on grpc-win2016 workers (#29171)

--- tools/internal_ci/helper_scripts/prepare_build_windows.bat
+++ tools/internal_ci/helper_scripts/prepare_build_windows.bat
@@ -38,6 +38,10 @@
 netsh interface ip set dns "Local Area Connection 8" static 169.254.169.254 primary
 netsh interface ip add dnsservers "Local Area Connection 8" 8.8.8.8 index=2
 netsh interface ip add dnsservers "Local Area Connection 8" 8.8.4.4 index=3
+
+@rem Uninstall protoc so that it doesn't clash with C++ distribtests.
+@rem (on grpc-win2016 kokoro workers it can result in GOOGLE_PROTOBUF_MIN_PROTOC_VERSION violation)
+choco uninstall protoc -y --limit-output

 @rem Install nasm (required for boringssl assembly optimized build as boringssl no long supports yasm)
 @rem Downloading from GCS should be very reliables when on a GCP VM.


updated readme

updated readme

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

--- bundle/update.cmd
+++ bundle/update.cmd
@@ -0,0 +1 @@
+git submodule foreach git pull origin master


build rmwebdemo

build rmwebdemo

--- build/build-rmwebdemo/make.bat
+++ build/build-rmwebdemo/make.bat
@@ -1,23 +1,29 @@
 @ECHO OFF
 cd target
-rem copy build-rmwebdemo-4.0.0.jar...
+echo copy build-rmwebdemo-4.0.0.jar...
 rem copy build-rmwebdemo-4.0.0.jar build-rmwebdemo-4.0.0-bin\build-rmwebdemo-4.0.0
 cd build-rmwebdemo-4.0.0-bin\build-rmwebdemo-4.0.0
 rem call :extractJar build-rmwebdemo-4.0.0

-rem copy quickbundle-rmwebdemo...
-xcopy /e/y/i ..\..\..\..\..\quickbundle-rmwebdemo quickbundle-rmwebdemo
+echo copy quickbundle-rmwebdemo...
+rem call xcopy /e/y/i/q ..\..\..\..\..\quickbundle-rmwebdemo quickbundle-rmwebdemo
+cd ..\..\..\..\..\
+call jar cfM build/build-rmwebdemo/target/build-rmwebdemo-4.0.0-bin/build-rmwebdemo-4.0.0/quickbundle-rmwebdemo.jar quickbundle-rmwebdemo
+cd build\build-rmwebdemo\target\build-rmwebdemo-4.0.0-bin\build-rmwebdemo-4.0.0
+call jar xfM ./quickbundle-rmwebdemo.jar
+call del quickbundle-rmwebdemo.jar
+
 cd quickbundle-rmwebdemo
 call mvn clean
 cd ..

-rem extract plugin jars...
+echo extract plugin jars...
 call :extractJar org.quickbundle.mda.gc-4.0.0
 call :extractJar org.quickbundle.mda.gp-4.0.0
 call :extractJar org.quickbundle.mda.libs-4.0.0
 call :extractJar org.quickbundle.mda.mvm-4.0.0

-rem move quickbundle-rmwebdemo...
+echo move quickbundle-rmwebdemo...
 move quickbundle-rmwebdemo org.quickbundle.mda.gp-4.0.0\t\j1

 cd ..\..\


--- Batch/Library.bat
+++ Batch/Library.bat
@@ -188,6 +188,7 @@
 :#   2016-12-07 JFL Added a source command for using debug functions in this  #
 :#		    library from an outside script.                           #
 :#   2016-12-08 JFL Moved the most common initializations into :Library.Init. #
+:#   2016-12-12 JFL Fixed function call/return logging when sourcing this lib.#
 :#		                                                              #
 :#          Copyright 2016 Hewlett Packard Enterprise Development LP         #
 :# Licensed under the Apache 2.0 license  www.apache.org/licenses/LICENSE-2.0 #
@@ -203,7 +204,7 @@
 if '%1'=='call' %*& exit /b

 setlocal EnableExtensions EnableDelayedExpansion
-set "VERSION=2016-12-08"
+set "VERSION=2016-12-12"
 set "SCRIPT=%~nx0"				&:# Script name
 set "SPATH=%~dp0" & set "SPATH=!SPATH:~0,-1!"	&:# Script path, without the trailing \
 set  "ARG0=%~f0"				&:# Script full pathname
@@ -767,12 +768,12 @@
       ) %\n%
       call set "DEBUG.MSG=%'!%DEBUG.MSG:%%=%%DEBUG.excl%%%'!%" %# Change all percent to ! #%  %\n%
       if defined ^^%>%DEBUGOUT ( %# If we use a debugging stream distinct from stdout #% %\n%
-	call :Echo.Eval2DebugOut %!%DEBUG.MSG%!%%# Use a helper routine, as delayed redirection does not work #%%\n%
+	%!%LCALL%!% :Echo.Eval2DebugOut DEBUG.MSG %# Use a helper routine, as delayed redirection does not work #% %\n%
       ) else ( %# Output directly here, which is faster #% %\n%
 	for /f "delims=" %%c in ("%'!%INDENT%'!%%'!%DEBUG.MSG%'!%") do echo %%c%# Use a for loop to do a double !variable! expansion #%%\n%
       ) %\n%
       if defined LOGFILE ( %# If we have to send a copy to a log file #% %\n%
-	call :Echo.Eval2LogFile %!%DEBUG.MSG%!%%# Use a helper routine, as delayed redirection does not work #%%\n%
+	%!%LCALL%!% :Echo.Eval2LogFile DEBUG.MSG %# Use a helper routine, as delayed redirection does not work #% %\n%
       ) %\n%
     ) %\n%
     for %%r in (%!%DEBUG.EXITCODE%!%) do ( %# Carry the return values through the endlocal barriers #% %\n%
@@ -855,19 +856,20 @@
 set "DEBUG=1"
 set "DEBUG.ENTRY=:Debug.Entry"
 set "IF_DEBUG=if .%DEBUG%.==.1."
-set "FUNCTION0=%LCALL% call :Debug.Entry0 %%0 %%*"
+set "FUNCTION0=call %LCALL% :Debug.Entry0 %%0 %%*"
 set FUNCTION=%MACRO.GETEXP% %&% %MACRO% ( %\n%
   call set "FUNCTION.NAME=%%0" %\n%
   call set ARGS=%%*%# Do not quote this, to keep string/non string aternance #%%\n%
   if defined ARGS set ARGS=%!%ARGS:^^^^^^^^^^^^^^^^=^^^^^^^^%!%%# ^carets are doubled in quoted strings, halved outside. => Quadruple them if using unquoted ones #%%\n%
   if %!%DEBUG%!%==1 ( %# Build the debug message and display it #% %\n%
+    set DEBUG.MSG=call %!%FUNCTION.NAME%!% %!%ARGS%!%%\n%
     if defined ^^%>%DEBUGOUT ( %# If we use a debugging stream distinct from stdout #% %\n%
-      call :Echo.2DebugOut call %!%FUNCTION.NAME%!% %!%ARGS:%%=%%%%%!%%# Use a helper routine, as delayed redirection does not work #%%\n%
+      %!%LCALL%!% :Echo.2DebugOut DEBUG.MSG %# Use a helper routine, as delayed redirection does not work #% %\n%
     ) else ( %# Output directly here, which is faster #% %\n%
-      echo%!%INDENT%!% call %!%FUNCTION.NAME%!% %!%ARGS%!%%\n%
+      echo%!%INDENT%!% %!%DEBUG.MSG%!%%\n%
     ) %\n%
     if defined LOGFILE ( %# If we have to send a copy to a log file #% %\n%
-      call :Echo.2LogFile call %!%FUNCTION.NAME%!% %!%ARGS:%%=%%%%%!%%# Use a helper routine, as delayed redirection does not work #%%\n%
+      %!%LCALL%!% :Echo.2LogFile DEBUG.MSG %# Use a helper routine, as delayed redirection does not work #% %\n%
     ) %\n%
     call set "INDENT=%'!%INDENT%'!%  " %\n%
   ) %\n%
@@ -879,7 +881,7 @@
 :# Macro for displaying comments on the return log line
 set RETURN#=set "RETURN#ERR=%'!%ERRORLEVEL%'!%" %&% %MACRO% ( %\n%
   set RETVAL=%!%MACRO.ARGS:~1%!%%\n%
-  call :Debug.Return0 %!%RETURN#ERR%!% %\n%
+  %!%LCALL%!% :Debug.Return0 %!%RETURN#ERR%!% %\n%
   %ON_MACRO_EXIT% set "INDENT=%'!%INDENT%'!%" %/ON_MACRO_EXIT% %&% set "RETURN#ERR=" %&% exit /b %\n%
 ) %/MACRO%
 set "EXEC.ARGS= %EXEC.ARGS%"
@@ -954,28 +956,26 @@
 %IF_DEBUG% goto :Echo
 goto :Echo.Log

-:Echo.Eval2DebugOut %*=String with variables that need to be evaluated first
-:# Must be called with delayed expansion on, so that !variables! within %* get expanded
-%>DEBUGOUT% echo.%INDENT%%*
-goto :eof
-
-:Echo.2DebugOut	%*=String to output to the DEBUGOUT stream
-setlocal DisableDelayedExpansion &:# Make sure !variables! do _not_ get expanded
-set ^"ARGS=%*^" &:# ^carets within "quoted" strings get doubled.
-if defined ARGS set ^"ARGS=%ARGS:^^=^%^"
-%>DEBUGOUT% echo.%INDENT%%ARGS%
-goto :eof
-
-:Echo.Eval2LogFile %*=String with variables that need to be evaluated first
-:# Must be called with delayed expansion on, so that !variables! within %* get expanded
-%>>LOGFILE% echo.%INDENT%%*
-goto :eof
-
-:Echo.2LogFile %*=String to output to the LOGFILE
-setlocal DisableDelayedExpansion &:# Make sure !variables! do _not_ get expanded
-set ^"ARGS=%*^" &:# ^carets within "quoted" strings get doubled.
-if defined ARGS set ^"ARGS=%ARGS:^^=^%^"
-%>>LOGFILE% echo.%INDENT%%ARGS%
+:Echo.Eval2DebugOut %1=Name of string, with !variables! that need to be evaluated first
+setlocal EnableDelayedExpansion &:# Make sure that !variables! get expanded
+set "STRING=!%1!" &:# !variables! not yet expanded; They will be on next line
+%>DEBUGOUT% echo.%INDENT%%STRING%
+goto :eof
+
+:Echo.2DebugOut	%1=Name of string to output to the DEBUGOUT stream
+setlocal EnableDelayedExpansion &:# Make sure that !variables! get expanded
+%>DEBUGOUT% echo.%INDENT%!%1!
+goto :eof
+
+:Echo.Eval2LogFile %1=Name of string, with variables that need to be evaluated first
+setlocal EnableDelayedExpansion &:# Make sure that !variables! get expanded
+set "STRING=!%1!" &:# !variables! not yet expanded; They will be on next line
+%>>LOGFILE% echo.%INDENT%%STRING%
+goto :eof
+
+:Echo.2LogFile %1=Name of string to output to the LOGFILE
+setlocal EnableDelayedExpansion &:# Make sure that !variables! get expanded
+%>>LOGFILE% echo.%INDENT%!%1!
 goto :eof

 :# Echo and log variable values, indented at the same level as the debug output.
@@ -3936,6 +3936,30 @@
 goto :eof

 :#----------------------------------------------------------------------------#
+
+:testLogFunc
+%FUNCTION%
+%ECHO% This is myFunc
+%POPARG%
+set "RET=!ARG!"
+%POPARG%
+set "VAR=!ARG!"
+if defined VAR %UPVAR% !VAR! & %POPARG% & set "!VAR!=!ARG!"
+%RETURN% !RET!
+
+:testLog
+call :Debug.SetLog t.log
+
+call :testLogFunc
+call :testLogFunc 0
+call :testLogFunc 1
+call :testLogFunc 0 RESULT Zero
+call :testLogFunc 0 TOTO "0 + 0 = La tte  Toto"
+set "STRING=@||&&(())<<>>^^^^,,;;  %%%%^!^!**??[[]]==~~''%%CD%%_^!CD^!"
+call :testLogFunc 0 RESULT "!STRING:%%=%%%%!"
+exit /b 0
+
+:#----------------------------------------------------------------------------#
 :#                                                                            #
 :#  Function        Main                                                      #
 :#                                                                            #


Shell update

Shell update

--- Framework/Build/Shell/Commit.cmd
+++ Framework/Build/Shell/Commit.cmd
@@ -1,8 +1,9 @@
 set /p m=Commit message:
 git add .
-git commit -m m
+git commit -m "%m%"
 git push
 cd ..\..\..\..\
 git add .
-git commit -m m
-git push+git commit -m "%m%"
+git push
+set /p m=


Adding commands file related used by exercise 8

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

--- class4/exercise8.cmd
+++ class4/exercise8.cmd
@@ -0,0 +1,2 @@
+logging buffered 65535
+no logging console


projects: Update get deps batch file with additional error checking.

--- SMP/project_get_dependencies.bat
+++ SMP/project_get_dependencies.bat
@@ -26,14 +26,17 @@
 SET CURRDIR=%CD%
 cd %~dp0

+REM Initialise error check value
+SET ERROR=0
+
 cd ..\..
 FOR %%I IN %DEPENDENCIES% DO (
     ECHO !PASSDEPENDENCIES! | FINDSTR /C:"%%I" >NUL 2>&1 || (
         REM Check if MSVC_VER environment variable is set
         IF "%MSVC_VER%"=="" (
-            CALL :cloneOrUpdateRepo "%%I"
+            CALL :cloneOrUpdateRepo "%%I" || GOTO exit
         ) ELSE (
-            CALL :downloadLibs "%%I"
+            CALL :downloadLibs "%%I" || GOTO exit
         )
     )
 )
@@ -83,7 +86,7 @@
     ECHO %REPONAME%: Found additional dependencies...
     ECHO.
     cd %REPONAME%\SMP
-    project_get_dependencies.bat "!PASSDEPENDENCIES!" || GOTO exitOnError
+    project_get_dependencies.bat "!PASSDEPENDENCIES!" || EXIT /B 1
     cd ..\..
 )
 ECHO.
@@ -98,16 +101,16 @@
 ECHO %REPONAME%: Getting latest release...
 SET UPSTREAMAPIURL=%UPSTREAMURL:github.com=api.github.com/repos%
 powershell -nologo -noprofile -command "try { Invoke-RestMethod -Uri %UPSTREAMAPIURL%/%REPONAME%/releases/latest > latest.json } catch {exit 1}"
-IF NOT %ERRORLEVEL% == 0 ( ECHO Failed getting latest %REPONAME% release & GOTO exitOnError )
+IF NOT %ERRORLEVEL% == 0 ( ECHO Failed getting latest %REPONAME% release & EXIT /B 1 )
 REM Get tag for latest release
 FOR /F "tokens=* USEBACKQ" %%F IN (`TYPE latest.json ^| FINDSTR /B "tag_name"`) DO SET TAG=%%F
 FOR /F "tokens=2 delims=: " %%F in ("%TAG%") DO SET TAG=%%F
-IF "%TAG%"=="" ( ECHO Failed getting latest %REPONAME% release tag information & GOTO exitOnError )
+IF "%TAG%"=="" ( ECHO Failed getting latest %REPONAME% release tag information & EXIT /B 1 )
 REM Get download name of latest release
 FOR /F "tokens=* USEBACKQ" %%F IN (`TYPE latest.json ^| FINDSTR "name="`) DO SET LIBNAME=%%F
 SET LIBNAME=%LIBNAME:*name=%
 FOR /F "tokens=1 delims=_" %%F in ("%LIBNAME:~1%") DO SET LIBNAME=%%F
-IF "%LIBNAME%"=="" ( ECHO Failed getting latest %REPONAME% release name information & GOTO exitOnError )
+IF "%LIBNAME%"=="" ( ECHO Failed getting latest %REPONAME% release name information & EXIT /B 1 )
 DEL /F /Q latest.json
 REM Get the download location for the required tag
 SET TAG2=%TAG:+=.%
@@ -117,15 +120,16 @@
 SET PREBUILTDIR=prebuilt
 MKDIR %PREBUILTDIR% >NUL 2>&1
 powershell -nologo -noprofile -command "try { (New-Object Net.WebClient).DownloadFile('%DLURL%', '%PREBUILTDIR%\temp.zip') } catch {exit 1}"
-IF NOT %ERRORLEVEL% == 0 ( ECHO Failed downloading %DLURL% & GOTO exitOnError )
-powershell -nologo -noprofile -command "try { Add-Type -A 'System.IO.Compression.FileSystem'; [IO.Compression.ZipFile]::ExtractToDirectory('%PREBUILTDIR%\temp.zip', '%PREBUILTDIR%'); } catch [System.IO.IOException] {exit 0} catch {exit 1}"
-IF NOT %ERRORLEVEL% == 0 ( ECHO Failed extracting downloaded archive & GOTO exitOnError )
+IF NOT %ERRORLEVEL% == 0 ( ECHO Failed downloading %DLURL% & EXIT /B 1 )
+powershell -nologo -noprofile -command "Add-Type -AssemblyName System.IO.Compression.FileSystem; $zip=[System.IO.Compression.ZipFile]::OpenRead('%PREBUILTDIR%\temp.zip'); foreach ($item in $zip.Entries) { try {$file=(Join-Path -Path .\%PREBUILTDIR% -ChildPath $item.FullName); $null=[System.IO.Directory]::CreateDirectory((Split-Path -Path $file)); [System.IO.Compression.ZipFileExtensions]::ExtractToFile($item,$file,$true)} catch {exit 1} }"
+IF NOT %ERRORLEVEL% == 0 ( ECHO Failed extracting downloaded archive & EXIT /B 1 )
 DEL /F /Q %PREBUILTDIR%\\temp.zip
 ECHO.
 EXIT /B %ERRORLEVEL%

 :exitOnError
 cd %CURRDIR%
+SET ERROR=1

 :exit
 REM Directly exit if an AppVeyor build
@@ -144,4 +148,4 @@
 IF %ERRORLEVEL% == 0 IF "%~1"=="" PAUSE

 :return
-EXIT /B 0+EXIT /B %ERROR%


Create bld.bat

Create bld.bat

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

--- conda/libdev/bld.bat
+++ conda/libdev/bld.bat
@@ -0,0 +1 @@
+move toolchains.py $PREFIX/share/site_scons/site_tools/toolchains.py


beta...

beta...

--- buildReleaseNuGetPackages.cmd
+++ buildReleaseNuGetPackages.cmd
@@ -1,4 +1,4 @@
-set ENETVER=5.22.14
+set ENETVER=5.30.14-beta
 echo "Start building Electron.NET dev stack..."
 echo "Restore & Build API"
 cd ElectronNet.API


Fix dita.bat

Fix dita.bat

--- src/main/bin/dita.bat
+++ src/main/bin/dita.bat
@@ -20,55 +20,21 @@
 REM  See the License for the specific language governing permissions and
 REM  limitations under the License.

-if "%HOME%"=="" goto homeDrivePathPre
-if exist "%HOME%\antrc_pre.bat" call "%HOME%\antrc_pre.bat"
-
-:homeDrivePathPre
-if "%HOMEDRIVE%%HOMEPATH%"=="" goto userProfilePre
-if "%HOMEDRIVE%%HOMEPATH%"=="%HOME%" goto userProfilePre
-if exist "%HOMEDRIVE%%HOMEPATH%\antrc_pre.bat" call "%HOMEDRIVE%%HOMEPATH%\antrc_pre.bat"
-
-:userProfilePre
-if "%USERPROFILE%"=="" goto alpha
-if "%USERPROFILE%"=="%HOME%" goto alpha
-if "%USERPROFILE%"=="%HOMEDRIVE%%HOMEPATH%" goto alpha
-if exist "%USERPROFILE%\antrc_pre.bat" call "%USERPROFILE%\antrc_pre.bat"
-
-:alpha
-
 if "%OS%"=="Windows_NT" @setlocal
 if "%OS%"=="WINNT" @setlocal

-if "%DITA_HOME%"=="" goto setDefaultAntHome
+if "%DITA_HOME%"=="" goto setDefaultDitaHome

-:stripAntHome
-if not _%DITA_HOME:~-1%==_\ goto checkClasspath
-set DITA_HOME=%DITA_HOME:~0,-1%
-goto stripAntHome
-
-:setDefaultAntHome
+:setDefaultDitaHome
 rem %~dp0 is expanded pathname of the current script under NT
-set DITA_HOME=%~dp0..
-
-:checkClasspath
-set _USE_CLASSPATH=yes
-rem CLASSPATH must not be used if it is equal to ""
-if "%CLASSPATH%"=="""" set _USE_CLASSPATH=no
-if "%CLASSPATH%"=="" set _USE_CLASSPATH=no
+set DITA_HOME="%~dp0.."

 rem Slurp the command line arguments. This loop allows for an unlimited number
 rem of arguments (up to the command line limit, anyway).
 set DITA_CMD_LINE_ARGS=
 :setupArgs
 if ""%1""=="""" goto doneStart
-if ""%1""==""-noclasspath"" goto clearclasspath
 set DITA_CMD_LINE_ARGS=%DITA_CMD_LINE_ARGS% %1
-shift
-goto setupArgs
-
-rem here is there is a -noclasspath in the options
-:clearclasspath
-set _USE_CLASSPATH=no
 shift
 goto setupArgs

@@ -76,39 +42,6 @@
 rem and for NT handling to skip to.

 :doneStart
-
-if "%_USE_CLASSPATH%"=="no" goto findDitaHome
-
-:stripClasspath
-if not _%CLASSPATH:~-1%==_\ goto findDitaHome
-set CLASSPATH=%CLASSPATH:~0,-1%
-goto stripClasspath
-
-:findDitaHome
-rem find DITA_HOME if it does not exist due to either an invalid value passed
-rem by the user or the %0 problem on Windows 9x
-if exist "%DITA_HOME%\lib\ant.jar" goto checkJava
-
-rem check for ant in Program Files
-if not exist "%ProgramFiles%\ant" goto checkSystemDrive
-set DITA_HOME=%ProgramFiles%\ant
-goto checkJava
-
-:checkSystemDrive
-rem check for ant in root directory of system drive
-if not exist %SystemDrive%\ant\lib\ant.jar goto checkCDrive
-set DITA_HOME=%SystemDrive%\ant
-goto checkJava
-
-:checkCDrive
-rem check for ant in C:\ant for Win9X users
-if not exist C:\ant\lib\ant.jar goto noAntHome
-set DITA_HOME=C:\ant
-goto checkJava
-
-:noAntHome
-echo DITA_HOME is set incorrectly or ant could not be located. Please set DITA_HOME.
-goto end

 :checkJava
 rem Set environment variables
@@ -124,16 +57,7 @@
 if "%_JAVACMD%" == "" set _JAVACMD=java.exe

 :runAnt
-if "%_USE_CLASSPATH%"=="no" goto runAntNoClasspath
-:runAntWithClasspath
-"%_JAVACMD%" %ANT_OPTS% -classpath "%DITA_HOME%\lib\ant-launcher.jar" "-Dant.home=%DITA_HOME%" org.apache.tools.ant.launch.Launcher %ANT_ARGS% -cp "%CLASSPATH%" %DITA_CMD_LINE_ARGS% -buildfile "%DITA_HOME%\build.xml" -main "org.dita.dost.invoker.Main"
-rem Check the error code of the Ant build
-if not "%OS%"=="Windows_NT" goto onError
-set ANT_ERROR=%ERRORLEVEL%
-goto end
-
-:runAntNoClasspath
-"%_JAVACMD%" %ANT_OPTS% -classpath "%DITA_HOME%\lib\ant-launcher.jar" "-Dant.home=%DITA_HOME%" org.apache.tools.ant.launch.Launcher %ANT_ARGS% %DITA_CMD_LINE_ARGS% -buildfile "%DITA_HOME%\build.xml" -main "org.dita.dost.invoker.Main"
+"%_JAVACMD%" %ANT_OPTS% -classpath "%DITA_HOME%\lib\ant-launcher.jar" "-Dant.home=%DITA_HOME%"  "-Ddita.dir=%DITA_HOME%" org.apache.tools.ant.launch.Launcher %ANT_ARGS% -cp "%CLASSPATH%" %DITA_CMD_LINE_ARGS% -buildfile "%DITA_HOME%\build.xml" -main "org.dita.dost.invoker.Main"
 rem Check the error code of the Ant build
 if not "%OS%"=="Windows_NT" goto onError
 set ANT_ERROR=%ERRORLEVEL%
@@ -173,20 +97,6 @@
 if "%OS%"=="Windows_NT" @endlocal
 if "%OS%"=="WINNT" @endlocal

-if "%HOME%"=="" goto homeDrivePathPost
-if exist "%HOME%\antrc_post.bat" call "%HOME%\antrc_post.bat"
-
-:homeDrivePathPost
-if "%HOMEDRIVE%%HOMEPATH%"=="" goto userProfilePost
-if "%HOMEDRIVE%%HOMEPATH%"=="%HOME%" goto userProfilePost
-if exist "%HOMEDRIVE%%HOMEPATH%\antrc_post.bat" call "%HOMEDRIVE%%HOMEPATH%\antrc_post.bat"
-
-:userProfilePost
-if "%USERPROFILE%"=="" goto omega
-if "%USERPROFILE%"=="%HOME%" goto omega
-if "%USERPROFILE%"=="%HOMEDRIVE%%HOMEPATH%" goto omega
-if exist "%USERPROFILE%\antrc_post.bat" call "%USERPROFILE%\antrc_post.bat"
-
 :omega

 exit /b %ANT_ERROR%


Parse Java system properties in plugin.bat

Closes #13616

--- distribution/src/main/resources/bin/plugin.bat
+++ distribution/src/main/resources/bin/plugin.bat
@@ -1,6 +1,6 @@
 @echo off

-SETLOCAL
+SETLOCAL enabledelayedexpansion

 if NOT DEFINED JAVA_HOME goto err

@@ -9,9 +9,46 @@

 TITLE Elasticsearch Plugin Manager ${project.version}

+SET properties=
+SET args=
+
+:loop
+SET "current=%~1"
+SHIFT
+IF "x!current!" == "x" GOTO breakloop
+
+IF "!current:~0,2%!" == "-D" (
+    ECHO "!current!" | FINDSTR /C:"=">nul && (
+         :: current matches -D*=*
+         IF "x!properties!" NEQ "x" (
+             SET properties=!properties! "!current!"
+         ) ELSE (
+             SET properties="!current!"
+         )
+    ) || (
+         :: current matches -D*
+         IF "x!properties!" NEQ "x" (
+            SET properties=!properties! "!current!=%~1"
+         ) ELSE (
+            SET properties="!current!=%~1"
+         )
+         SHIFT
+    )
+) ELSE (
+    :: current matches *
+    IF "x!args!" NEQ "x" (
+        SET args=!args! "!current!"
+    ) ELSE (
+        SET args="!current!"
+    )
+)
+
+GOTO loop
+:breakloop
+
 SET HOSTNAME=%COMPUTERNAME%

-"%JAVA_HOME%\bin\java" -client -Des.path.home="%ES_HOME%" -cp "%ES_HOME%/lib/*;" "org.elasticsearch.plugins.PluginManagerCliParser" %*
+"%JAVA_HOME%\bin\java" -client -Des.path.home="%ES_HOME%" !properties! -cp "%ES_HOME%/lib/*;" "org.elasticsearch.plugins.PluginManagerCliParser" !args!
 goto finally


Try to fix appveyor deploy

Try to fix appveyor deploy

--- ci/appveyor/deploy.cmd
+++ ci/appveyor/deploy.cmd
@@ -3,14 +3,15 @@
 REM Needed to enable to define OSQP_BIN within the file
 @setlocal enabledelayedexpansion

-set OSQP_VERSION="0.6.0.dev1"
-set OSQP_PACKAGE_NAME="OSQP"
-IF NOT "!OSQP_VERSION!"=="!OSQP_VERSION:dev=!" (
-	REM We are using a development version
-	set OSQP_PACKAGE_NAME="!OSQP_PACKAGE_NAME!-dev"
-)
+IF "%APPVEYOR_REPO_TAG%" == "true" (

-IF "%APPVEYOR_REPO_TAG%" == "true" (
+    REM Deply only on tags (releases)
+    set OSQP_VERSION="0.6.0.dev1"
+    set OSQP_PACKAGE_NAME="OSQP"
+    IF NOT "!OSQP_VERSION!"=="!OSQP_VERSION:dev=!" (
+	    REM We are using a development version
+	    set OSQP_PACKAGE_NAME="!OSQP_PACKAGE_NAME!-dev"
+    )

     REM Build C libraries
     cd %APPVEYOR_BUILD_FOLDER%


Added fmt script for Windows

Added fmt script for Windows

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

--- fmt.bat
+++ fmt.bat
@@ -0,0 +1,2 @@
+set GOATH=c:\code\mud
+go fmt mud\server mud\database mud\game mud\utils


windows-gam.spec rename

windows-gam.spec rename

--- src/windows-build.bat
+++ src/windows-build.bat
@@ -5,13 +5,13 @@
 del /q /f gam-%1-windows.zip
 del /q /f gam-%1-windows-x64.zip

-c:\python27-32\scripts\pyinstaller -F --distpath=gam gam.spec
+c:\python27-32\scripts\pyinstaller -F --distpath=gam windows-gam.spec
 xcopy LICENSE gam\
 xcopy whatsnew.txt gam\
 del gam\w9xpopen.exe
 "%ProgramFiles(x86)%\7-Zip\7z.exe" a -tzip gam-%1-windows.zip gam\ -xr!.svn

-c:\python27\scripts\pyinstaller -F --distpath=gam-64 gam.spec
+c:\python27\scripts\pyinstaller -F --distpath=gam-64 windows-gam.spec
 xcopy LICENSE gam-64\
 xcopy whatsnew.txt gam-64\
 "%ProgramFiles(x86)%\7-Zip\7z.exe" a -tzip gam-%1-windows-x64.zip gam-64\ -xr!.svn


Automated commit by Speedy_Git.bat on Fri 09/02/2016 12:34 AM

--- snipenator.bat
+++ snipenator.bat
@@ -17,5 +17,6 @@
 call git push origin master
 echo =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 echo.
-echo ### Great, everything went well! Press any key for exit.
-pause >nul+echo ### Great, everything went well!
+timeout /t 40
+exit


run_tests.bat: do not run tests in d3d12 mode on 32-bit windows due to bugs in 32-bit WARP

--- BuildTools/Scripts/appveyor/run_tests.bat
+++ BuildTools/Scripts/appveyor/run_tests.bat
@@ -1,7 +1,13 @@
 @echo off

 if "%PLATFORM_NAME%"=="Windows" (
-    ProcessGoldenImages.bat %1 %CONFIGURATION% %2 d3d11 d3d12
+    if "%PLATFORM%" == "x64" (
+        ProcessGoldenImages.bat %1 %CONFIGURATION% %2 d3d11 d3d12
+    ) else (
+        rem  There appear to be bugs in 32-bit D3D12 WARP that cause shader compilation errors in
+        rem  Tutorial14 and Atmosphere sample, so only run tests in d3d11 mode
+        ProcessGoldenImages.bat %1 %CONFIGURATION% %2 d3d11
+    )
 )

 if "%PLATFORM_NAME%"=="Windows8.1" (


Added support for libbind9 in the batch build process

--- win32utils/BuildAll.bat
+++ win32utils/BuildAll.bat
@@ -50,6 +50,10 @@

 cd isccc\win32
 nmake /nologo -f libisccc.mak CFG="libisccc - Win32 Release"  NO_EXTERNAL_DEPS="1"
+cd ..\..
+
+cd bind9\win32
+nmake /nologo -f libbind9.mak CFG="libbind9 - Win32 Release"  NO_EXTERNAL_DEPS="1"
 cd ..\..

 cd lwres\win32