Convert line endings from CRLF to LF.

Convert line endings from CRLF to LF.

+ This commit introduces no code change!

--- 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


git-svn-id: https://svn.code.sf.net/p/mygeneration/code/trunk@304 f5ecc899-f232-0410-8e71-85cf30c42a8c

--- installer/BuildAll.bat
+++ installer/BuildAll.bat
@@ -7,11 +7,11 @@
 goto :x64
 :x86
 	if "%DEVENV%"=="" set DEVENV="%PROGRAMFILES%\Microsoft Visual Studio 10.0\Common7\IDE\devenv.exe"  /out ".\application_build.log" /rebuild release
-	if "%MAKENSIS%"=="" set MAKENSIS=%PROGRAMFILES%\NSIS
+	if "%MAKENSIS%"=="" set MAKENSIS=%PROGRAMFILES%\NSIS\makensis.exe
 	goto done
 :x64
 	if "%DEVENV%"=="" set DEVENV="%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\Common7\IDE\devenv.exe"  /out ".\application_build.log" /rebuild release
-	if "%MAKENSIS%"=="" set MAKENSIS=%PROGRAMFILES(X86)%\NSIS
+	if "%MAKENSIS%"=="" set MAKENSIS=%PROGRAMFILES(X86)%\NSIS\makensis.exe
 :done

 %DEVENV% "..\plugins\MyMetaPlugins.sln"


Far3.bat improved

Far3.bat improved

--- Far3.bat
+++ Far3.bat
@@ -80,6 +80,18 @@
 set "far_ConEmuFile=%far_ConEmuDir%\ConEmu.dll"
 set "far_ConEmuBuild="

+for %%f in ( powershell.exe robocopy.exe ) do if "%%~$PATH:f" == "" (
+	echo:
+	echo:*** ERROR ***
+	echo:%%f not found in PATH. Unable to continue checking.
+	echo:
+	echo:Copy the folder manually by yourself
+	echo:From : "%ConEmuDir%\plugins\ConEmu"
+	echo:To   : "%far_ConEmuDir%"
+	echo:
+	goto :EOF
+)
+
 set "far_cmd_del=rd /s /q "%far_ConEmuDir%""
 set "far_cmd_copy=robocopy "%ConEmuDir%\plugins\ConEmu" "%far_ConEmuDir%" /S /E >nul"

@@ -89,18 +101,6 @@
 	echo:No ConEmu plugin found
 	echo:
 	call :conemu_plugin_copy
-	goto :EOF
-)
-
-for %%f in ( powershell.exe robocopy.exe ) do if "%%~$PATH:f" == "" (
-	echo:
-	echo:*** ERROR ***
-	echo:%%f not found in PATH. Unable to continue checking.
-	echo:
-	echo:Copy the folder manually by yourself
-	echo:From : "%ConEmuDir%\plugins\ConEmu"
-	echo:To   : "%far_ConEmuDir%"
-	echo:
 	goto :EOF
 )

@@ -125,9 +125,7 @@
 echo:It is extremely recommended to update the plugin for Far Manager
 echo:

-:: How to check if file is locked
-:: http://stackoverflow.com/a/24994480/3627676
-powershell -NoLogo -NoProfile -Command "try { [IO.File]::OpenWrite('%far_ConEmuFile%').Close(); } catch { exit 1; }" && call :conemu_plugin_del && call :conemu_plugin_copy && goto :EOF
+call :conemu_plugin_lockstate && call :conemu_plugin_del && call :conemu_plugin_copy && goto :EOF

 echo:
 echo:Perhaps, the plugin is locked by another application (Far Manager or
@@ -138,6 +136,14 @@
 echo:%far_cmd_copy%
 echo:

+goto :EOF
+
+:: ========================================================================
+
+:conemu_plugin_lockstate
+:: How to check if file is locked
+:: http://stackoverflow.com/a/24994480/3627676
+powershell -NoLogo -NoProfile -Command "try { [IO.File]::OpenWrite('%far_ConEmuFile%').Close(); } catch { exit 1; }"
 goto :EOF

 :: ========================================================================


Add check for NHol.dll and friendly message if not found.

Signed-off-by: Eric Taucher <30b64b56436fcf85b74ccbb05f43dcd6d341dadf@gmail.com>

--- NHol.bat
+++ NHol.bat
@@ -2,6 +2,10 @@
 :: latest version of F# Interactive (FSI) available on this machine.

 @echo off
+
+:: Get location of required dll: NHol.dll
+set NHOL_RELATIVE=NHol\bin\Debug\NHol.dll
+set "NHOL_ABSOLUTE=%~dp0%NHOL_RELATIVE%"

 :: Variables which hold paths to various versions of F# Interactive.
 set FSI_30= "C:\Program Files (x86)\Microsoft SDKs\F#\3.0\Framework\v4.0\fsi.exe"
@@ -59,31 +63,49 @@
   --use:help.fs^
   --use:database.fs^

-:: Try to find the user's installation of F# Interactive.
-if exist %FSI_30% (
-    :: VS 2012 / F# 3.0
-    echo Using F# 3.0
+:: Verify NHol.dll exists before proceeding
+if exist %NHOL_ABSOLUTE% (

-    :: Set the 'FSI' variable to the path for F# 3.0 Interactive.
-    set FSI= %FSI_30%
+   :: Try to find the user's installation of F# Interactive.
+   if exist %FSI_30% (
+      :: VS 2012 / F# 3.0
+      echo Using F# 3.0

-    set FSI_VER_FLAG = ""
+      :: Set the 'FSI' variable to the path for F# 3.0 Interactive.
+      set FSI= %FSI_30%
+
+      set FSI_VER_FLAG = ""
+   ) else (
+      if exist %FSI_20% (
+          :: VS 2010 / F# 2.0
+          echo Using F# 2.0
+
+          :: Set the 'FSI' variable to the path for F# 2.0 Interactive.
+          set FSI= %FSI_20%
+
+          set FSI_VER_FLAG = "--define:FSI_VER_2"
+      ) else (
+          :: Unable to find the F# installation, so exit.
+          echo Unable to find an installation of F# interactive at any known location.
+          echo Exiting...
+          pause
+          exit
+      )
+   )
 ) else (
-if exist %FSI_20% (
-    :: VS 2010 / F# 2.0
-    echo Using F# 2.0

-    :: Set the 'FSI' variable to the path for F# 2.0 Interactive.
-    set FSI= %FSI_20%
-
-
-    set FSI_VER_FLAG = "--define:FSI_VER_2"
-) else (
-    :: Unable to find the F# installation, so exit.
-    echo Unable to find an installation of F# interactive at any known location.
-    echo Exiting...
-    exit
-))
+:: Unable to find NHol.dll so exit.
+echo Unable to find NHol.dll at %NHOL_ABSOLUTE%.
+echo.
+echo Did you build NHol.dll by compiling the project?
+echo If not it is suggested to use Visual Studio to automatically download NuGet packages.
+echo Note: NHol works with Visual Studio Express which is free.
+echo.
+echo Exiting...
+echo.
+pause
+exit
+)

 :: Load the NHol environment into the detected version of F# Interactive.
 echo Loading NHol into F# Interactive.


added push script

added push script

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

--- Push.bat
+++ Push.bat
@@ -0,0 +1,3 @@
+git push origin
+git push github
+pause


Delete t.bat

Delete t.bat

--- t.bat
+++ t.bat
@@ -1,2 +0,0 @@
-python logo2grbl.py COM6 5 -3 1
-pause


commit on 08/12/2019 at 01:25:30

commit on 08/12/2019 at 01:25:30

--- windows-cmd/runMVDPipeLPCtotA20.cmd
+++ windows-cmd/runMVDPipeLPCtotA20.cmd
@@ -1 +1 @@
-cd C:/02*/01*/01*/thinPlyMechanics/windows-cmd && startRVESimPipeMVDLPC 1_144S10A10D10d100 && cd C:/02*/01*/01*/thinPlyMechanics/windows-cmd && startRVESimPipeMVDLPC 1_144S10A10D10d110 && cd C:/02*/01*/01*/thinPlyMechanics/windows-cmd && startRVESimPipeMVDLPC 1_144S10A10D10d120 && cd C:/02*/01*/01*/thinPlyMechanics/windows-cmd && startRVESimPipeMVDLPC 1_144S10A18D2d130 && cd C:/02*/01*/01*/thinPlyMechanics/windows-cmd && startRVESimPipeMVDLPC 1_144S10A18D2d140 && cd C:/02*/01*/01*/thinPlyMechanics/windows-cmd && startRVESimPipeMVDLPC 1_144S10A18D2d150 && cd C:/02*/01*/01*/thinPlyMechanics/windows-cmd && startRVESimPipeMVDLPC 1_144S10A15D5d130 && cd C:/02*/01*/01*/thinPlyMechanics/windows-cmd && startRVESimPipeMVDLPC 1_144S10A15D5d140 && cd C:/02*/01*/01*/thinPlyMechanics/windows-cmd && startRVESimPipeMVDLPC 1_144S10A15D5d150 && cd C:/02*/01*/01*/thinPlyMechanics/windows-cmd && startRVESimPipeMVDLPC 1_144S10A10D10d130 && cd C:/02*/01*/01*/thinPlyMechanics/windows-cmd && startRVESimPipeMVDLPC 1_144S10A10D10d140 && cd C:/02*/01*/01*/thinPlyMechanics/windows-cmd && startRVESimPipeMVDLPC 1_144S10A10D10d150 && cd C:/02*/01*/01*/thinPlyMechanics/windows-cmd && startRVESimPipeMVDLPC 1_144S10A15D5d120 && cd C:/02*/01*/01*/thinPlyMechanics/windows-cmd && startRVESimPipeMVDLPC 1_144S10A15D5d110 && cd C:/02*/01*/01*/thinPlyMechanics/windows-cmd && startRVESimPipeMVDLPC 1_144S10A10D10d90
+cd C:/02*/01*/01*/thinPlyMechanics/windows-cmd && startRVESimPipeMVDLPC 1_144S10A15D5d130 && cd C:/02*/01*/01*/thinPlyMechanics/windows-cmd && startRVESimPipeMVDLPC 1_144S10A15D5d140 && cd C:/02*/01*/01*/thinPlyMechanics/windows-cmd && startRVESimPipeMVDLPC 1_144S10A15D5d150 && cd C:/02*/01*/01*/thinPlyMechanics/windows-cmd && startRVESimPipeMVDLPC 1_144S10A10D10d130 && cd C:/02*/01*/01*/thinPlyMechanics/windows-cmd && startRVESimPipeMVDLPC 1_144S10A10D10d140 && cd C:/02*/01*/01*/thinPlyMechanics/windows-cmd && startRVESimPipeMVDLPC 1_144S10A10D10d150 && cd C:/02*/01*/01*/thinPlyMechanics/windows-cmd && startRVESimPipeMVDLPC 1_144S10A15D5d120 && cd C:/02*/01*/01*/thinPlyMechanics/windows-cmd && startRVESimPipeMVDLPC 1_144S10A15D5d110 && cd C:/02*/01*/01*/thinPlyMechanics/windows-cmd && startRVESimPipeMVDLPC 1_144S10A10D10d90


Allow additional build parameter.

Allow additional build parameter.

--- Build.bat
+++ Build.bat
@@ -1,4 +1,4 @@
 @rem ..\..\tools\nuget pack
-@nuget pack Unity.Wcf\Unity.Wcf.csproj -properties Configuration=Release -symbols -build -OutputDirectory bin
+@nuget pack Unity.Wcf\Unity.Wcf.csproj -properties Configuration=Release -symbols -build -OutputDirectory bin %*

 @rem pause


B-0 removed parameter from setup to make it simpler to run within Convey realm

--- build/setup.cmd
+++ build/setup.cmd
@@ -1,14 +1,14 @@
-robocopy %1\user\MongoDB\v3.1.2c ..\MongoDB mongod.exe /ZB /X /TEE
+robocopy \\conveydev.com\files\dev\sdlc-ci\development\user\MongoDB\v3.1.2c ..\MongoDB mongod.exe /ZB /X /TEE
 robocopy \\conveydev.com\files\repository\third-party-software-installers\Mongo\mongo-c-driver-ssl ..\__submodules\mongo-c-driver\tests /E /X /TEE

-robocopy %1\user\openssl\Win32\Debug\lib ..\bin\Win32\Debug /E /X /TEE
-robocopy %1\user\openssl\Win32\Release\lib ..\bin\Win32\Release /E /X /TEE
-robocopy %1\user\openssl\x64\Debug\lib ..\bin\x64\Debug /E /X /TEE
-robocopy %1\user\openssl\x64\Release\lib ..\bin\x64\Release /E /X /TEE
+robocopy \\conveydev.com\files\dev\sdlc-ci\development\user\openssl\Win32\Debug\lib ..\bin\Win32\Debug /E /X /TEE
+robocopy \\conveydev.com\files\dev\sdlc-ci\development\user\openssl\Win32\Release\lib ..\bin\Win32\Release /E /X /TEE
+robocopy \\conveydev.com\files\dev\sdlc-ci\development\user\openssl\x64\Debug\lib ..\bin\x64\Debug /E /X /TEE
+robocopy \\conveydev.com\files\dev\sdlc-ci\development\user\openssl\x64\Release\lib ..\bin\x64\Release /E /X /TEE

-robocopy %1\user\openssl\Win32\Debug\include ..\include\Win32\Debug /E /X /TEE
-robocopy %1\user\openssl\Win32\Release\include ..\include\Win32\Release /E /X /TEE
-robocopy %1\user\openssl\x64\Debug\include ..\include\x64\Debug /E /X /TEE
-robocopy %1\user\openssl\x64\Release\include ..\include\x64\Release /E /X /TEE
+robocopy \\conveydev.com\files\dev\sdlc-ci\development\user\openssl\Win32\Debug\include ..\include\Win32\Debug /E /X /TEE
+robocopy \\conveydev.com\files\dev\sdlc-ci\development\user\openssl\Win32\Release\include ..\include\Win32\Release /E /X /TEE
+robocopy \\conveydev.com\files\dev\sdlc-ci\development\user\openssl\x64\Debug\include ..\include\x64\Debug /E /X /TEE
+robocopy \\conveydev.com\files\dev\sdlc-ci\development\user\openssl\x64\Release\include ..\include\x64\Release /E /X /TEE

 EXIT /B 0


NuGet Pack the .csproj instead of the .nuspec

--- src/Build.cmd
+++ src/Build.cmd
@@ -29,6 +29,6 @@
 echo ===  NuGet Pack   ===
 echo =====================
 echo.
-NuGet pack app\SharpRaven\SharpRaven.nuspec -Properties ReleaseInfo='Test'
+NuGet pack app\SharpRaven\SharpRaven.csproj -Properties ReleaseInfo='Test'
 echo.
 ENDLOCAL


Improved build bat.

Improved build bat.

--- src/build.bat
+++ src/build.bat
@@ -1,19 +1,43 @@
 @ECHO OFF

-IF "%1"=="" (
+set buildNumber=0
+set copyrightYear=2018
+set version="%1"
+set prereleasePostfix=""
+
+IF "%2"=="1" (
+	set step="1"
+) ELSE IF "%2"=="2" (
+	set step="2"
+) ELSE IF "%2"=="3" (
+	set step="3"
+) ELSE IF "%2"=="4" (
+	set step="4"
+) ELSE IF "%2"=="5" (
+	set step="5"
+) ELSE (
+	set step="%3"
+	set prereleasePostfix="%2"
+)
+
+set inputOk="true"
+IF "%version%"=="" ( set inputOk="false" )
+ELSE IF "%step%"=="" ( set inputOk="false" )
+
+echo step: %step%
+echo version: %version%
+echo prereleasePostfix: %prereleasePostfix%
+
+IF "%inputOk%"=="false" (
 	rem I would have loved doing this all in one single step, but for some reason, I can't seem to build using MSBuild
 	rem while running from the command line using MSBuild 2017. See https://stackoverflow.com/questions/47002571/.
 	rem That's why this build file must be called multiple times.
-    echo Please provide a number of the build step. Starting with 1. Example: "%0 1
+    echo Please provide both the version number and the number of the of the build step. Starting with 1.
+	echo Usage: "%0 [version] {-[prerelease postfix]} [step]
+	echo Example1: "%0 4.0.0 -beta1 1
+	echo Example2: "%0 4.0.0 1
     goto :EOF
 )
-
-set step="%1"
-
-set version=4.0.0
-set prereleasePostfix=
-set buildNumber=0
-set copyrightYear=2018

 set version_Core=%version%
 set version_Packaging=%version_Core%
@@ -303,11 +327,11 @@
 	GOTO :EOF
 )

-echo Unknown step number.
+echo Unknown step number %step%.
 GOTO :EOF

 :release_directory_already_exists
-echo The release directory already exists.
+echo The release directory v%named_version% already exists.
 GOTO :EOF

 :strong_name_key_missing


Update CleanSystem.bat

Update CleanSystem.bat

--- Windows/CleanSystem.bat
+++ Windows/CleanSystem.bat
@@ -2,9 +2,9 @@
 echo Check for Admn
 net sessions
 if %errorlevel%==0 (
-echo Success
+echo Success, Obtained Admin Rights
 ) else (
-echo No admin
+echo Failure, No Admin Rights
 pause
 exit
 )


install.bat: always set SYSCONFDIR

install.bat: always set SYSCONFDIR

Fixes #903.

--- install.bat
+++ install.bat
@@ -8,7 +8,6 @@
 vars.PREFIX = nil
 vars.VERSION = "3.0"
 vars.SYSCONFDIR = nil
-vars.SYSCONFFORCE = nil
 vars.CONFBACKUPDIR = nil
 vars.SYSCONFFILENAME = nil
 vars.CONFIG_FILE = nil
@@ -197,7 +196,6 @@
 			vars.PREFIX = option.value
 		elseif name == "/CONFIG" then
 			vars.SYSCONFDIR = option.value
-			vars.SYSCONFFORCE = true
 		elseif name == "/TREE" then
 			vars.TREE_ROOT = option.value
 		elseif name == "/SCRIPTS" then
@@ -835,7 +833,6 @@
 vars.CONFIG_FILE = vars.SYSCONFDIR.."\\"..vars.SYSCONFFILENAME
 if SELFCONTAINED then
 	vars.SYSCONFDIR = vars.PREFIX
-	vars.SYSCONFFORCE = true
 	vars.TREE_ROOT = vars.PREFIX..[[\systree]]
 	REGISTRY = false
 end
@@ -1036,13 +1033,11 @@
    SYSTEM = [[$SYSTEM]],
    PROCESSOR = [[$UNAME_M]],
    PREFIX = [[$PREFIX]],
+   SYSCONFDIR = [[$SYSCONFDIR]],
    WIN_TOOLS = [[$PREFIX/tools]],
 ]=])
 if FORCE_CONFIG then
 	f:write("   FORCE_CONFIG = true,\n")
-end
-if vars.SYSCONFFORCE then  -- only write this value when explcitly given, otherwise rely on defaults
-	f:write(S("   SYSCONFDIR = [[$SYSCONFDIR]],\n"))
 end
 f:write("}\n")
 f:close()


install to a different location

install to a different location

change install.bat to allow to install to a different folder path using a parameter and store that value into a permanent environmental variable

--- install.bat
+++ install.bat
@@ -1,6 +1,14 @@
 @echo off

-set APP_DIR_PATH=%userprofile%\.smockin
+IF DEFINED %1 (
+    set APP_DIR_PATH=%1\.smockin
+
+) ELSE (
+    set APP_DIR_PATH=%userprofile%\.smockin
+)
+
+setx SMOCKIN_DIR_PATH = %APP_DIR_PATH%
+
 set DB_DIR_PATH=%APP_DIR_PATH%\db
 set DB_DRIVER_DIR_PATH=%DB_DIR_PATH%\driver
 set DB_DATA_DIR_PATH=%DB_DIR_PATH%\data


fixed schedule task

fixed schedule task

--- install.bat
+++ install.bat
@@ -181,6 +181,5 @@
 net localgroup Administrators swarmclient /add
 rem Due to problems with UDP broadcast, use the -master switch at the moment
 rem Schedule start of swarm client at start of the machine (after next reboot)
-schtasks /CREATE /SC ONSTART /RU swarmclient /RP K8934jASD,x9 /TN JenkinsSwarmClient /TR "
-java.exe -jar %WORKDRIVE%\swarmclient\swarm-client.jar -master http://%jenkinshost% -labels packer -fsroot %WORKDRIVE%\jenkins"
+schtasks /CREATE /SC ONSTART /RU swarmclient /RP K8934jASD,x9 /TN JenkinsSwarmClient /TR "java.exe -jar %WORKDRIVE%\swarmclient\swarm-client.jar -master http://%jenkinshost% -labels packer -fsroot %WORKDRIVE%\jenkins"


minor text update

minor text update

--- install.bat
+++ install.bat
@@ -65,9 +65,10 @@
 	print(S[[
 Installs LuaRocks.

-/P [dir]       (REQUIRED) Where to install.
-               Note that version; $VERSION, will be
-               appended to this path.
+/P [dir]       (REQUIRED) Where to install LuaRocks.
+               Note that version; $VERSION, will be appended to this
+               path, so "/P c:\luarocks\" will install in
+               "c:\luarocks\$VERSION\"

 Configuring the destinations:
 /TREE [dir]    Root of the local tree of installed rocks.


[win][build][batch] fix path variable calculation

--- cmd/run_konan.bat
+++ cmd/run_konan.bat
@@ -93,7 +93,7 @@
 :set_path
   rem libclang.dll is dynamically linked and thus requires correct PATH to be loaded.
   rem TODO: remove this hack.
-  set "PATH=%HOME%\.konan\dependencies\msys2-mingw-w64-x86_64-gcc-7.2.0-clang-llvm-5.0.0-windows-x86-64\bin;%PATH%"
+  set "PATH=%USERPROFILE%\.konan\dependencies\msys2-mingw-w64-x86_64-gcc-7.2.0-clang-llvm-5.0.0-windows-x86-64\bin;%PATH%"
 goto :eof

 :end


Try to add nuget restore

Try to add nuget restore

--- MyGet.bat
+++ MyGet.bat
@@ -1,3 +1,4 @@
 msbuild /t:restore SceneJect.sln
+%NUGET% restore SceneJect.sln -NoCache -NonInteractive
 dotnet restore SceneJect.sln
 msbuild SceneJect.sln /p:Configuration=Release


Windows testing

Windows testing


fix nuget package missing file

fix nuget package missing file

--- c/build_all/windows/build_proton.cmd
+++ c/build_all/windows/build_proton.cmd
@@ -88,7 +88,7 @@
 rem -- Create the nuget package
 rem -----------------------------------------------------------------------------

-copy %package-root%\%package-id%.* %proton-root%
+copy %package-root%\%package-id%* %proton-root%
 if not %errorlevel%==0 exit /b %errorlevel%

 pushd %proton-root%


run.bat was modified (32/64-bit definition code was added)

--- NLBB/script/run.bat
+++ NLBB/script/run.bat
@@ -1,6 +1,18 @@
-@ECHO OFF
-
-SET JAVA_HOME=C:\Java\jdk1.7.0_51
+@echo off
+
+Set RegQry=HKLM\Hardware\Description\System\CentralProcessor\0
+
+REG.exe Query %RegQry% > checkOS.txt
+
+Find /i "x86" < CheckOS.txt > StringCheck.txt
+
+If %ERRORLEVEL% == 0 (
+    Echo "This is 32 Bit Operating system"
+    SET JAVA_HOME=jre-7u51-windows-i586
+) ELSE (
+    Echo "This is 64 Bit Operating System"
+    SET JAVA_HOME=jre-7u51-windows-x64
+)

 :: Set application lib directory
 SET COMMON_LIB=lib\


Add set to fix error

Add set to fix error

--- vendor/lib/lib_base.cmd
+++ vendor/lib/lib_base.cmd
@@ -65,7 +65,7 @@
     exit /b

 :detect_comspec
-    CMDER_SHELL=%~n1
+    set CMDER_SHELL=%~n1
     if not defined CMDER_CLINK (
         set CMDER_CLINK=1
         if "%CMDER_SHELL%" equ "tcc" set CMDER_CLINK=0


Feature Development: Added StatHistorianReportGenerator.exe to the rolldown script.

git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/siegate/Feature Development;C89785

--- Build/Scripts/UpdateDependencies.bat
+++ Build/Scripts/UpdateDependencies.bat
@@ -45,6 +45,7 @@
 %tfs% get "%sourcetools%DataMigrationUtility.exe" /version:T /force /recursive /noprompt
 %tfs% get "%sourcetools%HistorianPlaybackUtility.exe" /version:T /force /recursive /noprompt
 %tfs% get "%sourcetools%HistorianView.exe" /version:T /force /recursive /noprompt
+%tfs% get "%sourcetools%StatHistorianReportGenerator.exe" /version:T /force /recursive /noprompt
 %tfs% get "%sourcetools%NoInetFixUtil.exe" /version:T /force /recursive /noprompt
 %tfs% get "%sourcetools%DNP3ConfigGenerator.exe" /version:T /force /recursive /noprompt

@@ -56,6 +57,7 @@
 %tfs% checkout "%sourcetools%DataMigrationUtility.exe" /noprompt
 %tfs% checkout "%sourcetools%HistorianPlaybackUtility.exe" /noprompt
 %tfs% checkout "%sourcetools%HistorianView.exe" /noprompt
+%tfs% checkout "%sourcetools%StatHistorianReportGenerator.exe" /noprompt
 %tfs% checkout "%sourcetools%NoInetFixUtil.exe" /noprompt
 %tfs% checkout "%sourcetools%DNP3ConfigGenerator.exe" /noprompt
 %tfs% checkout "%targetschema%" /recursive /noprompt
@@ -68,6 +70,7 @@
 XCOPY "%frameworktools%DataMigrationUtility\DataMigrationUtility.exe" "%sourcetools%DataMigrationUtility.exe" /Y
 XCOPY "%frameworktools%HistorianPlaybackUtility\HistorianPlaybackUtility.exe" "%sourcetools%HistorianPlaybackUtility.exe" /Y
 XCOPY "%frameworktools%HistorianView\HistorianView.exe" "%sourcetools%HistorianView.exe" /Y
+XCOPY "%frameworktools%StatHistorianReportGenerator\StatHistorianReportGenerator.exe" "%sourcetools%StatHistorianReportGenerator.exe" /Y
 XCOPY "%frameworktools%NoInetFixUtil\NoInetFixUtil.exe" "%sourcetools%NoInetFixUtil.exe" /Y
 XCOPY "%frameworktools%DNP3ConfigGenerator\DNP3ConfigGenerator.exe" "%sourcetools%DNP3ConfigGenerator.exe" /Y

@@ -108,6 +111,7 @@
 %tfs% checkin "%sourcetools%DataMigrationUtility.exe" /noprompt /comment:"Feature Development: Updated grid solutions framework tool: DataMigrationUtility."
 %tfs% checkin "%sourcetools%HistorianPlaybackUtility.exe" /noprompt /comment:"Feature Development: Updated openHistorian tool: HistorianPlaybackUtility."
 %tfs% checkin "%sourcetools%HistorianView.exe" /noprompt /comment:"Feature Development: Updated openHistorian tool: HistorianView."
+%tfs% checkin "%sourcetools%StatHistorianReportGenerator.exe" /noprompt /comment:"Feature Development: Updated openHistorian tool: StatHistorianReportGenerator."
 %tfs% checkin "%sourcetools%NoInetFixUtil.exe" /noprompt /comment:"Feature Development: Updated grid solutions framework tool: NoInetFixUtil."
 %tfs% checkin "%sourcetools%DNP3ConfigGenerator.exe" /noprompt /comment:"Feature Development: Updated grid solutions framework tool: DNP3ConfigGenerator."
 %tfs% checkin "%targetschema%" /noprompt /recursive /comment:"Feature Development: Updated database schema definitions from GSF source."


Modified UpdateDependencies.bat script to be more adaptable to different environments.

--- Build/Scripts/UpdateDependencies.bat
+++ Build/Scripts/UpdateDependencies.bat
@@ -27,54 +27,65 @@

 SETLOCAL

-SET pwd="%CD%"
-SET gwd="%LOCALAPPDATA%\Temp\openECA"
-SET git="%PROGRAMFILES(X86)%\Git\cmd\git.exe"
-SET replace="\\GPAWEB\NightlyBuilds\Tools\ReplaceInFiles\ReplaceInFiles.exe"
+SET pwd=%CD%
+IF "%git%" == "" SET git=%PROGRAMFILES(X86)%\Git\cmd\git.exe
+IF "%replace%" == "" SET replace=\\GPAWEB\NightlyBuilds\Tools\ReplaceInFiles\ReplaceInFiles.exe

-SET remote="git@github.com:GridProtectionAlliance/openECA.git"
-SET source="\\GPAWEB\NightlyBuilds\GridSolutionsFramework\Beta\Libraries\*.*"
-SET target="Source\Dependencies\GSF"
-SET sourcemasterbuild="\\GPAWEB\NightlyBuilds\GridSolutionsFramework\Beta\Build Scripts\MasterBuild.buildproj"
-SET targetmasterbuild="Build\Scripts"
-SET sourceschema=Source\Dependencies\GSF\Data
-SET targetschema=Source\Data
-SET sourcetools=\\GPAWEB\NightlyBuilds\GridSolutionsFramework\Beta\Tools\
-SET targettools=Source\Applications\openECA\openECASetup\
+SET defaulttarget=%LOCALAPPDATA%\Temp\openECA
+IF "%remote%" == "" SET remote=git@github.com:GridProtectionAlliance/openECA.git
+IF "%source%" == "" SET source=\\GPAWEB\NightlyBuilds\GridSolutionsFramework\Beta
+IF "%target%" == "" SET target=%defaulttarget%
+
+SET libraries=%source%\Libraries\*.*
+SET dependencies=%target%\Source\Dependencies\GSF
+SET sourcemasterbuild=%source%\Build Scripts\MasterBuild.buildproj
+SET targetmasterbuild=%target%\Build\Scripts
+SET sourceschema=%target%\Source\Dependencies\GSF\Data
+SET targetschema=%target%\Source\Data
+SET sourcetools=%source%\Tools
+SET targettools=%target%\Source\Applications\openECA\openECASetup

 ECHO.
 ECHO Entering working directory...
-IF EXIST %gwd% IF NOT EXIST %gwd%\.git RMDIR /S /Q %gwd%
-IF NOT EXIST %gwd% MKDIR %gwd%
-CD /D %gwd%
+IF EXIST "%target%" IF NOT EXIST "%target%"\.git RMDIR /S /Q "%target%"
+IF NOT EXIST "%target%" MKDIR "%target%"
+CD /D %target%

-IF EXIST .git GOTO UpdateRepository
+IF NOT EXIST .git GOTO CloneRepository
+IF NOT "%target%" == "%defaulttarget%" GOTO UpdateDependencies
+GOTO UpdateRepository

+:CloneRepository
 ECHO.
 ECHO Cloning remote repository...
-%git% clone %remote% .
+"%git%" clone "%remote%" .
+GOTO UpdateDependencies

 :UpdateRepository
 ECHO.
 ECHO Updating to latest version...
-%git% fetch
-%git% reset --hard origin/master
-%git% clean -f -d -x
+"%git%" gc
+"%git%" fetch
+"%git%" reset --hard origin/master
+"%git%" clean -f -d -x
+GOTO UpdateDependencies

+:UpdateDependencies
 ECHO.
 ECHO Updating dependencies...
-XCOPY %source% %target% /Y /E
-XCOPY %sourcemasterbuild% %targetmasterbuild% /Y
-XCOPY "%sourcetools%ConfigCrypter\ConfigCrypter.exe" "%targettools%ConfigCrypter.exe" /Y
-XCOPY "%sourcetools%ConfigEditor\ConfigEditor.exe" "%targettools%ConfigurationEditor.exe" /Y
-XCOPY "%sourcetools%DataMigrationUtility\DataMigrationUtility.exe" "%targettools%DataMigrationUtility.exe" /Y
-XCOPY "%sourcetools%HistorianPlaybackUtility\HistorianPlaybackUtility.exe" "%targettools%HistorianPlaybackUtility.exe" /Y
-XCOPY "%sourcetools%HistorianView\HistorianView.exe" "%targettools%HistorianView.exe" /Y
-XCOPY "%sourcetools%StatHistorianReportGenerator\StatHistorianReportGenerator.exe" "%targettools%StatHistorianReportGenerator.exe" /Y
-XCOPY "%sourcetools%NoInetFixUtil\NoInetFixUtil.exe" "%targettools%NoInetFixUtil.exe" /Y
-XCOPY "%sourcetools%DNP3ConfigGenerator\DNP3ConfigGenerator.exe" "%targettools%DNP3ConfigGenerator.exe" /Y
-XCOPY "%sourcetools%LogFileViewer\LogFileViewer.exe" "%targettools%LogFileViewer.exe" /Y
+XCOPY "%libraries%" "%dependencies%\" /Y /E
+XCOPY "%sourcemasterbuild%" "%targetmasterbuild%\" /Y
+COPY /Y "%sourcetools%\ConfigCrypter\ConfigCrypter.exe" "%targettools%\ConfigCrypter.exe"
+COPY /Y "%sourcetools%\ConfigEditor\ConfigEditor.exe" "%targettools%\ConfigurationEditor.exe"
+COPY /Y "%sourcetools%\DataMigrationUtility\DataMigrationUtility.exe" "%targettools%\DataMigrationUtility.exe"
+COPY /Y "%sourcetools%\HistorianPlaybackUtility\HistorianPlaybackUtility.exe" "%targettools%\HistorianPlaybackUtility.exe"
+COPY /Y "%sourcetools%\HistorianView\HistorianView.exe" "%targettools%\HistorianView.exe"
+COPY /Y "%sourcetools%\StatHistorianReportGenerator\StatHistorianReportGenerator.exe" "%targettools%\StatHistorianReportGenerator.exe"
+COPY /Y "%sourcetools%\NoInetFixUtil\NoInetFixUtil.exe" "%targettools%\NoInetFixUtil.exe"
+COPY /Y "%sourcetools%\DNP3ConfigGenerator\DNP3ConfigGenerator.exe" "%targettools%\DNP3ConfigGenerator.exe"
+COPY /Y "%sourcetools%\LogFileViewer\LogFileViewer.exe" "%targettools%\LogFileViewer.exe"

+:UpdateDbScripts
 ECHO.
 ECHO Updating database schema defintions...
 FOR /R "%sourceschema%" %%x IN (*.db) DO DEL "%%x"
@@ -97,25 +108,29 @@
 TYPE "%targetschema%\PostgreSQL\_InitialDataSet.sql" >> "%targetschema%\PostgreSQL\InitialDataSet.sql"
 TYPE "%targetschema%\SQL Server\_InitialDataSet.sql" >> "%targetschema%\SQL Server\InitialDataSet.sql"
 TYPE "%targetschema%\SQLite\_InitialDataSet.sql" >> "%targetschema%\SQLite\InitialDataSet.sql"
-%replace% /r /v "%targetschema%\*.sql" GSFSchema openECA
-%replace% /r /v "%targetschema%\*.sql" "--*" "-- "
-%replace% /r /v "%targetschema%\*SampleDataSet.sql" 8500 8525
-%replace% /r /v "%targetschema%\*SampleDataSet.sql" 6165 6190
-%replace% /r /v "%targetschema%\*SampleDataSet.sql" "e7a5235d-cb6f-4864-a96e-a8686f36e599" "e57b4a6d-ca9e-403c-ad2e-9a1db9a8a707"
-%replace% /r /v "%targetschema%\*db-update.bat" GSFSchema openECA
+"%replace%" /r /v "%targetschema%\*.sql" GSFSchema openECA
+"%replace%" /r /v "%targetschema%\*.sql" "--*" "-- "
+"%replace%" /r /v "%targetschema%\*SampleDataSet.sql" 8500 8525
+"%replace%" /r /v "%targetschema%\*SampleDataSet.sql" 6165 6190
+"%replace%" /r /v "%targetschema%\*SampleDataSet.sql" "e7a5235d-cb6f-4864-a96e-a8686f36e599" "e57b4a6d-ca9e-403c-ad2e-9a1db9a8a707"
+"%replace%" /r /v "%targetschema%\*db-update.bat" GSFSchema openECA
 CD %targetschema%\SQLite
 CALL db-update.bat
-CD %gwd%
+CD %target%

+:CommitChanges
 ECHO.
 ECHO Committing updates to local repository...
-%git% add .
-%git% commit -m "Updated GSF dependencies."
+"%git%" add .
+"%git%" commit -m "Updated GSF dependencies."
+IF NOT "%donotpush%" == "" GOTO Finish

+:PushChanges
 ECHO.
 ECHO Pushing changes to remote repository...
-%git% push
+"%git%" push
 CD /D %pwd%

+:Finish
 ECHO.
 ECHO Update complete


Fixing the runtests.cmd to run all tests.

--- test/runtests.cmd
+++ test/runtests.cmd
@@ -2,6 +2,7 @@
     Microsoft.Framework.CodeGeneration.Core.FunctionalTest
     Microsoft.Framework.CodeGeneration.Core.Test
     Microsoft.Framework.CodeGeneration.Templating.Test
+    Microsoft.Framework.CodeGeneration.EntityFramework.Test
     ) do (
         cd %%1
         k test


directory adjusts

directory adjusts

--- start_dev.bat
+++ start_dev.bat
@@ -5,7 +5,7 @@
 start /MIN /D "c:\Program Files\nodejs" cmd /k node-red -v

 REM REACT-CREAT-APP
-start /D "c:\Desenvolvimento\git\React\react-bootstrap-exemplo" cmd /k npm start
+start /D "c:\Desenvolvimento\git\React\react-node-red" cmd /k npm start

 REM FireFox i
 start /MIN /D "c:\Program Files (x86)\Mozilla Firefox\" cmd /k firefox.exe


try erroring out properly

try erroring out properly

git-svn-id: ee144a4ada4e65570a65b3ba2a4ac9d4eedc8fa4@994138 13f79535-47bb-0310-9956-ffa450edef68

--- bootstrap-build.bat
+++ bootstrap-build.bat
@@ -3,44 +3,55 @@
 ECHO Executing Phase: %phase%

 cmd /C mvn.bat install:install-file -Dfile=./thirdparty/org.apache.ws/XmlSchema-1.1.jar -DpomFile=./thirdparty/org.apache.ws/XmlSchema-1.1.pom -DgroupId=org.apache.ws.commons -DartifactId=XmlSchema -Dversion=1.1 -Dpackaging=jar
+IF errorlevel 1 GOTO ERROR
 if "%1"=="-DrdfProfile.none" (
     ECHO Building Without RDF Profile
     cmd /C mvn.bat %phase% %*
+    IF errorlevel 1 GOTO ERROR

  ) else (
     ECHO Building With RDF Profile
     cmd /C mvn.bat %phase% -DRdf %*
+    IF errorlevel 1 GOTO ERROR
  )
-
-:END
-
-IF errorlevel 1 GOTO END

 ECHO Installing 3rd Party Assemblies in the Local Repo
 rem call mvn install:install-file -Dfile=./thirdparty/org.apache.ws/XmlSchema-1.1.jar -DpomFile=./thirdparty/org.apache.ws/XmlSchema-1.1.pom -DgroupId=org.apache.ws.commons -DartifactId=XmlSchema -Dversion=1.1
 cmd /C mvn.bat npanday.plugin:maven-install-plugin:install-file -Dfile=./thirdparty/NUnit/NUnit.Framework.dll -DgroupId=NUnit -DartifactId=NUnit.Framework -Dpackaging=library -DartifactVersion=2.2.8.0
+IF errorlevel 1 GOTO ERROR
 cmd /C mvn.bat npanday.plugin:maven-install-plugin:install-file -Dfile=./thirdparty/Castle/Castle.Core.dll -DpomFile=./thirdparty/Castle/Castle.Core-2.0-rc2.pom -DgroupId=Castle -DartifactId=Castle.Core -Dpackaging=library -DartifactVersion=2.0-rc2
+IF errorlevel 1 GOTO ERROR
 cmd /C mvn.bat npanday.plugin:maven-install-plugin:install-file -Dfile=./thirdparty/Castle/Castle.DynamicProxy.dll -DpomFile=./thirdparty/Castle/Castle.DynamicProxy-2.0-rc2.pom -DgroupId=Castle -DartifactId=Castle.DynamicProxy -Dpackaging=library -DartifactVersion=2.0-rc2
+IF errorlevel 1 GOTO ERROR
 cmd /C mvn.bat npanday.plugin:maven-install-plugin:install-file -Dfile=./thirdparty/Castle/Castle.MicroKernel.dll -DpomFile=./thirdparty/Castle/Castle.MicroKernel-2.0-rc2.pom -DgroupId=Castle -DartifactId=Castle.MicroKernel -Dpackaging=library -DartifactVersion=2.0-rc2
+IF errorlevel 1 GOTO ERROR
 cmd /C mvn.bat npanday.plugin:maven-install-plugin:install-file -Dfile=./thirdparty/Castle/Castle.Windsor.dll -DpomFile=./thirdparty/Castle/Castle.Windsor-2.0-rc2.pom -DgroupId=Castle -DartifactId=Castle.Windsor -Dpackaging=library -DartifactVersion=2.0-rc2
-IF errorlevel 1 GOTO END
+IF errorlevel 1 GOTO ERROR

 if "%1" == "-DMicrosoft" (
     ECHO Compiling Assemblies with Microsoft
     cmd /C mvn.bat -f pom-dotnet.xml -Dmaven.test.skip=true -Dbootstrap -Dvendor=MICROSOFT %phase% %*
-    IF errorlevel 1 GOTO END
+    IF errorlevel 1 GOTO ERROR
  ) else  if "%1" == "-DMono" (
     ECHO Compiling Assemblies with Mono
     cmd /C mvn.bat -f pom-dotnet.xml -Dmaven.test.skip=true -Dbootstrap -Dvendor=MONO %phase% %*
-    IF errorlevel 1 GOTO END
+    IF errorlevel 1 GOTO ERROR
  ) else (
     ECHO Compiling Assemblies with Unknown Vendor
     cmd /C mvn.bat -f pom-dotnet.xml -Dmaven.test.skip=true -Dbootstrap %phase% %*
-    IF errorlevel 1 GOTO END
+    IF errorlevel 1 GOTO ERROR
  )

 cmd /C mvn.bat -f misc/dotnet-repository-builder/pom.xml %phase% %*
+IF errorlevel 1 GOTO ERROR

 cmd /C mvn.bat -f misc/npanday-repository-builder/pom.xml %phase% %*
+IF errorlevel 1 GOTO ERROR
+
+goto END
+
+:ERROR
+
+cmd /C exit /B 1

 :END


added update release notes script

added update release notes script

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

--- updateReleaseNotes.cmd
+++ updateReleaseNotes.cmd
@@ -0,0 +1 @@
+GitReleaseNotes.exe /outputFile RELEASES.md /token %1


Fix

Fix

git-svn-id: 5273550914f0087548030fb29e37461be35c08da@7923 aaf88347-d911-0410-b711-e54d386773bb

--- bin/AddToClassPath.bat
+++ bin/AddToClassPath.bat
@@ -4,7 +4,7 @@
 :argCheck
 IF %2a==a goto gotAllArgs
 SHIFT
-SET _CLASSPATHCOMPONENT=%_CLASSPATHCOMPONENT%;%1
+SET _CLASSPATHCOMPONENT=%_CLASSPATHCOMPONENT% %1
 GOTO argCheck
 :gotAllArgs
 SET JAVACLASSPATH=%JAVACLASSPATH%%_CLASSPATHCOMPONENT%;


BuildReleaseApk

BuildReleaseApk

--- BuildReleaseApk.bat
+++ BuildReleaseApk.bat
@@ -1,3 +1,4 @@
+"C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\MSBuild\15.0\Bin\amd64\MSBuild.exe" /p:Configuration=Release "C:\git\aikido-forchheim\membermanagement\AVF.Android.sln"
 "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\MSBuild\15.0\Bin\amd64\MSBuild.exe" /p:Configuration=Release /t:SignAndroidPackage "C:\git\aikido-forchheim\membermanagement\AVF.MemberManagement\AVF.MemberManagement.Droid\AVF.MemberManagement.Droid.csproj"
-explorer "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\MSBuild\15.0\Bin\amd64\MSBuild.exe"
-explorer C:\Dropbox\Aikido\App+copy /y "C:\git\aikido-forchheim\membermanagement\AVF.MemberManagement\AVF.MemberManagement.Droid\bin\Release\*signed*.apk" C:\Dropbox\Aikido\App
+pause


OpenCL_ICD added to getstuff.bat

OpenCL_ICD added to getstuff.bat

--- extdep/getstuff.bat
+++ extdep/getstuff.bat
@@ -13,6 +13,7 @@
 call :download leveldb 1.2
 call :download llvm 3.7svn
 call :download microhttpd 0.9.2
+call :download OpenCL_ICD 1
 call :download qt 5.4.1
 call :download miniupnpc 1.9
 call :download v8 3.15.9


Add note about the WiX toolset

Add note about the WiX toolset

--- Installer/BuildInstaller.bat
+++ Installer/BuildInstaller.bat
@@ -1,3 +1,8 @@
+@REM
+@REM To build the installer, you will need to the WiX Toolset, available at
+@REM http://wixtoolset.org/
+@REM
+
 @ECHO OFF
 TITLE 3RVX Installer Builder
 ECHO "   _____ ______     ____  _______   "


git version script

git version script

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

--- bin/phpsdk_version.bat
+++ bin/phpsdk_version.bat
@@ -0,0 +1,6 @@
+@echo off
+
+%PHP_SDK_PHP_CMD% -r "echo 'PHP SDK ' . file_get_contents(getenv('PHP_SDK_PATH') . '\\VERSION');"
+
+exit /b
+


cleanup

cleanup

--- vendor/lib/lib_git.cmd
+++ vendor/lib/lib_git.cmd
@@ -33,8 +33,6 @@
 :::.
 :::  GIT_VERSION_[GIT SCOPE] <out> Env variable containing Git semantic version string
 :::-------------------------------------------------------------------------------
-
-echo CMDER_HERE1.2

     setlocal enabledelayedexpansion
     :: clear the variables


autobuild tools for windows

autobuild tools for windows

--- src/EventStore/Scripts/windows/get-dev-on-win64.cmd
+++ src/EventStore/Scripts/windows/get-dev-on-win64.cmd
@@ -4,9 +4,9 @@

 @powershell -NoProfile -ExecutionPolicy unrestricted -Command "iex ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1'))"  || goto :Error
 path %PATH%;%systemdrive%\chocolatey\bin || goto :Error
-call cinst git || goto :Error
-call cinst svn || goto :Error
-call cinst VisualStudio2012WDX || goto :Error
+call cinst.bat git || goto :Error
+call cinst.bat svn || goto :Error
+call cinst.bat VisualStudio2012WDX || goto :Error

 path %SystemRoot%\Microsoft.NET\Framework\v4.0.30319\;%PATH%;%ProgramFiles(x86)%\Git\cmd;%ProgramFiles(x86)%\Subversion\bin; || goto :error


Add also %ROOTSYS%\bin to PYTHONPATH if not already set

--- config/thisroot.bat
+++ config/thisroot.bat
@@ -10,5 +10,6 @@
 set ROOTSYS=%CD%
 cd /D %OLDPATH%
 set PATH=%ROOTSYS%\bin;%PATH%
+echo %PYTHONPATH%|find /i "%ROOTSYS%\bin">nul || set PYTHONPATH=%ROOTSYS%\bin;%PYTHONPATH%
 set OLDPATH=
 set THIS=


Add @REM for windows BAT file comment

Add @REM for windows BAT file comment

git-svn-id: f3880c1fc5096ce2109c8aec392d8e07f619f417@1872 c2973edb-eda0-4c78-bc6a-9341b269661f

--- Source/C/Makefiles/NmakeSubdirs.bat
+++ Source/C/Makefiles/NmakeSubdirs.bat
@@ -1,13 +1,14 @@
-## @file
-#
-# Copyright (c) 2007 - 2010, Intel Corporation
-# All rights reserved. This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution.    The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+@REM ## @file
+@REM #
+@REM # Copyright (c) 2007 - 2010, Intel Corporation
+@REM # All rights reserved. This program and the accompanying materials
+@REM # are licensed and made available under the terms and conditions of the BSD License
+@REM # which accompanies this distribution.    The full text of the license may be found at
+@REM # http://opensource.org/licenses/bsd-license.php
+@REM #
+@REM # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+@REM # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+

 @echo off
 setlocal


Add game runner script for Windows to C++ bot

error: pathspec 'airesources/C++/run_game.bat' did not match any file(s) known to git

--- airesources/C++/run_game.bat
+++ airesources/C++/run_game.bat
@@ -0,0 +1,5 @@
+SET PATH=C:\Program Files (x86)\MSBuild\14.0\Bin;%PATH%
+CALL "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
+cl.exe /std:c++14 /O2 /MT /EHsc .\MyBot.cpp /link /out:MyBot.exe
+
+..\..\environment\halite.exe -d "96 96" ".\MyBot.exe" ".\MyBot.exe"


Fixed appveyor

Fixed appveyor

--- ci/appveyor/deploy.cmd
+++ ci/appveyor/deploy.cmd
@@ -2,7 +2,7 @@
 IF "%APPVEYOR_REPO_TAG%" == "true" (

 :: Create shared library archive for Bintray only ig Python 3.6
-if "%PYTHON_VERSION% == "3.6" (
+if "%PYTHON_VERSION%" == "3.6" (
     cd %APPVEYOR_BUILD_FOLDER%\build\out

     if "%PLATFORM%" == "x86" (


pretty up log message

pretty up log message

--- resources/stage_4_repair/disable_windows_telemetry/purge_windows_10_telemetry.bat
+++ resources/stage_4_repair/disable_windows_telemetry/purge_windows_10_telemetry.bat
@@ -188,6 +188,7 @@
 ::::::::::::::::::::::::::::::::::::::::::::::::::
 :: BLOCK BAD UPDATES
 call functions\log.bat "%CUR_DATE% %TIME%    Blocking bad updates, please wait..."
+echo.

 :: This line needed if we're being called from Tron. In standalone mode we'll already be in the appropriate directory
 pushd stage_4_repair\disable_windows_telemetry


Add parameter -N (Do not recurse into sub-projects) to skeleton
generation script for Windows.

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

--- binding/create_binding_skeleton.cmd
+++ binding/create_binding_skeleton.cmd
@@ -11,7 +11,6 @@
 	exit /B 1
 )

-mvn archetype:generate -DarchetypeGroupId=org.eclipse.smarthome.archetype -DarchetypeArtifactId=org.eclipse.smarthome.archetype.binding -DarchetypeVersion=0.8.0-SNAPSHOT -DgroupId=org.eclipse.smarthome.binding -DartifactId=org.eclipse.smarthome.binding.%2 -Dpackage=org.eclipse.smarthome.binding.%2 -DarchetypeCatalog='file://../archetype-catalog.xml' -Dversion=0.8.0-SNAPSHOT -DbindingId=%2 -DbindingIdCamelCase=%1
+mvn archetype:generate -N -DarchetypeGroupId=org.eclipse.smarthome.archetype -DarchetypeArtifactId=org.eclipse.smarthome.archetype.binding -DarchetypeVersion=0.8.0-SNAPSHOT -DgroupId=org.eclipse.smarthome.binding -DartifactId=org.eclipse.smarthome.binding.%2 -Dpackage=org.eclipse.smarthome.binding.%2 -DarchetypeCatalog='file://../archetype-catalog.xml' -Dversion=0.8.0-SNAPSHOT -DbindingId=%2 -DbindingIdCamelCase=%1

-
-ENDLOCAL+ENDLOCAL


update build.cmd

update build.cmd

git-svn-id: 756506b3b0ea8c31733a8f0a5bb416c7e269da3d@330 28bd50df-7adb-d945-0439-6e466c6a13cc

--- wdkbuild/build.cmd
+++ wdkbuild/build.cmd
@@ -30,7 +30,7 @@
 IF /I "%1"=="-help" GOTO :SHOWHELP
 IF /I "%1"=="--help" GOTO :SHOWHELP
 IF /I "%1"=="/?" GOTO :SHOWHELP
-GOTO :CHECK
+GOTO :CHECKFIRSTARG

 :SHOWHELP
 TITLE "build.cmd %1"
@@ -52,37 +52,51 @@
 ENDLOCAL
 EXIT /B

-:CHECK
-REM Check for the switches
+:CHECKFIRSTARG
+REM Check for the first switch
 IF "%1" == "" (
 SET BUILDTYPE=Build
+) ELSE (
+IF /I "%1" == "Build" SET BUILDTYPE=Build&&GOTO :CHECKSECONDARG
+IF /I "%1" == "/Build" SET BUILDTYPE=Build&&GOTO :CHECKSECONDARG
+IF /I "%1" == "-Build" SET BUILDTYPE=Build&&GOTO :CHECKSECONDARG
+IF /I "%1" == "--Build" SET BUILDTYPE=Build&&GOTO :CHECKSECONDARG
+IF /I "%1" == "Clean" SET BUILDTYPE=Clean&&GOTO :CHECKSECONDARG
+IF /I "%1" == "/Clean" SET BUILDTYPE=Clean&&GOTO :CHECKSECONDARG
+IF /I "%1" == "-Clean" SET BUILDTYPE=Clean&&GOTO :CHECKSECONDARG
+IF /I "%1" == "--Clean" SET BUILDTYPE=Clean&&GOTO :CHECKSECONDARG
+IF /I "%1" == "Rebuild" SET BUILDTYPE=Rebuild&&GOTO :CHECKSECONDARG
+IF /I "%1" == "/Rebuild" SET BUILDTYPE=Rebuild&&GOTO :CHECKSECONDARG
+IF /I "%1" == "-Rebuild" SET BUILDTYPE=Rebuild&&GOTO :CHECKSECONDARG
+IF /I "%1" == "--Rebuild" SET BUILDTYPE=Rebuild&&GOTO :CHECKSECONDARG
+ECHO.
+ECHO:Unsupported commandline switch!
+ECHO:Run "build.cmd help" for details about the commandline switches.
+CALL :SUBMSG "ERROR" "Compilation failed!"
+)
+
+
+:CHECKSECONDARG
+REM Check for the second switch
+IF "%2" == "" (
 SET ARCH=all
 ) ELSE (
-IF /I "%1" == "Build" SET BUILDTYPE=Build
-IF /I "%1" == "/Build" SET BUILDTYPE=Build
-IF /I "%1" == "-Build" SET BUILDTYPE=Build
-IF /I "%1" == "--Build" SET BUILDTYPE=Build
-IF /I "%1" == "Clean" SET BUILDTYPE=Clean
-IF /I "%1" == "/Clean" SET BUILDTYPE=Clean
-IF /I "%1" == "-Clean" SET BUILDTYPE=Clean
-IF /I "%1" == "--Clean" SET BUILDTYPE=Clean
-IF /I "%1" == "Rebuild" SET BUILDTYPE=Rebuild
-IF /I "%1" == "/Rebuild" SET BUILDTYPE=Rebuild
-IF /I "%1" == "-Rebuild" SET BUILDTYPE=Rebuild
-IF /I "%1" == "--Rebuild" SET BUILDTYPE=Rebuild
-IF /I "%2" == "x86" SET ARCH=x86
-IF /I "%2" == "/x86" SET ARCH=x86
-IF /I "%2" == "-x86" SET ARCH=x86
-IF /I "%2" == "--x86" SET ARCH=x86
-IF /I "%2" == "x64" SET ARCH=x64
-IF /I "%2" == "/x64" SET ARCH=x64
-IF /I "%2" == "-x64" SET ARCH=x64
-IF /I "%2" == "--x64" SET ARCH=x64
-IF /I "%2" == "all" SET ARCH=all
-IF /I "%2" == "/all" SET ARCH=all
-IF /I "%2" == "-all" SET ARCH=all
-IF /I "%2" == "--all" SET ARCH=all
-GOTO :START
+IF /I "%2" == "x86" SET ARCH=x86&&GOTO :START
+IF /I "%2" == "/x86" SET ARCH=x86&&GOTO :START
+IF /I "%2" == "-x86" SET ARCH=x86&&GOTO :START
+IF /I "%2" == "--x86" SET ARCH=x86&&GOTO :START
+IF /I "%2" == "x64" SET ARCH=x64&&GOTO :START
+IF /I "%2" == "/x64" SET ARCH=x64&&GOTO :START
+IF /I "%2" == "-x64" SET ARCH=x64&&GOTO :START
+IF /I "%2" == "--x64" SET ARCH=x64&&GOTO :START
+IF /I "%2" == "all" SET ARCH=all&&GOTO :START
+IF /I "%2" == "/all" SET ARCH=all&&GOTO :START
+IF /I "%2" == "-all" SET ARCH=all&&GOTO :START
+IF /I "%2" == "--all" SET ARCH=all&&GOTO :START
+ECHO.
+ECHO:Unsupported commandline switch!
+ECHO:Run "build.cmd help" for details about the commandline switches.
+CALL :SUBMSG "ERROR" "Compilation failed!"
 )


Update test_script

Update test_script

--- JeremyAnsel.ColorQuant/run-tests.cmd
+++ JeremyAnsel.ColorQuant/run-tests.cmd
@@ -4,9 +4,9 @@
 if '%Configuration%' == '' if not '%1' == '' set Configuration=%1
 if '%Configuration%' == '' set Configuration=Debug

-if exist .\build\coverage rd /s /q .\build\coverage
-md .\build\coverage
+if exist "%~dp0\build\coverage" rd /s /q "%~dp0\build\coverage"
+md "%~dp0\build\coverage"

-.\packages\OpenCover.4.5.3723\OpenCover.Console.exe -register:user -output:.\build\coverage\results.xml -target:.\packages\xunit.runner.console.2.0.0\tools\xunit.console.exe "-targetargs:.\JeremyAnsel.ColorQuant.Tests\bin\%Configuration%\JeremyAnsel.ColorQuant.Tests.dll -noshadow" "-filter:+[JeremyAnsel.ColorQuant]* -[*.Tests]*" -hideskipped:File;Filter;Attribute
+"%~dp0\packages\OpenCover.4.5.3723\OpenCover.Console.exe" -register:user -output:"%~dp0\build\coverage\results.xml" -target:"%~dp0\packages\xunit.runner.console.2.0.0\tools\xunit.console.exe" -targetargs:"%~dp0\JeremyAnsel.ColorQuant.Tests\bin\%Configuration%\JeremyAnsel.ColorQuant.Tests.dll -noshadow" "-filter:+[JeremyAnsel.ColorQuant]* -[*.Tests]*" -hideskipped:File;Filter;Attribute

-.\packages\ReportGenerator.2.1.4.0\ReportGenerator.exe -reports:.\build\coverage\results.xml -targetdir:.\build\coverage -verbosity:Info
+"%~dp0\packages\ReportGenerator.2.1.4.0\ReportGenerator.exe" -reports:"%~dp0\build\coverage\results.xml" -targetdir:"%~dp0\build\coverage" -verbosity:Info


Added a explicit setting for the SDK version to use.

--- appveyor/setup_fftw_dlls.cmd
+++ appveyor/setup_fftw_dlls.cmd
@@ -1,3 +1,4 @@
 @ECHO OFF
+"%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Setup\WindowsSdkVer.exe" -q -version:%WINDOWS_SDK_VERSION%
 "%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Bin\SetEnv.cmd"
 call powershell setup_fftw_dlls.ps1 || EXIT 1


[modify]バッチファイル修正（プラットフォーム名が間違っていた

[modify]バッチファイル修正（プラットフォーム名が間違っていた

--- BatchFiles/CreateLive2dfordll.bat
+++ BatchFiles/CreateLive2dfordll.bat
@@ -5,7 +5,7 @@
 call %NUGET% restore "%~dp0../Extension/Live2DWrapping/Live2DWrapping.sln"
 call %MSBUILD% "%~dp0../Extension/Live2DWrapping/Live2DWrapping.sln" /t:Build /p:Platform=x64 /property:Configuration=Debug

-call %MSBUILD% "%~dp0../Extension/Generater/Generater.sln" /t:Build /p:Platform=Any CPU /property:Configuration=Debug
+call %MSBUILD% "%~dp0../Extension/Generater/Generater.sln" /t:Build /p:Platform="Any CPU" /property:Configuration=Debug

 call %MSBUILD% "%~dp0../Extension/Live2DforDLL/Live2DforDLL.sln" /t:Build /p:Platform=x64 /property:Configuration=Debug


UPDATE: updates list of libraries in run script.

git-svn-id: 7003860f782148507aa0d02fa3b12992383fb6a5@3256 a09ad3ba-1a0f-0410-b1b9-c67202f10d70

--- cloveretl.engine/scripts/clover.bat
+++ cloveretl.engine/scripts/clover.bat
@@ -101,10 +101,9 @@
 set JMS_JAR=%CLOVER_HOME%\lib\jms.jar
 set JXL_JAR=%CLOVER_HOME%\lib\jxl.jar
 set LOG4J_JAR=%CLOVER_HOME%\lib\log4j-1.2.12.zip
-set POI_JAR=%CLOVER_HOME%\lib\poi-2.5.1.jar
+set COMMONS_CLI=%CLOVER_HOME%\lib\commons-cli-1.0.jar

-
-echo "%_JAVACMD%" %CLOVER_OPTS% %JAVA_CMD_LINE_ARGS% -classpath "%USER_CLASSPATH%;%TRANSFORM_PATH%;%CLOVER_HOME%\lib\cloveretl.engine.jar;%COMMONS_LOGGING_JAR%;%JAVOLUTION_JAR%;%JMS_JAR%;%JXL_JAR%;%LOG4J_JAR%;%POI_JAR%;%TOOLS_JAR%;" "-Dclover.home=%CLOVER_HOME%" org.jetel.main.runGraph -plugins "%CLOVER_HOME%\plugins" %CLOVER_CMD_LINE_ARGS%
+echo "%_JAVACMD%" %CLOVER_OPTS% %JAVA_CMD_LINE_ARGS% -classpath "%USER_CLASSPATH%;%TRANSFORM_PATH%;%CLOVER_HOME%\lib\cloveretl.engine.jar;%COMMONS_LOGGING_JAR%;%JAVOLUTION_JAR%;%JMS_JAR%;%JXL_JAR%;%LOG4J_JAR%;%TOOLS_JAR%;%COMMONS_CLI%" "-Dclover.home=%CLOVER_HOME%" org.jetel.main.runGraph -plugins "%CLOVER_HOME%\plugins" %CLOVER_CMD_LINE_ARGS%
 "%_JAVACMD%" %CLOVER_OPTS% %JAVA_CMD_LINE_ARGS% -classpath "%USER_CLASSPATH%;%CLOVER_HOME%\lib\cloveretl.engine.jar;%COMMONS_LOGGING_JAR%;%JAVOLUTION_JAR%;%JMS_JAR%;%JXL_JAR%;%LOG4J_JAR%;%POI_JAR%;%TOOLS_JAR%;" "-Dclover.home=%CLOVER_HOME%" org.jetel.main.runGraph -plugins "%CLOVER_HOME%\plugins" %CLOVER_CMD_LINE_ARGS%

 set CLOVER_OPTS=


Small fix [skip ci]

Small fix [skip ci]


Update build script to build two separately things; optimized and debug versions of both exe and dll

--- build.bat
+++ build.bat
@@ -16,8 +16,10 @@
 del /Q w:\build\*.obj
 del /Q w:\build\*.pdb

-cl /DGAME_TITLE=\"%GAME_TITLE%\" /Zi ..\code\game.cpp /LDd
-cl /DGAME_TITLE=\"%GAME_TITLE%\" /Zi /Fe%GAME_TITLE% ..\code\win32_platform.cpp %LIBS%
-cl /DGAME_TITLE=\"%GAME_TITLE%\" /DMULTIMA_CONSOLE /Zi /Fe%GAME_TITLE%_console.exe ..\code\win32_platform.cpp %LIBS%
+cl /DGAME_TITLE=\"%GAME_TITLE%\" /O2 ..\code\game.cpp /LD
+cl /DGAME_TITLE=\"%GAME_TITLE%\" /O2 /Fe%GAME_TITLE% ..\code\win32_platform.cpp %LIBS%
+
+cl /DGAME_TITLE=\"%GAME_TITLE%\" /DMULTIMA_DEBUG /Zi /Fegame_debug.dll ..\code\game.cpp /LDd
+cl /DGAME_TITLE=\"%GAME_TITLE%\" /DMULTIMA_DEBUG /Zi /Fe%GAME_TITLE%_debug.exe ..\code\win32_platform.cpp %LIBS%

 popd


* incrementing version #

* incrementing version #

--- build.bat
+++ build.bat
@@ -1 +1 @@
-source\BuildFiles\fb.exe source\BuildFiles\BuildFiles.dll -c:BuildTask -p:Version="0.2.1"+source\BuildFiles\fb.exe source\BuildFiles\BuildFiles.dll -c:BuildTask -p:Version="0.2.2"


Fix platform (x64)

Fix platform (x64)

--- build.bat
+++ build.bat
@@ -23,7 +23,7 @@

 nuget.exe restore Sigma.sln

-%WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild Sigma.sln /p:Configuration="%config%" /m /v:M /fl /flp:LogFile=msbuild.log;Verbosity=diag /nr:false
+%WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild Sigma.sln /p:Configuration="%config%" /p:Platform=x64 /m /v:M /fl /flp:LogFile=msbuild.log;Verbosity=diag /nr:false

 REM pack Sigma.Core


add comments

add comments

--- build.bat
+++ build.bat
@@ -3,7 +3,7 @@
 set cert_path="Z:\data\arcgis\addins\cert_2016.cer"
 where /q python
 IF ERRORLEVEL 1 (
-    REM Assume default 10.4 location
+    REM Assume default 10.4 installation
     set py="c:\python27\ArcGIS10.4\python"
 ) ELSE (
     set py="python"
@@ -11,6 +11,8 @@
 echo Building addin...
 "%py%" makeaddin.py
 echo Signing addin...
+REM Assumes that the signing program installed -- it is installed with
+REM the .NET SDK of the vesrion of ArcGIS Desktop used.
 "c:\Program Files (x86)\Common Files\ArcGIS\bin\ESRISignAddin.exe" "%addin_path%" /c:"%cert_path%"
 set runTest=n
 set /p runTest=Would you like to run the test suite? y/N:


Add build batch script

Add build batch script

Running this batch script will build all bots in the repository
The jar files needed by OSBot will appear in the builds directory

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

--- build.bat
+++ build.bat
@@ -0,0 +1,10 @@
+if exist .\build rmdir /Q /S .\build
+
+mkdir .\build
+
+javac -d .\build  -cp "dependencies/OSBot 2.4.39.jar;" catherby_fisher\src\CatherbyFisher.java
+jar cfe build\CatherbyFisher.jar CatherbyFisher -C .\build CatherbyFisher.class -C .\build CatherbyFisher$State.class -C .\build CatherbyFisher$1.class
+
+del .\build\*.class
+
+pause


Fix solution path

Fix solution path

--- build.bat
+++ build.bat
@@ -16,7 +16,10 @@

 dir

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

 REM pack Sigma.Core


CI version number support

CI version number support

--- build.cmd
+++ build.cmd
@@ -30,7 +30,12 @@
 set FAKE_BUILD_FILE=%BUILD_DIR%build.fsx
 set FAKE_VERSION=4.16.0
 set NUNIT_VERSION=2.6.4
-set FAKE_PARAMS=project=%PROJECT_NAME%
+
+rem Version from environment
+if '%VERSION%'=='' set VERSION=%VERSION_NUMBER%
+if '%VERSION%'=='' set VERSION=%APPVEYOR_BUILD_VERSION%
+if '%VERSION%'=='' set VERSION=%BUILD_NUMBER%
+if '%VERSION%'=='' set VERSION=0.0.0.0

 echo.
 echo ##########################################################
@@ -40,8 +45,8 @@
 echo #   NuGet Path:               %NUGET_PATH%
 echo #   Fake Path:                %FAKE_PATH%
 echo #   Fake Build File:          %FAKE_BUILD_FILE%
-echo #   Fake Parameters:          %FAKE_PARAMS%
 echo #   Build Target:             %TARGET%
+echo #   Build Version:            %VERSION%
 echo #
 echo.

@@ -80,7 +85,8 @@
 echo.

 :RUN
-"%FAKE_PATH%" "%FAKE_BUILD_FILE%" %TARGET% "%FAKE_PARAMS%"
+"%FAKE_PATH%" "%FAKE_BUILD_FILE%" %TARGET% project=%PROJECT_NAME% version=%VERSION%
+
 if %ERRORLEVEL% NEQ 0 (
 	echo Failure within FAKE script.
 	goto FAILED


Sync changes from netbuild

Sync changes from netbuild

--- build.cmd
+++ build.cmd
@@ -1,23 +1,15 @@
 @echo off
 setlocal enableDelayedExpansion

-goto main
+set config=Release
+
+goto parseOptions

 :: Functions

 :buildSubdir

-pushd %1
-for /f "delims=" %%p in ('dir /a-d /b /s project.json') do (
-    :: Exclude bin/ and obj/ directories
-    echo %%p | findstr /i /c:bin /c:obj > NUL
-    if !ERRORLEVEL! NEQ 0 (
-        :: dnu is a batch script, so we need to `call` it
-        call dnu restore "%%p"
-        call dnu pack "%%p"
-    )
-)
-popd
+for /f "delims=" %%p in ('call :listProjects %*') do call dnu pack "%%p" --configuration "%config%"
 goto :EOF

 :checkInstalled
@@ -30,19 +22,48 @@
 )
 goto :EOF

-:runTests
+:listProjects

 pushd %1
 for /f "delims=" %%p in ('dir /a-d /b /s project.json') do (
     :: Exclude bin/ and obj/ directories
-    echo %%p | findstr /i /c:bin /c:obj > NUL
-    if !ERRORLEVEL! NEQ 0 dnx -p "%%p" test
+    echo %%p | findstr /v /i /c:bin /c:obj
 )
 popd
 goto :EOF

+:restore
+
+:: dnu is a batch script, so we need to `call` it
+for /f "delims=" %%p in ('call :listProjects %*') do call dnu restore "%%p"
+goto :EOF
+
+:runTests
+
+for /f "delims=" %%p in ('call :listProjects %*') do dnx -p "%%p" test
+goto :EOF
+
 :: Entry point
-:main
+:parseOptions
+
+if "%~1" == "" goto parsingDone
+
+if "%~1" == "-c" (
+    shift
+    set config=%1
+    goto parseOptions
+)
+
+if "%~1" == "--config" (
+    shift
+    set config=%1
+    goto parseOptions
+)
+
+shift
+goto parseOptions
+
+:parsingDone

 :: Check for dnu and dnx
 call :checkInstalled dnu
@@ -50,6 +71,7 @@

 :: Do the actual work
 cd %~dp0
+call :restore src
+call :restore test
 call :buildSubdir src
-call :buildSubdir test
 call :runTests test


Minor output tweaks.

Minor output tweaks.

--- build.cmd
+++ build.cmd
@@ -15,7 +15,6 @@

 :: usage: call:configureWinSDK x86|x64|ia64 debug|release [/vista^|/xp^|/2003^|/2008^|/win7]
 :configureWinSDK
-@echo ==== Configuring WinSDK %~1 %~2 %~3 ====
 set TARGET_ARCH=/%1
 set MODE=/%2
 if "%3" == "" ( set TARGET_OS=/xp ) else set TARGET_OS=%3
@@ -30,7 +29,6 @@
   set SOURCE_FILE=%SOURCE_DIR%\boost_%BOOST_VERSION%.7z
 )
 if not exist "%~1" (
-  @echo ==== Extracting Boost Source ====
   @echo Extracting "%SOURCE_FILE%" to "%~1"
   "%ZIP7%" x -o"%~1" "%SOURCE_FILE%" > nul
   if errorlevel 1 (
@@ -44,7 +42,7 @@

 :: usage: call:bootstrap boost_dir
 :bootstrap
-@echo ==== Bootstrapping Boost %~1 ====
+@echo Bootstrapping %~1
 pushd "%~1"
 call bootstrap.bat
 popd
@@ -52,6 +50,7 @@

 :: usage: call:build x86|x64|ia64 debug|release
 :build
+@echo ==== Building %~1 %~2 ====
 call:configureWinSDK %~1 %~2
 set BUILD_DIR=%~dp0build\boost_%BOOST_VERSION%-%~1
 if not exist "%BUILD_DIR%" call:extractSource %BUILD_DIR%


Update 'build.cmd' alias parameter to use full name.

--- build.cmd
+++ build.cmd
@@ -30,7 +30,7 @@
 IF %BUILDCMD_DNX_VERSION%=="" (
 	CALL packages\KoreBuild\build\dnvm upgrade -runtime CLR -arch x86
 ) ELSE (
-	CALL packages\KoreBuild\build\dnvm install %BUILDCMD_DNX_VERSION% -runtime CLR -arch x86 -a default
+	CALL packages\KoreBuild\build\dnvm install %BUILDCMD_DNX_VERSION% -runtime CLR -arch x86 -alias default
 )
 CALL packages\KoreBuild\build\dnvm install default -runtime CoreCLR -arch x86


Fix link to developer guide

Fix link to developer guide

--- build.cmd
+++ build.cmd
@@ -18,7 +18,7 @@
     )

     echo Error: build.cmd requires Visual Studio 2013 or 2015.
-    echo        Please see https://github.com/dotnet/corefx/blob/master/Documentation/developer-guide.md for build instructions.
+    echo        Please see https://github.com/dotnet/corefx/blob/master/Documentation/project-docs/developer-guide.md for build instructions.
     exit /b 1
 )


fix missing _ in menpo_playground.py

fix missing _ in menpo_playground.py

--- build.cmd
+++ build.cmd
@@ -1 +1 @@
-build\miniconda\python menpoplayground.py bundle
+build\miniconda\python menpo_playground.py bundle


Update build command

Update build command

--- build.cmd
+++ build.cmd
@@ -16,11 +16,13 @@
 )

 :: Verify yarn installed
-where yarn 2>nul >null
+where yarn 2>nul >nul
 IF %ERRORLEVEL% NEQ 0 (
   echo "Missing yarn, installing via npm"
   npm i -g yarn
 )
+
+echo "Yarn installed, continuing to deployment"

 :: Setup
 :: -----


Fix directory navigation in build.cmd

Fix directory navigation in build.cmd

--- build.cmd
+++ build.cmd
@@ -21,6 +21,7 @@
 if %errorlevel% neq 0 exit /b %errorlevel%
 msbuild winp.vcxproj /t:Clean /p:Configuration=Debug /verbosity:minimal /nologo /p:Platform="x64"
 if %errorlevel% neq 0 exit /b %errorlevel%
+cd %BUIDROOT%
 mvn clean
 if %errorlevel% neq 0 exit /b %errorlevel%
 goto :build
@@ -46,12 +47,14 @@
 if %errorlevel% neq 0 exit /b %errorlevel%

 echo "### Build WinP"
+cd %BUIDROOT%
 mvn package
 if %errorlevel% neq 0 exit /b %errorlevel%

 goto :exit

 :test
+cd %BUIDROOT%
 mvn verify
 if %errorlevel% neq 0 exit /b %errorlevel%
 goto :exit


Build.cmd now passes build number

Build.cmd now passes build number

--- build.cmd
+++ build.cmd
@@ -1,7 +1,7 @@
-@echo off
-
-set framework=v4.0.30319
-
-"%SystemDrive%\Windows\Microsoft.NET\Framework\%framework%\MSBuild.exe" build\Build.proj /t:Build /v:m
-echo Done
-pause
+@echo off
+
+set framework=v4.0.30319
+
+"%SystemDrive%\Windows\Microsoft.NET\Framework\%framework%\MSBuild.exe" build\Build.proj /t:Build /v:m /p:build_number=2.0.0
+echo Done
+pause


Fixed: do not clean above repo root

Fixed: do not clean above repo root

--- clean.bat
+++ clean.bat
@@ -1,8 +1,7 @@
 @echo off
-for /R .. %%x in (bin) do if exist "%%x" rmdir /s /q "%%x" 1>NUL 2>NUL
-for /R .. %%x in (obj) do if exist "%%x" rmdir /s /q "%%x" 1>NUL 2>NUL
+for /R %%x in (bin) do if exist "%%x" rmdir /s /q "%%x" 1>NUL 2>NUL
+for /R %%x in (obj) do if exist "%%x" rmdir /s /q "%%x" 1>NUL 2>NUL

-rmdir /s /q .vs 1>NUL 2>NUL
 rmdir /s /q src\.vs 1>NUL 2>NUL
 rmdir /s /q src\packages 1>NUL 2>NUL
 rmdir /s /q coverage 1>NUL 2>NUL


Add space for correct syntax

Add space for correct syntax

Signed-off-by: Philippe Ombredanne <ca95c4a6a4931f366cbdaf5878c5016609417d37@nexb.com>

--- configure.bat
+++ configure.bat
@@ -65,7 +65,7 @@
     set "CFG_REQUIREMENTS=%DEV_REQUIREMENTS%"
     set CFG_DEV_MODE=1
 )
-if "%1" EQU "--python"(
+if "%1" EQU "--python" (
     echo "The --python option is now DEPRECATED. Use the PYTHON_EXECUTABLE environment"
     echo "variable instead. Run configure --help for details."
     exit /b 0


add modules list parsing to configure.bat

--- configure.bat
+++ configure.bat
@@ -119,7 +119,7 @@
     echo -no-docs .......... Do not build documentation (build by default)
     echo -modules ^<list^> ... Build only the specified modules (default all)
     echo                     Choose from: bearer location publishsubscribe location
-    echo                     multimedia contacts versit messaging systeminfo
+    echo                     multimedia contacts versit messaging systeminfo serviceframework
     echo                     Modules should be separated by a space. If a
     echo                     selected module depends on other modules they
     echo                     will automatically be enabled.
@@ -210,7 +210,52 @@
 set MOBILITY_MODULES_UNPARSED=%MOBILITY_MODULES_UNPARSED:xxx"=%
 set MOBILITY_MODULES_UNPARSED=%MOBILITY_MODULES_UNPARSED:xxx=%

-shift
+REM reset default modules as we expect a modules list
+set MOBILITY_MODULES=
+
+echo Checking selected modules:
+:modulesTag2
+
+for /f "tokens=1,*" %%a in ("%MOBILITY_MODULES_UNPARSED%") do (
+    set FIRST=%%a
+    set REMAINING=%%b
+)
+
+: What we want is a switch as we need to check module name and only want to
+: distinguish between false and correct module names being passed
+if %FIRST% == bearer (
+    echo     Bearer Management selected
+) else if %FIRST% == contacts (
+    echo     Contacts selected
+) else if %FIRST% == location (
+    echo     Location selected
+) else if %FIRST% == messaging (
+    echo     Messaging selected
+) else if %FIRST% == multimedia (
+    echo     Multimedia selected
+) else if %FIRST% == publishsubscribe (
+    echo     PublishSubscribe selected
+) else if %FIRST% == systeminfo (
+    echo     Systeminfo selected
+) else if %FIRST% == serviceframework (
+    echo     SerficeFramework selected
+) else if %FIRST% == versit (
+    echo     Versit selected
+) else (
+    echo     Unknown module %FIRST%
+    goto errorTag
+)
+
+set MOBILITY_MODULES=%MOBILITY_MODULES% %FIRST%
+if "%REMAINING%" == "" (
+    shift
+) else (
+    set MOBILITY_MODULES_UNPARSED=%REMAINING%
+    goto modulesTag2
+)
+
+SET REMAINING=
+SET FIRST=
 goto cmdline_parsing

 :startProcessing
@@ -255,12 +300,6 @@
 echo isEmpty($$QT_MOBILITY_INCLUDE):QT_MOBILITY_INCLUDE=$$QT_MOBILITY_PREFIX/include >> %PROJECT_CONFIG%
 echo isEmpty($$QT_MOBILITY_LIB):QT_MOBILITY_LIB=$$QT_MOBILITY_PREFIX/lib >> %PROJECT_CONFIG%
 echo isEmpty($$QT_MOBILITY_BIN):QT_MOBILITY_BIN=$$QT_MOBILITY_PREFIX/bin >> %PROJECT_CONFIG%
-
-REM now the modules
-if not "%MOBILITY_MODULES_UNPARSED%" == "" (
-    REM error checking would be nice (e.g. for %%m in (%MOBILITY_MODULES) ... , with an "if" switch like the cmdline arg parsing
-    set MOBILITY_MODULES=%MOBILITY_MODULES_UNPARSED%
-)

 echo mobility_modules = %MOBILITY_MODULES%  >> %PROJECT_CONFIG%
 echo maemo:mobility_modules -= systeminfo  >> %PROJECT_CONFIG%
@@ -394,16 +433,47 @@
 rd /s /q %BUILD_PATH%\include
 mkdir %BUILD_PATH%\include
 perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\src\global
-perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\src\bearer
-perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\src\publishsubscribe
-perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\src\location
-perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\src\serviceframework
-perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\src\systeminfo
-perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\src\contacts
-perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\src\multimedia
-perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\src\multimedia\experimental
-perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\src\messaging
-perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\src\versit
+
+set MODULES_TEMP=%MOBILITY_MODULES%
+
+:generateHeaders
+
+for /f "tokens=1,*" %%a in ("%MODULES_TEMP%") do (
+    set FIRST=%%a
+    set REMAINING=%%b
+)
+
+if %FIRST% == bearer (
+    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\src\bearer
+) else if %FIRST% == contacts (
+    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\src\contacts
+) else if %FIRST% == location (
+    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\src\location
+) else if %FIRST% == messaging (
+    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\src\messaging
+) else if %FIRST% == multimedia (
+    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\src\multimedia
+    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\src\multimedia\experimental
+) else if %FIRST% == publishsubscribe (
+    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\src\publishsubscribe
+) else if %FIRST% == systeminfo (
+    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\src\systeminfo
+) else if %FIRST% == serviceframework (
+    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\src\serviceframework
+) else if %FIRST% == versit (
+    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\src\versit
+)
+
+if "%REMAINING%" == "" (
+    shift
+) else (
+    set MODULES_TEMP=%REMAINING%
+    goto generateHeaders
+)
+
+SET REMAINING=
+SET FIRST=
+SET MODULES_TEMP=

 if exist config.pri del config.pri
 ren %PROJECT_CONFIG% config.pri
@@ -433,6 +503,9 @@
 set SOURCE_PATH=
 set MOBILITY_MODULES=
 set MOBILITY_MODULES_UNPARSED=
+SET REMAINING=
+SET FIRST=
+SET MODULES_TEMP=
 exit /b 1

 :exitTag
@@ -447,4 +520,7 @@
 set SOURCE_PATH=
 set MOBILITY_MODULES=
 set MOBILITY_MODULES_UNPARSED=
+SET REMAINING=
+SET FIRST=
+SET MODULES_TEMP=
 exit /b 0


Added skeleton bootstrap on build script

--- resources/skeleton/common/build.cmd
+++ resources/skeleton/common/build.cmd
@@ -1,4 +1,19 @@
 @echo off
 cd %~dp0

-echo Environment TODO...+e5r help 2>nul
+
+if "%ERRORLEVEL%"=="0" goto BuildCommon_Install
+goto BuildCommon_End
+
+:BuildCommon_Install
+  echo E5R Environment Bootstrap...
+
+  set E5RREPO=https://github.com/e5r/env/raw/migrate-to-javascript
+
+  bitsadmin /TRANSFER "Downloading installer..." "%E5RREPO%/e5r-install.cmd" "%CD%\e5r-install.cmd"
+  "%CD%\e5r-install.cmd"
+
+  if exist "%CD%\e5r-install.cmd" del /F /Q "%CD%\e5r-install.cmd"
+
+:BuildCommon_End


Updated build settings to support both python2 and python3 builds Comment batch scripts with ::

--- build_settings/win/build.bat
+++ build_settings/win/build.bat
@@ -1,12 +1,27 @@
-set WINPYDIR=C:\Users\swp\Python\WinPython-32bit-2.7.10.3\python-2.7.10
-set WINPYVER=2.7.10.3
-set HOME=%WINPYDIR%\..\settings
-set WINPYARCH="WIN32"
+@echo off

-set PATH=%WINPYDIR%\Lib\site-packages\PyQt4;%WINPYDIR%\;%WINPYDIR%\DLLs;%WINPYDIR%\Scripts;%WINPYDIR%\..\tools;
+setlocal enableextensions enabledelayedexpansion

-rem keep nbextensions in Winpython directory, rather then %APPDATA% default
-set JUPYTER_DATA_DIR=%WINPYDIR%\..\settings
+rem set /A PYTHON_VERSION=2
+
+IF /I "%PYTHON_VERSION%" EQU "2" (
+	set "WINPYDIR=C:\Users\swp\Python\WinPython-32bit-2.7.10.3\python-2.7.10"
+	set "WINPYVER=2.7.10.3"
+) ELSE (
+	set "WINPYDIR=C:\Users\swp\Python\WinPython-32bit-3.4.3.7\python-3.4.3"
+	set "WINPYVER=3.4.3.7"
+)
+
+set "HOME=%WINPYDIR%\..\settings"
+set "WINPYARCH=WIN32"
+
+set "PATH=%WINPYDIR%\Lib\site-packages\PyQt4;%WINPYDIR%\;%WINPYDIR%\DLLs;%WINPYDIR%\Scripts;%WINPYDIR%\..\tools;"
+
+:: keep nbextensions in Winpython directory, rather then %APPDATA% default
+set "JUPYTER_DATA_DIR=%WINPYDIR%\..\settings"
+
+echo "PYTHON VERSION:"
+python --version

 set PROJECTNAME="pythonVideoAnnotator"
 set BUILDSETTINGSDIR="%WORKSPACE%\build_settings\win"
@@ -14,27 +29,25 @@
 set BUILDOUTDIR="%WORKSPACE%\build"
 set DISTOUTDIR="%WORKSPACE%\dist"

-rem echo %PROJECTNAME%
-rem echo %BUILDSETTINGSDIR%
-rem echo %WORKSPACE%
-rem echo %MAINSCRIPT%
-rem echo %BUILDOUTDIR%
-rem echo %DISTOUTDIR%
-
+:: clean workspace
 @RD /S /Q %BUILDOUTDIR%
 @RD /S /Q %DISTOUTDIR%

-pip uninstall -y pyforms
-
-pip install https://github.com/UmSenhorQualquer/pyforms/archive/master.zip
-
-pip show pyforms
-
-rem echo "Running pyinstaller --additional-hooks-dir %BUILDSETTINGSDIR%\hooks --name %PROJECTNAME% --icon %BUILDSETTINGSDIR%\%ICONNAME% --onefile %MAINSCRIPT%"
+:: echo "Running pyinstaller --additional-hooks-dir %BUILDSETTINGSDIR%\hooks --name %PROJECTNAME% --icon %BUILDSETTINGSDIR%\%ICONNAME% --onefile %MAINSCRIPT%"

 pyinstaller --additional-hooks-dir %BUILDSETTINGSDIR%\hooks --name %PROJECTNAME% --icon %BUILDSETTINGSDIR%\cf_icon_128x128.ico --onefile %MAINSCRIPT%

 pyinstaller --additional-hooks-dir %BUILDSETTINGSDIR%\hooks --name %PROJECTNAME% --icon %BUILDSETTINGSDIR%\cf_icon_128x128.ico %MAINSCRIPT%

-python %WINPYDIR%\Scripts\zip.py "%WORKSPACE%\dist\pythonVideoAnnotator" "%WORKSPACE%\dist\pythonVideoAnnotator.zip"
+:: python %WINPYDIR%\Scripts\zip.py "%WORKSPACE%\dist\pythonVideoAnnotator" "%WORKSPACE%\dist\pythonVideoAnnotator.zip"
+
+IF %SOURCEFORGE_UPLOAD% EQU true (
+echo "Uploading to SourceForge..."
+
+c:\curl\curl.exe --progress-bar --netrc-file c:\curl_auth\bitbucket_auth.txt -X POST https://api.bitbucket.org/2.0/repositories/fchampalimaud/pythonvideoannotator/downloads -F files=@"%WORKSPACE%\dist\pythonVideoAnnotator.exe" > curl_output.log
+
+c:\curl\curl.exe --progress-bar --netrc-file c:\curl_auth\bitbucket_auth.txt -X POST https://api.bitbucket.org/2.0/repositories/fchampalimaud/pythonvideoannotator/downloads -F files=@"%WORKSPACE%\dist\pythonVideoAnnotator.zip" > curl_output.log
+) ELSE (
+echo "Skipping upload to SourceForge"
+)


Added initial continuous integration folder with appveyor script.

error: pathspec 'ci/appveyor/appveyor-cmd.cmd' did not match any file(s) known to git

--- ci/appveyor/appveyor-cmd.cmd
+++ ci/appveyor/appveyor-cmd.cmd
@@ -0,0 +1,79 @@
+:: To build extensions for 64 bit Python 3, we need to configure environment
+:: variables to use the MSVC 2010 C++ compilers from GRMSDKX_EN_DVD.iso of:
+:: MS Windows SDK for Windows 7 and .NET Framework 4 (SDK v7.1)
+::
+:: To build extensions for 64 bit Python 2, we need to configure environment
+:: variables to use the MSVC 2008 C++ compilers from GRMSDKX_EN_DVD.iso of:
+:: MS Windows SDK for Windows 7 and .NET Framework 3.5 (SDK v7.0)
+::
+:: 32 bit builds do not require specific environment configurations.
+::
+:: Note: this script needs to be run with the /E:ON and /V:ON flags for the
+:: cmd interpreter, at least for (SDK v7.0)
+::
+:: More details at:
+:: https://github.com/cython/cython/wiki/64BitCythonExtensionsOnWindows
+:: http://stackoverflow.com/a/13751649/163740
+::
+:: Original source:
+:: https://github.com/ogrisel/python-appveyor-demo/blob/master/appveyor/run_with_env.cmd
+::
+:: Author: Olivier Grisel
+:: License: CC0 1.0 Universal: http://creativecommons.org/publicdomain/zero/1.0/
+@ECHO OFF
+
+SET COMMAND_TO_RUN=%*
+SET WIN_SDK_ROOT=C:\Program Files\Microsoft SDKs\Windows
+SET WIN_WDK=c:\Program Files (x86)\Windows Kits\10\Include\wdf
+
+:: Extract the major and minor versions, and allow for the minor version to be
+:: more than 9.  This requires the version number to have two dots in it.
+SET MAJOR_PYTHON_VERSION=%PYTHON_VERSION:~0,1%
+IF "%PYTHON_VERSION:~3,1%" == "." (
+    SET MINOR_PYTHON_VERSION=%PYTHON_VERSION:~2,1%
+) ELSE (
+    SET MINOR_PYTHON_VERSION=%PYTHON_VERSION:~2,2%
+)
+
+:: Based on the Python version, determine what SDK version to use, and whether
+:: to set the SDK for 64-bit.
+IF %MAJOR_PYTHON_VERSION% == 2 (
+    SET WINDOWS_SDK_VERSION="v7.0"
+    SET SET_SDK_64=Y
+) ELSE (
+    IF %MAJOR_PYTHON_VERSION% == 3 (
+        SET WINDOWS_SDK_VERSION="v7.1"
+        IF %MINOR_PYTHON_VERSION% LEQ 4 (
+            SET SET_SDK_64=Y
+        ) ELSE (
+            SET SET_SDK_64=N
+            IF EXIST "%WIN_WDK%" (
+                :: See: https://connect.microsoft.com/VisualStudio/feedback/details/1610302/
+                REN "%WIN_WDK%" 0wdf
+            )
+        )
+    ) ELSE (
+        ECHO Unsupported Python version: "%MAJOR_PYTHON_VERSION%"
+        EXIT 1
+    )
+)
+
+IF %PYTHON_ARCH% == 64 (
+    IF %SET_SDK_64% == Y (
+        ECHO Configuring Windows SDK %WINDOWS_SDK_VERSION% for Python %MAJOR_PYTHON_VERSION% on a 64 bit architecture
+        SET DISTUTILS_USE_SDK=1
+        SET MSSdk=1
+        "%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Setup\WindowsSdkVer.exe" -q -version:%WINDOWS_SDK_VERSION%
+        "%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Bin\SetEnv.cmd" /x64 /release
+        ECHO Executing: %COMMAND_TO_RUN%
+        call %COMMAND_TO_RUN% || EXIT 1
+    ) ELSE (
+        ECHO Using default MSVC build environment for 64 bit architecture
+        ECHO Executing: %COMMAND_TO_RUN%
+        call %COMMAND_TO_RUN% || EXIT 1
+    )
+) ELSE (
+    ECHO Using default MSVC build environment for 32 bit architecture
+    ECHO Executing: %COMMAND_TO_RUN%
+    call %COMMAND_TO_RUN% || EXIT 1
+)


Updated to run the unit tests on windows

--- scripts/hudson/narayana.bat
+++ scripts/hudson/narayana.bat
@@ -4,7 +4,7 @@

 call:comment_on_pull "Started testing this pull request with BLACKTIE profile on Windows: %BUILD_URL%"

-call build.bat clean install "-DskipTests" || (call:comment_on_pull "BLACKTIE profile tests failed on Windows - Narayana Failed %BUILD_URL%" & exit -1)
+call build.bat clean install || (call:comment_on_pull "BLACKTIE profile tests failed on Windows - Narayana Failed %BUILD_URL%" & exit -1)

 echo "Cloning AS"
 rmdir /S /Q jboss-as


[ci/appveyor] set OPENSSL_xxx_LIB_NAME & OPENSSL_xxx_DLL_NAME

--- ci/appveyor/install.bat
+++ ci/appveyor/install.bat
@@ -45,6 +45,10 @@
 echo set (OPENSSL_INC_DIR %OPENSSL_DIR_CMAKE%/include) >> paths.cmake
 echo set (OPENSSL_LIB_DIR %OPENSSL_DIR_CMAKE%/lib) >> paths.cmake
 echo set (OPENSSL_DLL_DIR %OPENSSL_DIR_CMAKE%/bin) >> paths.cmake
+echo set (OPENSSL_CRYPTO_LIB_NAME libeay32) >> paths.cmake
+echo set (OPENSSL_CRYPTO_DLL_NAME libeay32) >> paths.cmake
+echo set (OPENSSL_SSL_LIB_NAME ssleay32) >> paths.cmake
+echo set (OPENSSL_SSL_DLL_NAME ssleay32) >> paths.cmake

 :: . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .


compiles reservr demo extended widgetset

svn changeset:2310/svn branch:trunk

--- build/bin/compile-gwt-components.bat
+++ build/bin/compile-gwt-components.bat
@@ -1 +1,2 @@
-@java -cp "%~dp0\../../src;%~dp0\bin;%~dp0\../gwt/gwt/gwt-user.jar;%~dp0\../gwt/gwt/gwt-dev-windows.jar" com.google.gwt.dev.GWTCompiler -out "%~dp0\../../WebContent" %* com.itmill.toolkit.terminal.gwt.Client+@java -cp "%~dp0\../../src;%~dp0\bin;%~dp0\../gwt/gwt/gwt-user.jar;%~dp0\../gwt/gwt/gwt-dev-windows.jar" com.google.gwt.dev.GWTCompiler -out "%~dp0\../../WebContent" %* com.itmill.toolkit.terminal.gwt.WidgetSet
+@java -cp "%~dp0\../../src;%~dp0\bin;%~dp0\../gwt/gwt/gwt-user.jar;%~dp0\../googlemaps/googlemaps_gwt.jar;%~dp0\../gwt/gwt/gwt-dev-windows.jar" com.google.gwt.dev.GWTCompiler -out "%~dp0\../../WebContent" %* com.itmill.toolkit.demo.reservation.gwt.WidgetSet


fixed packer firewall rules

fixed packer firewall rules

--- scripts/provision-basebox-slave.bat
+++ scripts/provision-basebox-slave.bat
@@ -46,8 +46,10 @@
 :PACKER_DONE
 call cinst packer-post-processor-vagrant-vmware-ovf

-netsh advfirewall firewall add name="packer-builder-vmware-iso" dir=in program="c:\HashiCorp\packer\packer-builder-vmware-iso.exe" action=allow
-netsh advfirewall firewall add name="packer-builder-virtualbox-iso" dir=in program="c:\HashiCorp\packer\packer-builder-virtualbox-iso.exe" action=allow
+netsh advfirewall firewall add rule name="packer-builder-vmware-iso" dir=in program="c:\HashiCorp\packer\packer-builder-vmware-iso.exe" action=allow
+netsh advfirewall firewall add rule name="packer-builder-virtualbox-iso" dir=in program="c:\HashiCorp\packer\packer-builder-virtualbox-iso.exe" action=allow
+netsh advfirewall firewall add rule name="packer-builder-vmware-iso" dir=in program="c:\Users\vagrant\go\bin\packer-builder-vmware-iso.exe" action=allow
+netsh advfirewall firewall add rule name="packer-builder-virtualbox-iso" dir=in program="c:\Users\vagrant\go\bin\packer-builder-virtualbox-iso.exe" action=allow

 echo Install VMware Workstation...
 rem Install VMware Workstation


CompileSharpmake.bat now can be run without arguments, and it will compile the Sharpmake.sln solution in Debug|AnyCPU

--- CompileSharpmake.bat
+++ CompileSharpmake.bat
@@ -3,6 +3,7 @@
 :: %~1: Project/Solution to build
 :: %~2: Target(Normally should be Debug or Release)
 :: %~3: Platform(Normally should be "Any CPU" for sln and AnyCPU for a csproj)
+:: if none are passed, defaults to building Sharpmake.sln in Debug|AnyCPU

 setlocal enabledelayedexpansion
 : set batch file directory as current
@@ -29,7 +30,11 @@
 call !VSMSBUILDCMD!
 if %errorlevel% NEQ 0 goto end

-call :BuildSharpmake %1 %2 %3
+if "%~1" == "" (
+    call :BuildSharpmake "Sharpmake.sln" "Debug" "Any CPU"
+) else (
+    call :BuildSharpmake %1 %2 %3
+)
 goto end

 :: Build Sharpmake using specified arguments


Finally completely removed the LIBDIR variable and put the path prefix manually before each library file.

--- bin/run_example.cmd
+++ bin/run_example.cmd
@@ -8,9 +8,8 @@
 	popd
 ) else (
 	echo Running %1...
-	SET LIBDIR=%dp0..\lib\win-i386
 	SET DFLAGS=-debug -g -property -w
-	SET LIBS=ws2_32.lib %LIBDIR%\event2.lib %LIBDIR%\ssl.lib %LIBDIR%\eay.lib
+	SET LIBS=ws2_32.lib ..\lib\win-i386\event2.lib ..\lib\win-i386\ssl.lib ..\lib\win-i386\eay.lib
 	echo %2 %3 %DFLAGS% -Jviews -I..\source %LIBS% ..\source\examples\%1.d
 	rdmd %2 %3 %DFLAGS% -Jviews -I..\source %LIBS% ..\source\examples\%1.d
 )


re-adding as binary - file is unmodified

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

--- scripts/pear.bat
+++ scripts/pear.bat
@@ -0,0 +1,69 @@
+@ECHO OFF
+
+REM ----------------------------------------------------------------------
+REM PHP version 5
+REM ----------------------------------------------------------------------
+REM Copyright (c) 1997-2004 The PHP Group
+REM ----------------------------------------------------------------------
+REM  This source file is subject to version 3.0 of the PHP license,
+REM  that is bundled with this package in the file LICENSE, and is
+REM  available at through the world-wide-web at
+REM  http://www.php.net/license/3_0.txt.
+REM  If you did not receive a copy of the PHP license and are unable to
+REM  obtain it through the world-wide-web, please send a note to
+REM  license@php.net so we can mail you a copy immediately.
+REM ----------------------------------------------------------------------
+REM  Authors:     Alexander Merz (alexmerz@php.net)
+REM ----------------------------------------------------------------------
+REM
+REM  $Id: pear.bat,v 1.18 2004/01/08 17:33:14 sniper Exp $
+
+REM change this lines to match the paths of your system
+REM -------------------
+
+@ECHO OFF
+:: Check PEAR global ENV, set them if they do not exist
+IF "%PHP_PEAR_INSTALL_DIR%"=="" SET "PHP_PEAR_INSTALL_DIR=@include_path@"
+IF "%PHP_PEAR_BIN_DIR%"=="" SET "PHP_PEAR_BIN_DIR=@bin_dir@"
+IF "%PHP_PEAR_PHP_BIN%"=="" SET "PHP_PEAR_PHP_BIN=@php_bin@"
+
+:: Check Folders and files
+IF NOT EXIST "%PHP_PEAR_INSTALL_DIR%" GOTO PEAR_INSTALL_ERROR
+IF NOT EXIST "%PHP_PEAR_INSTALL_DIR%\pearcmd.php" GOTO PEAR_INSTALL_ERROR2
+IF NOT EXIST "%PHP_PEAR_BIN_DIR%" GOTO PEAR_BIN_ERROR
+IF NOT EXIST "%PHP_PEAR_PHP_BIN%" GOTO PEAR_PHPBIN_ERROR
+:: launch pearcmd
+GOTO RUN
+:PEAR_INSTALL_ERROR
+ECHO PHP_PEAR_INSTALL_DIR is not set correctly.
+ECHO Please fix it using your environment variable or modify
+ECHO the default value in pear.bat
+ECHO The current value is:
+ECHO %PHP_PEAR_INSTALL_DIR%
+GOTO END
+:PEAR_INSTALL_ERROR2
+ECHO PHP_PEAR_INSTALL_DIR is not set correctly.
+ECHO pearcmd.php could not be found there.
+ECHO Please fix it using your environment variable or modify
+ECHO the default value in pear.bat
+ECHO The current value is:
+ECHO %PHP_PEAR_INSTALL_DIR%
+GOTO END
+:PEAR_BIN_ERROR
+ECHO PHP_PEAR_BIN_DIR is not set correctly.
+ECHO Please fix it using your environment variable or modify
+ECHO the default value in pear.bat
+ECHO The current value is:
+ECHO %PHP_PEAR_BIN_DIR%
+GOTO END
+:PEAR_PHPBIN_ERROR
+ECHO PHP_PEAR_PHP_BIN is not set correctly.
+ECHO Please fix it using your environment variable or modify
+ECHO the default value in pear.bat
+ECHO The current value is:
+ECHO %PHP_PEAR_PHP_BIN%
+GOTO END
+:RUN
+"%PHP_PEAR_PHP_BIN%" -C -d output_buffering=1 -d include_path="%PHP_PEAR_INSTALL_DIR%" -f "%PHP_PEAR_INSTALL_DIR%\pearcmd.php" -- %1 %2 %3 %4 %5 %6 %7 %8 %9
+:END
+@ECHO ON


Fix source_svn test recipe on Windows

Fix source_svn test recipe on Windows

--- test-recipes/metadata/source_svn/bld.bat
+++ test-recipes/metadata/source_svn/bld.bat
@@ -2,5 +2,7 @@
 cd trunk
 svn info
 if errorlevel 1 exit 1
-for /f "delims=" %%i in ('svn info | grep "Revision"') do set svnrev=%%i
-if not svnrev=="Revision: 1157" exit 1
+for /f "delims=" %%i in ('svn info ^| grep "Revision"') do set svnrev=%%i
+if errorlevel 1 exit 1
+echo %svnrev%
+if not "%svnrev%"=="Revision: 1157" exit 1


Delete appveyor.bat

Delete appveyor.bat

--- appveyor.bat
+++ appveyor.bat
@@ -1,9 +0,0 @@
-cd c:\tools\php
-copy php.ini-production php.ini /Y
-echo date.timezone="UTC" >> php.ini
-echo extension_dir=ext >> php.ini
-echo extension=php_openssl.dll >> php.ini
-echo extension=php_mbstring.dll >> php.ini
-echo extension=php_fileinfo.dll >> php.ini
-echo @php %%~dp0composer.phar %%* > composer.bat
-appveyor-retry appveyor DownloadFile https://getcomposer.org/composer.phar


chmod

chmod


Re-added script/vmtool.bat (works all the time for me)

--- script/vmtool.bat
+++ script/vmtool.bat
@@ -1,84 +1,351 @@
+@setlocal EnableDelayedExpansion EnableExtensions
+@for %%i in (a:\_packer_config*.cmd) do @call "%%~i"
 @if not defined PACKER_DEBUG echo off

-setlocal EnableDelayedExpansion EnableExtensions
-
-:: If TEMP is not defined in this shell instance, define it ourselves
-if not defined TEMP set TEMP=%USERPROFILE%\AppData\Local\Temp
+if not defined PACKER_SEARCH_PATHS set PACKER_SEARCH_PATHS="%USERPROFILE%" a: b: c: d: e: f: g: h: i: j: k: l: m: n: o: p: q: r: s: t: u: v: w: x: y: z:
+
+if not defined LESSMSI_URL set LESSMSI_URL=https://github.com/activescott/lessmsi/releases/download/v1.2.0/lessmsi-v1.2.0.zip
+if not defined SEVENZIP_URL set SEVENZIP_URL=http://downloads.sourceforge.net/sevenzip/7z922.msi
+if not defined VBOX_ISO_URL set VBOX_ISO_URL=http://download.virtualbox.org/virtualbox/4.3.18/VBoxGuestAdditions_4.3.18.iso
+if not defined VMWARE_TOOLS_TAR_URL set VMWARE_TOOLS_TAR_URL=https://softwareupdate.vmware.com/cds/vmw-desktop/ws/10.0.4/2249910/windows/packages/tools-windows-9.6.2.exe.tar
+
+goto main
+
+::::::::::::
+:find_unzip_vbs
+::::::::::::
+
+for %%i in ("%TEMP%" %PACKER_SEARCH_PATHS%) do if exist "%%~i\unzip.vbs" set UNZIP_VBS=%%~i\unzip.vbs
+
+if exist "%UNZIP_VBS%" goto :eof
+
+set UNZIP_VBS=%TEMP%\unzip.vbs
+
+echo Set fso = CreateObject("Scripting.FileSystemObject")>"%UNZIP_VBS%"
+echo ZipFile=fso.GetAbsolutePathName(Wscript.Arguments(0))>>"%UNZIP_VBS%"
+echo ExtractTo=fso.GetAbsolutePathName(Wscript.Arguments(1))>>"%UNZIP_VBS%"
+echo If NOT fso.FolderExists(ExtractTo) Then>>"%UNZIP_VBS%"
+echo    fso.CreateFolder(ExtractTo)>>"%UNZIP_VBS%"
+echo End If>>"%UNZIP_VBS%"
+echo set objShell = CreateObject("Shell.Application")>>"%UNZIP_VBS%"
+echo set FilesInZip=objShell.NameSpace(ZipFile).items>>"%UNZIP_VBS%"
+echo objShell.NameSpace(ExtractTo).CopyHere(FilesInZip)>>"%UNZIP_VBS%"
+echo Set fso = Nothing>>"%UNZIP_VBS%"
+echo Set objShell = Nothing>>"%UNZIP_VBS%"
+
+goto :eof
+
+::::::::::::
+:install_sevenzip
+::::::::::::
+
+pushd .
+
+set SEVENZIP_EXE=
+set SEVENZIP_DLL=
+for %%i in (7z.exe) do set SEVENZIP_EXE=%%~$PATH:i
+if defined SEVENZIP_EXE goto return0
+
+@for %%i in (%PACKER_SEARCH_PATHS%) do @if not defined SEVENZIP_EXE @if exist "%%~i\7z.exe" set SEVENZIP_EXE=%%~i\7z.exe
+
+if not defined SEVENZIP_EXE goto unmsi_sevenzip
+
+@for %%i in (%PACKER_SEARCH_PATHS%) do @if not defined SEVENZIP_DLL @if exist "%%~i\7z.dll" set SEVENZIP_DLL=%%~i\7z.dll
+
+if not defined SEVENZIP_DLL goto unmsi_sevenzip
+
+copy /y "%SEVENZIP_EXE%" "%SystemRoot%\" || goto unmsi_sevenzip
+copy /y "%SEVENZIP_DLL%" "%SystemRoot%\" || goto unmsi_sevenzip
+
+goto return0
+
+:unmsi_sevenzip
+
+for %%i in ("%SEVENZIP_URL%") do set SEVENZIP_ZIP=%%~nxi
+set SEVENZIP_DIR=%TEMP%\sevenzip
+set SEVENZIP_PATH=%SEVENZIP_DIR%\%SEVENZIP_ZIP%
+
+echo ==^> Creating "%SEVENZIP_DIR%"
+mkdir "%SEVENZIP_DIR%"
+cd /d "%SEVENZIP_DIR%"
+
+if exist "%SystemRoot%\_download.cmd" (
+  call "%SystemRoot%\_download.cmd" "%SEVENZIP_URL%" "%SEVENZIP_PATH%"
+) else (
+  echo ==^> Downloadling "%SEVENZIP_URL%" to "%SEVENZIP_PATH%"
+  powershell -Command "(New-Object System.Net.WebClient).DownloadFile('%SEVENZIP_URL%', '%SEVENZIP_PATH%')" <NUL
+)
+if not exist "%SEVENZIP_PATH%" goto return1
+
+echo ==^> Unpacking "%SEVENZIP_PATH%" to "%SEVENZIP_DIR%"
+
+for %%i in ("%LESSMSI_URL%") do set LESSMSI_ZIP=%%~nxi
+set LESSMSI_DIR=%TEMP%\lessmsi
+set LESSMSI_PATH=%LESSMSI_DIR%\%LESSMSI_ZIP%
+
+echo ==^> Creating "%LESSMSI_DIR%"
+mkdir "%LESSMSI_DIR%"
+cd /d "%LESSMSI_DIR%"
+
+if exist "%SystemRoot%\_download.cmd" (
+  call "%SystemRoot%\_download.cmd" "%LESSMSI_URL%" "%LESSMSI_PATH%"
+) else (
+  echo ==^> Downloadling "%LESSMSI_URL%" to "%LESSMSI_PATH%"
+  powershell -Command "(New-Object System.Net.WebClient).DownloadFile('%LESSMSI_URL%', '%LESSMSI_PATH%')" <NUL
+)
+if not exist "%LESSMSI_PATH%" goto return1
+
+call :find_unzip_vbs
+
+if not exist "%UNZIP_VBS%" echo ==^> ERROR: File not found: "%UNZIP_VBS%" & goto return1
+
+echo ==^> Unzipping "%LESSMSI_PATH%" to "%LESSMSI_DIR%"
+cscript "%UNZIP_VBS%" //b "%LESSMSI_PATH%" "%LESSMSI_DIR%"
+
+set LESSMSI_EXE=
+
+for %%i in ("%LESSMSI_DIR%\*.exe") do set LESSMSI_EXE=%%~i
+
+if not exist "%LESSMSI_EXE%" echo ==^> ERROR: Failed to unzip "%LESSMSI_PATH%" & goto return1
+
+"%LESSMSI_EXE%" x "%SEVENZIP_PATH%" 7z.exe 7z.dll
+
+@if errorlevel 1 echo ==^> WARNING: Error %ERRORLEVEL% was returned by: "%LESSMSI_EXE%" x "%SEVENZIP_PATH%" 7z.exe 7z.dll
+ver>nul
+
+set SEVENZIP_EXE=
+
+for /r %%i in (7z.exe) do if exist "%%~i" set SEVENZIP_EXE=%%~i
+
+if not exist "%SEVENZIP_EXE%" echo ==^> ERROR: Failed to unzip "%SEVENZIP_PATH%" & goto return1
+
+set SEVENZIP_DLL=
+
+for /r %%i in (7z.dll) do if exist "%%~i" set SEVENZIP_DLL=%%~i
+
+if not exist "%SEVENZIP_DLL%" echo ==^> ERROR: Failed to unzip "%SEVENZIP_PATH%" & goto return1
+
+echo ==^> Copying "%SEVENZIP_EXE%" to "%SystemRoot%"
+copy /y "%SEVENZIP_EXE%" "%SystemRoot%\" || goto return1
+copy /y "%SEVENZIP_DLL%" "%SystemRoot%\" || goto return1
+
+:return0
+
+popd
+ver>nul
+
+goto return
+
+:return1
+
+popd
+verify other 2>nul
+
+:return
+
+goto :eof
+
+::::::::::::
+:main
+::::::::::::
+
+echo "%PACKER_BUILDER_TYPE%" | findstr /i "vmware" >nul
+if not errorlevel 1 goto vmware
+
+echo "%PACKER_BUILDER_TYPE%" | findstr /i "virtualbox" >nul
+if not errorlevel 1 goto virtualbox
+
+echo ==^> ERROR: Unknown PACKER_BUILDER_TYPE: "%PACKER_BUILDER_TYPE%"
+
+pushd .
+
+goto exit1
+
+::::::::::::
+:vmware
+::::::::::::

 if exist "%SystemDrive%\Program Files (x86)" (
-  set SEVENZIP_INSTALL=7z922-x64.msi
-  set VBOX_INSTALL=VBoxWindowsAdditions-amd64.exe
-  set VMWARE_INSTALL=setup64.exe
-) else (
-  set SEVENZIP_INSTALL=7z922.msi
-  set VBOX_INSTALL=VBoxWindowsAdditions-x86.exe
-  set VMWARE_INSTALL=setup.exe
-)
-
-set SEVENZIP_URL=http://downloads.sourceforge.net/sevenzip/%SEVENZIP_INSTALL%
-set SEVENZIP_INSTALL_LOCAL_DIR=%TEMP%\7zip
-set SEVENZIP_INSTALL_LOCAL_PATH=%SEVENZIP_INSTALL_LOCAL_DIR%\%SEVENZIP_INSTALL%
-
-mkdir "%SEVENZIP_INSTALL_LOCAL_DIR%"
-
-echo ==^> Downloadling %SEVENZIP_URL% to %SEVENZIP_INSTALL_LOCAL_PATH%
-PATH=%PATH%;a:\
-for %%i in (_download.cmd) do set _download=%%~$PATH:i
-if defined _download (
-  call "%_download%" "%SEVENZIP_URL%" "%SEVENZIP_INSTALL_LOCAL_PATH%"
-) else (
-  powershell -Command "(New-Object System.Net.WebClient).DownloadFile('%SEVENZIP_URL%', '%SEVENZIP_INSTALL_LOCAL_PATH%')" <NUL
-)
-
-echo ==^> Download complete
-echo ==^> Installing 7zip from "%SEVENZIP_INSTALL_LOCAL_PATH%"
-msiexec /qb /i "%SEVENZIP_INSTALL_LOCAL_PATH%"
-
-echo "%PACKER_BUILDER_TYPE%" | findstr /I "vmware" >nul
-if not errorlevel 1 goto vmware
-
-echo "%PACKER_BUILDER_TYPE%" | findstr /I "virtualbox" >nul
-if not errorlevel 1 goto virtualbox
-
-echo ==^> ERROR: Unknown PACKER_BUILDER_TYPE: %PACKER_BUILDER_TYPE%
-
-goto :finish
-
-:vmware
+  set VMWARE_TOOLS_SETUP_EXE=setup64.exe
+) else (
+  set VMWARE_TOOLS_SETUP_EXE=setup.exe
+)
+
+for %%i in ("%VMWARE_TOOLS_TAR_URL%") do set VMWARE_TOOLS_TAR=%%~nxi
+set VMWARE_TOOLS_DIR=%TEMP%\vmware
+set VMWARE_TOOLS_TAR_PATH=%VMWARE_TOOLS_DIR%\%VMWARE_TOOLS_TAR%
+set VMWARE_TOOLS_ISO=windows.iso
+
+mkdir "%VMWARE_TOOLS_DIR%"
+pushd "%VMWARE_TOOLS_DIR%"
+
+set VMWARE_TOOLS_SETUP_PATH=
+
+@for %%i in (%PACKER_SEARCH_PATHS%) do @if not defined VMWARE_TOOLS_SETUP_PATH @if exist "%%~i\VMwareToolsUpgrader.exe" set VMWARE_TOOLS_SETUP_PATH=%%~i\%VMWARE_TOOLS_SETUP_EXE%
+
+if defined VMWARE_TOOLS_SETUP_PATH goto install_vmware_tools
+
+set VMWARE_TOOLS_ISO_PATH=
+
+@for %%i in (%PACKER_SEARCH_PATHS%) do @if not defined VMWARE_TOOLS_ISO_PATH @if exist "%%~i\%VMWARE_TOOLS_ISO%" set VMWARE_TOOLS_ISO_PATH=%%~i\%VMWARE_TOOLS_ISO%
+
+if defined VMWARE_TOOLS_ISO_PATH goto install_vmware_tools_from_iso
+
+if exist "%SystemRoot%\_download.cmd" (
+  call "%SystemRoot%\_download.cmd" "%VMWARE_TOOLS_TAR_URL%" "%VMWARE_TOOLS_TAR_PATH%"
+) else (
+  echo ==^> Downloadling "%VMWARE_TOOLS_TAR_URL%" to "%VMWARE_TOOLS_TAR_PATH%"
+  powershell -Command "(New-Object System.Net.WebClient).DownloadFile('%VMWARE_TOOLS_TAR_URL%', '%VMWARE_TOOLS_TAR_PATH%')" <NUL
+)
+if not exist "%VMWARE_TOOLS_TAR_PATH%" goto exit1
+
+call :install_sevenzip
+if errorlevel 1 goto exit1
+
+7z e -o"%VMWARE_TOOLS_DIR%" "%VMWARE_TOOLS_TAR_PATH%"
+
+@if errorlevel 1 echo ==^> WARNING: Error %ERRORLEVEL% was returned by: 7z e "%VMWARE_TOOLS_TAR_PATH%"
+ver>nul
+
+set VMWARE_TOOLS_INSTALLER_PATH=
+
+for %%i in (tools-windows-*.exe) do set VMWARE_TOOLS_INSTALLER_PATH=%CD%\%%~i
+
+if not exist "%VMWARE_TOOLS_INSTALLER_PATH%" echo ==^> ERROR: Failed to unzip "%VMWARE_TOOLS_TAR_PATH%" & goto exit1
+
+"%VMWARE_TOOLS_INSTALLER_PATH%" /s
+
+if exist "%SystemDrive%\Program Files (x86)" (
+  set VMWARE_TOOLS_PROGRAM_FILES_DIR=%SystemDrive%\Program Files ^(x86^)\VMware
+) else (
+  set VMWARE_TOOLS_PROGRAM_FILES_DIR=%SystemDrive%\Program Files\VMware
+)
+
+if not exist "%VMWARE_TOOLS_PROGRAM_FILES_DIR%" echo ==^> ERROR: Directory not found: "%VMWARE_TOOLS_PROGRAM_FILES_DIR%" & goto exit1
+
+set VMWARE_TOOLS_PROGRAM_FILES_ISO=
+
+for /r "%VMWARE_TOOLS_PROGRAM_FILES_DIR%" %%i in (%VMWARE_TOOLS_ISO%) do if exist "%%~i" set VMWARE_TOOLS_PROGRAM_FILES_ISO=%%~i
+
+if not exist "%VMWARE_TOOLS_PROGRAM_FILES_ISO%" echo ==^> ERROR: File not found: "%VMWARE_TOOLS_ISO%" in "%VMWARE_TOOLS_PROGRAM_FILES_DIR%" & goto exit1
+
+set VMWARE_TOOLS_ISO_PATH="%VMWARE_TOOLS_DIR%\%VMWARE_TOOLS_ISO%"
+
+copy /y "%VMWARE_TOOLS_PROGRAM_FILES_ISO%" "%VMWARE_TOOLS_ISO_PATH%"
+
+if not exist "%VMWARE_TOOLS_ISO_PATH%" echo ==^> ERROR: File not found: "%VMWARE_TOOLS_ISO_PATH%" & goto exit1
+
+rmdir /q /s "%VMWARE_TOOLS_PROGRAM_FILES_DIR%\tools-windows" || ver>nul
+
+rmdir "%VMWARE_TOOLS_PROGRAM_FILES_DIR%" || ver>nul
+
+:install_vmware_tools_from_iso
+
+call :install_sevenzip
+if errorlevel 1 goto exit1

 echo ==^> Extracting the VMWare Tools installer
-"%SystemDrive%\Program Files\7-Zip\7z.exe" x -o"%TEMP%\vmware" "%USERPROFILE%\windows.iso" "%VMWARE_INSTALL%"
+7z e -o"%VMWARE_TOOLS_DIR%" "%VMWARE_TOOLS_ISO_PATH%" "%VMWARE_TOOLS_SETUP_EXE%"
+
+@if errorlevel 1 echo ==^> WARNING: Error %ERRORLEVEL% was returned by: 7z e -o"%VMWARE_TOOLS_DIR%" "%VMWARE_TOOLS_ISO_PATH%" "%VMWARE_TOOLS_SETUP_EXE%"
+ver>nul
+
+set VMWARE_TOOLS_SETUP_PATH=%VMWARE_TOOLS_DIR%\%VMWARE_TOOLS_SETUP_EXE%
+
+if not exist "%VMWARE_TOOLS_SETUP_PATH%" echo ==^> Unable to unzip "%VMWARE_TOOLS_ISO_PATH%" & goto exit1
+
+:install_vmware_tools

 echo ==^> Installing VMware tools
-"%TEMP%\vmware\%VMWARE_INSTALL%" /S /v "/qn REBOOT=R ADDLOCAL=ALL"
-
-echo ==^> Cleaning up VMware tools install
-del /F /S /Q "%TEMP%\vmware"
-
-echo ==^> Removing "%USERPROFILE%\windows.iso"
-del /F "%USERPROFILE%\windows.iso"
-
-goto finish
-
+"%VMWARE_TOOLS_SETUP_PATH%" /S /v "/qn REBOOT=R ADDLOCAL=ALL"
+
+@if errorlevel 1 echo ==^> WARNING: Error %ERRORLEVEL% was returned by: "%VMWARE_TOOLS_SETUP_PATH%" /S /v "/qn REBOOT=R ADDLOCAL=ALL"
+ver>nul
+
+goto exit0
+
+::::::::::::
 :virtualbox
+::::::::::::
+
+if exist "%SystemDrive%\Program Files (x86)" (
+  set VBOX_SETUP_EXE=VBoxWindowsAdditions-amd64.exe
+) else (
+  set VBOX_SETUP_EXE=VBoxWindowsAdditions-x86.exe
+)
+
+for %%i in ("%VBOX_ISO_URL%") do set VBOX_ISO=%%~nxi
+set VBOX_ISO_DIR=%TEMP%\vmware
+set VBOX_ISO_PATH=%VBOX_ISO_DIR%\%VBOX_ISO%
+set VBOX_ISO=VBoxGuestAdditions.iso
+
+mkdir "%VBOX_ISO_DIR%"
+pushd "%VBOX_ISO_DIR%"
+
+set VBOX_SETUP_PATH=
+
+@for %%i in (%PACKER_SEARCH_PATHS%) do @if not defined VBOX_SETUP_PATH @if exist "%%~i\%VBOX_SETUP_EXE%" set VBOX_SETUP_PATH=%%~i\%VBOX_SETUP_EXE%
+
+if defined VBOX_SETUP_PATH goto install_vbox_guest_additions
+
+set VBOX_ISO_PATH=
+
+@for %%i in (%PACKER_SEARCH_PATHS%) do @if not defined VBOX_ISO_PATH @if exist "%%~i\%VBOX_ISO%" set VBOX_ISO_PATH=%%~i\%VBOX_ISO%
+
+if defined VBOX_ISO_PATH goto install_vbox_guest_additions_from_iso
+
+if exist "%SystemRoot%\_download.cmd" (
+  call "%SystemRoot%\_download.cmd" "%VBOX_ISO_URL%" "%VBOX_ISO_PATH%"
+) else (
+  echo ==^> Downloadling "%VBOX_ISO_URL%" to "%VBOX_ISO_PATH%"
+  powershell -Command "(New-Object System.Net.WebClient).DownloadFile('%VBOX_ISO_URL%', '%VBOX_ISO_PATH%')" <NUL
+)
+if not exist "%VBOX_ISO_PATH%" goto exit1
+
+:install_vbox_guest_additions_from_iso
+
+call :install_sevenzip
+if errorlevel 1 goto exit1

 echo ==^> Extracting the VirtualBox Guest Additions installer
-"%SystemDrive%\Program Files\7-Zip\7z.exe" x -o"%TEMP%\virtualbox" "%USERPROFILE%\VBoxGuestAdditions.iso" "%VBOX_INSTALL%"
+7z e -o"%VBOX_ISO_DIR%" "%VBOX_ISO_PATH%" "%VBOX_SETUP_EXE%"
+
+@if errorlevel 1 echo ==^> WARNING: Error %ERRORLEVEL% was returned by: 7z e -o"%VBOX_ISO_DIR%" "%VBOX_ISO_PATH%" "%VBOX_SETUP_EXE%"
+ver>nul
+
+set VBOX_SETUP_PATH=%VBOX_ISO_DIR%\%VBOX_SETUP_EXE%
+
+if not exist "%VBOX_SETUP_PATH%" echo ==^> Unable to unzip "%VBOX_ISO_PATH%" & goto exit1
+
+:install_vbox_guest_additions
+
+if not exist a:\oracle-cert.cer echo ==^> ERROR: File not found: a:\oracle-cert.cer & goto exit1

 echo ==^> Installing Oracle certificate to keep install silent
 certutil -addstore -f "TrustedPublisher" a:\oracle-cert.cer

 echo ==^> Installing VirtualBox Guest Additions
-"%TEMP%\virtualbox\%VBOX_INSTALL%" /S
-
-echo ==^> Cleaning up VirtualBox Guest Additions install
-del /F /S /Q "%TEMP%\virtualbox"
-
-echo ==^> Removing "%USERPROFILE%\VBoxGuestAdditions.iso"
-del /F "%USERPROFILE%\VBoxGuestAdditions.iso"
-
-goto finish
-
-:finish
-
-exit 0
+"%VBOX_SETUP_PATH%" /S
+
+@if errorlevel 1 echo ==^> WARNING: Error %ERRORLEVEL% was returned by: "%VBOX_SETUP_PATH%" /S
+ver>nul
+
+:exit0
+
+popd
+@ping 127.0.0.1
+@ver>nul
+
+@goto :exit
+
+:exit1
+
+popd
+@ping 127.0.0.1
+@verify other 2>nul
+
+:exit
+
+@echo ==^> Script exiting with errorlevel %ERRORLEVEL%
+@exit /b %ERRORLEVEL%
+


added asm.jar in the classpath

added asm.jar in the classpath

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

--- compile/pdfJavadoc.bat
+++ compile/pdfJavadoc.bat
@@ -4,7 +4,7 @@
 if "%JAVA_HOME%" == "" goto javahome

 SETLOCAL
-set CLASSPATH=mifdoclet.jar;..\classes;..\lib\bouncycastle.jar;..\lib\crimson.jar;..\lib\globus.jar;..\lib\javaxCrypto.jar;..\lib\jaxp.jar;..\lib\jini-core.jar;..\lib\jini-ext.jar;..\lib\reggie.jar;..\lib\bcel.jar;..\lib\sun-util.jar
+set CLASSPATH=mifdoclet.jar;..\classes;..\lib\bouncycastle.jar;..\lib\crimson.jar;..\lib\globus.jar;..\lib\javaxCrypto.jar;..\lib\jaxp.jar;..\lib\jini-core.jar;..\lib\jini-ext.jar;..\lib\reggie.jar;..\lib\bcel.jar;..\lib\asm.jar;..\lib\sun-util.jar
 echo %CLASSPATH%

 echo Filtering html doc-files...