Add kick_jenkins script

Add kick_jenkins script

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

--- tools/kick_jenkins.cmd
+++ tools/kick_jenkins.cmd
@@ -0,0 +1,44 @@
+@setlocal
+@echo off
+
+REM find current branch
+for /f "usebackq tokens=*" %%i in (`git symbolic-ref -q HEAD`) do set "current_branch_ref=%%i"
+if defined current_branch_ref set "current_branch=%current_branch_ref:refs/heads/=%"
+
+REM handle detached HEAD
+if not defined current_branch (
+    echo You're not on any branch! Aborting...
+    goto :eof
+)
+
+REM Don't rewrite history on 'develop' or 'master' branches
+set __exit=1
+if not "%current_branch%"=="master" if not "%current_branch%"=="develop" set __exit=0
+if %__exit%==1 (
+    echo You cannot call this script from 'develop' or 'master'. Change to a topic branch first.  Aborting...
+    goto :eof
+)
+
+REM find tracking branch
+for /f "usebackq tokens=*" %%i in (`git rev-parse --symbolic-full-name --abbrev-ref @{u}`) do set "tracking_branch=%%i"
+if not defined tracking_branch (
+    echo Branch ^'%current_branch%^' is not tracking a remote branch! Aborting...
+    goto :eof
+)
+
+for /f "usebackq tokens=*" %%i in (`git log --oneline -1`) do set "head_commit=%%i"
+choice /C yn /M "Rewrite HEAD commit (%head_commit%) on branch '%current_branch%', and push to '%tracking_branch%'?"
+
+if not %errorlevel%==1 goto :eof
+
+for /f "usebackq tokens=*" %%i in (`git config branch.%current_branch%.remote`) do set "remote=%%i"
+if not defined remote (
+    REM should never happen...
+    echo Error: could not isolate remote name for tracking branch ^'%tracking_branch%^'! Aborting...
+    goto :eof
+)
+
+for /f "usebackq tokens=*" %%i in (`call echo %%tracking_branch:%remote%/^=%%`) do set "tracking_abbrev=%%i"
+
+git commit --amend --no-edit
+git push -f %remote% %current_branch%:%tracking_abbrev%


speed up deployment with 7za

speed up deployment with 7za

--- build/deploy.cmd
+++ build/deploy.cmd
@@ -12,7 +12,7 @@
 %DEPLOYMENT_SOURCE%\build\7za.exe a -t7z %DEPLOYMENT_SOURCE%\deploy.7z %DEPLOYMENT_SOURCE%\*
 IF "%ERRORLEVEL%" NEQ "0" goto error

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

 del /q %DEPLOYMENT_SOURCE%\deploy.7z


updated to add links for BabelExt.js which is now split out of extension.js

--- makelinks.bat
+++ makelinks.bat
@@ -1,4 +1,9 @@
 mklink Chrome\extension.js ..\lib\extension.js
 mklink Opera\includes\extension.user.js ..\..\lib\extension.js
 mklink Firefox\data\extension.js ..\..\lib\extension.js
-mklink /H Safari.safariextension\extension.js ..\lib\extension.js+mklink /H Safari.safariextension\extension.js lib\extension.js
+
+mklink Chrome\BabelExt.js ..\lib\BabelExt.js
+mklink Opera\includes\BabelExt.js ..\..\lib\BabelExt.js
+mklink Firefox\data\BabelExt.js ..\..\lib\BabelExt.js
+mklink /H Safari.safariextension\BabelExt.js lib\BabelExt.js


Test !errorlevel!

Test !errorlevel!

--- conda/upload.bat
+++ conda/upload.bat
@@ -42,9 +42,9 @@
 echo ON

 conda install -n root anaconda-client
-if !errorlevel! neq 0 (
-    exit /b !errorlevel!
-)
+:: if !errorlevel! neq 0 (
+::    exit /b !errorlevel!
+:: )

 echo OFF


Tweaking install command to match new use of environment variables in paths

--- src/Install.bat
+++ src/Install.bat
@@ -1,4 +1,4 @@
 @echo off
-CloudSyncHelper.exe install --sudo
+CloudSyncHelper.exe install --sudo --interactive
 CloudSyncHelper.exe start
 pause


Bug fixes

Bug fixes

--- autoclean-prep.bat
+++ autoclean-prep.bat
@@ -68,8 +68,8 @@
 	if "%version%" == "6.0" set tac_winver=WinVista

 echo Adding to Startup...
-echo Command running: copy "%tac_workingdir%\autoclean.bat" "C:\%HOMEPATH%\AppData\Roaming\Microsoft\Windows\Start Menu\Programs\Startup\"
-copy "%tac_workingdir%\autoclean.bat" "C:\%HOMEPATH%\AppData\Roaming\Microsoft\Windows\Start Menu\Programs\Startup\"
+echo Command running: copy "autoclean-launcher.bat" "C:\%HOMEPATH%\AppData\Roaming\Microsoft\Windows\Start Menu\Programs\Startup\"
+copy "autoclean-launcher.bat" "C:\%HOMEPATH%\AppData\Roaming\Microsoft\Windows\Start Menu\Programs\Startup\"

 if not exist %tac_workingdir%\CT-Flags.txt goto initvars

@@ -155,11 +155,12 @@
 	echo Incorrect input. & goto clientnameconfirm

 :clientnamegood
+goto passquestion

 ::	set autoadminlogonenabled=0
 ::	reg query "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon" /v AutoAdminLogon | find "1"
-	if %ERRORLEVEL% EQU 0 (set autoadminlogonenabled=1 & echo autoadminlogonenabled=!autoadminlogonenabled! & goto av) || goto av REM skipping autologin prompts
-	pause
+::	if %ERRORLEVEL% EQU 0 (set autoadminlogonenabled=1 & echo autoadminlogonenabled=!autoadminlogonenabled! & goto av) || goto av REM skipping autologin prompts
+::	pause

 :passquestion
 	set password=


Use choco upgrade iso update

Use choco upgrade iso update

--- docfx/build-site.cmd
+++ docfx/build-site.cmd
@@ -1,5 +1,5 @@
 choco install docfx -y
-choco update docfx -y
+choco upgrade docfx -y
 docfx docfx\docfx.json
 del docs /s /q
 REM the CNAME file is generated in the doc folder when added through the github


Add batch to compile release binary.

Add batch to compile release binary.

error: pathspec 'src/Build-Release.bat' did not match any file(s) known to git

--- src/Build-Release.bat
+++ src/Build-Release.bat
@@ -0,0 +1,22 @@
+@echo off
+rem > Build-Release [cfg file]
+
+rem  Note: compiling twice the same sources gives different binaries.
+
+rem clean output directory
+del ..\dcu\*.dcu
+
+if '%1' NEQ '' goto use_cfg_argument
+
+:use_default_cfg
+dcc32 Drago
+goto return
+
+:use_cfg_argument
+set cfg=%1
+copy Drago.cfg Drago.cfg.bak > nul
+copy %cfg% Drago.cfg > nul
+dcc32 Drago
+move Drago.cfg.bak Drago.cfg > nul
+
+:return


Restore depot_tools autoupdate in Windows.

Original CL: https://codereview.chromium.org/1242013003/

Executing a bat file from another bat file will replace
that first bat file with the second one. To call the
second one and then return and execute the rest of the
first one, you have to do "call second.bat"

"python" is really "python.bat" so that this happened
was not obvious. More obvious now.

R=bratell@opera.com
TBR=pgervais@chromium.org
BUG=511926

Review URL: https://codereview.chromium.org/1239263003 .

git-svn-id: bd64dd6fa6f3f0ed0c0666d1018379882b742947@296063 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

--- update_depot_tools.bat
+++ update_depot_tools.bat
@@ -29,7 +29,7 @@

 :: Initialize/update virtualenv.
 cd /d "%DEPOT_TOOLS_DIR%."
-python -u bootstrap\bootstrap.py --deps_file bootstrap\deps.pyl --quiet ENV
+call python.bat -u bootstrap\bootstrap.py --deps_file bootstrap\deps.pyl --quiet ENV
 if errorlevel 1 goto :EOF

 :: Shall skip automatic update?


another cube test

another cube test

--- bin/cubes_test.bat
+++ bin/cubes_test.bat
@@ -1,15 +1,8 @@
 @echo off
 del /Q cubes_test.csv

-dctest64.exe --test2 --mesh-size 1
-dctest64.exe --test2 --mesh-size 2
-dctest64.exe --test2 --mesh-size 3
-dctest64.exe --test2 --mesh-size 4
-dctest64.exe --test2 --mesh-size 5
-dctest64.exe --test2 --mesh-size 6
-dctest64.exe --test2 --mesh-size 7
-dctest64.exe --test2 --mesh-size 8
-dctest64.exe --test2 --mesh-size 9
-dctest64.exe --test2 --mesh-size 10
-dctest64.exe --test2 --mesh-size 11
-dctest64.exe --test2 --mesh-size 12
+dctest64.exe --test2 --mesh-size0
+dctest64.exe --test2 --mesh-size1
+dctest64.exe --test2 --mesh-size2
+dctest64.exe --test2 --mesh-size3
+dctest64.exe --test2 --mesh-size4


Setting up the instantiation script for UE4

This is the instantiation script for UE4

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

--- Setup.bat
+++ Setup.bat
@@ -0,0 +1,33 @@
+@echo off
+setlocal
+pushd %~dp0
+
+rem Sync the dependencies...
+.\Engine\Binaries\DotNET\GitDependencies.exe --prompt %*
+if ERRORLEVEL 1 goto error
+
+rem Setup the git hooks...
+if not exist .git\hooks goto no_git_hooks_directory
+echo Registering git hooks...
+echo #!/bin/sh >.git\hooks\post-checkout
+echo Engine/Binaries/DotNET/GitDependencies.exe >>.git\hooks\post-checkout
+echo #!/bin/sh >.git\hooks\post-merge
+echo Engine/Binaries/DotNET/GitDependencies.exe >>.git\hooks\post-merge
+:no_git_hooks_directory
+
+rem Install prerequisites...
+echo Installing prerequisites...
+start /wait Engine\Extras\Redist\en-us\UE4PrereqSetup_x64.exe /quiet
+
+rem Register the engine installation...
+if not exist .\Engine\Binaries\Win64\UnrealVersionSelector-Win64-Shipping.exe goto :no_unreal_version_selector
+.\Engine\Binaries\Win64\UnrealVersionSelector-Win64-Shipping.exe /register
+:no_unreal_version_selector
+
+rem Done!
+goto :EOF
+
+rem Error happened. Wait for a keypress before quitting.
+:error
+pause
+


update the downloading url of ConEmu

update the downloading url of ConEmu

--- etc/candy-for-tea.bat
+++ etc/candy-for-tea.bat
@@ -23,7 +23,7 @@
 	@{
 		"name" = "ConEmu";
 		"home" = "https://github.com/Maximus5/ConEmu/";
-		"url" = "https://github.com/Maximus5/ConEmu/releases/download/v15.12.10/ConEmuPack.151210.7z";
+		"url" = "https://github.com/Maximus5/ConEmu/releases/download/v16.01.11/ConEmuPack.160111.7z";
 		"dir" = "ConEmu";
 	}


Add VS Redist to Windows Setup

Add VS Redist to Windows Setup

--- Tools/update_install.cmd
+++ Tools/update_install.cmd
@@ -13,6 +13,7 @@

 REM --- Update JASP install Folder ------
 SET JASP-BUILD=c:\Jasp\Build
+SET JASP-REDIST=c:\Jasp\Redist
 SET BUILD_DIR_32=%JASP-BUILD%\build-JASP-Release-32
 SET BUILD_DIR_64=%JASP-BUILD%\build-JASP-Release-64
 SET JASP-DESKTOP=%JASP-BUILD%\jasp-desktop
@@ -40,16 +41,25 @@
 cd _x86
 REM %QT-MSVC-BIN-2015%\windeployqt.exe --compiler-runtime --release JASP.exe
 %QT-MSVC-BIN-2015%\windeployqt.exe -core -gui -webenginewidgets -webchannel -svg -network -printsupport -xml -qml -quick -quickwidgets --qmldir %JASP-DESKTOP%\JASP-Desktop\resources JASP.exe
-
+
+REM --- Copy Redist ---
+COPY %JASP-REDIST%\vcredist_x86.exe .
+
+
 cd ..

 cd _x64
 %QT-MSVC-BIN-2017%\windeployqt.exe -core -gui -webenginewidgets -webchannel -svg -network -printsupport -xml -qml -quick -quickwidgets --qmldir %JASP-DESKTOP%\JASP-Desktop\resources JASP.exe
+
+REM --- Copy Redist ---
+COPY %JASP-REDIST%\vcredist_x64.exe .
+
 cd ..

 REM ---- Update Resources -------
 RMDIR Resources /S /Q
 XCOPY %JASP-DESKTOP%\Resources /E /I Resources
+DEL Resources\TestFiles.zip

 REM ---- Update Help -------
 RMDIR Help /S /Q


Fixed incrementign ref count

Fixed incrementign ref count

--- get-ref.bat
+++ get-ref.bat
@@ -13,7 +13,7 @@

     CALL GET-GLOBAL %GLOBALS_FILE% REFERENCE_COUNT[%REFERENCE%] REFERENCE_COUNT
     SET /A REFERENCE_COUNT=REFERENCE_COUNT+1
-    CALL SET-GLOBAL %GLOBALS_FILE% REFERENCE_COUNT[%REFERENCE%] REFERENCE_COUNT
+    CALL SET-GLOBAL %GLOBALS_FILE% REFERENCE_COUNT[%REFERENCE%] %REFERENCE_COUNT%

 :RETURN
     ENDLOCAL & (


Fixed the classpath.

Fixed the classpath.

--- webapp/WEB-INF/cmsshell.bat
+++ webapp/WEB-INF/cmsshell.bat
@@ -18,29 +18,32 @@
 set CLASSPATH= %CLASSPATH%;../../../common/lib/servlet.jar
 set CLASSPATH= %CLASSPATH%;../../../common/lib/servlet-api.jar
 set CLASSPATH= %CLASSPATH%;../../../common/lib/jsp-api.jar
-set CLASSPATH= %CLASSPATH%;lib/commons-dbcp.jar
-set CLASSPATH= %CLASSPATH%;lib/commons-pool.jar
-set CLASSPATH= %CLASSPATH%;lib/commons-collections.jar
+set CLASSPATH= %CLASSPATH%;lib/commons-dbcp-1.1.jar
+set CLASSPATH= %CLASSPATH%;lib/commons-pool-1.1.jar
+set CLASSPATH= %CLASSPATH%;lib/commons-collections-3.0.jar
+set CLASSPATH= %CLASSPATH%;lib/commons-digester-1.5.jar
+set CLASSPATH= %CLASSPATH%;lib/commons-beanutils-1.6.1.jar
+set CLASSPATH= %CLASSPATH%;lib/commons-fileupload-1.0.jar
 set CLASSPATH= %CLASSPATH%;lib/ojdbc14.jar
-set CLASSPATH= %CLASSPATH%;lib/commons-logging.jar
+set CLASSPATH= %CLASSPATH%;lib/commons-logging-1.0.3.jar
 set CLASSPATH= %CLASSPATH%;lib/log4j-1.2.8.jar
-set CLASSPATH= %CLASSPATH%;lib/jcr.jar;lib/opencms.jar;lib/opencms-legacy.jar
+set CLASSPATH= %CLASSPATH%;lib/jcr.jar;
+set CLASSPATH= %CLASSPATH%;lib/opencms.jar;lib/opencms-legacy.jar
 set CLASSPATH= %CLASSPATH%;lib/activation.jar
-set CLASSPATH= %CLASSPATH%;lib/jakarta-oro-2_0_6.jar
-set CLASSPATH= %CLASSPATH%;lib/ojdbc14.jar
+set CLASSPATH= %CLASSPATH%;lib/jakarta-oro-2.0.8.jar
 set CLASSPATH= %CLASSPATH%;lib/classes12.zip
-set CLASSPATH= %CLASSPATH%;lib/mysql-connector-java-3.0.7-stable-bin.jar
-set CLASSPATH= %CLASSPATH%;lib/Tidy.jar
+set CLASSPATH= %CLASSPATH%;lib/mysql-connector-java-3.0.11-stable-bin.jar
+set CLASSPATH= %CLASSPATH%;lib/jtidy-04aug2000r7-dev.jar
 set CLASSPATH= %CLASSPATH%;lib/mail.jar
-set CLASSPATH= %CLASSPATH%;lib/jug.jar
-set CLASSPATH= %CLASSPATH%;lib/xerces-1_4_4.jar
-set CLASSPATH= %CLASSPATH%;lib/dom4j.jar
+set CLASSPATH= %CLASSPATH%;lib/jug-1.1.jar
+@rem set CLASSPATH= %CLASSPATH%;lib/xerces-1_4_4.jar
+set CLASSPATH= %CLASSPATH%;lib/dom4j-1.4.jar
 set CLASSPATH= %CLASSPATH%;lib/opencms-drivers.jar
 set CLASSPATH= %CLASSPATH%;lib/lucene-1.3-final.jar
 set CLASSPATH= %CLASSPATH%;lib/poi-2.0-final-20040126.jar
 set CLASSPATH= %CLASSPATH%;lib/snowball-0.1.jar
 set CLASSPATH= %CLASSPATH%;lib/PDFBox-0.6.4.jar
-set CLASSPATH= %CLASSPATH%;lib/xercesImpl.jar;lib/xml-apis.jar
+set CLASSPATH= %CLASSPATH%;lib/xercesImpl-2.6.2.jar;lib/xml-apis-2.6.2.jar
 set CLASSPATH= %CLASSPATH%;classes

 @rem set opencms arguments


Windows deps: Only clone 'sources' branch from the tundra dept git repo. The windows prebuilt binary branches are HUGE and a waste of hard drive.

--- tools/Windows/BuildDeps.cmd
+++ tools/Windows/BuildDeps.cmd
@@ -534,17 +534,19 @@
 )

 IF NOT EXIST "%DEPS%\realxtend-tundra-deps\.git". (
-   cecho {0D}Cloning realxtend-tundra-deps repository into "%DEPS%\realxtend-tundra-deps".{# #}{\n}
-   cd "%DEPS%"
-   call git clone https://code.google.com/p/realxtend-tundra-deps
-   IF NOT EXIST "%DEPS%\realxtend-tundra-deps\.git" GOTO :ERROR
-
-   cd "%DEPS%\realxtend-tundra-deps"
-   call git checkout sources
-) ELSE (
-   cecho {0D}Updating realxtend-tundra-deps to newest.{# #}{\n}
-   cd "%DEPS%\realxtend-tundra-deps"
-   call git pull origin
+    cecho {0D}Cloning realxtend-tundra-deps repository into "%DEPS%\realxtend-tundra-deps".{# #}{\n}
+    REM Only clone/fetch the sources branch. Skipping the prebuilt binary branches as they are huge.
+    cd "%DEPS%"
+    call git init realxtend-tundra-deps
+    cd realxtend-tundra-deps
+    call git fetch https://code.google.com/p/realxtend-tundra-deps/ sources:refs/remotes/origin/sources
+    call git remote add origin https://code.google.com/p/realxtend-tundra-deps/
+    call git checkout sources
+    IF NOT EXIST "%DEPS%\realxtend-tundra-deps\.git" GOTO :ERROR
+) ELSE (
+    cecho {0D}Updating realxtend-tundra-deps to newest.{# #}{\n}
+    cd "%DEPS%\realxtend-tundra-deps"
+    call git pull origin
 )

 set OGRE_HOME=%DEPS%\ogre-safe-nocrashes\SDK


Create ScriptDumpFiles.bat

Create ScriptDumpFiles.bat

This is a bat file used in a monitoring process to see if Coveo is using more then 50% of RAM.

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

--- batch-file/ScriptDumpFiles.bat
+++ batch-file/ScriptDumpFiles.bat
@@ -0,0 +1,16 @@
+
+CALL procdump -s 2 -n 4 CESService7.exe c:\ProcDumpFiles
+
+CALL  procdump -s 2 -n 4 CESCustomCrawlers7.exe c:\ProcDumpFiles
+
+CALL procdump -s 2 -n 4 CESConverter7.exe c:\ProcDumpFiles
+
+CALL taskkill /f /im CESService7.exe
+
+CALL taskkill /f /im CESCustomCrawlers7.exe
+
+CALL taskkill /f /im CESConverter7.exe
+
+
+
+CALL msg * "CESService7 has just stop because it was taking too much memory(RAM), please contact Coveo and check your dump files C:\ProcDumpFiles, Link to doc: LINK"


added VERSION

added VERSION

git-svn-id: 4b6d41e9940b00d32d826e7d279a79f5b8ae3021@278 459513c6-d918-8e31-8e7a-abb81885386f

--- mkrelease.bat
+++ mkrelease.bat
@@ -1,9 +1,11 @@
 @echo off

-tar --exclude=neko/lexer.ml --exclude=.cvsignore --exclude=neko/*.cm* --exclude=neko/*.o* --exclude=*.tgz --exclude=CVS --exclude=libs/mtypes --exclude=bin/* --exclude=*.sln --exclude=*.vcproj --exclude=*.suo --exclude=*.ncb --exclude=debug --exclude=release --exclude=libs/include -zcf neko-1.0.tgz libs neko bin vm LICENSE Makefile
-mkdir neko-1.0
-tar -C neko-1.0 -zxf neko-1.0.tgz
-tar -zcf neko-1.0.tgz neko-1.0
-rm -rf neko-1.0
+set VERSION=neko-1.0.5
+
+tar --exclude=neko/lexer.ml --exclude=.cvsignore --exclude=neko/*.cm* --exclude=neko/*.o* --exclude=*.tgz --exclude=CVS --exclude=libs/mtypes --exclude=bin/* --exclude=*.sln --exclude=*.vcproj --exclude=*.suo --exclude=*.ncb --exclude=debug --exclude=release --exclude=libs/include -zcf %VERSION%.tgz libs neko bin vm LICENSE Makefile
+mkdir %VERSION%
+tar -C %VERSION% -zxf %VERSION%.tgz
+tar -zcf %VERSION%.tgz %VERSION%
+rm -rf %VERSION%

 pause


ADD Undocumented feature : --no-pause option to skip the pause at the end off script execution , useful for automatic build

git-svn-id: 8b72b58fb31a931b6e9a2bd3bb08bc6614045fb1@3358 c330d7e9-fc0c-0410-a5b3-fd85c6f5aa8f

--- scripts/win32-build.cmd
+++ scripts/win32-build.cmd
@@ -5,6 +5,7 @@
 REM no options / set to default
 set BuildType=Release
 set InitEnvScript=win32-init_env_command.cmd
+set PAUSE=pause
 if /i "%1"=="-h" (
 	echo Usage: win32-build.cmd [Build Type] [Init-env Script]
 	echo -- Build Type option can be : --release (-r^) or --debug (-d^). Default is release.
@@ -17,6 +18,8 @@
 	echo -- Default Init-env script is: win32-init_env_command.cmd
 	pause
 	exit 0
+) else if /i "%1"=="--no-pause" (
+	set PAUSE=echo ""
 ) else if /i "%1"=="-d" (
 	set BuildType=Debug
 	set InitEnvScript=%2
@@ -232,7 +235,7 @@
 echo.
 echo An error occured during building process !
 echo.
-pause
+%PAUSE%

 goto terminate

@@ -240,7 +243,7 @@

 :terminate_success

-pause
+%PAUSE%

 goto terminate


updating build scripts for 1102

updating build scripts for 1102

--- movebuild.bat
+++ movebuild.bat
@@ -1 +1 @@
-cp D:/SamStorage/git/cyclic/build/libs/* C:/Users/Sam/AppData/Roaming/.minecraft110/mods/+cp D:/SamStorage/git/cyclic/build/libs/* C:/Users/Sam/AppData/Roaming/.minecraft1102/mods/


myget

myget

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

--- mygetpush.cmd
+++ mygetpush.cmd
@@ -0,0 +1 @@
+nuget push distribution\*.nupkg -Source https://www.myget.org/F/thinktecture/


paer cases bat

paer cases bat

--- src/OCL/perf_cases.bat
+++ src/OCL/perf_cases.bat
@@ -1,25 +1,28 @@
+set S=%1
+set V=%2
+set T=%3
 cd ../../build
 PATH=.\src\Debug;%PATH%
+rem goto start
 echo "CIFAR-10"
 echo "conv1 100x3x32x32x32x5x5"
-.\driver\Debug\MLOpenDriver.exe -n 100 -c 3 -k 32 -x 5 -y 5 -H 32 -W 32 -F 1 -p 2 -q 2 -t 1 -s 1 -V 0
+.\driver\Debug\MLOpenDriver.exe -n 100 -c 3 -k 32 -x 5 -y 5 -H 32 -W 32 -F 1 -p 2 -q 2 -t %T% -s %S% -V %V%
 echo "conv1 100x32x16x16x32x5x5"
- .\driver\Debug\MLOpenDriver.exe -n 100 -c 32 -k 32 -x 5 -y 5 -H 16 -W 16 -F 1 -p 2 -q 2 -t 1 -s 1 -V 0
+ .\driver\Debug\MLOpenDriver.exe -n 100 -c 32 -k 32 -x 5 -y 5 -H 16 -W 16 -F 1 -p 2 -q 2 -t %T% -s %S% -V %V%
 echo "conv1 100x32x8x8x64x5x5"
- .\driver\Debug\MLOpenDriver.exe -n 100 -c 32 -k 64 -x 5 -y 5 -H 8 -W 8 -F 1 -p 2 -q 2 -t 1 -s 1 -V 0
+ .\driver\Debug\MLOpenDriver.exe -n 100 -c 32 -k 64 -x 5 -y 5 -H 8 -W 8 -F 1 -p 2 -q 2 -t %T% -s %S% -V %V%
 echo "conv1 200x3x32x32x32x5x5"
-.\driver\Debug\MLOpenDriver.exe -n 200 -c 3 -k 32 -x 5 -y 5 -H 32 -W 32 -F 1 -p 2 -q 2 -t 1 -s 1 -V 0
+.\driver\Debug\MLOpenDriver.exe -n 200 -c 3 -k 32 -x 5 -y 5 -H 32 -W 32 -F 1 -p 2 -q 2 -t %T% -s %S% -V %V%
 echo "conv1 200x32x16x16x32x5x5"
-.\driver\Debug\MLOpenDriver.exe -n 200 -c 32 -k 32 -x 5 -y 5 -H 16 -W 16 -F 1 -p 2 -q 2 -t 1 -s 1 -V 0
+.\driver\Debug\MLOpenDriver.exe -n 200 -c 32 -k 32 -x 5 -y 5 -H 16 -W 16 -F 1 -p 2 -q 2 -t %T% -s %S% -V %V%
 echo "conv1 200x32x8x8x64x5x5"
-.\driver\Debug\MLOpenDriver.exe -n 200 -c 32 -k 64 -x 5 -y 5 -H 8 -W 8 -F 1 -p 2 -q 2 -t 1 -s 1 -V 0
+.\driver\Debug\MLOpenDriver.exe -n 200 -c 32 -k 64 -x 5 -y 5 -H 8 -W 8 -F 1 -p 2 -q 2 -t %T% -s %S% -V %V%
 echo "conv1 1x3x32x32x32x5x5"
-.\driver\Debug\MLOpenDriver.exe -n 1 -c 3 -k 32 -x 5 -y 5 -H 32 -W 32 -F 1 -p 2 -q 2 -t 1 -s 1 -V 0
+.\driver\Debug\MLOpenDriver.exe -n 1 -c 3 -k 32 -x 5 -y 5 -H 32 -W 32 -F 1 -p 2 -q 2 -t %T% -s %S% -V %V%
 echo "conv1 1x32x16x16x32x5x5"
-.\driver\Debug\MLOpenDriver.exe -n 1 -c 32 -k 32 -x 5 -y 5 -H 16 -W 16 -F 1 -p 2 -q 2 -t 1 -s 1 -V 0
+.\driver\Debug\MLOpenDriver.exe -n 1 -c 32 -k 32 -x 5 -y 5 -H 16 -W 16 -F 1 -p 2 -q 2 -t %T% -s %S% -V %V%
 echo "conv1 1x32x8x8x64x5x5"
-.\driver\Debug\MLOpenDriver.exe -n 1 -c 32 -k 64 -x 5 -y 5 -H 8 -W 8 -F 1 -p 2 -q 2 -t 1 -s 1 -V 0
-goto end
+.\driver\Debug\MLOpenDriver.exe -n 1 -c 32 -k 64 -x 5 -y 5 -H 8 -W 8 -F 1 -p 2 -q 2 -t %T% -s %S% -V %V%
 echo "AlexNet"
 echo "conv2 256x96x27x27x256x5x5"
 rem aLibDNNDriver.exe -li 500 -ni 3 -n -l -bz 256 -iw 27 -ih 27 -ic0 96 -oc0 256 -fs 5 -cnv -fw -sch -sd 2
@@ -27,42 +30,43 @@
 rem aLibDNNDriver.exe -li 500 -ni 3 -n -l -bz 256 -iw 13 -ih 13 -ic0 256 -oc0 384 -fs 3 -cnv -fw -sch
 echo "GoogleNet"
 echo "conv2/3x3 32x64x56x56x192x3x3"
-aLibDNNDriver -li 500 -ni 3 -n -l -bz 1 -iw 512 -ih 256 -ic0 64 -oc0 192 -fs 3 -cnv -fw -sch
+.\driver\Debug\MLOpenDriver.exe -n 1 -W 512 -H 256 -c 64 -k 192 -x 3 -y 3 -F 1 -p 1 -q 1 -t %T% -s %S% -V %V%
 echo "inception_3a/3x3 1x96x128x256x128x3x3"
-aLibDNNDriver -li 500 -ni 3 -n -l -bz 1 -iw 256 -ih 128 -ic0 96 -oc0 128 -fs 3 -cnv -fw -sch
+.\driver\Debug\MLOpenDriver.exe -n 1 -W 256 -H 128 -c 96 -k 128 -x 3 -y 3 -F 1 -p 1 -q 1 -t %T% -s %S% -V %V%
 echo "inception_3a/5x5 1x16x128x256x32x5x5"
-aLibDNNDriver -li 500 -ni 3 -n -l -bz 1 -iw 256 -ih 128 -ic0 16 -oc0 32 -fs 5 -cnv -fw -sch
+.\driver\Debug\MLOpenDriver.exe -n 1 -W 256 -H 128 -c 16 -k 32 -x 5 -y 5 -F 1 -p 2 -q 2 -t %T% -s %S% -V %V%
 echo "inception_3b/3x3 1x128x128x256x192x3x3"
-aLibDNNDriver -li 500 -ni 3 -n -l -bz 1 -iw 256 -ih 128 -ic0 128 -oc0 192 -fs 3 -cnv -fw -sch
+.\driver\Debug\MLOpenDriver.exe -n 1 -W 256 -H 128 -c 128 -k 192 -x 3 -y 3 -F 1 -p 1 -q 1 -t %T% -s %S% -V %V%
 echo "inception_3b/5x5 1x32x128x256x96x5x5"
-aLibDNNDriver -li 500 -ni 3 -n -l -bz 1 -iw 256 -ih 128 -ic0 32 -oc0 96 -fs 5 -cnv -fw -sch
+.\driver\Debug\MLOpenDriver.exe -n 1 -W 256 -H 128 -c 32 -k 96 -x 5 -y 5 -F 1 -p 2 -q 2 -t %T% -s %S% -V %V%
 echo "inception_4a/3x3 1x96x64x128x208x3x3"
-aLibDNNDriver -li 500 -ni 3 -n -l -bz 1 -iw 128 -ih 64 -ic0 96 -oc0 208 -fs 3 -cnv -fw -sch
+.\driver\Debug\MLOpenDriver.exe -n 1 -W 128 -H 64 -c 96 -k 208 -x 3 -y 3 -F 1 -p 1 -q 1 -t %T% -s %S% -V %V%
 echo "inception_4a/5x5 32x16x64x128x48x5x5"
-aLibDNNDriver -li 500 -ni 3 -n -l -bz 1 -iw 128 -ih 64 -ic0 16 -oc0 48 -fs 5 -cnv -fw -sch
+.\driver\Debug\MLOpenDriver.exe -n 1 -W 128 -H 64 -c 16 -k 48 -x 5 -y 5 -F 1 -p 2 -q 2 -t %T% -s %S% -V %V%
 echo "inception_4b/3x3 1x112x64x128x224x3x3"
-aLibDNNDriver -li 500 -ni 3 -n -l -bz 1 -iw 128 -ih 64 -ic0 112 -oc0 224 -fs 3 -cnv -fw -sch
+.\driver\Debug\MLOpenDriver.exe -n 1 -W 128 -H 64 -c 112 -k 224 -x 3 -y 3 -F 1 -p 1 -q 1 -t %T% -s %S% -V %V%
 echo "inception_4b/5x5 1x24x64x128x64x5x5"
-aLibDNNDriver -li 500 -ni 3 -n -l -bz 1 -iw 128 -ih 64 -ic0 24 -oc0 64 -fs 5 -cnv -fw -sch
+.\driver\Debug\MLOpenDriver.exe -n 1 -W 128 -H 64 -c 24 -k 64 -x 5 -y 5 -F 1 -p 2 -q 2 -t %T% -s %S% -V %V%
 echo "inception_4c/3x3 1x128x64x128x256x3x3"
-aLibDNNDriver -li 500 -ni 3 -n -l -bz 1 -iw 128 -ih 64 -ic0 128 -oc0 256 -fs 3 -cnv -fw -sch
+.\driver\Debug\MLOpenDriver.exe -n 1 -W 128 -H 64 -c 128 -k 256 -x 3 -y 3 -F 1 -p 1 -q 1 -t %T% -s %S% -V %V%
 echo "inception_4c/5x5 1x24x64x128x64x5x5"
-aLibDNNDriver -li 500 -ni 3 -n -l -bz 1 -iw 128 -ih 64 -ic0 24 -oc0 64 -fs 5 -cnv -fw -sch
+.\driver\Debug\MLOpenDriver.exe -n 1 -W 128 -H 64 -c 24 -k 64 -x 5 -y 5 -F 1 -p 2 -q 2 -t %T% -s %S% -V %V%
 echo "inception_4d/3x3 1x144x64x128x288x3x3"
-aLibDNNDriver -li 500 -ni 3 -n -l -bz 1 -iw 128 -ih 64 -ic0 144 -oc0 288 -fs 3 -cnv -fw -sch
+.\driver\Debug\MLOpenDriver.exe -n 1 -W 128 -H 64 -c 144 -k 288 -x 3 -y 3 -F 1 -p 1 -q 1 -t %T% -s %S% -V %V%
 echo "inception_4d/5x5 1x32x64x128x64x5x5"
-aLibDNNDriver -li 500 -ni 3 -n -l -bz 1 -iw 128 -ih 64 -ic0 32 -oc0 64 -fs 5 -cnv -fw -sch
+.\driver\Debug\MLOpenDriver.exe -n 1 -W 128 -H 64 -c 32 -k 64 -x 5 -y 5 -F 1 -p 2 -q 2 -t %T% -s %S% -V %V%
 echo "inception_4e/3x3 1x160x64x128x320x3x3"
-aLibDNNDriver -li 500 -ni 3 -n -l -bz 1 -iw 128 -ih 64 -ic0 160 -oc0 320 -fs 3 -cnv -fw -sch
+.\driver\Debug\MLOpenDriver.exe -n 1 -W 128 -H 64 -c 160 -k 320 -x 3 -y 3 -F 1 -p 1 -q 1 -t %T% -s %S% -V %V%
 echo "inception_4e/5x5 1x32x64x128x128x5x5"
-aLibDNNDriver -li 500 -ni 3 -n -l -bz 1 -iw 128 -ih 64 -ic0 32 -oc0 128 -fs 5 -cnv -fw -sch
+.\driver\Debug\MLOpenDriver.exe -n 1 -W 128 -H 64 -c 32 -k 128 -x 5 -y 5 -F 1 -p 2 -q 2 -t %T% -s %S% -V %V%
 echo "inception_5a/3x3 1x160x64x128x320x3x3"
-aLibDNNDriver -li 500 -ni 3 -n -l -bz 1 -iw 128 -ih 64 -ic0 160 -oc0 320 -fs 3 -cnv -fw -sch
+.\driver\Debug\MLOpenDriver.exe -n 1 -W 128 -H 64 -c 160 -k 320 -x 3 -y 3 -F 1 -p 1 -q 1 -t %T% -s %S% -V %V%
 echo "inception_5a/5x5 1x32x64x128x128x5x5"
-aLibDNNDriver -li 500 -ni 3 -n -l -bz 1 -iw 128 -ih 64 -ic0 32 -oc0 128 -fs 5 -cnv -fw -sch
+.\driver\Debug\MLOpenDriver.exe -n 1 -W 128 -H 64 -c 32 -k 128 -x 5 -y 5 -F 1 -p 2 -q 2 -t %T% -s %S% -V %V%
 echo "inception_5b/3x3 1x192x64x128x384x3x3"
-aLibDNNDriver -li 500 -ni 3 -n -l -bz 1 -iw 128 -ih 64 -ic0 192 -oc0 384 -fs 3 -cnv -fw -sch
+.\driver\Debug\MLOpenDriver.exe -n 1 -W 128 -H 64 -c 192 -k 384 -x 3 -y 3 -F 1 -p 1 -q 1 -t %T% -s %S% -V %V%
+:start
 echo "inception_5b/5x5 1x48x64x128x128x5x5"
-aLibDNNDriver -li 500 -ni 3 -n -l -bz 1 -iw 128 -ih 64 -ic0 48 -oc0 128 -fs 5 -cnv -fw -sch
+.\driver\Debug\MLOpenDriver.exe -n 1 -W 128 -H 64 -c 48 -k 128 -x 5 -y 5 -F 1 -p 2 -q 2 -t %T% -s %S% -V %V%
 :end
 cd ../src/OCL


Smarter handling of Dependency Walker aliases

--- cmd/SetupEnv.cmd
+++ cmd/SetupEnv.cmd
@@ -46,9 +46,25 @@
 DOSKEY man=help $*
 DOSKEY which=where $*

-REM Some other useful aliases to avoid having to append to our PATH
-DOSKEY depends32="C:\Program Files (x86)\Nexiom\Software\Independent\Dependency Walker\depends.exe" $*
-DOSKEY depends64="C:\Program Files\Nexiom\Software\Independent\Dependency Walker\depends.exe" $*
+REM Add alias for Dependency Walker x86
+SET Dw32Path=C:\Program Files (x86)\Nexiom\Software\Independent\Dependency Walker\depends.exe
+IF NOT EXIST "%Dw32Path%" (
+    IF DEFINED SetupEnvVerbose ECHO * Couldn't locate Dependency Walker x86 at path specified by Dw32Path.
+) ELSE (
+    IF DEFINED SetupEnvVerbose ECHO * Setting Dependency Walker x86 'depends32' alias...
+    DOSKEY depends32="%Dw32Path%" $*
+)
+SET Dw32Path=
+
+REM Add alias for Dependency Walker x64
+SET Dw64Path=C:\Program Files\Nexiom\Software\Independent\Dependency Walker\depends.exe
+IF NOT EXIST "%Dw64Path%" (
+    IF DEFINED SetupEnvVerbose ECHO * Couldn't locate Dependency Walker x64 at path specified by Dw64Path.
+) ELSE (
+    IF DEFINED SetupEnvVerbose ECHO * Setting Dependency Walker x64 'depends64' alias...
+    DOSKEY depends64="%Dw64Path%" $*
+)
+SET Dw64Path=

 REM Add alias for Sublime Text
 SET SublRegPath=HKLM\Software\Microsoft\Windows\CurrentVersion\Uninstall\Sublime Text 2_is1


tests: Make macho-dump.bat actually work.

git-svn-id: 0ff597fd157e6f4fc38580e8d64ab130330d2411@105891 91177308-0d34-0410-b5e6-96231b3b80d8

--- test/Scripts/macho-dump.bat
+++ test/Scripts/macho-dump.bat
@@ -1,3 +1,7 @@
 @echo off
-macho-dump %1 %2 %3 %4 %5 %6 %7 %8 %9

+@rem The -t here is just to avoid infinite looping if %PYTHON_EXECUTABLE% isn't set
+@rem for some reason.
+
+%PYTHON_EXECUTABLE% -t %LLVM_SRC_ROOT%\test\Scripts\macho-dump %1 %2 %3 %4 %5 %6 %7 %8 %9
+


Update build script

Update build script

--- build.bat
+++ build.bat
@@ -1 +1 @@
-python C:\\Users\\micro\\Downloads\\gyp-master\\gyp_main.py binding.gyp -f msvs -G msvs_version=auto --depth=. --generator-output ./build+python C:\\github\\gyp\\gyp_main.py config.gyp -f msvs -G msvs_version=auto --depth=. --generator-output ./build


Bump Frida 15.1.4

Bump Frida 15.1.4

--- build.bat
+++ build.bat
@@ -1,7 +1,7 @@
 @echo off
 setlocal EnableDelayedExpansion
 set R2_BASE=""
-set frida_version=15.1.3
+set frida_version=15.1.4
 if "%PLATFORM%" == "x64" (set frida_os_arch=x86_64) else (set frida_os_arch=x86)
 for /f %%i in ('radare2 -H R2_USER_PLUGINS') do set R2_PLUGDIR=%%i
 REM for /f %%i in ('where radare2') do set R2_BASE=%%i\..


Updated build script

Updated build script

--- build.bat
+++ build.bat
@@ -1,4 +1,8 @@
 @echo Off
 dotnet restore
 dotnet pack "src\Discord.Net" -c "%Configuration%" -o "artifacts"
+dotnet pack "src\Discord.Net.Core" -c "%Configuration%" -o "artifacts"
+dotnet pack "src\Discord.Net.Rest" -c "%Configuration%" -o "artifacts"
+dotnet pack "src\Discord.Net.WebSocket" -c "%Configuration%" -o "artifacts"
+dotnet pack "src\Discord.Net.Rpc" -c "%Configuration%" -o "artifacts"
 dotnet pack "src\Discord.Net.Commands" -c "%Configuration%" -o "artifacts"


update build.bat to use visual studio 2019

--- build.bat
+++ build.bat
@@ -2,14 +2,14 @@
 setlocal EnableDelayedExpansion

 set ScriptRoot=%~dp0
-set VisualStudioInstallation=%ProgramFiles(x86)%\Microsoft Visual Studio\2017
+set VisualStudioInstallation=%ProgramFiles(x86)%\Microsoft Visual Studio\2019

 echo Searching for Visual Studio in: "%VisualStudioInstallation%"

 if defined DevEnvDir (
-    echo Visual Studio 2017 development environment has already been set.
+    echo Visual Studio 2019 development environment has already been set.
 ) else (
-    echo Setting Visual Studio 2017 environment...
+    echo Setting Visual Studio 2019 environment...

     for /F %%G in ('dir /b "%VisualStudioInstallation%"') do (

@@ -28,8 +28,8 @@
 :RunBuild

 if not defined DevEnvDir (
-    echo Visual Studio 2017 environment should have been set.
-    exit /b 1
+    echo Visual Studio 2019 environment should have been set.
+    exit /b
 )

 msbuild %ScriptRoot%\Build\EasyNetQ.proj


Build script

Build script

--- build.bat
+++ build.bat
@@ -22,8 +22,8 @@
 if not "%errorlevel%"=="0" goto failure

 REM Unit tests
-call dotnet test test\Marvin.Cache.Headers.Test --configuration %config%
-if not "%errorlevel%"=="0" goto failure
+rem call dotnet test test\Marvin.Cache.Headers.Test --configuration %config%
+rem if not "%errorlevel%"=="0" goto failure

 REM Package
 mkdir %cd%\artifacts


Windows build .bat

Windows build .bat

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

--- build.bat
+++ build.bat
@@ -0,0 +1,56 @@
+@echo off
+set verbose off
+set NOW=%TIME% %DATE%
+echo "Build process started %NOW%"
+
+echo "Building Ember assets..."
+cd gui
+call ember b -o dist-prod/ --environment=production
+::Call allows the rest of the file to run
+
+echo "Copying Ember assets..."
+cd ..
+rd /s /q embed\bindata\public
+mkdir embed\bindata\public
+echo "Copying Ember assets folder"
+robocopy /e /NFL /NDL /NJH gui\dist-prod\assets embed\bindata\public\assets
+echo "Copying Ember codemirror folder"
+robocopy /e /NFL /NDL /NJH gui\dist-prod\codemirror embed\bindata\public\codemirror
+echo "Copying Ember tinymce folder"
+robocopy /e /NFL /NDL /NJH gui\dist-prod\tinymce embed\bindata\public\tinymce
+echo "Copying Ember sections folder"
+robocopy /e /NFL /NDL /NJH gui\dist-prod\sections embed\bindata\public\sections
+
+copy gui\dist-prod\*.* embed\bindata
+copy gui\dist-prod\favicon.ico embed\bindata\public
+copy gui\dist-prod\manifest.json embed\bindata\public
+
+rd /s /q embed\bindata\mail
+mkdir embed\bindata\mail
+copy domain\mail\*.html embed\bindata\mail
+copy core\database\templates\*.html embed\bindata
+
+rd /s /q embed\bindata\scripts
+mkdir embed\bindata\scripts
+
+echo "Copying database scripts folder"
+robocopy /e /NFL /NDL /NJH core\database\scripts\autobuild embed\bindata\scripts
+
+echo "Generating in-memory static assets..."
+go get -u github.com/jteeuwen/go-bindata/...
+go get -u github.com/elazarl/go-bindata-assetfs/...
+cd embed
+go generate
+cd ..
+
+echo "Compiling Windows"
+set GOOS=windows
+go build -gcflags=-trimpath=%GOPATH% -asmflags=-trimpath=%GOPATH% -o bin/documize-community-windows-amd64.exe edition/community.go
+
+echo "Compiling Linux"
+set GOOS=linux
+go build -gcflags=-trimpath=%GOPATH% -asmflags=-trimpath=%GOPATH% -o bin/documize-community-linux-amd64 edition/community.go
+
+echo "Compiling Darwin"
+set GOOS=darwin
+go build -gcflags=-trimpath=%GOPATH% -asmflags=-trimpath=%GOPATH% -o bin/documize-community-darwin-amd64 edition/community.go


Fix local build break

Fix local build break

--- build.cmd
+++ build.cmd
@@ -4,8 +4,8 @@
 SETLOCAL
 SET NUGET_VERSION=latest
 SET CACHED_NUGET=%LocalAppData%\NuGet\nuget.%NUGET_VERSION%.exe
-SET BUILDCMD_KOREBUILD_VERSION=""
-SET BUILDCMD_DNX_VERSION=""
+SET BUILDCMD_KOREBUILD_VERSION=
+SET BUILDCMD_DNX_VERSION=

 IF EXIST %CACHED_NUGET% goto copynuget
 echo Downloading latest version of NuGet.exe...
@@ -19,7 +19,7 @@

 :restore
 IF EXIST packages\Sake goto getdnx
-IF %BUILDCMD_KOREBUILD_VERSION%=="" (
+IF "%BUILDCMD_KOREBUILD_VERSION%"=="" (
     .nuget\nuget.exe install KoreBuild -ExcludeVersion -o packages -nocache -pre
 ) ELSE (
     .nuget\nuget.exe install KoreBuild -version %BUILDCMD_KOREBUILD_VERSION% -ExcludeVersion -o packages -nocache -pre
@@ -27,10 +27,10 @@
 .nuget\NuGet.exe install Sake -ExcludeVersion -Source https://www.nuget.org/api/v2/ -Out packages

 :getdnx
+IF "%BUILDCMD_DNX_VERSION%"=="" (
+    SET BUILDCMD_DNX_VERSION=latest
+)
 IF "%SKIP_DNX_INSTALL%"=="" (
-    IF "%BUILDCMD_DNX_VERSION%"=="" (
-        BUILDCMD_DNX_VERSION=latest
-    )
     CALL packages\KoreBuild\build\dnvm install %BUILDCMD_DNX_VERSION% -runtime CoreCLR -arch x86 -alias default
     CALL packages\KoreBuild\build\dnvm install default -runtime CLR -arch x86 -alias default
 ) ELSE (


Fix build.cmd encoding to UT8 (was UTF8-BOM) - it was messing up console output on Windows

--- build.cmd
+++ build.cmd
@@ -1,4 +1,4 @@
-@echo off
+@echo off
 cls

 .paket\paket.bootstrapper.exe


ertertert

ertertert

--- build-appveyor.cmd
+++ build-appveyor.cmd
@@ -26,4 +26,4 @@
 ECHO gulp build --production

 # Everything that has been built gets packaged
-msbuild PocDeploy\PocDeploy.csproj /t:Package /p:PackageLocation=PocDeploy.zip+msbuild PocDeploy.csproj /t:Package /p:PackageLocation=PocDeploy.zip


Add Windows build script

Add Windows build script

--- build.bat
+++ build.bat
@@ -0,0 +1,2 @@
+set GOARCH=386
+go build -ldflags "-s -w -H=windowsgui" -o breathless_parks.exe


Update version to 1.0.1

Update version to 1.0.1

--- build.bat
+++ build.bat
@@ -1,5 +1,5 @@
 @echo off
-set "picklesVersion=1.0.0"
+set "picklesVersion=1.0.1"

 cls


Fix copy command again

Fix copy command again

--- build.bat
+++ build.bat
@@ -16,8 +16,8 @@

 powershell -Command "(new-object System.Net.WebClient).DownloadFile('https://dist.nuget.org/win-x86-commandline/latest/nuget.exe','nuget.exe')"

-copy nuget.exe Sigma.Core/
-copy nuget.exe Sigma.Core.Monitors.WPF/
+copy nuget.exe Sigma.Core
+copy nuget.exe Sigma.Core.Monitors.WPF

 nuget.exe restore Sigma.sln


Rename SKIP_KRE_INSTALL to SKIP_DOTNET_INSTALL

--- build.cmd
+++ build.cmd
@@ -19,7 +19,7 @@
 .nuget\NuGet.exe install KoreBuild -ExcludeVersion -o packages -nocache -pre
 .nuget\NuGet.exe install Sake -version 0.2 -o packages -ExcludeVersion

-IF "%SKIP_KRE_INSTALL%"=="1" goto run
+IF "%SKIP_DOTNET_INSTALL%"=="1" goto run
 CALL packages\KoreBuild\build\dotnetsdk upgrade -runtime CLR -x86
 CALL packages\KoreBuild\build\dotnetsdk install default -runtime CoreCLR -x86


Fix local build break

Fix local build break


Added simple build launcher.

Added simple build launcher.

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

--- build.cmd
+++ build.cmd
@@ -0,0 +1,11 @@
+@echo Off
+
+set targets=%1
+
+if "%targets%" == "" (
+	set targets=Build
+)
+
+%WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild "Dreamhost Dynamic DNS Updater.sln" /v:minimal /maxcpucount /target:%targets%
+
+pause


Renamed NuGet output directory to build\Packages

--- build.cmd
+++ build.cmd
@@ -12,14 +12,14 @@
 if errorlevel 1 pause

 ::Create NuGet packages
-mkdir build\NuGet
-nuget pack Dehydrator\Dehydrator.nuspec -Symbols -OutputDirectory build\NuGet -Version %version%
+mkdir build\Packages
+nuget pack Dehydrator\Dehydrator.nuspec -Symbols -OutputDirectory build\Packages -Version %version%
 if errorlevel 1 pause
-nuget pack Dehydrator.EntityFramework\Dehydrator.EntityFramework.nuspec -Symbols -OutputDirectory build\NuGet -Version %version%
+nuget pack Dehydrator.EntityFramework\Dehydrator.EntityFramework.nuspec -Symbols -OutputDirectory build\Packages -Version %version%
 if errorlevel 1 pause
-nuget pack Dehydrator.EntityFramework.Unity\Dehydrator.EntityFramework.Unity.nuspec -Symbols -OutputDirectory build\NuGet -Version %version%
+nuget pack Dehydrator.EntityFramework.Unity\Dehydrator.EntityFramework.Unity.nuspec -Symbols -OutputDirectory build\Packages -Version %version%
 if errorlevel 1 pause
-nuget pack Dehydrator.WebApi\Dehydrator.WebApi.nuspec -Symbols -OutputDirectory build\NuGet -Version %version%
+nuget pack Dehydrator.WebApi\Dehydrator.WebApi.nuspec -Symbols -OutputDirectory build\Packages -Version %version%
 if errorlevel 1 pause

 goto end


build script: CI fix

build script: CI fix

--- build.cmd
+++ build.cmd
@@ -10,8 +10,8 @@
 REM "bin\nuget.exe" "install" "FSharp.Formatting.CommandTool" "-OutputDirectory" "Packages" "-ExcludeVersion"
 REM "bin\nuget.exe" "install" "SourceLink.Fake" "-OutputDirectory" "Packages" "-ExcludeVersion"
 REM "bin\nuget.exe" "install" "NUnit.Runners" "-OutputDirectory" "Packages" "-ExcludeVersion"
-"bin\nuget.exe" "install" "Paket.Core" "-OutputDirectory" "packages" "-ExcludeVersion"
-"bin\nuget.exe" "install" "Paket.Core" "-OutputDirectory" "packages" "-ExcludeVersion"
+"bin\nuget.exe" "install" "Paket.Core" "-Version" "1.18.5" "-OutputDirectory" "packages" "-ExcludeVersion"
+"bin\nuget.exe" "install" "Paket.Core" "-Version" "1.18.5" "-OutputDirectory" "packages" "-ExcludeVersion"
 )

 bin\wget.exe -q --no-check-certificate https://github.com/vrvis/Aardvark.Fake/raw/master/bin/Aardvark.Fake.dll -O bin/Aardvark.Fake.dll


Adds /LUAMOD and /CMOD options to Windows installer

--- install.bat
+++ install.bat
@@ -8,8 +8,10 @@
 vars.PREFIX = nil
 vars.VERSION = "2.1"
 vars.SYSCONFDIR = nil
-vars.ROCKS_TREE = nil
-vars.SCRIPTS_DIR = nil
+vars.TREE_ROOT = nil
+vars.TREE_BIN = nil
+vars.TREE_LMODULE = nil
+vars.TREE_CMODULE = nil
 vars.LUA_INTERPRETER = nil
 vars.LUA_PREFIX = nil
 vars.LUA_BINDIR = nil
@@ -126,7 +128,11 @@
 /TREE [dir]    Root of the local tree of installed rocks.
                Default is %PROGRAMFILES%\LuaRocks\systree
 /SCRIPTS [dir] Where to install commandline scripts installed by
-               rocks. Default is {TREE}/bin.
+               rocks. Default is {TREE}\bin.
+/LUAMOD [dir]  Where to install Lua modules installed by rocks.
+               Default is {TREE}\share\lua\{LV}.
+/CMOD [dir]    Where to install c modules installed by rocks.
+               Default is {TREE}\lib\lua\{LV}.
 /CONFIG [dir]  Location where the config file should be installed.
                Default is to follow /P option
 /SELFCONTAINED Creates a self contained installation in a single
@@ -193,9 +199,13 @@
 		elseif name == "/CONFIG" then
 			vars.SYSCONFDIR = option.value
 		elseif name == "/TREE" then
-			vars.ROCKS_TREE = option.value
+			vars.TREE_ROOT = option.value
 		elseif name == "/SCRIPTS" then
-			vars.SCRIPTS_DIR = option.value
+			vars.TREE_BIN = option.value
+		elseif name == "/LUAMOD" then
+			vars.TREE_LMODULE = option.value
+		elseif name == "/CMOD" then
+			vars.TREE_CMODULE = option.value
 		elseif name == "/LV" then
 			vars.LUA_VERSION = option.value
 		elseif name == "/L" then
@@ -234,8 +244,8 @@
 		if not vars.PREFIX then
 			die("Option /P is required when using /SELFCONTAINED")
 		end
-		if vars.SYSCONFDIR or vars.ROCKS_TREE or vars.SCRIPTS_DIR then
-			die("Cannot combine /TREE, /SCRIPTS or /CONFIG with /SELFCONTAINED")
+		if vars.SYSCONFDIR or vars.TREE_ROOT or vars.TREE_BIN or vars.TREE_LMODULE or vars.TREE_CMODULE then
+			die("Cannot combine /TREE, /SCRIPTS, /LUAMOD, /CMOD, or /CONFIG with /SELFCONTAINED")
 		end
 	end
 	if INSTALL_LUA then
@@ -472,6 +482,8 @@
 	["/CONFIG"] = true,
 	["/TREE"] = true,
 	["/SCRIPTS"] = true,
+	["/LUAMOD"] = true,
+	["/CMOD"] = true,
 	["/LV"] = true,
 	["/LUA"] = true,
 	["/INC"] = true,
@@ -598,10 +610,10 @@
 	datapath = os.getenv("ProgramW6432") .. [[\LuaRocks]]
 end
 vars.SYSCONFDIR = vars.SYSCONFDIR or vars.PREFIX
-vars.ROCKS_TREE = vars.ROCKS_TREE or datapath..[[\systree]]
+vars.TREE_ROOT = vars.TREE_ROOT or datapath..[[\systree]]
 if SELFCONTAINED then
 	vars.SYSCONFDIR = vars.PREFIX
-	vars.ROCKS_TREE = vars.PREFIX..[[\systree]]
+	vars.TREE_ROOT = vars.PREFIX..[[\systree]]
 	REGISTRY = false
 end

@@ -614,7 +626,7 @@
 Will configure LuaRocks with the following paths:
 LuaRocks        : $FULL_PREFIX
 Config file     : $SYSCONFDIR\config.lua
-Rocktree        : $ROCKS_TREE
+Rocktree        : $TREE_ROOT

 Lua interpreter : $LUA_BINDIR\$LUA_INTERPRETER
     binaries    : $LUA_BINDIR
@@ -756,19 +768,19 @@
 -- see https://github.com/keplerproject/luarocks/pull/197#issuecomment-30176548

 -- configure 'scripts' directory
--- if vars.SCRIPTS_DIR then
--- 	mkdir(vars.SCRIPTS_DIR)
+-- if vars.TREE_BIN then
+-- 	mkdir(vars.TREE_BIN)
 -- 	if not USE_MINGW then
 -- 		-- definitly not for MinGW because of conflicting runtimes
 -- 		-- but is it ok to do it for others???
--- 		exec(S[[COPY lua5.1\bin\*.dll "$SCRIPTS_DIR" >NUL]])
+-- 		exec(S[[COPY lua5.1\bin\*.dll "$TREE_BIN" >NUL]])
 -- 	end
 -- else
 -- 	if not USE_MINGW then
--- 	mkdir(S[[$ROCKS_TREE\bin]])
+-- 	mkdir(S[[$TREE_ROOT\bin]])
 -- 		-- definitly not for MinGW because of conflicting runtimes
 -- 		-- but is it ok to do it for others???
--- 		exec(S[[COPY lua5.1\bin\*.dll "$ROCKS_TREE"\bin >NUL]])
+-- 		exec(S[[COPY lua5.1\bin\*.dll "$TREE_ROOT"\bin >NUL]])
 -- 	end
 -- end

@@ -799,7 +811,7 @@
 f:write(S[=[
 site_config.LUAROCKS_UNAME_M=[[$UNAME_M]]
 site_config.LUAROCKS_SYSCONFIG=[[$SYSCONFDIR\config.lua]]
-site_config.LUAROCKS_ROCKS_TREE=[[$ROCKS_TREE]]
+site_config.LUAROCKS_ROCKS_TREE=[[$TREE_ROOT]]
 site_config.LUAROCKS_PREFIX=[[$PREFIX]]
 site_config.LUAROCKS_DOWNLOADER=[[wget]]
 site_config.LUAROCKS_MD5CHECKER=[[md5sum]]
@@ -836,12 +848,22 @@
 if FORCE_CONFIG then
 	f:write("    home..[[/luarocks]],\n")
 end
-f:write(S"    { name = [[user]],   root = home..[[/luarocks]] },\n")
-f:write(S"    { name = [[system]], root = [[$ROCKS_TREE]] },\n")
+f:write(S"    { name = [[user]],\n")
+f:write(S"         root    = home..[[/luarocks]],\n")
+f:write(S"    },\n")
+f:write(S"    { name = [[system]],\n")
+f:write(S"         root    = [[$TREE_ROOT]],\n")
+if vars.TREE_BIN then
+  f:write(S"         bin_dir = [[$TREE_BIN]],\n")
+end
+if vars.TREE_CMODULE then
+  f:write(S"         lib_dir = [[$TREE_CMODULE]],\n")
+end
+if vars.TREE_LMODULE then
+  f:write(S"         lua_dir = [[$TREE_LMODULE]],\n")
+end
+f:write(S"    },\n")
 f:write("}\n")
-if vars.SCRIPTS_DIR then
-	f:write(S"scripts_dir=[[$SCRIPTS_DIR]]\n")
-end
 f:write("variables = {\n")
 if USE_MINGW and vars.LUA_RUNTIME == "MSVCRT" then
 	f:write("    MSVCRT = 'm',   -- make MinGW use MSVCRT.DLL as runtime\n")
@@ -858,11 +880,11 @@

 print()
 print("Creating rocktrees...")
-if not exists(vars.ROCKS_TREE) then
-	mkdir(vars.ROCKS_TREE)
-	print(S[[Created system rocktree    : "$ROCKS_TREE"]])
+if not exists(vars.TREE_ROOT) then
+	mkdir(vars.TREE_ROOT)
+	print(S[[Created system rocktree    : "$TREE_ROOT"]])
 else
-	print(S[[System rocktree exists     : "$ROCKS_TREE"]])
+	print(S[[System rocktree exists     : "$TREE_ROOT"]])
 end

 vars.APPDATA = os.getenv("APPDATA")
@@ -894,7 +916,9 @@
 -- ***********************************************************
 -- Exit handlers
 -- ***********************************************************
-
+vars.TREE_BIN     = vars.TREE_BIN     or vars.TREE_ROOT..[[\bin]]
+vars.TREE_LMODULE = vars.TREE_LMODULE or vars.TREE_ROOT..[[\share\lua\]]..vars.LUA_VERSION
+vars.TREE_CMODULE = vars.TREE_CMODULE or vars.TREE_ROOT..[[\lib\lua\]]..vars.LUA_VERSION
 print(S[[

 ============================
@@ -914,9 +938,9 @@
   LUA_PATH :   %APPDATA%\LuaRocks\share\lua\$LUA_VERSION\?.lua;%APPDATA%\LuaRocks\share\lua\$LUA_VERSION\?\init.lua
   LUA_CPATH:   %APPDATA%\LuaRocks\lib\lua\$LUA_VERSION\?.dll
 System rocktree
-  PATH     :   $ROCKS_TREE\bin
-  LUA_PATH :   $ROCKS_TREE\share\lua\$LUA_VERSION\?.lua;$ROCKS_TREE\share\lua\$LUA_VERSION\?\init.lua
-  LUA_CPATH:   $ROCKS_TREE\lib\lua\$LUA_VERSION\?.dll
+  PATH     :   $TREE_BIN
+  LUA_PATH :   $TREE_LMODULE\?.lua;$TREE_LMODULE\?\init.lua
+  LUA_CPATH:   $TREE_CMODULE\?.dll

 Note that the %APPDATA% element in the paths above is user specific and it MUST be replaced by its actual value.
 For the current user that value is: $APPDATA.


install emacs config too

install emacs config too

--- install.bat
+++ install.bat
@@ -1,4 +1,5 @@
 copy  /Y     cvsignore    %USERPROFILE%\.cvsignore
+copy  /Y     emacs        %USERPROFILE%\.emacs
 copy  /Y     gitconfig    %USERPROFILE%\.gitconfig
 copy  /Y     vimrc        %USERPROFILE%\.vimrc
 copy  /Y     zshrc        %USERPROFILE%\.zshrc


add build-no-upload.bat script

add build-no-upload.bat script

error: pathspec 'windows/build-no-upload.bat' did not match any file(s) known to git

--- windows/build-no-upload.bat
+++ windows/build-no-upload.bat
@@ -0,0 +1,35 @@
+@set PATH=%PATH%;%ProgramFiles%\NSIS
+
+@call vc9.bat
+@IF ERRORLEVEL 1 goto NO_VC9
+
+@rem @pushd .
+
+@rem check if makensis exists
+@makensis /version >nul
+@IF ERRORLEVEL 1 goto NSIS_NEEDED
+
+python buildandupload.py -noupload
+@IF ERRORLEVEL 1 goto BUILD_FAILED
+
+@goto END
+
+:NO_VC9
+echo vc9.bat failed
+@goto END
+
+:INSTALLER_FAILED
+echo Installer script failed
+@goto END
+
+:BUILD_FAILED
+echo Build failed!
+@goto END
+
+:NSIS_NEEDED
+echo NSIS doesn't seem to be installed. Get it from http://nsis.sourceforge.net/Download
+@goto END
+
+:END
+@popd
+


Do not start oldshell alongside IEx, closes #5730 (on Windows) (#6168)

--- bin/iex.bat
+++ bin/iex.bat
@@ -41,6 +41,6 @@

 :run
 @if defined IEX_WITH_WERL (@set __ELIXIR_IEX_FLAGS=--werl) else (set __ELIXIR_IEX_FLAGS=)
-call "%~dp0\elixir.bat" +iex --erl "-user Elixir.IEx.CLI" --no-halt %__ELIXIR_IEX_FLAGS% %*
+call "%~dp0\elixir.bat" --no-halt --erl "-noshell -user Elixir.IEx.CLI" +iex %__ELIXIR_IEX_FLAGS% %*
 :end
 endlocal


Update upload.bat

Update upload.bat

--- conda/upload.bat
+++ conda/upload.bat
@@ -55,7 +55,7 @@
 rmdir toolchain /s /q

 for %%x in (%UPLOAD_TARGETS%) do (
-  echo | set /p "for /f %%i in ('conda build " > _upload.bat
+  echo | set /p "for /f %%i in ('conda build " >> _upload.bat
   more _upload.bat
   <nul set /p %%x >> _upload.bat
   more _upload.bat


Update sync.bat

Update sync.bat

--- etc/scripts/sync.bat
+++ etc/scripts/sync.bat
@@ -1,7 +1,8 @@
-REM As you may have noticed, I implemented the DS library and the Falcon QML
-REM widgets as submodules. I still cannot say if that was a good idea...
-REM
-REM Run this script often to ensure that we use the lastest versions of the
-REM registered submodules.
+:: As you may have noticed, I implemented the DS library and the Falcon QML
+:: widgets as submodules. I still cannot say if that was a good idea...
+::
+:: Run this script often to ensure that we use the lastest versions of the
+:: registered submodules.
+::
 git submodule foreach git pull origin master


Create bld.bat

Create bld.bat

error: pathspec 'recipes/libignition-utils1/bld.bat' did not match any file(s) known to git

--- recipes/libignition-utils1/bld.bat
+++ recipes/libignition-utils1/bld.bat
@@ -0,0 +1,23 @@
+mkdir build
+cd build
+
+cmake ^
+    -G "NMake Makefiles" ^
+    -DCMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% ^
+    -DCMAKE_BUILD_TYPE=Release ^
+    -DCMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP=True ^
+    -DBUILD_TESTING=ON ^
+    %SRC_DIR%
+if errorlevel 1 exit 1
+
+:: Build.
+cmake --build . --config Release
+if errorlevel 1 exit 1
+
+:: Install.
+cmake --build . --config Release --target install
+if errorlevel 1 exit 1
+
+:: Test
+ctest --output-on-failure -C Release
+if errorlevel 1 exit 1


No rpd needed atm

No rpd needed atm

--- packer/scripts/enable-rdp.bat
+++ packer/scripts/enable-rdp.bat
@@ -1,2 +0,0 @@
-netsh advfirewall firewall add rule name="Open Port 3389" dir=in action=allow protocol=TCP localport=3389
-reg add "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server" /v fDenyTSConnections /t REG_DWORD /d 0 /f


Updating provisioning script

Updating provisioning script

--- environment/stack/scripts/provision.bat
+++ environment/stack/scripts/provision.bat
@@ -11,10 +11,12 @@
 	)
 )

-ECHO %YAWDS_CONF_GENERAL_SHORTNAME% - Package provisioning
+ECHO %YAWDS_CONF_GENERAL_SHORTNAME% packages provisioning
 ECHO.
-ECHO Coffee time! this may take some minutes...
-ECHO.
+IF NOT EXIST "%YAWDS_STACK_PATH%\provision.lock" (
+	ECHO Coffee time! this may take some minutes...
+	ECHO.
+)

 CALL node "%~dp0node_scripts\install_packages" "%YAWDS_STACK_PATH%\packages.ini" > "%~dp0temp\install_packages.bat"
 IF NOT ERRORLEVEL 0 GOTO CONFIG_ERROR


Build QtPropertyBrowser if the dll doesn't exist, not if the qt-solutions directory doesn't exist.

--- tools/Windows/BuildDeps.cmd
+++ tools/Windows/BuildDeps.cmd
@@ -747,39 +747,42 @@

 :: QtPropertyBrowser
 IF NOT EXIST "%DEPS%\qt-solutions". (
-   cecho {0D}Cloning QtPropertyBrowser into "%DEPS%\qt-solutions".{# #}{\n}
-   cd "%DEPS%"
-   call git clone https://git.gitorious.org/qt-solutions/qt-solutions.git
-   IF NOT EXIST "%DEPS%\qt-solutions\.git" GOTO :ERROR
-   cd qt-solutions\qtpropertybrowser
-
-   REM Don't build examples.
-   sed -e "s/SUBDIRS+=examples//" < qtpropertybrowser.pro > qtpropertybrowser.pro.sed
-   del qtpropertybrowser.pro
-   ren qtpropertybrowser.pro.sed qtpropertybrowser.pro
-
-   call configure -library
-   qmake
-   IF NOT %ERRORLEVEL%==0 GOTO :ERROR
-   IF %USE_JOM%==TRUE (
-      cecho {0D}- Building QtPropertyBrowser with jom{# #}{\n}
-      "%DEPS%\qt\jom\jom.exe"
-   ) ELSE (
-      cecho {0D}- Building QtPropertyBrowser with nmake{# #}{\n}
-      nmake /nologo
-   )
-   IF NOT %ERRORLEVEL%==0 GOTO :ERROR
-   :: Force deployment
-   del /Q "%TUNDRA_BIN%\QtSolutions_PropertyBrowser-head*.dll"
-) ELSE (
-   cecho {0D}QtPropertyBrowser already built. Skipping.{# #}{\n}
+    cecho {0D}Cloning QtPropertyBrowser into "%DEPS%\qt-solutions".{# #}{\n}
+    cd "%DEPS%"
+    call git clone https://git.gitorious.org/qt-solutions/qt-solutions.git
+    IF NOT EXIST "%DEPS%\qt-solutions\.git" GOTO :ERROR
+)
+
+IF NOT EXIST "%DEPS%\qt-solutions\qtpropertybrowser\lib\QtSolutions_PropertyBrowser-head.dll" (
+    cd "%DEPS%\qt-solutions\qtpropertybrowser"
+
+    REM Don't build examples.
+    sed -e "s/SUBDIRS+=examples//" < qtpropertybrowser.pro > qtpropertybrowser.pro.sed
+    del qtpropertybrowser.pro
+    ren qtpropertybrowser.pro.sed qtpropertybrowser.pro
+
+    call configure -library
+    qmake
+    IF NOT %ERRORLEVEL%==0 GOTO :ERROR
+    IF %USE_JOM%==TRUE (
+        cecho {0D}- Building QtPropertyBrowser with jom{# #}{\n}
+        "%DEPS%\qt\jom\jom.exe"
+    ) ELSE (
+        cecho {0D}- Building QtPropertyBrowser with nmake{# #}{\n}
+        nmake /nologo
+    )
+    IF NOT %ERRORLEVEL%==0 GOTO :ERROR
+    :: Force deployment
+    del /Q "%TUNDRA_BIN%\QtSolutions_PropertyBrowser-head*.dll"
+) ELSE (
+    cecho {0D}QtPropertyBrowser already built. Skipping.{# #}{\n}
 )

 IF NOT EXIST "%TUNDRA_BIN%\QtSolutions_PropertyBrowser-head.dll". (
-   cecho {0D}Deploying QtPropertyBrowser DLLs.{# #}{\n}
-   copy /Y "%DEPS%\qt-solutions\qtpropertybrowser\lib\QtSolutions_PropertyBrowser-head*.dll" "%TUNDRA_BIN%"
-) ELSE (
-   cecho {0D}QtPropertyBrowser DLLs already deployed. Skipping.{# #}{\n}
+    cecho {0D}Deploying QtPropertyBrowser DLLs.{# #}{\n}
+    copy /Y "%DEPS%\qt-solutions\qtpropertybrowser\lib\QtSolutions_PropertyBrowser-head*.dll" "%TUNDRA_BIN%"
+) ELSE (
+    cecho {0D}QtPropertyBrowser DLLs already deployed. Skipping.{# #}{\n}
 )

 :: OpenAL


doxygen: Add missing modules to Windows runner

Acked-by: Rhys Kidd <0b3b315d08353e2046d43a86d41e3fd1dff3d6ad@gmail.com>

--- doxygen/doxy.bat
+++ doxygen/doxy.bat
@@ -6,6 +6,9 @@
 doxygen tnl.doxy
 doxygen core.doxy
 doxygen glapi.doxy
+doxygen glsl.doxy
+doxygen nir.doxy
+doxygen i965.doxy

 echo Building again, to resolve tags
 doxygen tnl_dd.doxy
@@ -14,4 +17,8 @@
 doxygen swrast.doxy
 doxygen swrast_setup.doxy
 doxygen tnl.doxy
+doxygen core.doxy
 doxygen glapi.doxy
+doxygen glsl.doxy
+doxygen nir.doxy
+doxygen i965.doxy


Fixed path error

Fixed path error

--- Bin/DarunGrim3/SetupDist.bat
+++ Bin/DarunGrim3/SetupDist.bat
@@ -12,7 +12,7 @@
 del Src\*.pyc
 REM Generate binaries
 pushd Src
-c:\python26\python SetupDist.py py2exe
+c:\python26\python ..\SetupDist.py py2exe
 popd

 REM Prepare binary directory
@@ -34,5 +34,6 @@
 mv Src\bin Bin

 REM zip a package
-zip -r DarunGrim3.zip Bin\*
+pushd Bin
+zip -r ..\DarunGrim3.zip *
 pause


change windows set_build_env.bat script to assume Visual Studio 2012 rather than Visual Studio 2008

--- msconfig/set_build_env.bat
+++ msconfig/set_build_env.bat
@@ -36,7 +36,7 @@
 REM   or this batch file must be run from that directory
 REM
 REM   the location of the MS C compiler is derived from the
-REM   VS90COMNTOOLS environment variable. (which is set in all
+REM   VS110COMNTOOLS environment variable. (which is set in all
 REM   user's environments by the default compiler install.)
 REM
 REM
@@ -132,16 +132,16 @@
 set PROGRAMS_DIR=%ProgramFiles%
 if not "~%ProgramFiles(x86)%"=="~" set PROGRAMS_DIR=%SystemDrive%\PROGRA~2

-:: If Visual Studio 2008 is installed, then VS90COMNTOOLS should be defined
+:: If Visual Studio 2012 is installed, then VS110COMNTOOLS should be defined
 :: we can use that to setup the compiler environment. if it's not set
 :: then all we can do is choose default values for environment variables.
 ::
-if "~%VS90COMNTOOLS%"=="~" goto use_default_paths
-
-:: derive from VS90COMNTOOLS
-::
-for /D %%I in ("%VS90COMNTOOLS%..") do set VS90ROOT=%%~sdpI
-set VS_DIR=%VS90ROOT:~0,-1%
+if "~%VS110COMNTOOLS%"=="~" goto use_default_paths
+
+:: derive from VS110COMNTOOLS
+::
+for /D %%I in ("%VS110COMNTOOLS%..") do set VS110ROOT=%%~sdpI
+set VS_DIR=%VS110ROOT:~0,-1%
 set VC_DIR=%VS_DIR%\VC
 set VC_BIN=%VC_DIR%\bin
 set DBG_TOOLS_DIR=%ProgramFiles%\Debugging Tools for Windows (x86);%ProgramFiles%\Debugging Tools for Windows (x64)
@@ -163,12 +163,12 @@
 goto got_paths

-:: don't have VS90COMNTOOLS defined, so we will have to assume default
+:: don't have VS110COMNTOOLS defined, so we will have to assume default
 :: installation paths for compiler
 ::
 :use_default_paths
 :: Set default paths for Visual C++, the Platform SDKs, and Perl
-set VS_DIR=%PROGRAMS_DIR%\Microsoft Visual Studio 9.0
+set VS_DIR=%PROGRAMS_DIR%\Microsoft Visual Studio 11.0
 set VC_DIR=%VS_DIR%\VC
 set VC_BIN=%VC_DIR%\bin
 set PERL_BIN_DIR=%SystemDrive%\Perl\bin


:chart_with_upwards_trend: Just target .NET Standard

--- coverage.cmd
+++ coverage.cmd
@@ -52,11 +52,11 @@

 cd "%~dp0test\Abioc.Tests"

-::@echo dotnet.exe xunit -framework net47 -configuration %config% -noshadow -html %xunit_results%
-::@dotnet.exe xunit -framework net47 -configuration %config% -noshadow -html %xunit_results%
+::@echo dotnet.exe xunit -framework net472 -configuration %config% -noshadow -html %xunit_results%
+::@dotnet.exe xunit -framework net472 -configuration %config% -noshadow -html %xunit_results%

-@echo "%cover_exe%" -register:user "-target:dotnet.exe" "-targetargs:xunit -framework net47 -configuration %config% -noshadow -html %xunit_results%" -returntargetcode -filter:^"%coverage_filter%^" "-output:%coverage_results%"
-@"%cover_exe%" -register:user "-target:dotnet.exe" "-targetargs:xunit -framework net47 -configuration %config% -noshadow -html %xunit_results%" -returntargetcode -filter:^"%coverage_filter%^" "-output:%coverage_results%"
+@echo "%cover_exe%" -register:user "-target:dotnet.exe" "-targetargs:xunit -framework net472 -configuration %config% -noshadow -html %xunit_results%" -returntargetcode -filter:^"%coverage_filter%^" "-output:%coverage_results%"
+@"%cover_exe%" -register:user "-target:dotnet.exe" "-targetargs:xunit -framework net472 -configuration %config% -noshadow -html %xunit_results%" -returntargetcode -filter:^"%coverage_filter%^" "-output:%coverage_results%"
 @IF ERRORLEVEL 1 (
    echo Error executing the xunit tests
    EXIT /B 2
@@ -64,11 +64,11 @@

 cd "%~dp0test\Abioc.Tests.Internal"

-::@echo dotnet.exe xunit -framework net47 -configuration %config% -noshadow -html %xunit_results%
-::@dotnet.exe xunit -framework net47 -configuration %config% -noshadow -html %xunit_results%
+::@echo dotnet.exe xunit -framework net472 -configuration %config% -noshadow -html %xunit_results%
+::@dotnet.exe xunit -framework net472 -configuration %config% -noshadow -html %xunit_results%

-@echo "%cover_exe%" -register:user "-target:dotnet.exe" "-targetargs:xunit -framework net47 -configuration %config% -noshadow -html %xunit_results%" -returntargetcode -filter:^"%coverage_filter%^" "-output:%coverage_results%" -mergeoutput
-@"%cover_exe%" -register:user "-target:dotnet.exe" "-targetargs:xunit -framework net47 -configuration %config% -noshadow -html %xunit_results%" -returntargetcode -filter:^"%coverage_filter%^" "-output:%coverage_results%" -mergeoutput
+@echo "%cover_exe%" -register:user "-target:dotnet.exe" "-targetargs:xunit -framework net472 -configuration %config% -noshadow -html %xunit_results%" -returntargetcode -filter:^"%coverage_filter%^" "-output:%coverage_results%" -mergeoutput
+@"%cover_exe%" -register:user "-target:dotnet.exe" "-targetargs:xunit -framework net472 -configuration %config% -noshadow -html %xunit_results%" -returntargetcode -filter:^"%coverage_filter%^" "-output:%coverage_results%" -mergeoutput
 @IF ERRORLEVEL 1 (
    echo Error executing the internal xunit tests
    EXIT /B 2


Added debugging options

Added debugging options

--- etc/cmsshell.bat
+++ etc/cmsshell.bat
@@ -1,4 +1,4 @@
 @rem Start script for the OpenCms Shell
 @rem Please make sure that "servlet.jar" is found, the path used below was tested with Tomcat 4.1

-java -Dfile.encoding=ISO-8859-1 -Dopencms.disableScheduler=true  -classpath ../../../common/lib/servlet.jar;../../../common/lib/commons-dbcp.jar;../../../common/lib/commons-pool.jar;../../../common/lib/commons-collections.jar;lib/jcr.jar;lib/opencms.jar;lib/activation.jar;lib/jakarta-oro-2_0_6.jar;lib/mysql-connector-java-3.0.7-stable-bin.jar;lib/Tidy.jar;lib/mail.jar;lib/jug.jar;lib/xerces-1_4_4.jar com.opencms.boot.CmsMain %1 %2 %3 %4 %5 %6 %7 %8 %9+java -Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8001 -Djava.compiler=NONE -Dfile.encoding=ISO-8859-1 -Dopencms.disableScheduler=true  -classpath ../../../common/lib/servlet.jar;../../../common/lib/commons-dbcp.jar;../../../common/lib/commons-pool.jar;../../../common/lib/commons-collections.jar;lib/jcr.jar;lib/opencms.jar;lib/activation.jar;lib/jakarta-oro-2_0_6.jar;lib/mysql-connector-java-3.0.7-stable-bin.jar;lib/Tidy.jar;lib/mail.jar;lib/jug.jar;lib/xerces-1_4_4.jar com.opencms.boot.CmsMain %1 %2 %3 %4 %5 %6 %7 %8 %9


Implement bulk of flag parsing for bolt build

--- src/bolt-build.subr.bat
+++ src/bolt-build.subr.bat
@@ -72,5 +72,105 @@

 if "%help_mode%"=="true" call :usage && exit /b 0

+set count_targets=0
+set count_entry_point=0
+set count_entry_group_name=0
+
+:parse_flags
+  set flag=%~1
+  if not "%flag:~0,1%"=="-" goto done_parse_flags
+  shift
+
+  if "%flag%"=="-c" goto parse_config
+  if "%flag%"=="--config" goto parse_config
+  if "%flag%"=="-o" goto parse_output
+  if "%flag%"=="--output" goto parse_output
+  if "%flag%"=="-s" goto parse_src
+  if "%flag%"=="--src-dir" goto parse_src
+  if "%flag%"=="-n" goto parse_invoke
+  if "%flag%"=="--invoke-main" goto parse_invoke
+  if "%flag%"=="-r" goto parse_register
+  if "%flag%"=="--register" goto parse_register
+  if "%flag%"=="-i" goto parse_inline
+  if "%flag%"=="--inline" goto parse_inline
+  if "%flag%"=="-m" goto parse_modules
+  if "%flag%"=="--modules" goto parse_modules
+  if "%flag%"=="-e" goto parse_points
+  if "%flag%"=="--entry-points" goto parse_points
+  if "%flag%"=="-g" goto parse_group
+  if "%flag%"=="--entry-group" goto parse_group
+  if "%flag%"=="--" goto done_parse_flags
+  echo invalid flag [%flag%] && goto fail_usage
+
+  goto parse_flags
+
+  :parse_config
+    if "%~1"=="" echo %flag% requires an argument to be specified && goto fail_usage
+    set config_js=%~1
+    shift
+  goto parse_flags
+
+  :parse_output
+    if "%~1"=="" echo %flag% requires an argument to be specified && goto fail_usage
+    set output_dir=%~1
+    shift
+  goto parse_flags
+
+  :parse_src
+    if "%~1"=="" echo %flag% requires an argument to be specified && goto fail_usage
+    set src_dir=%~1
+    shift
+  goto parse_flags
+
+  :parse_invoke
+    if "%~1"=="" echo %flag% requires an argument to be specified && goto fail_usage
+    set invoke_main_flag=-n "%~1"
+    shift
+  goto parse_flags
+
+  :parse_register
+    set register_modules_flag=-r
+  goto parse_flags
+
+  :parse_inline
+    set generate_inline=true
+  goto parse_flags
+
+  :parse_modules
+    set generate_modules=true
+  goto parse_modules
+
+  :parse_points
+    :point_loop
+      set entry=%~1
+      if "%entry%"=="" goto end_point_loop
+      if "%entry:~0,1%"=="-" goto end_point_loop
+      shift
+
+      if not exist "%entry%" echo specified file for entry point not found [%entry%] && goto fail
+      call :is_dir "%entry%"
+      if %errorlevel%==0 echo specified file for entry point not found [%entry%] && goto fail
+
+      set entry_point_%count_entry_point%="%entry%"
+      set /a count_entry_point=%count_entry_point% + 1
+    goto point_loop
+    :end_point_loop
+  goto parse_modules
+
+  :parse_group
+    echo --entry-group parsing not implemented.
+    exit /b 1
+  goto parse_modules
+
+:done_parse_flags
+
+if "%config_js%"=="" set config_js=config/bolt/prod.js
+if "%output_dir%"=="" set output_dir=scratch/main/js
+if "%src_dir%"=="" set src_dir=src/main/js
+if "%generate_inline%"=="" set generate_inline=false
+if "%generate_modules%"=="" set generate_modules=false
+
+
+
 echo Windows support for bolt build is currently not implemented.
 exit /b 1


added new property

added new property


Change to windows line endings

Change to windows line endings

--- src/bolt-test.subr.bat
+++ src/bolt-test.subr.bat
@@ -1,88 +1,88 @@
-@echo off
-
-goto entry
-
-:usage
-  echo usage: bolt test [-v^|--verbose] CONFIG TEST ...
-  echo.
-  echo arguments:
-  echo   CONFIG                   The bolt configuration file to be used for tests
-  echo   TEST                     A test file. The test file may contain one or more
-  echo                            test methods. Test files have an `assert` library
-  echo                            exposed to them automatically.
-  echo.
-  echo example:
-  echo   Run all atomic tests.
-  echo.
-  echo     bolt test config/bolt/atomic.js src/test/js/atomic/**/*.js
-  echo.
-  echo.
-  echo   Run all browser tests.
-  echo.
-  echo     bolt test config/bolt/browser.js src/test/js/browser/**/*.js
-
-  exit /b 0
-
-:fail_usage
-  echo.
-  call :usage
-  exit /b 1
-
-:fail
-  exit /b 1
-
-:is_dir
-  setlocal
-  set olddir=%CD%
-  cd "%~1" 2>NUL
-  set err=%errorlevel%
-  cd "%olddir%"
-  exit /b %err%
-
-
-:entry
-
-if "%help_mode%"=="true" call :usage && exit /b 0
-
-set verbose=false
-
-if "%~1"=="-v" (set verbose=true
-  shift && goto done_flags)
-if "%~1"=="--verbose" (set verbose=true
-  shift && goto done_flags)
-
-if "%~1"=="" goto done_flags
-
-set flag=%~1
-if "%flag:~0,1%"=="-" echo Unknown flag [%flag%] && goto fail_usage
-
-:done_flags
-
-if "%~2"=="" echo Not enough arguments, must specify configuration and at least one test file. && goto fail_usage
-
-set config=%~1
-shift
-
-if not exist "%config%" echo Could not find config file [%config%] && exit /b 10
-call :is_dir "%config%"
-if %errorlevel%==0 echo Could not find config file [%config%] && exit /b 10
-
-for %%i in (node.exe) do set node=%%~$PATH:i
-if "%node%"=="" echo error: node.js is not on the system path && goto fail
-
-set remaining=
-:remaining
-if "%~1"=="" goto end_remaining
-set remaining=%remaining% "%~1"
-shift
-goto remaining
-:end_remaining
-
-setlocal enabledelayedexpansion
-for %%i in (%remaining%) do (
-  if not exist %%i echo Could not find test file [%%i] && exit /b 20
-  call :is_dir %%i
-  if !errorlevel!==0 echo Could not find test file [%%i] && exit /b 20)
-endlocal
-
-"%node%" "%base%bolt-test.js" "%verbose%" "%config%" %remaining%
+@echo off
+
+goto entry
+
+:usage
+  echo usage: bolt test [-v^|--verbose] CONFIG TEST ...
+  echo.
+  echo arguments:
+  echo   CONFIG                   The bolt configuration file to be used for tests
+  echo   TEST                     A test file. The test file may contain one or more
+  echo                            test methods. Test files have an `assert` library
+  echo                            exposed to them automatically.
+  echo.
+  echo example:
+  echo   Run all atomic tests.
+  echo.
+  echo     bolt test config/bolt/atomic.js src/test/js/atomic/**/*.js
+  echo.
+  echo.
+  echo   Run all browser tests.
+  echo.
+  echo     bolt test config/bolt/browser.js src/test/js/browser/**/*.js
+
+  exit /b 0
+
+:fail_usage
+  echo.
+  call :usage
+  exit /b 1
+
+:fail
+  exit /b 1
+
+:is_dir
+  setlocal
+  set olddir=%CD%
+  cd "%~1" 2>NUL
+  set err=%errorlevel%
+  cd "%olddir%"
+  exit /b %err%
+
+
+:entry
+
+if "%help_mode%"=="true" call :usage && exit /b 0
+
+set verbose=false
+
+if "%~1"=="-v" (set verbose=true
+  shift && goto done_flags)
+if "%~1"=="--verbose" (set verbose=true
+  shift && goto done_flags)
+
+if "%~1"=="" goto done_flags
+
+set flag=%~1
+if "%flag:~0,1%"=="-" echo Unknown flag [%flag%] && goto fail_usage
+
+:done_flags
+
+if "%~2"=="" echo Not enough arguments, must specify configuration and at least one test file. && goto fail_usage
+
+set config=%~1
+shift
+
+if not exist "%config%" echo Could not find config file [%config%] && exit /b 10
+call :is_dir "%config%"
+if %errorlevel%==0 echo Could not find config file [%config%] && exit /b 10
+
+for %%i in (node.exe) do set node=%%~$PATH:i
+if "%node%"=="" echo error: node.js is not on the system path && goto fail
+
+set remaining=
+:remaining
+if "%~1"=="" goto end_remaining
+set remaining=%remaining% "%~1"
+shift
+goto remaining
+:end_remaining
+
+setlocal enabledelayedexpansion
+for %%i in (%remaining%) do (
+  if not exist %%i echo Could not find test file [%%i] && exit /b 20
+  call :is_dir %%i
+  if !errorlevel!==0 echo Could not find test file [%%i] && exit /b 20)
+endlocal
+
+"%node%" "%base%bolt-test.js" "%verbose%" "%config%" %remaining%


Trying to properly propagate errors in Windows CI script.

--- dev/ci/appveyor.bat
+++ dev/ci/appveyor.bat
@@ -23,13 +23,19 @@
   call %APPVEYOR_BUILD_FOLDER%\dev\build\windows\MakeCoq_MinGW.bat -threads=1 ^
     -arch=%ARCH% -installer=Y -coqver=%APPVEYOR_BUILD_FOLDER_CFMT% ^
     -destcyg=%CYGROOT% -destcoq=%DESTCOQ% -cygcache=%CYGCACHE% ^
-    -setup %CYGROOT%\%SETUP%
-  copy "%CYGROOT%\build\coq-local\dev\nsis\*.exe" dev\nsis
-  7z a coq-opensource-archive-%ARCHLONG%.zip %CYGROOT%\build\tarballs\*
+    -setup %CYGROOT%\%SETUP% || GOTO ErrorExit
+  copy "%CYGROOT%\build\coq-local\dev\nsis\*.exe" dev\nsis || GOTO ErrorExit
+  7z a coq-opensource-archive-%ARCHLONG%.zip %CYGROOT%\build\tarballs\* || GOTO ErrorExit
 )

 if %USEOPAM% == true (
   %CYGROOT%\%SETUP% -qnNdO -R %CYGROOT% -l %CYGCACHE% -s %CYGMIRROR% ^
     -P rsync -P patch -P diffutils -P make -P unzip -P m4 -P findutils -P time
-  %CYGROOT%/bin/bash -l %APPVEYOR_BUILD_FOLDER%/dev/ci/appveyor.sh
+  %CYGROOT%/bin/bash -l %APPVEYOR_BUILD_FOLDER%/dev/ci/appveyor.sh || GOTO ErrorExit
 )
+
+GOTO :EOF
+
+:ErrorExit
+  ECHO ERROR MakeCoq_MinGW.bat failed
+  EXIT /b 1


orders panel, search panel initial implementation

--- js/gear.cmd
+++ js/gear.cmd
@@ -1,3 +1,3 @@
-@echo off
+@echo off

 copy /y/b loader.js+misc.js+verge.js+hashes.js+xhrs.js+idle.js+sseq.js+barcode.js+core-estimator.js+detect-browser.js+core.js gear.js


=removing unneeded files

=removing unneeded files

--- dep.bat
+++ dep.bat
@@ -1,12 +0,0 @@
-@echo off
-net use \\HACKBERRY\Ajia\temp\mcmanager
-mkdir \\HACKBERRY\Ajia\temp\mcmanager\bin
-mkdir \\HACKBERRY\Ajia\temp\mcmanager\Static
-copy /Y bin\Release\EasySgml.dll \\HACKBERRY\Ajia\temp\mcmanager\bin
-copy /Y bin\Release\MCManager.dll \\HACKBERRY\Ajia\temp\mcmanager\bin
-copy /Y Static\*.* \\HACKBERRY\Ajia\temp\mcmanager\Static
-copy /Y web.config \\HACKBERRY\Ajia\temp\mcmanager
-goto :EOF
-
-::anders@hackberry:/var/www$
-::sudo /etc/init.d/fastcgi-mono stop; rm -r mcmanager; mv /ajia/temp/mcmanager .; sudo /etc/init.d/fastcgi-mono start


build: Remove LunarGLASS from Win update ext sources.

--- update_external_sources.bat
+++ update_external_sources.bat
@@ -1,5 +1,5 @@
 @echo off
-REM Update source for glslang, LunarGLASS, spirv-tools
+REM Update source for glslang, spirv-tools

 REM Determine the appropriate CMake strings for the current version of Visual Studio
 echo Determining VS version
@@ -10,19 +10,11 @@
 REM Cleanup the file we used to collect the VS version output since it's no longer needed.
 del /Q /F vsversion.tmp

-REM Determine if SVN exists, this is a requirement for LunarGLASS
-set SVN_EXE_FOUND=0
-for %%X in (svn.exe) do (set FOUND=%%~$PATH:X)
-if defined FOUND (
- set SVN_EXE_FOUND=1
-)
-
 setlocal EnableDelayedExpansion
 set errorCode=0
 set BUILD_DIR=%~dp0
 set BASE_DIR=%BUILD_DIR%..
 set GLSLANG_DIR=%BASE_DIR%\glslang
-set LUNARGLASS_DIR=%BASE_DIR%\LunarGLASS
 set SPIRV_TOOLS_DIR=%BASE_DIR%\spirv-tools

 REM // ======== Parameter parsing ======== //
@@ -32,24 +24,18 @@
       echo.
       echo Available options:
       echo   --sync-glslang      just pull glslang_revision
-      echo   --sync-LunarGLASS   just pull LunarGLASS_revision
       echo   --sync-spirv-tools  just pull spirv-tools_revision
       echo   --build-glslang     pulls glslang_revision, configures CMake, builds Release and Debug
-      echo   --build-LunarGLASS  pulls LunarGLASS_revision, configures CMake, builds Release and Debug
       echo   --build-spirv-tools pulls spirv-tools_revision, configures CMake, builds Release and Debug
       echo   --all               sync and build glslang, LunarGLASS, spirv-tools
       goto:finish
    )

    set sync-glslang=0
-   set sync-LunarGLASS=0
    set sync-spirv-tools=0
    set build-glslang=0
-   set build-LunarGLASS=0
    set build-spirv-tools=0
    set check-glslang-build-dependencies=0
-   set check-LunarGLASS-fetch-dependencies=0
-   set check-LunarGLASS-build-dependencies=0

    :parameterLoop

@@ -57,13 +43,6 @@

       if "%1" == "--sync-glslang" (
          set sync-glslang=1
-         shift
-         goto:parameterLoop
-      )
-
-      if "%1" == "--sync-LunarGLASS" (
-         set sync-LunarGLASS=1
-         set check-LunarGLASS-fetch-dependencies=1
          shift
          goto:parameterLoop
       )
@@ -78,15 +57,6 @@
          set sync-glslang=1
          set check-glslang-build-dependencies=1
          set build-glslang=1
-         shift
-         goto:parameterLoop
-      )
-
-      if "%1" == "--build-LunarGLASS" (
-         set sync-LunarGLASS=1
-         set check-LunarGLASS-fetch-dependencies=1
-         set check-LunarGLASS-build-dependencies=1
-         set build-LunarGLASS=1
          shift
          goto:parameterLoop
       )
@@ -106,14 +76,6 @@
          set build-glslang=1
          set build-spirv-tools=1
          set check-glslang-build-dependencies=1
-
-         REM Only attempt to build LunarGLASS if we find SVN
-         if %SVN_EXE_FOUND% equ 1 (
-             set sync-LunarGLASS=1
-             set build-LunarGLASS=1
-             set check-LunarGLASS-fetch-dependencies=1
-             set check-LunarGLASS-build-dependencies=1
-         )
          shift
          goto:parameterLoop
       )
@@ -137,46 +99,6 @@
       set errorCode=1
    )

-   if %check-LunarGLASS-fetch-dependencies% equ 1 (
-      if %SVN_EXE_FOUND% equ 0 (
-         echo Dependency check failed:
-         echo   svn.exe not found
-         echo   Get Subversion for Windows here:  http://sourceforge.net/projects/win32svn/
-         echo   Install and ensure svn.exe makes it into your PATH, default is "C:\Program Files (x86)\Subversion\bin"
-         set errorCode=1
-      )
-
-      for %%X in (wget.exe) do (set FOUND=%%~$PATH:X)
-      if not defined FOUND (
-         echo Dependency check failed:
-         echo   wget.exe not found
-         echo   Get wget for Windows here:  http://gnuwin32.sourceforge.net/packages/wget.htm
-         echo   Easiest to select "Complete package, except sources" link which will install and setup PATH
-         echo   Install and ensure each makes it into your PATH, default is "C:\Program Files (x86)\GnuWin32\bin"
-         set errorCode=1
-      )
-
-      for %%X in (gzip.exe) do (set FOUND=%%~$PATH:X)
-      if not defined FOUND (
-         echo Dependency check failed:
-         echo   gzip.exe not found
-         echo   Get gzip for Windows here:  http://gnuwin32.sourceforge.net/packages/gzip.htm
-         echo   Easiest to select "Complete package, except sources" link which will install and setup PATH
-         echo   Install and ensure each makes it into your PATH, default is "C:\Program Files (x86)\GnuWin32\bin"
-         set errorCode=1
-      )
-
-      for %%X in (tar.exe) do (set FOUND=%%~$PATH:X)
-      if not defined FOUND (
-         echo Dependency check failed:
-         echo   tar.exe not found
-         echo   Get tar for Windows here:  http://gnuwin32.sourceforge.net/packages/gtar.htm
-         echo   Easiest to select Binaries/Setup link which will install and setup PATH
-         echo   Install and ensure each makes it into your PATH, default is "C:\Program Files (x86)\GnuWin32\bin"
-         set errorCode=1
-      )
-   )
-
    if %check-glslang-build-dependencies% equ 1 (
       for %%X in (cmake.exe) do (set FOUND=%%~$PATH:X)
       if not defined FOUND (
@@ -188,25 +110,6 @@
       )
    )

-   if %check-LunarGLASS-build-dependencies% equ 1 (
-      for %%X in (python.exe) do (set FOUND=%%~$PATH:X)
-      if not defined FOUND (
-         echo Dependency check failed:
-         echo   python.exe not found
-         echo   Get python 2.7x for Windows here:  http://www.python.org/download/releases/2.7.6/
-         echo   Install and ensure each makes it into your PATH, default is "C:\Python27"
-         set errorCode=1
-      )
-
-      for %%X in (cmake.exe) do (set FOUND=%%~$PATH:X)
-      if not defined FOUND (
-         echo Dependency check failed:
-         echo   cmake.exe not found
-         echo   Get CNake 2.8 for Windows here:  http://www.cmake.org/cmake/resources/software.html
-         echo   Install and ensure each makes it into your PATH, default is "C:\Program Files (x86)\CMake\bin"
-         set errorCode=1
-      )
-   )

    REM goto:main

@@ -217,12 +120,6 @@
 if %errorCode% neq 0 (goto:error)

 REM Read the target versions from external file, which is shared with Linux script
-if not exist LunarGLASS_revision (
-   echo.
-   echo Missing LunarGLASS_revision file!  Place it next to this script with target version in it.
-   set errorCode=1
-   goto:error
-)

 if not exist glslang_revision (
    echo.
@@ -238,17 +135,13 @@
    goto:error
 )

-set /p LUNARGLASS_REVISION= < LunarGLASS_revision
 set /p GLSLANG_REVISION= < glslang_revision
 set /p SPIRV_TOOLS_REVISION= < spirv-tools_revision
-echo LUNARGLASS_REVISION=%LUNARGLASS_REVISION%
 echo GLSLANG_REVISION=%GLSLANG_REVISION%
 echo SPIRV_TOOLS_REVISION=%SPIRV_TOOLS_REVISION%

-set /p LUNARGLASS_REVISION_R32= < LunarGLASS_revision_R32
-echo LUNARGLASS_REVISION_R32=%LUNARGLASS_REVISION_R32%
-
-echo Creating and/or updating glslang, LunarGLASS, spirv-tools in %BASE_DIR%
+
+echo Creating and/or updating glslang, spirv-tools in %BASE_DIR%

 if %sync-glslang% equ 1 (
    if exist %GLSLANG_DIR% (
@@ -262,18 +155,6 @@
    if %errorCode% neq 0 (goto:error)
 )

-if %sync-LunarGLASS% equ 1 (
-   if exist %LUNARGLASS_DIR% (
-      rd /S /Q %LUNARGLASS_DIR%
-   )
-   if not exist %LUNARGLASS_DIR% (
-      call:create_LunarGLASS
-   )
-   if %errorCode% neq 0 (goto:error)
-   call:update_LunarGLASS
-   if %errorCode% neq 0 (goto:error)
-)
-
 if %sync-spirv-tools% equ 1 (
    if exist %SPIRV_TOOLS_DIR% (
       rd /S /Q %SPIRV_TOOLS_DIR%
@@ -289,11 +170,6 @@

 if %build-glslang% equ 1 (
    call:build_glslang
-   if %errorCode% neq 0 (goto:error)
-)
-
-if %build-LunarGLASS% equ 1 (
-   call:build_LunarGLASS
    if %errorCode% neq 0 (goto:error)
 )

@@ -341,64 +217,6 @@
    git checkout %GLSLANG_REVISION%
 goto:eof

-:create_LunarGLASS
-   REM Windows complains if it can't find the directory below, no need to call
-   REM rd /S /Q %LUNARGLASS_DIR%
-   echo.
-   echo Creating local LunarGLASS repository %LUNARGLASS_DIR%)
-   mkdir %LUNARGLASS_DIR%
-   cd %LUNARGLASS_DIR%
-   git clone https://github.com/LunarG/LunarGLASS.git .
-   git checkout %LUNARGLASS_REVISION%
-   cd Core\LLVM
-   echo.
-   echo Downloading LLVM archive...
-   wget http://llvm.org/releases/3.4/llvm-3.4.src.tar.gz
-   REM tar on windows can't filter through gzip, so the below line doesn't work
-   REM tar --gzip -xf llvm-3.4.src.tar.gz
-   echo.
-   echo Unzipping the archive...
-   echo gzip --decompress --verbose --keep llvm-3.4.src.tar.gz
-   gzip --decompress --verbose --keep llvm-3.4.src.tar.gz
-   echo.
-   echo Extracting the archive... (this is slow)
-   echo tar -xf llvm-3.4.src.tar
-   tar -xf llvm-3.4.src.tar
-   if not exist %LUNARGLASS_DIR%\Core\LLVM\llvm-3.4\lib (
-      echo .
-      echo LLVM source download failed!
-      echo Delete LunarGLASS directory and try again
-      set errorCode=1
-      goto:eof
-   )
-   echo.
-   echo Syncing LunarGLASS source...
-   cd %LUNARGLASS_DIR%
-   REM put back the LunarGLASS github versions of some LLVM files
-   git checkout -f .
-   REM overwrite with private gitlab versions of some files
-   svn checkout -r %LUNARGLASS_REVISION_R32% --force https://cvs.khronos.org/svn/repos/SPIRV/trunk/LunarGLASS/ .
-   svn revert -R .
-   if not exist %LUNARGLASS_DIR%\Frontends\SPIRV (
-      echo.
-      echo LunarGLASS source download failed!
-      set errorCode=1
-   )
-goto:eof
-
-:update_LunarGLASS
-   echo.
-   echo Updating %LUNARGLASS_DIR%
-   cd %LUNARGLASS_DIR%
-   git fetch --all
-   git checkout -f %LUNARGLASS_REVISION% .
-   if not exist %LUNARGLASS_DIR%\.svn (
-      svn checkout -r %LUNARGLASS_REVISION_R32% --force https://cvs.khronos.org/svn/repos/SPIRV/trunk/LunarGLASS/ .
-   )
-   svn update -r %LUNARGLASS_REVISION_R325
-   svn revert -R .
-goto:eof
-
 :create_spirv-tools
    echo.
    echo Creating local spirv-tools repository %SPIRV_TOOLS_DIR%)
@@ -490,163 +308,6 @@
       echo glslang 64-bit Release build failed!
       set errorCode=1
    )
-goto:eof
-
-:build_LunarGLASS
-   echo.
-   echo Building %LUNARGLASS_DIR%
-   set LLVM_DIR=%LUNARGLASS_DIR%\Core\LLVM\llvm-3.4
-   cd %LLVM_DIR%
-
-   REM Cleanup any old directories lying around.
-   if exist build32 (
-      rmdir /s /q build32
-   )
-   if exist build (
-      rmdir /s /q build
-   )
-
-   echo Making 32-bit LLVM
-   echo *************************
-   mkdir build32
-   set LLVM_BUILD_DIR=%LLVM_DIR%\build32
-   cd %LLVM_BUILD_DIR%
-
-   echo Generating 32-bit LLVM CMake files for Visual Studio %VS_VERSION% -DCMAKE_INSTALL_PREFIX=install ..
-   cmake -G "Visual Studio %VS_VERSION%" -DCMAKE_INSTALL_PREFIX=install ..
-
-   echo Building 32-bit LLVM: MSBuild INSTALL.vcxproj /p:Platform=x86 /p:Configuration=Release
-   msbuild INSTALL.vcxproj /p:Platform=x86 /p:Configuration=Release /verbosity:quiet
-   REM Check for existence of one lib, even though we should check for all results
-   if not exist %LLVM_BUILD_DIR%\lib\Release\LLVMCore.lib (
-      echo.
-      echo LLVM 32-bit Release build failed!
-      set errorCode=1
-      goto:eof
-   )
-   REM disable Debug build of LLVM until LunarGLASS cmake files are updated to
-   REM handle Debug and Release builds of glslang simultaneously, instead of
-   REM whatever last lands in "./build32/install"
-   REM   echo Building 32-bit LLVM: MSBuild INSTALL.vcxproj /p:Platform=x86 /p:Configuration=Debug
-   REM   msbuild INSTALL.vcxproj /p:Platform=x86 /p:Configuration=Debug /verbosity:quiet
-   REM Check for existence of one lib, even though we should check for all results
-   REM   if not exist %LLVM_BUILD_DIR%\lib\Debug\LLVMCore.lib (
-   REM      echo.
-   REM      echo LLVM 32-bit Debug build failed!
-   REM      set errorCode=1
-   REM      goto:eof
-   REM   )
-
-   cd ..
-
-   echo Making 64-bit LLVM
-   echo *************************
-   mkdir build
-   set LLVM_BUILD_DIR=%LLVM_DIR%\build
-   cd %LLVM_BUILD_DIR%
-
-   echo Generating 64-bit LLVM CMake files for Visual Studio %VS_VERSION% -DCMAKE_INSTALL_PREFIX=install ..
-   cmake -G "Visual Studio %VS_VERSION% Win64" -DCMAKE_INSTALL_PREFIX=install ..
-
-   echo Building 64-bit LLVM: MSBuild INSTALL.vcxproj /p:Platform=x64 /p:Configuration=Release
-   msbuild INSTALL.vcxproj /p:Platform=x64 /p:Configuration=Release /verbosity:quiet
-   REM Check for existence of one lib, even though we should check for all results
-   if not exist %LLVM_BUILD_DIR%\lib\Release\LLVMCore.lib (
-      echo.
-      echo LLVM 64-bit Release build failed!
-      set errorCode=1
-      goto:eof
-   )
-   REM disable Debug build of LLVM until LunarGLASS cmake files are updated to
-   REM handle Debug and Release builds of glslang simultaneously, instead of
-   REM whatever last lands in "./build/install"
-   REM   echo Building 64-bit LLVM: MSBuild INSTALL.vcxproj /p:Platform=x64 /p:Configuration=Debug
-   REM   msbuild INSTALL.vcxproj /p:Platform=x64 /p:Configuration=Debug /verbosity:quiet
-   REM Check for existence of one lib, even though we should check for all results
-   REM   if not exist %LLVM_BUILD_DIR%\lib\Debug\LLVMCore.lib (
-   REM      echo.
-   REM      echo LLVM 64-bit Debug build failed!
-   REM      set errorCode=1
-   REM      goto:eof
-   REM   )
-
-   cd %LUNARGLASS_DIR%
-
-   REM Cleanup any old directories lying around.
-   if exist build32 (
-      rmdir /s /q build32
-   )
-   if exist build (
-      rmdir /s /q build
-   )
-
-   echo Making 32-bit LunarGLASS
-   echo *************************
-   mkdir build32
-   set LUNARGLASS_BUILD_DIR=%LUNARGLASS_DIR%\build32
-   cd %LUNARGLASS_BUILD_DIR%
-
-   echo Generating 32-bit LunarGlass CMake files for Visual Studio %VS_VERSION% -DCMAKE_INSTALL_PREFIX=install ..
-   cmake -G "Visual Studio %VS_VERSION%" -DCMAKE_INSTALL_PREFIX=install ..
-
-   echo Building 32-bit LunarGlass: MSBuild INSTALL.vcxproj /p:Platform=x86 /p:Configuration=Release
-   msbuild INSTALL.vcxproj /p:Platform=x86 /p:Configuration=Release /verbosity:quiet
-
-   REM Check for existence of one lib, even though we should check for all results
-   if not exist %LUNARGLASS_BUILD_DIR%\Core\Release\core.lib (
-      echo.
-      echo LunarGLASS 32-bit Release build failed!
-      set errorCode=1
-      goto:eof
-   )
-
-   REM disable Debug build of LunarGLASS until its cmake file can be updated to
-   REM handle Debug and Release builds of glslang simultaneously, instead of
-   REM whatever last lands in "./build/install"
-   REM   echo Building 32-bit LunarGlass: MSBuild INSTALL.vcxproj /p:Platform=x86 /p:Configuration=Debug
-   REM   msbuild INSTALL.vcxproj /p:Platform=x86 /p:Configuration=Debug /verbosity:quiet
-   REM Check for existence of one lib, even though we should check for all results
-   REM  if not exist %LUNARGLASS_BUILD_DIR%\Core\Debug\core.lib (
-   REM     echo.
-   REM     echo LunarGLASS 32-bit Debug build failed!
-   REM     set errorCode=1
-   REM     goto:eof
-   REM  )
-
-   cd ..
-
-   echo Making 64-bit LunarGLASS
-   echo *************************
-   mkdir build
-   set LUNARGLASS_BUILD_DIR=%LUNARGLASS_DIR%\build
-   cd %LUNARGLASS_BUILD_DIR%
-
-   echo Generating 64-bit LunarGlass CMake files for Visual Studio %VS_VERSION% -DCMAKE_INSTALL_PREFIX=install ..
-   cmake -G "Visual Studio %VS_VERSION% Win64" -DCMAKE_INSTALL_PREFIX=install ..
-
-   echo Building 64-bit LunarGlass: MSBuild INSTALL.vcxproj /p:Platform=x64 /p:Configuration=Release
-   msbuild INSTALL.vcxproj /p:Platform=x64 /p:Configuration=Release /verbosity:quiet
-
-   REM Check for existence of one lib, even though we should check for all results
-   if not exist %LUNARGLASS_BUILD_DIR%\Core\Release\core.lib (
-      echo.
-      echo LunarGLASS 64-bit Release build failed!
-      set errorCode=1
-      goto:eof
-   )
-
-   REM disable Debug build of LunarGLASS until its cmake file can be updated to
-   REM handle Debug and Release builds of glslang simultaneously, instead of
-   REM whatever last lands in "./build/install"
-   REM   echo Building 64-bit LunarGlass: MSBuild INSTALL.vcxproj /p:Platform=x64 /p:Configuration=Debug
-   REM   msbuild INSTALL.vcxproj /p:Platform=x64 /p:Configuration=Debug /verbosity:quiet
-   REM Check for existence of one lib, even though we should check for all results
-   REM  if not exist %LUNARGLASS_BUILD_DIR%\Core\Debug\core.lib (
-   REM     echo.
-   REM     echo LunarGLASS 64-bit Debug build failed!
-   REM     set errorCode=1
-   REM     goto:eof
-   REM  )
 goto:eof

 :build_spirv-tools


build: Add check for spirv-headers revision file

Change-Id: I9bc225275c4d890f44c7ab4dd2076b981778ac20

--- update_external_sources.bat
+++ update_external_sources.bat
@@ -136,6 +136,13 @@
    goto:error
 )

+if not exist %REVISION_DIR%\spirv-headers_revision (
+   echo.
+   echo Missing spirv-headers_revision file!  Place it in %REVISION_DIR% with target version in it.
+   set errorCode=1
+   goto:error
+)
+
 set /p GLSLANG_REVISION= < %REVISION_DIR%\glslang_revision
 set /p SPIRV_TOOLS_REVISION= < %REVISION_DIR%\spirv-tools_revision
 set /p SPIRV_HEADERS_REVISION= < %REVISION_DIR%\spirv-headers_revision


Minor language cleanup on VC installer

Minor language cleanup on VC installer

--- bin/win-installer-vc.cmd
+++ bin/win-installer-vc.cmd
@@ -6,8 +6,11 @@

 echo.
 echo Simple 2D and its dependencies will be installed to:
+echo.
 echo   %%LOCALAPPDATA%%\simple2d
-echo   Resolving to %LOCALAPPDATA%\simple2d
+echo.
+echo   On this system, resolving to:
+echo     %LOCALAPPDATA%\simple2d
 echo.

 set INPUT=
@@ -26,6 +29,6 @@

 echo.
 echo Simple 2D installed successfully!
-echo Remember to add %%LOCALAPPDATA%%\simple2d to your %%PATH%%
+echo Remember to add `%%LOCALAPPDATA%%\simple2d` to your %%PATH%%
 echo.
 pause


pls no more

pls no more

--- PlistTool.bat
+++ PlistTool.bat
@@ -23,21 +23,8 @@
 goto checkpy

 :checkpy
-REM Get python location
-set "python="
-FOR /F "tokens=* USEBACKQ" %%F IN (`python -V 2^>^&1`) DO (
-    set "t=%%F"
-    if /i "!t:~0,6!" == "python" (
-        REM Might have python installed - let's check for the store message
-        if /i "!t:was not found=!" == "!t!" (
-            REM There was no change - we found it.
-            set "python=%%F"
-        )
-    )
-)
-
-REM Check for py and give helpful hints!
-if /i "!python!"=="" (
+python -V > NUL 2>&1
+if not "!errorlevel!" == "0" (
     if %tried% lss 1 (
         if /i "!toask!"=="yes" (
             REM Better ask permission first


MDL-32323 add windows test database init script

error: pathspec 'admin/tool/phpunit/cli/init.bat' did not match any file(s) known to git

--- admin/tool/phpunit/cli/init.bat
+++ admin/tool/phpunit/cli/init.bat
@@ -0,0 +1,20 @@
+@ECHO OFF
+CALL php %~dp0\util.php --diag > NUL 2>&1
+
+IF ERRORLEVEL 133 GOTO drop
+IF ERRORLEVEL 132 GOTO install
+IF ERRORLEVEL 1 GOTO unknown
+GOTO done
+
+:drop
+CALL php %~dp0\util.php --drop
+IF ERRORLEVEL 1 GOTO done
+
+:install
+CALL php %~dp0\util.php --install
+GOTO done
+
+:unknown
+CALL php %~dp0\util.php --diag
+
+:done


git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/nodeJSProjects@48249 954022d7-b5bf-4e40-9824-e11837661b57

--- InstallAndRunCoAuthoring.bat
+++ InstallAndRunCoAuthoring.bat
@@ -2,22 +2,24 @@

 SET MONGO_DB_SERVICE_NAME=ASC Mongo DB Server
 SET CO_AUTHORING_SERVICE_NAME=ASC CoAuthoring Server
-SET INSTAL_SCRIPT_FOLDER=install_script
-SET DB_FILE_PATH=data\db
+SET INSTAL_SERVICE_FOLDER=Common
+SET INSTAL_SCRIPT_FOLDER=install
+SET SERVICE_FOLDER=CoAuthoring
+SET DB_FILE_PATH=CoAuthoring\data\db

 IF NOT EXIST %~dp0%DB_FILE_PATH% MKDIR %~dp0%DB_FILE_PATH%
 @IF NOT "%ERRORLEVEL%"=="0" goto ERROR

-call %~dp0\%INSTAL_SCRIPT_FOLDER%\InstallAndRunService.bat "%MONGO_DB_SERVICE_NAME%" "%~dp0mongodb\bin\mongod.exe --journal --dbpath "%~dp0%DB_FILE_PATH%"
+call %~dp0\%INSTAL_SERVICE_FOLDER%\%INSTAL_SCRIPT_FOLDER%\InstallAndRunService.bat "%MONGO_DB_SERVICE_NAME%" "%~dp0\%SERVICE_FOLDER%\mongodb\bin\mongod.exe --journal --dbpath "%~dp0%DB_FILE_PATH%"
 @IF NOT "%ERRORLEVEL%"=="0" goto ERROR

-call %~dp0\%INSTAL_SCRIPT_FOLDER%\ConfigMongoDB.bat
+call %~dp0\%SERVICE_FOLDER%\%INSTAL_SCRIPT_FOLDER%\ConfigMongoDB.bat
 @IF NOT "%ERRORLEVEL%"=="0" goto ERROR

-call %~dp0\%INSTAL_SCRIPT_FOLDER%\InstallNodeJSModules.bat
+call %~dp0\%SERVICE_FOLDER%\%INSTAL_SCRIPT_FOLDER%\InstallNodeJSModules.bat
 @IF NOT "%ERRORLEVEL%"=="0" goto ERROR

-call %~dp0\%INSTAL_SCRIPT_FOLDER%\InstallAndRunService.bat "%CO_AUTHORING_SERVICE_NAME%" "node.exe %~dp0sources\server.js"
+call %~dp0\%INSTAL_SERVICE_FOLDER%\%INSTAL_SCRIPT_FOLDER%\InstallAndRunService.bat "%CO_AUTHORING_SERVICE_NAME%" "node.exe %~dp0\%SERVICE_FOLDER%\sources\server.js"
 @IF NOT "%ERRORLEVEL%"=="0" goto ERROR


APK Verification Issue Fixed

APK Verification Issue Fixed


create future branch which bases on SuperSocket 1.5

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

--- future/Build.bat
+++ future/Build.bat
@@ -0,0 +1,19 @@
+@echo off
+
+set fdir=%WINDIR%\Microsoft.NET\Framework64
+
+if not exist %fdir% (
+	set fdir=%WINDIR%\Microsoft.NET\Framework
+)
+
+set msbuild=%fdir%\v4.0.30319\msbuild.exe
+
+%msbuild% SuperWebSocket\SuperWebSocket.csproj /p:Configuration=Release /t:Rebuild /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=..\superwebsocket.snk /p:OutputPath=..\bin\Net40
+
+FOR /F "tokens=*" %%G IN ('DIR /B /AD /S obj') DO RMDIR /S /Q "%%G"
+
+%msbuild% SuperWebSocket\SuperWebSocket.NET35.csproj  /p:Configuration=Release /t:Rebuild /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=..\superwebsocket.snk /p:OutputPath=..\bin\Net35
+
+FOR /F "tokens=*" %%G IN ('DIR /B /AD /S obj') DO RMDIR /S /Q "%%G"
+
+pause


Fix echo on

Fix echo on

--- gear360video.cmd
+++ gear360video.cmd
@@ -1,4 +1,4 @@
-rem @echo off
+@echo off

 rem Script to stitch panoramic videos produced by Samsung Gear360.
 rem Could be adopted to use with other cameras after creating pto file


[AS7-6969] Parse jboss.domain.config.dir, jboss.domain.log.dir and jboss.domain.base.dir properties in the domain.bat batch script.

--- build/src/main/resources/bin/domain.bat
+++ build/src/main/resources/bin/domain.bat
@@ -7,6 +7,8 @@

 @if not "%ECHO%" == ""  echo %ECHO%
 @if "%OS%" == "Windows_NT" setlocal
+rem Set to all parameters by default
+set SERVER_OPTS=%*

 if "%OS%" == "Windows_NT" (
   set "DIRNAME=%~dp0%"
@@ -76,6 +78,36 @@
   goto END
 )

+rem Setup directories, note directories with spaces do not work
+set "CONSOLIDATED_OPTS=%JAVA_OPTS% %SERVER_OPTS%"
+:DIRLOOP
+echo(%CONSOLIDATED_OPTS% | findstr /r /c:"^-Djboss.domain.base.dir" > nul && (
+  for /f "tokens=1,2* delims==" %%a IN ("%CONSOLIDATED_OPTS%") DO (
+    for /f %%i IN ("%%b") DO set "JBOSS_BASE_DIR=%%~fi"
+  )
+)
+echo(%CONSOLIDATED_OPTS% | findstr /r /c:"^-Djboss.domain.config.dir" > nul && (
+  for /f "tokens=1,2* delims==" %%a IN ("%CONSOLIDATED_OPTS%") DO (
+    for /f %%i IN ("%%b") DO set "JBOSS_CONFIG_DIR=%%~fi"
+  )
+)
+echo(%CONSOLIDATED_OPTS% | findstr /r /c:"^-Djboss.domain.log.dir" > nul && (
+  for /f "tokens=1,2* delims==" %%a IN ("%CONSOLIDATED_OPTS%") DO (
+    for /f %%i IN ("%%b") DO set "JBOSS_LOG_DIR=%%~fi"
+  )
+)
+
+for /f "tokens=1* delims= " %%i IN ("%CONSOLIDATED_OPTS%") DO (
+  if %%i == "" (
+    goto ENDDIRLOOP
+  ) else (
+    set CONSOLIDATED_OPTS=%%j
+    GOTO DIRLOOP
+  )
+)
+
+:ENDDIRLOOP
+
 rem Setup JBoss specific properties

 rem Set default module root paths
@@ -93,7 +125,7 @@
 )
 rem Set the domain configuration dir
 if "x%JBOSS_CONFIG_DIR%" == "x" (
-  set  "JBOSS_CONFIG_DIR=%JBOSS_BASE_DIR%/configuration"
+  set  "JBOSS_CONFIG_DIR=%JBOSS_BASE_DIR%\configuration"
 )

 echo ===============================================================================


git-tfs-sync

git-tfs-sync

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

--- git-tfs-sync.bat
+++ git-tfs-sync.bat
@@ -0,0 +1 @@
+git tfs clone https://davidpodhola.visualstudio.com/DefaultCollection $/Sync.Today/Main/2015


Remove data and console packages from the build script

--- Dist/package.cmd
+++ Dist/package.cmd
@@ -13,9 +13,9 @@
 nuget pack .\uSync8.ContentEdition\uSync.ContentEdition.nuspec  -OutputDirectory .\dist\%1 -build -version %1 -properties "depends=%1;Configuration=%config%"
 nuget pack .\uSync8.ContentEdition\uSync.ContentEdition.Core.nuspec  -OutputDirectory .\dist\%1 -build -version %1 -properties "depends=%1;Configuration=%config%"

-nuget pack .\uSync8.Community.DataTypeSerializers\uSync.Community.DataTypeSerializers.nuspec  -OutputDirectory .\dist\%1 -build -version %1 -properties "depends=%1;Configuration=%config%"
+REM nuget pack .\uSync8.Community.DataTypeSerializers\uSync.Community.DataTypeSerializers.nuspec  -OutputDirectory .\dist\%1 -build -version %1 -properties "depends=%1;Configuration=%config%"
+REM nuget pack .\uSync.Console\uSync.Console.nuspec  -OutputDirectory .\dist\%1 -build -version %1 -properties "depends=%1;Configuration=%config%"

-nuget pack .\uSync.Console\uSync.Console.nuspec  -OutputDirectory .\dist\%1 -build -version %1 -properties "depends=%1;Configuration=%config%"
 nuget pack .\uSync8.HistoryView\uSync.History.nuspec  -OutputDirectory .\dist\%1 -build -version %1 -properties "depends=%1;Configuration=%config%"

 call .\dist\CreatePackages %1


Remove bld.bat

Remove bld.bat

--- recipe/bld.bat
+++ recipe/bld.bat
@@ -1,2 +0,0 @@
-"%PYTHON%" setup.py install --single-version-externally-managed --record record.txt
-if errorlevel 1 exit 1


Added windows startapp

Added windows startapp

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

--- runapp.bat
+++ runapp.bat
@@ -0,0 +1 @@
+python -m "server.bottle_drone"


vcvarsall.bat moved to a new location in Visual Studio 2017

--- builds/msvc/build/buildbase.bat
+++ builds/msvc/build/buildbase.bat
@@ -5,6 +5,7 @@
 SET version=%2
 SET log=build_%version%.log
 SET tools=Microsoft Visual Studio %version%.0\VC\vcvarsall.bat
+IF %version% == 15 SET tools=Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat
 SET environment="%programfiles(x86)%\%tools%"
 IF NOT EXIST %environment% SET environment="%programfiles%\%tools%"
 IF NOT EXIST %environment% GOTO no_tools


fix mingw make name

fix mingw make name

--- neurolabi/cmake_update_library.bat
+++ neurolabi/cmake_update_library.bat
@@ -68,12 +68,12 @@
 rd /q/s ../c/CMakeCache.txt

 cmake ../c -DCMAKE_BUILD_TYPE=Debug -G "MinGW Makefiles"
-make clean
-make
-make clean
+mingw32-make clean
+mingw32-make
+mingw32-make clean
 cmake ../c -DCMAKE_BUILD_TYPE=Release -G "MinGW Makefiles"
-make
-make install
+mingw32-make
+mingw32-make install

 cd ..
 rd /q/s __tmp_cmake_tmp__


Update to Apache Ant 1.6.0

Update to Apache Ant 1.6.0

git-svn-id: fea306228a0c821168c534b698c8fa2a33280b3b@9059 13f79535-47bb-0310-9956-ffa450edef68

--- tools/ant/bin/ant.bat
+++ tools/ant/bin/ant.bat
@@ -4,7 +4,6 @@
 REM   reserved.

 if exist "%HOME%\antrc_pre.bat" call "%HOME%\antrc_pre.bat"
-set ANT_VERSION=1.6.0

 if "%OS%"=="Windows_NT" @setlocal

@@ -30,7 +29,7 @@
 :doneStart
 rem find ANT_HOME if it does not exist due to either an invalid value passed
 rem by the user or the %0 problem on Windows 9x
-if exist "%ANT_HOME%\lib\ant-%ANT_VERSION%.jar" goto checkJava
+if exist "%ANT_HOME%\lib\ant.jar" goto checkJava

 rem check for ant in Program Files
 if not exist "%ProgramFiles%\ant" goto checkSystemDrive


fix a misspelling

fix a misspelling


Handled batch file being run as administrator

--- RunNUnit.bat
+++ RunNUnit.bat
@@ -1 +1,2 @@
+@CD /D "%~dp0"
 start "NUnitGui" /D Build "packages\NUnit.Runners.2.6.4\tools\nunit.exe" Lucid.nunit


Changed eclipse dir to the thing most likely to work.

--- runEclipse.bat
+++ runEclipse.bat
@@ -1,4 +1,4 @@
-SET ECLIPSEDIR=e:\eclipse-34-rc3
+SET ECLIPSEDIR=c:\eclipse
 CALL ant
 COPY dist\lombok.jar %ECLIPSEDIR%\*.*
 SET curdir=%CD%


Force change to test web hook

Force change to test web hook

--- DeleteBinObj.bat
+++ DeleteBinObj.bat
@@ -1 +1 @@
-for /d /r . %%d in (bin,obj) do @if exist "%%d" rd /s/q "%%d"+for /d /r . %%d in (bin,obj) do @if exist "%%d" rd /s/q "%%d"


Whitespace fixes

Whitespace fixes

--- bin/pegjs.bat
+++ bin/pegjs.bat
@@ -1,5 +1,6 @@
 @echo off
-
+
 set DIR_WITH_SLASH=%~dp0
 set DIR=%DIR_WITH_SLASH:~0,-1%
+
 java -jar "%DIR%\..\vendor\rhino\js.jar" "%DIR%\pegjs-main.js" "%DIR%" %*


Quote the stylesheet option in case of spaces in the path.

--- bin/xspec.bat
+++ bin/xspec.bat
@@ -50,7 +50,7 @@
 echo Creating Test Stylesheet...
 echo %TEST_STYLESHEET%
 echo %XSPEC%
-java -cp "%CP%" net.sf.saxon.Transform -o:%TEST_STYLESHEET% -s:%XSPEC% -xsl:%~dp0\generate-xspec-tests.xsl
+java -cp "%CP%" net.sf.saxon.Transform -o:%TEST_STYLESHEET% -s:%XSPEC% -xsl:"%~dp0\generate-xspec-tests.xsl"
 echo.

 echo Running Tests...
@@ -74,7 +74,7 @@

 echo.
 echo Formatting Report...
-java -cp "%CP%" net.sf.saxon.Transform -o:%HTML% -s:%RESULT% -xsl:%~dp0\format-xspec-report.xsl
+java -cp "%CP%" net.sf.saxon.Transform -o:%HTML% -s:%RESULT% -xsl:"%~dp0\format-xspec-report.xsl"

 REM =======================================
 REM Check if coverage parameter was passed


commit on 31/01/2019 at 18:57:15

commit on 31/01/2019 at 18:57:15

--- ansys-APDL/fiberCPstress.cmd
+++ ansys-APDL/fiberCPstress.cmd
@@ -128,9 +128,6 @@
 *DO, i, 1, nAb, 1
  AL, nAb+8+i, 2*nAb+8+i                              ! Fibers
 *ENDDO
-
-AL, 1, 7, 6           ! 1, fiber
-AL, 2, 3, 4, 5, 7     ! 2, matrix

 ! Define Material Properties
 ! 1 is fiber, 2 is matrix


commit on 04/02/2019 at 15:08:14

commit on 04/02/2019 at 15:08:14

--- ansys-APDL/fiberCPstress.cmd
+++ ansys-APDL/fiberCPstress.cmd
@@ -141,18 +141,18 @@
  AL, nAb+9+i, 2*nAb+10+2*(i-1)+1, 2*nAb+10+2*(i-1)+2   ! Half fibers
 *ENDDO

-*LSEL,S,LINE,,2,3,1
-*LSEL,A,LINE,,6
-*LSEL,A,LINE,,9,10,1
+LSEL, S, LINE, , 2, 3, 1
+LSEL, A, LINE, , 6
+LSEL, A, LINE, , 9, 10, 1

 *DO, i, 1, nAb-1, 1
- *LSEL,A,LINE,,10+i
-*ENDDO
-
-*LSEL,A,LINE,,2*nAb+10
-
-*DO, i, 1, nAb, 1
- *LSEL,A,LINE,,2*nAb+10+i
+ LSEL, A, LINE, , 10+i
+*ENDDO
+
+LSEL, A, LINE, , 2*nAb+10
+
+*DO, i, 1, nAb, 1
+ LSEL, A, LINE, , 2*nAb+10+i
 *ENDDO

 AL, ALL


Useing jenkins job config to run windows tests

--- bin/test_win.bat
+++ bin/test_win.bat
@@ -1,4 +0,0 @@
-@echo off
-SET GOPATH=c:\jenkins\workspace\go-cli-build-windows2
-go test -i ./src/cf/...
-go test -v ./src/cf/...