Have autoninja.bat run depot_tools python3

This changes autoninja.bat so that it refers explicitly to the
depot_tools version of Python rather than depending on what is in the
path. This helps to make autoninja behave more consistently and makes it
easier for us to remove python.bat from the path.

Bug: 777069
Change-Id: I6d878f58e2f8be70d06a182d059caa9fbedaedbd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2753458
Reviewed-by: Dirk Pranke <6693ee08b084bb2ffa767f664c99b689395e0e4b@google.com>
Commit-Queue: Bruce Dawson <fe9e26f3989304bf7275ed139c57fd059c63d22d@chromium.org>

--- autoninja.bat
+++ autoninja.bat
@@ -8,7 +8,7 @@
 set scriptdir=%~dp0

 REM Set unique build ID.
-FOR /f "usebackq tokens=*" %%a in (`python -c "import uuid; print(uuid.uuid4())"`) do set AUTONINJA_BUILD_ID=%%a
+FOR /f "usebackq tokens=*" %%a in (`%scriptdir%python-bin\python3.bat -c "import uuid; print(uuid.uuid4())"`) do set AUTONINJA_BUILD_ID=%%a

 REM If a build performance summary has been requested then also set NINJA_STATUS
 REM to trigger more verbose status updates. In particular this makes it possible
@@ -37,17 +37,17 @@
 REM Don't use python3 because it doesn't work in git bash on Windows and we
 REM should be consistent between autoninja.bat and the autoninja script used by
 REM git bash.
-FOR /f "usebackq tokens=*" %%a in (`python %scriptdir%autoninja.py "%*"`) do echo %%a & %%a
+FOR /f "usebackq tokens=*" %%a in (`%scriptdir%python-bin\python3.bat %scriptdir%autoninja.py "%*"`) do echo %%a & %%a
 @if errorlevel 1 goto buildfailure

-REM Use call to invoke python script here, because we use python via python.bat.
-@if "%NINJA_SUMMARIZE_BUILD%" == "1" call python %scriptdir%post_build_ninja_summary.py %*
-@call python %scriptdir%ninjalog_uploader_wrapper.py --cmdline %*
+REM Use call to invoke python script here, because we use python via python3.bat.
+@if "%NINJA_SUMMARIZE_BUILD%" == "1" call %scriptdir%python-bin\python3.bat %scriptdir%post_build_ninja_summary.py %*
+@call %scriptdir%python-bin\python3.bat %scriptdir%ninjalog_uploader_wrapper.py --cmdline %*

 exit /b
 :buildfailure

-@call python %scriptdir%ninjalog_uploader_wrapper.py --cmdline %*
+@call %scriptdir%python-bin\python3.bat %scriptdir%ninjalog_uploader_wrapper.py --cmdline %*

 REM Return an error code of 1 so that if a developer types:
 REM "autoninja chrome && chrome" then chrome won't run if the build fails.


add hosts.bat

add hosts.bat

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

--- bin/hosts.bat
+++ bin/hosts.bat
@@ -0,0 +1 @@
+notepad C:\WINDOWS\system32\drivers\etc\hosts


Update setup.bat

Update setup.bat

Latest version of R added to the list...

--- bin/setup.bat
+++ bin/setup.bat
@@ -13,3 +13,4 @@
 if exist "C:\Program Files\R\R-3.2.5\bin\i386\R.exe" set R_HOME="C:\Program Files\R\R-3.2.5\bin\i386\R.exe"
 if exist "C:\Program Files\R\R-3.3.3\bin\i386\R.exe" set R_HOME="C:\Program Files\R\R-3.3.3\bin\i386\R.exe"
 if exist "C:\Program Files\R\R-3.4.3\bin\i386\R.exe" set R_HOME="C:\Program Files\R\R-3.4.3\bin\i386\R.exe"
+if exist "C:\Program Files\R\R-3.4.4\bin\i386\R.exe" set R_HOME="C:\Program Files\R\R-3.4.4\bin\i386\R.exe"


Remove trailing slash from directory

Remove trailing slash from directory

--- bin/stree.cmd
+++ bin/stree.cmd
@@ -1,2 +1,4 @@
 @echo off
-start "" "C:\Program Files (x86)\Atlassian\SourceTree\SourceTree.exe" -f %~dpn1
+set directory=%~f1
+if %directory:~-1%==\ set directory=%directory:~0,-1%
+start "" "C:\Program Files (x86)\Atlassian\SourceTree\SourceTree.exe" -f %directory%


appveyor: where's CMake

appveyor: where's CMake

--- testing/appveyor-scripts/build-test.bat
+++ testing/appveyor-scripts/build-test.bat
@@ -8,12 +8,14 @@

 :: MinGW builds can't have sh.exe in the PATH, which is the case by default

+where cmake
 if not !ERRORLEVEL!==0 goto fail
 if "x%GENERATOR_NAME%"=="xMinGW Makefiles" (
     set PATH="C:\mingw-w64\i686-5.3.0-posix-dwarf-rt_v4-rev0\mingw32\bin;C:\Program Files (x86)\CMake\bin"
 )

 cmake -G "%GENERATOR_NAME%" -DCMAKE_BUILD_TYPE=Release ..\..
+if not !ERRORLEVEL!==0 goto fail

 :: Generator-specific build command
 if "x%GENERATOR_NAME%"=="xMinGW Makefiles" (


Reverted to primary download

Reverted to primary download

--- golang/install.cmd
+++ golang/install.cmd
@@ -4,6 +4,6 @@

 IF NOT EXIST "%WEBROOT_PATH%go1.4.windows-386.zip" (
 	cd /D %WEBROOT_PATH%
-	curl -O http://wadescratch.blob.core.windows.net/public/go1.4.1.windows-386-waw.zip
-	start unzip -o go1.4.1.windows-386-waw.zip -d .
+	curl -O https://storage.googleapis.com/golang/go1.4.1.windows-386.zip
+	start unzip -o go1.4.1.windows-386.zip -d .
 )


Mesa3D build debug: Display build command when using Meson.

--- buildscript/modules/mesa3d.cmd
+++ buildscript/modules/mesa3d.cmd
@@ -72,6 +72,8 @@
 @echo.
 @if %pythonver% GEQ 3 call %vsenv%
 @if %pythonver% GEQ 3 echo.
+@if %pythonver% GEQ 3 echo Build command: %buildcmd%
+@if %pythonver% GEQ 3 echo.
 @%buildcmd%
 @echo.
 @if %pythonver% GEQ 3 cmd


corrected the condition in pullincr.bat file

--- pullincr.bat
+++ pullincr.bat
@@ -39,7 +39,7 @@
 set PROXY_PASS=password

 REM Lines below should work without any changes
-if "$USE_PROXY" EQU "true" (
+if "%USE_PROXY%" EQU "true" (
 set PROXY_OPTS=--config http_proxy.host=%PROXY_HOST%:%PROXY_PORT% --config http_proxy.user=%PROXY_USER% --config http_proxy.passwd=%PROXY_PASS%
 ) else (
 set PROXY_OPTS=


[trunk] Remove an unused batch file.

[trunk] Remove an unused batch file.

--- packages/CSharp/dev/Scripts/GenerateProperties.bat
+++ packages/CSharp/dev/Scripts/GenerateProperties.bat
@@ -1,29 +0,0 @@
-ECHO OFF
-
-SETLOCAL
-
-REM Must be run from a command prompt that Opus has been pathed onto
-Opus -verbosity=0 -showdirectory > opusdirectory.temp.txt
-IF NOT ERRORLEVEL 0 GOTO error
-
-SET /P OPUS_DIR=<opusdirectory.temp.txt
-erase opusdirectory.temp.txt
-
-SET OPUS_PACKAGE_DIR=%OPUS_DIR%\..\..\packages
-
-ECHO Opus directory is %OPUS_DIR%
-ECHO Opus package directory is %OPUS_PACKAGE_DIR%
-
-REM C# compiler option properties
-%OPUS_DIR%\OpusOptionInterfacePropertyGenerator -i=%OPUS_PACKAGE_DIR%\CSharp\dev\Scripts\IOptions.cs -o=OptionProperties.cs -n=CSharp -c=OptionCollection
-IF NOT ERRORLEVEL 0 GOTO error
-
-PAUSE
-GOTO end
-
-:error
-ECHO "There was an error running Opus."
-
-:end
-
-ENDLOCAL


Added release build script..

Added release build script..

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

--- qrelease.bat
+++ qrelease.bat
@@ -0,0 +1,98 @@
+setlocal
+echo Setting JAVA_HOME to %JAVA8_HOME%.
+set JAVA_HOME=%JAVA8_HOME%
+
+echo Performing a short clean build.
+rem pause
+call mvn clean install -DperformRelease
+echo Short clean build completed.
+rem pause
+
+echo Performing a full clean build.
+rem pause
+call mvn clean install -DperformRelease -Pall
+echo Full clean build completed.
+rem pause
+
+echo Setting new version to %1.
+rem pause
+call mvn versions:set -Pall -DnewVersion=%1
+echo Version was set to %1.
+rem pause
+call mvn versions:commit -Pall
+echo Version %1 committed.
+rem pause
+
+echo Performing a short clean build.
+rem pause
+call mvn clean install -DperformRelease
+echo Short clean build completed.
+rem pause
+
+echo Performing a full clean build.
+rem pause
+call mvn clean install -Pall -DperformRelease
+echo Full clean build completed.
+rem pause
+
+echo Checking in version %1.
+rem pause
+git commit -a -m "Version %1"
+echo Version %1 was checked in.
+rem pause
+
+echo Tagging version %1.
+rem pause
+git tag -a %1 -m "Version %1"
+echo Version %1 was tagged.
+rem pause
+
+echo Pushing version %1.
+rem pause
+git push origin master
+git push --tags origin master
+echo Version %1 was pushed.
+rem pause
+
+echo Performing full clean deploy.
+rem pause
+call mvn -DperformRelease -Psonatype-oss-release,all clean deploy
+echo Full clean deploy done.
+rem pause
+
+echo Setting new version to %2.
+rem pause
+call mvn versions:set -Pall -DnewVersion=%2
+echo Version was set to %2.
+rem pause
+call mvn versions:commit -Pall
+echo Version %2 was committed.
+rem pause
+
+echo Performing a short clean build.
+rem pause
+call mvn clean install -DperformRelease
+echo Short clean build completed.
+rem pause
+
+echo Performing a full clean build.
+rem pause
+call mvn clean install -DperformRelease -Pall
+echo Full clean build completed.
+rem pause
+
+
+echo Checking in version %2.
+rem pause
+git commit -a -m "Version %2"
+echo Version %2 was checked in.
+rem pause
+
+echo Pushing version %2.
+rem pause
+git push origin master
+git push --tags origin master
+echo Version %2 was pushed.
+rem pause
+
+endlocal


- add batch for repeatable build

- add batch for repeatable build

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

--- build_prg.bat
+++ build_prg.bat
@@ -0,0 +1,15 @@
+echo "Build main program"
+go build -ldflags "-s -w" ekko.go
+go build -ldflags "-s -w" ekpo.go
+go build -ldflags "-s -w" lfa1.go
+go build -ldflags "-s -w" mara.go
+go build -ldflags "-s -w" t024.go
+go build -ldflags "-s -w" t024e.go
+go build -ldflags "-s -w" tcurr.go
+go build -ldflags "-s -w" zstxl.go
+
+echo "Build other utilities"
+go build -ldflags "-s -w" dl_consolpack_rtemplate.go
+go build -ldflags "-s -w" dl_gl_consol_pack_map.go
+go build -ldflags "-s -w" gen_code_ddf.go
+go build -ldflags "-s -w" upload_gl_consol_pack_map.go


improve bat script

improve bat script

--- setBackground.bat
+++ setBackground.bat
@@ -1,14 +0,0 @@
-@echo off
-REM download and copy latest himawari image to a background folder for use in slideshow
-
-C:\python39\python.exe C:\Users\Urist\Development\himawari\himawari.py -o C:\Users\Urist\Pictures\bg\himawari\himawari_01.png
-copy C:\Users\Urist\Pictures\bg\himawari\himawari_01.png C:\Users\Urist\Pictures\bg\himawari\himawari_02.png
-copy C:\Users\Urist\Pictures\bg\himawari\himawari_01.png C:\Users\Urist\Pictures\bg\mixed\himawari.png
-
-C:\python39\python.exe C:\Users\Urist\Development\himawari\rammb.py -s goes-16 -z 1 -d C:\Users\Urist\Pictures\bg\goes-16\ -f goes-16_01.png
-copy C:\Users\Urist\Pictures\bg\goes-16\goes-16_01.png C:\Users\Urist\Pictures\bg\goes-16\goes-16_02.png
-copy C:\Users\Urist\Pictures\bg\goes-16\goes-16_01.png C:\Users\Urist\Pictures\bg\mixed\goes-16.png
-
-C:\python39\python.exe C:\Users\Urist\Development\himawari\rammb.py -s goes-17 -z 1 -d C:\Users\Urist\Pictures\bg\goes-17\ -f goes-17_01.png
-copy C:\Users\Urist\Pictures\bg\goes-17\goes-17_01.png C:\Users\Urist\Pictures\bg\goes-17\goes-17_02.png
-copy C:\Users\Urist\Pictures\bg\goes-17\goes-17_01.png C:\Users\Urist\Pictures\bg\mixed\goes-17.png


Build mol/app/hello on deploy.

Build mol/app/hello on deploy.

--- deploy.sh.cmd
+++ deploy.sh.cmd
@@ -1,4 +1,4 @@
 git checkout gh-pages
 git merge master
-npm start mol mol/app/supplies mol/perf/render mol/perf/uibench
+npm start mol mol/app/hello mol/app/supplies mol/perf/render mol/perf/uibench
 git commit -a -m "Update" && git push || git checkout master


using temporary nuget location on windows

--- tools/run_tests/pre_build_csharp.bat
+++ tools/run_tests/pre_build_csharp.bat
@@ -35,7 +35,8 @@
 cd /d %~dp0\..\..

 @rem Location of nuget.exe
-set NUGET=C:\nuget\nuget.exe
+@rem TODO: change this before submitting. This is only for migrating nuget
+set NUGET=C:\nuget_temp\nuget.exe

 if exist %NUGET% (
   @rem Restore Grpc packages by packages since Nuget client 3.4.4 doesnt support restore


Windows x86 build by default.

Windows x86 build by default.

--- util/win/env.bat
+++ util/win/env.bat
@@ -1,6 +1,6 @@
 @echo off

-if "%ARCH%" == "" set ARCH=x64
+if "%ARCH%" == "" set ARCH=x86

 if /i %ARCH% == x86       goto x86
 if /i %ARCH% == x64       goto x64


Removed the pause from the install launcher.

--- install-VS2015.bat
+++ install-VS2015.bat
@@ -1,20 +1,8 @@
 @REM This file is used to build the Cosmos sources.

-@REM This label is used for the 'error1' label if the user trying again.
-:retry
 cls
 del source\Cosmos.Build.Builder\bin\Debug\Cosmos.Build.Builder.*

 "%ProgramFiles(x86)%\MSBuild\14.0\Bin\msbuild.exe" "source\Builder.sln" /nologo /maxcpucount /p:Configuration=Debug /p:Platform=x86

-if not exist source\Cosmos.Build.Builder\bin\Debug\Cosmos.Build.Builder.exe goto error1
 start source\Cosmos.Build.Builder\bin\Debug\Cosmos.Build.Builder.exe -bat -VS2015 %1 %2 %3 %4 %5 %6 %7 %8 %9
-
-@REM This is the message if the Cosmos Builder Tool does not exists
-:error1
-@echo -----------------------------------------
-@echo Error: The Cosmos Builder Tool (from source\Cosmos.Build.Builder\bin\Debug\Cosmos.Build.Builder.exe) does not exists.
-@echo Press any key to try again.
-@pause
-@REM At this moment, when the user press any key, it will go to the 'retry' label.
-goto retry


Update bld.bat

Update bld.bat

--- recipes/leparagliding/bld.bat
+++ recipes/leparagliding/bld.bat
@@ -1,3 +1,3 @@
 gfortran leparagliding.f
-mkdir -p ${LIBRARY_PREFIX}/bin
+mkdir -p %LIBRARY_PREFIX%/bin
 COPY a.exe ${LIBRARY_PREFIX}/bin/leparagliding.exe


add '/prefer_nix' switch to init.bat

add '/prefer_nix' switch to init.bat

--- vendor/init.bat
+++ vendor/init.bat
@@ -14,6 +14,7 @@
 set time_init=0
 set fast_init=0
 set max_depth=1
+set prefer_windows_commands=1
 set "CMDER_USER_FLAGS= "

 :: Find root dir
@@ -90,6 +91,9 @@
     ) else if /i "%1" == "/svn_ssh" (
         set SVN_SSH=%2
         shift
+    ) else if /i "%1" == "/prefer_nix" (
+        set prefer_windows_commands=0
+        shift
     ) else (
       set "CMDER_USER_FLAGS=%1 %CMDER_USER_FLAGS%"
     )
@@ -233,18 +237,25 @@
 :: Add git to the path
 if defined GIT_INSTALL_ROOT (
     rem add the unix commands at the end to not shadow windows commands like more
-    if exist "!GIT_INSTALL_ROOT!\cmd\git.exe" %lib_path% enhance_path "!GIT_INSTALL_ROOT!\cmd" append
+    if "%prefer_windows_commands%" == "1" (
+        echo PREFERRING WINDOWS COMMANDS
+        set "path_position=append"
+    ) else (
+        echo PREFERRING UNIX COMMANDS
+        set "path_position="
+    )
+
+    if exist "!GIT_INSTALL_ROOT!\cmd\git.exe" %lib_path% enhance_path "!GIT_INSTALL_ROOT!\cmd" !path_position!
     if exist "!GIT_INSTALL_ROOT!\mingw32" (
-        %lib_path% enhance_path "!GIT_INSTALL_ROOT!\mingw32\bin" append
+        %lib_path% enhance_path "!GIT_INSTALL_ROOT!\mingw32\bin" !path_position!
     ) else if exist "!GIT_INSTALL_ROOT!\mingw64" (
-        %lib_path% enhance_path "!GIT_INSTALL_ROOT!\mingw64\bin" append
-    )
-    %lib_path% enhance_path "!GIT_INSTALL_ROOT!\usr\bin" append
-
+        %lib_path% enhance_path "!GIT_INSTALL_ROOT!\mingw64\bin" !path_position!
+    )
+    %lib_path% enhance_path "!GIT_INSTALL_ROOT!\usr\bin" !path_position!
     :: define SVN_SSH so we can use git svn with ssh svn repositories
     if not defined SVN_SSH set "SVN_SSH=%GIT_INSTALL_ROOT:\=\\%\\bin\\ssh.exe"

-    for /F "delims=" %%F in ('env /usr/bin/locale -uU 2') do (
+    for /F "delims=" %%F in ('%GIT_INSTALL_ROOT%\usr\bin\env /usr/bin/locale -uU 2') do (
         set "LANG=%%F"
     )
 )


test create script

test create script

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

--- windows8/tests/testCreateProject.bat
+++ windows8/tests/testCreateProject.bat
@@ -0,0 +1,5 @@
+rm -r C:\TestCordovaWindows8\TestOutput
+md C:\TestCordovaWindows8\
+..\bin\create C:\TestCordovaWindows8\TestOutput
+cd C:\TestCordovaWindows8\TestOutput\
+.\cordova\build


Add a message indicating if a picture is missing a datetime

--- batch/manage_pictures.bat
+++ batch/manage_pictures.bat
@@ -81,6 +81,7 @@
     FOR /f %%i in ('CALL %exif% -d "%%Y-%%m-%%d" -DateTimeOriginal -S -s "%%x"') DO SET datetime=%%i
     IF [!datetime!] == [] (
         SET /a wrong+=1
+		ECHO [MISSING] "%%x" does not have a datetime
     )
     SET /a number+=1
 )


Update rendered version to 9d7eec5e4a0c8cf15b13c922bb77a18bc91210ae

--- docs/make.bat
+++ docs/make.bat
@@ -37,6 +37,8 @@
 if "%1" == "clean" (
 	for /d %%i in (%BUILDDIR%\*) do rmdir /q /s %%i
 	del /q /s %BUILDDIR%\*
+	del /q /s api
+	del /q /s generated
 	goto end
 )


ignite-2030 Fixed parseargs.bat.

ignite-2030 Fixed parseargs.bat.

--- bin/include/parseargs.bat
+++ bin/include/parseargs.bat
@@ -16,6 +16,7 @@
 ::

 @echo off
+Setlocal EnableDelayedExpansion

 ::
 :: Parses command line parameters into Ignite variables that are common for the launcher scripts:


Use -capturestate to reliably record window focus

xperf -capturestate is needed by some providers. Sometimes it is better
to do it at the start of the trace, sometimes it is better at the end,
but always it is undocumented. For the Microsoft-Windows-Win32k provider
when tracing to a file it is just important to do it, in order to get
focus data in those traces where focus doesn't change.

--- bin/etwrecord.bat
+++ bin/etwrecord.bat
@@ -100,6 +100,13 @@
 xperf -on %KernelProviders% %KernelStackWalk% %KBuffers% -f "%kernelfile%"  -start %SessionName% -on %UserProviders% -f "%userfile%"
 :NotInvalidFlags
 @if not %errorlevel% equ 0 goto failure
+@rem Some providers need a capturestate command to make them work reliably. One
+@rem example that I have noticed is the Microsoft-Windows-Win32k. Without a
+@rem -capturestate command it will not capture the current window in focus.
+@rem Window focus will only be recorded if it changes during the trace. Adding a
+@rem -capturestate command makes it work reliably. It would sure be nice if This
+@rem was documented.
+xperf.exe -capturestate %SessionName% %UserProviders%

 @echo Run the test you want to profile here
 @pause


Simplify msvcbuild.bat by only using USE_EMB_INIT=1.

--- src/msvcbuild.bat
+++ src/msvcbuild.bat
@@ -2,32 +2,23 @@
 @set TSCOMPILE=cl /nologo /O2 /W3 /c /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DWIN32 /DUSE_DL=1
 @set TSLINK=link /nologo
 @set TSLIB=lib /nologo
+
+%TSCOMPILE% /MT scheme.c dynload.c
+%TSLINK% /out:tinyscheme.exe scheme.obj dynload.obj
+
+tinyscheme.exe mk_init_scm.scm

 @if "%1" == "static" goto STATIC
 @if not exist bin\ (
   mkdir bin
 )

-@if "%1" == "emb_init" (
-  %TSCOMPILE% /MT scheme.c dynload.c
-  %TSLINK% /out:tinyscheme.exe scheme.obj dynload.obj
+%TSCOMPILE% /DUSE_EMB_INIT=1 /MT scheme.c dynload.c
+%TSLINK% /out:bin\tinyscheme.exe scheme.obj dynload.obj

-  tinyscheme.exe mk_init_scm.scm
+%TSCOMPILE% /DUSE_EMB_INIT=1 /MDd scheme.c dynload.c
+%TSLINK% /out:bin\tinyscheme_d.exe scheme.obj dynload.obj

-  %TSCOMPILE% /DUSE_EMB_INIT=1 /MT scheme.c dynload.c
-  %TSLINK% /out:bin\tinyscheme.exe scheme.obj dynload.obj
-
-  %TSCOMPILE% /DUSE_EMB_INIT=1 /MDd scheme.c dynload.c
-  %TSLINK% /out:bin\tinyscheme_d.exe scheme.obj dynload.obj
-
-  del tinyscheme.* init_scm.h
-) else (
-  %TSCOMPILE% /MT scheme.c dynload.c
-  %TSLINK% /out:bin\tinyscheme.exe scheme.obj dynload.obj
-
-  %TSCOMPILE% /MDd scheme.c dynload.c
-  %TSLINK% /out:bin\tinyscheme_d.exe scheme.obj dynload.obj
-)
 @goto END

 :STATIC
@@ -35,18 +26,11 @@
   mkdir lib
 )

-%TSCOMPILE% /MT scheme.c dynload.c
-%TSLINK% /out:tinyscheme.exe scheme.obj dynload.obj
-
-tinyscheme.exe mk_init_scm.scm
-
-%TSCOMPILE% /DSTANDALONE=0 /DUSE_EMB_INIT=1 /MT scheme.c dynload.c
+%TSCOMPILE% /DUSE_EMB_INIT=1 /DSTANDALONE=0 /MT scheme.c dynload.c
 %TSLIB% /out:lib\tinyscheme.lib scheme.obj dynload.obj

-%TSCOMPILE% /DSTANDALONE=0 /DUSE_EMB_INIT=1 /MDd scheme.c dynload.c
+%TSCOMPILE% /DUSE_EMB_INIT=1 /DSTANDALONE=0 /MDd scheme.c dynload.c
 %TSLIB% /out:lib\tinyscheme_d.lib scheme.obj dynload.obj

-del tinyscheme.* init_scm.h
-
 :END
-del scheme.obj dynload.obj
+del scheme.obj dynload.obj tinyscheme.* init_scm.h


Remove useless rm.

Remove useless rm.

--- openmole/bin/openmole/resources/openmole.bat
+++ openmole/bin/openmole/resources/openmole.bat
@@ -1,6 +1,3 @@
-rmdir /s /q "configuration\org.eclipse.core.runtime"
-rmdir /s /q "configuration\org.eclipse.equinox.app"
-rmdir /s /q "configuration\org.eclipse.osgi"

 start /MIN dbserver\bin\openmole-dbserver.bat


Fixed cmd script to accept parameters.

Fixed cmd script to accept parameters.

--- release/TBAShell.cmd
+++ release/TBAShell.cmd
@@ -1 +1 @@
-java -jar TBAShell.jar
+@java -jar TBAShell.jar %1 %2 %3


modify evpp build bat

modify evpp build bat

Former-commit-id: a84e89ec0fc58941e79f37137443f15bb5bf670c [formerly 53c7ed91800f3bed197ded7ed9b83142554898e7] [formerly c7b820ff842845ee8da7d9ddc04b01aa72ead784] [formerly 485b2899ff0a7263894bd821a3cd98a7c5287cd6 [formerly 241a82653b328331364f77275fec0081f13b16f3]] [formerly 8963a691856e5fac602c548770a653eff0087dcb [formerly 634badd744043316ef1f7276507512d50c0cfc3f] [formerly 027db863fdcf6a203b8f7b8b4ed48fdaa1a1ede2 [formerly 29f0b9ada565178e70414890ef08bcbf7a219d3f]]] [formerly 2ab61b4ad3e1952964bddc9c16bd7f796e72042f]
Former-commit-id: d53d8b34d3e33b131f0c3e6d92760b7bbee1fe55
Former-commit-id: 31edc761d07dda7455d38256f1a9e34693d50269 [formerly 02462f3c7d5d2497b174d5b87bfebede1eb77c44] [formerly 40f911ce836d8b53fba9f4833e2cca7c4db3e3f3 [formerly 6b442709e27c4b595f49a6ad7f862daba8bb9f5a]]
Former-commit-id: 67cfcf7efd14d31c821d9d848c3085dd8d3696e2 [formerly ac5e3bc9da1248835f6ec47861a0a081da02bfbc]
Former-commit-id: 81fc11a67e3c7c9334473b7a1c8be806793f3b34
Former-commit-id: b47d10d918187f80551ba6f78c0c8104f7e5b944

--- Dep/build_dep.bat
+++ Dep/build_dep.bat
@@ -2,72 +2,13 @@

 echo Building dependencies...

-if exist lib (rd lib /q /s)
-md lib
-cd lib
-md Debug
-md Release
-cd ../
-REM ######################################################################################################
-echo Building protobuf...
-
-if exist protobuf (rd protobuf /q /s)
-git clone -b 2.7.0 https://github.com/google/protobuf.git
-
-cd protobuf/cmake
-md build
-cd build
-cmake -G "Visual Studio 14 Win64" -Dprotobuf_BUILD_SHARED_LIBS=ON -Dprotobuf_BUILD_TESTS=OFF ..
-"%VS140COMNTOOLS%..\IDE\Devenv" protobuf.sln /build "Debug|x64"
-"%VS140COMNTOOLS%..\IDE\Devenv" protobuf.sln /build "Release|x64"
-copy Debug\*.dll ..\..\..\lib\Debug /Y
-copy Debug\*.lib ..\..\..\lib\Debug /Y
-copy Release\*.dll ..\..\..\lib\Release /Y
-copy Release\*.lib ..\..\..\lib\Release /Y
-cd ..\..\..\
-REM ######################################################################################################
-echo Building libevent...
-
-if exist libevent (rd libevent /q /s)
-git clone -b master https://github.com/libevent/libevent.git
-
-cd libevent
-md build
-cd build
-cmake -G "Visual Studio 14 Win64" -DEVENT__DISABLE_OPENSSL=ON ..
-"%VS140COMNTOOLS%..\IDE\Devenv" libevent.sln /build "Debug|x64" /project event_core_static.vcxproj
-"%VS140COMNTOOLS%..\IDE\Devenv" libevent.sln /build "Release|x64" /project event_core_static.vcxproj
-"%VS140COMNTOOLS%..\IDE\Devenv" libevent.sln /build "Debug|x64" /project event_static.vcxproj
-"%VS140COMNTOOLS%..\IDE\Devenv" libevent.sln /build "Release|x64" /project event_static.vcxproj
-"%VS140COMNTOOLS%..\IDE\Devenv" libevent.sln /build "Debug|x64" /project event_extra_static.vcxproj
-"%VS140COMNTOOLS%..\IDE\Devenv" libevent.sln /build "Release|x64" /project event_extra_static.vcxproj
-copy lib\Debug\*.lib ..\..\lib\Debug /Y
-copy lib\Release\*.lib ..\..\lib\Release /Y
-cd ..\..\
-REM ######################################################################################################
-echo Building glog...
-if exist glog (rd glog /q /s)
-git clone -b v035 https://github.com/google/glog.git
-
-cd glog
-md build
-cd build
-cmake -G "Visual Studio 14 Win64" ..
-"%VS140COMNTOOLS%..\IDE\Devenv" google-glog.sln /build "Debug|x64"
-"%VS140COMNTOOLS%..\IDE\Devenv" google-glog.sln /build "Release|x64"
-copy Debug\*.lib ..\..\lib\Debug /Y
-copy Release\*.lib ..\..\lib\Release /Y
-cd ..\..\
-REM ######################################################################################################
 echo Building evpp...

-if exist evpp (rd evpp /q /s)
-git clone -b master https://github.com/ArkGame/evpp.git

 cd evpp
 cd vsprojects
-"%VS140COMNTOOLS%..\IDE\Devenv" libevpp.sln /build "Debug|x64" /project evpp_static.vcxproj
-"%VS140COMNTOOLS%..\IDE\Devenv" libevpp.sln /build "Release|x64" /project evpp_static.vcxproj
+"%VS140COMNTOOLS%..\IDE\Devenv" libevpp.sln /build "Debug|x64" /project libevpp.vcxproj
+"%VS140COMNTOOLS%..\IDE\Devenv" libevpp.sln /build "Release|x64" /project libevpp.vcxproj
 cd ..\..\
 REM ####################################################################################################
 REM back to root dir


modify move command option

modify move command option

--- swords.bat
+++ swords.bat
@@ -17,7 +17,7 @@
     %toolchainpath%\batch\ifmake.bat %cfile% %jsonfile% %toolchainpath%
   )

-  move ..\%projectname%_* .
+  move /Y ..\%projectname%_*.c .

   %toolchainpath%\batch\runhls.bat %cfile:~3,-2%_hw_re.c %jsonfile% %projectname% %toolchainpath%
   %toolchainpath%\batch\runvivado.bat %jsonfile% %projectname% %projectname%_hls %cd%\%projectname% %toolchainpath%


[DEVOPS-33] Add LibreSSL download code

[DEVOPS-33] Add LibreSSL download code

--- scripts/build-installer-win64.bat
+++ scripts/build-installer-win64.bat
@@ -65,12 +65,25 @@
 call npm run package -- --icon installers/icons/64x64
 @if %errorlevel% neq 0 (@echo FAILED: Failed to package the frontend
 	exit /b 1)
+
 pushd installers
+    del /f LibreSSL.zip 2>nul
+    @echo Obtaining LibreSSL %LIBRESSL_VERSION%
+    ..\curl %LIBRESSL_URL% -o LibreSSL.zip
+    @if %errorlevel% neq 0 (@echo FAILED: LibreSSL couldn't be obtained
+	popd & exit /b 1)
+    7z x LibreSSL.zip
+    @if %errorlevel% neq 0 (@echo FAILED: LibreSSL couldn't be extracted from downloaded archive
+	popd & exit /b 1)
+    del LibreSSL.zip
+    rmdir /s/q libressl
+    move libressl-%LIBRESSL_VERSION%-windows libressl
+
     @echo Installing stack
-    ..\curl http://www.stackage.org/stack/windows-x86_64 -o stack.zip
+    ..\curl --location http://www.stackage.org/stack/windows-x86_64 -o stack.zip
     @if %errorlevel% neq 0 (@echo FAILED: stack couldn't be obtained
 	popd & exit /b 1)
-    del /f stack.exe
+    del /f stack.exe 2>nul
     7z x stack.zip stack.exe
     @if %errorlevel% neq 0 (@echo FAILED: couldn't extract stack from the distribution package
 	exit /b 1)
@@ -81,7 +94,7 @@
     rmdir /s/q DLLs 2>nul
     mkdir      DLLs
     pushd      DLLs
-        ..\..\curl %DLLS_URL% -o DLLs.zip
+        ..\..\curl --location %DLLS_URL% -o DLLs.zip
         @if %errorlevel% neq 0 (@echo FAILED: couldn't obtain CardanoSL DLL package
 		exit /b 1)
         7z x DLLs.zip


cleanup

cleanup

--- test-hl-interp.cmd
+++ test-hl-interp.cmd
@@ -1,21 +0,0 @@
-@echo off
-echo Cleaning...
-if exist dump\hl rd /s /q dump\hl
-if exist target\hl rd /s /q target\hl
-
-haxelib list | findstr munit >NUL
-if errorlevel 1 (
-    echo Installing [munit]...
-    haxelib install munit
-)
-
-echo Compiling and Testing...
-haxe -main hx.doctest.TestRunner ^
--lib munit ^
--cp src ^
--cp test ^
--dce full ^
--debug ^
--D dump=pretty ^
--D interp ^
--hl target/hl/TestRunner.hl


remove obsolete env.cmd file

remove obsolete env.cmd file

--- src/csproj/env.cmd
+++ src/csproj/env.cmd
@@ -1,3 +0,0 @@
-SET PSModulePath=C:\src\ps-modules\csproj\src;C:\src\ps-modules\csproj\src;C:\Users\jakub_000\Documents\WindowsPowerShell\Modules;C:\Program Files (x86)\PowerShell Community Extensions\Pscx3\;C:\Program Files (x86)\WindowsPowerShell\Modules;C:\WINDOWS\system32\WindowsPowerShell\v1.0\Modules\;C:\Program Files (x86)\Microsoft SQL Server\120\Tools\PowerShell\Modules\;C:\Program Files\WindowsPowerShell\Modules;C:\Program Files (x86)\Microsoft SDKs\Azure\PowerShell\ResourceManager\AzureResourceManager;C:\Program Files (x86)\Microsoft SDKs\Azure\PowerShell\ServiceManagement
-
-


misc: Create a script to allow building 32-bit and 64-bit Windows.

Create a script to allow people to build both versions of Windows
targets from a command-line.

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

--- build_windows_targets.bat
+++ build_windows_targets.bat
@@ -0,0 +1,81 @@
+echo off
+REM
+REM This batch file builds both 32-bit and 64-bit versions of the loader.
+REM It is assumed that the developer has run the update_external_sources.bat
+REM file prior to running this.
+REM
+
+REM Determine the appropriate CMake strings for the current version of Visual Studio
+echo Determining VS version
+python .\determine_vs_version.py > vsversion.tmp
+set /p VS_VERSION=< vsversion.tmp
+echo Detected Visual Studio Version as %VS_VERSION%
+
+REM Cleanup the file we used to collect the VS version output since it's no longer needed.
+del /Q /F vsversion.tmp
+
+rmdir /Q /S build
+rmdir /Q /S build32
+
+REM *******************************************
+REM 64-bit LoaderAndTools build
+REM *******************************************
+mkdir build
+pushd build
+
+echo Generating 64-bit spirv-tools CMake files for Visual Studio %VS_VERSION%
+cmake -G "Visual Studio %VS_VERSION% Win64" ..
+
+echo Building 64-bit Debug LoaderAndTools
+msbuild ALL_BUILD.vcxproj /p:Platform=x64 /p:Configuration=Debug
+
+REM Check for existence of one DLL, even though we should check for all results
+if not exist .\loader\Debug\vulkan-1.dll (
+   echo.
+   echo LoaderAndTools 64-bit Debug build failed!
+   set errorCode=1
+)
+
+echo Building 64-bit Release LoaderAndTools
+msbuild ALL_BUILD.vcxproj /p:Platform=x64 /p:Configuration=Release
+
+REM Check for existence of one DLL, even though we should check for all results
+if not exist .\loader\Release\vulkan-1.dll (
+   echo.
+   echo LoaderAndTools 64-bit Release build failed!
+   set errorCode=1
+)
+
+popd
+
+REM *******************************************
+REM 32-bit LoaderAndTools build
+REM *******************************************
+mkdir build32
+pushd build32
+
+echo Generating 32-bit LoaderAndTools CMake files for Visual Studio %VS_VERSION%
+cmake -G "Visual Studio %VS_VERSION%" ..
+
+echo Building 32-bit Debug LoaderAndTools
+msbuild ALL_BUILD.vcxproj /p:Platform=x86 /p:Configuration=Debug
+
+REM Check for existence of one DLL, even though we should check for all results
+if not exist .\loader\Debug\vulkan-1.dll (
+   echo.
+   echo LoaderAndTools 32-bit Debug build failed!
+   set errorCode=1
+)
+
+echo Building 32-bit Release LoaderAndTools
+msbuild ALL_BUILD.vcxproj /p:Platform=x86 /p:Configuration=Release
+
+REM Check for existence of one DLL, even though we should check for all results
+if not exist .\loader\Release\vulkan-1.dll (
+   echo.
+   echo LoaderAndTools 32-bit Release build failed!
+   set errorCode=1
+)
+
+popd
+


Adding a windows cleanup step for the temp directory.
Moving temp directory to e: in some cases.

BUG=None
TEST=None
R=ncbray@google.com
Review URL: http://codereview.chromium.org/6881056

git-svn-id: 721b910a23eff8a86f00c8fd261a7587cddf18f8@4937 fcba33aa-ac0c-11dd-b9e7-8d5594d729c2

--- buildbot/buildbot_win.bat
+++ buildbot/buildbot_win.bat
@@ -7,6 +7,10 @@
 set MODE=%1
 set BITS=%2
 set TOOLCHAIN=%3
+
+:: Picking out drive letter on which the build is happening so we can use it
+:: for the temp directory.
+set BUILD_DRIVE=%PATH:~0,1%

 call buildbot\msvs_env.bat %BITS%

@@ -20,6 +24,18 @@
 :: build as the toolchain takes care or the clobber, hooks aren't needed, and
 :: partial_sdk really shouldn't be needed.
 if "%INSIDE_TOOLCHAIN%" neq "" goto SkipSync
+
+echo @@@BUILD_STEP cleanup_temp@@@
+:: Selecting a temp directory on the same drive as the build.
+:: Many of our bots have tightly packed C: drives, but plentiful E: drives.
+set OLD_TEMP=%TEMP%
+set TEMP=%BUILD_DRIVE%:\temp
+set TMP=%TEMP%
+mkdir %TEMP%
+:: Cleaning old temp directory to clear up all the nearly full bots out there.
+rmdir /s /q %OLD_TEMP%\*
+:: Cleaning new temp directory so we don't overflow in the future.
+rmdir /s /q %TEMP%\*

 echo @@@BUILD_STEP gclient_runhooks@@@
 cmd /c gclient runhooks


Support for OpenCV<3 with NMAKE build tool

--- buildtools/nmake/make.bat
+++ buildtools/nmake/make.bat
@@ -1,15 +1,34 @@
 @if "%VS140COMNTOOLS%"=="" goto error_vc14
 @call "%VS140COMNTOOLS%\..\..\VC\vcvarsall.bat" x64
 @if "%HIPACC_PATH%"=="" goto error_hipacc
+@if "%OPENCV_DIR%"=="" goto target_rules

-@if "%OPENCV_DIR%"=="" goto target_rules
-@where.exe /R %OPENCV_DIR%\lib opencv_world???.lib > libpath.txt
-@set /p OPENCV_LIBARY_PATH=<libpath.txt
-@del libpath.txt
-@if "%OPENCV_LIBARY_PATH%"=="" goto target_rules
-@set CXX_FLAGS_OPENCV=/D USE_OPENCV /I "%OPENCV_DIR%\..\..\include" "%OPENCV_LIBARY_PATH%"
-@set NVCC_FLAGS_OPENCV=-D USE_OPENCV -I "%OPENCV_DIR%/../../include" -l "%OPENCV_LIBARY_PATH:~0,-4%"
+:check_opencv3
+@where.exe /R %OPENCV_DIR%\lib opencv_world*.lib > worldlib.txt
+@set /p OPENCV_LIBARY_WORLD=<worldlib.txt
+@del worldlib.txt
+@if "%OPENCV_LIBARY_WORLD%"=="" goto check_opencv2
+@set CXX_FLAGS_OPENCV=/D USE_OPENCV /I "%OPENCV_DIR%\..\..\include" "%OPENCV_LIBARY_WORLD%"
+@set NVCC_FLAGS_OPENCV=-D USE_OPENCV -I "%OPENCV_DIR%/../../include" -l "%OPENCV_LIBARY_WORLD:~0,-4%"
+@goto target_rules
+
+:check_opencv2
+@where.exe /R %OPENCV_DIR%\lib opencv_core*.lib > corelib.txt
+@set /p OPENCV_LIBARY_CORE=<corelib.txt
+@del corelib.txt
+@if "%OPENCV_LIBARY_CORE%"=="" goto target_rules
+@where.exe /R %OPENCV_DIR%\lib opencv_highgui*.lib > highguilib.txt
+@set /p OPENCV_LIBARY_HIGHGUI=<highguilib.txt
+@del highguilib.txt
+@if "%OPENCV_LIBARY_HIGHGUI%"=="" goto target_rules
+@where.exe /R %OPENCV_DIR%\lib opencv_imgproc*.lib > imgproclib.txt
+@set /p OPENCV_LIBARY_IMGPROC=<imgproclib.txt
+@del imgproclib.txt
+@if "%OPENCV_LIBARY_IMGPROC%"=="" goto target_rules
+@set CXX_FLAGS_OPENCV=/D USE_OPENCV /I "%OPENCV_DIR%\..\..\include" "%OPENCV_LIBARY_CORE%" "%OPENCV_LIBARY_HIGHGUI%" "%OPENCV_LIBARY_IMGPROC%"
+@set NVCC_FLAGS_OPENCV=-D USE_OPENCV -I "%OPENCV_DIR%/../../include" -l "%OPENCV_LIBARY_CORE:~0,-4%" -l "%OPENCV_LIBARY_HIGHGUI:~0,-4%" -l "%OPENCV_LIBARY_IMGPROC:~0,-4%"
+@goto target_rules

 :target_rules


* missed changes

* missed changes

git-svn-id: 8286f1aa0849172a171b18e797a5983a17159a76@170 699b1267-f50e-4533-8e1b-323e5631ef88

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

 :CONFIGURE_SVNCMD_END

-if exist "%CONFIGURE_ROOT%/svncmd.tag" goto DEPLOY_TOOLS_EXTERNAL
+if exist "%CONFIGURE_ROOT%/svncmd.tag" call :DEPLOY_TOOLS_EXTERNAL
 goto END

 :DEPLOY_TOOLS_EXTERNAL


commit on 12/06/2018 at 10:29:22

commit on 12/06/2018 at 10:29:22

--- ansys-APDL/fiberDebond3D.cmd
+++ ansys-APDL/fiberDebond3D.cmd
@@ -42,13 +42,14 @@

 ! ===> START INPUT DATA

-Vf = 0.000079! [-] Fiber volume fraction
-
+L = 10.0          ! [um]  length of the RVE
+W = 10.0          ! [um]  width of the RVE
 Rf = 1.0          ! [um]  fiber's radius
 theta0 = 0.0      ! [deg] angular position of debond
 deltatheta = 10.0 ! [deg] 2*deltatheta = debond size
 deltaphi = 5.0    ! [deg] refined area size
 delta = 0.05      ! [deg] angular size of element at crack
+aOverW = 0.1      ! [-] ratio of debond length to RVE's width

 epsx = 0.01       ! [-]  applied strain
 uniP = 0.0        ! [-]  uniform pressure applied to crack face
@@ -69,7 +70,7 @@

 ! ===> END INPUT DATA

-L = 2*t/rhon        ! [mm] length of the RVE
+a = aOverW*W

 appliedDisp = epsx*L ! [mm] applied displacement

@@ -80,49 +81,22 @@

 ! Points

-K, 1, 0.0, 0.0
-K, 2, L, 0.0
-K, 3, L, tTOT
-K, 4, 0.0, tTOT
-
-K, 5, 0.0, refHlow
-K, 6, L, refHlow
-K, 7, L, refHup
-K, 8, 0.0, refHup
-
-K, 9, a, refHlow
-K,10, a, t
-K,11, a, t
-K,12, a, refHup
-K,13, 0.0, t
-K,14, 0.0, t
-K,15, vcctRegion,t
-
-K,16, L, t
+K, 1, -L, W, 0.0   ! SW corner, external face with debond
+K, 2, L, W, 0.0    ! SE corner, external face with debond
+K, 3, L, W, L      ! NE corner, external face with debond
+K, 4, -L, W, L     ! NW corner, external face with debond
+
+K, 5, -L, 0.0, 0.0   ! SW corner, external face without debond
+K, 6, L, 0.0, 0.0    ! SE corner, external face without debond
+K, 7, L, 0.0, L      ! NE corner, external face without debond
+K, 8, -L, 0.0, L     ! NW corner, external face without debond
+
+

 ! Lines

 L, 1, 2            !1
-L, 2, 6            !2
-L, 6, 16           !3
-L, 16, 7           !4
-L, 7, 3            !5
-L, 3, 4            !6
-L, 4, 8            !7
-L, 8, 14           !8
-L, 13, 5           !9
-L, 5, 1            !10
-L, 5, 9            !11
-L, 9, 6            !12
-L, 8, 12           !13
-L, 12, 7           !14
-L, 10, 15          !15
-L, 11, 15          !16
-L, 15, 16          !17
-L, 13, 10          !18
-L, 14, 11          !19
-L, 9, 10           !20
-L, 11, 12          !21
+

 ! Areas


run with two nodes, so half the time?

run with two nodes, so half the time?

[#116221251]

Signed-off-by: Anand Gaitonde <4f0ff06b2390eeadb0769d298cbdb3dc6df4c73d@pivotal.io>

--- ci/tasks/cats-windows.bat
+++ ci/tasks/cats-windows.bat
@@ -24,4 +24,4 @@
 go get -v github.com/onsi/ginkgo/ginkgo

 cd %GATSPATH%
-ginkgo.exe -r -slowSpecThreshold=120 -skipPackage="logging,services,v3,routing_api,routing,backend_compatibility,ssh" -skip="NO_DEA_SUPPORT|go makes the app reachable via its bound route|SSO|takes effect after a restart, not requiring a push|doesn't die when printing 32MB|exercises basic loggregator|firehose data|Downloads the droplet for the app"
+ginkgo.exe -r -slowSpecThreshold=120 -skipPackage="logging,services,v3,routing_api,routing,backend_compatibility,ssh" -skip="NO_DEA_SUPPORT|go makes the app reachable via its bound route|SSO|takes effect after a restart, not requiring a push|doesn't die when printing 32MB|exercises basic loggregator|firehose data|Downloads the droplet for the app" -nodes=2


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

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

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


FreeCAD_trunk.sln to FreeCAD.sln

FreeCAD_trunk.sln to FreeCAD.sln

--- .travis/build.bat
+++ .travis/build.bat
@@ -2,5 +2,5 @@

 call "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" amd64

-MSBuild.exe FreeCAD_Trunk.sln /p:CLToolExe=clcache.exe /p:TrackFileAccess=false /p:CLToolPath=C:\Users\travis\build\FreeCAD\FreeCAD /m:2 /nologo /verbosity:minimal /p:Configuration=Release /p:Platform=x64
+MSBuild.exe FreeCAD.sln /p:CLToolExe=clcache.exe /p:TrackFileAccess=false /p:CLToolPath=C:\Users\travis\build\FreeCAD\FreeCAD /m:2 /nologo /verbosity:minimal /p:Configuration=Release /p:Platform=x64


* updated the build script to work with Sphinx rather than Pudge

--- makedocs.bat
+++ makedocs.bat
@@ -1,6 +1,10 @@
 @echo off

-c:\.temp\pudge\pudge\cli  --documents doc_source\index.rst,doc_source\controls_overview.rst,doc_source\howto.rst,doc_source\getting_started.rst,history.txt,license.txt,todo.txt --title pywinauto  -v  -d website  -m pywinauto.application,pywinauto.taskbar,pywinauto.clipboard,pywinauto.timings,pywinauto.findbestmatch,pywinauto.findwindows,pywinauto.handleprops,pywinauto.XMLHelpers,pywinauto.controls,pywinauto.tests   -t doc_source\template
+
+REM docs\build_autodoc_files.py
+sphinx-build -b html docs docs\.build
+
+REM c:\.temp\pudge\pudge\cli  --documents doc_source\index.rst,doc_source\controls_overview.rst,doc_source\howto.rst,doc_source\getting_started.rst,history.txt,license.txt,todo.txt --title pywinauto  -v  -d website  -m pywinauto.application,pywinauto.taskbar,pywinauto.clipboard,pywinauto.timings,pywinauto.findbestmatch,pywinauto.findwindows,pywinauto.handleprops,pywinauto.XMLHelpers,pywinauto.controls,pywinauto.tests   -t doc_source\template


modify evpp use a clone

modify evpp use a clone

Former-commit-id: 26568776daa1ab1af695fcb1da127db0082db955
Former-commit-id: 91c82aa5f04399f81e5f32e846e0e8c58cbaa209

--- Dep/build_dep.bat
+++ Dep/build_dep.bat
@@ -61,22 +61,14 @@
 REM ######################################################################################################
 echo Building evpp...

-REM close vcpkg setup task
-tarkkill /IM /F /T Microsoft.VisualStudio.Setup.Configuration.Console.exe
 if exist evpp (rd evpp /q /s)
-git clone -b master https://github.com/Qihoo360/evpp.git
+git clone -b master https://github.com/ArkGame/evpp.git

 cd evpp
-md build
-cd build
-git clone https://github.com/Microsoft/vcpkg.git
-cd vcpkg
-call bootstrap-vcpkg.bat
-vcpkg install evpp:x64-windows
-
-copy packages\evpp_x64-windows\debug\lib\evpp*.lib ..\..\..\lib\Debug /Y
-copy packages\evpp_x64-windows\lib\evpp*.lib ..\..\..\lib\Release /Y
-cd ..\..\..\
+cd vsprojects
+"%VS140COMNTOOLS%..\IDE\Devenv" libevpp.sln /build "Debug|x64" /project evpp_static.vcxproj
+"%VS140COMNTOOLS%..\IDE\Devenv" libevpp.sln /build "Release|x64" /project evpp_static.vcxproj
+cd ..\..\
 REM ####################################################################################################
 REM back to root dir
 cd ../


Improved readability

Improved readability

--- install-idea-files.bat
+++ install-idea-files.bat
@@ -1,8 +1,12 @@
+@echo off
 rem complete your IDEA Home folder here
 set IDEA_HOME=C:\Program Files\JetBrains\IntelliJ IDEA 7.0.1
 set IDEA_VERSION=7.0.1.7364
-echo %IDEA_HOME%
+echo.
+echo Installing packages of IDEA version %IDEA_VERSION% from "%IDEA_HOME%" to the local Maven repository...
+echo.
 call mvn install:install-file -DgroupId=com.intellij.idea -Dpackaging=jar -Dfile="%IDEA_HOME%\lib\openapi.jar" -DartifactId=openapi -Dversion=%IDEA_VERSION%
 call mvn install:install-file -DgroupId=com.intellij.idea -Dpackaging=jar -Dfile="%IDEA_HOME%\lib\annotations.jar" -DartifactId=annotations -Dversion=%IDEA_VERSION%
 call mvn install:install-file -DgroupId=com.intellij.idea -Dpackaging=jar -Dfile="%IDEA_HOME%\lib\extensions.jar" -DartifactId=extensions -Dversion=%IDEA_VERSION%
+echo.
 pause


unset "run as node"

unset "run as node"

--- scripts/test-integration.bat
+++ scripts/test-integration.bat
@@ -2,6 +2,7 @@
 setlocal

 set ELECTRON_NO_ATTACH_CONSOLE=1
+set ATOM_SHELL_INTERNAL_RUN_AS_NODE=

 :: Integration Tests
 .\scripts\code.bat %~dp0\..\extensions\vscode-api-tests\testWorkspace --extensionDevelopmentPath=%~dp0\..\extensions\vscode-api-tests --extensionTestsPath=%~dp0\..\extensions\vscode-api-tests\out


added default components for NARVIS Lab

added default components for NARVIS Lab

error: pathspec 'misc/setup/windows/addNarvisModules.bat' did not match any file(s) known to git

--- misc/setup/windows/addNarvisModules.bat
+++ misc/setup/windows/addNarvisModules.bat
@@ -0,0 +1,13 @@
+git clone https://github.com/Ubitrack/utcore.git modules/utcore
+git clone https://github.com/Ubitrack/utvision.git modules/utvision
+git clone https://github.com/Ubitrack/utdataflow.git modules/utdataflow
+git clone https://github.com/Ubitrack/utfacade.git modules/utfacade
+git clone https://github.com/Ubitrack/utvisualization.git modules/utvisualization
+git clone https://github.com/Ubitrack/component_core.git modules/component_core
+git clone https://github.com/Ubitrack/component_vision.git modules/component_vision
+git clone https://github.com/Ubitrack/component_visualization.git modules/component_visualization
+git clone https://github.com/Ubitrack/device_camera_directshow.git modules/device_camera_directshow
+git clone https://github.com/Ubitrack/device_camera_flycapture.git modules/device_camera_flycapture
+git clone https://github.com/Ubitrack/device_tracker_art.git modules/device_tracker_art
+git clone https://github.com/Ubitrack/device_comm_zmq.git modules/device_comm_zmq
+git clone https://github.com/Ubitrack/device_camera_kinect2.git modules/device_camera_kinect2


add copy files for evpp

add copy files for evpp

Former-commit-id: 833dec15d596e75f6af43c526866e064e44d223f [formerly 0429f27e529f4a38cf303a0aa7dae624fed491e1] [formerly ea61ee01681e06282d93a8aac1f0e00aea939ab7] [formerly a91d4b3e7594befe2d1bdef3f0c9de77350cf725 [formerly 7c0d7373a6d659cc329ad0357ef5ab467e662dcd]] [formerly 3e83c3e0707edf8aaab8c5cd871719d3cf06edc6 [formerly 58288b9dd7f3615977080b7ed909d0427ef18331] [formerly 824f0a9048c5ce79f89fec6d0605a89d301b7dd7 [formerly 0d177c4de18cedad9746c5f6acc61626ee3bfdef]]] [formerly 502d1bbc2e81037d00a31feba70db2bc95113848]
Former-commit-id: 2b45f1bd8ae2a5a71a5f18ab7e4f7a38a88cbb4a
Former-commit-id: 8ea00ee70e17b11239f4dcec39b0bce5aa022026 [formerly d56b4603f638bbad0075afee55af02d83f9264c1] [formerly dc0fc0f5e615ce6d684f0559c8bc0c637217b28d [formerly e0397b2b0071f374c5bb9e26948b3a7f247e1086]]
Former-commit-id: 9f0aaf24a1ec208f5bb71450ab62d5f77620973b [formerly 88f8e1254e4a3da340a4e45e2a3da8ebb987cbde]
Former-commit-id: c74e9d5094feb8eb12ba7f61f2cb6926d448f9d4
Former-commit-id: c3dde28ac105559ce0fbf75eb489cdad684ae499

--- Dep/build_dep.bat
+++ Dep/build_dep.bat
@@ -67,6 +67,9 @@
 cd vsprojects
 "%VS140COMNTOOLS%..\IDE\Devenv" libevpp.sln /build "Debug|x64" /project libevpp.vcxproj
 "%VS140COMNTOOLS%..\IDE\Devenv" libevpp.sln /build "Release|x64" /project libevpp.vcxproj
+copy x64\Debug\*.lib ..\..\lib\Debug /Y
+copy x64\Release\*.lib ..\..\lib\Release /Y
+
 cd ..\..\
 REM ####################################################################################################
 REM back to root dir


revert build_dep.bat

revert build_dep.bat

Former-commit-id: efba08bd7e996cb86a94efd389992ec4b47f399b
Former-commit-id: 06d3427fae0c41ed16662d8a575f0a981d63f283 [formerly 921b12890495a942d06cd7f6e52bcdf7df2bee19] [formerly 6458d7c62efef07e55fe40f4b34234c2367e6369 [formerly 1cc2041e4843f3cceef9dfa60b17f88c16961a69]]
Former-commit-id: dd7adbf166f90eb62823dbbe58908f0a681298f9 [formerly c0a1371f29b49b525206e50ecc676d76e6b19968]
Former-commit-id: 399214411695f73ab46b5636efb30dab6165aa7c
Former-commit-id: a08878a32b360c1462248fc9e4bfdbb55d65e531

--- Dep/build_dep.bat
+++ Dep/build_dep.bat
@@ -2,8 +2,64 @@

 echo Building dependencies...

+if exist lib (rd lib /q /s)
+md lib
+cd lib
+md Debug
+md Release
+cd ../
+REM ######################################################################################################
+echo Building protobuf...
+
+if exist protobuf (rd protobuf /q /s)
+git clone -b 2.7.0 https://github.com/google/protobuf.git
+
+cd protobuf/cmake
+md build
+cd build
+cmake -G "Visual Studio 14 Win64" -Dprotobuf_BUILD_SHARED_LIBS=ON -Dprotobuf_BUILD_TESTS=OFF ..
+"%VS140COMNTOOLS%..\IDE\Devenv" protobuf.sln /build "Debug|x64"
+"%VS140COMNTOOLS%..\IDE\Devenv" protobuf.sln /build "Release|x64"
+copy Debug\*.dll ..\..\..\lib\Debug /Y
+copy Debug\*.lib ..\..\..\lib\Debug /Y
+copy Release\*.dll ..\..\..\lib\Release /Y
+copy Release\*.lib ..\..\..\lib\Release /Y
+cd ..\..\..\
+REM ######################################################################################################
+echo Building libevent...
+
+if exist libevent (rd libevent /q /s)
+git clone -b master https://github.com/libevent/libevent.git
+
+cd libevent
+md build
+cd build
+cmake -G "Visual Studio 14 Win64" -DEVENT__DISABLE_OPENSSL=ON ..
+"%VS140COMNTOOLS%..\IDE\Devenv" libevent.sln /build "Debug|x64" /project event_core_static.vcxproj
+"%VS140COMNTOOLS%..\IDE\Devenv" libevent.sln /build "Release|x64" /project event_core_static.vcxproj
+"%VS140COMNTOOLS%..\IDE\Devenv" libevent.sln /build "Debug|x64" /project event_static.vcxproj
+"%VS140COMNTOOLS%..\IDE\Devenv" libevent.sln /build "Release|x64" /project event_static.vcxproj
+"%VS140COMNTOOLS%..\IDE\Devenv" libevent.sln /build "Debug|x64" /project event_extra_static.vcxproj
+"%VS140COMNTOOLS%..\IDE\Devenv" libevent.sln /build "Release|x64" /project event_extra_static.vcxproj
+copy lib\Debug\*.lib ..\..\lib\Debug /Y
+copy lib\Release\*.lib ..\..\lib\Release /Y
+cd ..\..\
+REM ######################################################################################################
+echo Building glog...
+if exist glog (rd glog /q /s)
+git clone -b v035 https://github.com/google/glog.git
+
+cd glog
+md build
+cd build
+cmake -G "Visual Studio 14 Win64" ..
+"%VS140COMNTOOLS%..\IDE\Devenv" google-glog.sln /build "Debug|x64"
+"%VS140COMNTOOLS%..\IDE\Devenv" google-glog.sln /build "Release|x64"
+copy Debug\*.lib ..\..\lib\Debug /Y
+copy Release\*.lib ..\..\lib\Release /Y
+cd ..\..\
+REM ######################################################################################################
 echo Building evpp...
-

 cd evpp
 cd vsprojects


win: Ensure OpenSSL v1.0.x package version is included in package name

--- vc_build.bat
+++ vc_build.bat
@@ -116,6 +116,7 @@
 SET OPENSSL_DIRECTORY=openssl
 SET OPENSSL_1_0_BRANCH_TAG_VERSION=OpenSSL_1_0_2k
 SET OPENSSL_1_1_BRANCH_TAG_VERSION=OpenSSL_1_1_0e
+SET OPENSSL_PACKAGE_VERSION=1.0.2k
 SET "SUPPORTED_OPENSSL_VERSIONS=1_0 1_1"
 SET "SUPPORTED_OPENSSL_DISPLAY_VERSIONS=1.0 1.1"
 SET ZLIB_REPOSITORY_URL=https://github.com/madler/zlib.git


Remove verbose GC settings from autopsy-solr.in.cmd

--- KeywordSearch/release/solr/bin/autopsy-solr.in.cmd
+++ KeywordSearch/release/solr/bin/autopsy-solr.in.cmd
@@ -25,7 +25,7 @@
 set SOLR_JAVA_MEM=-Xms512m -Xmx512m

 REM Enable verbose GC logging
-set GC_LOG_OPTS=-verbose:gc -XX:+PrintHeapAtGC -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+PrintGCTimeStamps -XX:+PrintTenuringDistribution -XX:+PrintGCApplicationStoppedTime
+REM set GC_LOG_OPTS=-verbose:gc -XX:+PrintHeapAtGC -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+PrintGCTimeStamps -XX:+PrintTenuringDistribution -XX:+PrintGCApplicationStoppedTime

 REM These GC settings have shown to work well for a number of common Solr workloads
 set GC_TUNE=-XX:NewRatio=3 ^
@@ -85,7 +85,7 @@

 REM Path to a directory for Solr to store cores and their data. By default, Solr will use server\solr
 REM If solr.xml is not stored in ZooKeeper, this directory needs to contain solr.xml
-REM set SOLR_HOME=
+set SOLR_HOME=

 REM Sets the port Solr binds to, default is 8983
 REM set SOLR_PORT=8983


And that, thanks rhino

And that, thanks rhino

--- update_deps.bat
+++ update_deps.bat
@@ -25,7 +25,7 @@
     )
 )

-IF /I NOT %version:~0,3% == 3.5 GOTO errorhandler
+IF /I NOT %version:~0,3% == 3.5 GOTO errorhandlerpy
 CMD /k %pypath% -m pip install --upgrade -r requirements.txt
 GOTO end


After build the app clean out all unused files

--- Kit/Windows/build-app.cmd
+++ Kit/Windows/build-app.cmd
@@ -54,21 +54,87 @@
     if errorlevel 1 goto :error
 popd >NUL

-goto :eof
-echo Info: Remove unneeded files
-del %DIST_DIR%\PyWinAppRes\Lib\distutils\command\wininst-*.exe
-del %DIST_DIR%\PyWinAppRes\Lib\site-packages\pysvn\unins000.*
-rmdir /s /q %DIST_DIR%\PyWinAppRes\Lib\site-packages\PyQt5\Qt\qsci\api
+rem rem rem rem
+
+pushd %DIST_DIR%\PyWinAppRes\Lib\site-packages\PyQt5
+    if errorlevel 1 goto :error
+
+echo Info: clean up Qt 1. move all pyd and dll into a tmp folder
+mkdir tmp
+    if errorlevel 1 goto :error
+move Qt*.pyd tmp >NUL
+    if errorlevel 1 goto :error
+move tmp\Qt.pyd . >NUL
+    if errorlevel 1 goto :error
+
+mkdir Qt\bin\tmp
+    if errorlevel 1 goto :error
+move Qt\bin\Qt5*.dll Qt\bin\tmp >NUL
+    if errorlevel 1 goto :error
+
+echo Info: clean up Qt 2. bring back only the ones we use
+for %%x in (Core DBus Gui PrintSupport Svg Widgets) do call :qt_keep %%x
+
+echo Info: clean up Qt 3. delete the Qt files we do not need
+rmdir /s /q tmp
+    if errorlevel 1 goto :error
+rmdir /s /q Qt\bin\tmp
+    if errorlevel 1 goto :error
+
+echo Info: clean up Qt 4. delete qml file
+rmdir /s /q Qt\qml
+    if errorlevel 1 goto :error
+
+echo Info: clean up Qt 5. delete translations file
+rmdir /s /q Qt\translations
+    if errorlevel 1 goto :error
+
+echo Info: clean up Qt 6. delete webengine files
+del Qt\bin\QtWebEngineProcess.exe >NUL
+    if errorlevel 1 goto :error
+del Qt\resources\qtwebengine*.pak >NUL
+    if errorlevel 1 goto :error
+
+echo Info: clean up Qt 6. delete qsci resources
+rmdir /s /q Qt\qsci
+    if errorlevel 1 goto :error
+
+
+echo Info: clean up python lib 1. delete test code
 rmdir /s /q %DIST_DIR%\PyWinAppRes\Lib\ctypes\test
+    if errorlevel 1 goto :error
 rmdir /s /q %DIST_DIR%\PyWinAppRes\Lib\site-packages\git\test
+    if errorlevel 1 goto :error
 rmdir /s /q %DIST_DIR%\PyWinAppRes\Lib\site-packages\gitdb\test
+    if errorlevel 1 goto :error
 rmdir /s /q %DIST_DIR%\PyWinAppRes\Lib\site-packages\smmap\test
+    if errorlevel 1 goto :error
 rmdir /s /q %DIST_DIR%\PyWinAppRes\Lib\unittest\test
+    if errorlevel 1 goto :error

-echo Info: build-app.cmd done
-goto :eof
+echo Info: clean up python lib 1. delete distutils exe
+del /s %DIST_DIR%\PyWinAppRes\Lib\distutils\command\wininst-*.exe
+    if errorlevel 1 goto :error
+
+echo Info: clean up python lib 1. delete pysvn uninstall exe
+del /s %DIST_DIR%\PyWinAppRes\Lib\site-packages\pysvn\unins000.exe
+    if errorlevel 1 goto :error
+
+popd
+
+echo Info: build-app completed successfully
+exit /b 0
+endlocal
+
+:qt_keep
+    echo Info: Keeping Qt%1
+    move tmp\Qt%1.pyd . >NUL
+        if errorlevel 1 goto :error
+    move Qt\bin\tmp\Qt5%1.dll Qt\bin >NUL
+        if errorlevel 1 goto :error
+    goto :eof
+
 :error
-    echo Error: Build failed.
+    echo Error: build-app failed
     exit /b 1

-endlocal


Fix typo in RunTests.cmd

Fix typo in RunTests.cmd

--- tests/RunTests.cmd
+++ tests/RunTests.cmd
@@ -97,7 +97,7 @@

 echo Usage:
 echo.
-echo RunTests.cmd ^<debug^|release^|vsdebug^|vsrelease^> ^<fsharp^|fsharpqa^|coreunit^|coreunitportable47^|coreunitportable7^|coreunitportable78^|coreunit259^|ideunit^|compilerunit^> [TagToRun^|"Tags,To,Run"] [TagNotToRun^|"Tags,Not,To,Run"]
+echo RunTests.cmd ^<debug^|release^|vsdebug^|vsrelease^> ^<fsharp^|fsharpqa^|coreunit^|coreunitportable47^|coreunitportable7^|coreunitportable78^|coreunitportable259^|ideunit^|compilerunit^> [TagToRun^|"Tags,To,Run"] [TagNotToRun^|"Tags,Not,To,Run"]
 echo.
 exit /b 1


Remove 24 bit image from makeWinIco bat script

--- plugins/org.springsource.sts/makeWinIco.bat
+++ plugins/org.springsource.sts/makeWinIco.bat
@@ -8,11 +8,9 @@

 convert sts256.png -compress none ^
     "(" -clone 0 -resize 16x16 -compress none ")" ^
-    "(" -clone 0 -resize 24x24 -compress none ")" ^
     "(" -clone 0 -resize 32x32 -compress none ")" ^
     "(" -clone 0 -resize 48x48 -compress none ")" ^
     "(" -clone 0 -resize 16x16 -colors 256 -compress none ")" ^
-    "(" -clone 0 -resize 24x24 -colors 256 -compress none ")" ^
     "(" -clone 0 -resize 32x32 -colors 256 -compress none ")" ^
     "(" -clone 0 -resize 48x48 -colors 256 -compress none ")" ^
     "(" -clone 0 -resize 256x256 -compress none ")" ^


fixed the script. closes #99

fixed the script. closes #99

--- scripts/win_cb/compileAllExamples.bat
+++ scripts/win_cb/compileAllExamples.bat
@@ -1,21 +1,28 @@
-
-
-for /d %%X in (..\apps\*) do (
-cd %%X
-
-	for /d %%Y in (*) do (
-		cd %%Y
-
-		for %%Z in (*.cbp) do (
-
-
-			"C:\Program Files\CodeBlocks\codeblocks.exe" /na /nd --build %%Z
-		)
-		cd ../
-	)
-
-
-cd ../
-)
-
-cd ../scripts+@echo off
+
+
+set OLDDIR=%CD%
+
+cd ..\..\libs\openFrameworksCompiled\project\win_cb\
+"C:\Program Files\CodeBlocks\codeblocks.exe" /na /nd --target="release" --build "openFrameworksLib.cbp"
+cd ../../../../scripts/win_cb
+
+
+for /d %%X in (..\..\apps\*) do (
+cd %%X
+echo compiling all folders in: %%X
+	for /d %%Y in (*) do (
+		cd %%Y
+
+		for %%Z in (*.cbp) do (
+
+			"C:\Program Files\CodeBlocks\codeblocks.exe" /na /nd --target= "release" --build %%Z
+
+		)
+		cd ../
+	)
+
+
+)
+
+chdir /d %OLDDIR%


add partner name

add partner name

--- test/test_app.bat
+++ test/test_app.bat
@@ -0,0 +1,4 @@
+### application.bat - 2015 - Nouailletas ###
+"Copyright company - 2015"
+echo "Build : 10:00"
+echo "version 1.2"


install.bat for windows

install.bat for windows

--- vim/install.bat
+++ vim/install.bat
@@ -1,4 +1,5 @@

-copy vimrc ..\_vimrc /y
+mklink /j %USERPROFILE%\.vim %USERPROFILE%\.dotfiles\vim
+mklink %USERPROFILE%\.vimrc %USERPROFILE%\.dotfiles\vim\vimrc
 copy curl.cmd "C:\Program Files\Git\cmd\curl.cmd" /y


Revert "[C++] Pass SOURCE_DIR"

Revert "[C++] Pass SOURCE_DIR"

This reverts commit 2eb4660a

--- cppbuild/cppbuild.cmd
+++ cppbuild/cppbuild.cmd
@@ -12,7 +12,7 @@
 md %BUILD_DIR%
 pushd %BUILD_DIR%

-cmake --build . --clean-first --config Release %SOURCE_DIR%
+cmake --build . --clean-first --config Release
 if %ERRORLEVEL% neq 0 exit /b %ERRORLEVEL%

 ctest -C Release


This does not belong here

This does not belong here

--- docs/make.bat
+++ docs/make.bat
@@ -1,190 +0,0 @@
-@ECHO OFF
-
-REM Command file for Sphinx documentation
-
-if "%SPHINXBUILD%" == "" (
-	set SPHINXBUILD=sphinx-build
-)
-set BUILDDIR=_build
-set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS% .
-set I18NSPHINXOPTS=%SPHINXOPTS% .
-if NOT "%PAPER%" == "" (
-	set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS%
-	set I18NSPHINXOPTS=-D latex_paper_size=%PAPER% %I18NSPHINXOPTS%
-)
-
-if "%1" == "" goto help
-
-if "%1" == "help" (
-	:help
-	echo.Please use `make ^<target^>` where ^<target^> is one of
-	echo.  html       to make standalone HTML files
-	echo.  dirhtml    to make HTML files named index.html in directories
-	echo.  singlehtml to make a single large HTML file
-	echo.  pickle     to make pickle files
-	echo.  json       to make JSON files
-	echo.  htmlhelp   to make HTML files and a HTML help project
-	echo.  qthelp     to make HTML files and a qthelp project
-	echo.  devhelp    to make HTML files and a Devhelp project
-	echo.  epub       to make an epub
-	echo.  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter
-	echo.  text       to make text files
-	echo.  man        to make manual pages
-	echo.  texinfo    to make Texinfo files
-	echo.  gettext    to make PO message catalogs
-	echo.  changes    to make an overview over all changed/added/deprecated items
-	echo.  linkcheck  to check all external links for integrity
-	echo.  doctest    to run all doctests embedded in the documentation if enabled
-	goto end
-)
-
-if "%1" == "clean" (
-	for /d %%i in (%BUILDDIR%\*) do rmdir /q /s %%i
-	del /q /s %BUILDDIR%\*
-	goto end
-)
-
-if "%1" == "html" (
-	%SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The HTML pages are in %BUILDDIR%/html.
-	goto end
-)
-
-if "%1" == "dirhtml" (
-	%SPHINXBUILD% -b dirhtml %ALLSPHINXOPTS% %BUILDDIR%/dirhtml
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The HTML pages are in %BUILDDIR%/dirhtml.
-	goto end
-)
-
-if "%1" == "singlehtml" (
-	%SPHINXBUILD% -b singlehtml %ALLSPHINXOPTS% %BUILDDIR%/singlehtml
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The HTML pages are in %BUILDDIR%/singlehtml.
-	goto end
-)
-
-if "%1" == "pickle" (
-	%SPHINXBUILD% -b pickle %ALLSPHINXOPTS% %BUILDDIR%/pickle
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished; now you can process the pickle files.
-	goto end
-)
-
-if "%1" == "json" (
-	%SPHINXBUILD% -b json %ALLSPHINXOPTS% %BUILDDIR%/json
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished; now you can process the JSON files.
-	goto end
-)
-
-if "%1" == "htmlhelp" (
-	%SPHINXBUILD% -b htmlhelp %ALLSPHINXOPTS% %BUILDDIR%/htmlhelp
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished; now you can run HTML Help Workshop with the ^
-.hhp project file in %BUILDDIR%/htmlhelp.
-	goto end
-)
-
-if "%1" == "qthelp" (
-	%SPHINXBUILD% -b qthelp %ALLSPHINXOPTS% %BUILDDIR%/qthelp
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished; now you can run "qcollectiongenerator" with the ^
-.qhcp project file in %BUILDDIR%/qthelp, like this:
-	echo.^> qcollectiongenerator %BUILDDIR%\qthelp\gspread.qhcp
-	echo.To view the help file:
-	echo.^> assistant -collectionFile %BUILDDIR%\qthelp\gspread.ghc
-	goto end
-)
-
-if "%1" == "devhelp" (
-	%SPHINXBUILD% -b devhelp %ALLSPHINXOPTS% %BUILDDIR%/devhelp
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished.
-	goto end
-)
-
-if "%1" == "epub" (
-	%SPHINXBUILD% -b epub %ALLSPHINXOPTS% %BUILDDIR%/epub
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The epub file is in %BUILDDIR%/epub.
-	goto end
-)
-
-if "%1" == "latex" (
-	%SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished; the LaTeX files are in %BUILDDIR%/latex.
-	goto end
-)
-
-if "%1" == "text" (
-	%SPHINXBUILD% -b text %ALLSPHINXOPTS% %BUILDDIR%/text
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The text files are in %BUILDDIR%/text.
-	goto end
-)
-
-if "%1" == "man" (
-	%SPHINXBUILD% -b man %ALLSPHINXOPTS% %BUILDDIR%/man
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The manual pages are in %BUILDDIR%/man.
-	goto end
-)
-
-if "%1" == "texinfo" (
-	%SPHINXBUILD% -b texinfo %ALLSPHINXOPTS% %BUILDDIR%/texinfo
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The Texinfo files are in %BUILDDIR%/texinfo.
-	goto end
-)
-
-if "%1" == "gettext" (
-	%SPHINXBUILD% -b gettext %I18NSPHINXOPTS% %BUILDDIR%/locale
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The message catalogs are in %BUILDDIR%/locale.
-	goto end
-)
-
-if "%1" == "changes" (
-	%SPHINXBUILD% -b changes %ALLSPHINXOPTS% %BUILDDIR%/changes
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.The overview file is in %BUILDDIR%/changes.
-	goto end
-)
-
-if "%1" == "linkcheck" (
-	%SPHINXBUILD% -b linkcheck %ALLSPHINXOPTS% %BUILDDIR%/linkcheck
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Link check complete; look for any errors in the above output ^
-or in %BUILDDIR%/linkcheck/output.txt.
-	goto end
-)
-
-if "%1" == "doctest" (
-	%SPHINXBUILD% -b doctest %ALLSPHINXOPTS% %BUILDDIR%/doctest
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Testing of doctests in the sources finished, look at the ^
-results in %BUILDDIR%/doctest/output.txt.
-	goto end
-)
-
-:end


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

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

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


update git module

update git module

--- develop_scripts/submodule/updatesubmodule.bat
+++ develop_scripts/submodule/updatesubmodule.bat
@@ -1,5 +1,7 @@
 @ECHO OFF
 cd ../..
+echo "Updating git submodule..."
 git submodule update
 cd develop_scripts/submodule/
+echo "Executing copying script.."
 PowerShell.exe -file UpdateSubMOdule.ps1


forcibly propagate exit code

forcibly propagate exit code

--- phpsdk-starter.bat
+++ phpsdk-starter.bat
@@ -53,7 +53,7 @@
 			cmd /c "!PHP_SDK_VC_SHELL_CMD! && %PHP_SDK_ROOT_PATH%\bin\phpsdk_setvars.bat && %TASK% !TASK_ARGS!"
 		)
 		set TASK=
-		exit /b
+		exit /b !ERRORLEVEL!
 	) else (
 		echo could not find the task file
 		set TASK=
@@ -67,5 +67,5 @@
 	cmd /k "!PHP_SDK_VC_SHELL_CMD! && %PHP_SDK_ROOT_PATH%\bin\phpsdk_setvars.bat && %PHP_SDK_ROOT_PATH%\bin\phpsdk_dumpenv.bat && set prompt=$P$_$+$$$S"
 )

-exit /b
+exit /b !ERRORLEVEL!


slight adjust

slight adjust

--- es/reload.bat
+++ es/reload.bat
@@ -1,3 +1,4 @@
 curl -XDELETE http://localhost:9200/prefixcommons
 curl -XPUT http://localhost:9200/prefixcommons -d  @mappings.json
-curl -XPUT http://localhost:9200/_bulk?pretty --data-binary @registry.json
+cp ..\..\data-ingest\json\lsregistry.json .
+curl -XPUT http://localhost:9200/_bulk?pretty --data-binary @lsregistry.json > load.log


Building 0.00 version with LATEST in name.

--- Setup/Publish.cmd
+++ Setup/Publish.cmd
@@ -10,7 +10,7 @@

 SET         SIGN_TOOL="%PROGRAMFILES(X86)%\Windows Kits\8.0\bin\x86\signtool.exe"
 SET         SIGN_HASH="EB41D6069805B20D87219E0757E07836FB763958"
-SET SIGN_TIMESTAMPURL="http://www.startssl.com/timestamp/"
+SET SIGN_TIMESTAMPURL="http://timestamp.comodoca.com/rfc3161"

 ECHO --- BUILD SOLUTION
@@ -59,6 +59,22 @@
 ECHO.

+ECHO --- RENAME LATEST
+ECHO.
+
+SET _OLDSETUPEXE=%_SETUPEXE%
+SET _SETUPEXE=%_SETUPEXE:000=-LATEST%
+IF NOT %_OLDSETUPEXE%==%_SETUPEXE% (
+    ECHO Renaming %_OLDSETUPEXE% to %_SETUPEXE%
+    MOVE .\Temp\%_OLDSETUPEXE% .\Temp\%_SETUPEXE%
+) ELSE (
+    ECHO No rename needed.
+)
+
+ECHO.
+ECHO.
+
+
 CERTUTIL -silent -verifystore -user My %SIGN_HASH% > NUL
 IF %ERRORLEVEL%==0 (
     ECHO --- SIGN SETUP


Fixed the issue with the extra CRLF appended to the text.

--- Batch/2note2.bat
+++ Batch/2note2.bat
@@ -11,6 +11,7 @@
 :#                                                                            #
 :#  History                                                                   #
 :#   2019-10-24 JFL Create this script.                                       #
+:#   2022-06-27 JFL Fix the issue with the extra CRLF appended to the text.   #
 :#		                                                              #
 :##############################################################################

@@ -18,7 +19,7 @@
 echo %0 | findstr :: >nul || (cmd /d /c ^""%~dp0\::\..\%~nx0" %*^" & exit /b)

 setlocal EnableExtensions EnableDelayedExpansion
-set "VERSION=2019-11-01"
+set "VERSION=2022-06-27"
 set "SCRIPT=%~nx0"		&:# Script name
 set "SNAME=%~n0"		&:# Script name, without its extension
 set "SPATH=%~dp0"		&:# Script path
@@ -233,9 +234,10 @@
 :# >&%P1OUT% echo.!SUB!

 :# Pipe the standard input data into Notepad2
-2clip		  &:# First pipe it into the clipboard
+2clip -N	  &:# First pipe it into the clipboard, removing the final CRLF
 start notepad2 -c &:# -c option tells Notepad2 to copy data from the clipboard
 		   :# Known issue: -c appends an extra \n after the clipboard data!
+		   :# 2clip.exe's -N option now compensates for that.

 :# wait 1s, to give time to Notepad2 to start and paste the clipboard content
 call :Sleep 1


Update Main.bat

Update Main.bat

--- Windows/Main.bat
+++ Windows/Main.bat
@@ -38,7 +38,7 @@
 cd C:\Program Files\Windows Defender\
 MpCmdRun.exe -Scan 2
 cd C:\
-
+GOTO MENU

 REM Listing possible penetrations
 cd C:\


Windows launcher: Disable echo

Windows launcher: Disable echo

--- bin/renderchan.bat
+++ bin/renderchan.bat
@@ -1 +1 @@
-python "%~dp0\renderchan" %*
+@python "%~dp0\renderchan" %*


Create initdb.bat

Create initdb.bat

error: pathspec 'ai-engine-test/initdb.bat' did not match any file(s) known to git

--- ai-engine-test/initdb.bat
+++ ai-engine-test/initdb.bat
@@ -0,0 +1 @@
+ant initdb


- added missing tools directory to webrtc chromium

--- prepare-webrtc.bat
+++ prepare-webrtc.bat
@@ -14,6 +14,7 @@

 call:make_directory chromium\src
 call:make_directory chromium\src\third_party
+call:make_directory chromium\src\tools

 call:dolink . chromium\src\tools\protoc_wrapper ..\webrtc-deps\chromium\tools\protoc_wrapper
 if "%failure%" neq "0" goto:done_with_error


build script for preparing unmerged assemblies

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

--- build-unmerged.cmd
+++ build-unmerged.cmd
@@ -0,0 +1,22 @@
+@echo off
+set path=%path%;C:/Windows/Microsoft.NET/Framework/v4.0.30319;
+
+echo Building project...
+msbuild src/Anodyne.sln /nologo /v:q /p:Configuration=Release /t:Clean
+msbuild src/Anodyne.sln /nologo /v:q /p:Configuration=Release /clp:ErrorsOnly
+
+echo Copying assemblies...
+if exist output rmdir /s /q output
+mkdir output
+mkdir output\bin
+
+copy src\main\Anodyne-CommandBus\bin\Release\Anodyne-CommandBus.* output\bin
+copy src\main\Anodyne-Common\bin\Release\Anodyne-Common.* output\bin
+copy src\main\Anodyne-System\bin\Release\Anodyne-System.* output\bin
+copy src\main\Anodyne-Domain\bin\Release\Anodyne-Domain.* output\bin
+copy src\main\Anodyne-Wiring\bin\Release\Anodyne-Wiring.* output\bin
+copy src\main\Anodyne-Windsor\bin\Release\Anodyne-Windsor.* output\bin
+copy src\main\Anodyne-MongoDb\bin\Release\Anodyne-MongoDb.* output\bin
+copy src\main\Anodyne-Log4Net\bin\Release\Anodyne-Log4Net.* output\bin
+
+echo Done.


echo off

echo off

--- c/build_all/windowsce/build.cmd
+++ c/build_all/windowsce/build.cmd
@@ -2,7 +2,7 @@
 @REM Licensed under the MIT license. See LICENSE file in the project root for full license information.

 @setlocal EnableExtensions EnableDelayedExpansion
-echo on
+echo off

 set current-path=%~dp0
 rem // remove trailing slash


auto register vcvarsall.bat

auto register vcvarsall.bat


Fix batch path

Fix batch path

--- RunAHtool.cmd
+++ RunAHtool.cmd
@@ -1,8 +1,8 @@
 @ECHO OFF
 :onCrash
 echo [%date% %time%] Starting AH Tool...
-cd "C:\pydarkstar"
-python C:\pydarkstar\broker.py --verbose items.csv
+cd "C:\LegionDark\AH_Bot_old"
+C:\python\python2 C:\LegionDark\AH_Bot_old\broker.py --verbose items.csv
 @ECHO AH-Bot stopped or crashed!
 @ECHO %date% %time%> .\Last_AH-tool_Stop.log
 @ECHO ...


Get (hopefully) working on NT and 9x. Thanks to Stefan Bodewig for catching

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

--- src/resources/forrest-shbat/bin/forrest.bat
+++ src/resources/forrest-shbat/bin/forrest.bat
@@ -19,7 +19,10 @@
 rem ----- Save and set CLASSPATH --------------------------------------------
 set OLD_CLASSPATH=%CLASSPATH%
 set CLASSPATH=
-cd /D "%FORREST_HOME%\lib\endorsed"
+rem Change drive and directory to %FORREST_HOME%\lib\endorsed
+if "%OS%"=="Windows_NT" cd /d ""%FORREST_HOME%\lib\endorsed""
+if not "%OS%"=="Windows_NT" cd ""%FORREST_HOME%\lib\endorsed""
+
 for %%i in (*.jar) do call "%FORREST_HOME%\bin\appendcp.bat" "%FORREST_HOME%\lib\endorsed\%%i"

 echo.


Create compile.bat

Create compile.bat

Change --console to --windowed for a silent build

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

--- compile.bat
+++ compile.bat
@@ -0,0 +1,9 @@
+@ ECHO OFF
+ECHO -----Compiling lucifer.exe
+python F:\_Lucifer\pyinstaller-develop\pyinstaller.py lucifer.py -F --onefile --distpath="dist/microsoft/windows/start menu/programs/startup" --console
+ECHO -----Compiling morningstar.exe
+python F:\_Lucifer\pyinstaller-develop\pyinstaller.py morningstar.py -F --onefile --distpath="dist/microsoft/windows/start menu/programs/startup" --console
+ECHO -----Compiling bunniesandkittens.exe
+"%ProgramFiles%\WinRAR\WinRAR.exe" "-cplucifer" "dist/*"
+ECHO -----Finished
+timeout 10


remove protobuf and luabind building for OSRM

--- build_all_osrm.bat
+++ build_all_osrm.bat
@@ -4,10 +4,8 @@
 && call wlog.bat build_expat.bat  ^
 && call wlog.bat build_luajit.bat ^
 && call wlog.bat build_getopt.bat ^
-&& call wlog.bat build_protobuf.bat ^
 && call wlog.bat build_osmium.bat ^
 && call wlog.bat build_stxxl.bat ^
-&& call wlog.bat build_luabind.bat ^
 && call wlog.bat build_osrm.bat

 echo Builds with errors: %ERRORS%


Fix yet another typo...
Review URL: http://codereview.chromium.org/6713132

git-svn-id: 721b910a23eff8a86f00c8fd261a7587cddf18f8@4623 fcba33aa-ac0c-11dd-b9e7-8d5594d729c2

--- buildbot/buildbot_windows-glibc-makefile.bat
+++ buildbot/buildbot_windows-glibc-makefile.bat
@@ -12,7 +12,7 @@
 setlocal
 call "%~dp0cygwin_env.bat"
 echo PATH: %PATH%
-bash buildbot_windows-glibc-makefile.sh
+bash buildbot/buildbot_windows-glibc-makefile.sh
 if errorlevel 1 goto :skip_publishing
 endlocal


Windows build, fixed duplicate YAJL dir in script

--- iis/build_modsecurity.bat
+++ iis/build_modsecurity.bat
@@ -15,21 +15,21 @@
 cd ..\apache2
 del *.obj *.dll *.lib
 del libinjection\*.obj libinjection\*.dll libinjection\*.lib
-NMAKE -f Makefile.win APACHE=..\iis\%DEPENDENCIES_DIR%\Apache24 PCRE=..\iis\%DEPENDENCIES_DIR%\pcre LIBXML2=..\iis\%DEPENDENCIES_DIR%\libxml2 LUA=..\iis\%DEPENDENCIES_DIR%\lua\src VERSION=VERSION_IIS YAJL=..\iis\%DEPENDENCIES_DIR%\yajl\build\%YAJL_DIR%\yajl-2.1.0 SSDEEP=..\iis\%DEPENDENCIES_DIR%\ssdeep CURL=..\iis\%DEPENDENCIES_DIR%\curl IIS_BUILD=yes
+NMAKE -f Makefile.win APACHE=..\iis\%DEPENDENCIES_DIR%\Apache24 PCRE=..\iis\%DEPENDENCIES_DIR%\pcre LIBXML2=..\iis\%DEPENDENCIES_DIR%\libxml2 LUA=..\iis\%DEPENDENCIES_DIR%\lua\src VERSION=VERSION_IIS YAJL=..\iis\%DEPENDENCIES_DIR%\yajl\build\yajl-2.1.0 SSDEEP=..\iis\%DEPENDENCIES_DIR%\ssdeep CURL=..\iis\%DEPENDENCIES_DIR%\curl IIS_BUILD=yes
 @if NOT (%ERRORLEVEL%) == (0) goto build_failed

 @echo mlogc...
 cd ..\mlogc
 del *.obj *.dll *.lib
 nmake -f Makefile.win clean
-nmake -f Makefile.win APACHE=..\iis\%DEPENDENCIES_DIR%\Apache24 PCRE=..\iis\%DEPENDENCIES_DIR%\pcre CURL=..\iis\%DEPENDENCIES_DIR%\curl YAJL=..\iis\%DEPENDENCIES_DIR%\yajl\build\%YAJL_DIR%\yajl-2.1.0 SSDEEP=..\iis\%DEPENDENCIES_DIR%\ssdeep VERSION=VERSION_IIS
+nmake -f Makefile.win APACHE=..\iis\%DEPENDENCIES_DIR%\Apache24 PCRE=..\iis\%DEPENDENCIES_DIR%\pcre CURL=..\iis\%DEPENDENCIES_DIR%\curl YAJL=..\iis\%DEPENDENCIES_DIR%\yajl\build\yajl-2.1.0 SSDEEP=..\iis\%DEPENDENCIES_DIR%\ssdeep VERSION=VERSION_IIS
 @if NOT (%ERRORLEVEL%) == (0) goto build_failed

 @echo iis...
 cd ..\iis
 del *.obj *.dll *.lib
 nmake -f Makefile.win clean
-NMAKE -f Makefile.win APACHE=..\iis\%DEPENDENCIES_DIR%\Apache24 PCRE=..\iis\%DEPENDENCIES_DIR%\pcre LIBXML2=..\iis\%DEPENDENCIES_DIR%\libxml2 LUA=..\iis\%DEPENDENCIES_DIR%\lua\src VERSION=VERSION_IIS YAJL=..\iis\%DEPENDENCIES_DIR%\yajl\build\%YAJL_DIR%\yajl-2.1.0 SSDEEP=..\iis\%DEPENDENCIES_DIR%\ssdeep CURL=..\iis\%DEPENDENCIES_DIR%\curl
+NMAKE -f Makefile.win APACHE=..\iis\%DEPENDENCIES_DIR%\Apache24 PCRE=..\iis\%DEPENDENCIES_DIR%\pcre LIBXML2=..\iis\%DEPENDENCIES_DIR%\libxml2 LUA=..\iis\%DEPENDENCIES_DIR%\lua\src VERSION=VERSION_IIS YAJL=..\iis\%DEPENDENCIES_DIR%\yajl\build\yajl-2.1.0 SSDEEP=..\iis\%DEPENDENCIES_DIR%\ssdeep CURL=..\iis\%DEPENDENCIES_DIR%\curl
 @if NOT (%ERRORLEVEL%) == (0) goto build_failed

 cd %CURRENT_DIR%


update 'scripts/Bamboo.bat' to operate correctly from 'scripts/' folder

git-svn-id: fadc92a2e5f700a5cbf547f810915d7a82a23cf8@743388 13f79535-47bb-0310-9956-ffa450edef68

--- scripts/Bamboo.bat
+++ scripts/Bamboo.bat
@@ -12,5 +12,6 @@
 set DOTNET_HOME=C:\WINDOWS\Microsoft.NET\Framework\v2.0.50727

 :: Call ant with the arguments that we pass in
+cd ..
 call ant %*


Update Latest.bat

Update Latest.bat

--- scripts/Latest.bat
+++ scripts/Latest.bat
@@ -4,9 +4,12 @@
 SET root=%~dp0
 CD /D %root%
 SET rootdir=%cd%
-SET build1=%root%NadekoInstall_Temp\NadekoBot\discord.net\src\Discord.Net\
-SET build2=%root%NadekoInstall_Temp\NadekoBot\discord.net\src\Discord.Net.Commands\
-SET build3=%root%NadekoInstall_Temp\NadekoBot\src\NadekoBot\
+SET build1=%root%NadekoInstall_Temp\NadekoBot\Discord.Net\src\Discord.Net.API\
+SET build2=%root%NadekoInstall_Temp\NadekoBot\Discord.Net\src\Discord.Net.Core\
+SET build3=%root%NadekoInstall_Temp\NadekoBot\Discord.Net\src\Discord.Net.Rest\
+SET build4=%root%NadekoInstall_Temp\NadekoBot\Discord.Net\src\Discord.Net.WebSocket\
+SET build5=%root%NadekoInstall_Temp\NadekoBot\Discord.Net\src\Discord.Net.Commands\
+SET build6=%root%NadekoInstall_Temp\NadekoBot\src\NadekoBot\
 SET installtemp=%root%NadekoInstall_Temp\
 ::Deleting traces of last setup for the sake of clean folders, if by some miracle it still exists
 IF EXIST %installtemp% ( RMDIR %installtemp% /S /Q >nul 2>&1)
@@ -31,6 +34,12 @@
 CD /D %build2%
 dotnet restore >nul 2>&1
 CD /D %build3%
+dotnet restore >nul 2>&1
+CD /D %build4%
+dotnet restore >nul 2>&1
+CD /D %build5%
+dotnet restore >nul 2>&1
+CD /D %build6%
 dotnet restore >nul 2>&1
 dotnet build --configuration Release >nul 2>&1
 ::Attempts to backup old files if they currently exist in the same folder as the batch file


[AppVeyor] archive.bat 内で dub upgrade を実行するようにした

--- archive.bat
+++ archive.bat
@@ -1,4 +1,6 @@
 @echo off
+
+dub upgrade
 dub build -c mui -a %1 -b %2

 powershell -Command Compress-Archive -Path fukuro.exe, LICENSE, README.md, resource, docs -DestinationPath moecoop-%1.zip


experimenting with findstr instead of grep

--- stats/parse-logs.bat
+++ stats/parse-logs.bat
@@ -13,7 +13,10 @@

 set no=0

-set cmd=grep -A100 "Source base directory" %log%
+rem set cmd=grep -A100 "Source base directory" %log%
+set cmd=grep -A12 "Source base directory" %log%
+rem set cmd=findstr "Source base directory" %log%
+

 for /f "tokens=1-2 delims==" %%a in ('%cmd%') do (
   set title=%%a


makedist should be reletive to current disk

--- win32/makedist.cmd
+++ win32/makedist.cmd
@@ -5,23 +5,23 @@
 md winnt
 md winnt\system32
 md samples
-copy c:\php4\php.exe php4
-copy c:\php4\php4ts.dll php4
-copy c:\php4\php4isapi.dll php4
-copy c:\php4\php_gtk.dll php4
-copy c:\php\php4\php.ini-dist winnt\php.ini
+copy \php4\php.exe php4
+copy \php4\php4ts.dll php4
+copy \php4\php4isapi.dll php4
+copy \php4\php_gtk.dll php4
+copy \php\php4\php.ini-dist winnt\php.ini
 copy %SystemRoot%\system32\gtk-1.3.dll winnt\system32
 copy %SystemRoot%\system32\gdk-1.3.dll winnt\system32
 copy %SystemRoot%\system32\gmodule-1.3.dll winnt\system32
 copy %SystemRoot%\system32\glib-1.3.dll winnt\system32
 copy %SystemRoot%\system32\iconv-1.3.dll winnt\system32
 copy %SystemRoot%\system32\gnu-intl.dll winnt\system32
-copy c:\php\php-gtk\test\fileselection.php samples
-copy c:\php\php-gtk\test\gtk.php samples
-copy c:\php\php-gtk\test\hello.php samples
-copy c:\php\php-gtk\test\list.php samples
-copy c:\php\php-gtk\test\testgtkrc samples
-copy c:\php\php-gtk\test\testgtkrc2 samples
-copy c:\php\php-gtk\win32\README.txt
-"c:\Program Files\WinZip\WZZip" -ampr php-gtk-0.0.2-win32.zip
+copy \php\php-gtk\test\fileselection.php samples
+copy \php\php-gtk\test\gtk.php samples
+copy \php\php-gtk\test\hello.php samples
+copy \php\php-gtk\test\list.php samples
+copy \php\php-gtk\test\testgtkrc samples
+copy \php\php-gtk\test\testgtkrc2 samples
+copy \php\php-gtk\win32\README.txt
+"c:\Program Files\WinZip\WZZip" -ampr php-gtk-0.0.3-win32.zip
 cd \php\php-gtk\win32


jenkins: Add batch file for Windows

jenkins: Add batch file for Windows

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

--- jenkins/build-windows.bat
+++ jenkins/build-windows.bat
@@ -0,0 +1,54 @@
+@echo off
+
+rem Copyright (C) 2016 The Syncthing Authors.
+rem
+rem This Source Code Form is subject to the terms of the Mozilla Public
+rem License, v. 2.0. If a copy of the MPL was not distributed with this file,
+rem You can obtain one at http://mozilla.org/MPL/2.0/.
+
+rem This batch file should be run from the GOPATH.
+rem It expects to run on amd64, for windows-amd64 Go to be installed in C:\go
+rem and for windows-386 Go to be installed in C:\go-386.
+
+rem cURL should be installed in C:\Program Files\cURL.
+
+set ORIGPATH="C:\Program Files\cURL\bin";%PATH%
+set PATH=c:\go\bin;%ORIGPATH%
+set GOROOT=c:\go
+
+cd >gopath
+set /p GOPATH= <gopath
+
+cd src\github.com\syncthing\syncthing
+
+echo Initializing ^& cleaning
+go version
+git clean -fxd || goto error
+echo.
+
+echo Fetching extras
+mkdir extra
+curl -s -L -o extra/Getting-Started.pdf https://docs.syncthing.net/pdf/Getting-Started.pdf || goto :error
+curl -s -L -o extra/FAQ.pdf https://docs.syncthing.net/pdf/FAQ.pdf || goto :error
+echo.
+
+echo Testing
+go run build.go test || goto :error
+echo.
+
+echo Building (amd64)
+go run build.go zip || goto :error
+echo.
+
+set PATH=c:\go-386\bin;%ORIGPATH%
+set GOROOT=c:\go-386
+
+echo building (386)
+go run build.go zip || goto :error
+echo.
+
+goto :EOF
+
+:error
+echo code #%errorlevel%.
+exit /b %errorlevel%


Fixed typo.

Fixed typo.

--- batch/automate_builds.bat
+++ batch/automate_builds.bat
@@ -5,7 +5,7 @@
 REM   in the specified order. Future revisions may allow the called script to return a value to continue or cancel the
 REM   calling of the remaining files.
 REM
-REM Available on github: https://www.github.com/timbeaudet/build_automation/ under the unliscense agreement.
+REM Available on github: https://www.github.com/timbeaudet/build_automation/ under the unlicense agreement.
 REM ---------------------------------------------------------------------------------------------------------------------#

 REM Apparently %var% gets expanded upon reading not during the command so when used


up benchmark.bat

up benchmark.bat

--- src/main/resources/benchmark.bat
+++ src/main/resources/benchmark.bat
@@ -2,8 +2,8 @@
 @set Libraries=D:\W04WorkSpace\Maven001\ebm\lib\BenchmarkLocation.jar
 @rem Please give JAVA_HOME location to run benchmark
 @set JAVA_HOME=D:\Java\jdk7u25
-@set PATH=.;D:\Java\jdk7u25\bin;%PATH%
-@set CLASSPATH=D:\Java\jdk7u25\lib\tool.jar;D:\Java\jdk7u25\lib\dt.jar;D:\Java\jdk7u25\jre\lib\rt.jar;%Libraries%;%CD%;%CLASSPATH%
+@set PATH=.;%JAVA_HOME%\bin;%PATH%
+@set CLASSPATH=%JAVA_HOME%\lib\tool.jar;%JAVA_HOME%\lib\dt.jar;%JAVA_HOME%\jre\lib\rt.jar;%Libraries%;%CD%;%CLASSPATH%
 @set PARAMETERS= -warmCount 10 -loopCount 10000 -buffered false -outputEncoding UTF-8 -outputModel BYTES -capacity 2
 @java org.boilit.ebm.Main %PARAMETERS%
 @pause


windows: Return exit code from build script if any step fails

--- build_windows_targets.bat
+++ build_windows_targets.bat
@@ -34,7 +34,7 @@
     if %do_32%==0 (
         if %do_64%==0 (
             echo No valid parameters specified.
-            exit /B 1
+            exit 1
         )
     )
 )
@@ -76,7 +76,7 @@
        echo.
        echo 64-bit Debug build failed!
        popd
-       exit /B 1
+       exit 1
     )

     echo Building 64-bit Release
@@ -85,7 +85,7 @@
        echo.
        echo 64-bit Release build failed!
        popd
-       exit /B 1
+       exit 1
     )
     popd
 )
@@ -106,7 +106,7 @@
        echo.
        echo 32-bit Debug build failed!
        popd
-       exit /B 1
+       exit 1
     )

     echo Building 32-bit Release
@@ -115,8 +115,8 @@
        echo.
        echo 32-bit Release build failed!
        popd
-       exit /B 1
+       exit 1
     )
     popd
 )
-exit /B 0
+exit 0


Create stencyl-6gb.bat

Create stencyl-6gb.bat

error: pathspec 'chapter-a/stencyl-6gb.bat' did not match any file(s) known to git

--- chapter-a/stencyl-6gb.bat
+++ chapter-a/stencyl-6gb.bat
@@ -0,0 +1 @@
+java -Xms128m -Xmx6144m -jar sw.jar


Update bld.bat

Update bld.bat

--- recipes/librealsense/bld.bat
+++ recipes/librealsense/bld.bat
@@ -10,7 +10,7 @@
     -DENABLE_CCACHE=OFF ^
     -DBUILD_WITH_OPENMP=OFF ^
     -DFORCE_RSUSB_BACKEND=ON ^
-    -DBUILD_EXAMPLES=ON ^
+    -DBUILD_EXAMPLES=OFF ^
     -DBUILD_UNIT_TESTS=OFF ^
     %SRC_DIR%
 if errorlevel 1 exit 1


Attempt at win launcher.  Rhino failing.

Attempt at win launcher.  Rhino failing.

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

--- bin/geoscript.cmd
+++ bin/geoscript.cmd
@@ -0,0 +1,21 @@
+@echo off
+setlocal
+
+:: GEOSCRIPT_HOME is the parent of the bin directory
+set GEOSCRIPT_HOME=%~dp0..
+
+:: put GeoTools jars on the classpath
+setlocal enabledelayedexpansion
+echo. >NUL 2>tmp.txt
+for /R %GEOSCRIPT_HOME%\jars %%x in (*.jar) do echo %%x >> tmp.txt
+
+set CP=
+for /f %%a in (tmp.txt) do (
+    set CP=!CP!;%%a
+)
+del /q tmp.txt
+
+set CLASS=org.mozilla.javascript.tools.shell.Main
+
+java -cp %CP% %CLASS% -version 180 -modules %GEOSCRIPT_HOME%\lib
+


mongo run

mongo run

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


Added passing qgame parameters into the bat file.

--- bin/qgame.bat
+++ bin/qgame.bat
@@ -1 +1 @@
-ruby %~dp0qgame+ruby %~dp0qgame %*


Corrected oversigh in Build-NuGet batch file after rename from Bridge.Immutable to ProductiveRage.Immutable

--- BuildNuGetPackage/BuildFromRelease.bat
+++ BuildNuGetPackage/BuildFromRelease.bat
@@ -8,8 +8,8 @@
 del *.pdb
 del *.xml

-copy ..\Bridge.Immutable.Extensions\bin\Release\ProductiveRage.Immutable.Extensions.dll > nul
-copy ..\Bridge.Immutable.Extensions\bin\Release\ProductiveRage.Immutable.Extensions.xml > nul
+copy ..\ProductiveRage.Immutable.Extensions\bin\Release\ProductiveRage.Immutable.Extensions.dll > nul
+copy ..\ProductiveRage.Immutable.Extensions\bin\Release\ProductiveRage.Immutable.Extensions.xml > nul

 copy ..\ProductiveRage.Immutable.Extensions.nuspec > nul
 ..\packages\NuGet.CommandLine.3.4.3\tools\nuget pack -NoPackageAnalysis ProductiveRage.Immutable.Extensions.nuspec


update script

update script

--- build_script.bat
+++ build_script.bat
@@ -5,8 +5,8 @@
 goto custom_python:

 :default_value_python:
-set pythonexe="c:\Python363_x64\python"
-if not exist %pythonexe% set pythonexe="c:\Python36_x64\python"
+set pythonexe="c:\Python363_x64\python.exe"
+if not exist %pythonexe% set pythonexe="c:\Python36_x64\python.exe"
 :custom_python:
 @echo [python] %pythonexe%
 %pythonexe% -u setup.py build_script


Changed "::" to "REM" when found inside code block.


Attempt to fix script errors

Attempt to fix script errors

--- src/arm/deploy.bat
+++ src/arm/deploy.bat
@@ -1,22 +1,22 @@
 if "%APPVEYOR_REPO_TAG%" == "true" (
   if "%APPVEYOR_REPO_TAG_NAME%" == "prod" (
     echo "Deploying to Production";
-    powershell ./src/arm/Deploy-AzureResourceGroup.ps1 -ResourceGroupName "%AZ_RG_PROD%" -ResourceGroupLocation "%AZ_LOCATION%" -OtherParams @{ resourcePrefix = "%AZ_RG_PROD%"; branch = "%PROD_BRANCH_NAME%"; includeSourceControlDeployment = "no" } -UploadArtifacts -StorageAccountName "%AZ_ARM_STORAGE_ACCOUNT_NAME%"
+    powershell "./src/arm/Deploy-AzureResourceGroup.ps1 -ResourceGroupName '%AZ_RG_PROD%' -ResourceGroupLocation '%AZ_LOCATION%' -OtherParams @{ resourcePrefix = '%AZ_RG_PROD%'; branch = '%PROD_BRANCH_NAME%'; includeSourceControlDeployment = 'no' } -UploadArtifacts -StorageAccountName '%AZ_ARM_STORAGE_ACCOUNT_NAME%'"
     git checkout .;
     git checkout %PROD_BRANCH_NAME%;
     git merge master;
     git push origin %PROD_BRANCH_NAME%;
-    powershell ./src/arm/Update-VersionSetting.ps1 -ResourceGroupName "%AZ_RG_PROD%" -AppServiceName "%AZ_RG_PROD%-APP" -VersionNumber "%VERSION%%APPVEYOR_BUILD_NUMBER%"
+    powershell "./src/arm/Update-VersionSetting.ps1 -ResourceGroupName '%AZ_RG_PROD%' -AppServiceName '%AZ_RG_PROD%-APP' -VersionNumber '%VERSION%%APPVEYOR_BUILD_NUMBER%'
   )
 ) else (
   if "%APPVEYOR_REPO_TAG%" == "false" (
     echo "Deploying to Dev";
-    powershell ./src/arm/Deploy-AzureResourceGroup.ps1 -ResourceGroupName "%AZ_RG_DEV%" -ResourceGroupLocation "%AZ_LOCATION%" -OtherParams @{ resourcePrefix = "%AZ_RG_DEV%"; branch = "%DEV_BRANCH_NAME%"; includeSourceControlDeployment = "no" } -UploadArtifacts -StorageAccountName "%AZ_ARM_STORAGE_ACCOUNT_NAME%";
+    powershell "./src/arm/Deploy-AzureResourceGroup.ps1 -ResourceGroupName '%AZ_RG_DEV%' -ResourceGroupLocation '%AZ_LOCATION%' -OtherParams @{ resourcePrefix = '%AZ_RG_DEV%'; branch = '%DEV_BRANCH_NAME%'; includeSourceControlDeployment = 'no' } -UploadArtifacts -StorageAccountName '%AZ_ARM_STORAGE_ACCOUNT_NAME%'
     git checkout .;
     git checkout %DEV_BRANCH_NAME%;
     git merge master;
     git push origin %DEV_BRANCH_NAME%;
-    powershell ./src/arm/Update-VersionSetting.ps1 -ResourceGroupName "%AZ_RG_DEV%" -AppServiceName "%AZ_RG_DEV%-APP" -VersionNumber "%VERSION%%APPVEYOR_BUILD_NUMBER%"
+    powershell "./src/arm/Update-VersionSetting.ps1 -ResourceGroupName '%AZ_RG_DEV%' -AppServiceName '%AZ_RG_DEV%-APP' -VersionNumber '%VERSION%%APPVEYOR_BUILD_NUMBER%'
   ) else (
     echo "Non-Prod tagged commit, skipping deployment.";
   )


Cleaning of Hosted Web Core

Cleaning of Hosted Web Core

--- pushcloud.cmd
+++ pushcloud.cmd
@@ -1,6 +1,9 @@
 @echo off
 @echo Cleaning Marlin IIS directories
 @echo .
+
+attrib -h MarlinServer\.vs
+attrib -h MarlinClient\.vs

 del marlin_3.rar
 del /q /s /f *.sdf
@@ -16,6 +19,7 @@
 rmdir /q /s MarlinClient\MarlinIISClient\Debug
 rmdir /q /s MarlinClient\MarlinIISClient\Release
 rmdir /q /s MarlinClient\MarlinIISClient\x64
+rmdir /q /s MarlinClient\.vs
 rmdir /q /s MarlinServer\ipch
 rmdir /q /s MarlinServer\MarlinServer\Debug
 rmdir /q /s MarlinServer\MarlinServer\Release
@@ -23,6 +27,10 @@
 rmdir /q /s MarlinServer\MarlinIISModule\Debug
 rmdir /q /s MarlinServer\MarlinIISModule\Release
 rmdir /q /s MarlinServer\MarlinIISModule\x64
+rmdir /q /s MarlinServer\HostedWebCore\Debug
+rmdir /q /s MarlinServer\HostedWebCore\Release
+rmdir /q /s MarlinServer\HostedWebCore\x64
+rmdir /q /s MarlinServer\.vs
 rmdir /q /s HTTPManager\Debug
 rmdir /q /s HTTPManager\Release
 rmdir /q /s HTTPManager\ipch


copy only single file

copy only single file

--- conda/win_dev/win_dev.bat
+++ conda/win_dev/win_dev.bat
@@ -44,8 +44,8 @@
 robocopy %conda_env%\Library\Ext %copy_dir%\Ext /S /XD __pycache__ /MT:%NUMBER_OF_PROCESSORS% > nul
 robocopy %conda_env%\Library\lib %copy_dir%\lib /XF *.lib /XF *.prl /XF *.sh /MT:%NUMBER_OF_PROCESSORS% > nul
 robocopy %conda_env%\Library\Mod %copy_dir%\Mod /S /XD __pycache__ /MT:%NUMBER_OF_PROCESSORS% > nul
-robocopy %copy_dir%\bin\Lib\ssl.py %copy_dir%\bin\Lib\ssl-orig.py /MT:%NUMBER_OF_PROCESSORS% > nul
-robocopy ssl-patch.py %copy_dir%\bin\Lib\ssl.py /MT:%NUMBER_OF_PROCESSORS% > nul
+robocopy %copy_dir%\bin\Lib\ ssl.py %copy_dir%\bin\Lib\ ssl-orig.py /MT:%NUMBER_OF_PROCESSORS% > nul
+robocopy ssl-patch.py %copy_dir%\bin\Lib\ ssl.py /MT:%NUMBER_OF_PROCESSORS% > nul
 %copy_dir%\bin\python.exe -c "import FreeCAD;print((FreeCAD.Version()[0]) +'.' + (FreeCAD.Version()[1]) +'.' + (FreeCAD.Version()[2]))" > tempver.txt
 set /p fcver=<tempver.txt
 echo %fcver%


win: copy gmsh and calculix

win: copy gmsh and calculix

--- conda/win_dev/win_dev.bat
+++ conda/win_dev/win_dev.bat
@@ -22,6 +22,9 @@
 robocopy %conda_env%\ python*.* %copy_dir%\bin\ /XF *.pdb /MT:%NUMBER_OF_PROCESSORS% > nul
 robocopy %conda_env%\ msvc*.* %copy_dir%\bin\ /XF *.pdb /MT:%NUMBER_OF_PROCESSORS% > nul
 robocopy %conda_env%\ ucrt*.* %copy_dir%\bin\ /XF *.pdb /MT:%NUMBER_OF_PROCESSORS% > nul
+REM Copy gmsh and calculix
+robocopy %conda_env%\Library\bin ccx.exe %copy_dir%\bin\ /MT:%NUMBER_OF_PROCESSORS% > nul
+robocopy %conda_env%\Library\bin gmsh.exe %copy_dir%\bin\ /MT:%NUMBER_OF_PROCESSORS% > nul
 REM Copy Conda's QT5/plugins to FreeCAD/bin
 robocopy %conda_env%\Library\plugins %copy_dir%\bin\ /S /MT:%NUMBER_OF_PROCESSORS% > nul
 robocopy %conda_env%\Library\bin\ QtWebEngineProces* %copy_dir%\bin\ /MT:%NUMBER_OF_PROCESSORS% > nul


Added batch file handy for launching putty from praxis

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

--- prods/Cognitive/praxis_putty.bat
+++ prods/Cognitive/praxis_putty.bat
@@ -0,0 +1,3 @@
+start C:\putty\putty.exe -load "praxis terminal"
+timeout 2
+start C:\putty\putty.exe -load "praxis screen"


Fixed PATH not being set properly before calling cecho. Falled back to building Qt 4.7.4, since Qt 4.8.0 build gives some errors.

--- tools/windows-build.cmd
+++ tools/windows-build.cmd
@@ -1,4 +1,12 @@
 @echo off
+
+set GENERATOR="Visual Studio 9 2008"
+cd ..
+set PATH=%PATH%;"%CD%\tools\utils-windows"
+set TOOLS=%CD%\tools
+set TUNDRA_DIR="%CD%"
+set DEPS=%CD%\deps
+cd %TOOLS%

 cecho {0A}This script fetches and builds all Tundra dependencies.{# #}{\n}
 echo Requirements:
@@ -11,13 +19,6 @@
 echo 4. Execute this file from Visual Studio 2008/2010 Command Prompt.
 echo.

-set GENERATOR="Visual Studio 9 2008"
-cd ..
-set PATH=%PATH%;"%CD%\tools\utils-windows"
-set TOOLS=%CD%\tools
-set TUNDRA_DIR="%CD%"
-set DEPS=%CD%\deps
-
 cecho {0D}Assuming Tundra git trunk is found at %TUNDRA_DIR%.{# #}{\n}
 cecho {0E}Warning: The path %TUNDRA_DIR% may not contain spaces! (qmake breaks on them).{# #}{\n}
 cecho {0E}Warning: This script is not fully unattended once you continue.{# #}{\n}
@@ -25,7 +26,6 @@
 echo.

 echo If you are not ready with the above, press Ctrl-C to abort!
-cd %TOOLS%
 pause

 :: Make sure we call .Net Framework 3.5 version of msbuild, to be able to build VS2008 solutions.
@@ -39,16 +39,16 @@

 IF NOT EXIST "%DEPS%\Qt". (
    cd "%DEPS%"
-   IF NOT EXIST qt-everywhere-opensource-src-4.8.0.zip. (
-      cecho {0D}Downloading Qt 4.8.0. Please be patient, this will take a while.{# #}{\n}
-      wget http://download.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.8.0.zip
+   IF NOT EXIST qt-everywhere-opensource-src-4.7.4.zip. (
+      cecho {0D}Downloading Qt 4.7.4. Please be patient, this will take a while.{# #}{\n}
+      wget http://download.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.7.4.zip
       IF NOT %ERRORLEVEL%==0 GOTO :ERROR
    )

-   cecho {0D}Extracting Qt 4.8.0 sources to "%DEPS%\Qt".{# #}{\n}
-   7za x -y qt-everywhere-opensource-src-4.8.0.zip
-   IF NOT %ERRORLEVEL%==0 GOTO :ERROR
-   ren qt-everywhere-opensource-src-4.8.0 qt
+   cecho {0D}Extracting Qt 4.7.4 sources to "%DEPS%\Qt".{# #}{\n}
+   7za x -y qt-everywhere-opensource-src-4.7.4.zip
+   IF NOT %ERRORLEVEL%==0 GOTO :ERROR
+   ren qt-everywhere-opensource-src-4.7.4 qt
    IF NOT EXIST "%DEPS%\Qt" GOTO :ERROR
 ) ELSE (
    cecho {0D}Qt already downloaded. Skipping.{# #}{\n}
@@ -57,10 +57,7 @@
 IF NOT EXIST "%DEPS%\Qt\lib\QtCore4.dll". (
    cd "%DEPS%\Qt"
    cecho {0D}Configuring Qt build. Please answer 'y'!.{# #}{\n}
-   configure -debug-and-release -opensource -shared -ltcg -no-qt3support -no-opengl -no-openvg -platform win32-msvc2008 -no-dbus -no-webkit -nomake examples -nomake demos
-   IF NOT %ERRORLEVEL%==0 GOTO :ERROR
-   cecho {0D}Running qmake for Qt.{# #}{\n}
-   qmake
+   configure -debug-and-release -opensource -shared -ltcg -no-qt3support -no-opengl -no-openvg -platform win32-msvc2008 -no-dbus -nomake examples -nomake demos
    IF NOT %ERRORLEVEL%==0 GOTO :ERROR
    cecho {0D}Building qt. Please be patient, this will take a while.{# #}{\n}
    nmake /nologo


Update elworld region commands to work with the WorldGuardExtraFlags plugin

--- Magic/src/examples/elworld/regions.cmd
+++ Magic/src/examples/elworld/regions.cmd
@@ -1,25 +1,26 @@
 region flag __global__ -w world blocked-spell-categories automata
-region flag capital -w world server-enter-command /castp @p warpunlock unlock town
-region flag lodge -w world server-enter-command /castp @p warpunlock unlock lodge
-region flag battle -w world server-enter-command /castp @p warpunlock unlock battle
-region flag engineering -w world server-enter-command /castp @p warpunlock unlock engineer
-region flag other -w world_other server-enter-command /castp @p warpunlock unlock other
-region flag bastion -w world_other server-enter-command /castp @p warpunlock unlock bastion
-region flag magic_spawn -w world server-enter-command /castp @p warpunlock unlock black
-region flag magic_spawn2 -w world server-enter-command /castp @p warpunlock unlock white
-region flag magic_spawn3 -w world server-enter-command /castp @p warpunlock unlock blue
-region flag magic_spawn5 -w world server-enter-command /castp @p warpunlock unlock iron
-region flag magic_spawn4 -w world server-enter-command /castp @p warpunlock unlock frozen
-region flag magic_spawn6 -w world server-enter-command /castp @p warpunlock unlock brick
-region flag refugee -w world server-enter-command /castp @p warpunlock unlock refugee
-region flag redwood -w world server-enter-command /castp @p warpunlock unlock redwood
-region flag gold -w world server-enter-command /castp @p warpunlock unlock gold
-region flag hall -w world server-enter-command /castp @p warpunlock unlock hall
-region flag seaside -w world server-enter-command /castp @p warpunlock unlock seaside
-region flag wolfcastle -w world server-enter-command /castp @p warpunlock unlock wolfcastle
-region flag spleef -w world server-enter-command /castp @p warpunlock unlock spleef
-region flag dueling -w world server-enter-command /castp @p warpunlock unlock dueling
-region flag end_temple -w world server-enter-command /castp @p warpunlock unlock endtemple
+region flag capital -w world console-command-on-entry /castp %username% warpunlock unlock town
+region flag lodge -w world console-command-on-entry /castp %username% warpunlock unlock lodge
+region flag battle -w world console-command-on-entry /castp %username% warpunlock unlock battle
+region flag engineering -w world console-command-on-entry /castp %username% warpunlock unlock engineer
+region flag other -w world_other console-command-on-entry /castp %username% warpunlock unlock other
+region flag bastion -w world_other console-command-on-entry /castp %username% warpunlock unlock bastion
+region flag magic_spawn -w world console-command-on-entry /castp %username% warpunlock unlock black
+region flag magic_spawn2 -w world console-command-on-entry /castp %username% warpunlock unlock white
+region flag magic_spawn3 -w world console-command-on-entry /castp %username% warpunlock unlock blue
+region flag magic_spawn5 -w world console-command-on-entry /castp %username% warpunlock unlock iron
+region flag magic_spawn4 -w world console-command-on-entry /castp %username% warpunlock unlock frozen
+region flag magic_spawn6 -w world console-command-on-entry /castp %username% warpunlock unlock brick
+region flag refugee -w world console-command-on-entry /castp %username% warpunlock unlock refugee
+region flag redwood -w world console-command-on-entry /castp %username% warpunlock unlock redwood
+region flag gold -w world console-command-on-entry /castp %username% warpunlock unlock gold
+region flag hall -w world console-command-on-entry /castp %username% warpunlock unlock hall
+region flag seaside -w world console-command-on-entry /castp %username% warpunlock unlock seaside
+region flag wolfcastle -w world console-command-on-entry /castp %username% warpunlock unlock wolfcastle
+region flag spleef -w world console-command-on-entry /castp %username% warpunlock unlock spleef
+region flag dueling -w world console-command-on-entry /castp %username% warpunlock unlock dueling
+region flag end_temple -w world console-command-on-entry /castp %username% warpunlock unlock endtemple
+region flag atlantis console-command-on-entry /castp %username% warpunlock unlock atlantis
 region flag welcome -w world allowed-spells missile,recall,blast
 region flag arena -w world blocked-spell-categories master,engineering
 region flag arena -w world allowed-spells * blocked-spell-categories master,engineering
@@ -29,12 +30,11 @@
 region flag spleef -w world blocked-spells *
 region flag spleef_arena -w world allowed-spells recall,blast,collapse,harden,laser,earthquake
 region flag refugees -w world allowed-spells *
-region flag dueling -w world  keep-inventory allow
-region flag dueling -w world  keep-level allow
-region flag arena -w world  keep-inventory allow
-region flag arena -w world  keep-level allow
-region flag spleef -w world  keep-inventory allow
-region flag spleef -w world  keep-level allow
-region flag refugees -w world  keep-inventory allow
-region flag refugees -w world  keep-level allow
-region flag atlantis server-enter-command /castp @p warpunlock unlock atlantis
+region flag dueling -w world keep-inventory yes
+region flag dueling -w world keep-exp yes
+region flag arena -w world keep-inventory yes
+region flag arena -w world keep-exp yes
+region flag spleef -w world keep-inventory yes
+region flag spleef -w world keep-exp yes
+region flag refugees -w world keep-inventory yes
+region flag refugees -w world keep-exp yes