Add script for refreshing server certificates

This was another magic script that lived somewhere in a file share, so rewriting and
committing this for the ages so we have the ability to easily find and use this script

error: pathspec 'src/System.Private.ServiceModel/tools/scripts/RefreshServerCertificates.cmd' did not match any file(s) known to git

--- src/System.Private.ServiceModel/tools/scripts/RefreshServerCertificates.cmd
+++ src/System.Private.ServiceModel/tools/scripts/RefreshServerCertificates.cmd
@@ -0,0 +1,80 @@
+@ECHO off
+:: This script closes the self-hosted WCF service, refreshes the certificates, then restarts the service
+::
+:: This script should be set as a scheduled task to run
+:: - Every 80 days
+::
+:: Note that for first run, recommend:
+:: 1. Run %_GITREPO%\src\System.Private.ServiceModel\tools\scripts\StartWCFSelfHostedSvc.cmd
+:: 2. Close the self hosted service non gracefully (so that the certificates are saved)
+:: 3. Run this script
+::
+:: This file is not designed to live inside a repo, hence why the deep file paths into the repo
+:: By convention, we place this file into C:\wcftest
+::
+
+setlocal
+
+SET _GITREPO=C:\git\wcf
+SET _SCRIPTSDIR=%_GITREPO%\src\System.Private.ServiceModel\tools\scripts
+SET _LOGFILE=%~dp0\RefreshServerCertificates_ScriptLog.txt
+SET _RESTARTSCRIPT=%~dp0\ScheduledRestartWcfSelfHostedService.cmd
+
+echo [%~n0] %DATE% %TIME% Running script to regenerate certificates... >> %_LOGFILE%
+
+if not exist %_RESTARTSCRIPT% (
+    echo [%~n0] Cannot find ScheduledRestartWcfSelfHostedService.cmd in %~dp0           >> %_LOGFILE%
+    echo        We require that script to start the WCF Self Hosted Service after       >> %_LOGFILE%
+    echo        certificates are regenerated                                            >> %_LOGFILE%
+
+    set _EXITCODE=1
+    goto end
+)
+
+:: Kill WCF self-hosted service
+TASKKILL /F /IM SelfHostedWCFService.exe                                                >> %_LOGFILE%
+
+:: Regenerate certificates
+echo call %_SCRIPTSDIR%\BuildCertUtil.cmd                                               >> %_LOGFILE%
+call %_SCRIPTSDIR%\BuildCertUtil.cmd                                                    >> %_LOGFILE%
+
+echo [%~n0] cmd /c %_GITREPO%\bin\Wcf\tools\CertificateGenerator\CertificateGenerator.exe       >> %_LOGFILE%
+cmd /c %_GITREPO%\bin\Wcf\tools\CertificateGenerator\CertificateGenerator.exe                   >> %_LOGFILE%
+
+:: Configure HTTPS ports to use new certificate
+echo [%~n0] powershell -NoProfile -ExecutionPolicy unrestricted %_SCRIPTSDIR%\ConfigHttpsPort.ps1   >> %_LOGFILE%
+powershell -NoProfile -ExecutionPolicy unrestricted %_SCRIPTSDIR%\ConfigHttpsPort.ps1               >> %_LOGFILE% 2>&1
+
+if NOT "%ERRORLEVEL%"=="0" (
+    echo Warning: An error occurred while configuring the https port.                               >> %_LOGFILE%
+    set _EXITCODE=1
+    goto end
+)
+
+echo [%~n0] cmd /c iisreset >> %_LOGFILE%
+cmd /c iisreset             >> %_LOGFILE% 2>&1
+
+if NOT "%ERRORLEVEL%"=="0" (
+    echo Warning: An error occurred while running iisreset.                               >> %_LOGFILE%
+    set _EXITCODE=1
+    goto end
+)
+
+:: Start self-hosted service
+echo [%~n0] %DATE% %TIME% Calling  %_RESTARTSCRIPT%...  >> %_LOGFILE%
+call %_RESTARTSCRIPT%
+
+if NOT "%ERRORLEVEL%"=="0" (
+    echo Warning: An error occurred while restarting the sevice                           >> %_LOGFILE%
+    set _EXITCODE=1
+    goto end
+)
+
+:end
+
+echo [%~n0] %DATE% %TIME% Ending script for regenerating certificates...  >> %_LOGFILE%
+echo. >> %_LOGFILE%
+echo. >> %_LOGFILE%
+
+exit /b %_EXITCODE%
+endlocal


Let -preCIxxxx get ahead of -pre1b in the queue

I think it will work with the following scheme:

* Official releases have no `-pre`
* Prereleases get `-pre{number}
* CI aka nightly builds get `-pre{number}CI{nnn}` where {number} is the previous pre number

Let's try it and see if I guessed right with NuGets "which is the newest" algorithm

--- NuGet/pack.bat
+++ NuGet/pack.bat
@@ -1,4 +1,4 @@
-set version=31.0.0-CI-%APPVEYOR_BUILD_NUMBER%
+set version=31.0.0-pre1CI%APPVEYOR_BUILD_NUMBER%
 REM set platform=x86

 if "%platform%"=="x64" (


#221: The detected java version is now checked to be a two digit number.

--- perfcake/src/main/scripts/perfcake.bat
+++ perfcake/src/main/scripts/perfcake.bat
@@ -130,9 +130,19 @@
 @REM Check Java version
 for /f tokens^=2-4^ delims^=.-_^" %%j in ('"%PERFCAKE_JAVA_EXE%" -version 2^>^&1') do (
   set jver=%%j%%k
-  goto :breakVer
+  goto breakVer
 )
 :breakVer
+
+echo x%jver%x | findstr /r /c:"x[1-9][0-9]x">nul
+if %errorlevel% equ 0 (
+  goto versionValid
+) else (
+  echo WARNING: Unable to detect Java version.
+  goto runPERFCAKE
+)
+
+:versionValid
 if not %jver% LSS 18 goto runPERFCAKE
 echo Unsupported Java version. PerfCake requires Java 8 and higher.
 goto error


fixed

fixed

--- BuildScript/BuildNF.CMake.Debug.bat
+++ BuildScript/BuildNF.CMake.Debug.bat
@@ -1,5 +1,5 @@
 cd ..
 cd cmake
-cmake .. -G "Visual Studio 14 2015 Win64" -DBUILD_TOOLS_ONLY=OFF
+cmake .. -G "Visual Studio 14 2015 Win64" -DBUILD_TOOLS_ONLY=OFF -DCMAKE_BUILD_TYPE=Debug
 cd ..
 cd BuildScript


Add an installer for the msysgit environment

This installer:
- detects the Git installation path
- checks prereqs (git, getopt.exe)
- delete old gitflow install
- install gitflow files

"Access denied" errors are detected and the user is given advice in that case (
use full administrator rights).

error: pathspec 'contrib/msysgit-install.cmd' did not match any file(s) known to git

--- contrib/msysgit-install.cmd
+++ contrib/msysgit-install.cmd
@@ -0,0 +1,76 @@
+@echo off
+setlocal
+if not "%~1"=="" set GIT_HOME=%~f1
+if "%GIT_HOME%"=="" call :FindGitHome "git.cmd"
+
+if exist "%GIT_HOME%" goto :GitHomeOK
+
+echo MsysGit installation directory not found.>&2
+echo Try to give the directory name on the command line:>&2
+echo   %0 "%ProgramFiles%\Git"
+endlocal
+exit /B 1
+
+:GitHomeOK
+set ERR=0
+
+echo Installing gitflow into "%GIT_HOME%"...
+
+call :ChkGetopt getopt.exe || set ERR=1
+if %ERR%==1 goto :End
+echo getopt.exe... Found
+
+if not exist "%GIT_HOME%\bin\git-flow" goto :Install
+echo GitFlow is already installed.>&2
+choice /C YN /M "Do you want to replace it"
+if errorlevel 255 goto :Abort
+if errorlevel 2 goto :Abort
+if not errorlevel 1 goto :Abort
+
+echo Deleting old files...
+for /F %%i in ("%GIT_HOME%\git-flow*" "%GIT_HOME%\gitflow-*") do if exist "%%~fi" del /F /Q "%%~fi"
+
+:Install
+echo Copying files...
+::goto :EOF
+xcopy "%~dp0\..\git-flow"            "%GIT_HOME%\bin"                 /Y /R /F
+if errorlevel 4 if not errorlevel 5 goto :AccessDenied
+if errorlevel 1 set ERR=1
+xcopy "%~dp0\..\git-flow*"           "%GIT_HOME%\bin"                 /Y /R /F || set ERR=1
+xcopy "%~dp0\..\gitflow-*"           "%GIT_HOME%\bin"                 /Y /R /F || set ERR=1
+xcopy "%~dp0\..\shFlags\src\shflags" "%GIT_HOME%\bin\gitflow-shFlags" /Y /R /F || set ERR=1
+
+if %ERR%==1 choice /T 30 /C Y /D Y /M "Some unexpected errors happened. Sorry, you'll have to fix them by yourself."
+
+:End
+endlocal & exit /B %ERR%
+goto :EOF
+
+:AccessDenied
+set ERR=1
+echo.
+echo You should run this script with "Full Administrator" rights:>&2
+echo - Right-click with Shift on the script from the Explorer>&2
+echo - Select "Run as administrator">&2
+choice /T 30 /C YN /D Y /N >nul
+goto :End
+
+:Abort
+echo Installation canceled.>&2
+set ERR=1
+goto :End
+
+:ChkGetopt
+:: %1 is getopt.exe
+if exist "%GIT_HOME%\bin\%1" goto :EOF
+if exist "%~f$PATH:1" goto :EOF
+echo %GIT_HOME%\bin\%1 not found.>&2
+echo You have to install this file manually. See the GitFlow README.
+exit /B 1
+
+:FindGitHome
+setlocal
+set GIT_CMD_DIR=%~dp$PATH:1
+if "%GIT_CMD_DIR%"=="" endlocal & goto :EOF
+endlocal & set GIT_HOME=%GIT_CMD_DIR:~0,-5%
+goto :EOF


added logging

added logging

--- MakefileAll.bat
+++ MakefileAll.bat
@@ -1,9 +1,15 @@
+@echo off
+
 set msbuild="C:\Program Files (x86)\MSBuild\14.0\bin\msbuild.exe"
 set config=Windows Release
 set platform=AnyCPU
 set buildargs=/nologo /p:Configuration="%config%" /p:Platform="%platform%" /consoleloggerparameters:ErrorsOnly /verbosity:detailed /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"

+echo Restoring NuGets...
+
 nuget restore
+
+echo Building FFImageLoading...

 %msbuild% source/FFImageLoading.Common/FFImageLoading.csproj %buildargs%
 %msbuild% source/FFImageLoading.BaitAndSwitch/FFImageLoading.BaitAndSwitch.csproj %buildargs%
@@ -12,11 +18,15 @@
 %msbuild% source/FFImageLoading.Touch/FFImageLoading.Touch.csproj %buildargs%
 %msbuild% source/FFImageLoading.Droid/FFImageLoading.Droid.csproj %buildargs%

+echo Building FFImageLoading.Transformations...
+
 %msbuild% source/FFImageLoading.Transformations/FFImageLoading.Transformations.csproj %buildargs%
 %msbuild% source/FFImageLoading.Transformations.Windows/FFImageLoading.Transformations.Windows.csproj %buildargs%
 %msbuild% source/FFImageLoading.Transformations.WinSL/FFImageLoading.Transformations.WinSL.csproj %buildargs%
 %msbuild% source/FFImageLoading.Transformations.Touch/FFImageLoading.Transformations.Touch.csproj %buildargs%
 %msbuild% source/FFImageLoading.Transformations.Droid/FFImageLoading.Transformations.Droid.csproj %buildargs%
+
+echo Building FFImageLoading.Forms...

 %msbuild% source/FFImageLoading.Forms.WinRT/FFImageLoading.Forms.WinRT.csproj %buildargs%
 %msbuild% source/FFImageLoading.Forms.WinUWP/FFImageLoading.Forms.WinUWP.csproj %buildargs%
@@ -24,6 +34,10 @@
 %msbuild% source/FFImageLoading.Forms.Touch/FFImageLoading.Forms.Touch.csproj %buildargs%
 %msbuild% source/FFImageLoading.Forms.Droid/FFImageLoading.Forms.Droid.csproj %buildargs%

+echo Packaging NuGets...
+
 nuget pack source/Xamarin.FFImageLoading.nuspec
 nuget pack source/Xamarin.FFImageLoading.Transformations.nuspec
 nuget pack source/Xamarin.FFImageLoading.Forms.nuspec
+
+echo All done.


daily

daily

--- Tools/ldzz.bat
+++ Tools/ldzz.bat
@@ -1 +1,2 @@
-FOR /L %%C IN (0, 1, 999) DO @C:\Factory\Tools\ld2.exe /c %%C
+@rem FOR /L %%C IN (0, 1, 999) DO @C:\Factory\Tools\ld2.exe /c %%C
+C:\Factory\Tools\ld2.exe /cz


*** empty log message ***

*** empty log message ***

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

--- Make_a_local_copy.bat
+++ Make_a_local_copy.bat
@@ -0,0 +1,40 @@
+rem dieser Batch kopier die Daten von d: auf c: und richtet sie so her, dass anschlieend
+rem das hv_help.prg gestartet werden kann und daran anschlieend das jHelpBuilder
+
+rem die .# Dateien sollten vorher aus dem Source entfernt werden
+
+rem die Pfad sind fix festgelegt
+
+echo "kopieren des Source"
+d:
+cd \CVS_HV\heliumhelp\jsp\
+c:
+cd \jbproject\heliumhelp\jsp\
+xcopy d:*.* /v/s/y
+pause
+
+echo "Entfernen aller nicht bentigten Dateien und Ordner"
+c:
+cd \jbproject\heliumhelp\jsp\
+del _vti_cnf\ /s
+del _vti_pvt\ /s
+del CVS\ /s
+del .cvsignore /s
+del Thumbs.db /s
+del *.bak /s
+del *.old /s
+del *.cdr /s
+del backup_of*.cdr /s
+del Sicherungskopie_von_*.cdr /s
+del *.dia /s
+
+pause
+
+echo "Map ergnzen"
+c:
+cd \jbproject\heliumhelp\jsp\heliumhelp\
+del map.bak
+hv_help map.jhm
+
+pause
+


Create copy_new_to_new.bat

Create copy_new_to_new.bat

error: pathspec 'Azure.Migration/copy_new_to_new.bat' did not match any file(s) known to git

--- Azure.Migration/copy_new_to_new.bat
+++ Azure.Migration/copy_new_to_new.bat
@@ -0,0 +1,2 @@
+REM 1) copy data from one production node to another
+robocopy F:\data_from_production \\tsclient\F\data_from_production /mir


backup-to-cloud-dev.cmd Блок копирования логов. Удален аргумент команды (вызывал вставку лишних символов).

--- backup-to-cloud-dev.cmd
+++ backup-to-cloud-dev.cmd
@@ -162,7 +162,7 @@
 ::
 ::  /a /y
 ::
-copy /a /y %LogFile% %Backup%
+copy /y %LogFile% %Backup%

 rem
 rem


Win build file changed

Win build file changed

--- build_settings/win/build.bat
+++ build_settings/win/build.bat
@@ -1,6 +1,5 @@
-@echo off
-set WINPYDIR=C:\Users\swp\Python\WinPython-32bit-2.7.10.3-PythonVideoAnnotator\python-2.7.10
-set WINPYVER=2.7.10.3
+set WINPYDIR=C:\Users\swp\Python\WinPython-32bit-2.7.10\python-2.7.10
+set WINPYVER=2.7.10
 set HOME=%WINPYDIR%\..\settings
 set WINPYARCH="WIN32"

@@ -27,4 +26,4 @@

 python setup.py sdist

-pyinstaller --additional-hooks-dir %BUILDSETTINGSDIR%\hooks --name %PROJECTNAME% --icon %BUILDSETTINGSDIR%\mouse.ico --onefile %MAINSCRIPT%+pyinstaller --additional-hooks-dir %BUILDSETTINGSDIR%\hooks --name %PROJECTNAME% --icon %BUILDSETTINGSDIR%\mouse.ico %MAINSCRIPT%


Create install.bat

Create install.bat

error: pathspec 'ExampleScripts/agario-bots2/install.bat' did not match any file(s) known to git

--- ExampleScripts/agario-bots2/install.bat
+++ ExampleScripts/agario-bots2/install.bat
@@ -0,0 +1 @@
+npm i


Sharepoint Enterprise Integrated

Sharepoint Enterprise Integrated

--- WebsitePanel/Sources/generate_es_proxies.bat
+++ WebsitePanel/Sources/generate_es_proxies.bat
@@ -47,6 +47,9 @@
 REM %WSDL% %SERVER_URL%/esHostedSharePointServers.asmx /out:.\WebsitePanel.EnterpriseServer.Client\HostedSharePointServersProxy.cs /namespace:WebsitePanel.EnterpriseServer /type:webClient
 REM %WSE_CLEAN% .\WebsitePanel.EnterpriseServer.Client\HostedSharePointServersProxy.cs

+REM %WSDL% %SERVER_URL%/esHostedSharePointServersEnt.asmx /out:.\WebsitePanel.EnterpriseServer.Client\HostedSharePointServersEntProxy.cs /namespace:WebsitePanel.EnterpriseServer /type:webClient
+REM %WSE_CLEAN% .\WebsitePanel.EnterpriseServer.Client\HostedSharePointServersEntProxy.cs
+
 REM %WSDL% %SERVER_URL%/esImport.asmx /out:.\WebsitePanel.EnterpriseServer.Client\ImportProxy.cs /namespace:WebsitePanel.EnterpriseServer /type:webClient
 REM %WSE_CLEAN% .\WebsitePanel.EnterpriseServer.Client\ImportProxy.cs

@@ -56,8 +59,8 @@
 REM %WSDL% %SERVER_URL%/esOperatingSystems.asmx /out:.\WebsitePanel.EnterpriseServer.Client\OperatingSystemsProxy.cs /namespace:WebsitePanel.EnterpriseServer /type:webClient
 REM %WSE_CLEAN% .\WebsitePanel.EnterpriseServer.Client\OperatingSystemsProxy.cs

-%WSDL% %SERVER_URL%/esOrganizations.asmx /out:.\WebsitePanel.EnterpriseServer.Client\OrganizationProxy.cs /namespace:WebsitePanel.EnterpriseServer.HostedSolution /type:webClient
-%WSE_CLEAN% .\WebsitePanel.EnterpriseServer.Client\OrganizationProxy.cs
+REM %WSDL% %SERVER_URL%/esOrganizations.asmx /out:.\WebsitePanel.EnterpriseServer.Client\OrganizationProxy.cs /namespace:WebsitePanel.EnterpriseServer.HostedSolution /type:webClient
+REB %WSE_CLEAN% .\WebsitePanel.EnterpriseServer.Client\OrganizationProxy.cs

 REM %WSDL% %SERVER_URL%/esPackages.asmx /out:.\WebsitePanel.EnterpriseServer.Client\PackagesProxy.cs /namespace:WebsitePanel.EnterpriseServer /type:webClient
 REM %WSE_CLEAN% .\WebsitePanel.EnterpriseServer.Client\PackagesProxy.cs


不要なDLLを削除するように修正。

不要なDLLを削除するように修正。

--- _pack.bat
+++ _pack.bat
@@ -41,6 +41,11 @@
 xcopy /Y "%SRC_DOC_FILE%" "%DEST_BASE_DIR%"
 if errorlevel 1 goto ON_ERROR

+REM ---- remove unused files
+
+del /S /Q "%DEST_SYSTEM_DIR%"\Xceed.Wpf.AvalonDock.* >nul 2>&1
+del /S /Q "%DEST_SYSTEM_DIR%"\Xceed.Wpf.DataGrid.dll >nul 2>&1
+
 exit /b 0

 :ON_ERROR


postdeployment.bat added to simply run it at windows os

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

--- runpostdeploy.bat
+++ runpostdeploy.bat
@@ -0,0 +1,11 @@
+@echo off
+
+@setlocal
+
+set BIN_PATH=%~dp0
+
+if "%PHP_COMMAND%" == "" set PHP_COMMAND=php.exe
+
+%PHP_COMMAND% "%BIN_PATH%common\lib\postdeploy.php" %*
+
+@endlocal


Removed _tkinter.lib

Removed _tkinter.lib

--- pkg/windows/BuildSalt.bat
+++ pkg/windows/BuildSalt.bat
@@ -1,6 +1,7 @@
 @ echo off
 @ echo Salt Windows Build Script
 @ echo.
+
 :: Define Variables
 @ echo Defining Variables...
 @ echo ---------------------
@@ -49,6 +50,9 @@
 If Exist "%BinDir%\DLLs\tclpip85.dll" del /S /Q "%BinDir%\DLLs\tclpip85.dll"
 If Exist "%BinDir%\DLLs\tk85.dll"     del /S /Q "%BinDir%\DLLs\tk85.dll"

+:: Delete Unused .lib files
+If Exist "%BinDir%\libs\_tkinter.lib" del /S /Q "%BinDir%\libs\_tkinter.lib"
+
 :: Delete .txt files
 If Exist "%BinDir%\NEWS.txt"   del /q "%BinDir%\NEWS.txt"
 If Exist "%BinDir%\README.txt" del /q "%BinDir%\README.txt"


init add

init add

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

--- infrastructure/workspace/workspace-setup.bat
+++ infrastructure/workspace/workspace-setup.bat
@@ -0,0 +1,27 @@
+# change me
+@powershell -NoProfile -ExecutionPolicy Bypass -Command "iex ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1'))" && SET PATH=%PATH%;%ALLUSERSPROFILE%\chocolatey\bin
+
+choco install -y git
+
+choco install -y VisualStudio2015Community
+
+choco install -y atom
+
+choco install -y sublimetext2
+choco install -y SublimeText2.PowershellAlias
+choco install -y SublimeText2.PackageControl
+
+choco install -y putty
+
+choco install -y jdk7
+
+choco install -y awscli
+
+choco install -y vagrant
+
+choco install -y virtualbox
+
+#choco install -y consolez
+choco install -y console2
+
+choco install -y chefdk


add devsetup

add devsetup

A batch script auto config development environment for windows,
includes:
QT, python,perl, VC, mingw, nasm, tcc, pdftkm, imagemagick, potrace etc.

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

--- batch/windevsetup.bat
+++ batch/windevsetup.bat
@@ -0,0 +1,90 @@
+@echo off
+rem golobal path define
+set IDEV_HOME=c:\devtools
+
+rem param parse and configuration
+rem default arch is amd64
+set ARCH=amd64
+set PY_VER=3.4.2
+if /i "%1" == "x86"       set ARCH=x86
+if /i "%2" == "2.7.8"     set PY_VER=%2
+
+rem qt related configuration
+rem set QT_ARCH=_64
+rem if /i %ARCH% == x86     set QT_ARCH=
+rem set QT_VER=5.3.2
+rem set QT_MAJOR_VER=5.3
+rem set QT_HOME=%IDEV_HOME%\Qt\%ARCH%\Qt%QT_VER%\%QT_MAJOR_VER%\msvc2013%QT_ARCH%
+rem set PATH=%QT_HOME%\bin;%PATH%
+rem set INCLUDE=%QT_HOME%\include;%QT_HOME%\include\QtPrintSupport;%INCLUDE%
+rem set LIB=%QT_HOME%\lib;%LIB%
+rem set LIBPATH=%QT_HOME%\lib;%LIBPATH%
+
+rem add python to path
+set PYTHON_HOME=%IDEV_HOME%\Python\%ARCH%\%PY_VER%
+set PATH=%PYTHON_HOME%;%PATH%
+set INCLUDE=%PYTHON_HOME%\include;%INCLUDE%
+set LIB=%PYTHON_HOME%\libs;%LIB%
+set LIBPATH=%PYTHON_HOME%\libs;%LIBPATH%
+set PYTHONHOME=%PYTHON_HOME%\Lib;
+set PYTHONPATH=%PYTHONHOME%
+
+rem add 3rdparty to path
+set TRDPTY_HOME=%IDEV_HOME%\3rdparty
+set PATH=%TRDPTY_HOME%\%ARCH%\bin;%PATH%
+set INCLUDE=%TRDPTY_HOME%\%ARCH%\include;%INCLUDE%
+set LIB=%TRDPTY_HOME%\%ARCH%\lib;%LIB%
+set LIBPATH=%TRDPTY_HOME%\%ARCH%\lib;%LIBPATH%
+
+rem perl configuration, ripped from portbalperl.bat
+set PERL_HOME=%IDEV_HOME%\perl\%ARCH%
+set PATH=%PERL_HOME%\perl\site\bin;%PERL_HOME%\perl\bin;%PATH%
+rem perl env variables
+set TERM=
+set HOME=%PERL_HOME%\data
+set PLPLOT_LIB=%PERL_HOME%\c\share\plplot
+set PLPLOT_DRV_DIR=%PERL_HOME%\c\share\plplot
+rem avoid collisions with other perl stuff on your system
+set PERL_JSON_BACKEND=
+set PERL_YAML_BACKEND=
+set PERL5LIB=
+set PERL5OPT=
+set PERL_MM_OPT=
+set PERL_MB_OPT=
+perl -MConfig -MPDL -e "printf("""Perl executable: %%s\nPerl version   : %%vd / $Config{archname}\nPDL version    : %%s\n""", $^X, $^V, $PDL::VERSION)" 2>nul
+if ERRORLEVEL==1 echo.&echo FATAL ERROR: 'perl' does not work; check if your strawberry pack is complete!
+
+rem mingw configuration
+set MINGW_HOME=%IDEV_HOME%\MinGW\%ARCH%
+set PATH=%MINGW_HOME%\bin;%PATH%
+
+rem add hg to $PATH
+set HG_HOME=%IDEV_HOME%\mercurial
+set PATH=%HG_HOME%;%PATH%
+
+rem add svn to $PATH
+set SVN_HOME=%IDEV_HOME%\TortoiseSVN
+set PATH=%SVN_HOME%\bin;%PATH%
+
+rem add nasm to path
+set NASM_HOME=%IDEV_HOME%\nasm
+set NASM_VER=2.11.05
+set PATH=%NASM_HOME%\%NASM_VER%;%NASM_HOME%\%NASM_VER%\rdoff;%PATH%
+
+rem add tcc to path
+set TCC_HOME=%IDEV_HOME%\tcc
+set PATH=%TCC_HOME%\%ARCH%;%PATH%
+
+rem add pdftk to path
+set PDFTK_HOME=%IDEV_HOME%\PDFtk
+set PATH=%PDFTK_HOME%\bin;%PATH%
+
+
+rem add ImageMagick to path
+set IMG_MAGIK_VER=6.8.9-Q16
+set IMG_MAGIK_HOME=%IDEV_HOME%\ImageMagick\%IMG_MAGIK_VER%
+set PATH=%IMG_MAGIK_HOME%;%PATH%
+
+rem add potrace to ptath
+set PATH=%IDEV_HOME%\potrace;%PATH%
+set PATH=%IDEV_HOME%\autotrace;%PATH%


Update sgw_windows_build.bat

Update sgw_windows_build.bat

--- build/windows/sgw_windows_build.bat
+++ build/windows/sgw_windows_build.bat
@@ -84,7 +84,7 @@
 :: Changes needed to support concurrent builds later
 set TARGET_DIR=%WORKSPACE%
 set BIN_DIR=%TARGET_DIR%\godeps\bin
-set LIC_DIR=%TARGET_DIR%\product-texts\mobile\license\sync_gateway
+set LIC_DIR=%TARGET_DIR%\product-texts\mobile\sync_gateway\license

 if NOT EXIST %TARGET_DIR% (
     echo FATAL: Missing source...


Minor revision to start-ladle.bat.

Minor revision to start-ladle.bat.

--- start-ladle.bat
+++ start-ladle.bat
@@ -1,4 +1,3 @@
 @rem Run the ladle web server
 @rem Usage: webs %port
-
 @lua ladle.lua %1


Now removing vc-using-framestream from buil script

--- build-vc-programs.cmd
+++ build-vc-programs.cmd
@@ -47,8 +47,8 @@
 REM ("Failed to load msbuild Toolset... Microsoft.Build, Version=14.0.0.0").
 REM Don't use the old nuget.

-SET NUGET_EXE=.\submodules\vcpkg\downloads\tools\nuget-4.6.2-windows\nuget.exe
-
+REM SET NUGET_EXE=.\submodules\vcpkg\downloads\tools\nuget-4.6.2-windows\nuget.exe
+REM
 REM %NUGET_EXE% restore tools\arislog\arislog.sln
 REM
 REM REM pushd tools\arislog\arislog
@@ -61,19 +61,19 @@
 REM
 REM msbuild tools\arislog\arislog.sln /t:Rebuild /p:Configuration="Release" /p:Platform="x64"
 REM IF %ERRORLEVEL% NEQ 0 EXIT /B 1
-
-
-%NUGET_EXE% restore sample-code\vc-using-framestream\vc-using-framestream.sln
-REM pushd sample-code\vc-using-framestream
-REM msbuild /t:restore /p:Configuration="Release" /p:Platform="x86"
-REM msbuild /t:restore /p:Configuration="Release" /p:Platform="x64"
-REM popd
-
-msbuild sample-code\vc-using-framestream\vc-using-framestream.sln /t:Rebuild /p:Configuration="Release" /p:Platform="x86"
-IF %ERRORLEVEL% NEQ 0 EXIT /B 1
-
-msbuild sample-code\vc-using-framestream\vc-using-framestream.sln /t:Rebuild /p:Configuration="Release" /p:Platform="x64"
-IF %ERRORLEVEL% NEQ 0 EXIT /B 1
+REM
+REM
+REM %NUGET_EXE% restore sample-code\vc-using-framestream\vc-using-framestream.sln
+REM REM pushd sample-code\vc-using-framestream
+REM REM msbuild /t:restore /p:Configuration="Release" /p:Platform="x86"
+REM REM msbuild /t:restore /p:Configuration="Release" /p:Platform="x64"
+REM REM popd
+REM
+REM msbuild sample-code\vc-using-framestream\vc-using-framestream.sln /t:Rebuild /p:Configuration="Release" /p:Platform="x86"
+REM IF %ERRORLEVEL% NEQ 0 EXIT /B 1
+REM
+REM msbuild sample-code\vc-using-framestream\vc-using-framestream.sln /t:Rebuild /p:Configuration="Release" /p:Platform="x64"
+REM IF %ERRORLEVEL% NEQ 0 EXIT /B 1

 GOTO End


add depman wrapper

add depman wrapper

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

--- bin/depman.bat
+++ bin/depman.bat
@@ -0,0 +1,3 @@
+@echo off
+
+%PHP_SDK_PHP_CMD% %~dp0depman.php %*


servers_start now doesn't set HSQLDB_VARIABLE. This needs to be set before running the script

--- servers_start.cmd
+++ servers_start.cmd
@@ -1,6 +1,5 @@
 @echo off

-SET HSQLDB_HOME=C:/apps/hsqldb
 rem Kill all processes listening to the service ports.
 FOR /F "tokens=5 delims= " %%P IN ('netstat -a -n -o ^| findstr 0.0.0.0:9001.*LISTENING') DO TaskKill.exe /F /PID %%P
 FOR /F "tokens=5 delims= " %%P IN ('netstat -a -n -o ^| findstr 0.0.0.0:8080.*LISTENING') DO TaskKill.exe /F /PID %%P


For AppVeyor

For AppVeyor

--- build/build.bat
+++ build/build.bat
@@ -1,6 +1,7 @@
 @echo off

 if defined APPVEYOR (
+  echo For AppVeyor
   set MSBUILD="msbuild.exe"
   set SEVENZIP="7z.exe"
 )


Buildscript: - restore VS2015 support as LLVM 4.0 is not supported by Mesa On Windows with Scons and MSVC; - multiple refactorings: only add stuff to PATH when needed, load Visual Studio Native tools only when needed.

--- buildscript/build.cmd
+++ buildscript/build.cmd
@@ -1,41 +1,35 @@
-@set mesa=%cd%/
-@set mesa=%mesa:\=/%
+@set mesa=%cd%\
 @set abi=x86
 @set /p x64=Do you want to build for x64?(y/n) Otherwise build for x86:
 @if /I %x64%==y @set abi=x64
 @set longabi=%abi%
 @if %abi%==x64 @set longabi=x86_64
-@set toolchain=Visual Studio 15 2017
-@if %abi%==x64 @set toolchain=%toolchain% Win64
 @set altabi=i686
 @if %abi%==x64 @set altabi=%longabi%
 @set minabi=32
 @if %abi%==x64 set minabi=64
-@set vsenv=%ProgramFiles:\=/%
+@set vsenv=%ProgramFiles%
 @if NOT "%ProgramW6432%"=="" set vsenv=%vsenv% (x86)
-@set vsenv=%vsenv%/Microsoft Visual Studio/2017/Community/VC/Auxiliary/Build/vcvars%minabi%.bat
-@set gcc=%mesa%mingw-w64-%abi%/mingw%minabi%/bin
-@set APPENDPATH=%mesa%flexbison/;%mesa%m4/%abi%/bin/;%mesa%Python/%abi%/;%mesa%Python/%abi%/Scripts/;%mesa%cmake/%abi%/bin/;
-@if EXIST "%gcc%" set APPENDPATH=%gcc%/;%APPENDPATH%
-@set PATH=%APPENDPATH:/=\%%PATH%
-
-@pip install -U mako
-@pip freeze > requirements.txt
-@pip install -r requirements.txt --upgrade
-@del requirements.txt
-
+@set vsenv=%vsenv%\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars%minabi%.bat
+@if EXIST "%vsenv%" @set toolchain=Visual Studio 15 2017
+@if NOT EXIST "%vsenv%" @set toolchain=Visual Studio 14
+@if NOT EXIST "%vsenv%" @set vsenv=%VS140COMNTOOLS%..\..\VC\bin\vcvars%minabi%.bat
+@set gcc=%mesa%mingw-w64-%abi%\mingw%minabi%\bin
+@set PATH=%mesa%flexbison\;%mesa%m4\%abi%\bin\;%mesa%cmake\%abi%\bin\;%PATH%
+@if EXIST "%gcc%" set PATH=%gcc%\;%PATH%
+@set vsenvloaded=0
 @set /p buildllvm=Begin LLVM build. Only needs to run once for each ABI and version. Proceed y/n?
 @if /I NOT %buildllvm%==y GOTO build_dxtn

 :build_llvm
-@cd %mesa%llvm
+@cd "%mesa%llvm"
 @RD /S /Q %abi%
 @RD /S /Q cmake-%abi%
 @md cmake-%abi%
 @cd cmake-%abi%
 @set vsenvloaded=1
 @call "%vsenv%"
-@cmake -G "%toolchain%" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_ENABLE_RTTI=1 -DLLVM_USE_CRT_RELEASE=MT -DLLVM_ENABLE_TERMINFO=OFF -DCMAKE_INSTALL_PREFIX=%mesa%llvm/%abi% ..
+@cmake -G "%toolchain%" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_ENABLE_RTTI=1 -DLLVM_USE_CRT_RELEASE=MT -DLLVM_ENABLE_TERMINFO=OFF -DCMAKE_INSTALL_PREFIX=%mesa:\=/%llvm/%abi% ..
 @pause
 @msbuild /p:Configuration=Release INSTALL.vcxproj
 @pause
@@ -45,12 +39,12 @@
 @if NOT EXIST "%mesa%dxtn" GOTO build_mesa
 @set /p builddxtn=Do you want to build S3 texture compression library? (y/n):
 @if /i NOT %builddxtn%==y GOTO build_mesa
-@cd %mesa%dxtn
+@cd "%mesa%dxtn"
 @RD /S /Q %abi%
 @MD %abi%
 @set dxtn=gcc -shared
 @if %abi%==x86 set dxtn=%dxtn% -m32
-@set dxtn=%dxtn% -v *.c *.h -I ../mesa/include -Wl,--dll,--dynamicbase,--enable-auto-image-base,--nxcompat -o %abi%/dxtn.dll
+@set dxtn=%dxtn% -v *.c *.h -I ..\mesa\include -Wl,--dll,--dynamicbase,--enable-auto-image-base,--nxcompat -o %abi%\dxtn.dll
 @echo.
 @%dxtn%
 @echo.
@@ -58,24 +52,47 @@
 :build_mesa
 @set /p buildmesa=Begin mesa build. Proceed (y/n):
 @if /i NOT %buildmesa%==y GOTO exit
-@set LLVM=%mesa%llvm/%abi%
-@cd %mesa%mesa
+@set LLVM=%mesa:\=/%llvm/%abi%
+@cd "%mesa%mesa"
+@RD /S /Q build\windows-%longabi%
 @set /p openswr=Do you want to build OpenSWR drivers? (y=yes):
 @set buildswr=
 @if /i %openswr%==y @set buildswr=swr=1
 @set mingw=n
-@rem if EXIST "%gcc%" set /p mingw=Do you want to build with MinGW-W64 instead of Visual Studio? (y=yes):
+@set mingwtest=0
+@if EXIST "%gcc%" @set mingwtest=1
+@set msys2=%mesa%msys64\msys2_shell.cmd
+@if EXIST "%msys2%" @set mingwtest=%mingwtest%2
+@rem if %mingwtest%==12 @set /p mingw=Do you want to build with MinGW-W64 instead of Visual Studio (y=yes):
 @set buildmingw=
-@if /i %mingw%==y (
+@set PATH=%mesa%Python\%abi%\;%mesa%Python\%abi%\Scripts\;%PATH%
+@pip install -U mako
+@pip freeze > requirements.txt
+@pip install -r requirements.txt --upgrade
+@del requirements.txt
+@if /i NOT %mingw%==y GOTO build_with_vs
+
+:build_with_mingw
 @set buildmingw=toolchain=crossmingw
-@mklink /H "%gcc%/%altabi%-w64-mingw32-ar.exe" "%gcc%/ar.exe"
-@mklink /H "%gcc%/%altabi%-w64-mingw32-ranlib.exe" "%gcc%/ranlib.exe"
-)
-@if /i NOT %mingw%==y (
-@if NOT %vsenvloaded==1 (
-@call "%vsenv%"
-)
-)
+@copy "%gcc%\%altabi%-w64-mingw32-gcc-ar.exe" "%gcc%\%altabi%-w64-mingw32-ar.exe"
+@copy "%gcc%\%altabi%-w64-mingw32-gcc-ranlib.exe" "%gcc%\%altabi%-w64-mingw32-ranlib.exe"
+@call "%msys2%" -use-full-path
+pacman -Syu
+pacman -S python2
+wget https://bootstrap.pypa.io/get-pip.py
+python2 get-pip.py
+pip install -U mako
+pip install -U scons
+pip freeze > requirements.txt
+pip install -r requirements.txt --upgrade
+cd $mesa
+cd mesa
+scons build=release platform=windows machine=x86 toolchain=crossmingw libgl-gdi
+@GOTO exit
+
+:build_with_vs
+@if %vsenvloaded%==0 call "%vsenv%"
 @cmd /k "scons build=release platform=windows machine=%longabi% %buildmingw% %buildswr% libgl-gdi"
+
 :exit
 exit


try with msvc in bld.bat

try with msvc in bld.bat

--- recipes/timml/bld.bat
+++ recipes/timml/bld.bat
@@ -1,3 +1,3 @@
-"%PYTHON%" setup.py build_ext --compiler=mingw32 --fcompiler=gfortran
+"%PYTHON%" setup.py build_ext --compiler=msvc --fcompiler=gfortran
 "%PYTHON%" setup.py install
 if errorlevel 1 exit 1


Delete disable_win_s_hotkey.bat

Delete disable_win_s_hotkey.bat

--- registry/disable_win_s_hotkey.bat
+++ registry/disable_win_s_hotkey.bat
@@ -1 +0,0 @@
-reg.exe add HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced /v DisabledHotkeys /t REG_SZ /d S /f


Issue #4035: Update NiftyLinkContinuousBuild.bat.

--- Utilities/NiftyLinkContinuousBuild.bat
+++ Utilities/NiftyLinkContinuousBuild.bat
@@ -1,4 +1,4 @@
-@echo ***** NiftyLink Continuous Build Script - v.3 *****
+@echo ***** NiftyLink Continuous Build Script - v.4 *****
 @echo.
 @REM ************************************************************************************
 @REM *****                                                                          *****
@@ -22,16 +22,21 @@
 @setlocal enableextensions

 @REM *****  Setting localised variables - Change these to match your system!!  *****
-@set "VS_LOCATION=c:\Program Files (x86)\Microsoft Visual Studio 10.0"
-@set "CMAKE_LOCATION=c:\Program Files (x86)\CMake\bin"
+@set "VS_LOCATION=c:\Program Files (x86)\Microsoft Visual Studio 11.0"
+@set "CMAKE_LOCATION=c:\CMake\CMake-3.6.3\bin"
 @set "BUILD_ROOT=D:\CB"
+@set "EXT_PROJ_ROOT=c:\EP"
 @set "PUTTY_LOCATION=c:\Program Files (x86)\PuTTY\"
-@set "QT_LOCATION=c:\Qt\4.8.5\bin\"
-@set "GIT_LOCATION=c:\Program Files (x86)\Git\bin\"
+@set "OPENSSL_LOCATION=c:\OpenSSL-Win64\bin\"
+@set "QT_LOCATION=D:\Qt\qt-4.8.7-vs11-x64\bin"
+@set "GIT_LOCATION=C:\Program Files\Git\bin"

 @rem if you are cross-compiling between 64 and 32 bit then override your qt here
-@rem @set "QTDIR=C:\Qt\Qt-4.8.4-x86-vc10"
-@rem @set "PATH=%QTDIR%\bin;%PATH%"
+@set "QTDIR=D:\Qt\qt-4.8.7-vs11-x64"
+@set "PATH=%QTDIR%\bin;%PATH%"
+@set "PATH=%GIT_LOCATION%;%PATH%"
+
+@echo PATH=%PATH%

 @REM *****  Set your build type 64bit/32bit  *****
 @set "BTYPE=x64"
@@ -42,7 +47,7 @@
 @REM @set "VSVER=VCExpress.exe"

 @REM *****  Set your CMake generator - the tool you're going to use to build NifTK  *****
-@set "CMAKE_GENERATOR=Visual Studio 10 Win64"
+@set "CMAKE_GENERATOR=Visual Studio 11 Win64"

 @REM ***** Possible options are the following: *****
 @REM NMake Makefiles             = Generates NMake makefiles.
@@ -121,8 +126,15 @@
 @echo.
 @REM pause

-@REM *****  Create new local build folder  *****
+@echo Cleaning the previous builds....
+@if exist "%BUILD_BIN%" rd /s /q "%BUILD_BIN%"
+
+@echo Cleaning the previous logs....
+@if exist "%BUILD_LOG%" rd /s /q "%BUILD_LOG%"
+
+@REM *****  Create new local build & log folders  *****
 @if not exist "%BUILD_BIN%" md "%BUILD_BIN%"
+@if not exist "%BUILD_LOG%" md "%BUILD_LOG%"

 @setlocal enableDelayedExpansion

@@ -150,7 +162,7 @@
 @REM *****  Run Visual Studio to build the current build conf  *****
 @echo ---------------------------------------------------------------------
 @echo Running VS....
-@"%VS_LOCATION%\Common7\IDE\%VSVER%" /build %BCONF% /project ALL_BUILD /projectconfig %VSCONFSTRING% %BUILD_BIN%\NIFTYLINK-SUPERBUILD.sln | "%GIT_LOCATION%\tee.exe" c:\CB\NiftyLink_log.txt 2>&1
+@"%VS_LOCATION%\Common7\IDE\%VSVER%" /build %BCONF% /project ALL_BUILD /projectconfig %VSCONFSTRING% %BUILD_BIN%\NIFTYLINK-SUPERBUILD.sln | tee D:\CB\NiftyLink-B-logs\NiftyLink_log.txt 2>&1
 @echo.

 @REM *****  Check ErrorLevel  *****
@@ -179,7 +191,7 @@
 @echo.

-@REM  *****  Set PATH and Environment for NiftyLink  *****
+@REM  *****  Set PATH and Environment for NifTK  *****
 @cd /d "%BUILD_BIN%\NiftyLink-build\"
 @set CL=/D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE
 @set LINK=/LARGEADDRESSAWARE
@@ -214,7 +226,7 @@

 @REM *****  Run CTEST  *****
 @echo Running CTest....
-"%CMAKE_LOCATION%\ctest.exe"
+"%CMAKE_LOCATION%\ctest.exe" -C %BCONF% -S CTestContinuous.cmake -V
 @echo.

 @IF %ERRORLEVEL% NEQ 0 SET /A errno^|=%ERROR_DEVENV%
@@ -224,4 +236,4 @@
 @echo.
 @echo ***** NiftyLink Continuous Build Script Successfully FINISHED *****
 @endlocal
-@endlocal
+@endlocal


Fix runAs.cmd

Fix runAs.cmd

--- runAs-tool-win32/cmd/runAs.cmd
+++ runAs-tool-win32/cmd/runAs.cmd
@@ -10,20 +10,23 @@
 ENDLOCAL

 REM Define OS bitness
-SET "RUN_AS_PATH_TO_BIN=%~dp0"
-SET "RUN_AS_PATH_TO_TOOL=JetBrains.runAs.exe"
-%RUN_AS_PATH_TO_BIN%JetBrains.getOSBitness.exe -s
+SET "RUNAS_76200936_0AA1_4855_A204_05C3F3C54476_PATH_TO_BIN=%~dp0"
+SET "RUNAS_76200936_0AA1_4855_A204_05C3F3C54476_PATH_TO_TOOL=JetBrains.runAs.exe"
+%RUNAS_76200936_0AA1_4855_A204_05C3F3C54476_PATH_TO_BIN%JetBrains.getOSBitness.exe -s
 SET "OS_BITNESS=%errorlevel%"

-IF %OS_BITNESS% EQU 64 SET "RUN_AS_PATH_TO_TOOL=%RUN_AS_PATH_TO_BIN%x64\%RUN_AS_PATH_TO_TOOL%"
-IF %OS_BITNESS% EQU 32 SET "RUN_AS_PATH_TO_TOOL=%RUN_AS_PATH_TO_BIN%x86\%RUN_AS_PATH_TO_TOOL%"
+IF %OS_BITNESS% EQU 64 SET "RUNAS_76200936_0AA1_4855_A204_05C3F3C54476_PATH_TO_TOOL=%RUNAS_76200936_0AA1_4855_A204_05C3F3C54476_PATH_TO_BIN%x64\%RUNAS_76200936_0AA1_4855_A204_05C3F3C54476_PATH_TO_TOOL%"
+IF %OS_BITNESS% EQU 32 SET "RUNAS_76200936_0AA1_4855_A204_05C3F3C54476_PATH_TO_TOOL=%RUNAS_76200936_0AA1_4855_A204_05C3F3C54476_PATH_TO_BIN%x86\%RUNAS_76200936_0AA1_4855_A204_05C3F3C54476_PATH_TO_TOOL%"

 REM Override environment variables
-SET RUN_AS_GET_VARS=%RUN_AS_PATH_TO_TOOL% -c:%1 -i:false -l:off cmd.exe /C %RUN_AS_PATH_TO_BIN%getEnvVars.cmd
-FOR /F %%G IN ('%RUN_AS_GET_VARS%') do SET "%%G"
+SET RUNAS_76200936_0AA1_4855_A204_05C3F3C54476_GET_VARS=%RUNAS_76200936_0AA1_4855_A204_05C3F3C54476_PATH_TO_TOOL% -c:%1 -i:false -l:off cmd.exe /C %RUNAS_76200936_0AA1_4855_A204_05C3F3C54476_PATH_TO_BIN%getEnvVars.cmd
+FOR /F "delims=" %%G IN ('%RUNAS_76200936_0AA1_4855_A204_05C3F3C54476_GET_VARS%') DO SET "%%G"
+
+SET "RUNAS_76200936_0AA1_4855_A204_05C3F3C54476_GET_VARS="
+SET "RUNAS_76200936_0AA1_4855_A204_05C3F3C54476_PATH_TO_BIN="

 REM Run command line
-%RUN_AS_PATH_TO_TOOL% -c:%1 -i:true -l:errors -b:-10000 cmd.exe /C %2
+%RUNAS_76200936_0AA1_4855_A204_05C3F3C54476_PATH_TO_TOOL% -c:%1 -i:true -l:errors -b:-10000 cmd.exe /C %2
 SET "EXIT_CODE=%ERRORLEVEL%"

 ECHO.


Also add OpenMP to the local arm64 test batch file.

--- build/windows/test.Magick.NET.arm64.cmd
+++ build/windows/test.Magick.NET.arm64.cmd
@@ -5,9 +5,17 @@
 pause

 "c:\Program Files\dotnet\dotnet.exe" test -c TestQ8 /p:Platform=arm64 --framework net60 ..\..\tests\Magick.NET.Tests\Magick.NET.Tests.csproj
-if %errorlevel% neq 0 exit /b %errorlevel%
+if %errorlevel% neq 0 goto DONE
 "c:\Program Files\dotnet\dotnet.exe" test -c TestQ16 /p:Platform=arm64 --framework net60 ..\..\tests\Magick.NET.Tests\Magick.NET.Tests.csproj
-if %errorlevel% neq 0 exit /b %errorlevel%
+if %errorlevel% neq 0 goto DONE
 "c:\Program Files\dotnet\dotnet.exe" test -c TestQ16-HDRI /p:Platform=arm64 --framework net60 ..\..\tests\Magick.NET.Tests\Magick.NET.Tests.csproj
-if %errorlevel% neq 0 exit /b %errorlevel%
+if %errorlevel% neq 0 goto DONE
+"c:\Program Files\dotnet\dotnet.exe" test -c TestQ8-OpenMP /p:Platform=arm64 --framework net60 ..\..\tests\Magick.NET.Tests\Magick.NET.Tests.csproj
+if %errorlevel% neq 0 goto DONE
+"c:\Program Files\dotnet\dotnet.exe" test -c TestQ16-OpenMP /p:Platform=arm64 --framework net60 ..\..\tests\Magick.NET.Tests\Magick.NET.Tests.csproj
+if %errorlevel% neq 0 goto DONE
+"c:\Program Files\dotnet\dotnet.exe" test -c TestQ16-HDRI-OpenMP /p:Platform=arm64 --framework net60 ..\..\tests\Magick.NET.Tests\Magick.NET.Tests.csproj
+if %errorlevel% neq 0 goto DONE
+
+:DONE
 pause


Patch annoying hanging on xcopy

Patch annoying hanging on xcopy

--- build.msvs.bat
+++ build.msvs.bat
@@ -255,9 +255,12 @@
 			xcopy /Y lualib.h		%incdir%
 			xcopy /Y lauxlib.h		%incdir%
 			xcopy /Y luajit.h		%incdir%
-			xcopy /Y msvs_lua51.dll	%dlldir%\libluajit.dll
+			xcopy /Y msvs_lua51.dll	%dlldir%
+			move %dlldir%\msvs_lua51.dll %dlldir%\libluajit.dll
 			xcopy /Y msvs_lua51.lib	%dlldir%\libluajit.lib
+			move %dlldir%\msvs_lua51.lib %dlldir%\libluajit.lib
 			xcopy /Y msvs_lua51.exp	%dlldir%\libluajit.exp
+			move %dlldir%\msvs_lua51.exp %dlldir%\libluajit.exp
 		popd

 		echo Finished locally building / installing luajit.
@@ -289,9 +292,12 @@
 			xcopy /Y luaconf.h		%incdir%
 			xcopy /Y lualib.h		%incdir%
 			xcopy /Y lauxlib.h		%incdir%
-			xcopy /Y msvs_lib%1.dll	%dlldir%\lib%1.dll
+			xcopy /Y msvs_lib%1.dll	%dlldir%
+			move %dlldir%\msvs_lib%1.dll %dlldir%\lib%1.dll
 			xcopy /Y msvs_lib%1.lib	%dlldir%\lib%1.lib
+			move %dlldir%\msvs_lib%1.lib %dlldir%\lib%1.lib
 			xcopy /Y msvs_lib%1.exp	%dlldir%\lib%1.exp
+			move %dlldir%\msvs_lib%1.exp %dlldir%\lib%1.exp
 		popd

 		echo Finished installing %1.


Windows: Organize bootstrap.bat

Windows: Organize bootstrap.bat

--- bootstrap/bootstrap.bat
+++ bootstrap/bootstrap.bat
@@ -4,29 +4,31 @@
 mklink /j %userprofile%\.prompts %userprofile%\.dotfiles\prompts
 mklink /j %userprofile%\.zsh %userprofile%\.dotfiles\zsh
 mklink /j %userprofile%\AutoHotkey %userprofile%\.dotfiles\AutoHotkey
+mklink %userprofile%\.agignore %userprofile%\.dotfiles\.agignore
+mklink %userprofile%\.aprc %userprofile%\.dotfiles\.aprc
 mklink %userprofile%\.bash_profile %userprofile%\.dotfiles\.bash_profile
 mklink %userprofile%\.bashrc %userprofile%\.dotfiles\.bashrc
-mklink %userprofile%\.inputrc %userprofile%\.dotfiles\.inputrc
+mklink %userprofile%\.ctags %userprofile%\.dotfiles\.ctags
+mklink %userprofile%\.curlrc %userprofile%\.dotfiles\.curlrc
 mklink %userprofile%\.dir_colors mklink %userprofile%\.dotfiles\.dir_colors
-mklink "C:\\Program Files\\ConEmu\\ConEmu.xml" %userprofile%\.dotfiles\ConEmu.xml
-mklink %userprofile%\.curlrc %userprofile%\.dotfiles\.curlrc
 mklink %userprofile%\.editorconfig %userprofile%\.dotfiles\.editorconfig
+mklink %userprofile%\.gemrc %userprofile%\.dotfiles\.gemrc
 mklink %userprofile%\.gitconfig %userprofile%\.dotfiles\.gitconfig
 mklink %userprofile%\.gitignore %userprofile%\.dotfiles\.gitignore
+mklink %userprofile%\.inputrc %userprofile%\.dotfiles\.inputrc
+mklink %userprofile%\.irbrc %userprofile%\.dotfiles\.irbrc
 mklink %userprofile%\.jscs.json %userprofile%\.dotfiles\.jscs.json
 mklink %userprofile%\.jshintrc %userprofile%\.dotfiles\.jshintrc
+mklink %userprofile%\.pryrc %userprofile%\.dotfiles\.pryrc
+mklink %userprofile%\.tmux.conf %userprofile%\.dotfiles\.tmux.conf
 mklink %userprofile%\.vimrc %userprofile%\.dotfiles\.vimrc
+mklink %userprofile%\.yamllint mklink %userprofile%\.dotfiles\.yamllint
+mklink %userprofile%\.zshrc %userprofile%\.dotfiles\.zshrc
+mklink %userprofile%\console_config.rb %userprofile%\.dotfiles\console_config.rb
+
 mkdir %userprofile%\Documents\WindowsPowerShell
 mklink %userprofile%\Documents\WindowsPowerShell\Microsoft.PowerShell_profile.ps1 %userprofile%\.dotfiles\powershell\Microsoft.PowerShell_profile.ps1
-mklink %userprofile%\.agignore %userprofile%\.dotfiles\.agignore
-mklink %userprofile%\.pryrc %userprofile%\.dotfiles\.pryrc
-mklink %userprofile%\.irbrc %userprofile%\.dotfiles\.irbrc
-mklink %userprofile%\console_config.rb %userprofile%\.dotfiles\console_config.rb
-mklink %userprofile%\.gemrc %userprofile%\.dotfiles\.gemrc
-mklink %userprofile%\.tmux.conf %userprofile%\.dotfiles\.tmux.conf
-mklink %userprofile%\.zshrc %userprofile%\.dotfiles\.zshrc
-mklink %userprofile%\.aprc %userprofile%\.dotfiles\.aprc
-mklink %userprofile%\.ctags %userprofile%\.dotfiles\.ctags
-mklink %userprofile%\.yamllint mklink %userprofile%\.dotfiles\.yamllint
+
+mklink "C:\\Program Files\\ConEmu\\ConEmu.xml" %userprofile%\.dotfiles\ConEmu.xml

 pause


src/all.bat: fix banner
we need to restore %PATH% before calling "dist banner", so that
it could suggest the user to add %GOROOT%/bin to %PATH% if necessary.

R=golang-dev, bradfitz
CC=golang-dev
http://codereview.appspot.com/6525049

--- src/all.bat
+++ src/all.bat
@@ -16,8 +16,11 @@
 if %GOBUILDFAIL%==1 goto end
 call run.bat --no-rebuild --no-local
 if %GOBUILDFAIL%==1 goto end
-go tool dist banner
+:: we must restore %PATH% before running "dist banner" so that the latter
+:: can get the original %PATH% and give suggestion to add %GOROOT%/bin
+:: to %PATH% if necessary.
 set PATH=%OLDPATH%
+%GOTOOLDIR%/dist banner

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


no message

no message

--- sage/deploy.cmd
+++ sage/deploy.cmd
@@ -91,9 +91,6 @@
   IF !ERRORLEVEL! NEQ 0 goto error
 )

-IF NOT EXIST "%DEPLOYMENT_TARGET%\requirements.txt" goto postPython
-IF EXIST "%DEPLOYMENT_TARGET%\.skipPythonDeployment" goto postPython
-
 echo Detected requirements.txt.  You can skip Python specific steps with a .skipPythonDeployment file.

 :: 2. Select Python version
@@ -142,7 +139,7 @@
       IF NOT EXIST "%DEPLOYMENT_TARGET%\static" (
         MKDIR "%DEPLOYMENT_TARGET%\static"
       )
-      env\scripts\python manage.py collectstatic --noinput --clear
+      env\scripts\python manage.py runserver 0.0.0.0:8000
     )
   )
 )


Don't use refreshenv

Don't use refreshenv


SDA-2650 Fixed path param for markdown-pdf

--- scripts/jenkins-win64.bat
+++ scripts/jenkins-win64.bat
@@ -111,4 +111,5 @@
 if ERRORLEVEL 1 (
     call npm install -g markdown-pdf
 )
-%appdata%\npm\markdown-pdf install_instructions_win.md -o "%targetsDir%\Install-Instructions-Experimental-%archiveName%.pdf"
+%appdata%\npm\markdown-pdf install_instructions_win.md
+


Update poor man's trybot script.

Update poor man's trybot script.

It will now work with new paths, build/Debug etc.

An addition of a couple of optional parameters allows for both push
and pull modes of operation, i.e. the script may be run on either the
VM or the dev machine.

BUG=none

Review URL: http://codereview.chromium.org/8706001

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

--- chrome_frame/test/poor_mans_trybot.bat
+++ chrome_frame/test/poor_mans_trybot.bat
@@ -38,19 +38,29 @@
 set CLIENT_ROOT=%~dp0%..\..
 set CONFIG=%1

+if (%2)==() goto setdefaultbase
+if (%3)==() goto usage
+set DRIVE=%2
+set INSTALL_ROOT=%3
+goto pastbase
+:setdefault
+set DRIVE=c:
+set INSTALL_ROOT=\trybot
+:pastbase
+
 @ECHO ON
-c:
-mkdir \trybot
-cd \trybot
+%DRIVE%
+mkdir %INSTALL_ROOT%
+cd %INSTALL_ROOT%
 rmdir /s /q base
-rmdir /s /q chrome\%CONFIG%
+rmdir /s /q build\%CONFIG%
 rmdir /s /q chrome_frame
 mkdir base
-mkdir chrome\%CONFIG%
+mkdir build\%CONFIG%
 mkdir chrome_frame\test\data
 mkdir chrome_frame\test\html_util_test_data
 copy %CLIENT_ROOT%\base\base_paths_win.cc base\base_paths_win.cc
-xcopy %CLIENT_ROOT%\chrome\%CONFIG% chrome\%CONFIG% /E /EXCLUDE:%CLIENT_ROOT%\chrome_frame\test\poor_mans_trybot_xcopy_filter.txt
+xcopy %CLIENT_ROOT%\build\%CONFIG% build\%CONFIG% /E /EXCLUDE:%CLIENT_ROOT%\chrome_frame\test\poor_mans_trybot_xcopy_filter.txt
 xcopy %CLIENT_ROOT%\chrome_frame\test\data chrome_frame\test\data /E
 xcopy %CLIENT_ROOT%\chrome_frame\test\html_util_test_data chrome_frame\test\html_util_test_data /E
 copy %CLIENT_ROOT%\chrome_frame\CFInstance.js chrome_frame\CFInstance.js
@@ -59,16 +69,15 @@
 echo ************************************
 echo DO THE FOLLOWING IN AN ADMIN PROMPT:
 echo ************************************
-echo regsvr32 \trybot\chrome\%CONFIG%\servers\npchrome_frame.dll
-echo rundll32 \trybot\chrome\debug\servers\npchrome_frame.dll,RegisterNPAPIPlugin
+echo regsvr32 \trybot\build\%CONFIG%\servers\npchrome_frame.dll
 echo *********************************
 echo THEN DO THIS IN A REGULAR PROMPT:
 echo *********************************
-echo \trybot\chrome\%CONFIG%\chrome_frame_unittests.exe
-echo \trybot\chrome\%CONFIG%\chrome_frame_tests.exe
+echo \trybot\build\%CONFIG%\chrome_frame_unittests.exe
+echo \trybot\build\%CONFIG%\chrome_frame_tests.exe
 goto end

 :usage
-echo "Usage: poor_mans_trybot.bat [debug|release]"
+echo "Usage: poor_mans_trybot.bat CONFIG [DRIVE INSTALL_ROOT]"

 :end


Bump version number

Bump version number

--- build/Build-debug.bat
+++ build/Build-debug.bat
@@ -1,5 +1,5 @@
 @ECHO OFF
-SET release=6.1.4
+SET release=6.1.6
 SET comment=
 SET version=%release%


Fix typo

Fix typo

--- maven-wrapper/mvnw.cmd
+++ maven-wrapper/mvnw.cmd
@@ -26,7 +26,7 @@
 @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_BATCH_PAUSE - set to 'on' to wait for a keystroke 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


Fix path escaping

Fix path escaping

If `%MAVEN_PROJECTBASEDIR%` contained whitespaces, Windows couldn't find the maven-wrapper.jar because the whitespaces were considered as argument separators.

--- maven-wrapper/mvnw.cmd
+++ maven-wrapper/mvnw.cmd
@@ -117,8 +117,8 @@
 :endReadAdditionalConfig

 SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
-
-set WRAPPER_JAR=""%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar""
+
+set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
 set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain

 @REM avoid using MAVEN_CMD_LINE_ARGS below since that would loose parameter escaping in %*


Turn on warnings in the C code when developing

--- cbits/text_search.bat
+++ cbits/text_search.bat
@@ -1 +1 @@
-gcc -c text_search.c -std=c99 -O2 && ghci text_search.o text_search.hs
+gcc -c text_search.c -std=c99 -O2 -Wall -Wextra -Werror && ghci text_search.o text_search.hs


Changed order so that targets that fail after a new lexer is added are at the end so more builds can be tested.

--- scripts/checkbuilds.bat
+++ scripts/checkbuilds.bat
@@ -51,46 +51,46 @@
 rem Set path for VC 6
 path %MSDEV_BASE%;%path%
 rem
-rem Target 4: Visual C++ using scintilla\vcbuild\SciLexer.dsp
+rem Target 4: Visual C++ .NET using scite\boundscheck\SciTE.sln
+call scite\scripts\clearboth
+cd scite\boundscheck
+devenv scite.sln /rebuild release
+if ERRORLEVEL 2 goto ERROR
+cd ..\..
+rem
+rem Target 5: GTK+ version using Visual C++ on scintilla\gtk\scintilla.mak
+call scite\scripts\clearboth
+cd scintilla\gtk
+nmake -f scintilla.mak QUIET=1
+if ERRORLEVEL 2 goto ERROR
+cd ..\..
+rem
+rem Target 6: Visual C++ 98 using scintilla\win32\scintilla_vc6.mak
+call scite\scripts\clearboth
+cd scintilla\win32
+call "%MSDEV_BASE%\..\..\..\VC98\bin\vcvars32.bat"
+nmake -f scintilla_vc6.mak QUIET=1
+if ERRORLEVEL 2 goto ERROR
+cd ..\..
+rem
+rem Target 7: Visual C++ using scintilla\vcbuild\SciLexer.dsp
 call scite\scripts\clearboth
 cd scintilla\vcbuild
 msdev SciLexer.dsp /MAKE "SciLexer - Win32 Release" /REBUILD
 if ERRORLEVEL 2 goto ERROR
 cd ..\..
 rem
-rem Target 5: Visual C++ using scite\vcbuild\SciTE.dsp
+rem Target 8: Visual C++ using scite\vcbuild\SciTE.dsp
 call scite\scripts\clearboth
 cd scite\vcbuild
 msdev SciTE.dsp /MAKE "SciTE - Win32 Release" /REBUILD
 if ERRORLEVEL 2 goto ERROR
 cd ..\..
 rem
-rem Target 6: Visual C++ using scite\boundscheck\SciTE.dsp
+rem Target 9: Visual C++ using scite\boundscheck\SciTE.dsp
 call scite\scripts\clearboth
 cd scite\boundscheck
 msdev SciTE.dsp /MAKE "SciTE - Win32 Release" /REBUILD
-if ERRORLEVEL 2 goto ERROR
-cd ..\..
-rem
-rem Target 6a: Visual C++ .NET using scite\boundscheck\SciTE.sln
-call scite\scripts\clearboth
-cd scite\boundscheck
-devenv scite.sln /rebuild release
-if ERRORLEVEL 2 goto ERROR
-cd ..\..
-rem
-rem Target 7: GTK+ version using Visual C++ on scintilla\gtk\scintilla.mak
-call scite\scripts\clearboth
-cd scintilla\gtk
-nmake -f scintilla.mak QUIET=1
-if ERRORLEVEL 2 goto ERROR
-cd ..\..
-rem
-rem Target 8: Visual C++ 98 using scintilla\win32\scintilla_vc6.mak
-call scite\scripts\clearboth
-cd scintilla\win32
-call "%MSDEV_BASE%\..\..\..\VC98\bin\vcvars32.bat"
-nmake -f scintilla_vc6.mak QUIET=1
 if ERRORLEVEL 2 goto ERROR
 cd ..\..
 call scite\scripts\clearboth


Allow running outside of scripts folder

Allow running outside of scripts folder

--- scripts/blynk-ser.bat
+++ scripts/blynk-ser.bat
@@ -11,6 +11,8 @@
 REM === Edit lines below only if absolutely sure what you're doing ===

 rem Get command line options
+set SCRIPTS_PATH=%~dp0
+
 :loop
 IF NOT "%1"=="" (
     IF "%1"=="-c" set COMM_PORT=%2& SHIFT & SHIFT & GOTO :loop
@@ -37,8 +39,8 @@
 )

 rem Create exe
-if not exist com2tcp.exe (
-    copy com2tcp.bin com2tcp.exe
+if not exist %SCRIPTS_PATH%\com2tcp.exe (
+    copy %SCRIPTS_PATH%\com2tcp.bin %SCRIPTS_PATH%\com2tcp.exe
 )

 rem Do the job
@@ -48,7 +50,7 @@
 rem mode %COMM_PORT%:%COMM_BAUD%,N,8,1 >nul

 :restart
-  com2tcp --baud %COMM_BAUD% --ignore-dsr \\.\%COMM_PORT% %SERV_ADDR% %SERV_PORT%
+  %SCRIPTS_PATH%\com2tcp.exe --baud %COMM_BAUD% --ignore-dsr \\.\%COMM_PORT% %SERV_ADDR% %SERV_PORT%
   echo Reconnecting in 3s...
   timeout /T 3
 goto restart
@@ -74,4 +76,3 @@
     echo.   If the specified serial port is not found, it will ask to enter another one.
     echo.   The script also tries to reestablish connection if it was lost.
 goto:eof
-


Adjust http_server.bat to the new file system location of webkitpy/layout_tests/layout_package/http_server.

TEST=none
BUG=none

Review URL: http://codereview.chromium.org/553074

git-svn-id: dd90618784b6a4b323ea0c23a071cb1c9e6f2ac7@37047 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

--- webkit/tools/layout_tests/webkitpy/layout_tests/layout_package/http_server.bat
+++ webkit/tools/layout_tests/webkitpy/layout_tests/layout_package/http_server.bat
@@ -1 +1 @@
-%~dp0..\..\..\..\third_party\python_24\python.exe %~dp0http_server.py %*
+%~dp0..\..\..\..\..\..\third_party\python_24\python.exe %~dp0http_server.py %*


Fixed typo in last commit

Fixed typo in last commit

--- contrib/packaging-python/conda/bld.bat
+++ contrib/packaging-python/conda/bld.bat
@@ -29,8 +29,8 @@
  -DBUILD_TESTING=OFF ^
  -DBUILD_GMOCK=OFF ^
  -DBUILD_BENCHMARKING=OFF ^
- -DIRRLICHT_ROOT=""C:\Users\SBEL CI\Documents\irrlicht-1.8.4" ^
- -DIRRLICHT_LIBRARY=""C:\Users\SBEL CI\Documents\irrlicht-1.8.4\lib\Win64-visualStudio\Irrlicht.lib" ^
+ -DIRRLICHT_ROOT="C:\Users\SBEL CI\Documents\irrlicht-1.8.4" ^
+ -DIRRLICHT_LIBRARY="C:\Users\SBEL CI\Documents\irrlicht-1.8.4\lib\Win64-visualStudio\Irrlicht.lib" ^
  -DEIGEN3_INCLUDE_DIR="C:\Users\SBEL CI\Documents\eigen-3.3.9" ^
  -DENABLE_MODULE_CASCADE=ON ^
  -DCASCADE_INCLUDE_DIR="%CONDA_INSTALL_LOCN%"\Library\include\opencascade ^


fixed install script

fixed install script

--- scripts_win/install.bat
+++ scripts_win/install.bat
@@ -1,7 +1,7 @@
 @echo off
 cd ..
 :: update composer
-php composer.phar self-install
+php composer.phar self-update
 :: install needed components
 php composer.phar install
 :: SQL Schema wird generiert


Update pack.bat

Update pack.bat

--- sendtocategory/pack.bat
+++ sendtocategory/pack.bat
@@ -1,4 +1,3 @@
 del CatMan-beta.xpi
-"C:\Program Files\7-Zip\7zG.exe" a -tzip CatMan-beta.xpi content defaults locale skin chrome.manifest install.rdf
+"C:\Program Files\7-Zip\7zG.exe" a -tzip CatMan-beta.xpi content defaults locale skin chrome.manifest manifest.json

-


bug fix

bug fix

--- version2/update.bat
+++ version2/update.bat
@@ -1,3 +1,3 @@
-php app/console assetic:dump
+php app/console assetic:dump --env=prod
 php app/console assets:install web/
 php app/console doctrine:schema:update --force


Move post building command from make file to bat file. Until build system support post build, these command will be for Duet platform's post building commands.

git-svn-id: 5648d1bec6962b0a6d1d1b40eba8cf5cdb62da3d@5126 6f19259b-4bc3-4df7-8a09-765794883524

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

--- DuetPkg/PostBuild.bat
+++ DuetPkg/PostBuild.bat
@@ -0,0 +1,15 @@
+#
+# Currently, Build system does not provide post build mechanism for module
+# and platform building, so just use a bat file to do post build commands.
+# Originally, following post building command is for EfiLoader module.
+#
+
+set BUILD_DIR=%WORKSPACE%\Build\DuetPkg\DEBUG_MYTOOLS
+set BASETOOLS_DIR=%WORKSPACE_TOOLS_PATH%\Bin\Win32
+set OUTPUT_DIR=%BUILD_DIR%\IA32\DuetPkg\BootSector\BootSector\OUTPUT
+
+%BASETOOLS_DIR%\TianoCompress -e -o %BUILD_DIR%\FV\DUETEFIMAINFV.z %BUILD_DIR%\FV\DUETEFIMAINFV.Fv
+%BASETOOLS_DIR%\TianoCompress -e -o %BUILD_DIR%\FV\DxeMain.z %BUILD_DIR%\IA32\DxeMain.efi
+%BASETOOLS_DIR%\TianoCompress -e -o %BUILD_DIR%\FV\DxeIpl.z %BUILD_DIR%\IA32\DxeIpl.efi
+%BASETOOLS_DIR%\EfiLdrImage.exe -o %BUILD_DIR%\FV\Efildr32 %BUILD_DIR%\IA32\EfiLoader.efi %BUILD_DIR%\FV\DxeIpl.z %BUILD_DIR%\FV\DUETEFIMAINFV.z
+copy /b %OUTPUT_DIR%\Start.com+%OUTPUT_DIR%\Efi32.com2+%BUILD_DIR%\FV\Efildr32 %BUILD_DIR%\FV\Efildr


Update RingFreeGLUT - buildvc.bat - use locatevc.bat

--- extensions/ringfreeglut/buildvc.bat
+++ extensions/ringfreeglut/buildvc.bat
@@ -1,5 +1,5 @@
 cls
-call "C:\Program Files\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x86
+call ../../src/locatevc.bat
 cl /c /DEBUG ring_freeglut.c -I "..\..\libdepwin\freeglut\include" -I"..\..\include"
 link /DEBUG ring_freeglut.obj  ..\..\lib\ring.lib ..\..\libdepwin\freeglut\lib\freeglut.lib /DLL /OUT:..\..\bin\ring_freeglut.dll /SUBSYSTEM:CONSOLE,"5.01"
 del ring_freeglut.obj


updated PrepareUserKit.bat. Userkit should work now.

--- source/PrepareUserKit.bat
+++ source/PrepareUserKit.bat
@@ -15,6 +15,6 @@
 mkdir "..\Pack"
 mkdir "..\Pack\Cosmos"
 xcopy /S "..\Build\*.*" "..\Pack\Cosmos"
-"..\Tools\7zip\7z.exe" a -tzip CosmosUserkit.zip "..\Pack\*.*" -r
+"..\Tools\7zip\7za.exe" a -tzip CosmosUserkit.zip "..\Pack\*.*" -r
 rmdir /S /Q "..\Pack"
 pause


Added statement to go to current directory

--- update.cmd
+++ update.cmd
@@ -1,3 +1,6 @@
+REM goto current directory
+cd /d %~dp0
+
 REM Copy Kidoju webfonts
 XCOPY ..\Kidoju.WebFonts\dist\fonts\*.* .\src\styles\fonts\ /C /E /I /R /Y
 ATTRIB +R .\src\styles\fonts\*


add .cmd

add .cmd

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

--- logdna.cmd
+++ logdna.cmd
@@ -0,0 +1,8 @@
+echo. 2>EmptyFile.js
+MKDIR c:example1
+@powershell -NoProfile -ExecutionPolicy Bypass -Command "iex ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1'))" && SET PATH=%PATH%;%ALLUSERSPROFILE%chocolateybin
+choco install logdna-agent -y
+logdna-agent -k d8e14421399a44a9a35dfc49c7f5f0aa # this is your unique Agent API Key
+:: by default the agent monitors %ALLUSERSPROFILE%logs
+logdna-agent -d C:LogFiles
+nssm start logdna-agent


Don't require java on PATH

Don't require java on PATH

--- fitnesse.bat
+++ fitnesse.bat
@@ -5,4 +5,4 @@
 echo You can stop Fitnesse by pressing Ctrl+C, or by closing this window.
 echo.
 cd wiki
-java -jar fitnesse-standalone.jar
+"C:\Program Files (x86)\Java\jre7\bin\java" -jar fitnesse-standalone.jar


DRILL-1218: 'sqlline.bat' file should use JAVA_HOME if set

--- distribution/src/resources/sqlline.bat
+++ distribution/src/resources/sqlline.bat
@@ -71,7 +71,31 @@
 goto argactionstart
 :argactionend

-echo DRILL_ARGS - %DRILL_ARGS%
+rem ----
+rem Validate JAVA_HOME
+rem ----
+if "%JAVA_EXE%" == "" (set JAVA_EXE=java.exe)
+
+if not "%JAVA_HOME%" == "" goto javaHomeSet
+echo.
+echo WARN: JAVA_HOME not found in your environment.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation
+echo.
+goto initDrillEnv
+
+:javaHomeSet
+if exist "%JAVA_HOME%\bin\%JAVA_EXE%" goto initDrillEnv
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory.
+echo JAVA_HOME = %JAVA_HOME%
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation
+echo.
+goto error
+
+:initDrillEnv
+echo DRILL_ARGS - "%DRILL_ARGS%"

 rem ----
 rem Deal with Drill variables
@@ -79,7 +103,7 @@

 set DRILL_BIN_DIR=%~dp0
 pushd %DRILL_BIN_DIR%..
-set DRILL_HOME=^"%cd%^"
+set DRILL_HOME=%cd%
 popd

 if "test%DRILL_CONF_DIR%" == "test" (
@@ -144,14 +168,27 @@
 set DRILL_CP=%DRILL_CP%;%DRILL_HOME%\contrib\*
 if NOT "test%DRILL_CLASSPATH%"=="test" set DRILL_CP=!DRILL_CP!;%DRILL_CLASSPATH%

-set "DRILL_SHELL_JAVA_OPTS=%DRILL_SHELL_JAVA_OPTS% -Dlog.path=%DRILL_LOG_DIR%\sqlline.log"
+set DRILL_SHELL_JAVA_OPTS=%DRILL_SHELL_JAVA_OPTS% -Dlog.path="%DRILL_LOG_DIR%\sqlline.log"
+
+SET JAVA_CMD=%JAVA_HOME%\bin\%JAVA_EXE%
+if "%JAVA_HOME%" == "" (set JAVA_CMD=%JAVA_EXE%)
+set ERROR_CODE=0

 if NOT "test%QUERY%"=="test" (
-  echo %QUERY% | java %DRILL_SHELL_JAVA_OPTS% %DRILL_JAVA_OPTS% -cp %DRILL_CP% sqlline.SqlLine -d org.apache.drill.jdbc.Driver %DRILL_ARGS%
+  echo %QUERY% | "%JAVA_CMD%" %DRILL_SHELL_JAVA_OPTS% %DRILL_JAVA_OPTS% -cp "%DRILL_CP%" sqlline.SqlLine -d org.apache.drill.jdbc.Driver %DRILL_ARGS%
 ) else (
   if NOT "test%FILE%"=="test" (
-    java %DRILL_SHELL_JAVA_OPTS% %DRILL_JAVA_OPTS% -cp %DRILL_CP% sqlline.SqlLine -d org.apache.drill.jdbc.Driver %DRILL_ARGS% --run=%FILE%
+    "%JAVA_CMD%" %DRILL_SHELL_JAVA_OPTS% %DRILL_JAVA_OPTS% -cp "%DRILL_CP%" sqlline.SqlLine -d org.apache.drill.jdbc.Driver %DRILL_ARGS% --run=%FILE%
   ) else (
-    java %DRILL_SHELL_JAVA_OPTS% %DRILL_JAVA_OPTS% -cp %DRILL_CP% sqlline.SqlLine -d org.apache.drill.jdbc.Driver %DRILL_ARGS%
+    "%JAVA_CMD%" %DRILL_SHELL_JAVA_OPTS% %DRILL_JAVA_OPTS% -cp "%DRILL_CP%" sqlline.SqlLine -d org.apache.drill.jdbc.Driver %DRILL_ARGS%
   )
 )
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+set ERROR_CODE=1
+
+:end
+endlocal
+exit /B %ERROR_CODE%


added setlocal to fits.bat to rule out any environment variable conflicts


Improve msvcbuild.bat static linking.

Improve msvcbuild.bat static linking.

--- src/msvcbuild.bat
+++ src/msvcbuild.bat
@@ -14,10 +14,10 @@
 @if not defined INCLUDE goto :FAIL

 @setlocal
-@set LJCOMPILE=cl /nologo /c /MD /O2 /W3 /D_CRT_SECURE_NO_DEPRECATE
+@set LJCOMPILE=cl /nologo /c /O2 /W3 /D_CRT_SECURE_NO_DEPRECATE
 @set LJLINK=link /nologo
 @set LJMT=mt /nologo
-@set LJLIB=lib /nologo
+@set LJLIB=lib /nologo /nodefaultlib
 @set DASMDIR=..\dynasm
 @set DASM=%DASMDIR%\dynasm.lua
 @set LJDLLNAME=lua51.dll
@@ -70,19 +70,19 @@
 :NODEBUG
 @if "%1"=="amalg" goto :AMALGDLL
 @if "%1"=="static" goto :STATIC
-%LJCOMPILE% /DLUA_BUILD_AS_DLL lj_*.c lib_*.c
+%LJCOMPILE% /MD /DLUA_BUILD_AS_DLL lj_*.c lib_*.c
 @if errorlevel 1 goto :BAD
 %LJLINK% /DLL /out:%LJDLLNAME% lj_*.obj lib_*.obj
 @if errorlevel 1 goto :BAD
 @goto :MTDLL
 :STATIC
-%LJCOMPILE% /DLUA_BUILD_AS_DLL lj_*.c lib_*.c
+%LJCOMPILE% lj_*.c lib_*.c
 @if errorlevel 1 goto :BAD
 %LJLIB% /OUT:%LJLIBNAME% lj_*.obj lib_*.obj
 @if errorlevel 1 goto :BAD
 @goto :MTDLL
 :AMALGDLL
-%LJCOMPILE% /DLUA_BUILD_AS_DLL ljamalg.c
+%LJCOMPILE% /MD /DLUA_BUILD_AS_DLL ljamalg.c
 @if errorlevel 1 goto :BAD
 %LJLINK% /DLL /out:%LJDLLNAME% ljamalg.obj lj_vm.obj
 @if errorlevel 1 goto :BAD


updater.bat v3.0 the real deal

updater.bat v3.0 the real deal

hopefully :fingers_crossed:

--- updater.bat
+++ updater.bat
@@ -43,7 +43,7 @@
 	powershell -Command "(New-Object Net.WebClient).DownloadFile('https://github.com/ghacksuserjs/ghacks-user.js/raw/master/updater.bat', '!_myname!-updated.bat')" >nul
 	IF EXIST "!_myname!-updated.bat" (
 		CLS
-		START CMD /C "!_myname!-updated.bat" !_myparams!
+		START CMD /C "!_myname!-updated.bat" !_myparams:-updatebatch=!
 		DEL /F "!_myname!.bat" 2>nul
 		EXIT /B
 	) ELSE (


fixed path to version and removed duplicate

--- deployment/release.bat
+++ deployment/release.bat
@@ -2,8 +2,7 @@

 echo "--------------------------------------------------------------------------------"
 echo "Commit changes"
-for /f "delims=" %%a in ('version.exe package.json') do @set version=%%a
-for /f "delims=" %%a in ('version.exe ../package.json') do @set version=%%a
+for /f "delims=" %%a in ('./version.exe ../package.json') do @set version=%%a
 echo New version = %version%

 git config alias.admin \!"git-as.sh %env.TEAMCITY_DATA_PATH%/GitareHero"


added the stop_cron_job

added the stop_cron_job

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

--- stop_cron_job.bat
+++ stop_cron_job.bat
@@ -0,0 +1 @@
+schtasks /delete /tn "PHP Cron Job"


linked to gyp

linked to gyp

--- vcsetup.bat
+++ vcsetup.bat
@@ -1,44 +0,0 @@
-@rem project generation script
-@rem author: Greg Wessels
-@echo off
-
-set in_dir=%~dp0
-set out_dir=%in_dir%build
-set gyp_home=%in_dir%.\tools\gyp
-set opt_filters=0
-
-:arg
-if "%1"=="" goto continue
-   if "%1"=="--msvc-filters" set opt_filters=1
-shift
-goto arg
-:continue
-
-echo.
-echo generating projects...
-echo.
-
-call "%gyp_home%\gyp.bat" reno.gyp^
-	--debug=all^
-	--depth=.^
-	-f msvs -G msvs_version=2013^
-	--generator-output="%out_dir%"^
-	-Darch=x86
-
-echo.
-
-if ERRORLEVEL 0 goto success
-goto failed
-
-:success
-   if "%opt_filters%"=="0" (
-      echo removing msvc project *.filters
-	  del "%out_dir%\*.filters"
-    )
-
-   echo generation successful.
-   exit /b
-
-:failed
-   echo generation failed. (err=%ERRORLEVEL%)
-


git-svn-id: http://svn.procergs.reders/vpr/branches/2.0@523 d2da55db-5866-43f3-bc33-3da1c376b5d1

--- lvp_mock.bat
+++ lvp_mock.bat
@@ -1,5 +1,6 @@
 @echo off
 rmdir "app/cache/prod" /s /q
 rmdir "app/cache/dev" /s /q
-svn update
+svn revert .
+svn update .
 composer install --prefer-dist --optimize-autoloader && php app/console assetic:dump --env=prod --no-debug && php app/console cache:clear --env=prod --no-warmup


Fix path to YaccConstructor.exe

Fix path to YaccConstructor.exe

--- src/RNGLR.OtherSppfTest/gen.cmd
+++ src/RNGLR.OtherSppfTest/gen.cmd
@@ -4,7 +4,7 @@
 for %%i in (Elementary, Ambiguous, Cycles, Summator) do (
 	echo.  >> log.txt
 	echo %%i >> log.txt
-	..\packages\YaccConstructor.0.0.8.12\tools\YaccConstructor\YC.YaccConstructor.exe  -i %%i.yrd ^
+	..\..\Bin\Release\v40\YC.YaccConstructor.exe  -i %%i.yrd ^
         -g "RNGLRGenerator -pos int -token int -module RNGLR.Parse%%i -translate false -highlighting true -namespace %%i -light true -o %%i.yrd.fs" >> log.txt
 )


Use java instead of full path

Use java instead of full path

--- js.build.bat
+++ js.build.bat
@@ -1,4 +1,4 @@
-"C:\Program Files (x86)\Java\jre1.8.0_45\bin\java.exe" -jar compiler.jar ^
+java.exe -jar compiler.jar ^
 --js=misc.js ^
 --js=siggy.js ^
 --js=siggy.helpers.js ^


[Windows][VS2008] Updated zip package script

--- tools/win/create_portable_zip.bat
+++ tools/win/create_portable_zip.bat
@@ -1,4 +1,9 @@
-set PKG_TYPE=mingw
+@echo off
+IF [%1]==[] (
+  echo Please specify mingw or vs2008 build should be used
+  exit /B 1
+)
+set PKG_TYPE=%1
 set PKG_DIR=MapsWithMe
 set BASE_PATH=C:\Qt\omim-build-%PKG_TYPE%-release
 set MINGW_BIN_PATH=C:\Qt\qtcreator-2.0.1\mingw\bin
@@ -8,7 +13,7 @@
 set PKG_RES_DIR=%PKG_DIR%\resources

 del /F /S /Q %PKG_DIR%
-del %ZIP_NAME%
+del /Q %ZIP_NAME%

 mkdir %PKG_DIR%
 copy %BASE_PATH%\out\release\MapsWithMe.exe %PKG_DIR%\
@@ -32,7 +37,8 @@
   copy %MINGW_BIN_PATH%\libgcc_s_dw2-1.dll %PKG_DIR%\
   copy %MINGW_BIN_PATH%\mingwm10.dll %PKG_DIR%\
 ) ELSE (
-  echo "aa"
+  copy C:\Windows\winsxs\x86_microsoft.vc90.crt_1fc8b3b9a1e18e3b_9.0.30729.4926_none_508ed732bcbc0e5a\msvcp90.dll %PKG_DIR%\
+  copy C:\Windows\winsxs\x86_microsoft.vc90.crt_1fc8b3b9a1e18e3b_9.0.30729.4926_none_508ed732bcbc0e5a\msvcr90.dll %PKG_DIR%\
 )

 copy %QT_BIN_PATH%\QtCore4.dll %PKG_DIR%\


make.bat from @TheHydroImpulse

make.bat from @TheHydroImpulse

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

--- make.bat
+++ make.bat
@@ -0,0 +1,13 @@
+@ECHO OFF
+
+:; Clear the screen and turn echo off (above) to keep it clean
+CLS
+
+SET PPath=
+SET FPath=
+
+:; Get Value from 'VER' command output
+FOR /F "" %%i in ('where make') do SET PPath=%%i
+
+:; djdd
+call %PPath%


make.cmd に make install を加えた

make.cmd に make install を加えた

--- make.cmd
+++ make.cmd
@@ -25,4 +25,19 @@
         zip -9 nyagos-%DATE:/=%.zip nyagos.exe lua52.dll nyagos.lua nyagos_ja.mkd readme.mkd .nyagos
         goto end

+:install
+        if exist installdir (
+            start make.cmd install_
+        ) else (
+            @echo Please do 'mklink /J installdir PATH\TO\BIN' for example.
+        )
+        @goto end
+
+:install_
+        @echo Please close NYAGOS.exe and hit ENTER.
+        @pause
+        copy nyagos.exe .\installdir\.
+        copy nyagos.lua .\installdir\.
+        copy lua52.dll  .\installdir\.
+        goto end
 :end


Fixed make.cmd errored relative-path from main/

--- make.cmd
+++ make.cmd
@@ -18,8 +18,8 @@
         for /F %%I IN ('dir /s /b /aa *.go') do go fmt "%%I" & attrib -A "%%I"
         pushd "%~dp0main"
         for %%I in (windres.exe) do if not "%%~$PATH:I" == "" cscript //nologo make_rc.js | windres.exe --output-format=coff -o nyagos.syso
-        for /F %%V in ('git log -1 --pretty^=format:%%H') do go build -o "%~dp0nyagos.exe" -ldflags "-X main.stamp=%DATE% -X main.commit=%%V %X_VERSION%"
         popd
+        for /F %%V in ('git log -1 --pretty^=format:%%H') do go build -o nyagos.exe -ldflags "-X main.stamp=%DATE% -X main.commit=%%V %X_VERSION%" .\main
         goto end

 :fmt


Fix 'make package' did not bundle release_note*

--- make.cmd
+++ make.cmd
@@ -38,8 +38,7 @@

 :package
         for /F %%I in ('nyagos -e "print(nyagos.version or (string.gsub(nyagos.stamp,[[/]],[[]])))"') do set VERSION=%%I
-        zip -9 "nyagos-%VERSION%.zip" nyagos.exe lua53.dll nyole.dll nyagos.lua .nyagos specialfolders.js lnk.js makeicon.cmd nyagos.d\*.lua catalog.d\*.lua license.txt readme_ja.md readme.md
-        zip -9j "nyagos-%VERSION%.zip" Doc\nyagos_*.md
+        zip -9 "nyagos-%VERSION%.zip" nyagos.exe lua53.dll nyole.dll nyagos.lua .nyagos specialfolders.js lnk.js makeicon.cmd nyagos.d\*.lua catalog.d\*.lua license.txt readme_ja.md readme.md Doc\*.md
         goto end

 :install


Improved make.cmd clean to find folders which have *.go

--- make.cmd
+++ make.cmd
@@ -17,14 +17,14 @@
         set "X_VERSION=-X main.version=%VERSION%"

 :build
-        for /F %%I IN ('dir /s /b /aa *.go') do go fmt "%%I" & attrib -A "%%I"
+        call :fmt
         powershell -ExecutionPolicy RemoteSigned "cd '%~dp0main' ; . '%~dp0main\makesyso.ps1'"
         for /F "delims=" %%V in ('git log -1 --date^=short --pretty^=format:"-X main.stamp=%%ad -X main.commit=%%H"') do go build -o nyagos.exe -ldflags "%%V %X_VERSION%" .\main
         goto end

 :fmt
         for /F %%I IN ('dir /s /b /aa *.go') do go fmt "%%I" & attrib -A "%%I"
-        goto end
+        exit /b

 :status
         nyagos -e "print(nyagos.version or 'Snapshot on '..nyagos.stamp)"
@@ -32,7 +32,7 @@

 :clean
         for %%I in (nyagos.exe nyagos.syso version.now) do if exist %%I del %%I
-        for %%I in (alias commands completion conio dos history interpreter lua main) do (cd "%%I" & go clean & cd ..)
+        powershell "ls -R | ?{ $_ -match '\.go$' } | %%{ [System.IO.Path]::GetDirectoryName($_.FullName)} | Sort-Object | Get-Unique | %%{ Write-Host 'go clean on',$_ ;  pushd $_ ; go clean ; popd }"
         for /R %%I in (*~ *.bak) do if exist %%I del %%I
         goto end


update minor version

update minor version

--- test/test_app.bat
+++ test/test_app.bat
@@ -1,2 +1,2 @@
 ### application.bat - 2015 - Louis ABID ###
-version = "1.2.0-b"+version = "1.2.1"


CA233422-xscontainer fails for WS16 if docker has been started before hand - FIX - removed return error if net stop docker fails

Signed-off-by: Thomas Mckelvey <026f81c6681dc0381db088271dec6ed389f0f057@citrix.com>

--- src/xscontainer/data/configure_tls.cmd
+++ src/xscontainer/data/configure_tls.cmd
@@ -36,7 +36,7 @@
 icacls.exe %USERPROFILE%\.docker\ /T /grant %USERDOMAIN%\%USERNAME%:(OI)(CI)F /grant %USERDOMAIN%\%USERNAME%:F /inheritance:r || goto :ERRORHANDLER
 xcopy /O %cdpath%client\* %USERPROFILE%\.docker\ || goto :ERRORHANDLER
 echo Restarting Docker.
-net stop Docker || goto :ERRORHANDLER
+net stop Docker || echo Not stopping Docker as it is not running.
 net start Docker || goto :ERRORHANDLER
 echo All done. Docker is now configured for TLS.


Update test script to clean up at start

Update test script to clean up at start

--- test/runtests.bat
+++ test/runtests.bat
@@ -1,4 +1,11 @@
 @ECHO OFF
+
+REM create bin directory if it doesn't exist
+if not exist ..\bin mkdir ..\bin
+
+REM delete output from previous run
+del actual.txt
+
 REM compile the code into the bin folder
 javac  javac  -cp ..\src -Xlint:none -d ..\bin ..\src\seedu\addressbook\Main.java


Remove unused Apollo test configuration.

--- test/runtests.cmd
+++ test/runtests.cmd
@@ -490,7 +490,6 @@
   set _rlArgs=%_rlArgs% %_exclude_forcedeferparse%
   set _rlArgs=%_rlArgs% %_exclude_nodeferparse%
   set _rlArgs=%_rlArgs% %_exclude_forceundodefer%
-  set _rlArgs=%_rlArgs% %_ExcludeApolloTests%
   set _rlArgs=%_rlArgs% %_NoProgramOutput%
   set _rlArgs=%_rlArgs% %_OnlyAssertOutput%
   set _rlArgs=%_rlArgs% %_quiet%


Tag nuget packages as Beta2

Tag nuget packages as Beta2

--- nuget/BuildPackage.cmd
+++ nuget/BuildPackage.cmd
@@ -1,5 +1,5 @@
 SET PackageName=OpenZWave
-SET Version=2.0.0-beta1
+SET Version=2.0.0-beta2
 RMDIR package /S /Q
 XCOPY ..\open-zwave\config package\config\ /S /Y
 XCOPY OpenZWave.nuspec package\ /Y


Updating Spark Phone.

Updating Spark Phone.

git-svn-id: f13e20fb8540f76a08799c0051229138c0279aa7@7304 b35dd754-fafc-0310-a699-88a17e54d16e


Qt 5.10.1 with OpenSSL 1.0.2o

Qt 5.10.1 with OpenSSL 1.0.2o

--- tools/options.bat
+++ tools/options.bat
@@ -2,11 +2,11 @@

 set MSVCVER=2017
-set QTVER=5.10.0
-set SSLVER=1.0.2n
+set QTVER=5.10.1
+set SSLVER=1.0.2o
 set PREFIX=C:\Qt
 set EXTRABUILDOPTIONS=-qt-sqlite
-set PATH=C:Python27\;C:\Strawberry\perl\bin;%PATH%
+set PATH=C:\Python27\;C:\Strawberry\perl\bin;%PATH%

 REM DO NOT EDIT BELOW THIS LINE


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%


make.cmd: allow to override ARCH and TARGET_PLATFORM

--- make.cmd
+++ make.cmd
@@ -4,17 +4,20 @@

 if "%JAVA_HOME%" == "" goto javahomeerror

-"%JAVA_HOME%\bin\java" -d32 -version 2>NUL
-if "%ERRORLEVEL%" == "0" set JAVA_ARCH=x86
+if "%ARCH%" == "" (
+	"%JAVA_HOME%\bin\java" -d32 -version 2>NUL
+	if %ERRORLEVEL% EQU 0 set ARCH=x86

-"%JAVA_HOME%\bin\java" -d64 -version 2>NUL
-if "%ERRORLEVEL%" == "0" set JAVA_ARCH=x86_64
+	"%JAVA_HOME%\bin\java" -d64 -version 2>NUL
+	if %ERRORLEVEL% EQU 0 set ARCH=x86_64
+)

 if "%VS_VERSION%" == "" set VS_VERSION=14

-if "%ARCH%" == "" set ARCH=%JAVA_ARCH%
-if "%ARCH%" == "x86" set TARGET_PLATFORM="Visual Studio %VS_VERSION%"
-if "%ARCH%" == "x86_64" set TARGET_PLATFORM="Visual Studio %VS_VERSION% Win64"
+if "%TARGET_PLATFORM%" == "" (
+	if "%ARCH%" == "x86" set TARGET_PLATFORM="Visual Studio %VS_VERSION%"
+	if "%ARCH%" == "x86_64" set TARGET_PLATFORM="Visual Studio %VS_VERSION% Win64"
+)

 if "%CMAKE_CONFIG%" == "" set CMAKE_CONFIG=RelWithDebInfo


Make steam2backloggery.bat a bit more self-documenting

--- steam2backloggery.bat
+++ steam2backloggery.bat
@@ -1,8 +1,16 @@
-set STEAM_NAME=steam username
+REM =====================
+REM USER SETTINGS GO HERE
+REM =====================
+
+set STEAM_NAME=steamcommunity ID
 set BL_NAME=backloggery username
 set BL_PASS=backloggery password
 set EDITOR=notepad

+REM =========================================
+REM NO USER SERVICEABLE PARTS BELOW THIS LINE
+REM =========================================
+
 java -jar bltool.jar --steam-name "%STEAM_NAME%" --bl-name "%BL_NAME%" --bl-pass "%BL_PASS%" --filter --from steam --to text --output games.txt
 %EDITOR% games.txt
 java -jar bltool.jar --bl-name "%BL_NAME%" --bl-pass "%BL_PASS%" --from text --to backloggery --input games.txt


removing extra whitespace

removing extra whitespace

--- Content/install.cmd
+++ Content/install.cmd
@@ -1,17 +1,9 @@
 # Install WP-CLI
-
-

 cd Commands

-
-
 IF EXISTS wp-cli.phar (
-
     rm -f wp-cli.phar
-
 )

-
-
-curl -O https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar+curl -O https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar


Update update_SCCM_policy.cmd

Update update_SCCM_policy.cmd

Added citation.

--- windows/update_SCCM_policy.cmd
+++ windows/update_SCCM_policy.cmd
@@ -1,3 +1,4 @@
 REM This script triggers the Machine Policy Evaluation and Update Cycle for SCCM connected computers
+REM Sourced from http://blogs.technet.com/b/charlesa_us/archive/2015/03/07/triggering-configmgr-client-actions-with-wmic-without-pesky-right-click-tools.aspx

 WMIC /namespace:\\root\ccm path sms_client CALL TriggerSchedule "{00000000-0000-0000-0000-000000000022}" /NOINTERACTIVE


use @REM instead of # (#27)

use @REM instead of # (#27)

using # in .cmd files as comment issues the following error: `Der Befehl "#" ist entweder falsch geschrieben oder konnte nicht gefunden werden.` aka command not found

--- mvnw.cmd
+++ mvnw.cmd
@@ -121,7 +121,7 @@
 set WRAPPER_JAR=""%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar""
 set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain

-# avoid using MAVEN_CMD_LINE_ARGS below since that would loose parameter escaping in %*
+@REM avoid using MAVEN_CMD_LINE_ARGS below since that would loose parameter escaping in %*
 %MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
 if ERRORLEVEL 1 goto error
 goto end


5.4.0-alpha-021

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


smt experiments

smt experiments

error: pathspec 'exp/smt/smt.example.bat' did not match any file(s) known to git

--- exp/smt/smt.example.bat
+++ exp/smt/smt.example.bat
@@ -0,0 +1,7 @@
+REM smt example
+
+REM the first argument is the training data
+REM the second argument is the development data
+REM they have been processed with UNK symbols
+
+D:\dev\mycnn2\msbuild\examples\Release\seq2seq_encdec.exe d:\data\smt\BTEC.zh-en\train.mrg d:\data\smt\BTEC.zh-en\devset1_2.mrg


netkvm: exclude XP/2003/Vista from the buildall.bat

This does not affect the common build, only engineering build
of the specific driver.

Signed-off-by: Yuri Benditovich <9668326cb042de5d91fd7679dac7ca5ea402812c@daynix.com>

--- NetKVM/buildAll.bat
+++ NetKVM/buildAll.bat
@@ -1,6 +1,6 @@
 @echo off
-call ..\tools\build.bat netkvm-vs2015.sln "Wlh Win7" %*
+call ..\tools\build.bat netkvm-vs2015.sln "Win7" %*
 if errorlevel 1 goto :eof
 call build_NoLegacy.bat
 if errorlevel 1 goto :eof
-call ..\tools\build.bat NDIS5\NetKVM-NDIS5.sln "WXp Wnet" %*
+::call ..\tools\build.bat NDIS5\NetKVM-NDIS5.sln "WXp Wnet Wlh" %*


Use experimental modules flag for Node before 12.22.4 (#60891)

--- tools/build/build.bat
+++ tools/build/build.bat
@@ -1,2 +1,2 @@
 @echo off
-"%~dp0\..\bootstrap\node.bat" "%~dp0\build.js" %*
+"%~dp0\..\bootstrap\node.bat" --experimental-modules "%~dp0\build.js" %*


Permission fixed

Permission fixed

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

--- platforms/android/cordova/build.bat
+++ platforms/android/cordova/build.bat
@@ -0,0 +1,26 @@
+:: Licensed to the Apache Software Foundation (ASF) under one
+:: or more contributor license agreements.  See the NOTICE file
+:: distributed with this work for additional information
+:: regarding copyright ownership.  The ASF licenses this file
+:: to you under the Apache License, Version 2.0 (the
+:: "License"); you may not use this file except in compliance
+:: with the License.  You may obtain a copy of the License at
+::
+:: http://www.apache.org/licenses/LICENSE-2.0
+::
+:: Unless required by applicable law or agreed to in writing,
+:: software distributed under the License is distributed on an
+:: "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+:: KIND, either express or implied.  See the License for the
+:: specific language governing permissions and limitations
+:: under the License.
+
+@ECHO OFF
+SET script_path="%~dp0build"
+IF EXIST %script_path% (
+        node %script_path% %*
+) ELSE (
+    ECHO.
+    ECHO ERROR: Could not find 'build' script in 'cordova' folder, aborting...>&2
+    EXIT /B 1
+)


Update uninstall for Doze

Update uninstall for Doze

--- scripts/uninstall-win32.bat
+++ scripts/uninstall-win32.bat
@@ -37,6 +37,7 @@
   IF EXIST "%HOMEPATH%\.kalabox" (
     ECHO Removing Kalabox directories
     RMDIR %HOMEPATH%\.kalabox /S /Q
+    RMDIR "%HOMEPATH%\VirtualBox VMs\Kalabox2" /S /Q
     ECHO REMOVED!
     ECHO.
   )


Separated S3 of git

Separated S3 of git

--- push.bat
+++ push.bat
@@ -2,9 +2,12 @@
 call check.bat
 set /p ask=Upload to S3 (y/n)?
 if %ask% == y (
+	call doPush.bat
+)
+set /p gitdo=Push to git (y/n)?
+if %gitdo% == y (
 	git add .
 	set /p msg=Git commit message :
 	git commit -m "%msg%"
 	git push
-	call doPush.bat
 )


'R350' alias in release procedures back to 'R'

--- CRAN_Release.cmd
+++ CRAN_Release.cmd
@@ -361,7 +361,7 @@
 export R_LIBS=~/build/revdeplib/
 export R_LIBS_SITE=none
 export _R_CHECK_FORCE_SUGGESTS_=false         # in my profile so always set
-R350
+R
 .libPaths()   # should be just 2 items: revdeplib and the base R package library
 update.packages(ask=FALSE)
 # if package not found on mirror, try manually a different one:
@@ -419,7 +419,7 @@
   all = system("ls *.tar.gz", intern=TRUE)
   all = sapply(strsplit(all, split="_"),'[',1)
   for (i in all[!all %in% deps]) {
-    cat("Removing",i,"because it", if (!i %in% rownames(avail)) "has been removed from CRAN/Bioconductor" else "no longer uses data.table")
+    cat("Removing",i,"because it", if (!i %in% rownames(avail)) "has been removed from CRAN/Bioconductor\n" else "no longer uses data.table\n")
     system(paste0("rm ",i,"_*.tar.gz"))
   }
 }
@@ -526,9 +526,9 @@
 find . -name 00check.log | grep -E 'AFM|easycsv|...|optiSel|xgboost' | xargs grep -H . > /tmp/out.log
 # For RxmSim: export JAVA_HOME=/usr/lib/jvm/java-8-oracle
 more <failing_package>.Rcheck/00check.log
-R350 CMD check <failing_package>.tar.gz
-R350 CMD INSTALL ~/data.table_1.9.6.tar.gz   # CRAN version to establish if fails are really due to data.table
-R350 CMD check <failing_package>.tar.gz
+R CMD check <failing_package>.tar.gz
+R CMD INSTALL ~/data.table_1.9.6.tar.gz   # CRAN version to establish if fails are really due to data.table
+R CMD check <failing_package>.tar.gz
 ls -1 *.tar.gz | grep -E 'Chicago|dada2|flowWorkspace|LymphoSeq' | parallel ~/build/R-3.5.0/bin/R CMD check &

 # Warning: replacing previous import robustbase::sigma by stats::sigma when loading VIM


Create bld.bat

Create bld.bat

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

--- recipes/robot-testing-framework/bld.bat
+++ recipes/robot-testing-framework/bld.bat
@@ -0,0 +1,22 @@
+mkdir build
+cd build
+
+cmake ^
+    -G "Ninja" ^
+    -DCMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% ^
+    -DCMAKE_BUILD_TYPE=Release ^
+    -DBUILD_TESTING=ON ^
+    %SRC_DIR%
+if errorlevel 1 exit 1
+
+:: Build.
+cmake --build . --config Release
+if errorlevel 1 exit 1
+
+:: Install.
+cmake --build . --config Release --target install
+if errorlevel 1 exit 1
+
+:: Test.
+ctest --output-on-failure -C Release
+if errorlevel 1 exit 1


[Misc] Add RemountDrive batch file

[Misc] Add RemountDrive batch file

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

--- miscellaneous/RemountDrive.cmd
+++ miscellaneous/RemountDrive.cmd
@@ -0,0 +1,91 @@
+@ECHO OFF
+SETLOCAL ENABLEEXTENSIONS
+
+REM This Windows batch file mounts a virtual hard drive, creates a file in it, removes the file, and then unmounts the hard drive.
+REM
+REM Setup:
+REM   1.  Open _Disk Management_ through the Start menu
+REM   2.  Navigate to _Action_ and select _Create VHD_
+REM   3.  Select the location for the virtual hard drive file and set the size to 10MB or greater
+REM   4.  Right click the new disk, select _Initialize Disk_, and click _OK_
+REM   5.  Right-click on the unallocated space in the new disk and select _New Simple Volume_
+REM   6.  Follow the wizard; in the screen _Assign Drive Letter or Path_, choose not to assign them
+REM   7.  Open a new command line window and type MOUNTVOL
+REM   8.  From the output, copy the volume name of your newly created hard drive (e.g. \\?\Volume{2f823551-0df2-11e6-96ba-806e6f6e6963}) into the configuration variable VOLUME below
+REM   9.  Assign the volume an unused drive letter in the configuration variable DRIVE below
+REM   10. Execute this script
+
+ECHO [Script executed at %DATE%-%TIME%]
+
+REM Volume: Configuration variable
+REM Volume: Unique identifier for the volume; open command prompt and type MOUNTVOL to find the volume name
+REM Volume: E.g. \\?\Volume{2f823551-0df2-11e6-96ba-806e6f6e6963}\
+SET VOLUME=
+
+REM Drive: Configuration variable
+REM Drive: Letter to denote the mount point
+REM Drive: E.g. D
+SET DRIVE=
+
+REM Flesh out configuration variables
+SET DRIVE=%DRIVE%:
+
+REM Check for empty drive
+CALL :CheckUnmounted %DRIVE% RETVAL
+IF %RETVAL% neq 0 (
+  ECHO Error: Drive %DRIVE% is already in use.
+  EXIT /B %RETVAL%
+)
+
+REM Mount and check volume
+MOUNTVOL %DRIVE% %VOLUME%
+CALL :CheckMounted %DRIVE% RETVAl
+IF %RETVAL% neq 0 (
+  ECHO Error: Failed to mount volume on drive %DRIVE%. Errorlevel %RETVAL%.
+  EXIT /B %RETVAL%
+)
+
+REM Add and remove file
+ECHO This file can be deleted.> %DRIVE%\tmp.txt
+DEL %DRIVE%\tmp.txt
+
+REM Unmount volume and check empty drive
+MOUNTVOL %DRIVE% /P
+CALL :CheckUnmounted %DRIVE% RETVAL
+IF %RETVAL% neq 0 (
+  ECHO Error: Failed to unmount volume from drive %DRIVE% . Errorlevel %RETVAL%.
+  EXIT /B %RETVAL%
+)
+
+ECHO [Script finished at %DATE%-%TIME%]
+EXIT /B 0
+
+REM This function checks that a certain drive is mounted.
+REM
+REM Parameters:
+REM   1: Drive letter with trailing colon (e.g. C:)
+REM   2. Return value
+REM     Equals 0 if the drive is mounted
+REM     Equals Non-zero in any other case
+:CheckMounted
+SET DRIVE=%~1
+MOUNTVOL %DRIVE% /L > NUL 2>&1
+SET %~2=%EXITCODE%
+EXIT /B %EXITCODE%
+
+REM This function checks that a certain drive is unmounted.
+REM
+REM Parameters:
+REM   1: Drive letter with trailing colon (e.g. C:)
+REM   2. Return value
+REM     Equals 0 if the drive is not mounted
+REM     Equals 1 in any other case
+:CheckUnmounted
+SET DRIVE=%~1
+SET EXITCODE=1
+MOUNTVOL %DRIVE% /L > NUL 2>&1
+IF %ERRORLEVEL% EQU 1 (  REM Must be immediately after MOUNTVOL
+  SET EXITCODE=0
+)
+SET %~2=%EXITCODE%
+EXIT /B %EXITCODE%


Added BAK file of BHS.

Added BAK file of BHS.

--- Rise_of_Music_Solution/package.bat
+++ Rise_of_Music_Solution/package.bat
@@ -17,4 +17,5 @@
 copy ..\LICENSE Rise_of_Music_target\scenario\Scripts\Rise_of_Music\LICENSE
 copy ..\README.md Rise_of_Music_target\scenario\Scripts\Rise_of_Music\README.md
 copy ..\Rise_of_Music.bhs Rise_of_Music_target\scenario\Scripts\Rise_of_Music\Rise_of_Music.bhs
+copy ..\Rise_of_Music.bhs Rise_of_Music_target\scenario\Scripts\Rise_of_Music\Rise_of_Music.bhs.bak
 copy ..\version.txt Rise_of_Music_target\scenario\Scripts\Rise_of_Music\version.txt


Delete t.bat

Delete t.bat

--- t.bat
+++ t.bat
@@ -1,3 +0,0 @@
-@ECHO OFF
-
-npm run test:single


[Batch] Fail if unknown option is provided.

--- cppbuild/cppbuild.cmd
+++ cppbuild/cppbuild.cmd
@@ -9,50 +9,35 @@
 set "AERON_SKIP_RMDIR="

 for %%o in (%*) do (
-
     if "%%o"=="--help" (
         echo %0 [--c-warnings-as-errors] [--cxx-warnings-as-errors] [--build-aeron-driver] [--link-samples-client-shared] [--build-archive-api] [--skip-rmdir] [--slow-system-tests] [--no-system-tests] [--debug-build] [--help]
         exit /b
-    )
-
-    if "%%o"=="--c-warnings-as-errors" (
+    ) else if "%%o"=="--c-warnings-as-errors" (
         set "EXTRA_CMAKE_ARGS=!EXTRA_CMAKE_ARGS! -DC_WARNINGS_AS_ERRORS=ON"
-    )
-
-    if "%%o"=="--cxx-warnings-as-errors" (
+    ) else if "%%o"=="--cxx-warnings-as-errors" (
         set "EXTRA_CMAKE_ARGS=!EXTRA_CMAKE_ARGS! -DCXX_WARNINGS_AS_ERRORS=ON"
-    )
-
-    if "%%o"=="--build-aeron-driver" (
+    ) else if "%%o"=="--build-aeron-driver" (
         echo "Enabling building of Aeron driver is the default"
-    )
-
-    if "%%o"=="--link-samples-client-shared" (
+    ) else if "%%o"=="--link-samples-client-shared" (
         set "EXTRA_CMAKE_ARGS=!EXTRA_CMAKE_ARGS! -DLINK_SAMPLES_CLIENT_SHARED=ON"
-    )
-
-    if "%%o"=="--build-archive-api" (
+    ) else if "%%o"=="--build-archive-api" (
         echo "Enabling building of Aeron Archive API is the default"
-    )
-
-    if "%%o"=="--skip-rmdir" (
+    ) else if "%%o"=="--skip-rmdir" (
         set "AERON_SKIP_RMDIR=yes"
-    )
-
-    if "%%o"=="--slow-system-tests" (
+    ) else if "%%o"=="--slow-system-tests" (
         set "EXTRA_CMAKE_ARGS=!EXTRA_CMAKE_ARGS! -DAERON_SLOW_SYSTEM_TESTS=ON"
         echo "Enabling slow system tests"
-    )
-
-    if "%%o"=="--no-system-tests" (
+    ) else if "%%o"=="--no-system-tests" (
         set "EXTRA_CMAKE_ARGS=!EXTRA_CMAKE_ARGS! -DAERON_SYSTEM_TESTS=OFF"
         echo "Disabling system tests"
-    )
-
-    if "%%o"=="--debug-build" (
+    ) else if "%%o"=="--debug-build" (
         set "EXTRA_CMAKE_ARGS=!EXTRA_CMAKE_ARGS! -DCMAKE_BUILD_TYPE=Debug"
         set "BUILD_DIR=%DIR%\Debug"
         set "BUILD_CONFIG=Debug"
+    ) else (
+        echo "Unknown option %%o"
+        echo "Use --help for help"
+        exit /b 1
     )
 )


update windows install due to hostname (part 2)

--- os/windows32/bin/setenv.bat
+++ os/windows32/bin/setenv.bat
@@ -5,7 +5,7 @@
 rem Author: Dan Harms <dan.harms@xrtrading.com>
 rem Created: Thursday, December  5, 2019
 rem Version: 1.0
-rem Modified Time-stamp: <2019-12-06 11:32:09 Dan.Harms>
+rem Modified Time-stamp: <2019-12-06 16:16:48 Dan.Harms>
 rem Modified by: Dan.Harms
 rem Keywords:

@@ -21,6 +21,7 @@
 setx GIT_DIR "C:\Program Files\Git"
 setx FIND_EXE "%GIT_DIR%\usr\bin\find"
 setx GREP_EXE "%GIT_DIR%\usr\bin\grep"
+setx HOSTNAME_EXE "%MSYS_DIR%\hostname"
 setx TAR_EXE "%GIT_DIR%\usr\bin\tar"
 setx PUTTY_DIR "%ChocolateyInstall%\bin"


wrong package name

wrong package name

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

--- scripts/windows/scheduler/scheduler.bat
+++ scripts/windows/scheduler/scheduler.bat
@@ -35,7 +35,7 @@

 rem This program will enable you to launch the scheduler daemon

-%JAVA_CMD% org.objectweb.proactive.examples.scheduler.LocalSchedulerExample %SCHEDULER_URL% %RM%
+%JAVA_CMD% org.objectweb.proactive.extra.scheduler.examples.LocalSchedulerExample %SCHEDULER_URL% %RM%
 ENDLOCAL

 :end


Switching-off (unneeded) parallelism for windows build

--- recipes/pyxtensor-feedstock/bld.bat
+++ recipes/pyxtensor-feedstock/bld.bat
@@ -4,7 +4,7 @@
 mkdir build
 cd build

-cmake -G"NMake Makefiles JOM" ^
+cmake -G"NMake Makefiles" ^
   -DCMAKE_INSTALL_PREFIX:PATH="%LIBRARY_PREFIX%" ^
   -DCMAKE_PREFIX_PATH:PATH="%LIBRARY_PREFIX%" ^
   -DCMAKE_BUILD_TYPE:STRING=Release ^


strip usernames from source

strip usernames from source

--- resources/stage_0_prep/stage_0_prep.bat
+++ resources/stage_0_prep/stage_0_prep.bat
@@ -66,7 +66,7 @@
 call :log "%CUR_DATE% %TIME%    Done."

-:: JOB: Get pre-Tron system state (installed programs, complete file list). Thanks to /u/Reverent for building this section
+:: JOB: Get pre-Tron system state (installed programs, complete file list)
 title TRON v%SCRIPT_VERSION% [stage_0_prep] [Analyze System State]
 call :log "%CUR_DATE% %TIME%    Generating pre-run system profile..."
 if /i %DRY_RUN%==no (