(Shot in the dark to add `gfortran` to path on AppVeyor.)

--- recipes/libbezier/bld.bat
+++ recipes/libbezier/bld.bat
@@ -21,6 +21,8 @@
 :: set PATH=%PATH%;C:\mingw-w64\x86_64-8.1.0-posix-seh-rt_v6-rev0\mingw64\bin;C:\mingw-w64\i686-6.3.0-posix-dwarf-rt_v5-rev1\mingw32\bin
 ::
 :: but the pre-processing of `bld.bat` causes issues with the indents.
+set PATH=%PATH%;C:\mingw-w64\x86_64-8.1.0-posix-seh-rt_v6-rev0\mingw64\bin
+set PATH=%PATH%;C:\mingw-w64\i686-6.3.0-posix-dwarf-rt_v5-rev1\mingw32\bin

 :: Workaround for `git bash`; CMake errors with
 ::   For MinGW make to work correctly sh.exe must NOT be in your path.


use Aimp3 by default

use Aimp3 by default

--- setup_vs_project_variables.bat
+++ setup_vs_project_variables.bat
@@ -3,5 +3,5 @@

 set BOOST_DIR=c:\libraries\boost\boost_1_46_1
 set FREEIMAGELIB_DIR=c:\libraries\FreeImage\3.15.0
-set AIMP_PLUGINS_DIR=c:\AIMP2\Plugins
-::set AIMP_PLUGINS_DIR=c:\AIMP3\Plugins+::set AIMP_PLUGINS_DIR=c:\AIMP2\Plugins
+set AIMP_PLUGINS_DIR=c:\AIMP3\Plugins


Fix windows script

Fix windows script

--- tools/release/build_delivery_win.cmd
+++ tools/release/build_delivery_win.cmd
@@ -311,8 +311,8 @@
   which.exe C:\python3%%v-64\python.exe || exit 1
   echo C:\python3%%v-64\python.exe: FOUND | tee.exe -a build.log
   C:\python3%%v-64\python.exe -m pip install --user absl-py mypy-protobuf
-  set PATH=%PATH%;%userprofile%\appdata\roaming\python\python3%%v\Scripts
-  set PATH=%PATH%;C:\python3%%v-64\Scripts
+  set PATH+=;%userprofile%\appdata\roaming\python\python3%%v\Scripts"
+  set PATH+=;C:\python3%%v-64\Scripts"

   echo Cleaning Python... | tee.exe -a build.log
  make.exe clean_python WINDOWS_PATH_TO_PYTHON=c:\python3%%v-64


Fix for AppVeyor

Fix for AppVeyor

--- vendors/build_vendors_appveyor.bat
+++ vendors/build_vendors_appveyor.bat
@@ -12,3 +12,6 @@
 copy %configuration%\ssdll.* ..\..\..\..\libs

 cd ..\..\..\..\src
+
+echo "Current directory is:"
+echo %cd%


add script to update maven version and tag

error: pathspec 'update-next-version.bat' did not match any file(s) known to git

--- update-next-version.bat
+++ update-next-version.bat
@@ -0,0 +1,27 @@
+@ECHO ON
+SETLOCAL
+
+::SET VARIABLE
+SET VERSION=J7.0.0.2
+SET NEXT_VERSION=J7.0.0.3-SNAPSHOT
+
+::STARTING
+echo executing in current dir "%~dp0"
+CD "%~dp0"
+
+::update version fro all current related project
+mvn release:clean release:prepare -Dresume=false -DreleaseVersion=%VERSION% -DdevelopmentVersion=%NEXT_VERSION%
+mvn versions:set -DnewVersion=%VERSION% -DprocessAllModules
+mvn clean install
+mvn versions:commit -DprocessAllModules
+git commit
+mvn release:perform
+GOTO:EOF
+
+## LABEL
+:ROLLBACK
+mvn release:rollback
+mvn versions:revert
+
+:FINISH
+ENDLOCAL


Add create.bat to create the virtual machine on windows

error: pathspec 'script/vagrant/create.bat' did not match any file(s) known to git

--- script/vagrant/create.bat
+++ script/vagrant/create.bat
@@ -0,0 +1,2 @@
+vagrant up
+pause


Add Microsoft.Azure.Devices.Uwp.dll in auto-sign script.

--- build/release/auto_sign_csharp_client.cmd
+++ build/release/auto_sign_csharp_client.cmd
@@ -45,6 +45,9 @@
 xcopy /q /y /R %client-build-root%\csharp\service\Microsoft.Azure.Devices\bin\Release_Delay_Sign\Microsoft.Azure.Devices.dll %client-build-root%\build\tosign\
 if !ERRORLEVEL! neq 0 exit /b !ERRORLEVEL!

+xcopy /q /y /R %client-build-root%\csharp\service\Microsoft.Azure.Devices.Uwp\bin\Release_Delay_Sign\Microsoft.Azure.Devices.Uwp.dll %client-build-root%\build\tosign\
+if !ERRORLEVEL! neq 0 exit /b !ERRORLEVEL!
+
 rem -- Auto-sign the managed dlls placed in the "tosign" Folder
 csu.exe /s=True /w=True /i=%client-build-root%\build\tosign /o=%client-build-root%\build\signed /c1=72 /c2=401 /d="Signing Azure IoT Managed Client binaries"
 if !ERRORLEVEL! neq 0 exit /b !ERRORLEVEL!
@@ -74,6 +77,12 @@
 xcopy /q /y /R %client-build-root%\build\signed\Microsoft.Azure.Devices.dll %client-build-root%\csharp\service\Microsoft.Azure.Devices\obj\Release_Delay_Sign\
 if !ERRORLEVEL! neq 0 exit /b !ERRORLEVEL!

+xcopy /q /y /R %client-build-root%\build\signed\Microsoft.Azure.Devices.Uwp.dll %client-build-root%\csharp\service\Microsoft.Azure.Devices.Uwp\bin\Release_Delay_Sign\
+if !ERRORLEVEL! neq 0 exit /b !ERRORLEVEL!
+
+xcopy /q /y /R %client-build-root%\build\signed\Microsoft.Azure.Devices.Uwp.dll %client-build-root%\csharp\service\Microsoft.Azure.Devices.Uwp\obj\Release_Delay_Sign\
+if !ERRORLEVEL! neq 0 exit /b !ERRORLEVEL!
+
 rem -- Clean directories
 del /F /Q %client-build-root%\build\tosign
 del /F /Q %client-build-root%\build\signed


Update bld.bat

Update bld.bat

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


remove publish from normal build and run tests scripts

--- build-and-run-tests.bat
+++ build-and-run-tests.bat
@@ -1,3 +1,2 @@
 ./run-tests.bat
-./build.bat
-./push-to-nuget.bat+./build.bat


create_installer.bat fixed

create_installer.bat fixed

--- installer/windows/create_installer.bat
+++ installer/windows/create_installer.bat
@@ -39,8 +39,7 @@
 xcopy /R /Y %SystemRoot%\SysWOW64\vcruntime140.dll binaries\32\msvcr\
 xcopy /R /Y %SystemRoot%\SysWOW64\vcruntime140_1.dll binaries\32\msvcr\

-echo "%programfiles(x86)%\Windows Kits\10\Redist\%WIN_SDK%\ucrt\DLLs\x86\*.dll"
-xcopy /R /Y "%programfiles(x86)%\Windows Kits\10\Redist\%WIN_SDK%\ucrt\DLLs\x86\*.dll" binaries\32\msvcr\
+xcopy /R /Y "%programfiles(x86)%\Windows Kits\10\Redist\ucrt\DLLs\x86\*" binaries\32\msvcr\
 if %ERRORLEVEL% GEQ 1 goto windows_sdk_not_found

 del binaries\32\Qt\opengl*.*
@@ -79,8 +78,7 @@
 xcopy /R /Y %SystemRoot%\System32\vcruntime140.dll binaries\64\msvcr\
 xcopy /R /Y %SystemRoot%\System32\vcruntime140_1.dll binaries\64\msvcr\

-echo "%programfiles(x86)%\Windows Kits\10\Redist\%WIN_SDK%\ucrt\DLLs\x64\*.dll"
-xcopy /R /Y "%programfiles(x86)%\Windows Kits\10\Redist\%WIN_SDK%\ucrt\DLLs\x64\*.dll" binaries\64\msvcr\
+xcopy /R /Y "%programfiles(x86)%\Windows Kits\10\Redist\ucrt\DLLs\x64\*" binaries\64\msvcr\
 if %ERRORLEVEL% GEQ 1 goto windows_sdk_not_found

 del binaries\64\Qt\opengl*.*


add thermal test

add thermal test

--- configure.bat
+++ configure.bat
@@ -616,6 +616,7 @@
 call :compileTest LockandFlipKeys LockandFlipPSkeys
 call :compileTest FmTxClientCheck FmTxClient
 call :compileTest DiskNotifyClientCheck DiskNotifyClient
+call :compileTest ThermalStatus_Symbian thermalstatus_symbian
 goto noTests

 :windowsTests


Hierarhical repositories, fix path quotes.

--- gitbox.bat
+++ gitbox.bat
@@ -18,8 +18,8 @@
 set base_path=("%PATH:;=" "%")
 for %%p in %base_path% do (
     if exist %%p\git.exe (
-        set base=%%p
-        set git_root=!base:~0,-4!
+        set base=%%~p
+        set git_root="!base:~0,-4!"
     )
 )
 if %git_root%==undefined (
@@ -27,7 +27,6 @@
         if exist %%p\bin\git.exe set git_root=%%p
     )
 )
-
 rem If the git couldn't be found, offer to install it
 if %git_root%==undefined (
     echo GitBox couldn't locate a valid git installation.
@@ -62,7 +61,7 @@
 )

 rem If git was found, execute any requested operation, or simply start the git shell
-set PATH=%git_root%\bin;%git_root%\cmd;%PATH%
+set PATH=%git_root:"=%\bin;%git_root:"=%\cmd;%PATH%
 set PLINK_PROTOCOL=ssh
 if "%HOME%"=="" (
     set HOME=%USERPROFILE%
@@ -73,13 +72,34 @@
     goto end
 )
 if /i '%1'=='list' (
-    rem Iterate through all the directories in the repoo folder and print them
-    echo List of repositories tracked by GitBox:
-    for /f "Delims=" %%d in ('dir /AD /B "%repos%"') do (
+     rem Get the group name or the default (all) and indentation (internal)
+    set group=%~2
+    if '%2'=='' set group=.
+    set indent=%~3
+    if '%3'=='' (
+        set "indent= "
+        echo List of repositories tracked by GitBox:
+    )
+
+    rem Iterate through all the groups in the requested folder and print them
+    for /f "Delims=" %%d in ('dir /AD /B "%repos%\!group!"') do (
+        set folder=%%d
+        if not '!folder:~-4!'=='.git' (
+            echo !indent!+ !folder!
+            call %0 list "!group!/!folder!" "  !indent!"
+        )
+    )
+
+    rem Iterate through all the repositories in the requested folder and print them
+    for /f "Delims=" %%d in ('dir /AD /B "%repos%\!group!"') do (
         set dir=%%d
-        echo  - !dir:~0,-4!
-    )
-    pause
+        if '!dir:~-4!'=='.git' (
+            echo !indent!- !dir:~0,-4!
+        )
+    )
+    if '%3'=='' (
+        pause
+    )
     goto end
 )
 if /i '%1'=='create' (


Fix rose build

Fix rose build

--- 8088/cga/scanline_per_frame/build.bat
+++ 8088/cga/scanline_per_frame/build.bat
@@ -9,9 +9,9 @@
 yasm 1spf4_single.asm -o 1spf4_single.bin
 yasm 1spf_unrolled.asm -o 1spf_unrolled.bin
 yasm rose.asm -o r.com -l rcom.lst
-copy /b r.com+\pictures\reenigne\cga2ntsc\rose_out_rgbi.dat rose.com
+copy /b r.com+\pictures\reenigne\cga2ntsc\rose_out_rgbi_stretch.dat rose.com
 yasm rose.asm -o r.bin -dbin=1 -l r.lst
-copy /b r.bin+\pictures\reenigne\cga2ntsc\rose_out_rgbi.dat rose.bin
+copy /b r.bin+\pictures\reenigne\cga2ntsc\rose_out_rgbi_stretch.dat rose.bin
 yasm 1spf_newstart.asm -o 1spf_newstart.bin -l 1spf_newstart.lst
 yasm 1spf_newstart2.asm -o 1spf_newstart2.bin -l 1spf_newstart2.lst
 yasm start_address_latch.asm -o start_address_latch.bin


Update Cartographer.cmd

Update Cartographer.cmd

 * Now it can generate project files, but it uses various fake ways and the project files still have link errors.

--- cartographer-windows/Cartographer.cmd
+++ cartographer-windows/Cartographer.cmd
@@ -9,6 +9,8 @@

 REM Please set "Assume Unchanged" to these files with your git client.
 xcopy /E /D /Y /Q "Projects\cartographer" "..\Projects\cartographer\"
+copy "C:\SDKs\boost_1_64_0\lib64-msvc-14.1\libboost_zlib-vc141-mt-1_64.lib" "C:\SDKs\boost_1_64_0\lib64-msvc-14.1\libboost_zlib-vc140-mt-1_64.lib"
+copy "C:\SDKs\boost_1_64_0\lib64-msvc-14.1\libboost_iostreams-vc141-mt-1_64.lib" "C:\SDKs\boost_1_64_0\lib64-msvc-14.1\libboost_iostreams-vc140-mt-1_64.lib"

@@ -46,10 +48,13 @@
 -DBOOST_INCLUDEDIR:PATH="%SdksFolderPath%/boost_1_64_0" ^
 -DBOOST_LIBRARYDIR:PATH="%SdksFolderPath%/boost_1_64_0/lib64-msvc-14.1" ^
 -DBOOST_ROOT:PATH="%SdksFolderPath%/boost_1_64_0/boost" ^
--DBoost_IOSTREAMS_LIBRARY_DEBUG:FILEPATH="boost_iostreams-vc141-mt-gd-1_64.lib" ^
--DBoost_IOSTREAMS_LIBRARY_RELEASE:FILEPATH="boost_iostreams-vc141-mt-1_64.lib" ^
--DBoost_REGEX_LIBRARY_DEBUG:FILEPATH="boost_regex-vc141-mt-gd-1_64.lib" ^
--DBoost_REGEX_LIBRARY_RELEASE:FILEPATH="boost_regex-vc141-mt-1_64.lib" ^
+-DBoost_DIR:PATH="%SdksFolderPath%/boost_1_64_0" ^
+-DBoost_INCLUDE_DIR:PATH="%SdksFolderPath%/boost_1_64_0" ^
+-DBoost_LIBRARY_DIR:PATH="%SdksFolderPath%/boost_1_64_0/lib64-msvc-14.1" ^
+-DBoost_IOSTREAMS_LIBRARY_DEBUG:FILEPATH="libboost_iostreams-vc141-mt-sgd-1_64.lib" ^
+-DBoost_IOSTREAMS_LIBRARY_RELEASE:FILEPATH="libboost_iostreams-vc141-mt-s-1_64.lib" ^
+-DBoost_REGEX_LIBRARY_DEBUG:FILEPATH="libboost_regex-vc141-mt-sgd-1_64.lib" ^
+-DBoost_REGEX_LIBRARY_RELEASE:FILEPATH="libboost_regex-vc141-mt-s-1_64.lib" ^
 -DLUA_INCLUDE_PREFIX="%SdksFolderPath%/lua/lua/include" ^
 -DLUA_INCLUDE_DIR="%SdksFolderPath%/lua/lua/include" ^
 -DLUA_LIBRARIES="%SdksFolderPath%/lua/lua/lib" ^
@@ -72,17 +77,14 @@
 echo ^
 -DTHREADS_PTHREADS_INCLUDE_DIR:PATH="%SdksFolderPath%/GerHobbelt/pthread-win32" ^
 -DTHREADS_PTHREADS_LIBRARY_DIR:PATH="%SdksFolderPath%/GerHobbelt/pthread-win32/bin/x64_MSVC2015.Release" ^
--DBoost_DIR:PATH="%SdksFolderPath%/boost_1_64_0" ^
--DBoost_INCLUDE_DIR:PATH="%SdksFolderPath%/boost_1_64_0" ^
--DBoost_LIBRARY_DIR:PATH="%SdksFolderPath%/boost_1_64_0/lib64-msvc-14.1" ^

 copy "..\..\cartographer-windows\Projects\cartographer_build_x64\AllFiles.cmake" .

-cmake.exe .
-REM cmake.exe --build "." --target "ALL_BUILD" --config "Release"
+cmake.exe . -G "Visual Studio 14 2015 Win64"
+cmake.exe --build "." --target "ALL_BUILD" --config "Release"
 REM cmake.exe --build "." --target "RUN_TESTS" --config "Release"
 REM cmake.exe --build "." --target "INSTALL" --config "Release"


Removed cleanup

Removed cleanup

--- _publish.bat
+++ _publish.bat
@@ -14,5 +14,5 @@
 @call scms --publish > .\last-deploy.log
 @call type .\last-deploy.log

-echo Cleaning up
-git clean -fdx+::echo Cleaning up
+::git clean -fdx


updated SonarQube UlibCpp package version

--- src/SonarQube.cmd
+++ src/SonarQube.cmd
@@ -29,7 +29,7 @@

 SonarQube.Scanner.MSBuild.exe begin ^
     /k:"UlibCpp" ^
-    /v:"4.0.1" ^
+    /v:"4.1.0" ^
     /d:"sonar.cfamily.build-wrapper-output=%CD%\bw-output" ^
     /d:"sonar.host.url=https://sonarqube.com" ^
     /d:"sonar.organization=vividos-github" ^


Another check for branches

Another check for branches

--- SpotifyAPI.Docs/docs.cmd
+++ SpotifyAPI.Docs/docs.cmd
@@ -1,25 +1,27 @@
 if "%APPVEYOR_PULL_REQUEST_NUMBER%" == "" (
-  echo Building docs...
-  pip install mkdocs
+  if "%APPVEYOR_REPO_BRANCH%" == "master" (
+    echo Building docs...
+    pip install mkdocs

-  cd ./SpotifyAPI.Docs
-  mkdocs build --clean
+    cd ./SpotifyAPI.Docs
+    mkdocs build --clean

-  mkdir deploy
-  cd deploy
+    mkdir deploy
+    cd deploy

-  git config --global user.email "johnny@johnnycrazy.de"
-  git config --global user.name "AppVeyor Doc Generation"
+    git config --global user.email "johnny@johnnycrazy.de"
+    git config --global user.name "AppVeyor Doc Generation"

-  git clone --quiet --branch=gh-pages https://%GH_TOKEN%@github.com/JohnnyCrazy/SpotifyAPI-NET gh-pages
-  cd gh-pages
-  git rm -qrf .
-  xcopy ..\..\site .\ /s /e /y
-  git add -A
-  git commit -m "Built docs | AppVeyor Build %APPVEYOR_BUILD_NUMBER%"
-  git push -fq origin gh-pages
+    git clone --quiet --branch=gh-pages https://%GH_TOKEN%@github.com/JohnnyCrazy/SpotifyAPI-NET gh-pages
+    cd gh-pages
+    git rm -qrf .
+    xcopy ..\..\site .\ /s /e /y
+    git add -A
+    git commit -m "Built docs | AppVeyor Build %APPVEYOR_BUILD_NUMBER%"
+    git push -fq origin gh-pages

-  cd ../../../
+    cd ../../../
+  )
 ) else (
   echo Skipping doc build
 )


latest version

latest version

--- src/client/userinterface/java/pack.bat
+++ src/client/userinterface/java/pack.bat
@@ -1,8 +1,23 @@
-
-SET EXTLIBS="extlibs/jsch-0.1.44.jar; extlibs/ws-commons-util-1.0.2.jar; extlibs/commons-vfs-1.0.jar; extlibs/VFSJFileChooser-0.0.3.jar; extlibs/jcommon-1.0.16.jar; extlibs/jxl.jar; extlibs/ws-commons-util-1.0.2.jar; extlibs/xmlrpc-client-3.1.3.jar; extlibs/xmlrpc-common-3.1.3.jar"
+SET EXTLIBS="extlibs/jsch-0.1.44.jar;extlibs/ws-commons-util-1.0.2.jar;extlibs/commons-vfs-1.0.jar;extlibs/VFSJFileChooser-0.0.3.jar;extlibs/jcommon-1.0.16.jar;extlibs/jxl.jar;extlibs/ws-commons-util-1.0.2.jar;extlibs/xmlrpc-client-3.1.3.jar;extlibs/xmlrpc-common-3.1.3.jar"

 javac.exe -deprecation -d classes -source 1.6 -target 1.6 -cp %EXTLIBS% src/*.java

-jar.exe cf target/applet.jar classes/Icons classes/*.class
+cd classes
+jar cf ../target/applet.jar  Icons  *.class

-keytool.exe -export -alias Twister -rfc -file target/sig.x509 -storepass password
+cd ../target
+jarsigner applet.jar Twister -storepass password
+
+jarsigner ../extlibs/commons-logging-1.1.1.jar Twister -storepass password
+jarsigner ../extlibs/commons-vfs-1.0.jar Twister -storepass password
+jarsigner ../extlibs/jcommon-1.0.16.jar Twister -storepass password
+jarsigner ../extlibs/jsch-0.1.44.jar Twister -storepass password
+jarsigner ../extlibs/jxl.jar Twister -storepass password
+jarsigner ../extlibs/VFSJFileChooser-0.0.3.jar Twister -storepass password
+jarsigner ../extlibs/ws-commons-util-1.0.2.jar Twister -storepass password
+jarsigner ../extlibs/xmlrpc-client-3.1.3.jar Twister -storepass password
+jarsigner ../extlibs/xmlrpc-common-3.1.3.jar Twister -storepass password
+
+keytool -export -alias Twister -rfc -file sig.x509 -storepass password
+
+pause


Qt local upload windows: reorder for optimization

[skip ci]

--- maintenance/local-upload/qt/run-win.bat
+++ maintenance/local-upload/qt/run-win.bat
@@ -1,53 +1,47 @@
-REM First toolchain will run clean {
-set PROJECT_DIR=examples/GTest
+REM {
 set TOOLCHAIN=vs-14-2015
-.\jenkins.py --verbose --clear-except || exit /b 1
-REM }
-
-REM {
 set PROJECT_DIR=examples/qt-widgets
-set TOOLCHAIN=vs-14-2015
-.\jenkins.py --verbose --upload --nocreate || exit /b 1
-set TOOLCHAIN=vs-12-2013
-.\jenkins.py --verbose --upload --nocreate || exit /b 1
-set TOOLCHAIN=vs-11-2012
-.\jenkins.py --verbose --upload --nocreate || exit /b 1
-set TOOLCHAIN=mingw
+.\jenkins.py --verbose --clear-except-download || exit /b 1
+set PROJECT_DIR=examples/qt-qml
+.\jenkins.py --verbose --nocreate || exit /b 1
+set PROJECT_DIR=examples/qt-location
+.\jenkins.py --verbose --nocreate || exit /b 1
+set PROJECT_DIR=examples/qt-camera
 .\jenkins.py --verbose --upload --nocreate || exit /b 1
 REM }

 REM {
+set TOOLCHAIN=vs-12-2013
+set PROJECT_DIR=examples/qt-widgets
+.\jenkins.py --verbose --clear-except-download || exit /b 1
+set PROJECT_DIR=examples/qt-qml
+.\jenkins.py --verbose --nocreate || exit /b 1
+set PROJECT_DIR=examples/qt-location
+.\jenkins.py --verbose --nocreate || exit /b 1
 set PROJECT_DIR=examples/qt-camera
-set TOOLCHAIN=vs-14-2015
-.\jenkins.py --verbose --upload --nocreate || exit /b 1
-set TOOLCHAIN=vs-12-2013
-.\jenkins.py --verbose --upload --nocreate || exit /b 1
-set TOOLCHAIN=vs-11-2012
-.\jenkins.py --verbose --upload --nocreate || exit /b 1
-set TOOLCHAIN=mingw
 .\jenkins.py --verbose --upload --nocreate || exit /b 1
 REM }

 REM {
+set TOOLCHAIN=vs-11-2012
+set PROJECT_DIR=examples/qt-widgets
+.\jenkins.py --verbose --clear-except-download || exit /b 1
+set PROJECT_DIR=examples/qt-qml
+.\jenkins.py --verbose --nocreate || exit /b 1
 set PROJECT_DIR=examples/qt-location
-set TOOLCHAIN=vs-14-2015
-.\jenkins.py --verbose --upload --nocreate || exit /b 1
-set TOOLCHAIN=vs-12-2013
-.\jenkins.py --verbose --upload --nocreate || exit /b 1
-set TOOLCHAIN=vs-11-2012
-.\jenkins.py --verbose --upload --nocreate || exit /b 1
-set TOOLCHAIN=mingw
+.\jenkins.py --verbose --nocreate || exit /b 1
+set PROJECT_DIR=examples/qt-camera
 .\jenkins.py --verbose --upload --nocreate || exit /b 1
 REM }

 REM {
+set TOOLCHAIN=mingw
+set PROJECT_DIR=examples/qt-widgets
+.\jenkins.py --verbose --clear-except-download || exit /b 1
 set PROJECT_DIR=examples/qt-qml
-set TOOLCHAIN=vs-14-2015
-.\jenkins.py --verbose --upload --nocreate || exit /b 1
-set TOOLCHAIN=vs-12-2013
-.\jenkins.py --verbose --upload --nocreate || exit /b 1
-set TOOLCHAIN=vs-11-2012
-.\jenkins.py --verbose --upload --nocreate || exit /b 1
-set TOOLCHAIN=mingw
+.\jenkins.py --verbose --nocreate || exit /b 1
+set PROJECT_DIR=examples/qt-location
+.\jenkins.py --verbose --nocreate || exit /b 1
+set PROJECT_DIR=examples/qt-camera
 .\jenkins.py --verbose --upload --nocreate || exit /b 1
 REM }


fixed itch.io script

fixed itch.io script

--- projects/main.bat
+++ projects/main.bat
@@ -35,7 +35,7 @@
 {
 	app.ShellExecute("C:/Users/Miki/AppData/Roaming/itch/bin/butler.exe", "login")
 	setTimeout(function() {
-		app.ShellExecute("C:/Users/Miki/AppData/Roaming/itch/bin/butler.exe", "push ..\..\lumixengine_data_exported mikulasflorek/lumix-engine:win-64")
+		app.ShellExecute("C:/Users/Miki/AppData/Roaming/itch/bin/butler.exe", "push ../../lumixengine_data_exported mikulasflorek/lumix-engine:win-64")
 	}, 2000)
 }


Add -timeoutRetries support to runtests.cmd

--- test/runtests.cmd
+++ test/runtests.cmd
@@ -196,8 +196,9 @@
   if /i "%1" == "-DumpOnCrash"      set _DumpOnCrash=1&                                         goto :ArgOk
   if /i "%1" == "-CrashOnException" set _CrashOnException=1&                                    goto :ArgOk

-  ::Timeout flag
-  if /i "%1" == "-timeout"          set _TestTimeout=%~2&                                       goto : ArgOkShift2
+  ::Timeout flags
+  if /i "%1" == "-timeout"          set _TestTimeout=%~2&                                       goto :ArgOkShift2
+  if /i "%1" == "-timeoutRetries"   set _TestTimeoutRetries=%~2&                                goto :ArgOkShift2

   if /i "%1" == "-extraVariants" (
     :: Extra variants are specified by the user but not run by default.
@@ -495,6 +496,9 @@
   if not "%_TestTimeout%" == "" (
     set EXTRA_RL_FLAGS=%EXTRA_RL_FLAGS% -timeout:%_TestTimeout%
   )
+  if not "%_TestTimeoutRetries%" == "" (
+    set EXTRA_RL_FLAGS=%EXTRA_RL_FLAGS% -timeoutRetries:%_TestTimeoutRetries%
+  )

   echo.
   echo ############# Starting %_TESTCONFIG% variant #############


Add GATSPATH to beginning of PATH.

Add GATSPATH to beginning of PATH.

- Ensure that the correct cf version is being used.

--- bin/test.bat
+++ bin/test.bat
@@ -4,7 +4,7 @@
 go get -u github.com/pivotal-cf-experimental/GATS/...

 SET GATSPATH=%GOPATH%\src\github.com\pivotal-cf-experimental\GATS
-SET PATH=%PATH%;%GATSPATH%;C:\Program Files\cURL\bin
+SET PATH=%GATSPATH%;%PATH%;C:\Program Files\cURL\bin
 SET CONFIG=%CD%\config.json
 SET LOCAL_GOPATH=%GATSPATH%\Godeps\_workspace
 MKDIR %LOCAL_GOPATH%\bin


Fix the tcl-8.4.18.1 path and make sure we cd into the right directory when building tcl/tk.

--- Tools/buildbot/external-amd64.bat
+++ Tools/buildbot/external-amd64.bat
@@ -22,7 +22,7 @@
 )

 @rem tcltk
-if not exist tcl8.4.18.1 (
+if not exist tcl-8.4.18.1 (
    if exist tcltk rd /s/q tcltk
    if exist tcl8.4.12 rd /s/q tcl8.4.12
    if exist tk8.4.12 rd /s/q tk8.4.12
@@ -30,12 +30,12 @@
    if exist tk8.4.16 rd /s/q tk8.4.16
    svn export http://svn.python.org/projects/external/tcl-8.4.18.1
    svn export http://svn.python.org/projects/external/tk-8.4.18.1
-   cd tcl-8.4.18.1
-   nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 MACHINE=AMD64 INSTALLDIR=../../tcltk64 clean all install
-   cd ..\..
-   cd tk-8.4.18.1
-   nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 MACHINE=AMD64 INSTALLDIR=../../tcltk64 TCLDIR=../../tcl-8.4.18.1 clean all install
 )
+cd tcl-8.4.18.1\win
+nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 MACHINE=AMD64 INSTALLDIR=../../tcltk64 clean all install
+cd ..\..
+cd tk-8.4.18.1\win
+nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 MACHINE=AMD64 INSTALLDIR=../../tcltk64 TCLDIR=../../tcl-8.4.18.1 clean all install

 @rem sqlite
 if not exist sqlite-source-3.3.4 svn export http://svn.python.org/projects/external/sqlite-source-3.3.4


update major version

update major version

--- test/test_app.bat
+++ test/test_app.bat
@@ -1 +1,4 @@
-### test_app.bat - 2015 - Thibault ROGER ###+### test_app.bat - 2015 - Thibault ROGER ###
+version = "2.0.0"
+
+echo "version ${version}"


Fixed beep

Fixed beep

--- defendAPR.bat
+++ defendAPR.bat
@@ -107,7 +107,7 @@
 	 :: check that the MAC did not change
 	IF NOT "%GoodMAC%"=="%PhysAddr%" (
 		ECHO.
-		@echo
+		@echo ^G
 		ECHO ARP POISONED!
 		ECHO Spoofed IP: %1
 		ECHO %1's actual Physical Address: %GoodMAC%


- added basic boot.bat for win32

- added basic boot.bat for win32

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

--- bin/boot.bat
+++ bin/boot.bat
@@ -0,0 +1,5 @@
+@echo off
+REM set path to erlang installation
+set ERLANG="c:\program files\erl5.7.1\bin"
+
+%ERLANG%\erl -setcookie "chocolate chip cookie" -pa ..\contrib\log4erl\ebin -pa ..\contrib\yaws\ebin -pa ..\ebin -yaws embedded true -connect_all false -sname boot@localhost -s boot


update by james.shi 2018/10/08

update by james.shi 2018/10/08

--- bin/cola.bat
+++ bin/cola.bat
@@ -40,7 +40,7 @@
 set JVM_ARGS=
 set RUN_ARGS=
 set DEBUG_PORT=
-set JAR_FILE=*cola-%APP_NAME%-?.?.?.jar
+set JAR_FILE=*%APP_NAME%-?.?.?.jar

 if ""%RUN_MODE%"" == ""debug"" (
 	setlocal enabledelayedexpansion
@@ -102,7 +102,7 @@
 )

 set MAVEN_CMD=mvn.cmd
-%MAVEN_CMD% -version >NUL 2>&1
+call %MAVEN_CMD% -version >NUL 2>&1
 if "%ERRORLEVEL%" == "0" goto runmvn

 echo.


removed no-configure

removed no-configure

--- recipes/r-rgl/bld.bat
+++ recipes/r-rgl/bld.bat
@@ -1,4 +1,4 @@
-"%R%" CMD INSTALL --build --no-configure "x11".
+"%R%" CMD INSTALL --build .
 if errorlevel 1 exit 1

 @rem Add more build steps here, if they are necessary.


FORGE-2784: Run forge.bat for java versions greater than 1.*

forge.bat java version validation now checks if the major
number is greater than 1. It also does a preliminary check
for the JAVA_VERSION in the %JAVA_HOME%\release text file
(if it exists) to avoid time spent running "java -version".

--- dist/src/main/resources/bin/forge.bat
+++ dist/src/main/resources/bin/forge.bat
@@ -51,7 +51,7 @@
 goto error

 :OkJHome
-if exist "%JAVA_HOME%\bin\java.exe" goto chkJVersion
+if exist "%JAVA_HOME%\bin\java.exe" goto chkJVersionInReleaseFile

 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory.
@@ -61,12 +61,33 @@
 echo.
 goto error

+:chkJVersionInReleaseFile
+if not exist "%JAVA_HOME%\release" goto chkJVersion
+
+for /f "delims== tokens=2" %%g in ('findstr "JAVA_VERSION=" "%JAVA_HOME%\release"') do (
+   set JAVAVER=%%g
+)
+set JAVAVER=%JAVAVER:"=%
+for /f "delims=. tokens=1" %%v in ("%JAVAVER%") do (
+   set JAVAVER_MAJOR=%%v
+)
+if %JAVAVER_MAJOR% gtr 1 goto chkFHome
+for /f "delims=. tokens=2" %%v in ("%JAVAVER%") do (
+   set JAVAVER_MINOR=%%v
+)
+if %JAVAVER_MINOR% geq 7 goto chkFHome
+
 :chkJVersion
 set PATH="%JAVA_HOME%\bin";%PATH%

 for /f "tokens=3" %%g in ('java -version 2^>^&1 ^| findstr /i "version"') do (
    set JAVAVER=%%g
 )
+set JAVAVER=%JAVAVER:"=%
+for /f "delims=. tokens=1" %%v in ("%JAVAVER%") do (
+   set JAVAVER_MAJOR=%%v
+)
+if %JAVAVER_MAJOR% gtr 1 goto chkFHome
 for /f "delims=. tokens=1-3" %%v in ("%JAVAVER%") do (
    set JAVAVER_MINOR=%%w
 )


OpenMM 6.3 windows

OpenMM 6.3 windows

Former-commit-id: 35132cd254eec444594dd2f928e5610fecee7a2b

--- openmm/bld.bat
+++ openmm/bld.bat
@@ -4,7 +4,9 @@
 mkdir build
 cd build

-cmake -G "NMake Makefiles" -DCMAKE_INSTALL_PREFIX=%PREFIX% -DFFTW_LIBRARY=%LIBRARY_LIB% -DFFTW_INCLUDES=%LIBARY_INC% -DCMAKE_BUILD_TYPE=Release ..
+cmake -G "NMake Makefiles" -DCMAKE_INSTALL_PREFIX=%PREFIX% -DOPENMM_BUILD_PME_PLUGIN=ON -DFFTW_LIBRARY=%LIBRARY_LIB%\libfftwf-3.3.lib -DFFTW_INCLUDES=%LIBRARY_INC% -DCMAKE_BUILD_TYPE=Release ..
+
+jom all DoxygenApiDocs :: sphinxpdf
 jom install
 if errorlevel 1 exit 1

@@ -19,4 +21,11 @@
 mkdir %PREFIX%\share\openmm
 move %PREFIX%\examples %PREFIX%\share\openmm

+:: Put docs into a subdirectory.
+cd %PREFIX%\docs
+mkdir openmm
+move *.html openmm
+:: move *.pdf openmm
+:: move api-* openmm
+
 if errorlevel 1 exit 1


Added jasy.bat for Windows users

Added jasy.bat for Windows users

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

--- bin/jasy.bat
+++ bin/jasy.bat
@@ -0,0 +1,3 @@
+@ECHO OFF
+SET THISDIR=%~DP0
+python3 "%THISDIR%\jasy" %1 %2 %3 %4 %5 %6 %7 %8 %9


Deleted batch file for regenerating schema as it's no longer required

--- regenerate_schema.bat
+++ regenerate_schema.bat
@@ -1 +0,0 @@
-perl script/maximus_create.pl model DB DBIC::Schema Maximus::Schema create=static naming=v5 overwrite_modifications=true dbi:mysql:maximus maximus demo AutoCommit=1


Don't check errors in post-link.bat

Don't check errors in post-link.bat

This prevents the package install fail on update (install latex packages which
are already installed) or when offline. As pdflatex installs packages anyway
when they are missing, there is no harm done other than a longer time on first
use.

--- recipes/miktex-portable/post-link.bat
+++ recipes/miktex-portable/post-link.bat
@@ -1,6 +1,7 @@
 rem latex packages which are needed by nbconvert and other pdf producers
-%PREFIX%\Library\miktex-portable\miktex\bin\mpm --update-db && if errorlevel 1 exit 1
+rem don't check for errors so that this succeeds even if offline, etc...
+%PREFIX%\Library\miktex-portable\miktex\bin\mpm --update-db --quiet
 for %%x in (adjustbox booktabs collectbox fancyvrb ifoddpage mptopdf ucs url) do (
-	%PREFIX%\Library\miktex-portable\miktex\bin\mpm --install %%x  && if errorlevel 1 exit 1
+	%PREFIX%\Library\miktex-portable\miktex\bin\mpm --quiet --install %%x
 )
-if errorlevel 1 exit 1
+rem No final check as this should succeed even if the conda package is updated and the latex packages already installed


Use the -Xbootclasspath trick in lein.bat.

This cuts lein startup time from 2.5 seconds
down to 1.5 on Vista.

--- bin/lein.bat
+++ bin/lein.bat
@@ -69,8 +69,10 @@
 :SKIP_JLINE

 if "x%JAVA_CMD%" == "x" set JAVA_CMD="java"
+set CLOJURE_JAR=%USERPROFILE%\.m2\repository\org\clojure\clojure\1.2.0\clojure-1.2.0.jar

-%JAVA_CMD% -client %JAVA_OPTS% -Dleiningen.original.pwd="%ORIGINAL_PWD%" ^
+%JAVA_CMD% -client %JAVA_OPTS% -Xbootclasspath/a:"%CLOJURE_JAR%" ^
+ -Dleiningen.original.pwd="%ORIGINAL_PWD%" ^
  -cp %CLASSPATH% %JLINE% clojure.main -e "(use 'leiningen.core)(-main)" NUL %*
 goto EOF


Updating broken link in `windows_sdk.cmd`.

--- appveyor/windows_sdk.cmd
+++ appveyor/windows_sdk.cmd
@@ -15,7 +15,7 @@
 :: cmd interpreter, at least for (SDK v7.0)
 ::
 :: More details at:
-:: https://github.com/cython/cython/wiki/64BitCythonExtensionsOnWindows
+:: https://github.com/cython/cython/wiki/CythonExtensionsOnWindows
 :: https://stackoverflow.com/a/13751649/163740
 ::
 :: Original Author: Olivier Grisel


remove win stuff

remove win stuff

--- docs/make.bat
+++ docs/make.bat
@@ -1,242 +0,0 @@
-@ECHO OFF
-
-REM Command file for Sphinx documentation
-
-if "%SPHINXBUILD%" == "" (
-	set SPHINXBUILD=sphinx-build
-)
-set BUILDDIR=_build
-set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS% .
-set I18NSPHINXOPTS=%SPHINXOPTS% .
-if NOT "%PAPER%" == "" (
-	set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS%
-	set I18NSPHINXOPTS=-D latex_paper_size=%PAPER% %I18NSPHINXOPTS%
-)
-
-if "%1" == "" goto help
-
-if "%1" == "help" (
-	:help
-	echo.Please use `make ^<target^>` where ^<target^> is one of
-	echo.  html       to make standalone HTML files
-	echo.  dirhtml    to make HTML files named index.html in directories
-	echo.  singlehtml to make a single large HTML file
-	echo.  pickle     to make pickle files
-	echo.  json       to make JSON files
-	echo.  htmlhelp   to make HTML files and a HTML help project
-	echo.  qthelp     to make HTML files and a qthelp project
-	echo.  devhelp    to make HTML files and a Devhelp project
-	echo.  epub       to make an epub
-	echo.  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter
-	echo.  text       to make text files
-	echo.  man        to make manual pages
-	echo.  texinfo    to make Texinfo files
-	echo.  gettext    to make PO message catalogs
-	echo.  changes    to make an overview over all changed/added/deprecated items
-	echo.  xml        to make Docutils-native XML files
-	echo.  pseudoxml  to make pseudoxml-XML files for display purposes
-	echo.  linkcheck  to check all external links for integrity
-	echo.  doctest    to run all doctests embedded in the documentation if enabled
-	goto end
-)
-
-if "%1" == "clean" (
-	for /d %%i in (%BUILDDIR%\*) do rmdir /q /s %%i
-	del /q /s %BUILDDIR%\*
-	goto end
-)
-
-
-%SPHINXBUILD% 2> nul
-if errorlevel 9009 (
-	echo.
-	echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
-	echo.installed, then set the SPHINXBUILD environment variable to point
-	echo.to the full path of the 'sphinx-build' executable. Alternatively you
-	echo.may add the Sphinx directory to PATH.
-	echo.
-	echo.If you don't have Sphinx installed, grab it from
-	echo.http://sphinx-doc.org/
-	exit /b 1
-)
-
-if "%1" == "html" (
-	%SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The HTML pages are in %BUILDDIR%/html.
-	goto end
-)
-
-if "%1" == "dirhtml" (
-	%SPHINXBUILD% -b dirhtml %ALLSPHINXOPTS% %BUILDDIR%/dirhtml
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The HTML pages are in %BUILDDIR%/dirhtml.
-	goto end
-)
-
-if "%1" == "singlehtml" (
-	%SPHINXBUILD% -b singlehtml %ALLSPHINXOPTS% %BUILDDIR%/singlehtml
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The HTML pages are in %BUILDDIR%/singlehtml.
-	goto end
-)
-
-if "%1" == "pickle" (
-	%SPHINXBUILD% -b pickle %ALLSPHINXOPTS% %BUILDDIR%/pickle
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished; now you can process the pickle files.
-	goto end
-)
-
-if "%1" == "json" (
-	%SPHINXBUILD% -b json %ALLSPHINXOPTS% %BUILDDIR%/json
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished; now you can process the JSON files.
-	goto end
-)
-
-if "%1" == "htmlhelp" (
-	%SPHINXBUILD% -b htmlhelp %ALLSPHINXOPTS% %BUILDDIR%/htmlhelp
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished; now you can run HTML Help Workshop with the ^
-.hhp project file in %BUILDDIR%/htmlhelp.
-	goto end
-)
-
-if "%1" == "qthelp" (
-	%SPHINXBUILD% -b qthelp %ALLSPHINXOPTS% %BUILDDIR%/qthelp
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished; now you can run "qcollectiongenerator" with the ^
-.qhcp project file in %BUILDDIR%/qthelp, like this:
-	echo.^> qcollectiongenerator %BUILDDIR%\qthelp\complexity.qhcp
-	echo.To view the help file:
-	echo.^> assistant -collectionFile %BUILDDIR%\qthelp\complexity.ghc
-	goto end
-)
-
-if "%1" == "devhelp" (
-	%SPHINXBUILD% -b devhelp %ALLSPHINXOPTS% %BUILDDIR%/devhelp
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished.
-	goto end
-)
-
-if "%1" == "epub" (
-	%SPHINXBUILD% -b epub %ALLSPHINXOPTS% %BUILDDIR%/epub
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The epub file is in %BUILDDIR%/epub.
-	goto end
-)
-
-if "%1" == "latex" (
-	%SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished; the LaTeX files are in %BUILDDIR%/latex.
-	goto end
-)
-
-if "%1" == "latexpdf" (
-	%SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
-	cd %BUILDDIR%/latex
-	make all-pdf
-	cd %BUILDDIR%/..
-	echo.
-	echo.Build finished; the PDF files are in %BUILDDIR%/latex.
-	goto end
-)
-
-if "%1" == "latexpdfja" (
-	%SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
-	cd %BUILDDIR%/latex
-	make all-pdf-ja
-	cd %BUILDDIR%/..
-	echo.
-	echo.Build finished; the PDF files are in %BUILDDIR%/latex.
-	goto end
-)
-
-if "%1" == "text" (
-	%SPHINXBUILD% -b text %ALLSPHINXOPTS% %BUILDDIR%/text
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The text files are in %BUILDDIR%/text.
-	goto end
-)
-
-if "%1" == "man" (
-	%SPHINXBUILD% -b man %ALLSPHINXOPTS% %BUILDDIR%/man
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The manual pages are in %BUILDDIR%/man.
-	goto end
-)
-
-if "%1" == "texinfo" (
-	%SPHINXBUILD% -b texinfo %ALLSPHINXOPTS% %BUILDDIR%/texinfo
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The Texinfo files are in %BUILDDIR%/texinfo.
-	goto end
-)
-
-if "%1" == "gettext" (
-	%SPHINXBUILD% -b gettext %I18NSPHINXOPTS% %BUILDDIR%/locale
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The message catalogs are in %BUILDDIR%/locale.
-	goto end
-)
-
-if "%1" == "changes" (
-	%SPHINXBUILD% -b changes %ALLSPHINXOPTS% %BUILDDIR%/changes
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.The overview file is in %BUILDDIR%/changes.
-	goto end
-)
-
-if "%1" == "linkcheck" (
-	%SPHINXBUILD% -b linkcheck %ALLSPHINXOPTS% %BUILDDIR%/linkcheck
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Link check complete; look for any errors in the above output ^
-or in %BUILDDIR%/linkcheck/output.txt.
-	goto end
-)
-
-if "%1" == "doctest" (
-	%SPHINXBUILD% -b doctest %ALLSPHINXOPTS% %BUILDDIR%/doctest
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Testing of doctests in the sources finished, look at the ^
-results in %BUILDDIR%/doctest/output.txt.
-	goto end
-)
-
-if "%1" == "xml" (
-	%SPHINXBUILD% -b xml %ALLSPHINXOPTS% %BUILDDIR%/xml
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The XML files are in %BUILDDIR%/xml.
-	goto end
-)
-
-if "%1" == "pseudoxml" (
-	%SPHINXBUILD% -b pseudoxml %ALLSPHINXOPTS% %BUILDDIR%/pseudoxml
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The pseudo-XML files are in %BUILDDIR%/pseudoxml.
-	goto end
-)
-
-:end


PR 36666: Fix runtest.cmd. So the script will fail if the unit tests failed

 - Fix runtest.cmd. So the script will fail if the unit tests failed
The %errorlevel% will only remember the last execution of the for loop. So if some unit test failed in the first test project, the build will still succeed.

--- tools/runtest.cmd
+++ tools/runtest.cmd
@@ -1,2 +1,4 @@
 @ECHO OFF
-for /f %%a in ('dir %~dp0..\test\project.json /b /s ^| find /i "Tests"') do dotnet test %%a+SET failed=0
+for /f %%a in ('dir %~dp0..\test\project.json /b /s ^| find /i "Tests"') do dotnet test %%a || set failed=1
+EXIT %failed%


Replaced fixed path python 2.7 executable calls

--- update_external_sources.bat
+++ update_external_sources.bat
@@ -300,7 +300,7 @@
    cd %GLSLANG_DIR%
    git clone %GLSLANG_GITURL% .
    git checkout %GLSLANG_REVISION%
-   C:\Python27\python.exe .\update_glslang_sources.py
+   python.exe .\update_glslang_sources.py
    if not exist %GLSLANG_DIR%\SPIRV (
       echo glslang source download failed!
       set errorCode=1
@@ -313,7 +313,7 @@
    cd %GLSLANG_DIR%
    git fetch --all
    git checkout %GLSLANG_REVISION%
-   C:\Python27\python.exe .\update_glslang_sources.py
+   python.exe .\update_glslang_sources.py
 goto:eof

 :create_spirv-tools


RPC Win. Dependency collector was updated.

--- dev/bin/win/prepare.bat
+++ dev/bin/win/prepare.bat
@@ -2,20 +2,30 @@
 :: Script to prepare Remote PC package contents.
 ::

+:: Dependencies
+set QT_PATH=c:\Dev\Qt\5.2.1\msvc2012_64_opengl
+set VS_PATH=c:\Program Files (x86)\Microsoft Visual Studio 11.0
+
 :: Copy VC++ runtime dependencies.
-copy /Y "C:\Program Files\Microsoft Visual Studio 10.0\VC\redist\x86\Microsoft.VC100.CRT\msvcp100.dll" .\Release
-copy /Y "C:\Program Files\Microsoft Visual Studio 10.0\VC\redist\x86\Microsoft.VC100.CRT\msvcr100.dll" .\Release
+copy /Y "%VS_PATH%\VC\redist\x64\Microsoft.VC110.CRT\msvcp110.dll" .\release
+copy /Y "%VS_PATH%\VC\redist\x64\Microsoft.VC110.CRT\msvcr110.dll" .\release

 :: Copy QT libraries.
-copy /Y C:\Qt\2010.05\qt\bin\QtCore4.dll .\Release
-copy /Y C:\Qt\2010.05\qt\bin\QtGui4.dll .\Release
-mkdir .\Release\plugins\imageformats
-copy /Y C:\Qt\2010.05\qt\plugins\imageformats\qjpeg4.dll .\Release\plugins\imageformats
+copy /Y %QT_PATH%\bin\icudt51.dll .\release
+copy /Y %QT_PATH%\bin\icuin51.dll .\release
+copy /Y %QT_PATH%\bin\icuuc51.dll .\release
+copy /Y %QT_PATH%\bin\Qt5Core.dll .\release
+copy /Y %QT_PATH%\bin\Qt5Gui.dll .\release
+copy /Y %QT_PATH%\bin\Qt5Widgets.dll .\release
+mkdir .\release\plugins\platforms
+mkdir .\release\plugins\imageformats
+copy /Y %QT_PATH%\plugins\platforms\qwindows.dll .\release\plugins\platforms
+copy /Y %QT_PATH%\plugins\imageformats\qjpeg.dll .\release\plugins\imageformats

 :: Copy help contents.
-mkdir .\Release\help
-XCOPY ..\..\..\doc\RemotePCHelp\*.* .\Release\help /E /I /Y /EXCLUDE:ignore.txt
+mkdir .\release\help
+XCOPY ..\..\..\doc\RemotePCHelp\*.* .\release\help /E /I /Y /EXCLUDE:ignore.txt

 :: Copy license stuff.
-COPY /Y ..\..\..\doc\License\EULA.txt .\Release
-COPY /Y ..\..\..\doc\License\LIBS.txt .\Release
+COPY /Y ..\..\..\doc\License\EULA.txt .\release
+COPY /Y ..\..\..\doc\License\LIBS.txt .\release


Make Windows compiler script create bin and obj dirs

--- compiler.bat
+++ compiler.bat
@@ -1,6 +1,10 @@
 @echo off
 set ROMVERSION=0
 title Compiling AEVILIA GB version 1.%ROMVERSION%
+
+if NOT exist bin/	mkdir bin
+if NOT exist obj/	mkdir obj
+
 echo === COMPILATION ===
 rgbasm -E -p 0xFF -o obj/main.o			 main.asm
 rgbasm -E -p 0xFF -o obj/battle.o		 battle.asm
@@ -15,17 +19,20 @@
 echo COMPILATION DONE
 echo.
 echo.
+
 echo === LINKING ===
 rgblink -m bin/Aevilia.map -n bin/Aevilia.sym -o bin/aevilia.gbc obj/main.o obj/battle.o obj/engine.o obj/home.o obj/gfx.o obj/maps.o obj/save.o obj/sound.o obj/tileset.o
 echo.
 echo LINKING DONE
 echo.
 echo.
+
 echo === FIXING ===
 rgbfix -Cjv -i ISSO -k 42 -l 0x33 -m 0x1B -n %ROMVERSION% -p 0xFF -r 0x04 -t AEVILIA bin/aevilia.gbc
 echo.
 echo FIXING DONE
 echo.
 echo.
+
 echo FILES READY !
 pause


added run.bat file

added run.bat file

error: pathspec 'bin/templates/project/cordova/run.bat' did not match any file(s) known to git

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


Update bld.bat

Update bld.bat

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

 :: cd ..\..


Remove no longer used recipe/set_bld_opts.bat

--- recipe/set_bld_opts.bat
+++ recipe/set_bld_opts.bat
@@ -1,105 +0,0 @@
-setlocal EnableDelayedExpansion
-
-if "%ARCH%"=="64" (
-    set WIN64="WIN64=YES"
-) else (
-    set WIN64=
-)
-
-:: Work out MSVC_VER - needed for build process.
-:: Currently guess from Python version
-if  %vc% LEQ 9 set MSVC_VER=1500
-if  %vc% GTR 9 set MSVC_VER=1900
-
-:: Get the minor/major version of poppler from the %poppler% environment
-:: variable that is set by conda-build
-FOR /F "tokens=1,2 delims=." %%a IN ("%poppler%") DO (
-  set POPPLER_MAJOR_VERSION=%%a
-  set POPPLER_MINOR_VERSION=%%b
-)
-:: remove leading zeros
-set /a POPPLER_MINOR_VERSION=10000%POPPLER_MINOR_VERSION% %% 10000
-
-:: Need consistent flags between build and install.
-set BLD_OPTS=%WIN64% ^
-    MSVC_VER=%MSVC_VER% ^
-    GDAL_HOME=%LIBRARY_PREFIX% ^
-    BINDIR=%LIBRARY_BIN% ^
-    LIBDIR=%LIBRARY_LIB% ^
-    INCDIR=%LIBRARY_INC% ^
-    DATADIR=%LIBRARY_PREFIX%\share\gdal ^
-    DLLBUILD=1 ^
-    BLOSC_CFLAGS="-I%LIBRARY_INC%" ^
-    BLOSC_LIBS=%LIBRARY_LIB%\blosc.lib ^
-    CURL_INC="-I%LIBRARY_INC%" ^
-    CURL_LIB="%LIBRARY_LIB%\libcurl.lib wsock32.lib wldap32.lib winmm.lib" ^
-    EXPAT_DIR=%LIBRARY_PREFIX% ^
-    EXPAT_INCLUDE="-I%LIBRARY_INC%" ^
-    EXPAT_LIB=%LIBRARY_LIB%\expat.lib ^
-    FITS_PLUGIN=NO ^
-    FITS_INC_DIR=%LIBRARY_INC% ^
-    FITS_LIB="%LIBRARY_LIB%\cfitsio.lib" ^
-    FREEXL_CFLAGS="-I%LIBRARY_INC%" ^
-    FREEXL_LIBS=%LIBRARY_LIB%\freexl_i.lib ^
-    GEOS_CFLAGS="-I%LIBRARY_INC% -DHAVE_GEOS" ^
-    GEOS_DIR=%LIBRARY_PREFIX% ^
-    GEOS_LIB=%LIBRARY_LIB%\geos_c.lib ^
-    HDF4_DIR=%LIBRARY_PREFIX% ^
-    HDF4_HAS_MAXOPENFILES=YES ^
-    HDF4_LIB="%LIBRARY_LIB%\hdf.lib %LIBRARY_LIB%\mfhdf.lib %LIBRARY_LIB%\xdr.lib" ^
-    HDF5_DIR=%LIBRARY_PREFIX% ^
-    HDF5_LIB=%LIBRARY_LIB%\hdf5.lib ^
-    HDF5_H5_IS_DLL=YES ^
-    TILEDB_ENABLED=YES ^
-    TILEDB_DIR=%LIBRARY_PREFIX% ^
-    TILEDB_LIBS=%LIBRARY_LIB%\tiledb.lib ^
-    JPEGDIR=%LIBRARY_INC% ^
-    JPEG_EXTERNAL_LIB=1 ^
-    JPEG_LIB=%LIBRARY_LIB%\libjpeg.lib ^
-    KEA_CFLAGS="-I%LIBRARY_INC%" ^
-    KEA_LIB="%LIBRARY_LIB%\hdf5_cpp.lib %LIBRARY_LIB%\libkea.lib" ^
-    NETCDF_INC_DIR=%LIBRARY_INC% ^
-    NETCDF_LIB=%LIBRARY_LIB%\netcdf.lib ^
-    NETCDF_SETTING=yes ^
-    NETCDF_HAS_NC4=yes ^
-    OPENJPEG_CFLAGS="-I%LIBRARY_INC%\openjpeg-2.5" ^
-    OPENJPEG_ENABLED=YES ^
-    OPENJPEG_LIB=%LIBRARY_LIB%\openjp2.lib ^
-    PG_INC_DIR=%LIBRARY_INC% ^
-    PG_LIB=%LIBRARY_LIB%\libpq.lib ^
-    PNGDIR=%LIBRARY_INC% ^
-    PNG_EXTERNAL_LIB=1 ^
-    PNG_LIB=%LIBRARY_LIB%\libpng.lib ^
-    PROJ_FLAGS="-DPROJ_STATIC" ^
-    PROJ_INCLUDE="-I%LIBRARY_INC%" ^
-    PROJ_LIBRARY=%LIBRARY_LIB%\proj.lib ^
-    SETARGV="\"%VCToolsInstallDir%\lib\x64\setargv.obj\"" ^
-    SPATIALITE_412_OR_LATER=yes ^
-    SQLITE_INC="-I%LIBRARY_INC% -DHAVE_SPATIALITE" ^
-    SQLITE_LIB="%LIBRARY_LIB%\sqlite3.lib %LIBRARY_LIB%\spatialite_i.lib" ^
-    TIFF_INC="-I%LIBRARY_INC%" ^
-    TIFF_LIB=%LIBRARY_LIB%\tiff.lib ^
-    TIFF_OPTS=-DBIGTIFF_SUPPORT ^
-    XERCES_DIR=%LIBRARY_PREFIX% ^
-    XERCES_INCLUDE="-I%LIBRARY_INC% -I%LIBRARY_INC%\xercesc" ^
-    XERCES_LIB=%LIBRARY_LIB%\xerces-c_3.lib ^
-    GEOTIFF_INC="-I%LIBRARY_INC%" ^
-    GEOTIFF_LIB=%LIBRARY_LIB%\geotiff_i.lib ^
-    LIBICONV_INCLUDE="-I%LIBRARY_INC% -DICONV_CONST= " ^
-    LIBICONV_LIBRARY="%LIBRARY_LIB%\iconv.lib" ^
-    POPPLER_ENABLED=YES ^
-    POPPLER_CFLAGS="-I%LIBRARY_INC%\poppler -DPOPPLER_HAS_OPTCONTENT= -DPOPPLER_BASE_STREAM_HAS_TWO_ARGS= " ^
-    POPPLER_MAJOR_VERSION=%POPPLER_MAJOR_VERSION% ^
-    POPPLER_MINOR_VERSION=%POPPLER_MINOR_VERSION% ^
-    POPPLER_LIBS="%LIBRARY_LIB%\poppler.lib /FORCE:MULTIPLE" ^
-    WEBP_ENABLED=YES ^
-    WEBP_CFLAGS="-I%LIBRARY_INC%" ^
-    WEBP_LIBS="%LIBARY_LIB%\libwebp.lib" ^
-    ZSTD_CFLAGS="-I%LIBRARY_INC%" ^
-    ZSTD_LIBS="%LIBRARY_LIB%\libzstd.lib" ^
-    LIBKML_DIR="%LIBRARY_PREFIX%" ^
-    LIBKML_INCLUDE="-I%LIBRARY_INC%" ^
-    LIBKML_LIBS="%LIBRARY_LIB%\kmlbase.lib %LIBRARY_LIB%\kmlconvenience.lib %LIBRARY_LIB%\kmldom.lib %LIBRARY_LIB%\kmlengine.lib %LIBRARY_LIB%\kmlregionator.lib %LIBRARY_LIB%\kmlxsd.lib %LIBRARY_LIB%\minizip.lib %LIBRARY_LIB%\uriparser.lib"
-
-
-endlocal && set BLD_OPTS=%BLD_OPTS%


LB-1807: Bold font not displayed correctly on NZZ Live Blogs (desktop only!)

Build more.

--- plugins/livedesk-embed/build/build.bat
+++ plugins/livedesk-embed/build/build.bat
@@ -1,15 +1,14 @@
 @echo off
 @echo on
-REM java -classpath js.jar;compiler.jar -Xss128m org.mozilla.javascript.tools.shell.Main r.js -o core.js
-REM java -classpath js.jar;compiler.jar -Xss128m org.mozilla.javascript.tools.shell.Main r.js -o default.js
-REM java -classpath js.jar;compiler.jar -Xss128m org.mozilla.javascript.tools.shell.Main r.js -o zeit_solo-desktop.js
-REM java -classpath js.jar;compiler.jar -Xss128m org.mozilla.javascript.tools.shell.Main r.js -o zeit-desktop.js
-REM java -classpath js.jar;compiler.jar -Xss128m org.mozilla.javascript.tools.shell.Main r.js -o rp-desktop.js
-REM java -classpath js.jar;compiler.jar -Xss128m org.mozilla.javascript.tools.shell.Main r.js -o nzz-desktop.js
-REM java -classpath js.jar;compiler.jar -Xss128m org.mozilla.javascript.tools.shell.Main r.js -o rhrnt.js
-REM java -classpath js.jar;compiler.jar -Xss128m org.mozilla.javascript.tools.shell.Main r.js -o rhrnt-section.js
+java -classpath js.jar;compiler.jar -Xss128m org.mozilla.javascript.tools.shell.Main r.js -o core.js
+java -classpath js.jar;compiler.jar -Xss128m org.mozilla.javascript.tools.shell.Main r.js -o default.js
+java -classpath js.jar;compiler.jar -Xss128m org.mozilla.javascript.tools.shell.Main r.js -o zeit_solo-desktop.js
+java -classpath js.jar;compiler.jar -Xss128m org.mozilla.javascript.tools.shell.Main r.js -o zeit-desktop.js
+java -classpath js.jar;compiler.jar -Xss128m org.mozilla.javascript.tools.shell.Main r.js -o rp-desktop.js
+java -classpath js.jar;compiler.jar -Xss128m org.mozilla.javascript.tools.shell.Main r.js -o nzz-desktop.js
+java -classpath js.jar;compiler.jar -Xss128m org.mozilla.javascript.tools.shell.Main r.js -o rhrnt.js
+java -classpath js.jar;compiler.jar -Xss128m org.mozilla.javascript.tools.shell.Main r.js -o rhrnt-section.js
 java -classpath js.jar;compiler.jar -Xss128m org.mozilla.javascript.tools.shell.Main r.js -o brasil247.js

-REM java -classpath js.jar;compiler.jar -Xss128m org.mozilla.javascript.tools.shell.Main r.js -o tageswoche-solo-desktop.js
-REM java -classpath js.jar;compiler.jar -Xss128m org.mozilla.javascript.tools.shell.Main r.js -o tageswoche-multi-desktop.js
-REM java -classpath js.jar;compiler.jar -Xss128m org.mozilla.javascript.tools.shell.Main r.js -o main.js+java -classpath js.jar;compiler.jar -Xss128m org.mozilla.javascript.tools.shell.Main r.js -o tageswoche-solo-desktop.js
+java -classpath js.jar;compiler.jar -Xss128m org.mozilla.javascript.tools.shell.Main r.js -o tageswoche-multi-desktop.js


Updated release.bat

Updated release.bat

--- Yak-Hax-Mimerme/release/release.bat
+++ Yak-Hax-Mimerme/release/release.bat
@@ -1,3 +1,3 @@
 @ECHO off
-echo. 2>values.txt
+if not exists values.txt echo. 2>values.txt
 java -jar %UTILS_PATH%\yhack\yhack.jar %1 %2 %3 %4 %5 %6 %7 %8


removed "make install" from script as it tries to build some stuff that does not work with static builds

git-svn-id: 353be9ac11a1e711854a13efcc2fc17d9d6b83e7@576 c36c8488-0289-0348-9b64-b301f74bd9a7

--- Scripts/MakeStaticQT.bat
+++ Scripts/MakeStaticQT.bat
@@ -1,3 +1,2 @@
 echo y | configure -static -qt-libtiff -qt-libpng -qt-libjpeg
-nmake sub-src
-nmake install+nmake sub-src


Delete publish_to_kcbp.bat

Delete publish_to_kcbp.bat

--- BuildBot/build_task/publish_to_kcbp.bat
+++ BuildBot/build_task/publish_to_kcbp.bat
@@ -1,12 +0,0 @@
-@echo off
-SET _BIN_PACK_DIR=%_BUILTBOT_PUBLISH_PACK_PATH%
-
-set issue_server_ip=172.16.41.114
-set issue_kbcp_dir=\\%issue_server_ip%\d$\KCBP\KCBP\KCBP\bin\
-
-net use \\%issue_server_ip% /del /yes
-net use \\%issue_server_ip% "" /user:administrator
-
-copy %_BIN_PACK_DIR%\*.* %issue_kbcp_dir%
-
-call %issue_kbcp_dir%\merge_spd.bat


remove rtmpdump argument in batch

remove rtmpdump argument in batch

https://github.com/streamlink/streamlink/pull/4169

--- resources/streamlink.bat
+++ resources/streamlink.bat
@@ -2,4 +2,4 @@
 REM Change the code page for UTF8
 chcp 65001 >NUL
 set PYTHONIOENCODING=cp65001
-"%~dp0\python\python.exe" "%~dp0\streamlink-script.py" --ffmpeg-ffmpeg "%~dp0\ffmpeg\ffmpeg.exe" --rtmp-rtmpdump "%~dp0\rtmpdump\rtmpdump.exe" --config "%~dp0\config" %*
+"%~dp0\python\python.exe" "%~dp0\streamlink-script.py" --ffmpeg-ffmpeg "%~dp0\ffmpeg\ffmpeg.exe" --config "%~dp0\config" %*


uncomment the publishing

uncomment the publishing

--- BuildScripts/NuGetPublish.bat
+++ BuildScripts/NuGetPublish.bat
@@ -7,11 +7,11 @@
 set PKGVER=3.1.0

 dotnet nuget push "%PACKAGES%\FastExpressionCompiler.%PKGVER%.nupkg" -k %APIKEY% -s %SOURCE%
-rem dotnet nuget push "%PACKAGES%\FastExpressionCompiler.src.%PKGVER%.nupkg" -k %APIKEY% -s %SOURCE%
-rem dotnet nuget push "%PACKAGES%\FastExpressionCompiler.Internal.src.%PKGVER%.nupkg" -k %APIKEY% -s %SOURCE%
-rem dotnet nuget push "%PACKAGES%\FastExpressionCompiler.LightExpression.%PKGVER%.nupkg" -k %APIKEY% -s %SOURCE%
-rem dotnet nuget push "%PACKAGES%\FastExpressionCompiler.LightExpression.src.%PKGVER%.nupkg" -k %APIKEY% -s %SOURCE%
-rem dotnet nuget push "%PACKAGES%\FastExpressionCompiler.LightExpression.Internal.src.%PKGVER%.nupkg" -k %APIKEY% -s %SOURCE%
+dotnet nuget push "%PACKAGES%\FastExpressionCompiler.src.%PKGVER%.nupkg" -k %APIKEY% -s %SOURCE%
+dotnet nuget push "%PACKAGES%\FastExpressionCompiler.Internal.src.%PKGVER%.nupkg" -k %APIKEY% -s %SOURCE%
+dotnet nuget push "%PACKAGES%\FastExpressionCompiler.LightExpression.%PKGVER%.nupkg" -k %APIKEY% -s %SOURCE%
+dotnet nuget push "%PACKAGES%\FastExpressionCompiler.LightExpression.src.%PKGVER%.nupkg" -k %APIKEY% -s %SOURCE%
+dotnet nuget push "%PACKAGES%\FastExpressionCompiler.LightExpression.Internal.src.%PKGVER%.nupkg" -k %APIKEY% -s %SOURCE%

 echo:
 echo:Publishing completed.


added pause to fresh batch

added pause to fresh batch

--- git_fresh.bat
+++ git_fresh.bat
@@ -1,2 +1,3 @@
 REM force (f) clean on all files and directories (d), including ignored files (x)
-git clean -fxd +git clean -fxd
+pause


update releasetest batch.

update releasetest batch.

--- tools/test/releasetest/releasetest.bat
+++ tools/test/releasetest/releasetest.bat
@@ -1,11 +1,15 @@
-@ECHO OFF
+@echo off
 @setlocal

 set BASEDIR=%~dp0
 set APPNAME=blogapp
-set APPDIR=%BASEDIR%\%APPNAME%
+set APPDIR=%BASEDIR%%APPNAME%
 set DBFILE=%APPDIR%\db\dbfile
 set PORT=8800
+set MAKE=nmake VERBOSE=1
+
+for %%I in (sqlite3.exe) do if exist %%~$path:I set SQLITE=%%~$path:I
+if "%SQLITE%" == "" for %%I in (sqlite3-bin.exe) do if exist %%~$path:I set SQLITE=%%~$path:I

 cd /D %BASEDIR%
 call :Which tfenv.bat
@@ -14,20 +18,18 @@
 ) else (
   call "..\..\..\tfenv.bat"
 )
-if "%Platform%" == "X64" (
-  set MAKE=nmake VERBOSE=1
-  set CL=/MP
-) else if "%DevEnvDir%" == "" (
-  set MAKE=mingw32-make -j4
-) else (
-  set MAKE=nmake
-  set CL=/MP
-)

 cd /D %BASEDIR%
 rd /Q /S %APPNAME%
 tspawn new %APPNAME%
-sqlite3.exe %DBFILE% < create_blog_table.sql
+if "%SQLITE%" == "" (
+  echo;
+  echo sqlite.exe command not found.
+  call :CleanUp
+  pause
+  exit /B 1
+)
+"%SQLITE%" %DBFILE% < create_blog_table.sql

 cd %APPNAME%
 tspawn s blog
@@ -50,11 +52,10 @@
 call :CheckWebApp treefrog
 %MAKE% distclean >nul 2>nul

-echo.
+echo;
 echo Test OK
 call :CleanUp
 exit /B 0
-

 ::
 :: Build by cmake
@@ -67,13 +68,12 @@
 cmake -G"NMake Makefiles" -DCMAKE_BUILD_TYPE=%1 ..
 %MAKE%
 if ERRORLEVEL 1 (
-  echo.
+  echo;
   echo Build Error!
-  call ::CleanUp
-  exit/ B 1
+  call :CleanUp
+  exit /B 1
 )
 exit /B 0
-

 ::
 :: Build by qmake
@@ -83,9 +83,9 @@
 qmake -r CONFIG+=%1
 %MAKE%
 if ERRORLEVEL 1 (
-  echo.
+  echo;
   echo Build Error!
-  call ::CleanUp
+  call :CleanUp
   exit /B 1
 )
 exit /B 0
@@ -94,8 +94,9 @@
 :: Check WebApp
 ::
 :CheckWebApp
+echo on
 cd /D %APPDIR%
-echo.
+echo;
 echo Starting webapp..
 set RES=1
 "%1" -e dev -d -p %PORT% %APPDIR%
@@ -115,9 +116,9 @@
 timeout 1 /nobreak >nul
 if not "%RESCODE%"=="200" (
   echo HTTP request failed
-  echo.
+  echo;
   echo App Test Error!
-  call ::CleanUp
+  call :CleanUp
   exit /B 1
 )
 echo HTTP request success "%URL%"


removed log folder creation (this is done by the installer), wrapped HIDECONSOLE in quotes [skip ci]

--- startfiles/start.bat
+++ startfiles/start.bat
@@ -17,12 +17,7 @@
     mkdir "%~dp0temp"
 )

-if not exist "%~dp0logs" (
-    echo Creating Directories for Logs...
-    mkdir "%~dp0logs"
-)
-
-SET HIDECONSOLE=%~dp0bin\tools\RunHiddenConsole.exe
+SET HIDECONSOLE="%~dp0bin\tools\RunHiddenConsole.exe"

 :: start all daemons, if no argument given (default)
 if "%1"=="" (


Add support for Windows 8 and lower in the windows script

--- windows-start.bat
+++ windows-start.bat
@@ -68,7 +68,7 @@
 echo Done

 echo|set /p=" - Deleting existing AvaIre.jar file... "
-rm AvaIre.jar > nul 2> nul
+del /f AvaIre.jar > nul 2> nul
 echo Done

 echo|set /p=" - Renaming nightly-build.jar to AvaIre.jar... "


Corrent the result name for mergeResult.cmd

--- x64/Release/mergeResult.cmd
+++ x64/Release/mergeResult.cmd
@@ -1,5 +1,5 @@
 FOR /f %%a IN ('WMIC OS GET LocalDateTime ^| FIND "."') DO SET DTS=%%a
-SET serID=quickResult_win_%DTS:~0,4%-%DTS:~4,2%-%DTS:~6,2%_%DTS:~8,2%-%DTS:~10,2%-%DTS:~12,2%
+SET serID=resultWin_%DTS:~0,4%-%DTS:~4,2%-%DTS:~6,2%_%DTS:~8,2%-%DTS:~10,2%-%DTS:~12,2%
 echo serID: %serID%

 set resultFolder=..\..\data\networks\results\%serID%\


Add RVM dependencies under cygwin

Add RVM dependencies under cygwin

--- windows/build.bat
+++ windows/build.bat
@@ -3,7 +3,7 @@
 call refreshenv

 wget -c https://cygwin.com/setup-x86_64.exe
-setup-x86_64.exe -R "C:\cygwin64" -s http://mirror.switch.ch/ftp/mirror/cygwin/ -q -g -P curl,zsh,git,vim,wget,xz,tar,gawk,bzip2,subversion,zlib,fontconfig,clang,cmake,lua,perl,the_silver_searcher,gnupg,patch,zlib-devel,openssl-devel,libyaml-devel,libyaml0_2,sqlite3,make,libtool,autoconf,automake,bison,m4,mingw64-i686-gcc-core,mingw64-x86_64-gcc-core,patch,cygwin32-readline
+setup-x86_64.exe -R "C:\cygwin64" -s http://mirror.switch.ch/ftp/mirror/cygwin/ -q -g -P curl,zsh,git,vim,wget,xz,tar,gawk,bzip2,subversion,zlib,fontconfig,clang,cmake,lua,perl,the_silver_searcher,gnupg,patch,zlib-devel,openssl-devel,libyaml-devel,libyaml0_2,sqlite3,make,libtool,autoconf,automake,bison,m4,mingw64-i686-gcc-core,mingw64-x86_64-gcc-core,patch,cygwin32-readline,libcrypt-devel,libcrypt0

 set script_path=%~dp0
 set repo_path=%script_path%\..\


Remove gulp from deploy script

Remove gulp from deploy script

--- deploy.cmd
+++ deploy.cmd
@@ -113,9 +113,9 @@
 )

 :: 4. Run Gulp task
-IF EXIST "%DEPLOYMENT_TARGET%\gulpfile.js" (
+IF EXIST "%DEPLOYMENT_TARGET%\tsconfig.json" (
  pushd "%DEPLOYMENT_TARGET%"
- call .\node_modules\.bin\gulp build --production
+ call .\node_modules\.bin\tsc
  IF !ERRORLEVEL! NEQ 0 goto error
  popd
 )


Avoid generating a package.json on installing local copy of Yarn at deploy

--- deploy.cmd
+++ deploy.cmd
@@ -86,7 +86,7 @@
 :: 1. Build Webapp
 :: .a Install Yarn
 echo Prepare environment to build WebApp
-call :ExecuteCmd %NPM_CMD% install yarn
+call :ExecuteCmd %NPM_CMD% install yarn --no-save
 SET YARN_PATH=%DEPLOYMENT_SOURCE%\node_modules\.bin\yarn
 :: .b Enter app dir
 pushd %DEPLOYMENT_SOURCE%\app


ARROW-3568: [Packaging] Run pyarrow unittests for windows wheels

Build https://ci.appveyor.com/project/kszucs/crossbow/builds/19651947

Author: Krisztián Szűcs <szucs.krisztian@gmail.com>

Closes #2801 from kszucs/ARROW-3568 and squashes the following commits:

bc0aa2a2d <Krisztián Szűcs>  missing pytest
b82243a17 <Krisztián Szűcs>  run pytest when building windows wheels

--- dev/tasks/python-wheels/win-build.bat
+++ dev/tasks/python-wheels/win-build.bat
@@ -82,8 +82,9 @@
 @rem test the wheel
 call deactivate
 conda create -n wheel-test -q -y python=%PYTHON% ^
-      numpy=%NUMPY% pandas
+      numpy=%NUMPY% pandas pytest
 call activate wheel-test

 pip install --no-index --find-links=%ARROW_SRC%\python\dist\ pyarrow
 python -c "import pyarrow; import pyarrow.parquet"
+pytest --pyargs pyarrow


[C]: set zlib build to Release.

[C]: set zlib build to Release.

--- cppbuild/cppbuild-vs.cmd
+++ cppbuild/cppbuild-vs.cmd
@@ -55,7 +55,7 @@
 cmake -DCMAKE_INSTALL_PREFIX=%ZLIB_INSTALL_DIR% --config Release ..
 if %ERRORLEVEL% neq 0 exit /b %ERRORLEVEL%

-cmake --build . --target install
+cmake --build . --config Debug --target install
 if %ERRORLEVEL% neq 0 exit /b %ERRORLEVEL%

 pushd %BUILD_DIR%


Force redeploy?

Force redeploy?

--- deploy.cmd
+++ deploy.cmd
@@ -71,7 +71,7 @@

 goto end

-:: Execute command routine that will echo out when error
+:: Execute command routine that will echo out when error
 :ExecuteCmd
 setlocal
 set _CMD_=%*


update minor alternative version

update minor alternative version

--- test/test_app.bat
+++ test/test_app.bat
@@ -1,4 +1,4 @@
 ### test_app.bat - 2015 - Thibault ROGER ###
-version = "2.0.0"
+version = "1.2.0-b"

 echo "version ${version}"


updated classpath for components libs

updated classpath for components libs

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

--- scripts/windows/init.bat
+++ scripts/windows/init.bat
@@ -37,10 +37,16 @@
 IF EXIST %PROACTIVE%\lib\log4j.jar set CLASSPATH=%CLASSPATH%;%PROACTIVE%\lib\log4j.jar
 IF EXIST %PROACTIVE%\lib\ibis.jar set CLASSPATH=%CLASSPATH%;%PROACTIVE%\lib\ibis.jar
 IF EXIST %PROACTIVE%\lib\xercesImpl.jar set CLASSPATH=%CLASSPATH%;%PROACTIVE%\lib\xercesImpl.jar
-IF EXIST %PROACTIVE%\lib\fractal.jar set CLASSPATH=%CLASSPATH%;%PROACTIVE%\lib\fractal.jar
-IF EXIST %PROACTIVE%\lib\fractal-adl.jar set CLASSPATH=%CLASSPATH%;%PROACTIVE%\lib\fractal-adl.jar
-IF EXIST %PROACTIVE%\lib\dtdparser.jar set CLASSPATH=%CLASSPATH%;%PROACTIVE%\lib\dtdparser.jar
-IF EXIST %PROACTIVE%\lib\ow_deployment_scheduling.jar set CLASSPATH=%CLASSPATH%;%PROACTIVE%\lib\ow_deployment_scheduling.jar
+IF EXIST %PROACTIVE%\lib\components\fractal.jar set CLASSPATH=%CLASSPATH%;%PROACTIVE%\lib\fractal.jar
+IF EXIST %PROACTIVE%\lib\components\fractal-adl.jar set CLASSPATH=%CLASSPATH%;%PROACTIVE%\lib\fractal-adl.jar
+IF EXIST %PROACTIVE%\lib\components\dtdparser.jar set CLASSPATH=%CLASSPATH%;%PROACTIVE%\lib\dtdparser.jar
+IF EXIST %PROACTIVE%\lib\components\ow_deployment_scheduling.jar set CLASSPATH=%CLASSPATH%;%PROACTIVE%\lib\ow_deployment_scheduling.jar
+IF EXIST %PROACTIVE%\lib\components\fractal-gui.jar set CLASSPATH=%CLASSPATH%;%PROACTIVE%\lib\fractal-gui.jar
+IF EXIST %PROACTIVE%\lib\components\fractal-swing.jar set CLASSPATH=%CLASSPATH%;%PROACTIVE%\lib\fractal-swing.jar
+IF EXIST %PROACTIVE%\lib\components\julia-asm.jar set CLASSPATH=%CLASSPATH%;%PROACTIVE%\lib\julia-asm.jar
+IF EXIST %PROACTIVE%\lib\components\julia-mixins.jar set CLASSPATH=%CLASSPATH%;%PROACTIVE%\lib\julia-mixins.jar
+IF EXIST %PROACTIVE%\lib\components\julia-runtime.jar set CLASSPATH=%CLASSPATH%;%PROACTIVE%\lib\julia-runtime.jar
+IF EXIST %PROACTIVE%\lib\components\SVGGraphics.jar set CLASSPATH=%CLASSPATH%;%PROACTIVE%\lib\SVGGraphics.jar
 IF EXIST %PROACTIVE%\lib\bouncycastle.jar set CLASSPATH=%CLASSPATH%;%PROACTIVE%\lib\bouncycastle.jar
 echo CLASSPATH=%CLASSPATH%


Fix dartanalyzer.bat so it works when there are spaces in the path to dart sdk.

BUG=dartbug.com/10859
R=devoncarew@google.com

Review URL: https://codereview.chromium.org//15767003

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

--- sdk/bin/dartanalyzer.bat
+++ sdk/bin/dartanalyzer.bat
@@ -36,12 +36,12 @@
     )
   )
 )
-endlocal & set "DART_SDK=%DART_SDK%" & set "DART_SDK_HOME=%DART_SDK_HOME%"
+endlocal & set DART_SDK=%DART_SDK% & set DART_SDK_HOME=%DART_SDK_HOME%

 if exist "%DART_SDK_HOME%\util\dartanalyzer\dartanalyzer.jar" (
-  set DART_ANALYZER_LIBS="%DART_SDK_HOME%\util\dartanalyzer"
+  set DART_ANALYZER_LIBS=%DART_SDK_HOME%\util\dartanalyzer
 ) else if exist "%DART_ANALYZER_HOME%\util\dartanalyzer\dartanalyzer.jar" (
-  set DART_ANALYZER_LIBS="%DART_ANALYZER_HOME%\util\dartanalyzer"
+  set DART_ANALYZER_LIBS=%DART_ANALYZER_HOME%\util\dartanalyzer
 ) else (
   echo Configuration problem. Couldn't find dartanalyzer.jar.
   exit /b 1


WifiPasswordReveal: Added French language support

--- WifiPasswordReveal.bat
+++ WifiPasswordReveal.bat
@@ -8,12 +8,37 @@
 setlocal enabledelayedexpansion

 :main
-    title WiFiPasswordReveal v1.0 (c) lallouslab.net - The Batchography book
+    title WiFiPasswordReveal v1.1 (c) lallouslab.net - The Batchography book

     echo.
-    echo Reveal all saved WiFi passwords Batch file script v1.0 (c) lallouslab.net
+    echo Reveal all saved WiFi passwords Batch file script v1.1 (c) lallouslab.net
     echo.
     echo Inspired by the book "Batchography: The Art of Batch Files Programming"
+    echo.
+
+
+    :: Default language is English
+    set KEYCONTENT=Key Content
+    set ALL_PROFILES=All User Profile
+
+    :: Detect the language
+    for /F "usebackq tokens=3" %%a IN (`reg query "hklm\system\controlset001\control\nls\language" /v Installlanguage`) DO (
+        :: 0409 English ; 0407 German ; 040C French ; 0C0A Spanish
+        :: https://docs.microsoft.com/en-us/previous-versions/office/developer/speech-technologies/hh361638(v=office.14)
+        set lang_id=%%a
+    )
+
+    if "%lang_id%"=="0409" (
+        echo English operating system language detected
+    ) else if "%lang_id%" == "040C" (
+        set KEYCONTENT=Contenu de la cl
+        set ALL_PROFILES=Profil Tous les utilisateurs
+
+        echo French operating system language detected
+    ) else (
+        echo Warning: Unknown operating system language detected! The script might not work correctly!
+    )
+
     echo.

     :: Get all the profiles


添加docker自动生成并运行的批处理文件

添加docker自动生成并运行的批处理文件

error: pathspec 'Samples/Senparc.Weixin.MP.Sample.vs2017/Senparc.Weixin.MP.CoreSample/docker-build.bat' did not match any file(s) known to git

--- Samples/Senparc.Weixin.MP.Sample.vs2017/Senparc.Weixin.MP.CoreSample/docker-build.bat
+++ Samples/Senparc.Weixin.MP.Sample.vs2017/Senparc.Weixin.MP.CoreSample/docker-build.bat
@@ -0,0 +1,5 @@
+dotnet restore .
+dotnet build .
+dotnet publish -c Release -o bin\Release\netcoreapp2.2\publish\
+docker image build --file Dockerfile --tag weixin-sample:3.0 .
+docker run -p 5000:80 -e "ASPNETCORE_URLS=http://+:80"  -it --name weixinsample--rm weixin-sample:3.0


[C]: add error checks to build script for Windows.

--- cppbuild/cppbuild-vs.cmd
+++ cppbuild/cppbuild-vs.cmd
@@ -44,10 +44,19 @@
 pushd zlib-1.2.11
 md build
 pushd build
+
 cmake -G "Visual Studio 16 2019" -DCMAKE_INSTALL_PREFIX=%ZLIB_INSTALL_DIR% ..
+if %ERRORLEVEL% neq 0 exit /b %ERRORLEVEL%
+
 cmake --build . --target install
+if %ERRORLEVEL% neq 0 exit /b %ERRORLEVEL%

 pushd %BUILD_DIR%
 cmake -G "Visual Studio 16 2019" %EXTRA_CMAKE_ARGS% %SOURCE_DIR%
+if %ERRORLEVEL% neq 0 exit /b %ERRORLEVEL%
+
 cmake --build . --config Release
+if %ERRORLEVEL% neq 0 exit /b %ERRORLEVEL%
+
 ctest -C Release
+if %ERRORLEVEL% neq 0 exit /b %ERRORLEVEL%


Removed an echo statement I was using for debugging on the second time this was run.

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

--- edksetup.bat
+++ edksetup.bat
@@ -294,7 +294,6 @@
 @goto end

 :NewBuild
-echo in NewBuild
 @IF NOT EXIST "BaseTools\toolsetup.bat" goto AntBuild
 if not defined EDK_TOOLS_PATH set EDK_TOOLS_PATH=%WORKSPACE%\BaseTools
 @call BaseTools\toolsetup.bat


lower-case else keyword, GEQ seems case-sensitive

--- org.openbel.framework.tools/scripts/StartServer.cmd
+++ org.openbel.framework.tools/scripts/StartServer.cmd
@@ -14,7 +14,7 @@
 call catalina.bat start
 if %ERRORLEVEL% GEQ 1 (
     echo Unable to start server.
-) ELSE (
+) else (
     echo BEL Server successfully started. Default url is http://localhost:8080/
     echo     WebAPI is available. Default url is http://localhost:8080/openbel-ws/
     echo     WebAPI WSDL is available. Default url is http://localhost:8080/openbel-ws/belframework.wsdl


Adding debug option.

Adding debug option.

SVN-Revision: 1451

--- software/build/build.cmd
+++ software/build/build.cmd
@@ -7,6 +7,11 @@
 set CIPROPFILE=C:\NCI-Projects\ncit-properties\properties\ci-upgrade.properties
 set QAPROPFILE=C:\NCI-Projects\ncit-properties\properties\qa-upgrade.properties
 set DATAQAPROPFILE=C:\NCI-Projects\ncit-properties\properties\data-qa-upgrade.properties
+set DEBUG=-Denable.upgrade.debug=false
+set TAG=-Danthill.build.tag_built=desktop
+if "%2" == "debug" (
+    set DEBUG=-Denable.upgrade.debug=true
+)
 cls
 if "%1" == "" (
     echo.
@@ -24,19 +29,19 @@
     goto DONE
 )
 if "%1" == "all" (
-    ant -Danthill.build.tag_built=desktop build:all
+    ant %TAG% build:all
     goto DONE
 )
 if "%1" == "upgrade" (
-    ant -Danthill.build.tag_built=desktop deploy:local:upgrade
+    ant %TAG% %DEBUG% deploy:local:upgrade
     goto DONE
 )
 if "%1" == "install" (
-    ant -Danthill.build.tag_built=desktop deploy:local:install
+    ant %TAG% %DEBUG% deploy:local:install
     goto DONE
 )
 if "%1" == "deploy" (
-    ant -Danthill.build.tag_built=desktop deploy:hot
+    ant %TAG% %DEBUG% deploy:hot
     goto DONE
 )
 if "%1" == "clean" (
@@ -47,19 +52,19 @@
     goto DONE
 )
 if "%1" == "dev" (
-    ant -Dproperties.file=%DEVPROPFILE% -Danthill.build.tag_built=desktop deploy:remote:upgrade
+    ant -Dproperties.file=%DEVPROPFILE% %TAG% %DEBUG% deploy:remote:upgrade
     goto DONE
 )
 if "%1" == "ci" (
-    ant -Dproperties.file=%CIPROPFILE% -Danthill.build.tag_built=desktop deploy:remote:upgrade
+    ant -Dproperties.file=%CIPROPFILE% %TAG% %DEBUG% deploy:remote:upgrade
     goto DONE
 )
 if "%1" == "qa" (
-    ant -Dproperties.file=%QAPROPFILE% -Danthill.build.tag_built=desktop deploy:remote:upgrade
+    ant -Dproperties.file=%QAPROPFILE% %TAG% %DEBUG% deploy:remote:upgrade
     goto DONE
 )
 if "%1" == "data-qa" (
-    ant -Dproperties.file=%DATAQAPROPFILE% -Danthill.build.tag_built=desktop deploy:remote:upgrade
+    ant -Dproperties.file=%DATAQAPROPFILE% %TAG% %DEBUG% deploy:remote:upgrade
     goto DONE
 )


fix permission of new batch file

fix permission of new batch file


Put the our jar files before the system's CLASSPATH

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

--- edksetup.bat
+++ edksetup.bat
@@ -154,13 +154,13 @@
 @REM Java Programs can use it.
 @REM It needs the XMLBEANS libraries in order to compile.
 @REM
-set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib
-set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\jsr173_1.0_api.jar
-set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\xbean.jar
-set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\xbean_xpath.jar
-set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\xmlpublic.jar
-set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\saxon8.jar
-set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\resolver.jar
+set CLASSPATH=%XMLBEANS_HOME%\lib;%CLASSPATH%
+set CLASSPATH=%XMLBEANS_HOME%\lib\jsr173_1.0_api.jar;%CLASSPATH%
+set CLASSPATH=%XMLBEANS_HOME%\lib\xbean.jar;%CLASSPATH%
+set CLASSPATH=%XMLBEANS_HOME%\lib\xbean_xpath.jar;%CLASSPATH%
+set CLASSPATH=%XMLBEANS_HOME%\lib\xmlpublic.jar;%CLASSPATH%
+set CLASSPATH=%XMLBEANS_HOME%\lib\saxon8.jar;%CLASSPATH%
+set CLASSPATH=%XMLBEANS_HOME%\lib\resolver.jar;%CLASSPATH%

 call ant -f %WORKSPACE%\Tools\build.xml SurfaceArea

@@ -168,7 +168,7 @@
 @REM Now we can make the other Java Programs
 @REM All of the remaining Java Programs require the SurfaceArea library to compile
 @REM
-set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\SurfaceArea.jar
+set CLASSPATH=%WORKSPACE%\Tools\Jars\SurfaceArea.jar;%CLASSPATH%

 call ant -f %WORKSPACE%\Tools\build.xml JavaCode

@@ -176,13 +176,13 @@
 @REM We have all of the Java Programs and add-in classes created, so we can start
 @REM using the cpp-tasks to create our tools
 @REM
-set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\Common.jar
-set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\PcdTools.jar
-set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\GenBuild.jar
-set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\cpptasks.jar
-set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\frameworktasks.jar
-set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Bin\FrameworkWizard.jar
-set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Bin\MigrationTools.jar
+set CLASSPATH=%WORKSPACE%\Tools\Jars\Common.jar;%CLASSPATH%
+set CLASSPATH=%WORKSPACE%\Tools\Jars\PcdTools.jar;%CLASSPATH%
+set CLASSPATH=%WORKSPACE%\Tools\Jars\GenBuild.jar;%CLASSPATH%
+set CLASSPATH=%WORKSPACE%\Tools\Jars\cpptasks.jar;%CLASSPATH%
+set CLASSPATH=%WORKSPACE%\Tools\Jars\frameworktasks.jar;%CLASSPATH%
+set CLASSPATH=%WORKSPACE%\Tools\Bin\FrameworkWizard.jar;%CLASSPATH%
+set CLASSPATH=%WORKSPACE%\Tools\Bin\MigrationTools.jar;%CLASSPATH%

 call ant -f %WORKSPACE%\Tools\build.xml C_Code

@@ -233,21 +233,21 @@
 echo CYGWIN_HOME:   %CYGWIN_HOME%
 echo PATH:          %PATH%
 echo.
-set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib
-set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\jsr173_1.0_api.jar
-set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\xbean.jar
-set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\xbean_xpath.jar
-set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\xmlpublic.jar
-set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\saxon8.jar
-set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\resolver.jar
-set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\SurfaceArea.jar
-set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\Common.jar
-set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\PcdTools.jar
-set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\GenBuild.jar
-set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\cpptasks.jar
-set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\frameworktasks.jar
-set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Bin\FrameworkWizard.jar
-set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Bin\MigrationTools.jar
+set CLASSPATH=%XMLBEANS_HOME%\lib;%CLASSPATH%
+set CLASSPATH=%XMLBEANS_HOME%\lib\jsr173_1.0_api.jar;%CLASSPATH%
+set CLASSPATH=%XMLBEANS_HOME%\lib\xbean.jar;%CLASSPATH%
+set CLASSPATH=%XMLBEANS_HOME%\lib\xbean_xpath.jar;%CLASSPATH%
+set CLASSPATH=%XMLBEANS_HOME%\lib\xmlpublic.jar;%CLASSPATH%
+set CLASSPATH=%XMLBEANS_HOME%\lib\saxon8.jar;%CLASSPATH%
+set CLASSPATH=%XMLBEANS_HOME%\lib\resolver.jar;%CLASSPATH%
+set CLASSPATH=%WORKSPACE%\Tools\Jars\SurfaceArea.jar;%CLASSPATH%
+set CLASSPATH=%WORKSPACE%\Tools\Jars\Common.jar;%CLASSPATH%
+set CLASSPATH=%WORKSPACE%\Tools\Jars\PcdTools.jar;%CLASSPATH%
+set CLASSPATH=%WORKSPACE%\Tools\Jars\GenBuild.jar;%CLASSPATH%
+set CLASSPATH=%WORKSPACE%\Tools\Jars\cpptasks.jar;%CLASSPATH%
+set CLASSPATH=%WORKSPACE%\Tools\Jars\frameworktasks.jar;%CLASSPATH%
+set CLASSPATH=%WORKSPACE%\Tools\Bin\FrameworkWizard.jar;%CLASSPATH%
+set CLASSPATH=%WORKSPACE%\Tools\Bin\MigrationTools.jar;%CLASSPATH%
 echo CLASSPATH:     %CLASSPATH%
 goto end


Fix MSBuild call for Hydrax sln.

Fix MSBuild call for Hydrax sln.

--- tools/windows-build-deps.cmd
+++ tools/windows-build-deps.cmd
@@ -311,7 +311,11 @@

     cecho {0D}Building Bullet. Please be patient, this will take a while.{# #}{\n}
     MSBuild BULLET_PHYSICS.sln /p:configuration=Debug /clp:ErrorsOnly /nologo /m:%NUMBER_OF_PROCESSORS%
-    MSBuild BULLET_PHYSICS.sln /p:configuration=%BUILD_TYPE% /clp:ErrorsOnly /nologo /m:%NUMBER_OF_PROCESSORS%
+    if %BUILD_RELEASE%==TRUE (
+        MSBuild BULLET_PHYSICS.sln /p:configuration=Release /clp:ErrorsOnly /nologo /m:%NUMBER_OF_PROCESSORS%
+    ) ELSE (
+        MSBuild BULLET_PHYSICS.sln /p:configuration=RelWithDebInfo /clp:ErrorsOnly /nologo /m:%NUMBER_OF_PROCESSORS%
+    )
     IF NOT %ERRORLEVEL%==0 GOTO :ERROR
 ) ELSE (
     cecho {0D}Bullet already built. Skipping.{# #}{\n}


生成工具 :dizzy_face:

生成工具 :dizzy_face:

--- generate.bat
+++ generate.bat
@@ -28,8 +28,9 @@
     %CS_COMPILER_PATH% --csharp_out=%CS_TARGET_PATH%  %SOURCE_FOLDER%\%%i

     ::生成 Java 代码
+    %JAVA_COMPILER_PATH% --java_out=%JAVA_TARGET_PATH%  %SOURCE_FOLDER%\%%i
+
     echo echo generate:%%i
-    %JAVA_COMPILER_PATH% --java_out=%JAVA_TARGET_PATH%  %SOURCE_FOLDER%\%%i

 )


fix on mac

fix on mac

--- build-react.cmd
+++ build-react.cmd
@@ -1 +1 @@
-browserify -r react -r react-dom -r react-list -r react-bootstrap -u react-native> react-bundle.js+browserify -r react -r react-dom -r react-list -r react-bootstrap -u react-native -u react-native-android-kdb > react-bundle.js


fix commnd line help

fix commnd line help

--- vendor/bin/alias.cmd
+++ vendor/bin/alias.cmd
@@ -144,26 +144,36 @@
 :p_help
 echo.Usage:
 echo.
-echo.     alias [options] [alias=alias command] or [[create [alias] [alias command]]]
+echo.  alias [options] [alias=alias command]
+echo.
+echo   OR
+echo.
+echo.  alias create [alias] [alias command]
 echo.
 echo.Options:
 echo.
-echo.     Note: Options MUST precede the alias definition.
+echo.  Note: Options MUST precede the alias definition.
 echo.
-echo.     /d [alias]     Delete an [alias].
-echo.     /f [macrofile] Path to the [macrofile] you want to store the new alias in.
-echo.                    Default: %cmder_root%\config\user_aliases.cmd
-echo.     /reload        Reload the aliases file.  Can be used with /f argument.
-echo.                    Default: %cmder_root%\config\user_aliases.cmd
+echo.  /d [alias]     Delete an [alias].
+echo.  /f [macrofile] Path to the [macrofile] you want to store the new alias in.
+echo.                 Default: %cmder_root%\config\user_aliases.cmd
+echo.  /reload        Reload the aliases file.  Can be used with /f argument.
+echo.                 Default: %cmder_root%\config\user_aliases.cmd
 echo.
-echo. If alias is called with no parameters, it will display the list of existing aliases.
+echo. If alias is called with no parameters, it will display the list of existing
+echo. aliases.
 echo.
 echo. In the alias command, you can use the following notations:
 echo.
-echo. ^^^^^^^^%% - '%%' in env vars must be escaped if preserving the variable in the alias is desired.
-echo. $*    - allows the alias to assume all the parameters of the supplied command.
-echo. $1-$9 - Allows you to seperate parameter by number, much like %%1 in batch.
-echo. $T    - Command seperator, allowing you to string several commands together into one alias.
+echo. ^^^^^^^^%% - %% signs in env vars must be escaped if preserving the variable
+echo.         in he alias is desired. Variables in aliases surrounded by double
+echo.         quotes only require '^^%%' vs '^^^^^^^^%%'
+echo. $*    - allows the alias to assume all the parameters of the supplied
+echo.         command.
+echo. $1-$9 - Allows you to seperate parameter by number, much like %%1 in
+echo.         batch.
+echo. $T    - Command seperator, allowing you to string several commands
+echo.         together into one alias.
 echo.
 echo. For more information, read DOSKEY /?
 exit /b


Fix NuGet.exe path

Fix NuGet.exe path

--- MediaCaptureReader/Package/publish.cmd
+++ MediaCaptureReader/Package/publish.cmd
@@ -5,5 +5,5 @@

 set OUTPUT=c:\NuGet\

-nuget push %OUTPUT%Packages\MMaitre.MediaCaptureReader.%VERSION%.nupkg
-nuget push %OUTPUT%Symbols\MMaitre.MediaCaptureReader.Symbols.%VERSION%.nupkg -Source http://nuget.gw.symbolsource.org/Public/NuGet +%OUTPUT%nuget push %OUTPUT%Packages\MMaitre.MediaCaptureReader.%VERSION%.nupkg
+%OUTPUT%nuget push %OUTPUT%Symbols\MMaitre.MediaCaptureReader.Symbols.%VERSION%.nupkg -Source http://nuget.gw.symbolsource.org/Public/NuGet


test drive for checkout latest on win

test drive for checkout latest on win

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

--- latest.bat
+++ latest.bat
@@ -0,0 +1,4 @@
+git fetch --tags
+for /f "delims=" %%a in ('git rev-list --tags --max-count=1') do @set rev=%%a
+for /f "delims=" %%a in ('git describe --tags %%rev%%') do @set tag=%%a
+git checkout %%tag%%


Completely remove Python and verify

Completely remove Python and verify

error: pathspec 'pkg/windows/uninstall-and-wipe-Python.cmd' did not match any file(s) known to git

--- pkg/windows/uninstall-and-wipe-Python.cmd
+++ pkg/windows/uninstall-and-wipe-Python.cmd
@@ -0,0 +1,9 @@
+@echo off
+
+:: uninstall Python 2.7 64bit
+MsiExec.exe /X {16E52445-1392-469F-9ADB-FC03AF00CD62} /QN
+
+:: wipe the Python directory
+::  DOS hack first create dir because Windows cannot test not existing without error message
+md c:\Python27  1>nul 2>nul
+rd /s /q c:\Python27 || echo Failure: c:\Python27 still exists, please find out why and repeat.


get cairo from main repo

get cairo from main repo

--- build_cairo.bat
+++ build_cairo.bat
@@ -1,8 +1,8 @@
 setlocal
 call settings.bat

-rem git clone --depth 1 https://github.com/Mixaill/cmake.cairo.git cairo
-git clone --depth 1 https://github.com/alex85k/cmake.cairo.git cairo
+git clone --depth 1 https://github.com/Mixaill/cmake.cairo.git cairo
+rem git clone --depth 1 https://github.com/alex85k/cmake.cairo.git cairo

 cd cairo


commit on 12/06/2018 at 11:06:40

commit on 12/06/2018 at 11:06:40

--- ansys-APDL/fiberDebond3D.cmd
+++ ansys-APDL/fiberDebond3D.cmd
@@ -50,6 +50,8 @@
 deltaphi = 5.0    ! [deg] refined area size
 delta = 0.05      ! [deg] angular size of element at crack
 aOverW = 0.1      ! [-] ratio of debond length to RVE's width
+refWoverA = 0.1   ! [-] ratio of refined region width to debond's length
+refRoverR = 0.1   ! [-] ratio of refined radial region to fiber's radius

 epsx = 0.01       ! [-]  applied strain
 uniP = 0.0        ! [-]  uniform pressure applied to crack face
@@ -74,6 +76,8 @@

 a = aOverW*W
 crackFront = W-a
+refVolStart = crackFront + refWoverA*a
+refVolStop = crackFront - refWoverA*a

 deltathetarad = deltatheta*Pi/180.0
 deltaphirad = deltaphi*Pi/180.0
@@ -114,8 +118,29 @@
 K, 17, Rf*COS(refArAngStart), W, Rf*SIN(refArAngStart)     ! Fiber's interface, coincident start of refined area (for debond), external face with debond

 K, 18, Rf*COS(deltathetarad), W, Rf*SIN(deltathetarad)     ! Fiber's interface, crack tip, external face with debond
-K, 19, Rf*COS(refArAngStop), W, Rf*SIN(refArAngStop)     ! Fiber's interface, end of refined area, external face with debond
-
+K, 19, Rf*COS(refArAngStop), W, Rf*SIN(refArAngStop)       ! Fiber's interface, end of refined area, external face with debond
+
+K, 20, (1-refRoverR)*Rf*COS(refArAngStart), W, (1-refRoverR)*Rf*SIN(refArAngStart)     ! Fiber's inside neighborhood, start of refined area, external face with debond
+K, 21, (1-refRoverR)*Rf*COS(deltathetarad), W, (1-refRoverR)*Rf*SIN(deltathetarad)     ! Fiber's inside neighborhood, crack tip, external face with debond
+K, 22, (1-refRoverR)*Rf*COS(refArAngStop), W, (1-refRoverR)*Rf*SIN(refArAngStop)       ! Fiber's inside neighborhood, end of refined area, external face with debond
+
+K, 23, (1+refRoverR)*Rf*COS(refArAngStart), W, (1+refRoverR)*Rf*SIN(refArAngStart)     ! Fiber's inside neighborhood, start of refined area, external face with debond
+K, 24, (1+refRoverR)*Rf*COS(deltathetarad), W, (1+refRoverR)*Rf*SIN(deltathetarad)     ! Fiber's inside neighborhood, crack tip, external face with debond
+K, 25, (1+refRoverR)*Rf*COS(refArAngStop), W, (1+refRoverR)*Rf*SIN(refArAngStop)       ! Fiber's inside neighborhood, end of refined area, external face with debond
+
+K, 16, Rf*COS(refArAngStart), W, Rf*SIN(refArAngStart)     ! Fiber's interface, start of refined area, start of refined volume, face with debond
+K, 17, Rf*COS(refArAngStart), W, Rf*SIN(refArAngStart)     ! Fiber's interface, coincident start of refined area (for debond), start of refined volume, face with debond
+
+K, 18, Rf*COS(deltathetarad), W, Rf*SIN(deltathetarad)     ! Fiber's interface, crack tip, start of refined volume, face with debond
+K, 19, Rf*COS(refArAngStop), W, Rf*SIN(refArAngStop)       ! Fiber's interface, end of refined area, start of refined volume, face with debond
+
+K, 20, (1-refRoverR)*Rf*COS(refArAngStart), W, (1-refRoverR)*Rf*SIN(refArAngStart)     ! Fiber's inside neighborhood, start of refined area, start of refined volume, face with debond
+K, 21, (1-refRoverR)*Rf*COS(deltathetarad), W, (1-refRoverR)*Rf*SIN(deltathetarad)     ! Fiber's inside neighborhood, crack tip, start of refined volume, face with debond
+K, 22, (1-refRoverR)*Rf*COS(refArAngStop), W, (1-refRoverR)*Rf*SIN(refArAngStop)       ! Fiber's inside neighborhood, end of refined area, start of refined volume, face with debond
+
+K, 23, (1+refRoverR)*Rf*COS(refArAngStart), W, (1+refRoverR)*Rf*SIN(refArAngStart)     ! Fiber's inside neighborhood, start of refined area, start of refined volume, face with debond
+K, 24, (1+refRoverR)*Rf*COS(deltathetarad), W, (1+refRoverR)*Rf*SIN(deltathetarad)     ! Fiber's inside neighborhood, crack tip, start of refined volume, face with debond
+K, 25, (1+refRoverR)*Rf*COS(refArAngStop), W, (1+refRoverR)*Rf*SIN(refArAngStop)       ! Fiber's inside neighborhood, end of refined area, start of refined volume, face with debond

 ! Lines


Check that Docker is installed on Windows

Signed-off-by: Robert Breker <bfcd7039ca4b92386f0756a1d5e67ea4ff23cfe0@citrix.com>

--- src/xscontainer/data/configure_tls.cmd
+++ src/xscontainer/data/configure_tls.cmd
@@ -6,6 +6,12 @@
     EXIT /B 1
 )
 SET cdpath=%~dp0
+if not exist c:\ProgramData\docker\ (
+    echo Error: Could not find Docker in c:\ProgramData\docker\.
+    echo Please install Docker before running this script.
+    timeout 10 > NUL
+    EXIT /B 1
+)
 echo Setting the system environment variable DOCKER_HOST
 reg add "HKLM\SYSTEM\CurrentControlSet\Control\Session Manager\Environment" /v DOCKER_HOST /t REG_SZ /d tcp://:2376 /f
 echo Setting the system environment variable DOCKER_TLS


Update windows git log aliases

Update windows git log aliases

--- windows/cmder-config/user-aliases.cmd
+++ windows/cmder-config/user-aliases.cmd
@@ -83,22 +83,22 @@
 gir=git reset $*

 ;= Git Log Author
-gl=git log --topo-order --pretty=format:"%C(4)%aN %C(7)<%aE> %C(4)%ar %C(3)%ad %C(2)%h%C(1)%d %C(7)%<(80,trunc)%s" --first-parent $*
-gla=git log --topo-order --pretty=format:"%C(4)%aN %C(7)<%aE> %C(4)%ar %C(3)%ad %C(2)%h%C(1)%d %C(7)%<(80,trunc)%s" --all $*
-glag=git log --topo-order --pretty=format:"%C(4)%aN %C(7)<%aE> %C(4)%ar %C(3)%ad %C(2)%h%C(1)%d %C(7)%<(80,trunc)%s" --all --graph $*
-gld=git log --topo-order --pretty=format:"%C(4)%aN %C(7)<%aE> %C(4)%ar %C(3)%ad %C(2)%h%C(1)%d %C(7)%<(80,trunc)%s" --no-merges --first-parent $*
-gldp=git log --topo-order --pretty=format:"%C(4)%aN %C(7)<%aE> %C(4)%ar %C(3)%ad %C(2)%h%C(1)%d %C(7)%<(80,trunc)%s" --no-merges --first-parent --patch $*
-glg=git log --topo-order --pretty=format:"%C(4)%aN %C(7)<%aE> %C(4)%ar %C(3)%ad %C(2)%h%C(1)%d %C(7)%<(80,trunc)%s" --graph $*
-gls=git log --topo-order --stat --pretty="format:%C(bold)Commit:%C(reset) %C(2)%H%C(1)%d%n%C(bold)Author:%C(reset) %C(4)%an %C(7)<%ae>%n%C(bold)Date:%C(reset) %C(3)%ai %C(4)(%ar)%C(reset)%n%+B" $*
+gl=git log --pretty=format:"%C(4)%aN %C(7)<%aE> %C(4)%ar %C(3)%ad %C(2)%h%C(1)%d %C(7)%<(80,trunc)%s" --topo-order $*
+gla=git log --pretty=format:"%C(4)%aN %C(7)<%aE> %C(4)%ar %C(3)%ad %C(2)%h%C(1)%d %C(7)%<(80,trunc)%s" --topo-order --all $*
+glag=git log --pretty=format:"%C(4)%aN %C(7)<%aE> %C(4)%ar %C(3)%ad %C(2)%h%C(1)%d %C(7)%<(80,trunc)%s" --topo-order --all --graph $*
+gld=git log --pretty=format:"%C(4)%aN %C(7)<%aE> %C(4)%ar %C(3)%ad %C(2)%h%C(1)%d %C(7)%<(80,trunc)%s" --topo-order --no-merges --first-parent $*
+gldp=git log --pretty=format:"%C(4)%aN %C(7)<%aE> %C(4)%ar %C(3)%ad %C(2)%h%C(1)%d %C(7)%<(80,trunc)%s" --topo-order --no-merges --first-parent --patch $*
+glg=git log --pretty=format:"%C(4)%aN %C(7)<%aE> %C(4)%ar %C(3)%ad %C(2)%h%C(1)%d %C(7)%<(80,trunc)%s" --topo-order --graph $*
+gls=git log --pretty="format:%C(bold)Commit:%C(reset) %C(2)%H%C(1)%d%n%C(bold)Author:%C(reset) %C(4)%an %C(7)<%ae>%n%C(bold)Date:%C(reset) %C(3)%ai %C(4)(%ar)%C(reset)%n%+B" --topo-order --stat $*

 ;= Git Log Committer
-glc=git log --topo-order --pretty=format:"%C(4)%cN %C(7)<%cE> %C(4)%cr %C(3)%cd %C(2)%h%C(1)%d %C(7)%<(80,trunc)%s" --first-parent $*
-glca=git log --topo-order --pretty=format:"%C(4)%cN %C(7)<%cE> %C(4)%cr %C(3)%cd %C(2)%h%C(1)%d %C(7)%<(80,trunc)%s" --all $*
-glcag=git log --topo-order --pretty=format:"%C(4)%cN %C(7)<%cE> %C(4)%cr %C(3)%cd %C(2)%h%C(1)%d %C(7)%<(80,trunc)%s" --all --graph $*
-glcd=git log --topo-order --pretty=format:"%C(4)%cN %C(7)<%cE> %C(4)%cr %C(3)%cd %C(2)%h%C(1)%d %C(7)%<(80,trunc)%s" --no-merges --first-parent $*
-glcdp=git log --topo-order --pretty=format:"%C(4)%cN %C(7)<%cE> %C(4)%cr %C(3)%cd %C(2)%h%C(1)%d %C(7)%<(80,trunc)%s" --no-merges --first-parent --patch $*
-glcg=git log --topo-order --pretty=format:"%C(4)%cN %C(7)<%cE> %C(4)%cr %C(3)%cd %C(2)%h%C(1)%d %C(7)%<(80,trunc)%s" --graph $*
-glcs=git log --topo-order --stat --pretty="format:%C(bold)Commit:%C(reset) %C(2)%H%C(1)%d%n%C(bold)Committer:%C(reset) %C(4)%cn %C(7)<%ce>%n%C(bold)Date:%C(reset) %C(3)%ci %C(4)(%cr)%C(reset)%n%+B" $*
+glc=git log --pretty=format:"%C(4)%cN %C(7)<%cE> %C(4)%cr %C(3)%cd %C(2)%h%C(1)%d %C(7)%<(80,trunc)%s" --topo-order $*
+glca=git log --pretty=format:"%C(4)%cN %C(7)<%cE> %C(4)%cr %C(3)%cd %C(2)%h%C(1)%d %C(7)%<(80,trunc)%s" --topo-order --all $*
+glcag=git log --pretty=format:"%C(4)%cN %C(7)<%cE> %C(4)%cr %C(3)%cd %C(2)%h%C(1)%d %C(7)%<(80,trunc)%s" --topo-order --all --graph $*
+glcd=git log --pretty=format:"%C(4)%cN %C(7)<%cE> %C(4)%cr %C(3)%cd %C(2)%h%C(1)%d %C(7)%<(80,trunc)%s" --topo-order --no-merges --first-parent $*
+glcdp=git log --pretty=format:"%C(4)%cN %C(7)<%cE> %C(4)%cr %C(3)%cd %C(2)%h%C(1)%d %C(7)%<(80,trunc)%s" --topo-order --no-merges --first-parent --patch $*
+glcg=git log --pretty=format:"%C(4)%cN %C(7)<%cE> %C(4)%cr %C(3)%cd %C(2)%h%C(1)%d %C(7)%<(80,trunc)%s" --topo-order --graph $*
+glcs=git log --pretty="format:%C(bold)Commit:%C(reset) %C(2)%H%C(1)%d%n%C(bold)Committer:%C(reset) %C(4)%cn %C(7)<%ce>%n%C(bold)Date:%C(reset) %C(3)%ci %C(4)(%cr)%C(reset)%n%+B" --topo-order --stat $*

 ;= Git Merge
 gm=git merge $*


Double quoting the path to the host and to csc.dll in RunCsc.cmd so that it works when the CLI is in a path with spaces.

--- src/redist/RunCsc.cmd
+++ src/redist/RunCsc.cmd
@@ -3,4 +3,4 @@
 REM Copyright (c) .NET Foundation and contributors. All rights reserved.
 REM Licensed under the MIT license. See LICENSE file in the project root for full license information.

-%~dp0..\..\dotnet %~dp0csc.exe %*
+"%~dp0..\..\dotnet" "%~dp0csc.exe" %*


commit on 08/06/2019 at 09:15:08

commit on 08/06/2019 at 09:15:08

--- windows-cmd/startPipeLPC.cmd
+++ windows-cmd/startPipeLPC.cmd
@@ -1 +1 @@
-cd C:/02*/01*/01*/thinPlyMechanics/windows-cmd && startERVESimPipeLPC.cmd 1_144S0A0 && cd C:/02*/01*/01*/thinPlyMechanics/windows-cmd && startERVESimPipeLPC.cmd 1_144S0A0T1 && cd C:/02*/01*/01*/thinPlyMechanics/windows-cmd && startERVESimPipeLPC.cmd 1_144S0A1 && cd C:/02*/01*/01*/thinPlyMechanics/windows-cmd && startERVESimPipeLPC.cmd 1_144S0A1T1 && cd C:/02*/01*/01*/thinPlyMechanics/windows-cmd && startERVESimPipeLPC.cmd 1_144S0A5 && cd C:/02*/01*/01*/thinPlyMechanics/windows-cmd && startERVESimPipeLPC.cmd 1_144S0A5T1 && cd C:/02*/01*/01*/thinPlyMechanics/windows-cmd && startERVESimPipeLPC.cmd 1_144S0A10 && cd C:/02*/01*/01*/thinPlyMechanics/windows-cmd && startERVESimPipeLPC.cmd 1_144S0A10T1 && cd C:/02*/01*/01*/thinPlyMechanics/windows-cmd && startERVESimPipeLPC.cmd 1_144S0A100 && cd C:/02*/01*/01*/thinPlyMechanics/windows-cmd && startERVESimPipeLPC.cmd 1_144S0A100T1
+cd C:/02*/01*/01*/thinPlyMechanics/windows-cmd && startERVESimPipeLPC.cmd 1_144S0A10T1 && cd C:/02*/01*/01*/thinPlyMechanics/windows-cmd && startERVESimPipeLPC.cmd 1_144S0A100 && cd C:/02*/01*/01*/thinPlyMechanics/windows-cmd && startERVESimPipeLPC.cmd 1_144S0A100T1


Fixed publishing nuget package to specific location

--- createNuget.bat
+++ createNuget.bat
@@ -529,7 +529,7 @@
 IF %publish% EQU 1 (
 	IF NOT "%destination%"=="" (
 		CALL:print %debug% "Nuget package will be pushed to %destination%"
-		%nuget% push %nugetOutputPath%\%nugetName%.%nugetVersion%.nupkg -s %destination%
+		%nuget% push %nugetOutputPath%\%nugetName%.%nugetVersion%.nupkg -Source %destination%
 	) ELSE (
 		CALL:print %debug% "Nuget package will be pushed to default location"
 		%nuget% push %nugetOutputPath%\%nugetName%.%nugetVersion%.nupkg


fix script

fix script

--- ArcGISRuntimeSDKQt_CppSamples/CloudAndPortal/OAuthRedirectExample/windows_deployment.bat
+++ ArcGISRuntimeSDKQt_CppSamples/CloudAndPortal/OAuthRedirectExample/windows_deployment.bat
@@ -3,14 +3,13 @@
 SET "ARCH=x64"
 SET "VC_ARCH=amd64"
 SET "QT_KIT=C:\Qt\5.6\msvc2015_64"
-SET DIR="%~dp0"
-SET BUILD_TYPE="release"
-SET "BUILD_DIR="%DIR%\build-OAuthRedirectExample-Desktop_Qt_5_6_2_MSVC2015_64bit-Release\%BUILD_TYPE%"
-SET ARCGIS_SDK_DIR ="C:\Program Files (x86)\ArcGIS SDKs\Qt100.1\sdk\windows\%ARCH%\bin\%BUILD_TYPE%"
+SET "DIR=%~dp0"
+SET "BUILD_TYPE=release"
+SET "BUILD_DIR=%DIR%..\build-OAuthRedirectExample-Desktop_Qt_5_6_2_MSVC2015_64bit-Release\%BUILD_TYPE%"
+SET "ARCGIS_SDK_DIR=C:\Program Files (x86)\ArcGIS SDKs\Qt100.1\sdk\windows\%ARCH%\bin\%BUILD_TYPE%"

-ECHO "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %VC_ARCH%
 call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %VC_ARCH%
-call "%QT_KIT%\bin\windeployqt.exe" "%BUILD_DIR%\OAuthRedirectExample.exe" --qmldir %DIR% -sensors -positioning
+call %QT_KIT%\bin\windeployqt.exe %BUILD_DIR%\OAuthRedirectExample.exe --qmldir %DIR% -sensors -positioning

 copy "%ARCGIS_SDK_DIR%\EsriCommonQt.dll" "%BUILD_DIR%\EsriCommonQt.dll"
 copy "%ARCGIS_SDK_DIR%\runtimecore.dll" "%BUILD_DIR%\runtimecore.dll"


Fixed empty LDFLAGS breaking build.bat

Fixed empty LDFLAGS breaking build.bat

--- McEngine/build.bat
+++ McEngine/build.bat
@@ -108,8 +108,10 @@
 	)
 )

-echo LDFLAGS = %LDFLAGS%
-echo %LDFLAGS%>> "%LDARGSFILE%"
+if not "%LDFLAGS%"=="" (
+	echo LDFLAGS = %LDFLAGS%
+	echo %LDFLAGS%>> "%LDARGSFILE%"
+)

 echo Collecting library search paths ...
 for /d %%i in ("%FULLPATH%%LIB%"\*) do (


fixed build_dep.bat

fixed build_dep.bat

--- Dependencies/build_dep.bat
+++ Dependencies/build_dep.bat
@@ -17,6 +17,3 @@
 copy lib\\Release\\libevent.lib lib\\Debug\\ /Y
 copy lib\\Release\\libevent_core.a lib\\Debug\\ /Y
 copy lib\\Release\\libevent_core.lib lib\\Debug\\ /Y
-
-REM back to main dir
-cd ..\\


Set configuration to the one bundled

Set configuration to the one bundled

--- mb-env.bat
+++ mb-env.bat
@@ -10,13 +10,14 @@
 set MINDBENDER_CORE=%~dp0git\mindbender-core
 set MINDBENDER_LAUNCHER=%~dp0git\mindbender-launcher
 set MINDBENDER_EXAMPLE=%~dp0git\mindbender-example\projects
+set MINDBENDER_CONFIG=polly

-set PATH=%~dp0bin\windows\syncthing;%PATH%
 set PATH=%~dp0bin\windows\python36;%PATH%
 set PATH=%~dp0bin\windows;%PATH%
 set PATH=%~dp0bin;%PATH%

-set PYTHONPATH=%~dp0bin\maya\2016\pythonpath
+set PYTHONPATH=%~dp0bin\pythonpath
+set PYTHONPATH=%~dp0\git\mindbender-config;%PYTHONPATH%
 set PYTHONPATH=%MINDBENDER_CORE%;%MINDBENDER_LAUNCHER%;%PYTHONPATH%

 set PYBLISHGUI=pyblish_qml


Create install.bat

Create install.bat


Update posix.bat

Update posix.bat

--- windows/posix.bat
+++ windows/posix.bat
@@ -1,5 +1,4 @@
 echo off
 set PATH=C:\Program Files\Git\mingw64_gcc\mingw64\bin;C:\Program Files\Git\bin;%PATH%
-rem echo %PATH%
-rem cd "C:\Program Files\Git\mingw64_gcc\mingw64\bin"
+rem echo Posix on Windows
 "C:\WINDOWS\system32\cmd.exe"


- using pythonw for launching aliases

- using pythonw for launching aliases

--- bin/ecosystem-init.bat
+++ bin/ecosystem-init.bat
@@ -1,6 +1,7 @@
 @ECHO OFF

-set python_exe=S:\python\Python27\pythonw.exe
+set python_exe=S:\python\Python27\python.exe
+set pythonw_exe=S:\python\Python27\pythonw.exe

 for %%d in (%~dp0..) do set ECO_ROOT=%%~fd

@@ -10,13 +11,14 @@

 Doskey eco=%python_exe% %ECO_ROOT%\bin\ecosystem.py $*

-Doskey maya-2015-stable=%python_exe% %ECO_ROOT%\bin\ecosystem.py -t base,maya2015,mayaportable,stable -r maya
-Doskey   maya-2015-beta=%python_exe% %ECO_ROOT%\bin\ecosystem.py -t base,maya2015,mayaportable,beta -r maya
-Doskey  maya-2015-alpha=%python_exe% %ECO_ROOT%\bin\ecosystem.py -t base,maya2015,mayaportable,alpha -r maya
+Doskey maya-2015-stable=%pythonw_exe% %ECO_ROOT%\bin\ecosystem.py -t base,maya2015,mayaportable,stable -r maya
+Doskey   maya-2015-beta=%pythonw_exe% %ECO_ROOT%\bin\ecosystem.py -t base,maya2015,mayaportable,beta -r maya
+Doskey  maya-2015-alpha=%pythonw_exe% %ECO_ROOT%\bin\ecosystem.py -t base,maya2015,mayaportable,alpha -r maya

-Doskey    maya-2015-dev=%python_exe% %ECO_ROOT%\bin\ecosystem.py -t base,maya2015,mayaportable,dev -r maya
-Doskey maya-2015-dev-jc=%python_exe% %ECO_ROOT%\bin\ecosystem.py -t base,maya2015,mayaportable,devjc -r maya
+Doskey    maya-2015-dev=%pythonw_exe% %ECO_ROOT%\bin\ecosystem.py -t base,maya2015,mayaportable,dev -r maya
+Doskey maya-2015-dev-jc=%pythonw_exe% %ECO_ROOT%\bin\ecosystem.py -t base,maya2015,mayaportable,devjc -r maya

-Doskey     eclipse-luna=start %python_exe% %ECO_ROOT%\bin\ecosystem.py -t base,eclipse-luna -r eclipse-luna-setup.bat
+Doskey eclipse-luna=start %python_exe% %ECO_ROOT%\bin\ecosystem.py -t base,eclipse-luna -r eclipse-luna-setup.bat
+

 Doskey     rv="S:\dev_area\apps\tweak\rv-stable.lnk"


minor fix

minor fix

--- bin/phpsdk_version.bat
+++ bin/phpsdk_version.bat
@@ -1,6 +1,6 @@
 @echo off

-%PHP_SDK_PHP_CMD% -r "echo 'PHP SDK ' . file_get_contents(getenv('PHP_SDK_PATH') . '\\VERSION');"
+%PHP_SDK_PHP_CMD% -r "echo 'PHP-SDK ' . file_get_contents(getenv('PHP_SDK_PATH') . '\\VERSION');"

 exit /b


Added patch for twolfson-style resolution

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

--- bin/twolfson-style.cmd
+++ bin/twolfson-style.cmd
@@ -0,0 +1,7 @@
+@IF EXIST "%~dp0\node.exe" (
+  "%~dp0\node.exe"  "%~dp0\twolfson-style" %*
+) ELSE (
+  @SETLOCAL
+  @SET PATHEXT=%PATHEXT:;.JS;=;%
+  node  "%~dp0\twolfson-style" %*
+)


Less verbose test suite.

Less verbose test suite.

--- run_unit_test_suite.bat
+++ run_unit_test_suite.bat
@@ -1,5 +1,5 @@
 @echo off
 echo Running unit test suite...
-python -m pytest -k "unit" -xvs --cov-report html --cov=chamber --ignore=tests_depreciated\ --pdb
+python -m pytest -k "unit" -x --cov-report html --cov=chamber --ignore=tests_depreciated\ --pdb
 echo Testing complete.


Improved winrm firewall rules

Improved winrm firewall rules

--- template/windows/floppy/install-winrm.bat
+++ template/windows/floppy/install-winrm.bat
@@ -6,9 +6,15 @@
 cmd /c winrm set winrm/config/service/auth @{Basic="true"}
 cmd /c winrm set winrm/config/listener?Address=*+Transport=HTTP @{Port="5985"}
 cmd /c netsh advfirewall firewall set rule group="remote administration" new enable=yes
-cmd /c netsh firewall add portopening TCP 5985 "Port 5985"
+cmd /c netsh advfirewall firewall add portopening TCP 5985 "Port 5985"
+powershell -NoProfile -ExecutionPolicy Bypass -Command "Set-NetFirewallRule -DisplayGroup 'Windows Remote Management' -Enabled True"
+netsh advfirewall firewall add rule name="Windows Remote Management (HTTP-In) for vagrant" description="Allow Windows Remote Management even on public networks for vagrant boxes" dir=in action=allow protocol=tcp localport=5985
+
 cmd /c net stop winrm
 cmd /c net start winrm
+cmd /c sc config "WinRM" start= auto

 cmd /c reg add "HKEY_CURRENT_USER\Control Panel\Desktop" /v ScreenSaveActive /t REG_SZ /d 0 /f
 cmd /c reg add "HKEY_CURRENT_USER\Control Panel\Desktop" /v ScreenSaveIsSecure /t REG_SZ /d 0 /f
+
+net accounts /MaxPWAge:unlimited


new script

new script

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

--- scripts/webapi-stop.bat
+++ scripts/webapi-stop.bat
@@ -0,0 +1,2 @@
+call activate cate
+python cate\webapi\main.py --port 9090 --caller cate-desktop stop


Add batch file for running Cppcheck, http://cppcheck.sourceforge.net/

error: pathspec 'tools/Windows/Cppcheck/RunCppcheck.bat' did not match any file(s) known to git

--- tools/Windows/Cppcheck/RunCppcheck.bat
+++ tools/Windows/Cppcheck/RunCppcheck.bat
@@ -0,0 +1,26 @@
+:: Assumes that Cppcheck is installed in the default location or accessible via PATH by default.
+:: The warning unusedFunction: 'The function 'funcName' is never used.' is suppressed because as an SDK,
+:: not all of the functions are not used by the library itself.
+:: TODO missingInclude warning suppressed for now until deps directory is configured to be included.
+
+@echo off
+
+set ORIG_PATH=%PATH%
+set PATH=%PATH%;C:\Program Files (x86)\Cppcheck
+
+call cppcheck --version
+IF ERRORLEVEL 1 GOTO NoCppcheck
+
+set SRC_DIR=../../../src/
+call cppcheck --template "{file}({line}): ({severity}) ({id}): {message}" -DTUNDRACORE_API= -I%SRC_DIR% ^
+    -rp=%SRC_DIR% --enable=all --suppress=unusedFunction --suppress=missingInclude %SRC_DIR%
+
+GOTO End
+
+:NoCppcheck
+echo Could not find the cppcheck executable! Please add it to system PATH and try again!
+
+:End
+set PATH=%ORIG_PATH%
+
+pause


NetBeans example adding

NetBeans example adding

git-svn-id: 294f12855175db510999321cff72188496f07bec@741 45c5ae6f-87cc-4fd0-92ee-e4f023fd80da

--- Release/Release_Source.bat
+++ Release/Release_Source.bat
@@ -82,6 +82,11 @@
 xcopy ..\Project\Java\*.sh MediaInfo_Lib_Source\Project\Java\ /S
 xcopy ..\Project\Java\*.java MediaInfo_Lib_Source\Project\Java\ /S
 xcopy ..\Project\Java\*.txt MediaInfo_Lib_Source\Project\Java\ /S
+xcopy ..\Project\NetBeans\Example\*.xml MediaInfo_Lib_Source\Project\NetBeans\Example\ /s
+xcopy ..\Project\NetBeans\Example\*.properties MediaInfo_Lib_Source\Project\NetBeans\Example\ /s
+xcopy ..\Project\NetBeans\Example\*.mf MediaInfo_Lib_Source\Project\NetBeans\Example\
+xcopy ..\Project\NetBeans\Example\*.txt MediaInfo_Lib_Source\Project\NetBeans\Example\
+xcopy ..\Project\NetBeans\Example\src\*.java MediaInfo_Lib_Source\Project\NetBeans\Example\src\

 @rem --- Copying : Release ---
 xcopy *.txt MediaInfo_Lib_Source\Release\


Delete minify.bat

Delete minify.bat

--- minify.bat
+++ minify.bat
@@ -1 +0,0 @@
-java -jar yuicompressor\yuicompressor-2.4.2.jar jQuery.WSlot.js -o jQuery.WSlot.min.js