integrate fhsarp 4.1.1

integrate fhsarp 4.1.1

--- build-netcore.bat
+++ build-netcore.bat
@@ -1,22 +0,0 @@
-@echo off
-
-:: Check prerequisites
-set _msbuildexe="%ProgramFiles(x86)%\MSBuild\14.0\Bin\MSBuild.exe"
-if not exist %_msbuildexe% set _msbuildexe="%ProgramFiles%\MSBuild\14.0\Bin\MSBuild.exe"
-if not exist %_msbuildexe% set _msbuildexe="%ProgramFiles(x86)%\MSBuild\12.0\Bin\MSBuild.exe"
-if not exist %_msbuildexe% set _msbuildexe="%ProgramFiles%\MSBuild\12.0\Bin\MSBuild.exe"
-if not exist %_msbuildexe% echo Error: Could not find MSBuild.exe.  Please see http://www.microsoft.com/en-us/download/details.aspx?id=40760. && goto :eof
-
-set msbuildflags=/maxcpucount
-
-::Build
-
-%_msbuildexe% %msbuildflags% lib\netcore\build-fsc-netcore.proj /v:n
-@if ERRORLEVEL 1 echo Error: "%_msbuildexe% %msbuildflags% lib\netcore\build-fsc-netcore.proj" failed  && goto :failure
-
-
-@echo "Finished"
-goto :eof
-
-:failure
-exit /b 1


Remove *.res from files zipped.

Remove *.res from files zipped.

--- zipsrc.bat
+++ zipsrc.bat
@@ -1,4 +1,4 @@
 cd ..
 del/q scintilla.zip
-zip scintilla.zip scintilla\*.* scintilla\*\*.* -x *.o -x *.obj -x *.dll -x *.lib
+zip scintilla.zip scintilla\*.* scintilla\*\*.* -x *.o -x *.obj -x *.dll -x *.lib -x *.res
 cd scintilla


バッチファイルを実行した時に、コマンドを表示させないように変更

バッチファイルを実行した時に、コマンドを表示させないように変更

--- 実行.bat
+++ 実行.bat
@@ -1,5 +1,5 @@
-cd src
-python makeAmpCSV.py
-python makeGMM.py
-python convert.py
-pause
+@cd src
+@python makeAmpCSV.py
+@python makeGMM.py
+@python convert.py
+@pause


Update path to Java 8

Update path to Java 8

--- ci/jenkins.cmd
+++ ci/jenkins.cmd
@@ -9,6 +9,7 @@

 SET PYTHON_HOME=C:\Python36
 SET DOTNET_HOME=C:\Program Files\dotnet
+SET JAVA_HOME=C:\opt\oracle-jdk-8
 SET MAVEN_HOME=C:\opt\apache-maven-3.3.9

 ECHO [behave.userdata] > %USERINI%
@@ -17,7 +18,7 @@
 ECHO cf_username = %CF_USER% >> %USERINI%
 ECHO cf_password = %CF_PASS% >> %USERINI%

-SET PATH=%PYTHON_HOME%\Scripts;%DOTNET_HOME%;%MAVEN_HOME%\bin;%PATH%
+SET PATH=%PYTHON_HOME%\Scripts;%DOTNET_HOME%;%JAVA_HOME%\bin;%MAVEN_HOME%\bin;%PATH%

 CALL %BASEDIR%\test-setup
 CALL %BASEDIR%\test-run %*


link

link

Signed-off-by: 724789975 <2db27e81d9367e6e7167a07a8b1b0127934d0fc9@qq.com>

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

--- Client_Unity/link.bat
+++ Client_Unity/link.bat
@@ -0,0 +1,25 @@
+echo off & color 0A
+setlocal enabledelayedexpansion
+::ָʼļ
+set DIR="%cd%"\Test
+echo DIR=%DIR%
+
+::  /R ʾҪļ,ȥʾļ
+:: %%f һ,ڵ,ֻһĸ,ǰ%%
+:: ͨ,ָ׺,*.*ʾļ
+
+for /R %DIR% %%f in (*.png *.cs *.dll *.cpp *.jslib *.html *.js *.prefab *.unity *.ttf *.mat *.shader *.anim *.asset *.h *.c *.lua *.xml *.pl) do (
+	set "var=%%f"
+	set "p=%%f"
+	echo !p!
+	set "var=!var:Test=Test_Link!"
+	echo !var!
+	set "p1=D:%%~pf"
+	set "p1=!p1:Test=Test_Link!"
+	echo !p1!
+	md !p1!
+
+	del !var!
+	mklink /h !var! !p!
+)
+pause


[HOTFIX] fix interpreter.cmd script

[HOTFIX] fix interpreter.cmd script

### What is this PR for?
interpreter.cmd works incorrect after https://github.com/apache/zeppelin/pull/2562

### What type of PR is it?
Bug Fix

### Questions:
* Does the licenses files need update? no
* Is there breaking changes for older versions? no
* Does this needs documentation? no

Author: tinkoff-dwh <tinkoff.dwh@gmail.com>

Closes #2607 from tinkoff-dwh/master and squashes the following commits:

1932202 [tinkoff-dwh] Merge remote-tracking branch 'upstream/master'
c7f5124 [tinkoff-dwh] Merge remote-tracking branch 'upstream/master'
8baa87b [tinkoff-dwh] [HOTFIX] fix interpreter.cmd script

--- bin/interpreter.cmd
+++ bin/interpreter.cmd
@@ -27,6 +27,7 @@
     set INTERPRETER_ID=%~n2
 )
 if /I "%~1"=="-p" set PORT=%~2
+if /I "%~1"=="-c" set CALLBACK_HOST=%~2
 if /I "%~1"=="-l" set LOCAL_INTERPRETER_REPO=%~2
 shift
 goto loop
@@ -127,11 +128,11 @@
 if defined SPARK_SUBMIT (
     set JAVA_INTP_OPTS=%JAVA_INTP_OPTS% -Dzeppelin.log.file='%ZEPPELIN_LOGFILE%'

-    "%SPARK_SUBMIT%" --class %ZEPPELIN_SERVER% --jars %CLASSPATH% --driver-java-options "!JAVA_INTP_OPTS!" %SPARK_SUBMIT_OPTIONS% "%SPARK_APP_JAR%" %PORT%
+    "%SPARK_SUBMIT%" --class %ZEPPELIN_SERVER% --jars %CLASSPATH% --driver-java-options "!JAVA_INTP_OPTS!" %SPARK_SUBMIT_OPTIONS% "%SPARK_APP_JAR%" "%CALLBACK_HOST%" %PORT%
 ) else (
     set JAVA_INTP_OPTS=%JAVA_INTP_OPTS% -Dzeppelin.log.file="%ZEPPELIN_LOGFILE%"

-    "%ZEPPELIN_RUNNER%" !JAVA_INTP_OPTS! %ZEPPELIN_INTP_MEM% -cp %ZEPPELIN_CLASSPATH_OVERRIDES%;%CLASSPATH% %ZEPPELIN_SERVER% %PORT%
+    "%ZEPPELIN_RUNNER%" !JAVA_INTP_OPTS! %ZEPPELIN_INTP_MEM% -cp %ZEPPELIN_CLASSPATH_OVERRIDES%;%CLASSPATH% %ZEPPELIN_SERVER% "%CALLBACK_HOST%" %PORT%
 )

 exit /b


GRAILS-1357

GRAILS-1357

git-svn-id: 29aad96320b2a07b98332cd568fc1316025c072f@4941 1cfb16fd-6d17-0410-8ff1-b7e8e1e2867d

--- bin/startGrails.bat
+++ bin/startGrails.bat
@@ -65,6 +65,9 @@
 if "%eval[2+2]" == "4" goto 4NT_args

 :win9xME_args
+@rem remove trailing slash from GRAILS_HOME
+if "%GRAILS_HOME:~-1%"=="\" SET GRAILS_HOME=%GRAILS_HOME:~0,-1%
+
 @rem Slurp the command line arguments.
 set CMD_LINE_ARGS=
 set SERVER_PORT=


Change output to couscous.exe

Change output to couscous.exe

--- code/build.bat
+++ code/build.bat
@@ -10,5 +10,5 @@
   set CFlags=/nologo /MTd /Zi /DEBUG
   set LFlags=/INCREMENTAL:NO
   set Libs=User32.lib Gdi32.lib
-  cl %CFlags% "%SourceDir%/win32_main.cpp" /Fe"main.exe" /link %LFlags% %Libs%
+  cl %CFlags% "%SourceDir%/win32_main.cpp" /Fe"couscous.exe" /link %LFlags% %Libs%
 popd


CI: fix MSBuild command line error

CI: fix MSBuild command line error

--- code/build.cmd
+++ code/build.cmd
@@ -19,7 +19,7 @@

 set extraOpt=""
 if defined APPVEYOR (
-    set extraOpt="/logger:""C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"""
+    set extraOpt=/logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
 )

 msbuild .\.build\Build.proj /t:%target% /p:Configuration="%config%" /fl /v:m /flp:LogFile=msbuild.log;Verbosity=Diagnostic /nr:false %extraOpt%


commit on 07/06/2018 at 12:43:50

commit on 07/06/2018 at 12:43:50

--- ansys-APDL/transverseCrack.cmd
+++ ansys-APDL/transverseCrack.cmd
@@ -247,31 +247,63 @@
 LSEL,S,LINE,,8                            ! Crack
 NSLL,S,1                                  !Select nodes associated to this line
 *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,4), NODE, 1, U, X
-*VGET, CrackDisps(1,5), NODE, 1, U, Y
-*VGET, CrackDisps(1,6), NODE, 1, S, X
-*VGET, CrackDisps(1,7), NODE, 1, S, Y
-*VGET, CrackDisps(1,8), NODE, 1, S, XY
-*VGET, CrackDisps(1,9), NODE, 1, EPEL, X
-*VGET, CrackDisps(1,10), NODE, 1, EPEL, Y
-*VGET, CrackDisps(1,11), NODE, 1, EPEL, XY
+*DIM, resArray, ARRAY, NNodes, 11
+*VGET, resArray(1,1), NODE, , NLIST
+*VGET, resArray(1,2), NODE, 1, LOC, Y
+*VGET, resArray(1,3), NODE, 1, LOC, X
+*VGET, resArray(1,4), NODE, 1, U, X
+*VGET, resArray(1,5), NODE, 1, U, Y
+*VGET, resArray(1,6), NODE, 1, S, X
+*VGET, resArray(1,7), NODE, 1, S, Y
+*VGET, resArray(1,8), NODE, 1, S, XY
+*VGET, resArray(1,9), NODE, 1, EPEL, X
+*VGET, resArray(1,10), NODE, 1, EPEL, Y
+*VGET, resArray(1,11), NODE, 1, EPEL, XY

 *CFOPEN, CFFileCoordDisp, csv
 *VWRITE, 'NODE','LABEL,','X[mm],','Z[mm],','UX','[mm],','UZ','[mm]'
 (A5,A6,A6,A6,A2,A5,A2,A4)
-*VWRITE, CrackDisps(1,1), ',', CrackDisps(1,2), ',', CrackDisps(1,3), ',', CrackDisps(1,4), ',', CrackDisps(1,5)
-(F5.0,A2,F12.8,A2,F12.8,A2,F12.8,A2,F12.8)
+*VWRITE, resArray(1,1), ',', resArray(1,2), ',', resArray(1,3), ',', resArray(1,4), ',', resArray(1,5)
+(F5.0,A1,F12.8,A1,F12.8,A1,F12.8,A1,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)
-(F5.0,A2,F12.8,A2,F12.8,A2,F12.8,A2,F12.8,A2,F12.8,A2,F12.8)
+*VWRITE, resArray(1,1), ', ', resArray(1,6), ', ', resArray(1,7), ', ', resArray(1,8), ', ', resArray(1,9), ', ', resArray(1,10), ', ', resArray(1,11)
+(F5.0,A1,F12.8,A1,F12.8,A1,F12.8,A1,F12.8,A1,F12.8,A1,F12.8)
 *CFCLOS

+LSEL,S,LINE,,7
+NSLL,S,1                                  !Select nodes associated to this line
+*GET,NNodes,NODE,0,COUNT                  !Get the number of nodes in the selected set
+*DIM, resArray, ARRAY, NNodes, 13
+*VGET, resArray(1,1), NODE, , NLIST
+*VGET, resArray(1,2), NODE, 1, LOC, Y
+*VGET, resArray(1,3), NODE, 1, LOC, X
+*VGET, resArray(1,4), NODE, 1, U, X
+*VGET, resArray(1,5), NODE, 1, U, Y
+*VGET, resArray(1,6), NODE, 1, S, X
+*VGET, resArray(1,7), NODE, 1, S, Y
+*VGET, resArray(1,8), NODE, 1, S, XY
+*VGET, resArray(1,9), NODE, 1, EPEL, X
+*VGET, resArray(1,10), NODE, 1, EPEL, Y
+*VGET, resArray(1,11), NODE, 1, EPEL, XY
+*VGET, resArray(1,12), NODE, 1, RF, FX
+*VGET, resArray(1,13), NODE, 1, RF, FY
+
+*CFOPEN, YsymmLowCDRF, csv
+*VWRITE, 'NODE','LABEL,','X[mm],','Z[mm],','UX','[mm],','UZ','[mm],',','RX','[kN],','RZ','[kN]'
+(A5,A6,A6,A6,A2,A5,A2,A5,A2,A5,A2,A4)
+*VWRITE, resArray(1,1), ',', resArray(1,2), ',', resArray(1,3), ',', resArray(1,4), ',', resArray(1,5), ',', resArray(1,12), ',', resArray(1,13)
+(F5.0,A1,F12.8,A1,F12.8,A1,F12.8,A1,F12.8,A1,F12.8,A1,F12.8)
+*CFCLOS
+
+*CFOPEN, YsymmLowCDSS, csv
+*VWRITE, 'NODE LABEL, SX [MPa], SZ [MPa], SXZ [MPa], EX [-], EZ [-], EXZ [-]'
+(A80)
+*VWRITE, resArray(1,1), ', ', resArray(1,6), ', ', resArray(1,7), ', ', resArray(1,8), ', ', resArray(1,9), ', ', resArray(1,10), ', ', resArray(1,11)
+(F5.0,A1,F12.8,A1,F12.8,A1,F12.8,A1,F12.8,A1,F12.8,A1,F12.8)
+*CFCLOS
+
 /EOF


commit on 06/06/2018 at 13:34:32

commit on 06/06/2018 at 13:34:32

--- ansys-APDL/transverseCrack.cmd
+++ ansys-APDL/transverseCrack.cmd
@@ -246,10 +246,6 @@
 NSLL,S,1                                  !Select nodes associated to this line
 *GET,NNodes,NODE,0,COUNT                  !Get the number of nodes in the selected set
 *DIM, CrackDisps, ARRAY, NNodes, 11
-!*GET,nodeLabel,NODE,0,NUM,MIN !Get label of the first node
-!*DO,i,1,NNodes,1
-!  ! Define some parameters
-!  *GET,CrackDisps(i,1),NODE,nodeLabel,NUM
 *VGET, CrackDisps(1,1), NODE, , NLIST
 *VGET, CrackDisps(1,2), NODE, 1, LOC, Y
 *VGET, CrackDisps(1,3), NODE, 1, LOC, X


Create comp.bat

Create comp.bat

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

--- comp.bat
+++ comp.bat
@@ -0,0 +1 @@
+gcc -o map_stuff.exe map_stuff.c map_lib.c


Excluse updater in portable release.

Excluse updater in portable release.

--- Build/build_portable.bat
+++ Build/build_portable.bat
@@ -25,5 +25,4 @@

 ::core files
 7z a %ZIP_ARCHIVE% "%VS_BUILD_DIRECTORY%\Tabster.exe"
-7z a %ZIP_ARCHIVE% "%VS_BUILD_DIRECTORY%\Updater.exe"
 7z a -r %ZIP_ARCHIVE% "%VS_BUILD_DIRECTORY%\*.dll"


Add file refresh_tests.bat

Add file refresh_tests.bat

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

--- tests/refresh_tests.bat
+++ tests/refresh_tests.bat
@@ -0,0 +1,2 @@
+del "output\correct_output.txt"
+call scripts_list >> "output\correct_output.txt"


fixed windows accidental && popd on same line

--- bin/busted.bat
+++ bin/busted.bat
@@ -17,7 +17,8 @@
   if defined TRUE  (
     pushd %~dp0 && (call "%cmd%" busted_bootstrap %*) && popd
   ) else (
-    pushd %~dp0 && (call "%cmd%" busted_bootstrap --cwd="%cwd%\\" %*) && popd
+    pushd %~dp0 && (call "%cmd%" busted_bootstrap --cwd="%cwd%\\" %*)
+    popd
     exit /B %ERRORLEVEL%
   )
 )


cmdize: simplify code calling html/hta

cmdize: simplify code calling html/hta

--- bin/cmdize.bat
+++ bin/cmdize.bat
@@ -181,7 +181,7 @@
 :cmdize.html
 echo:^<!-- :
 echo:@echo off
-echo:start "" "%%windir%%\System32\mshta.exe" "%%~f0" %%*
+echo:start "" mshta "%%~f0" %%*
 echo:goto :EOF
 echo:--^>
 type "%~f1"


Remove ExcludedVersion from nuget package generation command line in buld.bat

--- src/ComposeIt.Akka.FSharp.Extensions/build.bat
+++ src/ComposeIt.Akka.FSharp.Extensions/build.bat
@@ -1,5 +1,5 @@
 @echo off
 cls
-"..\packages\NuGet.CommandLine.2.8.6\tools\NuGet.exe" "Install" "FAKE" "-OutputDirectory" "..\..\packages" "-ExcludeVersion"
+"..\packages\NuGet.CommandLine.2.8.6\tools\NuGet.exe" "Install" "FAKE" "-OutputDirectory" "..\..\packages"
 "..\..\packages\FAKE\tools\Fake.exe" build.fsx
 pause


Update bld.bat

Update bld.bat

--- recipes/r-smurf/bld.bat
+++ recipes/r-smurf/bld.bat
@@ -1,2 +1,2 @@
-"%R%" CMD INSTALL --build . %R_ARGS%
+"%R%" CMD INSTALL --build . %R_ARGS%
 IF %ERRORLEVEL% NEQ 0 exit /B 1


publish script

publish script

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

--- dist/publish-nuget.bat
+++ dist/publish-nuget.bat
@@ -0,0 +1,11 @@
+@echo off
+IF %2.==. GOTO WrongArgs
+
+set SYMBOLSOURCE="http://nuget.gw.symbolsource.org/Public/NuGet"
+
+..\.nuget\nuget.exe push %1.nupkg %2
+..\.nuget\nuget.exe push %1.symbols.nupkg %2 -source %SYMBOLSOURCE%
+
+GOTO:EOF
+:WrongArgs
+ECHO "publish-nuget <pkgname> <apikey>"


AppVeyor build of CsoundQt (#793).

AppVeyor build of CsoundQt (#793).

--- msvc/build_csoundqt.bat
+++ msvc/build_csoundqt.bat
@@ -14,6 +14,7 @@
     LIBS+="%VCPKGDir%\installed\x64-windows\lib\libsndfile-1.lib" ^
     INCLUDEPATH+="%~dp0deps\include" ^
     INCLUDEPATH+="%APPVEYOR_BUILD_FOLDER%\deps\include" ^
+    DEFAULT_LIBSNDFILE_INCLUDE_DIRS+="%VCPKGDir%\installed\x64-windows\include"
     INCLUDEPATH+="%VCPKGDir%\installed\x64-windows\include"
 nmake.exe
 move "bin\CsoundQt*.*" "../../csound-vs/Release/"


build-msvc.cmd: Implement a switch for setting the Microsoft Visual Studio version: /version:foo.

--- build-msvc.cmd
+++ build-msvc.cmd
@@ -1,14 +1,19 @@
 @echo off
+
+setlocal ENABLEDELAYEDEXPANSION

 rem Process the command line arguments.
 set flag_batch=0
+set msvc_version=14.0
 for %%a in (%*) do (
-    if "%%a"=="/batch" set flag_batch=1
+    set flag="%%a"
+    if "!flag!"=="/batch" set flag_batch=1
+    if "!flag:~0,9!"=="/version:" set version="!arg:~7!"
 )

 rem Build Picol with MSVC.
 echo on
-call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat"
+call "C:\Program Files (x86)\Microsoft Visual Studio %msvc_version%\VC\vcvarsall.bat"
 echo on
 nmake /F Makefile.nmake
 @if "%flag_batch%"=="0" pause


update

update

--- build.msvc.cmd
+++ build.msvc.cmd
@@ -11,6 +11,8 @@

 :SelectPlatform
 set ACTION=%1
+if "%1" == "win64" set ACTION=%2
+if "%1" == "win32" set ACTION=%2
 if "%XYO_PLATFORM%" == "win64-msvc" goto Build
 if "%XYO_PLATFORM%" == "win32-msvc" goto Build
 set ACTION=%2


Small change in local publish config

Small change in local publish config

--- build/publish_local.cmd
+++ build/publish_local.cmd
@@ -6,7 +6,7 @@
 set skipCopyingBuiltAssemblies=false
 set skipDependentPackagesVersionsUpdate=false
 set skipCreatingNuGetPackages=false
-set skipPublishing=false
+set skipPublishing=true

 call publish_common.cmd


Fix MSVC_USE_SCRIPT patch applying typo fail Restrict swr LLVM 7 compatibility patch to Mesa 18.2.3 and older.

--- buildscript/modules/mesa3d.cmd
+++ buildscript/modules/mesa3d.cmd
@@ -63,11 +63,11 @@
 @IF %pythonver%==2 IF %intmesaver% LSS 18300 echo.

 @rem Fix swr build with LLVM 7.0 (patch v3) - https://lists.freedesktop.org/archives/mesa-dev/2018-October/207017.html
-@git apply -v ..\mesa-dist-win\patches\swr-llvm7.patch
-@echo.
+@IF %intmesaver% LSS 18254 git apply -v ..\mesa-dist-win\patches\swr-llvm7.patch
+@IF %intmesaver% LSS 18254 echo.

 @rem Add MSVC_USE_SCRIPT support so that Scons can use 64-bit compiler when doing a 32-bit build.
-@IF %intmesaver% LSS 18300 git appy -v ..\mesa-dist-win\patches\msvc_use_script.patch
+@IF %intmesaver% LSS 18300 git apply -v ..\mesa-dist-win\patches\msvc_use_script.patch
 @IF %intmesaver% LSS 18300 echo.

 @rem RIP texture_float build option that remained present in a zombie state for Scons build.
@@ -78,7 +78,6 @@
 @rem Configure Mesa build.

 @if %pythonver%==2 set buildcmd=%pythonloc% %pythonloc:~0,-10%Scripts\scons.py -j%throttle% build=release platform=windows machine=%longabi% MSVC_USE_SCRIPT=%vsenv%
-@if %pythonver%==2 if %intmesaver% LSS 18201 set buildcmd=%buildcmd% texture_float=1
 @if %pythonver% GEQ 3 set buildconf=%mesonloc% build/%abi% --backend=vs2017 --buildtype=plain --default-library=static
 @if %pythonver% GEQ 3 IF %mesonver:~2,-2% LSS 48 if %llvmlink%==MT set buildconf=%buildconf% -Dc_args="/MT /O2" -Dcpp_args="/MT /O2"
 @if %pythonver% GEQ 3 IF %mesonver:~2,-2% GEQ 48 set buildconf=%buildconf% --optimization=2


Updated frapid build.

Updated frapid build.

--- builds/all.bat
+++ builds/all.bat
@@ -13,6 +13,11 @@
 	"%programfiles(x86)%\MSBuild\14.0\Bin\MSBuild.exe" /verbosity:quiet /nologo /property:Configuration=Debug ../src/Frapid.Web/Areas/Frapid.Dashboard/Frapid.Dashboard.sln /p:VisualStudioVersion=14.0
 )

+if exist "../src/Frapid.Web/Areas/Frapid.WebsiteBuilder/Frapid.WebsiteBuilder.sln" (
+	@echo Building WebsiteBuilder Module
+	"%programfiles(x86)%\MSBuild\14.0\Bin\MSBuild.exe" /verbosity:quiet /nologo /property:Configuration=Debug ../src/Frapid.Web/Areas/Frapid.WebsiteBuilder/Frapid.WebsiteBuilder.sln /p:VisualStudioVersion=14.0
+)
+
 if exist "../src/Frapid.Web/Areas/Frapid.AddressBook/Frapid.AddressBook.sln" (
 	@echo Building AddressBook
 	"%programfiles(x86)%\MSBuild\14.0\Bin\MSBuild.exe" /verbosity:quiet /nologo /property:Configuration=Debug ../src/Frapid.Web/Areas/Frapid.AddressBook/Frapid.AddressBook.sln /p:VisualStudioVersion=14.0
@@ -21,12 +26,6 @@
 if exist "../src/Frapid.Web/Areas/Frapid.Calendar/Frapid.Calendar.sln" (
 	@echo Building Calendar
 	"%programfiles(x86)%\MSBuild\14.0\Bin\MSBuild.exe" /verbosity:quiet /nologo /property:Configuration=Debug ../src/Frapid.Web/Areas/Frapid.Calendar/Frapid.Calendar.sln /p:VisualStudioVersion=14.0
-)
-
-
-if exist "../src/Frapid.Web/Areas/Frapid.WebsiteBuilder/Frapid.WebsiteBuilder.sln" (
-	@echo Building WebsiteBuilder Module
-	"%programfiles(x86)%\MSBuild\14.0\Bin\MSBuild.exe" /verbosity:quiet /nologo /property:Configuration=Debug ../src/Frapid.Web/Areas/Frapid.WebsiteBuilder/Frapid.WebsiteBuilder.sln /p:VisualStudioVersion=14.0
 )

 if exist "../src/Frapid.Web/Areas/Frapid.Reports/Frapid.Reports.sln" (


Enhanced build script for Windows

Enhanced build script for Windows

--- build/windows/build.bat
+++ build/windows/build.bat
@@ -1,16 +1,23 @@
+@setlocal
+
+@rem Initialize build environment of Visual Studio 2015
 call "c:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\Tools\vsvars32.bat"

+@rem Build for x86 platform
 msbuild pkcs11-logger.sln /p:Configuration=Release /p:Platform=Win32 /target:Clean || goto :error
 msbuild pkcs11-logger.sln /p:Configuration=Release /p:Platform=Win32 /target:Build || goto :error
 copy .\Win32\Release\pkcs11-logger-x86.dll . || goto :error

+@rem Build for x64 platform
 msbuild pkcs11-logger.sln /p:Configuration=Release /p:Platform=x64 /target:Clean || goto :error
 msbuild pkcs11-logger.sln /p:Configuration=Release /p:Platform=x64 /target:Build || goto :error
 copy .\x64\Release\pkcs11-logger-x64.dll . || goto :error

-@echo "BUILD SUCCEEDED !!!"
+@echo *** BUILD SUCCESSFUL ***
+@endlocal
 @exit /b %errorlevel%

 :error
-@echo "BUILD FAILED !!!"
+@echo *** BUILD FAILED ***
+@endlocal
 @exit /b %errorlevel%


Fix bug 20645.

Fix bug 20645.

git-svn-id: de9d04cf23151003780adc3e4ddb7078e3680318@108790 13f79535-47bb-0310-9956-ffa450edef68

--- phoenix-bin/bin/run.bat
+++ phoenix-bin/bin/run.bat
@@ -59,7 +59,7 @@

 if not "%PHOENIX_TMPDIR%"=="" goto afterTmpDir
 set PHOENIX_TMPDIR=%PHOENIX_HOME%\temp
-if not exist "%PHOENIX_TMPDIR%" mkdir %PHOENIX_TMPDIR%
+if not exist "%PHOENIX_TMPDIR%" mkdir "%PHOENIX_TMPDIR%"

 :afterTmpDir


Modified this script to copy the plugin to Program Files in the same place as the installer puts it.  This avoids accidentally getting two copies of it installed.

--- src/Extensions/ReSharper/Install-ReSharperRunner.bat
+++ src/Extensions/ReSharper/Install-ReSharperRunner.bat
@@ -5,19 +5,19 @@
 set LOCALDIR=%~dp0

 set RESHARPERRUNNER_DLL=%LOCALDIR%Gallio.ReSharperRunner\bin\Gallio.ReSharperRunner.dll
-set RESHARPERBASEDIR=%APPDATA%\JetBrains\ReSharper
+set RESHARPER_DIR=%PROGRAMFILES%\JetBrains\ReSharper

 echo Installing the locally compiled Gallio test runner for ReSharper.
 echo.

 :V30_VS80_RETRY_PROMPT
-set /P Answer=Support ReSharper v3.0 for VS 2005?  (Y/N)
+set /P Answer=Support ReSharper v3.1 for VS 2005?  (Y/N)
 if /I "%Answer%"=="Y" call :INSTALL "v3.1" "vs8.0" & goto :V30_VS80_DONE_PROMPT
 if /I not "%Answer%"=="N" goto :V30_VS80_RETRY_PROMPT
 :V30_VS80_DONE_PROMPT

 :V30_VS90_RETRY_PROMPT
-set /P Answer=Support ReSharper v3.0 for VS 2008?  (Y/N)
+set /P Answer=Support ReSharper v3.1 for VS 2008?  (Y/N)
 if /I "%Answer%"=="Y" call :INSTALL "v3.1" "vs9.0" & goto :V30_VS90_DONE_PROMPT
 if /I not "%Answer%"=="N" goto :V30_VS90_RETRY_PROMPT
 :V30_VS90_DONE_PROMPT
@@ -28,10 +28,16 @@
 set RESHARPER_VERSION=%~1
 set VS_VERSION=%~2

-set PLUGINS_DIR=%RESHARPERBASEDIR%\%RESHARPER_VERSION%\%VS_VERSION%\Plugins
-set GALLIO_PLUGIN_DIR=%PLUGINS_DIR%\Gallio
+set RESHARPER_BIN_DIR=%RESHARPER_DIR%\%RESHARPER_VERSION%\%VS_VERSION%\Bin
+if not exist "%RESHARPER_BIN_DIR%" (
+    echo ReSharper %RESHARPER_VERSION% for %VS_VERSION% was not found.  Skipped.
+    goto :EOF
+)

-if not exist "%PLUGINS_DIR%" mkdir "%PLUGINS_DIR%"
+set RESHARPER_PLUGINS_DIR=%RESHARPER_BIN_DIR%\Plugins
+set GALLIO_PLUGIN_DIR=%RESHARPER_PLUGINS_DIR%\Gallio
+
+if not exist "%RESHARPER_PLUGINS_DIR%" mkdir "%RESHARPER_PLUGINS_DIR%"
 if not exist "%GALLIO_PLUGIN_DIR%" mkdir "%GALLIO_PLUGIN_DIR%"

 copy "%RESHARPERRUNNER_DLL%" "%GALLIO_PLUGIN_DIR%" /Y >nul


Resolve conflict in integrator.bat

Resolve conflict in integrator.bat

--- distribution/src/scripts/integrator.bat
+++ distribution/src/scripts/integrator.bat
@@ -168,7 +168,7 @@
 if %JAVA_VERSION% LEQ 18 set CARBON_CLASSPATH=.\wso2\lib\*;%CARBON_CLASSPATH%
 if %JAVA_VERSION% GEQ 110 set JAVA_VER_BASED_OPTS=--add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens java.rmi/sun.rmi.transport=ALL-UNNAMED

-set CMD_LINE_ARGS=-Xbootclasspath/a:%CARBON_XBOOTCLASSPATH% -Xms256m -Xmx1024m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath="%CARBON_HOME%\repository\logs\heap-dump.hprof"  -Dcom.sun.management.jmxremote -classpath %CARBON_CLASSPATH% %JAVA_OPTS% -Dcarbon.registry.root=/ -Dcarbon.home="%CARBON_HOME%" -Dwso2.server.standalone=true -Djava.command="%JAVA_HOME%\bin\java" -Djava.opts="%JAVA_OPTS%" -Djava.io.tmpdir="%CARBON_HOME%\wso2\tmp" -Dcatalina.base="%CARBON_HOME%\wso2\lib\tomcat" -Dwso2.carbon.xml="%CARBON_HOME%\conf\carbon.xml" -Dwso2.registry.xml="%CARBON_HOME%\conf\registry.xml" -Dwso2.user.mgt.xml="%CARBON_HOME%\conf\user-mgt.xml" -Dwso2.transports.xml="%CARBON_HOME%\conf\mgt-transports.xml" -Djava.util.logging.config.file="%CARBON_HOME%\conf\etc\logging-bridge.properties" -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager -Dcarbon.config.dir.path="%CARBON_HOME%\conf"  -Dcomponents.repo="%CARBON_HOME%\wso2\components\plugins" -Dcarbon.config.dir.path="%CARBON_HOME%\conf" -Dcarbon.components.dir.path="%CARBON_HOME%\wso2\components" -Dcarbon.extensions.dir.path="%CARBON_HOME%\extensions" -Dcarbon.dropins.dir.path="%CARBON_HOME%\dropins" -Dcarbon.external.lib.dir.path="%CARBON_HOME%\lib" -Dcarbon.patches.dir.path="%CARBON_HOME%\patches" -Dcarbon.servicepacks.dir.path="%CARBON_HOME%\servicepacks" -Dcarbon.internal.lib.dir.path="%CARBON_HOME%\wso2\lib" -Dconf.location="%CARBON_HOME%\conf" -Dcom.atomikos.icatch.file="%CARBON_HOME%\wso2\lib\transactions.properties" -Dcom.atomikos.icatch.hide_init_file_path="true" -Dorg.apache.jasper.compiler.Parser.STRICT_QUOTE_ESCAPING=false -Dorg.apache.jasper.runtime.BodyContentImpl.LIMIT_BUFFER=true -Dcom.sun.jndi.ldap.connect.pool.authentication=simple -Dcom.sun.jndi.ldap.connect.pool.timeout=3000 -Dorg.terracotta.quartz.skipUpdateCheck=true -Dcarbon.classpath=%CARBON_CLASSPATH% -Dfile.encoding=UTF8 -DworkerNode=false -Dei.extendedURIBasedDispatcher=org.wso2.carbon.integrator.core.handler.IntegratorStatefulHandler -Dorg.wso2.ignoreHostnameVerification=true -Dorg.apache.activemq.SERIALIZABLE_PACKAGES="*" -DavoidConfigUpdate=true -DenableCorrelationLogs=false -Dorg.wso2.CorrelationLogInterceptor.BlacklistedThreads=Framework,Start,RegistryLogWritter,Component
+set CMD_LINE_ARGS=-Xbootclasspath/a:%CARBON_XBOOTCLASSPATH% -Xms256m -Xmx1024m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath="%CARBON_HOME%\repository\logs\heap-dump.hprof"  -Dcom.sun.management.jmxremote -classpath %CARBON_CLASSPATH% %JAVA_OPTS% -Dcarbon.registry.root=/ -Dcarbon.home="%CARBON_HOME%" -Dwso2.server.standalone=true -Djava.command="%JAVA_HOME%\bin\java" -Djava.opts="%JAVA_OPTS%" -Djava.io.tmpdir="%CARBON_HOME%\wso2\tmp" -Dcatalina.base="%CARBON_HOME%\wso2\lib\tomcat" -Dwso2.carbon.xml="%CARBON_HOME%\conf\carbon.xml" -Dwso2.registry.xml="%CARBON_HOME%\conf\registry.xml" -Dwso2.user.mgt.xml="%CARBON_HOME%\conf\user-mgt.xml" -Dwso2.transports.xml="%CARBON_HOME%\conf\mgt-transports.xml" -Djava.util.logging.config.file="%CARBON_HOME%\conf\etc\logging-bridge.properties" -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager -Dcarbon.config.dir.path="%CARBON_HOME%\conf"  -Dcomponents.repo="%CARBON_HOME%\wso2\components\plugins" -Dcarbon.config.dir.path="%CARBON_HOME%\conf" -Dcarbon.components.dir.path="%CARBON_HOME%\wso2\components" -Dcarbon.extensions.dir.path="%CARBON_HOME%\extensions" -Dcarbon.dropins.dir.path="%CARBON_HOME%\dropins" -Dcarbon.external.lib.dir.path="%CARBON_HOME%\lib" -Dcarbon.patches.dir.path="%CARBON_HOME%\patches" -Dcarbon.servicepacks.dir.path="%CARBON_HOME%\servicepacks" -Dcarbon.internal.lib.dir.path="%CARBON_HOME%\wso2\lib" -Dconf.location="%CARBON_HOME%\conf" -Dcom.atomikos.icatch.file="%CARBON_HOME%\wso2\lib\transactions.properties" -Dcom.atomikos.icatch.hide_init_file_path="true" -Dorg.apache.jasper.compiler.Parser.STRICT_QUOTE_ESCAPING=false -Dorg.apache.jasper.runtime.BodyContentImpl.LIMIT_BUFFER=true -Dcom.sun.jndi.ldap.connect.pool.authentication=simple -Dcom.sun.jndi.ldap.connect.pool.timeout=3000 -Dorg.terracotta.quartz.skipUpdateCheck=true -Dcarbon.classpath=%CARBON_CLASSPATH% -Dfile.encoding=UTF8 -DworkerNode=false -Dei.extendedURIBasedDispatcher=org.wso2.carbon.integrator.core.handler.IntegratorStatefulHandler -Dorg.wso2.ignoreHostnameVerification=true -Dorg.apache.activemq.SERIALIZABLE_PACKAGES="*" -DavoidConfigUpdate=true -DenableCorrelationLogs=false -Dorg.wso2.CorrelationLogInterceptor.BlacklistedThreads=Framework,Start,RegistryLogWritter,Component -Dproperties.file.path=default

 :runJava
 echo JAVA_HOME environment variable is set to %JAVA_HOME%


%~* not allowed in batch scripts

%~* not allowed in batch scripts

Signed-off-by: Daniel Borchmann <25857343a15bf1edafebc2912e82ecf775c585c1@mailbox.tu-dresden.de>

--- bin/conexp-clj.bat
+++ bin/conexp-clj.bat
@@ -3,4 +3,4 @@
 set CONEXP_CLJ_HOME=..
 set CONEXP_CLJ_INIT=%CONEXP_CLJ_HOME%/lib/conexp-clj.clj

-java -cp "%CONEXP_CLJ_HOME%/lib/*" jline.ConsoleRunner clojure.main -i %CONEXP_CLJ_INIT% -r %~*
+java -cp "%CONEXP_CLJ_HOME%/lib/*" jline.ConsoleRunner clojure.main -i %CONEXP_CLJ_INIT% -r %*


* Bug fix for cleaning up abandoned selenium jar during auto upgrade   in windows platform.

--- server/src/main/resources/autobot_start_Node.bat
+++ server/src/main/resources/autobot_start_Node.bat
@@ -2,4 +2,5 @@

 set PATH=%JAVA_HOME%\jre\bin;%JAVA_HOME%\bin;%CD%;%PATH%
 set HUB_URL=http://127.0.0.1:4444/grid/register
+if exist selenium*.jar (del selenium*.jar)
 start "SeLion Grid Node connected to %HUB_URL%" java -DSeLionConfig=SeLionConfigWindows.json -cp *;. com.paypal.selion.utils.JarSpawner  "java -DSeLionConfig=SeLionConfigWindows.json -Djava.util.logging.config.file=logs/logging.properties -cp \"*;.\" com.paypal.selion.grid.SeLionGridLauncher -role node -hub %HUB_URL% -port 5556 -nodeConfig nodeConfigWindows.json -browserTimeout 60 -servlets com.paypal.selion.node.servlets.NodeAutoUpgradeServlet,com.paypal.selion.node.servlets.NodeForceRestartServlet,com.paypal.selion.node.servlets.LogServlet"


Revert "Update xb.bat"

Revert "Update xb.bat"

@* takes all arguments, even ones shifted off.
We only want to pass ones after --.

This reverts commit f884830590380de43e679688683dd82f9b21607e.

--- xb.bat
+++ xb.bat
@@ -294,8 +294,8 @@
 SET ANY_FAILED=0
 FOR %%G IN (%TEST_NAMES%) DO (
   ECHO.
-  ECHO ^> build\bin\%CONFIG%\%%G.exe %*
-  build\bin\%CONFIG%\%%G.exe %*
+  ECHO ^> build\bin\%CONFIG%\%%G.exe %1 %2 %3 %4 %5 %6 %7 %8 %9
+  build\bin\%CONFIG%\%%G.exe %1 %2 %3 %4 %5 %6 %7 %8 %9
   IF !ERRORLEVEL! NEQ 0 (
     SET ANY_FAILED=1
     IF %CONTINUE% EQU 0 (


Explicitly copy intl.dll from the GTK binaries.

This dependency is somehow not detected by py2exe, but it is required on
the destination machine.  Including it manually seems to be the way to
work around this.

--- make-win32-installer.bat
+++ make-win32-installer.bat
@@ -10,4 +10,5 @@
 call %py% setup.py py2exe
 for %%t in ("etc" "lib" "share\locale\en_GB" "share\themes") do ^
 xcopy %gtk%\%%t %dist%\%%t\ /s /y
+copy %gtk%\bin\intl.dll %dist%\ /y
 call %inno% install.iss


add file from windows branch

add file from windows branch

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

--- core/beaker.command.bat
+++ core/beaker.command.bat
@@ -0,0 +1,2 @@
+@echo off
+build\install\core\bin\core


same for windows

same for windows

--- build/ci.bat
+++ build/ci.bat
@@ -1,6 +1,6 @@
 @echo off
 @setlocal
-
+setlocal EnableDelayedExpansion

 echo Unit Tests
 pushd %~dp0\..
@@ -43,3 +43,9 @@
 dub run --build=unittest
 if %errorlevel% neq 0 exit /b %errorlevel%
 popd
+
+for /D %%D in ("subpackages\*") do (
+    echo %%D
+    dub test --root=%%D
+    if !errorlevel! neq 0 exit /b !errorlevel!
+)


Remove batch file

Remove batch file

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


Added edit script for csDataGatherer.

Added edit script for csDataGatherer.

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

--- csDataGatherer/edit.bat
+++ csDataGatherer/edit.bat
@@ -0,0 +1,4 @@
+@echo off
+start /B atom  . ../csComp ../csServerComp
+nodemon server.js
+start http://localhost:3456


try suggested windows blosc variables

try suggested windows blosc variables

--- recipe/set_bld_opts.bat
+++ recipe/set_bld_opts.bat
@@ -28,7 +28,8 @@
     LIBDIR=%LIBRARY_LIB% ^
     INCDIR=%LIBRARY_INC% ^
     DATADIR=%LIBRARY_PREFIX%\share\gdal ^
-    BLOSC_ROOT=%LIBRARY_PREFIX% ^
+    BLOSC_CFLAGS="-I%LIBRARY_INC%" ^
+    BLOSC_LIBS=%LIBRARY_LIB%\libblosc.lib ^
     CURL_INC="-I%LIBRARY_INC%" ^
     CURL_LIB="%LIBRARY_LIB%\libcurl.lib wsock32.lib wldap32.lib winmm.lib" ^
     EXPAT_DIR=%LIBRARY_PREFIX% ^


add exit conditions to bld.bat

add exit conditions to bld.bat

--- recipes/swashes/bld.bat
+++ recipes/swashes/bld.bat
@@ -1,4 +1,6 @@
 cmake.exe CMakeLists.txt
+if errorlevel 1 exit /b 1
 cmake.exe --build . --config Release
+if errorlevel 1 exit /b 1
 if not exist "%PREFIX%\" mkdir "%PREFIX%"
 COPY bin\swashes.exe %PREFIX%\


added a script for calling the vcvars batch file

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

--- Tools/wix/callVCVARS.bat
+++ Tools/wix/callVCVARS.bat
@@ -0,0 +1,14 @@
+rem Calling vcvars%ARCH%.bat
+
+set MSVCDIR_DEFAULT=C:\Program Files (x86)\Microsoft Visual Studio\2019\Community
+
+if "%MSVCDIR%"=="" (
+    set "MSVCDIR=%MSVCDIR_DEFAULT%"
+    echo Using default MSVCDIR "%MSVCDIR_DEFAULT%", to change set the MSVCDIR environment variable to your install location
+) else (
+    echo MSVCDIR: "%MSVCDIR%"
+)
+
+set VCVARS_DIR="%MSVCDIR%\VC\Auxiliary\Build"
+
+call %VCVARS_DIR%\vcvars%ARCH%.bat


added an install batch file to create folders within new projects for cover_images as well as repository folder

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

--- install.bat
+++ install.bat
@@ -0,0 +1,2 @@
+mkdir ./public/images/cover_images
+mkdir ./public/data/repository


more culr

more culr

--- install.bat
+++ install.bat
@@ -18,22 +18,34 @@

 call cinst curl
 call cinst 7zip
-set PATH=%PATH%;c:\Program Files\7-Zip
+set PATH=%PATH%;C:\Program Files\7-Zip
 call cinst vim
+where gvim.exe
+if ERRORLEVEL 1 call :addVimToUserPath
+goto VIM_DONE
+:addPackerToUserPath
+for /F "tokens=2* delims= " %%f IN ('reg query "HKCU\Environment" /v Path ^| findstr /i path') do set OLD_USER_PATH=%%g
+reg add HKCU\Environment /v Path /d "%OLD_USER_PATH%;C:\Program Fiels (x86)\vim\vim74" /f
+set PATH=%PATH%;C:\Program Files (x86)\vim\vim74
+exit /b
+:VIM_DONE
+
 call cinst msysgit
 call cinst firefox

+set WORKDRIVE=C:
+
 rem Install packer 0.5.1
-if not exist D:\Packer\cache mkdir D:\Packer\cache
-setx PACKER_CACHE_DIR D:\Packer\cache
-set PACKER_CACHE_DIR=D:\Packer\cache
-if not exist D:\Packer\temp mkdir D:\Packer\temp
-setx PACKER_TEMP_DIR D:\Packer\temp
-set PACKER_TEMP_DIR=D:\Packer\temp
+if not exist %WORKDRIVE%\Packer\cache mkdir %WORKDRIVE%\Packer\cache
+setx PACKER_CACHE_DIR %WORKDRIVE%\Packer\cache
+set PACKER_CACHE_DIR=%WORKDRIVE%\Packer\cache
+if not exist %WORKDRIVE%\Packer\temp mkdir %WORKDRIVE%\Packer\temp
+setx PACKER_TEMP_DIR %WORKDRIVE%\Packer\temp
+set PACKER_TEMP_DIR=%WORKDRIVE%\Packer\temp

 rem call cinst packer
 if exist C:\hashicorp\packer\packer.exe goto PACKER_INSTALLED
-curl -J -k https://dl.bintray.com/mitchellh/packer/0.5.1_windows_amd64.zip -O %TEMP%\0.5.1_windows_amd64.zip
+call curl -J -k https://dl.bintray.com/mitchellh/packer/0.5.1_windows_amd64.zip -O %TEMP%\0.5.1_windows_amd64.zip
 mkdir C:\hashicorp\packer
 cd /D C:\hashicorp\packer
 7z x %TEMP%\0.5.1_windows_amd64.zip
@@ -56,7 +68,7 @@
   call curl -L -k https://github.com/StefanScherer/basebox-slave/raw/master/VirtualBox.xml -O "%USERPROFILE%\.VirtualBox\VirtualBox.xml"
 )
 call cinst virtualbox
-if not exist D:\VirtualBox mkdir D:\VirtualBox
+if not exist %WORKDRIVE%\VirtualBox mkdir %WORKDRIVE%\VirtualBox
 rem if exist "C:\program files\oracle\virtualbox\vboxmanage.exe" goto VIRTUALBOX_INSTALLED
 rem wget http://download.virtualbox.org/virtualbox/4.3.6/VirtualBox-4.3.6-91406-Win.exe -O %TEMP%\VirtualBox-4.3.6-91406-Win.exe
 rem %TEMP%\VirtualBox-4.3.6-91406-Win.exe -s
@@ -77,8 +89,8 @@
 rem unzip jenkins.zip
 rem setup.exe -s

-if not exist D:\GitHub mkdir D:\GitHub
-cd /D D:\GitHub
+if not exist %WORKDRIVE%\GitHub mkdir %WORKDRIVE%\GitHub
+cd /D %WORKDRIVE%\GitHub
 if not exist basebox-packer (
   git clone https://github.com/StefanScherer/basebox-packer.git
 ) else (


Added tons of features.

Added tons of features.

Dynamic WIM support*
Cleaned up code

*Supports more than the one that it was written for.
E.G. You can use your own custom wim file instead of using the image compiler's wim.

--- install.bat
+++ install.bat
@@ -2,307 +2,80 @@
 @echo off
 cls
 cd /d %~dp0
-
-rem Sets up the working directory.
+goto setwiminfo

-
-
-goto Menu
-
-
-
-
-
-:Menu
+:setwiminfo
 cls
-set selection=
+echo Please enter the full path to the
+set /p WIM=WIM file of your choice:
 cls
-echo 1. Windows Server
-echo 2. Windows Client
-set /p selection=Please chose which OS type you want [1 or 2]:
-if %selection% EQU 1 goto Server
-if %selection% EQU 2 goto Client
-cls
-echo Invalid input try again!
+echo Path set.
 pause
-goto Menu
-
-:Server
-cls
-set selection=
-echo 1. Server 2008 (x86)
-echo 2. Server 2012 (x64)
-set /p selection=Please chose which OS you want [1 or 2]:
-if %selection% EQU 1 goto 2008
-if %selection% EQU 2 goto 2012
-cls
-echo Invalid input try again!
-pause
-goto Server
-
-:Client
-cls
-set selection=
-echo 1. Windows 8
-echo 2. Windows 7
-echo 3. Windows Vista
-set /p selection=Please chose which OS you want [1, 2 or 3]:
-if %selection% EQU 1 goto 8
-if %selection% EQU 2 goto 7
-if %selection% EQU 3 goto Vista
-cls
-echo Invalid input try again!
-pause
-goto Client
-
-
-:2008
-cls
-set selection=
-echo 1. Server Standard
-echo 2. Server Enterprise
-echo 3. Server Data Center
-echo 4. Server Standard Core (no GUI)
-echo 5. Server Enterprise Core (no GUI)
-echo 6. Server Data Center (no GUI)
-set /p selection=Please chose which OS type you want [1-6]:
-if %selection% EQU 1 goto i19
-if %selection% EQU 2 goto i18
-if %selection% EQU 3 goto i17
-if %selection% EQU 4 goto i16
-if %selection% EQU 5 goto i15
-if %selection% EQU 6 goto i14
-cls
-echo Invalid input try again!
-pause
-goto 2008
-
-:2012
-cls
-set selection=
-echo All are 64 bit (x64)
-echo 1. Server Standard Core (no GUI)
-echo 2. Server Standard
-echo 3. Server Data Center Core (no GUI)
-echo 4. Server Data Center
-set /p selection=Please chose which OS type you want [1-4]:
-if %selection% EQU 1 goto i23
-if %selection% EQU 2 goto i22
-if %selection% EQU 3 goto i21
-if %selection% EQU 4 goto i20
-cls
-echo Invalid input try again!
-pause
-goto 2012
-
-
-:8
-cls
-set selection=
-echo 1. Windows 8 x86
-echo 2. Windows 8 Pro x86
-echo 3. Windows 8 x64
-echo 4. Windows 8 Pro x64
-set /p selection=Please chose which OS type you want [1-4]:
-if %selection% EQU 1 goto i10
-if %selection% EQU 2 goto i11
-if %selection% EQU 3 goto i12
-if %selection% EQU 4 goto i13
-cls
-echo Invalid input try again!
-pause
-goto 8
-
-
-:7
-cls
-set selection=
-echo 1. Windows 7 Starter x86
-echo 2. Windows 7 Home Basic x86
-echo 3. Windows 7 Home Premium x86
-echo 4. Windows 7 Professional x86
-echo 5. Windows 7 Ultimate x86
-echo 6. Windows 7 Home Basic x64
-echo 7. Windows 7 Home Premium x64
-echo 8. Windows 7 Professional x64
-echo 9. Windows 7 Ultimate x64
-set /p selection=Please chose which OS type you want [1-9]:
-if %selection% EQU 1 goto i5
-if %selection% EQU 2 goto i4
-if %selection% EQU 3 goto i3
-if %selection% EQU 4 goto i2
-if %selection% EQU 5 goto i1
-if %selection% EQU 6 goto i9
-if %selection% EQU 7 goto i8
-if %selection% EQU 8 goto i7
-if %selection% EQU 9 goto i6
-cls
-echo Invalid input try again!
-pause
-goto 7
-
-
-:Vista
-cls
-set selection=
-echo 1.  Windows Vista Starter x86
-echo 2.  Windows Vista Business N x86
-echo 3.  Windows Vista Home Basic N x86
-echo 4.  Windows Vista Ultimate x86
-echo 5.  Windows Vista Home Premium x86
-echo 6.  Windows Vista Home Basic x86
-echo 7.  Windows Vista Business x86
-echo 8.  Windows Vista Ultiamte x64
-echo 9.  Windows Vista Home Premium x64
-echo 10. Windows Vista Home Basic x64
-echo 11. Windows Vista Vista Business x64
-set /p selection=Please chose which OS type you want [1-11]:
-if %selection% EQU 1 goto i24
-if %selection% EQU 2 goto i25
-if %selection% EQU 3 goto i26
-if %selection% EQU 4 goto i27
-if %selection% EQU 5 goto i28
-if %selection% EQU 6 goto i29
-if %selection% EQU 7 goto i30
-if %selection% EQU 8 goto i31
-if %selection% EQU 9 goto i32
-if %selection% EQU 10 goto i33
-if %selection% EQU 11 goto i34
-cls
-echo Invalid input try again!
-pause
-goto Vista
-
-
-
-:i1
-set index=1
+imagex /info "%WIM%" | find "<NAME>" >> Images.txt
 goto dest
-:i2
-set index=2
-goto dest
-:i3
-set index=3
-goto dest
-:i4
-set index=4
-goto dest
-:i5
-set index=5
-goto dest
-:i6
-set index=6
-goto dest
-:i7
-set index=7
-goto dest
-:i8
-set index=8
-goto dest
-:i9
-set index=9
-goto dest
-:i10
-set index=10
-goto dest
-:i11
-set index=11
-goto dest
-:i12
-set index=12
-goto dest
-:i13
-set index=13
-goto dest
-:i14
-set index=14
-goto dest
-:i15
-set index=15
-goto dest
-:i16
-set index=16
-goto dest
-:i17
-set index=17
-goto dest
-:i18
-set index=18
-goto dest
-:i19
-set index=19
-goto dest
-:i20
-set index=20
-goto dest
-:i21
-set index=21
-goto dest
-:i22
-set index=22
-goto dest
-:i23
-set index=23
-goto dest
-:i24
-set index=24
-goto dest
-:i25
-set index=25
-goto dest
-:i26
-set index=26
-goto dest
-:i27
-set index=27
-goto dest
-:i28
-set index=28
-goto dest
-:i29
-set index=29
-goto dest
-:i30
-set index=30
-goto dest
-:i31
-set index=31
-goto dest
-:i32
-set index=32
-goto dest
-:i33
-set index=33
-goto dest
-:i34
-set index=34
-goto dest
-
-
-
-:install
-imagex /apply Y:\WIMs\install.wim %index% %dest%:
-pause
-goto Boot
-
-

 :dest
 cls
-echo Please enter the drive letter you want to install to.
-set /p dest=Please chose which letter you want [A-Z]:
-goto install
+echo Where would you like to install the image?
+set /p dest=Enter the drive letter here [A-Z]:
+goto index

+:index
+echo :start >> Display.bat
+echo @echo off >> Display.bat
+echo cls >> Display.bat
+echo cd /d "%~dp0" >> Display.bat
+echo echo List of images avalable for instalation: >> Display.bat
+echo echo *Note the image number on the left of the name* >> Display.bat
+echo find /N "<NAME>" Images.txt >> Display.bat
+echo pause >> Display.bat
+echo del Images.txt >> Display.bat
+echo exit >> Display.bat
+start Display.bat
+cls
+set /p index=Please inter the number of the image (name) you want to install:
+goto install

-:Boot
+:install
+echo this will install the wim to the destination you selected.
+pause
 cls
-echo This will run EasyBCD from which you can install the Boot Loader.
+imagex /apply "%WIM%" %index% "%dest%":
+goto boot
+
+
+:boot
+echo EasyBCD is starting from which you can install the boot loader.
+Y:\Programs\EasyBCD\EasyBCD.exe
 pause
-Y:\Programs\EasyBCD\EasyBCD.exe
+goto cleanup
+
+
+:cleanup
+del Display.bat
+del Images.txt
+goto choice
+
+
+:choice
 cls
-echo Instalation complete!
+echo do you want to install another image?
+choice
+if %ERRORLEVEL% EQU 1 goto start
+if %ERRORLEVEL% EQU 2 goto end
+echo Error please try again :(
 pause
+goto choice
+
+
+:end
+cls
+echo Thank you for using Elliot Labs installer!
+echo For feature requests please email elliot-labs@live.com
+echo Thank you!
+pause | echo Press any key to exit...
+exit


updated file name checklist.rb to check_list_test_cases.rb in test.bat as checklist.rb is deleted

git-svn-id: 6bd94cac40bd5c1df74b384d972046d926de6ffa@11028 a8845c50-7012-0410-95d3-8e1449b9b1e4

--- mifos/test/testscripts/Watir/test.bat
+++ mifos/test/testscripts/Watir/test.bat
@@ -1,7 +1,7 @@
 ruby -I ./modules -S modules/Office/Office.rb
 ruby -I ./modules -S modules/User/User_Test_Cases.rb
 ruby -I ./modules -S modules/Fee/fees_man.rb
-ruby -I ./modules -S modules/check_list/Check_List.rb
+ruby -I ./modules -S modules/check_list/Check_List_Test_Cases.rb
 ruby -I ./modules -S modules/Funds/Funds_Main.rb
 ruby -I ./modules -S modules/ProductCategory/ProductCategory_Test_cases.rb
 ruby -I ./modules -S modules/LoanProduct/LoanProduct_Test_Cases.rb


update

update

--- tool/build-all-platform.bat
+++ tool/build-all-platform.bat
@@ -1,5 +1,3 @@
-rem űڱwindowsµĳʱsqlite
-rem Ҫ֧sqlitelinuxϵͳִbuild-all-platform.sh
 call install-archiver.bat
 cd ..
 go generate


BuildDeps.cmd: Bring back deletion of qt\src\3rdparty\webkit\Source\WebKit. Closes #708.

--- tools/Windows/BuildDeps.cmd
+++ tools/Windows/BuildDeps.cmd
@@ -285,6 +285,7 @@
     cd %QTDIR%

     :: WebKit seems to fail if we've build release first and then trying to build debug, but deleting the generated build files seems to help.
+    IF EXIST src\3rdparty\webkit\Source\WebKit.sln. del /Q src\3rdparty\webkit\Source\WebKit.sln
     IF EXIST src\3rdparty\webkit\Source\Webkit\qt\QtWebKit.%VCPROJ_FILE_EXT%. (
         del /Q src\3rdparty\webkit\Source\Webkit\qt\QtWebKit.%VCPROJ_FILE_EXT%*
         del /Q src\3rdparty\webkit\Source\Webkit\qt\Makefile*


Update SetupComplete.cmd

Update SetupComplete.cmd

--- unattended.win10/Setup/Scripts/SetupComplete.cmd
+++ unattended.win10/Setup/Scripts/SetupComplete.cmd
@@ -28,8 +28,9 @@
 reg add "HKLM\SOFTWARE\Microsoft\WcmSvc\wifinetworkmanager\features" /v WiFiSenseCredShared /t REG_DWORD /d 0 /f
 reg add "HKLM\SOFTWARE\Microsoft\WcmSvc\wifinetworkmanager\features" /v WiFiSenseOpen /t REG_DWORD /d 0 /f

-cscript "%WINDIR%\System32\Printing_Admin_Scripts\en-US\prndrvr.vbs" a -m "Canon LBP2900" -i "%WINDIR%\Setup\Files\CanonLBP2900\CNAB4STD.inf"
-cscript "%WINDIR%\System32\Printing_Admin_Scripts\en-US\prndrvr.vbs" a -m "Canon G2000 series Printer" -i "%WINDIR%\Setup\Files\CanonG2000\Driver\G2000P6.inf"
+rem cscript "%WINDIR%\System32\Printing_Admin_Scripts\en-US\prndrvr.vbs" a -m "Canon LBP2900" -i "%WINDIR%\Setup\Files\CanonLBP2900\CNAB4STD.inf"
+rem cscript "%WINDIR%\System32\Printing_Admin_Scripts\en-US\prndrvr.vbs" a -m "Canon G2000 series Printer" -i "%WINDIR%\Setup\Files\CanonG2000\Driver\G2000P6.inf"
+move "%WINDIR%\Setup\Drivers\*" "%WINDIR%\INF"

 "%WINDIR%\Setup\Files\chocolatey.exe" /S
 "%WINDIR%\Setup\Files\Firefox Setup 52.6.0esr.exe" -ms


compile-win-installer-unsigned: fix the name of the inno setup script

--- script/compile-win-installer-unsigned.bat
+++ script/compile-win-installer-unsigned.bat
@@ -1 +1 @@
-"%ProgramFiles(x86)%\Inno Setup 5\iscc.exe" /Qp "%~dp0\windows-installer\git-lfs-installer.iss"
+"%ProgramFiles(x86)%\Inno Setup 5\iscc.exe" /Qp "%~dp0\windows-installer\inno-setup-git-lfs-installer.iss"


Point diagnostics.bat to updated package name

Also removes the old jar name from being called out in the classpath list.

--- scripts/diagnostics.bat
+++ scripts/diagnostics.bat
@@ -14,6 +14,6 @@
   set DIAG_JAVA_OPTIONS=-Xmx512m
 )

-"%JAVA_EXEC%" %DIAG JAVA_OPTIONS% -cp .\;.\lib\*;support-diagnostics.jar com.elastic.support.DiagnosticApp %*
+"%JAVA_EXEC%" %DIAG JAVA_OPTIONS% -cp .\;.\lib\* com.elastic.support.diagnostics.DiagnosticApp %*

-endlocal+endlocal


strip usernames from source

strip usernames from source

--- resources/stage_1_tempclean/stage_1_tempclean.bat
+++ resources/stage_1_tempclean/stage_1_tempclean.bat
@@ -127,7 +127,7 @@
 title TRON v%SCRIPT_VERSION% [stage_1_tempclean] [Clear Windows Update cache]
 call :log "%CUR_DATE% %TIME%    Launch job 'Clear Windows Update cache'..."
 if /i %DRY_RUN%==no (
-	:: Allow us to start the service in Safe Mode. Thanks to /u/GrizzlyWinter
+	:: Allow us to start the service in Safe Mode
 	reg add "HKLM\SYSTEM\CurrentControlSet\Control\SafeBoot\%SAFEBOOT_OPTION%\WUAUSERV" /ve /t reg_sz /d Service /f >> "%LOGPATH%\%LOGFILE%" 2>&1
 	net stop WUAUSERV >> "%LOGPATH%\%LOGFILE%" 2>&1
 	if exist %windir%\softwaredistribution\download rmdir /s /q %windir%\softwaredistribution\download >> "%LOGPATH%\%LOGFILE%" 2>&1


Update stage_3_disinfect.bat

Update stage_3_disinfect.bat

--- resources/stage_3_disinfect/stage_3_disinfect.bat
+++ resources/stage_3_disinfect/stage_3_disinfect.bat
@@ -39,7 +39,7 @@

 REM :: JOB: RogueKiller
-REM title TRON v%SCRIPT_VERSION% [stage_3_disinfect] [RogueKiller]
+REM title Tron v%SCRIPT_VERSION% [stage_3_disinfect] [RogueKiller]
 REM call functions\log.bat "%CUR_DATE% %TIME%    Launch job 'RogueKiller' (it is SLOW, be patient)..."
 REM if /i %DRY_RUN%==no (
     REM start stage_3_disinfect\roguekiller\RogueKillerAutomation.exe
@@ -50,7 +50,7 @@

 :: JOB: MBAM (MalwareBytes Anti-Malware)
-title TRON v%SCRIPT_VERSION% [stage_3_disinfect] [Malwarebytes Anti-Malware]
+title Tron v%SCRIPT_VERSION% [stage_3_disinfect] [Malwarebytes Anti-Malware]
 if exist "%ProgramFiles(x86)%\Malwarebytes Anti-Malware\mbam.exe" (
 	call functions\log.bat "%CUR_DATE% %TIME% !  Malwarebytes installation detected. Skipping MBAM installation."
 	goto skip_mbam
@@ -83,7 +83,7 @@

 :: JOB: Kaspersky Virus Removal Tool (KVRT)
-title TRON v%SCRIPT_VERSION% [stage_3_disinfect] [Kaspersky VRT]
+title Tron v%SCRIPT_VERSION% [stage_3_disinfect] [Kaspersky VRT]
 if /i %SKIP_KASPERSKY_SCAN%==yes (
 	call functions\log.bat "%CUR_DATE% %TIME% ! SKIP_KASPERSKY_SCAN (-sk) set. Skipping KVRT scan."
 ) else (
@@ -98,7 +98,7 @@

 :: JOB: Sophos Virus Remover
-title TRON v%SCRIPT_VERSION% [stage_3_disinfect] [Sophos Virus Remover]
+title Tron v%SCRIPT_VERSION% [stage_3_disinfect] [Sophos Virus Remover]
 if /i %SKIP_SOPHOS_SCAN%==yes (
 	call functions\log.bat "%CUR_DATE% %TIME% ! SKIP_SOPHOS_SCAN (-ss) set. Skipping SAV scan."
 ) else (


Update stage_3_disinfect.bat

Update stage_3_disinfect.bat

--- resources/stage_3_disinfect/stage_3_disinfect.bat
+++ resources/stage_3_disinfect/stage_3_disinfect.bat
@@ -59,7 +59,7 @@
 	call :log "%CUR_DATE% %TIME%    Launch job 'Install Malwarebytes Anti-Malware'..."
 	:: Install MBAM & remove the desktop icon
 	if /i %DRY_RUN%==no (
-		"stage_3_disinfect\mbam\Malwarebytes Anti-Malware v2.1.8.1057.exe" /verysilent
+		"stage_3_disinfect\mbam\Malwarebytes Anti-Malware v2.2.0.1024.exe" /verysilent
 		::"Malwarebytes Anti-Malware v1.75.0.1300.exe" /SP- /VERYSILENT /NORESTART /SUPPRESSMSGBOXES /NOCANCEL
 		if exist "%PUBLIC%\Desktop\Malwarebytes Anti-Malware.lnk" del "%PUBLIC%\Desktop\Malwarebytes Anti-Malware.lnk"
 		if exist "%USERPROFILE%\Desktop\Malwarebytes Anti-Malware.lnk" del "%USERPROFILE%\Desktop\Malwarebytes Anti-Malware.lnk"


First commit

First commit

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

--- dist/RunChanges.bat
+++ dist/RunChanges.bat
@@ -0,0 +1,2 @@
+@echo off
+java -cp "DiffCDISC.jar" gov.nih.nci.evs.cdisc.Diff %*


Fix test_mobile_net random failed on windows GPU(#29480)

--- paddle/scripts/paddle_build.bat
+++ paddle/scripts/paddle_build.bat
@@ -421,7 +421,7 @@
 test_flags_use_mkldnn^|test_optimizer_in_control_flow^|test_fuse_bn_act_pass^|^
 test_fuse_bn_add_act_pass^|test_activation_mkldnn_op^|test_tsm^|test_gru_rnn_op^|test_rnn_op^|test_simple_rnn_op^|test_pass_builder^|test_lstm_cudnn_op^|test_inplace_addto_strategy^|^
 test_ir_inplace_pass^|test_ir_memory_optimize_pass^|test_memory_reuse_exclude_feed_var^|test_mix_precision_all_reduce_fuse^|test_parallel_executor_pg^|test_print_op^|test_py_func_op^|^
-test_weight_decay^|test_mobile_net^|^
+test_weight_decay^|^
 test_conv2d_int8_mkldnn_op^|^
 test_crypto^|test_callbacks^|test_program_prune_backward^|test_imperative_ocr_attention_model
 rem /*===============================================================*/


make whl-build task only reuse local third_party cache (#35858)

--- paddle/scripts/paddle_build.bat
+++ paddle/scripts/paddle_build.bat
@@ -76,6 +76,7 @@
 if not defined retry_times set retry_times=3
 if not defined PYTHON_ROOT set PYTHON_ROOT=C:\Python37
 if not defined BUILD_DIR set BUILD_DIR=build
+set task_name=%1

 rem ------initialize the python environment------
 set PYTHON_EXECUTABLE=%PYTHON_ROOT%\python.exe
@@ -363,14 +364,22 @@
 %cache_dir%\tools\busybox64.exe bash cache.sh

 set /p md5=< md5.txt
+echo %task_name%|findstr build >nul && (
+    set THIRD_PARTY_HOME=%cache_dir:\=/%/third_party
+    set THIRD_PARTY_PATH=!THIRD_PARTY_HOME!/%md5%
+    echo %task_name% is a whl-build task, will only reuse local third_party cache.
+    goto :cmake_impl
+) || (
+    echo %task_name% is a PR-CI-Windows task, will try to reuse bos and local third_party cache both.
+)
+
 if "%WITH_GPU%"=="ON" (
-    for /F "delims=" %%# in ('nvcc --version^|findstr V1') do set cuda_version=%%#
-    set cuda_version=!cuda_version:~-7,4!
+    for /F %%# in ('dir /b /d "C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\"') do set cuda_version=%%#
+    set cuda_version=!cuda_version:~-4!
     set sub_dir=cuda!cuda_version:.=!
 ) else (
     set sub_dir=cpu
 )
-
 set THIRD_PARTY_HOME=%cache_dir:\=/%/third_party/%sub_dir%
 set THIRD_PARTY_PATH=%THIRD_PARTY_HOME%/%md5%
 set UPLOAD_TP_FILE=OFF
@@ -397,7 +406,7 @@
     if not exist %THIRD_PARTY_PATH% ( set UPLOAD_TP_FILE=ON )
     cd %work_dir%\%BUILD_DIR%
 ) else (
-    echo Found reusable third_party cache locally, will reuse it.
+    echo Found reusable third_party cache in %THIRD_PARTY_PATH%, will reuse it.
 )

 :cmake_impl


CTRL+C is not working on windows XP and windows 7

--- bin/elasticsearch.bat
+++ bin/elasticsearch.bat
@@ -47,6 +47,7 @@
 REM space for a full heap dump.
 REM JAVA_OPTS=%JAVA_OPTS% -XX:HeapDumpPath=$ES_HOME/logs/heapdump.hprof

+set JAVA_OPTS=%JAVA_OPTS% -Djline.enabled=false

 set ES_CLASSPATH=%ES_CLASSPATH%;%ES_HOME%/lib/*;%ES_HOME%/lib/sigar/*
 set ES_PARAMS=-Delasticsearch -Des-foreground=yes -Des.path.home="%ES_HOME%"


Add support for JAVA_HOME with spaces (MID-4732)

Note that JAVA_HOME should *not* be enclosed in quotes!
So

- legal: set JAVA_HOME=c:\java\jre 8
- illegal: set JAVA_HOME="c:\java\jre 8"

--- dist/src/main/bin/midpoint.bat
+++ dist/src/main/bin/midpoint.bat
@@ -49,7 +49,7 @@
 echo Using parameters:      "%*"
 echo.
 echo Starting midPoint.
-start /b %RUN_JAVA% -jar %JAVA_OPTS% -Xms2048M -Xmx4096M -Dpython.cachedir="%MIDPOINT_HOME%\tmp" -Djavax.net.ssl.trustStore="%MIDPOINT_HOME%\keystore.jceks" -Djavax.net.ssl.trustStoreType=jceks -Dmidpoint.home="%MIDPOINT_HOME%" "%LIB_DIR%\midpoint.war" %* > "%BOOT_OUT%" 2>&1
+start /b "midPoint" "%RUN_JAVA%" -jar %JAVA_OPTS% -Xms2048M -Xmx4096M -Dpython.cachedir="%MIDPOINT_HOME%\tmp" -Djavax.net.ssl.trustStore="%MIDPOINT_HOME%\keystore.jceks" -Djavax.net.ssl.trustStoreType=jceks -Dmidpoint.home="%MIDPOINT_HOME%" "%LIB_DIR%\midpoint.war" %* > "%BOOT_OUT%" 2>&1
 goto end

 :doStop


windows: add autoreconf

windows: add autoreconf

--- recipes/libredwg/bld.bat
+++ recipes/libredwg/bld.bat
@@ -1,4 +1,5 @@
+bash -lc "autoreconf --install --symlink -I m4"
 bash -lc "configure --prefix=$PREFIX"

 bash -lc "make"
-bash -lc "make install"+bash -lc "make install"


Try to fix Windows tests

Try to fix Windows tests

--- recipes/sip/run_test.bat
+++ recipes/sip/run_test.bat
@@ -3,7 +3,7 @@
 sip -c . -b word.sbf word.sip
 if errorlevel 1 exit 1

-%PYTHON% configure.py
+python configure.py
 if errorlevel 1 exit 1

 nmake


removed !cons_nt.bat

removed !cons_nt.bat

--- os/osask/os-src/helloos0/!cons_nt.bat
+++ os/osask/os-src/helloos0/!cons_nt.bat
@@ -1 +0,0 @@
-cmd.exe


Enable building with VS2019

Enable building with VS2019

--- build/nuget-build.bat
+++ build/nuget-build.bat
@@ -4,13 +4,19 @@
 set workingdir=%~dp0
 set outputdir=%workingdir%nuget-unsigned

-@rem Initialize build environment of Visual Studio 2017 Community/Professional/Enterprise
+@rem Initialize build environment of Visual Studio 2017 or 2019 Community/Professional/Enterprise
 @set tools=
 @set tmptools="c:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools\VsMSBuildCmd.bat"
 @if exist %tmptools% set tools=%tmptools%
 @set tmptools="c:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\Common7\Tools\VsMSBuildCmd.bat"
 @if exist %tmptools% set tools=%tmptools%
 @set tmptools="c:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Common7\Tools\VsMSBuildCmd.bat"
+@if exist %tmptools% set tools=%tmptools%
+@set tmptools="c:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\Tools\VsMSBuildCmd.bat"
+@if exist %tmptools% set tools=%tmptools%
+@set tmptools="c:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\Common7\Tools\VsMSBuildCmd.bat"
+@if exist %tmptools% set tools=%tmptools%
+@set tmptools="c:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\VsMSBuildCmd.bat"
 @if exist %tmptools% set tools=%tmptools%
 @if not defined tools goto :error
 call %tools%


package/ci: disable building of OVR example on MinGW.

Not officially supported, so I don't care.

--- package/ci/appveyor-desktop-mingw.bat
+++ package/ci/appveyor-desktop-mingw.bat
@@ -39,6 +39,10 @@
 cd .. && cd ..

 rem Build Magnum Integration
+rem For MinGW it's not possible to use the OVR SDK directly, the Oculus Runtime
+rem is needed to be installed, but that's apparently not possible from a
+rem command-line so I'm just disabling it.
+rem https://forums.oculus.com/community/discussion/18303/silent-installation-of-oculus-runtime-windows
 git clone --depth 1 git://github.com/mosra/magnum-integration.git || exit /b
 cd magnum-integration || exit /b
 mkdir build && cd build || exit /b
@@ -46,7 +50,7 @@
     -DCMAKE_BUILD_TYPE=Release ^
     -DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%/deps ^
     -DWITH_BULLET=OFF ^
-    -DWITH_OVR=ON ^
+    -DWITH_OVR=OFF ^
     -G "MinGW Makefiles" || exit /b
 cmake --build . -- -j || exit /b
 cmake --build . --target install -- -j || exit /b
@@ -61,7 +65,7 @@
     -DWITH_BULLET_EXAMPLE=OFF ^
     -DWITH_CUBEMAP_EXAMPLE=ON ^
     -DWITH_MOTIONBLUR_EXAMPLE=ON ^
-    -DWITH_OVR_EXAMPLE=ON ^
+    -DWITH_OVR_EXAMPLE=OFF ^
     -DWITH_PICKING_EXAMPLE=ON ^
     -DWITH_PRIMITIVES_EXAMPLE=ON ^
     -DWITH_TEXT_EXAMPLE=ON ^


Win: do not specify the compiler

Win: do not specify the compiler

--- recipes/jkqtplotter/bld.bat
+++ recipes/jkqtplotter/bld.bat
@@ -1,7 +1,6 @@
 mkdir build
 cd build
 cmake \
-    -G "Visual Studio 15 2017 Win64" \
     -DCMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% \
     -DCMAKE_PREFIX_PATH=%LIBRARY_PREFIX% \
     -DJKQtPlotter_BUILD_EXAMPLES=OFF \


Quote escape `==` call

Quote escape `==` call

If `VIRTUAL_ENV` includes a space, the `==` call will result in an error.  This fixes the issue.

--- scripts/rmvirtualenv.bat
+++ scripts/rmvirtualenv.bat
@@ -14,7 +14,7 @@
 )

 if defined VIRTUAL_ENV (
-    if [%VIRTUAL_ENV%]==[%WORKON_HOME%\%1] call "%WORKON_HOME%\%1\Scripts\deactivate.bat"
+    if ["%VIRTUAL_ENV%"]==["%WORKON_HOME%\%1"] call "%WORKON_HOME%\%1\Scripts\deactivate.bat"
 )

 if not defined VIRTUALENVWRAPPER_PROJECT_FILENAME (
@@ -49,4 +49,4 @@

 set _CURRDIR=

-:END+:END


Created run script to launch QEMU and load kernel image.


Script to install clonedrive app

Script to install clonedrive app

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

--- scripts/InstallCloneDrive.cmd
+++ scripts/InstallCloneDrive.cmd
@@ -0,0 +1,5 @@
+@echo off
+
+start /w C:\\cfn\\xd\\SetupVirtualCloneDrive5470.exe /S
+
+del "C:\Users\Public\Desktop\Virtual CloneDrive.lnk"


pass more command line args to make on windows

Summary: I want to be able to run `make all py-integration` so we need pass more args through

Reviewed By: farnz

Differential Revision: D3921560

fbshipit-source-id: 1abaaa90393ca7a12a3e01aee226b4179e43cd8f

--- make.bat
+++ make.bat
@@ -23,7 +23,7 @@
 if %ERRORLEVEL% GTR 0 set PATH=c:\php;%PATH%

 @rem finally, run make
-nmake /nologo /s /f winbuild\Makefile %1
+nmake /nologo /s /f winbuild\Makefile %1 %2 %3 %4

 SET RETURN_CODE=%ERRORLEVEL%


update make.bat

update make.bat

--- make.bat
+++ make.bat
@@ -1,26 +1,27 @@
-@ECHO OFF
+@echo off

-REM ==========================================================================
-REM Shortcuts for various tasks, emulating UNIX "make" on Windows.
-REM Use this script for various tasks such as installing psutil or
-REM running tests ("make.bat test").
-REM This script is modeled after my Windows installation so it might
-REM need some adjustements in order to work on your system.
-REM By default C:\Python27\python.exe is used.
-REM To run another Python version run:
-REM set PYTHON=C:\Python33\python.exe & make test
-REM In case of Python 2.4 and 2.5 mingw32 compiler is used.
-REM ==========================================================================
+rem ==========================================================================
+rem Shortcuts for various tasks, emulating UNIX "make" on Windows.
+rem It is primarly intended as a shortcut for compiling / installing
+rem psutil and running tests (just run "make.bat test").
+rem This script is modeled after my Windows installation which uses:
+rem - mingw32 for Python 2.4 and 2.5
+rem - Visual studio 2008 for Python 2.6, 2.7, 3.2
+rem - Visual studio 2010 for Python 3.3+
+rem By default C:\Python27\python.exe is used.
+rem To use another Python version run:
+rem     set PYTHON=C:\Python24\python.exe & make.bat test
+rem ==========================================================================

 if "%PYTHON%" == "" (
-    SET PYTHON=C:\Python27\python.exe
+    set PYTHON=C:\Python27\python.exe
 )
 if "%TSCRIPT%" == "" (
-    SET TSCRIPT=test\test_psutil.py
+    set TSCRIPT=test\test_psutil.py
 )
-SET PATH=%PYTHON%;%PATH%
-SET PATH=C:\MinGW\bin;%PATH%
+set PATH=%PYTHON%;%PATH%
+set PATH=C:\MinGW\bin;%PATH%

 if "%1" == "help" (


Update make.bat add 'all' choice, which can call multiple tasks.

--- make.bat
+++ make.bat
@@ -2,83 +2,84 @@
 ::Takes one parameter for task.
 @ECHO OFF
 SET choice=%1
+SET tasks=clean, lua, watch, lint, map, test, diagram, doc, all

 ::Ask for make task if not specified
 IF /I "%choice%"=="" (
 SET didinput=1
-echo.
+echo/
 echo Valid Tasks are:
-echo    clean, lua, watch, lint, map, test, diagram, doc
-echo.
+echo    %tasks%
+echo/
 SET /P choice="What would you like to make?: "
 )

 ::Handle task input
 IF /I "%choice%"=="" GOTO INVALID
-IF /I %choice%==clean GOTO clean
-IF /I %choice%==lua GOTO lua
-IF /I %choice%==watch GOTO watch
-IF /I %choice%==lint GOTO lint
-IF /I %choice%==map GOTO map
-IF /I %choice%==test GOTO test
-IF /I %choice%==diagram GOTO diagram
-IF /I %choice%==doc GOTO doc
+IF /I %choice%==clean (CALL :clean & GOTO end)
+IF /I %choice%==lua (CALL :lua & GOTO end)
+IF /I %choice%==watch ( CALL :watch & GOTO end )
+IF /I %choice%==lint ( CALL :lint & GOTO end )
+IF /I %choice%==map ( CALL :map & GOTO end )
+IF /I %choice%==test ( CALL :test & GOTO end )
+IF /I %choice%==diagram ( CALL :diagram & GOTO end )
+IF /I %choice%==doc ( CALL :doc & GOTO end )
+IF /I %choice%==all ( CALL :all & GOTO end )
 GOTO INVALID

 ::Invalid task
 :INVALID
-echo.
+echo/
 echo Invalid Task.
-IF NOT DEFINED %didinput% (
-echo Valid Tasks are:
-echo    clean, lua, watch, lint, map, test, diagram, doc
-echo.
+IF NOT DEFINED didinput (
+	echo Valid Tasks are:
+	echo    %tasks%
+	echo/
 )
-PAUSE
-GOTO :EOF
+GOTO end

 ::Makefile commands
 :clean
 echo "clean"
-PAUSE
 GOTO :EOF

 :lua
 echo "lua"
-PAUSE
 GOTO :EOF

 :watch
 echo "watch"
-PAUSE
 GOTO :EOF

 :lint
 echo "lint"
-PAUSE
 GOTO :EOF

 :map
 echo "map"
-PAUSE
 GOTO :EOF

 :test
 echo "test"
-PAUSE
 GOTO :EOF

 :diagram
 echo "diagram"
-PAUSE
 GOTO :EOF

 :doc
 echo "doc"
-PAUSE
 GOTO :EOF

+:all
+CALL :lua
+CALL :map
+CALL :doc
+GOTO :EOF
+
+:end
+PAUSE


Bugfix

Bugfix

--- pulsar/INSTALL_LuMP_Pulsar_SOFA.bat
+++ pulsar/INSTALL_LuMP_Pulsar_SOFA.bat
@@ -67,7 +67,7 @@
     # ./t_sofa_f
     #  T_SOFA_F validation successful
     a=`./t_sofa_f`
-    if [ "${a"} == " T_SOFA_F validation successful" ];then
+    if [ "${a}" == " T_SOFA_F validation successful" ];then
         true
     else
         echo "SOFA test failed"


FIX: run.bat had wrong docker tag

FIX: run.bat had wrong docker tag

--- docker/run.bat
+++ docker/run.bat
@@ -1,4 +1,4 @@
 docker run 	--rm -it 	^
 		-v %CD%\work:/home/pytfa/work 	^
 		-v %CD%/..:/src/pytfa		^
-		cobratfapy3 %*
+		pytfa_docker %*


Added usage and install task.

Added usage and install task.

git-svn-id: 8a910031c78bbe8a754298bb28800c1494820db3@693 0604bb77-1110-461e-859e-28c50bf9b280

--- software/build/build.cmd
+++ software/build/build.cmd
@@ -5,7 +5,16 @@
 setlocal
 cls
 if "%1" == "" (
-    ant usage
+    echo.
+    echo Available targets are:
+    echo.
+    echo   clean        -- Remove classes directory for clean build
+    echo   all          -- Normal build of application
+    echo   upgrade      -- Build and upgrade application
+    echo   install      -- Builds, installs JBoss locally
+    echo   dev          -- Builds, upgrades JBoss on DEV
+    echo   qa           -- Builds, upgrades JBoss on QA
+    echo   deploy       -- Redeploy application
     goto DONE
 )
 if "%1" == "all" (
@@ -14,6 +23,10 @@
 )
 if "%1" == "upgrade" (
     ant deploy:local:upgrade
+    goto DONE
+)
+if "%1" == "install" (
+    ant deploy:local:install
     goto DONE
 )
 if "%1" == "deploy" (


Typo fix

Typo fix

--- archive.bat
+++ archive.bat
@@ -1,6 +1,6 @@
 @echo off

-set dest=jwpdctoc
+set dest=jwpdftoc

 if exist %dest% goto build
 mkdir %dest%


Adapted the build file to the simulator project

--- make.pe.bat
+++ make.pe.bat
@@ -4,46 +4,28 @@
 REM This file is for building the Poker Enlighter executable.

 REM The build log file:
-set buildlog=build_.%1_%2.log
+set buildlog=build.log

 REM Some very important notes:
-REM - The script expects 2 parameters: the version of Poker Enlighter followed
-REM by the build number. For example: "myscript.bat 2.3 538"
-REM - The script assumes the availability of the java, javac, jar, xcopy, winrar and md5sum commands.
-REM - The path of the rt.jar file (main file of the JRE) is hardcoded within the proguard config file.
+REM - The script assumes the availability of the java, javac and jar commands.
 REM - The script makes very specific assumptions of the structure of the JAR file, in the packaging
 REM stage. Please keep this script in sync with this structure.
-

 REM We're going to count execution time. So, remeber start time. Note that we don't look at the date, so this
 REM calculation won't work right if the program run spans local midnight.
 set t0=%time: =0%

-
 REM First, let's define some variables that contain most used names and paths
 REM throughout the build script. Changes of these variables will propagate down the script.

-set tmpbuilddir=release.%1.%2
-set manifestfile=Manifest.txt
-set proguardfile=proguard.config
-set perawfile=Poker.Enlighter.raw.jar
-set peobfuscatedfile=Poker.Enlighter.obfuscated.jar
 set simulatorjar=simulator.jar
-set guijar=Poker Enlighter.jar
-set mainclass=org/javafling/pokerenlighter/main/PokerEnlighter
-set lib1=lib/substance.lnf/substance.jar
-set lib2=lib/substance.lnf/trident.jar
-set lib3=lib/easynth.lnf/EaSynthLookAndFeel.jar
-set lib4=lib/jfreechart/jcommon-1.0.22.jar
-set lib5=lib/jfreechart/jfreechart-1.0.18.jar
-set lib6=lib/nimrod.lnf/nimrodlf-1.2.jar
-set lib7=lib/seaglass.lnf/seaglasslookandfeel-0.2.jar
+set simulatorclass=org/javafling/pokerenlighter/simulation/Simulator

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

-javac -g:none -Xlint:unchecked -classpath .;%simulatorjar%;%lib1%;%lib2%;%lib3%;%lib4%;%lib5%;%lib6%;%lib7% %mainclass%.java > %buildlog% 2>&1
+javac -g:none -Xlint:unchecked %simulatorclass%.java > %buildlog% 2>&1
 timeout /t 1 /nobreak > NUL

 REM Next, the script will move inside the "org/" folder and delete all the source code files.
@@ -55,114 +37,9 @@
 timeout /t 1 /nobreak > NUL
 cd..

-REM Next, the Manifest file is built. This is needed for the JAR file.
-
-echo Main-Class: %mainclass% > %manifestfile%
-echo Class-Path: %simulatorjar% %lib1% %lib2% %lib3% %lib4% %lib5% %lib6% %lib7% >> %manifestfile%
-
 REM Package everything in a JAR file.

-jar cfm0 %perawfile% %manifestfile% org/* >> %buildlog% 2>&1
-
-REM The Proguard config file is created below
-
-echo -injars %perawfile% > %proguardfile%
-echo -outjars %peobfuscatedfile% >> %proguardfile%
-echo -libraryjars 'C:\Program Files\Java\jre7\lib\rt.jar' >> %proguardfile%
-echo -libraryjars %lib1% >> %proguardfile%
-echo -libraryjars %lib2% >> %proguardfile%
-echo -libraryjars %lib3% >> %proguardfile%
-echo -libraryjars %lib4% >> %proguardfile%
-echo -libraryjars %lib5% >> %proguardfile%
-echo -libraryjars %lib6% >> %proguardfile%
-echo -libraryjars %lib7% >> %proguardfile%
-echo -target 1.7 >> %proguardfile%
-echo -dontshrink >> %proguardfile%
-echo -dontoptimize >> %proguardfile%
-echo -dontusemixedcaseclassnames >> %proguardfile%
-echo -verbose >> %proguardfile%
-echo -keepclasseswithmembers public class * { >> %proguardfile%
-echo     public static void main(java.lang.String[]); >> %proguardfile%
-echo } >> %proguardfile%
-echo -keepclassmembers enum  * { >> %proguardfile%
-echo public static **[] values(); >> %proguardfile%
-echo     public static ** valueOf(java.lang.String); >> %proguardfile%
-echo } >> %proguardfile%
-echo -keep class * extends javax.swing.plaf.ComponentUI { >> %proguardfile%
-echo     public static javax.swing.plaf.ComponentUI createUI(javax.swing.JComponent); >> %proguardfile%
-echo } >> %proguardfile%
-echo -keepclasseswithmembers,allowshrinking class * { >> %proguardfile%
-echo     native ^<methods^>; >> %proguardfile%
-echo } >> %proguardfile%
-
-REM The JAR file is obfuscated.
-
-java -jar proguard.jar @%proguardfile% -verbose >> %buildlog% 2>&1
-
-REM The proguard file and old JAR file is no longer needed
-
-del %proguardfile% >> %buildlog% 2>&1
-del %perawfile% >> %buildlog% 2>&1
-
-REM A new temporary directory will be made where the JAR file will be split in 2 and packaged.
-
-mkdir %tmpbuilddir%
-
-REM Move / copy all relevant files to the new directory and switch working dir to that directory
-
-xcopy "lib\*.*" %tmpbuilddir%\lib /E /I >> %buildlog% 2>&1
-xcopy "config\*.*" %tmpbuilddir%\config /E /I >> %buildlog% 2>&1
-xcopy LICENSE.txt %tmpbuilddir% >> %buildlog% 2>&1
-move %manifestfile% %tmpbuilddir% >> %buildlog% 2>&1
-move %peobfuscatedfile% %tmpbuilddir% >> %buildlog% 2>&1
-cd %tmpbuilddir%
-
-REM Next, the JAR file will be extracted
-
-jar -xf %peobfuscatedfile% >> %buildlog% 2>&1
-
-REM Next, delete the /a and /c directories (/combination and /simulation respectively) and
-REM move the images directory in the right location
-
-rmdir "org/javafling/pokerenlighter/a" /S /Q >> %buildlog% 2>&1
-rmdir "org/javafling/pokerenlighter/c" /S /Q >> %buildlog% 2>&1
-move org/javafling/pokerenlighter/gui/images org/javafling/pokerenlighter/b >> %buildlog% 2>&1
-rmdir "org/javafling/pokerenlighter/gui" /S /Q >> %buildlog% 2>&1
-
-REM Next, it's time to rebuild the JAR file
-
-jar cfm0 "%guijar%" %manifestfile% org/* >> %buildlog% 2>&1
-
-REM Next, the simulator's JAR file must be created. So a new extraction needs to be made.
-
-jar -xf %peobfuscatedfile% >> %buildlog% 2>&1
-rmdir "org/javafling/pokerenlighter/b" /S /Q >> %buildlog% 2>&1
-rmdir "org/javafling/pokerenlighter/gui" /S /Q >> %buildlog% 2>&1
-rmdir "org/javafling/pokerenlighter/main" /S /Q >> %buildlog% 2>&1
-jar cf0 "%simulatorjar%" org/* >> %buildlog% 2>&1
-
-REM Next, we package everything in a zip file.
-REM - "a" means create archive.
-REM - "-afzip" means make it a ZIP archive
-REM - "-m0" means no compression
-
-winrar a -afzip -r -m0 "poker.enlighter.%1.%2.zip" LICENSE.txt %simulatorjar% "%guijar%" config/* lib/*  >> %buildlog% 2>&1
-
-REM Next, we delete everything but the archive.
-
-del %peobfuscatedfile% >> %buildlog% 2>&1
-rmdir "org/" /S /Q >> %buildlog% 2>&1
-rmdir "META-INF/" /S /Q >> %buildlog% 2>&1
-rmdir "lib/" /S /Q >> %buildlog% 2>&1
-rmdir "config/" /S /Q >> %buildlog% 2>&1
-del LICENSE.txt >> %buildlog% 2>&1
-del %manifestfile% >> %buildlog% 2>&1
-del "%guijar%" >> %buildlog% 2>&1
-del %simulatorjar% >> %buildlog% 2>&1
-
-REM Finally, we need a MD5 hash value for the archive.
-
-md5sum "poker.enlighter.%1.%2.zip" > md5sum.txt
+jar cf0 %simulatorjar% org/* >> %buildlog% 2>&1

 REM And we are done. Enjoy.


Updated docs.cmd

Updated docs.cmd

--- SpotifyAPI.Docs/docs.cmd
+++ SpotifyAPI.Docs/docs.cmd
@@ -1,8 +1,9 @@
 if "%APPVEYOR_PULL_REQUEST_NUMBER%" == "" (
-  echo Pushing docs...
+  echo Building docs...
   pip install mkdocs
   cd ./SpotifyAPI.Docs
   mkdocs build
+  cd ..
 ) else (
   echo Skipping doc build
 )


Update heroku.cmd to check LOCALAPPDATA (#569)

--- resources/exe/heroku.cmd
+++ resources/exe/heroku.cmd
@@ -1,3 +1,10 @@
-@echo off
-set CLI_BINPATH=%~dp0\heroku.cmd
-"%~dp0\..\cli\bin\node.exe" "%~dp0\..\cli\bin\heroku.js" %*
+@echo off
+
+set CLI_BINPATH=%~dp0\heroku.cmd
+set CLI_LOCAL_BIN=%LOCALAPPDATA%\heroku\client\bin\heroku.cmd
+
+if exist "%CLI_LOCAL_BIN%" (
+  "%CLI_LOCAL_BIN%" %*
+) else (
+  "%~dp0\..\cli\bin\node.exe" "%~dp0\..\cli\bin\heroku.js" %*
+)


Bring back system-wide deployment tool Intended for systems and use cases where hardware accelerated OpenGL is not available. This covers Windows virtual machines in the cloud and RDP connections.

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

--- bin/systemwidedeploy.cmd
+++ bin/systemwidedeploy.cmd
@@ -0,0 +1,110 @@
+@echo off
+
+:: BatchGotAdmin
+:-------------------------------------
+REM  --> Check for permissions
+    IF "%PROCESSOR_ARCHITECTURE%" EQU "amd64" (
+>nul 2>&1 "%SYSTEMROOT%\SysWOW64\cacls.exe" "%SYSTEMROOT%\SysWOW64\config\system"
+) ELSE (
+>nul 2>&1 "%SYSTEMROOT%\system32\cacls.exe" "%SYSTEMROOT%\system32\config\system"
+)
+
+REM --> If error flag set, we do not have admin.
+if '%errorlevel%' NEQ '0' (
+    echo Requesting administrative privileges...
+    goto UACPrompt
+) else ( goto gotAdmin )
+
+:UACPrompt
+    echo Set UAC = CreateObject^("Shell.Application"^) > "%temp%\getadmin.vbs"
+    set params = %*:"=""
+    echo UAC.ShellExecute "cmd.exe", "/c ""%~s0"" %params%", "", "runas", 1 >> "%temp%\getadmin.vbs"
+
+    "%temp%\getadmin.vbs"
+    del "%temp%\getadmin.vbs"
+    exit /B
+
+:gotAdmin
+    pushd "%CD%"
+    CD /D "%~dp0"
+:--------------------------------------
+
+@TITLE Mesa3D system-wide deployment utility
+@echo Mesa3D system-wide deployment utility
+@echo -------------------------------------
+@echo This deployment utility targets systems without working GPUs and any use case
+@echo where hardware accelerated OpenGL is not available. This mainly covers
+@echo virtual machines in cloud environments and RDP connections. It can be
+@echo used to replace Microsoft Windows inbox OpenGL 1.1 software render
+@echo driver with Mesa3D softpipe, llvmpipe or swr driver.
+@echo.
+@pause
+@set mesaloc=%~dp0
+
+:deploy
+@cls
+@echo Mesa3D system-wide deployment utility
+@echo -------------------------------------
+@echo Please make a deployment choice:
+@echo 1. Desktop OpenGL drivers (softpipe and llvmpipe only);
+@IF /I %PROCESSOR_ARCHITECTURE%==AMD64 echo 2. Desktop OpenGL drivers (softpipe, llvmpipe and swr drivers);
+@echo 3. Mesa3D off-screen render driver gallium version (osmesa gallium);
+@echo 4. Mesa3D off-screen render driver classic version (osmesa swrast);
+@echo 5. Mesa3D graw framework with display support (graw gdi);
+@echo 6. Exit
+@set /p deploychoice=Enter choice:
+@if "%deploychoice%"=="1" GOTO desktopgl
+@if "%deploychoice%"=="2" GOTO desktopgl
+@if "%deploychoice%"=="3" GOTO osmesa
+@if "%deploychoice%"=="4" GOTO osmesa
+@if "%deploychoice%"=="5" GOTO graw
+@if "%deploychoice%"=="6" GOTO exit
+@echo Invaild entry
+@pause
+@GOTO deploy
+
+:desktopgl
+@if "%deploychoice%"=="2" if /I NOT %PROCESSOR_ARCHITECTURE%==AMD64 echo Invalid choice. swr driver is only supported on X64/AMD64 systems.
+@if "%deploychoice%"=="2" if /I NOT %PROCESSOR_ARCHITECTURE%==AMD64 pause
+@if "%deploychoice%"=="2" if /I NOT %PROCESSOR_ARCHITECTURE%==AMD64 GOTO deploy
+@IF /I %PROCESSOR_ARCHITECTURE%==X86 copy "%mesaloc%x86\opengl32.dll" "%windir%\System32\mesadrv.dll"
+@IF /I %PROCESSOR_ARCHITECTURE%==AMD64 copy "%mesaloc%x86\opengl32.dll" "%windir%\SysWOW64\mesadrv.dll"
+@IF /I %PROCESSOR_ARCHITECTURE%==AMD64 copy "%mesaloc%x64\opengl32.dll" "%windir%\System32\mesadrv.dll"
+@if "%deploychoice%"=="2" IF /I %PROCESSOR_ARCHITECTURE%==AMD64 copy "%mesaloc%x64\swr*.dll" "%windir%\System32"
+@IF /I %PROCESSOR_ARCHITECTURE%==AMD64 REG ADD "HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Windows NT\CurrentVersion\OpenGLDrivers\MSOGL" /v "DLL" /t REG_SZ /d "mesadrv.dll" /f
+@IF /I %PROCESSOR_ARCHITECTURE%==AMD64 REG ADD "HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Windows NT\CurrentVersion\OpenGLDrivers\MSOGL" /v "DriverVersion" /t REG_DWORD /d "1" /f
+@IF /I %PROCESSOR_ARCHITECTURE%==AMD64 REG ADD "HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Windows NT\CurrentVersion\OpenGLDrivers\MSOGL" /v "Flags" /t REG_DWORD /d "1" /f
+@IF /I %PROCESSOR_ARCHITECTURE%==AMD64 REG ADD "HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Windows NT\CurrentVersion\OpenGLDrivers\MSOGL" /v "Version" /t REG_DWORD /d "2" /f
+@REG ADD "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\OpenGLDrivers\MSOGL" /v "DLL" /t REG_SZ /d "mesadrv.dll" /f
+@REG ADD "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\OpenGLDrivers\MSOGL" /v "DriverVersion" /t REG_DWORD /d "1" /f
+@REG ADD "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\OpenGLDrivers\MSOGL" /v "Flags" /t REG_DWORD /d "1" /f
+@REG ADD "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\OpenGLDrivers\MSOGL" /v "Version" /t REG_DWORD /d "2" /f
+@echo.
+@echo Desktop OpenGL drivers deploy complete.
+@pause
+@GOTO deploy
+
+:osmesa
+@if "%deploychoice%"=="3" set osmesatype=gallium
+@if "%deploychoice%"=="4" set osmesatype=swrast
+@IF /I %PROCESSOR_ARCHITECTURE%==X86 copy "%mesaloc%x86\osmesa-%osmesatype%\osmesa.dll" "%windir%\System32"
+@IF /I %PROCESSOR_ARCHITECTURE%==AMD64 copy "%mesaloc%x86\osmesa-%osmesatype%\osmesa.dll" "%windir%\SysWOW64"
+@IF /I %PROCESSOR_ARCHITECTURE%==AMD64 copy "%mesaloc%x64\osmesa-%osmesatype%\osmesa.dll" "%windir%\System32"
+@echo.
+@echo Off-screen render driver deploy complete.
+@pause
+@GOTO deploy
+
+:graw
+@IF /I %PROCESSOR_ARCHITECTURE%==X86 copy "%mesaloc%x86\graw.dll" "%windir%\System32"
+@IF /I %PROCESSOR_ARCHITECTURE%==AMD64 copy "%mesaloc%x86\graw.dll" "%windir%\SysWOW64"
+@IF /I %PROCESSOR_ARCHITECTURE%==AMD64 copy "%mesaloc%x64\graw.dll" "%windir%\System32"
+@echo.
+@echo graw framework deploy complete.
+@pause
+@GOTO deploy
+
+:exit
+@echo Good Bye!
+@pause
+@exit


test: continuation (3)

test: continuation (3)

--- test.bat
+++ test.bat
@@ -3,12 +3,12 @@
 SET DEBUG=node-emitter-details
 CD ./test
 REM double quotes around %%f are needed cause the filename has a space
-IF %IS_TRAVIS_CI%==true (ECHO detected Travis-CI environment)
+IF %CI%==true (ECHO detected Travis-CI environment)
 FOR /r %%f IN (*) DO (
   REM get file name
   FOR %%F in ("%%f") DO (
     IF "%%~nxF"=="stack-trace.js" (
-      IF %IS_TRAVIS_CI%==true (
+      IF %CI%==true (
       ECHO SKIPPING %%~nxF
       ) ELSE (
       ECHO NODE TESTING: & ECHO. %%~nxF & ECHO ---


get rid of unwanted commit

get rid of unwanted commit

--- test.bat
+++ test.bat
@@ -1,5 +1,5 @@
 cd tests\test_plugin
 python setup.py install
 cd ..\..\
-nosetests --with-doctest --doctest-extension=.rst doc/source pyexcel tests --with-cov --cov examples --cov pyexcel --cov tests
+nosetests --with-doctest --doctest-extension=.rst doc/source pyexcel tests
 del tmp.db


bat-file

bat-file


Update tron_settings.bat

Update tron_settings.bat

--- resources/functions/tron_settings.bat
+++ resources/functions/tron_settings.bat
@@ -46,8 +46,8 @@
 :::::::::::::::::::::
 :: SCRIPT DEFAULTS ::
 :::::::::::::::::::::
-:: ! These are Tron's defaults. All settings here are overridden if their respective command-line flag is used
-::   If you use a CLI flag and Tron encounters a reboot, the CLI flag will be honored when the script resumes
+:: ! These are Tron's defaults. All settings here are overridden if their respective command-line switch is used
+::   If you use a CLI switch and Tron encounters a reboot, the CLI switch will be honored when the script resumes
 :: AUTORUN                (-a)   = Automatic execution (no welcome screen or prompts), implies -e
 :: AUTORUN_IN_SAFE_MODE   (-asm) = Automatic execution (no welcome screen or prompts), implies -e, autoboots to Safe Mode
 :: DRY_RUN                (-d)   = Run through script but skip all actual actions (test mode)
@@ -59,7 +59,7 @@
 :: AUTO_SHUTDOWN          (-o)   = Shutdown after the finishing. Overrides auto-reboot
 :: PRESERVE_POWER_SCHEME  (-p)   = Preserve active power scheme. Default is to reset power scheme to Windows defaults at the end of Tron
 :: AUTO_REBOOT_DELAY      (-r)   = Post-run delay (in seconds) before rebooting. Set to 0 to disable auto-reboot
-:: SKIP_ANTIVIRUS_SCANS   (-sa)  = Skip ALL antivirus scans (KVRT, MBAM, SAV). Use per-scanner flags to individually toggle usage
+:: SKIP_ANTIVIRUS_SCANS   (-sa)  = Skip ALL antivirus scans (KVRT, MBAM, SAV). Use per-scanner switches to individually toggle usage
 :: SKIP_APP_PATCHES       (-sap) = Set to yes to skip application patches (don't patch 7-Zip or Adobe Flash Player)
 :: SKIP_CUSTOM_SCRIPTS    (-scs) = Set to yes to forcibly skip Stage 8: Custom Scripts regardless whether or not .bat files exist in the directory
 :: SKIP_DEBLOAT           (-sdb) = Set to yes to skip de-bloat section (OEM bloat removal). Implies -m


Add siggy.map.connection.js to js.build.bat

--- public/js/js.build.bat
+++ public/js/js.build.bat
@@ -7,6 +7,7 @@
 --js=siggy.js ^
 --js=siggy.sigtable.js ^
 --js=siggy.globalnotes.js ^
+--js=siggy.map.connection.js ^
 --js=siggymap.js ^
 --js_output_file=siggy.compiled.js
 @pause


sync

sync

Former-commit-id: a1a7d88475befadc53439f1a0c6455e780ad07a2


file deleted

file deleted

--- mvnw.cmd
+++ mvnw.cmd
@@ -1,145 +0,0 @@
-@REM ----------------------------------------------------------------------------
-@REM Licensed to the Apache Software Foundation (ASF) under one
-@REM or more contributor license agreements.  See the NOTICE file
-@REM distributed with this work for additional information
-@REM regarding copyright ownership.  The ASF licenses this file
-@REM to you under the Apache License, Version 2.0 (the
-@REM "License"); you may not use this file except in compliance
-@REM with the License.  You may obtain a copy of the License at
-@REM
-@REM    http://www.apache.org/licenses/LICENSE-2.0
-@REM
-@REM Unless required by applicable law or agreed to in writing,
-@REM software distributed under the License is distributed on an
-@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-@REM KIND, either express or implied.  See the License for the
-@REM specific language governing permissions and limitations
-@REM under the License.
-@REM ----------------------------------------------------------------------------
-
-@REM ----------------------------------------------------------------------------
-@REM Maven2 Start Up Batch script
-@REM
-@REM Required ENV vars:
-@REM JAVA_HOME - location of a JDK home dir
-@REM
-@REM Optional ENV vars
-@REM M2_HOME - location of maven2's installed home dir
-@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
-@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending
-@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
-@REM     e.g. to debug Maven itself, use
-@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
-@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
-@REM ----------------------------------------------------------------------------
-
-@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
-@echo off
-@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on'
-@if "%MAVEN_BATCH_ECHO%" == "on"  echo %MAVEN_BATCH_ECHO%
-
-@REM set %HOME% to equivalent of $HOME
-if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
-
-@REM Execute a user defined script before this one
-if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
-@REM check for pre script, once with legacy .bat ending and once with .cmd ending
-if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
-if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
-:skipRcPre
-
-@setlocal
-
-set ERROR_CODE=0
-
-@REM To isolate internal variables from possible post scripts, we use another setlocal
-@setlocal
-
-@REM ==== START VALIDATION ====
-if not "%JAVA_HOME%" == "" goto OkJHome
-
-echo.
-echo Error: JAVA_HOME not found in your environment. >&2
-echo Please set the JAVA_HOME variable in your environment to match the >&2
-echo location of your Java installation. >&2
-echo.
-goto error
-
-:OkJHome
-if exist "%JAVA_HOME%\bin\java.exe" goto init
-
-echo.
-echo Error: JAVA_HOME is set to an invalid directory. >&2
-echo JAVA_HOME = "%JAVA_HOME%" >&2
-echo Please set the JAVA_HOME variable in your environment to match the >&2
-echo location of your Java installation. >&2
-echo.
-goto error
-
-@REM ==== END VALIDATION ====
-
-:init
-
-set MAVEN_CMD_LINE_ARGS=%*
-
-@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
-@REM Fallback to current working directory if not found.
-
-set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
-IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
-
-set EXEC_DIR=%CD%
-set WDIR=%EXEC_DIR%
-:findBaseDir
-IF EXIST "%WDIR%"\.mvn goto baseDirFound
-cd ..
-IF "%WDIR%"=="%CD%" goto baseDirNotFound
-set WDIR=%CD%
-goto findBaseDir
-
-:baseDirFound
-set MAVEN_PROJECTBASEDIR=%WDIR%
-cd "%EXEC_DIR%"
-goto endDetectBaseDir
-
-:baseDirNotFound
-set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
-cd "%EXEC_DIR%"
-
-:endDetectBaseDir
-
-IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
-
-@setlocal EnableExtensions EnableDelayedExpansion
-for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
-@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
-
-:endReadAdditionalConfig
-
-SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
-
-set WRAPPER_JAR="".\.mvn\wrapper\maven-wrapper.jar""
-set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
-
-%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CMD_LINE_ARGS%
-if ERRORLEVEL 1 goto error
-goto end
-
-:error
-set ERROR_CODE=1
-
-:end
-@endlocal & set ERROR_CODE=%ERROR_CODE%
-
-if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
-@REM check for post script, once with legacy .bat ending and once with .cmd ending
-if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
-if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
-:skipRcPost
-
-@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
-if "%MAVEN_BATCH_PAUSE%" == "on" pause
-
-if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
-
-exit /B %ERROR_CODE%


appveyor: Finally fix spaces in PATH variable

--- contrib/appveyor/build_main.bat
+++ contrib/appveyor/build_main.bat
@@ -1,20 +1,20 @@
 mkdir c:\projects\plib-build

 if "%APPVEYOR_REPO_BRANCH%"=="appveyor_test" (
-        set BOOST_ARGS=-DPLIB_TESTS_STATIC=ON -DBOOST_ROOT=C:\Libraries\boost_1_59_0
+        set "BOOST_ARGS=-DPLIB_TESTS_STATIC=ON -DBOOST_ROOT=C:\Libraries\boost_1_59_0"
 )

 if "%USE_MINGW%"=="1" (
         cd c:\projects\plib-build
-        set PATH="C:\MinGW\bin;C:\Program Files (x86)\CMake\bin"
-        set BUILD_TYPE="-DCMAKE_BUILD_TYPE=%configuration%"
+        set "PATH=C:\MinGW\bin;C:\Program Files (x86)\CMake\bin"
+        set BUILD_TYPE=-DCMAKE_BUILD_TYPE=%configuration%

         cmake %BUILD_TYPE% -G"%CMAKE_GENERATOR%" %BOOST_ARGS% c:\projects\plib
         mingw32-make
         ctest
 ) else (
         if "%USE_MSYS%"=="1" (
-                set PATH="C:\msys2\bin;C:\Program Files (x86)\CMake\bin"
+                set "PATH=C:\msys2\bin;C:\Program Files (x86)\CMake\bin"
                 c:\msys2\bin\bash c:\projects\plib\contrib\appveyor\build_msys.sh
         )
 )


set MAKEFLAGS

set MAKEFLAGS

--- build.bat
+++ build.bat
@@ -1,6 +1,9 @@
 echo @off

 set PATH=%PATH%;C:\Program Files\CMake 2.8\bin
+
+rem FIXME: this should set all the vars
+rem  call "%VSSHELL2010INSTALLDIR%VC\vcvarsall.bat"

 set PROCESSOR_ARCHITECTURE=AMD64
 set VSSHELL2010INSTALLDIR=C:\Program Files\Microsoft Visual Studio 10.0\
@@ -8,7 +11,6 @@
 set VS100COMNTOOLSDIR=%VS100COMNTOOLS%
 set VSINSTALLDIR=%VSSHELL2010INSTALLDIR%
 set WindowsSdkDir=C:\Program Files\Microsoft SDKs\Windows\v7.0A\
-rem  call "%VSSHELL2010INSTALLDIR%VC\vcvarsall.bat"
 set DevEnvDir=%VSINSTALLDIR%Common7\IDE\
 set INCLUDE=%VSINSTALLDIR%VC\INCLUDE;%INCLUDE%
 set INCLUDE=%WindowsSdkDir%\Include;%INCLUDE%
@@ -23,6 +25,7 @@
 rem start mspdbsrv.exe -start -spawn -shutdowntime -1
 cmake -G "NMake Makefiles" .

+set MAKEFLAGS=
 nmake
 hello.exe


Updated Windows installer. Should have fixed some small errors

--- src/tools/installer.cmd
+++ src/tools/installer.cmd
@@ -5,28 +5,28 @@
 SET srcdir=%CD%
 SET dstdir=%CD%\dist-dev

-del /N %dstdir%\blank.css
+del /Q %dstdir%\blank.css
 mklink "%dstdir%\blank.css" "%srcdir%\dist\blank.css"

-del /N %dstdir%\favicon.ico
+del /Q %dstdir%\favicon.ico
 mklink "%dstdir%\favicon.ico" "%srcdir%\dist\favicon.ico"

-del /N %dstdir%\favicon.png
+del /Q %dstdir%\favicon.png
 mklink "%dstdir%\favicon.png" "%srcdir%\dist\favicon.png"

-del /N %dstdir%\settings.js
+del /Q %dstdir%\settings.js
 mklink "%dstdir%\settings.js" "%srcdir%\dist\settings.js"

-del /N %dstdir%\css || rmdir %dstdir%\css
+del /Q %dstdir%\css || rmdir %dstdir%\css
 mklink /j "%dstdir%\css" "%srcdir%\src\stylesheets"

-del /N %dstdir%\js || rmdir %dstdir%\js
+del /Q %dstdir%\js || rmdir %dstdir%\js
 mklink /j "%dstdir%\js" "%srcdir%\src\javascript"

-del /N %dstdir%\packages || rmdir %dstdir%\packages
+del /Q %dstdir%\packages || rmdir %dstdir%\packages
 mklink /j "%dstdir%\packages" "%srcdir%\src\packages"

-del /N %dstdir%\themes || rmdir %dstdir%\themes
+del /Q %dstdir%\themes || rmdir %dstdir%\themes
 mklink /j "%dstdir%\themes" "%srcdir%\src\themes"

 npm install & grunt --force


changed COLAB_HOME to COLAB_SRC in order to be coherent with the other scripts.

--- scripts/win/RebuildServiceLayer.bat
+++ scripts/win/RebuildServiceLayer.bat
@@ -1,25 +1,25 @@
 @echo off
-if defined XCOLAB_HOME  (
+if defined XCOLAB_SRC  (

-echo XCOLAB_HOME found at %XCOLAB_HOME%
+echo XCOLAB_SRC found at %XCOLAB_SRC%

-cd %XCOLAB_HOME%/services/plansProposalsFacade/plansProposalsFacade-portlet
+cd %XCOLAB_SRC%/services/plansProposalsFacade/plansProposalsFacade-portlet
 mvn liferay:build-service

-cd %XCOLAB_HOME%/services/plansProposalsFacade
+cd %XCOLAB_SRC%/services/plansProposalsFacade
 mvn install -N

-cd %XCOLAB_HOME%/services/plansProposalsFacade/plansProposalsFacade-portlet-service
+cd %XCOLAB_SRC%/services/plansProposalsFacade/plansProposalsFacade-portlet-service
 mvn compile package install

-cd %XCOLAB_HOME%/services/plansProposalsFacade/plansProposalsFacade-portlet
+cd %XCOLAB_SRC%/services/plansProposalsFacade/plansProposalsFacade-portlet
 mvn compile package liferay:deploy -DskipTests=true

 echo rebuilding the service layer done.

 ) else (

-echo XCOLAB_HOME can't be found, please create an environemt variable point to your XColab source folder
+echo XCOLAB_SRC can't be found, please create an environemt variable point to your XColab source folder
 pause > null

 )


remove unused run build

remove unused run build

--- src/Web/Dogevents.Web.Client/deploy.cmd
+++ src/Web/Dogevents.Web.Client/deploy.cmd
@@ -119,14 +119,6 @@
   popd
 )

-:: 4. Run build
-IF EXIST "%DEPLOYMENT_TARGET%\webpack.config.js" (
-  pushd "%DEPLOYMENT_TARGET%"
-  call :ExecuteCmd !NPM_CMD! run build
-  IF !ERRORLEVEL! NEQ 0 goto error
-  popd
-)
-
 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 goto end


added batch file to run with database evolution

error: pathspec 'dmpster/run-apply-evolution.cmd' did not match any file(s) known to git

--- dmpster/run-apply-evolution.cmd
+++ dmpster/run-apply-evolution.cmd
@@ -0,0 +1 @@
+play -Dhttp.port=80 -Dfile.separator=\/ -Dconfig.resource=prod.conf -DapplyEvolutions.default=true start


remove really outdated set-hostnames script

--- files/set-hostnames.bat
+++ files/set-hostnames.bat
@@ -1,27 +0,0 @@
-@echo off
-
-:: #############################################################
-:: # Updates %SYSTEMDRIVE%/Windows/System32/drivers/etc/hosts
-:: #############################################################
-::
-:: NOTE: this script will ask for elevated user rights
-::
-
-set SCRIPT_DIR=%~dp0
-set TEMP_DIR=%TMP%\hostsedit
-set ACTION=update
-
-echo updating hostnames in %SYSTEMDRIVE%/Windows/System32/drivers/etc/hosts
-
-::
-:: XXX: subst'ed drives are not visible in elevated mode,
-:: thus we need to copy everything to %TMP% and execute it there
-::
-xcopy %SCRIPT_DIR%tools\hostsedit "%TEMP_DIR%" /I /Y /E
-> %TEMP_DIR%\update_hosts.bat (
-	@echo @echo off
-	@echo %TEMP_DIR%\hostsedit %ACTION% "chef-server 	chef-server.local" 		33.33.3.10
-	@echo %TEMP_DIR%\hostsedit %ACTION% "bare-os-image 	bare-os-image.local" 	33.33.3.11
-)
-%TEMP_DIR%\elevate %TEMP_DIR%\update_hosts.bat
-rmdir "%TEMP_DIR%" /S /Q


*** empty log message ***

*** empty log message ***

git-svn-id: 1b0c1c966ba83e662fc0b3a67ac9bac6ff73fe1f@164 2f08bc20-984a-4df8-b195-9b5d5d477537

--- make_uname.bat
+++ make_uname.bat
@@ -2,4 +2,4 @@
 REM This builds all the libraries for 1 uname

 REM FOR %%u IN (src srccd srccontrols srcpplot srcgl srcim srcimglib srcole srcledc srcview srclua3 srclua5 srcconsole) DO call make_uname_lib.bat %%u %1 %2 %3 %4 %5 %6 %7 %8 %9
-FOR %%u IN (src srccd srccontrols srcpplot srcgl srcim srcimglib srcole srcledc srcview srclua5 srcconsole) DO call make_uname_lib.bat %%u %1 %2 %3 %4 %5 %6 %7 %8 %9
+FOR %%u IN (src srccd srccontrols srcpplot srcgl srcim srcole srcledc srcview srclua5 srcconsole) DO call make_uname_lib.bat %%u %1 %2 %3 %4 %5 %6 %7 %8 %9


mk-librtmp.bat: remove double line

mk-librtmp.bat: remove double line

--- mk-librtmp.bat
+++ mk-librtmp.bat
@@ -21,7 +21,6 @@
 if "%_CPU%" == "win32" set XCFLAGS=-m32
 if "%_CPU%" == "win64" set XCFLAGS=-m64
 set XLDFLAGS=%XCFLAGS% "-L%_CDO%/openssl" "-L%_CDO%/zlib"
-set XLDFLAGS=%XCFLAGS% "-L%_CDO%/openssl" "-L%_CDO%/zlib"
 set LDFLAGS=%XLDFLAGS%
 del /s *.o *.a *.dll *.so *.exe >> nul 2>&1
 mingw32-make SYS=mingw SODEF_yes=


don't input null into the command

don't input null into the command

--- mk/sign-ps.bat
+++ mk/sign-ps.bat
@@ -30,6 +30,6 @@
 @echo on
 if not exist C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe goto done

-C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -Command "$c = Get-ChildItem -Path cert:\\CurrentUser\\My, cert:\\LocalMachine\\My | where { $_.Subject -like \"*Citrix Systems, Inc*\" }  | where {$_.Issuer -like \"*SHA256*\" }; Set-AuthenticodeSignature -cert $c %1" <NUL
+C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -Command "$c = Get-ChildItem -Path cert:\\CurrentUser\\My, cert:\\LocalMachine\\My | where { $_.Subject -like \"*Citrix Systems, Inc*\" }  | where {$_.Issuer -like \"*SHA256*\" }; Set-AuthenticodeSignature -cert $c %1" >NUL

 :done


yellowy fix

yellowy fix

--- autoclean-startclean.bat
+++ autoclean-startclean.bat
@@ -134,6 +134,7 @@
 	goto adw

 	:adw
+	color E0
 	echo At :adw
 	echo Launching ADWCLeaner... NOTE: Will request reboot after a clean.
 	echo Command: move %workingdir%\Tron\tron\resources\stage_9_manual_tools\adwcleaner*.exe %workingdir%\adwcleaner.exe
@@ -149,11 +150,10 @@
 	echo Command running: del autoclean-adw
 	del autoclean-adw
 	echo,
-
+	color E0
 	echo Launching PC Decrapifier.....
 	echo START "" /WAIT "%workingdir%\pc-decrapifier.exe"
 	START "" /WAIT "%workingdir%\pc-decrapifier.exe"
-	color E0
 	echo ---------------------------------------------------------
 	echo Please use PC Decrapifier to analyze and Remove bloatware
 	echo ---------------------------------------------------------