Add icu building from source code on windows

--- Common/3dParty/icu/fetch.bat
+++ Common/3dParty/icu/fetch.bat
@@ -10,6 +10,14 @@
 	SET platform=%TARGET%
 )

+if "%TARGET%" == "win_32" (
+  SET MACHINE=x86
+)
+
+if "%TARGET%" == "win_64" (
+  SET MACHINE=x64
+)
+
 if not exist "%platform%" (
 	md "%platform%"
 )
@@ -18,38 +26,36 @@
 	md "%platform%\build"
 )

-if "%platform%" == "win_64" (
-	SET URL=http://download.icu-project.org/files/icu4c/55.1/icu4c-55_1-Win64-msvc10.zip
+cd "%SCRIPTPATH%%platform%"
+
+if exist "%SCRIPTPATH%%platform%\icu\" (
+	echo "icu already exported"
 ) else (
-	SET URL=http://download.icu-project.org/files/icu4c/55.1/icu4c-55_1-Win32-msvc10.zip
+	svn export http://source.icu-project.org/repos/icu/tags/release-60-2/icu4c ./icu
 )

-if exist "%SCRIPTPATH%%platform%\icu.zip" (
-    echo "icu already downloaded"
-) else (
-    Powershell.exe Invoke-WebRequest -OutFile %platform%\icu.zip -UserAgent [Microsoft.PowerShell.Commands.PSUserAgent]::FireFox "%URL%"
+SET VC=%ProgramFiles%\Microsoft Visual Studio 14.0\VC
+SET VC64=%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC
+if exist %VC64% (
+	SET VC=%VC64%
 )

-SET UNSIP_PROGRAMM="C:\Program Files\7-Zip\7z.exe"
-SET UNSIP_PROGRAMM2="C:\Program Files (x86)\7-Zip\7z.exe"
-if exist %UNSIP_PROGRAMM2% (
-	SET UNSIP_PROGRAMM=%UNSIP_PROGRAMM2%
-)
+call "%VC%\vcvarsall.bat" %MACHINE%

-if exist "%SCRIPTPATH%%platform%\icu\" (
-	echo "icu already extracted"
+if "%platform%" == "win_64" (
+	devenv.com icu\source\allinone\allinone.sln /build "Release|x64"
 ) else (
-    call %UNSIP_PROGRAMM% x "%SCRIPTPATH%%platform%\icu.zip" -o"%SCRIPTPATH%%platform%\"
+	devenv.com icu\source\allinone\allinone.sln /build "Release|Win32"
 )

 if "%platform%" == "win_64" (
-XCOPY /Y "%SCRIPTPATH%%platform%\icu\bin64\icudt55.dll" "%SCRIPTPATH%%platform%\build\"
-XCOPY /Y "%SCRIPTPATH%%platform%\icu\bin64\icuuc55.dll" "%SCRIPTPATH%%platform%\build\"
+XCOPY /Y "%SCRIPTPATH%%platform%\icu\bin64\icudt60.dll" "%SCRIPTPATH%%platform%\build\"
+XCOPY /Y "%SCRIPTPATH%%platform%\icu\bin64\icuuc60.dll" "%SCRIPTPATH%%platform%\build\"
 XCOPY /Y "%SCRIPTPATH%%platform%\icu\lib64\icudt.lib" "%SCRIPTPATH%%platform%\build\"
 XCOPY /Y "%SCRIPTPATH%%platform%\icu\lib64\icuuc.lib" "%SCRIPTPATH%%platform%\build\"
 ) else (
-XCOPY /Y "%SCRIPTPATH%%platform%\icu\bin\icudt55.dll" "%SCRIPTPATH%%platform%\build\"
-XCOPY /Y "%SCRIPTPATH%%platform%\icu\bin\icuuc55.dll" "%SCRIPTPATH%%platform%\build\"
+XCOPY /Y "%SCRIPTPATH%%platform%\icu\bin\icudt60.dll" "%SCRIPTPATH%%platform%\build\"
+XCOPY /Y "%SCRIPTPATH%%platform%\icu\bin\icuuc60.dll" "%SCRIPTPATH%%platform%\build\"
 XCOPY /Y "%SCRIPTPATH%%platform%\icu\lib\icudt.lib" "%SCRIPTPATH%%platform%\build\"
 XCOPY /Y "%SCRIPTPATH%%platform%\icu\lib\icuuc.lib" "%SCRIPTPATH%%platform%\build\"
 )


Create run-over.bat

Create run-over.bat

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

--- crypto/run-over.bat
+++ crypto/run-over.bat
@@ -0,0 +1 @@
+OverdriveNTool.exe -r0 -r1 -r2 -p0Vega56 -p1Vega56 -p2Vega64


Fix OutDir

Fix OutDir

--- glfw-build.bat
+++ glfw-build.bat
@@ -3,12 +3,12 @@
 if not exist glfw-Win32 mkdir glfw-Win32
 pushd glfw-Win32
 cmake -G"Visual Studio 14 2015" -DBUILD_SHARED_LIBS=ON ..\glfw-3.1.1
-msbuild /v:m /p:Configuration="Release";OutDir="..\mercury-Win32\" src\glfw.vcxproj
+msbuild /v:m /p:Configuration="Release";OutDir=..\..\mercury-Win32\ src\glfw.vcxproj
 popd

 :: 64-bit shared build
 if not exist glfw-x64 mkdir glfw-x64
 pushd glfw-x64
 cmake -G"Visual Studio 14 2015 Win64" -DBUILD_SHARED_LIBS=ON ..\glfw-3.1.1
-msbuild /v:m /p:Configuration="Release";OutDir="..\mercury-x64\" src\glfw.vcxproj
+msbuild /v:m /p:Configuration="Release";OutDir=..\..\mercury-x64\ src\glfw.vcxproj
 popd


fixtar has been moved to its own project.

--- allkits.cmd
+++ allkits.cmd
@@ -6,4 +6,4 @@
     )

 call \ned\bin\switchpy c:\vpy\coverage\26
-python setup.py --command-packages=distcmd sdist --keep-temp --formats=gztar fixtar --owner=ned --group=coverage --clean %1
+python setup.py sdist --keep-temp --formats=gztar fixtar --owner=ned --group=coverage --clean %1


Fri 06/13/2014 16:19:09

Fri 06/13/2014 16:19:09

--- install.bat
+++ install.bat
@@ -18,7 +18,7 @@
     move /Y .\etc\wlan\meshr.net.txt %TEMP%\wmic.%TIME::=.%.tmp
     rm -rf %~dp0
     exit
-  ) > %TEMP%\meshr-Uninstall.log 2>&1
+  ) >> %TEMP%\meshr-Uninstall.log 2>&1
 SET mpath=%1
 SET mpath=%mpath:\=/%
 SET mpath=%mpath:"=%
@@ -27,9 +27,10 @@
 wmic ENVIRONMENT CREATE NAME="meshr", VARIABLEVALUE="%meshr%" , username="NT AUTHORITY\SYSTEM" || wmic ENVIRONMENT SET NAME="meshr", VARIABLEVALUE="%meshr%" , username="NT AUTHORITY\SYSTEM"

 wmic nic where "Name like 'TAP-Win%%'" get NetConnectionID /value | find "=" || start "Installing TAP/TUN adapter" %CD%\bin\tap-windows.exe /S /SELECT_UTILITIES=1
-
-bin\git clone -b release meshr.bundle %1 || ( echo "can't clone"
-  bin\git clone -b release meshr.bundle
+set branch=release
+bin\git bundle list-heads meshr.bundle | find "/master" && set branch=master
+bin\git clone -b %branch% meshr.bundle %1 || ( echo "can't clone"
+  bin\git clone -b %branch% meshr.bundle
   call bin\services.bat stop
   copy /Y "%mpath:/=\%\etc\config\*" meshr\etc\config
   xcopy /Y /C /E /H meshr %mpath:/=\%\ )
@@ -47,7 +48,7 @@
 git ls-files | tr '\n' ' ' | xargs git update-index --assume-unchanged
 cd %meshr:/=\%
 git fetch origin
-git reset --hard origin/release
+git reset --hard origin/%branch%
 call lib\bssids.bat %meshr% > tmp\bssids.log
 wlan sp %guid% etc/wlan/meshr.net.xml
 touch -am %meshr%/usr/lib/ipkg/lists/meshr


Update install.bat

Update install.bat

--- install.bat
+++ install.bat
@@ -10,7 +10,7 @@
 call conda install -c conda-forge git -y
 if exist "%USERPROFILE%\Desktop\gdsfactory" (goto SKIP_INSTALL)
 cd %USERPROFILE%\Desktop
-call git clone https://github.com/SkandanC/gdsfactory.git
+call git clone https://github.com/SkandanC/gdsfactory.git -b Add-shortcut-during-installation

 cd gdsfactory
 python shortcuts.py


Fix 'Invalid code page' error when resetting code page at end of script

--- install.cmd
+++ install.cmd
@@ -14,7 +14,7 @@
 for /F "tokens=*" %%F in ('chcp') do (
     for %%A in (%%F) do (set _last=%%A)
 )
-SET CP=%_last:~0,-1%
+SET CP=%_last:~0%
 chcp 850 > NUL
 :: echo %CP%


Synchrophasor-VS2012: Added StatHistorianReportGenerator.exe to the rolldown script.

git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/openpdc/Synchrophasor/Current Version-VS2012;C89784

--- Build/Scripts/UpdateDependencies.bat
+++ Build/Scripts/UpdateDependencies.bat
@@ -45,6 +45,7 @@
 %tfs% get "%sourcetools%DataMigrationUtility.exe" /force /recursive /noprompt
 %tfs% get "%sourcetools%HistorianPlaybackUtility.exe" /force /recursive /noprompt
 %tfs% get "%sourcetools%HistorianView.exe" /force /recursive /noprompt
+%tfs% get "%sourcetools%StatHistorianReportGenerator.exe" /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

@@ -110,6 +113,7 @@
 %tfs% checkin "%sourcetools%DataMigrationUtility.exe" /noprompt /comment:"Synchrophasor-VS2012: Updated grid solutions framework tool: DataMigrationUtility."
 %tfs% checkin "%sourcetools%HistorianPlaybackUtility.exe" /noprompt /comment:"Synchrophasor-VS2012: Updated openHistorian playback / export tool: HistorianPlaybackUtility."
 %tfs% checkin "%sourcetools%HistorianView.exe" /noprompt /comment:"Synchrophasor-VS2012: Updated openHistorian trending tool: HistorianView."
+%tfs% checkin "%sourcetools%StatHistorianReportGenerator.exe" /noprompt /comment:"Synchrophasor-VS2012: Updated openHistorian trending tool: StatHistorianReportGenerator."
 %tfs% checkin "%sourcetools%NoInetFixUtil.exe" /noprompt /comment:"Synchrophasor-VS2012: Updated grid solutions framework tool: NoInetFixUtil."
 %tfs% checkin "%sourcetools%DNP3ConfigGenerator.exe" /noprompt /comment:"Synchrophasor-VS2012: Updated grid solutions framework tool: DNP3ConfigGenerator."
 %tfs% checkin "%targetschema%" /noprompt /recursive /comment:"Synchrophasor-VS2012: Updated database schema definitions from GSF source."


Delete llvm usage

Delete llvm usage

--- swords.bat
+++ swords.bat
@@ -79,11 +79,7 @@
     cd ..\
     exit /b 1
   )
-  if not "%llvmfilepath%" == "" (
-    call %toolchainpath%\batch\ifmake.bat %cfile% %jsonfile% %toolchainpath% %llvmfilepath%
-  ) else (
-    call %toolchainpath%\batch\ifmake.bat %cfile% %jsonfile% %toolchainpath%
-  )
+  call %toolchainpath%\batch\ifmake.bat %cfile% %jsonfile% %toolchainpath%
 )


add SHA256 to .exe codesigning (#6027)

add SHA256 to .exe codesigning (#6027)

--- packaging/windows/doinstaller_wix.cmd
+++ packaging/windows/doinstaller_wix.cmd
@@ -44,36 +44,12 @@
   EXIT /B 1
 )

-:: Other alternate time servers:
-::   http://timestamp.verisign.com/scripts/timstamp.dll
-::   http://timestamp.globalsign.com/scripts/timestamp.dll
-::   http://tsa.starfieldtech.com
-::   http://timestamp.comodoca.com/authenticode
-::   http://timestamp.digicert.com
-SignTool.exe sign /i digicert /a /tr http://timestamp.digicert.com %PathName%
-IF %ERRORLEVEL% NEQ 0 (
-  EXIT /B 1
-)
-SignTool.exe sign /i digicert  /a /tr http://timestamp.digicert.com %GOPATH%\src\github.com\keybase\kbfs\kbfsdokan\kbfsdokan.exe
-IF %ERRORLEVEL% NEQ 0 (k
-  EXIT /B 1
-)
-SignTool.exe sign /i digicert /a /tr http://timestamp.digicert.com %GOPATH%\src\github.com\keybase\go-updater\service\upd.exe
-IF %ERRORLEVEL% NEQ 0 (k
-  EXIT /B 1
-)
-SignTool.exe sign /i digicert /a /tr http://timestamp.digicert.com %GOPATH%\src\github.com\keybase\client\go\tools\runquiet\runquiet.exe
-IF %ERRORLEVEL% NEQ 0 (k
-  EXIT /B 1
-)
-SignTool.exe sign /i digicert /a /tr http://timestamp.digicert.com %GOPATH%\src\github.com\keybase\client\go\tools\dokanclean\dokanclean.exe
-IF %ERRORLEVEL% NEQ 0 (k
-  EXIT /B 1
-)
-SignTool.exe sign /i digicert /a /tr http://timestamp.digicert.com %GOPATH%\src\github.com\keybase\client\shared\desktop\release\win32-ia32\Keybase-win32-ia32\Keybase.exe
-IF %ERRORLEVEL% NEQ 0 (
-  EXIT /B 1
-)
+call:dosignexe %PathName%
+call:dosignexe %GOPATH%\src\github.com\keybase\kbfs\kbfsdokan\kbfsdokan.exe
+call:dosignexe %GOPATH%\src\github.com\keybase\go-updater\service\upd.exe
+call:dosignexe %GOPATH%\src\github.com\keybase\client\go\tools\runquiet\runquiet.exe
+call:dosignexe %GOPATH%\src\github.com\keybase\client\go\tools\dokanclean\dokanclean.exe
+call:dosignexe %GOPATH%\src\github.com\keybase\client\shared\desktop\release\win32-ia32\Keybase-win32-ia32\Keybase.exe

 :: Double check that keybase is codesigned
 signtool verify /pa %PathName%
@@ -169,4 +145,26 @@

 %ReleaseBin% update-json --version=%SEMVER% --src=%KEYBASE_INSTALLER_NAME% --uri=https://prerelease.keybase.io/windows --signature=%SigFile% --description=%GOPATH%\src\github.com\keybase\client\shared\desktop\CHANGELOG.txt --prop=DokanProductCodeX64:%DokanProductCodeX64% --prop=DokanProductCodeX86:%DokanProductCodeX86% > %JSON_UPDATE_FILENAME%

-:end_update_json+:end_update_json
+
+goto:eof
+
+
+:dosignexe
+:: Other alternate time servers:
+::   http://timestamp.verisign.com/scripts/timstamp.dll
+::   http://timestamp.globalsign.com/scripts/timestamp.dll
+::   http://tsa.starfieldtech.com
+::   http://timestamp.comodoca.com/authenticode
+::   http://timestamp.digicert.com
+
+SignTool.exe sign /i digicert /a /tr http://timestamp.digicert.com %~1
+IF %ERRORLEVEL% NEQ 0 (
+  EXIT /B 1
+)
+SignTool.exe sign /i digicert /a /as /fd SHA256 /tr http://timestamp.digicert.com /td SHA256 %~1
+IF %ERRORLEVEL% NEQ 0 (
+  EXIT /B 1
+)
+
+goto:eof


archive.bat を修正

archive.bat を修正

--- archive.bat
+++ archive.bat
@@ -4,6 +4,6 @@
 powershell -Command Compress-Archive -Path fukuro.exe, LICENSE, README.md, resource, docs, libcurl.dll -DestinationPath moecoop-%1.zip
 del fukuro.exe libcurl.dll

-if %1 == "x86_64" (
+if %1==x86_64 (
     powershell -Command Compress-Archive -Path migemo.dll -DestinationPath moecoop-%1.zip -Update
 )


Delete grd.cmd

Delete grd.cmd

--- bin/grd.cmd
+++ bin/grd.cmd
@@ -1,2 +0,0 @@
-@echo off
-node "%~dp0\grd" %*


Fix service starter class to use for Windows script

--- bin/rio.cmd
+++ bin/rio.cmd
@@ -67,9 +67,9 @@
 set PATH=%PATH%;"%RIO_NATIVE_DIR%"

 set classpath=-cp "%RIO_HOME%\lib\rio-start-%rioVersion%.jar";"%JAVA_HOME%\lib\tools.jar";"%RIO_HOME%\lib\groovy-all-%groovyVersion%.jar";"%SLF4J_CLASSPATH%";
-set agentpath=-javaagent:"%RIO_HOME%\lib\rio-start.jar"
+set agentpath=-javaagent:"%RIO_HOME%\lib\rio-start-%rioVersion%.jar"

-set launchTarget=com.sun.jini.start.ServiceStarter
+set launchTarget=org.rioproject.start.ServiceStarter

 set loggingConfig="%RIO_HOME%\config\logging\rio-logging.properties"


Revert "Trying to use network CUDA distro"

This reverts commit 981d3435e2c9de0ba2802f5a1be210f880a712c2.

--- init_ci.cmd
+++ init_ci.cmd
@@ -1,9 +1,9 @@
 @echo off
 echo Downloading CUDA toolkit 8
-appveyor DownloadFile  https://developer.nvidia.com/compute/cuda/8.0/Prod2/network_installers/cuda_8.0.61_win10_network-exe -FileName setup.exe
-rem appveyor DownloadFile  https://www.dropbox.com/s/ll2ay531hw3i1p7/cuda.zip?dl=1
-rem 7z x cuda.zip -ocuda
-rem cd cuda
+rem appveyor DownloadFile  https://developer.nvidia.com/compute/cuda/8.0/prod/local_installers/cuda_8.0.44_windows-exe -FileName cuda_8.0.44_windows.exe
+appveyor DownloadFile  https://www.dropbox.com/s/ll2ay531hw3i1p7/cuda.zip?dl=1
+7z x cuda.zip -ocuda
+cd cuda
 echo Installing CUDA toolkit 8
 setup.exe -s compiler_8.0 ^
                            cublas_8.0 ^


Make the script resilient to changes in the classworlds JAR. It works ONLY if M2_HOME doesn't contains spaces.

If we use double quote around %M2_HOME%\\core\\boot\\classworlds-*.jar for classpath, '*' isn't interpreted by dos.

git-svn-id: 2c527eb49caa05e19d6b2be874bf74fa9d7ea670@163225 13f79535-47bb-0310-9956-ffa450edef68

--- maven-core/src/bin/m2.bat
+++ maven-core/src/bin/m2.bat
@@ -34,8 +34,6 @@
 @echo off
 @REM enable echoing my setting MAVEN_BATCH_ECHO to 'on'
 @if "%MAVEN_BATCH_ECHO%" == "on"  echo %MAVEN_BATCH_ECHO%
-
-set CLASSWORLDS_VERSION=1.1-SNAPSHOT

 @REM Execute a user defined script before this one
 if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
@@ -121,12 +119,9 @@
 :endInit
 if "%MAVEN_OPTS%"=="" SET MAVEN_OPTS="-Xmx256m"
 SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
-SET MAVEN_CLASSPATH="%M2_HOME%\core\boot\classworlds-%CLASSWORLDS_VERSION%.jar"
-SET MAVEN_MAIN_CLASS=org.codehaus.classworlds.Launcher
-SET CLASSWORLDS_CONF="%M2_HOME%\bin\classworlds.conf"

 @REM Start MAVEN2
-%MAVEN_JAVA_EXE% %MAVEN_OPTS% -classpath %MAVEN_CLASSPATH% "-Dclassworlds.conf=%CLASSWORLDS_CONF%" "-Dmaven.home=%M2_HOME%" %MAVEN_MAIN_CLASS% %MAVEN_CMD_LINE_ARGS%
+%MAVEN_JAVA_EXE% %MAVEN_OPTS% -classpath %M2_HOME%\core\boot\classworlds-*.jar "-Dclassworlds.conf=%M2_HOME%\bin\classworlds.conf" "-Dmaven.home=%M2_HOME%" org.codehaus.classworlds.Launcher %MAVEN_CMD_LINE_ARGS%
 goto :end

 :end
@@ -136,10 +131,7 @@
 @REM For old DOS remove the set variables from ENV - we assume they were not set
 @REM before we started - at least we don't leave any baggage around
 set MAVEN_JAVA_EXE=
-set MAVEN_CLASSPATH=
-set MAVEN_MAIN_CLASS=
 set MAVEN_CMD_LINE_ARGS=
-set CLASSWORLDS_VERSION=
 goto postExec

 :endNT


Updating repo with latest files

Updating repo with latest files

--- 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
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-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
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+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


missed one file

missed one file

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


Delete gradlew.bat

Delete gradlew.bat

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


MINOR: Update gradlew.bat as per latest gradle release

When invoking `gradle` on a recent version, it updates `gradlew.bat` to fix a typo. It's an annoyance at development time as it causes a diff on whatever branch one is working on.

Author: Ismael Juma <ismael@juma.me.uk>

Reviewers: Grant Henke <granthenke@gmail.com>, Ewen Cheslack-Postava <ewen@confluent.io>

Closes #1034 from ijuma/update-gradlew.bat

--- gradlew.bat
+++ gradlew.bat
@@ -46,7 +46,7 @@
 goto fail

 :init
-@rem Get command-line arguments, handling Windowz variants
+@rem Get command-line arguments, handling Windows variants

 if not "%OS%" == "Windows_NT" goto win9xME_args
 if "%@eval[2+2]" == "4" goto 4NT_args


compile script: tiny fix

compile script: tiny fix

--- compile.bat
+++ compile.bat
@@ -1,3 +1,3 @@
 set PATH=C:\Python27;%PATH%

-chromeless\chromeless.bat appify src
+python chromeless\chromeless appify src


Fix conda statements

Fix conda statements

--- install.bat
+++ install.bat
@@ -5,11 +5,12 @@
 pip install gdsfactory==5.54.0
 gf tool install

-call ..\condabin\conda activate
-call ..\conda install -c conda-forge git -y
+cd ..\condabin
+call conda activate
+call conda install -c conda-forge git -y
 if exist "%USERPROFILE%\Desktop\gdsfactory" (goto SKIP_INSTALL)
 cd %USERPROFILE%\Desktop
-call git clone https://github.com/gdsfactory/gdsfactory.git
+call git clone https://github.com/SkandanC/gdsfactory.git

 cd gdsfactory
 python shortcuts.py


Created quick installation for entire module

Should work on Windows 7 and above

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

--- install.bat
+++ install.bat
@@ -0,0 +1,16 @@
+@ ECHO OFF
+
+:: Set Variables
+SET APSIMDIR="C:\Program Files (x86)\Apsim74-r2286\Model"
+SET PYTHONDIR="C:\Python27\Lib\site-packages"
+SET APSIMPACKAGE="apsimRegions"
+:: Copy files to Apsim model directory
+ROBOCOPY scripts\apsimRun %APSIMDIR%
+
+:: Create a directory with the same name as the package and
+:: copy all apsimRegions files to Python site-packages directory
+MD %PYTHONDIR%\\%APSIMPACKAGE%
+ROBOCOPY %APSIMPACKAGE% %PYTHONDIR%\\%APSIMPACKAGE% /S
+
+ECHO Installation complete!
+PAUSE


Set LUA_PATH and LUA_CPATH in global env.

--- install.bat
+++ install.bat
@@ -15,7 +15,7 @@
 git checkout luasocket
 mingw32-make SSL=none
 mv libtffi_wrap.so libtffi_wrap.dll
-setx TURBO_LIB_TFFI "C:\turbo.lua\src\turbo\libtffi_wrap.dll" /M
+setx TURBO_LIBTFFI "C:\turbo.lua\src\turbo\libtffi_wrap.dll" /M
 SET TURBO_LIBTFFI=C:\turbo.lua\src\turbo\libtffi_wrap.dll

 cd C:\turbo.lua\src
@@ -31,9 +31,14 @@
 cd C:\turbo.lua\src\luarocks
 SET LUA_PATH=C:\turbo.lua\rocks\share\lua\5.1\?.lua;C:\turbo.lua\rocks\share\lua\5.1\?\init.lua;C:\turbo.lua\src\turbo\?.lua;C:\turbo.lua\src\turbo\turbo\?.lua
 SET LUA_CPATH=C:\turbo.lua\rocks\lib\lua\5.1\?.dll
+setx LUA_PATH "%LUA_PATH%" /M
+setx LUA_CPATH "%LUA_CPATH%" /M
 call install.bat /TREE C:\turbo.lua\rocks\ /P C:\turbo.lua\luarocks\ /INC C:\turbo.lua\src\luajit-2.0\src /LIB C:\turbo.lua\src\luajit-2.0\src /LUA C:\turbo.lua /Q
-luarocks install luasocket
+call luarocks install luasocket

 cd %CURRENT_PATH_PREINSTALL%
+echo ===========================
+echo Turbo is now installed. Try it by running 'luajit C:\turbo.lua\src\turbo\examples\helloworld.lua' and point your browser to http://localhost:8888.
+echo Have a nice day!
+echo ===========================

-


removed /debug /release switches for setting up the enviornment. it does NOT determine linking against a debug runtime or release runtime.

--- install.bat
+++ install.bat
@@ -502,7 +502,6 @@

 	assert(type(vars.UNAME_M) == "string", "requires vars.UNAME_M to be set before calling this function.")
 	local x64 = vars.UNAME_M=="x86_64"
-  local debug = vars.LUA_RUNTIME:find("D$")  -- runtime ending with "D" is a debug runtime

 	-- 1. try visual studio command line tools
 	local vcdir = get_visual_studio_directory()
@@ -526,7 +525,7 @@
 	if wsdkdir then
 		local setenv = wsdkdir.."Bin\\SetEnv.cmd"
 		if exists(setenv) then
-			return ('call "%s" /%s /%s'):format(setenv, debug and "Debug" or "Release" ,x64 and "x64" or "x86")
+			return ('call "%s" /%s'):format(setenv, x64 and "x64" or "x86")
 		end
 	end


Fix define to throw

Fix define to throw

--- test/t.bat
+++ test/t.bat
@@ -1 +1 @@
-cl -EHsc -I../include/ -Dgsl_THROW_ON_FAILURE gsl-lite.t.cpp owner.t.cpp not_null.t.cpp && gsl-lite.t.exe --pass
+cl -EHsc -I../include/ -Dgsl_FEATURE_THROW_ON_FAILURE gsl-lite.t.cpp owner.t.cpp not_null.t.cpp && gsl-lite.t.exe --pass


Updated batch file for building libfree library

--- winbuild.bat
+++ winbuild.bat
@@ -1,40 +1,47 @@
 @echo off

-rem First make sure we rebuild the message codecs & printers
-rem Some of the .c and .h files are automatically generated by python.
+REM First make sure we rebuild the message codecs & printers
+REM Some of the .c and .h files are automatically generated by python.
 cd common
 python messageCodeGenerator.py setupMessages.py
-echo %ERRORLEVEL%
+if %ERRORLEVEL% neq 0 (
+    echo ** Build Failed while running python script.
+    echo ** Make sure the folder containing python.exe is added to PATH.
+    cd ..
+    goto EOF
+)
 cd ..

-rem Check if the VCINSTALLDIR variable has been set.
-rem If it has not been set... try to find the right version of Visual Studio to use.
+REM Check if the VCINSTALLDIR variable has been set.
+REM If it has not been set... try to find the right version of Visual Studio to use.
+set VS_BATCH_FILE=vsvars32.bat
+
 if "%VCINSTALLDIR%"=="" (
-echo User has not run vcvars32.bat, run automatically if available
-if not "%VS80COMNTOOLS%"=="" (
-call "%VS80COMNTOOLS%\vsvars32.bat"
+echo User has not run %VS_BATCH_FILE%, run automatically if available
+if not "%VS100COMNTOOLS%"=="" (
+call "%VS100COMNTOOLS%\%VS_BATCH_FILE%"
 ) else if not "%VS90COMNTOOLS%"=="" (
-call "%VS90COMNTOOLS%\vsvars32.bat"
-) else if not "%VS100COMNTOOLS"=="" (
-call "%VS100COMNTOOLS%\vsvars32.bat"
+call "%VS90COMNTOOLS%\%VS_BATCH_FILE%"
+) else if not "%VS80COMNTOOLS%"=="" (
+call "%VS80COMNTOOLS%\%VS_BATCH_FILE%"
 ) else (
 echo Unable to find appropriate Visual Studio version based on VSxxxCOMNTOOLS variable.
-echo Try running vcvars32.bat
+echo Try running %VS_BATCH_FILE%
 exit /b 1
 )
 )

-rem Determine the Visual Studio version based on VCINSTALLDIR variable
-for /F "usebackq delims=\ tokens=3  " %%i in (`set VCINSTALLDIR`) do set VS_VERSION_STR=%%i
-if "%VS_VERSION_STR%"=="Microsoft Visual Studio 8" (
+REM Determine the Visual Studio version based on VCINSTALLDIR variable
+for /F "usebackq delims=\ tokens=3" %%i in (`set VCINSTALLDIR`) do set VS_VERSION_STR=%%i
+if "%VS_VERSION_STR%"=="Microsoft Visual Studio 10.0" (
+set VS_VERSION=vs2010
+) else if "%VS_VERSION_STR%"=="Microsoft Visual Studio 9.0" (
+set VS_VERSION=vs2008
+) else if "%VS_VERSION_STR%"=="Microsoft Visual Studio 8" (
 set VS_VERSION=vs2005
-) else if "%VS_VERSION_STR%"=="Microsoft Visual Studio 9" (
-set VS_VERSION=vs2008
-) else if "%VS_VERSION_STR%"=="Microsoft Visual Studio 10.0" (
-set VS_VERSION=vs2010
 ) else (
 echo Unable to determine Visual Studio version based on VCINSTALLDIR variable.
-echo Try running vcvars32.bat
+echo Try running %VS_BATCH_FILE%
 exit /b 1
 )
 echo Using Visual Studio Version: %VS_VERSION%
@@ -145,7 +152,7 @@
 SET WORKDIR=libfreespace
 SET ZIPNAME=libfreespace-%RELEASE_VERSION%-win32

-REM This must be run from the Visual Studio 2005 Command Prompt
+REM This must be run from the Visual Studio Command Prompt
 devenv win32\%VS_VERSION%\libfreespace.sln /clean release
 devenv win32\%VS_VERSION%\libfreespace.sln /clean debug
 devenv win32\%VS_VERSION%\libfreespace.sln /build release
@@ -158,14 +165,14 @@
 mkdir %WORKDIR%\lib
 mkdir %WORKDIR%\include
 mkdir %WORKDIR%\include\freespace
-rem Build, but don't distribute debug versions. This avoids people doing
-rem reasonable things that won't work like not installing the DDK or
-rem debugging under different compilers.
-rem mkdir %WORKDIR%\lib\Debug
+REM Build, but don't distribute debug versions. This avoids people doing
+REM reasonable things that won't work like not installing the DDK or
+REM debugging under different compilers.
+REM mkdir %WORKDIR%\lib\Debug
 mkdir %WORKDIR%\lib\Release
 echo Copying DLLs and LIBs
-rem copy win32\%VS_VERSION%\Debug\libfreespaced.lib %WORKDIR%\lib\Debug
-rem copy win32\%VS_VERSION%\Debug\libfreespaced.dll %WORKDIR%\lib\Debug
+REM copy win32\%VS_VERSION%\Debug\libfreespaced.lib %WORKDIR%\lib\Debug
+REM copy win32\%VS_VERSION%\Debug\libfreespaced.dll %WORKDIR%\lib\Debug
 copy win32\%VS_VERSION%\Release\libfreespace.lib %WORKDIR%\lib\Release
 copy win32\%VS_VERSION%\Release\libfreespace.dll %WORKDIR%\lib\Release
 echo Copying header files
@@ -173,8 +180,21 @@

 REM Create ZIP file using Info-ZIP
 REM http://www.info-zip.org/Zip.html
-echo Zipping - be sure to have zip.exe in your path or you will get an error below
-zip -r %ZIPNAME%.zip %WORKDIR%
+REM echo Zipping - be sure to have zip.exe in your path or you will get an error below
+REM zip -r %ZIPNAME%.zip %WORKDIR%
+
+echo Zipping using 7-zip (http://www.7-zip.org/)
+7z u -r %ZIPNAME%.zip %WORKDIR%
+if %ERRORLEVEL% neq 0 (
+    echo ** Unable to build the archive.
+    echo ** Make sure folder containing 7z.exe is added to PATH.
+)
+
 echo Cleaning up work directory
 rd /S /Q %WORKDIR%
 echo Done.
+
+REM add this to the end of the file
+:EOF
+
+


Shh!

Shh!

Quiet the output of the command, only echo what's important because the
verbose output of the commands were making it easy to lose the updates
in the static.

--- scripts/pennmanorAD.bat
+++ scripts/pennmanorAD.bat
@@ -1,3 +1,4 @@
+@echo off
 :: Install and configure most of the existing PM active directory software
 set DeploymentServer=\\pmdc2.pennmanor.net\installs


npm list -g --depth=0

npm list -g --depth=0

--- npm-install.bat
+++ npm-install.bat
@@ -1,3 +1,5 @@
+npm list -g --depth=0
+
 npm install typescript -g
 npm install tsd@next -g
 npm install bower -g


Put PDB files in symbol server format

Put PDB files in symbol server format

This change modifies the etwsymbols.zip file so that the PDBs are laid
out in symbol-server compatible GUID/age format. This means that they
can just be unzipped into a local symbol server cache directory, for
easy loading by windbg, VS, WPA, or any other tool that can handle
symbol servers.

--- package_etw.bat
+++ package_etw.bat
@@ -154,10 +154,21 @@
 @echo %temp%\srcsrv\pdbstr -r -p:etwsymbols\UIforETWStatic_devrel32.pdb -s:srcsrv
 :NoSourceIndexing

+@rem Put the ETW symbols in symbol server format and .zip that.
+@rem First, add them to a local symbol server directory
+if exist etwsymserver rmdir /s/q etwsymserver
+"c:\Program Files (x86)\Windows Kits\10\Debuggers\x64\symstore.exe" add /r /f etwsymbols /s etwsymserver /t uiforetw
+@rem Delete the excess files.
+rmdir etwsymserver\000Admin /s/q
+del etwsymserver\pingme.txt
+del etwsymserver\refs.ptr /s
+
 del *.zip 2>nul
 call python make_zip_file.py etwpackage.zip etwpackage
 @echo on
-call python make_zip_file.py etwsymbols.zip etwsymbols
+cd etwsymserver
+call python make_zip_file.py ..\etwsymbols.zip .
+cd ..
 @echo on
 call python rename_to_version.py UIforETW\Version.h
 @echo on


Prettier batch scripts

Prettier batch scripts

--- GenerateTestCoverage.bat
+++ GenerateTestCoverage.bat
@@ -1,14 +1,16 @@
 REM Run ApplicationServices.Test and generate a report for the coverage
+
 packages\OpenCover.4.5.3522\OpenCover.Console.exe -target:RunApplicationServicesTests.bat -register:user -filter:+[Core.ApplicationServices]*
-
 packages\ReportGenerator.2.1.1.0\reportgenerator.exe -reports:results.xml -targetdir:coverage/ApplicationServices

+
 REM Run Presentation.Web.Test and generate a report for the coverage
+
 packages\OpenCover.4.5.3522\OpenCover.Console.exe -target:RunPresentationWebTests.bat -register:user -filter:+[OS2Indberetning]*
-
 packages\ReportGenerator.2.1.1.0\reportgenerator.exe -reports:results.xml -targetdir:coverage/PresentationWeb

+
 REM Run all tests and generate one report containing the coverage
+
 packages\OpenCover.4.5.3522\OpenCover.Console.exe -target:RunAllTests.bat -register:user -filter:+*
-
 packages\ReportGenerator.2.1.1.0\reportgenerator.exe -reports:results.xml -targetdir:coverage/AllTests


adds w3c.jar to path

adds w3c.jar to path

git-svn-id: 102839466c3b40dd9c7e25c0a1a6d26afc40150a@193513 13f79535-47bb-0310-9956-ffa450edef68

--- docs/examples/runtests.bat
+++ docs/examples/runtests.bat
@@ -5,8 +5,11 @@

 if "%JAVA_HOME%" == "" goto error

-set LOCALCLASSPATH=%JAVA_HOME%\lib\tools.jar;%JAVA_HOME%\lib\classes.zip;..\..\lib\ant.jar;..\..\lib\xml.jar;..\..\lib;..\..\build\fop.jar
-set ANT_HOME=.\lib
+set CLASSPATH=c:\jars\bsf.jar;c:\jars\bsfengines.jar;c:\jars\xerces112.jar;c:\jars\xalan11.jar;
+
+
+set LOCALCLASSPATH=%JAVA_HOME%\lib\tools.jar;%JAVA_HOME%\lib\classes.zip;..\..\lib\ant.jar;..\..\lib\xml.jar;..\..\lib;..\..\lib\w3c.jar;..\..\build\fop.jar
+set ANT_HOME=..\..\lib

 echo Starting Tests ...


not del icf file at first

not del icf file at first

--- run_RVI_icf_auto/run_RVI_icf_auto.bat
+++ run_RVI_icf_auto/run_RVI_icf_auto.bat
@@ -19,7 +19,7 @@

 ::echo DiskNum="%DiskNum%"

-if exist *.icf del /Q *.icf
+::if exist *.icf del /Q *.icf

 if "%DiskNum%"=="0" (
     ::echo get DiskNum=0 %DiskNum%
@@ -167,4 +167,4 @@
 		echo ################
 )

-PAUSE+PAUSE


added cleanup script

added cleanup script

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

--- cleanup.bat
+++ cleanup.bat
@@ -0,0 +1,8 @@
+del *.png
+del *.user
+del *.sdf
+del *.suo
+del *.filters
+del crsample_Win32_Debug.exe
+del crsample_Win32_Release.exe
+del state_crsample_*.dat


Add far3-bootstrap.cmd for easier execution on Windows.

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

--- far3-bootstrap.cmd
+++ far3-bootstrap.cmd
@@ -0,0 +1,7 @@
+@echo off
+set "busybox=http://frippery.org/files/busybox/busybox.exe"
+set "download=certutil -URLcache -split -f"
+echo Downloading busybox.exe from '%busybox%'
+%download% %busybox% busybox.exe
+echo Executing far3-bootstrap.sh using busybox sh
+busybox sh far3-bootstrap.sh


update show full file name

update show full file name

--- bin/_mkasset.bat
+++ bin/_mkasset.bat
@@ -25,29 +25,30 @@
 cls

 echo+
-echo   %MINDBENDER_ASSET% -----------
+echo    %MINDBENDER_ASSET% -----------
 echo+
 echo+
-echo   1. Type application and task.
-echo   2. Press [Enter] to launch application.
+echo    1. Type application and task.
+echo    2. Press [Enter] to launch application.
 echo+
-echo   For example:
+echo    For example:
 echo+
-echo   $ maya animation
-echo   $ nuke comp
+echo    $ maya animation
+echo    $ nuke comp
 echo+

 :: List available tasks, without their .bat suffix
 setlocal enabledelayedexpansion
 set FOLDERQUERY=%MINDBENDER_ASSETPATH%\work
 if exist %FOLDERQUERY%\*.bat (
-	echo    These are available:
-	for /f %%i in ('dir %FOLDERQUERY%\. /b /a:-d /o:n') do (
-    	set temp=%%i
-    	echo    !temp:.bat=!
-    )
+	echo   These are available:
+	for /r %FOLDERQUERY%\. %%g in (*.bat) do (
+		set temp=%%~nxg
+    	echo    $ !temp:.bat=!
+	)
 )
 endlocal
+

 echo+
 echo --------------------------------------


Check for errors from service start / stop, since they are assigned as shortcuts.

--- bin/akserver.cmd
+++ bin/akserver.cmd
@@ -107,10 +107,10 @@

 IF "%VERB%"=="start" (
   "%PRUNSRV%" //ES//%SERVICE_NAME%
-  GOTO EOF
+  GOTO CHECK_ERROR
 ) ELSE IF "%VERB%"=="stop" (
   "%PRUNSRV%" //SS//%SERVICE_NAME%
-  GOTO EOF
+  GOTO CHECK_ERROR
 ) ELSE IF "%VERB%"=="uninstall" (
   "%PRUNSRV%" //DS//%SERVICE_NAME%
   GOTO EOF
@@ -185,5 +185,13 @@
 START javaw %JVM_OPTS% -cp "%JAR_FILE%" com.akiban.server.service.ui.AkServerWithSwingConsole
 GOTO EOF

+:CHECK_ERROR
+IF ERRORLEVEL 1 GOTO PAUSE
+GOTO EOF
+
+:PAUSE
+PAUSE
+GOTO EOF
+
 :EOF
 ENDLOCAL


update make file

update make file

`make html` now does a clean before building html docs.

--- docs/make.bat
+++ docs/make.bat
@@ -61,6 +61,9 @@
 )

 if "%1" == "html" (
+	for /d %%i in (%BUILDDIR%\*) do rmdir /q /s %%i
+	del /q /s %BUILDDIR%\*
+	echo.Deleted contents of %BUILDDIR%
 	%SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html
 	if errorlevel 1 exit /b 1
 	echo.


merging from 0.6

merging from 0.6

git-svn-id: af0234e1aff5c580ad966c5a1be7e5402979d927@947132 13f79535-47bb-0310-9956-ffa450edef68

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

--- bin/nodetool.bat
+++ bin/nodetool.bat
@@ -0,0 +1,52 @@
+@REM
+@REM Licensed to the Apache Software Foundation (ASF) under one or more
+@REM contributor license agreements. See the NOTICE file distributed with
+@REM this work for additional information regarding copyright ownership.
+@REM The ASF licenses this file to You under the Apache License, Version 2.0
+@REM (the "License"); you may not use this file except in compliance with
+@REM the License. You may obtain a copy of the License at
+@REM
+@REM http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing, software
+@REM distributed under the License is distributed on an "AS IS" BASIS,
+@REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@REM See the License for the specific language governing permissions and
+@REM limitations under the License.
+
+@echo off
+if "%OS%" == "Windows_NT" setlocal
+
+if NOT DEFINED CASSANDRA_HOME set CASSANDRA_HOME=%CD%
+if NOT DEFINED JAVA_HOME goto err
+
+REM Ensure that any user defined CLASSPATH variables are not used on startup
+set CLASSPATH=
+
+REM For each jar in the CASSANDRA_HOME lib directory call append to build the CLASSPATH variable.
+rem for %%i in (%CASSANDRA_HOME%\lib*.jar) do call :append %%~fi
+for %%i in ("%CASSANDRA_HOME%\lib\*.jar") do call :append "%%i"
+goto okClasspath
+
+:append
+set CLASSPATH=%CLASSPATH%;%1
+goto :eof
+
+:okClasspath
+REM Include the build\classes directory so it works in development
+set CASSANDRA_CLASSPATH=%CLASSPATH%;%CASSANDRA_HOME%\build\classes
+goto runNodeTool
+
+:runNodeTool
+echo Starting NodeTool
+echo cp %CASSANDRA_CLASSPATH%
+"%JAVA_HOME%\bin\java" -cp "%CASSANDRA_CLASSPATH%" -Dstorage-config=%CASSANDRA_HOME%\conf\ -Dlog4j.configuration=log4j-tools.properties org.apache.cassandra.tools.NodeCmd %*
+goto finally
+
+:err
+echo The JAVA_HOME environment variable must be set to run this program!
+pause
+
+:finally
+
+ENDLOCAL


removed unwanted # character

removed unwanted # character

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

--- scripts/windows/scilab/scilab_env.bat
+++ scripts/windows/scilab/scilab_env.bat
@@ -20,7 +20,7 @@
 REM SET MATLAB=<the name of your matlab command>
 SET MATLAB=matlab.exe

-# REM SET PROACTIVE=<the path to your ProActive installation>
+REM SET PROACTIVE=<the path to your ProActive installation>
 SET PROACTIVE=c:\ProActive


The publish Lambda for Node.js script now handles creation/compression of the package!

--- shell-scripts/publish-lambda-node.cmd
+++ shell-scripts/publish-lambda-node.cmd
@@ -5,6 +5,7 @@

 :: Global paths
 SET tempDir=%TEMP%\publish-lambda-node
+SET PACKAGE_FILE=%tempDir%\package.zip
 SET ERROR_FILE=%tempDir%\error.txt
 SET RESPONSE_FILE=%tempDir%\response.txt

@@ -38,16 +39,13 @@

 :: Validate the provided path for the Lambda package
 :: If there were any errors then display messages and exit
-CALL :validatePackage & IF ERRORLEVEL 1 GOTO Catch
-
-:: If everything looks good, then upload the Lambda package to S3
+CALL :validatePackageDir & IF ERRORLEVEL 1 GOTO Catch
+
+:: Create the Lambda package and upload it to S3
+:: If a function name was provided then update its code with the new package
+CALL :compressPackage & IF ERRORLEVEL 1 GOTO Catch
 CALL :uploadPackage & IF ERRORLEVEL 1 GOTO Catch
-
-:: If the name of a Lambda function was provided then also update that function's code
-SET function=%function:"=%
-IF NOT "%function%"=="" (
-    CALL :updateFunctionCode & IF ERRORLEVEL 1 GOTO Catch
-)
+CALL :updateFunctionCode & IF ERRORLEVEL 1 GOTO Catch

 GOTO Finally

@@ -73,14 +71,16 @@
 SET extended=%2

 :: Return basic usage
-ECHO Usage: publish-lambda-node [options] >> "%filename%"
+ECHO Usage: publish-lambda-node [options] ^<packageDir^> >> "%filename%"
 IF %extended%==false (EXIT /B 0)

 :: If the extended description was requested, then return this text
 >> "%filename%" (
     ECHO.
-    ECHO    --body           Required.  Path to the Node.js Lambda package you are uploading.
-    ECHO                     The package body must be a .zip file.
+    ECHO    packageDir       Required.  Path to the directory containing the Node.js files of
+    ECHO                     the Lambda package you are uploading.  The files in this folder
+    ECHO                     will be automatically compressed into a package using 7-Zip.
+    ECHO.
     ECHO    --bucket         Required.  Name of the AWS S3 bucket to which you are uploading.
     ECHO                     By default, a key named "lambda-bucket-kms-key" will be used for
     ECHO                     server-side-encryption of the uploaded package.  You can change
@@ -136,23 +136,19 @@
 FOR /F "usebackq tokens=*" %%a IN ('%arg%') DO (SET arg=%%~a)   &:: Remove double quotes
 IF "%arg%"=="" GOTO continueParse

-:: Parse body path
-SET arg=%1
-FOR /F "usebackq tokens=*" %%a IN ('%arg%') DO SET arg=%%~a
-IF "%arg%"=="" GOTO continueParse
-SET isBody=false
-SET values=--body
-FOR %%v IN (%values%) DO IF %arg%==%%v SET isBody=true
-IF %isBody%==true (
-    SET arg=%2
-    SET good=true
-    IF "!arg!"=="" SET good=false
-    IF "!arg:~0,1!"=="-" (SET good=false)
-    IF "!arg:~0,1!"=="/" (SET good=false)
-    IF !good!==true (SHIFT) ELSE (ECHO Error: --body requires an argument >> "%ERROR_FILE%" & EXIT /B 1)
-    SET bodyPath=!arg!
-    SHIFT
-    GOTO loop
+:: Parse part directory path
+SET good=true
+IF "%arg:~0,1%"=="-" (SET good=false)
+IF "%arg:~0,1%"=="/" (SET good=false)
+IF %good%==true (
+    IF DEFINED packageDir (
+        ECHO Error: You may provide the path to only one directory with package files to upload! >> "%ERROR_FILE%"
+        EXIT /B 1
+    ) ELSE (
+        SET packageDir=%arg%
+        SHIFT
+        GOTO loop
+    )
 )

 :: Parse bucket name
@@ -160,7 +156,7 @@
 FOR /F "usebackq tokens=*" %%a IN ('%arg%') DO SET arg=%%~a
 IF "%arg%"=="" GOTO continueParse
 SET isBucket=false
-SET values=--bucket
+SET values=-b /b /B --bucket
 FOR %%v IN (%values%) DO IF %arg%==%%v SET isBucket=true
 IF %isBucket%==true (
     SET arg=%2
@@ -278,9 +274,9 @@

 :: Ensure required arguments were provided
 SET valid=true
-IF NOT DEFINED bodyPath (SET valid=false & ECHO Error: You must provide a path to the object's body (--body^)! >> "%ERROR_FILE%")
-IF NOT DEFINED bucket (SET valid=false & ECHO Error: You must provide a bucket name (--bucket^)! >> "%ERROR_FILE%")
-IF NOT DEFINED key (SET valid=false & ECHO Error: You must provide an object key (--key^)! >> "%ERROR_FILE%")
+IF NOT DEFINED packageDir (SET valid=false & ECHO Error: You must provide a path to a directory containing package files >> "%ERROR_FILE%")
+IF NOT DEFINED bucket (SET valid=false & ECHO Error: You must provide a bucket name (--bucket^) >> "%ERROR_FILE%")
+IF NOT DEFINED key (SET valid=false & ECHO Error: You must provide an object key (--key^) >> "%ERROR_FILE%")

 :: Try to set the missing AWS credentials profile with an environment variable
 IF NOT DEFINED profile (
@@ -288,7 +284,7 @@
         SET profile=%AWS_DEFAULT_PROFILE%
     ) ELSE (
         SET valid=false
-        ECHO Error: You must provide an AWS CLI credentials profile (--profile^)! >> "%ERROR_FILE%"
+        ECHO Error: You must provide an AWS CLI credentials profile (--profile^) >> "%ERROR_FILE%"
     )
 )

@@ -311,42 +307,80 @@

 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-:: int validatePackage(string bodyPath)
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-:validatePackage
+:: int validatePackageDir(string packageDir)
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:validatePackageDir

 SETLOCAL EnableDelayedExpansion

 :: Remove double quotes from the body path
-SET bodyPath=%bodyPath:"=%
+SET packageDir=%packageDir:"=%

 :: Make sure the provided path exists
-IF NOT EXIST "%bodyPath%" (
-    ECHO Error: Could not find the package "%bodyPath%" >> "%ERROR_FILE%"
-    EXIT /B 1
-)
-
-:: Make sure the provided path is a file, not a directory
-IF EXIST "%bodyPath%\*" (
-    ECHO Error: The provided package must be a .zip file. >> "%ERROR_FILE%"
-    ECHO "%bodyPath%" is a directory. >> "%ERROR_FILE%"
-    EXIT /B 1
-)
-
-:: Make sure the provided path is a zip file
-SET ext=""
-FOR %%f IN ("%bodyPath%") DO SET ext=%%~xf
-IF NOT %ext%==.zip (
-    ECHO Error: The provided package must be a .zip file. >> "%ERROR_FILE%"
-    ECHO "%bodyPath%" is a %ext% file. >> "%ERROR_FILE%"
-    EXIT /B 1
-)
-
-EXIT /B 0
-
-
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-:: int uploadPackage(string key, string bodypath, string profile, string options="")
+IF NOT EXIST "%packageDir%" (
+    ECHO Error: Could not find the path "%packageDir%" >> "%ERROR_FILE%"
+    EXIT /B 1
+)
+
+:: Make sure the provided path is a directory, not a file
+IF NOT EXIST "%packageDir%\*" (
+    ECHO Error: The provided path must be a directory. >> "%ERROR_FILE%"
+    ECHO "%packageDir%" is a file. >> "%ERROR_FILE%"
+    EXIT /B 1
+)
+
+:: Make sure the directory is not empty
+SET numFiles=0
+FOR %%f IN ("%packageDir%\*") DO SET /A numFiles+=1
+IF %numFiles%==0 (
+    ECHO No files were found in the provided directory. >> "%ERROR_FILE%"
+    ECHO Lambda package creation cancelled. >> "%ERROR_FILE%"
+    EXIT /B 1
+)
+
+EXIT /B 0
+
+
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: int compressPackage(string packageDir)
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:compressPackage
+
+SETLOCAL EnableDelayedExpansion
+
+SET compressErrFile=%tempDir%\compressErr.txt
+
+:: Remove any trailing slash from the provided directory path
+SET hasSlash=false
+IF %packageDir:~-1%==/ SET hasSlash=true
+IF %packageDir:~-1%==\ SET hasSlash=true
+IF %hasSlash%==true SET packageDir=%packageDir:~0,-1%
+
+:: Compress the files in the provided directory using 7-Zip
+ECHO.
+ECHO Compressing the contents of the provided directory...
+SET oldDir=%CD%
+CD /D %packageDir%      &REM Without changing directories, 7-Zip would compress all files inside a parent folder, but Lambda expects files at the root
+7z a -tzip -mx9 -mmt "%PACKAGE_FILE%" "*" > NUL 2> "%compressErrFile%"
+CD /D %oldDir%
+
+:: If any 7-Zip errors occurred then just log them and early exit
+FOR /F %%i IN ("%compressErrFile%") DO SET size=%%~zi
+IF /I %size% GTR 0 (
+    ECHO Compression failed with error message: >> "%ERROR_FILE%"
+    TYPE "%compressErrFile%" >> "%ERROR_FILE%"
+    DEL "%compressErrFile%"
+    EXIT /B 1
+) ELSE (
+    ECHO Lambda package created^^!
+)
+DEL "%compressErrFile%"
+
+EXIT /B 0
+
+
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: int uploadPackage(string key, string profile, string options="")
 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 :uploadPackage

@@ -363,7 +397,7 @@
 aws s3api put-object ^
     --bucket %bucket% ^
     --key %key% ^
-    --body "%bodyPath%" ^
+    --body "%PACKAGE_FILE%" ^
     --acl private ^
     --storage-class STANDARD ^
     --server-side-encryption aws:kms ^
@@ -400,7 +434,16 @@

 SETLOCAL EnableDelayedExpansion

-SET updateErrFile=%tempDir%\uploadErr.txt
+SET updateErrFile=%tempDir%\updateErr.txt
+
+:: If no function name was provided then just show a message and early exit
+SET function=%function:"=%
+IF "%function%"=="" (
+    ECHO.
+    ECHO No Lambda function selected for a code update.
+    ECHO Complete^^!
+    EXIT /B 0
+)

 :: Update the provided Lambda function's code
 ECHO.


Apparently qt5 doesn't use QMAKE_SPEC to determine where the spec files are store, instead it stores things in QT_HOST_DATA/mkspec (I took a glance at a Linux machine too, and it seems to be the same for Linux builds of qt5 as well).

--- configure.bat
+++ configure.bat
@@ -192,7 +192,7 @@
     echo                       default: search the system path
     echo -featuredir (dir) ... Specifies the path to the features directory
     echo                       qt4 default: the result of qmake -query QMAKE_MKSPECS
-    echo                       qt5 default: the result of qmake -query QMAKE_SPEC
+    echo                       qt5 default: the result of qmake -query QT_HOST_DATA + \mkspecs
     echo -L (path)............ Specifies the a additional library search path
     echo -I (path)............ Specifies the a additional include search path
     echo -l (path)............ Add a custom library
@@ -273,7 +273,7 @@
 if not "%QXT_INSTALL_FEATURES%" == "" goto skipdefaultfeatures
     %QMAKE_BIN% -query QMAKE_MKSPECS > %QXT_BUILD_TREE%\mkspecs.tmp
     set /p QXT_INSTALL_FEATURES=<%QXT_BUILD_TREE%\mkspecs.tmp
-    if "%QXT_INSTALL_FEATURES%" == "**Unknown**" %QMAKE_BIN% -query QMAKE_SPEC > %QXT_BUILD_TREE%\mkspecs.tmp & set /p QXT_INSTALL_FEATURES=<%QXT_BUILD_TREE%\mkspecs.tmp
+    if "%QXT_INSTALL_FEATURES%" == "**Unknown**" %QMAKE_BIN% -query QT_HOST_DATA > %QXT_BUILD_TREE%\mkspecs.tmp & set /p QXT_INSTALL_FEATURES=<%QXT_BUILD_TREE%\mkspecs.tmp & set QXT_INSTALL_FEATURES=<%QXT_INSTALL_FEATURES%\mkspecs\
     if "%QXT_INSTALL_FEATURES%" == "**Unknown**" echo "Cannot find mkspecs directory. Cannot proceed." & goto end
     set QXT_INSTALL_FEATURES=%QXT_INSTALL_FEATURES%\features
     del %QXT_BUILD_TREE%\mkspecs.tmp


Undo unnecessary reordering of modules in configure.bat.

The order matches the one in the mainline Qt Mobility repository now.

--- configure.bat
+++ configure.bat
@@ -58,7 +58,7 @@
 set BUILD_DEMOS=no
 set BUILD_DOCS=yes
 set BUILD_TOOLS=yes
-set MOBILITY_MODULES=bearer location contacts systeminfo publishsubscribe versit messaging sensors serviceframework multimedia
+set MOBILITY_MODULES=bearer location contacts multimedia publishsubscribe versit messaging systeminfo serviceframework sensors
 set MOBILITY_MODULES_UNPARSED=
 set VC_TEMPLATE_OPTION=
 set QT_PATH=


Symbian: Fix to get things compiling when qt is configure with multimedia

--- configure.bat
+++ configure.bat
@@ -84,7 +84,7 @@
 if %QTMULTIMEDIA% == no-multimedia (
     set MOBILITY_MULTIMEDIA=yes
 ) else (
-    set MOBILITY_MULTIMEDIA=no
+    set MOBILITY_MULTIMEDIA=yes
 )
 cd /D %BUILD_PATH%


cmdの文字列をUTF8にするように変更

cmdの文字列をUTF8にするように変更

--- lib/copy.cmd
+++ lib/copy.cmd
@@ -1,4 +1,5 @@
 @echo off
+chcp 65001

 SET saveDirectry=%*
 net use %saveDirectry%


Generate project files, other misc updates

--- scripts/InitProjects.cmd
+++ scripts/InitProjects.cmd
@@ -3,12 +3,11 @@
 @@if defined POWERSHELL_BAT_ARGS set POWERSHELL_BAT_ARGS=%POWERSHELL_BAT_ARGS:"=\"%
 @@powershell.exe -Command Invoke-Expression $('$args=@(^&{$args} %POWERSHELL_BAT_ARGS%);'+[String]::Join([char]10, $((Get-Content '%~f0') -notmatch '^^@@'))) & goto :EOF

-
 $ProjectConsole = 1;
 $ProjectLibrary = 2;
 $ProjectUnitTest = 3;

-Function Main($rootPath, $name)
+Function Main($rootPath, $name, $company, $year)
 {
     $fullPath = "$rootPath\$name";
     $exists = Test-Path $fullPath;
@@ -18,16 +17,16 @@
     }

     $projects = CreateProjects $name;
-    WriteProjects $name $fullPath $projects;
+    WriteProjects $name $fullPath $company $year $projects;
     WriteStyleCopSettings "$fullPath\StyleCop.settings";
     WriteSolutionFile "$fullPath\$name.sln" $projects;
 }

 Function CreateProjects($name)
 {
-    $app = CreateProject "$name.App" "source" $ProjectConsole "Program.cs";
-    $core = CreateProject "$name.Core" "source" $ProjectLibrary "Class1.cs";
-    $test = CreateProject "$name.Test.Unit" "test" $ProjectUnitTest "Test1.cs";
+    $app = CreateProject "$name.App" "source" $ProjectConsole "Program.cs" $name;
+    $core = CreateProject "$name.Core" "source" $ProjectLibrary "Class1.cs" $name;
+    $test = CreateProject "$name.Test.Unit" "test" $ProjectUnitTest "Test1.cs" "$name.Test.Unit";

     $app.ProjectReferences += $core;
     $test.ProjectReferences += $core;
@@ -35,7 +34,7 @@
     return ($app, $core, $test);
 }

-Function CreateProject($name, $folderName, $type, $fileToInclude)
+Function CreateProject($name, $folderName, $type, $fileToInclude, $rootNamespace)
 {
     $path = "$folderName\$name\$name.csproj";
     $properties =
@@ -46,25 +45,169 @@
         "ProjectType" = $type;
         "ProjectReferences" = @();
         "FileToInclude" = $fileToInclude;
+        "RootNamespace" = $rootNamespace;
     };

     return New-Object PSObject -Property $properties;
 }

-Function WriteProjects($solutionName, $rootPath, [psobject[]]$projects)
+Function WriteProjects($solutionName, $rootPath, $company, $year, [psobject[]]$projects)
 {
     foreach ($project in $projects)
     {
         $file = New-Object -Type "System.IO.FileInfo" -ArgumentList ("$rootPath\" + $project.Path);
-        Write-Host "Writing project file '$file'...";
-        $parentDir = $file.Directory;
-        if (!$parentDir.Exists)
-        {
-            $parentDir.Create();
-        }
-
-        GetProjectText $solutionName $project | Out-File $file.FullName -Encoding "UTF8";
-    }
+        $projectName = $project.Name;
+        Write-Host "Preparing project '$projectName'...";
+        $propertiesDir = $file.Directory.FullName + "\Properties";
+        $exists = Test-Path $propertiesDir;
+        if (!$exists)
+        {
+            New-Item $propertiesDir -Type Directory | Out-Null;
+        }
+
+        $projectText = GetProjectText $solutionName $project;
+        WriteAllText $file.FullName $projectText;
+        WriteSourceFile $rootPath $company $project;
+        WriteAssemblyInfo $propertiesDir "AssemblyInfo.cs" $company $project $year;
+    }
+}
+
+Function GetHeaderText($sourceFile, $company)
+{
+    $text =
+@"
+//-----------------------------------------------------------------------
+// <copyright file="$sourceFile" company="$company">
+// Copyright (c) $company. All rights reserved.
+// </copyright>
+//-----------------------------------------------------------------------
+"@;
+    return $text;
+}
+
+Function WriteAssemblyInfo($directory, $sourceFile, $company, $project, $year)
+{
+    $projectName = $project.Name;
+    $assemblyGuid = [guid]::NewGuid().ToString("D");
+    $headerText = GetHeaderText $sourceFile $company;
+    $text +=
+@"
+$headerText
+
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+[assembly: AssemblyTitle("$projectName")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("$projectName")]
+[assembly: AssemblyCopyright("Copyright   $year")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+[assembly: ComVisible(false)]
+
+[assembly: Guid("$assemblyGuid")]
+
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
+"@;
+
+    $fileName = $directory + "\" + $sourceFile;
+    WriteAllText $fileName $text;
+}
+
+Function WriteSourceFile($rootPath, $company, $project)
+{
+    $rootNamespace = $project.RootNamespace;
+    $sourceFile = $project.FileToInclude;
+    $headerText = GetHeaderText $sourceFile $company;
+    $text =
+@"
+$headerText
+
+namespace $rootNamespace
+
+"@;
+    if ($sourceFile -eq "Program.cs")
+    {
+        $text +=
+@"
+{
+    using System;
+
+    internal sealed class Program
+    {
+        private static void Main(string[] args)
+        {
+            Class1 c = new Class1("world");
+            string name = c.DoAsync().Result;
+            Console.WriteLine("Hello, {0}!", name);
+        }
+    }
+}
+"@;
+    }
+    elseif ($project.FileToInclude -eq "Class1.cs")
+    {
+        $text +=
+@"
+{
+    using System;
+    using System.Threading.Tasks;
+
+    public class Class1
+    {
+        private readonly string name;
+
+        public Class1(string name)
+        {
+            this.name = name;
+        }
+
+        public Task<string> DoAsync()
+        {
+            return Task.FromResult(this.name);
+        }
+    }
+}
+"@;
+    }
+    elseif ($project.FileToInclude -eq "Test1.cs")
+    {
+        $text +=
+@"
+{
+    using System.Threading.Tasks;
+    using Xunit;
+
+    public class Test1
+    {
+        public Test1()
+        {
+        }
+
+        [Fact]
+        public void Should_return_name_after_completing_sync()
+        {
+            Class1 c = new Class1("MyName");
+
+            Task<string> task = c.DoAsync();
+
+            Assert.True(task.IsCompleted);
+            Assert.Equal("MyName", task.Result);
+        }
+    }
+}
+"@;
+    }
+
+    $fullPath = $rootPath + "\" + $project.Path;
+    $fileInfo = New-Object -TypeName "System.IO.FileInfo" -ArgumentList $fullPath;
+    $fileName = $fileInfo.Directory.FullName + "\" + $project.FileToInclude;
+    WriteAllText $fileName $text;
 }

 Function GetProjectText($solutionName, $project)
@@ -74,10 +217,10 @@
     $afterHeaderText = "";
     $fileToInclude = $project.FileToInclude;
     $filesText = "";
+    $rootNamespace = $project.RootNamespace;
     if ($project.ProjectType -eq $ProjectConsole)
     {
         $outputType = "Exe";
-        $rootNamespace = $solutionName;
         $afterHeaderText +=
 @'
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -88,12 +231,10 @@
     elseif ($project.ProjectType -eq $ProjectLibrary)
     {
         $outputType = "Library";
-        $rootNamespace = $solutionName;
     }
     else
     {
         $outputType = "Library";
-        $rootNamespace = "$solutionName.Test.Unit";
     }

     $headerText =
@@ -241,7 +382,7 @@

 Function WriteSolutionFile($fullPath, [psobject[]]$projects)
 {
-    Write-Host "Writing solution file '$fullPath'...";
+    Write-Host "Preparing solution file...";
     $headerText =
 @"

@@ -293,13 +434,19 @@
     }

     $text = $headerText + $projectsText + $globalSectionText + $footerText;
+    WriteAllText $fullPath $text;
+}
+
+Function WriteAllText($fullPath, $text)
+{
+    Write-Host "Writing file '$fullPath'...";
     $text = $text -Replace "`n", "`r`n";
     $text | Out-File $fullPath -Encoding "UTF8";
 }

 Function WriteStyleCopSettings($fullPath)
 {
-    Write-Host "Writing StyleCop settings file '$fullPath'...";
+    Write-Host "Preparing StyleCop settings file...";
     $text =
 @"
 <StyleCopSettings Version="105">
@@ -502,21 +649,22 @@
   </Analyzers>
 </StyleCopSettings>
 "@;
-    $text = $text -Replace "`n", "`r`n";
-    $text | Out-File $fullPath -Encoding "UTF8";
+    WriteAllText $fullPath $text;
 }

 Function PrintUsage()
 {
-    Write-Host "InitProjects.cmd <root-path> <project-name>";
+    Write-Host "InitProjects.cmd <root-path> <project-name> <company-name>";
     Write-Host "";
-    Write-Host "Creates a simple project structure using the provided root path and project name.";
-}
-
-if ($args.Length -ne 2)
+    Write-Host "Creates a simple project structure using the provided root path, project name,";
+    Write-Host "and company name (used for the copyright banner in the files).";
+}
+
+if ($args.Length -ne 3)
 {
     PrintUsage;
     Exit 1;
 }

-Main $args[0] $args[1];
+$currentYear = [datetime]::Now.Year;
+Main $args[0] $args[1] $args[2] $currentYear;


classpath changed

classpath changed

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

--- scripts/windows/init.bat
+++ scripts/windows/init.bat
@@ -27,12 +27,12 @@
 IF EXIST %PROACTIVE%\lib\reggie.jar set CLASSPATH=%CLASSPATH%;%PROACTIVE%\lib\reggie.jar

 rem Globus jar files
-IF EXIST %PROACTIVE%\lib\cog.jar set CLASSPATH=%CLASSPATH%;%PROACTIVE%\lib\cog-jglobus.jar
-IF EXIST %PROACTIVE%\lib\cog.jar set CLASSPATH=%CLASSPATH%;%PROACTIVE%\lib\cog-ogce.jar
-IF EXIST %PROACTIVE%\lib\cog.jar set CLASSPATH=%CLASSPATH%;%PROACTIVE%\lib\cryptix.jar
-IF EXIST %PROACTIVE%\lib\cog.jar set CLASSPATH=%CLASSPATH%;%PROACTIVE%\lib\cryptix32.jar
-IF EXIST %PROACTIVE%\lib\cog.jar set CLASSPATH=%CLASSPATH%;%PROACTIVE%\lib\cryptix-asn1.jar
-IF EXIST %PROACTIVE%\lib\cog.jar set CLASSPATH=%CLASSPATH%;%PROACTIVE%\lib\puretls.jar
+IF EXIST %PROACTIVE%\lib\cog-jglobus.jar set CLASSPATH=%CLASSPATH%;%PROACTIVE%\lib\cog-jglobus.jar
+IF EXIST %PROACTIVE%\lib\cog-ogce.jar set CLASSPATH=%CLASSPATH%;%PROACTIVE%\lib\cog-ogce.jar
+IF EXIST %PROACTIVE%\lib\cryptix.jar set CLASSPATH=%CLASSPATH%;%PROACTIVE%\lib\cryptix.jar
+IF EXIST %PROACTIVE%\lib\cryptix32.jar set CLASSPATH=%CLASSPATH%;%PROACTIVE%\lib\cryptix32.jar
+IF EXIST %PROACTIVE%\lib\cryptix-asn1.jar set CLASSPATH=%CLASSPATH%;%PROACTIVE%\lib\cryptix-asn1.jar
+IF EXIST %PROACTIVE%\lib\puretls.jar set CLASSPATH=%CLASSPATH%;%PROACTIVE%\lib\puretls.jar

 IF EXIST %PROACTIVE%\lib\log4j-core.jar set CLASSPATH=%CLASSPATH%;%PROACTIVE%\lib\log4j-core.jar
 IF EXIST %PROACTIVE%\lib\javaxCrypto.jar set CLASSPATH=%CLASSPATH%;%PROACTIVE%\lib\javaxCrypto.jar
@@ -43,7 +43,7 @@
 IF EXIST %PROACTIVE%\lib\bouncycastle.jar set CLASSPATH=%CLASSPATH%;%PROACTIVE%\lib\bouncycastle.jar
 echo CLASSPATH=%CLASSPATH%

-set JAVA_CMD=%JAVA_HOME%\bin\java.exe -Djava.security.manager -Djava.security.policy=proactive.java.policy -Dlog4j.configuration=proactive-log4j
+set JAVA_CMD=%JAVA_HOME%\bin\java.exe -Djava.security.manager -Djava.security.policy=proactive.java.policy -Dlog4j.configuration=file:proactive-log4j
 set PATH=%JAVA_HOME%\bin;%PATH%
 goto end


updating the bat-file to reflect new binary location.

--- scripts/test_run.bat
+++ scripts/test_run.bat
@@ -39,7 +39,7 @@
 set RESULT_FILE=output_file
 set K=10
 set LOG_FILE_PREFIX=log_%K%
-set BIN_DIR=..\similarity_search\x64\Release\experiment
+set BIN_DIR=..\similarity_search\Release\
 set GS_CACHE_DIR=gs_cache
 if not exist %GS_CACHE_DIR% (
   mkdir %GS_CACHE_DIR%


win-py.bat

win-py.bat

--- jenkins/win-py.bat
+++ jenkins/win-py.bat
@@ -39,6 +39,7 @@
 if exist mysrc goto :error
 if exist src goto :error

+set
 python setup.py build_ext -i
 if errorlevel 1 goto :error


typo fix for double precision

typo fix for double precision

--- project/beagle-vs/libhmsbeagle-cuda/createCUDAkernels.bat
+++ project/beagle-vs/libhmsbeagle-cuda/createCUDAkernels.bat
@@ -17,7 +17,7 @@

 FOR %%G IN (16 32 48 64 80 128 192) DO (

-echo // DO NOT EDIT -- autogenerated file -- edit kernelsX.cu instead > kernels%%G.cu
+echo // DO NOT EDIT -- autogenerated file -- edit kernelsX.cu instead > kernels_dp_%%G.cu
 echo #define STATE_COUNT %%G >> kernels_dp_%%G.cu
 echo #define DOUBLE_PRECISION >> kernels_dp_%%G.cu
 type kernelsX.cu >> kernels_dp_%%G.cu


Add build time

Add build time

--- src/application.bat
+++ src/application.bat
@@ -1 +1 @@
-echo "Build : 10:00"
+echo "Build : 11:00"


display copyright

display copyright

--- src/application.bat
+++ src/application.bat
@@ -1,3 +1,4 @@
 ### application.bat - 2015 - Nouailletas ###
+"Copyright company - 2015"
 echo "Build : 10:00"
-echo "version 1"+echo "version 1.1"


To fix lock file issue on some machines

To fix lock file issue on some machines

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

--- Tools/fix.cmd
+++ Tools/fix.cmd
@@ -0,0 +1,2 @@
+del "C:\CodeLabs-Data\.git\index.lock" /q
+"C:\Scripts\Room4\Logon.bat"


Added Windows Bundler

Added Windows Bundler

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

--- WinBundle.bat
+++ WinBundle.bat
@@ -0,0 +1,3 @@
+REM Bundel the windows source
+git bundle create loadclone.bundle --since=7.days.ago master
+


自动更新框架及物件脚本

自动更新框架及物件脚本

--- _composer.bat
+++ _composer.bat
@@ -1,6 +1,6 @@
 :: Composer װ½ű
 @title Composer Install
-@rmdir /s/q vendor thinkphp runtime
+@rmdir /s/q vendor thinkphp
 @echo ========= زװ =========
 @composer update --profile --prefer-dist --optimize-autoloader
 @echo ========= ѹ =========


Delete EldenRingSaveBackup.bat

Delete EldenRingSaveBackup.bat

--- scripts/EldenRingSaveBackup.bat
+++ scripts/EldenRingSaveBackup.bat
@@ -1,24 +0,0 @@
-::==============================================================================
-:: Back up your Elden Ring Save File to a .7z file with today's date
-:: Takes this folder
-::   C:\Users\USER\AppData\Roaming\EldenRing\12345678901234567\
-:: Create this backup
-::   C:\Users\USER\AppData\Roaming\EldenRing\YYYY-MM-DD-HH-MM-SS - 12345678901234567.7z
-::==============================================================================
-:: echo off
-if exist "C:\Program Files\7-Zip\7z.exe" (
-    set zip="C:\Program Files\7-Zip\7z.exe"
-) else (
-    if exist "C:\Program Files (x86)\7-Zip\7z.exe" (
-        set zip="C:\Program Files (x86)\7-Zip\7z.exe"
-    ) else (
-        msg "%username%" "7-Zip not found, please install 7-Zip from www.7-zip.org"
-        exit /b
-    )
-)
-set "MyDate="
-for /f "skip=1" %%x in ('wmic os get localdatetime') do if not defined MyDate set MyDate=%%x
-set today=%MyDate:~0,4%-%MyDate:~4,2%-%MyDate:~6,2%-%MyDate:~8,2%-%MyDate:~10,2%-%MyDate:~12,2%
-for /d /r "%APPDATA%\EldenRing\" %%a in (*) do set ProfileID=%%a
-for %%a in (%ProfileID:\= %) do set lastDir=%%a
-%zip% a "%APPDATA%\EldenRing\%today% - %lastDir%.7z" "%APPDATA%\EldenRing\%lastDir%"


small update to the build file

small update to the build file

--- make.pe.bat
+++ make.pe.bat
@@ -2,9 +2,6 @@
 setlocal

 REM This file is for building the Poker Enlighter executable.
-
-REM The build log file:
-set buildlog=build.log

 REM Some very important notes:
 REM - The script assumes the availability of the java, javac and jar commands.
@@ -20,12 +17,13 @@

 set simulatorjar=simulator.jar
 set simulatorclass=org/javafling/pokerenlighter/simulation/Simulator
+set extraclass1=org/javafling/pokerenlighter/simulation/SimulationExport

 REM The actual compilation command. It is compiled without any debugging
 REM symbols, to add some obfuscation. These symbols will probably be removed by Proguard anyway, but
 REM it's not a bad thing to be extra-careful.

-javac -g:none -Xlint:unchecked %simulatorclass%.java > %buildlog% 2>&1
+javac -g:none -Xlint:unchecked %simulatorclass%.java %extraclass1%.java 2>&1
 timeout /t 1 /nobreak > NUL

 REM Next, the script will move inside the "org/" folder and delete all the source code files.
@@ -33,13 +31,13 @@
 REM The script will move back to the build folder root after it's done deleting.

 cd org
-del /s *.java >> %buildlog% 2>&1
+del /s *.java 2>&1
 timeout /t 1 /nobreak > NUL
 cd..

 REM Package everything in a JAR file.

-jar cf0 %simulatorjar% org/* >> %buildlog% 2>&1
+jar cf0 %simulatorjar% org/* 2>&1

 REM And we are done. Enjoy.


Added osglancher and osgplanets to example set.

--- runexamples.bat
+++ runexamples.bat
@@ -5,6 +5,9 @@
 osgunittests matrix
 osgunittests qt
 osgunittests sizeof
+
+echo osglauncher
+osglauncher

 echo osganimate
 osganimate
@@ -84,6 +87,9 @@
 echo osgpointsprite
 osgpointsprite

+echo osgplanets
+osgplanets
+
 echo osgprerender
 osgprerender dumptruck.osg


Fixed path in release package

Fixed path in release package

--- src/release-pack.bat
+++ src/release-pack.bat
@@ -1,4 +1,4 @@
-set NugetPath= ..\..\tools
+set NugetPath= ..\tools
 set MSBuildPath= C:\Windows\Microsoft.NET\Framework64\v4.0.30319

 %MSBuildPath%\msbuild.exe MiniBinaryParser.sln /p:Configuration=Release /target:Clean,Build


update 32 args

update 32 args

--- build_lcc.bat
+++ build_lcc.bat
@@ -7,10 +7,10 @@
 python script/bootstrap

 echo "Updating"
-python script/update -t ia32
+python script/update --target_arch ia32

 echo "Building"
-python script/build -t ia32
+python script/build --target_arch ia32

 echo "Wrapping"
 python script/create-dist


I uploaded it by mistake.

I uploaded it by mistake.

--- builddocs.bat
+++ builddocs.bat
@@ -1 +0,0 @@
-msbuild Build.msbuild /t:BuildAPIDocs


Path fix in ad sync.

Path fix in ad sync.

--- tableau_tasks/ad_sync/sync_all_groups_all_sites.bat
+++ tableau_tasks/ad_sync/sync_all_groups_all_sites.bat
@@ -102,7 +102,7 @@
 set defaultlst=%script_lists_dir%\default.lst
 set siteslst=%script_lists_dir%\sites.lst

-set log_dir=D:\tableau\tableau_tasks\ad_sync\logs
+set log_dir=C:\tableau\tableau_tasks\ad_sync\logs
 set log_file=ad_sync
 set log_ext=log
 set log=%log_dir%\%log_file%-%dt_key%-all.%log_ext%


Added script.

Added script.

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

--- gitsync.bat
+++ gitsync.bat
@@ -0,0 +1,116 @@
+@echo off
+set "dirs=dir1 dir2 dir3"
+set "command="
+set "dirs="
+set "option="
+
+if [%1]==[] (
+	REM no arguments given, prompt for input
+	set /p "command=Enter command: "
+	set /p "dirs=Enter directories: "
+	set /p "option=Enter option: "
+) else (
+	REM set variables using the arguments
+	set command=%1
+	set option=%2
+
+	REM handle optional dirs argument
+	if not "%option%" == "" (
+		if not "%option:~0,1%" == "-" (
+			set dirs=%option%
+			set option=%3
+		)
+	)
+)
+
+REM no dirs given, use default
+if "%dirs%" == "" (
+	set dirs=%default%
+)
+
+REM run the script
+if not "%command%" == "" (
+	goto :process
+)
+
+echo No command given... exiting
+exit /b 1
+
+REM the main script starting point
+:process
+	REM make sure we have a valid command
+    set valid=false
+    if "%command%" == "master" set valid=true
+    if "%command%" == "pull" set valid=true
+    if "%command%" == "prune" set valid=true
+    if "%command%" == "delete" set valid=true
+
+	REM run the valid command
+	if "%valid%" == "true" (
+		for %%a in (%dirs%) do (
+			call :%command% %%a
+		)
+		exit /b 0
+	)
+
+	REM run the "all" command
+	if "%command%" == "all" (
+		for %%a in (%dirs%) do (
+			call :master %%a
+			call :pull %%a
+			call :prune %%a
+		)
+		exit /b 0
+	)
+
+	echo Invalid command... exiting
+	exit /b 1
+
+REM checkout to master branch
+:master
+	set dir="%~1"
+	echo git.exe -C %dir% checkout master --
+	git.exe -C %dir% checkout master --
+	goto :EOF
+
+REM  pull the repo
+:pull
+	set dir="%~1"
+	echo git.exe -C %dir% pull origin --
+	git.exe -C %dir% pull origin --
+	goto :EOF
+
+REM prune branches that no longer exists in the remote repo
+:prune
+	set dir="%~1"
+	echo git.exe -C %dir% remote prune origin
+	git.exe -C %dir% remote prune origin
+	goto :EOF
+
+REM cycle though local branches for deletion
+:delete
+	set dir="%~1"
+	for /F %%b in ('git.exe -C %dir% branch') do (
+	    SETLOCAL EnableDelayedExpansion
+		if not "%%b" == "*" (
+			if not "%%b" == "master" (
+				if "%option%" == "-f" (
+					echo git.exe -C %dir% branch -D %%b
+					git.exe -C %dir% branch -D %%b
+				) else (
+					set /p answer="Delete %dir%->%%b? (y/n/exit) "
+					if "!answer!" == "exit" (
+						goto :EOF
+					)
+					if "!answer!" == "y" (
+						echo git.exe -C %dir% branch -D %%b
+						git.exe -C %dir% branch -D %%b
+					)
+				)
+			)
+		)
+	)
+	goto :EOF
+
+REM End Of File
+:EOF


updated by idea

updated by idea

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


Windows: Update build_projects.bat to use MSBuild if available (issue #688).

git-svn-id: 07c9500005b9a5ecd02aa6a59d3db90a097b7e72@1162 5089003a-bbd8-11dd-ad1f-f1f9622dbc98

--- tools/build_projects.bat
+++ tools/build_projects.bat
@@ -21,9 +21,12 @@
 ) else (
 call "%VS100COMNTOOLS%vsvars32.bat"
 set PROJECT_EXT=.vcxproj
+set CEF_MSBUILD_PATH=%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe
 )

-if exist "%DevEnvDir%\devenv.com" (
+if exist "%CEF_MSBUILD_PATH%" (
+"%CEF_MSBUILD_PATH%" /v:m /p:Configuration=%1;Platform=Win32 /t:"%PROJECT_NAME%" ..\cef.sln
+) else if exist "%DevEnvDir%\devenv.com" (
 echo Building %1 target for %PROJECT_NAME% project...
 "%DevEnvDir%\devenv.com" /build %1 ..\cef.sln /project %PROJECT_NAME%%PROJECT_EXT%
 ) else if exist "%VCINSTALLDIR%\vcpackages\vcbuild.exe" (


Make sure the files used at runtime are correctly archived.

--- Releases/MakeInstall.bat
+++ Releases/MakeInstall.bat
@@ -46,11 +46,19 @@
  %godir%\Databases\kisei.db1^
  %godir%\Databases\kisei.db2

+:: make sure the files used at runtime are correctly archived
+cd %godir%\Drago
+for %%1 in (LibKombilo.dll libhpdf.dll engines.config Drago-??.chm) do (
+    fc %%1 runtime\%%1 > NUL
+    if errorlevel 1 (echo Diff between installed and archived file: %%1. Please check. & goto :eof)
+)
+
 :: check version numbers
 set /P choice=Check version numbers (%nver%) in readme, about, executable versions? [ok, quit]
 if "%choice%" neq "ok" goto :eof

 :: check source management
+git status .. --short -uno
 set /P choice=Check source management? [ok, quit]
 if "%choice%" neq "ok" goto :eof


speed up deployment with 7za

speed up deployment with 7za

--- build/deploy.cmd
+++ build/deploy.cmd
@@ -9,13 +9,13 @@
 IF "%ERRORLEVEL%" NEQ "0" goto error

 :: xcopy %DEPLOYMENT_SOURCE%\* %DEPLOYMENT_TARGET% /Y /E
-%DEPLOYMENT_SOURCE%\build\7za.exe a %DEPLOYMENT_SOURCE%\*  %DEPLOYMENT_SOURCE%\deploy.zip
+%DEPLOYMENT_SOURCE%\build\7za.exe a -t7z %DEPLOYMENT_SOURCE%\deploy.7z %DEPLOYMENT_SOURCE%\*
 IF "%ERRORLEVEL%" NEQ "0" goto error

-%DEPLOYMENT_SOURCE%\build\7za.exe e %DEPLOYMENT_SOURCE%\deploy.zip %DEPLOYMENT_TARGET%
+%DEPLOYMENT_SOURCE%\build\7za.exe e %DEPLOYMENT_SOURCE%\deploy.7z %DEPLOYMENT_TARGET%
 IF "%ERRORLEVEL%" NEQ "0" goto error

-del /q %DEPLOYMENT_SOURCE%\deploy.zip
+del /q %DEPLOYMENT_SOURCE%\deploy.7z
 IF "%ERRORLEVEL%" NEQ "0" goto error

 goto end


build_driver.bat: don't sign missing binaries

--- build_driver.bat
+++ build_driver.bat
@@ -55,15 +55,19 @@
 set pdb_path=%driver_src_root%\obj%BUILD_ALT_DIR%\%buildarch_directory%\%driver_name%.pdb
 set lib_path=%driver_src_root%\obj%BUILD_ALT_DIR%\%buildarch_directory%\%driver_name%.lib

-echo.
-call "%root%\sign.bat" "%sys_path%" || exit /b !errorlevel!
+if exist "%sys_path%" (
+  echo.
+  call "%root%\sign.bat" "%sys_path%" || exit /b !errorlevel!
+)

 echo.
 echo ============================== DISTR ==============================
-call :distr_copy "%pdb_path%" "%pdb_dist_dir%" || goto :distr_failure
-call :distr_copy "%sys_path%" "%sys_dist_dir%" || goto :distr_failure
+if exist "%sys_path%" (
+  call :distr_copy "%sys_path%" "%sys_dist_dir%" || goto :distr_failure
+  call :distr_copy "%pdb_path%" "%pdb_dist_dir%" || goto :distr_failure
+)
 if exist "%lib_path%" (
-  call :distr_copy "%lib_path%" || goto :distr_failure
+  call :distr_copy "%lib_path%" "%lib_dist_dir%" || goto :distr_failure
 )
 echo ========================== DISTR SUCCESS ==========================
 exit /b


add cmake.pixman build

add cmake.pixman build

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

--- build_pixman.bat
+++ build_pixman.bat
@@ -0,0 +1,13 @@
+setlocal
+call settings.bat
+
+git clone https://github.com/CMakePorts/cmake.pixman.git pixman
+
+cd pixman
+
+cmake %GENERATOR% -DCMAKE_BUILD_TYPE=%VARIANT% -DCMAKE_INSTALL_PREFIX=%PREFIX1%
+%ER%
+%MSBUILDINSTALL%
+%ER%
+
+cd ..


Create fio_script.bat

Create fio_script.bat

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

--- fio_script/fio_script.bat
+++ fio_script/fio_script.bat
@@ -0,0 +1,57 @@
+:: fio_script.bat
+:: Run 108 Disk in fio
+:: 2020-07-08T09:02:04
+
+:: Get Date & Time
+set hh=%time:~0,2%
+if "%time:~0,1%"==" " set hh=0%hh:~1,1%
+set dt=%date:~0,4%-%date:~5,2%-%date:~8,2%_%hh%%time:~3,2%%time:~6,2%
+
+:: Remove old fio
+echo. > test.fio
+echo. > test.log
+del *.fio
+del *.log
+
+:: Create fio results_%dt%.csv
+echo terse_version_3;fio_version;jobname;groupid;error;read_kb;read_bandwidth;read_iops;read_runtime_ms;read_slat_min;read_slat_max;read_slat_mean;read_slat_dev;read_clat_min;read_clat_max;read_clat_mean;read_clat_dev;read_clat_pct01;read_clat_pct02;read_clat_pct03;read_clat_pct04;read_clat_pct05;read_clat_pct06;read_clat_pct07;read_clat_pct08;read_clat_pct09;read_clat_pct10;read_clat_pct11;read_clat_pct12;read_clat_pct13;read_clat_pct14;read_clat_pct15;read_clat_pct16;read_clat_pct17;read_clat_pct18;read_clat_pct19;read_clat_pct20;read_tlat_min;read_lat_max;read_lat_mean;read_lat_dev;read_bw_min;read_bw_max;read_bw_agg_pct;read_bw_mean;read_bw_dev;write_kb;write_bandwidth;write_iops;write_runtime_ms;write_slat_min;write_slat_max;write_slat_mean;write_slat_dev;write_clat_min;write_clat_max;write_clat_mean;write_clat_dev;write_clat_pct01;write_clat_pct02;write_clat_pct03;write_clat_pct04;write_clat_pct05;write_clat_pct06;write_clat_pct07;write_clat_pct08;write_clat_pct09;write_clat_pct10;write_clat_pct11;write_clat_pct12;write_clat_pct13;write_clat_pct14;write_clat_pct15;write_clat_pct16;write_clat_pct17;write_clat_pct18;write_clat_pct19;write_clat_pct20;write_tlat_min;write_lat_max;write_lat_mean;write_lat_dev;write_bw_min;write_bw_max;write_bw_agg_pct;write_bw_mean;write_bw_dev;cpu_user;cpu_sys;cpu_csw;cpu_mjf;cpu_minf;iodepth_1;iodepth_2;iodepth_4;iodepth_8;iodepth_16;iodepth_32;iodepth_64;lat_2us;lat_4us;lat_10us;lat_20us;lat_50us;lat_100us;lat_250us;lat_500us;lat_750us;lat_1000us;lat_2ms;lat_4ms;lat_10ms;lat_20ms;lat_50ms;lat_100ms;lat_250ms;lat_500ms;lat_750ms;lat_1000ms;lat_2000ms;lat_over_2000ms;disk_name;disk_read_iops;disk_write_iops;disk_read_merges;disk_write_merges;disk_read_ticks;write_ticks;disk_queue_time;disk_util > results_%dt%.csv
+
+:: Generate fio config
+@ECHO OFF
+set rtime=180
+set bs_list=4 8 16 32 64 128 256 512
+set rw_list=read write
+:: set QD_list=1 2 4 8 16 32 64 128 256 512
+set QD_list=1
+set NJ_list=1 2 3 4 5 6 7 8 9 10
+
+for %%b in (%bs_list%) do (
+
+    for %%r in (%rw_list%) do (
+
+        for %%q in (%QD_list%) do (
+
+            for %%n in (%NJ_list%) do (
+
+                echo [global]        >> %%bK_%%r_QD%%q_NJ%%n.fio
+                echo ioengine=psync  >> %%bK_%%r_QD%%q_NJ%%n.fio
+                echo thread          >> %%bK_%%r_QD%%q_NJ%%n.fio
+                echo bs=%%bk         >> %%bK_%%r_QD%%q_NJ%%n.fio
+                echo rw=%%r          >> %%bK_%%r_QD%%q_NJ%%n.fio
+                echo iodepth=%%q     >> %%bK_%%r_QD%%q_NJ%%n.fio
+                echo numjobs=%%n     >> %%bK_%%r_QD%%q_NJ%%n.fio
+                echo time_based      >> %%bK_%%r_QD%%q_NJ%%n.fio
+                echo runtime=%rtime% >> %%bK_%%r_QD%%q_NJ%%n.fio
+                echo group_reporting >> %%bK_%%r_QD%%q_NJ%%n.fio
+
+                for /F "tokens=1,2,3,4,5,6" %%A in ('"wmic diskdrive list brief | findstr /c:"SCSI Disk Device""') DO (
+                    echo [%%bK_%%r_QD%%q_NJ%%n]  >> %%bK_%%r_QD%%q_NJ%%n.fio
+                    echo filename=%%F            >> %%bK_%%r_QD%%q_NJ%%n.fio
+                )
+
+                fio %%bK_%%r_QD%%q_NJ%%n.fio --output-format=terse --output=%%bK_%%r_QD%%q_NJ%%n.log
+                type %%bK_%%r_QD%%q_NJ%%n.log    >> results_%dt%.csv
+            )
+        )
+    )
+)


Delete install.bat

Delete install.bat

--- install.bat
+++ install.bat
@@ -1,3 +0,0 @@
-pip3 install --upgrade pip
-
-pip3 install selenium


Delegated blender detection to buildenv script, simplified install script accordingly.

--- install.bat
+++ install.bat
@@ -1,38 +1,23 @@
 @rem quick and dirty linux shell script to install the scripts in a user's local blender dir
 @echo off

-if "%BLENDERHOME%" == "" goto pleasesetblenderhome
+if "%BLENDERADDONS%" == "" goto pleasesetblenderhome

-echo.Installing in %BLENDERHOME%
-
-if not exist "%BLENDERHOME%\blender.exe" (
-echo.%BLENDERHOME%\blender.exe not found!
-echo.
-goto pleasesetblenderhome
+echo.Installing in
+echo.%BLENDERADDONS%\io_scene_nif
+rem remove old files
+rmdir /s /q "%BLENDERADDONS%\io_scene_nif"
+rem copy files from repository to blender addons folder
+for %%A in (io_scene_nif, ) do mkdir "%BLENDERADDONS%\%%A"
+for %%A in (__init__.py, import_export_nif.py, export_nif.py, import_nif.py) do (
+  copy "scripts\addons\io_scene_nif\%%A" "%BLENDERADDONS%\io_scene_nif"
 )
-
-set BLENDERADDONS=%BLENDERHOME%\2.59\scripts\addons
-
-echo on
-
-@echo Removing clutter
-@for %%A in ("%BLENDERADDONS%\io_scene_nif\*.*") do if exist "%%A" del "%%A"
-
-@echo Installing files
-@for %%A in (io_scene_nif, ) do mkdir "%BLENDERADDONS%\%%A"
-@for %%A in (__init__.py, import_export_nif.py, export_nif.py, import_nif.py) do copy "scripts\addons\io_scene_nif\%%A" "%BLENDERADDONS%\io_scene_nif"
-
-@echo off
-
-echo.
-echo.Done!
-echo.
 goto end

 :pleasesetblenderhome
-echo.Please set BLENDERHOME to the folder where blender.exe resides, such as:
+echo.Please set BLENDERADDONS to the folder where blender.exe resides, such as:
 echo.
-echo.  set BLENDERHOME="C:\Program Files\Blender Foundation\Blender"
+echo.  set BLENDERADDONS=C:\Program Files\Blender Foundation\Blender\2.59\scripts\addons
 echo.
 pause
 goto end


cleanup

cleanup

--- install.bat
+++ install.bat
@@ -1,8 +1,24 @@
-powershell -NoProfile -ExecutionPolicy unrestricted -Command "((new-object net.webclient).DownloadFile('https://raw.github.com/StefanScherer/dotfiles-windows/install/install.bat', '%Temp%\install.bat'))"
-%Temp%\install.bat
+@echo off
+echo Ensuring .NET 4.0 is installed
+@powershell -NoProfile -ExecutionPolicy unrestricted -Command "iex ((new-object net.webclient).DownloadString('https://raw.github.com/StefanScherer/arduino-ide/install/InstallNet4.ps1'))"
+echo Installing Chocolatey
+@powershell -NoProfile -ExecutionPolicy unrestricted -Command "iex ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1'))" && SET PATH=%PATH%;%systemdrive%\chocolatey\bin
+
+where cinst
+if ERRORLEVEL 1 goto set_chocolatey
+goto inst
+:set_chocolatey
+set ChocolateyInstall=%SystemDrive%\Chocolatey
+set PATH=%PATH%;%ChocolateyInstall%\bin
+:inst
+
+call cinst virtualbox
+call cinst vagrant
+set PATH=%PATH%;%ProgramFiles%\Oracle\VirtualBox
+set PATH=%PATH%;%SystemDrive%\hashicorp\vagrant\bin
+cd /D %USERPROFILE%\Documents

 call cinst curl
-call cinst vagrant
 call cinst 7zip.commandline
 call cinst vim
 call cinst msysgit
@@ -38,7 +54,7 @@
 rem Install VirtualBox 4.3.6
 if not exist "%USERPROFILE%\.VirtualBox\VirtualBox.xml" (
   mkdir "%USERPROFILE%\.VirtualBox"
-  wget --no-check-certificate https://github.com/StefanScherer/basebox-slave/raw/master/VirtualBox.xml -O "%USERPROFILE%\.VirtualBox\VirtualBox.xml"
+  call curl -L -k https://github.com/StefanScherer/basebox-slave/raw/master/VirtualBox.xml -O "%USERPROFILE%\.VirtualBox\VirtualBox.xml"
 )
 call cinst virtualbox
 if not exist D:\VirtualBox mkdir D:\VirtualBox
@@ -61,22 +77,6 @@
 rem cd /D %TEMP%
 rem unzip jenkins.zip
 rem setup.exe -s
-
-rem Install git for Windows
-if exist "C:\Program Files (x86)\Git\bin" goto GIT_INSTALLED
-dir "C:\Program Files (x86)\Git\bin
-wget --no-check-certificate https://msysgit.googlecode.com/files/Git-1.8.5.2-preview20131230.exe -O %TEMP%\gitsetup.exe
-%TEMP%\gitsetup.exe /VERYSILENT
-:GIT_INSTALLED
-where git
-if ERRORLEVEL 1 call :addGitToUserPath
-goto GIT_DONE
-:addGitToUserPath
-for /F "tokens=2* delims= " %%f IN ('reg query "HKCU\Environment" /v Path ^| findstr /i path') do set OLD_USER_PATH=%%g
-reg add HKCU\Environment /v Path /d "%OLD_USER_PATH%;C:\Program Files (x86)\Git\bin" /f
-set PATH=%PATH%;C:\Program Files (x86)\Git\bin
-exit /b
-:GIT_DONE

 if not exist D:\GitHub mkdir D:\GitHub
 cd /D D:\GitHub


Split look_for_lua_install in install.bat

Move gathering of potential lua directories into
a separate function, call it only when needed.

--- install.bat
+++ install.bat
@@ -526,33 +526,33 @@
 	return ""
 end

+local function get_possible_lua_directories()
+	if vars.LUA_PREFIX then
+		return {vars.LUA_PREFIX}
+	end
+
+	-- No prefix given, so use PATH.
+	local path = os.getenv("PATH") or ""
+	path = path:gsub(";+", ";") -- Remove duplicates.
+	local directories = split_string(path, ";")
+	for i, dir in ipairs(directories) do
+		-- Remove trailing backslashes, but not from a drive letter like `C:\`.
+		dir = dir:gsub("([^:])\\+$", "%1")
+		-- Remove trailing `bin` subdirectory, the searcher will check there anyway.
+		if dir:upper():match("[:\\]BIN$") then
+			dir = dir:sub(1, -5)
+		end
+		directories[i] = dir
+	end
+	-- Finally add some other default paths.
+	table.insert(directories, [[c:\lua5.1.2]])
+	table.insert(directories, [[c:\lua]])
+	table.insert(directories, [[c:\kepler\1.1]])
+	return directories
+end
+
 local function look_for_lua_install ()
 	print("Looking for Lua interpreter")
-	local directories
-	if vars.LUA_PREFIX then
-		directories = { vars.LUA_PREFIX }
-	else
-		-- no prefix given, so use path
-		directories = (os.getenv("PATH",";") or "")
-		directories = directories:gsub(";+", ";")  --remove all doubles
-		directories = split_string(directories,";")
-		-- if a path element ends with "\bin\" then remove it, as the searcher will check there anyway
-		for i, val in ipairs(directories) do
-			-- remove trailing backslash
-			while val:sub(-1,-1) == "\\" and val:sub(-2,-1) ~= ":\\" do
-				val = val:sub(1,-2)
-			end
-			-- remove trailing 'bin'
-			if val:upper():sub(-4,-1) == "\\BIN" or val:upper():sub(-4,-1) == ":BIN" then
-				val = val:sub(1,-5)
-			end
-			directories[i] = val
-		end
-		-- finaly add some other default paths
-		table.insert(directories, [[c:\lua5.1.2]])
-		table.insert(directories, [[c:\lua]])
-		table.insert(directories, [[c:\kepler\1.1]])
-	end
 	if vars.LUA_BINDIR and vars.LUA_LIBDIR and vars.LUA_INCDIR then
 		if look_for_interpreter(vars.LUA_BINDIR) and
 			look_for_link_libraries(vars.LUA_LIBDIR) and
@@ -569,8 +569,8 @@
 		end
 		return false
 	end
-
-	for _, directory in ipairs(directories) do
+
+	for _, directory in ipairs(get_possible_lua_directories()) do
 		print("    checking " .. directory)
 		if exists(directory) then
 			if look_for_interpreter(directory) then


Delete ProcessCertificate.cmd

Delete ProcessCertificate.cmd

--- VMM/Templates/SLB/EdgeDeployment.cr/ProcessCertificate.cmd
+++ VMM/Templates/SLB/EdgeDeployment.cr/ProcessCertificate.cmd
@@ -1,5 +0,0 @@
-@echo off
-chcp 437
-
-@PowerShell -NonInteractive -NoProfile -ExecutionPolicy Unrestricted -Command "& {./ProcessCertificate.ps1 %1; exit $LastExitCode }"
-exit /B %errorlevel%