fixed tag description

fixed tag description

--- push-release.bat
+++ push-release.bat
@@ -14,14 +14,14 @@
                          --repo full-build ^
 						 --tag %APPVEYOR_BUILD_VERSION% ^
 						 --name "full-build %APPVEYOR_BUILD_VERSION%" ^
-                         --description "%APPVEYOR_PROJECT_NAME% %CONFIGURATION%^|%PLATFORM% %APPVEYOR_BUILD_VERSION% %APPVEYOR_REPO_COMMIT%" ^
+                         --description "%APPVEYOR_PROJECT_NAME% %CONFIGURATION%|%PLATFORM% %APPVEYOR_BUILD_VERSION% %APPVEYOR_REPO_COMMIT%" ^
                          --pre-release || goto :ko

 %HERE%tools/github-release.exe upload ^
                      --user pchalamet ^
 					 --repo full-build ^
                      --tag %APPVEYOR_BUILD_VERSION% ^
-                     --name "%APPVEYOR_PROJECT_NAME%-net45-%PLATFORM%.zip" ^
+                     --name "%APPVEYOR_PROJECT_NAME%-net45-anycpu.zip" ^
                      --file %HERE%%CONFIGURATION%.zip || goto :ko

 :ok


FIXED: скрипт запуска автотестов пропускал ошибки (#152)

--- autotests/compatibility/run.bat
+++ autotests/compatibility/run.bat
@@ -218,6 +218,12 @@
   for %%c in (%REFAL_COMPILERS%) do (
     echo *** Perform SYNTAX ERROR test %~1 for compiler %%c...
     call :COMPILE.%%c "%~1"
+    echo errorlevel %ERRORLEVEL%
+    if errorlevel 2 (
+      echo COMPILER %%c FAILED ON SYNTAX ERROR TEST %~1
+      endlocal
+      exit /b 1
+    )
     if not errorlevel 1 (
       echo COMPILATION FOR COMPILER %%c SUCCESSED, SYNTAX ERRORS IS NOT FOUND
       endlocal
@@ -240,7 +246,7 @@
     --prefix=_test_prefix external 2>__error.txt
   if errorlevel 100 (
     echo COMPILER FAILS ON %SRC%, SEE __error.txt
-    exit /b 1
+    exit /b 3
   )
   if not exist %TARGET% (
     endlocal
@@ -256,7 +262,8 @@
 :COMPILE.srefc_classic
 setlocal
   set COMMON_SRFLAGS=%COMMON_SRFLAGS% --classic
-  call :COMPILE_SREFC_COMMON "%~1" || exit /b 1
+  call :COMPILE_SREFC_COMMON "%~1"
+  exit /b %ERRORLEVEL%
 endlocal
 goto :EOF

@@ -308,7 +315,8 @@
 :COMPILE.srefc_lambda
 setlocal
   set COMMON_SRFLAGS=%COMMON_SRFLAGS% --extended
-  call :COMPILE_SREFC_COMMON "%~1" || exit /b 1
+  call :COMPILE_SREFC_COMMON "%~1"
+  exit /b %ERRORLEVEL%
 endlocal
 goto :EOF


Update RingLibUV - extensions/ringlibuv/buildvc.bat

--- extensions/ringlibuv/buildvc.bat
+++ extensions/ringlibuv/buildvc.bat
@@ -1,5 +1,5 @@
 cls
 call ../../src/locatevc.bat
-cl /c /DEBUG ring_libuv.c -I"..\..\libdepwin\libuv\include" -I"..\..\include"
-link /DEBUG ring_libuv.obj  ..\..\lib\ring.lib ..\..\libdepwin\libuv\libuv.lib /DLL /OUT:..\..\bin\ring_uv.dll /SUBSYSTEM:WINDOWS,"5.01" /NODEFAULTLIB:msvcrt.lib
+cl /c /DEBUG ring_libuv.c -I"..\..\extensions\libdepwin\libuv\include" -I"..\..\include"
+link /DEBUG ring_libuv.obj  ..\..\lib\ring.lib ..\..\extensions\libdepwin\libuv\libuv.lib /DLL /OUT:..\..\bin\ring_uv.dll /SUBSYSTEM:WINDOWS,"5.01" /NODEFAULTLIB:msvcrt.lib
 del ring_libuv.obj


curl tmpfile name end with isbn, a help for debugging.

--- ebook/rename.bat
+++ ebook/rename.bat
@@ -8,8 +8,8 @@
 :amazonIsdn
 @echo input ISDN is %~1
 @set isdn=%~1
+@curl -s -L http://www.amazon.com/dp/%isdn% 1>tmpFile%isdn%
 @curl -s -L http://www.amazon.com/dp/%isdn% 1>tmpFile
-
 @rem do check first

 @findstr /R "btAsinTitle" tmpFile > tempfindoutput


fix the script generating the setup

fix the script generating the setup

--- build_setup_help_on_windows.bat
+++ build_setup_help_on_windows.bat
@@ -19,7 +19,7 @@
 %pythonexe% clean_pyd.py
 %pythonexe% setup.py build bdist_wininst --plat-name=win-amd64

-set pythonexe="c:\Python34\pythonw"
+set pythonexe="c:\Python34\python"
 %pythonexe% clean_pyd.py
 %pythonexe% setup.py sdist --formats=gztar,zip --verbose
 %pythonexe% setup.py bdist_wininst


r8833/sofa-dev : FIX: batch script to make visual studio solution and subprojects target the x64 compiler.

--- x64convert.bat
+++ x64convert.bat
@@ -1,19 +1,17 @@
-@echo off
+@echo on
 REM change taget platform from Win32 to x64 in Sofa.sln and related vcproj files.
-sed
-if errorlevel 0 goto main
-@echo on
-echo "sed is required to run that script"
-echo "http://gnuwin32.sourceforge.net/packages/sed.htm"
-goto end
-
+REM sed
+REM if errorlevel 0 goto main
+REM @echo on
+REM echo "sed is required to run that script"
+REM echo "http://gnuwin32.sourceforge.net/packages/sed.htm"
+REM goto end
+goto main
 :main
 @echo off
 set BASEDIR=%CD%
 set SOFASLN=%BASEDIR%\Sofa.sln
-call :findandreplaceSLN
-for /F "tokens=3 delims==," %%X in (%SOFASLN%)  do set FILE=%%X& call :findandreplaceVCPROJ
-goto end
+goto findandreplaceSLN

 :findandreplaceSLN
 @echo %SOFASLN%
@@ -21,13 +19,20 @@
 Copy /y %SOFASLN% %TMPSLN%
 sed  -e 's/Win32/x64/g' <%TMPSLN%>%SOFASLN%
 del %TMPSLN%
+goto findandreplaceVCPROJ

 :findandreplaceVCPROJ
+for /F "skip=1 tokens=3 delims==, eol=#" %%X in (%SOFASLN%)  do set FILE=%%X& call :replaceVCPROJ
+goto end
+
+:replaceVCPROJ
 @echo %FILE%
-set TMP=%FILE%.tmp
+set TMP=%FILE%.tmp
 Copy /y %FILE% %TMP%
 sed  -e 's/Name="Win32"/Name="x64"/g' -e 's/"Debug|Win32"/"Debug|x64"/g' -e 's/"Release|Win32"/"Release|x64"/g' <%TMP%>%FILE%
-del %TMP%
+del %TMP%
+

 :end
 cd %CD%
+


Prerobeny skript na testovanie javascriptu pre windows.
Review URL: http://codereview.appspot.com/3870043

git-svn-id: f2ba8acc5dc9bb42227aca43511cf4cc35f8886d@642 e29e1642-1b52-11df-8da0-9131547f57cf

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

--- scripts/run_jstests.bat
+++ scripts/run_jstests.bat
@@ -0,0 +1,10 @@
+@echo off
+REM See http://code.google.com/p/js-test-driver/ on how to write tests
+setlocal
+
+set SCRIPT_PATH=%~dp0
+set TEST_PATH=%SCRIPT_PATH%..\tests
+set JSDRIVER_BIN=%SCRIPT_PATH%..\third_party\jstestdriver\JsTestDriver-1.2.2.jar
+
+cd %TEST_PATH%
+java -jar %JSDRIVER_BIN% --verbose --tests all


Removing no longer needed file.

Removing no longer needed file.

--- run_with_env.cmd
+++ run_with_env.cmd
@@ -1,51 +0,0 @@
-:: To build extensions for 64 bit Python 3, we need to configure environment
-:: variables to use the MSVC 2010 C++ compilers from GRMSDKX_EN_DVD.iso of:
-:: MS Windows SDK for Windows 7 and .NET Framework 4 (SDK v7.1)
-::
-:: To build extensions for 64 bit Python 2, we need to configure environment
-:: variables to use the MSVC 2008 C++ compilers from GRMSDKX_EN_DVD.iso of:
-:: MS Windows SDK for Windows 7 and .NET Framework 3.5 (SDK v7.0)
-::
-:: 32 bit builds do not require specific environment configurations.
-::
-:: Note: this script needs to be run with the /E:ON and /V:ON flags for the
-:: cmd interpreter, at least for (SDK v7.0)
-::
-:: More details at:
-:: https://github.com/cython/cython/wiki/64BitCythonExtensionsOnWindows
-:: https://stackoverflow.com/a/13751649
-::
-:: Author: Olivier Grisel
-:: License: CC0 1.0 Universal: https://creativecommons.org/publicdomain/zero/1.0/
-@ECHO OFF
-
-SET COMMAND_TO_RUN=%*
-SET WIN_SDK_ROOT=C:\Program Files\Microsoft SDKs\Windows
-
-SET MAJOR_PYTHON_VERSION="%PYTHON_VERSION:~0,1%"
-IF %MAJOR_PYTHON_VERSION% == "2" (
-    SET WINDOWS_SDK_VERSION="v7.0"
-) ELSE IF %MAJOR_PYTHON_VERSION% == "3" (
-    SET WINDOWS_SDK_VERSION="v7.1"
-) ELSE (
-    ECHO Unsupported Python version: "%MAJOR_PYTHON_VERSION%"
-    EXIT 1
-)
-
-IF "%PYTHON_ARCH%"=="64" (
-    ECHO Configuring Windows SDK %WINDOWS_SDK_VERSION% for Python %MAJOR_PYTHON_VERSION% on a 64 bit architecture
-    SET DISTUTILS_USE_SDK=1
-    SET MSSdk=1
-    "%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Setup\WindowsSdkVer.exe" -q -version:%WINDOWS_SDK_VERSION%
-    "%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Bin\SetEnv.cmd" /x64 /release
-    ECHO Executing: %COMMAND_TO_RUN%
-    call %COMMAND_TO_RUN% || EXIT 1
-) ELSE (
-    ECHO Configuring Windows SDK %WINDOWS_SDK_VERSION% for Python %MAJOR_PYTHON_VERSION% on a 32 bit architecture
-    SET DISTUTILS_USE_SDK=1
-    SET MSSdk=1
-    "%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Setup\WindowsSdkVer.exe" -q -version:%WINDOWS_SDK_VERSION%
-    "%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Bin\SetEnv.cmd" /x86 /release
-    ECHO Executing: %COMMAND_TO_RUN%
-    call %COMMAND_TO_RUN% || EXIT 1
-)


use -d output_buffer=0 to workarround the PHP flush() problem

--- scripts/pear.bat
+++ scripts/pear.bat
@@ -1,22 +1,22 @@
 @ECHO OFF

 REM ----------------------------------------------------------------------
-REM PHP version 4.0
+REM PHP version 4.0
 REM ----------------------------------------------------------------------
-REM Copyright (c) 1997-2002 The PHP Group
+REM Copyright (c) 1997-2002 The PHP Group
 REM ----------------------------------------------------------------------
-REM  This source file is subject to version 2.02 of the PHP license,
-REM  that is bundled with this package in the file LICENSE, and is
-REM  available at through the world-wide-web at
-REM  http://www.php.net/license/2_02.txt.
-REM  If you did not receive a copy of the PHP license and are unable to
-REM  obtain it through the world-wide-web, please send a note to
-REM  license@php.net so we can mail you a copy immediately.
+REM  This source file is subject to version 2.02 of the PHP license,
+REM  that is bundled with this package in the file LICENSE, and is
+REM  available at through the world-wide-web at
+REM  http://www.php.net/license/2_02.txt.
+REM  If you did not receive a copy of the PHP license and are unable to
+REM  obtain it through the world-wide-web, please send a note to
+REM  license@php.net so we can mail you a copy immediately.
 REM ----------------------------------------------------------------------
-REM  Authors:     Alexander Merz (alexmerz@php.net)
+REM  Authors:     Alexander Merz (alexmerz@php.net)
 REM ----------------------------------------------------------------------
 REM
-REM  $Id: pear.bat,v 1.8 2002/06/12 16:31:53 cox Exp $
+REM  $Id: pear.bat,v 1.9 2002/07/26 10:48:20 cox Exp $

 REM change this lines to match the paths of your system
 REM -------------------
@@ -24,5 +24,5 @@
 set PHP_BIN=c:\php\php.exe
 set PEAR_PATH=c:\php\pear

-%PHP_BIN% -C -d include_path=%PEAR_PATH% -f %PEAR_PATH%\scripts\pear.in -- %1 %2 %3 %4 %5 %6 %7 %8 %9
+%PHP_BIN% -C -d output_buffer=0 -d include_path=%PEAR_PATH% -f %PEAR_PATH%\scripts\pear.in -- %1 %2 %3 %4 %5 %6 %7 %8 %9
 @ECHO ON


* Changing to DOS line breaks.

* Changing to DOS line breaks.

git-svn-id: 4b064e69dc630d28214c1e1442d27300cccf8e9a@121232 c90b9560-bf6c-de11-be94-00142212c4b1

--- scripts/pear.bat
+++ scripts/pear.bat
@@ -1,29 +1,29 @@
-@ECHO OFF
-
-REM ----------------------------------------------------------------------
-REM PHP version 4.0
-REM ----------------------------------------------------------------------
-REM Copyright (c) 1997-2002 The PHP Group
-REM ----------------------------------------------------------------------
-REM  This source file is subject to version 2.02 of the PHP license,
-REM  that is bundled with this package in the file LICENSE, and is
-REM  available at through the world-wide-web at
-REM  http://www.php.net/license/2_02.txt.
-REM  If you did not receive a copy of the PHP license and are unable to
-REM  obtain it through the world-wide-web, please send a note to
-REM  license@php.net so we can mail you a copy immediately.
-REM ----------------------------------------------------------------------
-REM  Authors:     Alexander Merz (alexmerz@php.net)
-REM ----------------------------------------------------------------------
-REM
-REM  $Id: pear.bat,v 1.11 2002/12/13 02:10:23 ssb Exp $
-
-REM change this lines to match the paths of your system
-REM -------------------
-
-set PHP_BIN=@php_bin@
-set BIN_DIR=@bin_dir@
-set PEAR_PATH=@include_path@
-
-%PHP_BIN% -C -d output_buffering=1 -d include_path=%PEAR_PATH% -f %BIN_DIR%\pear -- %1 %2 %3 %4 %5 %6 %7 %8 %9
-@ECHO ON
+@ECHO OFF
+
+REM ----------------------------------------------------------------------
+REM PHP version 4.0
+REM ----------------------------------------------------------------------
+REM Copyright (c) 1997-2002 The PHP Group
+REM ----------------------------------------------------------------------
+REM  This source file is subject to version 2.02 of the PHP license,
+REM  that is bundled with this package in the file LICENSE, and is
+REM  available at through the world-wide-web at
+REM  http://www.php.net/license/2_02.txt.
+REM  If you did not receive a copy of the PHP license and are unable to
+REM  obtain it through the world-wide-web, please send a note to
+REM  license@php.net so we can mail you a copy immediately.
+REM ----------------------------------------------------------------------
+REM  Authors:     Alexander Merz (alexmerz@php.net)
+REM ----------------------------------------------------------------------
+REM
+REM  $Id: pear.bat,v 1.12 2003/01/03 00:17:41 phanto Exp $
+
+REM change this lines to match the paths of your system
+REM -------------------
+
+set PHP_BIN=@php_bin@
+set BIN_DIR=@bin_dir@
+set PEAR_PATH=@include_path@
+
+%PHP_BIN% -C -d output_buffering=1 -d include_path=%PEAR_PATH% -f %BIN_DIR%\pear -- %1 %2 %3 %4 %5 %6 %7 %8 %9
+@ECHO ON


fixing typo

fixing typo

--- scripts/pear.bat
+++ scripts/pear.bat
@@ -16,7 +16,7 @@
 REM  Authors:     Alexander Merz (alexmerz@php.net)
 REM ----------------------------------------------------------------------
 REM
-REM  $Id: pear.bat,v 1.10 2002/07/26 11:58:10 cox Exp $
+REM  $Id: pear.bat,v 1.11 2002/12/13 02:10:23 ssb Exp $

 REM change this lines to match the paths of your system
 REM -------------------
@@ -25,5 +25,5 @@
 set BIN_DIR=@bin_dir@
 set PEAR_PATH=@include_path@

-%PHP_BIN% -C -d output_buffer=1 -d include_path=%PEAR_PATH% -f %BIN_DIR%\pear -- %1 %2 %3 %4 %5 %6 %7 %8 %9
+%PHP_BIN% -C -d output_buffering=1 -d include_path=%PEAR_PATH% -f %BIN_DIR%\pear -- %1 %2 %3 %4 %5 %6 %7 %8 %9
 @ECHO ON


Fix typo for temporary directory

Fix typo for temporary directory

--- gear360video.cmd
+++ gear360video.cmd
@@ -22,8 +22,8 @@
 # Clean-up function
 clean_up() {
     echo "Removing temporary directories..."
-    if [ -d "$FRAMESTMPDIR" ]; then
-        rm -rf "$FRAMESTMPDIR"
+    if [ -d "$FRAMESTEMPDIR" ]; then
+        rm -rf "$FRAMESTEMPDIR"
     fi
     if [ -d "$OUTTEMPDIR" ]; then
         rm -rf "$OUTTEMPDIR"


Update mc.bat to once again load the high contrast GUI by default.

--- mc.bat
+++ mc.bat
@@ -10,7 +10,7 @@
 for %%x in (python.exe) do (
 	if not [%%~$PATH:x]==[] (
 		echo "Running mapper with Python."
-		python.exe -B start.py --format raw
+		python.exe -B start.py --interface hc --format raw
 		goto :finished
 	)
 )


fix name problem on mingw

fix name problem on mingw

--- java/oracle/jdk1.8.0_102/src/start_package_test.cmd
+++ java/oracle/jdk1.8.0_102/src/start_package_test.cmd
@@ -59,7 +59,7 @@

 java -Djava.library.path=%LIBDIR% %PKG%.ATRSHMLOGTestPreallocCount

-java -Djava.library.path=%LIBDIR% %PKG%.ATRSHMLOGTestGetTime
+java -Djava.library.path=%LIBDIR% %PKG%.ATRSHMLOGTestGetInitTime

 java -Djava.library.path=%LIBDIR% %PKG%.ATRSHMLOGTestGetRealtime


Added a batch file that sets the INCLUDE and LIB directories so the project can be used more easily.

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

--- set_env_vars.bat
+++ set_env_vars.bat
@@ -0,0 +1,43 @@
+@echo off
+
+REM Batch file for setting environmental variables INCLUDE and LIB
+REM by tcpie, november 2013
+
+echo Batch script to set INCLUDE and LIB environmental variables for usage of this project.
+echo.
+echo Note that this batch file does not check the variables to see if they are already correct. Thus running this script multiple times may bloat your environmental variables!
+
+set /P continue=Do you wish to continue? (y/n): %=%
+
+IF NOT %continue%==y goto :end
+
+:include_label
+IF NOT DEFINED INCLUDE goto :set_new_include
+IF %INCLUDE% == "" goto :set_new_include
+goto :set_old_include
+
+:set_new_include
+	set temp1=%~dp0
+	setx INCLUDE %temp1%
+goto :lib_label
+
+:set_old_include
+	set temp1=%INCLUDE%;%~dp0
+	setx INCLUDE %temp1%
+
+:lib_label
+IF NOT DEFINED LIB goto :set_new_lib
+IF %LIB% == "" goto :set_new_lib
+goto :set_old_lib
+
+:set_new_lib
+	set temp1=%~dp0Release\
+	setx LIB %temp1%
+	goto :end
+
+:set_old_lib
+	set temp1=%LIB%;%~dp0Release\
+	setx LIB %temp1%
+
+:end
+echo Done. Exiting...


Add windows version of 'jrun' script.

Add windows version of 'jrun' script.


fix fftw error on win64

fix fftw error on win64

--- recipes/shtns/bld.bat
+++ recipes/shtns/bld.bat
@@ -7,7 +7,9 @@
 ) else (
 set GCC_ARCH=i686-w64-mingw32
 )
-bash -lc "ln -s ${LOCALAPPDATA}/Temp /tmp"
-bash -lc "cd src; ./configure --disable-openmp --enable-python --build=$GCC_ARCH --host=$GCC_ARCH --target=$GCC_ARCH"
+bash -lc "mkdir -p /tmp; ln -s ${LOCALAPPDATA}/Temp /tmp"
+bash -lc "echo $CYGWIN_PREFIX"
+bash -lc "export LDFLAGS=-L`cygpath -u $LIBRARY_LIB`; echo $LDFLAGS; ls -l `cygpath -u $LIBRARY_LIB`"
+bash -lc "cd src; export LDFLAGS=-L`cygpath -u $LIBRARY_LIB`; export PYTHON=`which python`; ./configure --disable-openmp --enable-python --build=$GCC_ARCH --host=$GCC_ARCH --target=$GCC_ARCH --prefix=$CYGWIN_PREFIX CFLAGS=$EXTRA_FLAGS"
 bash -lc "cd src; make"
-bash -lc "cd src; make install"
+bash -lc "cd src; make install"


Add batch file for Windows

Add batch file for Windows

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

--- ead2html.bat
+++ ead2html.bat
@@ -0,0 +1,2 @@
+echo off
+bundle exec ruby ead2html.rb -i %1 -o %2


Do not echo in apm.cmd

Do not echo in apm.cmd

--- bin/apm.cmd
+++ bin/apm.cmd
@@ -1,3 +1,4 @@
+@echo off
 set maybe_node_gyp_path=%~dp0\..\node_modules\.bin\node-gyp
 if exist %maybe_node_gyp_path% (
   set npm_config_node_gyp=%maybe_node_gyp_path%


Windows NT script for converting XML documenting files to HTML.

git-svn-id: 4c7b768bc2e2a56aa1c56b1b5a9454ba68342430@244 ac9c905b-388a-4ddf-9b6a-4063a022bc57

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

--- xml/html.cmd
+++ xml/html.cmd
@@ -0,0 +1,59 @@
+@ECHO off
+
+SET JAVA_HOME=c:\jdk1.3
+
+SET XT_PATH=c:\xt
+SET SAX_PATH=c:\xt
+SET XP_PATH=c:\xt
+
+SET XSLT="lgthtml.xsl"
+
+IF !%1==! SET TITLE="Entity documentation index"
+IF NOT !%1==! SET TITLE = %1%
+
+ECHO %1%
+ECHO %TITLE%
+
+ECHO This script converts all .xml files in the current directory to .html
+ECHO files applying the XSLT transformation defined in the $XSLT file
+ECHO using the James Clark XT XSLT Java processor
+ECHO.
+ECHO An index.html file, containing links to all .html documenting files,
+ECHO is automatically generated. This file uses the script optional parameter
+ECHO value as the title of the index.html file.
+ECHO.
+ECHO converting XML files to HTML...
+
+FOR %%f IN (*.xml) IF EXIST %%~nf.html DEL %%~nf.html
+
+FOR %%f IN (*.xml) DO %JAVA_HOME%\bin\java -cp "%XT_PATH%\xt.jar;%SAX_PATH%\sax.jar;%XP_PATH%\xp.jar" -Dcom.jclark.xsl.sax.parser=com.jclark.xml.sax.CommentDriver com.jclark.xsl.sax.Driver %%f %XSLT% %%~nf.html
+
+ECHO conversion done
+ECHO.
+ECHO generating index file...
+
+IF EXIST index.html DEL index.html
+
+ECHO ^<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"^> >> index.html
+ECHO ^<html^> >> index.html
+ECHO ^<head^> >> index.html
+ECHO ^<title^>%TITLE%^</title^> >> index.html
+ECHO ^<link rel="stylesheet" href="logtalk.css" type="text/css"^> >> index.html
+ECHO ^</head^> >> index.html
+ECHO ^<body^> >> index.html
+ECHO ^<h1^>%TITLE%^</h1^> >> index.html
+ECHO ^<ul^> >> index.html
+
+FOR %%f IN (*.xml) DO ECHO ^<li^>^<a href=^"%%~nf.html^"^>%%~nf^</a^>^</li^> >> index.html
+
+ECHO ^</ul^> >> index.html
+
+SET DATETIME=
+
+ECHO ^<p^>Generated on %DATETIME%^</p^> >> index.html
+ECHO ^</body^> >> index.html
+ECHO ^</html^> >> index.html
+
+ECHO index file generated
+
+@ECHO on


Don't attempt to start server twice.

Don't attempt to start server twice.

--- sql/NT/MSQLserver.bat
+++ sql/NT/MSQLserver.bat
@@ -11,7 +11,7 @@
 rem start the real server

 if exist "%MONETDB%\M5server.bat" goto m5server
-"%MONETDB%\Mserver.bat" --dbinit="module(sql_server); sql_server_start();" %*
+"%MONETDB%\Mserver.bat" --dbinit="module(sql_server);" %*

 :m5server
 "%MONETDB%\M5server.bat" --dbinit="include sql;" %*


Encoding pp file in ASCII instead of UCS-2

--- pack.cmd
+++ pack.cmd
@@ -1,6 +1,6 @@
 @echo off
 pushd "%~dp0"
-PowerShell -C "(type StackTraceParser.cs) -replace 'namespace\s+[a-z]+', 'namespace $rootnamespace$' | Out-File StackTraceParser.cs.pp" ^
+PowerShell -C "(type StackTraceParser.cs) -replace 'namespace\s+[a-z]+', 'namespace $rootnamespace$' | Out-File -Encoding ascii StackTraceParser.cs.pp" ^
  && call build ^
  && nuget pack StackTraceParser.Source.nuspec
 popd


Generalized Windows Visual C++ merge module locator for Visual Studio 2017

--- wininstall/locate-vcredist.bat
+++ wininstall/locate-vcredist.bat
@@ -8,20 +8,18 @@
 )

 @IF "%VisualStudioVersion%"=="15.0" (
-  @IF EXIST "%VCINSTALLDIR%Redist\MSVC\14.10.25008" (
-    @SET "Path32=%VCINSTALLDIR%Redist\MSVC\14.10.25008\MergeModules\Microsoft_VC150_CRT_x86.msm"
-    @SET "Path64=%VCINSTALLDIR%Redist\MSVC\14.10.25008\MergeModules\Microsoft_VC150_CRT_x64.msm"
+  @PUSHD "%VCINSTALLDIR%Redist\MSVC"
+  @FOR /D %%D IN (*) DO (
+    @PUSHD %%D
+    @FOR %%F IN (MergeModules\Microsoft_VC*_CRT_x86.msm) DO (
+      SET "Path32=%VCINSTALLDIR%Redist\MSVC\%%D\%%F"
+    )
+    @FOR %%F IN (MergeModules\Microsoft_VC*_CRT_x64.msm) DO (
+      SET "Path64=%VCINSTALLDIR%Redist\MSVC\%%D\%%F"
+    )
+    @POPD
   )
-
-  @IF EXIST "%VCINSTALLDIR%Redist\MSVC\14.11.25325" (
-    @SET "Path32=%VCINSTALLDIR%Redist\MSVC\14.11.25325\MergeModules\Microsoft_VC141_CRT_x86.msm"
-    @SET "Path64=%VCINSTALLDIR%Redist\MSVC\14.11.25325\MergeModules\Microsoft_VC141_CRT_x64.msm"
-  )
-
-  @IF EXIST "%VCINSTALLDIR%Redist\MSVC\14.12.25810" (
-    @SET "Path32=%VCINSTALLDIR%Redist\MSVC\14.12.25810\MergeModules\Microsoft_VC141_CRT_x86.msm"
-    @SET "Path64=%VCINSTALLDIR%Redist\MSVC\14.12.25810\MergeModules\Microsoft_VC141_CRT_x64.msm"
-  )
+  @POPD
 )

 @DEL vcredist.wxs >nul 2>&1


Still trying to get OpenCover to work

Still trying to get OpenCover to work

--- test.bat
+++ test.bat
@@ -3,11 +3,8 @@
 if not defined configuration set configuration=Release

 set project=Utilitron.Tests.Unit
-set bin=%project%\bin\%configuration%\net46
-set target=%bin%\win7-x64\dotnet-test-mstest.exe
-set libs=%bin%\%project%.dll

-tools\OpenCover\OpenCover.Console.exe -returntargetcode -register:user -filter:"+[Utilitron]* -[Utilitron]System.*" -target:"%target%" -targetargs:"%libs%" -output:coverage.xml
+tools\OpenCover\OpenCover.Console.exe -returntargetcode -register:user -target:"dotnet.exe" -targetargs:"test %project%" -output:coverage.xml
 if %errorlevel% neq 0 exit /b %errorlevel%

 tools\coveralls.io\coveralls.net.exe --opencover coverage.xml


Delete test.bat

Delete test.bat


Advanced Installer updated to v8.5

Advanced Installer updated to v8.5

--- platform/build/build_installer.bat
+++ platform/build/build_installer.bat
@@ -3,12 +3,12 @@
 REM %ProgramFiles% is not defined when this file is run by make_binary.pl on ws03-vc9-32.
 REM SET AI_DIR="%ProgramFiles%\Caphyon\Advanced Installer 7.3.1"

-SET AI_DIR="C:\Program Files\Caphyon\Advanced Installer 7.7\bin\x86"
+SET AI_DIR="C:\Program Files\Caphyon\Advanced Installer 8.5\bin\x86"

 SET AI_EXE=advancedinstaller.com
 SET INSTALL_PRJ=%3
 IF EXIST %AI_DIR%\%AI_EXE% GOTO INST
-SET AI_DIR="C:\Program Files (x86)\Caphyon\Advanced Installer 7.7\bin\x86"
+SET AI_DIR="C:\Program Files (x86)\Caphyon\Advanced Installer 8.5\bin\x86"
 IF EXIST %AI_DIR%\%AI_EXE% GOTO INST
 @echo Error: Advanced Installer is not found at %AI_DIR%; aborting installer build script
 EXIT -1


Add a build script for code socery gcc.

Add a build script for code socery gcc.

git-svn-id: 5648d1bec6962b0a6d1d1b40eba8cf5cdb62da3d@10260 6f19259b-4bc3-4df7-8a09-765794883524

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

--- BeagleBoardPkg/ba.bat
+++ BeagleBoardPkg/ba.bat
@@ -0,0 +1,68 @@
+@REM Copyright (c) 2008 - 2010, Apple, Inc.  All rights reserved.
+@REM All rights reserved. This program and the accompanying materials
+@REM are licensed and made available under the terms and conditions of the BSD License
+@REM which accompanies this distribution.  The full text of the license may be found at
+@REM http://opensource.org/licenses/bsd-license.php
+@REM
+@REM THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+@REM WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+@REM
+
+@REM Example usage of this script. default is a DEBUG build
+@REM b
+@REM b clean
+@REM b release
+@REM b release clean
+@REM b -v -y build.log
+
+ECHO OFF
+@REM Setup Build environment. Sets WORKSPACE and puts build in path
+CALL ..\edksetup.bat
+
+@REM Set for tools chain. Currently ARMGCC
+SET TARGET_TOOLS=ARMGCC
+SET TARGET=DEBUG
+
+@if /I "%1"=="RELEASE" (
+  @REM If 1st argument is release set TARGET to RELEASE and shift arguments to remove it
+  SET TARGET=RELEASE
+  shift /1
+)
+
+SET BUILD_ROOT=%WORKSPACE%\Build\BeagleBoard\%TARGET%_%TARGET_TOOLS%
+
+@REM Build the Beagle Board firmware and creat an FD (FLASH Device) Image.
+CALL build -p BeagleBoardPkg\BeagleBoardPkg.dsc -a ARM -t %TARGET_TOOLS% -b %TARGET% %1 %2 %3 %4 %5 %6 %7 %8
+@if ERRORLEVEL 1 goto Exit
+
+@if /I "%1"=="CLEAN" goto Clean
+
+@REM
+@REM Ram starts at 0x80000000
+@REM OMAP 3530 TRM defines 0x80008208 as the entry point
+@REM The reset vector is caught by the mask ROM in the OMAP 3530 so that is why this entry
+@REM point looks so strange.
+@REM OMAP 3430 TRM section 26.4.8 has Image header information. (missing in OMAP 3530 TRM)
+@REM
+@cd Tools
+
+ECHO Building tools...
+CALL nmake
+
+ECHO Patching image with ConfigurationHeader.dat
+CALL GenerateImage -D ..\ConfigurationHeader.dat -E 0x80008208 -I %BUILD_ROOT%\FV\BEAGLEBOARD_EFI.fd -O %BUILD_ROOT%\FV\BeagleBoard_EFI_flashboot.fd
+
+ECHO Patching ..\Debugger_scripts ...
+SET DEBUGGER_SCRIPT=..\Debugger_scripts
+@for /f %%a IN ('dir /b %DEBUGGER_SCRIPT%\*.inc %DEBUGGER_SCRIPT%\*.cmm') do (
+  @CALL replace %DEBUGGER_SCRIPT%\%%a %BUILD_ROOT%\%%a ZZZZZZ %BUILD_ROOT% WWWWWW  %WORKSPACE%
+)
+
+cd ..
+:Exit
+EXIT /B
+
+:Clean
+cd Tools
+CALL nmake clean
+cd ..


Update EvalRelevance.bat

Update EvalRelevance.bat

--- CMD/EvalRelevance.bat
+++ CMD/EvalRelevance.bat
@@ -1,4 +1,4 @@
-
+REM Get QnA.exe location from registry, and pass parameters as relevance to evaluate
 @echo off
 Set Relevance=%*


Add ability to generate nunit test results

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

--- CreateTestresults.cmd
+++ CreateTestresults.cmd
@@ -0,0 +1,11 @@
+@pushd %~dp0
+
+ECHO Remember to build the solution first!
+REM pause
+
+"%~dp0\TestHarness\packages\NUnit.Runners.2.6.3\tools\nunit-console.exe" "%~dp0\TestHarness\nunit\bin\Debug\nunitHarness.dll" /result=results-example-nunit.xml /nologo /nodots
+
+
+pause
+
+@popd


fix case to OmniSharp project

fix case to OmniSharp project

--- scripts/Omnisharp.cmd
+++ scripts/Omnisharp.cmd
@@ -1,3 +1,3 @@
 SETLOCAL

-%USERPROFILE%\.dnx\runtimes\dnx-clr-win-x86.1.0.0-beta4\bin\dnx %~dp0..\src\Omnisharp run %*
+%USERPROFILE%\.dnx\runtimes\dnx-clr-win-x86.1.0.0-beta4\bin\dnx %~dp0..\src\OmniSharp run %*


Replace the PHP license with New BSD like rest of the installer.

--- scripts/pear.bat
+++ scripts/pear.bat
@@ -3,15 +3,9 @@
 REM ----------------------------------------------------------------------
 REM PHP version 5
 REM ----------------------------------------------------------------------
-REM Copyright (c) 1997-2004 The PHP Group
+REM Copyright (c) 1997-2010 The Authors
 REM ----------------------------------------------------------------------
-REM  This source file is subject to version 3.0 of the PHP license,
-REM  that is bundled with this package in the file LICENSE, and is
-REM  available at through the world-wide-web at
-REM  http://www.php.net/license/3_0.txt.
-REM  If you did not receive a copy of the PHP license and are unable to
-REM  obtain it through the world-wide-web, please send a note to
-REM  license@php.net so we can mail you a copy immediately.
+REM http://opensource.org/licenses/bsd-license.php New BSD License
 REM ----------------------------------------------------------------------
 REM  Authors:     Alexander Merz (alexmerz@php.net)
 REM ----------------------------------------------------------------------


リンク作成バッチを追加する

リンク作成バッチを追加する

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

--- mklink.bat
+++ mklink.bat
@@ -0,0 +1,3 @@
+mklink %HOMEPATH%"\_vimrc" %HOMEPATH%"\dotfiles\_vimrc"
+mklink %HOMEPATH%"\_gvimrc" %HOMEPATH%"\dotfiles\_gvimrc"
+exit 0


Build Master:2017-02-28T17:42:58.124Z

Build Master:2017-02-28T17:42:58.124Z

--- deploy.cmd
+++ deploy.cmd
@@ -66,9 +66,8 @@
 @echo "Initiating Pre-Deployment: %date% %time%"

 for /F %%f in ('git.exe diff --name-only %PREVIOUS_SCM_COMMIT_ID% %SCM_COMMIT_ID% ^| grep package.json') do (
-    SET PACKAGE_JSON=%%f
+    SET PACKAGE_JSON=%%~f
     echo "package.json : %PACKAGE_JSON%"
-    echo %%f
     echo "NPM Install: %DEPLOYMENT_SOURCE%\%PACKAGE_JSON:~-12%"
     pushd "%DEPLOYMENT_SOURCE%\%PACKAGE_JSON:~-12%"
     npm install --production --progress=false --cache-min=432000


edit deployment script

edit deployment script

--- deploy.cmd
+++ deploy.cmd
@@ -106,15 +106,15 @@
 fi

 :: 4. Run Gulp Task
-if [ -e "$DEPLOYMENT_TARGET/gulpfile.js" ]; then
-  cd "$DEPLOYMENT_TARGET"
+IF EXIST "%DEPLOYMENT_TARGET%\gulpfile.js" (
+  pushd "%DEPLOYMENT_TARGET%"
   eval ./node_modules/.bin/gulp imagemin
   exitWithMessageOnError "gulp failed"
   cd - > /dev/null
 fi

 ::5. Unzip file
-cd "$DEPLOYMENT_TARGET"
+IF EXIST "%DEPLOYMENT_TARGET%"
 eval unzip -o Archive.zip
 cd - > /dev/null


Run tsd during deploy

Run tsd during deploy

--- deploy.cmd
+++ deploy.cmd
@@ -115,6 +115,13 @@
   popd
 )

+IF EXIST "%DEPLOYMENT_TARGET%\tsd.json" (
+  pushd "%DEPLOYMENT_TARGET%"
+  call :ExecuteCmd .\node_modules\.bin\tsd install
+  IF !ERRORLEVEL! NEQ 0 goto error
+  popd
+)
+

 :: 5. Run gulp transformations
 IF EXIST "%DEPLOYMENT_TARGET%\gulpfile.js" (


fix kudu

fix kudu

--- deploy.cmd
+++ deploy.cmd
@@ -116,8 +116,7 @@
 echo 5. Gulp build
 IF EXIST "gulpfile.js (
   pushd "%DEPLOYMENT_TARGET%"
-  call :ExecuteCmd gulp build
-  call :ExecuteCmd gulp
+  call .\node_modules\.bin\gulp build
   IF !ERRORLEVEL! NEQ 0 goto error
   popd
 )


Add a check for 32-bit vs 64-bit OS and then use the appropriate python

--- makepanda/makepanda.bat
+++ makepanda/makepanda.bat
@@ -1,17 +1,24 @@
 @echo off

 REM
-REM Verify that we can find the 'makepanda' python script
-REM and the python interpreter.  If we can find both, then
-REM run 'makepanda'.
+REM Check the Windows architecture and determine with Python
+REM to use; 64-bit or 32-bit. Verify that we can find the
+REM 'makepanda' python script and the python interpreter.
+REM If we can find both, then run 'makepanda'.
 REM
+
+if %PROCESSOR_ARCHITECTURE% == AMD64 (
+  set pythondir=win-python-x64
+) else (
+  set pythondir=win-python
+)

 set thirdparty=thirdparty
 if defined MAKEPANDA_THIRDPARTY set thirdparty=%MAKEPANDA_THIRDPARTY%

 if not exist makepanda\makepanda.py goto :missing1
-if not exist %thirdparty%\win-python\python.exe goto :missing2
-%thirdparty%\win-python\python.exe makepanda\makepanda.py %*
+if not exist %thirdparty%\%pythondir%\python.exe goto :missing2
+%thirdparty%\%pythondir%\python.exe makepanda\makepanda.py %*
 if errorlevel 1 if x%1 == x--slavebuild exit 1
 goto done

@@ -22,6 +29,7 @@
   goto done

 :missing2
+  echo %thirdparty%
   echo You seem to be missing the 'thirdparty' directory.  You probably checked
   echo the source code out from sourceforge.  The sourceforge repository is
   echo missing the 'thirdparty' directory.  You will need to supplement the


chore: use latest npm on Windows (#246)

chore: use latest npm on Windows (#246)

--- .kokoro/test.bat
+++ .kokoro/test.bat
@@ -1,4 +1,4 @@
-@rem Copyright 2018 gRPC authors.
+@rem Copyright 2018 Google LLC. All rights reserved.
 @rem
 @rem Licensed under the Apache License, Version 2.0 (the "License");
 @rem you may not use this file except in compliance with the License.
@@ -17,8 +17,7 @@
 cd /d %~dp0
 cd ..

-call npm install -g npm@5 || goto :error
-
+call npm install -g npm@latest || goto :error
 call npm install || goto :error
 call npm run test || goto :error


script to recreate bootstrap

script to recreate bootstrap

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

--- update-bootstrap.cmd
+++ update-bootstrap.cmd
@@ -0,0 +1,10 @@
+@echo off
+setlocal
+
+set HERE=%~dp0
+
+robocopy .full-build\projects bootstrap\projects *.targets /S
+robocopy .full-build\packages bootstrap\packages *.targets /S
+
+:ok
+exit /b 0


Fix a small typo

Fix a small typo

--- Windows/WiiWarePatcher.bat
+++ Windows/WiiWarePatcher.bat
@@ -25,7 +25,8 @@
 :: ===========================================================================

 @echo off
-title Wiimmfi Patcher for WAD's v%version% Created by @KcrPL, @Larsenv, @PokeAcer
+set title=Wiimmfi Patcher for WAD's v%version% Created by @KcrPL, @Larsenv, @PokeAcer
+title %title%
 cls

 set /a patherror=0


- adding double-clickable script

- adding double-clickable script

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

--- Build_Launch.bat
+++ Build_Launch.bat
@@ -0,0 +1,3 @@
+@ECHO off
+CALL "%~dp0Build.bat" %*
+PAUSE


Tweak revdep status()

Tweak revdep status()

--- CRAN_Release.cmd
+++ CRAN_Release.cmd
@@ -430,7 +430,7 @@
     cat("Installed data.table to be tested against:",as.character(packageVersion("data.table")),"\n")
     cat("CRAN:\n"); status("cran")
     cat("BIOC:\n"); status("bioc")
-    cat("TOTAL    :", length(deps), "\n\n")
+    cat("TOTAL          :", length(deps), "\n\n")
     cat("Oldest 00check.log (to check no old stale ones somehow missed):\n")
     system("find . -name '00check.log' | xargs ls -lt | tail -1")
     cat("\n")
@@ -468,8 +468,9 @@
       "NOTE    :",sprintf("%3d",length(n)),"\n",  #":",paste(sort(names(x)[n])),"\n",
       "OK      :",sprintf("%3d",length(ok)),"\n",
       "TOTAL   :",length(e)+length(w)+length(n)+length(ok),"/",length(deps),"\n",
-      "RUNNING :",sprintf("%3d",length(r)),":",paste(sort(names(x)[r])),"\n",
-      if (length(ns)==0) "\n" else paste0("NOT STARTED (first 20 of ",length(ns),") : ",paste(sort(names(x)[head(ns,20)]),collapse="|"),"\n\n")
+      if (length(r))  paste0("RUNNING       : ",paste(sort(names(x)[r]),collapse=" "),"\n"),
+      if (length(ns)) paste0("NOT STARTED   : ",paste(sort(names(x)[head(ns,20)]),collapse=" "), if(length(ns)>20)paste(" +",length(ns)-20,"more"), "\n"),
+      "\n"
       )
   assign(paste0(".fail.",which), c(sort(names(x)[e]), sort(names(x)[w])), envir=.GlobalEnv)
   invisible()
@@ -491,10 +492,13 @@
     scan(quiet=TRUE)
     # apx 7.5 hrs for 582 packages on my 4 cpu laptop with 8 threads
   } else {
-    x = deps[!file.exists(paste0("./",deps,".Rcheck"))]  # always those that haven't run
-    if (which %in% c("cran.fail","both.fail"))      x = union(x, .fail.cran)  # .fail written to .GlobalEnv by status()
-    else if (which %in% c("bioc.fail","both.fail")) x = union(x, .fail.bioc)
-    else if (which != "not.started")                x = which   # one package
+    if (!which %in% c("not.started","cran.fail","bioc.fail","both.fail")) {
+      x = which   # one package manually
+    } else {
+      x = deps[!file.exists(paste0("./",deps,".Rcheck"))]  # always those that haven't run
+      if (which %in% c("cran.fail","both.fail")) x = union(x, .fail.cran)  # .fail.* were written to .GlobalEnv by status()
+      if (which %in% c("bioc.fail","both.fail")) x = union(x, .fail.bioc)
+    }
     if (length(x)==0) { cat("No packages to run\n"); return(invisible()); }
     cat("Running",length(x),"packages:", paste(x), "\n")
     cat("Proceed? (ctrl-c or enter)\n")
@@ -502,7 +506,7 @@
     for (i in x) system(paste0("rm -rf ./",i,".Rcheck"))
     cmd = paste0("ls -1 *.tar.gz | grep -E '", paste0(x,collapse="|"),"' | TZ='UTC' parallel R CMD check")
   }
-  if (as.integer(system("ps -a | grep perfbar | wc -l", intern=TRUE)) < 1) system("perfbar",wait=FALSE)
+  if (as.integer(system("ps -e | grep perfbar | wc -l", intern=TRUE)) < 1) system("perfbar",wait=FALSE)
   system("touch /tmp/started.flag ; rm -f /tmp/finished.flag")
   system(paste("((",cmd,">/dev/null 2>&1); touch /tmp/finished.flag)"), wait=FALSE)
 }


daily

daily

--- DevTools/cuu.bat
+++ DevTools/cuu.bat
@@ -1,4 +1,4 @@
-@set @dirs=C:\Factory C:\Dev C:\pleiades\workspace\Test02\src C:\pleiades\workspace\Test03\src-03
+@set @dirs=C:\Factory C:\Dev C:\pleiades\workspace\Spica01\src C:\pleiades\workspace\Spica02\src C:\pleiades\workspace\Test01\src C:\pleiades\workspace\Test02\src C:\pleiades\workspace\Test03\src-03 C:\pleiades\workspace\Test04\src-04
 fndbrknuuid.exe %@dirs%
 IF ERRORLEVEL 1 PAUSE
 chkuuidcoll.exe %@dirs%


The run-debug batch script should use explicit paths. (dm)

--- Windows/run-debug.bat
+++ Windows/run-debug.bat
@@ -1,4 +1,9 @@
 @echo off
-echo Running BRLTTY in debug mode. When done, close this window (for example,
-echo by using the alt-space menu) and see %CD%\debug.log
-"%~dp0bin\brltty" -n -e -ldebug -Ldebug.log >stdout.log 2>stderr.log
+
+set programDirectory=%~dp0
+set logFile=%programDirectory%debug.log
+
+echo Running BRLTTY in debug mode. When done, close this window (for example, by
+echo using the alt-space menu) and see %logFile%
+
+"%programDirectory%bin\brltty" -n -ldebug "-L%logFile%" %*


Remove a lost space.

Remove a lost space.

--- gitbox.bat
+++ gitbox.bat
@@ -192,7 +192,7 @@
 echo Unknown GitBox command.
 echo.
 echo Gitbox command list:
-echo   list   [group] Lists all the git repositories tracked by GitBox.  The optional
+echo   list   [group] Lists all the git repositories tracked by GitBox. The optional
 echo                  group lists only a subgroup of the maintained repos.
 echo   create ^<repo^>  Creates a new empty git repository called ^<repo^> inside the
 echo                  GitBox repository collection.


Add ECHO messages

Add ECHO messages

--- bin/compile.bat
+++ bin/compile.bat
@@ -1,10 +1,14 @@
 @echo off
 setlocal enableDelayedExpansion

+Echo Compiling gamemodes...
 for /F %%G in ('dir /B/D ..\src\gamemodes\*.pwn') do (
+    Echo src\gamemodes\%%~nxG
     "compiler\pawncc.exe" "..\src\gamemodes\%%G" -o"server\gamemodes\%%~nG.amx" -i"..\src\includes" "-;" "-("
 )

+Echo Compiling filterscripts...
 for /F %%G in ('dir /B/D ..\src\filterscripts\*.pwn') do (
+    Echo src\filterscripts\%%~nxG
     "compiler\pawncc.exe" "..\src\filterscripts\%%G" -o"server\filterscripts\%%~nG.amx" -i"..\src\includes" "-;" "-("
 )


Fix grain not launching under Windows the first time after snapshot update Signed-off-by: Dmitriy Pavlenko <dmitriy.pavlenko@sysgears.com>

Fix grain not launching under Windows the first time after snapshot update
Signed-off-by: Dmitriy Pavlenko <ea58eea250c59e0289388b3f7eba86b0955b6ce8@sysgears.com>

--- grainw.bat
+++ grainw.bat
@@ -70,7 +70,6 @@
 if "%ERRORLEVEL%"=="2" (
     @REM Site deps invalid - regenerate them
     CALL gradlew.bat gendeps
-    IF NOT "%ERRORLEVEL%"=="0" GOTO fail
     CALL :validateAndLaunch %*
 )
 EXIT /B %ERRORLEVEL%


no message

no message

git-svn-id: https://svn.apache.org/repos/asf/jakarta/jmeter/trunk@322555 13f79535-47bb-0310-9956-ffa450edef68

Former-commit-id: 0e3c2b45bbf59db5488d8073d4a8ca8ee557e857

--- src/make.dist.bat
+++ src/make.dist.bat
@@ -11,7 +11,7 @@
 if "%name%"=="" set name=Apache_JMeter

 :: Set package version
-if "%version%"=="" set version=1.0.2
+if "%version%"=="" set version=1.1

 :: Set temp directory name
 if "%dir%"=="" set dir="temp"


compilecore.cmd again

compilecore.cmd again

--- compilecore.cmd
+++ compilecore.cmd
@@ -6,7 +6,7 @@
 SET PARAMS=/consoleloggerparameters:ErrorsOnly /m

 "%MSBUILD%" AM.Core\AM.Core.NetCore.xproj /target:ReBuild /property:Configuration=Debug   /property:OutputPath=%OUTPUT%\DebugCore  /p:DefineConstants="NETCORE"
-"%MSBUILD%" ManagedIrbis\ManagedIrbis.NetCore.xproj /target:ReBuild /property:Configuration=Debug   /property:OutputPath=%OUTPUT%\DebugCore /p:DefineConstants="NETCORE"
+rem "%MSBUILD%" ManagedIrbis\ManagedIrbis.NetCore.xproj /target:ReBuild /property:Configuration=Debug   /property:OutputPath=%OUTPUT%\DebugCore /p:DefineConstants="NETCORE"

 "%MSBUILD%" AM.Core\AM.Core.NetCore.xproj /target:ReBuild /property:Configuration=Release /property:OutputPath=%OUTPUT%\ReleaseCore /p:DefineConstants="NETCORE"
-"%MSBUILD%" ManagedIrbis\ManagedIrbis.NetCore.xproj /target:ReBuild /property:Configuration=Release /property:OutputPath=%OUTPUT%\ReleaseCore /p:DefineConstants="NETCORE"
+rem "%MSBUILD%" ManagedIrbis\ManagedIrbis.NetCore.xproj /target:ReBuild /property:Configuration=Release /property:OutputPath=%OUTPUT%\ReleaseCore /p:DefineConstants="NETCORE"


setup.bat (libAlembic 1.7.5 -> 1.7.7)

setup.bat (libAlembic 1.7.5 -> 1.7.7)

--- Plugin/setup.bat
+++ Plugin/setup.bat
@@ -1,7 +1,7 @@
 @echo off

 echo "downloading external libararies..."
-powershell.exe -Command "[System.Net.ServicePointManager]::SecurityProtocol=[System.Net.SecurityProtocolType]::Tls12; wget https://github.com/unity3d-jp/AlembicImporter/releases/download/20180122/External.7z -OutFile External/External.7z"
+powershell.exe -Command "[System.Net.ServicePointManager]::SecurityProtocol=[System.Net.SecurityProtocolType]::Tls12; wget https://github.com/unity3d-jp/AlembicImporter/releases/download/20180320/External.7z -OutFile External/External.7z"
 cd External
 7z\7za.exe x -aos External.7z
 cd ..


add file to execute test app

add file to execute test app

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

--- build/run.cmd
+++ build/run.cmd
@@ -0,0 +1,3 @@
+copy /y testapp\Resources\* win32\test\Resources
+copy /y testapp\* win32\test\
+win32\test\test.exe


Initial script for creating addon zip file.

--- install/makezip.bat
+++ install/makezip.bat
@@ -1,18 +1,14 @@
-git clean -xfd
-install.bat
-
 set /p VERSION=<../scripts/addons/io_scene_nif/VERSION
 set NAME=blender_nif_plugin
-set FILES=AUTHORS.rst CHANGELOG.rst LICENSE.rst README.rst install/install.sh install/install.bat scripts/  docs/_build/html/
+set EXTRAFILES=AUTHORS.rst CHANGELOG.rst LICENSE.rst README.rst

-rem update documentation
-pushd ../docs
-make clean
-make html
+pushd ..\scripts\addons
+del %NAME%-%VERSION%.*
+"%PROGRAMFILES%\7-Zip\7z.exe" a -tzip ..\..\install\%NAME%-%VERSION%.zip io_scene_nif -xr!__pycache__
 popd

 pushd ..
-del %NAME%-%VERSION%.*
-"%PROGRAMFILES%\7-Zip\7z.exe" a -tzip install/%NAME%-%VERSION%.zip %FILES%
+"%PROGRAMFILES%\7-Zip\7z.exe" a -tzip install\%NAME%-%VERSION%.zip %EXTRAFILES%
+popd

 pause


Script closes when complete. Better relative path structure.

--- startCompass.bat
+++ startCompass.bat
@@ -1,12 +1,14 @@
 :: Batch Script to compass watch all Compass Directories
 setlocal EnableDelayedExpansion
 ::Specifiy which locations to watch ONE location per line, no comments.
-set file=C:\altiris\locations.txt
+set file=%~dp0\locations.txt
 ::Specifiy Ruby location
 set rubyLocation=C:\Ruby200-x64\bin\
 ::Iterate watch locations
 FOR /F %%i IN (%file%) DO (
-  set watchLocation=%%i
+	set watchLocation=%%i
 	::Call watch and send it current watch location, and ruby location
 	start watchDirectory.CMD %watchLocation%
 )
+
+EXIT


Delete run.bat

Delete run.bat

--- env/run.bat
+++ env/run.bat
@@ -1 +0,0 @@
-python -m pip install -r requirements.txt


improve bat script

improve bat script

--- src/main/bin/unravl.bat
+++ src/main/bin/unravl.bat
@@ -23,15 +23,14 @@
     Rem is in src/main/bin
     Rem Build with:
     Rem    .\gradlew clean build
-    Rem Gradle will put the UnRAVL jar in build/libs
-    Rem and dependent jars in build/output/lib
+    Rem Gradle will put the UnRAVL jar in build\libs
+    Rem and dependent jars in build\output\lib
     set UNRAVL_JAR_DIR=!UNRAVL_DEV_DIR!\build\libs
     set UNRAVL_LIB_DIR=!UNRAVL_DEV_DIR!\build\output\lib
     set UNRAVL_CLASSPATH=!UNRAVL_LIB_DIR!/*;!UNRAVL_JAR_DIR!/*;
     Rem echo UNRAVL_CLASSPATH is !UNRAVL_CLASSPATH!
   ) else (
-    echo !UNRAVL_DIR! does not contain libraries !UNRAVL_DIR! build\libs
-    echo !UNRAVL_DEV_DIR! does not contain libraries in !UNRAVL_DEV_DIR!\build\libs
+    echo No libraries found in lib or build\libs;build\output\lib
     echo If in development, run:
     echo   .\gradlew clean build
     exit /B 1


Added the support tool bat file

Added the support tool bat file

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

--- support-tool.bat
+++ support-tool.bat
@@ -0,0 +1,98 @@
+@echo off
+mode con: cols=68 lines=32
+title Dreadnought Community Support Tool
+
+SETLOCAL ENABLEDELAYEDEXPANSION
+
+SET version=1.0.0
+SET sourceDirPath=C:\DreadnoughtSupport\
+SET contentDirPath=%sourceDirPath%\support-info
+echo:
+echo   ----------------------------------------------------------------
+echo    DREADNOUGHT COMMUNITY SUPPORT TOOL
+echo   ----------------------------------------------------------------
+echo:
+echo     This tool will create a zip file of your msinfo, dxdiag and
+echo     log files for bug reporting and submissions when contacting
+echo     Customer Support.
+echo:
+echo     Let the tool run until you see a file on your desktop called
+echo     DN_Support.zip
+echo:
+echo     Authors:
+echo      - Anyone#6415 <kjarli@gmail.com>
+echo:
+echo     For feedback, pease contact us on Discord:
+echo      - https://discord.gg/dreadnought
+echo:
+echo     Initial script setup by Spider.
+echo:
+echo   ----------------------------------------------------------------
+echo:
+echo     Will create:
+echo      - "%sourceDirPath%"
+echo:
+echo:    Using log directory:
+echo      - "%USERPROFILE%\AppData\Local\DreadGame\Saved\Logs"
+echo:
+echo   ----------------------------------------------------------------
+echo:
+echo:    Press ENTER to start or close the tool to quit.
+pause > nul
+RMDIR /s /q %sourceDirPath% 2> nul
+MKDIR %contentDirPath%\logs
+echo:
+echo     Gathering information, this can take up to a few minutes.
+echo     Please don't interrupt or quit the tool while waiting.
+
+echo Files gathered and zipped by the Dreadnought Community Support Tool (%version%) > %contentDirPath%\SUPPORT-README.txt
+echo Automatically collected files: >> %contentDirPath%\SUPPORT-README.txt
+echo  - /logs/*.log >> %contentDirPath%\SUPPORT-README.txt
+echo  - /DxDiag.txt >> %contentDirPath%\SUPPORT-README.txt
+echo  - /MSInfo.txt >> %contentDirPath%\SUPPORT-README.txt
+
+FORFILES /P "%USERPROFILE%\AppData\Local\DreadGame\Saved\Logs" /M *.log /C "cmd /c xcopy @PATH %contentDirPath%\logs 2>&1 > nul"
+@echo off
+dxdiag /t %contentDirPath%\DxDiag.txt
+Msinfo32 /report %contentDirPath%\MSInfo.txt
+
+IF [%2] EQU [] (
+  SET destinationDirPath="%USERPROFILE%\Desktop"
+) ELSE (
+  SET destinationDirPath="%2"
+)
+IF [%3] EQU [] (
+  SET destinationFileName="DN_Support.zip"
+) ELSE (
+  SET destinationFileName="%3"
+)
+SET tempFilePath=%TEMP%\FilesToZip.txt
+TYPE NUL > %tempFilePath%
+
+FOR /F "DELIMS=*" %%i IN ('DIR /B /S /A-D "%sourceDirPath%"') DO (
+  SET filePath=%%i
+  SET dirPath=%%~dpi
+  SET dirPath=!dirPath:~0,-1!
+  SET dirPath=!dirPath:%sourceDirPath%=!
+  SET dirPath=!dirPath:%sourceDirPath%=!
+  ECHO .SET DestinationDir=!dirPath! >> %tempFilePath%
+  ECHO "!filePath!" >> %tempFilePath%
+)
+
+MAKECAB /D MaxDiskSize=0 /D CompressionType=MSZIP /D Cabinet=ON /D Compress=ON /D UniqueFiles=ON /D DiskDirectoryTemplate=%destinationDirPath% /D CabinetNameTemplate=%destinationFileName%  /F %tempFilePath% > NUL 2>&1
+
+DEL setup.inf > NUL 2>&1
+DEL setup.rpt > NUL 2>&1
+DEL %tempFilePath% > NUL 2>&1
+echo   ----------------------------------------------------------------
+echo:
+echo     DN_Support.zip has been created and is located on your
+echo     Desktop. Please include this file as attachment to your
+echo     support ticket or email.
+echo:
+echo     You can now close the DREADNOUGHT COMMUNITY SUPPORT TOOL!
+echo:
+echo   ----------------------------------------------------------------
+echo:
+echo:    Press ENTER to quit.
+pause > nul


Updated run_tests.bat to return the error code of the last failing test

--- BuildTools/Scripts/appveyor/run_tests.bat
+++ BuildTools/Scripts/appveyor/run_tests.bat
@@ -17,15 +17,24 @@
 )

 if "%RUN_API_CORE_TEST%"=="true" (
-    "%1\UnitTests\DiligentCoreTest\%CONFIGURATION%\DiligentCoreTest.exe" || set ERROR=%ERRORLEVEL%
+    "%1\UnitTests\DiligentCoreTest\%CONFIGURATION%\DiligentCoreTest.exe"
+	if %ERRORLEVEL% NEQ 0 (
+		set ERROR=%ERRORLEVEL%
+	)
 )

 if "%RUN_CORE_API_D3D11_TEST%"=="true" (
-    "%1\UnitTests\DiligentCoreAPITest\%CONFIGURATION%\DiligentCoreAPITest.exe" --mode=d3d11_sw || set ERROR=%ERRORLEVEL%
+    "%1\UnitTests\DiligentCoreAPITest\%CONFIGURATION%\DiligentCoreAPITest.exe" --mode=d3d11_sw
+	if %ERRORLEVEL% NEQ 0 (
+		set ERROR=%ERRORLEVEL%
+	)
 )

 if "%RUN_CORE_API_D3D12_TEST%"=="true" (
-    "%1\UnitTests\DiligentCoreAPITest\%CONFIGURATION%\DiligentCoreAPITest.exe" --mode=d3d12_sw || set ERROR=%ERRORLEVEL%
+    "%1\UnitTests\DiligentCoreAPITest\%CONFIGURATION%\DiligentCoreAPITest.exe" --mode=d3d12_sw
+	if %ERRORLEVEL% NEQ 0 (
+		set ERROR=%ERRORLEVEL%
+	)
 )

 exit /B %ERROR% REM use /B to exit the current batch script context, and not the command prompt process


Update recipes/quartet/bld.bat

Update recipes/quartet/bld.bat

Co-authored-by: Uwe L. Korn <61df1ade108ad4f778ae80c035cf888799bb0fe0@users.noreply.github.com>

--- recipes/quartet/bld.bat
+++ recipes/quartet/bld.bat
@@ -1,3 +1,3 @@
 cmake -DBUILD_SHARED_LIBS=ON .
 cmake --build . --config=release
-cmake --install . --config=release --prefix="%PREFIX%"
+cmake --install . --config=release --prefix="%LIBRARY_PREFIX%"


Implement bolt build entry groups

Implement bolt build entry groups

--- src/bolt-build.subr.bat
+++ src/bolt-build.subr.bat
@@ -164,10 +164,10 @@
     echo.%name%| findstr /C:"/" >NUL 2>&1 && echo entry group name must not contain special characters >&2 && goto fail

     set entry_group_name_%count_entry_group_name%=%name%
+    set current_entry_group=%count_entry_group_name%
     set /a count_entry_group_name=%count_entry_group_name% + 1

-    set safe_name=%name:-=_%
-    set /a count_entry_groups_%safe_name%=0
+    set entry_group_files_%current_entry_group%=

     :group_loop
       set file=%~1
@@ -179,9 +179,7 @@
       call :is_dir "%file%"
       if %errorlevel%==0 echo specified file for entry group not found [%file%] && goto fail

-      set count=!count_entry_groups_%safe_name%!
-      set entry_groups_%safe_name%_%count%=%file%
-      set /a count_entry_groups_%safe_name%=%count% + 1
+      set entry_group_files_%current_entry_group%="%file%" !entry_group_files_%current_entry_group%!
     goto group_loop
     :end_group_loop
   goto parse_flags
@@ -224,7 +222,22 @@
   exit /b 0

 :bolt_group
-  echo bolt_group unimplemented.
+  mkdir "%output_dir%/compile" 2>NUL
+
+  set /a num=%count_entry_group_name% - 1
+  for /L %%i in (0,1,%num%) do (
+    rem iterate through the array
+    set name=!entry_group_name_%%i!
+    set target=!output_dir!\compile\!name!.js
+
+    rem add to targets variable so things can be linked later
+    set targets=!targets! "!target!"
+    set /a count_targets=!count_targets! + 1
+
+    call "!base!jsc.bat" compile -c "%config_js%" !entry_group_files_%%i! "!target!" || exit /b !errorlevel!
+
+    if "%generate_inline%"=="true" call :bolt_inline "!target!" "!name!"
+  )
   exit /b 0

 :bolt_link


ARROW-7780: [Release] Fix Windows wheel RC verification script given lack of "m" ABI tag in Python 3.8

Closes #6364 from wesm/fix-windows-rc-wheel-script and squashes the following commits:

9ada3362b <Wes McKinney> wheel verification fixes

Authored-by: Wes McKinney <3be70eed0275ec2606f002bff3514252e145d204@apache.org>
Signed-off-by: Krisztián Szűcs <6bab32dc957a05a87930e779f272342e159326fa@gmail.com>

--- dev/release/verify-release-candidate-wheels.bat
+++ dev/release/verify-release-candidate-wheels.bat
@@ -33,10 +33,10 @@

 cd %_VERIFICATION_DIR%

-CALL :verify_wheel 3.6 %1 %2
+CALL :verify_wheel 3.6 %1 %2 m
 if errorlevel 1 GOTO error

-CALL :verify_wheel 3.7 %1 %2
+CALL :verify_wheel 3.7 %1 %2 m
 if errorlevel 1 GOTO error

 CALL :verify_wheel 3.8 %1 %2
@@ -57,6 +57,7 @@
 set PY_VERSION=%1
 set ARROW_VERSION=%2
 set RC_NUMBER=%3
+set ABI_TAG=%4
 set PY_VERSION_NO_PERIOD=%PY_VERSION:.=%

 set CONDA_ENV_PATH=%_VERIFICATION_DIR%\_verify-wheel-%PY_VERSION%
@@ -65,7 +66,7 @@
     || EXIT /B 1
 call activate %CONDA_ENV_PATH%

-set WHEEL_FILENAME=pyarrow-%ARROW_VERSION%-cp%PY_VERSION_NO_PERIOD%-cp%PY_VERSION_NO_PERIOD%m-win_amd64.whl
+set WHEEL_FILENAME=pyarrow-%ARROW_VERSION%-cp%PY_VERSION_NO_PERIOD%-cp%PY_VERSION_NO_PERIOD%%ABI_TAG%-win_amd64.whl

 @rem Requires GNU Wget for Windows
 wget --no-check-certificate -O %WHEEL_FILENAME% https://bintray.com/apache/arrow/download_file?file_path=python-rc%%2F%ARROW_VERSION%-rc%RC_NUMBER%%%2F%WHEEL_FILENAME% || EXIT /B 1


Temporarily disabled crashrpt in Win64 build on jenkins (currently we don't have it anyway)

--- HelperScripts/jenkins_build64.bat
+++ HelperScripts/jenkins_build64.bat
@@ -27,5 +27,5 @@
 )
 mkdir build
 cd build
-cmake -DINCLUDE_QT_WALLET=TRUE -G "Visual Studio 12 Win64" ../bitshares_toolkit || exit /b 28
+cmake -DINCLUDE_QT_WALLET=TRUE -DINCLUDE_CRASHRPT=FALSE -G "Visual Studio 12 Win64" ../bitshares_toolkit || exit /b 28
 msbuild.exe /M:%NUMBER_OF_PROCESSORS% /p:Configuration=RelWithDebinfo /p:Platform=x64 /target:rebuild /v:diag BitShares.sln || exit /b 30


Create Install-Vim.bat

Create Install-Vim.bat

error: pathspec 'ps1/Install-Vim.bat' did not match any file(s) known to git

--- ps1/Install-Vim.bat
+++ ps1/Install-Vim.bat
@@ -0,0 +1,54 @@
+@setlocal enableextensions enabledelayedexpansion & set "PATH0=%~f0" & PowerShell.exe -Command "& (Invoke-Expression -Command ('{#' + ((Get-Content '!PATH0:'=''!') -join \"`n\") + '}'))" %* & exit /b !errorlevel!
+#
+# - Name
+#     Install-Vim.bat
+#
+# - Contents
+#     Install Vim.
+#
+# - Reference
+#     PowerShell on *.bat - http://pf-j.sakura.ne.jp/program/tips/ps1bat2.htm
+#     Vim - KaoriYa - https://www.kaoriya.net/software/vim/
+#
+# - Revision
+#     2016-05-24 created.
+#     yyyy-MM-dd modified.
+#
+
+
+################
+# constant
+################
+$psDir = "$env:USERPROFILE\Documents\WindowsPowerShell"; if (-Not(Test-Path -Path $psDir)) { mkdir $psDir }
+$psProfile = "$psDir\Microsoft.PowerShell_profile.ps1"
+$vimZip = "$docDir\vim.zip"
+$vimUri = 'https://github.com/koron/vim-kaoriya/releases/download/v8.0.0596-20170502/vim80-kaoriya-win64-8.0.0596-20170502.zip'
+
+
+################
+# main
+################
+# Get vim.zip.
+Invoke-RestMethod -Uri $vimUri -OutFile $vimZip -UseBasicParsing
+
+# Unzip vim.zip.
+$shApp = New-Object -Com shell.application
+$unzip = $shApp.NameSpace($vimZip)
+foreach ($item in $unzip.items()) { $shApp.Namespace("$env:USERPROFILE\Documents").copyhere($item, 0x8); }
+
+# Get the full path of the vim.exe.
+$vimExe = (Get-Item "$env:USERPROFILE\Documents\vim*\vim.exe").FullName
+
+# If there is no description about Vim in Profile,
+if (-Not((Get-Content $psProfile | Select-String '# vim').Matches.Success))
+{
+    # Add a description about Vim.
+    Write-Output "# vim`r`nNew-Alias vi $vimExe`r`nNew-Alias vim $vimExe`r`nfunction view() { $vimExe -R `$args }`r`n" >> $psProfile
+}
+
+# Display Profile information.
+Get-Item $psProfile
+Get-Content $psProfile
+
+
+# EOF


Try fix to deal with space in JAVA_HOME

Try fix to deal with space in JAVA_HOME

git-svn-id: 3c1f16eda3ef44bc7d9581ddf719321a2000da74@428 004c2c75-fc45-0410-b1a2-da8352e2331b

--- gradlew.bat
+++ gradlew.bat
@@ -43,12 +43,11 @@
 if not errorlevel 1 goto init

 echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo ERROR: JAVA_HOME might be set to an invalid directory: %JAVA_HOME%
 echo.
 echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo location of your Java installation if there are problems.
 echo.
-goto end

 :init
 @rem get name of script to launch with full path


removed typo

removed typo

--- publish-release.cmd
+++ publish-release.cmd
@@ -1,4 +1,4 @@
-haxelib@echo off
+@echo off
 :: @author Sebastian Thomschke, Vegard IT GmbH
 ::
 :: creates a new release in GitHub and haxelib.org


Path to profile folder

Path to profile folder

Changed path to profile folder instead of using username

--- install.bat
+++ install.bat
@@ -3,7 +3,7 @@
 :okcs
 if exist vb (goto okvb) else (echo "No vb folder found." && goto exit)
 :okvb
-set "D=C:\Users\%USERNAME%\Documents\Visual Studio 2015\Templates\ProjectTemplates"
+set "D=%userprofile%\Documents\Visual Studio 2015\Templates\ProjectTemplates"
 set "F=%TEMP%\Revit2018AddinWizardCs0.zip"
 echo Creating C# wizard archive %F%...
 cd cs


[installer] Fixed setup.bat script to work on winxp.

svn path=/trunk/eXist/; revision=17986

--- installer/scripts/setup.bat
+++ installer/scripts/setup.bat
@@ -11,11 +11,12 @@
 set JAVA_CMD="%JAVA_HOME%\bin\java"

 set JAVA_ENDORSED_DIRS="%EXIST_HOME%"\lib\endorsed
-set JAVA_OPTS="-Xms64m -Xmx768m -Djava.endorsed.dirs=%JAVA_ENDORSED_DIRS%" "%JAVA_OPTS%"
+set JAVA_OPTS="-Xms64m -Xmx768m -Djava.endorsed.dirs=%JAVA_ENDORSED_DIRS%"

-echo "JAVA_HOME: %JAVA_HOME%"
-echo "EXIST_HOME: %EXIST_HOME%"
+rem echo "JAVA_HOME: %JAVA_HOME%"
+rem echo "EXIST_HOME: %EXIST_HOME%"
+echo %JAVA_OPTS%

 %JAVA_CMD% "%JAVA_OPTS%" -Dexist.home="%EXIST_HOME%" -Duse.autodeploy.feature=false -jar "%EXIST_HOME%\start.jar" org.exist.installer.Setup %1 %2 %3 %4 %5 %6 %7 %8 %9

-:eof
+:eof


Buildscript refactoring

Buildscript refactoring

--- buildscript/build.cmd
+++ buildscript/build.cmd
@@ -1,16 +1,5 @@
-@set x86gcc=6.3.0
-@set x64gcc=6.3.0
-@set x86except=dwarf
-@set x64except=seh
-@set x86threading=posix
-@set x64threading=posix
-@set x86mingwver=5
-@set x64mingwver=5
-@set x86mingwrev=1
-@set x64mingwrev=1
-
-@set mesa=%cd%\
-@set mesaunix=%mesa:\=/%
+@set mesa=%cd%/
+@set mesa=%mesa:\=/%
 @set abi=x86
 @set /p x64=Do you want to build for x64?(y/n) Otherwise build for x86:
 @if /I %x64%==y @set abi=x64
@@ -22,20 +11,13 @@
 @if %abi%==x64 @set altabi=%longabi%
 @set minabi=32
 @if %abi%==x64 set minabi=64
-@if "%ProgramW6432%"=="" set vsenv=%ProgramFiles%
-@if NOT "%ProgramW6432%"=="" set vsenv=%ProgramFiles% (x86)
-@if %abi%==x86 set gcc=%vsenv%
-@if %abi%==x64 set gcc=%ProgramFiles%
-@set vsenv="%vsenv%\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\
-@if %abi%==x86 set vsenv=%vsenv%\vcvars32.bat"
-@if %abi%==x64 set vsenv=%vsenv%\vcvars64.bat"
-@call %vsenv%
-
-@if %abi%==x86 set gcc=%gcc%\mingw-w64\%altabi%-%x86gcc%-%x86threading%-%x86except%-rt_v%x86mingwver%-rev%x86mingwrev%
-@if %abi%==x64 set gcc=%gcc%\mingw-w64\%altabi%-%x64gcc%-%x64threading%-%x64except%-rt_v%x64mingwver%-rev%x64mingwrev%
-
-@set PATH=%mesa%flexbison\;%mesa%m4\%abi%\bin\;%mesa%Python\%abi%\;%mesa%Python\%abi%\Scripts\;%mesa%cmake\%abi%\bin\;%PATH%
-@if EXIST "%gcc%" set PATH=%gcc%\mingw%minabi%\bin\;%PATH%
+@set vsenv=%ProgramFiles:\=/%
+@if NOT "%ProgramW6432%"=="" set vsenv=%vsenv% (x86)
+@set vsenv=%vsenv%/Microsoft Visual Studio/2017/Community/VC/Auxiliary/Build/vcvars%minabi%.bat
+@set gcc=%mesa%mingw-w64-%abi%
+@set PATH=%mesa%flexbison/;%mesa%m4/%abi%/bin/;%mesa%Python/%abi%/;%mesa%Python/%abi%/Scripts/;%mesa%cmake/%abi%/bin/;%PATH%
+@if EXIST "%gcc%" set PATH=%gcc%/mingw%minabi%/bin/;%PATH%
+@if EXIST "%gcc%" set gcc=%gcc%/mingw%minabi%/bin

 @pip install -U mako
 @pip freeze > requirements.txt
@@ -50,8 +32,10 @@
 @RD /S /Q %abi%
 @RD /S /Q cmake-%abi%
 @md cmake-%abi%
-@cd cmake-%abi%
-@cmake -G "%toolchain%" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_ENABLE_RTTI=1 -DLLVM_USE_CRT_RELEASE=MT -DLLVM_ENABLE_TERMINFO=OFF -DCMAKE_INSTALL_PREFIX=%mesaunix%llvm/%abi% ..
+@cd cmake-%abi%
+@set vsenvloaded=1
+@call "%vsenv%"
+@cmake -G "%toolchain%" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_ENABLE_RTTI=1 -DLLVM_USE_CRT_RELEASE=MT -DLLVM_ENABLE_TERMINFO=OFF -DCMAKE_INSTALL_PREFIX=%mesa%llvm/%abi% ..
 @pause
 @msbuild /p:Configuration=Release INSTALL.vcxproj
 @pause
@@ -66,7 +50,7 @@
 @MD %abi%
 @set dxtn=gcc -shared
 @if %abi%==x86 set dxtn=%dxtn% -m32
-@set dxtn=%dxtn% -v *.c *.h -I ..\mesa\include -Wl,--dll,--dynamicbase,--enable-auto-image-base,--nxcompat -o %abi%\dxtn.dll
+@set dxtn=%dxtn% -v *.c *.h -I ../mesa/include -Wl,--dll,--dynamicbase,--enable-auto-image-base,--nxcompat -o %abi%/dxtn.dll
 @echo.
 @%dxtn%
 @echo.
@@ -74,12 +58,21 @@
 :build_mesa
 @set /p buildmesa=Begin mesa build. Proceed (y/n):
 @if /i NOT %buildmesa%==y GOTO exit
-@set LLVM=%mesaunix%llvm/%abi%
+@set LLVM=%mesa%llvm/%abi%
 @cd %mesa%mesa
 @set mingw=n
 @rem if EXIST "%gcc%" set /p mingw=Do you want to build with MinGW-W64 instead of Visual Studio? (y=yes):
 @set buildmingw=
-@if /i %mingw%==y @set buildmingw=toolchain=crossmingw
+@if /i %mingw%==y (
+@set buildmingw=toolchain=crossmingw
+@mklink /H "%gcc%/%altabi%-w64-mingw32-ar.exe" "%gcc%/ar.exe"
+@mklink /H "%gcc%/%altabi%-w64-mingw32-ranlib.exe" "%gcc%/ranlib.exe"
+)
+@if /i NOT %mingw%==y (
+@if NOT %vsenvloaded==1 (
+@call "%vsenv%"
+)
+)
 @set /p openswr=Do you want to build OpenSWR drivers? (y=yes):
 @set buildswr=
 @if /i %openswr%==y @set buildswr=swr=1


add svn editor

add svn editor


base for a relocation script

base for a relocation script

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

--- startfiles/relocate.bat
+++ startfiles/relocate.bat
@@ -0,0 +1,16 @@
+@echo off
+
+:: set window title
+TITLE WPN-XM Serverpack - Daemon Status Monitor
+
+:: adjust nginx.conf (include path)
+
+:: adjust php.ini
+
+:: adjust mariadb my.cnf
+
+:: delete all temporary files
+del /s /q temp
+
+echo.
+echo WPN-XM was successfully relocated!


Fixed last change.

Fixed last change.

--- scripts/checkbuilds.bat
+++ scripts/checkbuilds.bat
@@ -48,20 +48,22 @@
 path %SAVE_PATH%
 set INCLUDE=%SAVE_INCLUDE%
 rem
-rem Target 4: Visual C++ using scite\vcbuild\scite.dsp
+rem Set path for VC 6
+path %MSDEV_BASE%;%path%
+rem
+rem Target 4: Visual C++ using scintilla\vcbuild\scite.dsp
+rem call scite\scripts\clearboth
+rem cd scintilla\vcbuild
+rem msdev SciLexer.dsp /MAKE "SciLexer - Win32 Release" /REBUILD
+rem if ERRORLEVEL 2 goto ERROR
+rem cd ..\..
+rem
+rem Target 5: Visual C++ using scintilla\vcbuild\SciTE.dsp
 call scite\scripts\clearboth
-cd scintilla\vcbuild
-path %MSDEV_BASE%;%path%
-msdev SciLexer.dsp /MAKE "SciLexer - Win32 Release" /REBUILD
+cd scite\vcbuild
+msdev SciTE.dsp /MAKE "SciTE - Win32 Release" /REBUILD
 if ERRORLEVEL 2 goto ERROR
 cd ..\..
-rem
-rem Target 5: Visual C++ using scintilla\vcbuild\SciTE.dsp
-rem call scite\scripts\clearboth
-rem cd scite\vcbuild
-rem msdev SciTE.dsp /MAKE "SciTE - Win32 Release" /REBUILD
-rem if ERRORLEVEL 2 goto ERROR
-rem cd ..\..
 rem
 rem Target 6: Visual C++ using scite\boundscheck\SciTE.dsp
 rem call scite\scripts\clearboth


ci: trim the appveyor tests

ci: trim the appveyor tests

Removing the `build/styles` tests because they can take a while and others are more important.

Fix #14451

--- appveyor-e2e.bat
+++ appveyor-e2e.bat
@@ -2,7 +2,7 @@
 IF not defined APPVEYOR_PULL_REQUEST_NUMBER (
   IF not defined BUILDKITE_PULL_REQUEST (
     REM Run full test suite if not on a Appveyor/Buildkite PR.
-    node tests\legacy-cli\run_e2e.js --appveyor "--glob=tests/{basic,commands,generate,build/styles,ivy}/**"
+    node tests\legacy-cli\run_e2e.js --appveyor "--glob=tests/{basic,commands,generate,ivy}/**"
     exit
   )
 )


Add release script for windows

Add release script for windows

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

--- scripts/release_win.bat
+++ scripts/release_win.bat
@@ -0,0 +1,20 @@
+@echo off
+
+if "%~1" == "" (
+  echo Usage: release_win.bat path-to-bin-folder
+  goto end
+)
+
+setlocal
+set destdir="%cd%\%~1"
+
+mkdir build
+cd build
+del CMakeCache.txt rem make sure to use default settings
+cmake -D CMAKE_INSTALL_PREFIX=%destdir% -G "Visual Studio 12 2013 Win64" ..
+ICProjConvert150 embree.sln /IC /s /f
+cmake --build . --config Release --target INSTALL -- /m
+cd ..
+
+endlocal
+:end


fixed timings removed joke

fixed timings
removed joke

--- wip/hib/main.bat
+++ wip/hib/main.bat
@@ -1,4 +1,4 @@
-# http://www.youtube.com/watch?v=tmY4-RMB0YY
-call vid2mng cleese-creativity.mp4 cleese_joke 0:2:19  200 25
-call vid2mng cleese-creativity.mp4 cleese_nat  0:3:59  100 25
-call vid2mng cleese-creativity.mp4 cleese_gymt 0:22:10 175 25
+rem http://www.youtube.com/watch?v=tmY4-RMB0YY
+rem call vid2mng cleese-creativity.mp4 cleese_joke 0:2:19  200 25
+call vid2mng cleese-creativity.mp4 cleese_nat  0:04:00 100 25
+call vid2mng cleese-creativity.mp4 cleese_gymt 0:22:11 150 25


Only install virtualbox and vagrant with choco on Windows

--- presetup-win.cmd
+++ presetup-win.cmd
@@ -1,12 +1,6 @@
 REM Install Chocolatey
 @powershell -NoProfile -ExecutionPolicy unrestricted -Command "iex ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1'))" && SET PATH=%PATH%;%ALLUSERSPROFILE%\chocolatey\bin

-REM Install babun, virtualbox, vagrant, docker
-choco install babun -y
+REM Install virtualbox, vagrant
 choco install virtualbox -y
 choco install vagrant -y
-choco install docker -y
-
-REM Git configuration (proper line endings on Windows and support for long paths)
-git config --global core.autocrlf input
-git config --system core.longpaths true


Windows build script.

Windows build script.

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

--- fortran/build.bat
+++ fortran/build.bat
@@ -0,0 +1,6 @@
+del *.o
+del *.mod
+del mandel.exe
+nagfor -c imageout.f90
+nagfor -c mandel.f90
+nagfor -o mandel.exe mandel.o imageout.o


Added quotes.

Added quotes.

--- sql/src/test/BugTracker-2009/Tests/union_leak.SF-2540169.SQL.bat
+++ sql/src/test/BugTracker-2009/Tests/union_leak.SF-2540169.SQL.bat
@@ -1,10 +1,10 @@
 @prompt # $t $g
 @echo on

-%SQL_CLIENT% %TSTTRGDIR%\%1%.1.sql
-%MAL_CLIENT% %TSTTRGDIR%\%1%.2.mal
-%SQL_CLIENT% %TSTTRGDIR%\%1%.3.sql
-%MAL_CLIENT% %TSTTRGDIR%\%1%.2.mal
-%SQL_CLIENT% %TSTTRGDIR%\%1%.3.sql
-%MAL_CLIENT% %TSTTRGDIR%\%1%.2.mal
-%SQL_CLIENT% %TSTTRGDIR%\%1%.4.sql
+%SQL_CLIENT% "%TSTTRGDIR%\%1%.1.sql"
+%MAL_CLIENT% "%TSTTRGDIR%\%1%.2.mal"
+%SQL_CLIENT% "%TSTTRGDIR%\%1%.3.sql"
+%MAL_CLIENT% "%TSTTRGDIR%\%1%.2.mal"
+%SQL_CLIENT% "%TSTTRGDIR%\%1%.3.sql"
+%MAL_CLIENT% "%TSTTRGDIR%\%1%.2.mal"
+%SQL_CLIENT% "%TSTTRGDIR%\%1%.4.sql"


Remove echo output infront of commands

Remove echo output infront of commands

--- install-win.bat
+++ install-win.bat
@@ -41,19 +41,19 @@
                 mkdir "%~3"
             )
             echo Moving existing %2 to %3
-            echo move "%~2" "%~3"
+            move "%~2" "%~3"
         )
     )

     if !linkExists! == "0" (
         if exist "%~1\" (
-            echo mklink /d "%~2" "%~1"
+            mklink /d "%~2" "%~1"
         ) else (
-            echo mklink "%~2" "%~1"
+            mklink "%~2" "%~1"
         )
-        echo attrib /L "%~2" +h
+        attrib /L "%~2" +h
     ) else (
-        echo Not replacing existing link %2
+        Not replacing existing link %2
     )

 goto:EOF


move the zip'd file over to the package folder

--- launchers/make_launcher.bat
+++ launchers/make_launcher.bat
@@ -9,4 +9,6 @@
 REM copy over to the test app so we can test the launcher out
 REM del /Q /S ..\test_example\launchwin
 REM mkdir ..\test_example\launchwin
-REM xcopy /S launchwin\*.* ..\test_example\launchwin+REM xcopy /S launchwin\*.* ..\test_example\launchwin
+del /Q ..\osnap\launchwin-amd64-window.zip
+move launchwin.zip ..\osnap\launchwin-amd64-window.zip


libosmium: install protozero, utf8, gdalcpp using cmake

--- build_osmium.bat
+++ build_osmium.bat
@@ -21,7 +21,9 @@
    mingw32-make
    %ER%
 ) else (
-   cmake .. %GENERATOR% -DCMAKE_BUILD_TYPE=%VARIANT% -DCMAKE_INSTALL_PREFIX=%PREFIX% %CMAKE_BOOST_FLAGS% -DBUILD_TESTING=%TESTS% -DBUILD_HEADERS=%BUILD_HEADERS% -DBUILD_BENCHMARKS=%BUILD_BENCHMARKS% -DBUILD_DATA_TESTS=%DATATEST%
+   cmake .. %GENERATOR% -DCMAKE_BUILD_TYPE=%VARIANT% -DCMAKE_INSTALL_PREFIX=%PREFIX% %CMAKE_BOOST_FLAGS% ^
+   -DBUILD_TESTING=%TESTS% -DBUILD_HEADERS=%BUILD_HEADERS% -DBUILD_BENCHMARKS=%BUILD_BENCHMARKS% -DBUILD_DATA_TESTS=%DATATEST% ^
+   -DINSTALL_GDALCPP=ON -DINSTALL_PROTOZERO=ON -DINSTALL_UTFCPP=ON)
    %ER%
    %MSBUILD% libosmium.sln
    %ER%
@@ -38,12 +40,5 @@
    %ER%
 )

-mkdir %PREFIX%\include\protozero
-xcopy /i /y /e ..\include\protozero %PREFIX%\include\protozero
-mkdir %PREFIX%\include\utf8
-xcopy /i /y /e ..\include\utf8 %PREFIX%\include\utf8
-
-copy /y ..\include\utf8.h %PREFIX%\include
-copy /y ..\include\gdalcpp.hpp %PREFIX%\include
 cd ..\..


update script

update script

--- build_script.bat
+++ build_script.bat
@@ -4,7 +4,7 @@
 goto custom_python:

 :default_value_python:
-set pythonexe="c:\Python35_x64\python"
+set pythonexe="c:\Python36_x64\python"
 :custom_python:
 %pythonexe% -u setup.py build_script
 if %errorlevel% neq 0 exit /b %errorlevel%


removing docs/make.bat

removing docs/make.bat

--- docs/make.bat
+++ docs/make.bat
@@ -1,113 +0,0 @@
-@ECHO OFF
-
-REM Command file for Sphinx documentation
-
-set SPHINXBUILD=sphinx-build
-set BUILDDIR=_build
-set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS% .
-if NOT "%PAPER%" == "" (
-	set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS%
-)
-
-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.  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.  latex     to make LaTeX files, you can set PAPER=a4 or PAPER=letter
-	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
-	echo.
-	echo.Build finished. The HTML pages are in %BUILDDIR%/html.
-	goto end
-)
-
-if "%1" == "dirhtml" (
-	%SPHINXBUILD% -b dirhtml %ALLSPHINXOPTS% %BUILDDIR%/dirhtml
-	echo.
-	echo.Build finished. The HTML pages are in %BUILDDIR%/dirhtml.
-	goto end
-)
-
-if "%1" == "pickle" (
-	%SPHINXBUILD% -b pickle %ALLSPHINXOPTS% %BUILDDIR%/pickle
-	echo.
-	echo.Build finished; now you can process the pickle files.
-	goto end
-)
-
-if "%1" == "json" (
-	%SPHINXBUILD% -b json %ALLSPHINXOPTS% %BUILDDIR%/json
-	echo.
-	echo.Build finished; now you can process the JSON files.
-	goto end
-)
-
-if "%1" == "htmlhelp" (
-	%SPHINXBUILD% -b htmlhelp %ALLSPHINXOPTS% %BUILDDIR%/htmlhelp
-	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
-	echo.
-	echo.Build finished; now you can run "qcollectiongenerator" with the ^
-.qhcp project file in %BUILDDIR%/qthelp, like this:
-	echo.^> qcollectiongenerator %BUILDDIR%\qthelp\django-treebeard.qhcp
-	echo.To view the help file:
-	echo.^> assistant -collectionFile %BUILDDIR%\qthelp\django-treebeard.ghc
-	goto end
-)
-
-if "%1" == "latex" (
-	%SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
-	echo.
-	echo.Build finished; the LaTeX files are in %BUILDDIR%/latex.
-	goto end
-)
-
-if "%1" == "changes" (
-	%SPHINXBUILD% -b changes %ALLSPHINXOPTS% %BUILDDIR%/changes
-	echo.
-	echo.The overview file is in %BUILDDIR%/changes.
-	goto end
-)
-
-if "%1" == "linkcheck" (
-	%SPHINXBUILD% -b linkcheck %ALLSPHINXOPTS% %BUILDDIR%/linkcheck
-	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
-	echo.
-	echo.Testing of doctests in the sources finished, look at the ^
-results in %BUILDDIR%/doctest/output.txt.
-	goto end
-)
-
-:end


Fixed publishing script

Fixed publishing script

--- NugetPackager/Publish2Nuget.bat
+++ NugetPackager/Publish2Nuget.bat
@@ -12,7 +12,7 @@
 NuGet Update -self

 echo Packaging...
-NuGet Pack ../../SailorsPromises.nuspec -Prop Configuration=Release
+NuGet Pack ./SailorsPromises.nuspec -Prop Configuration=Release
 echo Packaged successfully

 echo publishing package...


Update compact.bat

Update compact.bat

fix url for sdelete

--- scripts/compact.bat
+++ scripts/compact.bat
@@ -12,7 +12,7 @@
 )

 if not exist "C:\Windows\Temp\SDelete.zip" (
-  powershell -Command "(New-Object System.Net.WebClient).DownloadFile('http://download.sysinternals.com/files/SDelete.zip', 'C:\Windows\Temp\SDelete.zip')" <NUL
+  powershell -Command "(New-Object System.Net.WebClient).DownloadFile('http://download.sysinternals.com/files/sdelete.zip', 'C:\Windows\Temp\SDelete.zip')" <NUL
 )

 if not exist "C:\Windows\Temp\sdelete.exe" (


*edit: pbo batch corrected

*edit: pbo batch corrected

--- arma3/TK_PersistentCampaign.CreatePbo.bat
+++ arma3/TK_PersistentCampaign.CreatePbo.bat
@@ -1,2 +1,2 @@
-call "C:\Program Files (x86)\Mikero\DePboTools\bin\MakePbo" -A -N TK_PersistentCampaign.Altis D:\[TK]PersistentCampaign.Altis.pbo
+call "D:\_TeamKommando\_Programme\ExtractPbo\MakePbo" -A -N TK_PersistentCampaign.Altis D:\[TK]PersistentCampaign.Altis.pbo


Remove external/ subdirectory.

Remove external/ subdirectory.

--- topographica-win/create_installer/prepare_for_installer.bat
+++ topographica-win/create_installer/prepare_for_installer.bat
@@ -80,7 +80,8 @@
 REM ** delete .pyc files
 del /S /Q /F *.pyc

-
+REM ** delete external/
+rmdir /Q /S external/

 REM ** Finally, remove topographica-win\


Update python detection

Update python detection

--- Install.bat
+++ Install.bat
@@ -6,6 +6,17 @@
 set "thisDir=%~dp0"
 set /a tried=0
 set "toask=yes"
+set "py2v="
+set "py2path="
+set "py3v="
+set "py3path="
+set "pypath="
+
+REM use_py3:
+REM   TRUE  = Use if found, use py2 otherwise
+REM   FALSE = Use py2
+REM   FORCE = Use py3
+set "use_py3=TRUE"

 goto checkscript

@@ -23,8 +34,22 @@
 goto checkpy

 :checkpy
-python -V > NUL 2>&1
-if not "!errorlevel!" == "0" (
+for /f "tokens=1" %%x in ('where python') do ( call :checkpyversion "%%x" "py2v" "py2path" "py3v" "py3path" )
+set "targetpy=3"
+if /i "!use_py3!" == "FALSE" (
+    set "targetpy=2"
+    set "pypath=!py2path!"
+) else if /i "!use_py3!" == "FORCE" (
+    set "pypath=!py3path!"
+) else if /i "!use_py3!" == "TRUE" (
+    set "pypath=!py3path!"
+    if "!pypath!" == "" set "pypath=!py2path!"
+)
+if not "!pypath!" == "" (
+    goto runscript
+)
+
+if "!pypath!" == "" (
     if %tried% lss 1 (
         if /i "!toask!"=="yes" (
             REM Better ask permission first
@@ -37,6 +62,7 @@
         echo   ###     ###
         echo  # Warning #
         echo ###     ###
+        echo.
         REM Couldn't install for whatever reason - give the error message
         echo Python is not installed or not found in your PATH var.
         echo Please install it from https://www.python.org/downloads/windows/
@@ -53,6 +79,62 @@
     )
 )
 goto runscript
+
+:checkpyversion <path> <py2v> <py2path> <py3v> <py3path>
+set "version="&for /f "tokens=2* USEBACKQ delims= " %%a in (`"%~1" -V 2^>^&1`) do (
+    REM Ensure we have a version number
+    call :isnumber "%%a"
+    if not "!errorlevel!" == "0" goto :EOF
+    set "version=%%a"
+)
+if not defined version goto :EOF
+if "!version:~0,1!" == "2" (
+    REM Python 2
+    call :comparepyversion "!version!" "!%~2!"
+    if "!errorlevel!" == "1" (
+        set "%~2=!version!"
+        set "%~3=%~1"
+    )
+) else (
+    REM Python 3
+    call :comparepyversion "!version!" "!%~4!"
+    if "!errorlevel!" == "1" (
+        set "%~4=!version!"
+        set "%~5=%~1"
+    )
+)
+goto :EOF
+
+:isnumber <check>
+set "var="&for /f "delims=0123456789." %%i in ("%~1") do set var=%%i
+if defined var (exit /b 1)
+exit /b 0
+
+:comparepyversion <version1> <version2> <return>
+REM Exits with status 0 if equal, 1 if v1 gtr v2, 2 if v1 lss v2
+for /f "tokens=1,2,3 delims=." %%a in ("%~1") do (
+    set a1=%%a
+    set a2=%%b
+    set a3=%%c
+)
+for /f "tokens=1,2,3 delims=." %%a in ("%~2") do (
+    set b1=%%a
+    set b2=%%b
+    set b3=%%c
+)
+if not defined a1 set a1=0
+if not defined a2 set a2=0
+if not defined a3 set a3=0
+if not defined b1 set b1=0
+if not defined b2 set b2=0
+if not defined b3 set b3=0
+if %a1% gtr %b1% exit /b 1
+if %a1% lss %b1% exit /b 2
+if %a2% gtr %b2% exit /b 1
+if %a2% lss %b2% exit /b 2
+if %a3% gtr %b3% exit /b 1
+if %a3% lss %b3% exit /b 2
+exit /b 0

 :askinstall
 cls
@@ -60,7 +142,7 @@
 echo  # Python Not Found #
 echo ###              ###
 echo.
-echo Python was not found on the system or in the PATH var.
+echo Python !targetpy! was not found on the system or in the PATH var.
 echo.
 set /p "menu=Would you like to install it now? [y/n]: "
 if /i "!menu!"=="y" (
@@ -92,7 +174,7 @@
 echo Parsing for latest...
 pushd "%TEMP%"
 :: Version detection code slimmed by LussacZheng (https://github.com/corpnewt/gibMacOS/issues/20)
-for /f "tokens=9 delims=< " %%x in ('findstr /i /c:"Latest Python 3 Release" pyurl.txt') do ( set "release=%%x" )
+for /f "tokens=9 delims=< " %%x in ('findstr /i /c:"Latest Python !targetpy! Release" pyurl.txt') do ( set "release=%%x" )
 popd

 echo Found Python !release! -  Downloading...
@@ -102,36 +184,39 @@
 REM At this point - we should have the version number.
 REM We can build the url like so: "https://www.python.org/ftp/python/[version]/python-[version]-amd64.exe"
 set "url=https://www.python.org/ftp/python/!release!/python-!release!-amd64.exe"
+set "pytype=exe"
+if "!targetpy!" == "2" (
+    set "url=https://www.python.org/ftp/python/!release!/python-!release!.amd64.msi"
+    set "pytype=msi"
+)
 REM Now we download it with our slick powershell command
-powershell -command "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; (new-object System.Net.WebClient).DownloadFile('!url!','%TEMP%\pyinstall.exe')"
+powershell -command "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; (new-object System.Net.WebClient).DownloadFile('!url!','%TEMP%\pyinstall.!pytype!')"
 REM If it doesn't exist - we bail
-if not exist "%TEMP%\pyinstall.exe" (
+if not exist "%TEMP%\pyinstall.!pytype!" (
     goto checkpy
 )
 REM It should exist at this point - let's run it to install silently
 echo Installing...
-echo pyinstall.exe /quiet PrependPath=1 Include_test=0 Shortcuts=0 Include_launcher=0
 pushd "%TEMP%"
-pyinstall.exe /quiet PrependPath=1 Include_test=0 Shortcuts=0 Include_launcher=0
+if /i "!pytype!" == "exe" (
+    echo pyinstall.exe /quiet PrependPath=1 Include_test=0 Shortcuts=0 Include_launcher=0
+    pyinstall.exe /quiet PrependPath=1 Include_test=0 Shortcuts=0 Include_launcher=0
+) else (
+    set "foldername=!release:.=!"
+    echo msiexec /i pyinstall.msi /qb ADDLOCAL=ALL TARGETDIR="%LocalAppData%\Programs\Python\Python!foldername:~0,2!"
+    msiexec /i pyinstall.msi /qb ADDLOCAL=ALL TARGETDIR="%LocalAppData%\Programs\Python\Python!foldername:~0,2!"
+)
 popd
-echo Installer finsihed with %ERRORLEVEL% status.
+echo Installer finished with %ERRORLEVEL% status.
 REM Now we should be able to delete the installer and check for py again
-del "%TEMP%\pyinstall.exe"
+del "%TEMP%\pyinstall.!pytype!"
 REM If it worked, then we should have python in our PATH
 REM this does not get updated right away though - let's try
 REM manually updating the local PATH var
 set "spath="
 set "upath="
-for /f "tokens=2* delims= " %%i in ('reg.exe query "HKCU\Environment" /v "Path" 2^> nul') do (
-    if NOT "%%j"=="" (
-		set "upath=%%j"
-	)
-)
-for /f "tokens=2* delims= " %%i in ('reg.exe query "HKLM\SYSTEM\CurrentControlSet\Control\Session Manager\Environment" /v "Path" 2^> nul') do (
-    if NOT "%%j"=="" (
-		set "spath=%%j"
-	)
-)
+for /f "tokens=2* delims= " %%i in ('reg.exe query "HKCU\Environment" /v "Path" 2^> nul') do ( if not "%%j" == "" set "upath=%%j" )
+for /f "tokens=2* delims= " %%i in ('reg.exe query "HKLM\SYSTEM\CurrentControlSet\Control\Session Manager\Environment" /v "Path" 2^> nul') do ( if not "%%j" == "" set "spath=%%j" )
 if not "!spath!" == "" (
     REM We got something in the system path
     set "PATH=!spath!"
@@ -155,8 +240,8 @@
 set "args=%*"
 set "args=!args:"=!"
 if "!args!"=="" (
-    python "!thisDir!!script_name!"
+    "!pypath!" "!thisDir!!script_name!"
 ) else (
-    python "!thisDir!!script_name!" %*
+    "!pypath!" "!thisDir!!script_name!" %*
 )
 goto :EOF


Set Python 3.7 (#899)

Set Python 3.7 (#899)

--- src/windows-build.bat
+++ src/windows-build.bat
@@ -10,7 +10,7 @@

 set WIXVERSION=3.11

-c:\python27-32\scripts\pyinstaller --clean -F --distpath=gam windows-gam.spec
+c:\python37-32\scripts\pyinstaller --clean -F --distpath=gam windows-gam.spec
 xcopy LICENSE gam\
 xcopy whatsnew.txt gam\
 xcopy gam-setup.bat gam\
@@ -18,7 +18,7 @@
 del gam\w9xpopen.exe
 "%ProgramFiles%\7-Zip\7z.exe" a -tzip gam-%1-windows.zip gam\ -xr!.svn

-c:\python27-64\scripts\pyinstaller --clean -F --distpath=gam-64 windows-gam.spec
+c:\python37-64\scripts\pyinstaller --clean -F --distpath=gam-64 windows-gam.spec
 xcopy LICENSE gam-64\
 xcopy whatsnew.txt gam-64\
 xcopy gam-setup.bat gam-64\


add cmd starter script

add cmd starter script

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

--- scripts/starter.bat
+++ scripts/starter.bat
@@ -0,0 +1 @@
+powershell -ExecutionPolicy Bypass .\scripts\build_and_test.ps1


Corrected cmd echoing in Windows script.

git-svn-id: a91d99a4c51940524e539abe295d6ea473345dd2@93 e6edf6fb-f266-4316-afb4-e53d95876a76

--- src/zip/liquibase.bat
+++ src/zip/liquibase.bat
@@ -1,4 +1,4 @@
-rem @echo off
+@echo off
 if "%OS%" == "Windows_NT" setlocal

 rem %~dp0 is expanded pathname of the current script under NT


test wincall instead of mmap

test wincall instead of mmap

git-svn-id: 4e7379b20b57f8e3dde5a0b7363f233184647162@2843 4e380d45-d1fd-0310-85a7-d18ec86df0ad

--- misc/run-all-tests-windows.bat
+++ misc/run-all-tests-windows.bat
@@ -27,8 +27,8 @@
 io\sd_test
 io\test_io "%STXXL_TMPDIR%"
 io\test_cancel "%STXXL_TMPDIR%"
+io\test_io_sizes wincall "%STXXL_TMPDIR%\out" 5368709120
 io\test_io_sizes syscall "%STXXL_TMPDIR%\out" 5368709120
-io\test_io_sizes mmap "%STXXL_TMPDIR%\out" 5368709120
 io\test_io_sizes boostfd "%STXXL_TMPDIR%\out" 5368709120
 io\benchmark_disk_and_flash 0 2 "%STXXL_TMPDIR%\testdiskx" "%STXXL_TMPDIR%\testdisky"
 io\benchmark_configured_disks 2 128


ugh, DOS CR-LF conversion

ugh, DOS CR-LF conversion

--- hw/cpu/grtest.bat
+++ hw/cpu/grtest.bat
@@ -1,6 +1,6 @@
-@echo off
-echo Make sure you are running this from the dos86l or dos386f dir.
-echo Grind test in progress. Results will be written to root directory of this drive.
-test >/GRIND.TXT
-grind >>/GRIND.TXT
-
+@echo off
+echo Make sure you are running this from the dos86l or dos386f dir.
+echo Grind test in progress. Results will be written to root directory of this drive.
+test >/GRIND.TXT
+grind >>/GRIND.TXT
+


[semver] del push2repos.bat

[semver] del push2repos.bat

--- Tools/SemVer/src/push2repos.bat
+++ Tools/SemVer/src/push2repos.bat
@@ -1,19 +0,0 @@
-@echo off
-setlocal
-
-set SEMVER_DIR="w:\SemVer"
-
-rem copy semver.exe
-rem copy readme.md
-rem goto local folder
-cp %GALADIATOR_HOME%\Tools\SemVer\src\semver.exe %SEMVER_DIR%\semver.exe
-cp %GALADIATOR_HOME%\Tools\SemVer\doc\README.MD %SEMVER_DIR%\README.MD
-cd %SEMVER_DIR%
-
-rem push to repos
-rem git add .
-rem git commit -m"%%1"
-rem git push
-
-endlocal
-@echo on


Recompiled libraries with ImageMagick 6.8.8.10.

--- ImageMagick/Source/Checkout.cmd
+++ ImageMagick/Source/Checkout.cmd
@@ -1,7 +1,7 @@
 @echo off

 set REPOS=https://subversion.imagemagick.org/subversion
-set REVISION=15409
+set REVISION=15437

 if not exist ImageMagick goto checkout
 rmdir /s /q ImageMagick


Update Appveyor

Update Appveyor


unsaved files

unsaved files

--- recipes/cookiecutter/run_test.bat
+++ recipes/cookiecutter/run_test.bat
@@ -1,4 +1,4 @@
 pip install -r requirements.txt
 cd "%SRC_DIR%"
-py.test --cov=cookiecutter -k 'not _hg_'
+py.test --cov=cookiecutter -k "not _hg_ and not mercurial"
 if errorlevel 1 exit 1


Copy the canonical etwproviders.man when packaging

The UIforETW repo has two copies of etwproviders.man. Until that is
fixed it is desirable to ship the correct copy in etwpackage.zip.

This change also fixes the inconsistent usage of %~dp0 and standardizes
on %UIforETW%.

--- package_etw.bat
+++ package_etw.bat
@@ -3,7 +3,7 @@
 @echo Creating a package of files for easy use of ETW/WPT.

 set UIforETW=%~dp0
-set destdir=%~dp0etwpackage
+set destdir=%UIforETW%etwpackage

 rmdir %destdir% /s/q
 @if exist %destdir%\bin\UIforETW.exe goto pleasecloseUIforETW
@@ -65,16 +65,18 @@
 xcopy %UIforETW%LICENSE %destdir%
 xcopy %UIforETW%README %destdir%

-xcopy /exclude:%~dp0excludecopy.txt %UIforETW%bin %destdir%\bin /s
-xcopy /exclude:%~dp0excludecopy.txt %UIforETW%include %destdir%\include /s
-xcopy /exclude:%~dp0excludecopy.txt %UIforETW%lib %destdir%\lib /s
-xcopy /exclude:%~dp0excludecopy.txt %UIforETW%third_party %destdir%\third_party /s
+xcopy /exclude:%UIforETW%excludecopy.txt %UIforETW%bin %destdir%\bin /s
+xcopy %UIforETW%ETWProviders\etwproviders.man %destdir%\bin /y
+xcopy /exclude:%UIforETW%excludecopy.txt %UIforETW%include %destdir%\include /s
+xcopy /exclude:%UIforETW%excludecopy.txt %UIforETW%lib %destdir%\lib /s
+xcopy /exclude:%UIforETW%excludecopy.txt %UIforETW%third_party %destdir%\third_party /s
 @rem Get the destinations to exist so that the xcopy proceeds without a question.
 echo >%destdir%\bin\UIforETW.exe
 echo >%destdir%\bin\UIforETW32.exe
 xcopy %UIforETW%bin\UIforETWStatic_devrel32.exe %destdir%\bin\UIforETW32.exe /y
 xcopy %UIforETW%bin\UIforETWStatic_devrel.exe %destdir%\bin\UIforETW.exe /y
-xcopy /exclude:%~dp0excludecopy.txt %destdir%\bin\UIforETW*.exe %~dp0bin /y
+@rem Copy the official binaries back to the local copy, for development purposes.
+xcopy /exclude:%UIforETW%excludecopy.txt %destdir%\bin\UIforETW*.exe %UIforETW%bin /y

 cd /d %UIforETW%
 python %UIforETW%make_zip_file.py %UIforETW%etwpackage.zip etwpackage


Split the user prompting code into functions.

Fixed error checking choices.
Fixed #4

--- win-kickstart.bat
+++ win-kickstart.bat
@@ -1,38 +1,24 @@
 @echo off
-
+setlocal
 :: Main Code
 set original_path=%cd%

 :: Constants
 set nimrod_git_url="git://github.com/Araq/Nimrod.git"
 set csources_git_url="git://github.com/nimrod-code/csources.git"
-set default_nimrod_branch=master
-set default_csources_branch=master
-set default_nimrod_directory="Nimrod"
-set default_csources_directory="csources"
-
-set default_arch="64"
-echo %PROCESSOR_ARCHITECTURE% | findstr "64"
-if ERRORLEVEL 1 set default_arch="32"
-
-
-:: Get the installation path
-:get_install_path
-set /P nimrod_directory="Installation path? (default: 'Nimrod')"
-if "%nimrod_directory%"=="" set nimrod_directory="Nimrod"
-if EXIST %nimrod_directory% (
-	choice /C "cr" /M "Warning, target directory exists. [C]ontinue, or [R]e-input path name?"
-	if ERRORLEVEL 2 (
-		goto:get_install_path
-	)
-)
+
+:: Prompt the user for information
+call:prompt_for_install_path selected_install_path
+call:prompt_for_branches selected_nim_branch selected_csources_branch
+call:prompt_for_build_arch selected_build_arch
+

 :: Clone the Nimrod and csource respositories
 echo.
-git clone %nimrod_git_url% %nimrod_directory%
-call:check_for_error
-
-cd %nimrod_directory%
+git clone %nimrod_git_url% %selected_install_path%
+call:check_for_error
+
+cd %selected_install_path%

 echo.
 git clone %csources_git_url% csources
@@ -41,58 +27,40 @@

 :: Checkout the selected branches.
 :checkout_branches
-echo.
-echo Select a branch by number, or type in an alternate branch name (default: %default_nimrod_branch%)
-echo [1] - Master
-echo [2] - Devel
-echo [3] - BigBreak
-
-set /P selected_nimrod_branch="Branch? "
-if "%selected_nimrod_branch%"=="" (
-	set selected_nimrod_branch=%default_nimrod_branch%
-	set selected_csources_branch=%default_csources_branch%
-) else if "%selected_nimrod_branch%"=="1" (
-	set selected_nimrod_branch="master"
-	set selected_csources_branch="master"
-) else if "%selected_nimrod_branch%"=="2" (
-	set selected_nimrod_branch="devel"
-	set selected_csources_branch="devel"
-) else if "%selected_nimrod_branch%"=="3" (
-	set selected_nimrod_branch="bigbreak"
-	set selected_csources_branch="bigbreak"
-) else (
-	set /P selected_csources_branch="Which csources branch should be used?"
+git checkout %selected_nim_branch%
+if ERRORLEVEL 1 (
+	echo Couldn't check out the branch '%selected_nim_branch%'
+	echo [R]eselect branch, or [Q]uit?
+	choice /C "rq" /N /M ""
+	if ERRORLEVEL 2 (
+		call:exit_batch
+	) else (
+		call:prompt_for_branches
+		goto:checkout_branches
+	)
 )

-git checkout %selected_nimrod_branch%
-if ERRORLEVEL 1 (
-	echo Couldn't check out the branch '%selected_nimrod_branch%'
-	goto:checkout_branches
-)
-
-cd csources
+@cd csources
 git checkout %selected_csources_branch%
 if ERRORLEVEL 1 (
-	echo Couldn't check out the branch '%selected_csources_branch%'
-	cd ..
-	goto:checkout_branches
+	echo Couldn't check out the branch '%selected_nim_branch%'
+	echo [R]eselect branch, or [Q]uit?
+	choice /C "rq" /N /M ""
+	if ERRORLEVEL 2 (
+		call:exit_batch
+	) else (
+		cd ..
+		call:prompt_for_branches
+		goto:checkout_branches
+	)
 )

 :: Build the basic nimrod binary
-:build_csources_binary
-echo Target architecture? This should match the default architecture the C compiler targets.
-echo Valid options are '32' and '64' (default: %arch%)
-set /P arch=""
-if "%arch%"=="" (
-	set arch=%default_arch%
-) else if "%arch%"=="32" (
+if "%selected_build_arch%"=="32" (
 	call build.bat
-) else if "%arch%"=="64" (
+) else if "%selected_build_arch%"=="64" (
 	call build64.bat
-) else (
-	echo Invalid architecture %arch%
-	goto:build_csources_binary
 )

 :: Build final binary
@@ -102,17 +70,133 @@
 .\koch boot -d:release
 call:check_for_error

-
+:end
+endlocal
 exit /B
+@echo off
+
 :: Subroutines

+:: Get the installation path
+:prompt_for_install_path
+setlocal
+
+	set default_nimrod_directory=Nimrod
+
+	:prompt_for_install_path_start
+	echo Installation path? (default: "%default_nimrod_directory%")
+	set /P nimrod_directory=""
+	if "%nimrod_directory%"=="" set nimrod_directory="%default_nimrod_directory%"
+	if EXIST %nimrod_directory% (
+		echo Warning, target directory exists. [C]ontinue, or [R]e-input path name?
+		choice /C "cr" /N /M ""
+		if ERRORLEVEL 2 (
+			echo.
+			goto:prompt_for_install_path_start
+		)
+	)
+echo.
+endlocal & set %~1=%nimrod_directory%
+goto:EOF
+
+:: Prompts the user to select a Nim and csources branch.
+:: Defaults to devel for both.
+:prompt_for_branches
+setlocal
+
+	set default_nimrod_branch=devel
+	set default_csources_branch=devel
+
+	:prompt_for_branches_start
+	echo Select a branch by number, or type in an alternate branch name
+	echo (default: %default_nimrod_branch%)
+	echo [1] - Master
+	echo [2] - Devel
+	echo [3] - BigBreak
+
+	set /P nim_branch=""
+	if "%nim_branch%"=="" (
+		set nim_branch=%default_nimrod_branch%
+		set selected_csources_branch=%default_csources_branch%
+	) else if "%nim_branch%"=="1" (
+		set nim_branch=master
+		set selected_csources_branch=master
+	) else if "%nim_branch%"=="2" (
+		set nim_branch=devel
+		set selected_csources_branch=devel
+	) else if "%nim_branch%"=="3" (
+		set nim_branch=bigbreak
+		set selected_csources_branch=bigbreak
+	) else (
+		echo Which csources branch should be used?
+		set /P selected_csources_branch=""
+		echo Warning: Nonstandard branch configuration being used.
+	)
+
+echo.
+endlocal & set %~1=%nim_branch%& set %~2=%selected_csources_branch%
+goto:EOF
+
+
+:: Prompts the user to select a bitness - either 32 or 64 - defaulting to the
+:: bitness of their system.
+:: Returns either '32' or '64' through the variable r1
+:prompt_for_build_arch
+setlocal enabledelayedexpansion
+
+	echo %PROCESSOR_ARC"HITECTURE% | findstr "64" > NUL
+	if ERRORLEVEL 1 set default_arch=32
+	set default_arch=64
+
+	:prompt_for_build_arch_start
+	echo Target architecture? This should match the default architecture the
+	echo C compiler targets.
+	echo Valid options are '32' and '64' (default: %default_arch%)
+	set /P arch=""
+	if "%arch%"=="" (
+		set arch=%default_arch%
+	) else if "%arch%"=="32" (
+		goto:prompt_for_build_arch_end
+	) else if "%arch%"=="64" (
+		goto:prompt_for_build_arch_end
+	) else (
+		echo Invalid architecture '%arch%'
+		echo.
+		goto:prompt_for_build_arch_start
+	)
+
+:prompt_for_build_arch_end
+endlocal & set %~1=%arch%
+goto:EOF
+
+
+:: Checks if the last program returned an error code, and shows a selection to
+:: either continue or quit if there is.
 :check_for_error
-setlocal
 if ERRORLEVEL 1 (
-	choice /C "cq" /M "Possible error encountered. [C]ontinue, or [Q]uit?"
+	echo Possible error encountered. [C]ontinue, or [Q]uit?
+	choice /C "cq" /N /M ""
 	if ERRORLEVEL 2 (
-			exit /B
+			call:exit_batch
 		)
 	)
-endlocal
-goto:EOF
+echo.
+goto:EOF
+
+:: Cleanly exits batch processing, regardless of where we are
+:exit_batch
+if not exist "%temp%\exit_batch_yes.txt" call :build_yes
+call :CtrlC <"%temp%\exit_batch_yes.txt" 1>nul 2>&1
+:CtrlC
+cmd /c exit -1073741510
+
+:build_yes
+pushd "%temp%"
+set "yes="
+copy nul exit_batch_yes.txt >nul
+for /f "delims=(/ tokens=2" %%Y in (
+  '"copy /-y nul exit_batch_yes.txt <nul"'
+) do if not defined yes set "yes=%%Y"
+echo %yes%>exit_batch_yes.txt
+popd
+exit /b


Not a zend_extension

Not a zend_extension

--- .appveyor/build_task.cmd
+++ .appveyor/build_task.cmd
@@ -45,8 +45,8 @@
 	mkdir c:\tests_tmp
 	set TEST_PHP_EXECUTABLE=%APPVEYOR_BUILD_FOLDER%\build\php.exe
 	set TEST_PHP_JUNIT=c:\tests_tmp\tests-junit.xml
-	if "%OPCACHE%" equ "1" set TEST_PHP_ARGS=!TEST_PHP_ARGS! -d zend_extension=%APPVEYOR_BUILD_FOLDER%\build\ext\php_opcache.so -d opcache.enable=1 -d opcache.enable_cli=1
-	set TEST_PHP_ARGS=-n -d -foo=1 -d zend_extension=%APPVEYOR_BUILD_FOLDER%\build\ext\php_tideways_xhprof.dll
+	if "%OPCACHE%" equ "1" set TEST_PHP_ARGS=!TEST_PHP_ARGS! -d extension=%APPVEYOR_BUILD_FOLDER%\build\ext\php_opcache.so -d opcache.enable=1 -d opcache.enable_cli=1
+	set TEST_PHP_ARGS=-n -d -foo=1 -d extension=%APPVEYOR_BUILD_FOLDER%\build\ext\php_tideways_xhprof.dll
 	set SKIP_DBGP_TESTS=1
 	set SKIP_IPV6_TESTS=1
 	set REPORT_EXIT_STATUS=1


[platform] Windows .bat launcher: fixing VM options loading; part 2

(previous code didn't work due to stupid immediate variable expansion)

GitOrigin-RevId: 3db20a67657c275f83eb3defad33e12b9654eb26

--- platform/build-scripts/resources/win/scripts/executable-template.bat
+++ platform/build-scripts/resources/win/scripts/executable-template.bat
@@ -98,6 +98,7 @@
 IF "%VM_OPTIONS_FILE%" == "" (
   ECHO ERROR: cannot find VM options file.
 ) ELSE (
+  SET ACC=-Djb.vmOptionsFile="%VM_OPTIONS_FILE%"
   FOR /F "eol=# usebackq delims=" %%i IN ("%VM_OPTIONS_FILE%") DO CALL "%IDE_BIN_DIR%\append.bat" "%%i"
 )


Added support for ><

Added support for ><

--- packages/ltx2htm/pl.cmd
+++ packages/ltx2htm/pl.cmd
@@ -227,6 +227,7 @@
 \Slimplies
 \backslash
 \bsl
+\Sxor

 % These are hacks to get the index right


gitlab: remove build dir before building

--- .gitlab-ci/test-msvc.bat
+++ .gitlab-ci/test-msvc.bat
@@ -5,6 +5,7 @@
 @echo on

 set BUILD_DIR=c:\gnet
+@RD /S /Q %BUILD_DIR%

 git clone --depth 1 https://github.com/wingtk/gvsbuild.git || goto :error


Create log directory

Create log directory

--- Bin/Build-Windows.bat
+++ Bin/Build-Windows.bat
@@ -59,6 +59,11 @@
 if not exist %CD%\Build\Plugins mkdir %CD%\Build\Plugins

 echo.
+call :ColorText 0a "Create Logs-Directory..."
+echo.
+if not exist %CD%\Build\Logs mkdir %CD%\Build\Logs
+
+echo.
 call :ColorText 0a "Move Locales (Language-Files)..."
 echo.
 @RD /S /Q %CD%\Build\locales


Add file

Add file

--- CopyBaseFrame.bat
+++ CopyBaseFrame.bat
@@ -4,7 +4,7 @@

 xcopy %BaseFrameDir%\Dep\*.* Dep\ /e/y
 xcopy %BaseFrameDir%\Doc\*.* Doc\  /e/y
-xcopy %BaseFrameDir%\Plugins\NFLuaScriptPlugin\*.* Plugins\NFLuaScriptPlugin\ /e/y
+xcopy %BaseFrameDir%\Frame\*.* Frame\ /e/y

 echo complete up
 pause


Fixed codecoverage tests.

Fixed codecoverage tests.

--- Tools/AppVeyor/CodeCoverage.cmd
+++ Tools/AppVeyor/CodeCoverage.cmd
@@ -6,7 +6,7 @@

 ..\Programs\NuGet.exe restore packages.config -PackagesDirectory .

-OpenCover.4.6.519\tools\OpenCover.Console.exe -target:"%VSINSTALLDIR%Common7\IDE\MSTest.exe" -targetargs:"/noresults /noisolation /testcontainer:""..\..\Tests\Magick.NET.Tests\bin\ReleaseQ8\x86\net45\Magick.NET.Tests.dll" -register:user -threshold:10 -excludebyattribute:*.ExcludeFromCodeCoverage* -excludebyfile:*\Generated\*.cs;*\MagickColors.cs -hideskipped:All -output:.\Magick.NET.Coverage.xml
+OpenCover.4.6.519\tools\OpenCover.Console.exe -target:"%VSINSTALLDIR%Common7\IDE\CommonExtensions\Microsoft\TestWindow\vstest.console.exe" -targetargs:"/platform:x86 /inIsolation ..\..\Tests\Magick.NET.Tests\bin\ReleaseQ8\x86\net45\Magick.NET.Tests.dll" -register:user -threshold:10 -excludebyattribute:*.ExcludeFromCodeCoverage* -excludebyfile:*\Generated\*.cs;*\MagickColors.cs -hideskipped:All -output:.\Magick.NET.Coverage.xml

 SET PATH=C:\\Python34;C:\\Python34\\Scripts;%PATH%
 pip install codecov


Updated the deploy script.

Updated the deploy script.

--- DeployToNuget.bat
+++ DeployToNuget.bat
@@ -15,7 +15,6 @@
 REM Requests the API Key
 REM ====================
 SET /p NuGetApiKey= Please enter the project's NuGet API Key:
-nuget.exe setApiKey %NuGetApiKey%

 SET package="src\Bumblebee.KendoUI\Bumblebee.KendoUI.csproj"

@@ -27,5 +26,6 @@
 REM Push to Nuget
 REM =============
 cd build
+nuget.exe setApiKey %NuGetApiKey%
 nuget.exe push Bumblebee.Automation.KendoUI.*.nupkg -Source https://www.nuget.org/api/v2/package
 cd ..


updated install batch - uspSelCoupons as comment

REM SQLCMD -S %1 -U %2 -P %3 -d %4 -i ./script/uspSelCoupons.sql  ::
uspSelCoupons is deplicated as business logic in CloudBread 2.0.1
release https://github.com/CloudBreadProject/CloudBread/issues/26

https://github.com/CloudBreadProject/CloudBread/issues/26

--- SQL-Script-2.0.0/install-with-sample.bat
+++ SQL-Script-2.0.0/install-with-sample.bat
@@ -31,7 +31,7 @@
 SQLCMD -S %1 -U %2 -P %3 -d %4 -i ./script/uspInsRegMember.sql
 SQLCMD -S %1 -U %2 -P %3 -d %4 -i ./script/uspSelAdminLogin.sql
 SQLCMD -S %1 -U %2 -P %3 -d %4 -i ./script/uspSelAdminLogout.sql
-SQLCMD -S %1 -U %2 -P %3 -d %4 -i ./script/uspSelCoupons.sql
+REM SQLCMD -S %1 -U %2 -P %3 -d %4 -i ./script/uspSelCoupons.sql		:: uspSelCoupons is deplicated as business logic in CloudBread 2.0.1 release https://github.com/CloudBreadProject/CloudBread/issues/26
 SQLCMD -S %1 -U %2 -P %3 -d %4 -i ./script/uspSelGameEvents.sql
 SQLCMD -S %1 -U %2 -P %3 -d %4 -i ./script/uspSelGiftItemToMe.sql
 SQLCMD -S %1 -U %2 -P %3 -d %4 -i ./script/uspSelItem1.sql