Vss2Git

--- src/makeTradeBuild.bat
+++ src/makeTradeBuild.bat
@@ -1,10 +1,14 @@
-midl /mktyplib203 typelib/chartskiltypes25.idl
+cd typelib
+midl /mktyplib203 chartskiltypes26.idl
 pause
-regtlib typelib/chartskiltypes25.tlb
+regtlib chartskiltypes26.tlb
 pause
-midl /mktyplib203 typelib/tradebuildsp25.idl
+midl /mktyplib203 tradebuildsp26.idl
 pause
-regtlib typelib/tradebuildsp25.tlb
+regtlib tradebuildsp26.tlb
+pause
+cd ..
+vb6 /m TradingDO\TradingDO.vbp
 pause
 vb6 /m TimeframeUtils\TimeframeUtils.vbp
 pause


added ability to specify arbitrary version for windows build script

--- src/utils/makedist.bat
+++ src/utils/makedist.bat
@@ -14,20 +14,19 @@
 goto build

 :help
-echo usage: makedist.bat [-bump]
+echo usage: makedist.bat [-v version|-bump]
 echo  -bump: increment version number and tag mercurial repository
 goto done

 REM ------------------------------------------------------------------
 REM Build settings
-
 :build
 echo setting build settings...
 set PROJECT_NAME=neurolab_all
 set SHADOW_DIR=..\%PROJECT_NAME%-build-desktop
 set DISTRIB_DIR=..\distrib

-set QT_DIST_DIR=C:\Qt\2010.02.1
+for /f usebackq %%i in (`dir /b /od C:\Qt\*`) do set QT_DIST_DIR=C:\Qt\%%i
 set QTDIR=%QT_DIST_DIR%\qt
 set QMAKESPEC=win32-g++

@@ -38,54 +37,51 @@

 REM ------------------------------------------------------------------
 REM Clean build
-
 call :distclean
 if ERRORLEVEL 1 goto :EOF

 REM ------------------------------------------------------------------
 REM Update
-
 echo updating...
 hg -q update
 if ERRORLEVEL 1 goto error

 REM ------------------------------------------------------------------
 REM Build Tools
-
 call :build utils\incversion incversion.pro
 if ERRORLEVEL 1 goto :EOF

 REM ------------------------------------------------------------------
 REM Increment version if necessary
-
 call :bumpdlls
 if "%1" == "-bump" call :bump
 if ERRORLEVEL 1 goto :EOF

 REM ------------------------------------------------------------------
 REM get version
-
+if "%1" == "-v" goto manualversion
 for /f usebackq %%v in (`utils\incversion\release\incversion.exe -nobump version.txt`) do set NEUROLAB_VERSION=%%v
 if ERRORLEVEL 1 goto error
+goto doneversion
+:manualversion
+set NEUROLAB_VERSION=%2
+:doneversion
 echo version is %NEUROLAB_VERSION%

 REM ------------------------------------------------------------------
 REM hg id
-
 for /f usebackq %%i in (`hg -q id`) do set HG_ID=%%i
 if ERRORLEVEL 1 goto error
 echo hg id is %HG_ID%

 REM ------------------------------------------------------------------
 REM build NeuroLab
-
 if not exist "%SHADOW_DIR%" mkdir "%SHADOW_DIR%"
 call :build "%SHADOW_DIR%" ..\src\neurolab_all.pro
 if ERRORLEVEL 1 goto :EOF

 REM ------------------------------------------------------------------
 REM create release directory
-
 if not exist "%DISTRIB_DIR%\zips" mkdir "%DISTRIB_DIR%\zips"
 set RELEASE_DIR=%DISTRIB_DIR%\%NEUROLAB_VERSION%-%HG_ID%

@@ -103,7 +99,6 @@

 REM ------------------------------------------------------------------
 REM copy files
-
 echo copying licenses...
 call :copyfile "%QT_DIST_DIR%\qt\LICENSE.LGPL" %RELEASE_DIR%\licenses\qt
 call :copyfile thirdparty\qtpropertybrowser\qtpropertybrowser-2.5_1-opensource\LICENSE.LGPL %RELEASE_DIR%\licenses\qtpropertybrowser
@@ -154,6 +149,7 @@
 popd
 goto :EOF

+REM ----------------------------
 :distclean
 echo cleaning...
 pushd .
@@ -163,6 +159,7 @@
 echo done cleaning
 goto :EOF

+REM ----------------------------
 :makezip
 pushd "%DISTRIB_DIR%\%1-%2"
 set ZIPFILE=..\zips\neurocogling-neurolab-%1-%2-win32.zip
@@ -175,6 +172,7 @@
 popd
 goto :EOF

+REM ----------------------------
 :copyfile
 pushd .
 REM echo copy /y "%1" "%2"
@@ -183,6 +181,7 @@
 popd
 goto :EOF

+REM ----------------------------
 :bumpdlls
 pushd .
 copy /y "%QT_DIST_DIR%\mingw\bin\libgcc_s_dw2-1.dll" utils\incversion\release > "%TEMP%\deploy.log"
@@ -194,6 +193,7 @@
 popd
 goto :EOF

+REM ----------------------------
 :bump
 echo incrementing version...
 pushd .
@@ -206,6 +206,7 @@
 popd
 goto :EOF

+REM ----------------------------
 :build
 pushd .
 call :qmake %1 %2
@@ -217,6 +218,7 @@
 goto :EOF

 :qmake
+REM ----------------------------
 echo running qmake in %1...
 pushd "%1"
 "%QT_DIST_DIR%\qt\bin\qmake.exe" "%2" -spec %QMAKESPEC% -r CONFIG-=debug CONFIG+=release
@@ -224,6 +226,7 @@
 popd
 goto :EOF

+REM ----------------------------
 :make
 echo running make in %1...
 pushd "%1"
@@ -232,11 +235,13 @@
 popd
 goto :EOF

+REM ----------------------------
 :wrongdir
 pushd .
 echo You must be in the src directory to run the makedist.bat script!
 goto error

+REM ----------------------------
 :error
 popd
 cd %OLDDIR%


Created a script for submitting packages to the nuget.org galery

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

--- submitNuGetPackage.cmd
+++ submitNuGetPackage.cmd
@@ -0,0 +1,9 @@
+msbuild /p:Configuration=Release Jace\Jace.csproj
+Tools\NuGet\nuget.exe pack Jace\Jace.csproj -Prop Configuration=Release
+
+@ECHO OFF
+FOR /F "delims=|" %%I IN ('DIR "Jace.*.nupkg" /B /O:D') DO SET NuGetPackage=%%I
+@ECHO ON
+
+REM ECHO %NuGetPackage%
+Tools\NuGet\nuget.exe push %NuGetPackage%


Keep only Boost

Keep only Boost

--- conda/libboost/bld.bat
+++ conda/libboost/bld.bat
@@ -1,5 +1,6 @@
 echo ON

+rm bld.bat
 dir


Update prompt message

Update prompt message

--- 上傳所有檔案.bat
+++ 上傳所有檔案.bat
@@ -21,5 +21,5 @@
 python lib/app.py reset-fail
 python lib/app.py batchupload -t poorKid

-echo WǧAiH}ƧݬݵGoI:)
+echo 槹AiH}ƧݬݵGoI:)
 pause


cleanup

cleanup

--- tos-laimas-compass-win32-x64/resources/app/r.bat
+++ tos-laimas-compass-win32-x64/resources/app/r.bat
@@ -1 +0,0 @@
-npm build && npm start


Update SetupComplete.cmd

Update SetupComplete.cmd

--- unattended.win10/Setup/Scripts/SetupComplete.cmd
+++ unattended.win10/Setup/Scripts/SetupComplete.cmd
@@ -10,6 +10,12 @@
 rem move "%windir%\SystemApps\Microsoft.Windows.Cortana_cw5n1h2txyewy" "%windir%\SystemApps\Microsoft.Windows.Cortana_cw5n1h2txyewy.dennyhalim"
 rem startmenu disabled if shellex disabled
 rem move "%windir%\SystemApps\ShellExperienceHost_cw5n1h2txyewy" "%windir%\SystemApps\ShellExperienceHost_cw5n1h2txyewy.dennyhalim"
+
+sc.exe config wuauserv start= demand
+sc.exe config DiagTrack start= disabled
+sc.exe config dmwappushservice start= disabled
+sc.exe config RetailDemo start= disabled
+sc.exe config lfsvc start= disabled

 reg load HKLM\DEFAULT "%Public%\..\default\ntuser.dat"
 reg add "HKLM\DEFAULT\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v Start_TrackProgs /t REG_DWORD /d 1 /f


* fixed: now must require at least one argument to run (has been not required before, so a click on the script would run w/o arguments and so the dir command uses the current directory instead and so iterates over all files in the current directory and if the current directory is a directory with the script then it does truncate to 0 all the files including the script!

git-svn-id: 8286f1aa0849172a171b18e797a5983a17159a76@51 699b1267-f50e-4533-8e1b-323e5631ef88

--- Scripts/Tools/xml/xml_vbs_preformat_for_files.bat
+++ Scripts/Tools/xml/xml_vbs_preformat_for_files.bat
@@ -46,18 +46,25 @@
   goto FLAGS_LOOP
 )

+set NUM_CMD_VA_ARGS=0
 set "CMD_VA_ARGS="

 :PROCESS_FILES_LOOP
 if "%~1" == "" goto PROCESS_FILES_LOOP_END

 set CMD_VA_ARGS=%CMD_VA_ARGS%%1
+set /A NUM_CMD_VA_ARGS+=1
 shift

 goto PROCESS_FILES_LOOP

 :PROCESS_FILES_LOOP_END

+if %NUM_CMD_VA_ARGS% EQU 0 (
+  echo.%?~nx0%: error: must set at least one wildcard token or directory path.
+  exit /b 255
+) >&2
+
 for /F "usebackq eol= tokens=* delims=" %%i in (`dir /A:-D /B /S %CMD_VA_ARGS%`) do (
   echo.%%i
   call "%%TOOLS_PATH%%/xml/vbs/xml_preformat.vbs" %%CMD_FLAG_ARGS%% "%%i" "%%i"


Update Vagrant.bat

Update Vagrant.bat

--- ServerSetupScripts/Windows/Chocolatey/Vagrant.bat
+++ ServerSetupScripts/Windows/Chocolatey/Vagrant.bat
@@ -4,7 +4,11 @@
 vagrant plugin install vagrant-winrm
 vagrant plugin install vagrant-omnibus
 vagrant plugin install vagrant-berkshelf
+
+# Look at a command to change the location of boxes if a seperate disk exists. Provisioning takes ages.
+# VAGRANT_HOME https://www.vagrantup.com/docs/other/environmental-variables.html
 vagrant box add mwrock/Windows2016 --provider virtualbox
+
 code --install-extension ms-vscode.powershell
 code --install-extension msazurermtools.azurerm-vscode-tools
 code --install-extension HookyQR.beautify


no pause

no pause


Build shared library on Windows

Build shared library on Windows

--- recipes/cppast/bld.bat
+++ recipes/cppast/bld.bat
@@ -8,7 +8,9 @@
       -DCMAKE_PREFIX_PATH:PATH="%LIBRARY_PREFIX%" ^
       -DCMAKE_BUILD_TYPE:STRING=Release ^
       -DCMAKE_LIBRARY_PATH:PATH="%LIBRARY_PREFIX%;%LIBRARY_PREFIX%/bin" ^
+      -DBUILD_SHARED_LIBS:BOOL=ON ^
       ..
+
 if errorlevel 1 exit 1

 nmake


Force MSVC as toolchain.

Force MSVC as toolchain.

--- recipes/gazebo/bld.bat
+++ recipes/gazebo/bld.bat
@@ -1,4 +1,8 @@
 set PKG_CONFIG_PATH=%LIBRARY_PREFIX%\share\pkgconfig;%LIBRARY_PREFIX%\lib\pkgconfig;%PKG_CONFIG_PATH%
+
+:: MSVC is preferred.
+set CC=cl.exe
+set CXX=cl.exe

 mkdir build
 cd build


* typo

* typo

git-svn-id: 8286f1aa0849172a171b18e797a5983a17159a76@177 699b1267-f50e-4533-8e1b-323e5631ef88

--- Scripts/Tools/std/xcopy_dir.bat
+++ Scripts/Tools/std/xcopy_dir.bat
@@ -22,12 +22,12 @@
 set "TO_PATH=%~2"

 if not defined FROM_PATH (
-  echo.%~nx0: error: input durectory path argument must be defined.
+  echo.%~nx0: error: input directory path argument must be defined.
   exit /b -255
 ) >&2

 if not defined TO_PATH (
-  echo.%~nx0: error: output durectory path argument must be defined.
+  echo.%~nx0: error: output directory path argument must be defined.
   exit /b -254
 ) >&2


Update bld.bat

Update bld.bat

--- recipes/pdal-c/bld.bat
+++ recipes/pdal-c/bld.bat
@@ -1,14 +1,32 @@

-set BUILD_TYPE=Release
+:: This script assumes that cmake is in PATH
+:: TODO Auto-detect latest platform
+set SCRIPT_DIR=%~dp0
+
+if not defined BUILD_TYPE set BUILD_TYPE=Release
+set ARCH=x64
+if not defined TARGET_OS set TARGET_OS=windows
+
+set TRIPLET=%ARCH%-%TARGET_OS%
+
+set BUILD_DIR=%SCRIPT_DIR%\build\%TRIPLET%
+
+if exist "%BUILD_DIR%\pdal-c.sln" (
+	pushd "%BUILD_DIR%"
+) else (
+	mkdir "%BUILD_DIR%"
+	pushd "%BUILD_DIR%"

 	cmake ../.. ^
-		-G "Visual Studio 15 2017"  ^
-		-DCMAKE_BUILD_TYPE=$BUILD_TYPE ^
-		-DCMAKE_INSTALL_PREFIX=$PREFIX ^
-		-DCMAKE_LIBRARY_PATH=$PREFIX/lib ^
-		-DCMAKE_INCLUDE_PATH=$PREFIX/include ^
-		-DCONDA_BUILD=ON
+		-DCMAKE_BUILD_TYPE=%BUILD_TYPE% ^
+		-DCONDA_BUILD=ON ^
+		-DCMAKE_INSTALL_PREFIX:PATH="%LIBRARY_PREFIX%" ^
+		-DCMAKE_PREFIX_PATH:PATH="%LIBRARY_PREFIX%" ^
+		.
+
+
 )

 :: Build and install solution
 cmake --build . --target INSTALL --config %BUILD_TYPE%
+


Update bld.bat

Update bld.bat

--- recipes/pycld2/bld.bat
+++ recipes/pycld2/bld.bat
@@ -1,7 +1,2 @@
-mkdir build
-cd build
-
-set "CFLAGS= -LD"
-
-"%PYTHON%" -m pip install --no-deps --ignore-installed  .
+"%PYTHON%" -m pip install
 if errorlevel 1 exit 1


Removed obsolete scripts

Removed obsolete scripts

--- scripts/install-vmhost-additions.cmd
+++ scripts/install-vmhost-additions.cmd
@@ -1,44 +0,0 @@
-@if not defined PACKER_DEBUG (@echo off) else (@echo on)
-setlocal EnableDelayedExpansion EnableExtensions
-title Installing Virtualbox Guest Additions...
-
-set DRIVE_LETTERS=C: D: E: F: G: H: I: J: K: L: M: N: O: P: Q: R: S: T: U: V: W: X: Y: Z:
-
-echo "%PACKER_BUILDER_TYPE%" | findstr /I "vmware" > NUL
-if not ERRORLEVEL 1 goto VMWare
-echo "%PACKER_BUILDER_TYPE%" | findstr /I "virtualbox" > NUL
-if not ERRORLEVEL 1 goto Virtualbox
-
-echo ERROR Unknown Packer builder type: %PACKER_BUILDER_TYPE%
-exit 1
-
-:Virtualbox
-echo ==^> Installing Virtualbox Guest Additions
-for %%i in (%DRIVE_LETTERS%) do if exist "%%~i\VBoxWindowsAdditions.exe" set GUEST_DRIVE=%%~i
-if "x%GUEST_DRIVE%" == "x" (
-  echo ERROR: Cannot find Virtualbox additions
-  exit 1
-)
-cmd /c certutil -addstore -f "TrustedPublisher" %GUEST_DRIVE%\cert\oracle-vbox.cer
-@if errorlevel 1 echo ERROR %ERRORLEVEL% while adding Oracle certificate to the trusted publishers
-cmd /c %GUEST_DRIVE%\VBoxWindowsAdditions.exe /S
-@if errorlevel 1 echo ERROR %ERRORLEVEL% while installing Virtualbox Guest Additions
-goto :end
-
-:VMWare
-echo ==^> Installing VMWare Guest Additions
-@powershell -NoProfile -ExecutionPolicy unrestricted -Command "Mount-DiskImage C:\Users\vagrant\windows.iso"
-@if errorlevel 1 echo ERROR %ERRORLEVEL% while mounting the VMWare Guest Additions ISO
-for %%i in (%DRIVE_LETTERS%) do if exist "%%~i\vmware\setup.exe" set GUEST_DRIVE=%%~i
-if "x%GUEST_DRIVE%" == "x" (
-  echo ERROR: Cannot find VMWare additions
-  exit 1
-)
-cmd /c %GUEST_DRIVE%\vmware\setup.exe /S /v "/qn REBOOT=R ADDLOCAL=ALL"
-@if errorlevel 1 echo ERROR %ERRORLEVEL% while installing VMWare Guest Additions
-@powershell -NoProfile -ExecutionPolicy unrestricted -Command "Dismount-DiskImage C:\Users\vagrant\windows.iso"
-@if errorlevel 1 echo ERROR %ERRORLEVEL% while unmounting the VMWare Guest Additions ISO
-goto :end
-
-:end
-exit 0


Fix git-version.h generation

Fix git-version.h generation

--- MGen/GIT-VS-VERSION-GEN.bat
+++ MGen/GIT-VS-VERSION-GEN.bat
@@ -143,7 +143,7 @@
 :: --------------------
 :: Precedence is Git, VERSION_FILE, then DEFAULT_VERSION.
 :: Check if git is available by testing git describe.
-CALL git describe --tags >NUL 2>&1
+CALL git describe>NUL 2>&1
 IF NOT ERRORLEVEL 1 (
   SET fGIT_AVAILABLE=1
   :: Parse git version string
@@ -286,11 +286,11 @@
 :: Full version releases have the Git patch count at the first '-' while
 :: pre-release versions have it at the second.
 IF [%USE_PRERELEASE_TAGS%] == [0] (
-  FOR /F "tokens=2 delims=-" %%A IN ('"git describe --tags --match %tmp%"') DO (
+  FOR /F "tokens=2 delims=-" %%A IN ('"git describe --match %tmp%"') DO (
     SET nbPATCHES_PART=%%A
   )
 ) ELSE (
-  FOR /F "tokens=3 delims=-" %%A IN ('"git describe --tags --match %tmp%"') DO (
+  FOR /F "tokens=3 delims=-" %%A IN ('"git describe --match %tmp%"') DO (
     SET nbPATCHES_PART=%%A
   )
 )
@@ -304,7 +304,7 @@
 :: PATCHED indicates that the build is taking place at a non-tagged commit.
 SET tmp=v%nbMAJOR_PART%.%nbMINOR_PART%.%nbFIX_PART%%strSTAGE_PART%%nbSTAGE_VERSION%
 IF DEFINED fGIT_AVAILABLE (
-  FOR /F "tokens=*" %%A IN ('"git describe --tags HEAD"') DO SET tmp2=%%A
+  FOR /F "tokens=*" %%A IN ('"git describe HEAD"') DO SET tmp2=%%A
 )
 IF NOT "%tmp%" == "%tmp2%" SET fPATCHED=1

@@ -494,47 +494,47 @@

 :: Builder checked out the parent of v1.0.0
 CALL git reset --hard v1.0.0~1 >NUL
-FOR /F "tokens=*" %%A IN ('"git describe --tags HEAD"') DO SET tmp=%%A
+FOR /F "tokens=*" %%A IN ('"git describe HEAD"') DO SET tmp=%%A
 CALL :TEST_VERSION %tmp%

 :: Builder staged a file.
 CALL touch README >NUL
 CALL git add README
-FOR /F "tokens=*" %%A IN ('"git describe --tags HEAD"') DO SET tmp=%%A
+FOR /F "tokens=*" %%A IN ('"git describe HEAD"') DO SET tmp=%%A
 CALL :TEST_VERSION %tmp%

 :: Builder checks out a tagged release and stages a file
 CALL git reset --hard v1.0.0 >NUL
-FOR /F "tokens=*" %%A IN ('"git describe --tags HEAD"') DO SET tmp=%%A
+FOR /F "tokens=*" %%A IN ('"git describe HEAD"') DO SET tmp=%%A
 CALL touch README
 CALL git add README
 CALL :TEST_VERSION %tmp%

 :: Builder commits that file.
 CALL git commit -m "Modified Release" >NUL
-FOR /F "tokens=*" %%A IN ('"git describe --tags HEAD"') DO SET tmp=%%A
+FOR /F "tokens=*" %%A IN ('"git describe HEAD"') DO SET tmp=%%A
 CALL :TEST_VERSION %tmp%

 :: Builder creates own tag
 CALL git tag v1.0.0-custom -m "Modified Release Tag"
-FOR /F "tokens=*" %%A IN ('"git describe --tags HEAD"') DO SET tmp=%%A
+FOR /F "tokens=*" %%A IN ('"git describe HEAD"') DO SET tmp=%%A
 CALL :TEST_VERSION %tmp%

 :: Builder checked out a maint release and staged a file
 CALL git reset --hard v1.0.0.1 >NUL
-FOR /F "tokens=*" %%A IN ('"git describe --tags HEAD"') DO SET tmp=%%A
+FOR /F "tokens=*" %%A IN ('"git describe HEAD"') DO SET tmp=%%A
 CALL touch README
 CALL git add README
 CALL :TEST_VERSION %tmp%

 :: Builder commits that file.
 CALL git commit -m "Modified Maint Release" >NUL
-FOR /F "tokens=*" %%A IN ('"git describe --tags HEAD"') DO SET tmp=%%A
+FOR /F "tokens=*" %%A IN ('"git describe HEAD"') DO SET tmp=%%A
 CALL :TEST_VERSION %tmp%

 :: Builder creates own tag
 CALL git tag v1.0.0.1-custom -m "Modified Maint Release Tag"
-FOR /F "tokens=*" %%A IN ('"git describe --tags HEAD"') DO SET tmp=%%A
+FOR /F "tokens=*" %%A IN ('"git describe HEAD"') DO SET tmp=%%A
 CALL :TEST_VERSION %tmp%

 ECHO.
@@ -564,4 +564,4 @@

 :: --------------------
 :END
-:: --------------------+:: --------------------


Update initialize_environment.bat

Update initialize_environment.bat

--- resources/functions/initialize_environment.bat
+++ resources/functions/initialize_environment.bat
@@ -56,13 +56,13 @@

 :: Detect system language. This determines which string we look for in ipconfig output for determining if we have an active network connection
 SYSTEM_LANGUAGE=undetected
-reg query "hklm\system\controlset001\control\nls\language" /v Installlanguage | find /i "0409"
+reg query "hklm\system\controlset001\control\nls\language" /v Installlanguage | find /i "0409" >nul 2>&1
 if /i %ERRORLEVEL%==0 set SYSTEM_LANGUAGE=en
-reg query "hklm\system\controlset001\control\nls\language" /v Installlanguage | find /i "0407"
+reg query "hklm\system\controlset001\control\nls\language" /v Installlanguage | find /i "0407" >nul 2>&1
 if /i %ERRORLEVEL%==0 set SYSTEM_LANGUAGE=de
-reg query "hklm\system\controlset001\control\nls\language" /v Installlanguage | find /i "040C"
+reg query "hklm\system\controlset001\control\nls\language" /v Installlanguage | find /i "040C" >nul 2>&1
 if /i %ERRORLEVEL%==0 set SYSTEM_LANGUAGE=fr
-reg query "hklm\system\controlset001\control\nls\language" /v Installlanguage | find /i "0C0A"
+reg query "hklm\system\controlset001\control\nls\language" /v Installlanguage | find /i "0C0A" >nul 2>&1
 if /i %ERRORLEVEL%==0 set SYSTEM_LANGUAGE=es


testing network detection fix

testing network detection fix

--- resources/functions/initialize_environment.bat
+++ resources/functions/initialize_environment.bat
@@ -63,29 +63,45 @@
 :: Detect system language. This determines which string we look for in ipconfig output for determining if we have an active network connection
 :: English
 reg query "hklm\system\controlset001\control\nls\language" /v Installlanguage | %FIND% /i "0409" >nul 2>&1
-if /i %ERRORLEVEL%==0 set SYSTEM_LANGUAGE=en
-goto detect_network_connection
+if /i %ERRORLEVEL%==0 (
+	set SYSTEM_LANGUAGE=en
+	goto detect_network_connection
+)
+
 :: English UK
 reg query "hklm\system\controlset001\control\nls\language" /v Installlanguage | %FIND% /i "0809" >nul 2>&1
-if /i %ERRORLEVEL%==0 set SYSTEM_LANGUAGE=gb
-goto detect_network_connection
+if /i %ERRORLEVEL%==0 (
+	set SYSTEM_LANGUAGE=gb
+	goto detect_network_connection
+)
+
 :: German
 reg query "hklm\system\controlset001\control\nls\language" /v Installlanguage | %FIND% /i "0407" >nul 2>&1
-if /i %ERRORLEVEL%==0 set SYSTEM_LANGUAGE=de
-goto detect_network_connection
+if /i %ERRORLEVEL%==0 (
+	set SYSTEM_LANGUAGE=de
+	goto detect_network_connection
+)
+
 :: French
 reg query "hklm\system\controlset001\control\nls\language" /v Installlanguage | %FIND% /i "040C" >nul 2>&1
-if /i %ERRORLEVEL%==0 set SYSTEM_LANGUAGE=fr
-goto detect_network_connection
+if /i %ERRORLEVEL%==0 (
+	set SYSTEM_LANGUAGE=fr
+	goto detect_network_connection
+)
+
 :: Spanish
 reg query "hklm\system\controlset001\control\nls\language" /v Installlanguage | %FIND% /i "0C0A" >nul 2>&1
-if /i %ERRORLEVEL%==0 set SYSTEM_LANGUAGE=es
-goto detect_network_connection
+if /i %ERRORLEVEL%==0 (
+	set SYSTEM_LANGUAGE=es
+	goto detect_network_connection
+)
+
 :: Turkish
 reg query "hklm\system\controlset001\control\nls\language" /v Installlanguage | %FIND% /i "041F" >nul 2>&1
-if /i %ERRORLEVEL%==0 set SYSTEM_LANGUAGE=tr
-goto detect_network_connection
-
+if /i %ERRORLEVEL%==0 (
+	set SYSTEM_LANGUAGE=tr
+	goto detect_network_connection
+)

 :: Detect network connection. We assume it's available unless we actively detect it isn't
 :detect_network_connection
@@ -113,7 +129,7 @@
 popd

-:: Build log directories if they don't already exist
+:: Build log directories if they don't exist
 for %%D in ("%LOGPATH%","%QUARANTINE_PATH%","%BACKUPS%","%RAW_LOGS%","%SUMMARY_LOGS%") do (
 	if not exist %%D mkdir %%D
 )


Added docpad update script

Added docpad update script

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

--- tools/updateDocpad.cmd
+++ tools/updateDocpad.cmd
@@ -0,0 +1,3 @@
+cd..
+cmd /c docpad update
+pause


combine unzip gz and tar files in one line

--- doradus-distribution/doradus-dist-run.bat
+++ doradus-distribution/doradus-dist-run.bat
@@ -4,7 +4,7 @@
 if not exist cassandra (
     echo "Installing and configuring Cassandra 2.0.7 for Doradus"
     .\tools\wget http://downloads.datastax.com/community/dsc-cassandra-2.0.7-bin.tar.gz
-    .\tools\tar -xzvf dsc-cassandra-2.0.7-bin.tar.gz
+    tools\7za.exe x -tgzip dsc-cassandra-2.0.7-bin.tar.gz  && tools\7za.exe  x dsc-cassandra-2.0.7-bin.tar
     ren dsc-cassandra-2.0.7 cassandra
     mkdir cassandra-data
     cd cassandra-data
@@ -12,7 +12,7 @@
     mkdir saved_caches
     mkdir commitlog
     .\tools\touch system.log
-    cd ..\cassandra\conf/
+    cd ..\cassandra\conf
     sed -e 's,/var/lib/cassandra,./cassandra-data,' -i "" cassandra.yaml
     sed -e 's,/var/log/cassandra,./cassandra-data,' -i "" log4j-server.properties
     cd ..\..


chore: remove pause statement

chore: remove pause statement

--- environment/stack/scripts/update.bat
+++ environment/stack/scripts/update.bat
@@ -56,7 +56,7 @@
 	ECHO Authentication required
 	GOTO END_ERROR
 )
-pause
+
 CALL wget -t 2 --timeout 2 -q -nv "--http-user=%YAWDS_UPDATE_USER%" "--http-passwd=%YAWDS_UPDATE_PASSWORD%" -O "%TEMP%\yawds_latest.ini" "%YAWDS_CONF_UPDATE_CHECK_URL%"
 GOTO CONTINUE


Added serve script

Added serve script

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

--- Documentation/serve.cmd
+++ Documentation/serve.cmd
@@ -0,0 +1,2 @@
+@echo off
+docfx serve _site


add Lenovo entries

add Lenovo entries

--- resources/stage_2_de-bloat/oem/programs_to_target_by_GUID.bat
+++ resources/stage_2_de-bloat/oem/programs_to_target_by_GUID.bat
@@ -2650,6 +2650,12 @@
 :: KODAK Share Button App
 start /wait msiexec /qn /norestart /x {DE9B51D7-C575-4587-A848-DE95CD7F7684}

+:: LeapFrog Connect
+start /wait msiexec /qn /norestart /x {F9233F02-5617-4BDC-8EC6-4B798EDFE6F4}
+
+:: LeapFrog LeapPad Explorer Plugin
+start /wait msiexec /qn /norestart /x {B124E3EA-59C5-462B-98EF-374099EA7A61}
+
 :: Lenovo Battery Gauge
 start /wait msiexec /qn /norestart /x {B8D3ED8D-A295-44C2-8AE1-56823D44AD1F}

@@ -3522,6 +3528,7 @@
 start /wait msiexec /qn /norestart /x {92C7DC44-DAD3-49FE-B89B-F92C6BA9A331}
 start /wait msiexec /qn /norestart /x {39187A4B-7538-4BE7-8BAD-9E83303793AA}
 start /wait msiexec /qn /norestart /x {05A55927-DB9B-4E26-BA44-828EBFF829F0}
+start /wait msiexec /qn /norestart /x {A14962A7-2B7D-456E-BFCD-F54E3A88D41F}

 :: TOSHIBA Bulletin Board
 start /wait msiexec /qn /norestart /x {C14518AF-1A0F-4D39-8011-69BAA01CD380}
@@ -3549,6 +3556,7 @@
 start /wait msiexec /qn /norestart /x {72EFCFA8-3923-451D-AF52-7CE9D87BC2A1}
 start /wait msiexec /qn /norestart /x {59358FD4-252B-4B38-AB81-955C491A494F}
 start /wait msiexec /qn /norestart /x {2C486987-D447-4E36-8D61-86E48E24199C}
+start /wait msiexec /qn /norestart /x {C2F94B5E-201A-4754-8F2F-4395E1D90DA3}

 :: TOSHIBA Extended Tiles for Windows Mobility Center // GUID shared with TOSHIBA Disc Creator
 start /wait msiexec /qn /norestart /x {5DA0E02F-970B-424B-BF41-513A5018E4C0}
@@ -3558,6 +3566,9 @@

 :: TOSHIBA Flash Cards Support Utility
 start /wait msiexec /qn /norestart /x {617C36FD-0CBE-4600-84B2-441CEB12FADF}
+
+:: TOSHIBA Hardware Setup
+start /wait msiexec /qn /norestart /x {5279374D-87FE-4879-9385-F17278EBB9D3}

 :: TOSHIBA HDD/SDD Alert 3.1.64.x
 start /wait msiexec /qn /norestart /x {D4322448-B6AF-4316-B859-D8A0E84DCB38}
@@ -3565,6 +3576,9 @@
 :: TOSHIBA Media Controller and TOSHIBA Media Controller Plug-in 1.0.5.11
 start /wait msiexec /qn /norestart /x {983CD6FE-8320-4B80-A8F6-0D0366E0AA22}
 start /wait msiexec /qn /norestart /x {F26FDF57-483E-42C8-A9C9-EEE1EDB256E0}
+
+:: Toshiba Online Backup
+star /wait msiexec /qn /norestart /x {C57BCDE1-7CB9-467D-B3BA-7E119916CDC1}

 :: Toshiba Password Utility
 start /wait msiexec /qn /norestart /x {26BB68BB-CF93-4A12-BC6D-A3B6F53AC8D9}
@@ -3617,6 +3631,9 @@
 start /wait msiexec /qn /norestart /x {B040D5C9-C9AA-430A-A44E-696656012E61}
 start /wait msiexec /qn /norestart /x {EFCCEE68-1317-40A5-B785-C07AD2769338}

+:: TOSHIBA Supervisor Password
+start /wait msiexec /qn /norestart /x {51B4E156-14A5-4904-9AE4-B1AA2A0E46BE}
+
 :: Toshiba TEMPRO
 start /wait msiexec /qn /norestart /x {F76F5214-83A8-4030-80C9-1EF57391D72A}

@@ -3634,6 +3651,9 @@
 start /wait msiexec /qn /norestart /x {5E6F6CF3-BACC-4144-868C-E14622C658F3}
 start /wait msiexec /qn /norestart /x {6F3C8901-EBD3-470D-87F8-AC210F6E5E02}

+:: TOSHIBA Wireless Display Monitor
+start /wait msiexec /qn /norestart /x {617773AE-ADBA-4479-BB04-65FE7758B35C}
+
 :: Toshiba Wireless LAN Indicator
 start /wait msiexec /qn /norestart /x {CDADE9BC-612C-42B8-B929-5C6A823E7FF9}
 start /wait msiexec /qn /norestart /x {5B01BCB7-A5D3-476F-AF11-E515BA206591}
@@ -3656,6 +3676,9 @@

 :: VIP Access (Lenovo-installed OEM bloatware for Verisign)
 start /wait msiexec /qn /norestart /x {E8D46836-CD55-453C-A107-A59EC51CB8DC}
+
+:: VTech Download Agent Libarary
+start /wait msiexec /qn /norestart /x {40C4903E-EDFB-4CAE-A611-41FEBA585921}

 :: Real Networks Video Downloader, VideoManager, VideoToolkit
 start /wait msiexec /qn /norestart /x {62796191-6F12-4ABE-BA8B-B4D4A266C997}


- Stub setup folder for a reproducible setup/install procedure.

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

--- setup/win/install_beautifulsoup.bat
+++ setup/win/install_beautifulsoup.bat
@@ -0,0 +1,3 @@
+cd ../beautifulsoup
+python setup.py install
+pause


minor changes

minor changes

--- Install.bat
+++ Install.bat
@@ -1,5 +0,0 @@
-call echo "Installing Machinima Studio dependencies"
-call cd .\gw2
-call npm install
-call cd .\gw2ui
-call npm install


MC-3750: Не работает upload библиотек конфигурации #resolved

--- Install.bat
+++ Install.bat
@@ -1,4 +1,13 @@
+::Copy metadata
 xcopy SystemConfiguration_1.0.0.0\* Assemblies\SystemConfiguration_1.0.0.0\ /s /y
+
+::Start ServiceHost
+start /d ..\InfinniPlatform\Assemblies\ InfinniPlatform.ServiceHost.exe
+
+::Wait 5 sec till ServiceHost start
+timeout 5
+
+::Upload assemblies and metadata
 pushd Assemblies
 InfinniPlatform.Utils.exe upload SystemConfiguration_1.0.0.0 withMetadata
 popd


Update version in DXR binaries check. (#361) (#362)

--- Samples/Desktop/D3D12Raytracing/tools/x64/PrebuildCheck.bat
+++ Samples/Desktop/D3D12Raytracing/tools/x64/PrebuildCheck.bat
@@ -28,7 +28,7 @@
 copy dxc.exe fxc.exe

 if %FILENOTFOUND% NEQ 0 (
-	echo Please go to https://github.com/Microsoft/DirectX-Graphics-Samples/releases and download "DirectX Raytracing Binary Release v1.0".
+	echo Please go to https://github.com/Microsoft/DirectX-Graphics-Samples/releases and download latest "DirectX Raytracing Binary Release v1.1".
 	echo Copy all the binaries to Samples\Desktop\D3D12Raytracing\tools\x64"
 	exit /b 1
 )


update kuduscript commit id

update kuduscript commit id

--- Kudu.Services.Web/updateNodeModules.cmd
+++ Kudu.Services.Web/updateNodeModules.cmd
@@ -10,7 +10,7 @@
 set /a counter+=1
 echo Attempt %counter% out of %attempts%

-cmd /c npm install https://github.com/projectkudu/KuduScript/tarball/e32ee2d0a8582d42acb9ea6d567da7734c82aae5
+cmd /c npm install https://github.com/projectkudu/KuduScript/tarball/4161bca23a9e2532fffa20cf5fc4df45982796cf
 IF %ERRORLEVEL% NEQ 0 goto error

 goto end


Update kuduscript to latest for adding python support

--- Kudu.Services.Web/updateNodeModules.cmd
+++ Kudu.Services.Web/updateNodeModules.cmd
@@ -10,7 +10,7 @@
 set /a counter+=1
 echo Attempt %counter% out of %attempts%

-cmd /c npm install https://github.com/projectkudu/KuduScript/tarball/da0885fc7a8a2facba79a8b5ca818ed6a730d856
+cmd /c npm install https://github.com/projectkudu/KuduScript/tarball/eddc60f7017a05a02bd9b19b3162ce58a10de81a
 IF %ERRORLEVEL% NEQ 0 goto error

 goto end


Removed unnecessary file.

Removed unnecessary file.

--- push_google_code.bat
+++ push_google_code.bat
@@ -1,2 +0,0 @@
-hg push https://andengine.googlecode.com/hg/
-pause


refactor: Clean code[753195]

refactor: Clean code[753195]

--- TTKScript/make_cert.bat
+++ TTKScript/make_cert.bat
@@ -3,7 +3,7 @@
 if not exist %1 echo "%1 not exist" && exit

 set base=C:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\bin
-"%base%\makecert.exe" -a sha512 -r -n "CN=Greedysky Studio" -b 01/01/2016 -e 12/31/2020 -sv %temp%\CbipSetupKey.pvk %temp%\CbipSetupKey.cer
+"%base%\makecert.exe" -a sha512 -r -n "CN=Greedysky Studio" -b 01/01/2016 -e 12/31/2022 -sv %temp%\CbipSetupKey.pvk %temp%\CbipSetupKey.cer
 "%base%\cert2spc.exe" %temp%\CbipSetupKey.cer %temp%\CbipSetupKey.spc
 "%base%\pvk2pfx.exe" -pvk %temp%\CbipSetupKey.pvk -spc %temp%\CbipSetupKey.spc -f -pfx %userprofile%\Desktop\TTKMusicplayer.pfx
 "%base%\signtool.exe" sign /f %userprofile%\Desktop\TTKMusicplayer.pfx  /t "http://timestamp.verisign.com/scripts/timstamp.dll" /d "TTKMusicplayer" %1


Delete package.csharp.nuget.cmd

Delete package.csharp.nuget.cmd

--- package.csharp.nuget.cmd
+++ package.csharp.nuget.cmd
@@ -1,9 +0,0 @@
-@echo off
-pushd .
-
-ECHO ********** Build projects in release mode
-dotnet build -p:BuildProjectReferences=false;DebugSymbols=false;AssemblyName=Avalara.AvaTax.RestClient -c Release --no-dependencies src\Avalara.AvaTax.RestClient.csproj
-
-ECHO ********** Packaging NUGET
-.\nuget.exe pack src\Avalara.AvaTax.RestClient.nuspec
-pause


Updated RunGame batch file

Updated RunGame batch file

--- RunGame.bat
+++ RunGame.bat
@@ -1,2 +1,2 @@
-python main.py
+python main.pyw
 pause


chore: bump ReportGenerator dep to 4.2.17

--- tools/testcoverage.bat
+++ tools/testcoverage.bat
@@ -9,7 +9,7 @@

 cd ../../%destination%

-set "reportgenerator=%UserProfile%\.nuget\packages\reportgenerator\4.2.16\tools\net47\ReportGenerator.exe"
+set "reportgenerator=%UserProfile%\.nuget\packages\reportgenerator\4.2.17\tools\net47\ReportGenerator.exe"
 set "targetdir=."

 "%reportGenerator%" -reports:coverage.xml -reporttypes:HtmlInline -targetdir:%targetdir%


Chore: Update tools dependency.

Chore: Update tools dependency.

--- tools/testcoverage.bat
+++ tools/testcoverage.bat
@@ -9,7 +9,7 @@

 cd ../../%destination%

-set "reportgenerator=%UserProfile%\.nuget\packages\reportgenerator\4.1.2\tools\net47\ReportGenerator.exe"
+set "reportgenerator=%UserProfile%\.nuget\packages\reportgenerator\4.1.3\tools\net47\ReportGenerator.exe"
 set "targetdir=."

 "%reportGenerator%" -reports:coverage.xml -reporttypes:HtmlInline -targetdir:%targetdir%


Support salt on windows

Support salt on windows

--- recipes/salt/bld.bat
+++ recipes/salt/bld.bat
@@ -2,13 +2,13 @@
 if errorlevel 1 exit 1

 for %%DIR in (
-              etc/salt
-              var/cache/salt
-              var/run/salt
-              srv/salt
-              srv/pillar
-              var/log/salt
-              var/run
-       ) do (
-              MKDIR %PREFIX%/%%DIR
-       )
+       etc/salt
+       var/cache/salt
+       var/run/salt
+       srv/salt
+       srv/pillar
+       var/log/salt
+       var/run
+) do (
+       mkdir %PREFIX%\%%DIR
+)


Fix path to install cygwin.

Fix path to install cygwin.

--- windows/floppy/windows-2012-standard-amd64-vagrant/configure.bat
+++ windows/floppy/windows-2012-standard-amd64-vagrant/configure.bat
@@ -1,5 +1,4 @@
 :: %~dp0 gives the dirname of the script

 cmd /c %~dp0firewall-disable.bat
-cmd /c %~dp0vagrant-ssh.bat
-
+cmd /c %~dp0install-cygwin-sshd.bat


Switch default windows git version to 1.9.5.

R=pgervais@chromium.org, agable@chromium.org, friedman@chromium.org
BUG=

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

git-svn-id: bd64dd6fa6f3f0ed0c0666d1018379882b742947@293482 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

--- bootstrap/win/win_tools.bat
+++ bootstrap/win/win_tools.bat
@@ -60,7 +60,7 @@
 if "%DEPOT_TOOLS_GIT_BLEEDING%" == "1" (
   set GIT_VERSION=1.9.5.chromium.5
 ) else (
-  set GIT_VERSION=1.9.0.chromium.6
+  set GIT_VERSION=1.9.5.chromium.5
 )
 for /f "tokens=2 delims=[]" %%i in ('ver') do set VERSTR=%%i
 for /f "tokens=2,3 delims=. " %%i in ("%VERSTR%") do (set VERMAJOR=%%i & set VERMINOR=%%j)


Update CleanSystem.bat

Update CleanSystem.bat

--- Windows/CleanSystem.bat
+++ Windows/CleanSystem.bat
@@ -67,3 +67,4 @@
 dism /online /disable-feature /featurename:TFTP >NUL
 dism /online /disable-feature /featurename:TelnetClient >NUL
 dism /online /disable-feature /featurename:TelnetServer >NUL
+PAUSE


Cygwin setup.exe -q 只會安裝 Base 的套件，因此要透過 -P 指定要額外安裝的套件

git-svn-id: 27ae7bafcf274886d2a5c602fae7f4b1f73c86e2@7 93027196-e06e-408b-8539-b5ef0f54f2f3

--- hadoop4win-setup/hadoop4win-setup.bat
+++ hadoop4win-setup/hadoop4win-setup.bat
@@ -78,9 +78,9 @@
 REM -- Note that last-* must *not* containing whitespace, e.g. " " etc.
 REM -- This is why there below is no space in front of ">".

-echo Install> "%CYGWIN_ROOT%\etc\setup\last-action"
-echo %LOCAL_REPOSITORY%> "%CYGWIN_ROOT%\etc\setup\last-cache"
-echo cygwin_mirror> "%CYGWIN_ROOT%\etc\setup\last-mirror"
+echo Install > "%CYGWIN_ROOT%\etc\setup\last-action"
+echo %LOCAL_REPOSITORY% > "%CYGWIN_ROOT%\etc\setup\last-cache"
+echo cygwin_mirror > "%CYGWIN_ROOT%\etc\setup\last-mirror"

 REM - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 REM Finally, run Cygwin setup quietly
@@ -90,7 +90,7 @@

 REM real do cygwin installation

-"%CYGWIN_SETUP%" -q -d -L -l "%LOCAL_REPOSITORY%\cygwin_mirror" -R "%CYGWIN_ROOT%"
+"%CYGWIN_SETUP%" -q -d -L -l "%LOCAL_REPOSITORY%\cygwin_mirror" -R "%CYGWIN_ROOT%" -P cygrunsrv,file,openssh,perl,procps,ncurses,rsync,sharutils,shutdown,subversion,tcp_wrappers,termcap,unzip,wget,zip,zlib

 REM - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 REM Installation of Hadoop and JDK


Fix build script to also work when nuget.exe isn't in the path

--- build/nuget/build-nupkg.cmd
+++ build/nuget/build-nupkg.cmd
@@ -1,4 +1,6 @@
 @ECHO OFF
+
+PUSHD %~dp0

 WHERE /Q nuget >NUL
 IF %ERRORLEVEL% NEQ 0 (
@@ -11,4 +13,6 @@
 nuget pack %~dp0WindowsCanvas.nuspec -nopackageanalysis -outputdirectory %~dp0..\..\bin %*
 nuget pack %~dp0WindowsCanvas-debug.nuspec -nopackageanalysis -outputdirectory %~dp0..\..\bin %*

-:END+:END
+
+POPD


#221: Fixed Windows startup scripts to properly verify Java version.

--- perfcake/src/main/scripts/perfcake.bat
+++ perfcake/src/main/scripts/perfcake.bat
@@ -128,7 +128,11 @@
 SET PERFCAKE_JAVA_EXE="%JAVA_HOME%\bin\java.exe"

 @REM Check Java version
-for /f "tokens=1-2" "delims=.-_" %%j in ('"%PERFCAKE_JAVA_EXE%" -version 2>&1') do set "jver=%%j%%k%%l%%m"
+for /f tokens^=2-4^ delims^=.-_^" %%j in ('"%PERFCAKE_JAVA_EXE%" -version 2^>^&1') do (
+  set jver=%%j%%k
+  goto :breakVer
+)
+:breakVer
 if not %jver% LSS 18 goto runPERFCAKE
 echo Unsupported Java version. PerfCake requires Java 8 and higher.
 goto error


updateHostsWindows.bat :: refactoring, fixed

- based on https://stackoverflow.com/a/10052222
- additional flags --auto --minimise (purged useless comments in final file = smaller size)  used
- tested on Windows 10 x64 - works well

--- updateHostsWindows.bat
+++ updateHostsWindows.bat
@@ -1,3 +1,4 @@
+::
 :: This script will first create a backup of the original or current hosts
 :: file and save it in a file titled "hosts.skel"
 ::
@@ -5,26 +6,56 @@
 :: will be copied to the proper path. Next, the DNS cache will be refreshed.
 ::
 :: THIS BAT FILE MUST BE LAUNCHED WITH ADMINISTRATOR PRIVILEGES
+:: Admin privileges script based on https://stackoverflow.com/a/10052222
+::
+::
 @ECHO OFF
 TITLE Update Hosts

 :: Check if we are administrator. If not, exit immediately.
+:: BatchGotAdmin
+:-------------------------------------
+REM  --> Check for permissions
+    IF "%PROCESSOR_ARCHITECTURE%" EQU "amd64" (
+>nul 2>&1 "%SYSTEMROOT%\SysWOW64\cacls.exe" "%SYSTEMROOT%\SysWOW64\config\system"
+) ELSE (
 >nul 2>&1 "%SYSTEMROOT%\system32\cacls.exe" "%SYSTEMROOT%\system32\config\system"
-if %ERRORLEVEL% NEQ 0 (
-    ECHO This script must be run with administrator privileges!
-    ECHO Please launch command prompt as administrator. Exiting...
-    EXIT /B 1
 )

-if not exist "%WINDIR%\System32\drivers\etc\hosts.skel" (
-	COPY %WINDIR%\System32\drivers\etc\hosts %WINDIR%\System32\drivers\etc\hosts.skel
-)
+REM --> If error flag set, we do not have admin.
+if '%errorlevel%' NEQ '0' (
+    echo Requesting administrative privileges...
+    goto UACPrompt
+) else ( goto gotAdmin )

-:: Update hosts file
-python updateHostsFile.py -a
+: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"

-:: Move new hosts file in-place
-COPY hosts %WINDIR%\System32\drivers\etc\
+    "%temp%\getadmin.vbs"
+    del "%temp%\getadmin.vbs"
+    exit /B

-:: Flush the DNS cache
-ipconfig /flushdns
+:gotAdmin
+    pushd "%CD%"
+    CD /D "%~dp0"
+
+:BackupHosts
+	:: Backup default hosts file
+	if not exist "%WINDIR%\System32\drivers\etc\hosts.skel" (
+		COPY %WINDIR%\System32\drivers\etc\hosts %WINDIR%\System32\drivers\etc\hosts.skel
+	)
+
+:UpdateHosts
+	:: Update hosts file
+	python updateHostsFile.py --auto --minimise
+
+	:: Move new hosts file in-place
+	COPY hosts %WINDIR%\System32\drivers\etc\
+
+	:: Flush the DNS cache
+	ipconfig /flushdns
+
+	:: Summary note
+	pause


win: fix version name

win: fix version name

--- conda/win/create_bundle.bat
+++ conda/win/create_bundle.bat
@@ -51,9 +51,9 @@
 copy C:\Users\travis\build\FreeCAD\FreeCAD-AppImage\conda\modifications\ctx_mp_python.py %copy_dir%\bin\Lib\site-packages\mpmath\ctx_mp_python.py

 if "%DEPLOY_RELEASE%"=="weekly-builds" (
-%copy_dir%\bin\python.exe -c "import FreeCAD;print('weekly-builds-' + FreeCAD.Version()[2])" > tempver.txt
+%copy_dir%\bin\python.exe -c "import FreeCAD;print('weekly-builds-' + FreeCAD.Version()[2].split(' ')[0]" > tempver.txt
 ) else (
-%copy_dir%\bin\python.exe -c "import FreeCAD;print((FreeCAD.Version()[0]) +'.' + (FreeCAD.Version()[1]) +'.' + (FreeCAD.Version()[2]))" > tempver.txt
+%copy_dir%\bin\python.exe -c "import FreeCAD;print((FreeCAD.Version()[0]) +'.' + (FreeCAD.Version()[1]) +'.' + (FreeCAD.Version()[2].split(' ')[0]))" > tempver.txt
 )
 set /p fcver=<tempver.txt


win: add commit-number

win: add commit-number

--- conda/win/create_bundle.bat
+++ conda/win/create_bundle.bat
@@ -50,15 +50,13 @@
 rename %copy_dir%\bin\Lib\site-packages\mpmath\ctx_mp_python.py ctx_mp_python-orig.py
 copy C:\Users\travis\build\FreeCAD\FreeCAD-AppImage\conda\modifications\ctx_mp_python.py %copy_dir%\bin\Lib\site-packages\mpmath\ctx_mp_python.py

+if "%DEPLOY_RELEASE%"=="weekly-builds" (
+%copy_dir%\bin\python.exe -c "import FreeCAD;print("weekly-builds-" + FreeCAD.Version()[2])" > tempver.txt
+) else (
 %copy_dir%\bin\python.exe -c "import FreeCAD;print((FreeCAD.Version()[0]) +'.' + (FreeCAD.Version()[1]) +'.' + (FreeCAD.Version()[2]))" > tempver.txt
+)
 set /p fcver=<tempver.txt

-IF "%DEPLOY_RELEASE%"=="weekly-builds" (
-    set fcver=weekly-builds
-)
-ELSE (
-    set fcver=%fcver:~0,10%
-)
 echo %fcver%
 cd %copy_dir%\..
 ren %copy_dir% FreeCAD_%fcver%-Win-Conda_vc14.x-x86_64


win: again

win: again

--- conda/win/create_bundle.bat
+++ conda/win/create_bundle.bat
@@ -51,7 +51,7 @@
 copy C:\Users\travis\build\FreeCAD\FreeCAD-AppImage\conda\modifications\ctx_mp_python.py %copy_dir%\bin\Lib\site-packages\mpmath\ctx_mp_python.py

 if "%DEPLOY_RELEASE%"=="weekly-builds" (
-%copy_dir%\bin\python.exe -c "import FreeCAD;print('weekly-builds-' + FreeCAD.Version()[2].split(' ')[0]" > tempver.txt
+%copy_dir%\bin\python.exe -c "import FreeCAD;print('weekly-builds-' + FreeCAD.Version()[2].split(' ')[0])" > tempver.txt
 ) else (
 %copy_dir%\bin\python.exe -c "import FreeCAD;print((FreeCAD.Version()[0]) +'.' + (FreeCAD.Version()[1]) +'.' + (FreeCAD.Version()[2].split(' ')[0]))" > tempver.txt
 )


escape white spaces in url

escape white spaces in url

--- GitHubMirrorScript.bat
+++ GitHubMirrorScript.bat
@@ -8,9 +8,9 @@
  GOTO :END
 )

-SET masterRepoUrl=%1
+SET masterRepoUrl="%1"
 SET mirrorDirName="vso-intelliJ-mirror"
-SET mirrorRepoUrl=%2
+SET mirrorRepoUrl="%2"

 echo "Delete local mirror directory"
 rd /S /Q %mirrorDirName%


Additional run file for windows, as git-bash sucks when calling other bat files (like maven)

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

--- run.bat
+++ run.bat
@@ -0,0 +1 @@
+call mvn.bat compile exec:java -P run-single -D"exec.args"="%*" -X


make build script more verbose and explicitly create directories.

--- recipes/mecab-ko/bld.bat
+++ recipes/mecab-ko/bld.bat
@@ -1,17 +1,34 @@
+mkdir "%PREFIX%\include\"
+if errorlevel 1 exit 1
+mkdir "%PREFIX%\bin\"
+if errorlevel 1 exit 1
+mkdir "%PREFIX%\lib\"
+if errorlevel 1 exit 1
+
 cd src
 if errorlevel 1 exit 1
 nmake -f Makefile.msvc.x64.in
 if errorlevel 1 exit 1

 cp mecab.h "%PREFIX%\include\"
+if errorlevel 1 exit 1
+
 cp libmecab.dll "%PREFIX%\lib\"
+if errorlevel 1 exit 1
 cp libmecab.lib "%PREFIX%\lib\"
+if errorlevel 1 exit 1

 cp mecab.exe "%PREFIX%\bin\"
+if errorlevel 1 exit 1
 cp mecab-cost-train.exe "%PREFIX%\bin\"
+if errorlevel 1 exit 1
 cp mecab-dict-gen.exe "%PREFIX%\bin\"
+if errorlevel 1 exit 1
 cp mecab-dict-index.exe "%PREFIX%\bin\"
+if errorlevel 1 exit 1
 cp mecab-system-eval.exe "%PREFIX%\bin\"
+if errorlevel 1 exit 1
 cp mecab-test-gen.exe "%PREFIX%\bin\"
+if errorlevel 1 exit 1

-if errorlevel 1 exit 1
+if errorlevel 1 exit /b 1


batch script for installing rdoc for ri

batch script for installing rdoc for ri

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

--- watir/install-rdoc.bat
+++ watir/install-rdoc.bat
@@ -0,0 +1 @@
+rdoc --exclude "unittests|examples|install.rb" -r


Now install_tdriver_interface.bat makes directories and copies also templates and completions.

--- install_tdriver_interface.bat
+++ install_tdriver_interface.bat
@@ -1 +1,8 @@
-ruby -cw libtdriverutil\tdriver_interface.rb && copy /y libtdriverutil\tdriver_interface.rb C:\tdriver\visualizer\tdriver_interface.rb+mkdir C:\tdriver\visualizer
+ruby -cw libtdriverutil\tdriver_interface.rb && copy /y libtdriverutil\tdriver_interface.rb C:\tdriver\visualizer\tdriver_interface.rb
+
+mkdir C:\tdriver\visualizer\templates
+copy libtdrivereditor\templates\*.* C:\tdriver\visualizer\templates
+
+mkdir C:\tdriver\visualizer\completions
+copy libtdrivereditor\completions\*.* C:\tdriver\visualizer\completions


updated scipy

updated scipy

--- install-requirements.bat
+++ install-requirements.bat
@@ -1,4 +1,4 @@
 python\python.exe downloads\get-pip.py
 python\python.exe -m pip install downloads\numpy‑1.13.3+mkl‑cp35‑cp35m‑win_amd64.whl
-python\python.exe -m pip install downloads\scipy-0.19.1-cp35-cp35m-win_amd64.whl
+python\python.exe -m pip install downloads\scipy-1.0.0-cp35-cp35m-win_amd64.whl
 python\python.exe -m pip install opencv-python pillow pygame tensorflow pyqt5


Fix the typo in the windows install script.

--- jenkins/install-test.bat
+++ jenkins/install-test.bat
@@ -53,7 +53,7 @@
 rem # right now we have one build, fake the platform resulution crap
 cscript /nologo wget.vbs /url:"http://%OMNITRUCK_BASE_URL%/chef/download?p=windows&pv=2008r2&m=x86_64&v=%INSTALL_CHEF_VERSION%" /path:%TMP%\install.msi

-call msiexec INTSALLLOCATION=C:\opscode /qb /i %TMP%\install.msi || GOTO :error
+call msiexec INSTALLLOCATION=C:\opscode /qb /i %TMP%\install.msi || GOTO :error

 call C:\opscode\chef\bin\chef-client --version || GOTO :error


Create WebIDE-Red-Windows.bat

Create WebIDE-Red-Windows.bat

error: pathspec 'WebIDE-Red-Windows.bat' did not match any file(s) known to git

--- WebIDE-Red-Windows.bat
+++ WebIDE-Red-Windows.bat
@@ -0,0 +1 @@
+


New script: Start up xwindows xterm with current directory added to path

git-svn-id: 9ecf60ce9baff443e30a0472d3fd222fcb8117cf@6036 7b97033b-253e-4a5c-9b07-e25f9089a9fd

error: pathspec 'Applications/Specware/bin/windows/StartXWin.cmd' did not match any file(s) known to git

--- Applications/Specware/bin/windows/StartXWin.cmd
+++ Applications/Specware/bin/windows/StartXWin.cmd
@@ -0,0 +1 @@
+C:\cygwin\bin\run.exe -p "%CD%" /usr/bin/bash.exe -l -c "/usr/bin/startxwin.exe"


1.8.6 -- add GUID for jre 10.0.2

1.8.6 -- add GUID for jre 10.0.2

--- java_runtime_nuker.bat
+++ java_runtime_nuker.bat
@@ -10,7 +10,8 @@
 ::                 - /u/MrYiff          : bug fix related to OS_VERSION variable
 ::                 - /u/cannibalkitteh  : additional registry & file cleaning locations
 ::                 - forums.oracle.com/people/mattmn : a lot of stuff from his Java removal script
-:: Version:       1.8.5 + ADDITION:    Add GUID for JRE 9.0.4
+:: Version:       1.8.6 + ADDITION:    Add GUID for JRE 10.0.2
+::                1.8.5 + ADDITION:    Add GUID for JRE 9.0.4
 ::                1.8.4 + ADDITION:    Add support for removal of JRE series 9
 ::                1.8.3 * IMPROVEMENT: Add deletion of orphaned Java binaries from the Windows system folders. Thanks to /u/Mikkehy
 ::                1.8.2 * IMPROVEMENT: Expand JRE8 mask to catch versions over 99 (3-digit identifier vs. 2). Thanks to /u/flash44007
@@ -82,8 +83,8 @@
 :: PREP AND CHECKS ::
 :::::::::::::::::::::
 @echo off && cls
-set SCRIPT_VERSION=1.8.5
-set SCRIPT_UPDATED=2018-01-19
+set SCRIPT_VERSION=1.8.6
+set SCRIPT_UPDATED=2018-07-18
 :: Get the date into ISO 8601 standard format (yyyy-mm-dd) so we can use it
 FOR /f %%a in ('WMIC OS GET LocalDateTime ^| find "."') DO set DTS=%%a
 set CUR_DATE=%DTS:~0,4%-%DTS:~4,2%-%DTS:~6,2%
@@ -216,6 +217,10 @@
 :: type, which always equals '32' or '64'. The first wildcard is the architecture, the second is the revision/update number.
 :: Beginning with JRE versions over 99 (JRE8 was first major version to have subversions go over 99), the GUID string "2F8__", which identified architecture, switched to "2F__", presumably to make room for the new 3rd digit in the version identifying section. You can see this in the JRE8 portion below.

+:: JRE 10
+call :log "%CUR_DATE% %TIME%   JRE 10..."
+%WMIC% product where "IdentifyingNumber like '{EECB2736-D013-5AC5-9917-7656712F6931}'" call uninstall /nointeractive >> "%LOGPATH%\%LOGFILE%"
+
 :: JRE 9
 call :log "%CUR_DATE% %TIME%   JRE 9..."
 :: Wildcards aren't used here because Oracle is stupid and generates random GUIDs per release now instead of doing the old wildcard system


fixed VGA

fixed VGA

--- src/ocl/perf_cases_googlenet_VGA.bat
+++ src/ocl/perf_cases_googlenet_VGA.bat
@@ -6,273 +6,273 @@
 echo "FullConvNet"
 :fullconvnet
 echo "conv1/7x7_s2 1x3x1024x2048x64x7x7"
-aLibDNNDriver conv -t %T% -n %B%  -V %V% -W 720 -H 480 -c 3 -k 64 -x 7 -y 7 -p 3 -q 3  -F 1 -u 2 -v 2
+.\driver\Debug\MLOpenDriver.exe conv -t %T% -n %B%  -V %V% -W 720 -H 480 -c 3 -k 64 -x 7 -y 7 -p 3 -q 3  -F 1 -u 2 -v 2
 echo "conv1/relu_7x7 1x64x512x1024x64"
-aLibDNNDriver -t %T% -n %B%  -V %V% -W  360 -H 240 -c 64 -k 64 -F 1
+.\driver\Debug\MLOpenDriver.exe -t %T% -n %B%  -V %V% -W  360 -H 240 -c 64 -k 64 -F 1
 echo "pool1/3x3_s2 1x64x512x1024x64x3x3"
-aLibDNNDriver pool -t %T% -n %B%  -V %V% -W 360 -H 240 -c 64 -k 64 -x 3 -y 3 -p 1 -q 1 -u 2 -v 2 -F 1
+.\driver\Debug\MLOpenDriver.exe pool -t %T% -n %B%  -V %V% -W 360 -H 240 -c 64 -k 64 -x 3 -y 3 -p 1 -q 1 -u 2 -v 2 -F 1
 echo "pool1/norm 1x64x256x512x64x5x5"
-aLibDNNDriver lrn -t %T% -n %B%  -V %V% -W 360 -H 240 -c 64 -k 192 -x 5 -y 5 -p 2 -q 2 -lrn 0 -F 1
+.\driver\Debug\MLOpenDriver.exe lrn -t %T% -n %B%  -V %V% -W 360 -H 240 -c 64 -k 192 -x 5 -y 5 -p 2 -q 2 -lrn 0 -F 1
 echo "conv2/3x3_reduce 1x64x256x512x64x1x1"
-aLibDNNDriver conv -t %T% -n %B%  -V %V% -W 360 -H 240 -c 64 -k 64 -x 1 -y 1 -p 0 -q 0  -F 1 -s %S%
+.\driver\Debug\MLOpenDriver.exe conv -t %T% -n %B%  -V %V% -W 360 -H 240 -c 64 -k 64 -x 1 -y 1 -p 0 -q 0  -F 1 -s %S%
 echo "conv2/relu_3x3_reduce 1x64x256x512x64"
-aLibDNNDriver activ -t %T% -n %B%  -V %V% -W 360 -H 240 -c 64 -k 64 -F 1
+.\driver\Debug\MLOpenDriver.exe activ -t %T% -n %B%  -V %V% -W 360 -H 240 -c 64 -k 64 -F 1
 echo "conv2/3x3 1x64x256x512x192x3x3"
-aLibDNNDriver conv -t %T% -n %B%  -V %V% -W 360 -H 240 -c 64 -k 192 -x 3 -y 3 -p 1 -q 1  -F 1 -s %S%
+.\driver\Debug\MLOpenDriver.exe conv -t %T% -n %B%  -V %V% -W 360 -H 240 -c 64 -k 192 -x 3 -y 3 -p 1 -q 1  -F 1 -s %S%
 echo "conv2/relu_3x3 1x192x256x512x192"
-aLibDNNDriver activ -t %T% -n %B%  -V %V% -W 360 -H 240 -c 192 -k 192 -F 1
+.\driver\Debug\MLOpenDriver.exe activ -t %T% -n %B%  -V %V% -W 360 -H 240 -c 192 -k 192 -F 1
 echo "conv2/norm2 1x192x256x512x192x5x5"
-aLibDNNDriver lrn -t %T% -n %B%  -V %V% -W 360 -H 240 -c 192 -k 192 -x 5 -y 5 -p 2 -q 2 -lrn 0 -F 1
+.\driver\Debug\MLOpenDriver.exe lrn -t %T% -n %B%  -V %V% -W 360 -H 240 -c 192 -k 192 -x 5 -y 5 -p 2 -q 2 -lrn 0 -F 1
 echo "pool2/3x3_s2 1x192x256x512x192x3x3"
-aLibDNNDriver pool -t %T% -n %B%  -V %V% -W 360 -H 240 -c 192 -k 192 -x 3 -y 3 -p 1 -q 1 -u 2 -v 2 -F 1
+.\driver\Debug\MLOpenDriver.exe pool -t %T% -n %B%  -V %V% -W 360 -H 240 -c 192 -k 192 -x 3 -y 3 -p 1 -q 1 -u 2 -v 2 -F 1
 echo "inception_3a/1x1 1x192x128x256x64x1x1"
-aLibDNNDriver conv -t %T% -n %B%  -V %V% -W 180 -H 120 -c 192 -k 64 -x 1 -y 1 -p 0 -q 0  -F 1 -s %S%
+.\driver\Debug\MLOpenDriver.exe conv -t %T% -n %B%  -V %V% -W 180 -H 120 -c 192 -k 64 -x 1 -y 1 -p 0 -q 0  -F 1 -s %S%
 echo "nception_3a/relu_1x1 1x64x128x256x64"
-aLibDNNDriver activ -t %T% -n %B%  -V %V% -W 180 -H 120 -c 64 -k 64 -F 1
+.\driver\Debug\MLOpenDriver.exe activ -t %T% -n %B%  -V %V% -W 180 -H 120 -c 64 -k 64 -F 1
 echo "inception_3a/3x3_reduce 1x192x128x256x96x3x3"
-aLibDNNDriver conv -t %T% -n %B%  -V %V% -W 180 -H 120 -c 192 -k 96 -x 1 -y 1 -p 0 -q 0  -F 1 -s %S%
+.\driver\Debug\MLOpenDriver.exe conv -t %T% -n %B%  -V %V% -W 180 -H 120 -c 192 -k 96 -x 1 -y 1 -p 0 -q 0  -F 1 -s %S%
 echo "inception_3a/relu_3x3_reduce 1x96x128x256x96"
-aLibDNNDriver lrn -t %T% -n %B%  -V %V% -W 180 -H 120 -c 96 -k 96 -F 1
+.\driver\Debug\MLOpenDriver.exe lrn -t %T% -n %B%  -V %V% -W 180 -H 120 -c 96 -k 96 -F 1
 echo "inception_3a/3x3 1x96x128x256x128x3x3"
-aLibDNNDriver conv -t %T% -n %B%  -V %V% -W 180 -H 120 -c 96 -k 128 -x 3 -y 3 -p 1 -q 1  -F 1 -s %S%
+.\driver\Debug\MLOpenDriver.exe conv -t %T% -n %B%  -V %V% -W 180 -H 120 -c 96 -k 128 -x 3 -y 3 -p 1 -q 1  -F 1 -s %S%
 echo "inception_3a/relu_3x3 1x128x128x256x128"
-aLibDNNDriver activ -t %T% -n %B%  -V %V% -W 180 -H 120 -c 128 -k 128 -F 1
+.\driver\Debug\MLOpenDriver.exe activ -t %T% -n %B%  -V %V% -W 180 -H 120 -c 128 -k 128 -F 1
 echo "inception_3a/5x5_reduce 1x192x128x256x64x1x1"
-aLibDNNDriver conv -t %T% -n %B%  -V %V% -W 180 -H 120 -c 192 -k 16 -x 1 -y 1 -p 0 -q 0  -F 1 -s %S%
+.\driver\Debug\MLOpenDriver.exe conv -t %T% -n %B%  -V %V% -W 180 -H 120 -c 192 -k 16 -x 1 -y 1 -p 0 -q 0  -F 1 -s %S%
 echo "inception_3a/relu_5x5_reduce 1x16x128x256x16"
-aLibDNNDriver activ -t %T% -n %B%  -V %V% -W 180 -H 120 -c 16 -k 16 -F 1
+.\driver\Debug\MLOpenDriver.exe activ -t %T% -n %B%  -V %V% -W 180 -H 120 -c 16 -k 16 -F 1
 echo "inception_3a/5x5 1x16x128x256x32x5x5"
-aLibDNNDriver conv -t %T% -n %B%  -V %V% -W 180 -H 120 -c 16 -k 32 -x 5 -y 5 -p 2 -q 2  -F 1 -s %S%
+.\driver\Debug\MLOpenDriver.exe conv -t %T% -n %B%  -V %V% -W 180 -H 120 -c 16 -k 32 -x 5 -y 5 -p 2 -q 2  -F 1 -s %S%
 echo "inception_3a/relu_5x5 1x32x128x256x32"
-aLibDNNDriver activ -t %T% -n %B%  -V %V% -W 180 -H 120 -c 32 -k 32 -F 1
+.\driver\Debug\MLOpenDriver.exe activ -t %T% -n %B%  -V %V% -W 180 -H 120 -c 32 -k 32 -F 1
 echo "inception_3a/pool 1x192x128x256x192x3x3"
-aLibDNNDriver pool -t %T% -n %B%  -V %V% -W 180 -H 120 -c 192 -k 192 -x 3 -y 3 -p 1 -q 1 -F 1
+.\driver\Debug\MLOpenDriver.exe pool -t %T% -n %B%  -V %V% -W 180 -H 120 -c 192 -k 192 -x 3 -y 3 -p 1 -q 1 -F 1
 echo "inception_3a/pool_proj 1x192x128x256x32x1x1"
-aLibDNNDriver conv -t %T% -n %B%  -V %V% -W 180 -H 120 -c 192 -k 32 -x 1 -y 1 -p 0 -q 0  -F 1 -s %S%
+.\driver\Debug\MLOpenDriver.exe conv -t %T% -n %B%  -V %V% -W 180 -H 120 -c 192 -k 32 -x 1 -y 1 -p 0 -q 0  -F 1 -s %S%
 echo "inception_3a/relu_pool_proj 1x32x128x256x32"
-aLibDNNDriver activ -t %T% -n %B%  -V %V% -W 180 -H 120 -c 32 -k 32 -F 1
+.\driver\Debug\MLOpenDriver.exe activ -t %T% -n %B%  -V %V% -W 180 -H 120 -c 32 -k 32 -F 1
 echo "inception_3a/output 1x128x256x256"
 :3b
 echo "inception_3b/1x1 1x256x128x256x128x1x1"
-aLibDNNDriver conv -t %T% -n %B%  -V %V% -W 180 -H 120 -c 256 -k 128 -x 1 -y 1 -p 0 -q 0  -F 1 -s %S%
+.\driver\Debug\MLOpenDriver.exe conv -t %T% -n %B%  -V %V% -W 180 -H 120 -c 256 -k 128 -x 1 -y 1 -p 0 -q 0  -F 1 -s %S%
 echo "nception_3b/relu_1x1 1x128x128x256x128"
-aLibDNNDriver active -t %T% -n %B%  -V %V% -W 180 -H 120 -c 128 -k 128 -F 1
+.\driver\Debug\MLOpenDriver.exe active -t %T% -n %B%  -V %V% -W 180 -H 120 -c 128 -k 128 -F 1
 echo "inception_3b/3x3_reduce 1x256x128x256x128x1x1"
-aLibDNNDriver conv -t %T% -n %B%  -V %V% -W 180 -H 120 -c 256 -k 128 -x 1 -y 1 -p 0 -q 0  -F 1 -s %S%
+.\driver\Debug\MLOpenDriver.exe conv -t %T% -n %B%  -V %V% -W 180 -H 120 -c 256 -k 128 -x 1 -y 1 -p 0 -q 0  -F 1 -s %S%
 echo "inception_3a/relu_3x3_reduce 1x128x128x256x128"
-aLibDNNDriver activ -t %T% -n %B%  -V %V% -W 180 -H 120 -c 128 -k 128 -F 1
+.\driver\Debug\MLOpenDriver.exe activ -t %T% -n %B%  -V %V% -W 180 -H 120 -c 128 -k 128 -F 1
 echo "inception_3b/3x3 1x128x128x256x192x3x3"
-aLibDNNDriver conv -t %T% -n %B%  -V %V% -W 180 -H 120 -c 128 -k 192 -x 3 -y 3 -p 1 -q 1  -F 1 -s %S%
+.\driver\Debug\MLOpenDriver.exe conv -t %T% -n %B%  -V %V% -W 180 -H 120 -c 128 -k 192 -x 3 -y 3 -p 1 -q 1  -F 1 -s %S%
 echo "inception_3b/relu_3x3 1x192x128x256x192"
-aLibDNNDriver activ -t %T% -n %B%  -V %V% -W 180 -H 120 -c 192 -k 192 -F 1
+.\driver\Debug\MLOpenDriver.exe activ -t %T% -n %B%  -V %V% -W 180 -H 120 -c 192 -k 192 -F 1
 echo "inception_3b/5x5_reduce 1x256x128x256x32x1x1"
-aLibDNNDriver conv -t %T% -n %B%  -V %V% -W 180 -H 120 -c 256 -k 32 -x 1 -y 1 -p 0 -q 0  -F 1 -s %S%
+.\driver\Debug\MLOpenDriver.exe conv -t %T% -n %B%  -V %V% -W 180 -H 120 -c 256 -k 32 -x 1 -y 1 -p 0 -q 0  -F 1 -s %S%
 echo "inception_3b/relu_5x5_reduce 1x32x128x256x32"
-aLibDNNDriver activ -t %T% -n %B%  -V %V% -W 180 -H 120 -c 32 -k 32 -F 1
+.\driver\Debug\MLOpenDriver.exe activ -t %T% -n %B%  -V %V% -W 180 -H 120 -c 32 -k 32 -F 1
 echo "inception_3b/5x5 1x32x128x256x96x5x5"
-aLibDNNDriver conv -t %T% -n %B%  -V %V% -W 180 -H 120 -c 32 -k 96 -x 5 -y 5 -p 2 -q 2  -F 1 -s %S%
+.\driver\Debug\MLOpenDriver.exe conv -t %T% -n %B%  -V %V% -W 180 -H 120 -c 32 -k 96 -x 5 -y 5 -p 2 -q 2  -F 1 -s %S%
 echo "inception_3b/relu_5x5 1x96x128x256x96"
-aLibDNNDriver activ -t %T% -n %B%  -V %V% -W 180 -H 120 -c 96 -k 96 -F 1
+.\driver\Debug\MLOpenDriver.exe activ -t %T% -n %B%  -V %V% -W 180 -H 120 -c 96 -k 96 -F 1
 echo "inception_3b/pool 1x256x128x256x256x3x3"
-aLibDNNDriver pool -t %T% -n %B%  -V %V% -W 180 -H 120 -c 256 -k 256 -x 3 -y 3 -p 1 -q 1 -F 1
+.\driver\Debug\MLOpenDriver.exe pool -t %T% -n %B%  -V %V% -W 180 -H 120 -c 256 -k 256 -x 3 -y 3 -p 1 -q 1 -F 1
 echo "inception_3b/pool_proj 1x256x128x256x64x1x1"
-aLibDNNDriver conv -t %T% -n %B%  -V %V% -W 180 -H 120 -c 256 -k 64 -x 1 -y 1 -p 0 -q 0  -F 1 -s %S%
+.\driver\Debug\MLOpenDriver.exe conv -t %T% -n %B%  -V %V% -W 180 -H 120 -c 256 -k 64 -x 1 -y 1 -p 0 -q 0  -F 1 -s %S%
 echo "inception_3b/relu_pool_proj 1x64x128x256x64"
-aLibDNNDriver activ -t %T% -n %B%  -V %V% -W 180 -H 120 -c 64 -k 64 -F 1
+.\driver\Debug\MLOpenDriver.exe activ -t %T% -n %B%  -V %V% -W 180 -H 120 -c 64 -k 64 -F 1
 echo "inception_3b/output 3"
 echo "pool3/3x3_s2 1x480x128x256x480x3x3"
-aLibDNNDriver pool -t %T% -n %B%  -V %V% -W 180 -H 120 -c 480 -k 480 -x 3 -y 3 -p 1 -q 1 -u 2 -v 2 -F 1
+.\driver\Debug\MLOpenDriver.exe pool -t %T% -n %B%  -V %V% -W 180 -H 120 -c 480 -k 480 -x 3 -y 3 -p 1 -q 1 -u 2 -v 2 -F 1
 :4a
 echo "inception_4a/1x1 1x480x64x128x192x1x1"
-aLibDNNDriver conv -t %T% -n %B%  -V %V% -W 90 -H 60 -c 480 -k 192 -x 1 -y 1 -p 0 -q 0  -F 1 -s %S%
+.\driver\Debug\MLOpenDriver.exe conv -t %T% -n %B%  -V %V% -W 90 -H 60 -c 480 -k 192 -x 1 -y 1 -p 0 -q 0  -F 1 -s %S%
 echo "nception_4a/relu_1x1 1x192x64x128x192x3x3"
-aLibDNNDriver activ -t %T% -n %B%  -V %V% -W 90 -H 60 -c 192 -k 192 -F 1
+.\driver\Debug\MLOpenDriver.exe activ -t %T% -n %B%  -V %V% -W 90 -H 60 -c 192 -k 192 -F 1
 echo "inception_4a/3x3_reduce 1x480x64x128x96x3x3"
-aLibDNNDriver conv -t %T% -n %B%  -V %V% -W 90 -H 60 -c 480 -k 96 -x 1 -y 1 -p 0 -q 0  -F 1 -s %S%
+.\driver\Debug\MLOpenDriver.exe conv -t %T% -n %B%  -V %V% -W 90 -H 60 -c 480 -k 96 -x 1 -y 1 -p 0 -q 0  -F 1 -s %S%
 echo "inception_4a/relu_3x3_reduce 1x96x64x128x96"
-aLibDNNDriver activ -t %T% -n %B%  -V %V% -W 90 -H 60 -c 96 -k 96 -F 1
+.\driver\Debug\MLOpenDriver.exe activ -t %T% -n %B%  -V %V% -W 90 -H 60 -c 96 -k 96 -F 1
 echo "inception_4a/3x3 1x96x64x128x208x3x3"
-aLibDNNDriver conv -t %T% -n %B%  -V %V% -W 90 -H 60 -c 96 -k 208 -x 3 -y 3 -p 1 -q 1  -F 1 -s %S%
+.\driver\Debug\MLOpenDriver.exe conv -t %T% -n %B%  -V %V% -W 90 -H 60 -c 96 -k 208 -x 3 -y 3 -p 1 -q 1  -F 1 -s %S%
 echo "inception_4a/relu_3x3 1x208x64x128x208"
-aLibDNNDriver activ -t %T% -n %B%  -V %V% -W 90 -H 60 -c 208 -k 208 -F 1
+.\driver\Debug\MLOpenDriver.exe activ -t %T% -n %B%  -V %V% -W 90 -H 60 -c 208 -k 208 -F 1
 echo "inception_4a/5x5_reduce 1x480x64x128x16x1s1"
-aLibDNNDriver conv -t %T% -n %B%  -V %V% -W 90 -H 60 -c 480 -k 16 -x 1 -y 1 -p 0 -q 0  -F 1 -s %S%
+.\driver\Debug\MLOpenDriver.exe conv -t %T% -n %B%  -V %V% -W 90 -H 60 -c 480 -k 16 -x 1 -y 1 -p 0 -q 0  -F 1 -s %S%
 echo "inception_4a/relu_5x5_reduce 1x16x64x128x16"
-aLibDNNDriver activ -t %T% -n %B%  -V %V% -W 90 -H 60 -c 16 -k 16 -F 1
+.\driver\Debug\MLOpenDriver.exe activ -t %T% -n %B%  -V %V% -W 90 -H 60 -c 16 -k 16 -F 1
 echo "inception_4a/5x5 1x16x64x128x48x5x5"
-aLibDNNDriver conv -t %T% -n %B%  -V %V% -W 90 -H 60 -c 16 -k 48 -x 5 -y 5 -p 2 -q 2  -F 1 -s %S%
+.\driver\Debug\MLOpenDriver.exe conv -t %T% -n %B%  -V %V% -W 90 -H 60 -c 16 -k 48 -x 5 -y 5 -p 2 -q 2  -F 1 -s %S%
 echo "inception_4a/relu_5x5_reduce 1x48x64x128x48"
-aLibDNNDriver activ -t %T% -n %B%  -V %V% -W 90 -H 60 -c 48 -k 48 -F 1
+.\driver\Debug\MLOpenDriver.exe activ -t %T% -n %B%  -V %V% -W 90 -H 60 -c 48 -k 48 -F 1
 echo "inception_4a/pool 32x480x64x128x480x3x3"
-aLibDNNDriver pool -t %T% -n %B%  -V %V% -W 90 -H 60 -c 480 -k 480 -x 3 -y 3 -p 1 -q 1 -F 1
+.\driver\Debug\MLOpenDriver.exe pool -t %T% -n %B%  -V %V% -W 90 -H 60 -c 480 -k 480 -x 3 -y 3 -p 1 -q 1 -F 1
 echo "inception_4a/pool_proj 1x480x64x128x64x1x1"
-aLibDNNDriver conv -t %T% -n %B%  -V %V% -W 90 -H 60 -c 480 -k 64 -x 1 -y 1 -p 0 -q 0  -F 1 -s %S%
+.\driver\Debug\MLOpenDriver.exe conv -t %T% -n %B%  -V %V% -W 90 -H 60 -c 480 -k 64 -x 1 -y 1 -p 0 -q 0  -F 1 -s %S%
 echo "inception_4a/relu_pool_proj 1x64x64x128x64"
-aLibDNNDriver activ -t %T% -n %B%  -V %V% -W 90 -H 60 -c 64 -k 64 -F 1
+.\driver\Debug\MLOpenDriver.exe activ -t %T% -n %B%  -V %V% -W 90 -H 60 -c 64 -k 64 -F 1
 echo "inception_4a/output 3"
 :4b
 echo "inception_4b/1x1 1x512x64x128x160x1x1"
-aLibDNNDriver conv -t %T% -n %B%  -V %V% -W 90 -H 60 -c 512 -k 160 -x 1 -y 1 -p 0 -q 0  -F 1 -s %S%
+.\driver\Debug\MLOpenDriver.exe conv -t %T% -n %B%  -V %V% -W 90 -H 60 -c 512 -k 160 -x 1 -y 1 -p 0 -q 0  -F 1 -s %S%
 echo "inception_4b/relu_1x1 1x160x64x128x160"
-aLibDNNDriver activ -t %T% -n %B%  -V %V% -W 90 -H 60 -c 160 -k 160 -F 1
+.\driver\Debug\MLOpenDriver.exe activ -t %T% -n %B%  -V %V% -W 90 -H 60 -c 160 -k 160 -F 1
 echo "inception_4b/3x3_reduce 1x512x64x128x112x1x1"
-aLibDNNDriver conv -t %T% -n %B%  -V %V% -W 90 -H 60 -c 512 -k 112 -x 1 -y 1 -p 0 -q 0  -F 1 -s %S%
+.\driver\Debug\MLOpenDriver.exe conv -t %T% -n %B%  -V %V% -W 90 -H 60 -c 512 -k 112 -x 1 -y 1 -p 0 -q 0  -F 1 -s %S%
 echo "inception_4b/relu_3x3_reduce 1x112x64x128x112"
-aLibDNNDriver activ -t %T% -n %B%  -V %V% -W 90 -H 60 -c 112 -k 112 -F 1
+.\driver\Debug\MLOpenDriver.exe activ -t %T% -n %B%  -V %V% -W 90 -H 60 -c 112 -k 112 -F 1
 echo "inception_4b/3x3 1x112x64x128x224x3x3"
-aLibDNNDriver conv -t %T% -n %B%  -V %V% -W 90 -H 60 -c 112 -k 224 -x 3 -y 3 -p 1 -q 1  -F 1 -s %S%
+.\driver\Debug\MLOpenDriver.exe conv -t %T% -n %B%  -V %V% -W 90 -H 60 -c 112 -k 224 -x 3 -y 3 -p 1 -q 1  -F 1 -s %S%
 echo "inception_4b/relu_3x3 1x224x64x128x224"
-aLibDNNDriver activ -t %T% -n %B%  -V %V% -W 90 -H 60 -c 224 -k 224 -F 1
+.\driver\Debug\MLOpenDriver.exe activ -t %T% -n %B%  -V %V% -W 90 -H 60 -c 224 -k 224 -F 1
 echo "inception_4b/5x5_reduce 1x512x64x128x24x1x1"
-aLibDNNDriver conv -t %T% -n %B%  -V %V% -W  128 -H 128 -c 512 -k 24 -x 1 -y 1 -p 0 -q 0  -F 1 -s %S%
+.\driver\Debug\MLOpenDriver.exe conv -t %T% -n %B%  -V %V% -W  128 -H 128 -c 512 -k 24 -x 1 -y 1 -p 0 -q 0  -F 1 -s %S%
 echo "inception_4b/relu_5x5_reduce 1x24x64x128x24"
-aLibDNNDriver activ -t %T% -n %B%  -V %V% -W 90 -H 60 -c 24 -k 24 -F 1
+.\driver\Debug\MLOpenDriver.exe activ -t %T% -n %B%  -V %V% -W 90 -H 60 -c 24 -k 24 -F 1
 echo "inception_4b/5x5 1x24x64x128x64x5x5"
-aLibDNNDriver conv -t %T% -n %B%  -V %V% -W 90 -H 60 -c 24 -k 64 -x 5 -y 5 -p 2 -q 2  -F 1 -s %S%
+.\driver\Debug\MLOpenDriver.exe conv -t %T% -n %B%  -V %V% -W 90 -H 60 -c 24 -k 64 -x 5 -y 5 -p 2 -q 2  -F 1 -s %S%
 echo "inception_4b/relu_5x5 1x64x64x128x64"
-aLibDNNDriver activ -t %T% -n %B%  -V %V% -W 90 -H 60 -c 64 -k 64 -F 1
+.\driver\Debug\MLOpenDriver.exe activ -t %T% -n %B%  -V %V% -W 90 -H 60 -c 64 -k 64 -F 1
 echo "inception_4b/pool 1x512x64x128x512x3x3"
-aLibDNNDriver pool -t %T% -n %B%  -V %V% -W 90 -H 60 -c 512 -k 512 -x 3 -y 3 -p 1 -q 1 -F 1
+.\driver\Debug\MLOpenDriver.exe pool -t %T% -n %B%  -V %V% -W 90 -H 60 -c 512 -k 512 -x 3 -y 3 -p 1 -q 1 -F 1
 echo "inception_4b/pool_proj 1x512x64x128x64x1x1"
-aLibDNNDriver conv -t %T% -n %B%  -V %V% -W 90 -H 60 -c 512 -k 64 -x 1 -y 1 -p 0 -q 0  -F 1 -s %S%
+.\driver\Debug\MLOpenDriver.exe conv -t %T% -n %B%  -V %V% -W 90 -H 60 -c 512 -k 64 -x 1 -y 1 -p 0 -q 0  -F 1 -s %S%
 echo "inception_4b/relu_pool_proj 1x64x64x128x64x1x1"
-aLibDNNDriver activ -t %T% -n %B%  -V %V% -W 90 -H 60 -c 64 -k 64 -F 1
+.\driver\Debug\MLOpenDriver.exe activ -t %T% -n %B%  -V %V% -W 90 -H 60 -c 64 -k 64 -F 1
 echo "inception_4b/output 3"
 echo "inception_4c/1x1 1x512x64x128x128x1x1"
-aLibDNNDriver conv -t %T% -n %B%  -V %V% -W 90 -H 60 -c 512 -k 128 -x 1 -y 1 -p 0 -q 0  -F 1 -s %S%
+.\driver\Debug\MLOpenDriver.exe conv -t %T% -n %B%  -V %V% -W 90 -H 60 -c 512 -k 128 -x 1 -y 1 -p 0 -q 0  -F 1 -s %S%
 echo "inception_4c/relu_1x1 1x128x64x128x128"
-aLibDNNDriver activ -t %T% -n %B%  -V %V% -W 90 -H 60 -c 128 -k 128 -F 1
+.\driver\Debug\MLOpenDriver.exe activ -t %T% -n %B%  -V %V% -W 90 -H 60 -c 128 -k 128 -F 1
 echo "inception_4c/3x3_reduce 1x512x64x128x128x1x1"
-aLibDNNDriver conv -t %T% -n %B%  -V %V% -W 90 -H 60 -c 512 -k 128 -x 1 -y 1 -p 0 -q 0  -F 1 -s %S%
+.\driver\Debug\MLOpenDriver.exe conv -t %T% -n %B%  -V %V% -W 90 -H 60 -c 512 -k 128 -x 1 -y 1 -p 0 -q 0  -F 1 -s %S%
 echo "inception_4c/relu_3x3_reduce 1x128x64x128x128"
-aLibDNNDriver activ -t %T% -n %B%  -V %V% -W 90 -H 60 -c 128 -k 128 -F 1
+.\driver\Debug\MLOpenDriver.exe activ -t %T% -n %B%  -V %V% -W 90 -H 60 -c 128 -k 128 -F 1
 echo "inception_4c/3x3 1x128x64x128x256x3x3"
-aLibDNNDriver conv -t %T% -n %B%  -V %V% -W 90 -H 60 -c 128 -k 256 -x 3 -y 3 -p 1 -q 1  -F 1 -s %S%
+.\driver\Debug\MLOpenDriver.exe conv -t %T% -n %B%  -V %V% -W 90 -H 60 -c 128 -k 256 -x 3 -y 3 -p 1 -q 1  -F 1 -s %S%
 echo "inception_4c/relu_3x3 1x256x64x128x256"
-aLibDNNDriver activ -t %T% -n %B%  -V %V% -W 90 -H 60 -c 256 -k 256 -F 1
+.\driver\Debug\MLOpenDriver.exe activ -t %T% -n %B%  -V %V% -W 90 -H 60 -c 256 -k 256 -F 1
 echo "inception_4c/5x5_reduce 1x512x64x128x24x1x1"
-aLibDNNDriver conv -t %T% -n %B%  -V %V% -W 90 -H 60 -c 512 -k 24 -x 1 -y 1 -p 0 -q 0  -F 1 -s %S%
+.\driver\Debug\MLOpenDriver.exe conv -t %T% -n %B%  -V %V% -W 90 -H 60 -c 512 -k 24 -x 1 -y 1 -p 0 -q 0  -F 1 -s %S%
 echo "inception_4c/relu_5x5_reduce 1x24x64x128x24"
-aLibDNNDriver activ -t %T% -n %B%  -V %V% -W 90 -H 60 -c 24 -k 24 -F 1
+.\driver\Debug\MLOpenDriver.exe activ -t %T% -n %B%  -V %V% -W 90 -H 60 -c 24 -k 24 -F 1
 echo "inception_4c/5x5 1x24x64x128x64x5x5"
-aLibDNNDriver conv -t %T% -n %B%  -V %V% -W 90 -H 60 -c 24 -k 64 -x 5 -y 5 -p 2 -q 2  -F 1 -s %S%
+.\driver\Debug\MLOpenDriver.exe conv -t %T% -n %B%  -V %V% -W 90 -H 60 -c 24 -k 64 -x 5 -y 5 -p 2 -q 2  -F 1 -s %S%
 echo "inception_4c/relu_5x5 1x64x64x128x64"
-aLibDNNDriver activ -t %T% -n %B%  -V %V% -W 90 -H 60 -c 64 -k 64 -F 1
+.\driver\Debug\MLOpenDriver.exe activ -t %T% -n %B%  -V %V% -W 90 -H 60 -c 64 -k 64 -F 1
 echo "inception_4c/pool 1x512x64x128x512x3x3"
-aLibDNNDriver pool -t %T% -n %B%  -V %V% -W 90 -H 60 -c 512 -k 512 -x 3 -y 3 -p 1 -q 1 -F 1
+.\driver\Debug\MLOpenDriver.exe pool -t %T% -n %B%  -V %V% -W 90 -H 60 -c 512 -k 512 -x 3 -y 3 -p 1 -q 1 -F 1
 echo "inception_4c/pool_proj 1x512x64x128x64x1x1"
-aLibDNNDriver conv -t %T% -n %B%  -V %V% -W 90 -H 60 -c 512 -k 64 -x 1 -y 1 -p 0 -q 0  -F 1 -s %S%
+.\driver\Debug\MLOpenDriver.exe conv -t %T% -n %B%  -V %V% -W 90 -H 60 -c 512 -k 64 -x 1 -y 1 -p 0 -q 0  -F 1 -s %S%
 echo "inception_4c/relu_pool_proj 1x64x64x128x64"
-aLibDNNDriver activ -t %T% -n %B%  -V %V% -W 90 -H 60 -c 64 -k 64 -F 1
+.\driver\Debug\MLOpenDriver.exe activ -t %T% -n %B%  -V %V% -W 90 -H 60 -c 64 -k 64 -F 1
 echo "inception_4c/output 3"
 echo "inception_4d/1x1 1x512x64x128x112x1x1"
-aLibDNNDriver conv -t %T% -n %B%  -V %V% -W 90 -H 60 -c 512 -k 112 -x 1 -y 1 -p 0 -q 0  -F 1 -s %S%
+.\driver\Debug\MLOpenDriver.exe conv -t %T% -n %B%  -V %V% -W 90 -H 60 -c 512 -k 112 -x 1 -y 1 -p 0 -q 0  -F 1 -s %S%
 echo "inception_4d/relu_1x1 1x112x64x128x112"
-aLibDNNDriver activ -t %T% -n %B%  -V %V% -W 90 -H 60 -c 112 -k 112 -F 1
+.\driver\Debug\MLOpenDriver.exe activ -t %T% -n %B%  -V %V% -W 90 -H 60 -c 112 -k 112 -F 1
 echo "inception_4d/3x3_reduce 1x512x64x128x144x1x1"
-aLibDNNDriver conv -t %T% -n %B%  -V %V% -W 90 -H 60 -c 512 -k 144 -x 1 -y 1 -p 0 -q 0  -F 1 -s %S%
+.\driver\Debug\MLOpenDriver.exe conv -t %T% -n %B%  -V %V% -W 90 -H 60 -c 512 -k 144 -x 1 -y 1 -p 0 -q 0  -F 1 -s %S%
 echo "inception_4d/relu_3x3_reduce 1x144x64x128x144"
-aLibDNNDriver activ -t %T% -n %B%  -V %V% -W 90 -H 60 -c 144 -k 144 -F 1
+.\driver\Debug\MLOpenDriver.exe activ -t %T% -n %B%  -V %V% -W 90 -H 60 -c 144 -k 144 -F 1
 echo "inception_4d/3x3 1x144x64x128x288x3x3"
-aLibDNNDriver conv -t %T% -n %B%  -V %V% -W 90 -H 60 -c 144 -k 288 -x 3 -y 3 -p 1 -q 1  -F 1 -s %S%
+.\driver\Debug\MLOpenDriver.exe conv -t %T% -n %B%  -V %V% -W 90 -H 60 -c 144 -k 288 -x 3 -y 3 -p 1 -q 1  -F 1 -s %S%
 echo "inception_4d/relu_3x3 1x288x64x128x288"
-aLibDNNDriver activ -t %T% -n %B%  -V %V% -W 90 -H 60 -c 288 -k 288 -F 1
+.\driver\Debug\MLOpenDriver.exe activ -t %T% -n %B%  -V %V% -W 90 -H 60 -c 288 -k 288 -F 1
 echo "inception_4d/5x5_reduce 1x512x64x128x32x1x1"
-aLibDNNDriver conv -t %T% -n %B%  -V %V% -W 90 -H 60 -c 512 -k 32 -x 1 -y 1 -p 0 -q 0  -F 1 -s %S%
+.\driver\Debug\MLOpenDriver.exe conv -t %T% -n %B%  -V %V% -W 90 -H 60 -c 512 -k 32 -x 1 -y 1 -p 0 -q 0  -F 1 -s %S%
 echo "inception_4d/relu_5x5_reduce 1x32x64x128x32"
-aLibDNNDriver activ -t %T% -n %B%  -V %V% -W 90 -H 60 -c 32 -k 32 -F 1
+.\driver\Debug\MLOpenDriver.exe activ -t %T% -n %B%  -V %V% -W 90 -H 60 -c 32 -k 32 -F 1
 echo "inception_4d/5x5 1x32x64x128x64x5x5"
-aLibDNNDriver conv -t %T% -n %B%  -V %V% -W 90 -H 60 -c 32 -k 64 -x 5 -y 5 -p 2 -q 2  -F 1 -s %S%
+.\driver\Debug\MLOpenDriver.exe conv -t %T% -n %B%  -V %V% -W 90 -H 60 -c 32 -k 64 -x 5 -y 5 -p 2 -q 2  -F 1 -s %S%
 echo "inception_4d/relu_5x5 1x64x64x128x64"
-aLibDNNDriver activ -t %T% -n %B%  -V %V% -W 90 -H 60 -c 64 -k 64 -F 1
+.\driver\Debug\MLOpenDriver.exe activ -t %T% -n %B%  -V %V% -W 90 -H 60 -c 64 -k 64 -F 1
 echo "inception_4d/pool 1x512x64x128x512x3x3"
-aLibDNNDriver pool -t %T% -n %B%  -V %V% -W 90 -H 60 -c 512 -k 512 -x 3 -y 3 -p 1 -q 1 -F 1
+.\driver\Debug\MLOpenDriver.exe pool -t %T% -n %B%  -V %V% -W 90 -H 60 -c 512 -k 512 -x 3 -y 3 -p 1 -q 1 -F 1
 echo "inception_4d/pool_proj 1x512x64x128x64x1x1"
-aLibDNNDriver conv -t %T% -n %B%  -V %V% -W 90 -H 60 -c 512 -k 64 -x 1 -y 1 -p 0 -q 0  -F 1 -s %S%
+.\driver\Debug\MLOpenDriver.exe conv -t %T% -n %B%  -V %V% -W 90 -H 60 -c 512 -k 64 -x 1 -y 1 -p 0 -q 0  -F 1 -s %S%
 echo "inception_4d/relu_pool_proj 1x64x64x128x64"
-aLibDNNDriver activ -t %T% -n %B%  -V %V% -W 90 -H 60 -c 64 -k 64 -F 1
+.\driver\Debug\MLOpenDriver.exe activ -t %T% -n %B%  -V %V% -W 90 -H 60 -c 64 -k 64 -F 1
 echo "inception_4d/output 3"
 :4e
 echo "inception_4e/1x1 1x528x64x128x256x1x1"
-aLibDNNDriver conv -t %T% -n %B%  -V %V% -W 90 -H 60 -c 528 -k 256 -x 1 -y 1 -p 0 -q 0  -F 1 -s %S%
+.\driver\Debug\MLOpenDriver.exe conv -t %T% -n %B%  -V %V% -W 90 -H 60 -c 528 -k 256 -x 1 -y 1 -p 0 -q 0  -F 1 -s %S%
 echo "inception_4e/relu_1x1 1x256x64x128x256"
-aLibDNNDriver activ -t %T% -n %B%  -V %V% -W 90 -H 60 -c 256 -k 256 -F 1
+.\driver\Debug\MLOpenDriver.exe activ -t %T% -n %B%  -V %V% -W 90 -H 60 -c 256 -k 256 -F 1
 echo "inception_4e/3x3_reduce 1x528x64x128x160x1x1"
-aLibDNNDriver conv -t %T% -n %B%  -V %V% -W 90 -H 60 -c 528 -k 160 -x 1 -y 1 -p 0 -q 0  -F 1 -s %S%
+.\driver\Debug\MLOpenDriver.exe conv -t %T% -n %B%  -V %V% -W 90 -H 60 -c 528 -k 160 -x 1 -y 1 -p 0 -q 0  -F 1 -s %S%
 echo "inception_4e/relu_3x3_reduce 1x160x64x128x160"
-aLibDNNDriver activ -t %T% -n %B%  -V %V% -W 90 -H 60 -c 160 -k 160 -F 1
+.\driver\Debug\MLOpenDriver.exe activ -t %T% -n %B%  -V %V% -W 90 -H 60 -c 160 -k 160 -F 1
 echo "inception_4e/3x3 1x160x64x128x320x3x3"
-aLibDNNDriver conv -t %T% -n %B%  -V %V% -W 90 -H 60 -onv c 160 -k 320 -x 3 -y 3 -p 1 -q 1  -F 1 -s %S%
+.\driver\Debug\MLOpenDriver.exe conv -t %T% -n %B%  -V %V% -W 90 -H 60 -onv c 160 -k 320 -x 3 -y 3 -p 1 -q 1  -F 1 -s %S%
 echo "inception_4e/relu_3x3 1x320x64x128x320"
-aLibDNNDriver activ -t %T% -n %B%  -V %V% -W 90 -H 60 -c 320 -k 320 -F 1
+.\driver\Debug\MLOpenDriver.exe activ -t %T% -n %B%  -V %V% -W 90 -H 60 -c 320 -k 320 -F 1
 echo "inception_4e/5x5_reduce 1x528x64x128x32x1x1"
-aLibDNNDriver conv -t %T% -n %B%  -V %V% -W 90 -H 60 -c 528 -k 32 -x 1 -y 1 -p 0 -q 0  -F 1 -s %S%
+.\driver\Debug\MLOpenDriver.exe conv -t %T% -n %B%  -V %V% -W 90 -H 60 -c 528 -k 32 -x 1 -y 1 -p 0 -q 0  -F 1 -s %S%
 echo "inception_4e/relu_5x5_reduce 1x32x64x128x32"
-aLibDNNDriver activ -t %T% -n %B%  -V %V% -W 90 -H 60 -c 32 -k 32 -F 1
+.\driver\Debug\MLOpenDriver.exe activ -t %T% -n %B%  -V %V% -W 90 -H 60 -c 32 -k 32 -F 1
 echo "inception_4e/5x5 1x32x64x128x128x5x5"
-aLibDNNDriver conv -t %T% -n %B%  -V %V% -W 90 -H 60 -c 32 -k 128 -x 5 -y 5 -p 2 -q 2  -F 1 -s %S%
+.\driver\Debug\MLOpenDriver.exe conv -t %T% -n %B%  -V %V% -W 90 -H 60 -c 32 -k 128 -x 5 -y 5 -p 2 -q 2  -F 1 -s %S%
 echo "inception_4e/relu_5x5 1x128x64x128x128"
-aLibDNNDriver activ -t %T% -n %B%  -V %V% -W 90 -H 60 -c 128 -k 128 -F 1
+.\driver\Debug\MLOpenDriver.exe activ -t %T% -n %B%  -V %V% -W 90 -H 60 -c 128 -k 128 -F 1
 echo "inception_4e/pool 1x528x64x128x528x3x3"
-aLibDNNDriver pool -t %T% -n %B%  -V %V% -W 90 -H 60 -c 528 -k 528 -x 3 -y 3 -p 1 -q 1 -F 1
+.\driver\Debug\MLOpenDriver.exe pool -t %T% -n %B%  -V %V% -W 90 -H 60 -c 528 -k 528 -x 3 -y 3 -p 1 -q 1 -F 1
 echo "inception_4e/pool_proj 1x528x64x128x128x1x1"
-aLibDNNDriver conv -t %T% -n %B%  -V %V% -W 90 -H 60 -c 528 -k 128 -x 1 -y 1 -p 0 -q 0  -F 1 -s %S%
+.\driver\Debug\MLOpenDriver.exe conv -t %T% -n %B%  -V %V% -W 90 -H 60 -c 528 -k 128 -x 1 -y 1 -p 0 -q 0  -F 1 -s %S%
 echo "inception_4e/relu_pool_proj 1x128x64x128x128"
-aLibDNNDriver activ -t %T% -n %B%  -V %V% -W 90 -H 60 -c 128 -k 128 -F 1
+.\driver\Debug\MLOpenDriver.exe activ -t %T% -n %B%  -V %V% -W 90 -H 60 -c 128 -k 128 -F 1
 echo "inception_4e/output 3"
 echo "inception_5a/1x1 1x832x64x128x256x1x1"
-aLibDNNDriver conv -t %T% -n %B%  -V %V% -W 45 -H 30 -c 832 -k 256 -x 1 -y 1 -p 0 -q 0  -F 1 -s %S%
+.\driver\Debug\MLOpenDriver.exe conv -t %T% -n %B%  -V %V% -W 45 -H 30 -c 832 -k 256 -x 1 -y 1 -p 0 -q 0  -F 1 -s %S%
 echo "inception_5a/relu_1x1 1x256x64x128x256"
-aLibDNNDriver activ -t %T% -n %B%  -V %V% -W 45 -H 30 -c 256 -k 256 -F 1
+.\driver\Debug\MLOpenDriver.exe activ -t %T% -n %B%  -V %V% -W 45 -H 30 -c 256 -k 256 -F 1
 echo "inception_5a/3x3_reduce 1x832x64x128x160x1x1"
-aLibDNNDriver conv -t %T% -n %B%  -V %V% -W 45 -H 30 -c 832 -k 160 -x 1 -y 1 -p 0 -q 0  -F 1 -s %S%
+.\driver\Debug\MLOpenDriver.exe conv -t %T% -n %B%  -V %V% -W 45 -H 30 -c 832 -k 160 -x 1 -y 1 -p 0 -q 0  -F 1 -s %S%
 echo "inception_5a/relu_3x3_reduce 1x160x64x128x160"
-aLibDNNDriver activ -t %T% -n %B%  -V %V% -W 45 -H 30 -c 160 -k 160 -F 1
+.\driver\Debug\MLOpenDriver.exe activ -t %T% -n %B%  -V %V% -W 45 -H 30 -c 160 -k 160 -F 1
 echo "inception_5a/3x3 1x160x64x128x320x3x3"
-aLibDNNDriver conv -t %T% -n %B%  -V %V% -W 45 -H 30 -c 160 -k 320 -x 3 -y 3 -p 1 -q 1  -F 1 -s %S%
+.\driver\Debug\MLOpenDriver.exe conv -t %T% -n %B%  -V %V% -W 45 -H 30 -c 160 -k 320 -x 3 -y 3 -p 1 -q 1  -F 1 -s %S%
 echo "inception_5a/relu_3x3 1x320x64x128x320"
-aLibDNNDriver activ -t %T% -n %B%  -V %V% -W 45 -H 30 -c 320 -k 320 -F 1
+.\driver\Debug\MLOpenDriver.exe activ -t %T% -n %B%  -V %V% -W 45 -H 30 -c 320 -k 320 -F 1
 echo "inception_5a/5x5_reduce 1x832x64x128x32x1x1"
-aLibDNNDriver conv -t %T% -n %B%  -V %V% -W 45 -H 30 -c 832 -k 32 -x 1 -y 1 -p 0 -q 0  -F 1 -s %S%
+.\driver\Debug\MLOpenDriver.exe conv -t %T% -n %B%  -V %V% -W 45 -H 30 -c 832 -k 32 -x 1 -y 1 -p 0 -q 0  -F 1 -s %S%
 echo "inception_5a/relu_5x5_reduce 1x32x64x128x32"
-aLibDNNDriver activ -t %T% -n %B%  -V %V% -W 45 -H 30 -c 32 -k 32 -F 1
+.\driver\Debug\MLOpenDriver.exe activ -t %T% -n %B%  -V %V% -W 45 -H 30 -c 32 -k 32 -F 1
 echo "inception_5a/5x5 1x32x64x128x128x5x5"
-aLibDNNDriver conv -t %T% -n %B%  -V %V% -W 45 -H 30 -c 32 -k 128 -x 5 -y 5 -p 2 -q 2  -F 1 -s %S%
+.\driver\Debug\MLOpenDriver.exe conv -t %T% -n %B%  -V %V% -W 45 -H 30 -c 32 -k 128 -x 5 -y 5 -p 2 -q 2  -F 1 -s %S%
 echo "inception_5a/relu_5x5 1x128x64x128x128"
-aLibDNNDriver activ -t %T% -n %B%  -V %V% -W 45 -H 30 -c 128 -k 128 -F 1
+.\driver\Debug\MLOpenDriver.exe activ -t %T% -n %B%  -V %V% -W 45 -H 30 -c 128 -k 128 -F 1
 echo "inception_5a/pool 1x832x64x128x832x3x3"
-aLibDNNDriver pool -t %T% -n %B%  -V %V% -W 45 -H 30 -c 832 -k 832 -x 3 -y 3 -p 1 -q 1 -F 1
+.\driver\Debug\MLOpenDriver.exe pool -t %T% -n %B%  -V %V% -W 45 -H 30 -c 832 -k 832 -x 3 -y 3 -p 1 -q 1 -F 1
 echo "inception_5a/pool_proj 1x832x64x128x128x1x1"
-aLibDNNDriver conv -t %T% -n %B%  -V %V% -W 45 -H 30 -c 832 -k 128 -x 1 -y 1 -p 0 -q 0  -F 1 -s %S%
+.\driver\Debug\MLOpenDriver.exe conv -t %T% -n %B%  -V %V% -W 45 -H 30 -c 832 -k 128 -x 1 -y 1 -p 0 -q 0  -F 1 -s %S%
 echo "inception_5a/relu_pool_proj 1x128x64x128x128"
-aLibDNNDriver activ -t %T% -n %B%  -V %V% -W 45 -H 30 -c 128 -k 128 -F 1
+.\driver\Debug\MLOpenDriver.exe activ -t %T% -n %B%  -V %V% -W 45 -H 30 -c 128 -k 128 -F 1
 echo "inception_5a/output 3"
 echo "inception_5b/1x1 1x832x64x128x384x1x1"
-aLibDNNDriver conv -t %T% -n %B%  -V %V% -W 45 -H 30 -c 832 -k 384 -x 1 -y 1 -p 0 -q 0  -F 1 -s %S%
+.\driver\Debug\MLOpenDriver.exe conv -t %T% -n %B%  -V %V% -W 45 -H 30 -c 832 -k 384 -x 1 -y 1 -p 0 -q 0  -F 1 -s %S%
 echo "inception_5b/relu_1x1 1x384x64x384x256"
-aLibDNNDriver activ -t %T% -n %B%  -V %V% -W 45 -H 30 -c 384 -k 384 -F 1
+.\driver\Debug\MLOpenDriver.exe activ -t %T% -n %B%  -V %V% -W 45 -H 30 -c 384 -k 384 -F 1
 echo "inception_5b/3x3_reduce 1x832x64x128x192x1x1"
-aLibDNNDriver conv -t %T% -n %B%  -V %V% -W 45 -H 30 -c 832 -k 192 -x 1 -y 1 -p 0 -q 0  -F 1 -s %S%
+.\driver\Debug\MLOpenDriver.exe conv -t %T% -n %B%  -V %V% -W 45 -H 30 -c 832 -k 192 -x 1 -y 1 -p 0 -q 0  -F 1 -s %S%
 echo "inception_5b/relu_3x3_reduce 1x192x64x128x192"
-aLibDNNDriver activ -t %T% -n %B%  -V %V% -W 45 -H 30 -c 192 -k 192 -F 1
+.\driver\Debug\MLOpenDriver.exe activ -t %T% -n %B%  -V %V% -W 45 -H 30 -c 192 -k 192 -F 1
 echo "inception_5b/3x3 1x192x64x128x384x3x3"
-aLibDNNDriver conv -t %T% -n %B%  -V %V% -W 45 -H 30 -c 192 -k 384 -x 3 -y 3 -p 1 -q 1  -F 1 -s %S%
+.\driver\Debug\MLOpenDriver.exe conv -t %T% -n %B%  -V %V% -W 45 -H 30 -c 192 -k 384 -x 3 -y 3 -p 1 -q 1  -F 1 -s %S%
 echo "inception_5b/relu_3x3 1x384x64x128x384"
-aLibDNNDriver activ -t %T% -n %B%  -V %V% -W 45 -H 30 -c 384 -k 384 -F 1
+.\driver\Debug\MLOpenDriver.exe activ -t %T% -n %B%  -V %V% -W 45 -H 30 -c 384 -k 384 -F 1
 echo "inception_5b/5x5_reduce 1x832x64x128x48x1x1"
-aLibDNNDriver conv -t %T% -n %B%  -V %V% -W 45 -H 30 -c 832 -k 48 -x 1 -y 1 -p 0 -q 0  -F 1 -s %S%
+.\driver\Debug\MLOpenDriver.exe conv -t %T% -n %B%  -V %V% -W 45 -H 30 -c 832 -k 48 -x 1 -y 1 -p 0 -q 0  -F 1 -s %S%
 echo "inception_5b/relu_5x5_reduce 1x48x64x128x48"
-aLibDNNDriver activ -t %T% -n %B%  -V %V% -W 45 -H 30 -c 48 -k 48 -F 1
+.\driver\Debug\MLOpenDriver.exe activ -t %T% -n %B%  -V %V% -W 45 -H 30 -c 48 -k 48 -F 1
 ]echo "inception_5b/5x5 1x48x64x128x128x5x5"
-aLibDNNDriver conv -t %T% -n %B%  -V %V% -W 45 -H 30 -c 48 -k 128 -x 5 -y 5 -p 2 -q 2  -F 1 -s %S%
+.\driver\Debug\MLOpenDriver.exe conv -t %T% -n %B%  -V %V% -W 45 -H 30 -c 48 -k 128 -x 5 -y 5 -p 2 -q 2  -F 1 -s %S%
 echo "inception_5b/relu_5x5 1x128x64x128x128"
-aLibDNNDriver activ -t %T% -n %B%  -V %V% -W 45 -H 30 -c 128 -k 128 -F 1
+.\driver\Debug\MLOpenDriver.exe activ -t %T% -n %B%  -V %V% -W 45 -H 30 -c 128 -k 128 -F 1
 echo "inception_5b/pool 1x832x64x128x832x3x3"
-aLibDNNDriver pool -t %T% -n %B%  -V %V% -W 45 -H 30 -c 832 -k 832 -x 3 -y 3 -p 1 -q 1 -F 1
+.\driver\Debug\MLOpenDriver.exe pool -t %T% -n %B%  -V %V% -W 45 -H 30 -c 832 -k 832 -x 3 -y 3 -p 1 -q 1 -F 1
 echo "inception_5b/pool_proj 1x832x64x128x128x1x1"
-aLibDNNDriver conv -t %T% -n %B%  -V %V% -W 45 -H 30 -c 832 -k 128 -x 1 -y 1 -p 0 -q 0  -F 1 -s %S%
+.\driver\Debug\MLOpenDriver.exe conv -t %T% -n %B%  -V %V% -W 45 -H 30 -c 832 -k 128 -x 1 -y 1 -p 0 -q 0  -F 1 -s %S%
 echo "inception_5b/relu_pool_proj 1x128x64x128x128"
-aLibDNNDriver activ -t %T% -n %B%  -V %V% -W 45 -H 30 -c 128 -k 128 -F 1
+.\driver\Debug\MLOpenDriver.exe activ -t %T% -n %B%  -V %V% -W 45 -H 30 -c 128 -k 128 -F 1
 echo "inception_5b/output 3"
 :end
 cd ../aLibDNN


Update stage_5_patch.bat

Update stage_5_patch.bat

--- resources/stage_5_patch/stage_5_patch.bat
+++ resources/stage_5_patch/stage_5_patch.bat
@@ -11,7 +11,7 @@
 :: PREP AND CHECKS ::
 :::::::::::::::::::::
 set STAGE_5_SCRIPT_VERSION=1.0.0
-set STAGE_5_SCRIPT_DATE=2015-12-xx
+set STAGE_5_SCRIPT_DATE=2015-11-30

 :: Quick check to see if we inherited the appropriate variables from Tron.bat
 if /i "%LOGFILE%"=="" (


MOB-2187

--- src/bin/mmx-server.bat
+++ src/bin/mmx-server.bat
@@ -17,6 +17,10 @@
 set PROG=mmx-server

+
+cd ..\plugins
+copy /b "*.jar" +,,  1>NUL 2>NUL
+cd ..\bin

 call :check2Args %*


Clean up build script (pushd and popd hell)

--- src/build/do_build.bat
+++ src/build/do_build.bat
@@ -12,14 +12,13 @@
 echo *** MAIN ASSEMBLY ***
 echo.
 dotnet restore
-pushd ..\Couchbase.Lite.Support.NetDesktop
+cd ..\Couchbase.Lite.Support.NetDesktop
 echo.
 echo *** NET DESKTOP ***
 echo.
 dotnet restore
-popd

-pushd ..\Couchbase.Lite.Support.UWP
+cd ..\Couchbase.Lite.Support.UWP
 if not exist ..\..\nuget.exe (
     powershell -Command "Invoke-WebRequest https://dist.nuget.org/win-x86-commandline/latest/nuget.exe -OutFile ..\..\nuget.exe"
 )
@@ -27,41 +26,41 @@
 echo *** UWP ***
 echo.
 "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\MSBuild.exe" /t:Restore
-popd
+
 echo.
 echo *** IOS ***
 echo.
-pushd ..\Couchbase.Lite.Support.Apple\iOS
+cd ..\Couchbase.Lite.Support.Apple\iOS
 ..\..\..\nuget.exe restore -SolutionDirectory ..\..
-popd
+
 echo.
 echo *** ANDROID ***
 echo.
-pushd ..\Couchbase.Lite.Support.Android
+cd ..\..\Couchbase.Lite.Support.Android
 ..\..\nuget.exe restore -SolutionDirectory ..
-popd

 echo.
 echo *** COPYING NATIVE RESOURCES ***
 echo.
 if not exist ..\Couchbase.Lite.Support.Apple\iOS\Resources mkdir ..\Couchbase.Lite.Support.Apple\iOS\Resources
 xcopy /Y ..\..\vendor\couchbase-lite-core\build_cmake\ios-fat\libLiteCore.dylib ..\Couchbase.Lite.Support.Apple\iOS\Resources
-pushd ..
+cd ..

 echo.
 echo *** BUILDING ***
 echo.
-pushd ..\Tools\SourceLink\dotnet-sourcelink-git
-dotnet build -c Release
-cd ..\dotnet-sourcelink
-dotnet build -c Release
-popd
+echo %cd%

-pushd Couchbase.Lite
-dotnet build -c Packaging /p:SourceLinkCreate=true
-dotnet ..\..\Tools\SourceLink\dotnet-sourcelink-git\bin\Release\netcoreapp1.0\dotnet-sourcelink-git.dll create --url "https://raw.githubusercontent.com/couchbase/couchbase-lite-net/{commit}/*"
-popd
+if exist ..\Tools\SourceLink (
+    cd ..\Tools\SourceLink\dotnet-sourcelink-git
+    dotnet build -c Release dotnet-sourcelink-git.csproj
+    cd ..\..\..\src\Couchbase.Lite
+
+    dotnet build -c Packaging /p:SourceLinkCreate=true
+    dotnet ..\..\Tools\SourceLink\dotnet-sourcelink-git\bin\Release\netcoreapp1.0\dotnet-sourcelink-git.dll create --url "https://raw.githubusercontent.com/couchbase/couchbase-lite-net/{commit}/*"
+)
+
+cd ..
 "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\MSBuild.exe" Couchbase.Lite.sln /p:Configuration=Packaging

-popd
 popd


Added Windows version of Handlebars compile script

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

--- compile.cmd
+++ compile.cmd
@@ -0,0 +1,14 @@
+@ECHO OFF
+SETLOCAL
+REM Compile the handlebars templates.
+SET handlebars=
+FOR /R %%i IN (stylebot\js\templates\*.handlebars) DO CALL :concat %%i
+handlebars %handlebars% -f %~dp0stylebot\js\templates.js
+GOTO :eof
+
+:concat
+SET handlebars=%handlebars%%1
+GOTO :eof
+
+:eof
+ENDLOCAL


Fix: use WinRAR GUI version to pack to zip.

--- compile.cmd
+++ compile.cmd
@@ -4,6 +4,6 @@
 del scrapbookx.xpi
 rem so that it's not archived

-rar a -r -x@compile.exclude.txt scrapbookx.zip *
-rar a -r -n@compile.include.txt scrapbookx.zip *
+winrar a -afzip -r -x@compile.exclude.txt scrapbookx.zip *
+winrar a -afzip -r -n@compile.include.txt scrapbookx.zip *
 ren scrapbookx.zip scrapbookx.xpi


deleted compile.bat.

deleted compile.bat.

--- complie.bat
+++ complie.bat
@@ -1,2 +0,0 @@
-cd C:\Users\orhe\Documents\GitHub\ChartSearch
-mvn install -DskipTests


updated test bat file.

updated test bat file.

--- src/test/releasetest/releasetest.bat
+++ src/test/releasetest/releasetest.bat
@@ -23,6 +23,7 @@

 cd %APPNAME%
 tspawn s blog
+tspawn w foo
 qmake -r CONFIG+=release
 %MAKE%
 if ERRORLEVEL 1 (


HIVE-10968 : Windows: analyze json table via beeline failed throwing Class org.apache.hive.hcatalog.data.JsonSerDe not found (Hari Subramaniyan, reviewed by Thejas Nair)

--- bin/ext/hiveserver2.cmd
+++ bin/ext/hiveserver2.cmd
@@ -76,7 +76,7 @@
 @echo   ^<name^>HiveServer2^</name^>
 @echo   ^<description^>Hadoop HiveServer2 Service^</description^>
 @echo   ^<executable^>%JAVA_HOME%\bin\java^</executable^>
-@echo   ^<arguments^>%JAVA_HEAP_MAX% -XX:MaxPermSize=512m %HADOOP_OPTS% -classpath %CLASSPATH%;%HIVE_HBASE_PATH% %CLASS% -hiveconf hive.hadoop.classpath=%HIVE_LIB%\* -hiveconf hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactory -hiveconf hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateUserAuthenticator -hiveconf hive.metastore.uris=" " %HIVE_OPTS%^</arguments^>
+@echo   ^<arguments^>%JAVA_HEAP_MAX% -XX:MaxPermSize=512m %HADOOP_OPTS% -classpath %CLASSPATH%;%HIVE_HBASE_PATH%;%HIVE_HOME%\hcatalog\share\hcatalog\* %CLASS% -hiveconf hive.hadoop.classpath=%HIVE_LIB%\*;%HIVE_HOME%\hcatalog\share\hcatalog\* -hiveconf hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactory -hiveconf hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateUserAuthenticator -hiveconf hive.metastore.uris=" " %HIVE_OPTS%^</arguments^>
 @echo ^</service^>
 goto :EOF


Updating release script. No longer tagging repo.

--- Build/createRelease.bat
+++ Build/createRelease.bat
@@ -1,40 +1,35 @@
-@echo off
-SET ROOTDIR=%~dp0
-set ROOTDIR=%ROOTDIR:~0,-7%
-set msbuild="%PROGRAMFILES(X86)%\Microsoft Visual Studio\2017\BuildTools\MSBuild\15.0\Bin\msbuild.exe"
-set configuration=Release
-set nugetFolder="%ROOTDIR%\.nuget"
-set PackageFolder="%ROOTDIR%\packages"
-set msbuildtasksVersion=1.4.0.65
-
-echo Before creating a release, remember to...
-echo * Update release notes
-echo.
-
-echo Installing msbuildtasks to %PackageFolder%. Please wait...
-%nugetFolder%\NuGet install MsBuildTasks -o %PackageFolder% -Version %msbuildtasksVersion%
-
-echo.
-set /p Version=Please enter version number, eg 1.2.0.0:
-set /p NugetVersion=Please enter nuget version number, eg 1.2:
-
-%msbuild% default.msbuild /v:q /t:MakeRelease
-
-git checkout -- %ROOTDIR%\MbCache.ProxyImpl.Castle\Properties\AssemblyInfo.cs
-git checkout -- %ROOTDIR%\MbCache.ProxyImpl.LinFu\Properties\AssemblyInfo.cs
-git checkout -- %ROOTDIR%\MbCache\Properties\AssemblyInfo.cs
-git checkout -- %ROOTDIR%\MbCacheTest\Properties\AssemblyInfo.cs
-
-echo -------------------------------
-echo.
-echo Updated assemblyinfo files to %Version%.
-echo Created a new nuget package to output folder.
-echo.
-echo Remember to...
-echo * Tag current changeset with version %nugetversion%
-echo * Push changes (tag and release notes) to server repo
-echo * Push nuget package to nuget server (and symbol server)
-
-echo.
-
+@echo off
+SET ROOTDIR=%~dp0
+set ROOTDIR=%ROOTDIR:~0,-7%
+set msbuild="%PROGRAMFILES(X86)%\Microsoft Visual Studio\2017\BuildTools\MSBuild\15.0\Bin\msbuild.exe"
+set configuration=Release
+set nugetFolder="%ROOTDIR%\.nuget"
+set PackageFolder="%ROOTDIR%\packages"
+set msbuildtasksVersion=1.4.0.65
+
+echo Before creating a release, remember to...
+echo * Update release notes
+echo.
+
+echo Installing msbuildtasks to %PackageFolder%. Please wait...
+%nugetFolder%\NuGet install MsBuildTasks -o %PackageFolder% -Version %msbuildtasksVersion%
+
+echo.
+set /p Version=Please enter version number, eg 1.2.0.0:
+set /p NugetVersion=Please enter nuget version number, eg 1.2:
+
+%msbuild% default.msbuild /v:q /t:MakeRelease
+
+git checkout -- %ROOTDIR%\MbCache.ProxyImpl.Castle\Properties\AssemblyInfo.cs
+git checkout -- %ROOTDIR%\MbCache.ProxyImpl.LinFu\Properties\AssemblyInfo.cs
+git checkout -- %ROOTDIR%\MbCache\Properties\AssemblyInfo.cs
+git checkout -- %ROOTDIR%\MbCacheTest\Properties\AssemblyInfo.cs
+
+echo -------------------------------
+echo.
+echo Updated assemblyinfo files to %Version%.
+echo Created a new nuget package to output folder.
+echo Did NOT push it to nuget.org
+echo.
+
 pause


added chocolatey install script

added chocolatey install script

--- install-chocolatey.cmd
+++ install-chocolatey.cmd
@@ -0,0 +1 @@
+@powershell -NoProfile -ExecutionPolicy unrestricted -Command "iex ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1'))" && SET PATH=%PATH%;%systemdrive%\chocolatey\bin


Added copywrite header for ConfigTest windows script

--- kubernetes-client/src/test/resources/token-generator-win.bat
+++ kubernetes-client/src/test/resources/token-generator-win.bat
@@ -1,3 +1,19 @@
+@REM
+@REM Copyright (C) 2015 Red Hat, Inc.
+@REM
+@REM Licensed under the Apache License, Version 2.0 (the "License");
+@REM you may not use this file except in compliance with the License.
+@REM You may obtain a copy of the License at
+@REM
+@REM         http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing, software
+@REM distributed under the License is distributed on an "AS IS" BASIS,
+@REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@REM See the License for the specific language governing permissions and
+@REM limitations under the License.
+@REM
+
 @echo off
 SET token=%PART1% %1
 CALL :upper token


Fixes luarocks downloading.

Fixes luarocks downloading.

--- .scripts/install_lua.bat
+++ .scripts/install_lua.bat
@@ -79,10 +79,10 @@
 :: Downloads and installs LuaRocks
 cd %APPVEYOR_BUILD_FOLDER%
 if !LUAROCKS_VER!==HEAD (
+	git clone https://github.com/keplerproject/luarocks.git downloads\luarocks-%LUAROCKS_VER%-win32
+) else (
 	call :download %LUAROCKS_URL%/luarocks-%LUAROCKS_VER%-win32.zip
 	call :extract_zip downloads\luarocks-%LUAROCKS_VER%-win32.zip downloads\luarocks-%LUAROCKS_VER%-win32
-) else (
-	git clone https://github.com/keplerproject/luarocks.git downloads\luarocks-%LUAROCKS_VER%-win32
 )
 cd downloads\luarocks-%LUAROCKS_VER%-win32
 call install.bat /LUA %LUA_DIR% /Q /LV %LUA_SHORTV% || call :die


Binding skeleton creation script for Windows.

Signed-off-by: Dancho Penev <37e475d111572792472c8fad744ee4c4e32f000f@hotmail.com>

error: pathspec 'addons/binding/create_openhab_binding_skeleton.cmd' did not match any file(s) known to git

--- addons/binding/create_openhab_binding_skeleton.cmd
+++ addons/binding/create_openhab_binding_skeleton.cmd
@@ -0,0 +1,16 @@
+@echo off
+
+
+SETLOCAL
+SET ARGC=0
+
+FOR %%x IN (%*) DO SET /A ARGC+=1
+
+IF %ARGC% NEQ 2 (
+	echo Usage: %0 BindingIdInCamelCase BindingIdInLowerCase
+	exit /B 1
+)
+
+mvn archetype:generate -N -DarchetypeGroupId=org.eclipse.smarthome.archetype -DarchetypeArtifactId=org.eclipse.smarthome.archetype.binding -DarchetypeVersion=0.7.0-SNAPSHOT -DgroupId=org.openhab.binding -DartifactId=org.openhab.binding.%2 -Dpackage=org.openhab.binding.%2 -DarchetypeCatalog='file://../archetype-catalog.xml' -Dversion=2.0.0-SNAPSHOT -DbindingId=%2 -DbindingIdCamelCase=%1 -DvendorName=openHAB -Dnamespace=org.openhab
+
+ENDLOCAL


MBlockEditor. Fix deploy script

MBlockEditor. Fix deploy script

--- MBlockEditor/Deploy.cmd
+++ MBlockEditor/Deploy.cmd
@@ -2,14 +2,14 @@
 if "%~1"=="" goto noparm

 cd /D "%~dp0\Release"
-7z a "..\_Arc\MBlockEditor%1.7z" *.dll *.map *.reg *.fml *.farconfig Changelog
+7z a "..\_Arc\MBlockEditor%1.7z" MBlockEditorW3L*.dll MBlockEditorW3L*.map Comment_FileTypes.farconfig Editor.CommentIndent.lua Changelog
 if errorlevel 1 goto err7z

-7z a "..\_Arc\MBlockEditor%1.dbg.7z" *.pdb
+7z a "..\_Arc\MBlockEditor%1.dbg.7z" MBlockEditorW3L*.pdb
 if errorlevel 1 goto err7z

 cd /D "%~dp0"
-7z a -r "_Arc\MBlockEditor%1.src.7z" Release\*.reg Release\*.fml Release\Changelog src\* -x!*.suo -x!*.user -x!*.aps -x!*.log
+7z a -r "_Arc\MBlockEditor%1.src.7z" Release\*.reg Release\*.fml Release\Changelog src\* -x!*.suo -x!*.user -x!*.aps -x!*.log -x!*.sdf -x!*.opensdf
 if errorlevel 1 goto err7z

 goto fin


Fix the issue that rDSN source directory contains blanks.

--- bin/Windows/deploy.cmd
+++ bin/Windows/deploy.cmd
@@ -14,30 +14,30 @@
 SET machine_list=%src_dir%\machines.txt

 IF "%src_dir%" EQU "" (
-    CALL %bin_dir%\echoc.exe 4 source directory not specified
+    CALL "%bin_dir%\echoc.exe" 4 source directory not specified
     CALL :usage
     GOTO exit
 )

 IF NOT EXIST "%src_dir%" (
-    CALL %bin_dir%\echoc.exe 4 cannot find source directory '%src_dir%'
+    CALL "%bin_dir%\echoc.exe" 4 cannot find source directory '%src_dir%'
     CALL :usage
     GOTO exit
 )

 IF NOT EXIST "%src_dir%\start.cmd" (
-    CALL %bin_dir%\echoc.exe 4 please create start.cmd in source directory '%src_dir%'
+    CALL "%bin_dir%\echoc.exe" 4 please create start.cmd in source directory '%src_dir%'
     GOTO exit
 )

 IF NOT EXIST "%machine_list%" (
-    CALL %bin_dir%\echoc.exe 4 cannot find machine_list file '%machine_list%'
+    CALL "%bin_dir%\echoc.exe" 4 cannot find machine_list file '%machine_list%'
     CALL :usage
     GOTO exit
 )

 IF "%3" EQU "" (
-    CALL %bin_dir%\echoc.exe 4 destination dir not specified
+    CALL "%bin_dir%\echoc.exe" 4 destination dir not specified
     CALL :usage
     GOTO exit
 )
@@ -51,7 +51,7 @@
 FOR /F %%i IN (%machine_list%) DO ECHO %cmd% %%i %src_dir% %ldst_dir% %deploy_name% ... && start %bin_dir%\deploy.one.cmd %cmd% %src_dir% %ldst_dir% %deploy_name% %%i

 IF ERRORLEVEL 1 (
-    CALL %bin_dir%\echoc.exe 4 unknow command '%cmd%'
+    CALL "%bin_dir%\echoc.exe" 4 unknow command '%cmd%'
     CALL :usage
     GOTO exit
 )


Added a batch script for running IPyParallels cluster.

error: pathspec 'src/main/python/run_ipp_cluster.bat' did not match any file(s) known to git

--- src/main/python/run_ipp_cluster.bat
+++ src/main/python/run_ipp_cluster.bat
@@ -0,0 +1,2 @@
+set PYTHONPATH=%PYTHONPATH%;S:\dev\tsa\src\main\python
+C:\Programs\Win64\Anaconda\V4.4.0_3.6\Scripts\ipcluster start --profile=mycluster --n=8


fix parallel build

fix parallel build

--- recipes/gau2grid/bld.bat
+++ recipes/gau2grid/bld.bat
@@ -20,14 +20,14 @@
 cd build
 cmake --build . ^
       --config Release ^
-      --target install ^
-      -- -j %CPU_COUNT%
+      --target install
 if errorlevel 1 exit 1

 :: tests outside build phase

+::      -- -j %CPU_COUNT%  # not on MSVC

 ::        ::-DCMAKE_C_FLAGS="%CFLAGS%" ^
 ::        ::-DCMAKE_C_COMPILER=clang-cl ^


Create CleanSystem.bat

Create CleanSystem.bat

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

--- Windows/CleanSystem.bat
+++ Windows/CleanSystem.bat
@@ -0,0 +1,7 @@
+REM Turn on UAC
+reg add HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System /v EnableLUA /t REG_DWORD /d 1 /f
+REM No Remote Desktop
+reg add "HKLM\SYSTEM\CurrentControlSet\Control\Terminal Server" /v fDenyTSConnections /t REG_DWORD /d 1 /f
+reg add "HKLM\SYSTEM\CurrentControlSet\Control\Terminal Server\WinStations\RDP-Tcp" /v UserAuthentication /t REG_DWORD /d 0 /f
+REM Windows auomatic updates
+reg add "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate\Auto Update" /v AUOptions /t REG_DWORD /d 3 /f


Remove w9xopen.exe and add README.txt to Windows build

--- tools/release_win.bat
+++ tools/release_win.bat
@@ -3,6 +3,8 @@
 python setup.py py2exe
 cd dist
 7z d library.zip jinja2\* dns\* 'graphy\*
+del /s w9xpopen.exe
+copy ..\README.txt .
 7z a namebench_for_Windows.zip -r *
 namebench -x -O 8.8.8.8 -t5 -o test.html
 start test.html


Add windows_node.cmd build script

Add windows_node.cmd build script

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

--- build/windows_node.cmd
+++ build/windows_node.cmd
@@ -0,0 +1,29 @@
+@REM Copyright (c) Microsoft. All rights reserved.
+@REM Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+@setlocal
+@echo off
+
+set build-root=%~dp0..
+REM Resolve to fully qualified path
+for %%i in ("%build-root%") do set build-root=%%~fi
+
+cd %build-root%\node
+
+REM Set up links in the npm cache to ensure we're exercising all the code in
+REM the repo, rather than downloading released versions of our packages from
+REM npm.
+call build\dev-setup.cmd
+if errorlevel 1 goto :eof
+
+REM Lint all JavaScript code and run unit + integration tests
+call build\build.cmd --min --integration-tests
+if errorlevel 1 goto :eof
+
+REM The 'npm link' commands in this script create symlinks to tracked repo
+REM files from ignored locations (under ./node_modules). This means a call to
+REM 'git clean -xdf' will delete tracked files from the repo's working
+REM directory. To avoid any complications, we'll unlink everything before
+REM exiting.
+call build\dev-teardown.cmd
+if errorlevel 1 goto :eof


git-svn-id: https://localhost:8443/svn/HpClass@22 993693f5-bd21-2247-966d-1f709dc436f8

--- update.bat
+++ update.bat
@@ -1 +1,2 @@
-svn update ./+svn update ./
+../svnexport/HPClass.bat


add removing redundant files to upload.bat

--- upload.bat
+++ upload.bat
@@ -4,3 +4,4 @@
 rd /S /Q dist
 del MANIFEST
 del setup.cfg
+del hse_ruz.egg-info


Create train_full.bat

Create train_full.bat

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

--- examples/cifar10/train_full.bat
+++ examples/cifar10/train_full.bat
@@ -0,0 +1,12 @@
+@echo off
+SET GLOG_logtostderr=1
+"../../bin/train_net.exe" cifar10_full_solver.prototxt
+
+rem reduce learning rate by factor of 10
+SET GLOG_logtostderr=1
+"../../bin/train_net.exe" cifar10_full_solver_lr1.prototxt cifar10_full_iter_60000.solverstate
+
+rem reduce learning rate by factor of 10
+SET GLOG_logtostderr=1
+"../../bin/train_net.exe" cifar10_full_solver_lr2.prototxt cifar10_full_iter_65000.solverstate
+pause


Update SetupComplete.cmd

Update SetupComplete.cmd

--- unattended.win10/Setup/Scripts/SetupComplete.cmd
+++ unattended.win10/Setup/Scripts/SetupComplete.cmd
@@ -35,6 +35,7 @@
 reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows\Windows Search" /v AllowCortana /t REG_DWORD /d 0 /f
 reg add "HKLM\SOFTWARE\Microsoft\WcmSvc\wifinetworkmanager\features" /v WiFiSenseCredShared /t REG_DWORD /d 0 /f
 reg add "HKLM\SOFTWARE\Microsoft\WcmSvc\wifinetworkmanager\features" /v WiFiSenseOpen /t REG_DWORD /d 0 /f
+reg add "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\DeviceAccess\Global\A8804298-2D5F-42E3-9531-9C8C39EB29CE" /v Value /t REG_DWORD /d 0 /f

 cscript "%WINDIR%\System32\Printing_Admin_Scripts\en-US\prndrvr.vbs" -a -m "Canon LBP2900" -i "%WINDIR%\Setup\Files\CanonLBP2900\CNAB4STD.inf"
 cscript "%WINDIR%\System32\Printing_Admin_Scripts\en-US\prndrvr.vbs" -a -m "Canon G2000 series Printer" -i "%WINDIR%\Setup\Files\CanonG2000\Driver\G2000P6.inf"


On Windows, use TLS 1.2

On Windows, use TLS 1.2

--- maven-wrapper/mvnw.cmd
+++ maven-wrapper/mvnw.cmd
@@ -141,7 +141,7 @@
 		"if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
 		"$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
 		"}"^
-		"$webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^
+		"[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^
 		"}"
     echo Finished downloading %WRAPPER_JAR%
 )


when launch in other unit yhan c...

when launch in other unit yhan c...

--- legacy/app/php_borrasca.bat
+++ legacy/app/php_borrasca.bat
@@ -1 +1,2 @@
+cd %~dp0
 php -S localhost:9020 server.php


Enable binary build logging

Enable binary build logging

Since binary log contains very extensive information, we lower the console log output verbosity to minimal.

Download binary log viewer from https://github.com/KirillOsenkov/MSBuildStructuredLog/releases

--- tools/buildRelease.cmd
+++ tools/buildRelease.cmd
@@ -1,4 +1,4 @@
 @ECHO OFF
 pushd %~dp0..
-msbuild /m /p:Configuration=Release /fl
-popd+msbuild /m /p:Configuration=Release /binaryLogger /verbosity:minimal
+popd


Remove VS2010 support.

Remove VS2010 support.

--- build/GenerateProjects.bat
+++ build/GenerateProjects.bat
@@ -5,24 +5,18 @@
 echo Build Project Generator:
 echo.
 echo [0] Clean
-echo [1] Visual C++ 2010
-echo [2] Visual C++ 2012
-echo [3] GNU Make
+echo [1] Visual C++ 2012
+echo [2] GNU Make
 echo.

 :choice
 set /P C="Choice: "
-if "%C%"=="3" goto gmake
-if "%C%"=="2" goto vs2012
-if "%C%"=="1" goto vs2010
+if "%C%"=="2" goto gmake
+if "%C%"=="1" goto vs2012
 if "%C%"=="0" goto clean

 :clean
 "premake4" --file=premake4.lua clean
-goto quit
-
-:vs2010
-"premake4" --file=premake4.lua vs2010
 goto quit

 :vs2012