Dont md5 check that one special file

Dont md5 check that one special file

--- tests/runonce.bat
+++ tests/runonce.bat
@@ -33,8 +33,6 @@
 START "" zput -vv -q -t 10 "tests/filename with spaces"
 zget -vv -q -t 10 "filename with spaces" recv_LICENSE
 IF ERRORLEVEL 1 EXIT /B 1
-md5 -cd4999f5a6fb5ebee9c8fb5496d57050f recv_LICENSE
-IF ERRORLEVEL 1 EXIT /B 1

 START "" zput -vv -q -t 10 LICENSE asd
 zget -vv -q -t 10 LICENSE recv_LICENSE


:notebook: temp disable nb tests on windows.

--- scripts/test-integration.bat
+++ scripts/test-integration.bat
@@ -43,8 +43,8 @@

 :: Tests in the extension host

-call "%INTEGRATION_TEST_ELECTRON_PATH%" %~dp0\..\extensions\vscode-notebook-tests\test --enable-proposed-api=vscode.vscode-notebook-tests --extensionDevelopmentPath=%~dp0\..\extensions\vscode-notebook-tests --extensionTestsPath=%~dp0\..\extensions\vscode-notebook-tests\out --disable-telemetry --crash-reporter-directory=%VSCODECRASHDIR% --no-cached-data --disable-updates --disable-extensions --user-data-dir=%VSCODEUSERDATADIR%
-if %errorlevel% neq 0 exit /b %errorlevel%
+:: call "%INTEGRATION_TEST_ELECTRON_PATH%" %~dp0\..\extensions\vscode-notebook-tests\test --enable-proposed-api=vscode.vscode-notebook-tests --extensionDevelopmentPath=%~dp0\..\extensions\vscode-notebook-tests --extensionTestsPath=%~dp0\..\extensions\vscode-notebook-tests\out --disable-telemetry --crash-reporter-directory=%VSCODECRASHDIR% --no-cached-data --disable-updates --disable-extensions --user-data-dir=%VSCODEUSERDATADIR%
+:: if %errorlevel% neq 0 exit /b %errorlevel%

 call "%INTEGRATION_TEST_ELECTRON_PATH%" %~dp0\..\extensions\vscode-api-tests\testWorkspace --enable-proposed-api=vscode.vscode-api-tests --extensionDevelopmentPath=%~dp0\..\extensions\vscode-api-tests --extensionTestsPath=%~dp0\..\extensions\vscode-api-tests\out\singlefolder-tests --disable-telemetry --crash-reporter-directory=%VSCODECRASHDIR% --no-cached-data --disable-updates --disable-extensions --user-data-dir=%VSCODEUSERDATADIR%
 if %errorlevel% neq 0 exit /b %errorlevel%


Solve problem of non-failing native tests

--- scripts/test_native_code.bat
+++ scripts/test_native_code.bat
@@ -10,10 +10,10 @@
 FOR /F %%i IN (__tmp_gtest.txt) DO (
 	echo %%i
 	%%i --gtest_output="xml:%%i.xml"
-	powershell C:\projects\spectre\scripts\Upload-TestResult.ps1 -fileName %%i.xml
 	IF %ERRORLEVEL% NEQ 0 (
 		set /A failures=%failures%+1
 	)
+	powershell C:\projects\spectre\scripts\Upload-TestResult.ps1 -fileName %%i.xml
 )
 del __tmp_gtest.txt


fix ElevateMe for Win10 and windows terminal

--- elevate.bat
+++ elevate.bat
@@ -2,7 +2,7 @@
 if not "%~1"=="" call :Elevate %* 2>"%Temp%\%~n0.log" && exit /b || ( call :Error & exit /b )
 call :IsAdmin && ( call :Futile & exit /b )
 call :ElevateMe 2>"%Temp%\%~n0.log" || ( call :Error & exit /b )
-exit
+exit /b
 :Elevate <Executable> [Arguments]
 setlocal DisableDelayedExpansion
 PowerShell -NoProfile -ExecutionPolicy RemoteSigned -Command "$0 = '%1'; $cl = '%*'; $ar = $cl.Substring($0.Length); if (![bool]$ar) {$ar = ' '}; start $0.Trim([char]0x22) -Verb runas -ArgumentList $ar -WorkingDirectory (cvpa .); exit(!$?);"
@@ -10,10 +10,11 @@
 exit /b
 :ElevateMe
 setlocal DisableDelayedExpansion
-PowerShell -NoProfile -ExecutionPolicy RemoteSigned -Command "gwmi -Class Win32_Process -Filter ('ProcessId = ' + $pid) | foreach { $parent = gwmi -Class Win32_Process -Filter ('ProcessId = ' + $_.ParentProcessId)}; $gparent = gwmi -Class Win32_Process -Filter ('ProcessId = ' + $parent.ParentProcessId); $args = $gparent.CommandLine.Trim().Trim([char]0x22).Substring($gparent.ExecutablePath.Length) + ' '; start $gparent.ExecutablePath -Verb runas -ArgumentList $args -WorkingDirectory (cvpa .); exit(!$?);"
+PowerShell -NoProfile -ExecutionPolicy RemoteSigned -Command "gwmi -Class Win32_Process -Filter ('ProcessId = ' + $pid) | foreach { $parent = gwmi -Class Win32_Process -Filter ('ProcessId = ' + $_.ParentProcessId)}; if ( $parent.ExecutablePath -like '*cmd.exe' ) { $gparent = $parent } else { $gparent = gwmi -Class Win32_Process -Filter ('ProcessId = ' + $parent.ParentProcessId) }; if ( $gparent.CommandLine.Length -gt $gparent.ExecutablePath.Length ) { $args = ($gparent.CommandLine.Trim().Trim([char]0x22)).Substring($gparent.ExecutablePath.Length) }; if ( $var -eq $null ) { $args = ' ' }; start $gparent.ExecutablePath -Verb runas -ArgumentList $args -WorkingDirectory (cvpa .); exit(!$?);"
 endlocal
 exit /b
 :Error
+:: TODO display usage information.
 echo.Failed to elevate with Administrator privileges
 echo.See "%Temp%\%~n0.log" for details.
 exit /b


Delete uuid.cmd

Delete uuid.cmd

All node modules can be installed from a terminal by using `npm install` or `npm install --save`.

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


Remove printed junk of start-ssh-agent

Remove printed junk of start-ssh-agent

start-ssh-agent printed empty lines and parentheses as some
opening parentheses were not prefixed with an '@'.

Signed-off-by: Jan Schulz <7fb630b19ed7bf3033a3f003af589997c9df045d@gmx.net>

--- mingw-w64-git/start-ssh-agent.cmd
+++ mingw-w64-git/start-ssh-agent.cmd
@@ -10,10 +10,10 @@

 @REM Start the ssh-agent if needed by git
 @FOR %%i IN ("git.exe") DO @SET GIT=%%~$PATH:i
-@IF EXIST "%GIT%" (
+@IF EXIST "%GIT%" @(
     @REM Get the ssh-agent executable
     @FOR %%i IN ("ssh-agent.exe") DO @SET SSH_AGENT=%%~$PATH:i
-    @IF NOT EXIST "%SSH_AGENT%" (
+    @IF NOT EXIST "%SSH_AGENT%" @(
         @FOR %%s IN ("%GIT%") DO @SET GIT_DIR=%%~dps
         @FOR %%s IN ("!GIT_DIR!") DO @SET GIT_DIR=!GIT_DIR:~0,-1!
         @FOR %%s IN ("!GIT_DIR!") DO @SET GIT_ROOT=%%~dps
@@ -27,38 +27,38 @@
     @FOR /D %%s in ("!BIN_DIR!\ssh-add.exe") DO @SET SSH_ADD=%%~s
     @IF NOT EXIST "!SSH_ADD!" @GOTO ssh-agent-done
     @REM Check if the agent is running
-    @FOR /f "tokens=1-2" %%a IN ('tasklist /fi "imagename eq ssh-agent.exe"') DO (
+    @FOR /f "tokens=1-2" %%a IN ('tasklist /fi "imagename eq ssh-agent.exe"') DO @(
         @ECHO %%b | @FINDSTR /r /c:"[0-9][0-9]*" > NUL
         @IF "!ERRORLEVEL!" == "0" @SET SSH_AGENT_PID=%%b
     )
     @REM Connect up the current ssh-agent
-    @IF [!SSH_AGENT_PID!] == [] (
+    @IF [!SSH_AGENT_PID!] == []  @(
         @ECHO Removing old ssh-agent sockets
         @FOR /d %%d IN (%TEMP%\ssh-??????*) DO @RMDIR /s /q %%d
-    ) ELSE (
+    ) ELSE  @(
         @ECHO Found ssh-agent at !SSH_AGENT_PID!
-        @FOR /d %%d IN (%TEMP%\ssh-??????*) DO (
-            @FOR %%f IN (%%d\agent.*) DO (
+        @FOR /d %%d IN (%TEMP%\ssh-??????*) DO @(
+            @FOR %%f IN (%%d\agent.*) DO @(
                 @SET SSH_AUTH_SOCK=%%f
                 @SET SSH_AUTH_SOCK=!SSH_AUTH_SOCK:%TEMP%=/tmp!
                 @SET SSH_AUTH_SOCK=!SSH_AUTH_SOCK:\=/!
             )
         )
-        @IF NOT [!SSH_AUTH_SOCK!] == [] (
+        @IF NOT [!SSH_AUTH_SOCK!] == [] @(
             @ECHO Found ssh-agent socket at !SSH_AUTH_SOCK!
         ) ELSE (
             @ECHO Failed to find ssh-agent socket
-            SET SSH_AGENT_PID=
+            @SET SSH_AGENT_PID=
         )
     )
     @REM See if we have the key
     @SET "HOME=%USERPROFILE%"
     @"!SSH_ADD!" -l 1>NUL 2>NUL
     @SET result=!ERRORLEVEL!
-    @IF NOT !result! == 0 (
-        @IF !result! == 2 (
+    @IF NOT !result! == 0 @(
+        @IF !result! == 2 @(
             @ECHO | @SET /p=Starting ssh-agent:
-            @FOR /f "tokens=1-2 delims==;" %%a IN ('"!SSH_AGENT!"') DO (
+            @FOR /f "tokens=1-2 delims==;" %%a IN ('"!SSH_AGENT!"') DO @(
                 @IF NOT [%%b] == [] @SET %%a=%%b
             )
             @ECHO. done
@@ -75,6 +75,6 @@
           & @SET "SSH_AGENT_PID=%SSH_AGENT_PID%"

 @ECHO %cmdcmdline% | @FINDSTR /l "\"\"" >NUL
-@IF NOT ERRORLEVEL 1 (
+@IF NOT ERRORLEVEL 1 @(
     @CALL cmd %*
 )


Update last source of unity plugin from master.

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


fixed gremlin.bat to work with command line arguments. Thanks to http://github.com/hazard.

--- gremlin.bat
+++ gremlin.bat
@@ -1,9 +1,33 @@
 :: Windows launcher script for Gremlin
+@echo off

-if not "%JAVA_OPTIONS%" == "" goto gotOpts
 set JAVA_OPTIONS=-Xms32M -Xmx512M
-:gotOpts

+:: Launch the application
+if "%1" == "" goto console
+if "%1" == "-e" goto script
+if "%1" == "-v" goto version
+
+:console
 java %JAVA_OPTIONS% %JAVA_ARGS% -cp target/gremlin-*-standalone.jar com.tinkerpop.gremlin.Console
+goto :eof

-:: TODO: return exit code
+:script
+
+set strg=
+
+FOR %%X IN (%*) DO (
+CALL :concat %%X %1 %2
+)
+
+java %JAVA_OPTIONS% %JAVA_ARGS% -cp target/gremlin-*-standalone.jar com.tinkerpop.gremlin.ScriptExecutor %strg%
+goto :eof
+
+:version
+echo Gremlin 0.5
+goto :eof
+
+:concat
+if %1 == %2 goto skip
+SET strg=%strg% %1
+:skip


back and forth with appveyor race against time and space

--- scripts/msvc-build.bat
+++ scripts/msvc-build.bat
@@ -9,4 +9,4 @@
       -DBUILD_META_EXAMPLES=OFF ^
       -DENABLE_TESTING=ON .. || exit /B

-cmake --build . --target install --config %CONFIGURATION% || exit /B
+cmake --build . --target install --config %CONFIGURATION% -- /maxcpucount:2 || exit /B


added win script launcher for standalone server

git-svn-id: d6c67068e44d4c7a26f9ca1517fed89f64cc07e8@1231859 13f79535-47bb-0310-9956-ffa450edef68

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

--- service/src/main/bin/any23server.bat
+++ service/src/main/bin/any23server.bat
@@ -0,0 +1,105 @@
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one or more
+@REM contributor license agreements. See the NOTICE file distributed with
+@REM this work for additional information regarding copyright ownership.
+@REM The ASF licenses this file to You under the Apache License, Version 2.0
+@REM (the "License"); you may not use this file except in compliance with
+@REM the License.  You may obtain a copy of the License at
+
+@REM  http://www.apache.org/licenses/LICENSE-2.0
+
+@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 ----------------------------------------------------------------------------
+@REM
+
+@echo off
+
+set ERROR_CODE=0
+
+:init
+@REM Decide how to startup depending on the version of windows
+
+@REM -- Win98ME
+if NOT "%OS%"=="Windows_NT" goto Win9xArg
+
+@REM set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" @setlocal
+
+@REM -- 4NT shell
+if "%eval[2+2]" == "4" goto 4NTArgs
+
+@REM -- Regular WinNT shell
+set CMD_LINE_ARGS=%*
+goto WinNTGetScriptDir
+
+@REM The 4NT Shell from jp software
+:4NTArgs
+set CMD_LINE_ARGS=%$
+goto WinNTGetScriptDir
+
+:Win9xArg
+@REM Slurp the command line arguments.  This loop allows for an unlimited number
+@REM of arguments (up to the command line limit, anyway).
+set CMD_LINE_ARGS=
+:Win9xApp
+if %1a==a goto Win9xGetScriptDir
+set CMD_LINE_ARGS=%CMD_LINE_ARGS% %1
+shift
+goto Win9xApp
+
+:Win9xGetScriptDir
+set SAVEDIR=%CD%
+%0\
+cd %0\..\..
+set BASEDIR=%CD%
+cd %SAVEDIR%
+set SAVE_DIR=
+goto repoSetup
+
+:WinNTGetScriptDir
+set BASEDIR=%~dp0\..
+
+:repoSetup
+
+
+if "%JAVACMD%"=="" set JAVACMD=java
+
+if "%REPO%"=="" set REPO=%BASEDIR%\lib
+
+set EXTRA_JVM_ARGUMENTS=-Xms500m -Xmx500m -XX:PermSize=128m -XX:-UseGCOverheadLimit
+goto endInit
+
+@REM Reaching here means variables are defined and arguments have been captured
+:endInit
+
+%JAVACMD% %JAVA_OPTS% %EXTRA_JVM_ARGUMENTS% -jar "$REPO"/jetty-runner-${jetty.runner.version}.jar --path /${project.artifactId} "$REPO"/${project.build.finalName}.${project.packaging}
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+if "%OS%"=="Windows_NT" @endlocal
+set ERROR_CODE=1
+
+:end
+@REM set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" goto endNT
+
+@REM For old DOS remove the set variables from ENV - we assume they were not set
+@REM before we started - at least we don't leave any baggage around
+set CMD_LINE_ARGS=
+goto postExec
+
+:endNT
+@endlocal
+
+:postExec
+
+if "%FORCE_EXIT_ON_ERROR%" == "on" (
+  if %ERROR_CODE% NEQ 0 exit %ERROR_CODE%
+)
+
+exit /B %ERROR_CODE%


Log rotation for start-local.bat

Log rotation for start-local.bat

--- stratosphere-dist/src/main/stratosphere-bin/bin/start-local.bat
+++ stratosphere-dist/src/main/stratosphere-bin/bin/start-local.bat
@@ -12,7 +12,8 @@
 ::  specific language governing permissions and limitations under the License.
 ::
 ::#######################################################################################################################
-setlocal
+@echo off
+setlocal EnableDelayedExpansion

 SET bin=%~dp0
 SET NEPHELE_ROOT_DIR=%bin%..
@@ -24,6 +25,29 @@

 SET NEPHELE_JM_CLASSPATH=%NEPHELE_LIB_DIR%\*

-java %JVM_ARGS% -cp "%NEPHELE_JM_CLASSPATH%" eu.stratosphere.nephele.jobmanager.JobManager -executionMode local -configDir "%NEPHELE_CONF_DIR%"
+SET logname=nephele-%username%-jobmanager-%computername%.log
+SET log=%NEPHELE_LOG_DIR%\%logname%
+SET outname=nephele-%username%-jobmanager-%computername%.out
+SET out=%NEPHELE_LOG_DIR%\%outname%
+SET log_setting=-Dlog.file=%log% -Dlog4j.configuration=file:%NEPHELE_CONF_DIR%/log4j.properties
+
+
+:: Log rotation (quick and dirty)
+CD %NEPHELE_LOG_DIR%
+for /l %%x in (5, -1, 1) do (
+SET /A y = %%x+1
+RENAME "%logname%.%%x" "%logname%.!y!" 2> nul
+RENAME "%outname%.%%x" "%outname%.!y!"  2> nul
+)
+RENAME "%logname%" "%logname%.0"  2> nul
+RENAME "%outname%" "%outname%.0"  2> nul
+DEL "%logname%.6"  2> nul
+DEL "%outname%.6"  2> nul
+
+
+echo Starting Stratosphere job manager. Webinterface by default on http://localhost:8081/.
+echo Don't close this batch window. Stop job manager by pressing Ctrl+C.
+
+java %JVM_ARGS% %log_setting% -cp %NEPHELE_JM_CLASSPATH% eu.stratosphere.nephele.jobmanager.JobManager -executionMode local -configDir %NEPHELE_CONF_DIR%  > "%out%"  2>&1

 endlocal


Add `push-nupkg.bat`

Add `push-nupkg.bat`

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

--- push-nupkg.bat
+++ push-nupkg.bat
@@ -0,0 +1,3 @@
+@echo on
+
+choco push *.nupkg --source https://push.chocolatey.org/ || exit /b 1


Delete demowithosinfo.bat

Delete demowithosinfo.bat

--- Version-1.0-Sample-When-adding-this-code-to-your-python-program-turrn-it-to-a-exe-with-http/bat2exe.net/echo-off-set/demowithosinfo.bat
+++ Version-1.0-Sample-When-adding-this-code-to-your-python-program-turrn-it-to-a-exe-with-http/bat2exe.net/echo-off-set/demowithosinfo.bat
@@ -1,19 +0,0 @@
-::Version 1.0 Sample With os info (Not Tested)
-::When adding this code to your python program turrn it to a exe with http://bat2exe.net/
-echo off
-set /p pathName=Enter Python Version Example: if python version is 3.2 type 32!
-echo Getting Info...
-start c:\python%versionnum%\python import platform print ('uname:', platform.uname()) print() print ('system   :', platform.system()) print ('node     :', platform.node()) print ('release  :', platform.release()) print ('version  :', platform.version()) print ('machine  :', platform.machine()) print ('processor:', platform.processor())
-echo Starting...
-start c:\python%versionnum%\python run.py
-echo Boot is done...
-PAUSE
-END::Version 1.0 Sample
-::When adding this code to your python program turrn it to a exe with http://bat2exe.net/
-echo off
-set /p pathName=Enter Python Version Example: if python version is 3.2 type 32!
-echo Starting!
-start c:\python%versionnum%\python run.py
-echo Boot is done...
-PAUSE
-END


remove bat lang

remove bat lang

--- src/main/resources/assets/samsprojectiles/lang/copy.bat
+++ src/main/resources/assets/samsprojectiles/lang/copy.bat
@@ -1,3 +0,0 @@
-echo y | copy/-Y en_CA.lang en_US.lang
-echo y | copy/-Y en_CA.lang en_GB.lang
-echo y | copy/-Y en_CA.lang en_AU.lang


make installer find interpreter by short versioned name, eg. lua52.exe instead of lua5.2.exe

--- install.bat
+++ install.bat
@@ -16,7 +16,7 @@
 vars.LUA_LIBDIR = nil
 vars.LUA_LIBNAME = nil
 vars.LUA_VERSION = "5.1"
-vars.LUA_SHORTV = nil
+vars.LUA_SHORTV = nil   -- "51"
 vars.LUA_LIB_NAMES = "lua5.1.lib lua51.dll liblua.dll.a"
 vars.LUA_RUNTIME = nil

@@ -180,6 +180,10 @@
 			vars.LUA_INTERPRETER = S"lua$LUA_VERSION.exe"
 			print(S"       Found $LUA_BINDIR\\$LUA_INTERPRETER")
 			return true
+		elseif exists( S"$LUA_BINDIR\\lua$LUA_SHORTV.exe" ) then
+			vars.LUA_INTERPRETER = S"lua$LUA_SHORTV.exe"
+			print(S"       Found $LUA_BINDIR\\$LUA_INTERPRETER")
+			return true
 		elseif exists(S"$LUA_BINDIR\\lua.exe") then
 			vars.LUA_INTERPRETER = "lua.exe"
 			print(S"       Found $LUA_BINDIR\\$LUA_INTERPRETER")
@@ -195,6 +199,12 @@
 	for _, e in ipairs{ [[\]], [[\bin\]] } do
 		if exists(directory..e.."\\lua"..vars.LUA_VERSION..".exe") then
 			vars.LUA_INTERPRETER = S"lua$LUA_VERSION.exe"
+			vars.LUA_BINDIR = directory .. e
+			print("       Found ."..e..vars.LUA_INTERPRETER)
+			return true
+
+		elseif exists(directory..e.."\\lua"..vars.LUA_SHORTV..".exe") then
+			vars.LUA_INTERPRETER = S"lua$LUA_SHORTV.exe"
 			vars.LUA_BINDIR = directory .. e
 			print("       Found ."..e..vars.LUA_INTERPRETER)
 			return true


Initial local commit

Initial local commit


Update gradlew.bat

Update gradlew.bat

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


Cleans env, but problem continues

Cleans env, but problem continues

--- src/main/scripts/install.bat
+++ src/main/scripts/install.bat
@@ -58,6 +58,7 @@
  if %ERRORLEVEL% NEQ 0 (
   set continue=0
  )
+ set script=
 goto:eof

 :: Function that install the utility for version 10.1.
@@ -92,6 +93,7 @@
  )

  if %continue% EQU 1 call:installScript %LOG4DB2_SRC_MAIN_CODE_PATH%\12-Version.sql
+ set continue=

  echo Please visit the wiki to learn how to use and configure this utility
  echo https://github.com/angoca/log4db2/wiki
@@ -136,6 +138,7 @@
  cd scripts 2> NUL

  if %continue% EQU 1 call:installScript %LOG4DB2_SRC_MAIN_CODE_PATH%\12-Version.sql
+ set continue=

  echo Please visit the wiki to learn how to use and configure this utility
  echo https://github.com/angoca/log4db2/wiki
@@ -186,9 +189,12 @@
  if /I "%param3%" == "-v9_7" (
   set v9_7=1
  )
-goto:eof
-
-:: Main unction that starts the installation.
+ set param1=
+ set param2=
+ set param3=
+goto:eof
+
+:: Main function that starts the installation.
 :init
  :: Initialize the environment.
  if EXIST init.bat (
@@ -208,6 +214,10 @@
   call:v10.1
  )

+ :: Clean environment.
+ set v9_7=
+ set adminInstall=
+ set temporalTable=
  if EXIST uninit.bat (
   call uninit.bat
  )


do later

do later

error: pathspec 'fix-vcredist-download-and-bitsadmin.cmd' did not match any file(s) known to git

--- fix-vcredist-download-and-bitsadmin.cmd
+++ fix-vcredist-download-and-bitsadmin.cmd
@@ -0,0 +1,28 @@
+
+
+copy C:\saltrepo_local_cache\64\vcredist_x64_2008_mfc.exe C:\git\salt\pkg\windows\prereqs\vcredist.exe
+
+
+goto eof
+
+from build_pkg.bat
+
+The regular user can bitsadmin /transfer "VCRedist 2008 MFC AMD64" "%Url64%" "%PreDir%\vcredist.exe"
+ "http://repo.saltstack.com/windows/dependencies/64/vcredist_x64_2008_mfc.exe"
+but it takes 2 minutes.
+
+
+
+The admin account cannot transfer, Error is
+
+BITSADMIN version 3.0 [ 7.5.7601 ]
+BITS administration utility.
+(C) Copyright 2000-2006 Microsoft Corp.
+
+BITSAdmin is deprecated and is not guaranteed to be available in future versions of Windows.
+Administrative tools for the BITS service are now provided by BITS PowerShell cmdlets.
+
+Unable to add file - 0x800704dd
+
+:eof
+


Jira Issue: MOBILITY-677 Added checks for configure.bat's buildsystem detection in order to make it tolerate warnings in qmake.

--- configure.bat
+++ configure.bat
@@ -360,7 +360,10 @@
         cd config.tests\make
     )

-    for /f "tokens=3" %%i in ('call %QT_PATH%qmake %SOURCE_PATH%\config.tests\make\make.pro 2^>^&1 1^>NUL') do set BUILDSYSTEM=%%i
+    for /f "tokens=2,3" %%a in ('call %QT_PATH%qmake %SOURCE_PATH%\config.tests\make\make.pro 2^>^&1 1^>NUL') do (
+        if "%%a" == "MESSAGE:" (
+            set BUILDSYSTEM=%%b)
+    )

     if %BUILDSYSTEM% == symbian-abld (
         call make -h >> %PROJECT_LOG% 2>&1


Fixed output of Mobility configure tests remaining in the Symbian SDK.

Reviewed-by: Alex

--- configure.bat
+++ configure.bat
@@ -460,9 +460,11 @@
     if "%MOBILITY_BUILDSYSTEM%" == "symbian-sbsv2" (
         call %MOBILITY_MAKE% release-armv5 >> %PROJECT_LOG% 2>&1
         for /f "tokens=2" %%i in ('%MOBILITY_MAKE% release-armv5 SBS^="@sbs --check"') do set FAILED=1
+        call %MOBILITY_MAKE% clean >> %PROJECT_LOG% 2>&1
     ) else if "%MOBILITY_BUILDSYSTEM%" == "symbian-abld" (
         call %MOBILITY_MAKE% release-gcce >> %PROJECT_LOG% 2>&1
         for /f "tokens=2" %%i in ('%MOBILITY_MAKE% release-gcce ABLD^="@ABLD.BAT -c" 2^>^&1') do if not %%i == bldfiles set FAILED=1
+        call %MOBILITY_MAKE% clean >> %PROJECT_LOG% 2>&1
     ) else {
         REM Make for other builds
         call %MOBILITY_MAKE% >> %PROJECT_LOG% 2>&1


don't use quotation

don't use quotation

--- configure.bat
+++ configure.bat
@@ -62,7 +62,7 @@

 :contactsTag
 shift
-set CONTACTS_PLUGIN="%CONTACTS_PLUGIN% %1"
+set CONTACTS_PLUGIN=%CONTACTS_PLUGIN% %1
 shift
 goto cmdline_parsing


Add file buildhtmlhelp.bat

Add file buildhtmlhelp.bat

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

--- docs/buildhtmlhelp.bat
+++ docs/buildhtmlhelp.bat
@@ -0,0 +1 @@
+make htmlhelp


Remove nupack.bat

Remove nupack.bat

--- nupack.bat
+++ nupack.bat
@@ -1,3 +0,0 @@
-@echo off
-mkdir NuGetPackages 2> NUL
-nuget pack -OutputDirectory NuGetPackages XamlAnimatedGif.nuspec


Apply amcache.hve hack to etwheap.bat

Apply amcache.hve hack to etwheap.bat

--- xperf/scripts/etwheap.bat
+++ xperf/scripts/etwheap.bat
@@ -67,14 +67,16 @@
 xperf -start %SessionName% -on %UserProviders% -f %userfile%
 :NotInvalidFlags
 @if not %errorlevel% equ 0 goto failure
-@rem Record information about the loggers at the start of the trace.
-@rem xperf -loggers >preloggers.txt

 @echo Hit a key when you are ready to stop heap tracing.
 @pause

-@rem Record information about the loggers (dropped events, for instance)
-@rem xperf -loggers >loggers.txt
+@rem Rename c:\Windows\AppCompat\Programs\amcache.hve to avoid serious merge
+@rem performance problems (up to six minutes!)
+@set HVEDir=c:\Windows\AppCompat\Programs
+@rename %HVEDir%\Amcache.hve Amcache_temp.hve 2>nul
+@set RenameErrorCode=%errorlevel%
+
 xperf -stop %SessionName% -stop %HeapSessionName% -stop "NT Kernel Logger"
 @if "%NOETWCOMPRESS%" == "" goto compressTrace
 @rem Don't compress trace, to allow loading them on Windows 7
@@ -86,6 +88,11 @@
 @rem Default to trace compression.
 xperf -merge %kernelfile% %userfile% %heapfile% %Filename% -compress
 :nocompressTrace
+
+@rem Rename the file back
+@if not "%RenameErrorCode%" equ "0" goto SkipRename
+@rename %HVEDir%\Amcache_temp.hve Amcache.hve
+:SkipRename

 @rem Delete heap tracing registry key
 reg delete "HKLM\Software\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\%2" /v TracingFlags /f


fix lib path

fix lib path

--- mk.bat
+++ mk.bat
@@ -1 +1 @@
-cl /Ox /EHsc src\msoffice-crypt.cpp -I .\include -I ..\cybozulib\include -I ..\cybozulib_ext\openssl\include -DNOMINMAX -DNDEBUG /Febin\msoffice-crypt.exe /link /LIBPATH:c:\prog\cybozulib_ext\openssl\lib"+cl /Ox /EHsc src\msoffice-crypt.cpp -I .\include -I ..\cybozulib\include -I ..\cybozulib_ext\openssl\include -DNOMINMAX -DNDEBUG /Febin\msoffice-crypt.exe /link /LIBPATH:..\cybozulib_ext\openssl\lib"


Update backup_encrypted_archive.bat

Update backup_encrypted_archive.bat

--- scripts/backup_encrypted_archive.bat
+++ scripts/backup_encrypted_archive.bat
@@ -1 +1,6 @@

+
+::Run.bat
+::Automates installation for apk files
+
+apk_mass_install -b -a -e


Ultra compression to save upload times on WFH broadband

--- scripts/ci-build-windows-package.bat
+++ scripts/ci-build-windows-package.bat
@@ -3,4 +3,4 @@
 cd test\desktop\features\scripts
 C:\Progra~1\Git\bin\bash.exe build_maze_runner.sh
 cd ..\fixtures\maze_runner
-7z a -r WindowsBuild-%UNITY_VERSION%.zip WindowsBuild
+7z a -mx9 -r WindowsBuild-%UNITY_VERSION%.zip WindowsBuild


changed name of copied changelog to AeroDyn14_ChangeLog.txt for web site

git-svn-id: a1dbbb1116aa15167b3965c0733dca1ba8495276@221 9add3c13-68b6-420a-9438-b3321c957034

--- update_web.bat
+++ update_web.bat
@@ -3,7 +3,7 @@
 set LOC=Y:\Wind\WindWeb\nwtc\docs

 :CopyFiles
-copy ChangeLog.txt             %LOC%\AeroDyn_ChangeLog.txt
+copy ChangeLog.txt             %LOC%\AeroDyn14_ChangeLog.txt

 :Done
 set LOC=


Recover e2645046e95b798c0907f580824f4e82462df208

--- maketools/build_dependencies.bat
+++ maketools/build_dependencies.bat
@@ -1,37 +1,73 @@
-set VCDIR="c:\Program Files (x86)\Microsoft Visual Studio 11.0\"
-@echo OFF
-set DEVENV=%VCDIR%\Common7\IDE\devenv.exe
+@echo off
+setlocal EnableExtensions
+setlocal EnableDelayedExpansion
+set KEY_NAME=HKEY_CLASSES_ROOT\VisualStudio.DTE.
+
+if "%1"=="" (
+	for /l %%x in (12, -1, 8) do (
+		set "CUR_KEY=%KEY_NAME%%%x.0"
+		reg query !CUR_KEY! >> nul 2>&1
+		if !ERRORLEVEL! == 0 (
+			echo "msvc%%x is installed"
+			set "MSVS_VER=VS%%x0"
+			set VS_MAJOR=%%x
+			goto got_version
+		)
+	)
+) else (
+	set "MSVS_VER=%1"
+)
+:got_version
+echo "Using %MSVS_VER%"
+
+set GENERATOR_NAME=""
+if /i "%MSVS_VER%" == "vs80" set GENERATOR_NAME="Visual Studio 8 2005"
+if /i "%MSVS_VER%" == "vs90" set GENERATOR_NAME="Visual Studio 9 2008"
+if /i "%MSVS_VER%" == "vs100" set GENERATOR_NAME="Visual Studio 10"
+if /i "%MSVS_VER%" == "vs110" set GENERATOR_NAME="Visual Studio 11"
+if /i "%MSVS_VER%" == "vs120" set GENERATOR_NAME="Visual Studio 12"
+
+if %GENERATOR_NAME%=="" (
+	set CMAKE_CMD=cmake
+) else (
+	set CMAKE_CMD=cmake -G %GENERATOR_NAME%
+)
+
+echo "Cmake command: %CMAKE_CMD%"
+
+set "COMMON_TOOLS=%MSVS_VER%COMNTOOLS"
+set DEVENV="!%COMMON_TOOLS%!\..\IDE\devenv.exe"
+
+echo "Using %DEVENV% compiler"
+
 set PWD=%CD%
 set BASEDIR=%PWD%\..
 echo "Working dir: " %PWD%
 echo "Basedir: " %BASEDIR%
 set PATH=%PATH%;%PWD%\cmake-2.8.12-win32-x86\bin;%PWD%\premake4.3
-rd /s /q %BASEDIR%\deps\glfw-3.0.3\build
-rm -r %BASEDIR%\deps\glfw-3.0.3\build
+rd /S /Q %BASEDIR%\deps\glfw-3.0.3\build
 md %BASEDIR%\deps\glfw-3.0.3\build
 cd %BASEDIR%\deps\glfw-3.0.3\build
-cmake ..
+%CMAKE_CMD% ..
 %DEVENV% GLFW.sln /Build
 %DEVENV% GLFW.sln /Build "Release"
 cd %PWD%
-rd /s /q %BASEDIR%\deps\zlib-1.2.8\build
-rm -r %BASEDIR%\deps\zlib-1.2.8\build
+rd /S /Q %BASEDIR%\deps\zlib-1.2.8\build
 md %BASEDIR%\deps\zlib-1.2.8\build
 cd %BASEDIR%\deps\zlib-1.2.8\build
-cmake ..
+%CMAKE_CMD% ..
 %DEVENV% zlib.sln /Build
 %DEVENV% zlib.sln /Build "Release"
 copy zconf.h ..
-rd /s /q %BASEDIR%\deps\lpng166\build
-rm -r %BASEDIR%\deps\lpng166\build
+rd /S /Q %BASEDIR%\deps\lpng166\build
 md %BASEDIR%\deps\lpng166\build
 cd %BASEDIR%\deps\lpng166\build
 set ZLIB_INCLUDE_DIR=%BASEDIR%\deps\zlib-1.2.8\
 set ZLIB_LIBRARY=%BASEDIR%\deps\zlib-1.2.8\build\Debug\zlibd.lib
-cmake -DZLIB_LIBRARY:FILEPATH=%ZLIB_LIBRARY% -DZLIB_INCLUDE_DIR:PATH=%ZLIB_INCLUDE_DIR% ..
+%CMAKE_CMD% -DZLIB_LIBRARY:FILEPATH=%ZLIB_LIBRARY% -DZLIB_INCLUDE_DIR:PATH=%ZLIB_INCLUDE_DIR% ..
 %DEVENV% libpng.sln /Build "Debug"
 set ZLIB_LIBRARY=%BASEDIR%\deps\zlib-1.2.8\build\Release\zlib.lib
-cmake -DZLIB_LIBRARY:FILEPATH=%ZLIB_LIBRARY% -DZLIB_INCLUDE_DIR:PATH=%ZLIB_INCLUDE_DIR% ..
+%CMAKE_CMD% -DZLIB_LIBRARY:FILEPATH=%ZLIB_LIBRARY% -DZLIB_INCLUDE_DIR:PATH=%ZLIB_INCLUDE_DIR% ..
 %DEVENV% libpng.sln /Build "Release"
 cd %BASEDIR%\deps\lpng166
 copy scripts\pnglibconf.h.prebuilt pnglibconf.h


--- C/include/make.bat
+++ C/include/make.bat
@@ -112,13 +112,14 @@
 :#   2020-01-06 JFL Output a more helpful message if can't find nmake.exe.    *
 :#   2020-01-29 JFL In the end, count warnings, and open the log if any found.*
 :#   2020-12-16 JFL Added optional LINK_OUDIR to link OUTDIR to another one.  *
+:#   2021-06-03 JFL Avoid counting constants like NO_WARNINGS as warnings.    *
 :#                                                                            *
 :#       Copyright 2016-2020 Hewlett Packard Enterprise Development LP       *
 :# Licensed under the Apache 2.0 license  www.apache.org/licenses/LICENSE-2.0 *
 :#*****************************************************************************

 setlocal EnableExtensions EnableDelayedExpansion
-set "VERSION=2020-12-16"
+set "VERSION=2021-06-03"
 set "SCRIPT=%~nx0"				&:# Script name
 set "SPATH=%~dp0" & set "SPATH=!SPATH:~0,-1!"	&:# Script path, without the trailing \
 set  "ARG0=%~f0"				&:# Script full pathname
@@ -1748,9 +1749,9 @@

 if %MAKEDEPTH%==0 ( :# If this is the top-level instance of make.bat, show the final result
   set "SHOW_LOG=%ERROR%"
-  if %ERROR%==0 if defined LOGFILE ( :# Count warnings in the log file
+  if %ERROR%==0 if defined LOGFILE ( :# Count warnings in the log file, excluding constants like _CRT_SECURE_NO_WARNINGS
     set "WARNINGS=0"
-    for /f "delims=" %%l in ('findstr /i warning "%LOGFILE%"') do set /a "WARNINGS+=1"
+    for /f "delims=" %%l in ('findstr /i warning "%LOGFILE%" ^| findstr /v WARNING') do set /a "WARNINGS+=1"
     if not !WARNINGS!==0 (
       set "RESULT=!RESULT!, but with !WARNINGS! warnings"
       set "SHOW_LOG=1"


new AppVeyor build scripts, take 6

new AppVeyor build scripts, take 6

--- scripts/build-appveyor.bat
+++ scripts/build-appveyor.bat
@@ -53,6 +53,7 @@
 SET BINDING_DIR=%HOME%\node_modules\mapnik\lib\binding\node-v11-win32-x64
 7z -y e %VCREDIST_FILE% -o%BINDING_DIR%\ | %windir%\system32\FIND "ing archive"
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR
+tree node_modules\mapnik\lib
 ECHO BINDING_DIR^: %BINDING_DIR%
 DIR %BINDING_DIR%


Typo fix.

Typo fix.

--- install.bat
+++ install.bat
@@ -68,11 +68,11 @@

 @echo on

-@for %%A in (mesh, Object, import, export) do mkdir %BLENDERSCRIPTS%\%%A
+@for %%A in (mesh, object, import, export) do mkdir %BLENDERSCRIPTS%\%%A

 @for %%A in (scripts\mesh\mesh_niftools_weightsquash.py, scripts\mesh\mesh_niftools_hull.py, scripts\mesh\mesh_niftools_morphcopy.py) do copy "%%A" %BLENDERSCRIPTS%\mesh

-@for %%A in (scripts\object\object_niftools_set_bone_priority.py, scripts\object\object_niftools_save_bone_pose.py, scripts\object\object_niftools_load_bone_pose.py) do copy "%%A" %BLENDERSCRIPTS%\Object
+@for %%A in (scripts\object\object_niftools_set_bone_priority.py, scripts\object\object_niftools_save_bone_pose.py, scripts\object\object_niftools_load_bone_pose.py) do copy "%%A" %BLENDERSCRIPTS%\object

 @for %%A in (scripts\import\import_nif.py, ) do copy "%%A" %BLENDERSCRIPTS%\import


Added path escaping and error checking

Added path escaping and error checking

--- install.bat
+++ install.bat
@@ -1,16 +1,20 @@
+echo "You may need to run this as admin"
 echo "TODO check for prereqs"
 REM Add a symlink to the vimrc
-del %USERPROFILE%\_vimrc
-del %USERPROFILE%\_vsvimrc
-del %USERPROFILE%\_vimcommon
-mklink %USERPROFILE%\_vimrc %cd%\vimrc
-mklink %USERPROFILE%\_vsvimrc %cd%\vsvimrc
-mklink %USERPROFILE%\_vimcommon %cd%\vimcommon
+del "%USERPROFILE%\_vimrc"
+del "%USERPROFILE%\_vsvimrc"
+del "%USERPROFILE%\_vimcommon"
+mklink "%USERPROFILE%\_vimrc" "%cd%\vimrc"
+if errorlevel 1 exit /b 0
+mklink "%USERPROFILE%\_vsvimrc" "%cd%\vsvimrc"
+if errorlevel 1 exit /b 0
+mklink "%USERPROFILE%\_vimcommon" "%cd%\vimcommon"
+if errorlevel 1 exit /b 0
 REM install Vundle
-git clone https://github.com/VundleVim/Vundle.vim.git %USERPROFILE%\vimfiles\bundle\Vundle.vim
+git clone https://github.com/VundleVim/Vundle.vim.git "%USERPROFILE%\vimfiles\bundle\Vundle.vim"
 vim +PluginInstall +qall
 vim +GoInstallBinaries
 REM Install YouCompleteMe
-python %USERPROFILE%\vimfiles\bundle\YouCompleteMe\install.py --clang-completer --gocode-completer
+python "%USERPROFILE%\vimfiles\bundle\YouCompleteMe\install.py" --clang-completer --gocode-completer
 REM Install syntastic checker
 pip install pylint


fixed install.bat file

fixed install.bat file

--- install.bat
+++ install.bat
@@ -1,3 +1,5 @@
 cd Dependencies
 call build_dep.bat
-cd ..\\+cd ..\\
+cd _Out\Server\NFDataCfg\tool\
+start FileProcess.exe


スペルミス…

スペルミス…

--- tools/win/make_build.cmd
+++ tools/win/make_build.cmd
@@ -67,15 +67,15 @@
 rem obs.dll
 REM "%PEXPORTS_EXE%" /EXPORTS "%OBS_APP%\bin\32bit\obs.dll" > "build\lib32\obs.def"
 REM "%PEXPORTS_EXE%" /EXPORTS "%OBS_APP%\bin\64bit\obs.dll" > "build\lib64\obs.def"
-"%GEDEF_EXE%" - "%OBS_APP%\bin\32bit\obs.dll" > "build\lib32\obs.def"
-"%GEDEF_EXE%" - "%OBS_APP%\bin\64bit\obs.dll" > "build\lib64\obs.def"
+"%GENDEF_EXE%" - "%OBS_APP%\bin\32bit\obs.dll" > "build\lib32\obs.def"
+"%GENDEF_EXE%" - "%OBS_APP%\bin\64bit\obs.dll" > "build\lib64\obs.def"
 "%LIB_EXE%" /MACHINE:x86 /def:"build\lib32\obs.def" /out:"build\lib32\obs.lib"
 "%LIB_EXE%" /MACHINE:x64 /def:"build\lib64\obs.def" /out:"build\lib64\obs.lib"
 rem libcurl.dll
 REM "%PEXPORTS_EXE%" /EXPORTS "%OBS_APP%\bin\32bit\libcurl.dll" > "build\lib32\libcurl.def"
 REM "%PEXPORTS_EXE%" /EXPORTS "%OBS_APP%\bin\64bit\libcurl.dll" > "build\lib64\libcurl.def"
-"%GEDEF_EXE%" - "%OBS_APP%\bin\32bit\libcurl.dll" > "build\lib32\libcurl.def"
-"%GEDEF_EXE%" - "%OBS_APP%\bin\64bit\libcurl.dll" > "build\lib64\libcurl.def"
+"%GENDEF_EXE%" - "%OBS_APP%\bin\32bit\libcurl.dll" > "build\lib32\libcurl.def"
+"%GENDEF_EXE%" - "%OBS_APP%\bin\64bit\libcurl.dll" > "build\lib64\libcurl.def"
 "%LIB_EXE%" /MACHINE:x86 /def:"build\lib32\libcurl.def" /out:"build\lib32\libcurl.lib"
 "%LIB_EXE%" /MACHINE:x64 /def:"build\lib64\libcurl.def" /out:"build\lib64\libcurl.lib"


Install VMware Tools 10.0.0

Install VMware Tools 10.0.0

--- scripts/vm-guest-tools.bat
+++ scripts/vm-guest-tools.bat
@@ -15,11 +15,9 @@
 )

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


Update VBox Additions 5.2.8

Update VBox Additions 5.2.8

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

 if not exist "C:\Windows\Temp\VBoxGuestAdditions.iso" (
-    powershell -Command "(New-Object System.Net.WebClient).DownloadFile('http://download.virtualbox.org/virtualbox/5.2.4/VBoxGuestAdditions_5.2.4.iso', 'C:\Windows\Temp\VBoxGuestAdditions.iso')" <NUL
+    powershell -Command "(New-Object System.Net.WebClient).DownloadFile('http://download.virtualbox.org/virtualbox/5.2.8/VBoxGuestAdditions_5.2.8.iso', 'C:\Windows\Temp\VBoxGuestAdditions.iso')" <NUL
 )

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


Fix broken plugin

Fix broken plugin

git-svn-id: 03a8048b5ee8463be5048a3801110fb50f378627@7583 d0ab736e-dc22-4aeb-8dc9-08def0aa14fd

--- plugins/DataBrowser/build.bat
+++ plugins/DataBrowser/build.bat
@@ -1,6 +1,9 @@
+rem We need Java 6 for this plugin. If you have Java 6, installed, set an environment variable, JDK6, to its location.
+if not "%JDK6%"=="" (
 if exist classes rmdir classes /s /q
 mkdir classes
 xcopy /E /y src classes\
-"%JAVA_HOME%\bin\java" -cp src;classes;../../../3rdpartypublic/classext/clojure.jar;../../../3rdpartypublic/classext/clojure-contrib.jar;../../../3rdpartypublic/classext/ij.jar;../../../3rdpartypublic/classext/bsh-2.0b4.jar;../../mmstudio/MMJ_.jar;../../MMCoreJ_wrap/MMCoreJ.jar;../../acqEngine/MMAcqEngine.jar -Djava.library.path=../../bin_Win32 -Dclojure.compile.path=classes -server clojure.lang.Compile org.micromanager.browser.plugin
-"%JAVA_HOME%\bin\jar" cf DataBrowser.jar -C classes\ .
+"%JDK6%\bin\java" -cp src;classes;../../../3rdpartypublic/classext/clojure.jar;../../../3rdpartypublic/classext/clojure-contrib.jar;../../../3rdpartypublic/classext/ij.jar;../../../3rdpartypublic/classext/bsh-2.0b4.jar;../../mmstudio/MMJ_.jar;../../MMCoreJ_wrap/MMCoreJ.jar;../../acqEngine/MMAcqEngine.jar -Djava.library.path=../../bin_Win32 -Dclojure.compile.path=classes -server clojure.lang.Compile org.micromanager.browser.plugin
+"%JDK6%\bin\jar" cf DataBrowser.jar -C classes\ .
 copy /Y DataBrowser.jar ..\..\Install_AllPlatforms\micro-manager\mmplugins\
+)


This starts the ant build to invoke the Maillogger property

SVN-Revision: 599


bat file to run sitemap

bat file to run sitemap

error: pathspec 'utilities/nodesitemap/runsitemap.bat' did not match any file(s) known to git

--- utilities/nodesitemap/runsitemap.bat
+++ utilities/nodesitemap/runsitemap.bat
@@ -0,0 +1 @@
+node sitemap.js -d www.campuscolors.com -c ./customurls.json -p ../../


Updated script to generate BDE and VSS test file (#546)

--- utils/generate_test_data_windows.bat
+++ utils/generate_test_data_windows.bat
@@ -36,6 +36,10 @@
 set imagename=ntfs-fixed.vhd
 set imagesize=4

+del /f %cd%\test_data\%imagename%
+
+echo Creating: %imagename%
+
 echo create vdisk file=%cd%\test_data\%imagename% maximum=%imagesize% type=fixed > CreateVHD.diskpart
 echo select vdisk file=%cd%\test_data\%imagename% >> CreateVHD.diskpart
 echo attach vdisk >> CreateVHD.diskpart
@@ -60,6 +64,10 @@
 set imagename=ntfs-dynamic.vhd
 set imagesize=4

+del /f %cd%\test_data\%imagename%
+
+echo Creating: %imagename%
+
 echo create vdisk file=%cd%\test_data\%imagename% maximum=%imagesize% type=expandable > CreateVHD.diskpart
 echo select vdisk file=%cd%\test_data\%imagename% >> CreateVHD.diskpart
 echo attach vdisk >> CreateVHD.diskpart
@@ -83,6 +91,10 @@
 set unitsize=4096
 set imagename=ntfs-parent.vhd
 set imagesize=4
+
+del /f %cd%\test_data\%imagename%
+
+echo Creating: %imagename%

 echo create vdisk file=%cd%\test_data\%imagename% maximum=%imagesize% type=fixed > CreateVHD.diskpart
 echo select vdisk file=%cd%\test_data\%imagename% >> CreateVHD.diskpart
@@ -107,6 +119,10 @@

 set imagename=ntfs-differential.vhd

+del /f %cd%\test_data\%imagename%
+
+echo Creating: %imagename%
+
 echo create vdisk file=%cd%\test_data\%imagename% parent=%cd%\test_data\ntfs-parent.vhd > CreateVHD.diskpart
 echo select vdisk file=%cd%\test_data\%imagename% >> CreateVHD.diskpart
 echo attach vdisk >> CreateVHD.diskpart
@@ -127,6 +143,10 @@
 set imagename=fat-parent.vhd
 set imagesize=4

+del /f %cd%\test_data\%imagename%
+
+echo Creating: %imagename%
+
 echo create vdisk file=%cd%\test_data\%imagename% maximum=%imagesize% type=fixed > CreateVHD.diskpart
 echo select vdisk file=%cd%\test_data\%imagename% >> CreateVHD.diskpart
 echo attach vdisk >> CreateVHD.diskpart
@@ -150,6 +170,10 @@

 set imagename=fat-differential.vhd

+del /f %cd%\test_data\%imagename%
+
+echo Creating: %imagename%
+
 echo create vdisk file=%cd%\test_data\%imagename% parent=%cd%\test_data\fat-parent.vhd > CreateVHD.diskpart
 echo select vdisk file=%cd%\test_data\%imagename% >> CreateVHD.diskpart
 echo attach vdisk >> CreateVHD.diskpart
@@ -170,6 +194,10 @@
 set unitsize=4096
 set imagename=ntfs-fixed.vhdx
 set imagesize=4
+
+del /f %cd%\test_data\%imagename%
+
+echo Creating: %imagename%

 echo create vdisk file=%cd%\test_data\%imagename% maximum=%imagesize% type=fixed > CreateVHDX.diskpart
 echo select vdisk file=%cd%\test_data\%imagename% >> CreateVHDX.diskpart
@@ -195,6 +223,10 @@
 set imagename=ntfs-dynamic.vhdx
 set imagesize=4

+del /f %cd%\test_data\%imagename%
+
+echo Creating: %imagename%
+
 echo create vdisk file=%cd%\test_data\%imagename% maximum=%imagesize% type=expandable > CreateVHDX.diskpart
 echo select vdisk file=%cd%\test_data\%imagename% >> CreateVHDX.diskpart
 echo attach vdisk >> CreateVHDX.diskpart
@@ -219,6 +251,10 @@
 set imagename=ntfs-parent.vhdx
 set imagesize=4

+del /f %cd%\test_data\%imagename%
+
+echo Creating: %imagename%
+
 echo create vdisk file=%cd%\test_data\%imagename% maximum=%imagesize% type=fixed > CreateVHDX.diskpart
 echo select vdisk file=%cd%\test_data\%imagename% >> CreateVHDX.diskpart
 echo attach vdisk >> CreateVHDX.diskpart
@@ -242,6 +278,10 @@

 set imagename=ntfs-differential.vhdx

+del /f %cd%\test_data\%imagename%
+
+echo Creating: %imagename%
+
 echo create vdisk file=%cd%\test_data\%imagename% parent=%cd%\test_data\ntfs-parent.vhdx > CreateVHDX.diskpart
 echo select vdisk file=%cd%\test_data\%imagename% >> CreateVHDX.diskpart
 echo attach vdisk >> CreateVHDX.diskpart
@@ -262,6 +302,10 @@
 set imagename=fat-parent.vhdx
 set imagesize=4

+del /f %cd%\test_data\%imagename%
+
+echo Creating: %imagename%
+
 echo create vdisk file=%cd%\test_data\%imagename% maximum=%imagesize% type=fixed > CreateVHDX.diskpart
 echo select vdisk file=%cd%\test_data\%imagename% >> CreateVHDX.diskpart
 echo attach vdisk >> CreateVHDX.diskpart
@@ -285,6 +329,10 @@

 set imagename=fat-differential.vhdx

+del /f %cd%\test_data\%imagename%
+
+echo Creating: %imagename%
+
 echo create vdisk file=%cd%\test_data\%imagename% parent=%cd%\test_data\fat-parent.vhdx > CreateVHDX.diskpart
 echo select vdisk file=%cd%\test_data\%imagename% >> CreateVHDX.diskpart
 echo attach vdisk >> CreateVHDX.diskpart
@@ -300,6 +348,71 @@
 echo detach vdisk >> UnmountVHDX.diskpart

 call :run_diskpart UnmountVHDX.diskpart
+
+rem Create a fixed-size VHD image with an AES 128-bit BDE encrypted volume with a password
+set unitsize=4096
+set imagename=bde_aes_128bit.vhd
+set imagesize=64
+
+del /f %cd%\test_data\%imagename%
+
+echo Creating: %imagename%
+
+echo create vdisk file=%cd%\%specimenspath%\%imagename% maximum=%imagesize% type=fixed > CreateVHD.diskpart
+echo select vdisk file=%cd%\%specimenspath%\%imagename% >> CreateVHD.diskpart
+echo attach vdisk >> CreateVHD.diskpart
+echo convert mbr >> CreateVHD.diskpart
+echo create partition primary >> CreateVHD.diskpart
+
+echo format fs=ntfs label="TestVolume" unit=%unitsize% quick >> CreateVHD.diskpart
+
+echo assign letter=x >> CreateVHD.diskpart
+
+call :run_diskpart CreateVHD.diskpart
+
+call :create_test_file_entries x
+
+rem This will ask for a password
+manage-bde -On x: -DiscoveryVolumeType "[none]" -EncryptionMethod aes128 -Password -Synchronous
+
+echo select vdisk file=%cd%\%specimenspath%\%imagename% > UnmountVHD.diskpart
+echo detach vdisk >> UnmountVHD.diskpart
+
+call :run_diskpart UnmountVHD.diskpart
+
+rem Create a fixed-size VHD image with a NTFS file system and unit size 512 and 2 volume snapshots
+set unitsize=512
+set imagename=ntfs_%unitsize%_with_2_vss.vhd
+set imagesize=128
+
+del /f %cd%\test_data\%imagename%
+
+echo Creating: %imagename%
+
+echo create vdisk file=%cd%\%specimenspath%\%imagename% maximum=%imagesize% type=fixed > CreateVHD.diskpart
+echo select vdisk file=%cd%\%specimenspath%\%imagename% >> CreateVHD.diskpart
+echo attach vdisk >> CreateVHD.diskpart
+echo convert mbr >> CreateVHD.diskpart
+echo create partition primary >> CreateVHD.diskpart
+
+echo format fs=ntfs label="TestVolume" unit=%unitsize% quick >> CreateVHD.diskpart
+
+echo assign letter=x >> CreateVHD.diskpart
+
+call :run_diskpart CreateVHD.diskpart
+
+call :create_test_file_entries x
+
+for /l %%i in (1, 1, 2) do (
+        "C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x64\vshadow.exe" -p x:
+
+        echo VSS%%i > x:\vss%%i
+)
+
+echo select vdisk file=%cd%\%specimenspath%\%imagename% > UnmountVHD.diskpart
+echo detach vdisk >> UnmountVHD.diskpart
+
+call :run_diskpart UnmountVHD.diskpart

 exit /b 0


Exclude wasm target from Windows packaging due to PR39448

git-svn-id: 0ff597fd157e6f4fc38580e8d64ab130330d2411@346122 91177308-0d34-0410-b5e6-96231b3b80d8

--- utils/release/build_llvm_package.bat
+++ utils/release/build_llvm_package.bat
@@ -44,8 +44,8 @@

 REM Setting CMAKE_CL_SHOWINCLUDES_PREFIX to work around PR27226.
-set cmake_flags=-DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_ASSERTIONS=ON -DLLVM_USE_CRT_RELEASE=MT -DLLVM_INSTALL_TOOLCHAIN_ONLY=ON -DCLANG_FORMAT_VS_VERSION=%clang_format_vs_version% -DPACKAGE_VERSION=%package_version% -DCMAKE_CL_SHOWINCLUDES_PREFIX="Note: including file: "
-
+REM Excluding wasm target to work around PR39448.
+set cmake_flags=-DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_ASSERTIONS=ON -DLLVM_USE_CRT_RELEASE=MT -DLLVM_INSTALL_TOOLCHAIN_ONLY=ON -DCLANG_FORMAT_VS_VERSION=%clang_format_vs_version% -DPACKAGE_VERSION=%package_version% -DCMAKE_CL_SHOWINCLUDES_PREFIX="Note: including file: " -DLLVM_TARGETS_TO_BUILD="AArch64;AMDGPU;ARM;BPF;Hexagon;Lanai;Mips;MSP430;NVPTX;PowerPC;Sparc;SystemZ;X86;XCore"
 REM TODO: Run all tests, including lld and compiler-rt.

 set "VSCMD_START_DIR=%CD%"


[ignore]updated version to 6.2

[ignore]updated version to 6.2

--- droid-binary/bin/droid.bat
+++ droid-binary/bin/droid.bat
@@ -138,13 +138,13 @@

 :PARAM
 REM has command line parameters passed - run command line version:
-java %DROIDOPTIONS% -jar droid-command-line-6.1.jar %*
+java %DROIDOPTIONS% -jar droid-command-line-6.2.jar %*

 GOTO end

 :NOPARAM
 REM no command line parameters passed - run GUI version:
-start javaw %DROIDOPTIONS% -jar droid-ui-6.1.jar
+start javaw %DROIDOPTIONS% -jar droid-ui-6.2.jar

 :END


Update RBL linker.cmd to match emt-a46 closure

--- hardware/cc3200emt/variants/RedBearLab_CC3200/linker.cmd
+++ hardware/cc3200emt/variants/RedBearLab_CC3200/linker.cmd
@@ -7,8 +7,8 @@

 INPUT(
     ../../configPkg/package/cfg/energia_pm4g.om4g
-    ../../lib/board.m4g.lib
-    lib/RedBearLab_CC3200.m4g.lib
+    ../../lib/cc3200.m4g.lib
+    lib/board.m4g.lib
     ti/drivers/lib/drivers_ccware.am4g
     ti/drivers/ports/tirtos/lib/tirtosport.am4g
     ti/drivers/lib/power_cc3200_tirtos.am4g


installer | windows:  FAST/FASTER_REBUILD env vars

--- scripts/build-installer-win64.bat
+++ scripts/build-installer-win64.bat
@@ -1,6 +1,8 @@
 rem DEPENDENCIES:
 rem   1. Node.js ('npm' binary in PATH)
 rem   2. 7zip    ('7z'  binary in PATH)
+rem
+rem   installer dev mode:  set FAST_REBUILD/FASTER_REBUILD to skip to frontend/installer compilation

 set MIN_CARDANO_BYTES=50000000
 set LIBRESSL_VERSION=2.5.3
@@ -28,6 +30,11 @@
 @echo ..with Cardano branch:      %CARDANO_BRANCH%
 @echo ..with LibreSSL version:    %LIBRESSL_VERSION%
 @echo .
+
+@if not [%FASTER_REBUILD%]==[] (@echo WARNING: FASTER_REBUILD set, skipping to frontend packaging
+    pushd installers & goto :build)
+@if not [%FAST_REBUILD%]==[]   (@echo WARNING: FAST_REBUILD set, skipping directly to installer rebuild
+    pushd installers & goto :fast_rebuild)

 @echo Obtaining curl
 powershell -Command "try { Import-Module BitsTransfer; Start-BitsTransfer -Source '%CURL_URL%' -Destination 'curl.7z'; } catch { exit 1; }"
@@ -85,6 +92,7 @@
 move   node_modules\daedalus-client-api\cardano-launcher.exe installers\
 del /f node_modules\daedalus-client-api\*.exe

+:fast_rebuild
 @echo Packaging frontend
 call npm run package -- --icon installers/icons/64x64
 @if %errorlevel% neq 0 (@echo FAILED: Failed to package the frontend


fixed env script

fixed env script

--- Samples/OSS/kyle/kyle_environment.bat
+++ Samples/OSS/kyle/kyle_environment.bat
@@ -21,7 +21,7 @@
     echo *** setting KRAKEN_PATH = %LOCAL_KRAKEN_PATH%
     set KRAKEN_PATH=%LOCAL_KRAKEN_PATH%
 )
-@endlocal
+@endlocal & SET KRAKEN_PATH=%KRAKEN_PATH%
 echo on

 set THIRD_PARTY=Z:\dist\fabric\ThirdParty


Add realtime test for dx9, dx12, vk

Add realtime test for dx9, dx12, vk

--- Tools/run_tests.cmd
+++ Tools/run_tests.cmd
@@ -8,6 +8,7 @@
 set use_debug_config=1
 set use_release_config=1
 set do_build=1
+set do_realtime_tests=1
 set do_default_gtests=1
 set errorcount=0
 :args_begin
@@ -16,6 +17,7 @@
     if "%~1"=="debug" ( set use_release_config=0 ) else (
     if "%~1"=="release" ( set use_debug_config=0 ) else (
     if "%~1"=="nobuild" ( set do_build=0 ) else (
+    if "%~1"=="norealtime" ( set do_realtime_tests=0 ) else (
     if "%~1"=="nogtests" ( set do_default_gtests=0 ) else (
         echo usage: run_tests.cmd [options]
         echo options:
@@ -23,9 +25,10 @@
         echo     debug        Only test the debug build
         echo     release      Only test the release build
         echo     nobuild      Don't build any configurations
+        echo     norealtime   Don't run tests for realtime collection
         echo     nogtests     Don't run default test suite
         exit /b 1
-    )))))
+    ))))))
     shift
     goto args_begin
 :args_end
@@ -104,13 +107,21 @@
 echo Testing functionality...

 if %use_release_config% EQU 1 (
-    set pmtest=build\Release\PresentMonTests-%version%-x64.exe
+    set test_config=Release
 ) else (
-    set pmtest=build\Debug\PresentMonTests-%version%-x64.exe
+    set test_config=Debug
+)
+
+if %do_realtime_tests% EQU 1 (
+    echo Realtime collection tests...
+    call :realtime_test "DX12" "DXGI"
+    call :realtime_test "DX9"  "D3D9"
+    call :realtime_test "VK"   "Other"
+    echo.
 )

 if %do_default_gtests% EQU 1 (
-    call :start_target_app
+    call :start_target_app /width=320 /height=240 /api=dx12

     for %%a in (%test_platforms%) do for %%b in (%build_configs%) do (
         call :gtests --presentmon="%pmdir%\build\%%b\PresentMon-%version%-%%a.exe" --golddir="%pmdir%\Tests\Gold"
@@ -200,8 +211,8 @@

 :: -----------------------------------------------------------------------------
 :gtests
-    echo "%pmdir%\%pmtest%" %*
-    "%pmdir%\%pmtest%" %*
+    echo "%pmdir%\build\%test_config%\PresentMonTests-%version%-x64.exe" %*
+    "%pmdir%\build\%test_config%\PresentMonTests-%version%-x64.exe" %*
     if not "%errorlevel%"=="0" set /a errorcount=%errorcount%+1
     exit /b 0

@@ -209,10 +220,8 @@
 :start_target_app
     set started_target_app_pid=0

-    :: Check if there's already one running, if so just leave it running and don't kill it after
-    for /f "tokens=1,2 delims=:" %%a in ('tasklist /fi "imagename eq PresentBench.exe" /fo list') do (
-        if "%%a" EQU "PID" exit /b 0
-    )
+    call :is_app_running /fi "imagename eq PresentBench.exe"
+    if %errorlevel% NEQ 0 exit /b 1

     if not exist "%~dp0PresentBench.exe" (
         echo warning: dependency not found: %~dp0PresentBench.exe
@@ -220,15 +229,72 @@
         exit /b 0
     )

-    start "" "%~dp0PresentBench.exe" /Width=320 /Height=240 /Api=DX12
+    start /b "" "%~dp0PresentBench.exe" %* >NUL
     for /f "tokens=1,2 delims=:" %%a in ('tasklist /fi "imagename eq PresentBench.exe" /fo list') do (
         if "%%a" EQU "PID" (
-            set started_target_app_pid=%%b
+            set /a started_target_app_pid=%%b
             exit /b 0
         )
     )
     exit /b 0

 :stop_target_app
-    if %started_target_app_pid% NEQ 0 taskkill /PID %started_target_app_pid%
-    exit /b 0
+    if %started_target_app_pid% EQU 0 exit /b 0
+    taskkill /PID %started_target_app_pid% >NUL
+    :until_killed
+        call :is_app_running /fi "imagename eq PresentBench.exe" /fi "pid eq %started_target_app_pid%"
+        if %errorlevel% NEQ 0 goto until_killed
+    set started_target_app_pid=0
+    exit /b 0
+
+:is_app_running
+    for /f "tokens=1,2 delims=:" %%a in ('tasklist %* /fo list') do (
+        if "%%a" EQU "PID" exit /b 1
+    )
+    exit /b 0
+
+:: -----------------------------------------------------------------------------
+:realtime_test
+    set test_api=%~1
+    set expected_runtime=%~2
+
+    call :start_target_app /width=320 /height=240 /api=%test_api%
+    if %errorlevel% NEQ 0 (
+        echo error: realtime tests cannot run with a process named PresentBench.exe already running
+        set /a errorcount=%errorcount%+1
+        exit /b 0
+    )
+
+    set saw_row=0
+    set saw_error=0
+    set present_mode=
+    for /f "tokens=4,12 delims=," %%a in ('"%pmdir%\build\%test_config%\PresentMon-%version%-x64.exe" -process_id %started_target_app_pid% -output_stdout -timed 2 -terminate_after_timed 2^>NUL') do (
+        if "%%a" NEQ "Runtime" (
+            if !saw_row! EQU 0 (
+                set present_mode=%%b
+                set saw_row=1
+            )
+            if "%%a" NEQ "%expected_runtime%" (
+                if !saw_error! EQU 0 (
+                    echo error: expecting runtime "%expected_runtime%", but got "%%a"
+                    set saw_error=1
+                )
+            )
+        )
+    )
+
+    call :stop_target_app
+
+    if %saw_error% NEQ 0 (
+        set /a errorcount=%errorcount%+1
+        exit /b 0
+    )
+    if %saw_row% EQU 0 (
+        echo error: realtime tests did not record any presents
+        set /a errorcount=%errorcount%+1
+        exit /b 0
+    )
+
+    echo.   %test_api%: %expected_runtime%, %present_mode%
+    exit /b 0
+


GS-9537
Fix groovystart script on windows to include the right jini group

svn path=/trunk/openspaces/; revision=99185

Former-commit-id: e9fb59dbde57b9b75b021fdc294b6f54e566a361

--- tools/groovy/bin/startGroovy.bat
+++ tools/groovy/bin/startGroovy.bat
@@ -78,7 +78,7 @@

 :default_JAVA_EXE
 set JAVA_EXE=java.exe
-goto check_GROOVY_HOME
+goto check_GS_GROOVY_HOME

 :valid_JAVA_HOME_DIR
 set JAVA_EXE=%JAVA_HOME%\bin\java.exe
@@ -250,6 +250,7 @@
 @rem GigaSpaces - Call setenv
 SET JSHOMEDIR=%GS_GROOVY_HOME%\..\..\
 call "%JSHOMEDIR%\bin\setenv.bat"
+set JAVA_OPTS=%JAVA_OPTS% %LOOKUP_GROUPS_PROP% %LOOKUP_LOCATORS_PROP%

 @rem Execute Groovy
 "%JAVA_EXE%" %GROOVY_OPTS% %JAVA_OPTS% -classpath "%STARTER_CLASSPATH%" %STARTER_MAIN_CLASS% --main %CLASS% --conf "%STARTER_CONF%" --classpath "%CP%" %CMD_LINE_ARGS%


Fixed error related to nodemon

Fixed error related to nodemon

--- scripts/windows/coco-dev-setup/batch/scripts/nab_automatic_script.bat
+++ scripts/windows/coco-dev-setup/batch/scripts/nab_automatic_script.bat
@@ -2,6 +2,6 @@
 call get_local_text npm_script npm script
 echo %npm_script%

-echo start cmd.exe cmd /c "TITLE CodeCombat.com - nodemon server & call nodemon -w server -w server_config.js">%~1\SCOCODE.bat
-echo start cmd.exe cmd /c "TITLE CodeCombat.com - brunch - live compiler & call brunch w">>%~1\SCOCODE.bat
-echo start cmd.exe cmd /c "TITLE CodeCombat.com - mongodb database & mongod --setParameter textSearchEnabled=true --dbpath %~2">>%~1\SCOCODE.bat+echo start cmd.exe cmd /c "TITLE CodeCombat.com - mongodb database & mongod --setParameter textSearchEnabled=true --dbpath %~2">%~1\SCOCODE.bat
+echo start cmd.exe cmd /c "TITLE CodeCombat.com - nodemon server & nodemon index.js">>%~1\SCOCODE.bat
+echo start cmd.exe cmd /c "TITLE CodeCombat.com - brunch - live compiler & brunch w">>%~1\SCOCODE.bat


Update scripts

Update scripts

--- conda/install.bat
+++ conda/install.bat
@@ -29,7 +29,7 @@
 echo ON

 for %%i in (%ANACONDA_INSTALL_RECIPES%) do (
-    conda install %%i --use-local %ANACONDA_CHANNEL_FLAGS% %ANACONDA_INSTALL_FLAGS%
+    conda install %%i %ANACONDA_CHANNEL_FLAGS% %ANACONDA_INSTALL_FLAGS%
     if errorlevel 1 (
         exit /b 1
     )


Just added a couple more directories to it.

git-svn-id: 3ec853389310512053d525963cab269c063bb453@171598 13f79535-47bb-0310-9956-ffa450edef68

--- scripts/Win32/ccd.cmd
+++ scripts/Win32/ccd.cmd
@@ -9,6 +9,7 @@
 IF "%1"=="internal" GOTO CD_INTERNAL
 IF "%1"=="intl" GOTO CD_INTL
 IF "%1"=="parsers" GOTO CD_PARSERS
+IF "%1"=="root" GOTO CD_ROOT
 IF "%1"=="samples" GOTO CD_SAMPLES
 IF "%1"=="sax" GOTO CD_SAX
 IF "%1"=="scripts" GOTO CD_SCRIPTS
@@ -49,6 +50,10 @@
 CD %XML4CRoot%\src\parsers
 GOTO EXIT

+:CD_ROOT
+CD %XML4CRoot%
+GOTO EXIT
+
 :CD_SAMPLES
 CD %XML4CRoot%\samples
 GOTO EXIT


Remove build and dist directories before install


Fix check_perms from r149483.

Fix check_perms from r149483.

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


Return the child task exit code.

Return the child task exit code.

--- Batch/TimeX.bat
+++ Batch/TimeX.bat
@@ -24,13 +24,14 @@
 :#                  and added option -T to revert to the old behaviour.       #
 :#   2020-12-10 JFL Option -n does not imply -t anymore. (2020-04-01 conseq.) #
 :#                  Added support for durations > 1 day.                      #
+:#   2021-01-05 JFL Return the child task exit code.                          #
 :#                                                                            #
 :#          Copyright 2016 Hewlett Packard Enterprise Development LP         #
 :# Licensed under the Apache 2.0 license  www.apache.org/licenses/LICENSE-2.0 #
 :##############################################################################

 setlocal EnableExtensions DisableDelayedExpansion
-set "VERSION=2020-12-10"
+set "VERSION=2021-01-05"
 set "SCRIPT=%~nx0"				&:# Script name
 set "SPATH=%~dp0"				&:# Script path
 set "SPATH=%SPATH:~0,-1%"			&:# Script path, without the trailing \
@@ -1347,6 +1348,7 @@
 for /l %%n in (1,1,%NLOOPS%) do (
   %EXEC% %ARGS%
 )
+set "ERR=%ERRORLEVEL%"

 call :Now
 set END_TIME=%HOUR%:%MINUTE%:%SECOND%.%MS%
@@ -1356,3 +1358,5 @@
 call :Time.Delta %START_DATE%_%START_TIME% %END_DATE%_%END_TIME% -f D
 if %D.DAY% GTR 0 set /a "D.HOUR=24*D.DAY + (100%D.HOUR% %% 100)" &:# Don't do it for 0 days, to keep the %02d HOUR format
 %>DEBUGOUT% %ECHO% Duration: %D.HOUR%:%D.MINUTE%:%D.SECOND%.%D.MS%
+
+exit /b %ERR%


Delete init.cmd

Delete init.cmd

--- init.cmd
+++ init.cmd
@@ -1,60 +0,0 @@
-:: variables
-set HOME=C:\Users\ajohnston
-set DEV=%HOME%\Documents\dev
-
-set DOT=%DEV%\dotfiles
-set MISC=%DEV%\misc
-set BIG=%DEV%\bigdata
-set F_API=%DEV%\foundation-api
-set F_WWW=%DEV%\foundation-www
-set ST_API=%DEV%\stratascape-api
-set ST_WWW=%DEV%\stratascape-www
-set SA_API=%DEV%\salesscape-api
-set SA_WWW=%DEV%\salesscape-www
-set B_API=%DEV%\bankchoice-api
-set B_WWW=%DEV%\bankchoice-www
-set P_API=%DEV%\ptekintegration-api
-set P_WWW=%DEV%\ptekintegration-www
-
-set DESKTOP=%HOME%\Desktop
-set DIFF_DIR=%DESKTOP%\diff
-set BIG_DIFF=%DIFF_DIR%\bigdata.diff
-set F_API_DIFF=%DIFF_DIR%\found-api.diff
-set F_WWW_DIFF=%DIFF_DIR%\found-www.diff
-set ST_API_DIFF=%DIFF_DIR%\strata-api.diff
-set ST_WWW_DIFF=%DIFF_DIR%\strata-www.diff
-set SA_API_DIFF=%DIFF_DIR%\sales-api.diff
-set SA_WWW_DIFF=%DIFF_DIR%\sales-www.diff
-set B_API_DIFF=%DIFF_DIR%\bank-api.diff
-set B_WWW_DIFF=%DIFF_DIR%\bank-www.diff
-set P_API_DIFF=%DIFF_DIR%\ptek-api.diff
-set P_WWW_DIFF=%DIFF_DIR%\ptek-www.diff
-
-:: cd
-doskey ~ = cd %HOME%
-doskey dot = cd %DOT%
-doskey misc = cd %MISC%
-doskey big = cd %BIG%
-doskey fapi = cd %F_API%
-doskey fwww = cd %F_WWW%
-doskey stapi = cd %ST_API%
-doskey stwww = cd %ST_WWW%
-doskey saapi = cd %SA_API%
-doskey sawww = cd %SA_WWW%
-doskey bapi = cd %B_API%
-doskey bwww = cd %B_WWW%
-doskey papi = cd %P_API%
-doskey pwww = cd %P_WWW%
-
-:: svn update
-doskey allup = svn up %BIG% ^& svn up %F_API% ^& svn up %F_WWW% ^& svn up %ST_API% ^& svn up %ST_WWW% ^& svn up %SA_API% ^& svn up %SA_WWW% ^& svn up %B_API% ^& svn up %B_WWW% ^& svn up %P_API% ^& svn up %P_WWW%
-
-:: svn diff
-:: output "directory already exists" error to unused var NULL
-doskey alldiff = mkdir %DIFF_DIR% 2$g NULL ^& svn di %BIG% $g %BIG_DIFF% ^& echo created %BIG_DIFF% ^& svn di %F_API% $g %F_API_DIFF% ^& echo created %F_API_DIFF% ^& svn di %F_WWW% $g %F_WWW_DIFF% ^& echo created %F_WWW_DIFF% ^& svn di %ST_API% $g %ST_API_DIFF% ^& echo created %ST_API_DIFF% ^& svn di %ST_WWW% $g %ST_WWW_DIFF% ^& echo created %ST_WWW_DIFF% ^& svn di %SA_API% $g %SA_API_DIFF% ^& echo created %SA_API_DIFF% ^& svn di %SA_WWW% $g %SA_WWW_DIFF% ^& echo created %SA_WWW_DIFF% ^& svn di %B_API% $g %B_API_DIFF% ^& echo created %B_API_DIFF% ^& svn di %B_WWW% $g %B_WWW_DIFF% ^& echo created %B_WWW_DIFF% ^& mkdir %DIFF_DIR% 2$g NULL ^& svn di %P_API% $g %P_API_DIFF% ^& echo created %P_API_DIFF% ^& svn di %P_WWW% $g %P_WWW_DIFF% ^& echo created %P_WWW_DIFF%
-
-:: run www server
-doskey strun = cd %ST_WWW% ^& grunt server
-doskey sarun = cd %SA_WWW% ^& grunt server
-doskey brun = cd %B_WWW% ^& grunt server
-doskey prun = cd %P_WWW% ^& grunt server


Added a "makefile" to build the project only with .NET Framework installed.

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

--- make.bat
+++ make.bat
@@ -0,0 +1,5 @@
+%systemroot%\Microsoft.NET\Framework64\v4.0.30319\MSBuild
+
+@echo "--- Running test application ---"
+
+@.\Examples\bin\Debug\Examples.exe .\Examples\test.xlsx


Correct path

Correct path

--- make.bat
+++ make.bat
@@ -3,4 +3,4 @@
 python.exe setup.py build
 cd ..

-"c:\Program Files (x86)\Inno Setup 5\ISCC.exe" pesel2pbn.iss+"%PROGRAMFILES%\Inno Setup 5\ISCC.exe" pesel2pbn.iss


some fixes to make.bat

some fixes to make.bat

--- make.bat
+++ make.bat
@@ -56,7 +56,6 @@
 )

 if "%1" == "clean" (
-    :clean
     for /r %%R in (__pycache__) do if exist %%R (rmdir /S /Q %%R)
     for /r %%R in (*.pyc) do if exist %%R (del /s %%R)
     for /r %%R in (*.pyd) do if exist %%R (del /s %%R)
@@ -89,7 +88,6 @@
 )

 if "%1" == "uninstall" (
-    :uninstall
     for %%A in ("%PYTHON%") do (
         set folder=%%~dpA
     )
@@ -100,28 +98,24 @@
 )

 if "%1" == "test" (
-    :test
-    call :install
+    call :build
     %PYTHON% %TSCRIPT%
     goto :eof
 )

 if "%1" == "test-process" (
-    :test
     call :install
     %PYTHON% -m unittest -v test.test_psutil.TestProcess
     goto :eof
 )

 if "%1" == "test-system" (
-    :test
     call :install
     %PYTHON% -m unittest -v test.test_psutil.TestSystem
     goto :eof
 )

 if "%1" == "test-memleaks" (
-    :memtest
     call :install
     %PYTHON% test\test_memory_leaks.py
     goto :eof
@@ -165,7 +159,6 @@
 )

 if "%1" == "build-all" (
-    :build-all
     rem for some reason this needs to be called twice (f**king windows...)
     call :build-exes
     call :build-exes
@@ -207,7 +200,6 @@
 )

 if "%1" == "upload-all" (
-    :build-all
     call :upload-exes
     call :upload-wheels
     echo OK
@@ -215,7 +207,6 @@
 )

 if "%1" == "setup-env" (
-    :setup-env
     echo downloading pip installer
     C:\python27\python.exe -c "import urllib2; url = urllib2.urlopen('https://raw.github.com/pypa/pip/master/contrib/get-pip.py'); data = url.read(); f = open('get-pip.py', 'w'); f.write(data)"
     C:\python26\python.exe get-pip.py & C:\python26\scripts\pip install unittest2 wheel ipaddress --upgrade
@@ -235,6 +226,8 @@
 goto :help

 :error
+    echo ------------------------------------------------
     echo last command exited with error code %errorlevel%
+    echo ------------------------------------------------
     exit /b %errorlevel%
     goto :eof


Modify make.cmd to just make goterp.exe.  We'll run goterp by hand on Windows.

--- make.cmd
+++ make.cmd
@@ -7,10 +7,3 @@

 :: Make goterp.
 go build -x goterp
-
-:: Put the demo\hello_web.t into a variable for parsing.
-:: (http://stackoverflow.com/questions/3068929)
-for /f "delims=" %%x in (demo\hello_web.t) do set web=%web% %%x
-
-:: Run demo\hello_web.t
-goterp "%web%"


make.cmd: print error-message when some process holds nyagos.exe

--- make.cmd
+++ make.cmd
@@ -514,7 +514,12 @@
             Do-Copy nyagos.exe $installDir
         }catch{
             taskkill /F /im nyagos.exe
-            Do-Copy nyagos.exe $installDir
+            try{
+                Do-Copy nyagos.exe $installDir
+            }catch{
+                Write-Host "Could not update installed nyagos.exe"
+                Write-Host "Some processes holds nyagos.exe now"
+            }
             # [void]([System.Windows.Forms.MessageBox]::Show("Done"))
             timeout /T 3
         }


Revert code-cli.bat changes

Revert code-cli.bat changes

--- scripts/code-cli.bat
+++ scripts/code-cli.bat
@@ -6,7 +6,7 @@
 pushd %~dp0..

 :: Get electron, compile, built-in extensions
-@REM if "%VSCODE_SKIP_PRELAUNCH%"=="" node build/lib/preLaunch.js
+if "%VSCODE_SKIP_PRELAUNCH%"=="" node build/lib/preLaunch.js

 for /f "tokens=2 delims=:," %%a in ('findstr /R /C:"\"nameShort\":.*" product.json') do set NAMESHORT=%%~a
 set NAMESHORT=%NAMESHORT: "=%
@@ -24,7 +24,7 @@
 set ELECTRON_ENABLE_STACK_DUMPING=1

 :: Launch Code
-%CODE% out\cli.js --ms-enable-electron-run-as-node %~dp0.. %*
+%CODE% --inspect=5874 out\cli.js --ms-enable-electron-run-as-node %~dp0.. %*
 goto end

 :builtin


echo=off works on NT, but not on W2K.

echo=off works on NT, but not on W2K.

--- ms/test.bat
+++ ms/test.bat
@@ -1,4 +1,4 @@
-@echo=off
+@echo off

 set test=..\ms
 set opath=%PATH%


add test

add test

--- ms/test.bat
+++ ms/test.bat
@@ -65,6 +65,10 @@

 echo dsatest
 dsatest
+if errorlevel 1 goto done
+
+echo ectest
+ectest
 if errorlevel 1 goto done

 echo testenc


Update run_tests.bat

Update run_tests.bat

--- script/run_tests.bat
+++ script/run_tests.bat
@@ -1,2 +1,2 @@
 cd build
-ctest -VV
+ctest -VV && cd ..


Тестирование поиска по маске

Тестирование поиска по маске

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

--- findfirst.bat
+++ findfirst.bat
@@ -0,0 +1,100 @@
+@echo off
+::஢  ਠ⮢ ᪠ ࢮ 䠩  ᪥.
+::ਠ:
+::	1.६  ࢮ 宦   ⨯ 䠩   横.
+::	2.᫥⥫  ࢮ 宦  ⨯ 䠩,  ⨯ 䠩  ᢮ 横, ᫥⥫ .
+::	3.ࠫ  ࢮ 宦  ⨯ 䠩,  ⨯ 䠩  ᢮ .     ६ 䠩.  ᫥ ⨯ 䠩 ᪠  ᭮ .
+::ࠬ: %1 -   ⠫,  ஬ 㤥 ந .
+setlocal enabledelayedexpansion
+if "%~2" equ "findfirst" goto:findfirst
+
+set "alltypes=*.jpg *.png *.gif"
+set "jpgtype=*.jpg *.jpe *.jpeg"
+set "pngtype=*.png"
+set "giftype=*.gif"
+set "jpglock=jpg.lck"
+set "pnglock=png.lck"
+set "giflock=gif.lck"
+set "jpgtmp=jpg.tmp"
+set "pngtmp=png.tmp"
+set "giftmp=gif.tmp"
+set "timeout=3"
+
+echo.1.६  (  横  ⨯ 䠩)
+call:initvars
+echo.%time%
+for /r "%~1" %%a in (%alltypes%) do (
+	if /i "%%~xa" equ ".jpg" if not defined jpg set "jpg=1"
+	if /i "%%~xa" equ ".png" if not defined png set "png=1"
+	if /i "%%~xa" equ ".gif" if not defined gif set "gif=1"
+	if defined jpg if defined png if defined gif goto:fin1
+)
+:fin1
+echo.%time%
+echo.jpg=%jpg%	png=%png%	gif=%gif%
+if defined jpg if defined png if defined gif (echo.  ⨯ & goto:fin11)
+echo.   ⨯
+:fin11
+
+echo.2.᫥⥫  ( ⨯ 䠩  ᢮ 横)
+call:initvars
+echo.%time%
+for /r "%~1" %%a in (%jpgtype%) do set "jpg=1" & goto:fin2jpg
+:fin2jpg
+for /r "%~1" %%a in (%pngtype%) do set "png=1" & goto:fin2png
+:fin2png
+for /r "%~1" %%a in (%giftype%) do set "gif=1" & goto:fin2gif
+:fin2gif
+echo.%time%
+echo.jpg=%jpg%	png=%png%	gif=%gif%
+if defined jpg if defined png if defined gif (echo.  ⨯ & goto:fin2)
+echo.   ⨯
+:fin2
+
+echo.3.ࠫ  ( ⨯ 䠩  ᢮ )
+call:initvars
+echo.%time%
+:: ᮢ
+start /b cmd /c "%~0 %~1 findfirst jpg"
+start /b cmd /c "%~0 %~1 findfirst png"
+::start /b cmd /c "%~0 %~1 findfirst gif"
+call:findfirst "%~1" findfirst gif
+
+::஢ઠ 襭 ᮢ
+call:waitforfile "%jpglock%"
+call:waitforfile "%pnglock%"
+::call:waitforfile "%giflock%"
+
+::⮣
+echo.%time%
+<"%jpgtmp%" set /p "jpg="
+<"%pngtmp%" set /p "png="
+<"%giftmp%" set /p "gif="
+echo.jpg=%jpg%	png=%png%	gif=%gif%
+if defined jpg if defined png if defined gif (echo.  ⨯ & goto:fin3)
+echo.   ⨯
+:fin3
+1>nul 2>&1 del /f/q "%jpgtmp%" "%pngtmp%" "%giftmp%"
+
+exit /b
+
+:waitforfile
+if exist "%~1" (1>nul timeout /t %timeout% /nobreak & goto:waitforfile)
+exit /b
+
+:initvars
+set "jpg="
+set "png="
+set "gif="
+exit /b
+
+:findfirst
+call set "lck=%%%~3lock%%"
+call set "ftmp=%%%~3tmp%%"
+call set "type=%%%~3type%%"
+>"%lck%" echo.
+for /r "%~1" %%a in (%type%) do (>"%ftmp%" echo.1 & goto:endfindfirst)
+>"%ftmp%" echo.0
+:endfindfirst
+1>nul del /f/q "%lck%"
+exit /b


Fix typo

Fix typo

--- mvnw.cmd
+++ mvnw.cmd
@@ -26,7 +26,7 @@
 @REM Optional ENV vars
 @REM M2_HOME - location of maven2's installed home dir
 @REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
-@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending
 @REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
 @REM     e.g. to debug Maven itself, use
 @REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000


Delete gradlew.bat

Delete gradlew.bat

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


Fix the build script using the correct syntax for not equals

--- appveyor-build.cmd
+++ appveyor-build.cmd
@@ -3,9 +3,9 @@
 set APPVEYOR_CI=1

 :: Check prerequisites
-if '%VisualStudioVersion%'!='' goto vsversionset
-if not exist ""%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\common7\ide\devenv.exe"" set VisualStudioVersion="14.0"
-if not exist ""%ProgramFiles(x86)%\Microsoft Visual Studio 12.0\common7\ide\devenv.exe"" set VisualStudioVersion="12.0"
+if not '%VisualStudioVersion%' == '' goto vsversionset
+if not exist "%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\common7\ide\devenv.exe" set VisualStudioVersion="14.0"
+if not exist "%ProgramFiles(x86)%\Microsoft Visual Studio 12.0\common7\ide\devenv.exe" set VisualStudioVersion="12.0"
 :vsversionset

 rem by default pick msbuild based on VisualStudioVersion


fix go.bat to build impl.callbacks

fix go.bat to build impl.callbacks

--- go.bat
+++ go.bat
@@ -6,6 +6,10 @@
 cd src

 cd SQLitePCLRaw.core
+dotnet pack -c Release
+cd ..
+
+cd SQLitePCLRaw.impl.callbacks
 dotnet pack -c Release
 cd ..


build_llvm_package.bat: Add OpenMP back

build_llvm_package.bat: Add OpenMP back

After r338721, it builds again.

git-svn-id: 0ff597fd157e6f4fc38580e8d64ab130330d2411@338823 91177308-0d34-0410-b5e6-96231b3b80d8

--- utils/release/build_llvm_package.bat
+++ utils/release/build_llvm_package.bat
@@ -40,7 +40,7 @@
 svn.exe export -r %revision% http://llvm.org/svn/llvm-project/clang-tools-extra/%branch% llvm/tools/clang/tools/extra || exit /b
 svn.exe export -r %revision% http://llvm.org/svn/llvm-project/lld/%branch% llvm/tools/lld || exit /b
 svn.exe export -r %revision% http://llvm.org/svn/llvm-project/compiler-rt/%branch% llvm/projects/compiler-rt || exit /b
-REM svn.exe export -r %revision% http://llvm.org/svn/llvm-project/openmp/%branch% llvm/projects/openmp || exit /b
+svn.exe export -r %revision% http://llvm.org/svn/llvm-project/openmp/%branch% llvm/projects/openmp || exit /b

 REM Setting CMAKE_CL_SHOWINCLUDES_PREFIX to work around PR27226.


Build fix

Build fix

--- copy_zip_package_files.bat
+++ copy_zip_package_files.bat
@@ -23,7 +23,7 @@
 copy "samples\Myra.Samples.CustomUIStylesheet\bin\MonoGame\%CONFIGURATION%\Myra.Samples.CustomUIStylesheet.exe" ZipPackage /Y
 copy "samples\Myra.Samples.GridContainer\bin\MonoGame\%CONFIGURATION%\Myra.Samples.GridContainer.exe" ZipPackage /Y
 copy "samples\Myra.Samples.SplitPaneContainer\bin\MonoGame\%CONFIGURATION%\Myra.Samples.SplitPaneContainer.exe" ZipPackage /Y
-copy "samples\Myra.Samples.SplitPaneContainer\bin\MonoGame\%CONFIGURATION%\Myra.Samples.Notepad.exe" ZipPackage /Y
+copy "samples\Myra.Samples.Notepad\bin\MonoGame\%CONFIGURATION%\Myra.Samples.Notepad.exe" ZipPackage /Y
 copy "src\Myra.UIEditor\bin\%CONFIGURATION%\Myra.UIEditor.exe" ZipPackage /Y
 xcopy "samples\Stylesheets\*.*" "ZipPackage\Stylesheets\*.*" /s


Update bld.bat

Update bld.bat

--- recipes/cm-unicode/bld.bat
+++ recipes/cm-unicode/bld.bat
@@ -1,4 +1,4 @@
 mkdir %PREFIX%/fonts
 for %%f in (*.ttf) do (
-    copy %%f %PREFIX%/fonts/%%f
+    copy %%~nf %PREFIX%/fonts/%%~nf
 )


Started reset batch file in case of errors. Not quite ready for use.

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

--- autoclean-RESET.bat
+++ autoclean-RESET.bat
@@ -0,0 +1,44 @@
+@echo off
+:: TIM
+:: -------------------
+:: AUTOCLEAN-RESET.BAT
+:: -------------------
+
+:: Crappy to do list follows...
+:: Look into Task Manager vs. StartupTool (Nirsoft) - REQ from Will
+:: In flag file, create last command name for restarting
+:: 			(ie: if  then set lastcommand = )
+:: SYSTEM BEEP AT TIMES OF INPUT
+:: add test for null entries
+:: add test for network connectivity (NIC working & BEAST accessible)
+:: look into ability to drag and drop text file or csv with client data,
+:: (e.g. name, av needed, password)
+:: Should log start time of each script (really, of each command)
+::     - Observe logwithdate batch file to see how vocatus accomplishes this
+:: Need to swtich away from flags and read from a file instead for the client
+:: info. Will be easier to restart one of the stages if something goes sideways.
+:: Add test / install for .NET Framework 3.5 (Keep in mind Win 7/8/8.1/10)
+
+:: BatchGotAdmin
+:-------------------------------------
+::  --> Check for permissions
+>nul 2>&1 "%SYSTEMROOT%\system32\cacls.exe" "%SYSTEMROOT%\system32\config\system"
+
+:: --> If error flag set, we do not have admin.
+if '%errorlevel%' NEQ '0' (
+    echo Requesting administrative privileges...
+    goto UACPrompt
+) else ( goto gotAdmin )
+
+:UACPrompt
+    echo Set UAC = CreateObject^("Shell.Application"^) > "%temp%\getadmin.vbs"
+    echo UAC.ShellExecute "%~s0", "", "", "runas", 1 >> "%temp%\getadmin.vbs"
+
+    "%temp%\getadmin.vbs"
+    exit /B
+
+:gotAdmin
+    if exist "%temp%\getadmin.vbs" ( del "%temp%\getadmin.vbs" )
+    pushd "%CD%"
+    CD /D "%~dp0"
+:--------------------------------------


Updated Discord Harmonbot to Python 3.7

Updated Discord Harmonbot to Python 3.7

--- Discord/scripts/Harmonbot.bat
+++ Discord/scripts/Harmonbot.bat
@@ -1,3 +1,3 @@
 :loop
-py -3.6 Harmonbot.py
+py -3.7 Harmonbot.py
 goto loop


added obbinapk argument

added obbinapk argument

--- build-ue4-game.bat
+++ build-ue4-game.bat
@@ -68,4 +68,4 @@
 echo Extracting the Optional files...
 7z x %REQUIRED_FILES_OPT% -o%ENGINE_DIRECTORY%

-%ENGINE_DIRECTORY%/Engine/Build/BatchFiles/RunUAT.bat BuildCookRun -project=%PROJECT% -build -%PLATFORM% -clientconfig=%CLIENT_CONFIG% -distribution -cook -stage -package -archive -archivedirectory=%ARCHIVE_DIRECTORY%
+%ENGINE_DIRECTORY%/Engine/Build/BatchFiles/RunUAT.bat BuildCookRun -project=%PROJECT% -build -%PLATFORM% -clientconfig=%CLIENT_CONFIG% -distribution -cook -stage -package -obbinapk -archive -archivedirectory=%ARCHIVE_DIRECTORY%


Updating release version.

Updating release version.

--- NuGet/NuGet.Build.bat
+++ NuGet/NuGet.Build.bat
@@ -5,12 +5,14 @@
 echo.
 echo Hint 2: Do we have the latest version of "nuget.exe"?
 echo.
-dir .\bin\Release\*.*
+dir ..\NetMQ.ReactiveExtensions\bin\Release\net45\*.*
+dir ..\NetMQ.ReactiveExtensions\bin\Release\netcoreapp1.0\*.*
+dir ..\NetMQ.ReactiveExtensions\bin\Release\netstandard1.6\*.*
 echo.
 echo Hint 3: Is the "Release" build above recent?
 echo.
 pause
-set version=0.9.4-rc5
+set version=0.9.4-rc6
 nuget.alpha pack NetMQ.ReactiveExtensions.nuspec -Version %version%
 rem TODO: Figure out why the new version is giving that error - hopefully they will release a new alpha that fixes the issue.
 nuget push NetMQ.ReactiveExtensions.%version%.nupkg 9871c41e-c402-4e85-8c96-5486fb725868


Added datetime to foldername

Added datetime to foldername

--- build-git-clone.cmd
+++ build-git-clone.cmd
@@ -11,6 +11,6 @@

 	set SolutionRootPath=%GitTemp%

-	for /f %%i in ('git rev-parse --verify HEAD') do set BuildIdentifier=%%i
+	for /f %%i in ('git rev-parse --verify HEAD') do set BuildIdentifier=%DateTime%_%%i
 )


Should delete .exe not .7z when building SDK multiple times

--- SDK/Win32/buildsdk.bat
+++ SDK/Win32/buildsdk.bat
@@ -81,7 +81,7 @@
 set SDKNAME=OgreSDK_%COMPILER%_v%OGREVERSION%
 rmdir /S/Q %SDKNAME%
 move %BUILD_DIR%\sdk %SDKNAME%
-del /Q/F %SDKNAME%.7z
+del /Q/F %SDKNAME%.exe
 rem create self-extracting 7zip archive
 7z a -r -y -sfx7z.sfx %SDKNAME%.exe %SDKNAME%


port to cmd_q_shows_sub command file to windows

--- src/condor_tests/cmd_q_shows-sub.cmd
+++ src/condor_tests/cmd_q_shows-sub.cmd
@@ -1,6 +1,7 @@
 universe = vanilla
 Notification = NEVER
 executable = /bin/sleep
+transfer_executable = false
 arguments = 0
 error = cmd_q_shows-sub.err
 hold = true


[Collector] Fix issue that collector start failed in the Windows environment

--- apm-collector/apm-collector-boot/bin/collectorService.bat
+++ apm-collector/apm-collector-boot/bin/collectorService.bat
@@ -17,5 +17,5 @@
  set _EXECJAVA=java
 )

-start "%COLLECTOR_PROCESS_TITLE%" %_EXECJAVA% "%COLLECTOR_OPTS%" -cp "%CLASSPATH%" CollectorBootStartUp
+start "%COLLECTOR_PROCESS_TITLE%" %_EXECJAVA% "%COLLECTOR_OPTS%" -cp "%CLASSPATH%" org.apache.skywalking.apm.collector.boot.CollectorBootStartUp
 endlocal


Get WiX location dynamically

Get WiX location dynamically

--- packaging/dist-win32.bat
+++ packaging/dist-win32.bat
@@ -7,7 +7,7 @@
 set PACKAGE_DIR="%OUTPUT_DIR%\QMK Firmware Flasher-%PLATFORM%-%ARCH%"
 set VERSION=%1

-set WIX_DIR="C:\Program Files (x86)\WiX Toolset v3.10\bin"
+set WIX_DIR="%WIX%bin"

 pushd


Print helpful error message when updating depot_tools on Windows

The depot_tools directory may get into a state in which its no longer a
git repo, in which case we can't update it. On Windows this would cause
the update_depot_tools.bat script to fail with a somewhat confusing
error message, this CL fixes that to inform the user what happened and
what they should do about it.

Bug: 1333997
Change-Id: I2c60fc46f1fae7811ff6610e25380d08010d0597
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3718926
Reviewed-by: Bruce Dawson <fe9e26f3989304bf7275ed139c57fd059c63d22d@chromium.org>
Commit-Queue: Will Cassella <6fcb8d0fce442c8d25448ae586fd600e0b7a0dab@chromium.org>
Reviewed-by: Brian Sheedy <8cdc5cc1fa60ba15acb0d296e6f5592b7bb7d71c@chromium.org>
Reviewed-by: Aravind Vasudevan <dbe94b625b74f03bb5e24a737a4f1e15753433de@google.com>

--- update_depot_tools.bat
+++ update_depot_tools.bat
@@ -48,6 +48,13 @@
 :: Now clear errorlevel so it can be set by other programs later.
 set errorlevel=

+:: Make sure DEPOT_TOOLS_DIR is a git repo
+IF NOT EXIST "%DEPOT_TOOLS_DIR%.git\" (
+  echo Error: Your depot_tools directory does not appear to be a git repository, and cannot be updated.
+  echo Consider deleting your depot_tools directory and following the instructions at https://www.chromium.org/developers/how-tos/install-depot-tools/ to reinstall it.
+  exit /b 1
+)
+
 cd /d "%DEPOT_TOOLS_DIR%."
 call git config remote.origin.fetch > NUL
 for /F %%x in ('git config --get remote.origin.url') DO (


Prevent msvc toolchain's python wrapper script from generating pyc files

Otherwise, we have to clean it every time and it will affect the linking in
cc_configure.bzl

--
MOS_MIGRATED_REVID=120329223

--- tools/cpp/wrapper/bin/call_python.bat
+++ tools/cpp/wrapper/bin/call_python.bat
@@ -23,4 +23,4 @@

 ::TODO(pcloudy): Remove hard code path, user should be able to configure
 if not defined MSVCPYTHON set MSVCPYTHON=C:\python_27_amd64\files\python.exe
-%MSVCPYTHON% "%PYDIR%\%TOOLNAME%.py" %*
+%MSVCPYTHON% -B "%PYDIR%\%TOOLNAME%.py" %*


skip those XML warnings ;)

skip those XML warnings ;)

--- MakefileAll.bat
+++ MakefileAll.bat
@@ -3,10 +3,11 @@
 set msbuild="C:\Program Files (x86)\MSBuild\14.0\bin\msbuild.exe"
 set config=Windows Release
 set platform=AnyCPU
+set warnings=;1591;
 if "%CI%"=="True" (
     set logger=/l:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
 )
-set buildargs=/p:Configuration="%config%" /p:Platform="%platform%" /v:detailed %logger%
+set buildargs=/p:Configuration="%config%" /p:Platform="%platform%" /p:NoWarn="%warnings%" /v:minimal %logger%

 echo Restoring NuGets...


Removed if / then statement for USE_UI flag

No need to have an if / then statement since USE_UI variable is set to blank or "-noui".

Signed-off-by: ariestav <0afed745aef74eef32f0ce1232ce9c5ccb01da8f@sbcglobal.net>

--- Windows/templater.bat
+++ Windows/templater.bat
@@ -38,8 +38,4 @@
 copy /Y "%APP_DIR%\%PANELS%\Templater 2.jsxbin" "%CD%\Templater 2.jsxbin"

 ::Run After Effects along with the Templater 2 file
-if %USE_UI%=="-noui" (
-    "%APP_DIR%\afterfx" -r -noui "%CD%\Templater 2.jsxbin"
-) else (
-    "%APP_DIR%\afterfx" -r "%CD%\Templater 2.jsxbin"
-)+"%APP_DIR%\afterfx" -r %USE_UI% "%CD%\Templater 2.jsxbin"