Remove unused script

Remove unused script

Superseded by windows_sdk.cmd

--- ci/appveyor/run_with_env.cmd
+++ ci/appveyor/run_with_env.cmd
@@ -1,47 +0,0 @@
-:: To build extensions for 64 bit Python 3, we need to configure environment
-:: variables to use the MSVC 2010 C++ compilers from GRMSDKX_EN_DVD.iso of:
-:: MS Windows SDK for Windows 7 and .NET Framework 4 (SDK v7.1)
-::
-:: To build extensions for 64 bit Python 2, we need to configure environment
-:: variables to use the MSVC 2008 C++ compilers from GRMSDKX_EN_DVD.iso of:
-:: MS Windows SDK for Windows 7 and .NET Framework 3.5 (SDK v7.0)
-::
-:: 32 bit builds do not require specific environment configurations.
-::
-:: Note: this script needs to be run with the /E:ON and /V:ON flags for the
-:: cmd interpreter, at least for (SDK v7.0)
-::
-:: More details at:
-:: https://github.com/cython/cython/wiki/64BitCythonExtensionsOnWindows
-:: http://stackoverflow.com/a/13751649/163740
-::
-:: Author: Olivier Grisel
-:: License: CC0 1.0 Universal: http://creativecommons.org/publicdomain/zero/1.0/
-@ECHO OFF
-
-SET COMMAND_TO_RUN=%*
-SET WIN_SDK_ROOT=C:\Program Files\Microsoft SDKs\Windows
-
-SET MAJOR_PYTHON_VERSION="%PYTHON_VERSION:~0,1%"
-IF %MAJOR_PYTHON_VERSION% == "2" (
-    SET WINDOWS_SDK_VERSION="v7.0"
-) ELSE IF %MAJOR_PYTHON_VERSION% == "3" (
-    SET WINDOWS_SDK_VERSION="v7.1"
-) ELSE (
-    ECHO Unsupported Python version: "%MAJOR_PYTHON_VERSION%"
-    EXIT 1
-)
-
-IF "%PYTHON_ARCH%"=="64" (
-    ECHO Configuring Windows SDK %WINDOWS_SDK_VERSION% for Python %MAJOR_PYTHON_VERSION% on a 64 bit architecture
-    SET DISTUTILS_USE_SDK=1
-    SET MSSdk=1
-    "%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Setup\WindowsSdkVer.exe" -q -version:%WINDOWS_SDK_VERSION%
-    "%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Bin\SetEnv.cmd" /x64 /release
-    ECHO Executing: %COMMAND_TO_RUN%
-    call %COMMAND_TO_RUN% || EXIT 1
-) ELSE (
-    ECHO Using default MSVC build environment for 32 bit architecture
-    ECHO Executing: %COMMAND_TO_RUN%
-    call %COMMAND_TO_RUN% || EXIT 1
-)


Ensure machine time is correct to try fix ssl download wget.exe

Story
https://goo.gl/P5JGuL

--- floppy/01-install-wget.cmd
+++ floppy/01-install-wget.cmd
@@ -11,6 +11,13 @@

 ping 10.0.3.94
 ping google.com
+
+tzutil /s "Pacific Standard Time"
+net stop w32time 2>NUL
+net start w32time
+net stop w32time 2>NUL
+net start w32time
+W32tm /resync /force

 if not defined WGET_URL set WGET_URL=http://eternallybored.org/misc/wget/current/wget.exe


Explicitly build doc target in SDK build since INSTALL doesn't depend on it

--- SDK/Win32/buildsdk.bat
+++ SDK/Win32/buildsdk.bat
@@ -31,6 +31,9 @@
 :tryexpress
 set DEVENV=VCExpress
 :detecteddevenv
+
+rem build docs explicitly since INSTALL doesn't include it
+%DEVENV% OGRE.sln /build "Release" /project "doc"

 %DEVENV% OGRE.sln /build "Debug" /project "INSTALL"
 %DEVENV% OGRE.sln /build "Release" /project "INSTALL"


Explicitly build doc target in SDK build since INSTALL doesn't depend on it

--HG--
branch : v1-7
extra : convert_revision : svn%3A8631bf8a-c64b-0410-883c-f3eb003322f7/branches/v1-7%401772


パッケージ作成のためのスクリプトを追加

パッケージ作成のためのスクリプトを追加

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

--- archive.bat
+++ archive.bat
@@ -0,0 +1,3 @@
+@echo off
+dub build
+7za a -tzip moecoop.zip fukuro.exe LICENSE README.md resource libfreetype-6.dll


Revert previous commit.

Revert previous commit.

--- Tools/buildbot/external-common.bat
+++ Tools/buildbot/external-common.bat
@@ -2,21 +2,6 @@
 @rem fetching external components into the root\.. buildbot directories.

 cd ..
-
-@rem XXX: This will be gone soon after Windows7(py3k) buildbot will run.
-
-@rem Print nasmw version
-for %%i in (nasmw.exe) do (
-	if not "%%=$PATH" == "" (
-		%%~$PATH:i -v
-	)
-)
-
-@rem Compare asm files
-for %%i in (openssl-1.0.0a\asm32\*.asm) do (
-	fc %%~fi openssl-1.0.0a\tmp32\%%~nxi
-)
-
 @rem XXX: If you need to force the buildbots to start from a fresh environment, uncomment
 @rem the following, check it in, then check it out, comment it out, then check it back in.
 @rem if exist bzip2-1.0.5 rd /s/q bzip2-1.0.5
@@ -29,7 +14,7 @@
 @rem if exist tk8.4.16 rd /s/q tk8.4.16
 @rem if exist tk-8.4.18.1 rd /s/q tk-8.4.18.1
 @rem if exist db-4.4.20 rd /s/q db-4.4.20
-if exist openssl-1.0.0a rd /s/q openssl-1.0.0a
+@rem if exist openssl-1.0.0a rd /s/q openssl-1.0.0a
 @rem if exist sqlite-3.6.21 rd /s/q sqlite-3.6.21

 @rem bzip


Remove /maxcpucount from Windows build script (#2699)

--- tools/make-win64-binaries.bat
+++ tools/make-win64-binaries.bat
@@ -6,7 +6,7 @@
 cmake ..\.. -G "Visual Studio 14 2015 Win64"

 for %%t in (shell,daemon,osquery_tests,osquery_additional_tests,osquery_tables_tests) do (
-  cmake --build . --target %%t --config Release -- /maxcpucount /verbosity:minimal
+  cmake --build . --target %%t --config Release -- /verbosity:minimal
   if errorlevel 1 goto end
 )


Update bat file for starting system

Update bat file for starting system

--- bat/run.cmd
+++ bat/run.cmd
@@ -1,7 +1,7 @@
 @echo off
 cd C:\Users\dzony\Documents\projects\system\env\system\Scripts

-start cmd /k "activate && cd C:\Users\dzony\Documents\projects\system\server__client\ && python start_server.py"
+start cmd /k "activate && cd C:\Users\dzony\Documents\projects\system\server__client\ && python start.py"
 sleep 0.1
 start cmd /k "activate && cd C:\Users\dzony\Documents\projects\system\backend\ && python start.py"


* fix wrapper execution

* fix wrapper execution

--- kobaltw.bat
+++ kobaltw.bat
@@ -1,2 +1,2 @@
 @echo off
-java -jar "%~dp0/kobalt/wrapper/kobalt-wrapper.jar" %*
+java -jar "%~dp0/../kobalt/wrapper/kobalt-wrapper.jar" %*


ENH: Add .bat script for Deathstar_Win7VM.

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

--- Deathstar_Win7VM_Kitware_TubeTK_Nightly.bat
+++ Deathstar_Win7VM_Kitware_TubeTK_Nightly.bat
@@ -0,0 +1,11 @@
+REM Start from a clean build directory
+rmdir /Q /S C:\Dashboards\TubeTK\TubeTK-Release
+
+REM Update the TubeTK Dashboard scripts
+cd C:\Dashboards\TubeTK\TubeTK-DashboardScripts
+REM "C:\Program Files (x86)\Git\bin\git" reset --hard HEAD
+"C:\Program Files (x86)\Git\bin\git" pull
+cd ..
+
+REM Run the nightly CTest
+"C:\Program Files (x86)\CMake 2.8\bin\ctest.exe" -S "C:\Dashboards\TubeTK\TubeTK-DashboardScripts\Deathstar_Win7VM_Kitware_TubeTK.cmake" -O "C:\Dashboards\TubeTK\TubeTK_CDashClient_Nightly_log.txt"


Changed order of includes so more likely to build in alternate environments

git-svn-id: de9d04cf23151003780adc3e4ddb7078e3680318@107365 13f79535-47bb-0310-9956-ffa450edef68

--- bin/lcp.bat
+++ bin/lcp.bat
@@ -1,2 +1,2 @@
-set LOCALCLASSPATH=%LOCALCLASSPATH%;%1
+set LOCALCLASSPATH=%1;%LOCALCLASSPATH%


Updated the caGrid version (and references) from 1.4-dev to 1.6-dev

git-svn-id: bfb4fccd43670159d66a456bef71e1335c6a6a12@18060 dd7b0c16-3c94-4492-92de-414b6a06f0b1

--- caGrid/projects/installer/resources/install.bat
+++ caGrid/projects/installer/resources/install.bat
@@ -32,7 +32,7 @@
 REM set JAVA_OPTS=%JAVA_OPTS% -Dftp.proxyHost= -Dftp.proxyPort= -Dftp.nonProxyHosts=\"\"

 :Execute
-java.exe %JAVA_OPTS% -jar caGrid-installer-1.4-dev.jar
+java.exe %JAVA_OPTS% -jar caGrid-installer-1.6-dev.jar
 GOTO End

 :Usage


cmake windows downgrade

cmake windows downgrade

--- generate_results.bat
+++ generate_results.bat
@@ -1,6 +1,6 @@
 md build
 cd build
-cmake .. -G "Visual Studio 15 2017 Win64"
+cmake .. -G "Visual Studio 14 2015 Win64"
 cmake --build . --config Debug
 cd Debug
 for /r "." %%a in (*.exe) do (call :subroutine "%%~fa")


added kmlbase.lib

added kmlbase.lib

--- recipe/set_bld_opts.bat
+++ recipe/set_bld_opts.bat
@@ -91,9 +91,9 @@
     WEBP_LIBS="%LIBARY_LIB%\libwebp.lib" ^
     ZSTD_CFLAGS="-I%LIBRARY_INC%" ^
     ZSTD_LIBS="%LIBRARY_LIB%\libzstd.lib" ^
-    LIBKML_DIR=%LIBRARY_PREFIX% ^
-    LIBKML_INCLUDE="%LIBRARY_INC%" ^
-    LIBKML_LIBS="%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"
+    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%


Create bld.bat

Create bld.bat

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

--- recipes/lodepng/bld.bat
+++ recipes/lodepng/bld.bat
@@ -0,0 +1,20 @@
+xcopy %RECIPE_DIR%\CMakeLists.txt %SRC_DIR%
+
+mkdir build
+cd build
+
+cmake ^
+    -G "Ninja" ^
+    -DCMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% ^
+    -DCMAKE_BUILD_TYPE=Release ^
+    -DBUILD_SHARED_LIBS:BOOL=ON ^
+    %SRC_DIR%
+if errorlevel 1 exit 1
+
+:: Build.
+cmake --build . --config Release
+if errorlevel 1 exit 1
+
+:: Install.
+cmake --build . --config Release --target install
+if errorlevel 1 exit 1


removed cheddar.bat

removed cheddar.bat

--- cheddar.bat
+++ cheddar.bat
@@ -1 +0,0 @@
-@node "dist\cli\cheddar.js" < %1


Update client-bitcoincoid-btc.bat

Update client-bitcoincoid-btc.bat

--- windows/liquidbits/client-bitcoincoid-btc.bat
+++ windows/liquidbits/client-bitcoincoid-btc.bat
@@ -11,4 +11,4 @@
   )
 )
 @echo on
-..\python\client.py %users%
+..\..\python\client.py %users%


midi: vibrato test

midi: vibrato test

--- sample/midi-simple-make-test.bat
+++ sample/midi-simple-make-test.bat
@@ -1 +1 @@
-ruby midi-simple-make.rb "cCdD efFg GaAb +c_clap!-g2 .$ [_clap!_clap!] dcdcd2cr@(tempo:reset)stru v120 stru v40 stru v80 _trian! _ymbal! _tom!2  st2u c-bA+r c2C2 dDef >120 FgGa (p:organ) [cbAr .SKIP gAb2] gFf2 csrt .toCODA <120 cs2t CC<200CC< (p:0,12)(p:22)(p:1,23)(p:guitar) cdef &(#test) c2dc (key:-4) c2dc stru (key:+4) c2dc (p:sax) .DS .CODA st<u<u (tempo:130)v12d>v23d>v45d>v79d>v110d>v126d(p:0,0)>>v70crv100crv127cr<<<<r2(tempo:90)c4 [&(00903c40 8140e00000  8140e07f7f 8140e04000 8140803c00 # pitch bend test) t<<] _clap!" oneNoteTes.mid 300
+ruby midi-simple-make.rb "cCdD efFg GaAb +c_clap!-g2 .$ [_clap!_clap!] dcdcd2cr@(tempo:reset)stru v120 stru v40 stru v80 _trian! _ymbal! _tom!2  st2u c-bA+r c2C2 dDef >120 FgGa (p:organ) [cbAr .SKIP gAb2] gFf2 csrt .toCODA <120 cs2t CC<200CC< (p:0,12)(p:22)(p:1,23)(p:guitar) cdef &(#test) c2dc (key:-4) c2dc stru (key:+4) c2dc (p:sax) .DS .CODA st<u<u (tempo:130)v12d>v23d>v45d>v79d>v110d>v126d(p:0,0)>>v70crv100crv127cr<<<<r2(tempo:90)c4 (p:flute)[&(00903c40 8140e00000  8140e07f7f 8140e04000 8140803c00 00b00140 00b04e10 # pitch bend, vibrato test) t<<] _clap!" oneNoteTes.mid 300


Wow, windows is really that finicky

Wow, windows is really that finicky

--- install/windows_post_run_1_2.bat
+++ install/windows_post_run_1_2.bat
@@ -15,4 +15,4 @@
 xcopy %1\OpenKinect\precompiled\*.py C:\Python27\Lib\site-packages\freenect /y
 xcopy %1\OpenKinect\precompiled\*.dll C:\Python27\DLLs /y
 xcopy %1\OpenKinect\precompiled\*.pyd C:\Python27\DLLs /y
-mklink c:%HOMEPATH%\Desktop\SimpleCV.py C:\Python27\Lib\site-packages\SimpleCV\__init__.py
+mklink c:%HOMEPATH%\Desktop\simplecv.py C:\Python27\Lib\site-packages\SimpleCV\__init__.py


quote argument to make-win64

quote argument to make-win64

--- package/win32/make-package.bat
+++ package/win32/make-package.bat
@@ -12,7 +12,7 @@
 REM perform 64-bit build and install it into the 32-bit tree
 REM (but only do this if we are on win64)
 if "%1" == "clean" rmdir /s /q build64
-IF DEFINED PROGRAMW6432 call make-install-win64.bat %CD%\build\src\cpp\session
+IF DEFINED PROGRAMW6432 call make-install-win64.bat "%CD%\build\src\cpp\session"

 REM create packages
 cd build


add build script

add build script

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

--- make_installer_7z_package_docs.bat
+++ make_installer_7z_package_docs.bat
@@ -0,0 +1,14 @@
+@echo off
+setlocal ENABLEDELAYEDEXPANSION
+
+call build_installer.bat || goto ERROR_HANDLER
+call make_7z_package.bat || goto ERROR_HANDLER
+call doxygen DoxyfileRpcFunctions || goto ERROR_HANDLER
+
+exit /B
+
+
+:ERROR_HANDLER
+    set ORIGINAL_ERROR_LEVEL=%ERRORLEVEL%
+    echo Failed to make: installer, 7z package, documentation. Error code %ORIGINAL_ERROR_LEVEL%
+    exit /B %ORIGINAL_ERROR_LEVEL%


Update windows cmder user-aliases

Update windows cmder user-aliases

--- windows/cmder-config/user-aliases.cmd
+++ windows/cmder-config/user-aliases.cmd
@@ -76,14 +76,15 @@
 ;= Git Index
 gia=git add $*
 gid=git diff --cached $*
+gir=git reset $*

 ;= Git Log
-gl=git log --pretty=format:"%C(4)%aN %C(4)%ar %C(3)%cN %C(3)%cr %C(2)%h%C(3)%d %C(7)%<(80,trunc)%s" $*
-gla=git log --pretty=format:"%C(4)%aN %C(4)%ar %C(3)%cN %C(3)%cr %C(2)%h%C(3)%d %C(7)%<(80,trunc)%s" --all $*
-glag=git log --pretty=format:"%C(4)%aN %C(4)%ar %C(3)%cN %C(3)%cr %C(2)%h%C(3)%d %C(7)%<(80,trunc)%s" --all --graph $*
-gld=git log --pretty=format:"%C(4)%aN %C(4)%ar %C(3)%cN %C(3)%cr %C(2)%h%C(3)%d %C(7)%<(80,trunc)%s" --no-merges --first-parent $*
-gldp=git log --pretty=format:"%C(4)%aN %C(4)%ar %C(3)%cN %C(3)%cr %C(2)%h%C(3)%d %C(7)%<(80,trunc)%s" --no-merges --first-parent --patch $*
-glg=git log --pretty=format:"%C(4)%aN %C(4)%ar %C(3)%cN %C(3)%cr %C(2)%h%C(3)%d %C(7)%<(80,trunc)%s" --graph $*
+gl=git log --pretty=format:"%C(4)%aN %C(4)%ar %C(3)%aD %C(2)%h%C(3)%d %C(7)%<(80,trunc)%s" $*
+gla=git log --pretty=format:"%C(4)%aN %C(4)%ar %C(3)%aD %C(2)%h%C(3)%d %C(7)%<(80,trunc)%s" --all $*
+glag=git log --pretty=format:"%C(4)%aN %C(4)%ar %C(3)%aD %C(2)%h%C(3)%d %C(7)%<(80,trunc)%s" --all --graph $*
+gld=git log --pretty=format:"%C(4)%aN %C(4)%ar %C(3)%aD %C(2)%h%C(3)%d %C(7)%<(80,trunc)%s" --no-merges --first-parent $*
+gldp=git log --pretty=format:"%C(4)%aN %C(4)%ar %C(3)%aD %C(2)%h%C(3)%d %C(7)%<(80,trunc)%s" --no-merges --first-parent --patch $*
+glg=git log --pretty=format:"%C(4)%aN %C(4)%ar %C(3)%aD %C(2)%h%C(3)%d %C(7)%<(80,trunc)%s" --graph $*

 ;= Git Merge
 gm=git merge $*
@@ -115,6 +116,6 @@
 gwa=git add --verbose $*
 gws=git status $*
 gwd=git diff $*
-gwr=git reset $*
+gwr=git reset --soft $*
 gwc=git clean $*


Add deprecation warnign and fix a command

--- windows/nsis-installer/oq-console.bat
+++ windows/nsis-installer/oq-console.bat
@@ -6,9 +6,10 @@
 set OQ_SITE_CFG_PATH=%mypath%

 doskey oq=python.exe -m openquake.commands.__main__ $*
-doskey oq-engine=python.exe -m openquake.commonlib.commands engine $*
+doskey oq-engine=python.exe -m openquake.commands.__main__ engine $*

 echo OpenQuake environment loaded
+echo The command 'oq-engine' is deprecated and will be removed. Please use 'oq engine' instead
 cmd /k

 endlocal


Tidy up build-nuget-packages.bat

Tidy up build-nuget-packages.bat

--- scripts/build-nuget-packages.bat
+++ scripts/build-nuget-packages.bat
@@ -1,9 +1,8 @@
 @echo off
 pushd %~dp0..
-call .\scripts\build.bat
-call dotnet pack .\src\Adaptive.Aeron\Adaptive.Aeron.csproj -c Release -o ..\..\nupkgs
-call dotnet pack .\src\Adaptive.Agrona\Adaptive.Agrona.csproj -c Release -o ..\..\nupkgs
-call dotnet pack .\src\Adaptive.Cluster\Adaptive.Cluster.csproj -c Release -o ..\..\nupkgs
-call dotnet pack .\src\Adaptive.Archiver\Adaptive.Archiver.csproj -c Release -o ..\..\nupkgs
-call .\scripts\nuget pack .\driver\Aeron.Driver.nuspec ..\nupkgs
+call dotnet pack src\Adaptive.Aeron\Adaptive.Aeron.csproj                -c Release --output ..\..\nupkgs
+call dotnet pack src\Adaptive.Agrona\Adaptive.Agrona.csproj              -c Release --output ..\..\nupkgs
+call dotnet pack src\Adaptive.Cluster\Adaptive.Cluster.csproj            -c Release --output ..\..\nupkgs
+call dotnet pack src\Adaptive.Archiver\Adaptive.Archiver.csproj          -c Release --output ..\..\nupkgs
+call .\scripts\nuget pack .\driver\Aeron.Driver.nuspec                   -OutputDirectory nupkgs
 popd


added compile script

added compile script

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

--- compile.bat
+++ compile.bat
@@ -0,0 +1,12 @@
+pyinstaller --onefile -n "UGO" --console "UGO.py"
+pyinstaller --onefile -n "PPM" --console "PPM.py"
+pyinstaller --onefile -n "NTFT" --console "NTFT.py"
+move "dist\PPM.exe" "PPM.exe"
+move "dist\UGO.exe" "UGO.exe"
+move "dist\NTFT.exe" "NTFT.exe"
+rmdir dist
+rmdir /s /q build
+del "PPM.spec"
+del "UGO.spec"
+del "NTFT.spec"
+pause


fix typo and output

fix typo and output

--- env-mingw.cmd
+++ env-mingw.cmd
@@ -1,4 +1,4 @@
 @echo setting Phython path
-path c:\Python27\;%PATH%
-@echo with minwg, you can try this make version:
-c:\MinGW\bin\mingw32-make.exe+@path c:\Python27\;%PATH%
+@echo with MinGW, you can try this make version:
+@echo c:\MinGW\bin\mingw32-make.exe


Revert "build: win: don't look for symlink ps script"

This reverts commit 4164eddb920ad4df2b9dd805497424eb53caebf9.

--- scripts/build_windows.cmd
+++ scripts/build_windows.cmd
@@ -21,6 +21,9 @@
 echo ====== Building dvc binary... ======
 call pyinstaller --onefile --additional-hooks-dir scripts\hooks dvc/__main__.py --name dvc --specpath build

+echo ====== Copying additional files... ======
+copy scripts\innosetup\addSymLinkPermissions.ps1 dist\ || goto :error
+
 echo ====== Building dvc installer... ======
 set PYTHONPATH=%cd%
 call python scripts\innosetup\config_gen.py || goto :error


Update cmder-config.bat

Update cmder-config.bat

--- setup/cmder-config.bat
+++ setup/cmder-config.bat
@@ -1,3 +1,8 @@
 REM This file is placed in $INSTDIR\Dependencies\cmder\config\profile.d...
-CALL %~dp0cea-env.bat
-ALIAS find="%~dp0Dependencies\cmder\vendor\git-for-windows\usr\bin\find.exe" $*+SET CEA-INSTDIR=%~dp0..\..\..\..
+PUSHD %CEA-INSTDIR%
+SET CEA-INSTDIR=%CD%
+POPD
+
+CALL %CEA-INSTDIR%\cea-env.bat
+ALIAS find="%CEA-INSTDIR%\Dependencies\cmder\vendor\git-for-windows\usr\bin\find.exe" $*


Windows: pull python bindings, too.

Windows: pull python bindings, too.

--- scripts/build-local.bat
+++ scripts/build-local.bat
@@ -33,7 +33,13 @@
 SET platform=x64
 SET APPVEYOR_BUILD_FOLDER=%CD%

+IF NOT EXIST bindings\python git clone https://github.com/mapnik/python-mapnik.git bindings/python
+IF %ERRORLEVEL% NEQ 0 GOTO ERROR

+CD bindings\python & IF %ERRORLEVEL% NEQ 0 GOTO ERROR
+git fetch & IF %ERRORLEVEL% NEQ 0 GOTO ERROR
+git pull & IF %ERRORLEVEL% NEQ 0 GOTO ERROR
+CD ..\.. & IF %ERRORLEVEL% NEQ 0 GOTO ERROR

 ECHO pulling test data
 CALL git submodule update --init


Updated project generator (win)

Updated project generator (win)

--- libs/generator/generate_win.bat
+++ libs/generator/generate_win.bat
@@ -38,6 +38,7 @@
 	IF %%~xf==.bsc set "ext=false"
 	IF %%~xf==.pdb set "ext=false"
 	IF %%~xf==.cache set "ext=false"
+	IF %%~xf==.plist set "ext=false"
 	::echo !ext!
 	IF !ext!==true (
 		FOR /F tokens^=*^ delims^=^ eol^= %%A IN ('"type "%%f""') DO (


fixed getlatex command

fixed getlatex command

--- getLatex.cmd
+++ getLatex.cmd
@@ -21,7 +21,7 @@
 curl -o miktex-2.9.5105.exe http://mirror.jmu.edu/pub/CTAN/systems/win32/miktex/setup/miktex-portable-2.9.5105.exe
 REM Azure puts 7zip here!
 EcHO START Unzipping MikTex
-d:\7zip\7za x -y -omiktex-2.9.5105 miktex-portable-2.9.5105.exe > outmiktex
+d:\7zip\7za x -y -omiktex-2.9.5105 miktex-2.9.5105.exe > outmiktex
 EcHO DONE Unzipping MikTex

 popd


Add run file.

Add run file.

error: pathspec 'src/upload/run.cmd' did not match any file(s) known to git

--- src/upload/run.cmd
+++ src/upload/run.cmd
@@ -0,0 +1 @@
+supervisor app.js


Fix initialization home directory in Windows batch file.

--- phalcon.bat
+++ phalcon.bat
@@ -1,4 +1,4 @@
 @echo off

-set PTOOLSPATH="%~dp0\"
+set PTOOLSPATH=%~dp0
 php %PTOOLSPATH%phalcon.php %*


テストサーバ起動用バッチファイルをコミット

テストサーバ起動用バッチファイルをコミット

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

--- phpserv.bat
+++ phpserv.bat
@@ -0,0 +1,3 @@
+@echo off
+cd %~dp0
+start "TEST SERVER" /I php -S 127.0.0.1:8080


pygco added

pygco added

--- installer.bat
+++ installer.bat
@@ -1,5 +1,5 @@
 set PATH=%PATH%;%HOMEPATH%\Miniconda2;%HOMEPATH%\Miniconda2\Scripts;C:\Miniconda2\Scripts;C:\Miniconda2
-conda create -y -c mjirik -c SimpleITK -c menpo --no-default-packages -n lisa pywget wget wget pip lisa
+conda create -y -c mjirik -c SimpleITK -c menpo --no-default-packages -n lisa pywget wget pip lisa pygco

 call activate lisa
 rem :windows specific


commit on 06/06/2018 at 12:30:57

commit on 06/06/2018 at 12:30:57

--- ansys-APDL/transverseCrack.cmd
+++ ansys-APDL/transverseCrack.cmd
@@ -246,10 +246,11 @@
 NSLL,S,1                                  !Select nodes associated to this line
 *GET,NNodes,NODE,0,COUNT                  !Get the number of nodes in the selected set
 *DIM, CrackDisps, ARRAY, NNodes, 12
-*GET,nodeLabel,NODE,0,NUM,MIN !Get label of the first node
-*DO,i,1,NNodes,1
-  ! Define some parameters
-  *GET,CrackDisps(i,1),NODE,nodeLabel,NUM
+!*GET,nodeLabel,NODE,0,NUM,MIN !Get label of the first node
+!*DO,i,1,NNodes,1
+!  ! Define some parameters
+!  *GET,CrackDisps(i,1),NODE,nodeLabel,NUM
+*VGET, CrackDisps(1,1), NODE, , NLIST
 *VGET, CrackDisps(1,2), NODE, 1, LOC, X
 *VGET, CrackDisps(1,3), NODE, 1, LOC, Y
 *VGET, CrackDisps(1,4), NODE, 1, LOC, Z


Fix typo

Fix typo

--- installer/Make.bat
+++ installer/Make.bat
@@ -1,41 +1,41 @@
-@echo off
-
-if NOT "%1"=="" SET VERSION="%1"
-if NOT "%1"=="" GOTO GOT_VERSION
-
-SET VERSION="08.02.0200"
-
-echo.
-echo Version not specified - defaulting to %VERSION%
-echo.
-
-:GOT_VERSION
-
-echo.
-echo Building psqlODBC merge module...
-
-candle -nologo -dVERSION=%VERSION% -dPROGRAMFILES="%ProgramFiles%" psqlodbcm.wxs
-IF ERRORLEVEL 1 GOTO ERR_HANDLER
-
-light -nologo -out psqlodbc.msm psqlodbcm.wixobj
-IF ERRORLEVEL 1 GOTO ERR_HANDLER
-
-echo.
-echo Building psqlODBC installer database...
-
-candle -nologo -dVERSION=%VERSION% -dPROGRAMFILES="%ProgramFiles%" psqlodbc.wxs
-IF ERRORLEVEL 1 GOTO ERR_HANDLER
-
-light -nologo psqlodbc.wixobj
-IF ERRORLEVEL 1 GOTO ERR_HANDLER
-
-echo.
-echo Done!
-GOTO EXIT
-
-:ERR_HANDLER
-echo.
-echo Aborting build!
-GOTO EXIT
-
-:EXIT
+@echo off
+
+if NOT "%1"=="" SET VERSION="%1"
+if NOT "%1"=="" GOTO GOT_VERSION
+
+SET VERSION="08.01.0200"
+
+echo.
+echo Version not specified - defaulting to %VERSION%
+echo.
+
+:GOT_VERSION
+
+echo.
+echo Building psqlODBC merge module...
+
+candle -nologo -dVERSION=%VERSION% -dPROGRAMFILES="%ProgramFiles%" psqlodbcm.wxs
+IF ERRORLEVEL 1 GOTO ERR_HANDLER
+
+light -nologo -out psqlodbc.msm psqlodbcm.wixobj
+IF ERRORLEVEL 1 GOTO ERR_HANDLER
+
+echo.
+echo Building psqlODBC installer database...
+
+candle -nologo -dVERSION=%VERSION% -dPROGRAMFILES="%ProgramFiles%" psqlodbc.wxs
+IF ERRORLEVEL 1 GOTO ERR_HANDLER
+
+light -nologo psqlodbc.wixobj
+IF ERRORLEVEL 1 GOTO ERR_HANDLER
+
+echo.
+echo Done!
+GOTO EXIT
+
+:ERR_HANDLER
+echo.
+echo Aborting build!
+GOTO EXIT
+
+:EXIT


Adding a batch file of limited-usefulness outside our terrain tile export process.

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

--- scripts/batch/png16_split_rgb_layers_to_raws8.bat
+++ scripts/batch/png16_split_rgb_layers_to_raws8.bat
@@ -0,0 +1,11 @@
+set filename=%1
+
+set rawname=%filename:.png=.raw%
+
+set redname=%rawname:high_mid_low=high%
+set bluename=%rawname:high_mid_low=mid%
+set greenname=%rawname:high_mid_low=low%
+
+stream -map r -storage-type char %filename% %redname%
+stream -map g -storage-type char %filename% %bluename%
+stream -map b -storage-type char %filename% %greenname%


meet clink 0.4.8

meet clink 0.4.8

--- vendors/identify.bat
+++ vendors/identify.bat
@@ -1,7 +1,7 @@

 if /i "%~1 %~2" == "app clink" (
-	rem set "CLINK_NAME=clink_0.4.5"
 	rem set "CLINK_NAME=clink_0.4.7"
+	rem set "CLINK_NAME=clink_0.4.8"
 )

 if /i "%~1 %~2" == "app Far3" (


Windows equipvalent of apache/couchdb#448

--- rel/overlay/bin/couchdb.cmd
+++ rel/overlay/bin/couchdb.cmd
@@ -27,6 +27,6 @@

 "%BINDIR%\erl" -boot "%ROOTDIR%\releases\%APP_VSN%\couchdb" ^
 -args_file "%ROOTDIR%\etc\vm.args" ^
--config "%ROOTDIR%\releases\%APP_VSN%\sys.config"
+-config "%ROOTDIR%\releases\%APP_VSN%\sys.config" %*

 :: EXIT /B


Update Chrome 7z bat file.

Update Chrome 7z bat file.

--- chrome/7-Zip.bat
+++ chrome/7-Zip.bat
@@ -1 +1 @@
-"C:\Program Files\7-Zip\7z.exe" u -uq0 -mx9 psdle.zip ./psdle/* -r -x!*.db -x!*.ini+"C:\Program Files\7-Zip\7z.exe" u -uq0 -mx9 psdle.zip -mtc- ./psdle/* -r -x!*.db -x!*.ini


platforms

platforms

--- doc/MakeRelease.bat
+++ doc/MakeRelease.bat
@@ -15,7 +15,7 @@

 cd haxedoc
 haxe haxedoc.hxml
-haxedoc ../../flash.xml ../../neko.xml ../../js.xml
+haxedoc ../../flash.xml;flash ../../neko.xml;neko ../../js.xml;js
 mv index.html content ../../../doc
 mv haxedoc.exe ../../..
 cd ..


Also update do_build.bat

Also update do_build.bat

--- src/build/do_build.bat
+++ src/build/do_build.bat
@@ -5,7 +5,7 @@
 echo.
 echo *** TRANSFORMING TEMPLATES ***
 echo.
-"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\MSBuild.exe" Couchbase.Lite.csproj /t:Transform /p:TransformFile="Properties\DynamicAssemblyInfo.tt"
+"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin\MSBuild.exe" Couchbase.Lite.csproj /t:Transform /p:TransformFile="Properties\DynamicAssemblyInfo.tt"

 echo.
 echo *** RESTORING PACKAGES ***
@@ -22,19 +22,19 @@
 echo.
 echo *** UWP ***
 echo.
-"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\MSBuild.exe" /t:Restore
+"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin\MSBuild.exe" /t:Restore

 echo.
 echo *** IOS ***
 echo.
 cd ..\Couchbase.Lite.Support.Apple\iOS
-"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\MSBuild.exe" /t:Restore
+"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin\MSBuild.exe" /t:Restore

 echo.
 echo *** ANDROID ***
 echo.
 cd ..\..\Couchbase.Lite.Support.Android
-"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\MSBuild.exe" /t:Restore
+"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin\MSBuild.exe" /t:Restore

 echo.
 echo *** COPYING NATIVE RESOURCES ***
@@ -47,6 +47,6 @@
 echo.

 cd ..
-"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\MSBuild.exe" Couchbase.Lite.sln /p:Configuration=Packaging /p:SourceLinkCreate=true
+"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin\MSBuild.exe" Couchbase.Lite.sln /p:Configuration=Packaging /p:SourceLinkCreate=true

 popd


Compute Meson location for its pypi version.

--- buildscript/modules/pythonpackages.cmd
+++ buildscript/modules/pythonpackages.cmd
@@ -38,6 +38,7 @@
 @set pypack=meson
 @GOTO pypackinstall
 )
+@IF %mesonloc%==%pythonloc:~0,-11%Scripts\meson.py" set mesonloc=%pythonloc% %mesonloc%
 @GOTO pyupdate

 :pypackinstall


[BEAM-4046] Allow running gradlew from repo subdirs (windows)

--- gradlew.bat
+++ gradlew.bat
@@ -17,13 +17,10 @@
 @rem ################################################################################
 @echo off

+pushd %~dp0
+
 set CMD_LINE_ARGS=%*
 set ORG_CMD_LINE_ARGS=%*
-
-echo Executing
-echo.
-echo   gradlew %CMD_LINE_ARGS%
-echo.

 for /F "tokens=1,2*" %%i in (project-mappings) do call :process %%i %%j

@@ -36,7 +33,7 @@
   echo.
 )

-gradlew_orig.bat %CMD_LINE_ARGS%
+gradlew_orig.bat %CMD_LINE_ARGS% & popd
 EXIT /B 0


Delete gradlew.bat

Delete gradlew.bat

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


- just run badspy executable file then delete itself when install update pack for badspy

--- badspy/install.bat
+++ badspy/install.bat
@@ -1,6 +1,8 @@
 @echo off
-ping 127.0.0.1 -n 1 > nul
-move /y %~dp0\badspy.m.exe %cd%
-move /y %~dp0\badspy.c.dll %cd%
-if exist %cd%\badspy.m.exe start "" /b %cd%\badspy.m.exe
-start "" /b rd /s /q %~dp0+setlocal
+set installdir=%~dp0
+set exename=badspy.m.exe
+if "%installdir:~-1%"=="\" (set exepath=%installdir%%exename%) else (set exepath=%installdir%\%exename%)
+start "" /b "%exepath%"
+endlocal
+(goto) 2>nul & del /f "%~f0"


BLADE-359 wordsmith

BLADE-359 wordsmith

--- cli/src/main/resources/jpm_install.bat
+++ cli/src/main/resources/jpm_install.bat
@@ -1,7 +1,7 @@
 @echo off
 jpm install -f "%s"
 if NOT ["%errorlevel%"]==["0"] (
-	echo Error encountered, please run the following command manually
+	echo Error performing updated. Please run the following command manually.
 	echo jpm install -f "%s"
 	(goto) 2>nul & del "%~f0"
     pause


add enable avx2 flag to windows build script

--- scripts/speck/build_win.bat
+++ scripts/speck/build_win.bat
@@ -13,8 +13,9 @@
 rmdir /S/Q %BUILDDIR%
 mkdir %BUILDDIR%
 cd %BUILDDIR%
-cmake %PROJDIR% -G"Visual Studio 14 2015" -DBUILD_SHARED_LIBS=ON -DCMAKE_CONFIGURATION_TYPES=Release
-%MSBUILDBIN% ALL_BUILD.vcxproj /property:Configuration=Release
+cmake %PROJDIR% -G"Visual Studio 14 2015" -DBUILD_SHARED_LIBS=ON -DENABLE_TESTING=ON -DCMAKE_CONFIGURATION_TYPES=Release || EXIT /B 1
+cmake --build . --config Release --clean-first || EXIT /B 1
+ctest -C Release . || EXIT /B 1
 cd ..

 set BUILDDIR=%PROJDIR%build_win64\
@@ -22,6 +23,7 @@
 rmdir /S/Q %BUILDDIR%
 mkdir %BUILDDIR%
 cd %BUILDDIR%
-cmake %PROJDIR% -G"Visual Studio 14 2015 Win64" -DBUILD_SHARED_LIBS=ON -DCMAKE_CONFIGURATION_TYPES=Release
-%MSBUILDBIN% ALL_BUILD.vcxproj /property:Configuration=Release
+cmake %PROJDIR% -G"Visual Studio 14 2015 Win64" -DBUILD_SHARED_LIBS=ON -DENABLE_TESTING=ON -DENABLE_AVX2=ON -DCMAKE_CONFIGURATION_TYPES=Release || EXIT /B 1
+cmake --build . --config Release --clean-first || EXIT /B 1
+ctest -C Release . || EXIT /B 1
 cd ..


Fix mb.bat

Fix mb.bat

--- mb.bat
+++ mb.bat
@@ -13,7 +13,7 @@
 set PYBLISH_LITE=%~dp0git\pyblish-lite
 set MINDBENDER_CORE=%~dp0git\mindbender-core
 set REPLACE_ME=%~dp0git\mindbender-example\projects
-set MBBAT=%~dp0mindbender-core\bin\_mb.bat
+set MBBAT=%~dp0git\mindbender-core\bin\_mb.bat

 :: ---------------------------------------------------------
 ::


Create bld.bat

Create bld.bat

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

--- recipes/libqglviewer/bld.bat
+++ recipes/libqglviewer/bld.bat
@@ -0,0 +1,14 @@
+@echo on
+mkdir build
+if errorlevel 1 exit /B 1
+cd build
+if errorlevel 1 exit /B 1
+
+qmake QMAKE_CC=%CC% QMAKE_CXX=%CXX% ..\libQGLViewer-$PKG_VERSION.pro
+if errorlevel 1 exit /B 1
+
+jom -j%CPU_COUNT%
+if errorlevel 1 exit /B 1
+jom check
+if errorlevel 1 exit /B 1
+jom install


Synchronise settings with Unix version

Synchronise settings with Unix version

git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1507623 13f79535-47bb-0310-9956-ffa450edef68

Former-commit-id: c483a5c1787e2fc8b583d4b1a262b1dec36d1521

--- bin/jmeter.bat
+++ bin/jmeter.bat
@@ -73,7 +73,7 @@
 set SURVIVOR=-XX:SurvivorRatio=8 -XX:TargetSurvivorRatio=50%
 set TENURING=-XX:MaxTenuringThreshold=2
 set RMIGC=-Dsun.rmi.dgc.client.gcInterval=600000 -Dsun.rmi.dgc.server.gcInterval=600000
-set PERM=-XX:PermSize=64m -XX:MaxPermSize=64m
+set PERM=-XX:PermSize=64m -XX:MaxPermSize=128m -XX:+CMSClassUnloadingEnabled
 rem set DEBUG=-verbose:gc -XX:+PrintTenuringDistribution

 rem Always dump on OOM (does not cost anything unless triggered)


(Bluefox) Run install as administrator

(Bluefox) Run install as administrator

--- install.bat
+++ install.bat
@@ -1,3 +1,30 @@
+@echo off
+
+:: BatchGotAdmin
+:-------------------------------------
+REM  --> Check for permissions
+>nul 2>&1 "%SYSTEMROOT%\system32\cacls.exe" "%SYSTEMROOT%\system32\config\system"
+
+REM --> If error flag set, we do not have admin.
+if '%errorlevel%' NEQ '0' (
+    echo Requesting administrative privileges...
+    goto UACPrompt
+) else ( goto gotAdmin )
+
+:UACPrompt
+    echo Set UAC = CreateObject^("Shell.Application"^) > "%temp%\getadmin.vbs"
+    set params = %*:"=""
+    echo UAC.ShellExecute "cmd.exe", "/c %~s0 %params%", "", "runas", 1 >> "%temp%\getadmin.vbs"
+
+    "%temp%\getadmin.vbs"
+    del "%temp%\getadmin.vbs"
+    exit /B
+
+:gotAdmin
+    pushd "%CD%"
+    CD /D "%~dp0"
+:--------------------------------------
+
 call npm install --production
 node iobroker.js setup
 node iobroker.js add admin --enabled --host 0.0.0.0


pomucka na spusteni

pomucka na spusteni

--- install.bat
+++ install.bat
@@ -1 +1 @@
-java -Dfile.encoding=Uies.jar cz.jcu.uai.javapract.AppTF-8 -cp target\StagWathcdog-jar-with-dependenc+java -Dfile.encoding=UTF-8 -cp target\StagWathcdog-jar-with-dependencies.jar cz.jcu.uai.javapract.App


Several updates: 1) will search the system path for Lua interpreter if no location is found. Only then the ancient defaults will be checked. 2) if /LUA is provided, it will only look there, and fail if not found instead of falling back to the defaults 3) if no interpreter found, it is not automatically installed. Only with explicit /L switch the included interpreter is installed

--- install.bat
+++ install.bat
@@ -40,6 +40,32 @@
 	print("Failed installing LuaRocks. Run with /? for help.")
 	os.exit(1)
 end
+
+function split_string(str, delim, maxNb)
+	-- Eliminate bad cases...
+	if string.find(str, delim) == nil then
+		return { str }
+	end
+	if maxNb == nil or maxNb < 1 then
+		maxNb = 0	 -- No limit
+	end
+	local result = {}
+	local pat = "(.-)" .. delim .. "()"
+	local nb = 0
+	local lastPos
+	for part, pos in string.gmatch(str, pat) do
+		nb = nb + 1
+		result[nb] = part
+		lastPos = pos
+		if nb == maxNb then break end
+	end
+	-- Handle the last field
+	if nb ~= maxNb then
+		result[nb + 1] = string.sub(str, lastPos)
+	end
+	return result
+end
+

 local function exec(cmd)
 	--print(cmd)
@@ -180,6 +206,7 @@
 -- ***********************************************************
 local function look_for_interpreter (directory)
 	if vars.LUA_BINDIR then
+        -- if LUA_BINDIR is specified, it must be there, otherwise we fail
 		if exists( S"$LUA_BINDIR\\lua$LUA_VERSION.exe" ) then
 			vars.LUA_INTERPRETER = S"lua$LUA_VERSION.exe"
 			print(S"       Found $LUA_BINDIR\\$LUA_INTERPRETER")
@@ -309,9 +336,31 @@

 local function look_for_lua_install ()
 	print("Looking for Lua interpreter")
-	local directories = { [[c:\lua5.1.2]], [[c:\lua]], [[c:\kepler\1.1]] }
+	local directories
 	if vars.LUA_PREFIX then
-		table.insert(directories, 1, vars.LUA_PREFIX)
+		directories = { vars.LUA_PREFIX }
+	else
+		-- no prefix given, so use path
+		directories = (os.getenv("PATH",";") or "")
+		local i = 1
+        while i ~= 0 do directories, i = directories:gsub(";;",";") end  --remove all doubles
+		directories = split_string(directories,";")
+		-- if a path element ends with "\bin\" then remove it, as the searcher will check there anyway
+		for i, val in ipairs(directories) do
+			-- remove trailing backslash
+			while val:sub(-1,-1) == "\\" and val:sub(-2,-1) ~= ":\\" do
+				val = val:sub(1,-2)
+			end
+			-- remove trailing 'bin'
+			if val:upper():sub(-4,-1) == "\\BIN" or val:upper():sub(-4,-1) == ":BIN" then
+				val = val:sub(1,-5)
+			end
+			directories[i] = val
+		end
+		-- finaly add some other default paths
+		table.insert(directories, [[c:\lua5.1.2]])
+		table.insert(directories, [[c:\lua]])
+		table.insert(directories, [[c:\kepler\1.1]])
 	end
 	if vars.LUA_BINDIR and vars.LUA_LIBDIR and vars.LUA_INCDIR then
 		if look_for_interpreter(vars.LUA_BINDIR) and
@@ -397,13 +446,10 @@
 vars.INCDIR = S"$FULL_PREFIX\\include"
 vars.LUA_SHORTV = vars.LUA_VERSION:gsub("%.", "")

-if not look_for_lua_install() then
-	print("Could not find Lua. Will install its own copy.")
-	print("See /? for options for specifying the location of Lua.")
+if INSTALL_LUA then
 	if vars.LUA_VERSION ~= "5.1" then
 		die("Cannot install own copy because no 5.2 version is bundled")
 	end
-	INSTALL_LUA = true
 	vars.LUA_INTERPRETER = "lua5.1"
 	vars.LUA_BINDIR = vars.BINDIR
 	vars.LUA_LIBDIR = vars.LIBDIR
@@ -412,8 +458,13 @@
     vars.LUA_RUNTIME = "MSVCR80"
     vars.UNAME_M = "x86"
 else
-    vars.UNAME_M = get_architecture()
-	print(S[[
+	if not look_for_lua_install() then
+		die("Could not find Lua. See /? for options for specifying the location of Lua, or installing a bundled copy of Lua 5.1.")
+	end
+    vars.UNAME_M = get_architecture()  -- can only do when installation was found
+end
+
+print(S[[

 Will configure LuaRocks with the following paths:
 LuaRocks       : $FULL_PREFIX
@@ -425,7 +476,7 @@
 System architecture detected as: $UNAME_M

 ]])
-end
+

 -- ***********************************************************
 -- Install LuaRocks files


Added simple batch file for windows install - still testing

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

--- install.bat
+++ install.bat
@@ -0,0 +1,72 @@
+
+echo "Installing OpenFlex Board View"
+
+IF exist openboardview.exe (
+IF exist sample-obv.conf (
+
+
+
+;; Create the configuration and history file paths
+;;
+set OD=%APPDATA%\openboardview
+IF exist %OD% (
+		echo "Config install path already exists"
+) else (
+		echo "Creating config installation path %OD%..."
+		mkdir %OD%
+)
+IF exist %OD%\obv.conf (
+	echo "Configuration file already exists, not overwriting"
+) else (
+	echo "Copying configuration file..."
+	copy sample-obv.conf %OD%\obv.conf
+)
+
+
+
+;; Create the binary install path
+;;
+set PD=%PROGRAMFILES%\openboardview
+IF exist %PD% (
+		echo "Binary install path already exists"
+) else (
+		echo "Creating binary installation path %PD%..."
+		mkdir %PD%
+)
+echo "Copying binary...
+copy openboardview.exe %PD%
+
+
+
+;; Attempt to create a desktop link
+;;
+set LNK="%HOMEDRIVE%%HOMEPATH%\Desktop\openboardview.lnk"
+if exist %LNK% (
+		echo "Desktop link already exists"
+		) else (
+			if exist %PD% (
+@echo off
+echo Set oWS = WScript.CreateObject("WScript.Shell") > CreateShortcut.vbs
+echo sLinkFile = "%HOMEDRIVE%%HOMEPATH%\Desktop\openboardview.lnk" >> CreateShortcut.vbs
+echo Set oLink = oWS.CreateShortcut(sLinkFile) >> CreateShortcut.vbs
+echo oLink.TargetPath = "%PD%" >> CreateShortcut.vbs
+echo oLink.Save >> CreateShortcut.vbs
+@echo on
+		echo "Creating desktop link..."
+cscript CreateShortcut.vbs
+del CreateShortcut.vbs
+)
+)
+
+
+echo "Install finished."
+echo "You can now run the binary at %OD%\openboardview.exe"
+) else (
+	echo "Cannot find sample-obv.conf to install."
+	)
+) else (
+	echo "Cannot find openboardview.exe to install."
+	)
+
+echo
+


Polish sccache on windows (#34147)

Polish sccache on windows (#34147)

--- paddle/scripts/paddle_build.bat
+++ paddle/scripts/paddle_build.bat
@@ -156,7 +156,7 @@

 rem -------Caching strategy 2: sccache decorate compiler-----------
 if "%WITH_SCCACHE%"=="ON" (
-    rem cmd /C sccache -V || call :install_sccache
+    cmd /C sccache -V || call :install_sccache
     sccache --stop-server 2> NUL
     if not exist D:\sccache mkdir D:\sccache
     set SCCACHE_DIR=D:\sccache\.cache
@@ -164,11 +164,10 @@
     set SCCACHE_ERROR_LOG=D:\sccache\sccache_log.txt
     set SCCACHE_LOG=quiet
     sccache --start-server
-    if !errorlevel! NEQ 0 exit /b 1
     sccache -z
     goto :CASE_%1
 ) else (
-    del %PYTHON_ROOT%\sccache.exe
+    del %PYTHON_ROOT%\sccache.exe 2> NUL
     goto :CASE_%1
 )

@@ -473,7 +472,7 @@
 echo 0 > %cache_dir%\error_code.txt
 type %cache_dir%\error_code.txt

-:: ci will collect clcache hit rate
+:: ci will collect sccache hit rate
 if "%WITH_SCCACHE%"=="ON" (
     call :collect_sccache_hits
 )
@@ -809,11 +808,11 @@
 for /f "tokens=2,3" %%i in ('type sccache_summary.txt ^| findstr "requests hits" ^| findstr /V "executed C/C++ CUDA"') do set %%i=%%j
 if %requests% EQU 0 (
     echo "sccache hit rate: 0%"
-    echo ipipe_log_param_Clcache_Hit_Hate: 0%
+    echo ipipe_log_param_sccache_Hit_Hate: 0%
 ) else (
     set /a rate=!hits!*10000/!requests!
     echo "sccache hit rate: !rate:~0,-2!.!rate:~-2!%%"
-    echo ipipe_log_param_Clcache_Hit_Hate: !rate:~0,2!.!rate:~2,2!%%
+    echo ipipe_log_param_sccache_Hit_Hate: !rate:~0,-2!.!rate:~-2!%%
 )

 goto:eof


init git submodules after checkout (bat)

--- script/download-and-install-package/install.bat
+++ script/download-and-install-package/install.bat
@@ -156,6 +156,27 @@
      echo Error: git checkout failed ...
      goto err
     )
+
+    cd ..
+  )
+
+  if "%PACKAGE_GIT_SUBMODULES%" == "YES" (
+    cd %PACKAGE_SUB_DIR%
+
+    echo.
+    echo Initialization git submodules ...
+    echo.
+
+    git submodule init
+    git submodule update
+
+    if %errorlevel% neq 0 (
+     echo.
+     echo Error: git submodule initialization failed!
+     goto err
+    )
+
+    cd ..
   )
 )


capitalize bat commands for style

capitalize bat commands for style

--- bin/deactivate.bat
+++ bin/deactivate.bat
@@ -1,12 +1,12 @@
 @echo off
 SETLOCAL ENABLEDELAYEDEXPANSION

-if "%1" == "" goto skipmissingarg
-    echo Usage: deactivate
-    echo.
-    echo Deactivates previously activated Conda
-    echo environment.
-    exit /b 1
+IF "%1" == "" GOTO skipmissingarg
+    ECHO Usage: deactivate
+    ECHO.
+    ECHO Deactivates previously activated Conda
+    ECHO environment.
+    EXIT /b 1
 :skipmissingarg

 REM special case for root env:
@@ -16,15 +16,15 @@
 IF NOT "%PATH_NO_ROOT%"=="%PATH%" SET "CONDA_DEFAULT_ENV=%ROOT_PATH%"

 REM Deactivate a previous activation if it is live
-if "%CONDA_DEFAULT_ENV%" == "" goto skipdeactivate
+IF "%CONDA_DEFAULT_ENV%" == "" GOTO skipdeactivate
     REM This search/replace removes the previous env from the path
-    echo Deactivating environment "%CONDA_DEFAULT_ENV%"...
+    ECHO Deactivating environment "%CONDA_DEFAULT_ENV%"...

     REM Run any deactivate scripts
-    if not exist "%CONDA_DEFAULT_ENV%\etc\conda\deactivate.d" goto nodeactivate
-        pushd "%CONDA_DEFAULT_ENV%\etc\conda\deactivate.d"
-        for %%g in (*.bat) do call "%%g"
-        popd
+    IF NOT EXIST "%CONDA_DEFAULT_ENV%\etc\conda\deactivate.d" GOTO nodeactivate
+        PUSHD "%CONDA_DEFAULT_ENV%\etc\conda\deactivate.d"
+        FOR %%g IN (*.bat) DO CALL "%%g"
+        POPD
     :nodeactivate

     REM Remove env name from PROMPT


CLI for windows.

CLI for windows.

git-svn-id: 8edb5892024d79aff1f98e328816c09323ad5332@56 d6d3f0c6-2a50-3b37-6bf7-63741bc15edd

--- bin/virgil-cli.bat
+++ bin/virgil-cli.bat
@@ -25,16 +25,16 @@
 set CLASSPATH=

 REM For each jar in the CASSANDRA_HOME lib directory call append to build the CLASSPATH variable.
-for %%i in ("%CASSANDRA_HOME%\lib\*.jar") do call :append "%%i"
+for %%i in ("target\lib\*.jar") do call :append "%%i"
 goto okClasspath

 :append
-set CLASSPATH=%CLASSPATH%;%1
+set CLASSPATH=%CLASSPATH%;%1;
 goto :eof

 :okClasspath
 REM Include the build\classes\main directory so it works in development
-set CASSANDRA_CLASSPATH=%CLASSPATH%;"%CASSANDRA_HOME%\build\classes\main";"%CASSANDRA_HOME%\build\classes\thrift"
+set CASSANDRA_CLASSPATH=%CLASSPATH%;"target\classes";"src\main\resources"
 goto runCli

 :runCli


skip integration during units on windows

[#132181413]

Signed-off-by: Matthew Boedicker <bd646ec310948bf2f36146b5501a0018bf548d0d@pivotal.io>

--- ci/cli/tasks/units-windows.bat
+++ ci/cli/tasks/units-windows.bat
@@ -7,4 +7,4 @@

 go get github.com/onsi/ginkgo/ginkgo

-ginkgo -r -randomizeAllSpecs -randomizeSuites .
+ginkgo -r -randomizeAllSpecs -randomizeSuites -skipPackage integration .


Update generate_solution.bat

Update generate_solution.bat

--- script/generate_solution.bat
+++ script/generate_solution.bat
@@ -1,3 +1,3 @@
 mkdir build
 cd build
-cmake ..
+cmake .. cd ..


Disabled the re-use of MSBuild nodes when creating a nuget packages

--- newCreateNuget.bat
+++ newCreateNuget.bat
@@ -229,9 +229,9 @@

 CALL:print %warning% "Building %~2 for %PLATFORM%"
 IF %logLevel% GEQ %trace% (
-	MSBuild %~1 /t:%~2 /property:Configuration=%CONFIGURATION% /property:Platform=%~3
-) ELSE (
-	MSBuild %~1 /t:%~2 /property:Configuration=%CONFIGURATION% /property:Platform=%~3  >NUL
+	MSBuild %~1 /t:%~2 /property:Configuration=%CONFIGURATION% /property:Platform=%~3 /nodeReuse:False
+) ELSE (
+	MSBuild %~1 /t:%~2 /property:Configuration=%CONFIGURATION% /property:Platform=%~3 /nodeReuse:False >NUL
 )

 ::MSBuild %~1 /property:Configuration=%CONFIGURATION% /property:Platform=%~3 /m


Create bld_cxx.bat

Create bld_cxx.bat

error: pathspec 'recipes/gz-transport/bld_cxx.bat' did not match any file(s) known to git

--- recipes/gz-transport/bld_cxx.bat
+++ recipes/gz-transport/bld_cxx.bat
@@ -0,0 +1,18 @@
+mkdir build
+cd build
+
+cmake ^
+    -G "Ninja" ^
+    -DCMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% ^
+    -DCMAKE_BUILD_TYPE=Release ^
+    -DCMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP=True ^
+    %SRC_DIR%
+if errorlevel 1 exit 1
+
+:: Build.
+cmake --build . --config Release
+if errorlevel 1 exit 1
+
+:: Install.
+cmake --build . --config Release --target install
+if errorlevel 1 exit 1


added command script to push built .nupkg file to NuGet.org

error: pathspec 'src/nupkg/PushNuGetPackage.cmd' did not match any file(s) known to git

--- src/nupkg/PushNuGetPackage.cmd
+++ src/nupkg/PushNuGetPackage.cmd
@@ -0,0 +1,16 @@
+@echo off
+REM
+REM ulib - a collection of useful classes
+REM Copyright (C) 2000-2019 Michael Fink
+REM
+REM Pushes NuGet package to NuGet.org
+REM
+
+if "%NUGET_APIKEY%" == "" echo "Environment variable NUGET_APIKEY is not set! Obtain a new API key under and set the environment variable!"
+if "%NUGET_APIKEY%" == "" echo "Note: API keys are managed under https://www.nuget.org/account/apikeys"
+if "%NUGET_APIKEY%" == "" exit 1
+
+nuget setApiKey %NUGET_APIKEY%
+nuget push Vividos.UlibCpp.Static.4.1.7.nupkg -Source https://www.nuget.org/api/v2/package
+
+pause


Fix for tests running script was added

Fix for tests running script was added

--- build/RunTests.bat
+++ build/RunTests.bat
@@ -3,4 +3,5 @@
 dotnet test "test\Infrastructure\Skeleton.Dapper.Tests" -c %1

 cd "test\Web.Tests"
-dotnet test -c %1+dotnet test -c %1
+cd "..\.."


no echo

no echo

--- scripts/build_appveyor.bat
+++ scripts/build_appveyor.bat
@@ -1,5 +1,5 @@

-@echo on
+@echo off
 :: The following line is important for proper variable expansion
 @SETLOCAL EnableDelayedExpansion
 SET BASEDIR=%cd%


Removing the git checkout

Removing the git checkout


changed start number

changed start number

--- loop-run.cmd
+++ loop-run.cmd
@@ -2,9 +2,9 @@
 set /a count=0
 set /a fails=0
 :do
-set /a count=%count%+1
 echo runs: %count% fails: %fails% command: %*
 %*
+set /a count=%count%+1
 if %errorlevel%==0 goto do
 set /a fails=%fails%+1
 goto do


Fix doc

Fix doc

git-svn-id: 152f48a1866dc7886cc2b83d2001e6645df26423@1705920 13f79535-47bb-0310-9956-ffa450edef68

--- src/test/scripts/ping.bat
+++ src/test/scripts/ping.bat
@@ -1,6 +1,6 @@
 @ECHO OFF

-REM Little batch file to run nearly foerver
+REM Little batch file to pause for a number of seconds
 REM see http://malektips.com/dos0017.html
 REM
 REM Licensed to the Apache Software Foundation (ASF) under one or more


Update VMware 15.5.1, update VirtualBox 6.1.2

--- scripts/vm-guest-tools.bat
+++ scripts/vm-guest-tools.bat
@@ -19,7 +19,7 @@
 )

 if not exist "C:\Windows\Temp\windows.iso" (
-    powershell -Command "(New-Object System.Net.WebClient).DownloadFile('https://softwareupdate.vmware.com/cds/vmw-desktop/ws/15.5.0/14665864/windows/packages/tools-windows.tar', 'C:\Windows\Temp\vmware-tools.tar')" <NUL
+    powershell -Command "(New-Object System.Net.WebClient).DownloadFile('https://softwareupdate.vmware.com/cds/vmw-desktop/ws/15.5.1/15018445/windows/packages/tools-windows.tar', 'C:\Windows\Temp\vmware-tools.tar')" <NUL
     cmd /c ""C:\Program Files\7-Zip\7z.exe" x C:\Windows\Temp\vmware-tools.tar -oC:\Windows\Temp"
     FOR /r "C:\Windows\Temp" %%a in (VMware-tools-windows-*.iso) DO REN "%%~a" "windows.iso"
     rd /S /Q "C:\Program Files (x86)\VMWare"
@@ -40,7 +40,7 @@
 )

 if not exist "C:\Windows\Temp\VBoxGuestAdditions.iso" (
-    powershell -Command "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; (New-Object System.Net.WebClient).DownloadFile('https://download.virtualbox.org/virtualbox/6.0.10/VBoxGuestAdditions_6.0.10.iso', 'C:\Windows\Temp\VBoxGuestAdditions.iso')" <NUL
+    powershell -Command "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; (New-Object System.Net.WebClient).DownloadFile('https://download.virtualbox.org/virtualbox/6.1.2/VBoxGuestAdditions_6.1.2.iso', 'C:\Windows\Temp\VBoxGuestAdditions.iso')" <NUL
 )

 cmd /c ""C:\Program Files\7-Zip\7z.exe" x C:\Windows\Temp\VBoxGuestAdditions.iso -oC:\Windows\Temp\virtualbox"


Add 'enable-console-logging' parameter to failchat-no-gui.bat

--- src/main/external-resources/failchat-no-gui.bat
+++ src/main/external-resources/failchat-no-gui.bat
@@ -1 +1 @@
-java -Xmx200m -Xms100m -XX:+UseG1GC -jar failchat-${project.version}.jar --no-gui
+java -Xmx200m -Xms100m -XX:+UseG1GC -jar failchat-${project.version}.jar --no-gui --enable-console-logging


fix runcover.bat to delete the prev results before running

--- src/tests/runcover.bat
+++ src/tests/runcover.bat
@@ -1,2 +1,4 @@
+del coverage.xml
+del /Q report\*
 dotnet test /p:AltCover=true
 dotnet reportgenerator -reports:coverage.xml -targetdir:report "-assemblyfilters:-xunit.*"


Update bld.bat

Update bld.bat

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

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


check before dir

check before dir

--- zuninstall-KEEP_CONFIG-no.cmd
+++ zuninstall-KEEP_CONFIG-no.cmd
@@ -3,6 +3,10 @@
 for /f "delims=" %%a in ('dir /b wix.d\MinionMSI\bin\Release\*.msi')   do @set "msi=%%a"

 @echo on
+msiexec /x wix.d\MinionMSI\bin\Release\%msi% /qb! KEEP_CONFIG=0
+@echo off

-msiexec /x wix.d\MinionMSI\bin\Release\%msi% /qb! KEEP_CONFIG=0
-dir /s /b \salt+dir "C:\salt" >nul 2>&1
+if %errorLevel%==0 (
+  dir /s /b c:\salt
+)


Changed VSVC version info.

Changed VSVC version info.

--- Pack/msvc7_1_MD.bat
+++ Pack/msvc7_1_MD.bat
@@ -1,5 +1,5 @@
 set FLAGS="/Od  /D WIN32 /D NDEBUG /D _LIB /D FORTRAN /D IFORT_WIN32 /D _MBCS /MDd /Za  /c  /TC"
 set LIBXML2_HOME=C:\DLR\TIVA\local
-set MSVCVersion=7.1
+set MSVCVersion=9.0
 set RT=MD
 (scons Pack=yes Tool=msvc MSVSVersion=%MSVCVersion% FC=ifort -c . & scons Pack=yes  Tool=msvc MSVSVersion=%MSVCVersion%  FC=ifort CCFLAGS=%FLAGS% ) & ( del tixi_win32_msvc7.1_ifort_%RT%.zip & ren tixi_win32_msvc7.1_ifort.zip tixi_win32_msvc7.1_ifort_%RT%.zip)


Fixed STRATOS-1145 - Create BAT file to run CLI in windows environment

--- products/stratos-cli/distribution/src/main/bin/stratos.bat
+++ products/stratos-cli/distribution/src/main/bin/stratos.bat
@@ -1,4 +1,5 @@
 @echo off
+
 rem ---------------------------------------------------------------------------
 rem  Licensed to the Apache Software Foundation (ASF) under one
 rem  or more contributor license agreements.  See the NOTICE file
@@ -21,16 +22,59 @@
 rem
 rem  Environment Variable Prequisites
 rem
-rem   STRATOS_CLI_HOME   Home of Stratos CLI Tool
+rem   JAVA_HOME          Java home path
 rem
 rem   STRATOS_URL        The URL of the Stratos Controller
 rem ---------------------------------------------------------------------------

-rem ----- Only set STRATOS_CLI_HOME if not already set ----------------------------
+:checkStratoURL
+if "%STRATOS_URL%" == "" goto noStratosURL
+goto checkJava

-if "%STRATOS_CLI_HOME%"=="" set STRATOS_CLI_HOME=%CD%
+:noStratosURL
+echo "You must set the STRATOS_URL variable before running the CLI"
+goto end

-cd %STRATOS_CLI_HOME%
+:checkJava
+if "%JAVA_HOME%" == "" goto noJavaHome
+if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome
+goto checkServer

-rem TODO: Update according to stratos.sh
+:noJavaHome
+echo "You must set the JAVA_HOME variable before running CLI."
+goto end

+:checkServer
+rem %~sdp0 is expanded pathname of the current script under NT with spaces in the path removed
+if "%CARBON_HOME%"=="" set CARBON_HOME=%~sdp0..
+SET curDrive=%cd:~0,1%
+SET wsasDrive=%CARBON_HOME:~0,1%
+if not "%curDrive%" == "%wsasDrive%" %wsasDrive%:
+
+rem ----- update classpath -----------------------------------------------------
+:updateClasspath
+
+setlocal EnableDelayedExpansion
+cd %CARBON_HOME%
+set CARBON_CLASSPATH=
+FOR %%C in ("%CARBON_HOME%\lib\*.jar") DO set CARBON_CLASSPATH=!CARBON_CLASSPATH!;".\lib\%%~nC%%~xC"
+
+set CARBON_CLASSPATH="%JAVA_HOME%\lib\tools.jar";%CARBON_CLASSPATH%;
+
+set CMD=RUN %*
+
+rem ----------------- Execute The Requested Command ----------------------------
+
+:runServer
+cd %CARBON_HOME%
+set JAVA_ENDORSED="%JAVA_HOME%jre\lib\endorsed";"%JAVA_HOME%lib\endorsed"
+
+:runJava
+"%JAVA_HOME%\bin\java" -cp %CARBON_CLASSPATH% org.apache.stratos.cli.Main
+
+:end
+goto endlocal
+
+:endlocal
+:END
+


- fixed prepare webrtc to handle gmock and gflags

--- prepare-webrtc.bat
+++ prepare-webrtc.bat
@@ -110,9 +110,13 @@
 if "%failure%" neq "0" goto:done_with_error
 call:dolink . third_party\jsoncpp chromium\src\third_party\jsoncpp
 if "%failure%" neq "0" goto:done_with_error
+call:dolink . third_party\gflags\src ..\webrtc-deps\gflags
+if "%failure%" neq "0" goto:done_with_error
 call:dolink . tools\gyp ..\webrtc-deps\gyp
 if "%failure%" neq "0" goto:done_with_error
 call:dolink . testing\gtest ..\webrtc-deps\gtest
+if "%failure%" neq "0" goto:done_with_error
+call:dolink . testing\gmock ..\webrtc-deps\gmock
 if "%failure%" neq "0" goto:done_with_error


no concucurrency for windows

no concucurrency for windows

Signed-off-by: Kenneth Reitz <b1c1d8736f20db3fb6c1c66bb1455ed43909f0d8@kennethreitz.org>

--- run-tests.bat
+++ run-tests.bat
@@ -3,4 +3,4 @@
 .venv\Scripts\pipenv install --dev

-.venv\Scripts\pipenv run pytest -n auto --boxed -v tests --tap-stream | tee results.tap+.venv\Scripts\pipenv run pytest -v tests --tap-stream | tee results.tap


Fixed dev null redirect on exit

Fixed dev null redirect on exit

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

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

 :exit


improve for dos batch for renaming ebook

--- ebook/rename.bat
+++ ebook/rename.bat
@@ -2,6 +2,7 @@
 @call :amazonIsdn 1626710104
 @call :amazonIsdn 0321942051
 @call :amazonIsdn 012408138X
+@call :amazonIsdn B00BFWI6CG
 @goto:eof

 :amazonIsdn
@@ -9,12 +10,18 @@
 @set isdn=%~1
 @curl -s -L http://www.amazon.com/dp/%isdn% 1>tmpFile

+@rem do check first
+
+@findstr /R "btAsinTitle" tmpFile > tempfindoutput
+@rem Notice 'findstr /R /N "^" tempfindoutput ^| find /C ":"' is count of fileline.
+@for /f %%i in ('findstr /R /N "^" tempfindoutput ^| find /C ":"') do @set FINDOUTPUT=%%i
+@IF %FINDOUTPUT%==0 @goto:notFoundExit
+
 @for /f "tokens=1 delims="  %%a in ('findstr /R "btAsinTitle" tmpFile') do @set title="%%a"
 @rem echo %title%
 @for /f "tokens=2 delims=>" %%b in ('echo %title%') do @set title="%%b"
 @rem echo %title%
 @for /f "tokens=1 delims=<" %%c in ('echo %title%') do @set title="%%c"
-

 @for /f "tokens=1 delims=" %%d in ('findstr /R "Publication.*Date.*ISBN-10.*%isbn%.*Edition.*" tmpFile') do @set details="%%d"
 @rem echo Details : %details%
@@ -23,8 +30,6 @@
 @for /f "tokens=2 delims=|" %%f in ('echo %details%') do @set isbn-10=%%f
 @for /f "tokens=3 delims=|" %%f in ('echo %details%') do @set isbn-13=%%f
 @for /f "tokens=4 delims=|" %%f in ('echo %details%') do @set edition="%%f"
-
-

 @set title=%title:~2,-1%
 @set publishdate=%publishdate:~105,-35%
@@ -36,6 +41,15 @@
 @echo ISBN-10 : %isbn-10%
 @echo ISBN-13 : %isbn-13%
 @echo Edition : %edition%
+@goto :cleanExit

+:notFoundExit
+@echo Error: No result found for %isdn%
+:cleanExit
+@rem clean varibles
+@set title=
+@set details=
+@del tempfindoutput
 @del tmpFile

+


nfps - buttons update (#499) [skip appveyor]

LB/RB >LT/RT - Used for tabs
M > RS - Used for Messenger in Main menu

--- textures/NFS/NFSPS/createtpk.bat
+++ textures/NFS/NFSPS/createtpk.bat
@@ -6,19 +6,19 @@
 %XNFSTPKTool% GLOBALB.BUN.000175.tpk.bin unpacked
 xcopy /S /Q /Y /F "../textures/b.dds" "unpacked/1B4F984/PC_KEY_ESC.dds"
 xcopy /S /Q /Y /F "../textures/menu.dds" "unpacked/1B4F984/PC_KEY_SPC.dds"
-REM xcopy /S /Q /Y /F "../textures/dummy.dds" "unpacked/1B4F984/PC_KEY_M_FRENCH.dds"
-xcopy /S /Q /Y /F "../textures/rb.dds" "unpacked/1B4F984/PC_KEY_0.dds"
+xcopy /S /Q /Y /F "../textures/rs.dds" "unpacked/1B4F984/PC_KEY_M_FRENCH.dds"
+xcopy /S /Q /Y /F "../textures/rt.dds" "unpacked/1B4F984/PC_KEY_0.dds"
 xcopy /S /Q /Y /F "../textures/y.dds" "unpacked/1B4F984/PC_KEY_1.dds"
 xcopy /S /Q /Y /F "../textures/x.dds" "unpacked/1B4F984/PC_KEY_2.dds"
 xcopy /S /Q /Y /F "../textures/view.dds" "unpacked/1B4F984/PC_KEY_3.dds"
 REM xcopy /S /Q /Y /F "../textures/dummy.dds" "unpacked/1B4F984/PC_KEY_4.dds"
 REM xcopy /S /Q /Y /F "../textures/dummy.dds" "unpacked/1B4F984/PC_KEY_5.dds"
-xcopy /S /Q /Y /F "../textures/lb.dds" "unpacked/1B4F984/PC_KEY_9.dds"
+xcopy /S /Q /Y /F "../textures/lt.dds" "unpacked/1B4F984/PC_KEY_9.dds"
 REM xcopy /S /Q /Y /F "../textures/dummy.dds" "unpacked/1B4F984/PC_KEY_E.dds"
-REM xcopy /S /Q /Y /F "../textures/dummy.dds" "unpacked/1B4F984/PC_KEY_M.dds"
+xcopy /S /Q /Y /F "../textures/rs.dds" "unpacked/1B4F984/PC_KEY_M.dds"
 xcopy /S /Q /Y /F "../textures/quit.dds" "unpacked/1B4F984/PC_KEY_Q.dds"
 REM xcopy /S /Q /Y /F "../textures/dummy.dds" "unpacked/1B4F984/PC_KEY_T.dds"
-xcopy /S /Q /Y /F "../textures/lbrb.dds" "unpacked/1B4F984/PC_GREATERTHAN_LESSTHAN_KEYS.dds"
+xcopy /S /Q /Y /F "../textures/ltrt.dds" "unpacked/1B4F984/PC_GREATERTHAN_LESSTHAN_KEYS.dds"
 xcopy /S /Q /Y /F "../textures/menu.dds" "unpacked/1B4F984/PC_KEY_SPC_SPANISH.dds"
 xcopy /S /Q /Y /F "../textures/menu.dds" "unpacked/1B4F984/PC_KEY_SPC_ITALIAN.dds"
 xcopy /S /Q /Y /F "../textures/menu.dds" "unpacked/1B4F984/PC_KEY_SPC_DANISH.dds"


xorg-xproto: better approach to the Windows hack

I got cocky and thought I could get away with just *one* download. Foolish.

--- recipes/xorg-xproto/bld.bat
+++ recipes/xorg-xproto/bld.bat
@@ -1,6 +1,7 @@
 :: Just delegate to the Unixy script; but some of the X.org tarballs have
 :: config.guess files too ancient to recognize 64-bit Windows!
-curl -sSL -o config.guess https://raw.githubusercontent.com/gcc-mirror/gcc/master/config.guess
+curl -sSL -o config.guess "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess"
+curl -sSL -o config.sub "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub"
 if errorlevel 1 exit 1
 bash %RECIPE_DIR%\build.sh
 if errorlevel 1 exit 1


Removing CVS from scripts directory.

Removing CVS from scripts directory.

--- delcvs.bat
+++ delcvs.bat
@@ -3,6 +3,7 @@
 rmdir /S /Q boundscheck\CVS
 rmdir /S /Q doc\CVS
 rmdir /S /Q gtk\CVS
+rmdir /S /Q scripts\CVS
 rmdir /S /Q src\CVS
 rmdir /S /Q vcbuild\CVS
 rmdir /S /Q win32\CVS


Removing ; at end of GitHub Actions windows unittests conofig

--- .github/scripts/windows_unittest.bat
+++ .github/scripts/windows_unittest.bat
@@ -1,4 +1,4 @@
 SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%
 call activate parcels
 parcels_get_examples examples/;
-pytest -v -s --nbval-lax -k "not documentation" tests/;
+pytest -v -s --nbval-lax -k "not documentation" tests/


deleted deploy script

deleted deploy script

--- deploy.cmd
+++ deploy.cmd
@@ -1,142 +0,0 @@
-@if "%SCM_TRACE_LEVEL%" NEQ "4" @echo off
-
-:: ----------------------
-:: KUDU Deployment Script
-:: Version: 1.0.6
-:: ----------------------
-
-:: Prerequisites
-:: -------------
-
-:: Verify node.js installed
-where node 2>nul >nul
-IF %ERRORLEVEL% NEQ 0 (
-  echo Missing node.js executable, please install node.js, if already installed make sure it can be reached from current environment.
-  goto error
-)
-
-:: Setup
-:: -----
-
-setlocal enabledelayedexpansion
-
-SET ARTIFACTS=%~dp0%..\artifacts
-
-IF NOT DEFINED DEPLOYMENT_SOURCE (
-  SET DEPLOYMENT_SOURCE=%~dp0%.
-)
-
-IF NOT DEFINED DEPLOYMENT_TARGET (
-  SET DEPLOYMENT_TARGET=%ARTIFACTS%\wwwroot
-)
-
-IF NOT DEFINED NEXT_MANIFEST_PATH (
-  SET NEXT_MANIFEST_PATH=%ARTIFACTS%\manifest
-
-  IF NOT DEFINED PREVIOUS_MANIFEST_PATH (
-    SET PREVIOUS_MANIFEST_PATH=%ARTIFACTS%\manifest
-  )
-)
-
-IF NOT DEFINED KUDU_SYNC_CMD (
-  :: Install kudu sync
-  echo Installing Kudu Sync
-  call npm install kudusync -g --silent
-  IF !ERRORLEVEL! NEQ 0 goto error
-
-  :: Locally just running "kuduSync" would also work
-  SET KUDU_SYNC_CMD=%appdata%\npm\kuduSync.cmd
-)
-goto Deployment
-
-:: Utility Functions
-:: -----------------
-
-:SelectNodeVersion
-
-IF DEFINED KUDU_SELECT_NODE_VERSION_CMD (
-  :: The following are done only on Windows Azure Websites environment
-  call %KUDU_SELECT_NODE_VERSION_CMD% "%DEPLOYMENT_SOURCE%" "%DEPLOYMENT_TARGET%" "%DEPLOYMENT_TEMP%"
-  IF !ERRORLEVEL! NEQ 0 goto error
-
-  IF EXIST "%DEPLOYMENT_TEMP%\__nodeVersion.tmp" (
-    SET /p NODE_EXE=<"%DEPLOYMENT_TEMP%\__nodeVersion.tmp"
-    IF !ERRORLEVEL! NEQ 0 goto error
-  )
-
-  IF EXIST "%DEPLOYMENT_TEMP%\__npmVersion.tmp" (
-    SET /p NPM_JS_PATH=<"%DEPLOYMENT_TEMP%\__npmVersion.tmp"
-    IF !ERRORLEVEL! NEQ 0 goto error
-  )
-
-  IF NOT DEFINED NODE_EXE (
-    SET NODE_EXE=node
-  )
-
-  SET NPM_CMD="!NODE_EXE!" "!NPM_JS_PATH!"
-) ELSE (
-  SET NPM_CMD=npm
-  SET NODE_EXE=node
-)
-
-goto :EOF
-
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-:: Deployment
-:: ----------
-
-:Deployment
-echo Handling node.js deployment.
-
-:: 1. KuduSync
-IF /I "%IN_PLACE_DEPLOYMENT%" NEQ "1" (
-  call :ExecuteCmd "%KUDU_SYNC_CMD%" -v 50 -f "%DEPLOYMENT_SOURCE%" -t "%DEPLOYMENT_TARGET%" -n "%NEXT_MANIFEST_PATH%" -p "%PREVIOUS_MANIFEST_PATH%" -i ".git;.hg;.deployment;deploy.cmd"
-  IF !ERRORLEVEL! NEQ 0 goto error
-)
-
-:: 2. Select node version
-call :SelectNodeVersion
-
-:: 3. Install npm packages
-IF EXIST "%DEPLOYMENT_TARGET%\package.json" (
-  pushd "%DEPLOYMENT_TARGET%"
-  call :ExecuteCmd !NPM_CMD! install --production
-  IF !ERRORLEVEL! NEQ 0 goto error
-  popd
-)
-
-:: 3. Build webpack
-call :ExecuteCmd !NPM_CMD! run build
-)
-
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-
-:: Post deployment stub
-IF DEFINED POST_DEPLOYMENT_ACTION call "%POST_DEPLOYMENT_ACTION%"
-IF !ERRORLEVEL! NEQ 0 goto error
-
-goto end
-
-:: Execute command routine that will echo out when error
-:ExecuteCmd
-setlocal
-set _CMD_=%*
-call %_CMD_%
-if "%ERRORLEVEL%" NEQ "0" echo Failed exitCode=%ERRORLEVEL%, command=%_CMD_%
-exit /b %ERRORLEVEL%
-
-:error
-endlocal
-echo An error has occurred during web site deployment.
-call :exitSetErrorLevel
-call :exitFromFunction 2>nul
-
-:exitSetErrorLevel
-exit /b 1
-
-:exitFromFunction
-()
-
-:end
-endlocal
-echo Finished successfully.


Fixed path

Fixed path

--- deploy.cmd
+++ deploy.cmd
@@ -109,6 +109,7 @@
 :: )
 :: ############ azure doesn't support native NPM modules ############

+pushd "%DEPLOYMENT_TARGET%"
 echo 4. Install JSPM
 call .\node_modules\.bin\jspm" install -y
 IF !ERRORLEVEL! NEQ 0 goto error
@@ -118,6 +119,7 @@
     call .\node_modules\.bin\gulp bundle
     IF !ERRORLEVEL! NEQ 0 goto error
 )
+popd


Fixed fetching github pull requests in windows.bat

--- templates/bootstrap.bat
+++ templates/bootstrap.bat
@@ -42,18 +42,26 @@
 CALL git clean -fdq
 IF %ERRORLEVEL% NEQ 0 EXIT %ERRORLEVEL%

-REM Fetch the latest code
+REM Determine if a GitHub pull request fetch is possible

-ECHO ^> git fetch -q
-CALL git fetch -q
-IF %ERRORLEVEL% NEQ 0 EXIT %ERRORLEVEL%
+SET PULL_REQUEST_FETCH=false
+IF NOT "%BUILDKITE_PULL_REQUEST%" == "false" (
+  IF "%BUILDKITE_PROJECT_PROVIDER%" == "github" SET PULL_REQUEST_FETCH=true
+  IF "%BUILDKITE_PROJECT_PROVIDER%" == "github_enterprise" SET PULL_REQUEST_FETCH=true
+)

-REM Build open-source Github pull requests
+if "%PULL_REQUEST_FETCH%" == "true" (
+  REM Fetch the code using the special GitHub PR syntax

-REM Allow checkouts of forked pull requests on GitHub only
-IF NOT "%BUILDKITE_PULL_REQUEST%" == "false" AND ECHO.%BUILDKITE_PROJECT_PROVIDER% | FIND /I "github">Nul (
+  ECHO ^> git fetch origin "+refs/pull/%BUILDKITE_PULL_REQUEST%/head:"
   CALL git fetch origin "+refs/pull/%BUILDKITE_PULL_REQUEST%/head:"
 ) ELSE (
+  REM Fetch the latest code
+
+  ECHO ^> git fetch -q
+  CALL git fetch -q
+  IF %ERRORLEVEL% NEQ 0 EXIT %ERRORLEVEL%
+
   REM Only reset to the branch if we're not on a tag

   IF "%BUILDKITE_TAG%" == "" (


*** empty log message ***

*** empty log message ***

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

--- srcconsole/copy_cygdll.bat
+++ srcconsole/copy_cygdll.bat
@@ -0,0 +1,8 @@
+@echo off
+copy /y ..\lib\cygw17\*.dll ..\bin\cygw17
+copy /y ..\..\cd\lib\cygw17\*.dll ..\bin\cygw17
+copy /y ..\..\im\lib\cygw17\*.dll ..\bin\cygw17
+copy /y ..\..\lua5.1\lib\cygw17\*.dll ..\bin\cygw17
+copy /y ..\..\luagl\lib\cygw17\*.dll ..\bin\cygw17
+copy /y ..\..\lfs\lib\cygw17\*.dll ..\bin\cygw17
+del ..\bin\cygw17\*3.dll


updated batch file for creating the service dispatcher entry in services

--- tmp/createServiceDispatcher.bat
+++ tmp/createServiceDispatcher.bat
@@ -1,3 +1,13 @@
 sc query state=all | find "QlikEAPowerToolsServiceDispatcher"
-IF %ERRORLEVEL% EQU 1 sc create QlikEAPowerToolsServiceDispatcher binPath= "%~1\PowerToolsServiceDispatcher\PowerToolsService.exe" DisplayName= "Qlik EAPowerTools Service Dispatcher" start= auto obj=%2 password=%3
-pause+
+IF %ERRORLEVEL% EQU 1
+GOTO ADDSERVICE
+ELSE
+GOTO END
+
+:ADDSERVICE
+sc create QlikEAPowerToolsServiceDispatcher binPath= "%~1\PowerToolsServiceDispatcher\PowerToolsService.exe" DisplayName= "Qlik EAPowerTools Service Dispatcher" start= auto obj=%2 password=%3
+sc description "QlikEAPowerToolsServiceDispatcher" "Service Dispatcher for running EA Powertools"
+
+:END
+exit


BuildDeps.cmd: do not check Visual Studio version using GENERATOR, but use VS_VER instead.

--- tools/Windows/BuildDeps.cmd
+++ tools/Windows/BuildDeps.cmd
@@ -62,7 +62,7 @@
 )

 :: If we use VS2008, framework path (for msbuild) may not be correctly set. Manually attempt to add in that case
-IF %GENERATOR%==%GENERATOR_VS2008% set PATH=C:\Windows\Microsoft.NET\Framework\v3.5;%PATH%
+IF %VS_VER%==vs2008 set PATH=C:\Windows\Microsoft.NET\Framework\v3.5;%PATH%

 :: Print user-defined variables
 cecho {F0}This script fetches and builds all Tundra dependencies{# #}{\n}
@@ -491,7 +491,7 @@
    :: We need to patch pp-iterator.h in order to make it compile with newer Visual Studio versions:
    :: http://stackoverflow.com/questions/2791525/stl-operator-behavior-change-with-visual-studio-2010
    :: Also cannot use QMake as it results in linker errors, so instead generate vcproj files and build using MSBuild.
-   IF NOT %GENERATOR%==%GENERATOR_VS2008% (
+   IF NOT %VS_VER%==vs2008 (
       copy /Y "%TOOLS%\Mods\QtScriptGenerator_pp-iterator.h" "%DEPS%\qtscriptgenerator\generator\parser\rpp\pp-iterator.h"
       qmake -tp vc
       cecho {0D}Building qtscript plugins. Please be patient, this will take a while.{# #}{\n}
@@ -1146,7 +1146,7 @@
    :: It's nicer to use a tailored file rathern than copy duplicates under the zziblib source tree.
    cecho {0D}Building zziplib from premade project %TOOLS%\Mods\vs2008-zziplib.vcproj{# #}{\n}
    copy /Y "%TOOLS%\Mods\vs2008-zziplib.vcproj" zziplib.vcproj
-   IF NOT %GENERATOR%==%GENERATOR_VS2008% VCUpgrade /nologo zziplib.vcproj
+   IF NOT %VS_VER%==vs2008 VCUpgrade /nologo zziplib.vcproj
    MSBuild zziplib.%VCPROJ_FILE_EXT% /p:configuration=Release /p:platform="%VS_PLATFORM%" /nologo /clp:ErrorsOnly /m:%NUMBER_OF_PROCESSORS%
    MSBuild zziplib.%VCPROJ_FILE_EXT% /p:configuration=Debug /p:platform="%VS_PLATFORM%" /nologo /clp:ErrorsOnly /m:%NUMBER_OF_PROCESSORS%


[bug fix] wrong syntax for the windows launch script

--- tools/run/run-civilizer.bat
+++ tools/run/run-civilizer.bat
@@ -42,8 +42,8 @@
 :usage
     echo [ %hostScript% ] Options
     echo     -port number : Specify port number
-    echo     -home path : Specify Private Home Directory
-    echo     -cleanStart : Start the app with a clean empty DB
-                    [CAUTION!!!] Your previous data will be all gone. Make a backup first!
+    echo     -home path   : Specify Private Home Directory
+    echo     -cleanStart  : Start the app with a clean empty DB
+    echo                    [CAUTION^^!^^!^^!] Your previous data will be all gone. Make a backup first^^!

 endlocal


build file updated

build file updated

--- Android/xwalk-quick-build/build.cmd
+++ Android/xwalk-quick-build/build.cmd
@@ -111,7 +111,7 @@
 :MAKE_APK
 SET ARCH=arm
 SET MODE=embedded
-SET XCL='--ignore-gpu-blacklist:--show-fps-counter'
+SET XCL='--ignore-gpu-blacklist'

 %XWALK_PATH% --package=%PACKAGE% --manifest=%MANIFEST% --keystore-path=%KS_PATH% --keystore-alias=%KS_ALIAS% --keystore-passcode=%KS_PASSCODE% --keystore-alias-passcode=%KS_ALIAS_PASSCODE% --keep-screen-on --fullscreen --orientation=landscape --arch=%ARCH% --mode=%MODE% --xwalk-command-line=%XCL% --enable-remote-debugging


Don't assume MRI Ruby 1.8 is in my path. Be explicit about the expectation

--- Merlin/Main/Languages/Ruby/Scripts/Dev.bat
+++ Merlin/Main/Languages/Ruby/Scripts/Dev.bat
@@ -9,7 +9,7 @@
 set PROGRAM_FILES_x86=%ProgramFiles(x86)%

 REM ruby.exe needs to be on the path
-set RUBY18_BIN=
+set RUBY18_BIN=C:\Ruby\bin
 set RUBY18_EXE=ruby.exe
 set RUBY19_EXE=c:\ruby19\bin\ruby.exe
 set RUBYOPT=


Adding bat

Adding bat

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

--- run_specs_and_generate_html_report.bat
+++ run_specs_and_generate_html_report.bat
@@ -0,0 +1 @@
+rspec -f d ./spec --format h > tests_report.html


updated compiler .bat file

updated compiler .bat file

error: pathspec 'samples/RotatingCube/winrtcompiler.bat' did not match any file(s) known to git

--- samples/RotatingCube/winrtcompiler.bat
+++ samples/RotatingCube/winrtcompiler.bat
@@ -0,0 +1,2 @@
+..\..\src\winrtcompiler\bin\winrtcompiler.exe -o=shader_winrt.h -p=winrt -a=gProgram -v=shader.vert -f=shader.frag
+..\..\src\winrtcompiler\bin\winrtcompiler.exe -o=shader_wp8.h -p=wp8 -a=gProgram -v=shader.vert -f=shader.frag


Umm..wtf? Why am I using KB2919355 again? Where did I get that KB# from, it should be KB2999226...

--- script/KB2919355.cmd
+++ script/KB2919355.cmd
@@ -2,11 +2,12 @@
 @for %%i in (a:\_packer_config*.cmd) do @call "%%~i"
 @if defined PACKER_DEBUG (@echo on) else (@echo off)

-title Downloading and installing required Windows Update (KB2919355).  Please wait...
-
-:: Check for all of our prerequisites needed to install KB2919355
+:: https://support.microsoft.com/en-us/help/2999226/update-for-universal-c-runtime-in-windows
+title Downloading and installing required Windows Update (KB2999226).  Please wait...
+
+:: Check for all of our prerequisites needed to install KB2999226
 if not exist "%SystemRoot%\_download.cmd" (
-  echo ==^> ERROR: Unable to download required Windows Update ^(KB2919355^) due to missing download tool
+  echo ==^> ERROR: Unable to download required Windows Update ^(KB2999226^) due to missing download tool
   goto :exit1
 )

@@ -23,9 +24,17 @@
 )

 :: Set the default urls that are used by this script to download the update
-set "KB2919355_WIN81X86_URL=https://download.microsoft.com/download/4/E/C/4EC66C83-1E15-43FD-B591-63FB7A1A5C04/Windows8.1-KB2919355-x86.msu"
-set "KB2919355_WIN81X64_URL=https://download.microsoft.com/download/D/B/1/DB1F29FC-316D-481E-B435-1654BA185DCF/Windows8.1-KB2919355-x64.msu"
-set "KB2919355_WIN2012R2_URL=https://download.microsoft.com/download/2/5/6/256CCCFB-5341-4A8D-A277-8A81B21A1E35/Windows8.1-KB2919355-x64.msu"
+set "KB2999226_WIN7X86_URL=https://download.microsoft.com/download/4/F/E/4FE73868-5EDD-4B47-8B33-CE1BB7B2B16A/Windows6.1-KB2999226-x86.msu"
+set "KB2999226_WIN7X64_URL=https://download.microsoft.com/download/1/1/5/11565A9A-EA09-4F0A-A57E-520D5D138140/Windows6.1-KB2999226-x64.msu"
+set "KB2999226_WIN80X86_URL=https://download.microsoft.com/download/1/E/8/1E8AFE90-5217-464D-9292-7D0B95A56CE4/Windows8-RT-KB2999226-x86.msu"
+set "KB2999226_WIN80X64_URL=https://download.microsoft.com/download/A/C/1/AC15393F-A6E6-469B-B222-C44B3BB6ECCC/Windows8-RT-KB2999226-x64.msu"
+set "KB2999226_WIN81X86_URL=https://download.microsoft.com/download/E/4/6/E4694323-8290-4A08-82DB-81F2EB9452C2/Windows8.1-KB2999226-x86.msu"
+set "KB2999226_WIN81X64_URL=https://download.microsoft.com/download/9/6/F/96FD0525-3DDF-423D-8845-5F92F4A6883E/Windows8.1-KB2999226-x64.msu"
+set "KB2999226_WIN2008X86_URL=https://download.microsoft.com/download/B/5/7/B5757251-DAB0-4E23-AA46-ABC233FDB90E/Windows6.0-KB2999226-x86.msu"
+set "KB2999226_WIN2008X64_URL=https://download.microsoft.com/download/A/7/A/A7A70B17-ADF9-4FC3-A722-69FA89B79756/Windows6.0-KB2999226-x64.msu"
+set "KB2999226_WIN2008R2_URL=https://download.microsoft.com/download/F/1/3/F13BEC9A-8FC6-4489-9D6A-F84BDC9496FE/Windows6.1-KB2999226-x64.msu"
+set "KB2999226_WIN2012_URL=https://download.microsoft.com/download/9/3/E/93E0745A-EAE9-4B5A-B50C-012F2D3B6659/Windows8-RT-KB2999226-x64.msu"
+set "KB2999226_WIN2012R2_URL=https://download.microsoft.com/download/D/1/3/D13E3150-3BB2-4B22-9D8A-47EE2D609FFF/Windows8.1-KB2999226-x64.msu"

 :: Get the PlatformVersion from SystemInfo
 for /f "delims=:; tokens=1,2" %%a in ('systeminfo') do (
@@ -44,61 +53,127 @@
 if not defined TEMP set TEMP=%LOCALAPPDATA%\Temp

 :: Figure out the platform version in order to determine the correct url
+if "%PlatformVersionMajor%" == "6" if "%PlatformVersionMinor%" == "0" goto Windows2008
+if "%PlatformVersionMajor%" == "6" if "%PlatformVersionMinor%" == "1" goto Windows7Family
+if "%PlatformVersionMajor%" == "6" if "%PlatformVersionMinor%" == "2" goto Windows80Family
 if "%PlatformVersionMajor%" == "6" if "%PlatformVersionMinor%" == "3" goto Windows81Family

-echo ==^> Skipping Windows Update ^(KB2919355^) due to it being non-applicable to the current platform
+echo ==^> Skipping Windows Update ^(KB2999226^) due to it being non-applicable to the current platform
 goto exit0

 :: We figured out that we're in the correct family. Now we need to figure out the
-:: architecture and whether it's the Windows8 server or client.
+:: architecture and whether it's the Windows server or client.
+:Windows7Family
+systeminfo | find "OS Name:" | find /c "Microsoft Windows Server" >NUL
+if errorlevel 1 goto Windows7
+goto Windows2008R2
+
+:Windows80Family
+systeminfo | find "OS Name:" | find /c "Microsoft Windows Server" >NUL
+if errorlevel 1 goto Windows2012
+goto Windows80
+
 :Windows81Family
 systeminfo | find "OS Name:" | find /c "Microsoft Windows Server" >NUL
-if errorlevel 1 goto Windows2012R2
+if errorlevel 1 goto Windows81
+goto Windows2012R2

 :: If it wasn't a server class operating system, then we must be a client.. In
 :: this case, we need to distinguish which architecture we actually are and then
 :: we can distinguish between which url is the correct one.
+:Windows7
+if "%PROCESSOR_ARCHITECTURE%" == "x86" goto Windows7x86
+goto Windows7x64
+
+:Windows80
+if "%PROCESSOR_ARCHITECTURE%" == "x86" goto Windows80x86
+goto Windows80x64
+
 :Windows81
 if "%PROCESSOR_ARCHITECTURE%" == "x86" goto Windows81x86
 goto Windows81x64

+:Windows2008
+if "%PROCESSOR_ARCHITECTURE%" == "x86" goto Windows2008x86
+goto Windows2008x64
+
 :: The following cases simply assign the url depending on the detected platform.
+:Windows7x86
+echo ==^> Detected Platform: Microsoft Windows 7.0 ^(x86^)
+set "KB2999226_URL=%KB2999226_WIN7X86_URL%"
+goto prepare_kb2999226
+
+:Windows7x64
+echo ==^> Detected Platform: Microsoft Windows 7.0 ^(x64^)
+set "KB2999226_URL=%KB2999226_WIN7X64_URL%"
+goto prepare_kb2999226
+
+:Windows80x86
+echo ==^> Detected Platform: Microsoft Windows 8.0 ^(x86^)
+set "KB2999226_URL=%KB2999226_WIN80X86_URL%"
+goto prepare_kb2999226
+
+:Windows80x64
+echo ==^> Detected Platform: Microsoft Windows 8.0 ^(x64^)
+set "KB2999226_URL=%KB2999226_WIN80X64_URL%"
+goto prepare_kb2999226
+
 :Windows81x86
 echo ==^> Detected Platform: Microsoft Windows 8.1 ^(x86^)
-set "KB2919355_URL=%KB2919355_WIN81X86_URL%"
-goto prepare_kb2919355
+set "KB2999226_URL=%KB2999226_WIN81X86_URL%"
+goto prepare_kb2999226

 :Windows81x64
 echo ==^> Detected Platform: Microsoft Windows 8.1 ^(x64^)
-set "KB2919355_URL=%KB2919355_WIN81X64_URL%"
-goto prepare_kb2919355
+set "KB2999226_URL=%KB2999226_WIN81X64_URL%"
+goto prepare_kb2999226
+
+:Windows2008x86
+echo ==^> Detected Platform: Microsoft Windows Server 2008 ^(x86^)
+set "KB2999226_URL=%KB2999226_WIN2008X86_URL%"
+goto prepare_kb2999226
+
+:Windows2008x64
+echo ==^> Detected Platform: Microsoft Windows Server 2008 ^(x64^)
+set "KB2999226_URL=%KB2999226_WIN2008X64_URL%"
+goto prepare_kb2999226
+
+:Windows2008R2
+echo ==^> Detected Platform: Microsoft Windows Server 2008R2 ^(x64^)
+set "KB2999226_URL=%KB2999226_WIN2008R2_URL%"
+goto prepare_kb2999226
+
+:Windows2012
+echo ==^> Detected Platform: Microsoft Windows Server 2012 ^(x64^)
+set "KB2999226_URL=%KB2999226_WIN2012_URL%"
+goto prepare_kb2999226

 :Windows2012R2
-echo ==^> Detected Platform: Microsoft Windows Server 2012 ^(x64^)
-set "KB2919355_URL=%KB2919355_WIN2012R2_URL%"
-goto prepare_kb2919355
+echo ==^> Detected Platform: Microsoft Windows Server 2012R2 ^(x64^)
+set "KB2999226_URL=%KB2999226_WIN2012R2_URL%"
+goto prepare_kb2999226

 :: Now that we've figured out the url, we just need to figure out where to
 :: place it. We're also going to need to extract it and determine the filename
 :: for the .cab file inside it. We rip all of this information from the url.
-:prepare_kb2919355
-for %%n in (%KB2919355_URL%) do set "KB2919355_FILENAME=%%~nxn"
-
-for %%n in (%KB2919355_FILENAME%) do set "KB2919355_BASEFILENAME=%%~nn"
-set "KB2919355_PATH=%TEMP%\%KB2919355_FILENAME%"
-set "KB2919355_DIR=%TEMP%\%KB2919355_BASEFILENAME%.extracted"
+:prepare_kb2999226
+for %%n in (%KB2999226_URL%) do set "KB2999226_FILENAME=%%~nxn"
+
+for %%n in (%KB2999226_FILENAME%) do set "KB2999226_BASEFILENAME=%%~nn"
+set "KB2999226_PATH=%TEMP%\%KB2999226_FILENAME%"
+set "KB2999226_DIR=%TEMP%\%KB2999226_BASEFILENAME%.extracted"

 :: Download the file to the path that was just calculated.
-:download_kb2919355
-call "%SystemRoot%\_download.cmd" "%KB2919355_URL%" "%KB2919355_PATH%"
-
-if errorlevel 1 (
-  echo ==^> ERROR: Unable to download file from %KB2919355_URL%
-  goto exit1
-)
-
-if not exist "%KB2919355_PATH%" (
-  echo ==^> ERROR: Unable to locate downloaded file at %KB2919355_PATH%
+:download_kb2999226
+call "%SystemRoot%\_download.cmd" "%KB2999226_URL%" "%KB2999226_PATH%"
+
+if errorlevel 1 (
+  echo ==^> ERROR: Unable to download file from %KB2999226_URL%
+  goto exit1
+)
+
+if not exist "%KB2999226_PATH%" (
+  echo ==^> ERROR: Unable to locate downloaded file at %KB2999226_PATH%
   goto exit1
 )

@@ -108,25 +183,25 @@
 :: properly. So to prevent the need of forcing users to install Windows Updates,
 :: or even starting the wuauserv service we do it this way. It's just Microsoft's
 :: Visual C runtime anyways...
-:extract_kb2919355
-echo ==^> Extracting KB2919355 to path %KB2919355_DIR%
-start "" /wait wusa "%KB2919355_PATH%" "/extract:%KB2919355_DIR%"
-if not exist "%KB2919355_DIR%\%KB2919355_BASEFILENAME%.cab" (
-  echo ==^> ERROR: Unable to extract Windows Update ^(KB2919355^) to %KB2919355_DIR%
-  goto exit1
-)
-
-:: So, we now should have the cab file for KB2919355. Final thing that we need
+:extract_kb2999226
+echo ==^> Extracting KB2999226 to path %KB2999226_DIR%
+start "" /wait wusa "%KB2999226_PATH%" "/extract:%KB2999226_DIR%"
+if not exist "%KB2999226_DIR%\%KB2999226_BASEFILENAME%.cab" (
+  echo ==^> ERROR: Unable to extract Windows Update ^(KB2999226^) to %KB2999226_DIR%
+  goto exit1
+)
+
+:: So, we now should have the cab file for KB2999226. Final thing that we need
 :: to do is to install it with dism, and make sure that it actually worked.
-:install_kb2919355
-echo ==^> Manually installing KB2919355 from file %KB2919355_DIR%\%KB2919355_BASEFILENAME%.cab
-start "" /wait dism /online /add-package "/packagepath:%KB2919355_DIR%\%KB2919355_BASEFILENAME%.cab"
-if errorlevel 1 (
-  echo ==^> ERROR: Unable to install Windows Update ^(KB2919355^) from %KB2919355_DIR%\%KB2919355_BASEFILENAME%.cab
+:install_kb2999226
+echo ==^> Manually installing KB2999226 from file %KB2999226_DIR%\%KB2999226_BASEFILENAME%.cab
+start "" /wait dism /online /add-package "/packagepath:%KB2999226_DIR%\%KB2999226_BASEFILENAME%.cab"
+if errorlevel 1 (
+  echo ==^> ERROR: Unable to install Windows Update ^(KB2999226^) from %KB2999226_DIR%\%KB2999226_BASEFILENAME%.cab
   goto exit 1
 )

-echo ==^> Successfully installed Windows Update ^(KB2919355^)
+echo ==^> Successfully installed Windows Update ^(KB2999226^)
 goto exit0

 :: These are our exit branches for setting the errorlevel using the exact


Create import.cmd

Create import.cmd

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

--- import.cmd
+++ import.cmd
@@ -0,0 +1,2 @@
+REM modify the line below to point to the folder where the OC Data Importer Python Script is stored
+"C:\path_to_where_the_Importer_Script_is_stored\OC Data Importer 1.0.py"


java fix build

java fix build

--- java/build.bat
+++ java/build.bat
@@ -1,3 +1,3 @@
-javac -d . api/NetHeader.java api/Client.java api/client.java api/Factory.java api/NetHelper.java
-jar cfv pubsubsql.jar pubsubsql/NetHeader.class pubsubsql/Client.class pubsubsql/client.class pubsubsql/Factory.class pubsubsql/NetHelper.class
+javac -d . api/NetHeader.java api/Client.java api/ClientImpl.java api/Factory.java api/NetHelper.java
+jar cfv pubsubsql.jar pubsubsql/NetHeader.class pubsubsql/Client.class pubsubsql/ClientImpl.class pubsubsql/Factory.class pubsubsql/NetHelper.class
 javac -d . -cp pubsubsql.jar test/PubSubSQLTest.java


Updated windows script

Updated windows script

--- Installer/Windows/build-msi.bat
+++ Installer/Windows/build-msi.bat
@@ -4,7 +4,6 @@
 echo File not found, please supply a zip file with the build as the first argument
 goto EXIT
 )
-

 call "%VS120COMNTOOLS%vsvars32.bat"

@@ -13,6 +12,21 @@
 del /q Duplicati-32bit.msi

 7z x -oDuplicati %1
+
+IF EXIST "..\oem" (
+	echo Installing OEM files
+	xcopy ..\oem\* Duplicati\webroot\oem /e /s /y /i
+)
+
+IF EXIST "..\..\oem" (
+	echo Installing OEM files
+	xcopy ..\..\oem\* Duplicati\webroot\ /e /s /y /i
+)
+
+IF EXIST "..\..\..\oem" (
+	echo Installing OEM files
+	xcopy ..\..\..\oem\* Duplicati\webroot\ /e /s /y /i
+)

 rmdir /s /q obj
 rmdir /s /q bin


updated SonarQube cmd script for new sonar-scanner-msbuild-4.3.1.1372-net46

--- src/SonarCloud.cmd
+++ src/SonarCloud.cmd
@@ -27,7 +27,7 @@
 REM
 rmdir .\bw-output /s /q 2> nul

-SonarQube.Scanner.MSBuild.exe begin ^
+SonarScanner.MSBuild.exe begin ^
     /k:"UlibCpp" ^
     /v:"4.1.3" ^
     /d:"sonar.cfamily.build-wrapper-output=%CD%\bw-output" ^
@@ -53,6 +53,6 @@
    -- "%VSINSTALL%\Common7\IDE\CommonExtensions\Microsoft\TestWindow\vstest.console.exe" ^
    "..\bin\Release\Win32\test\test.dll" /Platform:x86 /InIsolation /logger:trx

-SonarQube.Scanner.MSBuild.exe end /d:"sonar.login=%SONARLOGIN%"
+SonarScanner.MSBuild.exe end /d:"sonar.login=%SONARLOGIN%"

 pause


Fix runtests when running under appveyor

--- tests/RunTests.cmd
+++ tests/RunTests.cmd
@@ -287,8 +287,11 @@

 rem See <http://www.appveyor.com/docs/environment-variables>
 if not defined APPVEYOR goto :EOF
+
+set saved_errorlevel=%errorlevel%
+echo Saved errorlevel %saved_errorlevel%
 powershell -File Upload-Results.ps1 %RESULTSDIR%\%XMLFILE%
-
+if %saved_errorlevel% neq 0 exit /b %saved_errorlevel%
 goto :EOF

 :: Note: "goto :EOF" returns from an in-batchfile "call" command