Updated webrtc build script to distinguish win32 nad x64 native webrtc build.

--- buildWebRTC.bat
+++ buildWebRTC.bat
@@ -17,7 +17,9 @@
 SET x86BuildCompilerOption=amd64_x86
 SET x64BuildCompilerOption=amd64
 SET armBuildCompilerOption=amd64_arm
-SET win32BuildCompilerOption=amd64_x86
+SET win32BuildCompilerOption=amd64
+SET x86Win32BuildCompilerOption=amd64_x86
+SET x64Win32BuildCompilerOption=amd64
 SET currentBuildCompilerOption=amd64

 SET startTime=0
@@ -83,16 +85,23 @@
 	SET x64BuildCompilerOption=x86_amd64
 	SET armBuildCompilerOption=x86_arm
 	SET win32BuildCompilerOption=x86
-)
-
+
+	SET x86Win32BuildCompilerOption=x86
+    SET x64Win32BuildCompilerOption=x86_amd64
+)
+
 IF /I %~1==x86 (
 	SET currentBuildCompilerOption=%x86BuildCompilerOption%
 ) ELSE (
 	IF /I %~1==ARM (
 		SET currentBuildCompilerOption=%armBuildCompilerOption%
 	) ELSE (
-		IF /I %~1==win32 (
-			SET currentBuildCompilerOption=%x86BuildCompilerOption%
+		IF NOT "%currentPlatform%"=="%currentPlatform:win32=%" (
+			IF NOT "%currentPlatform%"=="%currentPlatform:x64=%" (
+				SET currentBuildCompilerOption=%x64Win32BuildCompilerOption%
+			) ELSE (
+				SET currentBuildCompilerOption=%x86Win32BuildCompilerOption%
+			)
 		) ELSE (
 			SET currentBuildCompilerOption=%x64BuildCompilerOption%
 		)
@@ -110,12 +119,17 @@
 	CALL %msVS_Path%\VC\vcvarsall.bat %currentBuildCompilerOption%
 	IF ERRORLEVEL 1 CALL:error 1 "Could not setup compiler for  %PLATFORM%"

-	IF /I "%currentPlatform%"=="win32" (
-		MSBuild %SOLUTIONPATH% /property:Configuration=%CONFIGURATION% /property:Platform=%PLATFORM% /t:Clean;Build /nodeReuse:False
+::IF /I "%currentPlatform%"=="win32" (
+	IF NOT "%currentPlatform%"=="%currentPlatform:win32=%" (
+		IF NOT "%currentPlatform%"=="%currentPlatform:x64=%" (
+			MSBuild %SOLUTIONPATH% /property:Configuration=%CONFIGURATION% /property:Platform=x64 /t:Clean;Build /nodeReuse:False
+		) ELSE (
+			MSBuild %SOLUTIONPATH% /property:Configuration=%CONFIGURATION% /property:Platform=win32 /t:Clean;Build /nodeReuse:False
+		)
 	) ELSE (
 		MSBuild %SOLUTIONPATH% /property:Configuration=%CONFIGURATION% /property:Platform=%PLATFORM% /t:Clean;Build /nodeReuse:False /m
 	)
-	if ERRORLEVEL 1 CALL:error 1 "Building WebRTC projects for %PLATFORM% has failed"
+	IF ERRORLEVEL 1 CALL:error 1 "Building WebRTC projects for %PLATFORM% has failed"
 ) ELSE (
 	CALL:error 1 "Could not compile because proper version of Visual Studio is not found"
 )
@@ -148,6 +162,7 @@
 :appendLibPath
 if "%~1"=="%~1:protobuf_lite.dll=%" SET webRtcLibs=!webRtcLibs! %~1
 GOTO:EOF
+
 :moveLibs

 IF NOT EXIST %libsSourcePathDestianation%NUL (
@@ -182,10 +197,11 @@
 	SET libsSourcePathDestianation=%basePath%build_win10_arm\%SOFTWARE_PLATFORM%\
 )

-IF /I "%currentPlatform%"=="win32" (
+IF NOT "%currentPlatform%"=="%currentPlatform:win32=%" (
 	SET libsSourcePath=%basePath%build_win32\%CONFIGURATION%
 	SET libsSourcePathDestianation=%basePath%build_win32\%SOFTWARE_PLATFORM%\
 )
+
 CALL:print %debug% "Source path is %libsSourcePath%"

 ::SET destinationPath=%basePath%WEBRTC_BUILD\%SOFTWARE_PLATFORM%\%CONFIGURATION%\%currentPlatform%\


Propagate first parameter to filter benchmarks

--- jmh/run.bat
+++ jmh/run.bat
@@ -7,4 +7,4 @@
 call mvn -f pom.xml clean package

 echo Running benchmarks
-java -jar target/benchmarks.jar -wi 5 -i 5 -f 1
+java -jar target/benchmarks.jar -wi 5 -i 5 -f 1 %1


Build 64bit rtaudio

Build 64bit rtaudio

--- ci/build_rtaudio.bat
+++ ci/build_rtaudio.bat
@@ -17,7 +17,7 @@

   mkdir C:\build_rtaudio_x86-64
   cd C:\build_rtaudio_x86-64
-  cmake -D CMAKE_INSTALL_PREFIX=C:/install_prefix_x86-64 -D BUILD_TESTING=OFF C:/rtaudio
+  cmake -G "Visual Studio 15 2017 Win64" -D CMAKE_INSTALL_PREFIX=C:/install_prefix_x86-64 -D BUILD_TESTING=OFF C:/rtaudio
   cmake --build . --target INSTALL --config Release
   cd C:\projects\libdmusic
 )


Changed redis connection opening to be synchronous call

Also added exception handling for GetCartAsync

--- src/cartservice/scripts/docker_setup.bat
+++ src/cartservice/scripts/docker_setup.bat
@@ -23,12 +23,13 @@

 :docker_local
   set REDIS_PORT=6379
-  set REDIS_ADDR=0.0.0.0:%REDIS_PORT%
+  set REDIS_ADDR=redis:%REDIS_PORT%
   set LISTEN_ADDR=0.0.0.0
   set PORT=7070

   echo run docker container with redis
-  start docker run -d --name=redis -p %REDIS_PORT%:%REDIS_PORT% redis
+  docker rm --force redis
+  start "" docker run -d --name=redis -p %REDIS_PORT%:%REDIS_PORT% redis

   echo building container image for cart service
   docker build -t cartservice ..\.


Create create.cmd

Create create.cmd

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

--- create.cmd
+++ create.cmd
@@ -0,0 +1,6 @@
+set pgbin_path=C:\Program Files\PostgreSQL\8.4\bin
+set study_db_name=enter_oc_site_database_name_here
+REM 3. Create OpenClinica postgres database using
+REM user clinica password is set in the %APPDATA%\postgresql\pgpass.conf (where %APPDATA% refers to the Application Data subdirectory in the user's profile).
+REM ---------------------------------------------------
+"%pgbin_path%\createdb.exe" -U clinica  -h localhost %study_db_name%


Also restore Examine packages to get it in the correct path for Build.bat

--- build/Build.bat
+++ build/Build.bat
@@ -124,6 +124,7 @@
 ..\src\.nuget\NuGet.exe restore ..\src\umbraco.datalayer\packages.config -OutputDirectory %nuGetFolder% -Verbosity quiet
 ..\src\.nuget\NuGet.exe restore ..\src\Umbraco.Web\project.json -OutputDirectory %nuGetFolder% -Verbosity quiet
 ..\src\.nuget\NuGet.exe restore ..\src\Umbraco.Web.UI\packages.config -OutputDirectory %nuGetFolder% -Verbosity quiet
+..\src\.nuget\NuGet.exe restore ..\src\UmbracoExamine\packages.config -OutputDirectory %nuGetFolder% -Verbosity quiet

 ECHO.
 ECHO Performing MSBuild and producing Umbraco binaries zip files


#36 : Build script change

#36 : Build script change

--- build/build.bat
+++ build/build.bat
@@ -12,7 +12,7 @@

 echo;
 echo This batch file requires softwares shown below.
-echo (1) Microsoft Visual Studio 2008 Professional Edition
+echo (1) Microsoft Visual Studio 2017
 echo (2) 7-Zip 9.20
 echo (3) Line Counter


globus jar files added

globus jar files added

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

--- scripts/windows/init.bat
+++ scripts/windows/init.bat
@@ -26,9 +26,14 @@
 IF EXIST %PROACTIVE%\lib\jini-ext.jar set CLASSPATH=%CLASSPATH%;%PROACTIVE%\lib\jini-ext.jar
 IF EXIST %PROACTIVE%\lib\reggie.jar set CLASSPATH=%CLASSPATH%;%PROACTIVE%\lib\reggie.jar

-IF EXIST %PROACTIVE%\lib\cog.jar set CLASSPATH=%CLASSPATH%;%PROACTIVE%\lib\cog.jar
-IF EXIST %PROACTIVE%\lib\iaik_jce_full.jar set CLASSPATH=%CLASSPATH%;%PROACTIVE%\lib\iaik_jce_full.jar
-IF EXIST %PROACTIVE%\lib\iaik_ssl.jar set CLASSPATH=%CLASSPATH%;%PROACTIVE%\lib\iaik_ssl.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\log4j-core.jar set CLASSPATH=%CLASSPATH%;%PROACTIVE%\lib\log4j-core.jar
 IF EXIST %PROACTIVE%\lib\javaxCrypto.jar set CLASSPATH=%CLASSPATH%;%PROACTIVE%\lib\javaxCrypto.jar
 IF EXIST %PROACTIVE%\lib\ibis.jar set CLASSPATH=%CLASSPATH%;%PROACTIVE%\lib\ibis.jar


script cleaned

script cleaned

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

--- scripts/windows/init.bat
+++ scripts/windows/init.bat
@@ -31,10 +31,8 @@
 IF EXIST %PROACTIVE%\lib\iaik_jce_full.jar set CLASSPATH=%CLASSPATH%;%PROACTIVE%\lib\iaik_jce_full.jar
 IF EXIST %PROACTIVE%\lib\iaik_ssl.jar set CLASSPATH=%CLASSPATH%;%PROACTIVE%\lib\iaik_ssl.jar
 IF EXIST %PROACTIVE%\lib\log4j-core.jar set CLASSPATH=%CLASSPATH%;%PROACTIVE%\lib\log4j-core.jar
-IF EXIST %PROACTIVE%\lib\ibis.jar set CLASSPATH=%CLASSPATH%;%PROACTIVE%\lib\ibis.jar
 IF EXIST %PROACTIVE%\lib\xercesImpl.jar set CLASSPATH=%CLASSPATH%;%PROACTIVE%\lib\xercesImpl.jar
 IF EXIST %PROACTIVE%\lib\xmlParserAPIs.jar set CLASSPATH=%CLASSPATH%;%PROACTIVE%\lib\xmlParserAPIs.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


update build.cmd to support specifying the arch when building

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

--- wdkbuild/build.cmd
+++ wdkbuild/build.cmd
@@ -21,12 +21,12 @@
 :SHOWHELP
 TITLE "build.cmd %1"
 ECHO.
-ECHO:Usage:  build.cmd [Clean^|Build^|Rebuild]
+ECHO:Usage:  build.cmd [Clean^|Build^|Rebuild] [x86^|x64^|all]
 ECHO.
 ECHO:Edit "build.cmd" and set your WDK and SDK directories.
 ECHO:You shouldn't need to make any changes other than that.
 ECHO.
-ECHO:Executing "build.cmd" will use the defaults: "build.bat Build"
+ECHO:Executing "build.cmd" will use the defaults: "build.bat build all"
 ECHO.
 ENDLOCAL
 EXIT /B
@@ -35,23 +35,33 @@
 REM Check for the switches
 IF "%1" == "" (
 SET BUILDTYPE=Build
+SET ARCH=all
 ) ELSE (
-IF /I "%1" == "Build" SET BUILDTYPE=Build&&GOTO :START
-IF /I "%1" == "/Build" SET BUILDTYPE=Build&&GOTO :START
-IF /I "%1" == "-Build" SET BUILDTYPE=Build&&GOTO :START
-IF /I "%1" == "--Build" SET BUILDTYPE=Build&&GOTO :START
-IF /I "%1" == "Clean" SET BUILDTYPE=Clean&&GOTO :START
-IF /I "%1" == "/Clean" SET BUILDTYPE=Clean&&GOTO :START
-IF /I "%1" == "-Clean" SET BUILDTYPE=Clean&&GOTO :START
-IF /I "%1" == "--Clean" SET BUILDTYPE=Clean&&GOTO :START
-IF /I "%1" == "Rebuild" SET BUILDTYPE=Rebuild&&GOTO :START
-IF /I "%1" == "/Rebuild" SET BUILDTYPE=Rebuild&&GOTO :START
-IF /I "%1" == "-Rebuild" SET BUILDTYPE=Rebuild&&GOTO :START
-IF /I "%1" == "--Rebuild" SET BUILDTYPE=Rebuild&&GOTO :START
-ECHO.
-ECHO:Unsupported commandline switch!
-ECHO:Run "build.cmd help" for details about the commandline switches.
-CALL :SUBMSG "ERROR" "Compilation failed!"
+IF /I "%1" == "Build" SET BUILDTYPE=Build
+IF /I "%1" == "/Build" SET BUILDTYPE=Build
+IF /I "%1" == "-Build" SET BUILDTYPE=Build
+IF /I "%1" == "--Build" SET BUILDTYPE=Build
+IF /I "%1" == "Clean" SET BUILDTYPE=Clean
+IF /I "%1" == "/Clean" SET BUILDTYPE=Clean
+IF /I "%1" == "-Clean" SET BUILDTYPE=Clean
+IF /I "%1" == "--Clean" SET BUILDTYPE=Clean
+IF /I "%1" == "Rebuild" SET BUILDTYPE=Rebuild
+IF /I "%1" == "/Rebuild" SET BUILDTYPE=Rebuild
+IF /I "%1" == "-Rebuild" SET BUILDTYPE=Rebuild
+IF /I "%1" == "--Rebuild" SET BUILDTYPE=Rebuild
+IF /I "%2" == "x86" SET ARCH=x86
+IF /I "%2" == "/x86" SET ARCH=x86
+IF /I "%2" == "-x86" SET ARCH=x86
+IF /I "%2" == "--x86" SET ARCH=x86
+IF /I "%2" == "x64" SET ARCH=x64
+IF /I "%2" == "/x64" SET ARCH=x64
+IF /I "%2" == "-x64" SET ARCH=x64
+IF /I "%2" == "--x64" SET ARCH=x64
+IF /I "%2" == "all" SET ARCH=all
+IF /I "%2" == "/all" SET ARCH=all
+IF /I "%2" == "-all" SET ARCH=all
+IF /I "%2" == "--all" SET ARCH=all
+GOTO :START
 )

@@ -67,43 +77,53 @@
 SET "FPATH=%WDKBASEDIR%\bin\x86;%WDKBASEDIR%\bin\x86\x86;%SDKDIR%\Bin"
 SET "PATH=%FPATH%"

+IF /I "%ARCH%" == "x64" GOTO :x64
+
 TITLE Building Notepad2 x86...
 ECHO. && ECHO.

 IF /I "%BUILDTYPE%" == "Build" (
-CALL :SUBNMAKEx86
-GOTO :x64
+CALL :SUBNMAKE
+IF /I "%ARCH%" == "x86" GOTO :END
+IF /I "%ARCH%" == "x64" GOTO :x64
+IF /I "%ARCH%" == "all" GOTO :x64
 )

 IF /I "%BUILDTYPE%" == "Rebuild" (
-CALL :SUBNMAKEx86 clean
-CALL :SUBNMAKEx86
-GOTO :x64
+CALL :SUBNMAKE clean
+CALL :SUBNMAKE
+IF /I "%ARCH%" == "x86" GOTO :END
+IF /I "%ARCH%" == "x64" GOTO :x64
+IF /I "%ARCH%" == "all" GOTO :x64
 )

-IF /I "%BUILDTYPE%" == "Clean" CALL :SUBNMAKEx86 clean
-
+IF /I "%BUILDTYPE%" == "Clean" CALL :SUBNMAKE clean
+IF /I "%ARCH%" == "x86" GOTO :END
+IF /I "%ARCH%" == "x64" GOTO :x64
+IF /I "%ARCH%" == "all" GOTO :x64

 :x64
 SET "LIB=%WDKBASEDIR%\lib\crt\amd64;%WDKBASEDIR%\lib\win7\amd64"
 SET "FPATH=%WDKBASEDIR%\bin\x86;%WDKBASEDIR%\bin\x86\amd64;%SDKDIR%\Bin"
 SET "PATH=%FPATH%"

+IF /I "%ARCH%" == "x86" GOTO :END
+
 TITLE Building Notepad2 x64...
 ECHO. && ECHO.

 IF /I "%BUILDTYPE%" == "Build" (
-CALL :SUBNMAKEx64
+CALL :SUBNMAKE "x64=1"
 GOTO :END
 )

 IF /I "%BUILDTYPE%" == "Rebuild" (
-CALL :SUBNMAKEx64 clean
-CALL :SUBNMAKEx64
+CALL :SUBNMAKE "x64=1" clean
+CALL :SUBNMAKE "x64=1"
 GOTO :END
 )

-IF /I "%BUILDTYPE%" == "Clean" CALL :SUBNMAKEx64 clean
+IF /I "%BUILDTYPE%" == "Clean" CALL :SUBNMAKE "x64=1" clean

 :END
@@ -112,13 +132,8 @@
 EXIT /B

-:SUBNMAKEx86
-nmake /NOLOGO /f "makefile.mak" %1
-IF %ERRORLEVEL% NEQ 0 CALL :SUBMSG "ERROR" "Compilation failed!"
-EXIT /B
-
-:SUBNMAKEx64
-nmake /NOLOGO /f "makefile.mak" x64=1 %1
+:SUBNMAKE
+nmake /NOLOGO /f "makefile.mak" %~1 %2
 IF %ERRORLEVEL% NEQ 0 CALL :SUBMSG "ERROR" "Compilation failed!"
 EXIT /B


Setting the name of the zip file to match latest dist.

--- win32/makedist.cmd
+++ win32/makedist.cmd
@@ -29,5 +29,5 @@
 copy \php\php-gtk\test\testgtkrc test
 copy \php\php-gtk\test\testgtkrc2 test
 copy \php\php-gtk\win32\README.txt
-"c:\Program Files\WinZip\WZZip" -ampr php-gtk-0.1.1a-win32.zip
+"c:\Program Files\WinZip\WZZip" -ampr php-gtk-0.5.0-win32.zip
 cd \php\php-gtk\win32


Pass command-line arguments through to the build program

--- .bach/bin/build.bat
+++ .bach/bin/build.bat
@@ -9,5 +9,5 @@
 ECHO.
 ECHO Build Bach with Bach...
 ECHO.
-java --module-path .bach\bin --add-modules ALL-MODULE-PATH .bach\src\build.java
+java --module-path .bach\bin --add-modules ALL-MODULE-PATH .bach\src\build.java %*
 EXIT /B %ERRORLEVEL%


Make deploy.bat walk up 2 dirs after its done

--- deploy.bat
+++ deploy.bat
@@ -6,4 +6,5 @@

 cd public/js
 call js.thirdparty.bat
-call js.build.bat+call js.build.bat
+cd ../../


Remove the arm64 build of the server for now.

This makes it take *forever* on my machine, perhaps if we can offload
this to the cloud or I pick up a small arm machine to do this on it
would be worth it. For now I don't anticipate us needing to run this on
an arm machine (unlike the rally-point stuff).

--- deploy.bat
+++ deploy.bat
@@ -53,7 +53,7 @@
 SET LATEST_TAG=%NAME%:latest

-docker buildx build --platform linux/arm64/v8,linux/amd64 -t %IMG% -t %NPM_TAG% -t %LATEST_TAG% --push .
+docker buildx build --platform linux/amd64 -t %IMG% -t %NPM_TAG% -t %LATEST_TAG% --push .
 if errorlevel 1 (
   echo Error building the image
   goto exit


Scape msbuild path at NuGet deploy

Scape msbuild path at NuGet deploy

--- deploy.cmd
+++ deploy.cmd
@@ -108,7 +108,7 @@
 call :ExecuteCmd "%MSBUILD_PATH%" web/deploy-config.proj /verbosity:m /nologo /p:Configuration=Release /t:CleanTransformConfig

 :: 2. Restore NuGet packages
-call :ExecuteCmd nuget.exe restore "%DEPLOYMENT_SOURCE%\web\packages.config" -SolutionDirectory "%DEPLOYMENT_SOURCE%\web\" -MSBuildPath %MSBUILD_PATH%
+call :ExecuteCmd nuget.exe restore "%DEPLOYMENT_SOURCE%\web\packages.config" -SolutionDirectory "%DEPLOYMENT_SOURCE%\web\" -MSBuildPath "%MSBUILD_PATH%"

 :: 3. Build to the repository path
 call :ExecuteCmd "%MSBUILD_PATH%" "%DEPLOYMENT_SOURCE%\web\Loconomics.sln" /verbosity:m /nologo %SCM_BUILD_ARGS%


Fix node & npm version logging

Fix node & npm version logging

--- deploy.cmd
+++ deploy.cmd
@@ -217,9 +217,9 @@
 echo PREVIOUS_MANIFEST_PATH: %PREVIOUS_MANIFEST_PATH%
 echo.
 echo node version:
-node --version
+call node --version
 echo npm version:
-npm --version
+call npm --version

 echo ----------------------------------------------------------
 echo.


build angular --prod

build angular --prod

--- deploy.cmd
+++ deploy.cmd
@@ -171,12 +171,16 @@
 		IF !ERRORLEVEL! NEQ 0 goto error
 	)
 	echo Bundle angular2 app
-	call :ExecuteCmd ng build --environment=prod --output-path="%ARTIFACTS%\AzureFunctions.AngularClient\dist"
+	call :ExecuteCmd ng build --prod --environment=prod --output-path="%ARTIFACTS%\AzureFunctions.AngularClient\dist"
 	IF !ERRORLEVEL! NEQ 0 (
-		call :ExecuteCmd ng build --environment=prod --output-path="%ARTIFACTS%\AzureFunctions.AngularClient\dist"
+		call :ExecuteCmd ng build --prod --environment=prod --output-path="%ARTIFACTS%\AzureFunctions.AngularClient\dist"
 		IF !ERRORLEVEL! NEQ 0 goto error
 	)
-
+
+	mv %ARTIFACTS%\AzureFunctions.AngularClient\dist\main.*.bundle.js %ARTIFACTS%\AzureFunctions.AngularClient\dist\main.bundle.js
+	mv %ARTIFACTS%\AzureFunctions.AngularClient\dist\scripts.*.bundle.js %ARTIFACTS%\AzureFunctions.AngularClient\dist\scripts.bundle.js
+	mv %ARTIFACTS%\AzureFunctions.AngularClient\dist\styles.*.bundle.js %ARTIFACTS%\AzureFunctions.AngularClient\dist\styles.bundle.js
+
 	each Copy angular output to the temporary path
 	IF /I "%IN_PLACE_DEPLOYMENT%" NEQ "1" (
 		echo ROBOCOPY "%ARTIFACTS%\AzureFunctions.AngularClient\dist" "%DEPLOYMENT_TEMP%" /E /IS


Restore npm installation commands

Restore npm installation commands

--- deploy.cmd
+++ deploy.cmd
@@ -99,14 +99,14 @@

 :: 3. Install npm packages
 IF EXIST "%DEPLOYMENT_TARGET%\package.json" (
-  ::pushd "%DEPLOYMENT_TARGET%"
-  ::call :ExecuteCmd !NPM_CMD! install --production
-  ::IF !ERRORLEVEL! NEQ 0 goto error
-  ::popd
-  ::pushd "%DEPLOYMENT_TARGET%\client"
-  ::call :ExecuteCmd !NPM_CMD! run build
-  ::IF !ERRORLEVEL! NEQ 0 goto error
-  ::popd
+  pushd "%DEPLOYMENT_TARGET%"
+  call :ExecuteCmd !NPM_CMD! install --production
+  IF !ERRORLEVEL! NEQ 0 goto error
+  popd
+  pushd "%DEPLOYMENT_TARGET%\client"
+  call :ExecuteCmd !NPM_CMD! run build
+  IF !ERRORLEVEL! NEQ 0 goto error
+  popd
 )

 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::


turning echo on

turning echo on

--- deploy.cmd
+++ deploy.cmd
@@ -1,4 +1,4 @@
-@echo off
+@echo on

 echo Creating folders
 MKDIR %HOME%\site\wwwroot\gopath


Setting up sync ignore list for live after successful test

--- deploy.cmd
+++ deploy.cmd
@@ -73,10 +73,9 @@
 :: Default list by KuduSync (deploy related files)
 SET IGNORE_DEPLOY_FILES=.git;.hg;.deployment;deploy.cmd
 :: Extended list, with our specific content that must not be copied into wwwroot
-:: note 1: packages.config is needed or will not load required binaries
-:: note 2: TODO to exclude Tests folder on production/live
+:: note: Excluding additional things, like Tests folder, on production/live
 SET IGNORE_LIST=%IGNORE_DEPLOY_FILES%;.gitignore
-IF "%CHANNEL%" EQU "dev" (
+IF "%CHANNEL%" EQU "live" (
   SET IGNORE_LIST=%IGNORE_LIST%;Tests
 )

@@ -120,6 +119,7 @@

 :: 4. KuduSync
 IF /I "%IN_PLACE_DEPLOYMENT%" NEQ "1" (
+  echo "KuduSync IgnoreList:" %IGNORE_LIST%
   call :ExecuteCmd "%KUDU_SYNC_CMD%" -v 50 -f "%DEPLOYMENT_SOURCE%\web" -t "%DEPLOYMENT_TARGET%" -n "%NEXT_MANIFEST_PATH%" -p "%PREVIOUS_MANIFEST_PATH%" -i "%IGNORE_LIST%"
   IF !ERRORLEVEL! NEQ 0 goto error
 )


Added some logging prior to compiler invocations and removed the logging to file of compiler output. Set a quick exit path if the first compiler invocation fails.

--- src/GenerateProjects.bat
+++ src/GenerateProjects.bat
@@ -41,7 +41,7 @@
 popd
 echo Began creating NMake project files at %nmake_dest_dir%
 pushd %nmake_dest_dir%
-cmake -D CMAKE_BUILD_TYPE=%build_mode% -G "NMake Makefiles" %src_dir%
+cmake -D CMAKE_BUILD_TYPE=%build_mode% -G "NMake Makefiles JOM" %src_dir%
 popd
 ::Generate batch file for invoking the compilers
 echo Generating batch files
@@ -64,15 +64,25 @@
 	@echo 		set build_flag=test
 	@echo 	^)
 	@echo ^)
-	@echo set compiler_output_file=compilerOut.txt
-	@echo set compiler_error_file=compilerErr.txt
 	@echo pushd %mingw_dest_suffix%
-	@echo call mingw32-make -j -Oline %%build_flag%% ^>%%compiler_output_file%%
+	@echo echo.
+	@echo echo Compiling with mingw32
+	@echo echo.
+	@echo call mingw32-make -j -Oline %%build_flag%%
 	@echo popd
+	@echo if not %%errorlevel%%==0 ^(
+	@echo	echo.
+	@echo	echo Compilation failed with mingw32 with error code %%errorlevel%%
+	@echo	goto quick_exit
+	@echo ^)
 	@echo pushd %nmake_dest_suffix%
+	@echo echo.
+	@echo echo Compiling with NMake
+	@echo echo.
 	@echo call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
-	@echo call NMake /nologo /x %%compiler_error_file%% %%build_flag%%^>%%compiler_output_file%%
+	@echo call jom /j4 /nologo %%build_flag%%
 	@echo popd
+	@echo :quick_exit
 	@echo endlocal
 )
 ::End of batch file generation


fix cmake configuration for Windows

fix cmake configuration for Windows

--- src/msvc_convert_to_sln.bat
+++ src/msvc_convert_to_sln.bat
@@ -9,7 +9,7 @@
 	echo   cd tnnlib\src
 	echo   mkdir build
 	echo   cd build
-	echo   ..\build_msvc ..
+	echo   ..\msvc_convert_to_sln ..

 	exit /B 1
 	)
@@ -35,8 +35,8 @@
 set python_exe=C:\Programs\Python27\python.exe

 :: BOOST configuration
-set boost_root=C:\libs\boost\boost_1_57_0
-set boost_libraries_dir=C:\libs\boost\boost_1_57_0\build\msvc-12.0\32\lib
+set boost_root=C:\libs\boost\boost_1_59_0
+set boost_libraries_dir=C:\libs\boost\boost_1_59_0\lib32-msvc-12.0

@@ -52,6 +52,8 @@

 %cmake% -G "%msvc_version%" -Wno-dev ^
 	%opencl_cmake_flag% ^
+	-DBoost_USE_STATIC_LIBS=ON ^
+	-DBoost_USE_STATIC_RUNTIME=ON ^
 	"-DZLIB_INCLUDE_DIR=%zlib_include_dir%" ^
 	"-DZLIB_LIBRARY:PATH=debug;%zlib_debug_lib%;optimized;%zlib_release_lib%" ^
 	"-DPNG_PNG_INCLUDE_DIR=%libpng_include_dir%" ^


增加手工部署Jar到本地Maven环境的Bat

增加手工部署Jar到本地Maven环境的Bat

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

--- deploy.bat
+++ deploy.bat
@@ -0,0 +1,5 @@
+call mvn clean install -DskipTests
+call mvn install:install-file -DgroupId=nepxion -DartifactId=matrix -Dversion=1.0.0 -Dfile=target/matrix-1.0.0.jar -Dpackaging=jar -DgeneratePom=true
+
+pause
+


Azure Kudu deploy script to run grunt and bower

Former-commit-id: 101a3d1809b8f9727157db8a270d28ff5614e755 [formerly a6c290ca380aaec8fe612d44d57bbf3a5b0491a7]
Former-commit-id: 48e84f6fb32242601f01fa1ff0234955a8a2040c

--- deploy.cmd
+++ deploy.cmd
@@ -86,23 +86,41 @@
 :: ----------

 :Deployment
-echo Handling node.js deployment.
+echo Handling node.js grunt deployment.

-:: 1. KuduSync
-IF /I "%IN_PLACE_DEPLOYMENT%" NEQ "1" (
-  call :ExecuteCmd "%KUDU_SYNC_CMD%" -v 50 -f "%DEPLOYMENT_SOURCE%" -t "%DEPLOYMENT_TARGET%" -n "%NEXT_MANIFEST_PATH%" -p "%PREVIOUS_MANIFEST_PATH%" -i ".git;.hg;.deployment;deploy.cmd"
+:: 1. Select node version
+call :SelectNodeVersion
+
+:: 2. Install npm packages
+IF EXIST "%DEPLOYMENT_TARGET%\package.json" (
+  pushd "%DEPLOYMENT_TARGET%"
+  call :ExecuteCmd !NPM_CMD! install
   IF !ERRORLEVEL! NEQ 0 goto error
+  popd
 )

-:: 2. Select node version
-call :SelectNodeVersion
+:: 3. Install bower packages
+IF EXIST "%DEPLOYMENT_TARGET%\bower.json" (
+	pushd "%DEPLOYMENT_TARGET%"
+	call :ExecuteCmd !NPM_CMD! install bower
+	if !ERRORLEVEL! NEQ 0 goto error
+	popd
+)

-:: 3. Install npm packages
-IF EXIST "%DEPLOYMENT_TARGET%\package.json" (
-  pushd "%DEPLOYMENT_TARGET%"
-  call :ExecuteCmd !NPM_CMD! install --production
+:: 4. Install and run grunt
+IF EXIST "%DEPLOYMENT_TARGET%\Gruntfile.js" (
+	pushd "%DEPLOYMENT_TARGET%"
+	call :ExecuteCmd !NPM_CMD! install grunt-cli
+	if !ERRORLEVEL! NEQ 0 goto error
+	call :ExecuteCmd ./node_modules/.bin/grunt build:js
+	if !ERRORLEVEL! NEQ 0 goto error
+	popd
+)
+
+:: 5. KuduSync
+IF /I "%IN_PLACE_DEPLOYMENT%" NEQ "1" (
+  call :ExecuteCmd "%KUDU_SYNC_CMD%" -v 50 -f "%DEPLOYMENT_SOURCE%/www" -t "%DEPLOYMENT_TARGET%" -n "%NEXT_MANIFEST_PATH%" -p "%PREVIOUS_MANIFEST_PATH%" -i ".git;.hg;.deployment;deploy.cmd"
   IF !ERRORLEVEL! NEQ 0 goto error
-  popd
 )

 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::


Install electron-packager

Install electron-packager

--- deploy.cmd
+++ deploy.cmd
@@ -5,6 +5,7 @@
 set PATH=%curpath%\megatools-1.9.97-win32;%PATH%

 :: Package it
+npm install -g electron-packager
 electron-packager . --asar --platform=win32 --arch=all --prune --ignore="\.babel|\.git|\.happypack|[Bb]uild|deps|([a-z]|[A-Z]|[0-9])+/src|\.git|\.git(attributes|ignore|modules)|appveyor\.yml|CMake.*?|([a-z]|[0-9])*.ilk|.pdb|binding.gyp|([a-z]|[0-9])*\.sh|([a-z]|[0-9])*\.cc|components|helpers|less|test|([a-z]|[0-9])*\.cmake|readme.md|webpack.config.js"

 :: Compress


HBASE-22145 windows hbase-env causes hbase cli/etc to ignore HBASE_OPTS

--- conf/hbase-env.cmd
+++ conf/hbase-env.cmd
@@ -40,7 +40,7 @@
 @rem see http://hbase.apache.org/book.html#performance
 @rem JDK6 on Windows has a known bug for IPv6, use preferIPv4Stack unless JDK7.
 @rem @rem See TestIPv6NIOServerSocketChannel.
-set HBASE_OPTS="-XX:+UseConcMarkSweepGC" "-Djava.net.preferIPv4Stack=true"
+set HBASE_OPTS=%HBASE_OPTS% "-XX:+UseConcMarkSweepGC" "-Djava.net.preferIPv4Stack=true"

 @rem Uncomment below to enable java garbage collection logging for the server-side processes
 @rem this enables basic gc logging for the server processes to the .out file


ensure git bin not on path for pkg build

--- package/win32/make-package.bat
+++ package/win32/make-package.bat
@@ -11,6 +11,11 @@
 REM Remove Rtools from path
 CALL SET PATH=%PATH:C:\Rtools\bin=%
 CALL SET PATH=%PATH:C:\Rtools\gcc-4.6.3\bin=%
+
+REM Remove Git from PATH (otherwise cmake complains about
+REM finding 'sh.exe')
+CALL set PATH=%PATH:C:\Program Files (x86)\Git\bin=%
+CALL set PATH=%PATH:C:\Program Files\Git\bin=%

 REM Establish build dir
 set BUILD_DIR=build


Revert "Install Visual C++ 2008 SP1 Redistributables"

This reverts commit 9c061351b85bf917c9870b5851168368a5075d6f.

--- recipes/vs2008_runtime/bld.bat
+++ recipes/vs2008_runtime/bld.bat
@@ -1,13 +1,3 @@
-powershell -Command "(New-Object Net.WebClient).DownloadFile('https://download.microsoft.com/download/d/d/9/dd9a82d0-52ef-40db-8dab-795376989c03/vcredist_x86.exe', 'vcredist_x86.exe')"
-if errorlevel 1 exit 1
-powershell -Command "(New-Object Net.WebClient).DownloadFile('https://download.microsoft.com/download/2/d/6/2d61c766-107b-409d-8fba-c39e61ca08e8/vcredist_x64.exe', 'vcredist_x64.exe')"
-if errorlevel 1 exit 1
-
-vcredist_x86.exe /qb!
-if errorlevel 1 exit 1
-vcredist_x64.exe /qb!
-if errorlevel 1 exit 1
-
 for %%F in ("." "bin") do (
     cmake -G "%CMAKE_GENERATOR%" ^
           -DCMAKE_INSTALL_PREFIX:PATH="%LIBRARY_PREFIX%" ^


Add some new switches for charts

Add some new switches for charts

--- testfiles/Test_Commands.bat
+++ testfiles/Test_Commands.bat
@@ -4,10 +4,10 @@

 python ../ClusterGraph.py heavy_n_junction.fasta heavy_n_junction_clstr.clstr sample_colours.txt heavy S orange 0.15 -l 500

-python ../PlotGermline.py kappa_n_A1_1000.txt,kappa_n_A1_1000.txt,kappa_n_A1_1000.txt -t "A1,A2,A3" "V-GENE and allele" G -d "size=" -c 2 -y 15000 -s kappa_germlines.pdf
+python ../PlotGermline.py kappa_n_A1_1000.txt,kappa_n_A1_1000.txt,kappa_n_A1_1000.txt,kappa_n_A1_1000.txt -t "A1,A2,A3" "V-GENE and allele" G -d "size=" -c 2 -y 15000 -b green,red,blue -g -gh -gv 3 -l 12 -w 0.8 -s kappa_germlines.pdf

-python ../Spectratype.py kappa_n_A1_1000.txt,kappa_n_A1_1000.txt,kappa_n_A1_1000.txt -t "A1,A2,A3" -c 2 -u -x 100 -s kappa_CDR3_length.pdf
+python ../Spectratype.py kappa_aa_A1_1000.txt,kappa_aa_A2_1000.txt,kappa_aa_A3_1000.txt -t  "A1,A2,A3" -c 1 -u -xmin 5 -xmax 20 -g -w 0.8 -gv 3 -b red,yellow,green -s kappa_CDR3_length.pdf

 python ../AbIdentity.py sample_heavy_n.txt H122 sample_intermediates_n.txt "M93173|IGHV1S40*01|Oryctolagus" IGHV1S40_n.txt intermediates.csv

-python ../PlotIdentity.py H1-36_repertoire.csv -p "H1-36_ab.csv,rv/m10/lr,H1-36_germline.csv,b+/m20/lb,H1-36_family.csv,ro/m4" -my 85 -mx 20 -c autumn_r -g white -b+python ../PlotIdentity.py H1-36_repertoire.csv -p "H1-36_ab.csv,rv/m10/lr,H1-36_germline.csv,b+/m20/lb,H1-36_family.csv,ro/m4" -my 85 -mx 20 -c autumn_r -g white -b -s identity.pdf


buildscripts/1.2.x: catch and display errors from the buildenv setup script in buildenv-win32.cmd.

--- buildscripts/1.2.x/buildenv-win32.cmd
+++ buildscripts/1.2.x/buildenv-win32.cmd
@@ -31,7 +31,18 @@
 )

 cd buildenv\1.2.x\win32
-for /f "delims=" %%I in ('setup.cmd /noninteractive') do set BUILDENV_DIR=%%I
+
+setlocal enabledelayedexpansion
+for /f "delims=" %%I in ('setup.cmd /noninteractive') do set SETUP_OUTPUT=!SETUP_OUTPUT! %%I
+set SETUP_OUTPUT=%SETUP_OUTPUT:~1%
+setlocal disabledelayedexpansion
+
+if not exist "%SETUP_OUTPUT%" (
+	echo %SETUP_OUTPUT%
+	exit /b 1
+)
+
+set BUILDENV_DIR=%SETUP_OUTPUT%
 set BUILDENV_DIR_BUILD=%BUILDENV_DIR%.build
 cd ..\..\..


delete batch file

delete batch file

--- zCopyToUpload.bat
+++ zCopyToUpload.bat
@@ -1,8 +0,0 @@
-REM copy Jekyll rendered pages in _site to my github.io repo
-
-
-Xcopy /S /E /I /Y C:\_dev\jekyll\_site C:\_dev\tedbergeron.github.io
-
-
-REM ### File copy has completed ###
-PAUSE


fixing cmake command

fixing cmake command

--- recipes/rdkit/bld.bat
+++ recipes/rdkit/bld.bat
@@ -13,7 +13,7 @@
 )

 cmake ^
-    -G "NMake Makefiles" ^
+    -G "NMake Makefiles JOM" ^
     -D RDK_INSTALL_INTREE=OFF ^
     -D RDK_BUILD_INCHI_SUPPORT=ON ^
     -D RDK_BUILD_AVALON_SUPPORT=ON ^


Cleaned up the sql batch installer

Cleaned up the sql batch installer

Cleaned up the sql batch installer so that it makes use of 'dir' a little more wisely. Also fixed the issues with re-installing of some databases multiple times.

--- data/sql/setup.bat
+++ data/sql/setup.bat
@@ -135,110 +135,34 @@
 	ECHO.
 	ECHO.                              Please Wait
 	ECHO.
-
-	:: Create the database schemas

 	cd "%PROJECT_BASE%galaxy"
-		mysql --password=%db_pass% --host=%db_host% --user=%db_user% < "create.sql"
+	for /F %%A IN ('dir "*.sql" /B /S') do (
+		mysql --password=%db_pass% --host=%db_host% --user=%db_user% --database=galaxy  < "%%A"
+		ECHO. Installing %%~nA [Done]
+	)
+
 	cd "%PROJECT_BASE%galaxy_manager"
-		mysql --password=%db_pass% --host=%db_host% --user=%db_user% < "create.sql"
+	for /F %%A IN ('dir "*.sql" /B /S') do (
+		mysql --password=%db_pass% --host=%db_host% --user=%db_user% --database=galaxy_manager --default-character-set=utf8 < "%%A"
+		ECHO. Installing %%~nA [Done]
+	)
+
 	cd "%PROJECT_BASE%swganh_static"
-		mysql --password=%db_pass% --host=%db_host% --user=%db_user% < "create.sql"
-
-	:: Populate the data
-
-	:: (galaxy)
-
-	cd "%PROJECT_BASE%"
-	cd "%PROJECT_BASE%galaxy\scripts"
-		for /F %%A IN ('dir /b "*.sql" ^| sort') do (
-			mysql --password=%db_pass% --host=%db_host% --user=%db_user% --database=galaxy  < "%%A"
-		ECHO. Installing %%A [Done]
-		)
-
-	cd "%PROJECT_BASE%galaxy\functions"
-		for /F %%A IN ('dir /b "*.sql" ^| sort') do (
-			mysql --password=%db_pass% --host=%db_host% --user=%db_user% --database=galaxy < "%%A"
-		ECHO. Installing %%A [Done]
-		)
-
-	cd "%PROJECT_BASE%galaxy\procedures"
-		for /F %%A IN ('dir /b "*.sql" ^| sort') do (
-			mysql --password=%db_pass% --host=%db_host% --user=%db_user% --database=galaxy --comments < "%%A"
-		ECHO. Installing %%A [Done]
-		)
-
-	:: (galaxy_manager)
-
-	cd "%PROJECT_BASE%"
-	cd "%PROJECT_BASE%galaxy_manager\scripts"
-		for /F %%A IN ('dir /b "*.sql" ^| sort') do (
-			mysql --password=%db_pass% --host=%db_host% --user=%db_user% --database=galaxy_manager --default-character-set=utf8 < "%%A"
-		ECHO. Installing %%A [Done]
-		)
-
-	cd "%PROJECT_BASE%galaxy_manager\functions"
-		for /F %%A IN ('dir /b "*.sql" ^| sort') do (
-			mysql --password=%db_pass% --host=%db_host% --user=%db_user% --database=galaxy_manager --default-character-set=utf8 < "%%A"
-		ECHO. Installing %%A [Done]
-		)
-
-	cd "%PROJECT_BASE%galaxy_manager\procedures"
-		for /F %%A IN ('dir /b "*.sql" ^| sort') do (
-			mysql --password=%db_pass% --host=%db_host% --user=%db_user% --database=galaxy_manager --default-character-set=utf8 < "%%A"
-		ECHO. Installing %%A [Done]
-		)
-
-	:: (swganh_static)
-	cd "%PROJECT_BASE%"
-
-	cd "%PROJECT_BASE%swganh_static\scripts"
-		for /F %%A IN ('dir /b "*.sql" ^| sort') do (
-			mysql --password=%db_pass% --host=%db_host% --user=%db_user% --database=swganh_static --default-character-set=utf8 < "%%A"
-		ECHO. Installing %%A [Done]
-		)
-
-	cd "%PROJECT_BASE%swganh_static\functions"
-		for /F %%A IN ('dir /b "*.sql" ^| sort') do (
-			mysql --password=%db_pass% --host=%db_host% --user=%db_user% --database=swganh_static --default-character-set=utf8 < "%%A"
-		ECHO. Installing %%A [Done]
-		)
-
-	cd "%PROJECT_BASE%swganh_static\procedures"
-		for /F %%A IN ('dir /b "*.sql" ^| sort') do (
-			mysql --password=%db_pass% --host=%db_host% --user=%db_user% --database=swganh_static --default-character-set=utf8 --comments < "%%A"
-		ECHO. Installing %%A [Done]
-		)
+	for /F %%A IN ('dir "*.sql" /B /S') do (
+		mysql --password=%db_pass% --host=%db_host% --user=%db_user% --database=swganh_static --default-character-set=utf8 < "%%A"
+		ECHO. Installing %%~nA [Done]
+	)

 	GOTO:MainMenu

 :SchemaGalaxy

-	:: Create the schema
-
 	cd "%PROJECT_BASE%galaxy"
-		mysql --password=%db_pass% --host=%db_host% --user=%db_user% --default-character-set=utf8 < "create.sql"
-
-	:: (galaxy)
-
-	cd "%PROJECT_BASE%"
-	cd "%PROJECT_BASE%galaxy\scripts"
-		for /F %%A IN ('dir /b "*.sql" ^| sort') do (
-			mysql --password=%db_pass% --host=%db_host% --user=%db_user% --database=galaxy --default-character-set=utf8 < "%%A"
-		ECHO. Installing %%A [Done]
-		)
-
-	cd "%PROJECT_BASE%galaxy\functions"
-		for /F %%A IN ('dir /b "*.sql" ^| sort') do (
-			mysql --password=%db_pass% --host=%db_host% --user=%db_user% --database=galaxy --default-character-set=utf8 < "%%A"
-		ECHO. Installing %%A [Done]
-		)
-
-	cd "%PROJECT_BASE%galaxy\procedures"
-		for /F %%A IN ('dir /b "*.sql" ^| sort') do (
-			mysql --password=%db_pass% --host=%db_host% --user=%db_user% --database=galaxy --default-character-set=utf8 --comments < "%%A"
-		ECHO. Installing %%A [Done]
-		)
+	for /F %%A IN ('dir "*.sql" /B /S') do (
+		mysql --password=%db_pass% --host=%db_host% --user=%db_user% --database=galaxy  < "%%A"
+		ECHO. Installing %%~nA [Done]
+	)

 	GOTO:MainMenu

@@ -246,54 +170,22 @@
 :: Create the schema

 	cd "%PROJECT_BASE%galaxy_manager"
-		mysql --password=%db_pass% --host=%db_host% --user=%db_user% --default-character-set=utf8 < "create.sql"
-
-	:: (galaxy_manager)
-
-	cd "%PROJECT_BASE%"
-	cd "%PROJECT_BASE%galaxy_manager\scripts"
-		for /F %%A IN ('dir /b "*.sql" ^| sort') do (
-			mysql --password=%db_pass% --host=%db_host% --user=%db_user% --database=galaxy_manager --default-character-set=utf8 < "%%A"
-		ECHO. Installing %%A [Done]
-		)
-
-	cd "%PROJECT_BASE%galaxy_manager\functions"
-		for /F %%A IN ('dir /b "*.sql" ^| sort') do (
-			mysql --password=%db_pass% --host=%db_host% --user=%db_user% --database=galaxy_manager --default-character-set=utf8 < "%%A"
-		ECHO. Installing %%A [Done]
-		)
-
-	cd "%PROJECT_BASE%galaxy_manager\procedures"
-		for /F %%A IN ('dir /b "*.sql" ^| sort') do (
-			mysql --password=%db_pass% --host=%db_host% --user=%db_user% --database=galaxy_manager --default-character-set=utf8 --comments < "%%A"
-		ECHO. Installing %%A [Done]
-		)
+	for /F %%A IN ('dir "*.sql" /B /S') do (
+		mysql --password=%db_pass% --host=%db_host% --user=%db_user% --database=galaxy_manager --default-character-set=utf8 < "%%A"
+		ECHO. Installing %%~nA [Done]
+	)
+
 	GOTO:MainMenu

 :SchemaSWGANH_STATIC
+
 	cd "%PROJECT_BASE%swganh_static"
-		mysql --password=%db_pass% --host=%db_host% --user=%db_user% --default-character-set=utf8 < "create.sql"
-
-	:: (swganh_static)
-
-	cd "%PROJECT_BASE%"
-	cd "%PROJECT_BASE%swganh_static\scripts"
-		for /F %%A IN ('dir /b "*.sql" ^| sort') do (
-			mysql --password=%db_pass% --host=%db_host% --user=%db_user% --database=swganh_static --default-character-set=utf8 < "%%A"
-		ECHO. Installing %%A [Done]
-		)
-
-	cd "%PROJECT_BASE%swganh_static\functions"
-		for /F %%A IN ('dir /b "*.sql" ^| sort') do (
-			mysql --password=%db_pass% --host=%db_host% --user=%db_user% --database=swganh_static --default-character-set=utf8 < "%%A"
-		ECHO. Installing %%A [Done]
-		)
-
-	cd "%PROJECT_BASE%swganh_static\procedures"
-		for /F %%A IN ('dir /b "*.sql" ^| sort') do (
-			mysql --password=%db_pass% --host=%db_host% --user=%db_user% --database=swganh_static --default-character-set=utf8 --comments < "%%A"
-		ECHO. Installing %%A [Done]
-		)
+	for /F %%A IN ('dir "*.sql" /B /S') do (
+		mysql --password=%db_pass% --host=%db_host% --user=%db_user% --database=swganh_static --default-character-set=utf8 < "%%A"
+		ECHO. Installing %%~nA [Done]
+	)
+
+
 	GOTO:MainMenu

 :SchemaSetup
@@ -491,4 +383,4 @@
 	GOTO:EOF

 :end
-	exit+	exit


OK, let's try not setting the generator on Win

--- conda/bld.bat
+++ conda/bld.bat
@@ -5,22 +5,14 @@
 mkdir build
 cd build

-rem Need to handle Python 3.x case at some point (Visual Studio 2010)
 if %ARCH%==32 (
-  call "C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" x86
-  if %PY_VER% LSS 3 (
-    set CMAKE_GENERATOR="Visual Studio 9 2008"
     set CMAKE_CONFIG="Release|Win32"
-  )
 )
 if %ARCH%==64 (
-  if %PY_VER% LSS 3 (
-    set CMAKE_GENERATOR="Visual Studio 9 2008 Win64"
     set CMAKE_CONFIG="Release|x64"
-  )
 )

-cmake .. -G%CMAKE_GENERATOR% ^
+cmake .. ^
  -DBUILD_SHARED_LIBS=1 ^
  -DCMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX%


update  configure.bat

update  configure.bat

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

 set VERSION=1.24.0
 set TFDIR=C:\TreeFrog\%VERSION%
-set LZ4_VERSION=1.9.1
+set LZ4_VERSION=1.8.3

 :parse_loop
 if "%1" == "" goto :start
@@ -136,8 +136,8 @@

 :: Builds LZ4
 cd ..
-rd /Q lz4
-mklink /d lz4 lz4-%LZ4_VERSION%
+del /f /q lz4 >nul 2>&1
+mklink /d lz4 lz4-%LZ4_VERSION% >nul 2>&1
 cd lz4\visual\VS2017\liblz4
 msbuild /t:rebuild  /p:Configuration=Release liblz4.vcxproj
 cd ..\..\..\..\..


stop packaging if missing git-archive-all

--- package.bat
+++ package.bat
@@ -43,7 +43,12 @@
 REM using third-party git-archive-all, otherwise we miss the datatypes submodule
 REM NOTE: currently requires install from git:
 REM         pip install git+https://github.com/Kentzo/git-archive-all
-echo Build Git archive...
+echo Building Git archive...
+where /q git-archive-all
+IF ERRORLEVEL 1 (
+    echo git-archive-all must be installed.
+    exit /b
+)
 git-archive-all tmp.zip
 echo Extracting archive...
 unzip -q tmp.zip


Added release script

Added release script

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

--- release.cmd
+++ release.cmd
@@ -0,0 +1,22 @@
+@echo off
+setlocal
+
+set ProjectPath=Test\bin\Release
+set ReleaseName=Test-2015-05-11
+set WinRAR=c:\Program Files\WinRAR\WinRAR.exe
+
+mkdir "%ProjectPath%\%ReleaseName%"
+mkdir "%ProjectPath%\%ReleaseName%\Scripts"
+copy *.txt "%ProjectPath%\%ReleaseName%"
+copy *.md "%ProjectPath%\%ReleaseName%"
+xcopy "Scripts" "%ProjectPath%\%ReleaseName%\Scripts" /E
+
+cd "%ProjectPath%"
+copy *.dll "%ReleaseName%"
+copy Test.exe "%ReleaseName%"
+
+"%WinRAR%" a -ep1 -m5 -r -t "%ReleaseName%.zip" "%ReleaseName%\*"
+rmdir /S /Q "%ReleaseName%"
+
+endlocal
+pause


Add wrapper batch file for Jenkins to build

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

--- Project/HEW/make/jenkins.bat
+++ Project/HEW/make/jenkins.bat
@@ -0,0 +1,10 @@
+mkdir ..\libm2dec\Release
+mkdir ..\libm2dec\Debug
+mkdir ..\h264dec\Release
+mkdir ..\h264dec\Debug
+mkdir ..\m2dec\Release
+mkdir ..\m2dec\Debug
+"C:\Program Files (x86)\Renesas\Hew\hmake.exe" m2dec.mak > buildlog.txt
+find "ERROR" buildlog.txt
+if errorlevel 1 exit /b 0
+exit /b 1


Fixed ocl dir for installed vxl

Fixed ocl dir for installed vxl

--- common.bat
+++ common.bat
@@ -84,7 +84,8 @@
 if not defined VIP_NOTEBOOK_PID_DIR set VIP_NOTEBOOK_PID_DIR=%VIP_PID_DIR%/notebook
 if not defined VIP_NOTEBOOK_LOCK_DIR set VIP_NOTEBOOK_LOCK_DIR=%VIP_LOCK_DIR%/notebook
 if not defined VIP_NOTEBOOK_PROFILE_DIR set VIP_NOTEBOOK_PROFILE_DIR=%VIP_PROJECT_ROOT%/notebooks/profile
-if not defined BOXM2_OPENCL_DIR set BOXM2_OPENCL_DIR=%VIP_VXL_SRC_DIR%/contrib/brl/bseg/boxm2/ocl/cl/
+REM if not defined BOXM2_OPENCL_DIR set BOXM2_OPENCL_DIR=%VIP_VXL_SRC_DIR%/contrib/brl/bseg/boxm2/ocl/cl/
+if not defined BOXM2_OPENCL_DIR set BOXM2_OPENCL_DIR=%VIP_INSTALL_DIR%/share/vxl/cl/boxm2/
 if not defined VOLM_DIR set VOLM_DIR=%VIP_VXL_SRC_DIR%/contrib/brl/bbas/volm
 if not defined VIP_PYTHONPATH set VIP_PYTHONPATH=%VIP_PROJECT_ROOT%
 REM for voxel_globe package


Changed source order

Changed source order

--- restore.cmd
+++ restore.cmd
@@ -4,7 +4,7 @@

 :RESTORE

-nuget restore Core2D.sln -source "https://www.nuget.org/api/v2/;https://ci.appveyor.com/nuget/portable-xaml;https://www.myget.org/F/perspex-nightly/api/v2;https://www.myget.org/F/xamlbehaviors-nightly/api/v2"
+nuget restore Core2D.sln -source "https://ci.appveyor.com/nuget/portable-xaml;https://www.nuget.org/api/v2/;https://www.myget.org/F/perspex-nightly/api/v2;https://www.myget.org/F/xamlbehaviors-nightly/api/v2"

 IF NOT ERRORLEVEL 1 GOTO :EOF


Rely on "bash" being available on Windows command line; regenerate the header/source code when starting VS IDE.

--- ide/_vs2013.bat
+++ ide/_vs2013.bat
@@ -1,5 +1,9 @@
 @ECHO OFF
 SETLOCAL
+
+cd ..
+bash -c "make realclean ; make M=\"1 2 3 4 5 23\" ALIGNED_STORES=1 header source main"
+cd ide

 SET LIBXSMMROOT=%~d0%~p0\..


fix incorrect path

fix incorrect path

--- backup_differential.bat
+++ backup_differential.bat
@@ -51,7 +51,7 @@
 set STAGING=P:\backup_staging\local

 :: This is the final, long-term destination for your backup after it is compressed.
-set DESTINATION=\\thebrain\backup_stephandzur\Everything else\personal\root
+set DESTINATION=\\thebrain\backup\Everything else\personal\root

 :: If you want to customize the prefix of the backup files, do so here. Don't use any special characters (like underscores)
 :: The script automatically suffixes an underscore to this name. Recommend not changing this unless you really need to.


Fixed a misspelling of one of the bitsadmin labels in the floppy/_download.cmd script.

--- floppy/_download.cmd
+++ floppy/_download.cmd
@@ -92,7 +92,7 @@

 @for %%i in (%SystemRoot% %PACKER_SEARCH_PATHS%) do @if not defined wget @if exist "%%~i\wget.exe" set wget=%%~i\wget.exe

-if not defined wget goto check_bitadmin
+if not defined wget goto check_bitsadmin
 if not exist "%wget%" goto check_bitsadmin

 "%wget%" --version >NUL 2>NUL


fixed AStyle.bat

fixed AStyle.bat

--- AStyle.bat
+++ AStyle.bat
@@ -30,9 +30,9 @@

 ::a dir
 set SRC_DIR=%~dp0/NFComm
-AStyle %ASTYLE_PARAM% -r %SRC_DIR%/*.h %SRC_DIR%/*.cpp
+AStyle %ASTYLE_PARAM% -r %SRC_DIR%/*.h %SRC_DIR%/*.cpp %SRC_DIR%/*.hpp

 set SRC_DIR=%~dp0/NFServer
-AStyle %ASTYLE_PARAM% -r %SRC_DIR%/*.h %SRC_DIR%/*.cpp
+AStyle %ASTYLE_PARAM% -r %SRC_DIR%/*.h %SRC_DIR%/*.cpp %SRC_DIR%/*.hpp

 pause


write each column to it's own file

write each column to it's own file

...not a good trail to go down. recorded here for..., well I'm not sure
why. Just cause I did it I suppose.

--- stats/parse-by-count.bat
+++ stats/parse-by-count.bat
@@ -12,7 +12,8 @@
 set logfile=%1
 if not exist scratch mkdir scratch

-for /f "delims=;" %%a in (field_names.txt) do call :Get_Field_Values "%%a"
+rem for /f "delims=;" %%a in (field_names.txt) do call :Get_Field_Values "%%a"
+for /f "delims=;" %%a in (field_names.txt) do call :by_equals
 start scratch

 call :Build_CSV
@@ -26,6 +27,12 @@
     :: TODO: change so only capture values (stuff to right of `=`)
     goto :eof

+:by_equals
+    for /f "tokens=1,2 delims==" %%a in ('findstr /c:"=" "%logfile%"') do (
+        @echo %%b >> "scratch\%%a.txt"
+        )
+    goto :eof
+
 :Build_CSV
     echo.   +++ Build_CSV not yet implemented.
     goto :eof


Install python 2.7 on a separate prefix on Windows

--- recipes/qt-webengine/bld.bat
+++ recipes/qt-webengine/bld.bat
@@ -10,6 +10,10 @@
 )
 popd
 endlocal
+
+:: Chromium requires Python 2.7 to generate compilation outputs.
+conda create -y --prefix "%SRC_DIR%\win_python" python=2.7 -c conda-forge
+set PATH=%SRC_DIR%\win_python;%PATH%

 set PATH=%cd%\jom;%PATH%
 SET PATH=%cd%\gnuwin32\gnuwin32\bin;%cd%\gnuwin32\bin;%PATH%


Angular Prod Build

Angular Prod Build

--- deploy.cmd
+++ deploy.cmd
@@ -97,24 +97,23 @@
 :: 2. Select node version
 call :SelectNodeVersion

-:: 3. Install npm packages
-IF EXIST "%DEPLOYMENT_TARGET%\package.json" (
-  pushd "%DEPLOYMENT_TARGET%"
-  call :ExecuteCmd !NPM_CMD! install
-  IF !ERRORLEVEL! NEQ 0 goto error
-  popd
-)
+# 3. Install NPM packages
+if [ -e "$DEPLOYMENT_TARGET/package.json" ]; then
+  cd "$DEPLOYMENT_TARGET"
+  eval $NPM_CMD install --production
+  eval $NPM_CMD install --only=dev
+  exitWithMessageOnError "npm failed"
+  cd - > /dev/null
+fi

-echo Handling Angular build
-    :: 4. Build ng app
-    IF EXIST "%DEPLOYMENT_TARGET%\package.json" (
-      pushd "%DEPLOYMENT_TARGET%"
-      call :ExecuteCmd "!NODE_EXE!" ./node_modules/@angular/cli/bin/ng build --prod --env=prod --aot
-      :: the next line is optional to fix 404 error see section #8
-      call :ExecuteCmd cp "%DEPLOYMENT_TARGET%"/web.config "%DEPLOYMENT_TARGET%"/dist/
-      IF !ERRORLEVEL! NEQ 0 goto error
-      popd
-    )
+
+# 4. Angular Prod Build
+if [ -e "$DEPLOYMENT_TARGET/.angular-cli.json" ]; then
+  cd "$DEPLOYMENT_TARGET"
+  eval ./node_modules/.bin/ng build --prod
+  exitWithMessageOnError "Angular build failed"
+  cd - > /dev/null
+fi

 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 goto end


update deploy.cmd

update deploy.cmd

nothing change

add echo

little comment change

--- deploy.cmd
+++ deploy.cmd
@@ -101,11 +101,14 @@
 IF EXIST "%DEPLOYMENT_TARGET%\package.json" (
   pushd "%DEPLOYMENT_TARGET%"
   call :ExecuteCmd !NPM_CMD! install --production
+  call :ExecuteCmd !NPM_CMD! install typescript
   IF !ERRORLEVEL! NEQ 0 goto error
   popd
 )

+
 :: 4. Compile TypeScript
+echo Transpiling TypeScript...
 call :ExecuteCmd tsc

 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::


Try to fix deploy paths

Try to fix deploy paths

--- deploy.cmd
+++ deploy.cmd
@@ -1,5 +1,24 @@
 mkdir %DEPLOYMENT%
+mkdir %DEPLOYMENT%\keywords
+mkdir %DEPLOYMENT%\keywords\items
 copy PythonWhiteLibrary\src\WhiteLibrary.py %DEPLOYMENT%\
+copy PythonWhiteLibrary\src\keywords\__init__.py %DEPLOYMENT%\keywords\
+copy PythonWhiteLibrary\src\keywords\application.py %DEPLOYMENT%\keywords\
+copy PythonWhiteLibrary\src\keywords\keyboard.py %DEPLOYMENT%\keywords\
+copy PythonWhiteLibrary\src\keywords\librarycomponent.py %DEPLOYMENT%\keywords\
+copy PythonWhiteLibrary\src\keywords\robotlibcore.py %DEPLOYMENT%\keywords\
+copy PythonWhiteLibrary\src\keywords\window.py %DEPLOYMENT%\keywords\
+copy PythonWhiteLibrary\src\keywords\items\__init__.py %DEPLOYMENT%\keywords\items\
+copy PythonWhiteLibrary\src\keywords\items\buttons.py %DEPLOYMENT%\keywords\items\
+copy PythonWhiteLibrary\src\keywords\items\label.py %DEPLOYMENT%\keywords\items\
+copy PythonWhiteLibrary\src\keywords\items\listcontrols.py %DEPLOYMENT%\keywords\items\
+copy PythonWhiteLibrary\src\keywords\items\menu.py %DEPLOYMENT%\keywords\items\
+copy PythonWhiteLibrary\src\keywords\items\progressbar.py %DEPLOYMENT%\keywords\items\
+copy PythonWhiteLibrary\src\keywords\items\slider.py %DEPLOYMENT%\keywords\items\
+copy PythonWhiteLibrary\src\keywords\items\tab.py %DEPLOYMENT%\keywords\items\
+copy PythonWhiteLibrary\src\keywords\items\textbox.py %DEPLOYMENT%\keywords\items\
+copy PythonWhiteLibrary\src\keywords\items\tree.py %DEPLOYMENT%\keywords\items\
+copy PythonWhiteLibrary\src\keywords\items\uiitem.py %DEPLOYMENT%\keywords\items\
 copy PythonWhiteLibrary\version.py %DEPLOYMENT%\
 copy PythonWhiteLibrary\src\__init__.py %DEPLOYMENT%\
 copy PythonWhiteLibrary\setup.py %DEPLOYMENT%\


(build) Updated Cake tool to version 0.17.0

--- deploy.cmd
+++ deploy.cmd
@@ -1,6 +1,6 @@
 @ECHO OFF
 REM SET Cake & NuGet version
-SET CAKE_VERSION=0.16.2
+SET CAKE_VERSION=0.17.0
 SET CAKE_FOLDER=Cake.%CAKE_VERSION%
 SET NUGET_VERSION=3.5.0.1938
 SET NUGET_EXE=%~dp0\Tools\nuget.exe


테스트 자동화 runTest.bat 배치파일 추가

테스트 자동화 runTest.bat 배치파일 추가

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

--- runTest.bat
+++ runTest.bat
@@ -0,0 +1 @@
+vendor\bin\phpunit --colors=always tests/


Make sure we build vscode-notebook-tests on windows

--- scripts/test-integration.bat
+++ scripts/test-integration.bat
@@ -22,6 +22,7 @@
 	call yarn gulp 	compile-extension:vscode-api-tests^
 					compile-extension:vscode-colorize-tests^
 					compile-extension:markdown-language-features^
+					compile-extension:vscode-notebook-tests^
 					compile-extension:emmet^
 					compile-extension:css-language-features-server^
 					compile-extension:html-language-features-server^


fix batch commands for ethernet-device and empty pypirc

--- create.bat
+++ create.bat
@@ -2,8 +2,8 @@

 if not exist tmp mkdir tmp

-echo "eth0" > tmp/ethernet-device.txt
-echo nul > tmp/pypirc.txt
+echo eth0 > tmp/ethernet-device.txt
+copy /y nul "tmp/pypirc.txt"

 set /p USER_NAME="User name: "
 :: TODO: Make files with newlines. This would add a newline.


Remove av from the binary requirements (#2006)

Signed-off-by: peter <6fbd8a499ac0033ab7eb088923e0440b961520f5@gmail.com>

--- packaging/windows/build_vision.bat
+++ packaging/windows/build_vision.bat
@@ -64,7 +64,7 @@
     set PYTHON_VERSION_STR=%%v
     set PYTHON_VERSION_STR=!PYTHON_VERSION_STR:.=!
     conda remove -n py!PYTHON_VERSION_STR! --all -y || rmdir %CONDA_HOME%\envs\py!PYTHON_VERSION_STR! /s
-    conda create -n py!PYTHON_VERSION_STR! -y -q -c defaults -c conda-forge numpy>=1.11 mkl>=2018 python=%%v ca-certificates scipy av
+    conda create -n py!PYTHON_VERSION_STR! -y -q -c defaults -c conda-forge numpy>=1.11 mkl>=2018 python=%%v ca-certificates scipy
 )

 :: Uncomment for stable releases


make.bat: remove double quotes

make.bat: remove double quotes

Fixes #2974.

R=golang-dev, r, rsc
CC=golang-dev
https://golang.org/cl/5653052

--- src/make.bat
+++ src/make.bat
@@ -16,9 +16,9 @@
 :: backslashes.  Then we wrap that in quotes to create
 :: a C string.
 cd ..
-set GOROOT="%CD%"
+set GOROOT=%CD%
 cd src
-if "x%GOROOT_FINAL%"=="x" set GOROOT_FINAL="%GOROOT%"
+if "x%GOROOT_FINAL%"=="x" set GOROOT_FINAL=%GOROOT%
 set DEFGOROOT=-DGOROOT_FINAL="\"%GOROOT_FINAL:\=\\%\""

 echo # Building C bootstrap tool.


Revert "3.1a1"

Revert "3.1a1"

This reverts commit ac7ad78d1dda534b1904e0f62a0cecb7d5fb5f59.

--- updater.bat
+++ updater.bat
@@ -3,7 +3,7 @@

 REM ### ghacks-user.js updater for Windows
 REM ## author: @claustromaniac
-REM ## version: 3.1a1
+REM ## version: 3.1a

 SET _myname=%~n0
 SET _myparams=%*
@@ -39,9 +39,6 @@
 	IF NOT "!_myname:~0,9!"=="[updated]" (
 		IF EXIST "[updated]!_myname!.bat" (
 			DEL /F "[updated]!_myname!.bat"
-			ECHO Script updated^^!
-			ECHO.
-			ECHO.
 			GOTO begin
 		)
 		ECHO Checking updater version...
@@ -214,7 +211,7 @@
 :merge
 SETLOCAL disabledelayedexpansion
 (
-	FOR /F "tokens=1,* delims=]" %%G IN ('FIND /n /v "" ^< "%~1"') DO (
+	FOR /F "tokens=1,* delims=]" %%G IN ('find /n /v "" ^< "%~1"') DO (
 		SET "_pref=%%H"
 		SETLOCAL enabledelayedexpansion
 		SET "_temp=!_pref: =!"


3.2

3.2

Prevent issues handling the script when the name includes spaces.

+ Formatting.

--- updater.bat
+++ updater.bat
@@ -39,11 +39,10 @@
 	REM The normal flow here goes from phase 1 to phase 2 and then phase 3.
 	IF NOT "!_myname:~0,9!"=="[updated]" (
 		IF EXIST "[updated]!_myname!.bat" (
-			REM Phase 3
-			REM The new script, with the original name, should:
-			REM 	Delete the [updated]*.bat script
-			REM 	Begin the normal script routine.
-			REN [updated]!_myname!.bat [updated]!_myname!.bat.old
+			REM ## Phase 3 ##: The new script, with the original name, will:
+			REM 	* Delete the [updated]*.bat script
+			REM 	* Begin the normal routine
+			REN "[updated]!_myname!.bat" "[updated]!_myname!.bat.old"
 			DEL /F "[updated]!_myname!.bat.old"
 			ECHO Script updated^^!
 			ECHO.
@@ -52,11 +51,10 @@
 			ECHO.
 			GOTO begin
 		)
-		REM Phase 1
-		REM -updatebatch will:
-		REM 	Download new batch and name it [updated]*.bat
-		REM 	Open that script in a new CMD window.
-		REM 	Exit
+		REM ## Phase 1 ##
+		REM 	* Download new batch and name it [updated]*.bat
+		REM 	* Start that script in a new CMD window
+		REM 	* Exit
 		ECHO Updating script...
 		ECHO.
 		REM Uncomment the next line and comment the powershell call for testing.
@@ -79,14 +77,13 @@
 			ECHO.
 			TIMEOUT 300 >nul
 		) ELSE (
-			REM Phase 2
-			REM The [updated]*.bat script will:
-			REM 	Copy itself overwriting the original batch.
-			REM 	Start that script in a new CMD instance.
-			REM 	Exit.
+			REM ## Phase 2 ##: The [updated]*.bat script will:
+			REM 	* Copy itself overwriting the original batch
+			REM 	* Start that script in a new CMD instance
+			REM 	* Exit
 			IF EXIST !_myname:~9!.bat (
-				REN !_myname:~9!.bat !_myname:~9!.bat.old
-				DEL /F !_myname:~9!.bat.old
+				REN "!_myname:~9!.bat" "!_myname:~9!.bat.old"
+				DEL /F "!_myname:~9!.bat.old"
 			)
 			COPY /B /V /Y "!_myname!.bat" "!_myname:~9!.bat"
 			START CMD /C "!_myname:~9!.bat" !_myparams!


Fix determining the version from VS2015 pre-build steps

When targetting Win32, also the pre-build step is executed in a 32-bit
environment, which is unable to access the 64-bit registry via
Wow6432Node. Instead use the "/reg" switch to specify which view of the
registry to access.

--- version.cmd
+++ version.cmd
@@ -3,19 +3,27 @@
 setlocal enabledelayedexpansion

 rem Read the Git for Windows installation path from the Registry.
+set REG=64
 :REG_QUERY
-for /f "skip=2 delims=: tokens=1*" %%a in ('reg query HKLM\SOFTWARE%WOW%\Microsoft\Windows\CurrentVersion\Uninstall\Git_is1 /v InstallLocation 2^> nul') do (
+for /f "skip=2 delims=: tokens=1*" %%a in ('reg query HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Git_is1 /v InstallLocation /reg:%REG% 2^> nul') do (
     for /f "tokens=3" %%i in ("%%a") do (
         set GIT=%%i:%%b
     )
 )
 if "%GIT%"=="" (
-    if "%WOW%"=="" (
+    if "%REG%"=="64" (
         rem Assume we are on 64-bit Windows, so explicitly read the 32-bit Registry.
-        set WOW=\Wow6432Node
+        set WOW=32
         goto REG_QUERY
     )
 )
+
+if "%GIT%"=="" (
+    echo Error: No installation of Git for Windows found.
+    exit /b 1
+)
+
+echo Using Git at %GIT%...

 pushd "%~dp0"
 for /f "delims=" %%l in ('"%GIT%\bin\git.exe" describe --tags') do (


Added batch file to build sphinx docs in windows

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

--- docs/make.bat
+++ docs/make.bat
@@ -0,0 +1,281 @@
+@ECHO OFF
+
+REM Command file for Sphinx documentation
+
+if "%SPHINXBUILD%" == "" (
+	set SPHINXBUILD=sphinx-build
+)
+set BUILDDIR=_build
+set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS% .
+set I18NSPHINXOPTS=%SPHINXOPTS% .
+if NOT "%PAPER%" == "" (
+	set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS%
+	set I18NSPHINXOPTS=-D latex_paper_size=%PAPER% %I18NSPHINXOPTS%
+)
+
+if "%1" == "" goto help
+
+if "%1" == "help" (
+	:help
+	echo.Please use `make ^<target^>` where ^<target^> is one of
+	echo.  html       to make standalone HTML files
+	echo.  dirhtml    to make HTML files named index.html in directories
+	echo.  singlehtml to make a single large HTML file
+	echo.  pickle     to make pickle files
+	echo.  json       to make JSON files
+	echo.  htmlhelp   to make HTML files and a HTML help project
+	echo.  qthelp     to make HTML files and a qthelp project
+	echo.  devhelp    to make HTML files and a Devhelp project
+	echo.  epub       to make an epub
+	echo.  epub3      to make an epub3
+	echo.  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter
+	echo.  text       to make text files
+	echo.  man        to make manual pages
+	echo.  texinfo    to make Texinfo files
+	echo.  gettext    to make PO message catalogs
+	echo.  changes    to make an overview over all changed/added/deprecated items
+	echo.  xml        to make Docutils-native XML files
+	echo.  pseudoxml  to make pseudoxml-XML files for display purposes
+	echo.  linkcheck  to check all external links for integrity
+	echo.  doctest    to run all doctests embedded in the documentation if enabled
+	echo.  coverage   to run coverage check of the documentation if enabled
+	echo.  dummy      to check syntax errors of document sources
+	goto end
+)
+
+if "%1" == "clean" (
+	for /d %%i in (%BUILDDIR%\*) do rmdir /q /s %%i
+	del /q /s %BUILDDIR%\*
+	goto end
+)
+
+
+REM Check if sphinx-build is available and fallback to Python version if any
+%SPHINXBUILD% 1>NUL 2>NUL
+if errorlevel 9009 goto sphinx_python
+goto sphinx_ok
+
+:sphinx_python
+
+set SPHINXBUILD=python -m sphinx.__init__
+%SPHINXBUILD% 2> nul
+if errorlevel 9009 (
+	echo.
+	echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
+	echo.installed, then set the SPHINXBUILD environment variable to point
+	echo.to the full path of the 'sphinx-build' executable. Alternatively you
+	echo.may add the Sphinx directory to PATH.
+	echo.
+	echo.If you don't have Sphinx installed, grab it from
+	echo.http://sphinx-doc.org/
+	exit /b 1
+)
+
+:sphinx_ok
+
+
+if "%1" == "html" (
+	%SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The HTML pages are in %BUILDDIR%/html.
+	goto end
+)
+
+if "%1" == "dirhtml" (
+	%SPHINXBUILD% -b dirhtml %ALLSPHINXOPTS% %BUILDDIR%/dirhtml
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The HTML pages are in %BUILDDIR%/dirhtml.
+	goto end
+)
+
+if "%1" == "singlehtml" (
+	%SPHINXBUILD% -b singlehtml %ALLSPHINXOPTS% %BUILDDIR%/singlehtml
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The HTML pages are in %BUILDDIR%/singlehtml.
+	goto end
+)
+
+if "%1" == "pickle" (
+	%SPHINXBUILD% -b pickle %ALLSPHINXOPTS% %BUILDDIR%/pickle
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished; now you can process the pickle files.
+	goto end
+)
+
+if "%1" == "json" (
+	%SPHINXBUILD% -b json %ALLSPHINXOPTS% %BUILDDIR%/json
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished; now you can process the JSON files.
+	goto end
+)
+
+if "%1" == "htmlhelp" (
+	%SPHINXBUILD% -b htmlhelp %ALLSPHINXOPTS% %BUILDDIR%/htmlhelp
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished; now you can run HTML Help Workshop with the ^
+.hhp project file in %BUILDDIR%/htmlhelp.
+	goto end
+)
+
+if "%1" == "qthelp" (
+	%SPHINXBUILD% -b qthelp %ALLSPHINXOPTS% %BUILDDIR%/qthelp
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished; now you can run "qcollectiongenerator" with the ^
+.qhcp project file in %BUILDDIR%/qthelp, like this:
+	echo.^> qcollectiongenerator %BUILDDIR%\qthelp\d.qhcp
+	echo.To view the help file:
+	echo.^> assistant -collectionFile %BUILDDIR%\qthelp\d.ghc
+	goto end
+)
+
+if "%1" == "devhelp" (
+	%SPHINXBUILD% -b devhelp %ALLSPHINXOPTS% %BUILDDIR%/devhelp
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished.
+	goto end
+)
+
+if "%1" == "epub" (
+	%SPHINXBUILD% -b epub %ALLSPHINXOPTS% %BUILDDIR%/epub
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The epub file is in %BUILDDIR%/epub.
+	goto end
+)
+
+if "%1" == "epub3" (
+	%SPHINXBUILD% -b epub3 %ALLSPHINXOPTS% %BUILDDIR%/epub3
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The epub3 file is in %BUILDDIR%/epub3.
+	goto end
+)
+
+if "%1" == "latex" (
+	%SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished; the LaTeX files are in %BUILDDIR%/latex.
+	goto end
+)
+
+if "%1" == "latexpdf" (
+	%SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
+	cd %BUILDDIR%/latex
+	make all-pdf
+	cd %~dp0
+	echo.
+	echo.Build finished; the PDF files are in %BUILDDIR%/latex.
+	goto end
+)
+
+if "%1" == "latexpdfja" (
+	%SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
+	cd %BUILDDIR%/latex
+	make all-pdf-ja
+	cd %~dp0
+	echo.
+	echo.Build finished; the PDF files are in %BUILDDIR%/latex.
+	goto end
+)
+
+if "%1" == "text" (
+	%SPHINXBUILD% -b text %ALLSPHINXOPTS% %BUILDDIR%/text
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The text files are in %BUILDDIR%/text.
+	goto end
+)
+
+if "%1" == "man" (
+	%SPHINXBUILD% -b man %ALLSPHINXOPTS% %BUILDDIR%/man
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The manual pages are in %BUILDDIR%/man.
+	goto end
+)
+
+if "%1" == "texinfo" (
+	%SPHINXBUILD% -b texinfo %ALLSPHINXOPTS% %BUILDDIR%/texinfo
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The Texinfo files are in %BUILDDIR%/texinfo.
+	goto end
+)
+
+if "%1" == "gettext" (
+	%SPHINXBUILD% -b gettext %I18NSPHINXOPTS% %BUILDDIR%/locale
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The message catalogs are in %BUILDDIR%/locale.
+	goto end
+)
+
+if "%1" == "changes" (
+	%SPHINXBUILD% -b changes %ALLSPHINXOPTS% %BUILDDIR%/changes
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.The overview file is in %BUILDDIR%/changes.
+	goto end
+)
+
+if "%1" == "linkcheck" (
+	%SPHINXBUILD% -b linkcheck %ALLSPHINXOPTS% %BUILDDIR%/linkcheck
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Link check complete; look for any errors in the above output ^
+or in %BUILDDIR%/linkcheck/output.txt.
+	goto end
+)
+
+if "%1" == "doctest" (
+	%SPHINXBUILD% -b doctest %ALLSPHINXOPTS% %BUILDDIR%/doctest
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Testing of doctests in the sources finished, look at the ^
+results in %BUILDDIR%/doctest/output.txt.
+	goto end
+)
+
+if "%1" == "coverage" (
+	%SPHINXBUILD% -b coverage %ALLSPHINXOPTS% %BUILDDIR%/coverage
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Testing of coverage in the sources finished, look at the ^
+results in %BUILDDIR%/coverage/python.txt.
+	goto end
+)
+
+if "%1" == "xml" (
+	%SPHINXBUILD% -b xml %ALLSPHINXOPTS% %BUILDDIR%/xml
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The XML files are in %BUILDDIR%/xml.
+	goto end
+)
+
+if "%1" == "pseudoxml" (
+	%SPHINXBUILD% -b pseudoxml %ALLSPHINXOPTS% %BUILDDIR%/pseudoxml
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The pseudo-XML files are in %BUILDDIR%/pseudoxml.
+	goto end
+)
+
+if "%1" == "dummy" (
+	%SPHINXBUILD% -b dummy %ALLSPHINXOPTS% %BUILDDIR%/dummy
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. Dummy builder generates no files.
+	goto end
+)
+
+:end


Add logdir and storagedir to nodetool.bat

Patch by jmckenzie; reviewed by pthompson for CASSANDRA-9696

--- bin/nodetool.bat
+++ bin/nodetool.bat
@@ -23,8 +23,11 @@
 if NOT DEFINED CASSANDRA_HOME set CASSANDRA_HOME=%~dp0..
 if NOT DEFINED JAVA_HOME goto :err

+set CASSANDRA_PARAMS=%CASSANDRA_PARAMS% -Dcassandra.logdir="%CASSANDRA_HOME%\logs"
+set CASSANDRA_PARAMS=%CASSANDRA_PARAMS% -Dcassandra.storagedir="%CASSANDRA_HOME%\data"
+
 echo Starting NodeTool
-"%JAVA_HOME%\bin\java" -cp %CASSANDRA_CLASSPATH% -Dlogback.configurationFile=logback-tools.xml org.apache.cassandra.tools.NodeTool %*
+"%JAVA_HOME%\bin\java" -cp %CASSANDRA_CLASSPATH% %CASSANDRA_PARAMS% -Dlogback.configurationFile=logback-tools.xml org.apache.cassandra.tools.NodeTool %*
 goto finally

 :err


Update upload.bat

Update upload.bat

--- conda/upload.bat
+++ conda/upload.bat
@@ -56,7 +56,7 @@

 for %%x in (%UPLOAD_TARGETS%) do (
     for /f %%i in ('conda build %%x -c %ANACONDA_CHANNEL% %ANACONDA_UPLOAD_FLAGS% --output') do (set UPLOAD_FILE=%%i)
-    anaconda upload --user $ANACONDA_CHANNEL %UPLOAD_FILE
+    anaconda upload --user %ANACONDA_CHANNEL% %UPLOAD_FILE%
     if %errorlevel% neq 0 (
       echo "upload failed"
     )


Now deletes boundscheck\CVS.

Now deletes boundscheck\CVS.

--- delcvs.bat
+++ delcvs.bat
@@ -1,5 +1,6 @@
 rmdir /S /Q CVS
 rmdir /S /Q bin\CVS
+rmdir /S /Q boundscheck\CVS
 rmdir /S /Q doc\CVS
 rmdir /S /Q gtk\CVS
 rmdir /S /Q src\CVS


edit deploy script

edit deploy script

--- deploy.cmd
+++ deploy.cmd
@@ -85,20 +85,22 @@
 :: Deployment
 :: ----------

-::Deployment
+:Deployment
 echo Handling node.js deployment.

 :: 1. Select node version
 call :SelectNodeVersion

 :: 2. Install npm packages
-IF EXIST "%DEPLOYMENT_SOURCE%\package.json" (
+IF EXIST "%DEPLOYMENT_TARGET%\package.json" (
+  ::  pushd "%DEPLOYMENT_TARGET%"
   call :ExecuteCmd !NPM_CMD! install
   IF !ERRORLEVEL! NEQ 0 goto error
+  :: popd
 )

 :: 3. Execute Gulp
-IF EXIST "%DEPLOYMENT_SOURCE%\gulpfile.js" (
+IF EXIST "%DEPLOYMENT_TARGET%\gulpfile.js" (
     call .\node_modules\.bin\gulp build
     IF !ERRORLEVEL! NEQ 0 goto error
 )
@@ -108,6 +110,7 @@
   call :ExecuteCmd "%KUDU_SYNC_CMD%" -v 50 -f "%DEPLOYMENT_SOURCE%\dist" -t "%DEPLOYMENT_TARGET%" -n "%NEXT_MANIFEST_PATH%" -p "%PREVIOUS_MANIFEST_PATH%" -i ".git;.hg;.deployment;deploy.cmd"
   IF !ERRORLEVEL! NEQ 0 goto error
 )
+
 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 goto end


Fixing root deploy command to use correct script names.

--- deploy.cmd
+++ deploy.cmd
@@ -1,8 +1,8 @@
 if (%APP% == "api")
-    call ".\src\dotnet\deployapi.cmd"
+    call ".\src\dotnet\deploy-api.cmd"

 if (%APP% == "mvc")
-    call ".\src\dotnet\deploymvc.cmd"
+    call ".\src\dotnet\deploy-mvc.cmd"

 if (%APP% == "angular")
     call ".\src\angular\deploy.cmd"


Install Azure Artifacts Credential Provider in Kudu deployment scipt

--- deploy.cmd
+++ deploy.cmd
@@ -66,6 +66,10 @@

 echo Handling ASP.NET Core Web Application deployment.

+:: 0. Install Azure Artifacts Credential Provider for NuGet
+call :ExecuteCmd @"%SystemRoot%\System32\WindowsPowerShell\v1.0\powershell.exe" -NoProfile -InputFormat None -ExecutionPolicy Bypass -Command "iex ((New-Object System.Net.WebClient).DownloadString('https://github.com/Microsoft/artifacts-credprovider/blob/master/helpers/installcredprovider.ps1'))"
+IF !ERRORLEVEL! NEQ 0 goto error
+
 :: 1. Restore nuget packages
 call :ExecuteCmd dotnet restore "%DEPLOYMENT_SOURCE%\live.asp.net.sln" %RESTORE_ARGS%
 IF !ERRORLEVEL! NEQ 0 goto error


Updating config

Updating config

--- deploy.cmd
+++ deploy.cmd
@@ -99,12 +99,23 @@
 :: 2. Select node version
 call :SelectNodeVersion

-:: 3. Install npm packages
-IF EXIST "%DEPLOYMENT_TARGET%\package.json" (
-  pushd "%DEPLOYMENT_TARGET%"
-  call :ExecuteCmd !NPM_CMD! install --production
+:: 2. Restore NPM packages
+IF /I "packages.json" NEQ "" (
+  CD %DEPLOYMENT_TARGET%
+  echo Installing npm packages: Starting %TIME%
+  call npm --version
+  call npm install
+  echo Installing npm packages: Finished %TIME%
   IF !ERRORLEVEL! NEQ 0 goto error
-  popd
+)
+
+:: 3. Run webpack
+IF /I "webpack.config.js" NEQ "" (
+  IF !ERRORLEVEL! NEQ 0 goto error
+  echo Running webpack deployment: Starting %TIME%
+  call npm run build:prod
+  echo Running webpack deployment: Finished %TIME%
+  IF !ERRORLEVEL! NEQ 0 goto error
 )

 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::


Separate ARM_PATH from UV4 variable

Separate ARM_PATH from UV4 variable

--- tools/build_release.bat
+++ tools/build_release.bat
@@ -15,23 +15,20 @@
 :: See the License for the specific language governing permissions and
 :: limitations under the License.
 ::
-
+setlocal enabledelayedexpansion
 @rem Script assumes working directory is workspace root. Force it.
 cd %~dp0..\

 @rem See if we can find uVision. This logic is consistent with progen
 @if [%UV4%]==[] (
 	@echo UV4 variable is not set, trying to autodetect..
-	@set ARM_PATH=C:\KEIL_V5\ARM\ARMCC
 	if EXIST c:\keil\uv4\uv4.exe (
 		set UV4=c:\keil\uv4\uv4.exe
-		set ARM_PATH=C:\KEIL_V4\ARM\ARMCC
 	) else if EXIST c:\keil_v5\uv4\uv4.exe (
 		set UV4=c:\keil_v5\uv4\uv4.exe
-		set ARM_PATH=C:\KEIL_V5\ARM\ARMCC
 	) else goto error_nomdk
 )
-@echo USING UV4=%UV4% and ARM_PATH=%ARM_PATH%
+@echo USING UV4=%UV4%

 @set project_tool=%1
 @set env_folder=%2
@@ -62,11 +59,22 @@
 @if %project_tool%==mbedcli (
 	@REM setup mbed dependencies
 	echo Building for mbed cli
+
+	@if [%ARM_PATH%]==[] (
+		@echo ARM_PATH variable is not set, trying to autodetect..
+		if EXIST C:\KEIL_V4\ARM\ARMCC\ (
+			set ARM_PATH=C:\KEIL_V4\ARM\ARMCC
+		) else if EXIST C:\KEIL_V5\ARM\ARMCC\ (
+			set ARM_PATH=C:\KEIL_V5\ARM\ARMCC
+		) else goto error_armpath
+	)
+	@echo USING ARM_PATH=!ARM_PATH!
+
 	@REM uncomment these next two lines when the update to mbed-os merge the test dependency
 	@REM mbed deploy
 	@REM mbed update
 	mbed config root .
-	mbed config ARM_PATH=%ARM_PATH%
+	mbed config ARM_PATH=!ARM_PATH!
 	python tools/mbedcli_compile.py --clean --release
 	@if %errorlevel% neq 0 exit /B %errorlevel%
 	python tools/copy_release_files.py --project-tool mbedcli
@@ -93,3 +101,8 @@
 @echo non-default location, you need to set environment variable UV4 to
 @echo the path of the executable
 @exit /B 1
+
+:error_armpath
+@echo Error: Need to set environment variable ARM_PATH to
+@echo the path of ARM compiler
+@exit /B 1


for proton builds, retire vs2008, add vs2017

--- bat/build_proton.bat
+++ bat/build_proton.bat
@@ -22,8 +22,9 @@
 :: build_proton.bat
 :: Version 1.5 2015-07-09
 :: Version 1.6 2016-03-08 Add VS2015
-::
-:: Usage: build_proton.bat INSTALL_ROOT_PATH [2008|2010|2012|2013|2015 x64|x86 [any         [any]]]
+:: Version 1.7 2017-10-25 Add VS2017, Remove VS2008
+::
+:: Usage: build_proton.bat INSTALL_ROOT_PATH [2010|2012|2013|2015|2017 x64|x86 [any         [any]]]
 ::                         %1                 %2                       %3       %4           %5
 ::                                                                              keep build  keep install
 :: A script to cmake/make/install proton on windows.
@@ -34,15 +35,11 @@
 :: It produces an installed directory that qpid can share to get 1.0 support.
 ::
 :: Cmake and the compiles will be in subfolder of the current directory:
-::      .\build_2008_x86
 ::      .\build_2010_x86
-::      .\build_2008_x64
 ::      .\build_2010_x64
 ::
 :: Installs are steered to sub directories under INSTALL_ROOT_PATH in %1.
-::      %1%\install_2008_x86
 ::      %1%\install_2010_x86
-::      %1%\install_2008_x64
 ::      %1%\install_2010_x64
 ::
 ::   The install directories are suitable to be consumed in a
@@ -59,7 +56,7 @@

 :: Check that CD is a proton checkout
 IF NOT exist .\proton-c (echo This script must execute from a proton checkout root && pause && goto :eof)
-IF NOT exist .\proton-j (echo This script must execute from a proton checkout root && pause && goto :eof)
+IF NOT exist .\proton-j (echo This script must execute from a proton checkout root. If this is a distribution kit then proton-j is absent. Just 'mkdir proton-j' and build again. && pause && goto :eof)

 :: Check that the INSTALL_ROOT_PATH is specified
 IF "%1"=="" (echo You must specify an INSTALL_ROOT_PATH && GOTO :Usage)
@@ -96,23 +93,23 @@
 IF "%cli_build%"=="true" (
     call :build_proton %cli_compiler% %cli_arch% %INSTALL_ROOT% "%keep_build%" "%keep_install%"
 ) ELSE (
-    call :build_proton 2008 x86  %INSTALL_ROOT% "%keep_build%" "%keep_install%"
     call :build_proton 2010 x86  %INSTALL_ROOT% "%keep_build%" "%keep_install%"
     call :build_proton 2012 x86  %INSTALL_ROOT% "%keep_build%" "%keep_install%"
     call :build_proton 2013 x86  %INSTALL_ROOT% "%keep_build%" "%keep_install%"
     call :build_proton 2015 x86  %INSTALL_ROOT% "%keep_build%" "%keep_install%"
-    call :build_proton 2008 x64  %INSTALL_ROOT% "%keep_build%" "%keep_install%"
+    call :build_proton 2017 x86  %INSTALL_ROOT% "%keep_build%" "%keep_install%"
     call :build_proton 2010 x64  %INSTALL_ROOT% "%keep_build%" "%keep_install%"
     call :build_proton 2012 x64  %INSTALL_ROOT% "%keep_build%" "%keep_install%"
     call :build_proton 2013 x64  %INSTALL_ROOT% "%keep_build%" "%keep_install%"
     call :build_proton 2015 x64  %INSTALL_ROOT% "%keep_build%" "%keep_install%"
+    call :build_proton 2017 x64  %INSTALL_ROOT% "%keep_build%" "%keep_install%"
 )
 goto :eof

 ::
 :: build a proton
 ::  %1 selects architecture x86 or x64
-::  %2 selects studio 2008 or 2010 or 2012 or 2013
+::  %2 selects studio  2010 or 2012 or 2013 or 2015 or 2017
 ::  %3 is fully qualified install root path with no trailing slash
 ::  %4 true|false to keep build directory
 ::  %5 true|false to keep install directory
@@ -130,20 +127,7 @@
 set   build_dir=build_%vsname%_%arch%
 set install_dir=%INSTALL_ROOT_PATH%\install_%vsname%_%arch%

-REM VS2008 or VS2010 or VS2012 or VS2013 or VS2015, x86 or x64
-if "%vsname%"=="2008" (
-    if "%arch%" == "x86" (
-        call "%VS90COMNTOOLS%..\..\VC\vcvarsall.bat" x86
-        if ERRORLEVEL 1 exit /b 1
-        set cmakegen="Visual Studio 9 2008"
-        set proton_arch=Win32
-    ) else (
-        call "%VS90COMNTOOLS%..\..\VC\vcvarsall.bat" amd64
-        if ERRORLEVEL 1 exit /b 1
-        set cmakegen="Visual Studio 9 2008 Win64"
-        set proton_arch=x64
-    )
-)
+REM VS2010 or VS2012 or VS2013 or VS2015 or VS2017, x86 or x64
 if "%vsname%"=="2010" (
     if "%arch%" == "x86" (
         call "%VS100COMNTOOLS%..\..\VC\vcvarsall.bat" x86
@@ -193,6 +177,19 @@
         call "%VS140COMNTOOLS%..\..\VC\vcvarsall.bat" amd64
         if ERRORLEVEL 1 exit /b 1
         set cmakegen="Visual Studio 14 2015 Win64"
+        set proton_arch=x64
+    )
+)
+if "%vsname%"=="2017" (
+    if "%arch%" == "x86" (
+        call "%VS150COMNTOOLS%..\..\VC\Auxiliary\build\vcvarsall.bat" x86
+        if ERRORLEVEL 1 exit /b 1
+        set cmakegen="Visual Studio 15 2017"
+        set proton_arch=Win32
+    ) else (
+        call "%VS150COMNTOOLS%..\..\VC\Auxiliary\build\vcvarsall.bat" amd64
+        if ERRORLEVEL 1 exit /b 1
+        set cmakegen="Visual Studio 15 2017 Win64"
         set proton_arch=x64
     )
 )


moving to environment variables

moving to environment variables

--- bin/cea-workflow.bat
+++ bin/cea-workflow.bat
@@ -2,116 +2,125 @@
 rem run a (complete) cea workflow for a given scenario

 rem configure variables used for the simulation
-set SCENARIO=c:\reference-case-WTP-reduced\WTP_MIX_m
-set REGION=SIN
-set WEATHER=Singapore-2016
+if not defined CEA-SCENARIO (
+    echo please set CEA-SCENARIO first
+    exit /b 1
+)
+if not defined CEA-REGION (
+    echo please set CEA-REGION first
+    exit /b 1
+)
+if not defined CEA-WEATHER (
+    echo please set CEA-WEATHER first
+    exit /b 1
+)

 rem run each script, break on error

 rem copy-default-databases
-echo %date% %time% copy-default-databases begin >> %SCENARIO%\cea-workflow.log
-cea copy-default-databases --scenario %SCENARIO% --region %REGION%
+echo %date% %time% copy-default-databases begin >> %CEA-SCENARIO%\cea-workflow.log
+cea copy-default-databases --scenario %CEA-SCENARIO% --region %CEA-REGION%
 if %errorlevel% neq 0 exit /b %errorlevel%
-echo %date% %time% copy-default-databases end >> %SCENARIO%\cea-workflow.log
+echo %date% %time% copy-default-databases end >> %CEA-SCENARIO%\cea-workflow.log

 rem data-helper
-echo %date% %time% data-helper begin >> %SCENARIO%\cea-workflow.log
+echo %date% %time% data-helper begin >> %CEA-SCENARIO%\cea-workflow.log
 cea data-helper
 if %errorlevel% neq 0 exit /b %errorlevel%
-echo %date% %time% data-helper end >> %SCENARIO%\cea-workflow.log
+echo %date% %time% data-helper end >> %CEA-SCENARIO%\cea-workflow.log

 rem radiation-daysim
-echo %date% %time% radiation-daysim begin >> %SCENARIO%\cea-workflow.log
-cea radiation-daysim --weather %WEATHER%
+echo %date% %time% radiation-daysim begin >> %CEA-SCENARIO%\cea-workflow.log
+cea radiation-daysim --weather %CEA-WEATHER%
 if %errorlevel% neq 0 exit /b %errorlevel%
-echo %date% %time% radiation-daysim end >> %SCENARIO%\cea-workflow.log
+echo %date% %time% radiation-daysim end >> %CEA-SCENARIO%\cea-workflow.log

 rem demand
-echo %date% %time% demand begin >> %SCENARIO%\cea-workflow.log
+echo %date% %time% demand begin >> %CEA-SCENARIO%\cea-workflow.log
 cea demand --multiprocessing on
 if %errorlevel% neq 0 exit /b %errorlevel%
-echo %date% %time% demand end >> %SCENARIO%\cea-workflow.log
+echo %date% %time% demand end >> %CEA-SCENARIO%\cea-workflow.log

 rem emissions
-echo %date% %time% emissions begin >> %SCENARIO%\cea-workflow.log
+echo %date% %time% emissions begin >> %CEA-SCENARIO%\cea-workflow.log
 cea emissions
 if %errorlevel% neq 0 exit /b %errorlevel%
-echo %date% %time% emissions end >> %SCENARIO%\cea-workflow.log
+echo %date% %time% emissions end >> %CEA-SCENARIO%\cea-workflow.log

 rem network-layout
-echo %date% %time% network-layout begin >> %SCENARIO%\cea-workflow.log
+echo %date% %time% network-layout begin >> %CEA-SCENARIO%\cea-workflow.log
 cea network-layout
 if %errorlevel% neq 0 exit /b %errorlevel%
-echo %date% %time% network-layout end >> %SCENARIO%\cea-workflow.log
+echo %date% %time% network-layout end >> %CEA-SCENARIO%\cea-workflow.log

 rem operation-costs
-echo %date% %time% operation-costs begin >> %SCENARIO%\cea-workflow.log
+echo %date% %time% operation-costs begin >> %CEA-SCENARIO%\cea-workflow.log
 cea operation-costs
 if %errorlevel% neq 0 exit /b %errorlevel%
-echo %date% %time% operation-costs end >> %SCENARIO%\cea-workflow.log
+echo %date% %time% operation-costs end >> %CEA-SCENARIO%\cea-workflow.log

 rem photovoltaic
-echo %date% %time% photovoltaic begin >> %SCENARIO%\cea-workflow.log
+echo %date% %time% photovoltaic begin >> %CEA-SCENARIO%\cea-workflow.log
 cea photovoltaic
 if %errorlevel% neq 0 exit /b %errorlevel%
-echo %date% %time% photovoltaic end >> %SCENARIO%\cea-workflow.log
+echo %date% %time% photovoltaic end >> %CEA-SCENARIO%\cea-workflow.log

 rem solar-collector
-echo %date% %time% solar-collector FP begin >> %SCENARIO%\cea-workflow.log
+echo %date% %time% solar-collector FP begin >> %CEA-SCENARIO%\cea-workflow.log
 cea solar-collector --type-scpanel FP
 if %errorlevel% neq 0 exit /b %errorlevel%
-echo %date% %time% solar-collector FP end >> %SCENARIO%\cea-workflow.log
+echo %date% %time% solar-collector FP end >> %CEA-SCENARIO%\cea-workflow.log

 rem solar-collector
-echo %date% %time% solar-collector ET begin >> %SCENARIO%\cea-workflow.log
+echo %date% %time% solar-collector ET begin >> %CEA-SCENARIO%\cea-workflow.log
 cea solar-collector --type-scpanel ET
 if %errorlevel% neq 0 exit /b %errorlevel%
-echo %date% %time% solar-collector ET end >> %SCENARIO%\cea-workflow.log
+echo %date% %time% solar-collector ET end >> %CEA-SCENARIO%\cea-workflow.log

 rem photovoltaic-thermal
-echo %date% %time% photovoltaic-thermal begin >> %SCENARIO%\cea-workflow.log
+echo %date% %time% photovoltaic-thermal begin >> %CEA-SCENARIO%\cea-workflow.log
 cea photovoltaic-thermal
 if %errorlevel% neq 0 exit /b %errorlevel%
-echo %date% %time% photovoltaic-thermal end >> %SCENARIO%\cea-workflow.log
+echo %date% %time% photovoltaic-thermal end >> %CEA-SCENARIO%\cea-workflow.log

 rem sewage-potential
-echo %date% %time% sewage-potential begin >> %SCENARIO%\cea-workflow.log
+echo %date% %time% sewage-potential begin >> %CEA-SCENARIO%\cea-workflow.log
 cea sewage-potential
 if %errorlevel% neq 0 exit /b %errorlevel%
-echo %date% %time% sewage-potential end >> %SCENARIO%\cea-workflow.log
+echo %date% %time% sewage-potential end >> %CEA-SCENARIO%\cea-workflow.log

 rem lake-potential
-echo %date% %time% lake-potential begin >> %SCENARIO%\cea-workflow.log
+echo %date% %time% lake-potential begin >> %CEA-SCENARIO%\cea-workflow.log
 cea lake-potential
 if %errorlevel% neq 0 exit /b %errorlevel%
-echo %date% %time% lake-potential end >> %SCENARIO%\cea-workflow.log
+echo %date% %time% lake-potential end >> %CEA-SCENARIO%\cea-workflow.log

 rem thermal-network-matrix
-echo %date% %time% thermal-network-matrix begin >> %SCENARIO%\cea-workflow.log
+echo %date% %time% thermal-network-matrix begin >> %CEA-SCENARIO%\cea-workflow.log
 cea thermal-network-matrix
 if %errorlevel% neq 0 exit /b %errorlevel%
-echo %date% %time% thermal-network-matrix end >> %SCENARIO%\cea-workflow.log
+echo %date% %time% thermal-network-matrix end >> %CEA-SCENARIO%\cea-workflow.log

 rem decentralized
-echo %date% %time% decentralized begin >> %SCENARIO%\cea-workflow.log
+echo %date% %time% decentralized begin >> %CEA-SCENARIO%\cea-workflow.log
 cea decentralized
 if %errorlevel% neq 0 exit /b %errorlevel%
-echo %date% %time% decentralized end >> %SCENARIO%\cea-workflow.log
+echo %date% %time% decentralized end >> %CEA-SCENARIO%\cea-workflow.log

 rem optimization
-echo %date% %time% optimization begin >> %SCENARIO%\cea-workflow.log
+echo %date% %time% optimization begin >> %CEA-SCENARIO%\cea-workflow.log
 cea optimization --individualind 2 ngen 2
 if %errorlevel% neq 0 exit /b %errorlevel%
-echo %date% %time% optimization end >> %SCENARIO%\cea-workflow.log
+echo %date% %time% optimization end >> %CEA-SCENARIO%\cea-workflow.log

 rem optimization
-echo %date% %time% optimization begin >> %SCENARIO%\cea-workflow.log
+echo %date% %time% optimization begin >> %CEA-SCENARIO%\cea-workflow.log
 cea optimization --individualind 5 ngen 5
 if %errorlevel% neq 0 exit /b %errorlevel%
-echo %date% %time% optimization end >> %SCENARIO%\cea-workflow.log
+echo %date% %time% optimization end >> %CEA-SCENARIO%\cea-workflow.log

 rem plots
-echo %date% %time% plots begin >> %SCENARIO%\cea-workflow.log
+echo %date% %time% plots begin >> %CEA-SCENARIO%\cea-workflow.log
 cea plots
 if %errorlevel% neq 0 exit /b %errorlevel%
-echo %date% %time% plots end >> %SCENARIO%\cea-workflow.log+echo %date% %time% plots end >> %CEA-SCENARIO%\cea-workflow.log


Update init.bat, add *.jar from dist/lib to the classpath when classes not found.

git-svn-id: 27916816d6cfa57849e9a885196bf7392b80e1ac@10952 28e8926c-6b08-0410-baaa-805c5e19b8d6

--- bin/windows/init.bat
+++ bin/windows/init.bat
@@ -31,22 +31,8 @@
 	SET JARS=!JARS!;%PA_SCHEDULER%\lib\ProActive\ProActive.jar
 	FOR %%j IN ("%PA_SCHEDULER%\lib\common\*.jar") DO SET JARS=!JARS!;%%j
 ) ELSE (
-	SET JARS=%PA_SCHEDULER%\dist\lib\ProActive.jar
-rem Jars needed by the scheduler not included in the ProActive.jar jarindex
-	SET JARS=!JARS!;%PA_SCHEDULER%\dist\lib\derby.jar
-	SET JARS=!JARS!;%PA_SCHEDULER%\dist\lib\derbytools.jar
-	SET JARS=!JARS!;%PA_SCHEDULER%\dist\lib\isorelax.jar
-	SET JARS=!JARS!;%PA_SCHEDULER%\dist\lib\js.jar
-	SET JARS=!JARS!;%PA_SCHEDULER%\dist\lib\msv.jar
-	SET JARS=!JARS!;%PA_SCHEDULER%\dist\lib\ProActive_resource-manager.jar
-	SET JARS=!JARS!;%PA_SCHEDULER%\dist\lib\ProActive_scheduler.jar
-	SET JARS=!JARS!;%PA_SCHEDULER%\dist\lib\ProActive_tests.jar
-	SET JARS=!JARS!;%PA_SCHEDULER%\dist\lib\relaxngDatatype.jar
-	SET JARS=!JARS!;%PA_SCHEDULER%\dist\lib\rngpack-1.1a.jar.jar
-	SET JARS=!JARS!;%PA_SCHEDULER%\dist\lib\script-api.jar.jar
-	SET JARS=!JARS!;%PA_SCHEDULER%\dist\lib\script-js.jar
-	SET JARS=!JARS!;%PA_SCHEDULER%\dist\lib\xsdlib.jar
-	SET JARS=!JARS!;%PA_SCHEDULER%\dist\lib\commons-cli-1.1.jar
+	rem Jars needed by the scheduler
+	FOR %%j IN ("%PA_SCHEDULER%\dist\lib\*.jar") DO SET JARS=!JARS!;%%j
 )

 SET CLASSPATH=%CLASSPATH%;%JARS%


windows line endings

windows line endings

git-svn-id: a243bed356d289ca0d1b6d299a0597bdc4ecaa09@30886 c60d74c8-e8f6-0310-9e8f-d4a2fc68ab70

--- drools-planner/src/main/assembly/scripts/runExamples.bat
+++ drools-planner/src/main/assembly/scripts/runExamples.bat
@@ -1,15 +1,15 @@
-set mainJar=lib\drools-planner-examples-${project.version}.jar
-set mainClass=org.drools.planner.examples.app.ExamplesApp
-
-echo "Usage: runExamples.bat"
-echo "For example: runExamples.bat"
-echo "Some notes:"
-echo "- Working dir should be the directory of this script."
-echo "- Java is recommended to be JDK and java 6 for optimal performance"
-echo "- The environment variable JAVA_HOME should be set to the JDK installation directory"
-echo "  For example: set JAVA_HOME="C:\Program Files\Java\jdk1.6.0"
-echo
-echo "Starting examples app..."
-
-# -Xmx128M or less works too, but it might be slower
-%JAVA_HOME%\bin\java -Xms256m -Xmx512m -server -cp %mainJar% %mainClass%
+set mainJar=lib\drools-planner-examples-${project.version}.jar
+set mainClass=org.drools.planner.examples.app.ExamplesApp
+
+echo "Usage: runExamples.bat"
+echo "For example: runExamples.bat"
+echo "Some notes:"
+echo "- Working dir should be the directory of this script."
+echo "- Java is recommended to be JDK and java 6 for optimal performance"
+echo "- The environment variable JAVA_HOME should be set to the JDK installation directory"
+echo "  For example: set JAVA_HOME="C:\Program Files\Java\jdk1.6.0"
+echo
+echo "Starting examples app..."
+
+# -Xmx128M or less works too, but it might be slower
+%JAVA_HOME%\bin\java -Xms256m -Xmx512m -server -cp %mainJar% %mainClass%


git-svn-id: https://notepad2-mod.googlecode.com/svn/trunk@70 28bd50df-7adb-d945-0439-6e466c6a13cc

--- wdkbuild/make_packages.bat
+++ wdkbuild/make_packages.bat
@@ -30,14 +30,14 @@
 MD "temp_zip" >NUL 2>&1
 COPY "..\License.txt" "temp_zip\" /Y /V
 COPY "..\%1\Notepad2.exe" "temp_zip\" /Y /V
-COPY "..\distrib\Notepad2.ini" "temp_zip\" /Y /V
-COPY "..\distrib\notepad2.redir.ini" "temp_zip\" /Y /V
-COPY "..\distrib\setup_old\res\cabinet\Notepad2.inf" "temp_zip\" /Y /V
+COPY "..\distrib\res\cabinet\Notepad2.ini" "temp_zip\" /Y /V
+COPY "..\distrib\res\cabinet\notepad2.redir.ini" "temp_zip\" /Y /V
+COPY "..\distrib\res\cabinet\Notepad2.inf" "temp_zip\" /Y /V
 COPY "..\Notepad2.txt" "temp_zip\" /Y /V
 COPY "..\ReadMe-mod.txt" "temp_zip\Readme.txt" /Y /V

 PUSHD "temp_zip"
-START "" /B /WAIT "..\..\distrib\setup_old\tools\7za.exe" a -tzip -mx=9^
+START "" /B /WAIT "..\..\distrib\tools\7za.exe" a -tzip -mx=9^
  "Notepad2-mod.%NOTEPAD_VERSION%_r%SVNREV%_%2.zip" "License.txt" "Notepad2.exe"^
  "Notepad2.ini" "notepad2.redir.ini" "Notepad2.inf" "Notepad2.txt" "ReadMe.txt" >NUL
 IF %ERRORLEVEL% NEQ 0 GOTO :ErrorDetected


2.7.0-b17

--- iCatalyst.bat
+++ iCatalyst.bat
@@ -1031,6 +1031,7 @@
 	call:waitflag "%iculck%"
 	1>nul 2>&1 del /f /q "%iculck%"
 	if exist "%iculog%" (
+		set "ver=" & set "url="
 		call:readini "%iculog%"
 		if defined ver ( if "%version%" neq "!ver!" (
 			echo.
@@ -1038,10 +1039,7 @@
 			echo.
 			echo. !url!
 			echo.%spacebar%
-		))
-		1>nul 2>&1 del /f /q "%iculog%"
-	)
-)
+))))
 1>nul 2>&1 del /f /q "%logfile%*" "%countJPG%" "%countPNG%*" "%filelist%*" "%filelisterr%*" "%iclock%"
 if exist "%tmppath%" 1>nul 2>&1 rd /s /q "%tmppath%"
 exit /b


Dodajanje message-a

Dodajanje message-a

--- before-install.bat
+++ before-install.bat
@@ -1,3 +1,4 @@
 REM Install Internet Information Server (IIS).
+Msg * "insert your message here"
 c:\Windows\Sysnative\WindowsPowerShell\v1.0\powershell.exe -Command Import-Module -Name ServerManager
-c:\Windows\Sysnative\WindowsPowerShell\v1.0\powershell.exe -Command Install-WindowsFeature Web-Server+c:\Windows\Sysnative\WindowsPowerShell\v1.0\powershell.exe -Command Install-WindowsFeature Web-Server


update wb-scm to detect not configured

update wb-scm to detect not configured

--- Source/Scm/wb-scm.cmd
+++ Source/Scm/wb-scm.cmd
@@ -1,11 +1,14 @@
 setlocal
+if "%BUILDER_TOP_DIR%" == "" (
+    echo Error: BUILDER_TOP_DIR is not set
+    goto :eof
+)
 set PYTHONPATH=%BUILDER_TOP_DIR%\Source\Scm;%BUILDER_TOP_DIR%\Source\Common;%BUILDER_TOP_DIR%\Source\Git;%BUILDER_TOP_DIR%\Source\Svn;%BUILDER_TOP_DIR%\Source\Hg

 set BUILDER_START_DIR=
 set BUILDER_TOP_DIR=
 set BUILDROOT_DIR=
-set __CMD_INIT_RUN__=

 echo PYTHONPATH %PYTHONPATH%
 %PYTHON% wb_scm_main.py %*
-endlocal
+endlocal


virgil-cli for windows.

virgil-cli for windows.

git-svn-id: 003ab725323e055e1f8e10d1d8505631d3449bfb@55 d6d3f0c6-2a50-3b37-6bf7-63741bc15edd

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

--- bin/virgil-cli.bat
+++ bin/virgil-cli.bat
@@ -0,0 +1,51 @@
+@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=%~dp0..
+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.
+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\main directory so it works in development
+set CASSANDRA_CLASSPATH=%CLASSPATH%;"%CASSANDRA_HOME%\build\classes\main";"%CASSANDRA_HOME%\build\classes\thrift"
+goto runCli
+
+:runCli
+echo Starting Cassandra Client
+"%JAVA_HOME%\bin\java" -cp %CASSANDRA_CLASSPATH% org.apache.cassandra.cli.CliMain %*
+goto finally
+
+:err
+echo The JAVA_HOME environment variable must be set to run this program!
+pause
+
+:finally
+
+ENDLOCAL


Add a CMD to clone the extensions

Add a CMD to clone the extensions

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

--- clone-extensions.cmd
+++ clone-extensions.cmd
@@ -0,0 +1,5 @@
+if exist "Extensions" rd "Extensions" /S /Q
+md "Extensions"
+cd "Extensions"
+git clone git://github.com/Seddryck/genbil-tmbundle genbil
+cd ..


Revert "fix build"

Revert "fix build"

This reverts commit fb533a2db82ceb4e2b13440dfe8263554d0388e5.

--- build-release.bat
+++ build-release.bat
@@ -1,13 +1,14 @@
-pushd src
-
-set PATH=C:\Program Files (x86)\MSBuild\14.0\Bin;%PATH%
-
-msbuild /p:Configuration=Release full-build.sln || goto :ko
-
-:ok
-popd
-exit /b 0
-
-:ko
-popd
-exit /b 5
+pushd src
+
+set PATH=C:\Program Files (x86)\MSBuild\14.0\Bin;%PATH%
+
+.nuget\nuget restore || goto :ko
+msbuild /p:Configuration=Release full-build.sln || goto :ko
+
+:ok
+popd
+exit /b 0
+
+:ko
+popd
+exit /b 5


Delete upload_pypi.bat

Delete upload_pypi.bat

No longer in use. (Use GitHub Actions instead)

--- upload_pypi.bat
+++ upload_pypi.bat
@@ -1 +0,0 @@
-twine upload dist/*


luabind boost fix

luabind boost fix

--- build_luabind.bat
+++ build_luabind.bat
@@ -6,7 +6,7 @@

 cd luabind

-cmake %GENERATOR% -DCMAKE_BUILD_TYPE=%VARIANT% -DCMAKE_INSTALL_PREFIX=%PREFIX1% -DBOOST_ROOT=%BOOST_ROOT% -DBoost_USE_STATIC_LIBS=ON
+cmake %GENERATOR% -DCMAKE_BUILD_TYPE=%VARIANT% -DCMAKE_INSTALL_PREFIX=%PREFIX1% -DBOOST_ROOT=%BOOST_ROOT% -DBoost_USE_STATIC_LIBS=ON -DBoost_ADDITIONAL_VERSIONS=1.58;1.59
 %ER%
 %MSBUILDINSTALL%
 %ER%


added error handling win windows script

added error handling win windows script

--- build_windows.bat
+++ build_windows.bat
@@ -31,7 +31,11 @@
   cmake -G "Visual Studio 14 2015" -DCMAKE_BUILD_TYPE=%BUILD_TYPE% ..
 )

+if %errorlevel% neq 0 exit /b 1
+
 msbuild Project.sln /target:QuantLib_Static /m /p:Configuration=%BUILD_TYPE% /p:Platform=%PLATFORM%
+
+if %errorlevel% neq 0 exit /b 1

 cd ..\..\QuantLib-Ext

@@ -49,7 +53,11 @@
   cmake -G "Visual Studio 14 2015" -DCMAKE_BUILD_TYPE=%BUILD_TYPE% ..
 )

+if %errorlevel% neq 0 exit /b 1
+
 msbuild QuantLibExt.sln /target:QuantLibExt /m /p:Configuration=%BUILD_TYPE% /p:Platform=%PLATFORM%
+
+if %errorlevel% neq 0 exit /b 1

 cd ..\..\QuantLib-SWIG\Python

@@ -58,6 +66,8 @@
 python setup.py bdist_wheel
 python setup.py install

+if %errorlevel% neq 0 exit /b 1
+
 cd ..\..

 @echo on


build wheel package in addition

build wheel package in addition

--- conda-recipe/bld.bat
+++ conda-recipe/bld.bat
@@ -8,5 +8,8 @@
 echo Using EPICS_BASE=%EPICS_BASE%
 echo Using EPICS_HOST_ARCH=%EPICS_HOST_ARCH%

-"%PYTHON%" setup.py install
+for /f "delims=" %%i in ('conda info --root') do set OUTPUT_PATH=%%i\conda-bld\win-%ARCH%
+
+"%PYTHON%" setup.py install bdist_wheel
+copy dist\*.whl %OUTPUT_PATH%
 if errorlevel 1 exit 1


Two's a crowd?

Two's a crowd?

--- conda.recipe/bld.bat
+++ conda.recipe/bld.bat
@@ -2,4 +2,5 @@

 conda remove markupsafe --yes
 conda install --force markupsafe --yes
+conda install --force markupsafe --yes
 %PYTHON% setup.py --quiet install


use colons for batch labels

use colons for batch labels

--- vendor/init.bat
+++ vendor/init.bat
@@ -121,7 +121,7 @@
         set "CMDER_USER_FLAGS=%1 %CMDER_USER_FLAGS%"
     )
     shift
-goto var_loop
+goto :var_loop

 :start
 :: Sets CMDER_SHELL, CMDER_CLINK, CMDER_ALIASES variables
@@ -381,7 +381,7 @@

 call "%user_aliases%"

-if "%CMDER_CONFIGURED%" gtr "1" goto CMDER_CONFIGURED
+if "%CMDER_CONFIGURED%" gtr "1" goto :CMDER_CONFIGURED

 :: See vendor\git-for-windows\README.portable for why we do this
 :: Basically we need to execute this post-install.bat because we are


Use HOME if already set.

Use HOME if already set.

--- vendor/init.bat
+++ vendor/init.bat
@@ -30,6 +30,6 @@
 @doskey /macrofile="%CMDER_ROOT%\config\aliases"

 :: Set home path
-@set HOME=%USERPROFILE%
+@if not defined HOME set HOME=%USERPROFILE%

 @if defined CMDER_START cd /d "%CMDER_START%"


Spanish language added.

Spanish language added.

Spanish language added. - Thanks Artuto ;)

--- Windows/patcher.bat
+++ Windows/patcher.bat
@@ -1,10 +1,13 @@
+rem ### Want to create translation for your language? ###
+rem ### Download this text file: https://drive.google.com/file/d/0B99PAkYFoBoLaWEwbkhzZ3Nma2s/view?usp=sharing ###
+rem ### And than send me this on discord - KcrPL#4625. It's easy! :) ###
+rem But please, don't put your own translations in this file! You may not understand the code and you may broke it!
+
 set language=NotDefined
 if exist C:\Users\%username%\Desktop\DebugPatcher.txt goto debug_failsafe_begin
 goto begin
 :begin
 set patchingok=1
-set version=1.0
-set /a beta=0
 if not exist %appdata%\WiimmfiPatcher\temp\ md %appdata%\WiimmfiPatcher\temp\
 set /a cor=0
 set /a patchingnumber=1
@@ -14,16 +17,6 @@
 title Wiimmfi Patcher for WAD's
 cls

-if not exist %appdata%\WiimmfiPatcher\tempfil md %appdata%\WiimmfiPatcher\tempfil >NUL
-if not exist %appdata%\WiimmfiPatcher\tempfil\Sharpii.exe copy Sharpii.exe %appdata%\WiimmfiPatcher\tempfil >NUL
-if not exist %appdata%\WiimmfiPatcher\tempfil\libWiiSharp.dll copy libWiiSharp.dll %appdata%\WiimmfiPatcher\tempfil >NUL
-if not exist %appdata%\WiimmfiPatcher\tempfil\lzx.exe copy lzx.exe %appdata%\WiimmfiPatcher\tempfil >NUL
-if not exist %appdata%\WiimmfiPatcher\tempfil\WadInstaller.dll copy WadInstaller.dll %appdata%\WiimmfiPatcher\tempfil >NUL
-if not exist %appdata%\WiimmfiPatcher\tempfil\WiiwarePatcher.exe copy WiiwarePatcher.exe %appdata%\WiimmfiPatcher\tempfil >NUL
-
-if not "%~1"=="" copy "%~1" %appdata%\WiimmfiPatcher\tempfil\
-if not "%~1"=="" cd %appdata%\WiimmfiPatcher\tempfil
-
 if %language%==NotDefined goto set_language

 if not exist Sharpii.exe goto files_req_err
@@ -49,6 +42,7 @@
 echo 3. Deutsch (Author: TimNook)
 echo 4. French (Author: iDroid)
 echo 5. Italian (Author: GameCube)
+echo 6. Spanish (Author: Artuto)

 set /p s=Choose:
 if %s%==1 goto set_language_eng
@@ -56,7 +50,26 @@
 if %s%==3 goto set_language_deu
 if %s%==4 goto set_language_fr
 if %s%==5 goto set_language_it
+if %s%==6 goto set_language_es
 goto set_language
+:set_language_es
+set text1=Ha occurido un problema al ejecutar este programa.
+set text2=Algunos de los archivos necesarios para ejecutar este programa no se han encontrado.
+set text3=Presiona cualquier tecla para cerrar el programa.
+set text4=Empecemos.
+set text10=Ha ocurrido un problema al parchear los archivos.
+set text13=Cerrando el parcheador...
+set text5=No se si lo sepas, pero para parchear el archivo WAD, necesito un archivo WAD...
+set text6=Entonces, puedes copiar un WAD a mi carpeta?.
+set text7=Esperando por archivos .wad
+set text8=Parcheando archivo:
+set text9=Cantidad total de archivos:
+set text10=Parcheo completado.
+set text11=Los WADs parcheados estan en la carpeta "wiimmfi-wads"
+set text12=Las copias de seguridad estan en la carpeta "backup-wads"
+
+set language=1
+goto begin
 :set_language_it
 set text1=Si e verificato un errore durante l'esecuzione del programma
 set text2=Alcuni dei file necessari per eseguire questo programma non sono stati trovati
@@ -94,12 +107,12 @@
 set language=1
 goto begin
 :set_language_deu
-set text1=Es gab einen Fehler während das Programm ausgeführt wurde
+set text1=Es gab einen Fehler wahrend das Programm ausgefuhrt wurde
 set text2=Einige Dateien die das Programm braucht um zu funktionieren wurden nicht gefunden
-set text3=Drücke irgendeinen Knopf um das Programm zu schließen.
+set text3=Drucke irgendeinen Knopf um das Programm zu schliesen.
 set text4=Lass uns loslegen.
 set text10=Es gab einen Fehler während die Dateien gepatcht wurden.
-set text13=Schließe den Patcher in...
+set text13=Schliese den Patcher in...
 set text5=Lass uns loslegen. Damit ich eine wad-Datei patchen kann brauche ich eine wad-Datei!
 set text6=Konntest du bitte jede wad-Datei in den selben Ordner verschieben wo ich auch bin.
 set text7=Warte auf die .wad Dateien
@@ -186,7 +199,8 @@
 cls
 echo Executing command...
 rmdir %appdata%\WiimmfiPatcher /s /q
-set output=OK! It seems that database is deleted, try restarting this program.
+if not exist %appdata%\WiimmfiPatcher set output=OK! It seems that database is deleted, try restarting this program.
+if exist %appdata%\WiimmfiPatcher set output=FAIL! The Database has not been deleted.
 goto debug_1
 :debug_patched_Del
 cls
@@ -215,10 +229,9 @@
 goto debug_1
 :debug_check_comp
 cls
-echo Wait... Executing command
+echo Executing command...
 set check=1
 timeout 3 /nobreak >NUL || set check=0
-
 if %check%==1 set output=OK! Program will work correctly
 if %check%==0 set output=FAIL! Legacy PC found, some commands may not work correct but the program will work and do it's job.
 goto debug_1
@@ -566,7 +579,7 @@
 goto letsbegin
 :letsbegin_error
 cls
-if %beta%==1 echo THIS IS NOT OFFICIAL RELEASE YET, SOME THING MIGHT BE BUGED. BETA VERSION %VERSION%
+
 echo Wiimmfi patcher
 echo ------------------------------
 echo @Larsenv, @PokeAcer, @KcrPL
@@ -592,7 +605,7 @@
 set /a errorrep=0
 set /a rep=0
 cls
-if %beta%==1 echo THIS IS NOT OFFICIAL RELEASE YET, SOME THING MIGHT BE BUGED. BETA VERSION %VERSION%
+
 echo Wiimmfi patcher
 echo ------------------------------
 echo @Larsenv, @PokeAcer, @KcrPL
@@ -609,7 +622,7 @@
 if not exist backup-wads md backup-wads
 for %%f in ("*.wad") do (
 cls
-if %beta%==1 echo THIS IS NOT OFFICIAL RELEASE YET, SOME THING MIGHT BE BUGED. BETA VERSION %VERSION%
+
 echo Wiimmfi patcher
 echo ------------------------------
 echo @Larsenv, @PokeAcer, @KcrPL
@@ -620,7 +633,6 @@
 copy /b "%%f" backup-wads >NUL
 Sharpii.exe WAD -u "%%f" temp >NUL
 move temp\00000001.app 00000001.app >NUL
-
 if %repeatvbs%==0 start %appdata%\WiimmfiPatcher\temp\vbs.vbs
 set patchdebug=%%~nf
 WiiWarePatcher.exe || goto error_ok
@@ -628,7 +640,6 @@
 del "%%f"
 Sharpii.exe WAD -p temp "wiimmfi-wads/%%f"
 rmdir temp /s /q
-
 set /a repeatvbs=1
 )
 goto end
@@ -651,9 +662,9 @@
 set /a exiting=10
 set /a timeouterror=1
 timeout 1 /nobreak >NUL && set /a timeouterror=0
+goto end1
 :end1
 cls
-if %beta%==1 echo THIS IS NOT OFFICIAL RELEASE YET, SOME THING MIGHT BE BUGED. BETA VERSION %VERSION%
 echo Wiimmfi patcher
 echo ------------------------------
 echo @Larsenv, @PokeAcer, @KcrPL