improve windows installer script

improve windows installer script

--- contrib/windows-install/setup-weboob.bat
+++ contrib/windows-install/setup-weboob.bat
@@ -1,4 +1,5 @@
 @echo off
+setlocal enableextensions enabledelayedexpansion

 call settings.cmd

@@ -10,25 +11,24 @@
 echo.
 echo 1.GNU/WGET Init

-set wget=wget-%ARCHITECTURE%.exe
+set WGET=wget-%ARCHITECTURE%.exe

 echo.
 echo 2.Check Python 2.7 Installation
 set KEY_NAME=HKLM\Software\Python\PythonCore\2.7\InstallPath
 REG QUERY %KEY_NAME% > nul || 	(
-									echo 2.1 Download Python 2.7
+									set PYTHON_MSI=python-2.7.5.msi
 									if %ARCHITECTURE% == x64 (
-										set python_msi=python-2.7.5.amd64.msi
-									) else (
-										set python_msi=python-2.7.5.msi
-									)
+										set PYTHON_MSI=python-2.7.5.amd64.msi
+									)

-									"%wget%" -o python_donwload http://www.python.org/ftp/python/2.7.5/%python_msi%
+									echo 2.1 Download !PYTHON_MSI!
+									"%WGET%" -o python_donwload "http://www.python.org/ftp/python/2.7.5/!PYTHON_MSI!"

-									echo 2.2 Setup Python 2.7
-									%python_msi%
+									echo 2.2 Setup !PYTHON_MSI!
+									!PYTHON_MSI!

-									del %python_msi%
+									del !PYTHON_MSI!
 									del python_donwload
 								)

@@ -38,11 +38,11 @@

 echo.
 echo 3.Check PyQt4 Installation
-for %%i in (pyuic4.bat) do set qt=%%~$PATH:i
-if not defined qt (
+set KEY_NAME=HKLM\Software\PyQt4\Py2.7\InstallPath
+REG QUERY %KEY_NAME% > nul || 	(

 	echo 3.1 Download PyQt4
-	"%wget%" -o qt_download http://heanet.dl.sourceforge.net/project/pyqt/PyQt4/PyQt-4.10.3/PyQt4-4.10.3-gpl-Py2.7-Qt4.8.5-%ARCHITECTURE%.exe
+	"%WGET%" -o qt_download http://heanet.dl.sourceforge.net/project/pyqt/PyQt4/PyQt-4.10.3/PyQt4-4.10.3-gpl-Py2.7-Qt4.8.5-%ARCHITECTURE%.exe

 	echo 3.2 Setup PyQt4
 	PyQt4-4.10.3-gpl-Py2.7-Qt4.8.5-%ARCHITECTURE%.exe
@@ -73,7 +73,7 @@
 %PythonPath%Scripts\easy_install.exe cssselect || goto :InstallFailed
 echo.
 echo -- lxml
-%PythonPath%Scripts\easy_install.exe lxml || goto :InstallFailed
+%PythonPath%Scripts\easy_install.exe lxml==3.2.5 || goto :InstallFailed
 echo.
 echo -- dateutils
 %PythonPath%Scripts\easy_install.exe dateutils || goto :InstallFailed
@@ -90,8 +90,11 @@
 echo -- gdata
 %PythonPath%Scripts\easy_install.exe gdata || goto :InstallFailed
 echo.
+echo -- feedparser
+%PythonPath%Scripts\easy_install.exe feedparser || goto :InstallFailed
+echo.
 echo -- pillow
-%PythonPath%Scripts\easy_install.exe pillow || goto :InstallFailed
+%PythonPath%Scripts\easy_install.exe pillow==2.3.0 || goto :InstallFailed

 echo.
 echo 6.Install WeBoob
@@ -146,4 +149,4 @@
 goto :Quit

 :Quit
-pause+pause


Add debug output to analyse buildbot failure.

--- PCbuild/build_ssl.bat
+++ PCbuild/build_ssl.bat
@@ -1,4 +1,5 @@
 @echo off
+cd
 if not defined HOST_PYTHON set HOST_PYTHON=python
 %HOST_PYTHON% build_ssl.py %1 %2


rename variable

rename variable

--- scripts/build.cmd
+++ scripts/build.cmd
@@ -1,10 +1,11 @@
 @echo off

-set nsis_compiler=
+set nsis_path=

 if defined NSIS_HOME (
     if exist "%NSIS_HOME%\makensis.exe" (
-        set "nsis_compiler=%NSIS_HOME%"
+        set "nsis_path=%NSIS_HOME%"
+        goto build
     )
 )

@@ -14,12 +15,12 @@
     set RegQry=HKLM\SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\NSIS
 )

-if not defined nsis_compiler (
-    for /F "tokens=2*" %%a in ('reg query "%RegQry%" /v InstallLocation ^|findstr InstallLocation') do set nsis_compiler=%%b
+if not defined nsis_path (
+    for /F "tokens=2*" %%a in ('reg query "%RegQry%" /v InstallLocation ^|findstr InstallLocation') do set nsis_path=%%b
 )

-if not defined nsis_compiler (
-    for %%X in (makensis.exe) do (set nsis_compiler=%%~dp$PATH:X)
+if not defined nsis_path (
+    for %%X in (makensis.exe) do (set nsis_path=%%~dp$PATH:X)
 )

 set args=
@@ -28,8 +29,9 @@
     shift
 if not "%~1"=="" goto loop

-if defined nsis_compiler (
-    "%nsis_compiler%\makensis.exe" %args%
+:build
+if defined nsis_path (
+    "%nsis_path%\makensis.exe" %args%
 ) else (
     echo "Error: makensis.exe isn't in your PATH environment variable."
 )


Working on setup, testing functions

Working on setup, testing functions

--- MCal.bat
+++ MCal.bat
@@ -1,21 +1,56 @@
 @echo off

 :: initial launch compatibility check
-:: because oneos apps has different deps
-if "%1" NOT "oneos_apps" (
-cls
-echo Warning! MCal is not running as a OneOS App. You can use MCal, but some features may not be available.
-pause
-goto start
-)
+:: because oneos apps has different deps -- i commented this out because oneos does not currently support the "oneos_apps" launch code
+:: if "%1" NOT "oneos_apps" (
+:: cls
+:: echo Warning! MCal is not running as a OneOS App. You can use MCal, but some features may not be available.
+:: pause
+:: goto start
+:: )

 :start
 :: we will check if MCal has been installed.
 IF NOT EXIST "MCal_deps\setup.chk" (
-cls MCal has not been run before.
+cls
+echo MCal has not been run before.
 CHOICE /C:yn "Install now"
 if "%ERRORLEVEL%" == "1" (
 goto install
 ) else (
 goto eof
 )
+
+
+:install
+cls
+echo Installing MCal...
+sleep 1 >NUL
+echo Creating MCal directory...
+mkdir MCal
+echo.
+
+echo Entering MCal directory...
+cd MCal
+echo.
+
+echo Downloading gitcmd...
+powershell -Command "(New-Object System.Net.WebClient).DownloadFile('http://update.litesec.co/stable/appdeps/PortableGit.zip', 'git.zip')"
+echo.
+
+echo Unpacking git...
+mkdir git
+cd git
+..\..\system\7za.exe e git.zip -y
+cd ..
+echo.
+
+echo Downloading MCal deps using git...
+git\cmd\git.exe clone https://github.com/LiteSec/MCal.git
+echo.
+
+
+:: for testing
+echo Dev test!
+call cmd
+cd ..


Update nugetpush script

Update nugetpush script

--- nugetpush.bat
+++ nugetpush.bat
@@ -1 +1 @@
-nuget push build/NoCommons.1.1.0.nupkg+nuget push nocommons/build/NoCommons.1.2.0.nupkg


fixed generate.cmd's help guard (#3530)

fixed generate.cmd's help guard (#3530)

--- tools/generate.cmd
+++ tools/generate.cmd
@@ -7,11 +7,12 @@
 setlocal

 :: help requested?
-set pot_help="%1%2"
-if not "%pot_help%"=="help"        (set req_help=T)
-if not "%pot_help%"=="-help"       (set req_help=T)
-if not "%pot_help%"=="--help"      (set req_help=T)
-if not "%pot_help%"=="/help"       (set req_help=T)
+set pot_help=%1%2
+if "%pot_help%"==""            (set req_help=T)
+if "%pot_help%"=="help"        (set req_help=T)
+if "%pot_help%"=="-help"       (set req_help=T)
+if "%pot_help%"=="--help"      (set req_help=T)
+if "%pot_help%"=="/help"       (set req_help=T)
 if not x%pot_help%==x%pot_help:?=% (set req_help=T)
 if not "%req_help%" == "" (
     echo.
@@ -24,6 +25,7 @@
     echo Example: generate.cmd monitor/data-plane 1.1.0 olydis new-cool-feature
     echo.
     echo To display this help, run either of
+    echo      generate.cmd
     echo      generate.cmd help
     echo      generate.cmd -help
     echo      generate.cmd --help


Sync both plugins and source/drift

Sync both plugins and source/drift

--- Sync.cmd
+++ Sync.cmd
@@ -1,15 +1,22 @@
+@echo off
+
+rem sync.cmd target
+rem sync.cmd source target
+rem example: sync.cmd C:\Projects\MyGame
+rem example: sync.cmd C:\Projects\DriftUe4Plugin C:\Projects\MyGame
+
 pushd %~dp0
 setlocal
 if "%2" == "" (
-	set source=%~dp0\Plugins
-	set dest=%1\Plugins
+	set source=%~dp0
+	set dest=%1
 	shift
 ) else (
-	set source=%1\Plugins
-	set dest=%2\Plugins
+	set source=%1
+	set dest=%2
 	shift
 	shift
 )
-robocopy /mir /l %source% %dest% -xd Binaries -xd Resources -xd Intermediate
+robocopy /mir /l %source%\Plugins %dest%\Plugins -xd Binaries -xd Resources -xd Intermediate
+robocopy /mir /l %source%\Source\Drift %dest%\Source\Drift
 popd
-


Fix windows DLL location

Fix windows DLL location

--- recipes/blpapi/bld.bat
+++ recipes/blpapi/bld.bat
@@ -1,5 +1,5 @@
 set BLPAPI_ROOT="."
-copy "%BLPAPI_ROOT%"\lib\ "%PREFIX%"\lib\
+copy "%BLPAPI_ROOT%"\lib\ "%PREFIX%"\Library\bin
 if errorlevel 1 exit 1
 "%PYTHON%" setup.py install
 if errorlevel 1 exit 1


Make.cmd: remove $(OFILES)

Make.cmd: remove $(OFILES)

The linker doesn't support multiple object files (maybe it did in the past?)

R=rsc
CC=golang-dev
http://codereview.appspot.com/2444041

Committer: Russ Cox <5ad239cb8a44f659eaaee0aa1ea5b94947abe557@golang.org>

--- src/Make.cmd
+++ src/Make.cmd
@@ -12,8 +12,8 @@

 PREREQ+=$(patsubst %,%.make,$(DEPS))

-$(TARG): _go_.$O $(OFILES)
-	$(LD) -o $@ _go_.$O $(OFILES)
+$(TARG): _go_.$O
+	$(LD) -o $@ _go_.$O

 _go_.$O: $(GOFILES) $(PREREQ)
 	$(GC) -o $@ $(GOFILES)


Using OPTIMA_PYTHON_INSTALL_PREFIX=%PREFIX%

--- recipes/optima/bld.bat
+++ recipes/optima/bld.bat
@@ -1,16 +1,12 @@
 @REM Configure the build of Optima
-cmake -S . -B build ^
-    -DCMAKE_BUILD_TYPE=Release ^
+cmake -S . -B build                         ^
+    -DCMAKE_BUILD_TYPE=Release              ^
     -DCMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% ^
-    -DCMAKE_INCLUDE_PATH=%LIBRARY_INC% ^
-    -DCMAKE_VERBOSE_MAKEFILE=ON ^
+    -DCMAKE_INCLUDE_PATH=%LIBRARY_INC%      ^
+    -DCMAKE_VERBOSE_MAKEFILE=ON             ^
+    -DOPTIMA_PYTHON_INSTALL_PREFIX=%PREFIX% ^
     -DPYTHON_EXECUTABLE=%PYTHON%

 @REM Build and install Optima in %LIBRARY_PREFIX%
 @REM Note: No need for --parallel below, since cmake takes care of the /MP flag for MSVC
 cmake --build build --config Release --target install
-
-@REM In Windows, conda-forge Python packages must be located in %PREFIX%\site-packages.
-@REM The above install command places them in %PREFIX%\Library\site-packages instead.
-cmake -E copy_directory %LIBRARY_PREFIX%\site-packages %PREFIX%\site-packages
-cmake -E remove_directory %LIBRARY_PREFIX%\site-packages


Updated scripts for building and running tests

--- src/Test.cmd
+++ src/Test.cmd
@@ -22,12 +22,21 @@

 SET OutDir=%CMDHOME%\..\Binaries\%CONFIGURATION%

-set TESTS=%OutDir%\Tester.dll %OutDir%\TesterInternal.dll
+set TESTS=%OutDir%\TesterInternal.dll
 @Echo Test assemblies = %TESTS%

 set TEST_ARGS= /Settings:%CMDHOME%\Local.testsettings
 set TEST_ARGS= %TEST_ARGS% /TestCaseFilter:%TEST_CATEGORIES% /Logger:trx

+REM ---- Temporary script while we migrate TesterInternal project.
 @echo on

 "%VSTESTEXE%" %TEST_ARGS% %TESTS%
+
+@echo off
+
+set TESTER=%OutDir%\Tester.dll
+if .%FILTERS%. == .. set FILTERS=-trait "Category=BVT"
+
+@echo on
+packages\xunit.runner.console.2.1.0\tools\xunit.console %TESTER% %FILTERS% -xml "TestResults/xUnit-Results.xml" -parallel none -noshadow > TestResults/xUnit-output.log


Updated the cleanall batch file.

Updated the cleanall batch file.

--- cleanall.bat
+++ cleanall.bat
@@ -1,4 +1,4 @@
-@TITLE Cleaning up the OpenCOR environment...
+@TITLE Cleaning the OpenCOR environment...

 @CD build


updated the automanualcompiler

updated the automanualcompiler

changed it to reflect the new github directory

--- anim/automanualcompiler.bat
+++ anim/automanualcompiler.bat
@@ -1,5 +1,5 @@
-"C:\Program Files (x86)\Steam\steamapps\common\Don't Starve Mod Tools Release\mod_tools\scml.exe" "C:\Program Files (x86)\Steam\steamapps\common\Don't Starve Together Beta\mods\orion\exported\orion\orion.scml" "C:\Program Files (x86)\Steam\steamapps\common\Don't Starve Together Beta\mods\orion"
-"C:\Program Files (x86)\Steam\steamapps\common\Don't Starve Mod Tools Release\mod_tools\scml.exe" "C:\Program Files (x86)\Steam\steamapps\common\Don't Starve Together Beta\mods\orion\exported\ghost_orion_build\ghost_orion_build.scml" "C:\Program Files (x86)\Steam\steamapps\common\Don't Starve Together Beta\mods\orion"
+"C:\Program Files (x86)\Steam\steamapps\common\Don't Starve Mod Tools Release\mod_tools\scml.exe" "C:\Program Files (x86)\Steam\steamapps\common\Don't Starve Together Beta\mods\DSTmod-Orion_Castilio\exported\orion\orion.scml" "C:\Program Files (x86)\Steam\steamapps\common\Don't Starve Together Beta\mods\DSTmod-Orion_Castilio"
+"C:\Program Files (x86)\Steam\steamapps\common\Don't Starve Mod Tools Release\mod_tools\scml.exe" "C:\Program Files (x86)\Steam\steamapps\common\Don't Starve Together Beta\mods\DSTmod-Orion_Castilio\exported\ghost_orion_build\ghost_orion_build.scml" "C:\Program Files (x86)\Steam\steamapps\common\Don't Starve Together Beta\mods\DSTmod-Orion_Castilio"

 "C:\Program Files (x86)\Steam\steamapps\common\Don't Starve Mod Tools Release\mod_tools\autocompiler.exe"


Setup junction point folders for development

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

--- setup_folders.bat
+++ setup_folders.bat
@@ -0,0 +1,11 @@
+set SITECORE=C:\inetpub\wwwroot\Sitecore8\
+set PROJECT=C:\Projects\sitecorepowershell\Trunk\
+
+rmdir "%SITECORE%Data\serialization /Q
+mklink /J %SITECORE%Data\serialization %PROJECT%Data\serialization
+
+rmdir "%SITECORE%Website\sitecore modules\PowerShell" /Q
+mklink /J "%SITECORE%Website\sitecore modules\PowerShell" "%PROJECT%sitecore modules\PowerShell"
+
+rmdir "%SITECORE%Website\sitecore modules\Shell\PowerShell" /Q
+mklink /J "%SITECORE%Website\sitecore modules\Shell\PowerShell" "%PROJECT%sitecore modules\Shell\PowerShell"


Add Python path to Kokoro batch script

Add Python path to Kokoro batch script

Bug b/123360006

Change-Id: Ie29b1fea3607ad0da2fb48cf3a5248e976c2cf5f
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/27389
Tested-by: Nicolas Capens <51edc787c30f24c4904e8ffbb5523c3a9f7a451d@google.com>
Reviewed-by: Chris Forbes <c3279c50043e18e9442c1ae071cafa0e7a4ca967@google.com>
Reviewed-by: Nicolas Capens <51edc787c30f24c4904e8ffbb5523c3a9f7a451d@google.com>

--- kokoro/gcp_windows/continuous.bat
+++ kokoro/gcp_windows/continuous.bat
@@ -1,4 +1,6 @@
 @echo on
+
+SET PATH=%PATH%;C:\python27

 cd git\SwiftShader


Added app/listDevices.bat helpful file.

Added app/listDevices.bat helpful file.

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

--- app/listDevices.bat
+++ app/listDevices.bat
@@ -0,0 +1,6 @@
+@echo off
+setlocal
+set adbPath=C:\Program Files (x86)\Android\android-studio\sdk\platform-tools
+"%adbPath%\adb.exe" devices -l
+endlocal
+pause


Clean up build directories.

Clean up build directories.

--- electron-dotnet/tools/build_websharpjs.bat
+++ electron-dotnet/tools/build_websharpjs.bat
@@ -4,9 +4,6 @@
 set FLAVOR=%1

 if "%FLAVOR%" equ "" set FLAVOR=Release
-
-mkdir "%SELF%\build\nuget\content\websharp" > nul 2>&1
-mkdir "%SELF%\build\nuget\tools" > nul 2>&1

 if not exist "%SELF%\build\download.exe" (
 	csc /out:"%SELF%\build\download.exe" "%SELF%\download.cs"
@@ -16,9 +13,6 @@
 	"%SELF%\build\download.exe" http://nuget.org/nuget.exe "%SELF%\build\nuget.exe"
 	"%SELF%\build\nuget.exe" update -self
 )
-
-rem csc /out:"%SELF%\..\src\websharpjs\WebSharp.js\bin\Release\net451\WebSharpJs.dll" /target:library "%SELF%\..\src\websharpjs\WebSharp.js\dotnet\*.cs" "%SELF%\..\src\websharpjs\WebSharp.js\dotnet\WebSharpJs.Browser\*.cs"
-rem if %ERRORLEVEL% neq 0 exit /b -1

 cd "%SELF%\..\src\websharpjs\WebSharp.js"
 dotnet restore WebSharp.js.sln /p:Configuration=%FLAVOR% /p:Platform="Any CPU"


Update Main.bat

Update Main.bat

--- Windows/Main.bat
+++ Windows/Main.bat
@@ -30,7 +30,6 @@

 CHOICE /C 123456789 /M "Enter your choice:"
-echo ""
 if ERRORLEVEL 9 goto Nine
 if ERRORLEVEL 8 goto Eight
 if ERRORLEVEL 7 goto Seven


Create get_cifar10_dataset.bat

Create get_cifar10_dataset.bat

error: pathspec 'examples/cifar10/get_cifar10_dataset.bat' did not match any file(s) known to git

--- examples/cifar10/get_cifar10_dataset.bat
+++ examples/cifar10/get_cifar10_dataset.bat
@@ -0,0 +1,8 @@
+@echo off
+echo Downloading...
+"../../tools/wget" --no-check-certificate http://www.cs.toronto.edu/~kriz/cifar-10-binary.tar.gz
+echo Unzipping...
+"../../tools/7za" e cifar-10-binary.tar.gz && del cifar-10-binary.tar.gz
+"../../tools/7za" x cifar-10-binary.tar && del cifar-10-binary.tar
+echo Done!
+pause


add deploy.bat

add deploy.bat

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

--- deploy.bat
+++ deploy.bat
@@ -0,0 +1,72 @@
+@ECHO OFF
+
+REM the location of this batch file
+SET SOURCE=%~dp0
+
+REM extract project folder name
+FOR /D %%I IN ("%SOURCE%\.") DO SET NAME=%%~nxI
+
+REM target names
+SET DEPLOY=%NAME%-deploy
+SET TARGET="%SOURCE%..\%DEPLOY%"
+SET SOURCE="%SOURCE%"
+
+ECHO This script can create a deployment in %TARGET%
+ECHO.
+
+IF NOT EXIST %TARGET% GOTO deploy
+
+ECHO "%DEPLOY%" folder already exists, please rename or remove it and try again.
+ECHO.
+
+PAUSE
+EXIT
+
+:DEPLOY
+
+ECHO ==========
+ECHO build step
+ECHO ==========
+ECHO.
+
+REM FIXME: we push/pop to satisfy minify.bat requirement that package.js be in CWD
+
+PUSHD "%CD%"
+CD "%SOURCE%/minify"
+
+REM build enyo
+CALL ..\enyo\minify\minify.bat
+
+REM build app
+CALL ..\enyo\tools\minify.bat package.js -output ..\build\app
+
+POPD
+
+ECHO =========
+ECHO copy step
+ECHO =========
+ECHO.
+
+REM make deploy folder
+MKDIR %TARGET%
+
+REM copy root folder files
+COPY %SOURCE%index.html %TARGET% >NUL
+COPY %SOURCE%icon.png %TARGET% >NUL
+
+REM copy assets and build
+XCOPY %SOURCE%assets\*.* %TARGET%\assets\ /Q /E >NUL
+XCOPY %SOURCE%build\*.* %TARGET%\build\ /Q /E >NUL
+
+REM copy library items
+MKDIR %TARGET%\lib
+
+FOR /D %%G in (%SOURCE%lib\*) DO IF EXIST "%%G\deploy.bat" ECHO deploying "%%~nxG"
+FOR /D %%G in (%SOURCE%lib\*) DO IF EXIST "%%G\deploy.bat" CALL "%%G\deploy.bat" %TARGET%\lib\"%%~nxG"
+
+FOR /D %%G in (%SOURCE%lib\*) DO IF NOT EXIST "%%G\deploy.bat" ECHO copying "%%~nxG"
+FOR /D %%G in (%SOURCE%lib\*) DO IF NOT EXIST "%%G\deploy.bat" XCOPY "%%G" %TARGET%\lib\"%%~nxG"\ /Q /E >NUL
+
+ECHO.
+
+PAUSE


Refactored copying script for windows

Refactored copying script for windows

--- copy.bat
+++ copy.bat
@@ -1,3 +0,0 @@
-@echo off
-git checkout windows
-copy init.el %home%\.emacs.d\init.el


Added curl compatible with windows

Added curl compatible with windows

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

--- curl.cmd
+++ curl.cmd
@@ -0,0 +1,12 @@
+@rem Do not use "echo off" to not affect any child calls.
+@setlocal
+
+@rem Get the abolute path to the parent directory, which is assumed to be the
+@rem Git installation root.
+@for /F "delims=" %%I in ("%~dp0..") do @set git_install_root=%%~fI
+@set PATH=%git_install_root%\bin;%git_install_root%\mingw\bin;%PATH%
+
+@if not exist "%HOME%" @set HOME=%HOMEDRIVE%%HOMEPATH%
+@if not exist "%HOME%" @set HOME=%USERPROFILE%
+
+@curl.exe %*


path environment variable fix

path environment variable fix

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

-setx PATH=%PATH%;\Python27
+setx PATH "%PATH%;C:\Python27"
+set PATH=%PATH%;C:\Python27

 goto:eof


windows start.bat bugfix

windows start.bat bugfix

--- websites/code/studygolang/start.bat
+++ websites/code/studygolang/start.bat
@@ -8,7 +8,7 @@

 :ok

-start /b bin\studygolang >> log\panic.log 2>&1 &
+start /b bin\studygolang.exe >> log\panic.log 2>&1 &

 echo start successfully


Delete upd_solution.bat

Delete upd_solution.bat

--- BuildBot/build_task/upd_solution.bat
+++ BuildBot/build_task/upd_solution.bat
@@ -1 +0,0 @@
-python %~dp0upd_solution.py %_BUILDBOT_SOLUTION% %_BUILDBOT_SVN_PATH%\src\kbss_wlfs


Не закрывать окно с консолью после минимизации изображений

--- dev/imagemin.bat
+++ dev/imagemin.bat
@@ -1 +1 @@
-grunt imagemin+start grunt imagemin


9 args should be enough for anyone.

9 args should be enough for anyone.

--- boar.bat
+++ boar.bat
@@ -1 +1 @@
-C:\Python26\python.exe C:\Python26\boar\boar %1 %2 %3 %4 %5+C:\Python26\python.exe C:\Python26\boar\boar %1 %2 %3 %4 %5 %6 %7 %8 %9


Fixes for error checking were added

Fixes for error checking were added

--- build/CalculateCoverage.bat
+++ build/CalculateCoverage.bat
@@ -2,13 +2,13 @@

 nuget install OpenCover -ExcludeVersion -OutputDirectory tools
 tools\OpenCover\tools\OpenCover.Console.exe -target:"C:\Program Files\dotnet\dotnet.exe" -targetargs:" test ""test\GfPolynoms.Tests\project.json"" -c Debug" -register:user -filter:"+[*]* -[xunit*]*" -threshold:100 -oldstyle -returntargetcode -output:coverage.xml
-if not errorlevel 0 exit /b %errorlevel%
+if %errorlevel% neq 0 exit /b %errorlevel%
 tools\OpenCover\tools\OpenCover.Console.exe -target:"C:\Program Files\dotnet\dotnet.exe" -targetargs:" test ""test\GfAlgorithms.Tests\project.json"" -c Debug" -register:user -filter:"+[*]* -[xunit*]*" -threshold:100 -oldstyle -returntargetcode -mergeoutput -output:coverage.xml
-if not errorlevel 0 exit /b %errorlevel%
+if %errorlevel% neq 0 exit /b %errorlevel%
 tools\OpenCover\tools\OpenCover.Console.exe -target:"C:\Program Files\dotnet\dotnet.exe" -targetargs:" test ""test\RsCodesTools.Tests\project.json"" -c Debug" -register:user -filter:"+[*]* -[xunit*]*" -threshold:100 -oldstyle -returntargetcode -mergeoutput -output:coverage.xml
-if not errorlevel 0 exit /b %errorlevel%
+if %errorlevel% neq 0 exit /b %errorlevel%
 tools\OpenCover\tools\OpenCover.Console.exe -target:"C:\Program Files\dotnet\dotnet.exe" -targetargs:" test ""test\WaveletCodesTools.Tests\project.json"" -c Debug" -register:user -filter:"+[*]* -[xunit*]*" -threshold:100 -oldstyle -returntargetcode -mergeoutput -output:coverage.xml
-if not errorlevel 0 exit /b %errorlevel%
+if %errorlevel% neq 0 exit /b %errorlevel%

 SET PATH=C:\\Python34;C:\\Python34\\Scripts;%PATH%
 pip install codecov


Live and learn

Live and learn

--- _src/chrome/7-Zip.bat
+++ _src/chrome/7-Zip.bat
@@ -3,4 +3,4 @@
 ::"C:\Program Files\7-Zip\7z.exe" rn %~dp0/psdle.zip psdle.min.js js\psdle.js

 ::Assuming symlink: mklink /H "_src/chrome/psdle/js/psdle.js" "psdle.min.js"
-"C:\Program Files\7-Zip\7z.exe" a -uq0 -mx9 %~dp0/psdle.zip -mtc- %~dp0/psdle/* -r -x!*.db -x!*.ini+"%PROGRAMFILES%\7-Zip\7z.exe" a -uq0 -mx9 %~dp0/psdle.zip -mtc- %~dp0/psdle/* -r -x!*.db -x!*.ini


Do not run packages without tests

Do not run packages without tests

--- build/02_RunTests.bat
+++ build/02_RunTests.bat
@@ -2,13 +2,13 @@
 cmd /c call "node_modules/.bin/ng" test --watch=false || goto :error
 popd

-pushd "%~dp0/../src/picturepark-sdk-v1-angular-ui"
-cmd /c call "node_modules/.bin/ng" test --watch=false || goto :error
-popd
+REM pushd "%~dp0/../src/picturepark-sdk-v1-angular-ui"
+REM cmd /c call "node_modules/.bin/ng" test --watch=false || goto :error
+REM popd

-pushd "%~dp0/../src/picturepark-sdk-v1-angular-app"
-cmd /c call "node_modules/.bin/ng" test --watch=false || goto :error
-popd
+REM pushd "%~dp0/../src/picturepark-sdk-v1-angular-app"
+REM cmd /c call "node_modules/.bin/ng" test --watch=false || goto :error
+REM popd

 goto :EOF
 :error


Remove prerelease tag from MSBuild 14 packages (#987)

--- build/LegacyPackages/14.0/build.cmd
+++ build/LegacyPackages/14.0/build.cmd
@@ -13,7 +13,7 @@
 :: The minor version here should align with the Visual Studio Update of MSBuild being packaged
 SET VERSIONMINOR=3
 :: The build number here should be incremented when servicing the NuGet package.  The tag should be prereleaseNN when trying out something new
-SET VERSIONBUILD=0-prerelease02
+SET VERSIONBUILD=0
 :: This is the path to where this file is located
 SET ROOT=%~dp0
 :: The path to where packages will be outputed to


Skipped tests.

Skipped tests.

--- run.bat
+++ run.bat
@@ -20,7 +20,7 @@
 rem #java -cp "target/classes:target/dependency/*" com.github.onsdigital.generator.Csv

 rem # Now build the JAR:
-mvn package && ^
+mvn -Dmaven.test.skip=true package && ^
 ^
 rem # Development: reloadable ^
 java $JAVA_OPTS -Drestolino.files=$RESTOLINO_STATIC -Drestolino.classes=$RESTOLINO_CLASSES -Drestolino.packageprefix=$PACKAGE_PREFIX -cp "target/dependency/*" com.github.davidcarboni.restolino.Main


修改运行命令依赖于pm2

修改运行命令依赖于pm2

--- run.bat
+++ run.bat
@@ -1 +1 @@
-start cmd /C "set DEBUG=DoddCMS & npm start"+start cmd /C "set DEBUG=DoddCMS & pm2 start process.json &pm2 logs"


--- Batch/Reconnect.bat
+++ Batch/Reconnect.bat
@@ -20,13 +20,14 @@
 :#                  Allow specifying drives either as u, U, u:, U:            #
 :#   2015-11-12 JFL Get the drive list from the registry.                     #
 :#                  Removed all JFL-specific drive definitions.               #
+:#   2018-11-25 JFL Fixed the help when no drive is currently disconnected.   #
 :#                                                                            #
 :#          Copyright 2016 Hewlett Packard Enterprise Development LP         #
 :# Licensed under the Apache 2.0 license  www.apache.org/licenses/LICENSE-2.0 #
 :#----------------------------------------------------------------------------#

 setlocal enableextensions enabledelayedexpansion
-set "VERSION=2015-11-12"
+set "VERSION=2018-11-25"
 set "SCRIPT=%~nx0"
 set "SPATH=%~dp0" & set "SPATH=!SPATH:~0,-1!"
 set "ARG0=%~f0"
@@ -128,14 +129,14 @@
     set "!DRIVE!=!ADDRESS!"
   )
 )
-set "DRIVES=!DRIVES:~1!" &:# Remove the initial space inserted above
+if defined DRIVES set "DRIVES=!DRIVES:~1!" &:# Remove the initial space inserted above
 %IF_DEBUG% echo Found DRIVES=!DRIVES!
 goto :eof

 :Help
 call :FindDrives
 echo.
-echo %SCRIPT% version %VERSION% - Reconnect network drives
+echo %SCRIPT% version %VERSION% - Reconnect disconnected network drives
 echo.
 echo Usage: %SCRIPT% [OPTIONS] [DRIVES]
 echo.
@@ -143,8 +144,8 @@
 echo   -?       Display this help
 echo   -V       Display the script version and exit
 echo.
-echo Drives:    (The : after the drive letter is optional)
-for %%d in (%DRIVES%) do echo   %%d       Reconnect to !%%d!
+echo Drives:    The drives to reconnect to. (The : is optional.) Ex: X: Y:
+echo            Default on this system: %DRIVES%
 echo.
 goto :eof


Create PSX_MOVE_OVERLAYS.bat

Create PSX_MOVE_OVERLAYS.bat

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

--- PSX_MOVE_OVERLAYS.bat
+++ PSX_MOVE_OVERLAYS.bat
@@ -0,0 +1,5 @@
+for /r %cd%/SPEC_PSX %%x in (*.BIN) do move "%%x" "%cd%/BUILD/TOOLS/CODEWAD_Pack/Release/GAME"
+for /r %cd%/SPEC_PSX %%x in (*.REL) do move "%%x" "%cd%/BUILD/TOOLS/CODEWAD_Pack/Release/GAME"
+for /r %cd%/GAME %%x in (*.BIN) do move "%%x" "%cd%/BUILD/TOOLS/CODEWAD_Pack/Release/GAME"
+for /r %cd%/GAME %%x in (*.REL) do move "%%x" "%cd%/BUILD/TOOLS/CODEWAD_Pack/Release/GAME"
+for /r %cd%/SPEC_PSX %%x in (*.MOD) do move "%%x" "%cd%/BUILD/TOOLS/GAMEWAD_Pack/Release/DATA"


Update build-windows.bat

Update build-windows.bat

Try to redirect the module caches to the build root

--- utils/build-windows.bat
+++ utils/build-windows.bat
@@ -49,6 +49,15 @@
 subst T: %full_build_root% %exitOnError%
 set build_root=T:
 set install_directory=%build_root%\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain\usr
+
+md %build_root%\tmp
+set TMPDIR=%build_root%\tmp
+
+md %build_root%\tmp\org.llvm.clang
+set CUSTOM_CLANG_MODULE_CACHE=%build_root%\tmp\org.llvm.clang.9999
+
+md %build_root%\tmp\org.swift.package-manager
+set SWIFTPM_MODULECACHE_OVERRIDE=%build_root%\tmp\org.swift.package-manager

 call :clone_repositories %exitOnError%
 call :download_icu %exitOnError%


Add file rpwibuild.bat

Add file rpwibuild.bat

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

--- visualsrc/rpwibuild.bat
+++ visualsrc/rpwibuild.bat
@@ -0,0 +1 @@
+BUILD.BAT


Added command script to start SG.

Added command script to start SG.

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

--- start_gateway.cmd
+++ start_gateway.cmd
@@ -0,0 +1 @@
+"C:\Program Files (x86)\Couchbase\sync_gateway.exe" -pretty -verbose=true src\Couchbase.Lite.Tests.Shared\Assets\GatewayConfig.json


cleanup

cleanup

--- recipes/alps/bld.bat
+++ recipes/alps/bld.bat
@@ -1,4 +1,3 @@
-dir "%LIBRARY_BIN%"

 :: Compile clapack
 %PYTHON% %RECIPE_DIR%\get_clapack_src.py


Update PSX_BUILD.bat

Update PSX_BUILD.bat

--- PSX_BUILD.bat
+++ PSX_BUILD.bat
@@ -1,4 +1,8 @@
 mingw32-make
 call PSX_EXPORT_OVERLAYS.bat
 call PSX_MOVE_OVERLAYS.bat
-call PSX_CREATE_GAMEWAD.bat+call PSX_CREATE_GAMEWAD.bat
+cd DISC
+CPE2X MAIN.CPE
+MAKEISO.bat
+cd ../


As recommanded by Shay : Don't modify ES_PARAMS Escape parameters

--- bin/elasticsearch.bat
+++ bin/elasticsearch.bat
@@ -48,9 +48,9 @@
 REM JAVA_OPTS=%JAVA_OPTS% -XX:HeapDumpPath=$ES_HOME/logs/heapdump.hprof

 set ES_CLASSPATH=%ES_CLASSPATH%;%ES_HOME%/lib/*;%ES_HOME%/lib/sigar/*
-set ES_PARAMS=-Delasticsearch -Des-foreground=yes -Des.path.home="%ES_HOME%" %*
+set ES_PARAMS=-Delasticsearch -Des-foreground=yes -Des.path.home="%ES_HOME%"

-"%JAVA_HOME%\bin\java" %JAVA_OPTS% %ES_JAVA_OPTS% %ES_PARAMS% -cp "%ES_CLASSPATH%" "org.elasticsearch.bootstrap.ElasticSearch"
+"%JAVA_HOME%\bin\java" %JAVA_OPTS% %ES_JAVA_OPTS% %ES_PARAMS% "%*" -cp "%ES_CLASSPATH%" "org.elasticsearch.bootstrap.ElasticSearch"
 goto finally


Arrrrggggghhhhh

Arrrrggggghhhhh

--- test-coverage.bat
+++ test-coverage.bat
@@ -43,7 +43,7 @@
 -filter:"+[DBCL]DD.Extends*" ^
 -target:".\packages\NUnit.Runners.Net4.2.6.4\tools\nunit-console-x86.exe" ^
 -targetdir:".\Source\Test\NUnit.Extensions\bin\Debug" ^
--targetargs:"NUnit.Extensions.dll /nologo /noshadow /result=\"TestResult.xml\" %nunit_work_option_folder%"
+-targetargs:"NUnit.Extensions.dll /nologo /noshadow /result=\"TestResult.xml\" "
 @echo -------------------------------------
 @echo.
 @echo.
@@ -56,7 +56,7 @@
 -filter:"+[*]DD.Extends*" ^
 -target:".\packages\NUnit.Runners.Net4.2.6.4\tools\nunit-console-x86.exe" ^
 -targetdir:".\Source\Test\NUnit.Extensions\bin\Debug" ^
--targetargs:"NUnit.Extensions.dll /nologo /noshadow /result=\"TestResult.xml\" %nunit_work_option_folder%"
+-targetargs:"NUnit.Extensions.dll /nologo /noshadow /result=\"TestResult.xml\" "
 @echo -------------------------------------
 @echo.
 @echo.
@@ -67,7 +67,7 @@
 -filter:"-[*]DD.Collections.ICodeSet.*Test* +[*]DD.Collections.ICodeSet* +[*]DD.Text*" ^
 -target:".\packages\NUnit.Runners.Net4.2.6.4\tools\nunit-console-x86.exe" ^
 -targetdir:".\Source\Test\NUnit.ICodeSet\bin\Debug" ^
--targetargs:"NUnit.ICodeSet.dll /nologo /noshadow /result=\"ICodeSet.TestResult.xml\" %nunit_work_option_folder%"
+-targetargs:"NUnit.ICodeSet.dll /nologo /noshadow /result=\"ICodeSet.TestResult.xml\" "
 @echo -------------------------------------
 @echo.
 @echo.
@@ -78,7 +78,7 @@
 -filter:"-[*]DD.Collections.BitSetArrayTest* +[*]DD.Collections.BitSetArray*" ^
 -target:".\packages\NUnit.Runners.Net4.2.6.4\tools\nunit-console-x86.exe" ^
 -targetdir:".\Source\Test\NUnit.BitSetArray\bin\Debug" ^
--targetargs:"NUnit.BitSetArray.dll /nologo /noshadow /result=\"BitSetArray.TestResult.xml\" %nunit_work_option_folder%"
+-targetargs:"NUnit.BitSetArray.dll /nologo /noshadow /result=\"BitSetArray.TestResult.xml\" "
 @echo -------------------------------------
 @echo.
 @echo.
@@ -89,7 +89,7 @@
 -filter:"-[*]DD.Diagnostics.SuccessTest* +[*]DD.Diagnostics*" ^
 -target:".\packages\NUnit.Runners.Net4.2.6.4\tools\nunit-console-x86.exe" ^
 -targetdir:".\Source\Test\NUnit.Diagnostics\bin\Debug" ^
--targetargs:"NUnit.Diagnostics.dll /nologo /noshadow /result=\"Diagnostics.TestResult.xml\" %nunit_work_option_folder%"
+-targetargs:"NUnit.Diagnostics.dll /nologo /noshadow /result=\"Diagnostics.TestResult.xml\" "
 @echo -------------------------------------
 @echo.
 @echo.


Build scripts moved packaging

Build scripts moved packaging

Former-commit-id: 0bb6e1f7326d3fc12de7acbf29daf4c233a99f83

--- update-version.cmd
+++ update-version.cmd
@@ -1,2 +0,0 @@
-mvn org.eclipse.tycho:tycho-versions-plugin:update-pom -Dtycho.mode=maven
-


Remove pause as we want to build it from CI agent

--- teamcity-plugin/Build/build-metarunner.cmd
+++ teamcity-plugin/Build/build-metarunner.cmd
@@ -18,6 +18,4 @@
 PAUSE
 @PowerShell -File "%~dp0Create-Zip.ps1" -target %~dp0..\Drops\Temp\ %~dp0..\Drops\octopuspuppet-metarunner.zip

-RMDIR "%~dp0..\Drops\Temp\" /S /Q
-
-PAUSE+RMDIR "%~dp0..\Drops\Temp\" /S /Q


Can't remove requests, needed by ucoinpy

--- ci/appveyor/build.cmd
+++ ci/appveyor/build.cmd
@@ -13,6 +13,7 @@

 pip install pylibscrypt
 pip install libnacl
+pip install requests
 pip install base58
 pip install quamash
 pip install asyncio


More reliable DEL and RMDIR in xspec-bat.cmd  (#249)

--- test/xspec-bat.cmd
+++ test/xspec-bat.cmd
@@ -16,7 +16,7 @@
 rem Results log file
 rem
 set "RESULTS_FILE=%TEMP%\%~n0_results.log"
-call :del "%RESULTS_FILE%"
+if exist "%RESULTS_FILE%" call :del "%RESULTS_FILE%"

 rem
 rem Work directory
@@ -732,8 +732,11 @@

 :del
     if exist %1 (
-        del /q %1
-        if errorlevel 1 call :failed "Failed to del: %~1"
+        rem DEL returns 0 as long as the parameter is valid
+        del %1
+        if exist %1 call :failed "Failed to del: %~1"
+    ) else (
+        call :failed "File not found for del: %~1"
     )
     goto :EOF

@@ -744,16 +747,26 @@

 :rmdir
     if exist %1 (
-        call :del "%~1\*"
+        rem DEL and RMDIR return 0 as long as the parameter is valid
+        del /q "%~1\*"
         rmdir %1
-        if errorlevel 1 call :failed "Failed to rmdir: %~1"
-    )
+        if exist %1 call :failed "Failed to rmdir: %~1"
+    ) else (
+        call :failed "Dir not found for rmdir: %~1"
+    )
+    goto :EOF
+
+:rmdir-if-exist
+    if exist %1 call :rmdir %1
     goto :EOF

 :rmdir-s
     if exist %1 (
+        rem RMDIR returns 0 as long as the parameter is valid
         rmdir /s /q %1
-        if errorlevel 1 call :failed "Failed to rmdir /s: %~1"
+        if exist %1 call :failed "Failed to rmdir /s: %~1"
+    ) else (
+        call :failed "Dir not found for rmdir /s: %~1"
     )
     goto :EOF

@@ -790,10 +803,10 @@
     rem Remove the XSpec output directories
     rem    Keep "..\test\" to minimize accident
     rem
-    call :rmdir ..\test\catalog\xspec
-    call :rmdir ..\test\xspec
-    call :rmdir ..\tutorial\schematron\xspec
-    call :rmdir ..\tutorial\xspec
+    call :rmdir-if-exist ..\test\catalog\xspec
+    call :rmdir          ..\test\xspec
+    call :rmdir-if-exist ..\tutorial\schematron\xspec
+    call :rmdir          ..\tutorial\xspec

     rem
     rem Remove the work directory


@echo off when rebuilding on windows

@echo off when rebuilding on windows

--- vendor/rebuild.bat
+++ vendor/rebuild.bat
@@ -1,3 +1,4 @@
+@echo off
 cd ..
 cd node_modules
 rmdir /Q /S nslog\build 2>nul


revert previous commit

revert previous commit

git-svn-id: 756506b3b0ea8c31733a8f0a5bb416c7e269da3d@337 28bd50df-7adb-d945-0439-6e466c6a13cc

--- wdkbuild/build.cmd
+++ wdkbuild/build.cmd
@@ -45,18 +45,18 @@
 ECHO.
 ECHO.
 ECHO:Executing "build.cmd" will use the defaults: "build.cmd build all"
-ECHO:If you skip an argument the default one will be used.
-ECHO.
-ECHO:Examples:
-ECHO:  "build.cmd rebuild" is equivalent to "build.cmd rebuild all"
-ECHO:  "build.cmd x86" is equivalent to "build.cmd build x86"
+ECHO:If you skip the second argument the default one will be used. Example:
+ECHO:"build.cmd rebuild" is equivalent to "build.cmd rebuild all"
+ECHO:NOTE: "build.cmd x86" won't work.
 ECHO.
 ENDLOCAL
 EXIT /B

 :CHECKFIRSTARG
-REM Check for the first switch
-IF "%1" == "" SET BUILDTYPE=Build&&GOTO :CHECKSECONDARG
+rem Check for the first switch
+IF "%1" == "" (
+SET BUILDTYPE=Build
+) ELSE (
 IF /I "%1" == "Build" SET BUILDTYPE=Build&&GOTO :CHECKSECONDARG
 IF /I "%1" == "/Build" SET BUILDTYPE=Build&&GOTO :CHECKSECONDARG
 IF /I "%1" == "-Build" SET BUILDTYPE=Build&&GOTO :CHECKSECONDARG
@@ -69,27 +69,18 @@
 IF /I "%1" == "/Rebuild" SET BUILDTYPE=Rebuild&&GOTO :CHECKSECONDARG
 IF /I "%1" == "-Rebuild" SET BUILDTYPE=Rebuild&&GOTO :CHECKSECONDARG
 IF /I "%1" == "--Rebuild" SET BUILDTYPE=Rebuild&&GOTO :CHECKSECONDARG
-IF /I "%1" == "x86" SET ARCH=x86&&GOTO :CHECKSECONDARG
-IF /I "%1" == "/x86" SET ARCH=x86&&GOTO :CHECKSECONDARG
-IF /I "%1" == "-x86" SET ARCH=x86&&GOTO :CHECKSECONDARG
-IF /I "%1" == "--x86" SET ARCH=x86&&GOTO :CHECKSECONDARG
-IF /I "%1" == "x64" SET ARCH=x64&&GOTO :CHECKSECONDARG
-IF /I "%1" == "/x64" SET ARCH=x64&&GOTO :CHECKSECONDARG
-IF /I "%1" == "-x64" SET ARCH=x64&&GOTO :CHECKSECONDARG
-IF /I "%1" == "--x64" SET ARCH=x64&&GOTO :CHECKSECONDARG
-IF /I "%1" == "all" SET ARCH=all&&GOTO :CHECKSECONDARG
-IF /I "%1" == "/all" SET ARCH=all&&GOTO :CHECKSECONDARG
-IF /I "%1" == "-all" SET ARCH=all&&GOTO :CHECKSECONDARG
-IF /I "%1" == "--all" SET ARCH=all&&GOTO :CHECKSECONDARG
 ECHO.
-ECHO:"%1": Unsupported commandline switch!
+ECHO:Unsupported commandline switch!
 ECHO:Run "build.cmd help" for details about the commandline switches.
 CALL :SUBMSG "ERROR" "Compilation failed!"
+)

 :CHECKSECONDARG
-REM Check for the second switch
-IF "%2" == "" SET ARCH=all&&GOTO :START
+rem Check for the second switch
+IF "%2" == "" (
+SET ARCH=all
+) ELSE (
 IF /I "%2" == "x86" SET ARCH=x86&&GOTO :START
 IF /I "%2" == "/x86" SET ARCH=x86&&GOTO :START
 IF /I "%2" == "-x86" SET ARCH=x86&&GOTO :START
@@ -102,28 +93,17 @@
 IF /I "%2" == "/all" SET ARCH=all&&GOTO :START
 IF /I "%2" == "-all" SET ARCH=all&&GOTO :START
 IF /I "%2" == "--all" SET ARCH=all&&GOTO :START
-IF /I "%2" == "Build" SET BUILDTYPE=Build&&GOTO :START
-IF /I "%2" == "/Build" SET BUILDTYPE=Build&&GOTO :START
-IF /I "%2" == "-Build" SET BUILDTYPE=Build&&GOTO :START
-IF /I "%2" == "--Build" SET BUILDTYPE=Build&&GOTO :START
-IF /I "%2" == "Clean" SET BUILDTYPE=Clean&&GOTO :START
-IF /I "%2" == "/Clean" SET BUILDTYPE=Clean&&GOTO :START
-IF /I "%2" == "-Clean" SET BUILDTYPE=Clean&&GOTO :START
-IF /I "%2" == "--Clean" SET BUILDTYPE=Clean&&GOTO :START
-IF /I "%2" == "Rebuild" SET BUILDTYPE=Rebuild&&GOTO :START
-IF /I "%2" == "/Rebuild" SET BUILDTYPE=Rebuild&&GOTO :START
-IF /I "%2" == "-Rebuild" SET BUILDTYPE=Rebuild&&GOTO :START
-IF /I "%2" == "--Rebuild" SET BUILDTYPE=Rebuild&&GOTO :START
 ECHO.
-ECHO:"%2": Unsupported commandline switch!
+ECHO:Unsupported commandline switch!
 ECHO:Run "build.cmd help" for details about the commandline switches.
 CALL :SUBMSG "ERROR" "Compilation failed!"
+)

 :START
-IF /I "%BUILDTYPE%" == "" SET BUILDTYPE=Build
-IF /I "%ARCH%" == "" SET ARCH=all
 IF /I "%BUILDTYPE%" == "Clean" GOTO :x86
+
+rem update the svn revision before building
 PUSHD ..
 CALL "update_version.bat"
 POPD
@@ -131,8 +111,7 @@
 :x86
 SET "INCLUDE=%WDKBASEDIR%\inc\crt;%WDKBASEDIR%\inc\api;%WDKBASEDIR%\inc\api\crt\stl60;%WDKBASEDIR%\inc\ddk"
 SET "LIB=%WDKBASEDIR%\lib\crt\i386;%WDKBASEDIR%\lib\win7\i386"
-SET "FPATH=%WDKBASEDIR%\bin\x86;%WDKBASEDIR%\bin\x86\x86;%SDKDIR%\Bin"
-SET "PATH=%FPATH%"
+SET "PATH=%WDKBASEDIR%\bin\x86;%WDKBASEDIR%\bin\x86\x86;%SDKDIR%\Bin"

 IF /I "%ARCH%" == "x64" GOTO :x64

@@ -161,8 +140,7 @@

 :x64
 SET "LIB=%WDKBASEDIR%\lib\crt\amd64;%WDKBASEDIR%\lib\win7\amd64"
-SET "FPATH=%WDKBASEDIR%\bin\x86;%WDKBASEDIR%\bin\x86\amd64;%SDKDIR%\Bin"
-SET "PATH=%FPATH%"
+SET "PATH=%WDKBASEDIR%\bin\x86;%WDKBASEDIR%\bin\x86\amd64;%SDKDIR%\Bin"

 IF /I "%ARCH%" == "x86" GOTO :END


Updated all shaders to new standards

Updated all shaders to new standards

Former-commit-id: 815cce31616d63df6a1ee7186205ddb7e2143132

--- vkcompile.bat
+++ vkcompile.bat
@@ -1,3 +0,0 @@
-C:/VulkanSDK/1.0.54.0/Bin32/glslangValidator.exe -V New-Kosmos/res/shaders/tests/test.vert -o New-Kosmos/res/shaders/tests/test.vert.spv
-C:/VulkanSDK/1.0.54.0/Bin32/glslangValidator.exe -V New-Kosmos/res/shaders/tests/test.frag -o New-Kosmos/res/shaders/tests/test.frag.spv
-pause


Look for default make files in the STINCLUDE directory. Added option -U to undefine variables. Renamed the special "goal_name" as "module_name". Use this module_name earlier when making the log file name. Default to the current directory name as the last resort. Added variable IGNORE_NMAKEFILE.

--- C/include/make.bat
+++ C/include/make.bat
@@ -96,13 +96,19 @@
 :#		    or \ is assumed to be a pseudo-target not to be logged.   *
 :#		    Added options -q and -Q to set the output capture manually.
 :#   2016-12-16 JFL Updated the batch library framework.		      *
+:#   2017-02-22 JFL Look for default make files in the STINCLUDE directory.   *
+:#                  Added option -U to undefine variables.		      *
+:#   2017-02-24 JFL Renamed the special "goal_name" as "module_name".         *
+:#                  Use this module_name earlier when making the log file name.
+:#                  Default to the current directory name as the last resort. *
+:#   2017-03-01 JFL Added variable IGNORE_NMAKEFILE.                          *
 :#                                                                            *
 :#          Copyright 2016 Hewlett Packard Enterprise Development LP         *
 :# Licensed under the Apache 2.0 license  www.apache.org/licenses/LICENSE-2.0 *
 :#*****************************************************************************

 setlocal EnableExtensions EnableDelayedExpansion
-set "VERSION=2016-12-16"
+set "VERSION=2017-03-01"
 set "SCRIPT=%~nx0"				&:# Script name
 set "SPATH=%~dp0" & set "SPATH=!SPATH:~0,-1!"	&:# Script path, without the trailing \
 set  "ARG0=%~f0"				&:# Script full pathname
@@ -1228,16 +1234,22 @@
 :#----------------------------------------------------------------------------#

 :GetDefaultMakeFile
-if exist NMakeFile (
+%FUNCTION%
+%UPVAR% MAKEFILE
+set "NMAKEFILE=NMakeFile"
+if "%IGNORE_NMAKEFILE%"=="1" set "NMAKEFILE=:" &:# An impossible name
+if exist %NMAKEFILE% (
   set "MAKEFILE=NMakeFile"	&rem :# Default make file name
 ) else if exist All.mak (
   set "MAKEFILE=All.mak"	&rem :# Most powerful one, that can build for all MS OS versions
 ) else if exist DosWin.mak (
   set "MAKEFILE=DosWin.mak"	&rem :# Previous version of the same, more complex and less powerfull
+) else if exist "%SPATH%\All.mak" (
+  set "MAKEFILE="%SPATH%\All.mak""  &rem :# Most powerful one, that can build for all MS OS versions
 ) else (
   set "MAKEFILE=NMakeFile"	&rem :# Revert to the default, even though we know it's not there
 )
-goto :eof
+%RETURN%

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

@@ -1314,13 +1326,17 @@
 :# Run nmake without logging anything, for simple goals like help, clean, etc.
 :nmake [nmake.exe options]
 %FUNCTION%
-if not defined MAKEFILE call :GetDefaultMakeFile
+if not defined MAKEFILE (
+  call :GetDefaultMakeFile
+) else (
+  %ECHOVARS.D% MAKEFILE
+)
 call :GetConfig >NUL 2>NUL :# Get Development tools location. Also defines OUTDIR.
 if errorlevel 1 %RETURN%
 :# Update the PATH for running Visual Studio tools, from definitions set in %CONFIG.BAT%
 set PATH=!%MAKEORIGIN%_PATH!
 if not defined MAKE set "MAKE=!%MAKEORIGIN%_CC:CL.EXE=nmake.exe!" &:# Includes enclosing quotes
-%ECHOVARS.D% CD MESSAGES OUTDIR MAKEORIGIN PATH %MAKEORIGIN%_CC
+%ECHOVARS.D% CD MESSAGES OUTDIR MAKEORIGIN PATH INCLUDE %MAKEORIGIN%_CC
 set "NMAKEFLAGS=/NOLOGO /c /s"
 %IF_VERBOSE% set "NMAKEFLAGS=/NOLOGO"
 :# Clear a few multi-line variables that pollute the (nmake /P) logs
@@ -1483,14 +1499,18 @@
 if "!ARG!"=="-q" set "LIGHTMAKE=1" & goto next_arg
 if "!ARG!"=="-Q" set "LIGHTMAKE=0" & goto next_arg
 if "!ARG!"=="-u" %POPARG% & call :update_scripts "!ARG!" & goto :eof
+if "!ARG!"=="-U" %POPARG% & set "%ARG%=" & goto next_arg
 if "!ARG!"=="-v" call :Verbose.On & goto next_arg
 if "!ARG!"=="-V" (echo %VERSION%) & goto :eof
 if "!ARG!"=="-X" call :Exec.Off & goto next_arg
 :# Special targets that need special handling
 if "!ARG!"=="cleanenv" goto :CleanBuildEnvironment &:# This routine exits directly
 if not "LIGHTMAKE"=="0" (
-  for %%t in (help clean mostlyclean distclean goal_name) do (
-    if "!ARG!"=="%%t" call :nmake !ARG! & exit /b
+  for %%t in (help clean mostlyclean distclean module_name) do (
+    if "!ARG!"=="%%t" (
+      call :GetConfig
+      call :nmake !ARG! & exit /b
+    )
   )
   :# Any goal that begins with "list_" and that contains no . or \
   if not "!ARG:list_=!"=="!ARG!" if "!ARG:.=!"=="!ARG!" if "!ARG:\=!"=="!ARG!" call :nmake !ARG! & exit /b
@@ -1636,8 +1656,21 @@
 if %MAKEDEPTH%==0 if defined LOGFILE ( :# If this is the top-level instance of make.bat, show the final result
   set GOAL=
   for %%F in ("%LASTGOAL%") do set "GOAL=%%~nF"
-  :# If there's no goal, use the make file name. (Provided it's not a generic makefile.)
-  if not defined GOAL if /i "%MAKEFILE%" neq "nmakefile" for %%F in ("%MAKEFILE%") do set GOAL=%%~nF
+  :# If there's no goal, maybe the makefile itself has a rule to generate the default log file name
+  if not defined GOAL (
+    :# Gotcha: nmake always displays on stdout: "Started parsing rules in NMakeFile." So redirect stderr.
+    :# Gotcha: The exit code does not survive the 'sub-shell' return. So test it inside, and change the sub-shell output.
+    :# Gotcha: Testing variables in the subshell requires three pairs of ^. So use if errorlevel 1.
+    for %%m in (%MAKE%) do set "MAKE=%%~sm" &rem :# Get the short name, else the following invokation fails
+    %ECHO.D% !MAKE! /nologo /s /c /f %MAKEFILE% /x - module_name
+    for /f "delims=" %%g in (
+      '!MAKE! /nologo /s /c /f %MAKEFILE% /x - module_name 2^>NUL ^& if errorlevel 1 echo :'
+    ) do set "GOAL=%%g"
+    :# ":" is an impossible goal name, flagging the absence of target "module_name" in the makefile.
+    if "!GOAL!"==":" set "GOAL="
+  )
+  :# If there's still no goal, use the make file name. (Provided it's not a generic makefile.)
+  if not defined GOAL for %%F in (%MAKEFILE%) do if /i "%%~nxF" neq "NMakefile" if /i "%%~nxF" neq "All.mak" set GOAL=%%~nF
   :# If there's still no goal, and the %CD% is something like ...\PROGRAM\SRC, use the word %PROGRAM%
   if not defined GOAL (
     for %%f in ("!CD!") do set "CD0=%%~nxf"
@@ -1646,27 +1679,19 @@
     popd
     if /i "!CD0!" equ "src" set "GOAL=!CD1!"
   )
-  :# If there's still no goal, maybe the makefile itself has a rule to generate the default goal name
-  if not defined GOAL (
-    :# Gotcha: nmake always displays on stdout: "Started parsing rules in NMakeFile." So redirect stderr.
-    :# Gotcha: The exit code does not survive the 'sub-shell' return. So test it inside, and change the sub-shell output.
-    :# Gotcha: Testing variables in the subshell requires three pairs of ^. So use if errorlevel 1.
-    for /f "delims=" %%g in (
-      '%MAKE% /nologo /s /c /f %MAKEFILE% /x - goal_name 2^>NUL ^& if errorlevel 1 echo :'
-    ) do set "GOAL=%%g"
-    :# ":" is an impossible goal name, flagging the absence of target "goal_name" in the makefile.
-    if "!GOAL!"==":" set "GOAL="
+  %ECHOVARS.D% GOAL
+  :# If there's still no goal, use the current directory name.
+  if not defined GOAL set "GOAL=!CD0!"
+  %ECHOVARS.D% GOAL
+  :# Rename %LOGFILE% after the %GOAL%, and display the build log.
+  set LOGFILE2=!GOAL!.log
+  if defined OUTDIR set "LOGFILE2=%OUTDIR%\!LOGFILE2!"
+  if not "!LOGFILE2!"=="!LOGFILE!" (
+    if exist "!LOGFILE2!" del "!LOGFILE2!"
+    move "!LOGFILE!" "!LOGFILE2!" >nul
+    call :Debug.SetLog "!LOGFILE2!"
   )
-  :# If there's still no goal, give it up and keep the default log file name: make.log.
-  if defined GOAL ( :# Rename %LOGFILE% after the %GOAL%, and display the build log.
-    set LOGFILE2=!GOAL!.log
-    if defined OUTDIR set "LOGFILE2=%OUTDIR%\!LOGFILE2!"
-    if not "!LOGFILE2!"=="!LOGFILE!" (
-      if exist "!LOGFILE2!" del "!LOGFILE2!"
-      move "!LOGFILE!" "!LOGFILE2!" >nul
-      call :Debug.SetLog "!LOGFILE2!"
-    )
-  )
+  %ECHOVARS.D% LOGFILE
 )

 if %MAKEDEPTH%==0 ( :# If this is the top-level instance of make.bat, show the final result


update

update

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

--- monthertree/fcgi.cmd
+++ monthertree/fcgi.cmd
@@ -0,0 +1 @@
+python manage.py runfcgi host=127.0.0.1 port=8080


Update Dr. Memory paths to account for the new version of the DrM SFX
TBR=bruening
TEST=DrM FYI bot starts the proper version of DrM
Review URL: http://codereview.chromium.org/6507041

git-svn-id: de016e52bd170d2d4f2344f9bf92d50478b649e0@75250 0039d316-1c4b-4281-b951-d872f2087c98

--- tools/valgrind/chrome_tests.bat
+++ tools/valgrind/chrome_tests.bat
@@ -42,7 +42,7 @@

 :DRMEMORY_BINARY_OK
 %DRMEMORY_SFX% -o%DRMEMORY_PATH%\unpacked -y
-set DRMEMORY_COMMAND=%DRMEMORY_PATH%\unpacked\exports32\bin\drmemory.exe -dr %DRMEMORY_PATH%\unpacked\exports
+set DRMEMORY_COMMAND=%DRMEMORY_PATH%\unpacked\bin\drmemory.exe
 :: }}}
 goto :RUN_TESTS


Run.bat add

Run.bat add

--- Run.bat
+++ Run.bat
@@ -1,2 +1 @@
-cd .\src
-java -Djava.library.path=D:\workspace\SpotSpotter\src -Djava.ext.dirs=D:\workspace\SpotSpotter\lib pers.zylo117.spotspotter.mainprogram.Main+java -jar -Xms1024m -Xmx1536m SpotSpotter.jar


Auto merge of #19324 - drewler:fix_matchbat, r=jdm

Get back to working dir after vcvarsall.bat

<!-- Please describe your changes on the following line: -->

When using cmd.exe directly (instead of `x86_x64 Cross Tools Command Prompt for VS 2017`), vcvarsall.bat changes the working directory.
To prevent this, pushd and popd could be used.

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors

<!-- Either: -->
- [X] These changes do not require tests because they are part of the build process.

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/19324)
<!-- Reviewable:end -->

--- mach.bat
+++ mach.bat
@@ -1,4 +1,6 @@
 @echo off
+
+pushd .

 IF EXIST "%ProgramFiles(x86)%" (
   set "ProgramFiles32=%ProgramFiles(x86)%"
@@ -32,4 +34,6 @@
   EXIT /B
 )

+popd
+
 python mach %*


Made a windows version of the Makefile

Made a windows version of the Makefile

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

--- make.bat
+++ make.bat
@@ -0,0 +1,36 @@
+@ECHO OFF
+SET BINARY=logstats.exe
+SET VERSION=1.0.0
+for /f "delims=" %%a in ('git rev-parse HEAD') do SET BUILD=%%a
+SET LDFLAGS=-ldflags "-X main.Version=%VERSION% -X main.Build=%BUILD%"
+
+set ARG1=%1
+
+if "%ARG1%" == "clean" (
+    CALL :clean
+) ELSE IF "%ARG1%" == "build" (
+    CALL :build
+) ELSE IF "%ARG1%" == "clean-build" (
+    CALL :clean
+    CALL :build
+) ELSE (
+    ECHO Incorrect arguments passed [%ARG1%]
+)
+EXIT /B 0
+
+:clean
+if exist bin (
+    RD /S /Q "bin"
+)
+EXIT /B 0
+
+:build
+@ECHO ON
+go build %LDFLAGS% -o ./bin/%BINARY%
+@ECHO OFF
+copy "./config.yaml" "./bin/config.yaml" > nul
+copy "./irctest.log" "./bin/irctest.log" > nul
+cd bin
+%BINARY%
+cd ..
+EXIT /B 0


Fix: `make install PATH\TO\INSTALLDIR` can not work.

--- make.cmd
+++ make.cmd
@@ -11,7 +11,7 @@
 if "%GOPATH%" == "" set "GOPATH=%USERPROFILE%\go"
 for /F "delims=; tokens=1" %%I in ("%GOPATH%") do set "GOPATH1ST=%%I"

-call :"%~1"
+call :"%~1" %2 %3 %4 %5 %6
 @popd
 @endlocal
 @exit /b
@@ -105,7 +105,7 @@
         @exit /b

 :"install"
-        if not "%2" == "" set "INSTALLDIR=%2" & echo @set "INSTALLDIR=%2" > "%~dp0Misc\version.cmd"
+        if not "%1" == "" set "INSTALLDIR=%1" & echo @set "INSTALLDIR=%~1" > "%~dp0Misc\version.cmd"
         if "%INSTALLDIR%" == "" (
             echo Please %0.cmd install PATH\TO\BIN, once
             @exit /b


Delete mvnw.cmd

Delete mvnw.cmd

--- mvnw.cmd
+++ mvnw.cmd
@@ -1,145 +0,0 @@
-@REM ----------------------------------------------------------------------------
-@REM Licensed to the Apache Software Foundation (ASF) under one
-@REM or more contributor license agreements.  See the NOTICE file
-@REM distributed with this work for additional information
-@REM regarding copyright ownership.  The ASF licenses this file
-@REM to you under the Apache License, Version 2.0 (the
-@REM "License"); you may not use this file except in compliance
-@REM with the License.  You may obtain a copy of the License at
-@REM
-@REM    http://www.apache.org/licenses/LICENSE-2.0
-@REM
-@REM Unless required by applicable law or agreed to in writing,
-@REM software distributed under the License is distributed on an
-@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-@REM KIND, either express or implied.  See the License for the
-@REM specific language governing permissions and limitations
-@REM under the License.
-@REM ----------------------------------------------------------------------------
-
-@REM ----------------------------------------------------------------------------
-@REM Maven2 Start Up Batch script
-@REM
-@REM Required ENV vars:
-@REM JAVA_HOME - location of a JDK home dir
-@REM
-@REM Optional ENV vars
-@REM M2_HOME - location of maven2's installed home dir
-@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
-@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending
-@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
-@REM     e.g. to debug Maven itself, use
-@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
-@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
-@REM ----------------------------------------------------------------------------
-
-@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
-@echo off
-@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on'
-@if "%MAVEN_BATCH_ECHO%" == "on"  echo %MAVEN_BATCH_ECHO%
-
-@REM set %HOME% to equivalent of $HOME
-if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
-
-@REM Execute a user defined script before this one
-if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
-@REM check for pre script, once with legacy .bat ending and once with .cmd ending
-if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
-if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
-:skipRcPre
-
-@setlocal
-
-set ERROR_CODE=0
-
-@REM To isolate internal variables from possible post scripts, we use another setlocal
-@setlocal
-
-@REM ==== START VALIDATION ====
-if not "%JAVA_HOME%" == "" goto OkJHome
-
-echo.
-echo Error: JAVA_HOME not found in your environment. >&2
-echo Please set the JAVA_HOME variable in your environment to match the >&2
-echo location of your Java installation. >&2
-echo.
-goto error
-
-:OkJHome
-if exist "%JAVA_HOME%\bin\java.exe" goto init
-
-echo.
-echo Error: JAVA_HOME is set to an invalid directory. >&2
-echo JAVA_HOME = "%JAVA_HOME%" >&2
-echo Please set the JAVA_HOME variable in your environment to match the >&2
-echo location of your Java installation. >&2
-echo.
-goto error
-
-@REM ==== END VALIDATION ====
-
-:init
-
-set MAVEN_CMD_LINE_ARGS=%*
-
-@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
-@REM Fallback to current working directory if not found.
-
-set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
-IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
-
-set EXEC_DIR=%CD%
-set WDIR=%EXEC_DIR%
-:findBaseDir
-IF EXIST "%WDIR%"\.mvn goto baseDirFound
-cd ..
-IF "%WDIR%"=="%CD%" goto baseDirNotFound
-set WDIR=%CD%
-goto findBaseDir
-
-:baseDirFound
-set MAVEN_PROJECTBASEDIR=%WDIR%
-cd "%EXEC_DIR%"
-goto endDetectBaseDir
-
-:baseDirNotFound
-set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
-cd "%EXEC_DIR%"
-
-:endDetectBaseDir
-
-IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
-
-@setlocal EnableExtensions EnableDelayedExpansion
-for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
-@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
-
-:endReadAdditionalConfig
-
-SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
-
-set WRAPPER_JAR="".\.mvn\wrapper\maven-wrapper.jar""
-set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
-
-%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CMD_LINE_ARGS%
-if ERRORLEVEL 1 goto error
-goto end
-
-:error
-set ERROR_CODE=1
-
-:end
-@endlocal & set ERROR_CODE=%ERROR_CODE%
-
-if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
-@REM check for post script, once with legacy .bat ending and once with .cmd ending
-if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
-if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
-:skipRcPost
-
-@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
-if "%MAVEN_BATCH_PAUSE%" == "on" pause
-
-if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
-
-exit /B %ERROR_CODE%


Modified path to Nant.exe

Modified path to Nant.exe

Nant.exe is no longer included in the version control. This means that it needs to be installed on the system and added to the $PATH

--- nant.bat
+++ nant.bat
@@ -1,2 +1,2 @@
-..\tools\nant\bin\NAnt.exe %*
+NAnt.exe %*


4.0.0-alpha-059

--- pack.bat
+++ pack.bat
@@ -7,5 +7,5 @@
   && dotnet build test\Aqua.Tests.TestObjects2 ^
   && dotnet build test\Aqua.Tests ^
   && dotnet test test\Aqua.Tests\Aqua.Tests.csproj ^
-  && dotnet pack src\Aqua\Aqua.csproj --output "..\..\artifacts" --configuration Debug --include-symbols --version-suffix 058 ^
-  && dotnet pack src\Aqua.Newtonsoft.Json\Aqua.Newtonsoft.Json.csproj --output "..\..\artifacts" --configuration Debug --include-symbols --version-suffix 058+  && dotnet pack src\Aqua\Aqua.csproj --output "..\..\artifacts" --configuration Debug --include-symbols --version-suffix 059 ^
+  && dotnet pack src\Aqua.Newtonsoft.Json\Aqua.Newtonsoft.Json.csproj --output "..\..\artifacts" --configuration Debug --include-symbols --version-suffix 059


4.0.0-alpha-055

--- pack.bat
+++ pack.bat
@@ -7,5 +7,5 @@
   && dotnet build test\Aqua.Tests.TestObjects2 ^
   && dotnet build test\Aqua.Tests ^
   && dotnet test test\Aqua.Tests\Aqua.Tests.csproj ^
-  && dotnet pack src\Aqua\Aqua.csproj --output "..\..\artifacts" --configuration Debug --include-symbols --version-suffix 054 ^
-  && dotnet pack src\Aqua.Newtonsoft.Json\Aqua.Newtonsoft.Json.csproj --output "..\..\artifacts" --configuration Debug --include-symbols --version-suffix 054+  && dotnet pack src\Aqua\Aqua.csproj --output "..\..\artifacts" --configuration Debug --include-symbols --version-suffix 055 ^
+  && dotnet pack src\Aqua.Newtonsoft.Json\Aqua.Newtonsoft.Json.csproj --output "..\..\artifacts" --configuration Debug --include-symbols --version-suffix 055


automatic unzip

automatic unzip

--- package/win32/rebuild-package.bat
+++ package/win32/rebuild-package.bat
@@ -28,6 +28,10 @@
 IF "%CMAKE_BUILD_TYPE%" == "Release" cpack -G ZIP
 cd ..

+REM unzip to devel directory
+rmdir /S /Q "C:\RStudio-devel"
+7zip x RStudio-99.9.9.zip -o"C:\RStudio-devel"
+
 REM reset modified environment variables (PATH)
 endlocal


Update mare

Update mare

--- generate.bat
+++ generate.bat
@@ -1,5 +1,5 @@
 @echo off

-if not exist Build\mare\mare.exe call Ext\mare\build.bat --buildDir=Build/mare --outputDir=Build/mare --sourceDir=Ext/mare/src
+if not exist Build\mare\mare.exe call Ext\mare\compile.bat --buildDir=Build/mare --outputDir=Build/mare --sourceDir=Ext/mare/src
 if not "%1"=="" (Build\mare\mare.exe %*) else Build\mare\mare.exe --vcxproj=2013


sha1 + git tag

sha1 + git tag

--- push-release.bat
+++ push-release.bat
@@ -1,6 +1,9 @@
 rem if "%APPVEYOR_REPO_TAG%" NEQ "True" goto :ok

 set HERE=%~dp0
+
+git config --global user.email "%APPVEYOR_REPO_COMMIT_AUTHOR%"
+git config --global user.name "%APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL%"

 git tag -a %APPVEYOR_BUILD_VERSION% -m "Release vesion %APPVEYOR_BUILD_VERSION%" || goto :ko
 git push --tags https://%GITHUB_TOKEN%@github.com/pchalamet/full-build.git || goto :ko
@@ -10,7 +13,7 @@
                          --repo full-build ^
 						 --tag %APPVEYOR_BUILD_VERSION% ^
 						 --name "full-build %APPVEYOR_BUILD_VERSION%" ^
-                         --description "%APPVEYOR_PROJECT_NAME% %APPVEYOR_BUILD_VERSION% - %PLATFORM% %CONFIGURATION%" ^
+                         --description "%APPVEYOR_PROJECT_NAME% %APPVEYOR_BUILD_VERSION% (%APPVEYOR_REPO_COMMIT%)- %PLATFORM% %CONFIGURATION%" ^
                          --pre-release || goto :ko

 %HERE%tools\github-release upload ^


Modified UpdateDependencies.bat script to properly call the new db-update.bat script.

git-tfs-id: [https://tfs.codeplex.com/tfs/TFS11]$/openHistorian/Main;C41553

--- Build/Scripts/UpdateDependencies.bat
+++ Build/Scripts/UpdateDependencies.bat
@@ -83,7 +83,7 @@
 %replace% /r /v "%targetschema%\*db-update.bat" GSFSchema openHistorian
 SET cwd=%CD%
 CD %targetschema%\SQLite
-ECHO "N" | db-update.bat
+CALL db-update.bat
 CD "%cwd%"

 :: ECHO.


Added Grafana Panels into Rolldown

Added Grafana Panels into Rolldown

--- Build/Scripts/UpdateDependencies.bat
+++ Build/Scripts/UpdateDependencies.bat
@@ -47,6 +47,10 @@
 SET sourcetools=%source%\Tools
 SET targettools=%target%\Source\Applications\openHistorian\openHistorianSetup

+::Grafana Panels
+SET GrafanaSource=\\GPAWEB\NightlyBuilds\GrafanaPanels\Binaries
+SET GrafanaTarget=%target%\Source\Applications\openHistorian\openHistorian\Grafana\data\plugins
+
 ECHO.
 ECHO Entering working directory...
 IF EXIST "%target%" IF NOT EXIST "%target%"\.git RMDIR /S /Q "%target%"
@@ -88,6 +92,7 @@
 COPY /Y "%sourcetools%\NoInetFixUtil\NoInetFixUtil.exe" "%targettools%\NoInetFixUtil.exe"
 COPY /Y "%sourcetools%\DNP3ConfigGenerator\DNP3ConfigGenerator.exe" "%targettools%\DNP3ConfigGenerator.exe"
 COPY /Y "%sourcetools%\LogFileViewer\LogFileViewer.exe" "%targettools%\LogFileViewer.exe"
+XCOPY "%GrafanaSource%" "%GrafanaTarget%\" /Y /E /U

 :UpdateDbScripts
 ECHO.


Fixed UpdateDependencies.bat to reference proper STTP library location

--- Build/Scripts/UpdateDependencies.bat
+++ Build/Scripts/UpdateDependencies.bat
@@ -34,11 +34,11 @@
 SET defaulttarget=%LOCALAPPDATA%\Temp\SIEGate
 IF "%remote%" == "" SET remote=git@github.com:GridProtectionAlliance/SIEGate.git
 IF "%source%" == "" SET source=\\GPAWEB\NightlyBuilds\GridSolutionsFramework\Beta
-IF "%sttp%" == "" SET sttp=\\GPAWEB\NightlyBuilds\sttp.net\Beta
+IF "%sttp%" == "" SET sttp=\\GPAWEB\NightlyBuilds\sttp-gsfapi\Beta
 IF "%target%" == "" SET target=%defaulttarget%

 SET libraries=%source%\Libraries\*.*
-SET sttplibrary=%sttp%\lib\sttp.net.dll
+SET sttplibrary=%sttp%\lib\sttp.gsf.dll
 SET dependencies=%target%\Source\Dependencies\GSF
 SET sourcemasterbuild=%source%\Build Scripts\MasterBuild.buildproj
 SET targetmasterbuild=%target%\Build\Scripts


Restore ctest

Restore ctest

...even though it doesn't seem to do anything

--- recipes/fltk/bld.bat
+++ recipes/fltk/bld.bat
@@ -11,6 +11,10 @@
 nmake
 if errorlevel 1 exit 1

+:: Test.
+ctest
+if errorlevel 1 exit 1
+
 :: Install.
 nmake install
 if errorlevel 1 exit 1


fix location

fix location

--- recipes/ucrt/bld.bat
+++ recipes/ucrt/bld.bat
@@ -4,7 +4,7 @@
 if errorlevel 1 exit 1
 msiexec /a "%SRC_DIR%\Installers\Universal CRT Redistributable-x86_en-us.msi" /qb TARGETDIR="%SRC_DIR%\tmp"
 if errorlevel 1 exit 1
-xcopy "tmp\Program Files\Windows Kits\10\Redist\%PKG_VERSION%\ucrt\DLLs\x64\"* "%PREFIX%"
+xcopy "tmp\Windows Kits\10\Redist\%PKG_VERSION%\ucrt\DLLs\x64\"* "%PREFIX%"
 if errorlevel 1 exit 1
-xcopy "tmp\Program Files\Windows Kits\10\Redist\%PKG_VERSION%\ucrt\DLLs\x64\"* "%LIBRARY_BIN%"
+xcopy "tmp\Windows Kits\10\Redist\%PKG_VERSION%\ucrt\DLLs\x64\"* "%LIBRARY_BIN%"
 if errorlevel 1 exit 1


HIVE-3479 : Bug fix: Return the child JVM exit code to the parent process to handle the error conditions (Kanna Karanam via Ashutosh Chauhan)

git-svn-id: c2303eb81cb646bce052f55f7f0d14f181a5956c@1387835 13f79535-47bb-0310-9956-ffa450edef68

--- testutils/hadoop.cmd
+++ testutils/hadoop.cmd
@@ -173,7 +173,7 @@
     set CLASS=%hadoop-command%
   )
   call %JAVA% %JAVA_HEAP_MAX% %HADOOP_OPTS% -classpath %CLASSPATH% %CLASS% %hadoop-command-arguments%
-
+  exit /b %ERRORLEVEL%
   goto :eof

 :version


- nut.cmd, Windows nut is abandoned

- nut.cmd, Windows nut is abandoned

--- nut.cmd
+++ nut.cmd
@@ -1,12 +0,0 @@
-@REM ----------------------------------------------------------------------------
-@REM Nut start up script
-@REM ----------------------------------------------------------------------------
-@echo off
-set NUT_VERSION=1.2-SNAPSHOT
-set NUT_HOME=C:\ab\nut\Nut\src\resources
-set NUT_REPOSITORY=C:\.nut
-set NUT_ERROR=0
-rem java.exe -Xmx177M -classpath C:\ab\nut\Nut\target\Nut.jar ab.nut.Nut "-Dversion=%NUT_VERSION%" "-Dhome=%NUT_HOME%" "-Drepository=%NUT_REPOSITORY%" %*
-java.exe -Xmx177M -classpath C:\.nut\ab\nut\Nut\%NUT_VERSION%\Nut-%NUT_VERSION%.jar;C:\.nut\junit\junit\4.4\junit-4.4.jar;target/test-classes ab.nut.Nut "-Dversion=%NUT_VERSION%" "-Dhome=%NUT_HOME%" "-Drepository=%NUT_REPOSITORY%" %*
-if ERRORLEVEL 1 set NUT_ERROR=1
-exit /B %NUT_ERROR%


Fix pause bug

Fix pause bug

--- runtransform.bat
+++ runtransform.bat
@@ -17,8 +17,8 @@
 )
 if %nogui%==1 (
     call python.exe "%~DP0runtransform.py" %*
+    pause
 ) else (
     start "Crawler" /b pythonw.exe "%~DP0runtransform.py" %*
 )
 endlocal
-pause


senv.bat: force touch and checkout on filtered files

--- senv.bat
+++ senv.bat
@@ -70,6 +70,13 @@
 	sed -i -e "s;#no_proxy#;%NO_PROXY%;g" dfsmudge.sh
 )
 sed -i -e "s;_unixpath_;%unixpath%;g" dfsmudge.sh
+
+setlocal enabledelayedexpansion
+touch profile
+git checkout HEAD -- profile
+for /F "usebackq" %%i in (`dir Dockerfile* /b/s`) do touch %%i
+for /F "usebackq" %%i in (`dir Dockerfile* /b/s`) do git checkout HEAD -- %%i
+endlocal

 doskey h=doskey /history
 doskey gl=git lg -20


Do not exit with 1 if stop.bat fails to find conveyord.log

--- stop.bat
+++ stop.bat
@@ -26,7 +26,7 @@
 :MOVELOG

 REM move conveyord.log to DATE_conveyord.log
-IF NOT EXIST conveyord.log GOTO FAILED
+IF NOT EXIST conveyord.log GOTO FAILEDLOG
 MOVE /Y conveyord.log %DATETIMEPREFIX%conveyord.log

@@ -36,7 +36,8 @@

 EXIT /B 0

-:FAILED
+:FAILEDLOG
+ECHO No such file or directory: conveyord.log

-EXIT /B 1
+EXIT /B 0


Testing batch file

Testing batch file

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

--- test.bat
+++ test.bat
@@ -0,0 +1,2 @@
+"C:\python33\python.exe" %1
+PAUSE


remove new line

remove new line

--- test.bat
+++ test.bat
@@ -5,5 +5,4 @@
 	-parallel all ^
 	-html Result.html ^
 	-nologo
-
 pause


Reverting 6df4a7e since it apprently just makes there be no test results

--- test.bat
+++ test.bat
@@ -7,7 +7,7 @@
 set target=%bin%\win7-x64\dotnet-test-mstest.exe
 set libs=%bin%\%project%.dll

-tools\OpenCover\OpenCover.Console.exe -returntargetcode -register:path64 -filter:"+[Utilitron]* -[Utilitron]System.*" -target:"%target%" -targetargs:"%libs%" -output:coverage.xml
+tools\OpenCover\OpenCover.Console.exe -returntargetcode -register:user -filter:"+[Utilitron]* -[Utilitron]System.*" -target:"%target%" -targetargs:"%libs%" -output:coverage.xml
 if %errorlevel% neq 0 exit /b %errorlevel%

 tools\coveralls.io\coveralls.net.exe --opencover coverage.xml


Fix to issue #94

Fix to issue #94

--- Install/WebAdaptorIIS/CreateCertificate.bat
+++ Install/WebAdaptorIIS/CreateCertificate.bat
@@ -18,6 +18,13 @@
 echo 3. From the "Actions" panel, click "Create Domain Certificate".
 echo.
 echo 4. On the "Distinguished Name Properties" dialog enter...
+echo.
+echo    *********************        NOTE        *********************
+echo    - Enter the property values as they apply to your organization.
+echo    - The "Common name" is composed of the host name and the domain
+echo      name of your website, i.e the address you will be using to
+echo      access your website.
+echo    **************************************************************
 echo.
 echo      Common name^:        %ops_FQDN%
 echo      Organization^:       Esri, Inc.


need 32 it tcl

need 32 it tcl

--- regression/win32.bat
+++ regression/win32.bat
@@ -1,4 +1,4 @@
-set TCLSH=c:\Tcl\bin\tclsh.exe
+set TCLSH=c:\Tcl32\bin\tclsh.exe
 set ZIP="c:\Program Files\7-Zip\7z.exe"

 %TCLSH% cget.tcl http://download.zeromq.org/zeromq-2.1.11.zip zeromq-2.1.11.zip


Added updating submodule

Added updating submodule

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

--- UpdateSubmodule.cmd
+++ UpdateSubmodule.cmd
@@ -0,0 +1,2 @@
+cd ImageProcessor
+git submodule update --remote --merge


Updating init-tools.cmd to pass through PACKAGES_DIR

--- init-tools.cmd
+++ init-tools.cmd
@@ -2,20 +2,20 @@
 setlocal

 set INIT_TOOLS_LOG=%~dp0init-tools.log
-if [%PACKAGES_DIR%]==[] set PACKAGES_DIR=%~dp0packages\
+if [%PACKAGES_DIR%]==[] set PACKAGES_DIR=%~dp0packages
 if [%TOOLRUNTIME_DIR%]==[] set TOOLRUNTIME_DIR=%~dp0Tools
 set DOTNET_PATH=%TOOLRUNTIME_DIR%\dotnetcli\
 if [%DOTNET_CMD%]==[] set DOTNET_CMD=%DOTNET_PATH%dotnet.exe
 if [%BUILDTOOLS_SOURCE%]==[] set BUILDTOOLS_SOURCE=https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json
 set /P BUILDTOOLS_VERSION=< "%~dp0BuildToolsVersion.txt"
-set BUILD_TOOLS_PATH=%PACKAGES_DIR%Microsoft.DotNet.BuildTools\%BUILDTOOLS_VERSION%\lib\
+set BUILD_TOOLS_PATH=%PACKAGES_DIR%\Microsoft.DotNet.BuildTools\%BUILDTOOLS_VERSION%\lib
 set INIT_TOOLS_RESTORE_PROJECT=%~dp0init-tools.msbuild
 set BUILD_TOOLS_SEMAPHORE=%TOOLRUNTIME_DIR%\%BUILDTOOLS_VERSION%\init-tools.completed

 :: if force option is specified then clean the tool runtime and build tools package directory to force it to get recreated
 if [%1]==[force] (
   if exist "%TOOLRUNTIME_DIR%" rmdir /S /Q "%TOOLRUNTIME_DIR%"
-  if exist "%PACKAGES_DIR%Microsoft.DotNet.BuildTools" rmdir /S /Q "%PACKAGES_DIR%Microsoft.DotNet.BuildTools"
+  if exist "%PACKAGES_DIR%\Microsoft.DotNet.BuildTools" rmdir /S /Q "%PACKAGES_DIR%\Microsoft.DotNet.BuildTools"
 )

 :: If sempahore exists do nothing
@@ -61,9 +61,9 @@

 if exist "%BUILD_TOOLS_PATH%" goto :afterbuildtoolsrestore
 echo Restoring BuildTools version %BUILDTOOLS_VERSION%...
-echo Running: "%DOTNET_CMD%" restore "%INIT_TOOLS_RESTORE_PROJECT%" --no-cache --packages %PACKAGES_DIR% --source "%BUILDTOOLS_SOURCE%" /p:BuildToolsPackageVersion=%BUILDTOOLS_VERSION% >> "%INIT_TOOLS_LOG%"
-call "%DOTNET_CMD%" restore "%INIT_TOOLS_RESTORE_PROJECT%" --no-cache --packages %PACKAGES_DIR% --source "%BUILDTOOLS_SOURCE%" /p:BuildToolsPackageVersion=%BUILDTOOLS_VERSION% >> "%INIT_TOOLS_LOG%"
-if NOT exist "%BUILD_TOOLS_PATH%init-tools.cmd" (
+echo Running: "%DOTNET_CMD%" restore "%INIT_TOOLS_RESTORE_PROJECT%" --no-cache --packages "%PACKAGES_DIR%" --source "%BUILDTOOLS_SOURCE%" /p:BuildToolsPackageVersion=%BUILDTOOLS_VERSION% >> "%INIT_TOOLS_LOG%"
+call "%DOTNET_CMD%" restore "%INIT_TOOLS_RESTORE_PROJECT%" --no-cache --packages "%PACKAGES_DIR%" --source "%BUILDTOOLS_SOURCE%" /p:BuildToolsPackageVersion=%BUILDTOOLS_VERSION% >> "%INIT_TOOLS_LOG%"
+if NOT exist "%BUILD_TOOLS_PATH%\init-tools.cmd" (
   echo ERROR: Could not restore build tools correctly. See '%INIT_TOOLS_LOG%' for more details. 1>&2
   exit /b 1
 )
@@ -71,8 +71,8 @@
 :afterbuildtoolsrestore

 echo Initializing BuildTools...
-echo Running: "%BUILD_TOOLS_PATH%init-tools.cmd" "%~dp0" "%DOTNET_CMD%" "%TOOLRUNTIME_DIR%" >> "%INIT_TOOLS_LOG%"
-call "%BUILD_TOOLS_PATH%init-tools.cmd" "%~dp0" "%DOTNET_CMD%" "%TOOLRUNTIME_DIR%" >> "%INIT_TOOLS_LOG%"
+echo Running: "%BUILD_TOOLS_PATH%\init-tools.cmd" "%~dp0" "%DOTNET_CMD%" "%TOOLRUNTIME_DIR%" >> "%INIT_TOOLS_LOG%"
+call "%BUILD_TOOLS_PATH%\init-tools.cmd" "%~dp0" "%DOTNET_CMD%" "%TOOLRUNTIME_DIR%" "%PACKAGES_DIR%" >> "%INIT_TOOLS_LOG%"
 set INIT_TOOLS_ERRORLEVEL=%ERRORLEVEL%
 if not [%INIT_TOOLS_ERRORLEVEL%]==[0] (
   echo ERROR: An error occured when trying to initialize the tools. Please check '%INIT_TOOLS_LOG%' for more details. 1>&2


* Fixed a bug where it was only possible to pass one parameter to phd.bat * Fixed a bug where it wasn't possible to use paths with spaces in