fix eol-style.  all .bat files should be eol-style CRLF

git-svn-id: 46b6970677d4601447c97310ca1751d9f277788c@164624 13f79535-47bb-0310-9956-ffa450edef68

--- phoenix-bin/bin/run.bat
+++ phoenix-bin/bin/run.bat
@@ -1,91 +1,91 @@
-@echo off
-rem
-rem Phoenix start script.
-rem
-rem Author: Peter Donald [donaldp@apache.org]
-rem
-rem Environment Variable Prequisites
-rem
-rem   PHOENIX_OPTS       (Optional) Java runtime options used when the command is
-rem                      executed.
-rem
-rem   PHOENIX_TMPDIR     (Optional) Directory path location of temporary directory
-rem                      the JVM should use (java.io.tmpdir).  Defaults to
-rem                      $CATALINA_BASE/temp.
-rem
-rem   JAVA_HOME          Must point at your Java Development Kit installation.
-rem
-rem   PHOENIX_JVM_OPTS   (Optional) Java runtime options used when the command is
-rem                       executed.
-rem
-rem -----------------------------------------------------------------------------
-
-rem
-rem Determine if JAVA_HOME is set and if so then use it
-rem
-if not "%JAVA_HOME%"=="" goto found_java
-
-set PHOENIX_JAVACMD=java
-goto file_locate
-
-:found_java
-set PHOENIX_JAVACMD=%JAVA_HOME%\bin\java
-
-:file_locate
-
-rem
-rem Locate where phoenix is in filesystem
-rem
-if not "%OS%"=="Windows_NT" goto start
-
-rem %~dp0 is name of current script under NT
-set PHOENIX_HOME=%~dp0
-
-rem : operator works similar to make : operator
-set PHOENIX_HOME=%PHOENIX_HOME:\bin\=%
-
-:start
-
-if not "%PHOENIX_HOME%" == "" goto phoenix_home
-
-echo.
-echo Warning: PHOENIX_HOME environment variable is not set.
-echo   This needs to be set for Win9x as it's command prompt
-echo   scripting bites
-echo.
-goto end
-
-:phoenix_home
-
-if not "%PHOENIX_TMPDIR%"=="" goto afterTmpDir
-set PHOENIX_TMPDIR=%PHOENIX_HOME%\temp
-if not exist "%PHOENIX_TMPDIR%" mkdir "%PHOENIX_TMPDIR%"
-
-:afterTmpDir
-
-echo Using PHOENIX_HOME:   %PHOENIX_HOME%
-echo Using PHOENIX_TMPDIR: %PHOENIX_TMPDIR%
-echo Using JAVA_HOME:      %JAVA_HOME%
-
-set PHOENIX_SM=
-
-if "%PHOENIX_SECURE%" == "false" goto postSecure
-
-rem Make Phoenix run with security Manager enabled
-set PHOENIX_SM="-Djava.security.manager"
-
-:postSecure
-
-rem
-rem -Djava.ext.dirs= is needed as some JVM vendors do foolish things
-rem like placing jaxp/jaas/xml-parser jars in ext dir
-rem thus breaking Phoenix
-rem
-
-rem uncomment to get enable remote debugging
-rem set DEBUG=-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y
-
-rem Kicking the tires and lighting the fires!!!
-"%PHOENIX_JAVACMD%" %DEBUG% "-Djava.ext.dirs=%PHOENIX_HOME%\lib" "-Dphoenix.home=%PHOENIX_HOME%" "-Djava.security.policy=jar:file:%PHOENIX_HOME%/bin/phoenix-loader.jar!/META-INF/java.policy" %PHOENIX_JVM_OPTS% %PHOENIX_SECURE% -jar "%PHOENIX_HOME%\bin\phoenix-loader.jar" %1 %2 %3 %4 %5 %6 %7 %8 %9
-
-:end
+@echo off
+rem
+rem Phoenix start script.
+rem
+rem Author: Peter Donald [donaldp@apache.org]
+rem
+rem Environment Variable Prequisites
+rem
+rem   PHOENIX_OPTS       (Optional) Java runtime options used when the command is
+rem                      executed.
+rem
+rem   PHOENIX_TMPDIR     (Optional) Directory path location of temporary directory
+rem                      the JVM should use (java.io.tmpdir).  Defaults to
+rem                      $CATALINA_BASE/temp.
+rem
+rem   JAVA_HOME          Must point at your Java Development Kit installation.
+rem
+rem   PHOENIX_JVM_OPTS   (Optional) Java runtime options used when the command is
+rem                       executed.
+rem
+rem -----------------------------------------------------------------------------
+
+rem
+rem Determine if JAVA_HOME is set and if so then use it
+rem
+if not "%JAVA_HOME%"=="" goto found_java
+
+set PHOENIX_JAVACMD=java
+goto file_locate
+
+:found_java
+set PHOENIX_JAVACMD=%JAVA_HOME%\bin\java
+
+:file_locate
+
+rem
+rem Locate where phoenix is in filesystem
+rem
+if not "%OS%"=="Windows_NT" goto start
+
+rem %~dp0 is name of current script under NT
+set PHOENIX_HOME=%~dp0
+
+rem : operator works similar to make : operator
+set PHOENIX_HOME=%PHOENIX_HOME:\bin\=%
+
+:start
+
+if not "%PHOENIX_HOME%" == "" goto phoenix_home
+
+echo.
+echo Warning: PHOENIX_HOME environment variable is not set.
+echo   This needs to be set for Win9x as it's command prompt
+echo   scripting bites
+echo.
+goto end
+
+:phoenix_home
+
+if not "%PHOENIX_TMPDIR%"=="" goto afterTmpDir
+set PHOENIX_TMPDIR=%PHOENIX_HOME%\temp
+if not exist "%PHOENIX_TMPDIR%" mkdir "%PHOENIX_TMPDIR%"
+
+:afterTmpDir
+
+echo Using PHOENIX_HOME:   %PHOENIX_HOME%
+echo Using PHOENIX_TMPDIR: %PHOENIX_TMPDIR%
+echo Using JAVA_HOME:      %JAVA_HOME%
+
+set PHOENIX_SM=
+
+if "%PHOENIX_SECURE%" == "false" goto postSecure
+
+rem Make Phoenix run with security Manager enabled
+set PHOENIX_SM="-Djava.security.manager"
+
+:postSecure
+
+rem
+rem -Djava.ext.dirs= is needed as some JVM vendors do foolish things
+rem like placing jaxp/jaas/xml-parser jars in ext dir
+rem thus breaking Phoenix
+rem
+
+rem uncomment to get enable remote debugging
+rem set DEBUG=-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y
+
+rem Kicking the tires and lighting the fires!!!
+"%PHOENIX_JAVACMD%" %DEBUG% "-Djava.ext.dirs=%PHOENIX_HOME%\lib" "-Dphoenix.home=%PHOENIX_HOME%" "-Djava.security.policy=jar:file:%PHOENIX_HOME%/bin/phoenix-loader.jar!/META-INF/java.policy" %PHOENIX_JVM_OPTS% %PHOENIX_SECURE% -jar "%PHOENIX_HOME%\bin\phoenix-loader.jar" %1 %2 %3 %4 %5 %6 %7 %8 %9
+
+:end


replaced -multibackups with -singlebackup

also minor changes to the merge function.

--- updater.bat
+++ updater.bat
@@ -16,7 +16,7 @@
 IF /I "%~1"=="-multioverrides" (SET _multi=1)
 IF /I "%~1"=="-merge" (SET _merge=1)
 IF /I "%~1"=="-updatebatch" (SET _updateb=1)
-IF /I "%~1"=="-multibackups" (SET _multibackups=1)
+IF /I "%~1"=="-singlebackup" (SET _singlebackup=1)
 SHIFT
 GOTO parse
 :endparse
@@ -158,10 +158,10 @@
 	)
 	IF "!_changed!"=="true" (
 		CALL :message "Backing up..."
-		IF DEFINED _multibackups (
-	                MOVE /Y user.js "user-backup-!date:/=-!_!time::=.!.js" >nul
-		) ELSE (
+		IF DEFINED _singlebackup (
 			MOVE /Y user.js user.js.bak >nul
+		) ELSE (
+			MOVE /Y user.js "user-backup-!date:/=-!_!time::=.!.js" >nul
 		)
 		REN user.js.new user.js
 		CALL :message "Update complete."
@@ -196,18 +196,14 @@
 :merge
 SETLOCAL DisableDelayedExpansion
 (
-	FOR /F tokens^=2^,^*^ delims^=^'^" %%G IN ('FINDSTR /B /R /C:"user_pref.*\).*;" "%~1"') DO (
-		IF NOT "%%G"=="" (
-			IF NOT "%%H"=="" (SET "%%G=%%H")
-		)
-	)
+	FOR /F tokens^=2^,^*^ delims^=^'^" %%G IN ('FINDSTR /B /R /C:"user_pref.*\)[ 	]*;" "%~1"') DO (IF NOT "%%H"=="" (SET "%%G=%%H"))
 	FOR /F "tokens=1,* delims=:" %%I IN ('FINDSTR /N "^" "%~1"') DO (
 		SET "_temp=%%J"
 		SETLOCAL EnableDelayedExpansion
-		IF "!_temp:)=!"=="!_temp!" (
+		IF NOT "!_temp:~0,9!"=="user_pref" (
 			ENDLOCAL & ECHO:%%J
 		) ELSE (
-			IF NOT "!_temp:~0,9!"=="user_pref" (
+			IF "!_temp:;=!"=="!_temp!" (
 				ENDLOCAL & ECHO:%%J
 			) ELSE (
 				ENDLOCAL


windows build script

windows build script

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

--- vcbuild.bat
+++ vcbuild.bat
@@ -0,0 +1,12 @@
+set PROJ_LIB=C:\dev2\proj\nad
+set GDAL_DATA=C:\dev2\gdal\data
+set target=Build
+set config=Release
+rm build.sln
+python gyp/gyp build.gyp --depth=. -f msvs -G msvs_version=2010
+msbuild build.sln
+copy Default\\_srs.node lib\\_srs.node
+rem test!
+rem set NODE_PATH=lib
+rem node node_modules\expresso\bin\expresso
+rem node -e "console.log(require('mapnik'))"


Fix wintest.bat

Fix wintest.bat

--- wintest.bat
+++ wintest.bat
@@ -1,4 +1,4 @@
 cd testsrc
-ghc --make -package mtl -package HUnit -fallow-overlapping-instances -fallow-undecidable-instances -fglasgow-exts -cpp -o runtests.exe -i..\dist\build:.. runtests.hs
+ghc --make -package FilePath -package mtl -package HUnit -fallow-overlapping-instances -fallow-undecidable-instances -fglasgow-exts -cpp -o runtests.exe -i..\dist\build:..\src runtests.hs
 cd ..


Updated run_tests script to hopefully show output


Delete git.cmd

Delete git.cmd

--- .bin/git.cmd
+++ .bin/git.cmd
@@ -1,3 +0,0 @@
-@echo off
-SET PATH=%~dp0;%PATH%
-"%~dp0node" "%~dp0..\..\packages\NoGit.0.0.8\node_modules\nogit\bin\git.js" %*


Update bld.bat

Update bld.bat

--- recipes/dartsim/bld.bat
+++ recipes/dartsim/bld.bat
@@ -4,14 +4,17 @@
 set "CC=clang-cl.exe"
 set "CXX=clang-cl.exe"

-cmake -G "NMake Makefiles"^
-    -DCMAKE_BUILD_TYPE=Release^
-    -DCMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX%^
-    -DCMAKE_PREFIX_PATH=%LIBRARY_PREFIX%^
-    -DDART_MSVC_DEFAULT_OPTIONS=ON^
-    -DDART_VERBOSE=ON^
+cmake -G "NMake Makefiles" ^
+    -DCMAKE_BUILD_TYPE=Release ^
+    -DCMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% ^
+    -DCMAKE_PREFIX_PATH=%LIBRARY_PREFIX% ^
+    -DDART_MSVC_DEFAULT_OPTIONS=ON ^
+    -DDART_VERBOSE=ON ^
     %SRC_DIR%
-
+echo "Print CMakeOutput:"
+type CMakeFiles\CMakeOutput.log
+echo "Print CMakeOutput:"
+type CMakeFiles\CMakeError.log
 if errorlevel 1 exit 1

 nmake


yet more label fixes...

yet more label fixes...

--- popcorn.cmd
+++ popcorn.cmd
@@ -4,7 +4,7 @@
 set "output=nul"
 set "times=1"

-goto :parseArgs
+goto :parsePackage

 :help

@@ -17,11 +17,13 @@
 call :help 1>&2
 exit /b 1

-:parseArgs
+:parsePackage

 if "%~1" == "" goto usage
 set "package=%~1"
 shift
+
+:parseArgs

 if "%~1" == "" goto main


remove comment

remove comment

--- setup.bat
+++ setup.bat
@@ -76,7 +76,6 @@
 	ECHO Please download from %WRT_download% and install it!
 	start "" %WRT_download%
 	ECHO .
-	:: SET INSTALL=false (optional now)
 )

 :: check if needed dir exist


mintty only needed for interactive prompt

--- setup.bat
+++ setup.bat
@@ -364,7 +364,7 @@
 IF %MINGLE_SUITE% EQU 0 (
 msys\bin\mintty msys/bin/bash -l -c "/mingw/bin/mingle | tee /home/developer/build.log"
 ) ELSE (
-msys\bin\mintty msys/bin/bash -l -c "/mingw/bin/mingle --suite=%MINGLE_SUITE% 2>&1 | tee /home/developer/build.log"
+msys\bin\bash -l -c "/mingw/bin/mingle --suite=%MINGLE_SUITE% 2>&1 | tee /home/developer/build.log"
 )

 IF EXIST msys\home\developer\build.log (


build and install EZPlugin

build and install EZPlugin

--- setup.bat
+++ setup.bat
@@ -2,6 +2,8 @@

 @echo off
 setlocal
+
+@set PATH=%PATH%;C:\Program Files\Java\jdk1.7.0_25\bin

 REM remove old folders
 IF EXIST "%USERPROFILE%\Desktop\server" RD /S /Q "%USERPROFILE%\Desktop\server"
@@ -51,6 +53,10 @@
 REM accept the EULA
 powershell -ExecutionPolicy Bypass -Command "(gc %USERPROFILE%\Desktop\server\eula.txt) -replace 'false', 'true' | Set-Content %USERPROFILE%\Desktop\server\eula.txt"

+REM build EZPlugin
+cd "%USERPROFILE%\Desktop\code\EZPlugin"
+..\..\sh.exe build_lib.sh
+
 echo Done

 endlocal


setup.cmd now works with spaces in paths

--- setup.cmd
+++ setup.cmd
@@ -5,7 +5,7 @@
 :: directory of the project (which is where this script is located).
 for %%F in (%0) do set ROOT_DIR=%%~dpF
 set NPM_BIN_DIR=%ROOT_DIR%node_modules\.bin\
-cd %ROOT_DIR%
+cd "%ROOT_DIR%"

 if "%1" == "install" (
 	call :installDevDependencies
@@ -39,13 +39,21 @@
 	%~1
 goto:eof

-:: On Windows, npm, bower, tsd, and grunt are batch files
-:: So we have to explicitly call then with "call"
+:: On Windows, npm, bower, tsd, and grunt are batch files,
+:: so we have to explicitly call them with "call"
 :: These also happen to be the commands that we want to assert,
 :: or exit on failure for, so there is an additional "exit /b"
 :runAndAssertCmd
 	echo Running: %1
 	call %~1 || exit /b
+goto:eof
+
+:: Same as runAndAssertCmd, but takes in an arbitrary number of
+:: arguments, and calls them without stripping the double quotes
+:: This is used for commands where the path may have spaces
+:runAndAssertCmdArgs
+	echo Running: %*
+	call %* || exit /b
 goto:eof

 :: We use robocopy to delete these folders since they (esp. node_modules)
@@ -64,9 +72,9 @@
 goto:eof

 :installThirdParty
-	call :runAndAssertCmd "%NPM_BIN_DIR%bower install --allow-root"
-	call :runAndAssertCmd "%NPM_BIN_DIR%tsd reinstall --config .\third_party\tsd.json"
-	call :runAndAssertCmd "%NPM_BIN_DIR%grunt copy:thirdParty"
+	call :runAndAssertCmdArgs "%NPM_BIN_DIR%bower" install --allow-root
+	call :runAndAssertCmdArgs "%NPM_BIN_DIR%tsd" reinstall --config .\third_party\tsd.json
+	call :runAndAssertCmdArgs "%NPM_BIN_DIR%grunt" copy:thirdParty
 goto:eof

 :installDevDependencies


Initial checkin of batch file to create Xerces-C documentation

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

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

--- createdocs.bat
+++ createdocs.bat
@@ -0,0 +1 @@
+java org.apache.stylebook.StyleBook "targetDirectory=doc/html" doc/xerces-c_book.xml ../../xml-stylebook/styles/apachexml


スクリプトにVS2015生成を追加

スクリプトにVS2015生成を追加

--- release.bat
+++ release.bat
@@ -175,11 +175,25 @@

+echo Compile VS14
+rmdir /S /Q VS14
+mkdir VS14
+
+cd VS14
+call cmake.bat -G "Visual Studio 14"  -D USE_MSVC_RUNTIME_LIBRARY_DLL:BOOL=OFF ../Dev/Cpp/
+cmake.exe -G "Visual Studio 14"  -D USE_MSVC_RUNTIME_LIBRARY_DLL:BOOL=OFF ../Dev/Cpp/
+
+"C:\Program Files (x86)\MSBuild\12.0\Bin\msbuild" Effekseer.sln /p:configuration=Debug
+"C:\Program Files (x86)\MSBuild\12.0\Bin\msbuild" Effekseer.sln /p:configuration=Release
+cd ..
+
+
 mkdir %RDIR_R%\Compiled\\include\
 mkdir %RDIR_R%\Compiled\\lib\

 mkdir %RDIR_R%\Compiled\\lib\VS2012\
 mkdir %RDIR_R%\Compiled\\lib\VS2013\
+mkdir %RDIR_R%\Compiled\\lib\VS2015\

 robocopy VS11\Debug %RDIR_R%\Compiled\\lib\VS2012\Debug *.lib /mir /S
@@ -187,6 +201,9 @@

 robocopy VS12\Debug %RDIR_R%\Compiled\\lib\VS2013\Debug *.lib /mir /S
 robocopy VS12\Release %RDIR_R%\Compiled\\lib\VS2013\Release *.lib /mir /S
+
+robocopy VS14\Debug %RDIR_R%\Compiled\\lib\VS2015\Debug *.lib /mir /S
+robocopy VS14\Release %RDIR_R%\Compiled\\lib\VS2015\Release *.lib /mir /S

 copy Dev\Cpp\Effekseer\Effekseer.h %RDIR_R%\Compiled\\include\.
 copy Dev\Cpp\EffekseerRendererDX9\EffekseerRendererDX9.h %RDIR_R%\Compiled\\include\.


Update for 12340

Update for 12340

--- src/reader/reader.bat
+++ src/reader/reader.bat
@@ -1,5 +1,5 @@
 @echo off
-echo "Tiawps sessionkey reader Build 11723 3.3.3"
+echo "Tiawps sessionkey reader Build 12340 3.3.5"

 SET PATH=%~dp0
 REM Switch to drive
@@ -7,5 +7,5 @@

 cd %PATH%

-tiawps_reader.exe 12272644 1288
+tiawps_reader.exe 13081844 1288
 PAUSE


Enable 64-bit Windows builds.

Enable 64-bit Windows builds.

--- scripts/checkbuilds.bat
+++ scripts/checkbuilds.bat
@@ -97,9 +97,9 @@
 cd scintilla\win32
 nmake -f scintilla.mak
 if ERRORLEVEL 2 goto ERROR
-REM ~ cd ..\..\scite\win32
-REM ~ nmake -f scite.mak
-REM ~ if ERRORLEVEL 2 goto ERROR
+cd ..\..\scite\win32
+nmake -f scite.mak
+if ERRORLEVEL 2 goto ERROR
 cd ..\..
 rem
 rem Finished


Add windows command for populating mongo

error: pathspec 'cmds/mongo_populate/populate_homes.cmd' did not match any file(s) known to git

--- cmds/mongo_populate/populate_homes.cmd
+++ cmds/mongo_populate/populate_homes.cmd
@@ -0,0 +1,8 @@
+@echo off
+where mongoimport /q
+
+IF "%ERRORLEVEL%" == "0" (
+	call mongoimport --host localhost --port 27017 --collection homes --db bibliothek --jsonArray --file ./homes_data.json --verbose
+) ELSE (
+	echo Cannot find `mongoimport`
+)


remove always-run-UTR flag from EFM suite script (should only run when test case wants it to run)

--- scripts/runEFMTests.bat
+++ scripts/runEFMTests.bat
@@ -15,4 +15,4 @@
 @set PYTHONDIR=c:\python31
 @set PYTHONPATH=..

-"%PYTHONDIR%\python" -m arelle.CntlrCmdLine --file "%TESTCASESINDEXFILE%" --efm --utr --validate --csvTestReport "%OUTPUTCSVFILE%" --logFile "%OUTPUTLOGFILE%" 2>  "%OUTPUTERRFILE%"
+"%PYTHONDIR%\python" -m arelle.CntlrCmdLine --file "%TESTCASESINDEXFILE%" --efm --validate --csvTestReport "%OUTPUTCSVFILE%" --logFile "%OUTPUTLOGFILE%" 2>  "%OUTPUTERRFILE%"


added service debugging debugging

added service debugging debugging

--- start.cmd
+++ start.cmd
@@ -3,11 +3,19 @@
 for /d %%d in (./deps/*) do set deps=!deps! %CD%/deps/%%d/ebin

 set exe= erl.exe
-set erlpaths= -pa %CD%/apps/dderl/ebin -pa %deps%
+set erlpaths=-pa %CD%/apps/dderl/ebin -pa %deps%
+set kernelconfig=-kernel inet_dist_listen_min 7000 -kernel inet_dist_listen_max 7020 -kernel error_logger {file,\\\""%CD%/log/kernel.txt\\\""}
+set commonparams=%erlpaths% -emu_args -setcookie dderl -dderl port 443 -imem tcp_port 8125 -imem mnesia_schema_name dderlstag -s dderl
+if not "%~2" == "" (
+    set name=-name dderl@%2
+)
+if not "%~3" == "" (
+    set extra=-imem erl_cluster_mgr 'dderl@%3'
+)

 if "%1" == "add" (
     @echo Adding dderl service
-    erlsrv.exe add dderl -c "DDErl Service" -name dderl@zhhapmop-sbsm01.it.bwns.ch -args "%erlpaths% -kernel inet_dist_listen_min 7000 -kernel inet_dist_listen_max 7020 -setcookie dderl -dderl port 443 -imem tcp_port 8125 -imem mnesia_schema_name dderlstag -imem erl_cluster_mgr 'dderl@oltapmop-sbsm01.it.bwns.ch' -s dderl"
+    erlsrv.exe add dderl -c "DDErl Service" -stopaction "init:stop()." -debugtype reuse -w %CD% %name% -args "%kernelconfig% %commonparams% %extra%"
 ) else if "%1" == "remove" (
     @echo Removing dderl service
    erlsrv.exe remove dderl
@@ -21,10 +29,12 @@
     erlsrv.exe list dderl
 ) else if "%1" == "gui" (
     @echo Starting dderl service
-    start /MAX werl.exe %erlpaths% -args_file vm.args -s dderl
+    start /MAX werl.exe %name% %erlpaths% %commonparams% %extra%
 ) else if "%1" == "txt" (
     @echo Starting dderl
-    erl.exe %erlpaths% -args_file vm.args -s dderl
+    erl.exe %name% %erlpaths% %commonparams% %extra%
 ) else (
+    @echo "name = '%name%'"
+    @echo "args = '-args \"%commonparams% %extra%\"'"
     @echo "usage: cmd //C start.cmd add|remove|start|stop|list|gui|txt"
 )


fixed MooBench script

fixed MooBench script

--- scripts/MooBench-cmd/startMooBench.cmd
+++ scripts/MooBench-cmd/startMooBench.cmd
@@ -1,9 +1,9 @@

 set cp=.;MooBench.jar;META-INF/kieker.monitoring.properties;META-INF/kieker.logging.properties
 set jvmParams=-javaagent:lib/kieker-1.9_aspectj.jar -Dorg.aspectj.weaver.loadtime.configuration=META-INF/kieker.aop.xml -Dorg.aspectj.weaver.showWeaveInfo=true -Daj.weaving.verbose=true -Dkieker.monitoring.writer=kieker.monitoring.writer.tcp.TCPWriter
-set params=-d 10 -h 1 -m 0 -t 3000000 -o tmp/test.txt -q
+set params=-d 10 -h 1 -m 0 -t 1000000 -o tmp/test.txt -q
 set runs=%1

-for %%i in (%runs%) do (
+for /l %%i in (1, 1, %runs%) do (
 	java -cp %cp% %jvmParams% mooBench.benchmark.Benchmark %params%
 )


Further debugging.

Further debugging.

--- dev/appveyor-bootstrap.bat
+++ dev/appveyor-bootstrap.bat
@@ -11,4 +11,6 @@
 pip install pip -U
 echo "Upgraded pip."
 pip install setuptools -U --ignore-installed
+echo "Upgraded setuptools."
 pip install -r dev\reqs.txt
+echo "Installed reqs."


adjusted batch script to work with conda env. create, install and activate with existing environment work fine, still some issues with the update call. also there appear to be some package incompatibilities

--- set-env.bat
+++ set-env.bat
@@ -1,63 +1,44 @@
 @echo off
 :: set the environment name to be the current folder
-for %%A in ("%~f0\..") do set "env_name=%%~nxA" > nul
+FOR %%A in ("%~f0\..") do SET "env_name=%%~nxA" > nul

 :: try to activate the environment
-call activate %env_name%
+CALL activate %env_name%

-set ret = %ERRORLEVEL% > nul
+:: get arguments FOR create & install

-if ret == 1 goto :create
-if %1 == "create" goto :create
-if %1 == "install" goto :create
+IF /i "%1" == "create" GOTO create
+IF /i "%1" == "install" GOTO create
+IF /i "%1" == "update" GOTO update
+IF %ERRORLEVEL% GEQ 1 GOTO create

+GOTO :EOF

 :: if it can't be activated, create it
 :create
-call conda create -n %env_name% --file conda_versions.txt
-if exist requirements.txt (
-    call activate %env_name%
-    call pip install -r requirements.txt
+CALL conda create -n %env_name% --file conda_versions.txt
+:: don't CALL pip if conda runs into trouble
+IF %ERRORLEVEL% GEQ 1 EXIT /B 2
+:: CALL pip if we have pip requirements
+IF exist requirements.txt (
+    CALL activate %env_name%
+    CALL pip install -r requirements.txt
     )
-call activate %env_name%
+GOTO :EOF
+

+:update
+CALL conda update --all
+IF exist requirements.txt (
+    CALL activate %env_name%
+    :: this should update all pip packages
+    FOR /F "delims===" %i in ('pip freeze -l') do pip install -U %i
+CALL activate %env_name%
+CALL picky --update
+)

-:: if we pass create or install, do the same
-::if %1 == "create" (
-::    call conda create -n %env_name% --file conda_versions.txt
-::    if exist requirements.txt (
-::        call activate %env_name%
-::        call pip install -r requirements.txt
-::        )
-::    call activate %env_name%
-::    )::
+CALL picky

-::if %1 == "install" (
-::    call conda create -n %env_name% --file conda_versions.txt
-::    if exist requirements.txt (
-::        call activate %env_name%
-::        call pip install -r requirements.txt
-::        )
-::    call activate %env_name%
-::    )
-
-if %1 == "update" (
-    call conda update --all
-    if exist requirements.txt (
-        call activate %env_name%
-        :: this should update all pip packages
-        for /F "delims===" %i in ('pip freeze -l') do pip install -U %i
-        )
-    call activate %env_name%
-    call picky --update
-    )
-
-set ret = %ERRORLEVEL% > nul
-
-if NOT ret == 1 (
-    call activate %env_name%
-    )
-
-call picky+GOTO :EOF


reduce verbosity during build

reduce verbosity during build

--- recipes/alps/bld.bat
+++ recipes/alps/bld.bat
@@ -16,7 +16,7 @@
     ../clapack
 if errorlevel 1 exit 1

-cmake --build . --config Release
+cmake --build . --config Release -- /consoleloggerparameters:ErrorsOnly;Summary /verbosity:minimal
 if errorlevel 1 exit 1

 cmake --build . --config Release --target install
@@ -66,7 +66,7 @@

 type CMakeCache.txt

-cmake --build . --config Release
+cmake --build . --config Release -- /consoleloggerparameters:ErrorsOnly;Summary /verbosity:minimal
 if errorlevel 1 exit 1

 cmake --build . --config Release --target install


Fix source indexing to reference correct hash

The whole point of source indexing is to ensure that when you are
debugging that the correct source file will appear, magically. The
previous version of source indexing in UIforETW referenced the master
branch, which is not a stable location when debugging crashes from
old releases. This changes the packaging script to get the current
hash and embed it. It isn't done very efficiently - it should be a
variable that is defined once instead of being referenced in every
remapping line, but oh well. It works. I promise I'll rewrite this
some day.

Typical source indexing information looks like this:

> pdbstr -r -p:etwsymbols\UIforETWStatic_devrel.pdb -s:srcsrv
SRCSRV: ini ------------------------------------------------
VERSION=1
INDEXVERSION=2
VERCTL=Archive
DATETIME=09/08/2016 20:37:13
SRCSRV: variables ------------------------------------------
SRCSRVVERCTRL=http
HTTP_ALIAS=https://raw.githubusercontent.com
HTTP_EXTRACT_TARGET=%HTTP_ALIAS%/%var2%/%var3%/%var4%/%var5%
SRCSRVTRG=%http_extract_target%
SRCSRVCMD=
SRCSRV: source files ---------------------------------------
c:\github\uiforetw\uiforetw\utility.h*google*UIforETW*ea1129d25ba58efd03ef649829348ca553f82383*UIforETW/Utility.h
c:\github\uiforetw\uiforetw\stdafx.h*google*UIforETW*ea1129d25ba58efd03ef649829348ca553f82383*UIforETW/stdafx.h
c:\github\uiforetw\uiforetw\utility.cpp*google*UIforETW*ea1129d25ba58efd03ef649829348ca553f82383*UIforETW/Utility.cpp
...
SRCSRV: end ------------------------------------------------

And the URLs that should be generated look like this:
https://raw.githubusercontent.com/google/UIforETW/ea1129d25ba58efd03ef649829348ca553f82383/UIforETW/Utility.h

--- package_etw.bat
+++ package_etw.bat
@@ -100,16 +100,32 @@
 @rem verifyLocalRepo comes with its own challenges since github-sourceindexer.ps1 does
 @rem a weak job of looking for git.exe. I had to edit FindGitExe to tell it exactly where
 @rem to look - something like this:
-@rem function FindGitExe {
-@rem  	$gitexe = "c:\src\chromium\depot_tools\git-2.8.3-64_bin\cmd\git.exe"
-@rem     if (Test-Path $gitexe) {
-@rem         return $gitexe
-@rem     }
+@rem function FindGitExe {
+@rem  	$gitexe = "c:\src\chromium\depot_tools\git-2.8.3-64_bin\cmd\git.exe"
+@rem     if (Test-Path $gitexe) {
+@rem         return $gitexe
+@rem     }
 if not exist ..\GitHub-Source-Indexer\github-sourceindexer.ps1 goto NoSourceIndexing
 mkdir %temp%\srcsrv
 xcopy /s /y "c:\Program Files (x86)\Windows Kits\10\Debuggers\x64\srcsrv" %temp%\srcsrv
-powershell ..\GitHub-Source-Indexer\github-sourceindexer.ps1 -symbolsFolder etwsymbols -userID "google" -repository UIforETW -branch "master" -sourcesRoot %UIforETW% -dbgToolsPath %temp%\srcsrv -verifyLocalRepo
-@echo Run these commands to verify what has been indexed:
+
+@rem Crazy gymnastics to get the current git hash into an environment variable:
+echo|set /p="set hash=">sethash.bat
+call git log -1 --pretty=%%%%H >>sethash.bat
+call sethash.bat
+del sethash.bat
+
+@rem We need to create this sort of URL:
+@rem https://raw.githubusercontent.com/google/UIforETW/ea1129d25ba58efd03ef649829348ca553f82383/.gitignore
+@rem From this template:
+@rem HTTP_EXTRACT_TARGET=%HTTP_ALIAS%/%var2%/%var3%/raw/%var4%/%var5%
+@rem With these sort of arguments:
+@rem c:\github\uiforetw\uiforetw\utility.h*google*UIforETW*master*UIforETW/utility.h
+
+powershell ..\GitHub-Source-Indexer\github-sourceindexer.ps1 -symbolsFolder etwsymbols -userID "google" ^
+    -repository UIforETW -branch %hash% -sourcesRoot %UIforETW% -dbgToolsPath %temp%\srcsrv ^
+    -verifyLocalRepo -gitHubUrl https://raw.githubusercontent.com -serverIsRaw
+@echo Run these commands if you want to verify what has been indexed:
 @echo %temp%\srcsrv\pdbstr -r -p:etwsymbols\UIforETWStatic_devrel.pdb -s:srcsrv
 @echo %temp%\srcsrv\pdbstr -r -p:etwsymbols\UIforETWStatic_devrel32.pdb -s:srcsrv
 :NoSourceIndexing


fix: .bat script was not working in jre bundle when running from network drive

--- droid-binary/bin/droid.bat
+++ droid-binary/bin/droid.bat
@@ -147,6 +147,6 @@

 :NOPARAM
 REM No command-line parameters passed -- run GUI version:
-start ${JRE_BIN_PATH}javaw %DROID_OPTIONS% -jar "%DROID_HOME%droid-ui-${project.version}.jar"
+start "" "${JRE_BIN_PATH}javaw" %DROID_OPTIONS% -jar "%DROID_HOME%droid-ui-${project.version}.jar"

 :END


Upgrade JSorolla dependency

Upgrade JSorolla dependency

--- e2e-runner.bat
+++ e2e-runner.bat
@@ -1,52 +1,74 @@
+@echo off
+setlocal EnableExtensions EnableDelayedExpansion
+
 rem This script launches IVA e2e tests over one or more Opencga studies in Windows env
-rem It prompts for Opencga username, password, and a comma-separated list of studies
-rem TODO add cli params
+rem It prompts for Opencga username, password, and a comma-separated list of studies if -u (username) and -s (studies) params are not provided.

-@echo off
-    setlocal enableextensions disabledelayedexpansion

 :parse
 IF "%~1"=="" GOTO endparse
-IF "%~1"=="-u" SET opencgauser=%~2
+IF "%~1"=="-u" SET opencgaUser=%~2
 IF "%~1"=="-s" SET studies=%~2
-IF "%~1"=="-h" REM do something else
+IF "%~1"=="-h" call :help & goto :eof
 SHIFT
 GOTO parse
 :endparse

+if not defined opencgaUser (
 rem set the username using a plain prompt
-	SET /p username=Enter your Opencga Username [ENTER]:
-	rem this doesnt work?
-	if not defined username (
-        echo Username must be defined
+	SET /p opencgaUser=Enter your Opencga Username [ENTER]:
+	if not defined opencgaUser (
+		echo Username must be defined
 		goto :eof
-    )
+	)
+)

 rem Call the subroutine to get the password
-    call :getPassword password
-	if not defined password (
-        echo Password must be defined
+call :getPassword opencgaPassword
+if not defined opencgaPassword (
+	echo Password must be defined
+	goto :eof
+)
+
+if not defined studies (
+rem set the username using a plain prompt
+	SET /p studies="Enter the the FQN (comma-separated) of the studies you want to test [ENTER]:"
+	if not defined studies (
+		echo studies must be defined
 		goto :eof
-    )
-
-rem set the study using a plain prompt
-	SET /p studies=Enter the the FQN (comma-separated) of the studies you want to test [ENTER]:
-	if not defined studies (
-        echo At least one study must be defined
-		goto :eof
-    )
-
-rem iterate over studies and run the test defined in --spec
-for %%a in ("%studies:,=" "%") do (
-    echo %%~a
-    (if exist mochawesome-report rmdir /S/Q mochawesome-report) && npx cypress run --env username=%username%,password=%password%,study=%%~a --headless --spec \"cypress/integration/003-header-bar-post-login.spec.js\" & npx mochawesome-merge mochawesome-report/*.json -o mochawesome-report/cypress-combined-report.json && ^
-    npx marge --reportFilename report.html --charts --timestamp _HH-MM_dd-mm-yyyy --reportPageTitle IVA --reportTitle IVA --reportDir ./report mochawesome-report/cypress-combined-report.json && (if exist mochawesome-report rmdir /S/Q mochawesome-report)
+	)
 )

+rem echo %opencgaUser% - %opencgaPassword% - %studies%
+
+rem Iterate over studies and
+for %%a in ("%studies:,=" "%") do (
+set tmp=%%~na
+set study=!tmp::=!
+echo %%~a delayed: !study!
+rem TODO fix !study! is not expanded in the following commands
+rem (if exist mochawesome-report rmdir /S/Q mochawesome-report) && npx cypress run --env username=%opencgaUser%,password=%opencgaPassword%,study=%%~a --config videosFolder='cypress/videos/!study!',screenshotsFolder='cypress/screenshots/!study!' --headless --spec 'cypress/integration/002-login.js' & npx mochawesome-merge mochawesome-report/*.json -o mochawesome-report/cypress-combined-report.json && ^
+rem npx marge --reportFilename "!study!.html" --charts --timestamp _HH-MM_dd-mm-yyyy --reportPageTitle 'IVA !study!' --reportTitle 'IVA study: !study!' --reportDir ./report mochawesome-report/cypress-combined-report.json && (if exist mochawesome-report rmdir /S/Q mochawesome-report)
+)
+
 rem End of the process
-    endlocal
-    exit /b
+endlocal
+exit /b
+
+
+:help
+setlocal EnableDelayedExpansion
+set u="Usage: %~n0%~x0 [-u <USERNAME>] [-s <STUDIES>]"
+echo(!~u!
+echo Launches IVA e2e tests over one or more Opencga studies.
+echo Options:
+echo -u     Opencga username.
+echo -s     Comma-separated list of studies. Please wrap the list in quotes in case of more that one study
+echo -h     Prints command description
+
+echo !multiLine!
+endlocal & exit /b 0

 rem Subroutine to get the password
@@ -86,3 +108,4 @@
     rem return password to caller
     if defined _password ( set "exitCode=0" ) else ( set "exitCode=1" )
     endlocal & set "%~1=%_password%" & exit /b %exitCode%
+


Synchronized with SF repo

Synchronized with SF repo

--- tools/runcoverity.bat
+++ tools/runcoverity.bat
@@ -26,9 +26,12 @@

 REM Built coverity report. Compress it.
 zip -r gustysserpents.zip cov-int
-
 PopD
-
+Echo.Compressed output...
+If Exist "submitcoveritybuild.bat" (
+  Echo.A batch for auto-submitting the coverity build has been detected and will be called.
+  Call "submitcoveritybuild.bat"
+)

 :End
 PopD


3.1a2

--- 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.1a2

 SET _myname=%~n0
 SET _myparams=%*
@@ -110,10 +110,10 @@
 	ECHO.
 	ECHO This batch should be run from your Firefox profile directory. It will download the latest version of ghacks user.js from github and then append any of your own changes from user-overrides.js to it.
 	ECHO.
-	REM ECHO Visit the wiki for more detailed information.
-	REM ECHO.
+	ECHO Visit the wiki for more detailed information.
+	ECHO.
 	CHOICE /M "Continue"
-	IF ERRORLEVEL 2 EXIT /B
+	IF ERRORLEVEL 2 ( EXIT /B )
 )
 CLS
 ECHO.
@@ -129,8 +129,9 @@
 	ECHO %date%, %time%
 	ECHO.
 )
+IF EXIST user.js.old.bak ( DEL /F user.js.old.bak )
 IF EXIST user.js (
-	IF EXIST user.js.bak REN user.js.bak user.js.old.bak
+	IF EXIST user.js.bak ( REN user.js.bak user.js.old.bak )
 	REN user.js user.js.bak
 	ECHO Current user.js file backed up.
 	ECHO.
@@ -198,8 +199,8 @@
 	)
 	ECHO.
 ) ELSE (
-	IF EXIST user.js.bak REN user.js.bak user.js
-	IF EXIST user.js.old.bak REN user.js.old.bak user.js.bak
+	IF EXIST user.js.bak ( REN user.js.bak user.js )
+	IF EXIST user.js.old.bak ( REN user.js.old.bak user.js.bak )
 	ECHO.
 	ECHO Update failed. Make sure PowerShell is allowed internet access.
 	ECHO.
@@ -213,6 +214,7 @@

 REM ###### Merge function ######
 :merge
+IF EXIST updatertempfile1 ( DEL /F updatertempfile1 )
 SETLOCAL disabledelayedexpansion
 (
 	FOR /F "tokens=1,* delims=]" %%G IN ('FIND /n /v "" ^< "%~1"') DO (


version

version

--- nuspec/pack.bat
+++ nuspec/pack.bat
@@ -1,6 +1,6 @@
 del *.nupkg

-set version=200.6.1
+set version=200.6.2

 nuget pack Chance.MvvmCross.Plugins.UserInteraction.nuspec -Version %version%
 copy /y *.nupkg ..\..\nugets


No need to rebuild the solution when building the Windows installer anymore

--- installer/windows/create_installer.bat
+++ installer/windows/create_installer.bat
@@ -16,7 +16,7 @@
 %QTDIR32%\bin\qmake.exe -tp vc -r
 popd

-msbuild ..\..\file-commander.sln /t:Rebuild /p:Configuration=Release;PlatformToolset=v140
+msbuild ..\..\file-commander.sln /t:Build /p:Configuration=Release;PlatformToolset=v140

 xcopy /R /Y ..\..\bin\release\x86\FileCommander.exe binaries\32\
 xcopy /R /Y ..\..\bin\release\x86\plugin_*.dll binaries\32\
@@ -45,7 +45,7 @@
 %QTDIR64%\bin\qmake.exe -tp vc -r
 popd

-msbuild ..\..\file-commander.sln /t:Rebuild /p:Configuration=Release;PlatformToolset=v140
+msbuild ..\..\file-commander.sln /t:Build /p:Configuration=Release;PlatformToolset=v140

 xcopy /R /Y ..\..\bin\release\x64\FileCommander.exe binaries\64\
 xcopy /R /Y ..\..\bin\release\x64\plugin_*.dll binaries\64\


Remove winprep.bat since windows stuff should now be covered

--- winprep.bat
+++ winprep.bat
@@ -1,4 +0,0 @@
-find /v "unix" < MissingH.cabal > cabal.win
-del MissingH.cabal
-ren cabal.win MissingH.cabal
-


initial

initial

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

--- run_RVI_icf_auto/run_RVI_icf_auto.bat
+++ run_RVI_icf_auto/run_RVI_icf_auto.bat
@@ -0,0 +1,170 @@
+::echo ################
+::echo Test Script --- You can remove it
+::echo ################
+
+@ECHO OFF
+
+setlocal EnableDelayedExpansion
+
+:GetRAND
+SET /A RAND=%RANDOM%
+::ECHO %RAND%
+ECHO.
+
+SET /A RAND=%RAND%%%10
+::ECHO %RAND%
+ECHO.
+
+set DiskNum=%RAND%
+
+::echo DiskNum="%DiskNum%"
+
+if exist *.icf del /Q *.icf
+
+if "%DiskNum%"=="0" (
+    ::echo get DiskNum=0 %DiskNum%
+	goto GetRAND
+)else (
+    ::echo get DiskNum not 0 is "%DiskNum%"
+	for /L %%i in (1, 1, %DiskNum%) do (
+        set "formattedValue=000000%%i"
+	    set FileName=!formattedValue:~-2!
+	    ::set FileName=!formattedValue:~-3!
+		::echo not create icf file
+		echo.
+	    ::echo !FileName!.icf
+		echo.
+	    ::echo %%i %%i > !FileName!.icf
+		echo.
+    )
+)
+::echo ################
+::echo Test Script --- You can remove it
+::echo ################
+
+echo ################
+echo RUN ICF FILE
+echo ################
+
+@ECHO OFF
+
+setlocal EnableDelayedExpansion
+
+cls
+echo ################
+echo RUN ICF FILE
+echo ################
+echo.
+echo ################
+echo Read executable ICF file
+echo ################
+
+set /a cnt=0
+
+:loop
+
+set /a cnt+=1
+set "formattedValue=000000%cnt%"
+set FileName=!formattedValue:~-2!
+
+if exist !FileName!.icf (
+    echo !FileName!.icf
+	::type !FileName!.icf
+	goto loop
+)else (
+    break
+)
+
+
+::echo ################
+::echo Read execute xxx ICF file
+::echo ################
+
+set /a cnt_2=0
+
+:loop_2
+
+set /a cnt_2+=1
+set "formattedValue=000000%cnt_2%"
+set FileName=!formattedValue:~-3!
+
+if exist !FileName!.icf (
+    echo !FileName!.icf
+	::type !FileName!.icf
+	goto loop_2
+)else (
+    break
+)
+
+echo.
+echo ################
+echo How many icf in this folder
+echo ################
+
+set /a cnt-=1
+set /a cnt_2-=1
+
+::echo "cnt"="%cnt%"
+::echo "cnt_2"="%cnt_2%"
+
+if "%cnt_2%"=="0" if "%cnt%"=="0" (
+        echo Ooops here not exist xx.icf and xxx.icf FILE
+    	echo ################
+		echo STOP - Do Noting
+		echo ################
+    )else (
+		echo Here has Total "%cnt%" icf FILE
+		echo ################
+		echo OK - That do it
+		echo ################
+		if exist iometer (
+		    for /L %%i in (1, 1, %cnt%) do (
+		        set "formattedValue=000000%%i"
+	            set FileName=!formattedValue:~-2!
+                echo !FileName!.icf running...
+			    ::type !FileName!.icf
+			    iometer !FileName!.icf !FileName!.csv
+			)
+			echo ################
+			echo Finish 01~!FileName!.icf
+			echo ################
+		)else (
+			echo ################
+			echo No IOmeter tool
+			echo Please put IOmeter in this folder, Thanks.
+			echo ################
+		    echo STOP - Do Noting
+		    echo ################
+		)
+)else if "%cnt%"=="0" (
+        echo Here has Total "%cnt_2%" icf FILE
+		echo ################
+		echo OK - That do it
+		echo ################
+		if exist iometer (
+		    for /L %%i in (1, 1, %cnt2%) do (
+		        set "formattedValue=000000%%i"
+	            set FileName=!formattedValue:~-3!
+                echo !FileName!.icf running...
+			    ::type !FileName!.icf
+			    iometer !FileName!.icf !FileName!.csv
+			)
+			echo ################
+			echo Finish 001~!FileName!.icf
+			echo ################
+		)else (
+			echo ################
+			echo No IOmeter tool
+			echo Please put IOmeter in this folder, Thanks.
+			echo ################
+		    echo STOP - Do Noting
+		    echo ################
+		)
+    )else (
+		echo Here hava "%cnt%" xx.icf and "%cnt_2%" xxx.icf FILE that is strangeness.
+    	echo ################
+		echo STOP - Do Noting
+		echo ################
+)
+
+PAUSE


Remove extra whitespace

Remove extra whitespace

--- nesappscraper.bat
+++ nesappscraper.bat
@@ -2,10 +2,7 @@
 title NESA PP Scraper - Started %time%
 scrapy crawl nesapp
 git add data.json
-
 git add meta.json
-
 git commit -m "Update data: %date% %time%"
-
 git push
-pause+pause


BUG: check_application_end at corrct location

--- Packaging/Files/selftester.bat
+++ Packaging/Files/selftester.bat
@@ -98,7 +98,6 @@
   echo "ERROR: otb_loader.exe %1"
   type tmp.log
   if %EXIT_ON_ERROR% equ 1 ( exit 1 )
-  goto :check_application_end
 )
 endlocal
 goto :eof
@@ -111,6 +110,7 @@
 if not exist bin\otbcli_%app%.bat (
   echo ERROR : missing cli launcher for application %app%
   if %EXIT_ON_ERROR% equ 1 ( exit 1 )
+  goto :check_application_end
 )
 type NUL > tmp.log
 cmd /C bin\otbcli_%app%.bat "-help" ^> tmp.log ^2^>^&^1


nuget restore cmd for appveyor

nuget restore cmd for appveyor

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

--- nuget-restore.cmd
+++ nuget-restore.cmd
@@ -0,0 +1,15 @@
+@echo off
+rem initiate the retry number
+set retryNumber=0
+set maxRetries=3
+
+:RESTORE
+nuget restore %*
+
+rem problem?
+IF NOT ERRORLEVEL 1 GOTO :EOF
+@echo Oops, nuget restore exited with code %ERRORLEVEL% - let us try again!
+set /a retryNumber=%retryNumber%+1
+IF %reTryNumber% LSS %maxRetries% (GOTO :RESTORE)
+@echo Sorry, we tried restoring nuget packages for %maxRetries% times and all attempts were unsuccessful!
+EXIT /B 1


suppression run_analyzr.cmd (inutile maintenant)

--- run_analyzr.cmd
+++ run_analyzr.cmd
@@ -1,7 +0,0 @@
-@echo off
-
-REM python-env\Scripts\python.exe -m scripts.analyzrctl %*
-
-py-env-analyzr\Scripts\python.exe  %~dp0\analyzr.py %*
-
-PAUSE


Switch appveyor to use zmq v4.2.0

Switch appveyor to use zmq v4.2.0

--- .appveyor/appveyor.bat
+++ .appveyor/appveyor.bat
@@ -56,7 +56,7 @@

 echo Installing libzmq
 set LIBZMQ_SOURCEDIR=C:\projects\libzmq
-git clone --depth 1 --quiet https://github.com/zeromq/libzmq.git "%LIBZMQ_SOURCEDIR%"
+git clone --branch v4.2.0 --depth 1 --quiet https://github.com/zeromq/libzmq.git "%LIBZMQ_SOURCEDIR%"
 if %ERRORLEVEL% NEQ 0 (
   echo cloning libzmq failed
   exit 1


Update install_bigfix.bat

Update install_bigfix.bat

--- CMD/install_bigfix.bat
+++ CMD/install_bigfix.bat
@@ -27,7 +27,7 @@
 REM http://stackoverflow.com/questions/1702762/how-to-create-an-empty-file-at-the-command-line-in-windows
 REM http://stackoverflow.com/questions/7225630/how-to-echo-2-no-quotes-to-a-file-from-a-batch-script
 type NUL > %BASEFOLDER%\clientsettings.cfg
-REM  TODO: only do the following line if variable is set
+REM  TODO: only do the following line if FQDN_variable is set
 >>%BASEFOLDER%\clientsettings.cfg ECHO _BESClient_RelaySelect_FailoverRelay=http://%1:52311/bfmirror/downloads/
 >>%BASEFOLDER%\clientsettings.cfg ECHO _BESClient_Resource_StartupNormalSpeed=1
 >>%BASEFOLDER%\clientsettings.cfg ECHO _BESClient_Download_RetryMinutes=1


win32/build_sources.cmd: do the right thing by default with msg_parser.awk

There is a bug in gawk 3.1.3 in Win32 returning error code from exit
in END block unless exit is called with (-1) as its
parameter. Avoiding that bug was the default behaviou earlier,
resulting error with gawk 3.1.5.

darcs-hash:20061122180338-65a35-d27c5e43d79038ad963ab12d1757c41f6dbbfa2b.gz

--- win32/build_sources.cmd
+++ win32/build_sources.cmd
@@ -13,8 +13,10 @@
 @goto failed
 :have_awk

-:: in Win32 exit 0; from awk gets converted to errorlevel 1
-@set MSG_AWK=gawk -v BINMODE=rw -f ../libsofia-sip-ua/msg/msg_parser.awk success=-1
+@set MSG_AWK=gawk -v BINMODE=rw -f ../libsofia-sip-ua/msg/msg_parser.awk
+:: in Win32 exit 0; from gawk 3.1.3 gets converted to errorlevel 1
+:: If you have gawk 3.1.3 uncomment the following line
+:: @set MSG_AWK=gawk -v BINMODE=rw -f ../libsofia-sip-ua/msg/msg_parser.awk success=-1
 @set TAG_AWK=gawk -f ../libsofia-sip-ua/su/tag_dll.awk BINMODE=rw

 @set IN=../libsofia-sip-ua/msg/test_class.h


Build Ironframe in DiegoWindowsMSI on appveyor instead of testing it (currently freezes)

See #93622840

--- Containerizer/make.bat
+++ Containerizer/make.bat
@@ -5,7 +5,7 @@

 git submodule update --init --recursive
 cd IronFrame
-call build.bat || exit /b 1
+call build.bat build || exit /b 1
 cd ..

 rmdir /S /Q packages


Added new libraries in the publish script

--- DwellerBot/publish.bat
+++ DwellerBot/publish.bat
@@ -8,10 +8,16 @@
 copy /Y DwellerBot.exe %publishpath%
 copy /Y DwellerBot.exe.config %publishpath%
 copy /Y HtmlAgilityPack.dll %publishpath%
+copy /Y Microsoft.Recognizers.Definitions.dll %publishpath%
+copy /Y Microsoft.Recognizers.Text.dll %publishpath%
+copy /Y Microsoft.Recognizers.Text.Number.dll %publishpath%
+copy /Y Microsoft.Recognizers.Text.NumberWithUnit.dll %publishpath%
 copy /Y Newtonsoft.Json.dll %publishpath%
 copy /Y Serilog.dll %publishpath%
 copy /Y Serilog.FullNetFx.dll %publishpath%
 copy /Y Serilog.Sinks.ColoredConsole.dll %publishpath%
+copy /Y System.Collections.Immutable.dll %publishpath%
+copy /Y System.ValueTuple.dll %publishpath%
 copy /Y System.Net.Http.Extensions.dll %publishpath%
 copy /Y System.Net.Http.Formatting.dll %publishpath%
 copy /Y System.Net.Http.Primitives.dll %publishpath%


vimrc and gvimrc should be in homedir for bat setup

--- setup/setup.bat
+++ setup/setup.bat
@@ -1,16 +1,12 @@
 @echo off
 setlocal enableextensions

-if exist "%programfiles(x86)%"\ (
-	mklink "%programfiles(x86)%"\vim\.vimrc "%cd%\..\vimfiles\.vimrc"
-	mklink "%programfiles(x86)%"\vim\.gvimrc "%cd%\..\vimfiles\.gvimrc"
-) else (
-	mklink "%programfiles%"\vim\.vimrc "%cd%\..\vimfiles\.vimrc"
-	mklink "%programfiles%"\vim\.gvimrc "%cd%\..\vimfiles\.gvimrc"
-)
+mklink "%userprofile%"\.vimrc "%cd%\..\vimfiles\.vimrc"
+mklink "%userprofile%"\.gvimrc "%cd%\..\vimfiles\.gvimrc"

 mklink "%userprofile%"\.gitconfig "%cd%\..\gitfiles\.gitconfig"
 mklink "%userprofile%"\.gitignore_global "%cd%\..\gitfiles\.gitignore_global"
+mklink "%userprofile%"\.inputrc "%cd%\..\.inputrc"
 mklink "%userprofile%"\.bashrc "%cd%\..\.bashrc"
 mklink "%userprofile%"\.bashrc_local "%cd%\..\local\.bashrc"
 mklink "%userprofile%"\.inputrc "%cd%\..\.inputrc"


Adição da linha removida

Adição da linha removida

--- otimizador.cmd
+++ otimizador.cmd
@@ -2,6 +2,7 @@

 taskkill /im MAAB.RestApi.vshost.exe
 taskkill /im MAAB.RestApi.exe
+

 cls
 echo Bem-vindo %USERNAME%, o que voce deseja?


Go back to SVN commit, will need to re-install SVN on build machine.


Adjustments in the build script

Adjustments in the build script

--- Source/Build/build.cmd
+++ Source/Build/build.cmd
@@ -244,6 +244,7 @@

 rem ECHO Building CSSCodeProvider.v4.6.dll: >> ..\Build\build.log
 copy ..\CSSRoslynProvider\bin\Release\CSSRoslynProvider.dll "%local_dev%\Lib\CSSRoslynProvider.dll"
+copy ..\CSSRoslynProvider\bin\Release\CSSRoslynProvider.dll "%local_dev%\Lib\Bin\Linux\CSSRoslynProvider.dll"
 copy ..\CSSRoslynProvider\bin\Release\CSSRoslynProvider.dll CSSRoslynProvider.dll
 ECHO ------------ >> ..\Build\build.log


Update batch file

Update batch file

--- scripts/build.bat
+++ scripts/build.bat
@@ -2,7 +2,7 @@
 rmdir /s /q "dist"

 REM Compile TypeScript using config in 'tsconfig.json'
-tsc -d
+call tsc -d

 REM Rename files in 'dist' to support ES modules with '.mjs'
-CALL "scripts\rename.bat"
+call "scripts\rename.bat"


Create Jenkins7478Converter.bat

Create Jenkins7478Converter.bat

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

--- Jenkins7478Converter.bat
+++ Jenkins7478Converter.bat
@@ -0,0 +1,58 @@
+@echo off
+if not exist "%~f1" exit /b 1
+@echo off > "%~f1.fix"
+setlocal EnableExtensions DisableDelayedExpansion
+for /f "skip=2 tokens=1,* delims=]" %%K in ('find /n /v "" "%~f1"') do set "_=%%L" & >>"%~f1.fix" call :Expand_
+endlocal
+
+:Expand_
+:: NULL is a blank line or line with only a close bracket ].
+if not defined _ echo.^
& exit /b 0
+:: Ensure even number of double quotation marks.
+set "_=%_:"=""%"
+:: Replace all U+'s to escape unicode notations.
+set "_=%_:U+=U+0055%"
+:: Replace all special search term signs.
+call :Escape_ "=" "U+003D"
+call :Escape_ "*" "U+002A"
+call :Escape_ "~" "U+007E"
+call :Escape_ "&" "U+0026"
+:: Replace the search term.
+set "_=%_:U+0026=U+0026amp;%"
+set "_=%_:'=U+0026apos;%"
+set "_=%_:""=U+0026quot;%"
+set "_=%_:<=U+0026lt;%"
+set "_=%_:>=U+0026gt;%"
+:: Intermediate for Ampersand replacement.
+set "_=%_:U+0026=<%"
+call :Escape_ "<" "&"
+:: Revert special search term signs then the U's.
+set "_=%_:U+003D==%"
+set "_=%_:U+002A=*%"
+set "_=%_:U+007E=~%"
+set "_=%_:U+0055=U+%"
+:: Escape batch special characters.
+set "_=%_:^=^^%"
+set "_=%_:<=^<%"
+set "_=%_:>=^>%"
+set "_=%_:&=^&%"
+set "_=%_:|=^|%"
+:: Revert quotations.
+set "_=%_:""="%"
+:: Display
+echo(%_%^
+exit /b 0
+
+:: Escape a special character. Equals must be escaped first due to the delims.
+:: Note that duplicate delims are allowed in the case of equals.
+:: Escape must be used only while the euqal sign has been escaped.
+:Escape_ <Character> <Unicode>
+for /f "tokens=2,* delims==%~1" %%A in ('set _') do (
+	set "[=%%A"
+	set "]=%%B"
+)
+if defined ] (
+	set "_=%[%%~2%]%"
+	goto Escape_ %1 %2
+)
+exit /b 0


try copying from top dir

try copying from top dir

--- recipe/bld.bat
+++ recipe/bld.bat
@@ -23,12 +23,12 @@

 dir include

-move libmetis\libmetis.a %LIBRARY_BIN%
-move programs\cmpfillin %LIBRARY_LIB%
-move programs\gpmetis %LIBRARY_LIB%
-move programs\graphchk %LIBRARY_LIB%
-move programs\m2gmetis %LIBRARY_LIB%
-move programs\ndmetis %LIBRARY_LIB%
-move programs\mpmetis %LIBRARY_LIB%
-move include\metis.h %LIBRARY_INC%
-move include\gklib_tls.h %LIBRARY_INC%+move ..\..\libmetis\libmetis.a %LIBRARY_BIN%
+move ..\..\programs\cmpfillin %LIBRARY_LIB%
+move ..\..\programs\gpmetis %LIBRARY_LIB%
+move ..\..\programs\graphchk %LIBRARY_LIB%
+move ..\..\programs\m2gmetis %LIBRARY_LIB%
+move ..\..\programs\ndmetis %LIBRARY_LIB%
+move ..\..\programs\mpmetis %LIBRARY_LIB%
+move ..\..\include\metis.h %LIBRARY_INC%
+move ..\..\include\gklib_tls.h %LIBRARY_INC%


Delete solution cache file on clean, if it exists.

--- src/tools/msvc/clean.bat
+++ src/tools/msvc/clean.bat
@@ -1,5 +1,5 @@
 @echo off
-REM $PostgreSQL: pgsql/src/tools/msvc/clean.bat,v 1.16 2009/11/12 00:13:00 tgl Exp $
+REM $PostgreSQL: pgsql/src/tools/msvc/clean.bat,v 1.17 2010/01/01 16:58:53 mha Exp $

 set DIST=0
 if "%1"=="dist" set DIST=1
@@ -11,6 +11,7 @@
 if exist release rd /s /q release
 for %%f in (*.vcproj) do del %%f
 if exist pgsql.sln del /q pgsql.sln
+if exist pgsql.sln.cache del /q pgsql.sln.cache
 del /s /q src\bin\win32ver.rc 2> NUL
 del /s /q src\interfaces\win32ver.rc 2> NUL
 if exist src\backend\win32ver.rc del /q src\backend\win32ver.rc


Fix .NET 4.5 CI testing for repo rename (#141)

* Modifications for repo rename
* Keeps using csnats directory for AppVeyor
* Use a relative directory

--- appveyor/testnet45.bat
+++ appveyor/testnet45.bat
@@ -1 +1 @@
-%xunit20%\xunit.console.x86 "C:\projects\csharp-nats\net45\NATSUnitTests\bin\Release\NATSUnitTests.dll" -appveyor
+%xunit20%\xunit.console.x86 "net45\NATSUnitTests\bin\Release\NATSUnitTests.dll" -appveyor


Fix run_all_test script to avoid git-cl variable clashes.

A recent update to git-cl seems to use the same variable
SCRIPT, etc...

After running run_all_tests, the git-cl script won't work until you unset
the variables or close your shell.

Unsetting the variable is enough, but it's safer to use a new name in
case the script crashes.

R=chrisha@chromium.org, chrisha

BUG=

Review URL: https://codereview.appspot.com/74770043

git-svn-id: db59699583a60be9a535cd09cdc9132301867226@2072 15e8cca8-e42c-11de-a347-f34a4f72eb7d

--- syzygy/run_all_tests.bat
+++ syzygy/run_all_tests.bat
@@ -12,12 +12,16 @@
 :: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 :: See the License for the specific language governing permissions and
 :: limitations under the License.
-set PYTHON="%~dp0..\third_party\python_26\python.exe"
-set SCRIPT="%~dp0tests\run_all_tests.py"
-set INTERNAL_TESTS="%~dp0internal\run_all_tests.bat"
+set SYZYGY_PYTHON="%~dp0..\third_party\python_26\python.exe"
+set SYZYGY_SCRIPT="%~dp0tests\run_all_tests.py"
+set SYZYGY_INTERNAL_TESTS="%~dp0internal\run_all_tests.bat"

-%PYTHON% %SCRIPT% %*
+%SYZYGY_PYTHON% %SYZYGY_SCRIPT% %*

-IF EXIST %INTERNAL_TESTS% (
-%INTERNAL_TESTS% %*
+IF EXIST %SYZYGY_INTERNAL_TESTS% (
+%SYZYGY_INTERNAL_TESTS% %*
 )
+
+set SYZYGY_PYTHON=
+set SYZYGY_SCRIPT=
+set SYZYGY_INTERNAL_TESTS=


update build.bat

update build.bat

--- tools/build.bat
+++ tools/build.bat
@@ -1,5 +1,5 @@

-dir "C:\Program Files (x86)\"
+dir "C:\Program Files (x86)\Microsoft Visual Studio 12.0"
 call "C:\Program Files (x86)\Microsoft Visual Studio\2013\Community\VC\Auxiliary\Build\vcvars32.bat"
 cl /MD /LD /EHsc /Fe:arma3urlfetch.dll^
     src\common.cpp^


Visual Studio 2015 added

Visual Studio 2015 added

--- release_it.bat
+++ release_it.bat
@@ -5,7 +5,7 @@
 set STARTDIR=%CD%
 set WXDIR=%STARTDIR%\..\wxWidgets\3.0.2

-
+@if NOT "%VS140COMNTOOLS%"=="" (call "%VS140COMNTOOLS%\vsvars32.bat" & goto VS_END)
 @if NOT "%VS100COMNTOOLS%"=="" (call "%VS100COMNTOOLS%\vsvars32.bat" & goto VS_END)
 @if NOT "%VS90COMNTOOLS%"=="" (call "%VS90COMNTOOLS%\vsvars32.bat" & goto VS_END)
 @if NOT "%VS80COMNTOOLS%"=="" (call "%VS80COMNTOOLS%\vsvars32.bat" & goto VS_END)


add c# programming tools for windows

add c# programming tools for windows

--- windows_cygwin/build.bat
+++ windows_cygwin/build.bat
@@ -1,5 +1,5 @@
 @echo on
-choco install -y firefox googlechrome wget notepadplusplus sublimetext3
+choco install -y firefox googlechrome wget notepadplusplus sublimetext3 mono monodevelop gtksharp visualstudiocode microsoft-build-tools visualstudio2015community p4merge dotnet4.5

 wget -c https://cygwin.com/setup-x86_64.exe
 setup-x86_64.exe -R "C:\cygwin64" -s http://cygwin.netbet.org/ -q -g -P curl,zsh,git,vim,wget,xz,tar,gawk,bzip2,subversion,zlib,fontconfig,clang


AppVeyor runs boot image and tests

AppVeyor runs boot image and tests

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

--- AppVeyorTestDolphinVM.cmd
+++ AppVeyorTestDolphinVM.cmd
@@ -0,0 +1,11 @@
+git clone -q --branch=master https://github.com/dolphinsmalltalk/Dolphin.git Dolphin
+
+copy ..\..\Dolphin7.exe Dolphin
+copy ..\..\DolphinVM7.dll Dolphin
+copy ..\..\DolphinCR7.dll Dolphin
+copy ..\..\DolphinDR7.dll Dolphin
+copy ..\..\DolphinSureCrypto.dll Dolphin
+
+cd Dolphin
+CALL BootDPRO
+CALL TestDPRO


build: patch Windows container, fixing Node 10 (#120)

--- .kokoro/test.bat
+++ .kokoro/test.bat
@@ -17,7 +17,15 @@
 cd /d %~dp0
 cd ..

-call npm install -g npm@latest || goto :error
+@rem The image we're currently running has a broken version of Node.js enabled
+@rem by nvm (v10.15.3), which has no npm bin. This hack uses the functional
+@rem Node v8.9.1 to install npm@latest, it then uses this version of npm to
+@rem install npm for v10.15.3.
+call nvm use v8.9.1 || goto :error
+call node C:\Users\kbuilder\AppData\Roaming\nvm-ps\versions\v8.9.1\node_modules\npm-bootstrap\bin\npm-cli.js i npm -g || goto :error
+call nvm use v10.15.3 || goto :error
+call node C:\Users\kbuilder\AppData\Roaming\nvm-ps\versions\v8.9.1\node_modules\npm\bin\npm-cli.js i npm -g || goto :error
+
 call npm install || goto :error
 call npm run test || goto :error


build: patch Windows container, fixing Node 10 (#31)


build: script updated for new Windows image (#246)

--- .kokoro/test.bat
+++ .kokoro/test.bat
@@ -17,14 +17,12 @@
 cd /d %~dp0
 cd ..

-@rem The image we're currently running has a broken version of Node.js enabled
-@rem by nvm (v10.15.3), which has no npm bin. This hack uses the functional
-@rem Node v8.9.1 to install npm@latest, it then uses this version of npm to
-@rem install npm for v10.15.3.
-call nvm use v8.9.1 || goto :error
-call node C:\Users\kbuilder\AppData\Roaming\nvm-ps\versions\v8.9.1\node_modules\npm-bootstrap\bin\npm-cli.js i npm -g || goto :error
-call nvm use v10.15.3 || goto :error
-call node C:\Users\kbuilder\AppData\Roaming\nvm-ps\versions\v8.9.1\node_modules\npm\bin\npm-cli.js i npm -g || goto :error
+@rem npm path is not currently set in our image, we should fix this next time
+@rem we upgrade Node.js in the image:
+SET PATH=%PATH%;/cygdrive/c/Program Files/nodejs/npm
+
+call nvm use v12.14.1
+call which node

 call npm install || goto :error
 call npm run test || goto :error


build: update windows configuration to match new vm


add installer builder instructions

add installer builder instructions

git-svn-id: 609ac0b5210091cb75f7034bee43d3bb429ce1d9@972 08b3d480-bf2c-0410-a26f-811ee3361c24

--- win32/makeins.bat
+++ win32/makeins.bat
@@ -1,2 +1,5 @@
+#Make sure to add the directory where the NSIS installer maker is to
+#Tools\Options\Directories\Executable Files
+
 cd ..\package\win32\nsis
 makensis bzflag.nsi


pull update

pull update

--- ADBfree/core.bat
+++ ADBfree/core.bat
@@ -47,15 +47,15 @@
 ECHO ________________________________________________________________________________________________________________________
 echo                                 Enable USB Debugging and plug device into USB port.
 echo                            Go to Contacts>settings>import/export and export to local storage.
-adb wait-for-device devices 1>NUL
+adb wait-for-device devices
 mkdir adbpull
 adb pull /storage/sdcard0/ adbpull/
-adb backup -noapk -f backup.ab
+adb backup -noapk -shared -f backup.ab
 ECHO ________________________________________________________________________________________________________________________
 ECHO                 Data dump complete. Please unplug Sending device and plug in Recieving device.
 pause
 adb kill-server
-adb wait-for-device devices 1>NUL2
+adb wait-for-device devices
 adb restore backup.ab
 adb push ./adbpull /storage/sdcard0/
 del /f .\backup.ab


Added option -l. Allow passing multiple arguments to vcvarsall.bat.

--- Batch/vcvars.bat
+++ Batch/vcvars.bat
@@ -15,6 +15,8 @@
 :#                  Fixed the display of variables set by the script.         *
 :#   2018-01-10 JFL Added option -X.                           		      *
 :#   2019-05-09 JFL Added support for Visual Studio 2019.		      *
+:#   2019-09-17 JFL Added option -l.					      *
+:#                  Allow passing multiple arguments to vcvarsall.bat.	      *
 :#                                                                            *
 :#         Copyright 2018 Hewlett Packard Enterprise Development LP          *
 :# Licensed under the Apache 2.0 license: www.apache.org/licenses/LICENSE-2.0 *
@@ -22,7 +24,7 @@

 setlocal EnableExtensions EnableDelayedExpansion

-set "VERSION=2019-05-09"
+set "VERSION=2019-09-17"
 set "SCRIPT=%~nx0"
 set "ARG0=%~f0"
 set "RETURN=goto :eof"
@@ -50,6 +52,8 @@
 :# Find the most recent 32-bits Microsoft Visual C++ instance

 :findvc32
+setlocal
+set "VCVARS_VAR=%~1"
 call :findvs
 for %%s in (%VSTUDIOS%) do @(
   for %%c in ("Enterprise\VC" "Professional\VC" "Community\VC" "Preview\VC" "VC" "VC7" "VC98") do @(
@@ -59,7 +63,8 @@
         set "VSTUDIO=%%~s"
         set "VC=%%~s\%%~c"
         set "VCVARSDIR=%%~s\%%~c%%~p"
-        goto foundvc32
+        if not defined VCVARS_VAR goto foundvc32
+        set %VCVARS_VAR%=!%VCVARS_VAR%! "!VCVARSDIR!\vcvarsall.bat"
       )
     )
   )
@@ -67,6 +72,9 @@
 :foundvc32
 %ECHO.V% :# Found "%VCVARSDIR%\vcvarsall.bat"
 %ECHOVARS.V% VSTUDIO VC
+set "OPTRESULT=rem"
+if defined VCVARS_VAR set OPTRESULT=set %VCVARS_VAR%=!%VCVARS_VAR%!
+endlocal & set "VSTUDIO=%VSTUDIO%" & set "VC=%VC%" & set "VCVARSDIR=%VCVARSDIR%" & %OPTRESULT%
 %RETURN%

 :#-----------------------------------------------------------------------------
@@ -100,18 +108,21 @@

 :help
 echo.
-echo Set Visual C++ environment variables
-echo.
-echo Usage: %ARG0% [OPTIONS] [ARCHI]
+echo Set Visual C++ environment variables using the latest vcvarsall.bat available
+echo.
+echo Usage: %ARG0% [OPTIONS] [ARGS]
 echo.
 echo Options:
-echo   -?^|-h          This help
+echo   -?^|-h          Display this help
+echo   -l             List all vcvarsall.bat instances installed
 echo   -v             Display verbose information
 echo   -V             Display the script version and exit
 echo   -x CMD [ARGS]  Run the command line with VC variables and return
 echo   -X             Display the actual vcvars command to run, but don't run it
 echo.
-echo Archi:           Target architecture. Default: x86
+echo Args:            vcvarsall.bat arguments
+echo   help           Display vcvarsall.bat usage
+echo                  Target architecture. Default: x86. Common values:
 echo   x86            32-bits x86
 echo   ia64           64-bits IA64
 echo   amd64          64-bits x86
@@ -154,7 +165,7 @@
 set "ECHO.V=rem"
 set "ECHOVARS.V=rem"
 set "ECHO.MSVCVARS=rem"
-set "ARCHI="
+set "VCVARS_ARGS="
 set "NOEXEC=0"
 goto get_args

@@ -165,12 +176,12 @@
 if .%1.==.-?. goto help
 if .%1.==./?. goto help
 if .%1.==.-h. goto help
+if .%1.==.-l. call :findvc32 ALL & (for %%v in (!ALL!) do echo %%~v) & exit /b
 if .%1.==.-v. set "ECHO.V=call :echo" & set "ECHOVARS.V=call :echo.vars" & set "ECHO.MSVCVARS=call :echo.msvcvars" & goto next_arg
 if .%1.==.-V. echo %VERSION% & exit /b 0
 if .%1.==.-x. shift & goto exec_cmd
 if .%1.==.-X. set "NOEXEC=1" & goto next_arg
-if "%ARCHI%"=="" set "ARCHI=%1" & goto next_arg
->&2 echo Warning: Unexpected argument %1 ignored
+set ^"VCVARS_ARGS=!VCVARS_ARGS! %1^"
 goto next_arg

 :go
@@ -194,10 +205,10 @@
 )

 :# Visual Studio 2017 and later require the ARCHI parameter
-if not "%VCVARSDIR%"=="%VC%" if "%ARCHI%"=="" set "ARCHI=x86"
+if not "%VCVARSDIR%"=="%VC%" if "%VCVARS_ARGS%"=="" set "VCVARS_ARGS=x86"

 :# Generate the final command
-set CMD=call "%VCVARSDIR%\vcvarsall.bat" %ARCHI%
+set CMD=call "%VCVARSDIR%\vcvarsall.bat" !VCVARS_ARGS!
 if "%NOEXEC%"=="1" (
   echo %CMD%
   exit /b 0


Exclude TCGAbiolinks from revdep checks as takes too long (currently >1hr)

--- CRAN_Release.cmd
+++ CRAN_Release.cmd
@@ -378,6 +378,8 @@

 avail = available.packages(repos=biocinstallRepos())   # includes CRAN at the end from getOption("repos")
 deps = tools::package_dependencies("data.table", db=avail, which="most", reverse=TRUE, recursive=FALSE)[[1]]
+exclude = c("TCGAbiolinks")   # takes loo long: https://github.com/BioinformaticsFMRP/TCGAbiolinks/issues/240
+deps = deps[-match(exclude, deps)]
 table(avail[deps,"Repository"])
 length(deps)
 old = 0
@@ -404,7 +406,7 @@
   }
 }
 cat("New downloaded:",new," Already had latest:", old, " TOTAL:", length(deps), "\n")
-table(avail[deps,"Repository"])
+length(deps)

 # Remove the tar.gz no longer needed :
 system("ls *.tar.gz | wc -l")
@@ -424,6 +426,7 @@
   }
 }
 system("ls *.tar.gz | wc -l")
+length(deps)

 status = function(which="both") {
   if (which=="both") {
@@ -513,7 +516,7 @@

 # ** ensure latest version installed into revdeplib **
 system("R CMD INSTALL ~/GitHub/data.table/data.table_1.11.5.tar.gz")
-run()
+run("rerun.all")

 out = function(fnam="~/fail.log") {
   x = c(.fail.cran, .fail.bioc)


-Build

-Build

--- Build/runbuild.cmd
+++ Build/runbuild.cmd
@@ -1,5 +1,5 @@
 cls
-powershell -Command "& { [Console]::WindowWidth = 150; [Console]::WindowHeight = 50; Start-Transcript %~dp0runbuild.txt; Import-Module %~dp0..\Tools\PSake\psake.psm1; Invoke-psake %~dp0..\Build\build.ps1 %*; Stop-Transcript; }"
+powershell -Command "& { [Console]::WindowWidth = 150; [Console]::WindowHeight = 50; Start-Transcript %~dp0runbuild.txt; Import-Module %~dp0..\Tools\PSake\psake.psm1; Invoke-psake %~dp0..\Build\build.ps1 %*; Stop-Transcript; exit !($psake.build_success); }"

 ECHO %ERRORLEVEL%
 EXIT /B %ERRORLEVEL%


make a git clean before nuget restore

make a git clean before nuget restore

--- NugetRestore.cmd
+++ NugetRestore.cmd
@@ -1,2 +1,3 @@
+git clean -fx -d
 mkdir Artifacts
 .\.nuget\nuget restore Mapsui.sln


Add compilation for various configuration and feature selections (issue #118)

Omit macros min(), max() via -DNOMINMAX

--- test/t-all.bat
+++ test/t-all.bat
@@ -1,7 +1,6 @@
 @echo off & setlocal enableextensions enabledelayedexpansion
 ::
-:: t-all.bat - perform tests with varying contract violation response,
-::             span index type and C++ standard (MSVC).
+:: t-all.bat - perform tests with varying contract violation response, features, span index type and C++ standard (MSVC).
 ::

 set log=%0.log
@@ -10,9 +9,32 @@
 set /a compiler_version=0
 call :CompilerVersion compiler_version

-set    cvResponses=gsl_CONFIG_CONTRACT_VIOLATION_THROWS gsl_CONFIG_CONTRACT_VIOLATION_TERMINATES
-set spanIndexTypes=std::size_t std::ptrdiff_t
-set   cppStandards=c++14 c++latest
+set cvResponses=^
+    gsl_CONFIG_CONTRACT_VIOLATION_THROWS ^
+    gsl_CONFIG_CONTRACT_VIOLATION_TERMINATES
+
+set spanIndexTypes=^
+    std::size_t
+    std::ptrdiff_t
+
+set gslFeatures=^
+    "gsl_CONFIG_DEPRECATE_TO_LEVEL=0" ^
+    "gsl_CONFIG_DEPRECATE_TO_LEVEL=1" ^
+    "gsl_CONFIG_DEPRECATE_TO_LEVEL=2" ^
+    "gsl_CONFIG_DEPRECATE_TO_LEVEL=3" ^
+    "gsl_CONFIG_DEPRECATE_TO_LEVEL=4" ^
+    "gsl_CONFIG_DEPRECATE_TO_LEVEL=5" ^
+    "gsl_CONFIG_DEPRECATE_TO_LEVEL=99" ^
+    "gsl_FEATURE_WITH_CONTAINER_TO_STD=0" ^
+    "gsl_FEATURE_MAKE_SPAN_TO_STD=0" ^
+    "gsl_FEATURE_BYTE_SPAN_TO_STD=0" ^
+    "gsl_FEATURE_HAVE_IMPLICIT_MACRO=0" ^
+    "gsl_FEATURE_HAVE_OWNER_MACRO=0" ^
+    "gsl_FEATURE_EXPERIMENTAL_RETURN_GUARD=1"
+
+set cppStandards=^
+    c++14 ^
+    c++latest

 set CppCoreCheckInclude=%VCINSTALLDIR%\Auxiliary\VS\include

@@ -24,7 +46,13 @@
 :ForAllCombinations
 :ForContractViolationResponse
 for %%r in ( %cvResponses% ) do (
-    call :ForSpanIndexType -D%%r
+    call :ForGslFeature -D%%r
+)
+goto :EOF
+
+:ForGslFeature  contractViolationResponse
+for %%i in ( %gslFeatures% ) do (
+    call :ForSpanIndexType %* "-D%%i"
 )
 goto :EOF

@@ -45,7 +73,7 @@

 :CompileLog  contractViolationResponse spanIndexSize [CppStd]
 echo VC%compiler_version%: %*
-call :Compile >> %log%  2>&1
+call :Compile %* >> %log%  2>&1
 if errorlevel 1 (
     less %log% & goto :EOF
 ) else (
@@ -55,8 +83,8 @@
 goto :EOF

 :Compile  contractViolationResponse spanIndexSize [CppStd]
-call t.bat %*
-set compile=cl -EHsc -I../include -I"%CppCoreCheckInclude%" %args% -Dgsl_FEATURE_EXPERIMENTAL_RETURN_GUARD -Dgsl_CONFIG_CONTRACT_VIOLATION_THROWS gsl-lite.t.cpp assert.t.cpp at.t.cpp byte.t.cpp issue.t.cpp not_null.t.cpp owner.t.cpp span.t.cpp string_span.t.cpp util.t.cpp
+set args=%*
+set compile=cl -EHsc -I../include -I"%CppCoreCheckInclude%" %args% -DNOMINMAX gsl-lite.t.cpp assert.t.cpp at.t.cpp byte.t.cpp issue.t.cpp not_null.t.cpp owner.t.cpp span.t.cpp string_span.t.cpp util.t.cpp
 echo %compile% && %compile%
 goto :EOF


set executable bit on update_rev.bat

set executable bit on update_rev.bat


Update bld.bat

Update bld.bat

--- libboost-python/bld.bat
+++ libboost-python/bld.bat
@@ -14,7 +14,7 @@
 IF errorlevel 1 exit 1
 set PATH=%PATH%;%SRC_DIR%\b2_for_mingw\bin
 IF errorlevel 1 exit 1
-ECHO b2 toolset=gcc --build-type=complete stage ^
+ECHO b2 install toolset=gcc --build-type=complete stage ^
         --build-dir=buildboost ^
         --prefix=%LIBRARY_PREFIX% ^
         address-model=%ARCH% ^
@@ -25,7 +25,7 @@
         -s ZLIB_INCLUDE="%LIBRARY_INC%" ^
         -s ZLIB_LIBPATH="%LIBRARY_LIB%" ^
         --with-python
-CALL b2 toolset=gcc ^
+CALL b2 install toolset=gcc ^
         address-model=%ARCH% ^
         variant=release ^
         threading=multi ^


Create JenkinsVCBuild.bat

Create JenkinsVCBuild.bat

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

--- JenkinsVCBuild.bat
+++ JenkinsVCBuild.bat
@@ -0,0 +1,198 @@
+@echo off
+setlocal EnableDelayedExpansion
+
+:: This script requires PROJECT_NAME
+if not defined PROJECT_NAME echo ERROR: PROJECT_NAME not specified.& endlocal & exit /b 1
+
+:: Default to x86, Visual Studio 2013, and no Klocwork
+call :Expand VCARC !VCARC! x86
+call :Expand VCVER !VCVER! 120
+call :Expand KLOCWORK !KLOCWORK! NO
+
+:: Setup the Visual Studio Environment
+if "!VCVER!"=="90" call "%ProgramFiles(x86)%\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" !VCARC! && goto Build
+if "!VCVER!"=="100" call "%ProgramFiles(x86)%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" !VCARC! && goto Build
+::if "!VCVER!"=="110" call "%ProgramFiles(x86)%\Microsoft Visual Studio 11.0\VC\vcvarsall.bat" !VCARC! && goto Build
+if "!VCVER!"=="120" call "%ProgramFiles(x86)%\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" !VCARC! && goto Build
+echo Error: Unknown version of Visual Studio specified. VCVER=!VCVER!
+echo Supported versions include 90, 100, and 120.
+endlocal & exit /b 1
+
+:Build
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: Setup Environment Variables
+call :Expand INCLUDE "!VCINCLUDE!;!INCLUDE!;"
+call :Expand LIB "!VCLIB!;!LIB!;"
+call :Expand LIBPATH "!VCREFERENCE!;!LIBPATH!;"
+call :Expand PATH "!VCPATH!;!PATH!;"
+call :Expand DPATH "!PATH!;"
+call :TidyList INCLUDE
+call :TidyList LIB
+call :TidyList LIBPATH
+call :TidyList PATH
+call :TidyList DPATH
+
+:: Determine Tools Version
+set "ToolsVersion="
+if "!VCVER!"=="90" goto VCPROJ
+if "!VCVER!"=="100" call :Expand ToolsVersion 4.0
+if "!VCVER!"=="110" call :Expand ToolsVersion 11.0
+if "!VCVER!"=="120" call :Expand ToolsVersion 12.0
+goto VCXPROJ
+
+:VCXPROJ
+@echo on
+MSBuild "%PROJECT_NAME%.vcxproj" /ToolsVersion:%ToolsVersion% /p:PlatformToolset=v%VCVER% /p:Configuration=Release /p:OutDir=Release\ /p:IntDir=Release\ /p:IncludePath=\"%INCLUDE%;\" /p:LibraryPath=\"%LIB%;\" /p:ReferencePath=\"%LIBPATH%;\" || @goto End
+@echo off
+goto BuildDebug
+
+:VCPROJ
+@echo on
+VCBuild /time /useenv "%PROJECT_NAME%.vcproj" "Release" || @goto End
+@echo off
+goto BuildDebug
+
+
+:BuildDebug
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: Setup Debug Environment Variables
+call :Expand INCLUDE "!VCINCLUDED!;!INCLUDE!;"
+call :Expand LIB "!VCLIBD!;!LIB!;"
+call :Expand LIBPATH "!VCREFERENCED!;!LIBPATH!;"
+call :Expand PATH "!VCPATHD!;!PATH!;"
+call :Expand DPATH "!PATH!;"
+call :TidyList INCLUDE
+call :TidyList LIB
+call :TidyList LIBPATH
+call :TidyList PATH
+call :TidyList DPATH
+
+:: Determine Tools Version
+if "!VCVER!"=="90" goto VCPROJD
+goto VCXPROJD
+
+:VCXPROJD
+@echo on
+MSBuild "%PROJECT_NAME%.vcxproj" /ToolsVersion:%ToolsVersion% /p:PlatformToolset=v%VCVER% /p:Configuration=Debug /p:OutDir=Debug\ /p:IntDir=Debug\ /p:IncludePath=\"%INCLUDE%;\" /p:LibraryPath=\"%LIB%;\" /p:ReferencePath=\"%LIBPATH%;\" || @goto End
+@echo off
+goto BuildKlocwork
+
+:VCPROJD
+@echo on
+VCBuild /time /useenv "%PROJECT_NAME%.vcproj" "Debug" || @goto End
+@echo off
+goto BuildKlocwork
+
+
+:BuildKlocwork
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: Check for Klocwork Flag
+if not defined Klocwork goto End
+if /i not "%Klocwork:~0,1%"=="y" goto End
+echo Running Klocwork Analysis...
+
+:: Setup Klocwork Environment
+set "Path=C:\Klocwork\Insight 10.0 Command Line\bin;%Path%"
+set "Rebuild="
+
+:: Create Local Klocwork Project
+kwcheck create --url http://ipklocworkdb:80/FrontEnd_VC 2>nul
+::kwcheck create --license-host ipvmfactorylic4 --license-port 27000
+
+:: Sync Server Project
+::kwcheck sync
+
+:: Display Configuration
+kwcheck info
+
+:: Checkout Nursing's Klocwork Rule Set
+::svn checkout http://scm.nursing.cerner.corp/svn/vcdev/trunk/tools/Klocwork Klocwork
+
+:: Import Nursing's Klocwork Rule Set
+::kwcheck import Klocwork\generated.kb
+::kwcheck import Klocwork\statNPD.kb
+::kwcheck import Klocwork\metrics_default.mconf
+::kwcheck import Klocwork\analysis_profile.pconf
+::kwcheck import Klocwork\Stability_taxonomy.tconf
+::echo f|xcopy Klocwork\configuration.txt .kwlp\configuration.txt /R /Y
+
+:: Determine Tools Version
+if "!VCVER!"=="90" goto VCPROJK
+goto VCXPROJK
+
+:VCXPROJK
+@echo on
+kwinject MSBuild "%PROJECT_NAME%.vcxproj" /nr:false /ToolsVersion:%ToolsVersion% /t:Rebuild /p:PlatformToolset=v%VCVER% /p:Configuration=Debug /p:OutDir=Debug\ /p:IntDir=Debug\ /p:IncludePath=\"%INCLUDE%;\" /p:LibraryPath=\"%LIB%;\" /p:ReferencePath=\"%LIBPATH%;\" || @goto End
+@echo off
+goto RunKlocwork
+
+:VCPROJK
+@echo on
+kwinject VCBuild /time /useenv "%PROJECT_NAME%.vcproj" "Debug" || @goto End
+@echo off
+goto RunKlocwork
+
+
+:RunKlocwork
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: Run the Analysis
+if /i "%Klocwork:~-7%"=="rebuild" set "Rebuild=--rebuild"
+kwcheck run %Rebuild% -b kwinject.out || goto End
+
+:: Generate the Report
+kwcheck list -F xml --report KlocworkReport.xml || goto End
+echo Klockwork Analysis succeeded.
+goto End
+
+
+:End
+echo.
+echo Build Exit Code = %ErrorLevel%
+@echo on & @endlocal & @exit /b %ErrorLevel%
+
+
+::: Alternative Build Commands
+:: 90
+:: devenv "%PROJECT_NAME%.vcproj" /Build "Release" /useenv
+:: 100+
+:: devenv "%PROJECT_NAME%.vcxproj" /Build "Release" /useenv
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: Routines
+
+:: Remove Excess Backslashes, Semicolons, and Duplicates
+:TidyList <ListVar>
+if not defined %~1 = exit /b 1
+call :Expand "%~1" "%%%~1:;;=;%%"
+call :Expand "%~1" "%%%~1:\\=\%%"
+call :Expand "%~1" "%%%~1:\\=\%%"
+call :Expand "%~1" "%%%~1:\;=;%%"
+call :RemoveDuplicates %1
+call :Expand "%~1" "%%%~1:;;=;%%"
+call :CheckList %1
+exit /b %ErrorLevel%
+
+
+:: Remove Duplicate Entries from a List
+:RemoveDuplicates <ListVar>
+setlocal EnableDelayedExpansion
+call :Expand List "%%%~1%%" || exit /b 1
+set "Tsil="
+for %%A in ("%List:;=" "%") do if not "%%~A"=="" set "Tsil=%%~A;!Tsil!"
+for %%A in ("%Tsil:;=" "%") do if not "%%~A"=="" set "List=%%~A;!List:%%~A;=!"
+endlocal & set "%~1=%List%"
+exit /b 0
+
+
+:: Check the List for Invalid Paths
+:CheckList <ListVar>
+setlocal EnableDelayedExpansion
+call :Expand List "%%%~1%%" || exit /b 1
+for %%A in ("%List:;=" "%") do if not exist "%%~fA\" echo WARNING: "%%~A" not found.
+endlocal & exit /b 0
+
+
+:: Variable Expansion and Validation Routine
+:Expand <Var> [Value] [Default]
+2>nul set "%~1=%~2"
+if defined %~1 = exit /b 0
+exit /b 1


Macherie

Macherie

--- DevTools/vv.bat
+++ DevTools/vv.bat
@@ -1 +0,0 @@
-CD /D C:\Dev\Annex\Violet


Updated script to build msi package

Updated script to build msi package

--- Setup/BuildMsi.bat
+++ Setup/BuildMsi.bat
@@ -1,3 +1,3 @@
-for /f "delims=" %%i in ('"C:\Program Files (x86)\Windows Kits\8.1\bin\x64\uuidgen.exe"') do set output=%%i
-"C:\Program Files (x86)\WiX Toolset v3.9\bin\candle.exe" Influx-Capacitor.wsx -dEnvironment="Release" -dVersion="1.0.8" -dId="%output%"
+for /f "delims=" %%i in ('"C:\Program Files (x86)\Windows Kits\8.1\bin\x64\uuidgen.exe"') do set guid=%%i
+"C:\Program Files (x86)\WiX Toolset v3.9\bin\candle.exe" Influx-Capacitor.wsx -dEnvironment="%2" -dVersion="%1" -dId="%guid%"
 "C:\Program Files (x86)\WiX Toolset v3.9\bin\light.exe" -ext WixUIExtension -cultures:en-us Influx-Capacitor.wixobj


Delete BatchAttend.bat

Delete BatchAttend.bat

Old file - not needed

--- BatchAttend.bat
+++ BatchAttend.bat
@@ -1,18 +0,0 @@
-cd C:\Users\Elaine\Documents\BKL\Lowell\2016-2017\TableauFormat
-del Enrollment.csv
-del ProcessedAttend.csv
-del ProcessedEnroll.csv
-del DistrictAttend.csv
-del PublicAttend.csv
-
-cd C:\Users\Elaine\Documents\BKL\Lowell\2016-2017\Scripts
-python EnrollTableCreate.py
-python ProcessAttendance.py
-python ProcessEnrollment.py
-
-cd C:\Users\Elaine\Documents\BKL\Lowell\2016-2017\TableauFormat
-type ProcessedAttend.csv, ProcessedEnroll.csv > DistrictAttend.csv
-
-cd C:\Users\Elaine\Documents\BKL\Lowell\2016-2017\Scripts
-python ProcPublicView.py
-python ProcStudentView.py


updated backup script for T1

updated backup script for T1

--- EiMbackupT1.cmd
+++ EiMbackupT1.cmd
@@ -2,8 +2,11 @@

 @echo off

-:: Folder with data files
+:: Folder with bio files
 set dataFolder="C:\eim\EiMpatch\data"
+
+:: Folder with trial files
+set trialFolder="C:\eim\trials"

 :: Destination folder
 set backupFolder="C:\Google Drive\T1"
@@ -18,11 +21,14 @@

 echo Month:[%mm%]  Day:[%dd%]  Year:[%yyyy%]
 mkdir %backupFolder%\EiM_%yyyy%-%mm%-%dd%
-echo Copying EiM files...
+echo Copying EiM bio files...
 xcopy /C /Y /S %dataFolder% %backupFolder%\EiM_%yyyy%-%mm%-%dd%
+echo Copying EiM trial files...
+xcopy /C /Y /S %trialFolder% %backupFolder%\EiM_%yyyy%-%mm%-%dd%

 IF %deleteFlag% EQU 1 (
 echo Deleting source files...
 del /Q %dataFolder%
+del /Q %trialFolder%
 )
 ::pause


Swapped VS2017 preference order

Swapped VS2017 preference order

--- build/VS_scripts/build.generic.cmd
+++ build/VS_scripts/build.generic.cmd
@@ -38,9 +38,9 @@
 IF %msbuild_version% == VS2017Professional SET msbuild=%msbuild_vs2017professional%
 IF %msbuild_version% == VS2017Enterprise SET msbuild=%msbuild_vs2017enterprise%
 IF %msbuild_version% == VS2017 (
+	IF EXIST %msbuild_vs2017community% SET msbuild=%msbuild_vs2017community%
+	IF EXIST %msbuild_vs2017professional% SET msbuild=%msbuild_vs2017professional%
 	IF EXIST %msbuild_vs2017enterprise% SET msbuild=%msbuild_vs2017enterprise%
-	IF EXIST %msbuild_vs2017professional% SET msbuild=%msbuild_vs2017professional%
-	IF EXIST %msbuild_vs2017community% SET msbuild=%msbuild_vs2017community%
 )

 SET project="%~p0\..\VS2010\zstd.sln"


Batch: Added FPC, DPA query in batch

Batch: Added FPC, DPA query in batch

--- SQL-Script-2.0.0/install-with-sample.bat
+++ SQL-Script-2.0.0/install-with-sample.bat
@@ -5,7 +5,9 @@
 SQLCMD -S %1 -U %2 -P %3 -d %4 -i ./script/sspBatchDARPU.sql
 SQLCMD -S %1 -U %2 -P %3 -d %4 -i ./script/sspBatchDAU.sql
 SQLCMD -S %1 -U %2 -P %3 -d %4 -i ./script/sspBatchDormant.sql
+SQLCMD -S %1 -U %2 -P %3 -d %4 -i ./script/sspBatchDPA.sql
 SQLCMD -S %1 -U %2 -P %3 -d %4 -i ./script/sspBatchDPU.sql
+SQLCMD -S %1 -U %2 -P %3 -d %4 -i ./script/sspBatchFPC.sql
 SQLCMD -S %1 -U %2 -P %3 -d %4 -i ./script/sspBatchFPU.sql
 SQLCMD -S %1 -U %2 -P %3 -d %4 -i ./script/sspBatchHAU.sql
 SQLCMD -S %1 -U %2 -P %3 -d %4 -i ./script/sspBarchMAU.sql


Minimal example: windows .bat file fix

Minimal example: windows .bat file fix

--- Minimal/project/dist/startApplication.bat
+++ Minimal/project/dist/startApplication.bat
@@ -1 +1 @@
-java -javaagent:../lib/instrumentation-agent.jar -jar minimal-app.jar start
+java -javaagent:../lib/instrumentation-agent.jar -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=9010 -Dcom.sun.management.jmxremote.local.only=false -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -jar minimal-app.jar start


Complain if environment variable LOCALHOSTIP doesn't specify the local network ip address.

--- bin/drawnio.bat
+++ bin/drawnio.bat
@@ -6,6 +6,8 @@
 set JAVA_OPTS=
 if -debug==%1 set JAVA_OPTS=-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_shmem,server=y,suspend=y,address=jgc1

+if "%LOCALHOSTIP%"=="" echo Warning: You should set environment variable 'LOCALHOSTIP' to your local ip address before running this script.
+if "%LOCALHOSTIP%"=="" set LOCALHOSTIP=192.168.1.103

 @echo on
-java -classpath %CPATH% %JAVA_OPTS% org.jgroups.demos.Draw -props c:\jboss\JGroups\conf\tcp-nio.xml+java -classpath %CPATH% %JAVA_OPTS% -Djgroups.bind_addr=%LOCALHOSTIP% -Djgroups.tcpping.initial_hosts=%LOCALHOSTIP%[7800],%LOCALHOSTIP%[7801] org.jgroups.demos.Draw -props c:\jboss\JGroups\conf\tcp-nio.xml


Update scripts [skip ci]

Update scripts [skip ci]

--- bin/script/win/deploy.bat
+++ bin/script/win/deploy.bat
@@ -1,7 +1,11 @@
 echo ON

-rmdir %CONDA_PREFIX%\conda-bld\src_cache
-rmdir %CONDA_PREFIX%\conda-bld\broken
+:: activate
+:: if errorlevel 1 exit 1
+
+rmdir %CONDA_PREFIX%\conda-bld\src_cache /S /q
+rmdir %CONDA_PREFIX%\conda-bld\broken /S /q
+
 for /R %%i in ("%CONDA_PREFIX%\conda-bld\*.tar.bz2") do (
     anaconda upload %%i -u %ANACONDA_UPLOAD% --label win-release
     if errorlevel 1 exit 1


commit on 06/06/2018 at 13:37:46

commit on 06/06/2018 at 13:37:46

--- ansys-APDL/transverseCrack.cmd
+++ ansys-APDL/transverseCrack.cmd
@@ -247,8 +247,8 @@
 *GET,NNodes,NODE,0,COUNT                  !Get the number of nodes in the selected set
 *DIM, CrackDisps, ARRAY, NNodes, 11
 *VGET, CrackDisps(1,1), NODE, , NLIST
-*VGET, CrackDisps(1,2), NODE, 1, LOC, Y
-*VGET, CrackDisps(1,3), NODE, 1, LOC, X
+*VGET, CrackDisps(1,2), NODE, 1, LOC, X
+*VGET, CrackDisps(1,3), NODE, 1, LOC, Y
 *VGET, CrackDisps(1,4), NODE, 1, U, X
 *VGET, CrackDisps(1,5), NODE, 1, U, Y
 *VGET, CrackDisps(1,6), NODE, 1, S, X
@@ -263,17 +263,17 @@
 !*MOPER, CrackDisps, UnCrackDisps, SORT, , 3, 1

 *CFOPEN, CFFileCoordDisp, csv
-*VWRITE, 'NODE',' LABEL,',' X',' [mm],',' Z',' [mm],',' UX',' [mm],',' UZ',' [mm]'
+*VWRITE, 'NODE','LABEL,','X','[mm],','Z','[mm],','UX','[mm],','UZ','[mm]'
 (A,A,A,A,A,A,A,A,A)
-*VWRITE, CrackDisps(1,1), ', ', CrackDisps(1,2), ', ', CrackDisps(1,3), ', ', CrackDisps(1,4), ', ', CrackDisps(1,5)
-(F12.8,A2,F12.8,A2,F12.8,A2,F12.8,A2,F12.8)
+*VWRITE, CrackDisps(1,1), ',', CrackDisps(1,2), ',', CrackDisps(1,3), ',', CrackDisps(1,4), ',', CrackDisps(1,5)
+(I5,A2,F12.8,A2,F12.8,A2,F12.8,A2,F12.8)
 *CFCLOS

 *CFOPEN, CFFileStressStrain, csv
 *VWRITE, 'NODE LABEL, SX [MPa], SZ [MPa], SXZ [MPa], EX [-], EZ [-], EXZ [-]'
 (A80)
 *VWRITE, CrackDisps(1,1), ', ', CrackDisps(1,6), ', ', CrackDisps(1,7), ', ', CrackDisps(1,8), ', ', CrackDisps(1,9), ', ', CrackDisps(1,10), ', ', CrackDisps(1,11)
-(F12.8,A2,F12.8,A2,F12.8,A2,F12.8,A2,F12.8,A2,F12.8,A2,F12.8)
+(I5,A2,F12.8,A2,F12.8,A2,F12.8,A2,F12.8,A2,F12.8,A2,F12.8)
 *CFCLOS

 /EOF


Adds a pause after build succeeds and when not running on the build server

--- build/Build.bat
+++ build/Build.bat
@@ -83,6 +83,7 @@
 ECHO No errors were detected!
 ECHO There may still be some in the output, which you would need to investigate.
 ECHO Warnings are usually normal.
+IF isci NEQ 1 PAUSE
 GOTO :EOF

 :error


by zhanyi

by zhanyi

--- build/merge.bat
+++ build/merge.bat
@@ -1,6 +1,7 @@
 java -jar js.jar ueditor_css_all.js ../themes/default/ ../themes/default/css/ueditor.css

 java -jar js.jar ueditor_js_all.js ../ ../ueditor.all.js
-java -jar yuicompressor-2.4.6.jar --nomunge --preserve-semi  --disable-optimizations --charset utf-8 ../ueditor.all.js -o ../ueditor.all.min.js
+java -jar compiler.jar --compilation_level ADVANCED_OPTIMIZATIONS --js ../ueditor.all.js --js_output_file ../ueditor.all.min.js

+


Fix the web site build script

Fix the web site build script

--- build/buildweb.bat
+++ build/buildweb.bat
@@ -2,7 +2,7 @@

 if "%1" == "" (
   echo Usage: buildweb output-directory
-  echo e.g. buildweb c:\users\jon\nodatime.org
+  echo e.g. buildweb c:\users\jon\NodaTime\nodatime.org
   echo It is expected that the output directory already exists and is
   echo set up for git...
   goto end
@@ -54,8 +54,7 @@

 :build_mvc
 pushd ..\src\NodaTime.Web
-REM Assume NuGet restore has already taken place
-REM nuget restore -PackagesDirectory ..\packages
+call nuget restore -PackagesDirectory ..\packages
 IF ERRORLEVEL 1 EXIT /B 1
 REM Build and deploy NodaTime.Web.dll.  See #359 for why we're suppressing PDB
 REM generation.


Runs Scintilla tests after first build.

Runs Scintilla tests after first build.

--- scripts/checkbuilds.bat
+++ scripts/checkbuilds.bat
@@ -22,6 +22,10 @@
 set INCLUDE=%BORLAND_BASE%\include
 make -f scintilla.mak QUIET=1
 if ERRORLEVEL 2 goto ERROR
+cd ..\test
+pythonw simpleTests.py
+pythonw lexTests.py
+pythonw performanceTests.py
 cd ..\..\scite\win32
 make -f scite.mak QUIET=1
 if ERRORLEVEL 2 goto ERROR


embed install dotnet4.ps1 in bat

embed install dotnet4.ps1 in bat

--- scripts/installnet4.bat
+++ scripts/installnet4.bat
@@ -1,4 +1,60 @@
-echo Downloading DotNet 4
-powershell -NoProfile -ExecutionPolicy unrestricted -Command "(New-Object System.Net.WebClient).DownloadFile('http://download.microsoft.com/download/5/6/2/562A10F9-C9F4-4313-A044-9C94E0A8FAC8/dotNetFx40_Client_x86_x64.exe', 'C:\Windows\Temp\dotNetFx40.exe')" <NUL
-echo Installing DotNet 4
-C:\Windows\Temp\dotNetFx40.exe /q /norestart /repair >nul 2>&1
+@@echo off
+:CheckPowerShellExecutionPolicy
+@@FOR /F "tokens=*" %%i IN ('powershell -noprofile -command Get-ExecutionPolicy') DO Set PSExecMode=%%i
+@@if /I "%PSExecMode%"=="unrestricted" goto :RunPowerShellScript
+@@if /I "%PSExecMode%"=="remotesigned" goto :RunPowerShellScript
+
+@@NET FILE 1>NUL 2>NUL
+@@if not "%ERRORLEVEL%"=="0" (
+@@echo Elevation required to change PowerShell execution policy from [%PSExecMode%] to RemoteSigned
+@@powershell -NoProfile -Command "start-process -Wait -Verb 'RunAs' -FilePath 'powershell.exe' -ArgumentList '-NoProfile Set-ExecutionPolicy RemoteSigned'"
+@@) else (
+@@powershell -NoProfile Set-ExecutionPolicy RemoteSigned
+@@)
+
+:RunPowerShellScript
+@@set POWERSHELL_BAT_ARGS=%*
+@@if defined POWERSHELL_BAT_ARGS set POWERSHELL_BAT_ARGS=%POWERSHELL_BAT_ARGS:"=\"%
+@@PowerShell -Command Invoke-Expression $('$args=@(^&{$args} %POWERSHELL_BAT_ARGS%);'+[String]::Join([Environment]::NewLine,$((Get-Content '%~f0') -notmatch '^^@@^|^^:'))) & goto :EOF
+
+{
+# Start PowerShell
+$NetFx4ClientUrl = 'http://download.microsoft.com/download/5/6/2/562A10F9-C9F4-4313-A044-9C94E0A8FAC8/dotNetFx40_Client_x86_x64.exe'
+$NetFx4FullUrl = 'http://download.microsoft.com/download/9/5/A/95A9616B-7A37-4AF6-BC36-D6EA96C8DAAE/dotNetFx40_Full_x86_x64.exe'
+$NetFx4Path = 'c:\vagrant\resources\NetFx4'
+$NetFx4InstallerFile = 'dotNetFx40.exe'
+$NetFx4Installer = Join-Path $NetFx4Path $NetFx4InstallerFile
+
+function Is64Bit { [IntPtr]::Size -eq 8 }
+
+function Enable-Net40 {
+    if(Is64Bit) {$fx="framework64"} else {$fx="framework"}
+    if(!(test-path "$env:windir\Microsoft.Net\$fx\v4.0.30319")) {
+        if (!(Test-Path $NetFx4Path)) {
+          Write-Host "Creating folder `'$NetFx4Path`'"
+          $null = New-Item -Path "$NetFx4Path" -ItemType Directory
+        }
+
+        if (!(Test-Path $NetFx4Installer)) {
+            Write-Host "Downloading `'$NetFx4ClientUrl`' to `'$NetFx4Installer`'"
+            (New-Object Net.WebClient).DownloadFile("$NetFx4ClientUrl","$NetFx4Installer")
+        }
+
+        $psi = New-Object System.Diagnostics.ProcessStartInfo
+        $psi.WorkingDirectory = "$NetFx4Path"
+        $psi.FileName = "$NetFx4InstallerFile"
+        $psi.Arguments = "/q /norestart /repair /log `'$NetFx4Path\NetFx4Install.log`'"
+        #$psi.WindowStyle = [System.Diagnostics.ProcessWindowStyle]::Minimized;
+
+        Write-Host "Installing `'$NetFx4Installer`'"
+        $s = [System.Diagnostics.Process]::Start($psi);
+        $s.WaitForExit();
+        # if ($s.ExitCode -ne 0) {
+        # Write-Error ".NET Framework install failed with exit code `'$($s.ExitCode)`'."
+        # }
+    }
+}
+
+Enable-Net40
+# End PowerShell
+}.Invoke($args)


Trying to get the Windows Github workflow working

--- installer/windows/create_installer.bat
+++ installer/windows/create_installer.bat
@@ -10,12 +10,12 @@
 SETLOCAL

 if exist "%programfiles(x86)%\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" (
-    call "%programfiles(x86)%\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" x64 %WIN_SDK% -vcvars_ver=14.29
+    call "%programfiles(x86)%\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" x64 -vcvars_ver=14.29
 ) else (
     if exist "%programfiles(x86)%\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" (
-        call "%programfiles(x86)%\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64 %WIN_SDK% -vcvars_ver=14.29
+        call "%programfiles(x86)%\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64 -vcvars_ver=14.29
     ) else (
-        call "%programfiles(x86)%\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x64 %WIN_SDK% -vcvars_ver=14.29
+        call "%programfiles(x86)%\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x64 -vcvars_ver=14.29
     )
 )


ImpressCMS/DevBox-Ubuntu

ImpressCMS/DevBox-Ubuntu

--- virtualbox2hyperv.bat
+++ virtualbox2hyperv.bat
@@ -8,7 +8,7 @@
 echo "Searching for version of the box..."
 for /f "delims=^" %%i in ('vagrant box list') do (
 	for /f "tokens=1,2,3" %%a in ("%%i") do (
-	   if "%%a" == "MekDrop/ImpressCMS-DevBox" if "%%b" == "(virtualbox," (
+	   if "%%a" == "ImpressCMS/DevBox-Ubuntu" if "%%b" == "(virtualbox," (
 		set found_version=%%c
 		goto found_version
 	   )


Adding cmd script to prepare windows build with buildbot.

--- win_prepare_build.cmd
+++ win_prepare_build.cmd
@@ -21,4 +21,4 @@
 if exist Makefile. (
 mingw32-make distclean
 )
-qmake -spec win32-g++ "CONFIG+=release %PKTH_Conf%" DEFINES+=BOOST_USE_WINDOWS_H pokerth.pro
+qmake "CONFIG+=release %PKTH_Conf%" DEFINES+=BOOST_USE_WINDOWS_H pokerth.pro


Fixed boots version info in the script. Removed regex lib fife dont need it anymore

--- build/appveyor/copy-boost-to-includes.bat
+++ build/appveyor/copy-boost-to-includes.bat
@@ -10,14 +10,12 @@
 xcopy /Y /S "C:\Libraries\boost_1_65_1\boost" "C:\projects\fifengine-dependencies\includes\include\boost" >nul 2>&1

 :: copy binaries (dlls) and libs
-copy "C:\Libraries\boost_1_65_1\lib32-msvc-14.1\boost_filesystem-vc141-mt-1_65.dll" "C:\projects\fifengine-dependencies\includes\bin\boost_filesystem-vc141-mt-1_65.dll"
-copy "C:\Libraries\boost_1_65_1\lib32-msvc-14.1\boost_system-vc141-mt-1_65.dll" "C:\projects\fifengine-dependencies\includes\bin\boost_system-vc141-mt-1_65.dll"
-copy "C:\Libraries\boost_1_65_1\lib32-msvc-14.1\boost_regex-vc141-mt-1_65.dll" "C:\projects\fifengine-dependencies\includes\bin\boost_regex-vc141-mt-1_65.dll"
-copy "C:\Libraries\boost_1_65_1\lib32-msvc-14.1\boost_python-vc141-mt-1_65.dll" "C:\projects\fifengine-dependencies\includes\bin\boost_regex-vc141-mt-1_65.dll"
-copy "C:\Libraries\boost_1_65_1\lib32-msvc-14.1\libboost_filesystem-vc141-mt-1_65.lib" "C:\projects\fifengine-dependencies\includes\lib\boost\libboost_filesystem-vc141-mt-1_65.lib"
-copy "C:\Libraries\boost_1_65_1\lib32-msvc-14.1\libboost_system-vc141-mt-1_65.lib" "C:\projects\fifengine-dependencies\includes\lib\boost\libboost_system-vc141-mt-1_65.lib"
-copy "C:\Libraries\boost_1_65_1\lib32-msvc-14.1\libboost_regex-vc141-mt-1_65.lib" "C:\projects\fifengine-dependencies\includes\lib\boost\libboost_regex-vc141-mt-1_65.lib"
-copy "C:\Libraries\boost_1_65_1\lib32-msvc-14.1\libboost_python-vc141-mt-1_65.lib" "C:\projects\fifengine-dependencies\includes\lib\boost\libboost_regex-vc141-mt-1_65.lib"
+copy "C:\Libraries\boost_1_65_1\lib32-msvc-14.1\boost_filesystem-vc141-mt-1_65_1.dll" "C:\projects\fifengine-dependencies\includes\bin\boost_filesystem-vc141-mt-1_65_1.dll"
+copy "C:\Libraries\boost_1_65_1\lib32-msvc-14.1\boost_system-vc141-mt-1_65_1.dll" "C:\projects\fifengine-dependencies\includes\bin\boost_system-vc141-mt-1_65_1.dll"
+copy "C:\Libraries\boost_1_65_1\lib32-msvc-14.1\boost_python-vc141-mt-1_65_1.dll" "C:\projects\fifengine-dependencies\includes\bin\boost_python-vc141-mt-1_65_1.dll"
+copy "C:\Libraries\boost_1_65_1\lib32-msvc-14.1\libboost_filesystem-vc141-mt-1_65_1.lib" "C:\projects\fifengine-dependencies\includes\lib\boost\libboost_filesystem-vc141-mt-1_65_1.lib"
+copy "C:\Libraries\boost_1_65_1\lib32-msvc-14.1\libboost_system-vc141-mt-1_65_1.lib" "C:\projects\fifengine-dependencies\includes\lib\boost\libboost_system-vc141-mt-1_65_1.lib"
+copy "C:\Libraries\boost_1_65_1\lib32-msvc-14.1\libboost_python-vc141-mt-1_65_1.lib" "C:\projects\fifengine-dependencies\includes\lib\boost\libboost_python-vc141-mt-1_65_1.lib"

 :: remove the "share" folder
 rmdir /S /Q C:\projects\fifengine-dependencies\includes\share


testcov.bat

testcov.bat

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

--- csharp/testcov.bat
+++ csharp/testcov.bat
@@ -0,0 +1 @@
+python partcover-to-html.py bin\rel-cov\partcover.xml cov


Added batch script to easily start the bot

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

--- RUN.bat
+++ RUN.bat
@@ -0,0 +1,3 @@
+@ECHO OFF
+TITLE TwitchBot
+python twitchbot.py


A simple script to simplify my life

A simple script to simplify my life

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

--- DwellerBot/publish.bat
+++ DwellerBot/publish.bat
@@ -0,0 +1,21 @@
+@echo off
+set "publishpath=D:\Projects\DwellerBot"
+mkdir %publishpath%
+echo Publishing to %publishpath%
+
+cd bin\debug\
+@echo on
+copy /Y DwellerBot.exe %publishpath%
+copy /Y DwellerBot.exe.config %publishpath%
+copy /Y HtmlAgilityPack.dll %publishpath%
+copy /Y Newtonsoft.Json.dll %publishpath%
+copy /Y Serilog.dll %publishpath%
+copy /Y Serilog.FullNetFx.dll %publishpath%
+copy /Y System.Net.Http.Extensions.dll %publishpath%
+copy /Y System.Net.Http.Formatting.dll %publishpath%
+copy /Y System.Net.Http.Primitives.dll %publishpath%
+copy /Y Telegram.Bot.dll %publishpath%
+@echo off
+echo Done
+
+pause


Update user_install.bat

Update user_install.bat

--- doc/user/user_install.bat
+++ doc/user/user_install.bat
@@ -14,7 +14,7 @@
     exit /b !ERRORLEVEL!
 )

-if not exist!CONDA_DIR! (
+if not exist !CONDA_DIR! (
     curl https://repo.continuum.io/miniconda/Miniconda!CONDA_VERSION!-latest-Windows-!PLATFORM!.exe -o miniconda.exe
     if !ERRORLEVEL! neq 0 exit /b !ERRORLEVEL!
     start /wait "" miniconda.exe /InstallationType=JustMe /RegisterPython=0 /S /D=!CONDA_DIR!


Attempt to fix UpdateDependencies.bat script.

--- Build/Scripts/UpdateDependencies.bat
+++ Build/Scripts/UpdateDependencies.bat
@@ -120,7 +120,13 @@
 CALL db-update.bat
 CD %targetschemaa%\SQL Server
 CALL db-refresh.bat
-IF NOT "%SQLCONNECTIONSTRING%" == "" "%targettools%\DataMigrationUtility.exe" "%SQLCONNECTIONSTRING%; Initial Catalog=openPDC"
+IF NOT "%SQLCONNECTIONSTRING%" == ""(
+    MKDIR "%TEMP%\DataMigrationUtility"
+    COPY /Y "%targettools%\DataMigrationUtility.exe" "%TEMP%\DataMigrationUtility"
+    XCOPY "%dependencies%" "%TEMP%\DataMigrationUtility\" /Y /E
+    "%TEMP%\DataMigrationUtility\DataMigrationUtility.exe" "%SQLCONNECTIONSTRING%; Initial Catalog=openPDC"
+    RMDIR /S /Q "%TEMP%\DataMigrationUtility"
+)
 IF EXIST "%targettools%\SerializedSchema.bin" MOVE /Y "%targettools%\SerializedSchema.bin" "%target%"
 CD %target%


Fixed error in UpdateDependencies.bat that prevented the script from committing and pushing changes.

--- Build/Scripts/UpdateDependencies.bat
+++ Build/Scripts/UpdateDependencies.bat
@@ -131,14 +131,14 @@
 :CommitChanges
 ECHO.
 ECHO Committing updates to local repository...
-%git% add .
-%git% commit -m "Updated GSF dependencies."
+"%git%" add .
+"%git%" commit -m "Updated GSF dependencies."
 IF NOT "%donotpush%" == "" GOTO Finish

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

 :Finish


Add package/run-appleseed-maya-package.bat

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

--- package/run-appleseed-maya-package.bat
+++ package/run-appleseed-maya-package.bat
@@ -0,0 +1,3 @@
+@echo off
+python appleseed-maya.package.py
+pause


In future, use the Windows-mode 7zip self-extractor not the default console-mode one

--HG--
branch : v1-7
extra : convert_revision : svn%3A8631bf8a-c64b-0410-883c-f3eb003322f7/branches/v1-7%401860

--- SDK/Win32/buildsdk.bat
+++ SDK/Win32/buildsdk.bat
@@ -83,7 +83,7 @@
 move %BUILD_DIR%\sdk %SDKNAME%
 del /Q/F %SDKNAME%.7z
 rem create self-extracting 7zip archive
-7z a -r -y -sfx %SDKNAME%.exe %SDKNAME%
+7z a -r -y -sfx7z.sfx %SDKNAME%.exe %SDKNAME%

 echo Done! Test %SDKNAME%.exe and then release
 goto end


Create samba-services.cmd

Create samba-services.cmd

error: pathspec 'scripts/samba-services.cmd' did not match any file(s) known to git

--- scripts/samba-services.cmd
+++ scripts/samba-services.cmd
@@ -0,0 +1,9 @@
+rem matikan servis
+reg.exe add "HKLM:\SYSTEM\CurrentControlSet\Services\LanmanServer" /f /v Start /t REG_DWORD /d 4
+
+rem http://aka.ms/StopUsingSMB1
+rem matikan samba1
+reg.exe add "HKLM:\SYSTEM\CurrentControlSet\Services\LanmanServer\Parameters" /f /v SMB1 /t REG_DWORD /d 0
+
+rem audit samba1
+reg.exe add "HKLM:\SYSTEM\CurrentControlSet\Services\LanmanServer\Parameters" /f /v AuditSmb1Access /t REG_DWORD -d 1


adding autotesting for mssql server - windows only

--- autotest.cmd
+++ autotest.cmd
@@ -4,14 +4,14 @@
 :: @author Thomas Müller
 :: @author Tobias Ramforth (translated into Windows batch file)
 ::
-:: @copyright 2012 Thomas Müller thomas.mueller@tmit.eu
+:: @copyright 2012, 2013 Thomas Müller thomas.mueller@tmit.eu
 ::
 @echo off

 set DATADIR=data-autotest
 set BASEDIR=%~dp0

-:: create autoconfig for sqlite, mysql and postgresql
+:: create autoconfig for sqlite, mysql, postgresql and mssql
 echo ^<?php                                      > .\tests\autoconfig-sqlite.php
 echo $AUTOCONFIG ^= array ^(                     >> .\tests\autoconfig-sqlite.php
 echo  'installed' ^=^> false^,                   >> .\tests\autoconfig-sqlite.php
@@ -50,16 +50,35 @@
 echo   'dbpass' ^=^> 'owncloud'^,                >> .\tests\autoconfig-pgsql.php
 echo ^)^;                                        >> .\tests\autoconfig-pgsql.php

+echo ^<?php                                      > .\tests\autoconfig-mssql.php
+echo $AUTOCONFIG ^= array ^(                     >> .\tests\autoconfig-mssql.php
+echo   'installed' ^=^> false^,                  >> .\tests\autoconfig-mssql.php
+echo   'dbtype' ^=^> 'mssql'^,                   >> .\tests\autoconfig-mssql.php
+echo   'dbtableprefix' ^=^> 'oc_'^,              >> .\tests\autoconfig-mssql.php
+echo   'adminlogin' ^=^> 'admin'^,               >> .\tests\autoconfig-mssql.php
+echo   'adminpass' ^=^> 'admin'^,                >> .\tests\autoconfig-mssql.php
+echo   'directory' ^=^> '%BASEDIR%%DATADIR%'^,   >> .\tests\autoconfig-mssql.php
+echo   'dbuser' ^=^> 'oc_autotest'^,             >> .\tests\autoconfig-mssql.php
+echo   'dbname' ^=^> 'oc_autotest'^,             >> .\tests\autoconfig-mssql.php
+echo   'dbhost' ^=^> 'localhost\sqlexpress'^,    >> .\tests\autoconfig-mssql.php
+echo   'dbpass' ^=^> 'owncloud'^,                >> .\tests\autoconfig-mssql.php
+echo ^)^;                                        >> .\tests\autoconfig-mssql.php
+
 echo localhost:5432:*:oc_autotest:owncloud > %APPDATA%\postgresql\pgpass.conf

 ::
 :: start test execution
 ::
-::call:execute_tests "sqlite"
-call:execute_tests "mysql"
-::call:execute_tests "mssql"
-::call:execute_tests "ora"
-::call:execute_tests "pgsql"
+if [%1] == [] (
+	echo "Running on all database backends"
+	call:execute_tests "sqlite"
+	call:execute_tests "mysql"
+	call:execute_tests "mssql"
+	::call:execute_tests "ora"
+	call:execute_tests "pgsql"
+) else (
+	call:execute_tests "%1"
+)

 goto:eof

@@ -83,6 +102,9 @@
 	if "%~1" == "mysql" mysql -u oc_autotest -powncloud -e "DROP DATABASE oc_autotest"

 	if "%~1" == "pgsql" dropdb -h localhost -p 5432 -U oc_autotest -w oc_autotest
+
+	:: we assume a sqlexpress installation
+	if "%~1" == "mssql" sqlcmd -S localhost\sqlexpress -U oc_autotext -P owncloud -Q "IF EXISTS (SELECT name FROM sys.databases WHERE name=N'oc_autotest') DROP DATABASE [oc_autotest]"

 	:: copy autoconfig
 	copy /y %BASEDIR%\tests\autoconfig-%~1.php %BASEDIR%\config\autoconfig.php
@@ -96,9 +118,8 @@
 	rmdir /s /q coverage-html-%~1
 	md coverage-html-%~1
 	php -f enable_all.php
-	::phpunit --log-junit autotest-results-%~1.xml --coverage-clover autotest-clover-%~1.xml --coverage-html coverage-html-%~1
-	::phpunit --bootstrap bootstrap.php --configuration phpunit.xml
-	php win32-phpunit.php --bootstrap bootstrap.php --configuration phpunit.xml --log-junit autotest-results-%~1.xml --coverage-clover autotest-clover-%~1.xml --coverage-html coverage-html-%~1
+
+	php win32-phpunit.php --bootstrap bootstrap.php --configuration phpunit-autotest.xml --log-junit autotest-results-%~1.xml --coverage-clover autotest-clover-%~1.xml --coverage-html coverage-html-%~1
 	echo "Done with testing %~1 ..."
 	cd %BASEDIR%
 goto:eof
@@ -114,4 +135,10 @@
 ::  - to enable dropdb I decided to add following line to pg_hba.conf (this is not the safest way but I don't care for the testing machine):
 :: local	all	all	trust
 ::
+:: NOTES on mssql:
+::  we assume the usage of a local installed sqlexpress
+::  create a user 'oc_autotest' with password 'owncloud' and assign the server role 'dbcreator'
+::  make sure the sqlserver is configured to allow sql authentication
+::

+


Update arguments used in screenplay demo 3

--- doc/screenplay/demo-3-bach.bat
+++ doc/screenplay/demo-3-bach.bat
@@ -34,7 +34,7 @@
 echo Step 4: Build
 pause > nul
 @echo on
-jshell --show-version --execution local https://bit.ly/bach-build
+jshell --show-version https://bit.ly/bach-build
 @echo off
 pause > nul

@@ -49,7 +49,7 @@
 echo Step 6: Describe demo module
 pause > nul
 echo.
-jar --describe-module --file .bach\out\main\modules\demo-0.jar
+jar --describe-module --file .bach\modules\demo.jar
 pause > nul

 cd ..


jenkins

jenkins

--- jenkins/win32-cpp.bat
+++ jenkins/win32-cpp.bat
@@ -21,8 +21,8 @@
 set "VS110COMNTOOLS=C:\Program Files (x86)\Microsoft Visual Studio 11.0\Common7\Tools\"
 set "VS120COMNTOOLS=C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\Tools\"
 echo set(BUILD_LUA_WRAPPERS "OFF" CACHE BOOL "BUILD_LUA_WRAPPERS")>initcache.cmake
-echo set(JPEG_INCLUDE_DIR "%CD%\..\turbojpeg-win32" CACHE PATH "JPEG_INCLUDE_DIR")>>initcache.cmake
-echo set(JPEG_LIBRARY "%CD%\..\turbojpeg-win32\turbojpeg-static.lib" CACHE PATH "JPEG_LIBRARY")>>initcache.cmake
+echo set(JPEG_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/turbojpeg-win32" CACHE PATH "JPEG_INCLUDE_DIR")>>initcache.cmake
+echo set(JPEG_LIBRARY "${CMAKE_CURRENT_SOURCE_DIR}/turbojpeg-win32/turbojpeg-static.lib" CACHE PATH "JPEG_LIBRARY")>>initcache.cmake
 "c:\program files (x86)\cmake\bin\cmake" -G "Visual Studio 10 2010" -C initcache.cmake ..
 C:\WINDOWS\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe ALL_BUILD.vcxproj /p:Configuration=Release
 if errorlevel 1 exit /B 1