Allow the batch file to be used from other directories (like running ..\build from MonoRail dir)

git-svn-id: bab0c2de90ee11a20376049c2cdee62584491f34@5610 73e77b4c-caa6-f847-a29a-24ab75ae54b6

--- build.cmd
+++ build.cmd
@@ -15,13 +15,22 @@
 REM limitations under the License.
 REM ****************************************************************************

+IF "%~dp0"=="%CD%\" goto checkargs
+goto normal
+
+:checkargs
 IF "%~1"=="" goto quick

 :normal
-%~dp0SharedLibs\build\NAnt\bin\NAnt.exe -t:net-3.5 -D:nunit-console=%~dp0SharedLibs\build\NUnit\bin\nunit-console.exe -buildfile:default.build %*
+%~dp0SharedLibs\build\NAnt\bin\NAnt.exe -t:net-3.5 -D:nunit-console=%~dp0SharedLibs\build\NUnit\bin\nunit-console.exe %*
 goto end

 :quick
-%~dp0SharedLibs\build\NAnt\bin\NAnt.exe -t:net-3.5 -D:nunit-console=%~dp0SharedLibs\build\NUnit\bin\nunit-console.exe -buildfile:default.build quick release clean build
+%~dp0SharedLibs\build\NAnt\bin\NAnt.exe -t:net-3.5 -D:nunit-console=%~dp0SharedLibs\build\NUnit\bin\nunit-console.exe quick release clean build
+goto end

-:end+:test
+ECHO test!
+
+:end
+


Used msbuild via variable for better readability build parameters

--- build.cmd
+++ build.cmd
@@ -4,4 +4,6 @@
    set config=Release
 )

-%WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild build.proj /p:Configuration="%config%" /t:Compile /m /v:M /fl /flp:LogFile=msbuild.log;Verbosity=Normal /nr:false+SET msbuild="%windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe"
+
+%msbuild% build.proj /p:Configuration="%config%" /t:Compile /m /v:M /fl /flp:LogFile=msbuild.log;Verbosity=Normal /nr:false


Update `build.cmd` to match latest template - aspnet/Universe#347 - `%KOREBUILD_VERSION%` doesn't work without this fix

--- build.cmd
+++ build.cmd
@@ -28,12 +28,11 @@
     copy %CACHED_NUGET% %NUGET_PATH% > nul
 )

+SET KOREBUILD_DOWNLOAD_ARGS=
+IF NOT "%KOREBUILD_VERSION%"=="" (
+    SET KOREBUILD_DOWNLOAD_ARGS=-version %KOREBUILD_VERSION%
+)
 IF NOT EXIST %KOREBUILD_FOLDER% (
-    SET KOREBUILD_DOWNLOAD_ARGS=
-    IF NOT "%KOREBUILD_VERSION%"=="" (
-        SET KOREBUILD_DOWNLOAD_ARGS=-version %KOREBUILD_VERSION%
-    )
-
     %BUILD_FOLDER%\nuget.exe install KoreBuild-dotnet -ExcludeVersion -o %BUILD_FOLDER% -nocache -pre %KOREBUILD_DOWNLOAD_ARGS%
 )


commit on 02/06/2018 at 17:06:39

commit on 02/06/2018 at 17:06:39

--- ansys-APDL/transverseCrack.cmd
+++ ansys-APDL/transverseCrack.cmd
@@ -101,6 +101,8 @@
 ASEL, S, 4
 AATT, 2

+ALLSEL
+
 ! Seed the edges
 ! LESIZE, NL1, SIZE, ANGSIZ, NDIV, SPACE, KFORC, LAYER1, LAYER2, KYNDIV
 LESIZE, 1, elSize


Fix typo in Windows elasticsearch-env script

This commit fixes a simple typo in the Windows version of the
elasticsearch-env script; this typo is harmless as it appears in a
comment.

--- distribution/src/main/resources/bin/elasticsearch-env.bat
+++ distribution/src/main/resources/bin/elasticsearch-env.bat
@@ -1,6 +1,6 @@
 set SCRIPT=%0

-rem determine Elasticsearch home; to do this, we strip from the path util we
+rem determine Elasticsearch home; to do this, we strip from the path until we
 rem find bin, and then strip bin (there is an assumption here that there is no
 rem nested directory under bin also named bin)
 for %%I in (%SCRIPT%) do set ES_HOME=%%~dpI


Create bld.bat

Create bld.bat

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

--- recipes/ad3/bld.bat
+++ recipes/ad3/bld.bat
@@ -0,0 +1,8 @@
+cmake -G "NMake Makefiles"  -D CMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% %SRC_DIR%
+if errorlevel 1 exit 1
+
+nmake
+if errorlevel 1 exit 1
+
+nmake install
+if errorlevel 1 exit 1


adding bat script to start Yamcs on Windows

error: pathspec 'yamcs-core/bin/yamcs-server.bat' did not match any file(s) known to git

--- yamcs-core/bin/yamcs-server.bat
+++ yamcs-core/bin/yamcs-server.bat
@@ -0,0 +1,19 @@
+@echo off
+
+if "%OS%"=="Windows_NT" @setlocal
+
+rem %~dp0 is expanded pathname of the current script under NT
+set BASE=%~dp0..
+echo %BASE%
+set YAMCS_HOME=%BASE%
+
+set LOCALCLASSPATH=
+for %%i in ("%BASE%\lib\*.jar") do call "%BASE%\bin\lcp.bat" %%i
+set LOCALCLASSPATH=%LOCALCLASSPATH%;%BASE%\etc
+
+
+set JAVA=java.exe
+set JAVA_ARGS=-client -classpath "%LOCALCLASSPATH%" -Xmx300M
+%JAVA% %JAVA_ARGS% org.yamcs.YamcsServer
+
+if "%OS%"=="Windows_NT" @endlocal


Fixed uninstall issue.

Fixed uninstall issue.

--- CompareShellExtension/Install.bat
+++ CompareShellExtension/Install.bat
@@ -44,8 +44,8 @@
 ECHO Uninstalling...
 TASKKILL /F /IM explorer.exe
 %REGASM% "%DLLPATH%" /unregister
+explorer.exe
 RD /S /Q "%PRODUCTPATH%"
-explorer.exe
 GOTO End

 :End


SVN-Revision: 702

--- software/formbuilder/build_with_dev_properties.bat
+++ software/formbuilder/build_with_dev_properties.bat
@@ -1,4 +1,4 @@
-ant build-all -DCADSR.DS.URL="jdbc:oracle:thin:@ncidb-dsr-d:1551:DSRDEV" -DCADSR.DS.USER=FORMBUILDER -DCADSR.DS.PSWD=formbuilder
+ant build-all -DCADSR.DS.URL="ncidb-dsr-d:1551:DSRDEV" -DCADSR.DS.USER=FORMBUILDER -DCADSR.DS.PSWD=formbuilder


Cosmetic improvements to win deployment script [ci skip]

--- src/xpiks-qt/deployment/deploy_win.cmd
+++ src/xpiks-qt/deployment/deploy_win.cmd
@@ -1,7 +1,7 @@
 echo 'Starting deployment...'

 set XPIKS_PLATFORM=x64
-set XPIKS_VERSION=1.5.0.beta
+set XPIKS_VERSION=1.5.0
 set APP_NAME=Xpiks

 rem deploy dir should be "Xpiks" in order to have it nicely zipped in the end
@@ -59,6 +59,7 @@
 del %DEPLOY_DIR_NAME%\libexiv2.dll
 del %DEPLOY_DIR_NAME%\libexpat.dll
 del %DEPLOY_DIR_NAME%\dmg-background.jpg
+del %DEPLOY_DIR_NAME%\translations\*.ts
 rem need to remove exiftool/ dir as well

 echo 'Packing binaries...'


modify note

modify note

--- sharding-distribution/sharding-proxy-distribution/src/main/resources/bin/start.bat
+++ sharding-distribution/sharding-proxy-distribution/src/main/resources/bin/start.bat
@@ -1,19 +1,19 @@
-#
-# 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.
-#
+@rem
+@rem Licensed to the Apache Software Foundation (ASF) under one or more
+@rem contributor license agreements.  See the NOTICE file distributed with
+@rem this work for additional information regarding copyright ownership.
+@rem The ASF licenses this file to You under the Apache License, Version 2.0
+@rem (the "License"); you may not use this file except in compliance with
+@rem 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, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem

 @echo off & setlocal enabledelayedexpansion


moving directories around

moving directories around

--- tests/Grace.Tests/CodeCoverageAppVeyor.cmd
+++ tests/Grace.Tests/CodeCoverageAppVeyor.cmd
@@ -1,16 +1,16 @@
 @echo off

 SET dotnet="C:/Program Files/dotnet/dotnet.exe"
-SET opencover=.\tools\OpenCover.4.6.519\tools\OpenCover.Console.exe
-SET coveralls=.\tools\coveralls.net.0.412\tools\csmacnz.Coveralls.exe
+SET opencover=..\..\tools\OpenCover.4.6.519\tools\OpenCover.Console.exe
+SET coveralls=..\..\tools\coveralls.net.0.412\tools\csmacnz.Coveralls.exe

 SET targetargs="test"
 SET filter="+[*]Grace.* -[Grace.Tests]* -[xunit.*]* "
 SET coveragefile=Coverage.xml
 SET coveragedir=Coverage

-nuget install OpenCover -Version 4.6.519 -OutputDirectory tools
-nuget install coveralls.net -Version 0.412.0 -OutputDirectory tools
+nuget install OpenCover -Version 4.6.519 -OutputDirectory ..\..\tools
+nuget install coveralls.net -Version 0.412.0 -OutputDirectory ..\..\tools

 REM Run code coverage analysis
 %opencover% -oldStyle -register:user -target:%dotnet% -output:%coveragefile% -targetargs:%targetargs% -filter:%filter% -skipautoprops -hideskipped:All


add script for adding host

add script for adding host

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

--- batch/addhost.bat
+++ batch/addhost.bat
@@ -0,0 +1,15 @@
+@echo off
+setlocal enabledelayedexpansion
+
+:loop
+set host=
+set ip=
+set /p host=pls specify host string, quit to exit:
+if not defined host goto :loop
+if "!host!" equ "quit" goto :exit
+set /p ip=pls specify ip address for host !host!:
+if not defined ip goto :loop
+goto :loop
+
+:exit
+endlocal


fixes for release generation under Windows

--- scripts/package_win.bat
+++ scripts/package_win.bat
@@ -5,17 +5,7 @@
 REM create package
 cmake --build . --config Release --target PACKAGE -- /m /nologo /verbosity:n

-set mode=%1
-set version=%2
-set platform=%3
-
-IF %mode% == "ON" (
-  embree_zip=embree-${EMBREE_VERSION}.%platform%.windows.zip
-  @echo  "<DartMeasurementFile name=\"%embree_zip%\" type=\"file\">%embree_zip%</DartMeasurementFile>"
-) ELSE (
-  embree_installer=embree-${EMBREE_VERSION}.%platform%.exe
-  @echo  "<DartMeasurementFile name=\"%embree_installer%\" type=\"file\">%embree_installer%</DartMeasurementFile>"
-)
+@echo "<DartMeasurementFile name="%1" type="file">%1</DartMeasurementFile>"

 :abort
 endlocal


set compilation level to ADVANCED_OPTIMIZATIONS

--- build/compile.bat
+++ build/compile.bat
@@ -1,3 +1,3 @@
-java -jar GoogleClosureCompiler.jar --language_in=ECMASCRIPT6_STRICT --language_out=ES5_STRICT --js_output_file=%1 %2
+java -jar GoogleClosureCompiler.jar --language_in=ECMASCRIPT6_STRICT --language_out=ES5_STRICT --compilation_level=ADVANCED_OPTIMIZATIONS --js_output_file=%1 %2
 java -jar AddUserscriptLines.jar %1 %2 %3
-java -jar BeautifyScript.jar %2+java -jar BeautifyScript.jar %2


git-svn-id: svn://scm.gforge.inria.fr/svn/openvibe@1748 c330d7e9-fc0c-0410-a5b3-fd85c6f5aa8f

--- scripts/win32-build.cmd
+++ scripts/win32-build.cmd
@@ -46,10 +46,10 @@
 	IF NOT "!ERRORLEVEL!" == "0" goto terminate_error

 	REM nmake OpenViBE-documentation
-	IF NOT "!ERRORLEVEL!" == "0" goto terminate_error
+	REM IF NOT "!ERRORLEVEL!" == "0" goto terminate_error

 	nmake install
-	IF NOT "!ERRORLEVEL!" == "0" goto terminate_error
+	REM IF NOT "!ERRORLEVEL!" == "0" goto terminate_error

 	cd %saved_directory%
 )


nothing in path

nothing in path

--- build-release.bat
+++ build-release.bat
@@ -5,7 +5,6 @@
 bootstrap\fullbuild install || goto :ko
 bootstrap\fullbuild add-view fullbuild * || goto :ko
 bootstrap\fullbuild rebuild fullbuild || goto :ko
-bootstrap\fullbuild test * || goto :ko
 goto :ok

 :ok


* removing pause from the build script to make it work with AppVeyor

--- build.bat
+++ build.bat
@@ -1,5 +1,4 @@
 @echo off
 cls
 "tools\nuget\nuget.exe" "install" "FAKE" "-OutputDirectory" "tools" "-ExcludeVersion"
-"tools\FAKE\tools\Fake.exe" build.fsx
-pause+"tools\FAKE\tools\Fake.exe" build.fsx


Added build script

Added build script

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

--- build.bat
+++ build.bat
@@ -0,0 +1,4 @@
+@echo off
+title Charlatano Builder
+gradlew charlatano
+pause


Disable Parallel Build Tests

Disable Parallel Build Tests

Parallelism is bad for our CPU Intensive tests.
Also disabling parallelism does not appear to lengthen the build time

Signed-off-by: Dave_Goddard <a5692579077bf98cb035292473fe12572309d028@pivotal.io>

--- build.bat
+++ build.bat
@@ -17,7 +17,7 @@
 for /F "tokens=1* delims= " %%a in ("%*") do set BUILDARGS=%%b
 if "%BUILDARGS%"=="" set BUILDARGS=/verbosity:minimal

-%MSBUILD% /nologo /m /nr:false /t:%TARGET% %BUILDARGS% %~dp0build/build.proj
+%MSBUILD% /nologo /nr:false /t:%TARGET% %BUILDARGS% %~dp0build/build.proj

 if errorlevel 1 goto Error_BuildFailed


Add a build.bat for MyGet Build service

Add a build.bat for MyGet Build service

--- build.bat
+++ build.bat
@@ -0,0 +1,23 @@
+@echo Off
+set config=%1
+if "%config%" == "" (
+   set config=Release
+)
+
+set version=1.0.0
+if not "%PackageVersion%" == "" (
+   set version=%PackageVersion%
+)
+
+set nuget=
+if "%nuget%" == "" (
+	set nuget=nuget
+)
+
+%WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild src\Yotpo.Net.csproj /p:Configuration="%config%" /m /v:M /fl /flp:LogFile=msbuild.log;Verbosity=diag /nr:false
+
+mkdir Build
+mkdir Build\lib
+mkdir Build\lib\net40
+
+%nuget% pack "src\Yotpo.Net.nuspec" -NoPackageAnalysis -verbosity detailed -o Build -Version %version% -p Configuration="%config%"


Added package restore to build.bat

Added package restore to build.bat

--- build.bat
+++ build.bat
@@ -14,10 +14,11 @@
 	set nuget=nuget
 )

+%nuget% restore src\ShuffleBag.sln
+
 %WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild src\ShuffleBag.sln /p:Configuration="%config%" /m /v:M /fl /flp:LogFile=msbuild.log;Verbosity=diag /nr:false

 mkdir Build
 mkdir Build\lib
-mkdir Build\lib\net40

 %nuget% pack "src\ShuffleBag.nuspec" -NoPackageAnalysis -verbosity detailed -o Build -Version %version% -p Configuration="%config%"


* Fixed build.bat to not echo comments.

* Fixed build.bat to not echo comments.

--- build.bat
+++ build.bat
@@ -1,3 +1,5 @@
+@echo off
+
 REM ELMAH - Error Logging Modules and Handlers for ASP.NET
 REM Copyright (c) 2007 Atif Aziz. All rights reserved.
 REM
@@ -39,7 +41,6 @@
 REM and which is expected to be located in the standard installation
 REM directory.

-@echo off
 pushd "%~dp0"
 setlocal
 set DEVENV70EXE=%ProgramFiles%\Microsoft Visual Studio .NET\Common7\IDE\devenv.com


++version

++version

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

 cd ..\builder
-call build chrlauncher 2.5.7
+call build chrlauncher 2.6

 pause


Add path white spaces support

Add path white spaces support

--- build.cmd
+++ build.cmd
@@ -12,18 +12,18 @@
 md artifacts\proxies\clr

 :: --- Selenide --- ::
-cd %RootDirectory%src\bin\
-for /r %%f in (*.*) do copy %%f "%RootDirectory%artifacts"
-cd %RootDirectory%
+cd "%RootDirectory%src\bin\"
+for /r %%f in (*.*) do copy "%%f" "%RootDirectory%artifacts"
+cd "%RootDirectory%"

-cd %RootDirectory%artifacts
+cd "%RootDirectory%artifacts"
 set proxygenParameters=
 for %%f in (*.jar) do ( if /I "%%f" neq "selenide-4.4.3.jar" ( if "%%f" neq "selenide-4.4.3.proxies.clr.jar" (set proxygenParameters=!proxygenParameters!.\artifacts\%%f;) else (echo %%f)))
 set proxygenParameters=%proxygenParameters:~0,-1%
-cd %RootDirectory%
+cd "%RootDirectory%"

 :: --- jni4net --- ::
-xcopy /E /Y %RootDirectory%bin-%j4n_version%\*.* artifacts
+xcopy /E /Y "%RootDirectory%bin-%j4n_version%\*.*" artifacts

 :: --- Go! --- ::
 artifacts\proxygen.exe artifacts\selenide-4.4.3.jar -wd artifacts\proxies -cp "%proxygenParameters%"
@@ -34,7 +34,7 @@
 xcopy selenide-4.4.3.j4n.jar ..

 :: Demo Test app ::
-"C:\Program Files (x86)\MSBuild\%MSBuildVersion%\Bin\MSBuild" %RootDirectory%test\TestSelenideForNet\TestSelenideForNet.csproj /t:Rebuild /property:Configuration=Debug /property:Platform="x64"
+"C:\Program Files (x86)\MSBuild\%MSBuildVersion%\Bin\MSBuild" "%RootDirectory%test\TestSelenideForNet\TestSelenideForNet.csproj" /t:Rebuild /property:Configuration=Debug /property:Platform="x64"

 cd ..
 TestSelenideForNet


Specify build configuration and logging

Specify build configuration and logging

--- build.cmd
+++ build.cmd
@@ -2,7 +2,7 @@
 setlocal
 if "%VS120COMNTOOLS%"=="" GOTO NOTOOLS
 call "%VS120COMNTOOLS%\VsDevCmd.bat"
-msbuild .\PSScriptAnalyzer.sln
+msbuild .\PSScriptAnalyzer.sln  /p:Configuration=Debug /l:FileLogger,Microsoft.Build.Engine;logfile=PSScriptAnalyzer_Build.log;append=true
 if NOT [%ERRORLEVEL%]==[0] pause

 GOTO END


Update K_BUILD_VERSION/kre/KRE/.k => DNX_BUILD_VERSION/dnx/DNX/.dnx.

--- build.cmd
+++ build.cmd
@@ -1,4 +1,4 @@
-@echo off
+@echo off
 cd %~dp0

 SETLOCAL
@@ -19,7 +19,7 @@
 .nuget\NuGet.exe install KoreBuild -ExcludeVersion -o packages -nocache -pre
 .nuget\NuGet.exe install Sake -version 0.2 -o packages -ExcludeVersion

-IF "%SKIP_KRE_INSTALL%"=="1" goto run
+IF "%SKIP_DNX_INSTALL%"=="1" goto run
 CALL packages\KoreBuild\build\kvm upgrade -runtime CLR -x86
 CALL packages\KoreBuild\build\kvm install default -runtime CoreCLR -x86


Address log file generation (#3)

Address log file generation (#3)

--- build.cmd
+++ build.cmd
@@ -737,6 +737,8 @@
 )

 echo ---------------- Done with package restore, starting proto ------------------------
+set logdir=%~dp0%BUILD_CONFIG%\net40\
+if not exist "!logdir!" mkdir "!logdir!"

 rem Build Proto
 if "%BUILD_PROTO%" == "1" (


added restore to build.cmd

added restore to build.cmd

--- build.cmd
+++ build.cmd
@@ -27,6 +27,7 @@
 for %%F in (%KPM_PATH%) do set KPM_DIR=%%~dpF

 cd src\FSharpSupport
+kpm restore

 SET ERRORLEVEL=
 echo klr --lib "%KPM_DIR%;%KPM_DIR%\lib\Microsoft.Framework.PackageManager;%~dp0\packages\FSharpSupport\lib\net45" "Microsoft.Framework.PackageManager" build


Sending build batch script tail args to MSBUILD

--- build.cmd
+++ build.cmd
@@ -7,6 +7,6 @@
     echo machine, which is required to build the solution.
     exit /b 1
 )
-for %%i in (debug release) do "%MSBUILDEXE%" "MoreLinq.sln" /p:Configuration=%%i
-if "%1"=="all" for %%i in (debug release) do "%MSBUILDEXE%" MoreLinq.Silverlight.sln /p:Configuration=%%i
-if "%1"=="docs" "%MSBUILDEXE%" MoreLinq.shfbproj
+for %%i in (debug release) do "%MSBUILDEXE%" "MoreLinq.sln" /p:Configuration=%%i %*
+if "%1"=="all" for %%i in (debug release) do "%MSBUILDEXE%" MoreLinq.Silverlight.sln /p:Configuration=%%i %*
+if "%1"=="docs" "%MSBUILDEXE%" MoreLinq.shfbproj %*


build boost only manually

build boost only manually

--- build_all_big.bat
+++ build_all_big.bat
@@ -1,4 +1,4 @@
-cmd /c build_boost.bat
+rem cmd /c build_boost.bat
 cmd /c build_geos.bat
 cmd /c build_luabind.bat
 cmd /c build_stxxl.bat


reduced line lengths

reduced line lengths

--- pySwitch.bat
+++ pySwitch.bat
@@ -10,7 +10,7 @@
 ) else (
     echo.
     echo   %~n0 needs elevated permissions
-    echo   ...to be able to modify the global PATH variable ^(Windows Registry^)
+    echo   ...to be able to modify the global PATH variable ^(Windows Registry^)
     echo.
     echo   Please start with "Run as administrator"
     echo.
@@ -20,7 +20,9 @@
 :: -- Get Global Path --
 set KEY_NAME=HKLM\SYSTEM\CurrentControlSet\Control\Session Manager\Environment
 set VALUE_NAME=Path
-FOR /F "tokens=2*" %%A IN ('REG.exe query "%KEY_NAME%" /v "%VALUE_NAME%"') DO (set globalPath=%%B)
+FOR /F "tokens=2*" %%A IN ('REG.exe query "%KEY_NAME%" /v "%VALUE_NAME%"') DO (
+    set globalPath=%%B
+)

 :: -- Read Config File --
 set configFile=%~dp0config.txt
@@ -79,6 +81,9 @@
 CHOICE /C %cstr% /M "-> Make your choice:" /N

 :: -- MAIN: ERRORLEVELS in decreasing order --
+set KEY_NAME=HKLM\SYSTEM\CurrentControlSet\Control\Session Manager\Environment
+set KEY_TYPE=REG_EXPAND_SZ
+set VALUE_NAME=Path
 SET /A lvl=!ubound!+1
 for /l %%n in (!ubound!,-1,0) do (
     for /f "tokens=1,2 delims==" %%r IN ("!arr[%%n]!") do (
@@ -90,7 +95,7 @@
             ) else (
                 set add=
             )
-            REG ADD "HKLM\SYSTEM\CurrentControlSet\Control\Session Manager\Environment" /v Path /t REG_EXPAND_SZ /d "!add!%globalPath%" /f >nul
+            REG ADD "%KEY_NAME%" /v "%VALUE_NAME%" /t %KEY_TYPE% /d "!add!%globalPath%" /f >nul
             echo.
             echo    You now use "!key!". Have Fun^^!
             GOTO RefreshUserEnvironment
@@ -103,7 +108,9 @@
 :RefreshUserEnvironment
 set KEY_NAME=HKCU\Environment
 set VALUE_NAME=Path
-FOR /F "tokens=2*" %%A IN ('REG.exe query "%KEY_NAME%" /v "%VALUE_NAME%"') DO (set userPath=%%B)
+FOR /F "tokens=2*" %%A IN ('REG.exe query "%KEY_NAME%" /v "%VALUE_NAME%"') DO (
+    set userPath=%%B
+)
 SetX %VALUE_NAME% "%userPath%" >nul
 ping 1.1.1.1 -n 1 -w 2000 > nul
 Goto End


msbuild for bullet

msbuild for bullet

--- third_party/build_libs.bat
+++ third_party/build_libs.bat
@@ -3,8 +3,7 @@
 # bullet
 cd bullet
 ../../tools/premake/premake5 vs2017 --platform_dir="win32"
-
 cd build/win32
-make config=debug
-make config=release
+msbuild bullet_monolithic.sln /p:Configuration=Debug
+msbuild bullet_monolithic.sln /p:Configuration=Release
 cd ../../..


Add --retry to test-all [skip ci]

Add --retry to test-all [skip ci]

--- pkg_build_64.cmd
+++ pkg_build_64.cmd
@@ -44,7 +44,7 @@
 @echo.
 @echo ---------------------------------------------------------------------- Running Tests
 @echo test-all
-@make.exe "TESTOPTS=-v -j%M_JOBS% --job-status=normal --show-skip" test-all > %LOG_PATH_NAME%-test-all.log 2>&1
+@make.exe "TESTOPTS=-v -j%M_JOBS% --job-status=normal --show-skip --retry" test-all > %LOG_PATH_NAME%-test-all.log 2>&1
 @rem make.exe "TESTOPTS=-v --show-skip" test-all > %LOG_PATH_NAME%-test-all.log 2>&1

 @rem --------------------------------------------------------- btest, test-basic


updating to bintray

updating to bintray

--- bootstrap/win32/engage.cmd
+++ bootstrap/win32/engage.cmd
@@ -17,12 +17,12 @@
 SET OOMPH_NAME=oomphInstaller
 SET DOWNLOAD_LOCATION=%SCRIPT_PATH%\download

-SET ECLIPSE_INSTALLER_WEB=http://peterkir.github.io/org.eclipse.oomph/peterkir/products
+SET ECLIPSE_INSTALLER_WEB=https://dl.bintray.com/peterkir/generic/org.eclipse.oomph/1.3.0/peterkir/164/products
 SET ECLIPSE_INSTALLER_ARCHIVE=org.eclipse.oomph.setup.installer.product-win32.win32.x86_64.zip
 SET ECLIPSE_INSTALLER=%ECLIPSE_INSTALLER_ARCHIVE:~0,-4%

-::SET JAVA_WEB=https://s3-eu-west-1.amazonaws.com/klib.io/www/_archives/java/zipped/1.8
-SET JAVA_WEB=http://jazz01.rd.corpintra.net/web/repo/_archives/java/zipped/1.8
+SET JAVA_WEB=https://s3-eu-west-1.amazonaws.com/klib.io/www/_archives/java/zipped/1.8
+::SET JAVA_WEB=http://jazz01.rd.corpintra.net/web/repo/_archives/java/zipped/1.8
 SET JAVA_ARCHIVE=win32.x86_64-jre1.8.0_60.zip
 SET JAVA=%JAVA_ARCHIVE:~13,-4%


Non-critical patch for correct installer script execution on x64 Windows
Patch by sharky72

git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C74629

--- setup/build_version.bat
+++ setup/build_version.bat
@@ -18,6 +18,9 @@
 GOTO :EndGood

 :GoodPaths
+SET ProgFiles=%ProgramFiles%
+IF /i "%PROCESSOR_ARCHITECTURE%" == "AMD64" SET ProgFiles=%ProgramFiles(x86)%
+
 SET BUILDTYPE=/%1
 IF "%1"=="" SET BUILDTYPE=/rebuild
 rem IF "%1"=="build" SET BUILDTYPE=
@@ -38,8 +41,8 @@
 devenv /nologo vld_vs10.sln %BUILDTYPE% "Release|x64" /Project vld
 IF %ERRORLEVEL% NEQ 0 GOTO EndBad

-if not exist "%ProgramFiles%\NSIS\makensis.exe" GOTO EndBad
-"%ProgramFiles%\NSIS\makensis.exe" /V3 setup\vld-setup.nsi
+if not exist "%ProgFiles%\NSIS\makensis.exe" GOTO EndBad
+"%ProgFiles%\NSIS\makensis.exe" /V3 setup\vld-setup.nsi
 IF %ERRORLEVEL% NEQ 0 GOTO EndBad
 CD setup


Updated clean script

Updated clean script

--- clean.cmd
+++ clean.cmd
@@ -8,6 +8,9 @@

 rmdir /Q /S dependencies\FileSystem.DotNetFx\bin
 rmdir /Q /S dependencies\FileSystem.DotNetFx\obj
+
+rmdir /Q /S dependencies\FileSystem.Uwp\bin
+rmdir /Q /S dependencies\FileSystem.Uwp\obj

 rmdir /Q /S dependencies\FileWriter.Dxf\bin
 rmdir /Q /S dependencies\FileWriter.Dxf\obj


Improve error detection of dependency bat file.

--- SMP/project_get_dependencies.bat
+++ SMP/project_get_dependencies.bat
@@ -13,8 +13,8 @@
 IF "%MSVC_VER%"=="" (
     git status >NUL 2>&1
     IF %ERRORLEVEL% NEQ 0 (
-      ECHO A working copy of git was not found. To use this script you must first install git for windows.
-      EXIT /B 1
+        ECHO A working copy of git was not found. To use this script you must first install git for windows.
+        GOTO exitOnError
     )
 )

@@ -30,9 +30,9 @@
     ECHO !PASSDEPENDENCIES! | FINDSTR /C:"%%I" >NUL 2>&1 || (
         REM Check if MSVC_VER environment variable is set
         IF "%MSVC_VER%"=="" (
-            CALL :cloneOrUpdateRepo "%%I" || GOTO exit
+            CALL :cloneOrUpdateRepo "%%I" || GOTO exitOnError
         ) ELSE (
-            CALL :downloadLibs "%%I" || GOTO exit
+            CALL :downloadLibs "%%I" || GOTO exitOnError
         )
     )
 )
@@ -67,6 +67,10 @@
     REM Clone from the origin repo
     SET REPOURL=%UPSTREAMURL%/%REPONAME%.git
     git clone !REPOURL! --quiet
+    IF %ERRORLEVEL% NEQ 0 (
+        ECHO %REPONAME%: Git clone failed.
+        GOTO exitOnError
+    )
     REM Initialise autocrlf options to fix cross platform interoperation
     REM  Once updated the repo needs to be reset to correct the local line endings
     cd %REPONAME%


Updated InnoSetup and Visual Studio executables

--- Setup/Publish.cmd
+++ Setup/Publish.cmd
@@ -6,11 +6,10 @@
 SET  FILES_EXECUTABLE="..\Binaries\MagiWol.exe" "..\Binaries\wol.exe"
 SET       FILES_OTHER="..\Binaries\ReadMe.txt" "..\Binaries\License.txt"

+SET   COMPILE_TOOL_16="%PROGRAMFILES(X86)%\Microsoft Visual Studio\2019\Community\Common7\IDE\devenv.exe"
 SET   COMPILE_TOOL_15="%PROGRAMFILES(X86)%\Microsoft Visual Studio\2017\Community\Common7\IDE\devenv.exe"
-SET   COMPILE_TOOL_14="%PROGRAMFILES(X86)%\Microsoft Visual Studio 14.0\Common7\IDE\devenv.exe"
-SET  COMPILE_TOOL_14E="%PROGRAMFILES(X86)%\Microsoft Visual Studio 14.0\Common7\IDE\WDExpress.exe"
-
-SET        SETUP_TOOL="%PROGRAMFILES(x86)%\Inno Setup 5\iscc.exe"
+
+SET        SETUP_TOOL="%PROGRAMFILES(x86)%\Inno Setup 6\iscc.exe"

 SET       SIGN_TOOL_1="%PROGRAMFILES(X86)%\Microsoft SDKs\ClickOnce\SignTool\signtool.exe"
 SET       SIGN_TOOL_2="%PROGRAMFILES(X86)%\Windows Kits\10\App Certification Kit\signtool.exe"
@@ -26,28 +25,23 @@
 ECHO --- DISCOVER TOOLS
 ECHO.

-IF EXIST %COMPILE_TOOL_15% (
-    ECHO Visual Studio 2017
-    SET COMPILE_TOOL=%COMPILE_TOOL_15%
-) ELSE (
-    IF EXIST %COMPILE_TOOL_14% (
-        ECHO Visual Studio 2015
-        SET COMPILE_TOOL=%COMPILE_TOOL_14%
-    ) ELSE (
-        IF EXIST %COMPILE_TOOL_14E% (
-            ECHO Visual Studio Express 2015
-            SET COMPILE_TOOL=%COMPILE_TOOL_14E%
-        ) ELSE (
-            ECHO Cannot find Visual Studio^^!
-            PAUSE && EXIT /B 255
-        )
+IF EXIST %COMPILE_TOOL_16% (
+    ECHO Visual Studio 2019
+    SET COMPILE_TOOL=%COMPILE_TOOL_16%
+) ELSE (
+    IF EXIST %COMPILE_TOOL_15% (
+        ECHO Visual Studio 2017
+        SET COMPILE_TOOL=%COMPILE_TOOL_15%
+    ) ELSE (
+		ECHO Cannot find Visual Studio^^!
+		PAUSE && EXIT /B 255
     )
 )

 IF EXIST %SETUP_TOOL% (
-    ECHO Inno Setup 5
-) ELSE (
-    ECHO Cannot find Inno Setup 5^^!
+    ECHO Inno Setup 6
+) ELSE (
+    ECHO Cannot find Inno Setup 6^^!
     PAUSE && EXIT /B 255
 )


Update MySqlInstall.bat

Update MySqlInstall.bat

--- Source/AppVeyor/MySqlInstall.bat
+++ Source/AppVeyor/MySqlInstall.bat
@@ -10,13 +10,13 @@
 REM "C:\Program Files\MySql\MySQL Server 5.7\bin\mysql.exe" -h localhost -u root -pPassword12! ace_auth < database\updates\auth\changeme.sql

 REM execute Update Scripts for Shard Database
-"C:\Program Files\MySql\MySQL Server 5.7\bin\mysql.exe" -h localhost -u root -pPassword12! ace_shard < database\updates\shard\08-20-2017-vw-ace-wielded-object.sql
+"C:\Program Files\MySql\MySQL Server 5.7\bin\mysql.exe" -h localhost -u root -pPassword12! ace_shard < database\updates\shard\2017-08-20-00-vw-ace-wielded-object.sql

 REM Download latest ACE-World database, extract and import it
-appveyor DownloadFile https://github.com/ACEmulator/ACE-World/releases/download/v0.2.3/ACE-World-db-v0.2.3.sql.zip
-7z x ACE-World-db-v0.2.3.sql.zip
-"C:\Program Files\MySql\MySQL Server 5.7\bin\mysql.exe" -h localhost -u root -pPassword12! ace_world < ACE-World-db-v0.2.3.sql
+appveyor DownloadFile https://github.com/ACEmulator/ACE-World/releases/download/v0.2.5/ACE-World-db-v0.2.5.sql.zip
+7z x ACE-World-db-v0.2.5.sql.zip
+"C:\Program Files\MySql\MySQL Server 5.7\bin\mysql.exe" -h localhost -u root -pPassword12! ace_world < ACE-World-db-v0.2.5.sql

 REM execute Update Scripts for World Database
-"C:\Program Files\MySql\MySQL Server 5.7\bin\mysql.exe" -h localhost -u root -pPassword12! ace_world < database\updates\world\06-06-30-2017-generator-chains-testdata.sql
+"C:\Program Files\MySql\MySQL Server 5.7\bin\mysql.exe" -h localhost -u root -pPassword12! ace_world < database\updates\world\2017-06-30-00-generator-chains-testdata.sql


Updated version in script

Updated version in script

--- Scripts/GenerateRelease-Gwenn.bat
+++ Scripts/GenerateRelease-Gwenn.bat
@@ -2,7 +2,7 @@

 set OutputDir=D:\HR-Builds
 set ProjectDir=D:\HeliumRain
-set EngineDir=D:\Dock\UE4_Packaged\4.13
+set EngineDir=D:\Dock\UE4_Packaged\4.14

 set VersionName=dev
 if not "%1"=="" (


[*] run tests path changed

[*] run tests path changed

--- MockMetrics/MockMetrics.Tests/run-tests.cmd
+++ MockMetrics/MockMetrics.Tests/run-tests.cmd
@@ -1,2 +1,2 @@
 msbuild MySolution.sln
-nunit-console.exe MockMetrics.Tests\bin\Debug\MockMetrics.Tests.dll+nunit-console.exe MockMetrics\MockMetrics\MockMetrics.Tests\bin\Debug\MockMetrics.Tests.dll


Avoid compiling Hadrian dependencies with profiling on Cabal/Windows

--- hadrian/build.cabal.bat
+++ hadrian/build.cabal.bat
@@ -1,6 +1,6 @@
 @echo off
 set CABAL=cabal
-set CABFLAGS=--disable-documentation --disable-profiling
+set CABFLAGS=--disable-documentation --disable-profiling --disable-library-profiling

 rem It is currently more robust to pass Cabal an absolute path to the project file.
 set PROJ="%CD%/hadrian/cabal.project"


win-r shell:startup right clk properties point to perkstart.bat

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

--- perkstart.bat
+++ perkstart.bat
@@ -0,0 +1,2 @@
+cd C:\vroomcoin-master
+start "" vroomcoin-qt.exe -datadir=".\data"


Added the create_new_vm.bat script, to document the creation steps of the virtual machine on a Windows host.

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

--- create_new_vm.bat
+++ create_new_vm.bat
@@ -0,0 +1,45 @@
+@echo off
+
+if (%1)==() goto ERROR
+
+set ISO=E:\Users\username\Downloads\mini.iso
+set VM_DIR=E:\Users\username\VirtualBox VMs
+set VM_NAME=%1
+set VM_SHARED_DIRECTORY=E:\Users\username\workspace
+
+:: Create the new disk
+@echo on
+VboxManage createhd --filename "%VM_DIR%\%VM_NAME%\%VM_NAME%.vdi" --size 10240 --format VDI --variant Standard
+
+:: Create the new vm
+VboxManage createvm --name "%VM_NAME%" --ostype Ubuntu_64 --register
+VboxManage modifyvm "%VM_NAME%" --memory 2048 --vram 12 --acpi on --ioapic on --cpus 1 --rtcuseutc on --boot1 dvd --boot2 disk --boot3 none --boot4 none --audio none
+VboxManage modifyvm "%VM_NAME%" --nic1 nat --nictype1 82540EM
+VboxManage modifyvm "%VM_NAME%" --nic2 hostonly --nictype2 82540EM --hostonlyadapter2 "VirtualBox Host-Only Ethernet Adapter"
+
+:: Create the HD controller and attach the disk
+VBoxManage storagectl "%VM_NAME%" --name "SATA Controller" --add sata --controller IntelAHCI
+VBoxManage storageattach "%VM_NAME%" --storagectl "SATA Controller" --port 0 --device 0 --type hdd --medium "%VM_DIR%\%VM_NAME%\%VM_NAME%.vdi"
+
+:: Create the DVD drive controller and attach the CD ROM ISO
+VBoxManage storagectl "%VM_NAME%" --name "IDE Controller" --add ide
+VBoxManage storageattach "%VM_NAME%" --storagectl "IDE Controller" --port 0 --device 0 --type dvddrive --medium "%ISO%"
+
+:: Shared folders
+VBoxManage sharedfolder add "%VM_NAME%" --name "shared_workspace" --hostpath "%VM_SHARED_DIRECTORY%"
+@echo off
+
+echo Done.
+goto END
+
+
+:ERROR
+echo Missing Virtual Machine name.
+
+
+:END
+echo.
+
+
+:: "eject" the CD ROM ISO (maybe worth doing after the install is complete)
+:: VBoxManage storageattach "%VM_NAME%" --storagectl "IDE Controller" --port 0 --device 0 --type dvddrive --medium none


exit error on appveyor

exit error on appveyor

--- .appveyor/rsqueak-build.bat
+++ .appveyor/rsqueak-build.bat
@@ -37,6 +37,7 @@
 @echo on
 set SDL_VIDEODRIVER=dummy
 C:\Python27\python %~dp0\..\.build\%buildscript% %buildargs%
+if %ERRORLEVEL% GEQ 1 EXIT /B 1

 if %buildscript%==build.py (
   copy %~dp0\..\rsqueak.exe %~dp0\..\rsqueak-win32-%APPVEYOR_REPO_COMMIT%.exe


Changed cooldown from 30 seconds to 10.

Changed cooldown from 30 seconds to 10.

--- runBot.bat
+++ runBot.bat
@@ -1,5 +1,5 @@
 :start
 python magolor.py
-echo Bot restarting in 30 seconds...
-timeout /t 30 /nobreak > NUL
+echo Bot restarting in 10 seconds...
+timeout /t 10 /nobreak > NUL
 goto start


Add file for Windows version

Add file for Windows version

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

--- FastJavaC.bat
+++ FastJavaC.bat
@@ -0,0 +1,42 @@
+::https://www.syneart.com
+@echo off&set mytitle=FastJavaC v1.9 (20151113) by Syneart
+title %mytitle%
+if (%~n1) EQU () echo nI妸, бN *.Java 즲ܥ妸ɮ׹ϥܶ}&set /p .=&goto End
+title [ %~nx1 ] - %mytitle%
+set nowDirectory="%cd%"&set maybeisx86on64="false"&set Wow6432Node=\
+:getJDKPath
+if %maybeisx86on64% EQU "true" (set Wow6432Node=\Wow6432Node\)
+set packagePath=nul&set CheckpackagePath=nul&set fileTmepPath=%temp%\fastJavaTmp&set HaveParameter="false"&set CanClose="false"&set NoMainFunction=*
+(for /f "tokens=2* delims=	 " %%a in ('REG QUERY "hklm\SOfTWaRE%Wow6432Node%JavaSoft\Java Development Kit" /v CurrentVersion') do set JavaVersion=%%b) >nul 2>nul
+if "%JavaVersion%" EQU "" if %maybeisx86on64% EQU "false" (set maybeisx86on64="true"&goto getJDKPath)
+for /f "tokens=2* delims=	 " %%a in ('REG QUERY "hklm\SOfTWaRE%Wow6432Node%JavaSoft\Java Development Kit\%JavaVersion%" /v JavaHome') do set JavaHome=%%b\bin\
+for /f "tokens=1* delims=:package" %%a in ('findstr /i /n "package " %1') do set packagePath=%%b
+set packagePath=%packagePath:;=%
+set packagePath=%packagePath: =%
+set CheckpackagePath=%packagePath://=EOF%
+if "%packagePath%" EQU "nul" (set packagePath=%~n1)
+if "%CheckpackagePath%" NEQ "%packagePath%" (set packagePath=%~n1)
+:main
+cls
+for /f "tokens=1* delims=:main" %%a in ('findstr /i /n "void main" %1') do (set NoMainFunction=%~n1)
+md %fileTmepPath% >nul 2>nul
+del %fileTmepPath%\%~n1.class >nul 2>nul
+del %fileTmepPath%\%packagePath%\%~n1.class >nul 2>nul
+echo ^>^> %~n1 ɮ׽sĶ, еy ...&echo.
+cd /d %~dp1%
+"%JavaHome%javac" %NoMainFunction%.java -d %fileTmepPath%
+if "%JavaVersion%" EQU "" if %maybeisx86on64% EQU "true" (echo.&echo ХUw Java SE Development Kit ^(JDK^)&set /p .=&goto End)
+if not exist %fileTmepPath%\%~n1.class (
+   if not exist %fileTmepPath%\%packagePath%\%~n1.class (echo.&echo ЭץHW~ !! ë Enter 䭫ssĶ ... &set /p .=&goto main)
+   set packagePath=%packagePath%.%~n1
+)
+for /f "tokens=1* delims=" %%a in ('findstr /i /n "\<arg.*[0-9]\>" %1') do (set HaveParameter="true")
+if %HaveParameter% EQU "true" (cls&echo zҩ즲 Java {ݭnJѼơAпJѼ :&set /p argument=)
+for /f "tokens=1* delims=:.awt" %%a in ('findstr /i /n ".awt " %1') do (set CanClose="true")
+for /f "tokens=1* delims=:.swing " %%a in ('findstr /i /n ".swing " %1') do (set CanClose="true")
+echo ^>^>  %~n1 ...
+if %CanClose% EQU "false" (cls)
+cd /d %fileTmepPath%
+"%JavaHome%java" %packagePath% %argument%
+if %CanClose% EQU "false" (echo.&&cd %nowDirectory%&&set /p .=^>^> 槹AN䵲{ ...)
+:End


update build_script

update build_script

--- build_script.bat
+++ build_script.bat
@@ -5,7 +5,8 @@
 goto custom_python:

 :default_value_python:
-set pythonexe="c:\Python363_x64\python.exe"
+set pythonexe="c:\Python364_x64\python.exe"
+if not exist %pythonexe% set pythonexe="c:\Python363_x64\python.exe"
 if not exist %pythonexe% set pythonexe="c:\Python36_x64\python.exe"
 :custom_python:
 @echo [python] %pythonexe%


Fix build script comments to match new name

--- buildandtest.cmd
+++ buildandtest.cmd
@@ -3,10 +3,10 @@
 REM Sample usages:
 REM
 REM  Building and running tests
-REM  - build.libgit2sharp.cmd
+REM  - buildandtest.cmd
 REM
 REM  Building and identifying potential leaks while running tests
-REM  - build.libgit2sharp.cmd "LEAKS_IDENTIFYING"
+REM  - buildandtest.cmd "LEAKS_IDENTIFYING"

 SETLOCAL


Fix publish script

Fix publish script

--- build/publishRockMessagingSqs.bat
+++ build/publishRockMessagingSqs.bat
@@ -19,5 +19,5 @@
 goto :get_latest_package_and_push_it

 :get_latest_package_and_push_it
-for /f %%i in ('dir /b/a-d/od/t:c Rock.Messaging.?.?.?*.nupkg') do set LAST=%%i
+for /f %%i in ('dir /b/a-d/od/t:c Rock.Messaging.SQS.?.?.?*.nupkg') do set LAST=%%i
 nuget push %LAST% %ApiKey%


we need numpy before numexpr

we need numpy before numexpr

--- appveyor-install.cmd
+++ appveyor-install.cmd
@@ -2,6 +2,7 @@
 call setenv /x64

 rem install python packages
+pip install numpy
 pip install numexpr
 pip install -r dev_requirements.txt


Fixing typo

Fixing typo

--- elink/dv/elink.cmd
+++ elink/dv/elink.cmd
@@ -1,5 +1,6 @@
-=y .
--y ../hdl
+dv_elink.v
+-y .
+-y ../../elink/hdl
 -y ../../common/hdl
 -y ../../axi/hdl
 -y ../../fifos/hdl


remove  -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H

--- recipe/set_bld_opts.bat
+++ recipe/set_bld_opts.bat
@@ -65,7 +65,7 @@
     PNGDIR=%LIBRARY_INC% ^
     PNG_EXTERNAL_LIB=1 ^
     PNG_LIB=%LIBRARY_LIB%\libpng.lib ^
-    PROJ_FLAGS="-DPROJ_STATIC -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H" ^
+    PROJ_FLAGS="-DPROJ_STATIC" ^
     PROJ_INCLUDE="-I%LIBRARY_INC%" ^
     PROJ_LIBRARY=%LIBRARY_LIB%\proj.lib ^
     SPATIALITE_412_OR_LATER=yes ^


Added start bat for dbus daemon service for windows platforms.

git-svn-id: 65dd0ccd495961f396d5302e5521154b071f0302@1063 5b2332b8-efa3-11de-8684-7d64432d61a3

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

--- bin/startdbus.bat
+++ bin/startdbus.bat
@@ -0,0 +1 @@
+telepathy\dbus-daemon.exe --config-file=data\session.conf


clangbuilder.bat add -NoExit

clangbuilder.bat add -NoExit

--- bin/clangbuilder.bat
+++ bin/clangbuilder.bat
@@ -1,2 +1,2 @@
 @Echo off
-PowerShell -NoProfile -NoLogo -ExecutionPolicy unrestricted -File "%~dp0ClangbuilderTarget.ps1" %*
+PowerShell -NoProfile -NoLogo -NoExit -ExecutionPolicy unrestricted -File "%~dp0ClangbuilderTarget.ps1" %*


Update diydoge.bat

Update diydoge.bat

--- bin/diydoge.bat
+++ bin/diydoge.bat
@@ -37,7 +37,7 @@
 7z920.msi /quiet /passive

 :unzip_cpuminer
-echo [*] Unzipping 32-bit cpuminer...
+echo [*] Unzipping cpuminer...
 "%ProgramFiles%\7-zip\7z.exe" e -y pooler-cpuminer-2.3.3-win32.zip
 goto :startminer

@@ -55,7 +55,7 @@
 7z920.msi /quiet /passive

 :unzip_cpuminer_64
-echo [*] Unzipping 64-bit cpuminer...
+echo [*] Unzipping cpuminer...
 "%ProgramFiles(x86)%\7-zip\7z.exe" e -y pooler-cpuminer-2.3.3-win32.zip

 :startminer


Maintain the original PATH (and only add) in Windows CI tests.

--- extras/scripts/postsubmit.bat
+++ extras/scripts/postsubmit.bat
@@ -5,8 +5,7 @@
 SET POWERSHELL_PATH=
 FOR /F "delims=" %%F IN ('where powershell.exe') DO (SET POWERSHELL_PATH=!POWERSHELL_PATH!%%~dpF.;)

-set NEW_PATH=C:\Windows\system32;C:\Windows;%PYTHON3_PATH%;%PYTHON3_PATH%\Scripts;C:\Program Files\CMake\bin;C:\ProgramData\Chocolatey\bin;
-set PATH=%NEW_PATH%
+set OLD_PATH=%PATH%

 SET CL_PATH=
 SET MSBUILD_PATH=
@@ -18,11 +17,10 @@
   FOR /F "delims=" %%F IN ('where msbuild.exe') DO (SET MSBUILD_PATH=!MSBUILD_PATH!%%~dpF.;)
 )

-set NEW_PATH=%NEW_PATH%%CL_PATH%%MSBUILD_PATH%%POWERSHELL_PATH%
+set PATH=%OLD_PATH%%CL_PATH%%MSBUILD_PATH%%POWERSHELL_PATH%

-if not "%MINGW_PATH%" == "" SET NEW_PATH=%NEW_PATH%%MINGW_PATH%;
+if not "%MINGW_PATH%" == "" SET PATH=%PATH%%MINGW_PATH%;

-set PATH=%NEW_PATH%
 setx PATH "%PATH%"

 mkdir build-%CONFIGURATION%


Q2.BAT script

Q2.BAT script

Because I was told there's still people running DOS ...

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

--- src/dist/bin/q2.bat
+++ src/dist/bin/q2.bat
@@ -0,0 +1,89 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  run startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and RUN_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%..
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+@rem Execute run
+CD ..
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %RUN_OPTS%  -jar @jarname@ %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable RUN_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%RUN_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega


Corrected build script with new tag

Corrected build script with new tag

--- Setup/Portable/NuGet/Build.cmd
+++ Setup/Portable/NuGet/Build.cmd
@@ -26,6 +26,7 @@
 echo.
 echo Creating packages...

-forfiles /m *.nuspec /c "cmd /c nuget.exe pack @File -Version %version% -Properties aforgever=%aforgever%;shimver=%shimver% -OutputDirectory %output%"
+forfiles /m *.nuspec /c "cmd /c nuget.exe pack @File -Version %version% -Properties drawver=%drawver%;shimver=%shimver% -OutputDirectory %output%"

-:eof+:eof
+pause


Fix missing placeholder `INIT_SBT_VERSION'

--- src/universal/bin/sbt.bat
+++ src/universal/bin/sbt.bat
@@ -52,6 +52,8 @@
 rem We use the value of the JAVA_OPTS environment variable if defined, rather than the config.
 set _JAVA_OPTS=%JAVA_OPTS%
 if "%_JAVA_OPTS%"=="" set _JAVA_OPTS=%CFG_OPTS%
+
+set INIT_SBT_VERSION=

 :args_loop
 if "%~1" == "" goto args_end


#38 : Build script change

#38 : Build script change

--- build/build.bat
+++ build/build.bat
@@ -92,9 +92,9 @@
 copy ..\doc\readme\ReadmeJPN.txt deployment
 copy ..\doc\readme\ReadmeENG.txt deployment
 cd deployment
-%SEVENZIP% a cfk110.zip cmdfreak.msi
-%SEVENZIP% a cfk110.zip ReadmeENG.txt
-%SEVENZIP% a cfk110.zip ReadmeJPN.txt
+%SEVENZIP% a cfk120.zip cmdfreak.msi
+%SEVENZIP% a cfk120.zip ReadmeENG.txt
+%SEVENZIP% a cfk120.zip ReadmeJPN.txt
 del ReadmeENG.txt
 del ReadmeJPN.txt
 del cmdfreak.msi


Update bld.bat

Update bld.bat

--- libboost-python/bld.bat
+++ libboost-python/bld.bat
@@ -1,11 +1,11 @@
 :: Start with bootstrap
 cd tools\build
-CALL bootstrap.bat
-CALL .\b2 install --prefix=%LIBRARY_BIN%
+CALL bootstrap.bat mingw
+:: CALL .\b2 install --prefix=%LIBRARY_BIN%
 cd ..\..

 :: Build step
-CALL .\b2 install ^
+CALL .\tools\build\b2 install ^
     --build-dir=buildboost ^
     --prefix=%LIBRARY_PREFIX% ^
     toolset=gcc ^


Update bld.bat

Update bld.bat

--- libboost-python/bld.bat
+++ libboost-python/bld.bat
@@ -1,5 +1,5 @@
 :: Start with bootstrap
-:: cd .\tools\build
+cd .\tools\build
 ECHO .\bootstrap.bat
 CALL .\bootstrap.bat
 IF errorlevel 1 exit 1


helper batch file to generate wave file from tap

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

--- bootload/makewav.bat
+++ bootload/makewav.bat
@@ -0,0 +1 @@
+appmake +zx -b combined.tap --audio --fast --dumb


revert python to 3.4 (3.5.1 cx_Freeze not ready yet)

--- buildWinDists.bat
+++ buildWinDists.bat
@@ -5,10 +5,12 @@
 rem build x86 only for eiopa or x86

 @set PYTHON32DIR=c:\python34x86
-@set PYTHON64DIR=c:\python35
+@set PYTHON64DIR=c:\python34
+rem @set TCL_LIBRARY=c:\python35\tcl\tcl8.6
+rem @set TK_LIBRARY=c:\python35\tcl\tk8.6
 @set NSISDIR=C:\Program Files (x86)\NSIS
 @set BUILT32DIR=build\exe.win32-3.4
-@set BUILT64DIR=build\exe.win-amd64-3.5
+@set BUILT64DIR=build\exe.win-amd64-3.4
 @set ZIP=c:\progra~1\7-zip\7z.exe

 @set do32bitBuild=true


Added VC6 make file int.

Added VC6 make file int.

--- scripts/checkbuilds.bat
+++ scripts/checkbuilds.bat
@@ -85,6 +85,14 @@
 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
 goto CLEANUP
 :ERROR


Remove dead Borland support.

Remove dead Borland support.

--- scripts/checkbuilds.bat
+++ scripts/checkbuilds.bat
@@ -7,7 +7,6 @@
 rem
 cd ..\..
 set
-set BORLAND_BASE=C:\Borland\bcc55
 set MSDEV_BASE=C:\Program Files (x86)\Microsoft Visual Studio\Common\MSDev98\Bin
 set MSDEV71_BASE=C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\Tools
 rem
@@ -99,6 +98,5 @@
 :CLEANUP
 set SAVE_PATH=
 set SAVE_INCLUDE=
-set BORLAND_BASE=
 set MSDEV_BASE=
 set


Creating the output directory on the fly

git-svn-id: a20303ca0449e3ef575223833049c5e6a53b9062@645577 13f79535-47bb-0310-9956-ffa450edef68

--- src/test/bin/testme.bat
+++ src/test/bin/testme.bat
@@ -16,4 +16,5 @@
 @REM limitations under the License.
 @REM

+MKDIR target
 %JAVA_HOME%\bin\java -cp .\lib\junit-3.8.1.jar;.\lib\exec-test-1.0-SNAPSHOT.jar;.\lib\exec-1.0-SNAPSHOT.jar org.apache.commons.exec.TestRunner


Create setup.bat

Create setup.bat

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

--- dependency_setup/setup.bat
+++ dependency_setup/setup.bat
@@ -0,0 +1,29 @@
+SET CURRENTDIR="%cd%"
+
+if exist maven-android-sdk-deployer (
+    cd maven-android-sdk-deployer
+        git pull
+) else (
+    git clone https://github.com/mosabua/maven-android-sdk-deployer.git
+        cd maven-android-sdk-deployer
+)
+
+call mvn clean install -P 4.4a
+
+cd extras\compatibility-v13
+
+call mvn clean install -Dextras.compatibility.v13.groupid=com.android.support -
+
+Dextras.compatibility.v13.artifactid=support-v13
+
+cd ..\compatibility-v4
+
+call mvn clean install -Dextras.compatibility.v4.groupid=com.android.support -Dextras.compatibility.v4.artifactid=support-
+
+v4
+
+cd ..\gcm\gcm-server
+
+call mvn clean install
+
+cd /d %CURRENTDIR%


fixed little error in deployment script

fixed little error in deployment script

--- build_deployment.cmd
+++ build_deployment.cmd
@@ -141,7 +141,7 @@
 echo Build assembly archive...
 echo.

-"%ZIP_TOOL%" a -tzip -mx9 -r "%FILENAME_BINARY%" ce2.0 ce3.5 net2.0 net2.0.unsigned net3.5 net4.0 net4.0.unsigned net4.5 net4.6 net4.7 net4.8 winrt uwp netstandard unity sl4 sl5 wp7.0 wp7.1 wp8.0 winmd portable interop ..\..\THANKS ..\..\COPYING -xr^^!Documentation >> %LOGFILE% 2>&1
+"%ZIP_TOOL%" a -tzip -mx9 -r "%FILENAME_BINARY%" ce2.0 ce3.5 net2.0 net2.0.unsigned net3.5 net4.0 net4.0.unsigned net4.5 net4.6 net4.7 net4.8 winrt uwp netcoreapp netstandard unity sl4 sl5 wp7.0 wp7.1 wp8.0 winmd portable interop ..\..\THANKS ..\..\COPYING -xr^^!Documentation >> %LOGFILE% 2>&1
 if ERRORLEVEL 1 GOTO ERROR_OPERATION

 echo Build assembly archive - demo clients...


CSharp runGame.bat

CSharp runGame.bat

error: pathspec 'airesources/CSharp/runGame.bat' did not match any file(s) known to git

--- airesources/CSharp/runGame.bat
+++ airesources/CSharp/runGame.bat
@@ -0,0 +1,4 @@
+csc /t:library /out:HaliteHelper.dll HaliteHelper.cs
+csc /reference:HaliteHelper.dll -out:MyBot.exe MyBot.cs
+csc /reference:HaliteHelper.dll -out:RandomBot.exe RandomBot.cs
+halite -d "30 30" "./MyBot.exe" "./RandomBot.exe"


Delete download_BLE_OnOff.bat

Delete download_BLE_OnOff.bat

--- AvrDude/download_BLE_OnOff.bat
+++ AvrDude/download_BLE_OnOff.bat
@@ -1,7 +0,0 @@
-@echo off
-color f0
-title AvrDude GUI Command Window
-@echo.
-@echo. trying to connect to device...
-avrdude -p 32MX150F128D -c stk500v2 -P COM3 -V -U flash:w:"D:\+Dev\+tweeq\BLE_OnOff\dist\default\production\BLE_OnOff.production.hex":i
-pause


Update bigfix_setup_root_eval.bat

Update bigfix_setup_root_eval.bat

--- CMD/bigfix_setup_root_eval.bat
+++ CMD/bigfix_setup_root_eval.bat
@@ -9,4 +9,4 @@

 powershell -command "& { (New-Object Net.WebClient).DownloadFile('http://download.microsoft.com/download/2/5/0/2508F7B4-6DDE-4C3E-B1FA-E1EB66F2F79F/SQLServer2016-SSEI-Dev.exe', '%BASEFOLDER%\SQLServer-SSEI-Dev.exe') }" -ExecutionPolicy Bypass

-REM SQLServer-SSEI-Dev.exe /ACTION=Install /IACCEPTSQLSERVERLICENSETERMS /QS /ADDCURRENTUSERASSQLADMIN /SQLSVCINSTANTFILEINIT="True"
+REM SQLServer-SSEI-Dev.exe /Q /ACTION=Install /IACCEPTSQLSERVERLICENSETERMS


PDI-4547 : Oracle OCI connection gives 'no ocijdbc9 in java.library.path' error when connecting to database

git-svn-id: 51b39fcfd0d3a6ea7caa15377cad4af13b9d2664@14137 5fb7f6ec-07c1-534a-b4ca-9155e429e800

--- bin/Spoon.bat
+++ bin/Spoon.bat
@@ -59,7 +59,6 @@
 REM Using 32bit Java, so include 32bit SWT Jar
 REM ===========================================
 set LIBSPATH=libswt\win32
-set SWTJAR=..\libswt\win32
 GOTO :CONTINUE
 :USE64
 REM ===========================================
@@ -97,4 +96,4 @@
 REM ***************

 @echo on
-start "Spoon" "%_PENTAHO_JAVA%" %OPT% -jar launcher\launcher.jar -lib %SWTJAR% %_cmdline%
+start "Spoon" "%_PENTAHO_JAVA%" %OPT% -jar launcher\launcher.jar -lib ..\%LIBSPATH% %_cmdline%


added build.bat for Jenkins build

added build.bat for Jenkins build

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

--- bin/build.bat
+++ bin/build.bat
@@ -0,0 +1,44 @@
+set result=0
+
+set boxname=%1
+
+@if "%boxname:~-7%" == "_vmware" (
+  set boxname=%boxname:~0,-7%
+)
+@if "%boxname:~-7%" == "_vcloud" (
+  set boxname=%boxname:~0,-7%
+)
+@if "%boxname:~-11%" == "_virtualbox" (
+  set boxname=%boxname:~0,-11%
+)
+
+if "%boxname%x"=="x" (
+  echo "No boxname given!"
+  result = 5
+  goto :done
+)
+
+vagrant plugin install vagrant-serverspec
+
+rem use a local box
+vagrant box add box-cutter/ubuntu1404-desktop http://roecloudsrv001/vagrant/ubuntu1404-desktop_vmware.box --force
+
+rem create and test the box
+vagrant up --provider=vmware_workstation
+if ERRORLEVEL 1 set result=%ERRORLEVEL%
+vagrant halt
+
+set /p vmx=< .vagrant\machines\default\vmware_workstation\id
+
+set ova=%boxname%.ova
+del /F "%ova%"
+ovftool "%vmx%" "%ova%"
+if ERRORLEVEL 1 set result=%ERRORLEVEL%
+
+rem vagrant destroy -f
+
+rem remove the local box
+vagrant box remove box-cutter/ubuntu1404-desktop --provider=vmware_desktop
+
+:done
+exit %result%


bat update

bat update

--- update.bat
+++ update.bat
@@ -17,6 +17,7 @@
 cd ..\angular-material-midnight-dist
 del commitlabel.log /Q
 call committime.bat
+git pull
 git add *
 git commit -F commitlabel.log
 git push


Pauses are Hell

Pauses are Hell

GUI comes up anyway, why need this?


Improve update.bat

Improve update.bat

--- update.bat
+++ update.bat
@@ -2,9 +2,13 @@
 echo Updating Avalon Setup..
 echo+

+:: Discard any rouge changes to the codebase
 git submodule foreach git reset --hard
 git reset --hard
+
+:: Update, include any added submodules
 git pull origin master
+git submodule init
 git submodule update --recursive

 echo+


working with nodemcu-uploader on windows

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

--- upload.bat
+++ upload.bat
@@ -0,0 +1,11 @@
+@echo off
+
+nodemcu-uploader upload files\*.*
+
+cd src
+nodemcu-uploader upload init.lua
+nodemcu-uploader upload services\*.lua --compile
+nodemcu-uploader upload lib\*.lua --compile
+
+cd ..
+nodemcu-uploader terminal


Trying to diagnose CsoundQt build failure on AppVeyor (#793).

--- msvc/build_csoundqt.bat
+++ msvc/build_csoundqt.bat
@@ -1,5 +1,6 @@
 cd staging\CsoundQt
-echo "CSOUND_LIBRARY_DIR:" %~dp0csound-vs/Release
+echo "CSOUND_LIBRARY_DIR:" %~dp0csound-vs\Release
+dir %~dp0csound-vs\Release
 qmake.exe qcs.pro ^
     CONFIG+=html_webengine ^
     CONFIG+=perfThread_build ^
@@ -7,7 +8,7 @@
     DEFINES+="USE_DOUBLE=1" ^
     CSOUND_API_INCLUDE_DIR=%~dp0/"../include" ^
     CSOUND_INTERFACES_INCLUDE_DIR=%~dp0/"../interfaces" ^
-    CSOUND_LIBRARY_DIR=%~dp0csound-vs/Release ^
+    CSOUND_LIBRARY_DIR=%~dp0csound-vs/\Release ^
     DEFAULT_CSOUND_LIBS=csound64.lib ^
     CSOUND_LIBRARY=csound64.lib ^
     LIBS+=%~dp0/deps/lib/libsndfile-1.lib ^


servedoc.bat: changed port number

servedoc.bat: changed port number

--- servedoc.bat
+++ servedoc.bat
@@ -1,4 +1,4 @@
 @echo off
 ::set GOPATH=%GOPATH%;C:\DEV\go
 set GOPATH=C:\DEV\go
-C:\Windows\System32\cmd.exe /c start "Godoc Server http://localhost:6061" "C:\Programs\Go\bin\godoc.exe" -goroot="C:\Programs\Go\." -http=localhost:6061 -tabwidth=4
+C:\Windows\System32\cmd.exe /c start "Godoc Server http://localhost:6161" "C:\Programs\Go\bin\godoc.exe" -goroot="C:\Programs\Go\." -http=localhost:6161 -tabwidth=4


Update publishdocs.bat

Update publishdocs.bat

--- src/publishdocs.bat
+++ src/publishdocs.bat
@@ -5,8 +5,8 @@

 xcopy ..\das-payments-AcceptanceTests\AcceptanceTests\docs das-paymentsacceptancetesting /E /R /Y

-git config  --global user.email "kalim.akbar@fasst.org.uk"
-git config  --global user.name "build agent"
+git config  user.email "kalim.akbar@fasst.org.uk"
+git config  user.name "build agent"

 cd das-paymentsacceptancetesting
 git add --all


移出不再使用脚本

移出不再使用脚本

--- package_source_code.bat
+++ package_source_code.bat
@@ -1,27 +0,0 @@
-@echo off
-echo ***************************************************************************
-echo      package_source_code.bat
-echo                     by niuren.zhu
-echo                           2017.01.19
-echo  ˵
-echo     1. װ7zipصַhttp://www.7-zip.org/
-echo     2. 7zipϵͳPATH7z -hǷ
-echo     3. űǰĿ¼Դ뵽release/SourceCode.zip
-echo ****************************************************************************
-REM ò
-SET WORK_FOLDER=%~dp0
-SET RELEASE_FOLDER=%WORK_FOLDER%release\
-SET PACKAGE_TYPE=zip
-SET FILE_NAME=SourceCode.%PACKAGE_TYPE%
-
-echo --ǰĿ¼[%WORK_FOLDER%]
-if not exist "%RELEASE_FOLDER%" mkdir "%RELEASE_FOLDER%"
-if exist "%RELEASE_FOLDER%%FILE_NAME%" del /q "%RELEASE_FOLDER%%FILE_NAME%"
-
-7z a -t%PACKAGE_TYPE% "%RELEASE_FOLDER%%FILE_NAME%" * -xr!release -xr!.git -xr!target\ -x!*.%PACKAGE_TYPE%
-
-if exist "%RELEASE_FOLDER%%FILE_NAME%" (
-  echo --ɹ
-) else (
-  echo --ʧ
-)


Fixed dev null redirect on exit

Fixed dev null redirect on exit

--- run-tests.bat
+++ run-tests.bat
@@ -33,12 +33,13 @@

 :execute
- echo Executing %~1 in %CD%
+ echo #########    Executing: %~1 in %CD%    #########
  call %~1
  if not "%ERRORLEVEL%" == "0" (
  	echo Error while executing  %~1 in %CD%
- 	call:exit 2> null
- )
+ 	call:exit 2> NUL
+ ) else echo #########    Executed: %~1 in %CD%   #########
+
 goto:eof

 :exit


Use pytest and flake8 commands.

Use pytest and flake8 commands.

--- run_tests.cmd
+++ run_tests.cmd
@@ -1,7 +1,5 @@
-@echo off
-
 set PYTHON=%~1
 set PATH=%PYTHON%;%PYTHON%\Scripts;%PATH%

-python -m pytest
-python -m flake8
+pytest
+flake8


Java1.8に変更

--- make_package.bat
+++ make_package.bat
@@ -2,6 +2,8 @@

 %~d0
 cd %~p0
+
+set JAVA_HOME=%JAVA_HOME_8%

 call mvn clean
 call mvn compile -Dmaven.test.skip=true


release script

release script

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

--- make_release.bat
+++ make_release.bat
@@ -0,0 +1,27 @@
+@echo off
+
+if "%~1"=="" (
+	echo Release version must be specified as an argument
+	goto quit
+)
+
+set ver=%1
+set zipper="C:\Program Files\7-Zip\7z.exe"
+
+mkdir %ver%
+
+cd %ver%
+copy ..\build\Win32\Release\Xenos.exe Xenos.exe
+copy ..\build\x64\Release\Xenos64.exe Xenos64.exe
+copy ..\Releases\Changelog.txt Changelog.txt
+copy ..\Releases\Readme.txt Readme.txt
+%zipper% a -t7z Xenos_%ver%.7z * -mx=9 -myx=9
+copy Xenos_%ver%.7z ..\Releases\Xenos_%ver%.7z
+cd ..
+rmdir /S /Q %ver%
+
+mkdir Releases\Pdb\%ver%
+copy  build\Win32\Release\Xenos.pdb Releases\Pdb\%ver%\Xenos.pdb
+copy  build\x64\Release\Xenos64.pdb Releases\Pdb\%ver%\Xenos64.pdb
+
+:quit


Revert "Removed myget.bat"

Revert "Removed myget.bat"

This reverts commit 7340223ac3394ae71dfdc3ed9785282f73443ac2.

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

--- myget.bat
+++ myget.bat
@@ -0,0 +1,34 @@
+@echo Off
+set config=%1
+if "%config%" == "" (
+   set config=Release
+)
+
+REM Build
+call "%msbuild%" src\cr-viewmodels.sln /p:Configuration="%config%" /m /v:M /fl /flp:LogFile=msbuild.log;Verbosity=Normal /nr:false
+if not "%errorlevel%"=="0" goto failure
+
+REM Unit tests
+call %nuget% install NUnit.Runners -Version 2.6.2 -OutputDirectory packages
+packages\NUnit.Runners.2.6.2\tools\nunit-console.exe /config:%config% /framework:net-4.5 src\tests\bin\%config%\CR.ViewModels.Tests.dll
+if not "%errorlevel%"=="0" goto failure
+
+REM Package
+mkdir Build
+cmd /c %nuget% pack "src\core\core.csproj" -symbols -o Build -p Configuration=%config%
+if not "%errorlevel%"=="0" goto failure
+
+cmd /c %nuget% pack "src\persistance.memory\persistance.memory.csproj" -symbols -o Build -p Configuration=%config%
+if not "%errorlevel%"=="0" goto failure
+
+cmd /c %nuget% pack "src\persistance.ravendb\persistance.ravendb.csproj" -symbols -o Build -p Configuration=%config%
+if not "%errorlevel%"=="0" goto failure
+
+cmd /c %nuget% pack "src\persistance.applicationstate\persistance.applicationstate.csproj" -symbols -o Build -p Configuration=%config%
+if not "%errorlevel%"=="0" goto failure
+
+:success
+exit 0
+
+:failure
+exit -1


Fix win-guest-agent-build-exe.bat

Fix win-guest-agent-build-exe.bat

File paths must use backslashes.

Change-Id: I24609f3afccd364ba2717e57cf241711f2461c91
Signed-off-by: Lev Veyde <32edd3ccb8e9d69e90ee9ce8dbc368c1f61bdf7b@redhat.com>

--- ovirt-guest-agent/win-guest-agent-build-exe.bat
+++ ovirt-guest-agent/win-guest-agent-build-exe.bat
@@ -1,6 +1,6 @@
 @echo off
 echo "Building the executable"
 python setup.py py2exe -b 1
-copy ../configurations/default.ini default.ini
-copy ../configurations/default-logger.ini default-logger.ini
-copy ../configurations/ovirt-guest-agent.ini ovirt-guest-agent.ini
+copy ..\configurations\default.ini default.ini
+copy ..\configurations\default-logger.ini default-logger.ini
+copy ..\configurations\ovirt-guest-agent.ini ovirt-guest-agent.ini


Update

Update


Fixed issue where TMP environment variable lead to death.

--- src/windows/sbt.bat
+++ src/windows/sbt.bat
@@ -9,7 +9,7 @@
 @REM   ZOMG! We need delayed expansion to build up CFG_OPTS later
 @setlocal enabledelayedexpansion

-@echo on
+@echo off
 set SBT_HOME=%~dp0
 set ERROR_CODE=0

@@ -17,10 +17,10 @@
 set FN=%SBT_HOME%sbtconfig.txt
 set CFG_OPTS=
 FOR /F "tokens=* eol=# usebackq delims=" %%i IN ("%FN%") DO (
-  set TMP=%%i
+  set DO_NOT_REUSE_ME=%%i
   rem ZOMG (Part #2) WE use !! here to delay the expansion of
   rem CFG_OPTS, otherwise it remains "" for this loop.
-  set CFG_OPTS=!CFG_OPTS! !TMP!
+  set CFG_OPTS=!CFG_OPTS! !DO_NOT_REUSE_ME!
 )

 rem We use the value of the JAVACMD environment variable if defined
@@ -40,7 +40,6 @@

 :run

-echo "%_JAVACMD%" %_JAVA_OPTS% %SBT_OPTS% -cp "%SBT_HOME%jansi.jar;%SBT_HOME%sbt-launch.jar;%SBT_HOME%classes" SbtJansiLaunch %*
 "%_JAVACMD%" %_JAVA_OPTS% %SBT_OPTS% -cp "%SBT_HOME%jansi.jar;%SBT_HOME%sbt-launch.jar;%SBT_HOME%classes" SbtJansiLaunch %*
 if ERRORLEVEL 1 goto error
 goto end


TST: updated compiler command

TST: updated compiler command

Updated the windows compiler command for x64 systems.

--- ci/appveyor-with-compiler.cmd
+++ ci/appveyor-with-compiler.cmd
@@ -17,6 +17,8 @@
 ::
 :: Author: Olivier Grisel
 :: License: CC0 1.0 Universal: http://creativecommons.org/publicdomain/zero/1.0/
+::
+:: Adapted for Visual Studio 2019 (AGB)
 SET COMMAND_TO_RUN=%*
 SET WIN_SDK_ROOT=C:\Program Files\Microsoft SDKs\Windows
 SET WIN_WDK="c:\Program Files (x86)\Windows Kits\10\Include\wdf"
@@ -39,6 +41,7 @@
 SET MSSdk=1
 "%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Setup\WindowsSdkVer.exe" -q -version:%WINDOWS_SDK_VERSION%
 CALL "%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Bin\SetEnv.cmd" /x64 /release
+CALL  "%WIN_SDK_ROOT% (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" x86_amd64

 :main


BLD : a .bat file that maybe works?

BLD : a .bat file that maybe works?

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

--- conda_recipe/bld.bat
+++ conda_recipe/bld.bat
@@ -0,0 +1 @@
+"%PYTHON%" setup.py install


GROOVY-2678: Installation of Groovy in a Path the contains spaces doesn't work (eg "Program Files")

git-svn-id: aa43ce4553b005588bb3cc6c16966320b011facb@11302 a5544e8c-8a19-0410-ba12-f9af4593a198

--- src/bin/startGroovy.bat
+++ src/bin/startGroovy.bat
@@ -5,9 +5,9 @@
 @rem                                                                         ##
 @rem ##########################################################################

-@rem
+@rem
 @rem $Revision$ $Date$
-@rem
+@rem

 @rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal
@@ -60,15 +60,14 @@
 if "%GROOVY_HOME%" == "" set GROOVY_HOME=%DIRNAME%..

 @rem classpath handling
-set _SKIP=2
+set _SKIP=1
 set CP=
 if "x%~1" == "x-cp" set CP=%~2
 if "x%~1" == "x-classpath" set CP=%~2
 if "x" == "x%CP%" goto init
-set _SKIP=4
 shift
 shift
-
+
 :init
 @rem get name of script to launch with full path
 set GROOVY_SCRIPT_NAME=%~f1
@@ -125,38 +124,25 @@
 :process_arg
 if "%_ARG%" == "" goto execute

+if "x%_ARG%" == "x%CLASS%" goto found_class
+if "x1" == "x%_SKIP%" goto skip
+
 rem now unescape -q, -s, -d
 set _ARG=%_ARG:-q="%
 set _ARG=%_ARG:-s=*%
 set _ARG=%_ARG:-d=-%

-if "x4" == "x%_SKIP%" goto skip_4
-if "x3" == "x%_SKIP%" goto skip_3
-if "x2" == "x%_SKIP%" goto skip_2
-if "x1" == "x%_SKIP%" goto skip_1
-
 set CMD_LINE_ARGS=%CMD_LINE_ARGS% %_ARG%
 set _ARG=
 goto win9xME_args_loop

-:skip_4
+:found_class
+set _SKIP=0
 set _ARG=
-set _SKIP=3
 goto win9xME_args_loop

-:skip_3
+:skip
 set _ARG=
-set _SKIP=2
-goto win9xME_args_loop
-
-:skip_2
-set _ARG=
-set _SKIP=1
-goto win9xME_args_loop
-
-:skip_1
-set _ARG=
-set _SKIP=0
 goto win9xME_args_loop

 :4NT_args
@@ -170,7 +156,7 @@
 if exist "%USERPROFILE%/.groovy/init.bat" call "%USERPROFILE%/.groovy/init.bat"

 @rem Setting a classpath using the -cp or -classpath option means not to use
-@rem the global classpath. Groovy behaves then the same as the java
+@rem the global classpath. Groovy behaves then the same as the java
 @rem interpreter
 if "x" == "x%CP%" goto empty_cp
 :non_empty_cp


ROO-498: Parentheses in JAVA_HOME break roo.bat

--- bootstrap/src/main/bin/roo.bat
+++ bootstrap/src/main/bin/roo.bat
@@ -1,10 +1,11 @@
 @echo off
-setlocal
+setlocal enabledelayedexpansion

 for %%? in ("%~dp0..") do set ROO_HOME=%%~f?
 rem echo Resolved ROO_HOME: "%ROO_HOME%"

-if exist "%JAVA_HOME%\jre" (set ROO_JRE=%JAVA_HOME%\jre) else (set ROO_JRE=%JAVA_HOME%)
+rem parentheses might occur in path, so delayed variable expansion is needed, hence the ! chars
+if exist "!JAVA_HOME!\jre" (set ROO_JRE=!JAVA_HOME!\jre) else (set ROO_JRE=!JAVA_HOME!)

 :launch
 java -Djline.nobell=true -Djava.ext.dirs="%ROO_HOME%\dist;%ROO_HOME%\lib;%ROO_HOME%\work;%ROO_JRE%\lib\ext" %ROO_OPTS% -Droo.home="%ROO_HOME%" org.springframework.roo.bootstrap.Bootstrap "classpath:roo-bootstrap.xml" %*


Also add build-plugins.bat

Also add build-plugins.bat

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

--- tools/build-plugins.bat
+++ tools/build-plugins.bat
@@ -0,0 +1,124 @@
+:: This script assumes you have installed Visual Studio 2010 and  the following libraries:
+:: - boost in C:\boost, where libraries are in C:\boost\win32 and C:\boost\x64 downloaded here:
+:: http://boost.teeks99.com/
+
+@echo off
+
+set CWD=%cd%
+
+
+if "%3" == "1" (
+	set BUILD_DIR=%CWD%\autobuild\build
+	set DEPLOY_DIR=%CWD%\autobuild\deploy
+) else (
+	set BUILD_DIR=%CWD%\build
+	set DEPLOY_DIR=%CWD%\build\deploy
+)
+
+set IO_BRANCH=master
+set MISC_BRANCH=master
+
+:: Either 32 or 64
+set BITS=%1%
+
+:: If %4% set you can specify a build condiguration, either Debug or Release
+:: This defaults to Release
+if "%2" == "Debug" (
+	set CONFIGURATION=Debug
+	set CONF_BUILD_SUB_DIR=debug
+) else (
+	set CONFIGURATION=Release
+	set CONF_BUILD_SUB_DIR=release
+)
+
+if "%BITS%" == "32" (
+	set BUILD_SUB_DIR=win32
+	set MSVC_CONF=Win32
+	set OFX_CONF_SUB_DIR=Win32
+) else if "%BITS%" == "64" (
+	set BUILD_SUB_DIR=x64
+	set MSVC_CONF=x64
+	set OFX_CONF_SUB_DIR=Win64
+) else (
+	echo Architecture must be either 32 or 64 bits.
+	goto fail
+)
+
+set PROJECT_OBJ_DIR=%BUILD_SUB_DIR%\%CONF_BUILD_SUB_DIR%
+
+
+:: Set here the path where the Qt_64bit libraries enclosing directory is located
+:: You can download our pre-compiled version here:
+:: https://sourceforge.net/projects/natron/files/Natron_Windows_3rdParty.zip/download
+set DEP_PATH=C:\Users\Lex\Documents\Github\Natron3rdParty
+
+set GIT_IO=https://github.com/MrKepzie/openfx-io.git
+set GIT_MISC=https://github.com/devernay/openfx-misc.git
+
+if not exist "%BUILD_DIR%" (
+	echo "You should build Natron before building plug-ins"
+	goto fail
+)
+
+cd %BUILD_DIR%
+git clone %GIT_MISC%
+cd openfx-misc
+git checkout %MISC_BRANCH%
+git pull origin %MISC_BRANCH%
+git submodule update -i --recursive
+git log|head -1|awk "{print $2}" > curVersion.txt
+set /p GITV_MISC=<curVersion.txt
+echo "Building openfx-misc at commit " %GITV_MISC% %BITS%bit %CONFIGURATION%
+
+cd Misc
+devenv Misc.sln /Build "%CONFIGURATION%|%MSVC_CONF%" /Project Support
+devenv Misc.sln /Build "%CONFIGURATION%|%MSVC_CONF%" /Project Misc
+devenv Misc.sln /Build "%CONFIGURATION%|%MSVC_CONF%" /Project CImg
+
+if exist "%DEPLOY_DIR%\Plugins\Misc.ofx.bundle" (
+	rmdir /S /Q %DEPLOY_DIR%\Plugins\Misc.ofx.bundle
+)
+mkdir %DEPLOY_DIR%\Plugins\Misc.ofx.bundle
+xcopy /Y /E %PROJECT_OBJ_DIR%\Misc.ofx.bundle %DEPLOY_DIR%\Plugins\Misc.ofx.bundle
+if exist "%DEPLOY_DIR%\Plugins\CImg.ofx.bundle" (
+	rmdir /S /Q %DEPLOY_DIR%\Plugins\CImg.ofx.bundle
+)
+mkdir %DEPLOY_DIR%\Plugins\CImg.ofx.bundle
+xcopy /Y /E %PROJECT_OBJ_DIR%\CImg.ofx.bundle %DEPLOY_DIR%\Plugins\CImg.ofx.bundle
+
+
+cd %BUILD_DIR%
+git clone %GIT_IO%
+cd openfx-io
+git checkout %IO_BRANCH%
+git pull origin %IO_BRANCH%
+git submodule update -i --recursive
+git log|head -1|awk "{print $2}" > curVersion.txt
+set /p GITV_IO=<curVersion.txt
+echo "Building openfx-io at commit " %GITV_IO% %BITS%bit %CONFIGURATION%
+
+devenv IO.sln /Build "%CONFIGURATION%|%MSVC_CONF%"
+if exist "%DEPLOY_DIR%\Plugins\IO.ofx.bundle" (
+	rmdir /S /Q %DEPLOY_DIR%\Plugins\IO.ofx.bundle
+)
+mkdir %DEPLOY_DIR%\Plugins\IO.ofx.bundle
+xcopy /Y /E %PROJECT_OBJ_DIR%\IO.ofx.bundle %DEPLOY_DIR%\Plugins\IO.ofx.bundle
+copy /Y %DEP_PATH%\ffmpeg_2.4\lib\%BUILD_SUB_DIR%\avcodec-56.dll %DEPLOY_DIR%\Plugins\IO.ofx.bundle\Contents\%OFX_CONF_SUB_DIR%
+copy /Y %DEP_PATH%\ffmpeg_2.4\lib\%BUILD_SUB_DIR%\avformat-56.dll %DEPLOY_DIR%\Plugins\IO.ofx.bundle\Contents\%OFX_CONF_SUB_DIR%
+copy /Y %DEP_PATH%\ffmpeg_2.4\lib\%BUILD_SUB_DIR%\avutil-54.dll %DEPLOY_DIR%\Plugins\IO.ofx.bundle\Contents\%OFX_CONF_SUB_DIR%
+copy /Y %DEP_PATH%\ffmpeg_2.4\lib\%BUILD_SUB_DIR%\swresample-1.dll %DEPLOY_DIR%\Plugins\IO.ofx.bundle\Contents\%OFX_CONF_SUB_DIR%
+copy /Y %DEP_PATH%\ffmpeg_2.4\lib\%BUILD_SUB_DIR%\swscale-3.dll %DEPLOY_DIR%\Plugins\IO.ofx.bundle\Contents\%OFX_CONF_SUB_DIR%
+copy INRIA.IO.manifest %DEPLOY_DIR%\Plugins\IO.ofx.bundle\Contents\%OFX_CONF_SUB_DIR%
+cd %DEPLOY_DIR%\Plugins\IO.ofx.bundle\Contents\%OFX_CONF_SUB_DIR%
+mt -manifest INRIA.IO.manifest -outputresource:IO.ofx;2
+
+cd %CWD%
+
+goto success
+
+:FAIL
+	set errorlevel=1
+	exit /b awk
+
+:SUCCESS
+


msys2_shell.cmd: Fixed running with conemu if path (for any strange reason) has spaces

--- filesystem/msys2_shell.cmd
+++ filesystem/msys2_shell.cmd
@@ -72,7 +72,7 @@
   echo ConEmu not found. Exiting. 1>&2
   exit /b 1
 )
-start "%CONTITLE%" "%ComEmuCommand%" /Here /Icon "%WD%..\..\msys2.ico" /cmd %WD%bash --login %1 %2 %3 %4 %5 %6 %7 %8 %9
+start "%CONTITLE%" "%ComEmuCommand%" /Here /Icon "%WD%..\..\msys2.ico" /cmd "%WD%bash" --login %1 %2 %3 %4 %5 %6 %7 %8 %9
 exit /b %ERRORLEVEL%

 :startsh


msys2_shell.cmd: Stop deprecating parameters, give users freedom to use whatever they found convenient

--- filesystem/msys2_shell.cmd
+++ filesystem/msys2_shell.cmd
@@ -26,10 +26,10 @@
 )
 rem Shell types
 if "x%~1" == "x-msys" shift& set MSYSTEM=MSYS& goto :checkparams
-if "x%~1" == "x-msys2" shift& set MSYSTEM=MSYS& set _deprecated_msys2=true& goto :checkparams
+if "x%~1" == "x-msys2" shift& set MSYSTEM=MSYS& goto :checkparams
 if "x%~1" == "x-mingw32" shift& set MSYSTEM=MINGW32& goto :checkparams
 if "x%~1" == "x-mingw64" shift& set MSYSTEM=MINGW64& goto :checkparams
-if "x%~1" == "x-mingw" shift& set _deprecated_mingw=true& (if exist "%WD%..\..\mingw64" (set MSYSTEM=MINGW64) else (set MSYSTEM=MINGW32))& goto :checkparams
+if "x%~1" == "x-mingw" shift& (if exist "%WD%..\..\mingw64" (set MSYSTEM=MINGW64) else (set MSYSTEM=MINGW32))& goto :checkparams
 rem Console types
 if "x%~1" == "x-consolez" shift& set MSYSCON=console.exe& goto :checkparams
 if "x%~1" == "x-mintty" shift& set MSYSCON=mintty.exe& goto :checkparams
@@ -37,29 +37,10 @@
 if "x%~1" == "x-defterm" shift& set MSYSCON=defterm& goto :checkparams
 rem Other parameters
 if "x%~1" == "x-full-path" shift& set MSYS2_PATH_TYPE=inherit& goto :checkparams
-if "x%~1" == "x-use-full-path" shift& set MSYS2_PATH_TYPE=inherit& set _deprecated_use_full_path=true& goto :checkparams
+if "x%~1" == "x-use-full-path" shift& set MSYS2_PATH_TYPE=inherit& goto :checkparams
 if "x%~1" == "x-here" shift& set CHERE_INVOKING=enabled_from_arguments& goto :checkparams
-if "x%~1" == "x-where" shift& set CHERE_INVOKING=enabled_from_arguments& set _deprecated_where=true& goto :checkparams
+if "x%~1" == "x-where" shift& set CHERE_INVOKING=enabled_from_arguments& goto :checkparams
 if "x%CHERE_INVOKING%" == "xenabled_from_arguments" if not "%~1" == "" if exist "%~1\" shift& cd /d "%~1\"& goto :checkparams
-
-rem Deprecated parameters
-rem TODO: remove this check when most users have stopped using them
-if "x%_deprecated_use_full_path%" == "xtrue" (
-  echo The MSYS2 shell has been started with the deprecated -use-full-path> "%WD%..\..\etc\profile.d\msys2_shell.use_full_path.warning.once"
-  echo option. Please update your shortcuts to use -full-path instead.>>    "%WD%..\..\etc\profile.d\msys2_shell.use_full_path.warning.once"
-)
-if "x%_deprecated_where%" == "xtrue" (
-  echo The MSYS2 shell has been started with the deprecated -where> "%WD%..\..\etc\profile.d\msys2_shell.where.warning.once"
-  echo option. Please update your shortcuts to use -here instead.>> "%WD%..\..\etc\profile.d\msys2_shell.where.warning.once"
-)
-if "x%_deprecated_msys2%" == "xtrue" (
-  echo The MSYS2 shell has been started with the deprecated -msys2> "%WD%..\..\etc\profile.d\msys2_shell.msys2.warning.once"
-  echo option. Please update your shortcuts to use -msys instead.>> "%WD%..\..\etc\profile.d\msys2_shell.msys2.warning.once"
-)
-if "x%_deprecated_mingw%" == "xtrue" (
-  echo The MSYS2 shell has been started with the deprecated -mingw option.> "%WD%..\..\etc\profile.d\msys2_shell.mingw.warning.once"
-  echo Please update your shortcuts to use -mingw32 or -mingw64 instead.>>  "%WD%..\..\etc\profile.d\msys2_shell.mingw.warning.once"
-)

 rem Setup proper title
 if "%MSYSTEM%" == "MINGW32" (


Fixed a typo in build_all.bat

Fixed a typo in build_all.bat

--- build_all.bat
+++ build_all.bat
@@ -79,10 +79,7 @@
     -DBUILD_opencv_ximgproc=OFF ^
     -DBUILD_opencv_xobjdetect=OFF ^
     -DBUILD_opencv_xphoto=OFF
-if %errorlevel% neq 0 (
-	echo OpenCV configuration failed!
-	exit /b %errorlevel%
-)
+if %errorlevel% neq 0 exit /b %errorlevel%

 cmake --build "%OPENCV_BUILD_DIR%" --target ALL_BUILD --config Release
 if %errorlevel% neq 0 exit /b %errorlevel%


Fix misplaced comments

Fix misplaced comments

--- setup.bat
+++ setup.bat
@@ -1,9 +1,9 @@
+@echo off
 REM BL-MCP version 1.1
 REM @author acomputerdog 1-25-14
 REM TODO:
 REM * get blazeloader sources that are not the newest dev version.
 REM * get libraries without hardcoding them
-@echo off
 if not exist "%cd%/BlazeLoader/instlflg" (
     echo --- MCP and BL setup script ---
     echo Please select an install type:


Fix a bunch of bugs with installer * Fix always attempting to use mcp version blank * Fix closing on crashes * Fix 3-second delay in script

--- setup.bat
+++ setup.bat
@@ -1,10 +1,11 @@
-REM BL-MCP version 1.1
-REM @author acomputerdog 1-25-14
+@echo off
+REM BL-MCP version 1.3
+REM @author acomputerdog 2-14-14
 REM TODO:
 REM * get blazeloader sources that are not the newest dev version.
 REM * get libraries without hardcoding them
-@echo off
 if not exist "%cd%/BlazeLoader/instlflg" (
+    setlocal EnableDelayedExpansion
     echo --- MCP and BL setup script ---
     echo Please select an install type:
     echo 1 - Cancel install
@@ -22,6 +23,7 @@
         set setupmode=bl
     ) else (
         echo MCP setup canceled.
+        pause
         exit /b -1
     )
     if not exist "%cd%/temp/setup" mkdir "%cd%\temp\setup\"
@@ -46,6 +48,7 @@
         echo Done.
     ) else (
         echo Unable to extract downloader script, aborting install!
+        pause
         exit /b 3
     )
     echo.
@@ -64,6 +67,7 @@
     ) else (
         echo 7-zip was not extracted! (you may need to disable your antivirus if the self-extracting archive was blocked^)
         echo Unable to extract BlazeLoader, aborting install!
+        pause
         exit /b 1
     )
     echo.
@@ -72,35 +76,24 @@
     "%cd%/temp/setup/7-zip/7z.exe" x -o"%cd%/temp/setup/" -y "%cd%/temp/setup/BlazeLoader_repo.zip"
     xcopy /I /Y /E /C /Q "%cd%\temp\setup\BlazeLoader-master\*" "%cd%\BlazeLoader"
     rmdir /S /Q "%cd%\temp\setup\BlazeLoader-master"
-    timeout /t 2 >nul
     echo Done.
-    if exist "%cd%/BlazeLoader/mcp.ver" (
-        set /p mcpver=<"%cd%/BlazeLoader/mcp.ver"
-        if [%mcpver%] == [] (
-            echo.
-            echo Unable to detect MCP version, defaulting to MCP version 903.
-            set mcpver=903
-        )
-    ) else (
-        echo.
-        echo Unable to detect MCP version, defaulting to MCP version 903.
-        set mcpver=903
-    )
-    if not exist "%cd%/temp/setup/mcp%mcpver%.zip" (
+    set /p mcpver=<"%cd%/BlazeLoader/mcp.ver"
+    if not exist "%cd%/temp/setup/mcp!mcpver!.zip" (
         echo.
         echo Downloading MCP...
-        cscript.exe //B "%cd%/temp/setup/bl_downloader.vbs" http://mcp.ocean-labs.de/files/archive/mcp%mcpver%.zip "%cd%/temp/setup/mcp%mcpver%.zip"
+        cscript.exe //B "%cd%/temp/setup/bl_downloader.vbs" http://mcp.ocean-labs.de/files/archive/mcp%mcpver%.zip "%cd%/temp/setup/mcp!mcpver!.zip"
         echo Done.
     ) else (
         echo MCP already downloaded; skipping download.
     )
     echo.
     echo Extracting MCP...
-    "%cd%/temp/setup/7-zip/7z.exe" x -bd -ba -o"%cd%" -y "%cd%/temp/setup/mcp%mcpver%.zip"
+    "%cd%/temp/setup/7-zip/7z.exe" x -bd -ba -o"%cd%" -y "%cd%/temp/setup/mcp!mcpver!.zip"
     if exist "%cd%/decompile.bat" (
         echo Done.
     ) else (
-        echo MCP version %mcpver% was not found, provide it manually to %cd%/temp/setup/mcp%mcpver%.zip!  Aborting install!
+        echo MCP version !mcpver! was not found, provide it manually to %cd%/temp/setup/mcp!mcpver!.zip!  Aborting install!
+        pause
         exit /b 2
     )
     echo.
@@ -138,8 +131,9 @@
     echo %date%-%time%>"%cd%/BlazeLoader/instlflg"
     echo MCP setup complete!
     echo.
+	pause
 ) else (
     echo MCP has already been set up!
+    pause
     exit /b -2
-)
-pause
+)


Make.cmd: create TARGDIR if necessary

Make.cmd: create TARGDIR if necessary

Fixes issue 1771.

R=adg, rsc1
CC=golang-dev
http://codereview.appspot.com/4437089

--- src/Make.cmd
+++ src/Make.cmd
@@ -25,7 +25,7 @@
 install: $(TARGDIR)/$(TARG)

 $(TARGDIR)/$(TARG): $(TARG)
-	cp -f $(TARG) $(TARGDIR)
+	mkdir -p $(TARGDIR) && cp -f $(TARG) $(TARGDIR)

 CLEANFILES+=$(TARG) _test _testmain.go


fix: python file name in start.bat

fix: python file name in start.bat

--- start.bat
+++ start.bat
@@ -1,3 +1,3 @@
 @echo off
 cls
-python client.py --config=config.json
+python TwitterClient.py --config=config.json


Update

Update

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

--- start.cmd
+++ start.cmd
@@ -0,0 +1,2 @@
+start grunt
+start jekyll serve


Add powershell output to MinGW script log

This helps with debugging any issues on when downloading MinGW

--- mingw.cmd
+++ mingw.cmd
@@ -362,12 +362,15 @@
 @for /f %%a in ("%archive_path: =-%") do @set "file_name=%%~na"
 @for /f %%a in ("%archive_path: =-%") do @set "file_ext=%%~xa"
 @call :log 2 "Unzipping: %file_name%%file_ext%"
+@call :iso8601 iso8601
+@set "log_path=%temp%\unzip-%iso8601%-%file_name%.log"
 @powershell ^
   Add-Type -assembly "system.io.compression.filesystem"; ^
   [io.compression.zipfile]::ExtractToDirectory(^
-    '%archive_path%', '%folder_path%') 2>nul
+    '%archive_path%', '%folder_path%') 2>"%log_path%"
 @if errorlevel 1 (
   @call :log 0 "Failed to unzip: %file_name%%file_ext%"
+  @call :log_append "%log_path%"
   @exit /b 1
 )
 @endlocal
@@ -850,13 +853,15 @@
 @call :log 2 "Downloading %url%"
 @call :iso8601 iso8601
 @set "temp_path=%temp%\download-%iso8601%-%file_name%"
+@set "log_path=%temp%\download-%iso8601%-log-%file_name%"
 @call :log 4 "Using temp file %temp_path%"
 @powershell Invoke-WebRequest "'%url%'" ^
   -OutFile "'%temp_path%'" ^
   -UserAgent [Microsoft.PowerShell.Commands.PSUserAgent]::IE ^
-  1> nul 2> nul
+  1>nul 2>"%log_path%"
 @if errorlevel 1 (
   @call :log 0 "Failed to download %url%"
+  @call :log_append "%log_path%"
   @exit /b 1
 )
 @if [%checksum%] neq [] (


Adds script to create nuget package

Adds script to create nuget package

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

--- nugetPackage.bat
+++ nugetPackage.bat
@@ -0,0 +1,4 @@
+echo %APPVEYOR_BUILD_NUMBER%
+powershell -Command "(gc src/project.json) -replace '.0-\*', '.%APPVEYOR_BUILD_NUMBER%-*' | Out-File src/project.json"
+
+dotnet pack src --configuration Release --output src/NuGet --version-suffix "alpha"


Document env vars in hammer.bat

Document env vars in hammer.bat

--- omaha/hammer.bat
+++ omaha/hammer.bat
@@ -30,18 +30,49 @@
 goto set_env_variables

 :set_env_variables
+
+:: Change these variables to match the local build environment.
+
+:: Directory where the Go programming language toolchain is installed.
 set GOROOT=%ProgramFiles(x86)%\go\files
+
+:: Directory where AtlServer files are.
 set OMAHA_ATL_SERVER_DIR=c:\atl_server\files
+
+:: This will depend on your OS. If this version of the .Net framework came with
+:: the OS, then set it to the framework directory
+:: (something like C:\Windows\Microsoft.NET\Framework\v2.0.50727).
+:: Otherwise, set it to the directory where the .NET framework is installed.
 set OMAHA_NET_DIR=%WINDIR%\Microsoft.NET\Framework\v2.0.50727
+
+:: This directory is needed to find mage.exe tool, which is the .Net manifest
+:: generating tool. This tool ships as part of the Windows SDK.
+:: However, newer versions of mage.exe can't targer older versions of .Net
+:: framework. If there is a need for the click-once application to run on older
+:: versions of the .Net framework, then an older version of the Windows SDK
+:: needs to be installed and this environment variable point to that directory.
 set OMAHA_NETFX_TOOLS_DIR=%WindowsSDK_ExecutablePath_x86%
+
+:: Directory where Python (python.exe) is installed.
 set OMAHA_PYTHON_DIR=C:\Python24
+
+:: Directory in WiX where candle.exe and light.exe are installed.
 set OMAHA_WIX_DIR=%ProgramFiles(x86)%\WiX Toolset v3.8\bin
+
+:: Root directory of the WTL installation.
 set OMAHA_WTL_DIR=C:\wtl\files
+
 set OMAHA_PLATFORM_SDK_DIR=%WindowsSdkDir%\
 set OMAHA_WINDOWS_SDK_10_0_VERSION=%WindowsSDKVersion:~0,-1%
+
+:: Directory which includes the sign.exe tool for Authenticode signing.
 set OMAHA_SIGNTOOL_SDK_DIR=%WindowsSdkDir%\bin\x86
 set PYTHONPATH=%OMAHA_PYTHON_DIR%
+
+:: Directory of Scons (http://www.scons.org/).
 set SCONS_DIR=C:\Python24\Lib\site-packages\scons-1.3.1
+
+:: Directory of the Google's Software Construction Toolkit.
 set SCT_DIR=C:\swtoolkit

 set PROXY_CLSID_TARGET=%~dp0proxy_clsids.txt


add bat file with update src.

add bat file with update src.

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

--- zdmin_update_app.bat
+++ zdmin_update_app.bat
@@ -0,0 +1 @@
+appcfg.py update ../9.yunzlog.com


HIVE-7268 : On Windows Hive jobs in Webhcat always run on default MR mode (Deepesh Khandelwal, reviewed by Hari Subramaniyan)

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

--- hcatalog/bin/templeton.cmd
+++ hcatalog/bin/templeton.cmd
@@ -46,6 +46,7 @@
   set TEMPLETON_CLASSPATH=!TEMPLETON_CLASSPATH!;%HCATALOG_HOME%\share\hcatalog\*
   set TEMPLETON_CLASSPATH=!TEMPLETON_CLASSPATH!;%HCATALOG_HOME%\share\webhcat\svr\*
   set TEMPLETON_CLASSPATH=!TEMPLETON_CLASSPATH!;%HCATALOG_HOME%\share\webhcat\svr\lib\*
+  set TEMPLETON_CLASSPATH=!TEMPLETON_CLASSPATH!;%HIVE_HOME%\conf

   @rem TODO: append hcat classpath to the templeton classpath
   @rem append hadoop classpath


Change directory when building grpcio-tools

--- tools/run_tests/build_artifact_python.bat
+++ tools/run_tests/build_artifact_python.bat
@@ -65,11 +65,19 @@

 @rem Build gRPC Python extensions
 python setup.py build_ext -c mingw32
-python tools\distrib\python\grpcio_tools\setup.py build_ext -c mingw32
+
+pushd tools\distrib\python\grpcio_tools
+python setup.py build_ext -c mingw32
+popd
+

 @rem Build gRPC Python distributions
 python setup.py bdist_wheel
-python tools\distrib\python\grpcio_tools\setup.py bdist_wheel
+
+pushd tools\distrib\python\grpcio_tools
+python setup.py bdist_wheel
+popd
+

 mkdir artifacts
 xcopy /Y /I /S dist\* artifacts\ || goto :error


fix(build): use git archive to populate version

--- .conda-recipe/bld.bat
+++ .conda-recipe/bld.bat
@@ -1,3 +1,11 @@
+REM Use `git archive` to export with versioneer version.
+set ARCHIVE_NAME=%PKG_NAME%-%PKG_VERSION%
+git archive master -o %ARCHIVE_NAME%.tar --format tar
+mkdir %ARCHIVE_NAME%
+tar xvf %ARCHIVE_NAME%.tar -C %ARCHIVE_NAME%
+
+cd %ARCHIVE_NAME%
+
 REM Generate `setup.py` from `pavement.py` definition.
 "%PYTHON%" -m paver generate_setup


remove tmp file

remove tmp file

--- get_RVI_icf_auto/two_if.bat
+++ get_RVI_icf_auto/two_if.bat
@@ -1,418 +0,0 @@
-@echo off
-
-echo.
-echo ################
-echo TO_ICF
-echo ################
-echo.
-
-setlocal EnableDelayedExpansion
-
-if exist *.icf del /Q *.icf
-if exist *.tmp del /Q *.tmp
-
-set ManagerName=ManagerName
-
-:: Get ManagerName
-for /f "usebackq skip=1 tokens=*" %%i in (`wmic computersystem get name ^| findstr /r /v "^$" `) do (
-	    set ManagerName=%%i )
-
-echo ################
-echo Get ManagerName= %ManagerName%
-echo ################
-
-
-echo ################
-echo Get os get "SystemDrive"
-echo ################
-
-wmic os get "SystemDrive" > SystemDrive.tmp
-type SystemDrive.tmp > SystemDrive.txt
-
-for /f "skip=1 tokens=1,2,3,4* " %%i in (SystemDrive.txt) do (
-    echo %%i
-    set SystemDrive=%%i
-)
-echo ################
-echo Get os get "SystemDrive"="%SystemDrive%"
-echo ################
-
-echo ################
-echo Get os get "SystemDriveID"
-echo ################
-
-wmic logicaldisk where 'DeviceID="%SystemDrive%"' get Access > SystemDriveID.tmp
-
-type SystemDriveID.tmp > SystemDriveID.txt
-
-for /f "skip=1 tokens=1,2,3,4* " %%i in (SystemDriveID.txt) do (
-    echo %%i
-    set SystemDriveID=%%i
-)
-echo ################
-echo Get os get "SystemDriveID"="%SystemDriveID%"
-echo ################
-
-echo ################
-echo Get diskdrive get FirmwareRevision, Index, Model
-echo ################
-::ic diskdrive get              %%i,   %%j,           %%k,   %%l
-wmic diskdrive get FirmwareRevision, Index, InterfaceType, Model  > diskdrive.tmp
-type diskdrive.tmp > diskdrive.txt
-
-for /f "skip=1 tokens=1,2,3,4,5* " %%i in (diskdrive.txt) do (
-    set "formattedValue=%%l %%m %%n"
-	set /A a=100+%%j
-    if %%j==%SystemDriveID% (
-        echo REMOVE %%j !formattedValue:~0,20! %%i -- THIS IS OS DISK
-    )else (
-		set b=SAS_2K
-		if %%k==IDE (
-		    set b=SATA_6K
-		    ::echo !a:~1! !formattedValue:~0,20! %%i
-		    set "line[!a:~1!]=%%j %%i !b! ^(!formattedValue:~0,20!
-		)else if %%l==ATA (
-			set b=SATA_6K
-            set "line[!a:~1!]=%%j %%i !b! !formattedValue:~0,20!
-        )else (
-            set "line[!a:~1!]=%%j %%i !b! !formattedValue:~0,20!
-		)
-    )
-)
-
-if exist disksort.txt del /Q disksort.txt
-
-rem Show array elements
-for /F "tokens=2 delims==" %%a in ('set line[') do echo %%a
-for /F "tokens=2 delims==" %%a in ('set line[') do echo %%a >> disksort.txt
-
-::type disklist.tmp
-::sort disklist.tmp > disksort.txt
-::type disksort.txt
-
-echo ################
-echo Get spic Line -skip 1--------------
-echo ################
-
-for /f "tokens=1,2,3,4,5* " %%i in (disksort.txt) do (
-    set "formattedValue=%%l %%m %%n"
-	set /A a=100+%%j
-	set "line[!a:~1!]=%%j %%i !b! !formattedValue:~0,20!
-)
-
-for /F "skip=1 tokens=2 delims==" %%a in ('set line[') do (
-    echo %%a
-	goto nxetline)
-:nxetline
-
-echo ################
-echo Get spic Line -skip 3--------------
-echo ################
-
-for /f "tokens=1,2,3,4,5* " %%i in (disksort.txt) do (
-    set "formattedValue=%%l %%m %%n"
-	set /A a=100+%%j
-	set "line[!a:~1!]=%%j %%i !b! !formattedValue:~0,20!
-)
-
-for /F "skip=3 tokens=2 delims==" %%a in ('set line[') do (
-    echo %%a
-	goto nxetline)
-:nxetline
-
-echo ################
-echo Get spic Line -skip 6--------------
-echo ################
-
-for /f "tokens=1,2,3,4,5* " %%i in (disksort.txt) do (
-    set "formattedValue=%%l %%m %%n"
-	set /A a=100+%%j
-	set "line[!a:~1!]=%%j %%i !b! !formattedValue:~0,20!
-)
-
-for /F "skip=6 tokens=2 delims==" %%a in ('set line[') do (
-    echo %%a > temp.tmp
-	goto nxetline)
-:nxetline
-
-
-echo ################
-echo Get spic Line ---------------
-echo ################
-
-echo ################
-echo Careate icf_info.tmp file
-echo ################
-
-:: Careate icf_info_top.tmp
-set TampFileName=icf_info_top
-::echo ################
-::echo Careate !TampFileName!.tmp
-::echo ################
-::echo.
-echo Version 1.1.0 >> !TampFileName!.tmp
-echo 'TEST SETUP ==================================================================== >> !TampFileName!.tmp
-echo 'Test Description >> !TampFileName!.tmp
-echo. >> !TampFileName!.tmp
-echo 'Run Time >> !TampFileName!.tmp
-echo '	hours      minutes    seconds >> !TampFileName!.tmp
-echo 	0          10         0 >> !TampFileName!.tmp
-echo 'Ramp Up Time ^(s^) >> !TampFileName!.tmp
-echo 	300 >> !TampFileName!.tmp
-echo 'Default Disk Workers to Spawn >> !TampFileName!.tmp
-echo 	NUMBER_OF_CPUS >> !TampFileName!.tmp
-echo 'Default Network Workers to Spawn >> !TampFileName!.tmp
-echo 	0 >> !TampFileName!.tmp
-echo 'Record Results >> !TampFileName!.tmp
-echo 	ALL >> !TampFileName!.tmp
-echo 'Worker Cycling >> !TampFileName!.tmp
-echo '	start      step       step type >> !TampFileName!.tmp
-echo 	1          1          LINEAR >> !TampFileName!.tmp
-echo 'Disk Cycling >> !TampFileName!.tmp
-echo '	start      step       step type >> !TampFileName!.tmp
-echo 	1          1          LINEAR >> !TampFileName!.tmp
-echo 'Queue Depth Cycling >> !TampFileName!.tmp
-echo '	start      end        step       step type >> !TampFileName!.tmp
-echo 	1          32         2          EXPONENTIAL >> !TampFileName!.tmp
-echo 'Test Type >> !TampFileName!.tmp
-echo 	NORMAL >> !TampFileName!.tmp
-echo 'END test setup >> !TampFileName!.tmp
-echo 'RESULTS DISPLAY =============================================================== >> !TampFileName!.tmp
-echo 'Record Last Update Results,Update Frequency,Update Type >> !TampFileName!.tmp
-echo 	DISABLED,1,WHOLE_TEST >> !TampFileName!.tmp
-echo 'Bar chart 1 statistic >> !TampFileName!.tmp
-echo 	Total I/Os per Second >> !TampFileName!.tmp
-echo 'Bar chart 2 statistic >> !TampFileName!.tmp
-echo 	Total MBs per Second (Decimal) >> !TampFileName!.tmp
-echo 'Bar chart 3 statistic >> !TampFileName!.tmp
-echo 	Average I/O Response Time (ms) >> !TampFileName!.tmp
-echo 'Bar chart 4 statistic >> !TampFileName!.tmp
-echo 	Maximum I/O Response Time (ms) >> !TampFileName!.tmp
-echo 'Bar chart 5 statistic >> !TampFileName!.tmp
-echo 	%% CPU Utilization (total) >> !TampFileName!.tmp
-echo 'Bar chart 6 statistic >> !TampFileName!.tmp
-echo 	Total Error Count >> !TampFileName!.tmp
-echo 'END results display >> !TampFileName!.tmp
-echo 'ACCESS SPECIFICATIONS ========================================================= >> !TampFileName!.tmp
-echo 'Access specification name,default assignment >> !TampFileName!.tmp
-echo 	SAS_2K,NONE >> !TampFileName!.tmp
-echo 'size,%% of size,%% reads,%% random,delay,burst,align,reply >> !TampFileName!.tmp
-echo 	2048,100,0,100,0,1,2048,0 >> !TampFileName!.tmp
-echo 'Access specification name,default assignment >> !TampFileName!.tmp
-echo 	SATA_6K,NONE >> !TampFileName!.tmp
-echo 'size,%% of size,%% reads,%% random,delay,burst,align,reply >> !TampFileName!.tmp
-echo 	6144,100,0,100,0,1,6144,0 >> !TampFileName!.tmp
-echo 'END access specifications >> !TampFileName!.tmp
-echo 'MANAGER LIST ================================================================== >> !TampFileName!.tmp
-echo 'Manager ID, manager name >> !TampFileName!.tmp
-echo 	1, >> !TampFileName!.tmp
-echo 'Manager network address >> !TampFileName!.tmp
-echo. >> !TampFileName!.tmp
-
-
-:: Careate icf_Worker_info_top.tmp
-set TampFileName=icf_Worker_info_top
-::echo ################
-::echo Careate !TampFileName!.tmp
-::echo ################
-::echo.
-echo 'Worker >> !TampFileName!.tmp
-::echo     Worker 1 >> !TampFileName!.tmp
-
-:: Careate icf_Worker_info_mid_top.tmp
-set TampFileName=icf_Worker_info_mid_top
-::echo ################
-::echo Careate !TampFileName!.tmp
-::echo ################
-::echo.
-echo 'Worker type >> !TampFileName!.tmp
-echo 	DISK >> !TampFileName!.tmp
-echo 'Default target settings for worker >> !TampFileName!.tmp
-echo 'Number of outstanding IOs,test connection rate,transactions per connection,use fixed seed,fixed seed value >> !TampFileName!.tmp
-::echo 	1,DISABLED,1,DISABLED,0 >> !TampFileName!.tmp
-
-:: Careate icf_Worker_info_mid_mid.tmp
-set TampFileName=icf_Worker_info_mid_mid
-::echo ################
-::echo Careate !TampFileName!.tmp
-::echo ################
-::echo.
-echo 'Disk maximum size,starting sector,Data pattern >> !TampFileName!.tmp
-echo 	0,0,0 >> !TampFileName!.tmp
-echo 'End default target settings for worker >> !TampFileName!.tmp
-echo 'Assigned access specs >> !TampFileName!.tmp
-::echo 	SAS_2K >> !TampFileName!.tmp
-
-:: Careate icf_Worker_info_mid_bot.tmp
-set TampFileName=icf_Worker_info_mid_bot
-echo 'End assigned access specs >> !TampFileName!.tmp
-echo 'Target assignments >> !TampFileName!.tmp
-echo 'Target >> !TampFileName!.tmp
-::echo     1: "" >> !TampFileName!.tmp
-
-:: Careate icf_Worker_info_bot.tmp
-set TampFileName=icf_Worker_info_bot
-::echo ################
-::echo Careate !TampFileName!.tmp
-::echo ################
-::echo.
-echo 'Target type >> !TampFileName!.tmp
-echo 	DISK >> !TampFileName!.tmp
-echo 'End target >> !TampFileName!.tmp
-echo 'End target assignments >> !TampFileName!.tmp
-echo 'End worker >> !TampFileName!.tmp
-
-:: Careate icf_info_bot.tmp
-set TampFileName=icf_info_bot
-::echo ################
-::echo Careate !TampFileName!.tmp
-::echo ################
-::echo.
-echo 'End manager >> !TampFileName!.tmp
-echo 'END manager list >> !TampFileName!.tmp
-echo Version 1.1.0 >> !TampFileName!.tmp
-
-echo ################
-echo Start carte many icf file
-echo ################
-echo.
-
-set file=disksort.txt
-set /a cnt=0
-for /f %%a in ('type "%file%"^|find "" /v /c') do set /a cnt=%%a
-echo %file% has %cnt% lines
-
-set DiskNum=%cnt%
-
-set /a count=1
-
-::LOOP
-::if %count% LEQ %DiskNum% (
-::    set "formattedValue=000000%count%"
-::    set FileName=!formattedValue:~-2!
-::    echo !FileName!.icf
-::    for /f "tokens=1,2,3,4* " %%i in (disksort.txt) do (
-::        echo %%i %%j %%k )
-::    set /a count +=1
-::    goto LOOP
-::)
-
-echo ################
-echo Get spic Line -skip 3-------------
-echo ################
-
-set SKIP=5
-for /f "tokens=1,2,3,4,5* " %%i in (disksort.txt) do (
-    set "formattedValue=%%l %%m %%n"
-	set /A a=100+%%j
-	set "line[!a:~1!]=%%i %%j !b! !formattedValue:~0,20!
-)
-
-for /F "skip=%SKIP% tokens=2 delims==" %%a in ('set line[') do (
-    echo %%a > temp.tmp
-	goto nxetline)
-:nxetline
-
-echo ################
-echo get spic disk info
-echo ################
-
-set NULL=
-
-for /f "tokens=1,2,3,4,5* " %%i in (temp.tmp) do (
-    set TargetID=%%i
-	set TargetFW=%%j
-    if "%%n"=="" if "%%m"=="" (
-	    set TargetName=%%l
-	)else if "%%n"=="" (
-	    set TargetName=%%l %%m
-	)else (
-	    set TargetName=%%l %%m %%n
-	)
-	set AssignedName=%%k
-)
-echo ################
-echo NULL="%NULL%"
-echo ################
-
-echo ################
-echo TargetName="%TargetName%"
-echo ################
-
-
-echo %AssignedName% %TargetID% %TargetName% %TargetFW%
-
-echo ################
-echo Start carte many icf file
-echo ################
-echo.
-
-set DiskNum=2
-set FileName=00
-
-for /L %%i in (1, 1, %DiskNum%) do (
-    set "formattedValue=000000%%i"
-	set FileName=!formattedValue:~-2!
-    echo !FileName!.icf
-	:: imput icf_info_top
-	type icf_info_top.tmp                               >> !FileName!.icf
-	    :: imput icf_Worker_info_top(outstanding=8)
-	    type icf_Worker_info_top.tmp                    >> !FileName!.icf
-        echo     Worker 1 >> !FileName!.icf
-	    :: imput icf_Worker_mid_top
-	    type icf_Worker_info_mid_top.tmp                >> !FileName!.icf
-	    echo 	8,DISABLED,1,DISABLED,0 >> !FileName!.icf
-	    :: imput icf_Worker_info_mid_mid
-	    type icf_Worker_info_mid_mid.tmp                >> !FileName!.icf
-		echo 	SAS_2K >> !FileName!.icf
-	    :: imput icf_Worker_info_mid_bot
-	    type icf_Worker_info_mid_bot.tmp                >> !FileName!.icf
-	    echo     %%i: "">> !FileName!.icf
-	    :: imput icf_Worker_info_bot
-	    type icf_Worker_info_bot.tmp                    >> !FileName!.icf
-	:: imput Other Worker info(outstanding=1)
-	for /L %%j in (2, 1, %DiskNum%) do (
-	    if %%i==%%j (
-		    :: imput icf_Worker_info_top
-	        type icf_Worker_info_top.tmp                >> !FileName!.icf
-            echo     Worker %%j >> !FileName!.icf
-	        :: imput icf_Worker_mid_top
-	        type icf_Worker_info_mid_top.tmp            >> !FileName!.icf
-	        echo 	1,DISABLED,1,DISABLED,0 >> !FileName!.icf
-	        :: imput icf_Worker_info_mid_mid
-	        type icf_Worker_info_mid_mid.tmp                >> !FileName!.icf
-		    echo 	SAS_2K >> !FileName!.icf
-			:: imput icf_Worker_info_mid_bot
-	        type icf_Worker_info_mid_bot.tmp            >> !FileName!.icf
-	        echo     1: "" >> !FileName!.icf
-		    :: imput icf_Worker_info_bot
-	        type icf_Worker_info_bot.tmp                >> !FileName!.icf
-	    )else (
-		    :: imput icf_Worker_info_top
-	        type icf_Worker_info_top.tmp                >> !FileName!.icf
-            echo     Worker %%j >> !FileName!.icf
-	        :: imput icf_Worker_mid_top
-	        type icf_Worker_info_mid_top.tmp            >> !FileName!.icf
-	        echo 	1,DISABLED,1,DISABLED,0 >> !FileName!.icf
-	        :: imput icf_Worker_info_mid_mid
-	        type icf_Worker_info_mid_mid.tmp                >> !FileName!.icf
-		    echo 	SAS_2K >> !FileName!.icf
-			:: imput icf_Worker_info_mid_bot
-	        type icf_Worker_info_mid_bot.tmp            >> !FileName!.icf
-	        echo     %%j: "" >> !FileName!.icf
-	        :: imput icf_Worker_info_bot
-	        type icf_Worker_info_bot.tmp                >> !FileName!.icf
-	    )
-	)
-	 type icf_info_bot.tmp                              >> !FileName!.icf
-)
-
-echo.
-echo ################
-echo Complete carte many icf file
-echo ################
-echo.
-
-if exist *.tmp del /Q *.tmp
-
-PAUSE


Windows Update pullpatches.bat June 2017 edition

IE11 is a cumulative update and supersedes all previous

--- wupatch/pullpatches.bat
+++ wupatch/pullpatches.bat
@@ -5,7 +5,7 @@

 setlocal enableextensions enabledelayedexpansion

-set ppversion=12
+set ppversion=13
 set ppurl=https://raw.githubusercontent.com/conoror/misc/master/wupatch/pullpatches.bat

 set msdownloadpath=http://download.windowsupdate.com
@@ -298,17 +298,18 @@
 /c/msdownload/update/software/secu/2016/12/windows6.1-kb3205394-x64_71d0c657d24bc852f074996c32987fb936c07774.msu

-Security only Updates for Jan,Mar,Apr 2017
-------------------------------------------
+Security only Updates for Jan,Mar,Apr,May 2017
+----------------------------------------------

 /c/msdownload/update/software/secu/2017/01/windows6.1-kb3212642-x64_f3633176091129fc428d899c93545bdc7821e689.msu
 /d/msdownload/update/software/secu/2017/02/windows6.1-kb4012212-x64_2decefaa02e2058dcd965702509a992d8c4e92b3.msu
 /c/msdownload/update/software/secu/2017/03/windows6.1-kb4015546-x64_4ff5653990d74c465d48adfba21aca6453be99aa.msu
-
-
-Security only and IE11 (IE is cumulative) Updates for May 2017
---------------------------------------------------------------
-
-/c/msdownload/update/software/secu/2017/04/ie11-windows6.1-kb4018271-x64_7c8d8beb9999d65c8db17001c697e82a9a0bb1d1.msu
 /c/msdownload/update/software/secu/2017/05/windows6.1-kb4019263-x64_d64d8b6f91434754fdd2a552d8732c95a6e64f30.msu

+
+Security only and IE11 (IE is cumulative) Updates for June 2017
+---------------------------------------------------------------
+
+/c/msdownload/update/software/secu/2017/05/ie11-windows6.1-kb4021558-x64_ac613bb21b5ba702d60367b5db8c35ada8e65c50.msu
+/c/msdownload/update/software/secu/2017/06/windows6.1-kb4022722-x64_ee5b5fae02d1c48dbd94beaff4d3ee4fe3cd2ac2.msu
+


Go back to original directory on error

Go back to original directory on error

--- build/windows.bat
+++ build/windows.bat
@@ -78,5 +78,7 @@
 goto :EOF

 :error
-echo Failed with error #%errorlevel%
-exit /b %errorlevel%
+set ERRORCODE=%errorlevel%
+echo Failed with error #%ERRORCODE%
+cd "%CURRENT%"
+exit /b %ERRORCODE%


test nosetests

test nosetests

--- test/run.bat
+++ test/run.bat
@@ -0,0 +1 @@
+nosetests --with-xcoverage --with-xunit