Partial fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=55620
Prevent Tomcat from starting on Windows when CATALINA_HOME contains a ; character

git-svn-id: 79cef5a5a257cc9dbe40a45ac190115b4780e2d0@1530890 13f79535-47bb-0310-9956-ffa450edef68

--- bin/catalina.bat
+++ bin/catalina.bat
@@ -132,6 +132,23 @@
 set "CATALINA_BASE=%CATALINA_HOME%"
 :gotBase

+rem Ensure that neither CATALINA_HOME nor CATALINA_BASE contains a semi-colon
+rem as this is used as the separator in the classpath and Java provides no
+rem mechanism for escaping if the same character appears in the path. Check this
+rem by replacing all occurrences of ';' with '' and checking that neither
+rem CATALINA_HOME nor CATALINA_BASE have changed
+if "%CATALINA_HOME%" == "%CATALINA_HOME:;=%" goto homeNoSemicolon
+echo Using CATALINA_HOME:   "%CATALINA_HOME%"
+echo Unable to start as CATALINA_HOME contains a semicolon (;) character
+goto end
+:homeNoSemicolon
+
+if "%CATALINA_BASE%" == "%CATALINA_BASE:;=%" goto baseNoSemicolon
+echo Using CATALINA_BASE:   "%CATALINA_BASE%"
+echo Unable to start as CATALINA_HOME contains a semicolon (;) character
+goto end
+:baseNoSemicolon
+
 rem Ensure that any user defined CLASSPATH variables are not used on startup,
 rem but allow them to be specified in setenv.bat, in rare case when it is needed.
 set CLASSPATH=


run-here: minor code improvement

run-here: minor code improvement

--- bin/run-here.bat
+++ bin/run-here.bat
@@ -18,6 +18,8 @@
 	set "run_rootkey=HKEY_LOCAL_MACHINE"
 	shift
 )
+
+set "run_classkey=%run_rootkey%\Software\Classes"

 :: /I, /U or /S
 set "run_action=%~1"
@@ -97,7 +99,7 @@
 set "run_arguments=%run_arguments:"=\"%"

 for %%s in ( %run_subkey1% ) do (
-	reg add "%run_rootkey%\Software\Classes\%%s\shell\%run_menu%\command" /ve /d "\"%run_progpath%\"%run_arguments%" /f
+	reg add "%run_classkey%\%%s\shell\%run_menu%\command" /ve /d "\"%run_progpath%\"%run_arguments%" /f
 )
 goto :EOF

@@ -106,14 +108,14 @@
 if /i "%run_menu%" == "cmd" goto :run_forbidden

 for %%s in ( %run_subkey1% ) do (
-	reg delete "%run_rootkey%\Software\Classes\%%s\shell\%run_menu%" /f
+	reg delete "%run_classkey%\%%s\shell\%run_menu%" /f
 )
 goto :EOF

 :run_show
 for %%s in ( %run_subkey1% ) do (
-	reg query "%run_rootkey%\Software\Classes\%%s\shell\%run_menu%" /s
+	reg query "%run_classkey%\%%s\shell\%run_menu%" /s
 )
 goto :EOF


fix windows script

fix windows script

--- dependencies/windows/install-qt-sdk-win.cmd
+++ dependencies/windows/install-qt-sdk-win.cmd
@@ -5,7 +5,7 @@
 @rem When updating to a new Qt version, be sure to also update the
 @rem component versions in qt-noninteractive-install-win.qs
 set QT_VERSION=5.12.1
-set QT_SDK_BINARY=qt-opensource-windows-x86-${QT_VERSION}.exe
+set QT_SDK_BINARY=qt-opensource-windows-x86-%QT_VERSION%.exe
 set QT_SDK_URL=https://s3.amazonaws.com/rstudio-buildtools/%QT_SDK_BINARY%
 set QT_SCRIPT=qt-noninteractive-install-win.qs


v1.0.0

--- repair_wmi.bat
+++ repair_wmi.bat
@@ -68,17 +68,17 @@

 :: Get 64-bit stuff
 if exist %SystemRoot%\SysWOW64\wbem (
-		pushd %SystemRoot%\SysWOW64\wbem
-		for %%j in (*.dll) do RegSvr32 -s %%j
-		:: Most aggressive option
-		winmgmt.exe /resetrepository
-		:: Less aggressive option
-		:: winmgmt.exe /salvagerepository /resyncperf
-		wmiadap.exe /RegServer
-		wmiprvse.exe /RegServer
-		popd
-		)
+	pushd %SystemRoot%\SysWOW64\wbem
+	for %%j in (*.dll) do RegSvr32 -s %%j
+	:: Most aggressive option
+	winmgmt.exe /resetrepository
+	:: Less aggressive option
+	:: winmgmt.exe /salvagerepository /resyncperf
+	wmiadap.exe /RegServer
+	wmiprvse.exe /RegServer
 	popd
+)
+popd

 :: finished


add batch script

add batch script

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

--- idea-defaults.cmd
+++ idea-defaults.cmd
@@ -0,0 +1,2 @@
+@echo off
+python %~dp0/idea-defaults.py %*


Use FIND_PACKAGE on windows

Use FIND_PACKAGE on windows

--- recipes/dcmtk/bld.bat
+++ recipes/dcmtk/bld.bat
@@ -12,11 +12,7 @@
     -D DCMTK_WITH_ICU:BOOL=OFF ^
     -D DCMTK_WITH_OPENJPEG:BOOL=OFF ^
     -D DCMTK_WITH_SNDFILE:BOOL=OFF ^
-    -D WITH_LIBPNGINC:PATH=%LIBRARY_PREFIX% ^
-    -D WITH_LIBTIFFINC:PATH=%LIBRARY_PREFIX% ^
-    -D WITH_LIBXMLINC:PATH=%LIBRARY_PREFIX% ^
-    -D WITH_OPENSSLINC:PATH=%LIBRARY_PREFIX% ^
-    -D WITH_ZLIBINC:PATH=%LIBRARY_PREFIX% ^
+    -D DCMTK_USE_FIND_PACKAGE:BOOL=ON ^
     ..
 if errorlevel 1 exit 1


Update bld.bat

Update bld.bat

--- recipes/hugin/bld.bat
+++ recipes/hugin/bld.bat
@@ -21,7 +21,7 @@
     -wxWidgets_LIBRARIES=%LIBRARY_INC%\lib    ^
     -DENBLEND_DIR=%LIBRARY_PREFIX%            ^
     -DOPENEXR_BIN_DIR=%LIBRARY_BIN%           ^
-    -DHUGIN_BUILDER="RamonaOptics"            ^
+    -DHUGIN_BUILDER="conda-forge"             ^
     -DEXIFVTOOL_EXE=%LIBRARY_BIN%\exiftool    ^
     -DEXIV2_DLL=%LIBRARY_BIN%\exiv2.dll       ^
     -DGLEW_DLL=%LIBRARY_BIN%\glew32.dll       ^


Another try.

Another try.

--- recipes/sleef/bld.bat
+++ recipes/sleef/bld.bat
@@ -2,8 +2,9 @@
 cd build

 cmake ^
+    -G"Visual Studio 15 2017" ^
     -DCMAKE_PREFIX_PATH=%LIBRARY_PREFIX% ^
     -DCMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% ^
     ..

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


Уточнены имена дистрибутивов

Уточнены имена дистрибутивов


Enable warnings for MSVS

Enable warnings for MSVS

--- tests/Make-check-cl.bat
+++ tests/Make-check-cl.bat
@@ -35,7 +35,7 @@

 REM List the expected failure (compiler internal error)
 set "expectedFailure1=test-msnapshot.c"
-set "expectedFailure2=test-mtuple.c"
+set "expectedFailure2=test-none.c"

 echo "Compiler full version:"
 cl /Bv
@@ -52,7 +52,7 @@
     REM /Zc:preprocessor is mandatory to have a compliant preprocessor
     REM /Zc:__cplusplus is needed to report the real value of __cplusplus, so that M*LIB uses the C++ atomic, and not its emulation.
     echo Compiling %%f
-    cl.exe /I.. /O2 /std:c++14 /Zc:__cplusplus /Zc:preprocessor test.cpp > %%f.log 2>&1
+    cl.exe /I.. /O2 /W3 /std:c++14 /Zc:__cplusplus /Zc:preprocessor test.cpp > %%f.log 2>&1
     if ERRORLEVEL 1 (
         echo *** BUILD ERROR for %%f *** >> %%f.log
         type %%f.log


added bin/electron-har.cmd variant for windows instances of this module

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

--- bin/electron-har.cmd
+++ bin/electron-har.cmd
@@ -0,0 +1,7 @@
+@IF EXIST "%~dp0\node.exe" (
+  "%~dp0\node.exe"  "%~dp0electron-har" %*
+) ELSE (
+  @SETLOCAL
+  @SET PATHEXT=%PATHEXT:;.JS;=;%
+  node  "%~dp0electron-har" %*
+)


Revision to the Pop windows batch CLI file

--- script/pop.bat
+++ script/pop.bat
@@ -39,6 +39,9 @@
     SET TEST_CFG=-c %SCRIPT_DIR%..\vendor\PopPHPFramework\tests\phpunit-win.xml
 ) else (
     SET TEST_DIR=%2
+    if exist "%TEST_DIR%\phpunit.xml" (
+        SET TEST_CFG=-c %TEST_DIR%\phpunit.xml
+    }
 )
 if not exist %TEST_DIR% (
     goto :nodir


#10 travis files

#10 travis files

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

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


delete

delete

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


initial check-in

initial check-in


Added a windows version of the `post-checkout` file

error: pathspec '.buildkite/hooks/post-checkout.bat' did not match any file(s) known to git

--- .buildkite/hooks/post-checkout.bat
+++ .buildkite/hooks/post-checkout.bat
@@ -0,0 +1,6 @@
+IF "%AGENT_TEST%" == "" (
+  echo "\$AGENT_TEST has not been set"
+  exit 1
+)
+
+SET BUILDKITE_BUILD_CHECKOUT_PATH="tests/%AGENT_TEST%"


win32 use jre instead of JDK

win32 use jre instead of JDK

--- bootstrap/osgi/win32/engage.cmd
+++ bootstrap/osgi/win32/engage.cmd
@@ -45,18 +45,33 @@
 ::ECHO browser launched with PID %IE_PID%
 :: TODO search an kill the IE if not previously open WMIC process %IE_PID% delete

-SET JAVA_CMD=setupJavaSDK.cmd
+
+
+:: source archives location
+SET JAVA_WEB=http://www.klib.io/_archives/java
+
+:: concrete version names for the Java Archives
+SET JAVA_ARCHIVE=win32.x86_64-jre1.8.0_74.zip
+
+:: Java Name (includes version)
+SET JAVA_VERSION=%JAVA_ARCHIVE:~16,-9%
+SET JAVA_NAME=%JAVA_ARCHIVE:~13,-4%
+SET JAVA_WEB_DL=%JAVA_WEB%/%JAVA_VERSION%/%JAVA_ARCHIVE%
+SET JAVA_DL=%DL%\%JAVA_ARCHIVE%
+
+:: extract locations
+SET JAVA_EXTRACT=%JAVA%\%JAVA_VERSION%
+
 ECHO.
-ECHO # downloading and configuring Java via %GITHUB_IO_BOOT%/%JAVA_CMD%
+ECHO # setup local JDK %JAVA_VERSION% in version %JAVA_NAME%
 ECHO.
-powershell -nologo -noprofile  -command "%POWERSHELL_TITLE%;if ( Test-Path %DL%\%JAVA_CMD% ) { Write-Output 'skipping download, cause file exists - %DL%\%JAVA_CMD%' } else {(New-Object System.Net.WebClient).DownloadFile('%GITHUB_IO_BOOT%/%JAVA_CMD%','%DL%\%JAVA_CMD%')}"
+powershell -nologo -noprofile  -command "%POWERSHELL_TITLE%;if ( Test-Path '%JAVA_DL%' ) { Write-Output '   - skipping download,   cause file exists   - %JAVA_DL%' } else { Write-Output '   - downloading archive %JAVA_ARCHIVE%';(New-Object System.Net.WebClient).DownloadFile('%JAVA_WEB_DL%','%JAVA_DL%')}"
 IF "%ERRORLEVEL%"=="" (
-	ECHO failing downloading file %GITHUB_IO_BOOT%/%JAVA_CMD%
+	ECHO failing downloading file %JAVA_WEB%/%JAVA_ARCHIVE%
 	GOTO END
 )

-:: installing JDKs into %SCRIPT_PATH%/java
-CALL %DL%\%JAVA_CMD% %SCRIPT_PATH%
+powershell -nologo -noprofile  -command "%POWERSHELL_TITLE%;if ( Test-Path '%JAVA_EXTRACT%\%JAVA_NAME%' -PathType Container )  { Write-Output '   - skipping extraction, cause folder exists - %JAVA_EXTRACT%\%JAVA_NAME%' } else { Write-Output '   - extracting %JAVA_DL% archive to %JAVA_EXTRACT%'; Add-Type -A System.IO.Compression.FileSystem; [IO.Compression.ZipFile]::ExtractToDirectory('%JAVA_DL%', '%JAVA_EXTRACT%')}"

 FOR /F %%a IN ('DIR /B %SCRIPT_PATH%\java\1.8') DO SET JAVA8=%SCRIPT_PATH%\java\1.8\%%a

@@ -113,8 +128,8 @@
 ECHO -Doomph.installer.update.url=%BINTRAY_BUILD_ROOT%/p2/installer >> %IDEFIX_INI%
 ECHO -Doomph.update.url=%BINTRAY_BUILD_ROOT%/p2/oomph               >> %IDEFIX_INI%
 ECHO -Doomph.setup.installer.mode=advanced                          >> %IDEFIX_INI%
-ECHO -Doomph.redirection.klibProductCatalog=index:/redirectable.products.setup-^>http://peterkir.github.io/idefix/oomph/peterkir/productsCatalog.setup >> %IDEFIX_INI%
-ECHO -Doomph.redirection.klibProjectCatalog=index:/redirectable.projects.setup-^>http://peterkir.github.io/idefix/oomph/peterkir/projectsCatalog.setup >> %IDEFIX_INI%
+ECHO -Doomph.redirection.klibProductCatalog=index:/redirectable.products.setup-^>http://peterkir.github.io/idefix/oomph/osgi/productsCatalog.setup >> %IDEFIX_INI%
+ECHO -Doomph.redirection.klibProjectCatalog=index:/redirectable.projects.setup-^>http://peterkir.github.io/idefix/oomph/osgi/projectsCatalog.setup >> %IDEFIX_INI%

 ECHO.
 ECHO # launching %IDEFIX_NAME%


Windows update script updated to print to file, and check if abs_detailed_report was defined.

--- build/automated/auto_update.bat
+++ build/automated/auto_update.bat
@@ -1,7 +1,7 @@
 @ECHO off

 REM
-REM Automated Build Script for TEMPLATE_PROJECT_NAME to automate the update process by grabbing the latest from the source
+REM Automated Build Script to automate the update process by grabbing the latest from the source
 REM control repository, used here is subversion (svn) though it shouldn't be hard to modify to Git or Hg.
 REM
 REM This may be run by an automated process to clean and/or build each project with an /automated/auto_ script.
@@ -10,6 +10,17 @@
 REM -------------------------------------------------------------------------------------------------------------------

 REM This should go back to project_root to update, which by default was 2 levels back from: project_root/build/automated/
+
+IF NOT DEFINED abs_detailed_report_file (
+	ECHO WARNING: abs_detailed_report_file was not set.
+	SET abs_detailed_report_file="auto_build_report.txt"
+)
+
+(ECHO.)>>%abs_detailed_report_file%
+(ECHO.)>>%abs_detailed_report_file%
+(ECHO updating from source control of %CD%)>>%abs_detailed_report_file%
+(ECHO ========================================================)>>%abs_detailed_report_file%
+
 PUSHD ..\..\
-svn update
+(svn update --quiet --non-interactive)>>%abs_detailed_report_file%
 POPD


fix batch setup file

fix batch setup file

--- build_setup_help_on_windows.bat
+++ build_setup_help_on_windows.bat
@@ -43,7 +43,7 @@
 echo #######################################################

 :setup33:
-IF NOT EXIST c:\Python33 GOTO setup34_64:
+IF NOT EXIST c:\Python33 GOTO setup33_64:
 set pythonexe="c:\Python33\python"
 %pythonexe% setup.py clean_pyd
 %pythonexe% setup.py bdist_wininst
@@ -51,7 +51,7 @@
 echo #######################################################

 :setup33_64:
-IF NOT EXIST c:\Python33_x64 GOTO setup33:
+IF NOT EXIST c:\Python33_x64 GOTO setup34:
 set pythonexe="c:\Python33_x64\python"
 %pythonexe% setup.py clean_pyd
 %pythonexe% setup.py sdist --formats=gztar,zip --verbose
@@ -61,6 +61,7 @@
 echo #######################################################

 :setup34:
+IF NOT EXIST c:\Python34 GOTO setup34_x64_msi_wheel:
 set pythonexe="c:\Python34\python"
 %pythonexe% setup.py clean_pyd
 %pythonexe% setup.py build bdist_wininst --plat-name=win-amd64


Does the windows installation with Windowish defaults Adds a prompt before installing, and a switch /Q to ignore that example added to help text to explain a self contained installation registry information is now loaded without prompts

--- install.bat
+++ install.bat
@@ -4,10 +4,11 @@

 local vars = {}

-vars.PREFIX = [[C:\LuaRocks]]
+
+vars.PREFIX = os.getenv("PROGRAMFILES")..[[\LuaRocks]]
 vars.VERSION = "2.1"
-vars.SYSCONFDIR = nil
-vars.ROCKS_TREE = nil
+vars.SYSCONFDIR = (os.getenv("PROGRAMDATA") or (os.getenv("ALLUSERSPROFILE")..[[\Application Data]])) .. [[\LuaRocks]] -- ALLUSERS for WinXP compat
+vars.ROCKS_TREE = vars.SYSCONFDIR
 vars.SCRIPTS_DIR = nil
 vars.LUA_INTERPRETER = nil
 vars.LUA_PREFIX = nil
@@ -21,13 +22,13 @@
 vars.LUA_RUNTIME = nil
 vars.UNAME_M = nil

-local P_SET = false
 local FORCE = false
 local FORCE_CONFIG = false
 local INSTALL_LUA = false
 local USE_MINGW = false
 local REGISTRY = false
 local NOADMIN = false
+local PROMPT = true

 ---
 -- Some helpers
@@ -111,16 +112,17 @@
 	print(S[[
 Installs LuaRocks.

-/P [dir]       (REQUIRED) Where to install LuaRocks.
+/P [dir]       Where to install LuaRocks.
                Note that version; $VERSION, will be appended to this
                path, so "/P c:\luarocks\" will install in
                "c:\luarocks\$VERSION\"
+               Default is %PROGRAMFILES%\LuaRocks

 Configuring the destinations:
 /TREE [dir]    Root of the local tree of installed rocks.
-               Default is same place of installation
+               Default is %PROGRAMDATA%\LuaRocks
 /SCRIPTS [dir] Where to install commandline scripts installed by
-               rocks. Default is TREE/bin.
+               rocks. Default is {TREE}/bin.

 Configuring the Lua interpreter:
 /LV [version]  Lua version to use; either 5.1 or 5.2.
@@ -148,7 +150,7 @@

 Other options:
 /CONFIG [dir]  Location where the config file should be installed.
-               Default is same place of installation
+               Default is %PROGRAMDATA%\LuaRocks
 /FORCECONFIG   Use a single config location. Do not use the
                LUAROCKS_CONFIG variable or the user's home directory.
                Useful to avoid conflicts when LuaRocks
@@ -161,6 +163,11 @@
                switch to prevent elevation, but make sure the
                destination paths are all accessible for the current
                user.
+/Q             Do not prompt for confirmation of settings
+
+Example:
+To create a self contained install use (assuming Lua is in your PATH):
+INSTALL /P c:\LuaRocks /TREE c:\LuaRocks /CONFIG c:\LuaRocks

 ]])
 end
@@ -176,7 +183,6 @@
 			os.exit(0)
 		elseif name == "/P" then
 			vars.PREFIX = option.value
-			P_SET = true
 		elseif name == "/CONFIG" then
 			vars.SYSCONFDIR = option.value
 		elseif name == "/TREE" then
@@ -205,6 +211,8 @@
 			REGISTRY = true
 		elseif name == "/NOADMIN" then
 			NOADMIN = true
+		elseif name == "/Q" then
+			PROMPT = false
 		else
 			die("Unrecognized option: " .. name)
 		end
@@ -213,9 +221,6 @@

 -- check for combination/required flags
 local function check_flags()
-	if not P_SET then
-		die("Missing required parameter /P")
-	end
 	if INSTALL_LUA then
 		if vars.LUA_INCDIR or vars.LUA_BINDIR or vars.LUA_LIBDIR or vars.LUA_PREFIX then
 			die("Cannot combine option /L with any of /LUA /BIN /LIB /INC")
@@ -531,8 +536,6 @@
 	print("Admin priviledges available for installing")
 end

-vars.SYSCONFDIR = vars.SYSCONFDIR or vars.PREFIX
-vars.ROCKS_TREE = vars.ROCKS_TREE or vars.PREFIX
 vars.FULL_PREFIX = S"$PREFIX\\$VERSION"
 vars.BINDIR = vars.FULL_PREFIX
 vars.LIBDIR = vars.FULL_PREFIX
@@ -563,14 +566,18 @@
 Will configure LuaRocks with the following paths:
 LuaRocks       : $FULL_PREFIX
 Lua interpreter: $LUA_BINDIR\$LUA_INTERPRETER
-Lua binaries   : $LUA_BINDIR
-Lua libraries  : $LUA_LIBDIR
-Lua includes   : $LUA_INCDIR
+    binaries   : $LUA_BINDIR
+    libraries  : $LUA_LIBDIR
+    includes   : $LUA_INCDIR
 Binaries will be linked against: $LUA_LIBNAME with runtime $LUA_RUNTIME
 System architecture detected as: $UNAME_M

 ]])

+if PROMPT then
+	print("Press <ENTER> to start installing, or press <CTRL>+<C> to abort. Use install /? for installation options.")
+	io.read()
+end

 -- ***********************************************************
 -- Install LuaRocks files
@@ -770,7 +777,7 @@
 	print()
 	print([[Loading registry information for ".rockspec" files]])
 	exec( S[[lua5.1\bin\lua5.1.exe "$FULL_PREFIX\LuaRocks.reg.lua" "$FULL_PREFIX\LuaRocks.reg.template"]] )
-	exec( S[["$FULL_PREFIX\\LuaRocks.reg"]] )
+	exec( S[[regedit /S "$FULL_PREFIX\\LuaRocks.reg"]] )
 end

 -- ***********************************************************


remove bld.bat

remove bld.bat

--- recipes/r-samr/bld.bat
+++ recipes/r-samr/bld.bat
@@ -1,8 +0,0 @@
-"%R%" CMD INSTALL --build .
-if errorlevel 1 exit 1
-
-@rem Add more build steps here, if they are necessary.
-
-@rem See
-@rem http://docs.continuum.io/conda/build.html
-@rem for a list of environment variables that are set during the build process.


Skip test that requires tar

Skip test that requires tar

[#114532269]

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

 cd %GATSPATH%
-ginkgo.exe -r -slowSpecThreshold=120 -nodes=2 -skip=NO_DIEGO_SUPPORT . apps backend_compatibility detect docker internet_dependent security_groups ssh routing
+ginkgo.exe -r -slowSpecThreshold=120 -nodes=2 -skip="NO_DIEGO_SUPPORT|Downloading droplets" . apps backend_compatibility detect docker internet_dependent security_groups ssh routing


.gitlab-ci/test-msvc.bat: Generate cover report for tests

...for Visual Studio builds in the CI.

--- .gitlab-ci/test-msvc.bat
+++ .gitlab-ci/test-msvc.bat
@@ -14,6 +14,11 @@

 :: FIXME: can we get code coverage support?

+
+python "%CD%\.gitlab-ci\meson-junit-report.py" --project-name glib ^
+--job-id "%CI_JOB_NAME%" --output "%CD%/_build/%CI_JOB_NAME%-report.xml" ^
+"%CD%/_build/meson-logs/testlog.json"
+
 goto :EOF
 :error
 exit /b 1


gitlab: do not rebuild the deps each time

Instead comment out the rebuild of the dependencies and add instructions
to comment it out in a branch when we need to update the deps

--- .gitlab-ci/test-msvc.bat
+++ .gitlab-ci/test-msvc.bat
@@ -5,13 +5,17 @@
 @echo on

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

-git clone --depth 1 https://github.com/wingtk/gvsbuild.git || goto :error
+:: NOTE: uncomment this in a branch in order to update the depenencies. We do not
+:: build it each time to avoid spending so much of time building openssl and glib
+:: so we just keep it cached in c:\gnet
+::@RD /S /Q %BUILD_DIR%

-pushd gvsbuild
-python.exe build.py --verbose --debug build -p x64 --vs-ver 15 --build-dir %BUILD_DIR% openssl glib || goto :error
-popd
+::git clone --depth 1 https://github.com/wingtk/gvsbuild.git || goto :error
+
+::pushd gvsbuild
+::python.exe build.py --verbose --debug build -p x64 --vs-ver 15 --build-dir %BUILD_DIR% openssl glib || goto :error
+::popd

 set DEPS_DIR=%BUILD_DIR%\gtk\x64\release
 set PATH=%DEPS_DIR%\bin;%PATH%


use quoted string for filepath

use quoted string for filepath

to avoid 'file not found' message from Windows if path contains a space

--- maven-wrapper/mvnw.cmd
+++ maven-wrapper/mvnw.cmd
@@ -121,7 +121,7 @@
 set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain

 set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar"
-FOR /F "tokens=1,2 delims==" %%A IN (%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties) DO (
+FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
     IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
 )


Quotes

Quotes

--- src/test/scripts/test.bat
+++ src/test/scripts/test.bat
@@ -32,7 +32,7 @@
 db2 connect > NUL
 if %ERRORLEVEL% NEQ 0 (
  echo Please connect to a database before the execution of the test
- echo Remember that to call the script the command is 'test <TestSuite>'"
+ echo Remember that to call the script the command is 'test <TestSuite>'
 ) else (
  db2 DELETE FROM LOGDATA.LOGS


Fixing exit code handling

Fixing exit code handling

The endlocal statement will wipe out the ERROR_CODE variable, so we cannot access %ERROR_CODE% after endlocal.

--- src/universal/bin/sbt.bat
+++ src/universal/bin/sbt.bat
@@ -11,7 +11,6 @@

 @echo off
 set SBT_HOME=%~dp0
-set ERROR_CODE=0

 rem FIRST we load the config file of extra options.
 set FN=%SBT_HOME%\..\conf\sbtconfig.txt
@@ -45,10 +44,10 @@
 goto end

 :error
-set ERROR_CODE=1
+@endlocal
+exit /B 1
+

 :end
-
 @endlocal
-
-exit /B %ERROR_CODE%
+exit /B 0


Force clean before build in build script

--- nuget/buildpackage.cmd
+++ nuget/buildpackage.cmd
@@ -6,7 +6,7 @@
 for /D %%D in (%SYSTEMROOT%\Microsoft.NET\Framework\v4*) do set msbuild=%%D\MSBuild.exe
 echo %msbuild%

-%msbuild% ..\src\AtleX.Data.sln /p:Configuration=release
+%msbuild% ..\src\AtleX.Data.sln /p:Configuration=release /t:Clean,Build /maxcpucount

 :: Build NuGet package
 .\tools\nuget pack AtleX.Data.nuspec -OutputDirectory .\output\


Custom deploy script

Custom deploy script

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

--- deploy.cmd
+++ deploy.cmd
@@ -0,0 +1,133 @@
+@if "%SCM_TRACE_LEVEL%" NEQ "4" @echo off
+
+:: ----------------------
+:: KUDU Deployment Script
+:: Version: 1.0.13
+:: ----------------------
+
+:: Prerequisites
+:: -------------
+
+:: Verify node.js installed
+where node 2>nul >nul
+IF %ERRORLEVEL% NEQ 0 (
+  echo Missing node.js executable, please install node.js, if already installed make sure it can be reached from current environment.
+  goto error
+)
+
+:: Setup
+:: -----
+
+setlocal enabledelayedexpansion
+
+SET ARTIFACTS=%~dp0%..\artifacts
+
+IF NOT DEFINED DEPLOYMENT_SOURCE (
+  SET DEPLOYMENT_SOURCE=%~dp0%.
+)
+
+IF NOT DEFINED DEPLOYMENT_TARGET (
+  SET DEPLOYMENT_TARGET=%ARTIFACTS%\wwwroot
+)
+
+IF NOT DEFINED NEXT_MANIFEST_PATH (
+  SET NEXT_MANIFEST_PATH=%ARTIFACTS%\manifest
+
+  IF NOT DEFINED PREVIOUS_MANIFEST_PATH (
+    SET PREVIOUS_MANIFEST_PATH=%ARTIFACTS%\manifest
+  )
+)
+
+IF NOT DEFINED KUDU_SYNC_CMD (
+  :: Install kudu sync
+  echo Installing Kudu Sync
+  call npm install kudusync -g --silent
+  IF !ERRORLEVEL! NEQ 0 goto error
+
+  :: Locally just running "kuduSync" would also work
+  SET KUDU_SYNC_CMD=%appdata%\npm\kuduSync.cmd
+)
+goto Deployment
+
+:: Utility Functions
+:: -----------------
+
+:SelectNodeVersion
+
+IF DEFINED KUDU_SELECT_NODE_VERSION_CMD (
+  :: The following are done only on Windows Azure Websites environment
+  call %KUDU_SELECT_NODE_VERSION_CMD% "%DEPLOYMENT_SOURCE%" "%DEPLOYMENT_TARGET%" "%DEPLOYMENT_TEMP%"
+  IF !ERRORLEVEL! NEQ 0 goto error
+
+  IF EXIST "%DEPLOYMENT_TEMP%\__nodeVersion.tmp" (
+    SET /p NODE_EXE=<"%DEPLOYMENT_TEMP%\__nodeVersion.tmp"
+    IF !ERRORLEVEL! NEQ 0 goto error
+  )
+
+  IF EXIST "%DEPLOYMENT_TEMP%\__npmVersion.tmp" (
+    SET /p NPM_JS_PATH=<"%DEPLOYMENT_TEMP%\__npmVersion.tmp"
+    IF !ERRORLEVEL! NEQ 0 goto error
+  )
+
+  IF NOT DEFINED NODE_EXE (
+    SET NODE_EXE=node
+  )
+
+  SET NPM_CMD="!NODE_EXE!" "!NPM_JS_PATH!"
+) ELSE (
+  SET NPM_CMD=npm
+  SET NODE_EXE=node
+)
+
+goto :EOF
+
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: Deployment
+:: ----------
+
+:Deployment
+echo Handling node.js deployment.
+
+:: 1. KuduSync
+IF /I "%IN_PLACE_DEPLOYMENT%" NEQ "1" (
+  call :ExecuteCmd "%KUDU_SYNC_CMD%" -v 50 -f "%DEPLOYMENT_SOURCE%" -t "%DEPLOYMENT_TARGET%" -n "%NEXT_MANIFEST_PATH%" -p "%PREVIOUS_MANIFEST_PATH%" -i ".git;.hg;.deployment;deploy.cmd"
+  IF !ERRORLEVEL! NEQ 0 goto error
+)
+
+:: 2. Select node version
+call :SelectNodeVersion
+
+:: 3. Install npm packages
+IF EXIST "%DEPLOYMENT_TARGET%\package.json" (
+  pushd "%DEPLOYMENT_TARGET%"
+  call :ExecuteCmd !NPM_CMD! install --production
+  IF !ERRORLEVEL! NEQ 0 goto error
+  popd
+)
+
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+goto end
+
+:: Execute command routine that will echo out when error
+:ExecuteCmd
+setlocal
+set _CMD_=%*
+call %_CMD_%
+if "%ERRORLEVEL%" NEQ "0" echo Failed exitCode=%ERRORLEVEL%, command=%_CMD_%
+exit /b %ERRORLEVEL%
+
+:error
+endlocal
+echo An error has occurred during web site deployment.
+call :exitSetErrorLevel
+call :exitFromFunction 2>nul
+
+:exitSetErrorLevel
+exit /b 1
+
+:exitFromFunction
+()
+
+:end
+endlocal
+echo Finished successfully.


fixes for deployment script

fixes for deployment script

--- deploy.cmd
+++ deploy.cmd
@@ -127,7 +127,7 @@
 IF EXIST "%DEPLOYMENT_TARGET%\package.json" (
   pushd "%DEPLOYMENT_TARGET%"

-  SET NPM_TOOLS="%HOME%\npm_tools"
+  SET NPM_TOOLS=%HOME%\npm_tools

   IF NOT EXIST "%NPM_TOOLS%" (
     mkdir "%NPM_TOOLS%"


Fix deployment script.

Fix deployment script.

--- deploy.cmd
+++ deploy.cmd
@@ -131,21 +131,21 @@
 call copy web.config dist\

 :: 7. Copy custom styles if exists
-IF EXISTS "%DEPLOYMENT_TARGET%\..\assets\%SiteCustomStyleUrl%" (
+IF EXISTS "%HOME%\site\assets\%SiteCustomStyleUrl%" (
   echo Copying custom css styles
-  call copy "%DEPLOYMENT_TARGET%\..\assets\%SiteCustomStyleUrl%" "%DEPLOYMENT_TARGET%\dist\%SiteCustomStyleUrl%"
+  call copy "%HOME%\site\assets\%SiteCustomStyleUrl%" "%DEPLOYMENT_TARGET%\dist\%SiteCustomStyleUrl%"
 )

 :: 8. Copy custom logo if exists
-IF EXISTS "%DEPLOYMENT_TARGET%\..\assets\logo-white.svg" (
+IF EXISTS "%HOME%\site\assets\logo-white.svg" (
   echo Copying custom big logo
-  call copy "%DEPLOYMENT_TARGET%\..\assets\logo-white.svg" "%DEPLOYMENT_TARGET%\dist\assets\logo-white.svg"
+  call copy "%HOME%\site\assets\logo-white.svg" "%DEPLOYMENT_TARGET%\dist\assets\logo-white.svg"
 )

 :: 9. Copy custom small logo if exists
-IF EXISTS "%DEPLOYMENT_TARGET%\..\assets\logo-small-white.svg" (
+IF EXISTS "%HOME%\site\assets\logo-small-white.svg" (
   echo Copying custom small logo
-  call copy "%DEPLOYMENT_TARGET%\..\assets\logo-small-white.svg" "%DEPLOYMENT_TARGET%\dist\assets\logo-small-white.svg"
+  call copy "%HOME%\site\assets\logo-small-white.svg" "%DEPLOYMENT_TARGET%\dist\assets\logo-small-white.svg"
 )

 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::


update db deploy script

update db deploy script

--- deploy.cmd
+++ deploy.cmd
@@ -119,21 +119,5 @@
 :: Custom Wutnu database config
 :: ----------------------------

-:: Parse connection string
-SET _conn=%SQLAZURECONNSTR_WutNuContext%
-SET _conn=%_conn: =%
-SET _conn="%_conn:;=";"%"
-FOR %%a IN (%_conn%) DO @FOR /F %%b IN (%%a) DO SET _%%b
-SET _conn=
-
-:: Call to check for DB schema update
-for /f "delims=" %%A in ('sqlcmd.exe -s "" -W -h -1 -S "%_datasource%" -U "%_userid%" -P "%_password%" -d "%_initialcatalog%" -Q "exit(set nocount on; select count(*) from sys.tables where name='User')"') do set "DBConfigured=%%A"
-
-if "%DBConfigured%"=="0" (
-	echo "configuring database"
-	.\Wutnu3\bin\sqlpackage /Action:Publish /SourceFile:"%DEPLOYMENT_SOURCE%\site\repository\Wutnu.Database.dacpac" /TargetConnectionString:"%SQLAZURECONNSTR_WutNuContext%"
-) else (
-	.\Wutnu3\bin\sqlpackage /Action:Update /SourceFile:"%DEPLOYMENT_SOURCE%\site\repository\Wutnu.Database.dacpac" /TargetConnectionString:"%SQLAZURECONNSTR_WutNuContext%"
-)
-
+.\Wutnu3\bin\sqlpackage /Action:Publish /SourceFile:"%DEPLOYMENT_SOURCE%\site\repository\Wutnu.Database.dacpac" /TargetConnectionString:"%SQLAZURECONNSTR_WutNuContext%"
 echo "DB configuration done"


Make a Microsoft import library for the x64 csound64.dll.

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

--- mingw64/make_import_library.cmd
+++ mingw64/make_import_library.cmd
@@ -0,0 +1,6 @@
+@echo CREATING MICROSOFT IMPORT LIBRARY FOR CSOUND64.DLL FOR X64
+dumpbin /exports csound-mingw64/csound64.dll > exports.txt
+@echo LIBRARY CSOUND64 >> csound64.def
+@echo EXPORTS >> csound64.def
+FOR /F "skip=19 tokens=4" %%l in (exports.txt) do @echo %%l >> csound64.def
+lib /def:csound64.def /out:csound64.lib /machine:x64


Create run.bat

Create run.bat

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

--- algorithms/quicksort/run.bat
+++ algorithms/quicksort/run.bat
@@ -0,0 +1,5 @@
+mkdir bin
+javac -d bin Program.java
+cd bin
+java -ea Program
+pause


Other extract command

Other extract command

--- script/install-zpm.bat
+++ script/install-zpm.bat
@@ -13,12 +13,9 @@
 ) else (
     powershell -command "Invoke-WebRequest -Uri https://github.com/premake/premake-core/releases/download/v5.0.0-alpha11/premake-5.0.0-alpha11-windows.zip -OutFile premake5.zip"
 )
-dir
 echo Finished downloading premake...

-powershell -command "Add-Type -AssemblyName System.IO.Compression.FileSystem ^
-
-[System.IO.Compression.ZipFile]::ExtractToDirectory('premake5.zip', '.')"
+powershell -command "Expand-Archive premake5.zip -DestinationPath ."

 git clone https://github.com/Zefiros-Software/ZPM.git ./zpm


[KARAF-1124] Fix karaf.bat script to support of braces

git-svn-id: 71d8a689455c5fbb0f077bc40adcfc391e14cb9d@1222679 13f79535-47bb-0310-9956-ffa450edef68

--- assemblies/features/framework/src/main/filtered-resources/resources/bin/karaf.bat
+++ assemblies/features/framework/src/main/filtered-resources/resources/bin/karaf.bat
@@ -60,28 +60,28 @@
 )
 set KARAF_HOME=%DIRNAME%..
 if not exist "%KARAF_HOME%" (
-    call :warn KARAF_HOME is not valid: %KARAF_HOME%
+    call :warn KARAF_HOME is not valid: "%KARAF_HOME%"
     goto END
 )

 if not "%KARAF_BASE%" == "" (
     if not exist "%KARAF_BASE%" (
-       call :warn KARAF_BASE is not valid: %KARAF_BASE%
+       call :warn KARAF_BASE is not valid: "%KARAF_BASE%"
        goto END
     )
 )
 if "%KARAF_BASE%" == "" (
-  set KARAF_BASE=%KARAF_HOME%
+  set "KARAF_BASE=%KARAF_HOME%"
 )

 if not "%KARAF_DATA%" == "" (
     if not exist "%KARAF_DATA%" (
-        call :warn KARAF_DATA is not valid: %KARAF_DATA%
+        call :warn KARAF_DATA is not valid: "%KARAF_DATA%"
         goto END
     )
 )
 if "%KARAF_DATA%" == "" (
-    set KARAF_DATA=%KARAF_BASE%\data
+    set "KARAF_DATA=%KARAF_BASE%\data"
 )

 set LOCAL_CLASSPATH=%CLASSPATH%


CI: alter the ninja reporting for analytics

Add additional information to the build to get some analytics for timing
on each step.

--- utils/build-windows-toolchain.bat
+++ utils/build-windows-toolchain.bat
@@ -39,6 +39,8 @@
 set TEMP=%BuildRoot%\tmp
 set TMP=%BuildRoot%\tmp
 set TMPDIR=%BuildRoot%\tmp
+
+set NINJA_STATUS="[%%f/%%t][%%p][%%es]"

 call :CloneDependencies || (exit /b)
 call :CloneRepositories || (exit /b)


Update chrome-leaner.cmd

Update chrome-leaner.cmd

--- apps/chrome-leaner.cmd
+++ apps/chrome-leaner.cmd
@@ -6,5 +6,5 @@
 cd "%programfiles(x86)%\google\chrome\application"
 chrome.exe --process-per-site --renderer-process-limit=1 --disk-cache-size=1

-#enable dns-over-https
-#enable this in chrome/opera/edge browser: chrome://flags/#dns-over-https
+rem #enable dns-over-https
+rem #enable this in chrome/opera/edge browser: chrome://flags/#dns-over-https


added bru.bat as the equivalent to bru.sh

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

--- bru.bat
+++ bru.bat
@@ -0,0 +1,6 @@
+@echo off
+rem This is the equivalent of bru.sh on Windows.
+rem Add the parent dir of bru.bat to your PATH.
+SET script_dir=%~dp0
+call python3 %script_dir%/autoupdate.py --hours 24
+call python3 %script_dir%/bru.py %*


PR:
Obtained from:
Submitted by:
Reviewed by:
Reverted previous change; unintended check-in of this file.

git-svn-id: 102839466c3b40dd9c7e25c0a1a6d26afc40150a@198189 13f79535-47bb-0310-9956-ffa450edef68

--- fop.bat
+++ fop.bat
@@ -25,7 +25,7 @@
 rem The default commons logger for JDK1.4 is JDK1.4Logger.
 rem To use a different logger, uncomment the one desired below
 rem set LOGCHOICE=-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.NoOpLog
-set LOGCHOICE=-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog
+rem set LOGCHOICE=-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog
 rem set LOGCHOICE=-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.Log4JLogger

 set LOGLEVEL=


Change configure.bat to CRLF (as it should be).

Doing this in master because I can't merge some change from sensors due to
every line being different.

--- configure.bat
+++ configure.bat
@@ -1,547 +1,547 @@
-:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-::
-:: Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-:: All rights reserved.
-:: Contact: Nokia Corporation (qt-info@nokia.com)
-::
-:: This file is part of the Qt Mobility Components.
-::
-:: $QT_BEGIN_LICENSE:LGPL$
-:: No Commercial Usage
-:: This file contains pre-release code and may not be distributed.
-:: You may use this file in accordance with the terms and conditions
-:: contained in the Technology Preview License Agreement accompanying
-:: this package.
-::
-:: GNU Lesser General Public License Usage
-:: Alternatively, this file may be used under the terms of the GNU Lesser
-:: General Public License version 2.1 as published by the Free Software
-:: Foundation and appearing in the file LICENSE.LGPL included in the
-:: packaging of this file.  Please review the following information to
-:: ensure the GNU Lesser General Public License version 2.1 requirements
-:: will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-::
-:: In addition, as a special exception, Nokia gives you certain additional
-:: rights.  These rights are described in the Nokia Qt LGPL Exception
-:: version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-::
-:: If you have questions regarding the use of this file, please contact
-:: Nokia at qt-info@nokia.com.
-::
-::
-::
-::
-::
-::
-::
-::
-:: $QT_END_LICENSE$
-::
-:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-
-@echo off
-
-set QT_MOBILITY_PREFIX= C:\QtMobility
-set BUILD_PATH=%CD%
-set SOURCE_PATH= %~dp0
-cd /D %SOURCE_PATH%
-set SOURCE_PATH=%CD%
-cd /D %BUILD_PATH%
-
-set PROJECT_CONFIG= %BUILD_PATH%\config.in
-set PROJECT_LOG= %BUILD_PATH%\config.log
-set RELEASEMODE=release
-set WIN32_RELEASEMODE=debug_and_release build_all
-set QT_MOBILITY_LIB=
-set BUILD_UNITTESTS=no
-set BUILD_EXAMPLES=no
-set BUILD_DOCS=yes
-set MOBILITY_MODULES=bearer location contacts multimedia publishsubscribe versit messaging systeminfo serviceframework sensors
-set MOBILITY_MODULES_UNPARSED=
-set VC_TEMPLATE_OPTION=
-set QT_PATH=
-set QMAKE_CACHE=%BUILD_PATH%\.qmake.cache
-
-if exist "%QMAKE_CACHE%" del %QMAKE_CACHE%
-if exist "%PROJECT_LOG%" del %PROJECT_LOG%
-if exist "%PROJECT_CONFIG%" del %PROJECT_CONFIG%
-
-echo QT_MOBILITY_SOURCE_TREE = %SOURCE_PATH% > %QMAKE_CACHE%
-echo QT_MOBILITY_BUILD_TREE = %BUILD_PATH% >> %QMAKE_CACHE%
-set QMAKE_CACHE=
-
-:cmdline_parsing
-if "%1" == ""               goto startProcessing
-if "%1" == "-debug"         goto debugTag
-if "%1" == "-release"       goto releaseTag
-if "%1" == "-silent"        goto silentTag
-if "%1" == "-prefix"        goto prefixTag
-if "%1" == "-libdir"        goto libTag
-if "%1" == "-bindir"        goto binTag
-if "%1" == "-headerdir"     goto headerTag
-if "%1" == "-tests"         goto testTag
-if "%1" == "-examples"      goto exampleTag
-if "%1" == "-qt"            goto qtTag
-if "%1" == "-vc"            goto vcTag
-if "%1" == "-no-docs"       goto nodocsTag
-if "%1" == "-modules"       goto modulesTag
-if "%1" == "/?"             goto usage
-if "%1" == "-h"             goto usage
-if "%1" == "-help"          goto usage
-if "%1" == "--help"         goto usage
-
-
-echo Unknown option: "%1"
-goto usage
-
-:usage
-echo Usage: configure.bat [-prefix (dir)] [headerdir (dir)] [libdir (dir)]
-    echo                  [-bindir (dir)] [-tests] [-examples]
-    echo                  [-debug] [-release] [-silent]
-    echo.
-    echo Options:
-    echo.
-    echo -prefix (dir) ..... This will install everything relative to dir
-    echo                     (default prefix: C:\QtMobility)
-    echo -headerdir (dir) .. Header files will be installed to dir
-    echo                     (default prefix: PREFIX/include)
-    echo -libdir (dir) ..... Libraries will be installed to dir
-    echo                     (default PREFIX/lib)
-    echo -bindir (dir) ..... Executables will be installed to dir
-    echo                     (default PREFIX/bin)
-    echo -debug ............ Build with debugging symbols
-    echo -release .......... Build without debugging symbols
-    echo -silent ........... Reduces build output
-    echo -tests ............ Build unit tests (not build by default)
-    echo                     Note, this adds test symbols to all libraries
-    echo                     and should not be used for release builds.
-    echo -examples ......... Build example applications
-    echo -no-docs .......... Do not build documentation (build by default)
-    echo -modules ^<list^> ... Build only the specified modules (default all)
-    echo                     Choose from: bearer contacts location publishsubscribe
-    echo                     messaging multimedia systeminfo serviceframework versit
-    echo                     Modules should be separated by a space and surrounded
-    echo                     by double quotation. If a
-    echo                     selected module depends on other modules dependencies
-    echo                     will automatically be enabled.
-    echo -vc ............... Generate Visual Studio make files
-
-
-if exist "%PROJECT_CONFIG%" del %PROJECT_CONFIG%
-goto exitTag
-
-:qtTag
-shift
-set QT_PATH=%1\
-shift
-goto cmdline_parsing
-
-:debugTag
-if "%RELEASEMODE%" == "release" set RELEASEMODE=debug
-set WIN32_RELEASEMODE=
-shift
-goto cmdline_parsing
-
-:releaseTag
-if "%RELEASEMODE%" == "debug"   set RELEASEMODE=release
-set WIN32_RELEASEMODE=
-shift
-goto cmdline_parsing
-
-:silentTag
-echo CONFIG += silent > %PROJECT_CONFIG%
-shift
-goto cmdline_parsing
-
-:prefixTag
-shift
-set QT_MOBILITY_PREFIX=%1
-shift
-goto cmdline_parsing
-
-:libTag
-shift
-echo QT_MOBILITY_LIB = %1 >> %PROJECT_CONFIG%
-shift
-goto cmdline_parsing
-
-:binTag
-shift
-echo QT_MOBILITY_BIN = %1 >> %PROJECT_CONFIG%
-shift
-goto cmdline_parsing
-
-:headerTag
-shift
-echo QT_MOBILITY_INCLUDE = %1 >> %PROJECT_CONFIG%
-shift
-goto cmdline_parsing
-
-:testTag
-set BUILD_UNITTESTS=yes
-shift
-goto cmdline_parsing
-
-:exampleTag
-set BUILD_EXAMPLES=yes
-shift
-goto cmdline_parsing
-
-:vcTag
-shift
-set VC_TEMPLATE_OPTION=-tp vc
-goto cmdline_parsing
-
-:nodocsTag
-set BUILD_DOCS=no
-shift
-goto cmdline_parsing
-
-:modulesTag
-shift
-:: %1 can have leading/trailing quotes, so we can't use if "%1" == ""
-if xx%1xx == xxxx (
-    echo. >&2
-    echo >&2The -modules option requires a list of modules.
-    echo. >&2
-    goto usage
-)
-
-:: Remove leading/trailing quotes, if we have them
-set MOBILITY_MODULES_UNPARSED=xxx%1xxx
-set MOBILITY_MODULES_UNPARSED=%MOBILITY_MODULES_UNPARSED:"xxx=%
-set MOBILITY_MODULES_UNPARSED=%MOBILITY_MODULES_UNPARSED:xxx"=%
-set MOBILITY_MODULES_UNPARSED=%MOBILITY_MODULES_UNPARSED:xxx=%
-
-REM reset default modules as we expect a modules list
-set MOBILITY_MODULES=
-
-echo Checking selected modules:
-:modulesTag2
-
-for /f "tokens=1,*" %%a in ("%MOBILITY_MODULES_UNPARSED%") do (
-    set FIRST=%%a
-    set REMAINING=%%b
-)
-
-: What we want is a switch as we need to check module name and only want to
-: distinguish between false and correct module names being passed
-if %FIRST% == bearer (
-    echo     Bearer Management selected
-) else if %FIRST% == contacts (
-    echo     Contacts selected
-) else if %FIRST% == location (
-    echo     Location selected
-) else if %FIRST% == messaging (
-    echo     Messaging selected
-) else if %FIRST% == multimedia (
-    echo     Multimedia selected
-) else if %FIRST% == publishsubscribe (
-    echo     PublishSubscribe selected
-) else if %FIRST% == systeminfo (
-    echo     Systeminfo selected
-) else if %FIRST% == serviceframework (
-    echo     ServiceFramework selected
-) else if %FIRST% == versit (
-    echo     Versit selected ^(implies Contacts^)
-) else if %FIRST% == sensors (
-    echo     Sensors selected
-) else (
-    echo     Unknown module %FIRST%
-    goto errorTag
-)
-
-set MOBILITY_MODULES=%MOBILITY_MODULES% %FIRST%
-if "%REMAINING%" == "" (
-    shift
-) else (
-    set MOBILITY_MODULES_UNPARSED=%REMAINING%
-    goto modulesTag2
-)
-
-SET REMAINING=
-SET FIRST=
-goto cmdline_parsing
-
-:startProcessing
-
-echo CONFIG += %RELEASEMODE% >> %PROJECT_CONFIG%
-echo CONFIG_WIN32 += %WIN32_RELEASEMODE% %RELEASEMODE% >> %PROJECT_CONFIG%
-set RELEASEMODE=
-set WIN32_RELEASEMODE=
-
-set CURRENTDIR=%CD%
-echo %CURRENTDIR%
-if exist %QT_MOBILITY_PREFIX% goto prefixExists
-mkdir %QT_MOBILITY_PREFIX%
-if errorlevel 1 goto invalidPrefix
-cd /D %QT_MOBILITY_PREFIX%
-set QT_MOBILITY_PREFIX=%CD%
-cd /D %CURRENTDIR%
-rd /S /Q %QT_MOBILITY_PREFIX%
-goto endprefixProcessing
-
-:invalidPrefix
-echo "%QT_MOBILITY_PREFIX%" is not a valid directory path.
-goto :exitTag
-
-:prefixExists
-cd /D %QT_MOBILITY_PREFIX%
-set QT_MOBILITY_PREFIX=%CD%
-cd /D %CURRENTDIR%
-
-:endprefixProcessing
-echo QT_MOBILITY_PREFIX = %QT_MOBILITY_PREFIX% >> %PROJECT_CONFIG%
-
-echo build_unit_tests = %BUILD_UNITTESTS% >> %PROJECT_CONFIG%
-set BUILD_UNITTESTS=
-
-echo build_examples = %BUILD_EXAMPLES% >> %PROJECT_CONFIG%
-set BUILD_EXAMPLES=
-
-echo build_docs = %BUILD_DOCS% >> %PROJECT_CONFIG%
-set BUILD_DOCS=
-
-echo qmf_enabled = no >> %PROJECT_CONFIG%
-
-echo isEmpty($$QT_MOBILITY_INCLUDE):QT_MOBILITY_INCLUDE=$$QT_MOBILITY_PREFIX/include >> %PROJECT_CONFIG%
-echo isEmpty($$QT_MOBILITY_LIB):QT_MOBILITY_LIB=$$QT_MOBILITY_PREFIX/lib >> %PROJECT_CONFIG%
-echo isEmpty($$QT_MOBILITY_BIN):QT_MOBILITY_BIN=$$QT_MOBILITY_PREFIX/bin >> %PROJECT_CONFIG%
-
-echo mobility_modules = %MOBILITY_MODULES%  >> %PROJECT_CONFIG%
-REM no Sysinfo support on Maemo yet
-echo maemo5^|maemo6:mobility_modules -= systeminfo >> %PROJECT_CONFIG%
-echo contains(mobility_modules,versit): mobility_modules *= contacts  >> %PROJECT_CONFIG%
-
-echo Checking available Qt
-call %QT_PATH%qmake -v >> %PROJECT_LOG% 2>&1
-if errorlevel 1 goto qmakeNotFound
-goto qmakeFound
-:qmakeNotFound
-echo ... Not found  >> %PROJECT_LOG% 2>&1
-if "%QT_PATH%" == "" (
-    echo >&2Cannot find 'qmake' in your PATH.
-    echo >&2Your PATH is: %PATH%
-) else (
-    echo >&2Cannot find 'qmake' in %QT_PATH%.
-)
-echo >&2Aborting.
-goto errorTag
-
-:qmakeFound
-call %QT_PATH%qmake -query QT_VERSION
-
-goto checkMake
-
-:makeTest
-setlocal
-    set CURRENT_PWD=%CD%
-
-    if %BUILD_PATH% == %SOURCE_PATH% (
-        cd %SOURCE_PATH%\config.tests\make
-        if exist make del make
-    ) else (
-        rmdir /S /Q config.tests\make
-        mkdir config.tests\make
-        cd config.tests\make
-    )
-
-    for /f "tokens=3" %%i in ('call %QT_PATH%qmake %SOURCE_PATH%\config.tests\make\make.pro 2^>^&1 1^>NUL') do set BUILDSYSTEM=%%i
-
-    if %BUILDSYSTEM% == symbian-abld (
-        call make -h >> %PROJECT_LOG% 2>&1
-        if not errorlevel 1 (
-            echo ... Symbian abld make found.
-            set MAKE=make
-        )
-    ) else if %BUILDSYSTEM% == symbian-sbsv2 (
-        call make -h >> %PROJECT_LOG% 2>&1
-        if not errorlevel 1 (
-            echo ... Symbian sbsv2 make found.
-            set MAKE=make
-        )
-    ) else if %BUILDSYSTEM% == win32-nmake (
-        call nmake /? >> %PROJECT_LOG% 2>&1
-        if not errorlevel 1 (
-            echo ... nmake found.
-            set MAKE=nmake
-        )
-    ) else if %BUILDSYSTEM% == win32-mingw (
-        call mingw32-make -v >> %PROJECT_LOG% 2>&1
-        if not errorlevel 1 (
-            echo ... mingw32-make found.
-            set MAKE=mingw32-make
-        )
-    ) else (
-        echo ... Unknown target environment %BUILDSYSTEM%.
-    )
-    call cd %CURRENT_PWD%
-call endlocal&set %1=%MAKE%&set %2=%BUILDSYSTEM%&goto :EOF
-
-:checkMake
-echo Checking make
-call :makeTest MOBILITY_MAKE MOBILITY_BUILDSYSTEM
-if not "%MOBILITY_MAKE%" == "" goto compileTests
-
-echo >&2Cannot find 'nmake', 'mingw32-make' or 'make' in your PATH
-echo >&2Aborting.
-goto errorTag
-
-:compileTest
-setlocal
-    echo Checking %1
-    set CURRENT_PWD=%CD%
-
-    if %BUILD_PATH% == %SOURCE_PATH% (
-        cd %SOURCE_PATH%\config.tests\%2
-        if exist %2 del %2
-    ) else (
-        rmdir /S /Q config.tests\%2
-        mkdir config.tests\%2
-        cd config.tests\%2
-    )
-
-    call %QT_PATH%qmake %SOURCE_PATH%\config.tests\%2\%2.pro >> %PROJECT_LOG% 2>&1
-    call %MOBILITY_MAKE% clean >> %PROJECT_LOG% 2>&1
-    call %MOBILITY_MAKE% >> %PROJECT_LOG% 2>&1
-
-    set FAILED=0
-    if %MOBILITY_BUILDSYSTEM% == symbian-sbsv2 (
-        for /f "tokens=2" %%i in ('%MOBILITY_MAKE% SBS^="@sbs --check"') do set FAILED=1
-    ) else if %MOBILITY_BUILDSYSTEM% == symbian-abld (
-        for /f "tokens=2" %%i in ('%MOBILITY_MAKE% ABLD^="@ABLD.BAT -c" 2^>^&1') do if not %%i == bldfiles set FAILED=1
-    ) else if errorlevel 1 (
-        set FAILED=1
-    )
-
-    if %FAILED% == 0 (
-        echo ... OK
-        echo %2_enabled = yes >> %PROJECT_CONFIG%
-    ) else (
-        echo ... Not Found
-        echo %2_enabled = no >> %PROJECT_CONFIG%
-    )
-
-    cd %CURRENT_PWD%
-endlocal&goto :EOF
-
-:compileTests
-
-echo.
-echo Start of compile tests
-REM compile tests go here.
-call :compileTest LBT lbt
-call :compileTest SNAP snap
-call :compileTest SymbianContactSIM symbiancntsim
-echo End of compile tests
-echo.
-echo.
-
-REM we could skip generating headers if a module is not enabled
-if not exist "%BUILD_PATH%\features" mkdir %BUILD_PATH%\features
-copy %SOURCE_PATH%\features\strict_flags.prf %BUILD_PATH%\features
-echo Generating Mobility Headers...
-rd /s /q %BUILD_PATH%\include
-mkdir %BUILD_PATH%\include
-perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\src\global
-
-set MODULES_TEMP=%MOBILITY_MODULES%
-
-:generateHeaders
-
-for /f "tokens=1,*" %%a in ("%MODULES_TEMP%") do (
-    set FIRST=%%a
-    set REMAINING=%%b
-)
-
-if %FIRST% == bearer (
-    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\src\bearer
-) else if %FIRST% == contacts (
-    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\src\contacts
-    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\src\contacts\requests
-    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\src\contacts\filters
-    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\src\contacts\details
-) else if %FIRST% == location (
-    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\src\location
-) else if %FIRST% == messaging (
-    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\src\messaging
-) else if %FIRST% == multimedia (
-    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\src\multimedia
-    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\src\multimedia\experimental
-) else if %FIRST% == publishsubscribe (
-    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\src\publishsubscribe
-) else if %FIRST% == systeminfo (
-    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\src\systeminfo
-) else if %FIRST% == serviceframework (
-    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\src\serviceframework
-) else if %FIRST% == versit (
-    REM versit implies contacts
-    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\src\versit
-    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\src\contacts
-    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\src\contacts\requests
-    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\src\contacts\filters
-    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\src\contacts\details
-) else if %FIRST% == sensors (
-    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\src\sensors
-)
-
-if "%REMAINING%" == "" (
-    shift
-) else (
-    set MODULES_TEMP=%REMAINING%
-    goto generateHeaders
-)
-
-SET REMAINING=
-SET FIRST=
-SET MODULES_TEMP=
-
-if exist config.pri del config.pri
-ren %PROJECT_CONFIG% config.pri
-
-echo.
-echo Running qmake...
-call %QT_PATH%qmake -recursive %VC_TEMPLATE_OPTION% %SOURCE_PATH%\qtmobility.pro
-if errorlevel 1 goto qmakeRecError
-echo.
-echo configure has finished. You may run %MOBILITY_MAKE% to build the project now.
-goto exitTag
-
-:qmakeRecError
-echo.
-echo configure failed.
-goto errorTag
-
-:errorTag
-set BUILD_PATH=
-set CURRENTDIR=
-set MOBILITY_MAKE=
-set MOBILITY_BUILDSYSTEM=
-set PROJECT_CONFIG=
-set PROJECT_LOG=
-set QT_MOBILITY_PREFIX=
-set QT_PATH=
-set SOURCE_PATH=
-set MOBILITY_MODULES=
-set MOBILITY_MODULES_UNPARSED=
-SET REMAINING=
-SET FIRST=
-SET MODULES_TEMP=
-exit /b 1
-
-:exitTag
-set BUILD_PATH=
-set CURRENTDIR=
-set MOBILITY_MAKE=
-set MOBILITY_BUILDSYSTEM=
-set PROJECT_CONFIG=
-set PROJECT_LOG=
-set QT_MOBILITY_PREFIX=
-set QT_PATH=
-set SOURCE_PATH=
-set MOBILITY_MODULES=
-set MOBILITY_MODULES_UNPARSED=
-SET REMAINING=
-SET FIRST=
-SET MODULES_TEMP=
-exit /b 0
+:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::
+:: Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+:: All rights reserved.
+:: Contact: Nokia Corporation (qt-info@nokia.com)
+::
+:: This file is part of the Qt Mobility Components.
+::
+:: $QT_BEGIN_LICENSE:LGPL$
+:: No Commercial Usage
+:: This file contains pre-release code and may not be distributed.
+:: You may use this file in accordance with the terms and conditions
+:: contained in the Technology Preview License Agreement accompanying
+:: this package.
+::
+:: GNU Lesser General Public License Usage
+:: Alternatively, this file may be used under the terms of the GNU Lesser
+:: General Public License version 2.1 as published by the Free Software
+:: Foundation and appearing in the file LICENSE.LGPL included in the
+:: packaging of this file.  Please review the following information to
+:: ensure the GNU Lesser General Public License version 2.1 requirements
+:: will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+::
+:: In addition, as a special exception, Nokia gives you certain additional
+:: rights.  These rights are described in the Nokia Qt LGPL Exception
+:: version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+::
+:: If you have questions regarding the use of this file, please contact
+:: Nokia at qt-info@nokia.com.
+::
+::
+::
+::
+::
+::
+::
+::
+:: $QT_END_LICENSE$
+::
+:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+
+@echo off
+
+set QT_MOBILITY_PREFIX= C:\QtMobility
+set BUILD_PATH=%CD%
+set SOURCE_PATH= %~dp0
+cd /D %SOURCE_PATH%
+set SOURCE_PATH=%CD%
+cd /D %BUILD_PATH%
+
+set PROJECT_CONFIG= %BUILD_PATH%\config.in
+set PROJECT_LOG= %BUILD_PATH%\config.log
+set RELEASEMODE=release
+set WIN32_RELEASEMODE=debug_and_release build_all
+set QT_MOBILITY_LIB=
+set BUILD_UNITTESTS=no
+set BUILD_EXAMPLES=no
+set BUILD_DOCS=yes
+set MOBILITY_MODULES=bearer location contacts multimedia publishsubscribe versit messaging systeminfo serviceframework sensors
+set MOBILITY_MODULES_UNPARSED=
+set VC_TEMPLATE_OPTION=
+set QT_PATH=
+set QMAKE_CACHE=%BUILD_PATH%\.qmake.cache
+
+if exist "%QMAKE_CACHE%" del %QMAKE_CACHE%
+if exist "%PROJECT_LOG%" del %PROJECT_LOG%
+if exist "%PROJECT_CONFIG%" del %PROJECT_CONFIG%
+
+echo QT_MOBILITY_SOURCE_TREE = %SOURCE_PATH% > %QMAKE_CACHE%
+echo QT_MOBILITY_BUILD_TREE = %BUILD_PATH% >> %QMAKE_CACHE%
+set QMAKE_CACHE=
+
+:cmdline_parsing
+if "%1" == ""               goto startProcessing
+if "%1" == "-debug"         goto debugTag
+if "%1" == "-release"       goto releaseTag
+if "%1" == "-silent"        goto silentTag
+if "%1" == "-prefix"        goto prefixTag
+if "%1" == "-libdir"        goto libTag
+if "%1" == "-bindir"        goto binTag
+if "%1" == "-headerdir"     goto headerTag
+if "%1" == "-tests"         goto testTag
+if "%1" == "-examples"      goto exampleTag
+if "%1" == "-qt"            goto qtTag
+if "%1" == "-vc"            goto vcTag
+if "%1" == "-no-docs"       goto nodocsTag
+if "%1" == "-modules"       goto modulesTag
+if "%1" == "/?"             goto usage
+if "%1" == "-h"             goto usage
+if "%1" == "-help"          goto usage
+if "%1" == "--help"         goto usage
+
+
+echo Unknown option: "%1"
+goto usage
+
+:usage
+echo Usage: configure.bat [-prefix (dir)] [headerdir (dir)] [libdir (dir)]
+    echo                  [-bindir (dir)] [-tests] [-examples]
+    echo                  [-debug] [-release] [-silent]
+    echo.
+    echo Options:
+    echo.
+    echo -prefix (dir) ..... This will install everything relative to dir
+    echo                     (default prefix: C:\QtMobility)
+    echo -headerdir (dir) .. Header files will be installed to dir
+    echo                     (default prefix: PREFIX/include)
+    echo -libdir (dir) ..... Libraries will be installed to dir
+    echo                     (default PREFIX/lib)
+    echo -bindir (dir) ..... Executables will be installed to dir
+    echo                     (default PREFIX/bin)
+    echo -debug ............ Build with debugging symbols
+    echo -release .......... Build without debugging symbols
+    echo -silent ........... Reduces build output
+    echo -tests ............ Build unit tests (not build by default)
+    echo                     Note, this adds test symbols to all libraries
+    echo                     and should not be used for release builds.
+    echo -examples ......... Build example applications
+    echo -no-docs .......... Do not build documentation (build by default)
+    echo -modules ^<list^> ... Build only the specified modules (default all)
+    echo                     Choose from: bearer contacts location publishsubscribe
+    echo                     messaging multimedia systeminfo serviceframework versit
+    echo                     Modules should be separated by a space and surrounded
+    echo                     by double quotation. If a
+    echo                     selected module depends on other modules dependencies
+    echo                     will automatically be enabled.
+    echo -vc ............... Generate Visual Studio make files
+
+
+if exist "%PROJECT_CONFIG%" del %PROJECT_CONFIG%
+goto exitTag
+
+:qtTag
+shift
+set QT_PATH=%1\
+shift
+goto cmdline_parsing
+
+:debugTag
+if "%RELEASEMODE%" == "release" set RELEASEMODE=debug
+set WIN32_RELEASEMODE=
+shift
+goto cmdline_parsing
+
+:releaseTag
+if "%RELEASEMODE%" == "debug"   set RELEASEMODE=release
+set WIN32_RELEASEMODE=
+shift
+goto cmdline_parsing
+
+:silentTag
+echo CONFIG += silent > %PROJECT_CONFIG%
+shift
+goto cmdline_parsing
+
+:prefixTag
+shift
+set QT_MOBILITY_PREFIX=%1
+shift
+goto cmdline_parsing
+
+:libTag
+shift
+echo QT_MOBILITY_LIB = %1 >> %PROJECT_CONFIG%
+shift
+goto cmdline_parsing
+
+:binTag
+shift
+echo QT_MOBILITY_BIN = %1 >> %PROJECT_CONFIG%
+shift
+goto cmdline_parsing
+
+:headerTag
+shift
+echo QT_MOBILITY_INCLUDE = %1 >> %PROJECT_CONFIG%
+shift
+goto cmdline_parsing
+
+:testTag
+set BUILD_UNITTESTS=yes
+shift
+goto cmdline_parsing
+
+:exampleTag
+set BUILD_EXAMPLES=yes
+shift
+goto cmdline_parsing
+
+:vcTag
+shift
+set VC_TEMPLATE_OPTION=-tp vc
+goto cmdline_parsing
+
+:nodocsTag
+set BUILD_DOCS=no
+shift
+goto cmdline_parsing
+
+:modulesTag
+shift
+:: %1 can have leading/trailing quotes, so we can't use if "%1" == ""
+if xx%1xx == xxxx (
+    echo. >&2
+    echo >&2The -modules option requires a list of modules.
+    echo. >&2
+    goto usage
+)
+
+:: Remove leading/trailing quotes, if we have them
+set MOBILITY_MODULES_UNPARSED=xxx%1xxx
+set MOBILITY_MODULES_UNPARSED=%MOBILITY_MODULES_UNPARSED:"xxx=%
+set MOBILITY_MODULES_UNPARSED=%MOBILITY_MODULES_UNPARSED:xxx"=%
+set MOBILITY_MODULES_UNPARSED=%MOBILITY_MODULES_UNPARSED:xxx=%
+
+REM reset default modules as we expect a modules list
+set MOBILITY_MODULES=
+
+echo Checking selected modules:
+:modulesTag2
+
+for /f "tokens=1,*" %%a in ("%MOBILITY_MODULES_UNPARSED%") do (
+    set FIRST=%%a
+    set REMAINING=%%b
+)
+
+: What we want is a switch as we need to check module name and only want to
+: distinguish between false and correct module names being passed
+if %FIRST% == bearer (
+    echo     Bearer Management selected
+) else if %FIRST% == contacts (
+    echo     Contacts selected
+) else if %FIRST% == location (
+    echo     Location selected
+) else if %FIRST% == messaging (
+    echo     Messaging selected
+) else if %FIRST% == multimedia (
+    echo     Multimedia selected
+) else if %FIRST% == publishsubscribe (
+    echo     PublishSubscribe selected
+) else if %FIRST% == systeminfo (
+    echo     Systeminfo selected
+) else if %FIRST% == serviceframework (
+    echo     ServiceFramework selected
+) else if %FIRST% == versit (
+    echo     Versit selected ^(implies Contacts^)
+) else if %FIRST% == sensors (
+    echo     Sensors selected
+) else (
+    echo     Unknown module %FIRST%
+    goto errorTag
+)
+
+set MOBILITY_MODULES=%MOBILITY_MODULES% %FIRST%
+if "%REMAINING%" == "" (
+    shift
+) else (
+    set MOBILITY_MODULES_UNPARSED=%REMAINING%
+    goto modulesTag2
+)
+
+SET REMAINING=
+SET FIRST=
+goto cmdline_parsing
+
+:startProcessing
+
+echo CONFIG += %RELEASEMODE% >> %PROJECT_CONFIG%
+echo CONFIG_WIN32 += %WIN32_RELEASEMODE% %RELEASEMODE% >> %PROJECT_CONFIG%
+set RELEASEMODE=
+set WIN32_RELEASEMODE=
+
+set CURRENTDIR=%CD%
+echo %CURRENTDIR%
+if exist %QT_MOBILITY_PREFIX% goto prefixExists
+mkdir %QT_MOBILITY_PREFIX%
+if errorlevel 1 goto invalidPrefix
+cd /D %QT_MOBILITY_PREFIX%
+set QT_MOBILITY_PREFIX=%CD%
+cd /D %CURRENTDIR%
+rd /S /Q %QT_MOBILITY_PREFIX%
+goto endprefixProcessing
+
+:invalidPrefix
+echo "%QT_MOBILITY_PREFIX%" is not a valid directory path.
+goto :exitTag
+
+:prefixExists
+cd /D %QT_MOBILITY_PREFIX%
+set QT_MOBILITY_PREFIX=%CD%
+cd /D %CURRENTDIR%
+
+:endprefixProcessing
+echo QT_MOBILITY_PREFIX = %QT_MOBILITY_PREFIX% >> %PROJECT_CONFIG%
+
+echo build_unit_tests = %BUILD_UNITTESTS% >> %PROJECT_CONFIG%
+set BUILD_UNITTESTS=
+
+echo build_examples = %BUILD_EXAMPLES% >> %PROJECT_CONFIG%
+set BUILD_EXAMPLES=
+
+echo build_docs = %BUILD_DOCS% >> %PROJECT_CONFIG%
+set BUILD_DOCS=
+
+echo qmf_enabled = no >> %PROJECT_CONFIG%
+
+echo isEmpty($$QT_MOBILITY_INCLUDE):QT_MOBILITY_INCLUDE=$$QT_MOBILITY_PREFIX/include >> %PROJECT_CONFIG%
+echo isEmpty($$QT_MOBILITY_LIB):QT_MOBILITY_LIB=$$QT_MOBILITY_PREFIX/lib >> %PROJECT_CONFIG%
+echo isEmpty($$QT_MOBILITY_BIN):QT_MOBILITY_BIN=$$QT_MOBILITY_PREFIX/bin >> %PROJECT_CONFIG%
+
+echo mobility_modules = %MOBILITY_MODULES%  >> %PROJECT_CONFIG%
+REM no Sysinfo support on Maemo yet
+echo maemo5^|maemo6:mobility_modules -= systeminfo >> %PROJECT_CONFIG%
+echo contains(mobility_modules,versit): mobility_modules *= contacts  >> %PROJECT_CONFIG%
+
+echo Checking available Qt
+call %QT_PATH%qmake -v >> %PROJECT_LOG% 2>&1
+if errorlevel 1 goto qmakeNotFound
+goto qmakeFound
+:qmakeNotFound
+echo ... Not found  >> %PROJECT_LOG% 2>&1
+if "%QT_PATH%" == "" (
+    echo >&2Cannot find 'qmake' in your PATH.
+    echo >&2Your PATH is: %PATH%
+) else (
+    echo >&2Cannot find 'qmake' in %QT_PATH%.
+)
+echo >&2Aborting.
+goto errorTag
+
+:qmakeFound
+call %QT_PATH%qmake -query QT_VERSION
+
+goto checkMake
+
+:makeTest
+setlocal
+    set CURRENT_PWD=%CD%
+
+    if %BUILD_PATH% == %SOURCE_PATH% (
+        cd %SOURCE_PATH%\config.tests\make
+        if exist make del make
+    ) else (
+        rmdir /S /Q config.tests\make
+        mkdir config.tests\make
+        cd config.tests\make
+    )
+
+    for /f "tokens=3" %%i in ('call %QT_PATH%qmake %SOURCE_PATH%\config.tests\make\make.pro 2^>^&1 1^>NUL') do set BUILDSYSTEM=%%i
+
+    if %BUILDSYSTEM% == symbian-abld (
+        call make -h >> %PROJECT_LOG% 2>&1
+        if not errorlevel 1 (
+            echo ... Symbian abld make found.
+            set MAKE=make
+        )
+    ) else if %BUILDSYSTEM% == symbian-sbsv2 (
+        call make -h >> %PROJECT_LOG% 2>&1
+        if not errorlevel 1 (
+            echo ... Symbian sbsv2 make found.
+            set MAKE=make
+        )
+    ) else if %BUILDSYSTEM% == win32-nmake (
+        call nmake /? >> %PROJECT_LOG% 2>&1
+        if not errorlevel 1 (
+            echo ... nmake found.
+            set MAKE=nmake
+        )
+    ) else if %BUILDSYSTEM% == win32-mingw (
+        call mingw32-make -v >> %PROJECT_LOG% 2>&1
+        if not errorlevel 1 (
+            echo ... mingw32-make found.
+            set MAKE=mingw32-make
+        )
+    ) else (
+        echo ... Unknown target environment %BUILDSYSTEM%.
+    )
+    call cd %CURRENT_PWD%
+call endlocal&set %1=%MAKE%&set %2=%BUILDSYSTEM%&goto :EOF
+
+:checkMake
+echo Checking make
+call :makeTest MOBILITY_MAKE MOBILITY_BUILDSYSTEM
+if not "%MOBILITY_MAKE%" == "" goto compileTests
+
+echo >&2Cannot find 'nmake', 'mingw32-make' or 'make' in your PATH
+echo >&2Aborting.
+goto errorTag
+
+:compileTest
+setlocal
+    echo Checking %1
+    set CURRENT_PWD=%CD%
+
+    if %BUILD_PATH% == %SOURCE_PATH% (
+        cd %SOURCE_PATH%\config.tests\%2
+        if exist %2 del %2
+    ) else (
+        rmdir /S /Q config.tests\%2
+        mkdir config.tests\%2
+        cd config.tests\%2
+    )
+
+    call %QT_PATH%qmake %SOURCE_PATH%\config.tests\%2\%2.pro >> %PROJECT_LOG% 2>&1
+    call %MOBILITY_MAKE% clean >> %PROJECT_LOG% 2>&1
+    call %MOBILITY_MAKE% >> %PROJECT_LOG% 2>&1
+
+    set FAILED=0
+    if %MOBILITY_BUILDSYSTEM% == symbian-sbsv2 (
+        for /f "tokens=2" %%i in ('%MOBILITY_MAKE% SBS^="@sbs --check"') do set FAILED=1
+    ) else if %MOBILITY_BUILDSYSTEM% == symbian-abld (
+        for /f "tokens=2" %%i in ('%MOBILITY_MAKE% ABLD^="@ABLD.BAT -c" 2^>^&1') do if not %%i == bldfiles set FAILED=1
+    ) else if errorlevel 1 (
+        set FAILED=1
+    )
+
+    if %FAILED% == 0 (
+        echo ... OK
+        echo %2_enabled = yes >> %PROJECT_CONFIG%
+    ) else (
+        echo ... Not Found
+        echo %2_enabled = no >> %PROJECT_CONFIG%
+    )
+
+    cd %CURRENT_PWD%
+endlocal&goto :EOF
+
+:compileTests
+
+echo.
+echo Start of compile tests
+REM compile tests go here.
+call :compileTest LBT lbt
+call :compileTest SNAP snap
+call :compileTest SymbianContactSIM symbiancntsim
+echo End of compile tests
+echo.
+echo.
+
+REM we could skip generating headers if a module is not enabled
+if not exist "%BUILD_PATH%\features" mkdir %BUILD_PATH%\features
+copy %SOURCE_PATH%\features\strict_flags.prf %BUILD_PATH%\features
+echo Generating Mobility Headers...
+rd /s /q %BUILD_PATH%\include
+mkdir %BUILD_PATH%\include
+perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\src\global
+
+set MODULES_TEMP=%MOBILITY_MODULES%
+
+:generateHeaders
+
+for /f "tokens=1,*" %%a in ("%MODULES_TEMP%") do (
+    set FIRST=%%a
+    set REMAINING=%%b
+)
+
+if %FIRST% == bearer (
+    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\src\bearer
+) else if %FIRST% == contacts (
+    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\src\contacts
+    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\src\contacts\requests
+    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\src\contacts\filters
+    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\src\contacts\details
+) else if %FIRST% == location (
+    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\src\location
+) else if %FIRST% == messaging (
+    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\src\messaging
+) else if %FIRST% == multimedia (
+    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\src\multimedia
+    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\src\multimedia\experimental
+) else if %FIRST% == publishsubscribe (
+    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\src\publishsubscribe
+) else if %FIRST% == systeminfo (
+    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\src\systeminfo
+) else if %FIRST% == serviceframework (
+    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\src\serviceframework
+) else if %FIRST% == versit (
+    REM versit implies contacts
+    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\src\versit
+    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\src\contacts
+    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\src\contacts\requests
+    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\src\contacts\filters
+    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\src\contacts\details
+) else if %FIRST% == sensors (
+    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\src\sensors
+)
+
+if "%REMAINING%" == "" (
+    shift
+) else (
+    set MODULES_TEMP=%REMAINING%
+    goto generateHeaders
+)
+
+SET REMAINING=
+SET FIRST=
+SET MODULES_TEMP=
+
+if exist config.pri del config.pri
+ren %PROJECT_CONFIG% config.pri
+
+echo.
+echo Running qmake...
+call %QT_PATH%qmake -recursive %VC_TEMPLATE_OPTION% %SOURCE_PATH%\qtmobility.pro
+if errorlevel 1 goto qmakeRecError
+echo.
+echo configure has finished. You may run %MOBILITY_MAKE% to build the project now.
+goto exitTag
+
+:qmakeRecError
+echo.
+echo configure failed.
+goto errorTag
+
+:errorTag
+set BUILD_PATH=
+set CURRENTDIR=
+set MOBILITY_MAKE=
+set MOBILITY_BUILDSYSTEM=
+set PROJECT_CONFIG=
+set PROJECT_LOG=
+set QT_MOBILITY_PREFIX=
+set QT_PATH=
+set SOURCE_PATH=
+set MOBILITY_MODULES=
+set MOBILITY_MODULES_UNPARSED=
+SET REMAINING=
+SET FIRST=
+SET MODULES_TEMP=
+exit /b 1
+
+:exitTag
+set BUILD_PATH=
+set CURRENTDIR=
+set MOBILITY_MAKE=
+set MOBILITY_BUILDSYSTEM=
+set PROJECT_CONFIG=
+set PROJECT_LOG=
+set QT_MOBILITY_PREFIX=
+set QT_PATH=
+set SOURCE_PATH=
+set MOBILITY_MODULES=
+set MOBILITY_MODULES_UNPARSED=
+SET REMAINING=
+SET FIRST=
+SET MODULES_TEMP=
+exit /b 0


--- resources/stage_4_repair/purge_windows_telemetry/purge_windows_10_telemetry.bat
+++ resources/stage_4_repair/purge_windows_telemetry/purge_windows_10_telemetry.bat
@@ -6,7 +6,8 @@
 ::                  - win10-unfu**k: https://github.com/dfkt/win10-unfuck
 ::                  - WindowsLies:   https://github.com/WindowsLies/BlockWindows
 ::                  - ... and many other places around the web
-:: Version:       1.1.0-TRON - Disable null-routing of storeedgefd.dsx.mp.microsoft.com, which is required for the App Store to connect. Thanks to /u/derphurr for Wireshark analysis
+:: Version:       1.1.1-TRON + Add additional KB entries. Thanks to /u/kronflux
+::                1.1.0-TRON - Disable null-routing of storeedgefd.dsx.mp.microsoft.com, which is required for the App Store to connect. Thanks to /u/derphurr for Wireshark analysis
 ::                1.0.9-TRON + Add WIN_VER to list of variables to populate if running in standalone mode
 ::                1.0.8-TRON ! Fix critical bug where the check to prevent running the script on any Windows version besides 10 would check WIN_VER_NUM and find the version # to be 6.3 instead of 10
 ::                           / Change "sc delete" commands to "sc config <servicename> start= disabled" for Xbox related services
@@ -39,8 +40,8 @@
 :: PREP AND CHECKS ::
 :::::::::::::::::::::
 @echo off
-set SCRIPT_VERSION=1.1.0-TRON
-set SCRIPT_UPDATED=2016-02-10
+set SCRIPT_VERSION=1.1.1-TRON
+set SCRIPT_UPDATED=2016-02-24

 :: Populate dependent variables if we didn't inherit them from Tron (standalone execution)
 if /i "%LOGPATH%"=="" (
@@ -50,7 +51,7 @@
 	for /f "tokens=3*" %%i IN ('reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion" /v ProductName ^| Find "ProductName"') DO set WIN_VER=%%i %%j
 	for /f "tokens=3*" %%i IN ('reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion" /v CurrentVersion ^| Find "CurrentVersion"') DO set WIN_VER_NUM=%%i
 )
-
+
 :: Make sure we're on Win10
 :: Windows 10 stupidly reports its version number as 6.3 so we can't use WIN_VER_NUM. sigh
 if /i not "%WIN_VER:~0,9%"=="Windows 1" (
@@ -111,91 +112,97 @@
 ::::::::::::::::::::::::::::::::::::::::::::::::::
 :: REMOVE BAD UPDATES
 if "%VERBOSE%"=="yes" (
-	:: 02/22 - kb 2902907 (https://support.microsoft.com/en-us/kb/2902907)
+	:: 02/22 - KB 2902907 (https://support.microsoft.com/en-us/kb/2902907)
 	start /wait "" wusa /uninstall /kb:2902907 /norestart /quiet
-	:: 03/22 - kb 2922324 (https://support.microsoft.com/en-us/kb/2922324)
+	:: 03/22 - KB 2922324 (https://support.microsoft.com/en-us/kb/2922324)
 	start /wait "" wusa /uninstall /kb:2922324 /norestart /quiet
-	:: 04/22 - kb 2952664 (https://support.microsoft.com/en-us/kb/2952664)
+	:: 04/22 - KB 2952664 (https://support.microsoft.com/en-us/kb/2952664)
 	start /wait "" wusa /uninstall /kb:2952664 /norestart /quiet
-	:: 05/22 - kb 2976978 (https://support.microsoft.com/en-us/kb/2976978)
+	:: 05/22 - KB 2976978 (https://support.microsoft.com/en-us/kb/2976978)
 	start /wait "" wusa /uninstall /kb:2976978 /norestart /quiet
-	:: 06/22 - kb 2977759 (https://support.microsoft.com/en-us/kb/2977759)
+	:: 06/22 - KB 2977759 (https://support.microsoft.com/en-us/kb/2977759)
 	start /wait "" wusa /uninstall /kb:2977759 /norestart /quiet
-	:: 07/22 - kb 2990214 (https://support.microsoft.com/en-us/kb/2990214)
+	:: 07/22 - KB 2990214 (https://support.microsoft.com/en-us/kb/2990214)
 	start /wait "" wusa /uninstall /kb:2990214 /norestart /quiet
-	:: 08/22 - kb 3012973 (https://support.microsoft.com/en-us/kb/3012973)
+	:: 08/22 - KB 3012973 (https://support.microsoft.com/en-us/kb/3012973)
 	start /wait "" wusa /uninstall /kb:3012973 /norestart /quiet
-	:: 09/22 - kb 3014460 (https://support.microsoft.com/en-us/kb/3014460)
+	:: 09/22 - KB 3014460 (https://support.microsoft.com/en-us/kb/3014460)
 	start /wait "" wusa /uninstall /kb:3014460 /norestart /quiet
-	:: 10/22 - kb 3015249 (https://support.microsoft.com/en-us/kb/3015249)
+	:: 10/22 - KB 3015249 (https://support.microsoft.com/en-us/kb/3015249)
 	start /wait "" wusa /uninstall /kb:3015249 /norestart /quiet
-	:: 11/22 - kb 3021917 (https://support.microsoft.com/en-us/kb/3021917)
+	:: 11/22 - KB 3021917 (https://support.microsoft.com/en-us/kb/3021917)
 	start /wait "" wusa /uninstall /kb:3021917 /norestart /quiet
-	:: 12/22 - kb 3022345 (https://support.microsoft.com/en-us/kb/3022345)
+	:: 12/22 - KB 3022345 (https://support.microsoft.com/en-us/kb/3022345)
 	start /wait "" wusa /uninstall /kb:3022345 /norestart /quiet
-	:: 13/22 - kb 3035583 (https://support.microsoft.com/en-us/kb/3035583)
+	:: 13/22 - KB 3035583 (https://support.microsoft.com/en-us/kb/3035583)
 	start /wait "" wusa /uninstall /kb:3035583 /norestart /quiet
-	:: 14/22 - kb 3044374 (https://support.microsoft.com/en-us/kb/3044374)
+	:: 14/22 - KB 3044374 (https://support.microsoft.com/en-us/kb/3044374)
 	start /wait "" wusa /uninstall /kb:3044374 /norestart /quiet
-	:: 15/22 - kb 3050265 (https://support.microsoft.com/en-us/kb/3050265)
+	:: 15/22 - KB 3050265 (https://support.microsoft.com/en-us/kb/3050265)
 	start /wait "" wusa /uninstall /kb:3050265 /norestart /quiet
-	:: 16/22 - kb 3050267 (https://support.microsoft.com/en-us/kb/3050267)
+	:: 16/22 - KB 3050267 (https://support.microsoft.com/en-us/kb/3050267)
 	start /wait "" wusa /uninstall /kb:3050267 /norestart /quiet
-	:: 17/22 - kb 3065987 (https://support.microsoft.com/en-us/kb/3065987)
+	:: 17/22 - KB 3065987 (https://support.microsoft.com/en-us/kb/3065987)
 	start /wait "" wusa /uninstall /kb:3065987 /norestart /quiet
-	:: 18/22 - kb 3068708 (https://support.microsoft.com/en-us/kb/3068708)
+	:: 18/22 - KB 3068708 (https://support.microsoft.com/en-us/kb/3068708)
 	start /wait "" wusa /uninstall /kb:3068708 /norestart /quiet
-	:: 19/22 - kb 3075249 (https://support.microsoft.com/en-us/kb/3075249)
+	:: 19/22 - KB 3075249 (https://support.microsoft.com/en-us/kb/3075249)
 	start /wait "" wusa /uninstall /kb:3075249 /norestart /quiet
-	:: 20/22 - kb 3075851 (https://support.microsoft.com/en-us/kb/3075851)
+	:: 20/22 - KB 3075851 (https://support.microsoft.com/en-us/kb/3075851)
 	start /wait "" wusa /uninstall /kb:3075851 /norestart /quiet
-	:: 21/22 - kb 3075853 (https://support.microsoft.com/en-us/kb/3075853)
+	:: 21/22 - KB 3075853 (https://support.microsoft.com/en-us/kb/3075853)
 	start /wait "" wusa /uninstall /kb:3075853 /norestart /quiet
-	:: 22/22 - kb 3080149 (https://support.microsoft.com/en-us/kb/3080149)
+	:: 22/22 - KB 3080149 (https://support.microsoft.com/en-us/kb/3080149)
 	start /wait "" wusa /uninstall /kb:3080149 /norestart /quiet
+	:: Additional KB entries removed by Microsoft; originally associated with telemetry
+	start /wait "" wusa /uninstall /kb:2976987 /norestart /quiet
+	start /wait "" wusa /uninstall /kb:3068707 /norestart /quiet
 ) else (
-	:: 02/22 - kb 2902907 (https://support.microsoft.com/en-us/kb/2902907)
+	:: 02/22 - KB 2902907 (https://support.microsoft.com/en-us/kb/2902907)
 	start /wait "" wusa /uninstall /kb:2902907 /norestart /quiet >> "%LOGPATH%\%LOGFILE%" 2>&1
-	:: 03/22 - kb 2922324 (https://support.microsoft.com/en-us/kb/2922324)
+	:: 03/22 - KB 2922324 (https://support.microsoft.com/en-us/kb/2922324)
 	start /wait "" wusa /uninstall /kb:2922324 /norestart /quiet >> "%LOGPATH%\%LOGFILE%" 2>&1
-	:: 04/22 - kb 2952664 (https://support.microsoft.com/en-us/kb/2952664)
+	:: 04/22 - KB 2952664 (https://support.microsoft.com/en-us/kb/2952664)
 	start /wait "" wusa /uninstall /kb:2952664 /norestart /quiet >> "%LOGPATH%\%LOGFILE%" 2>&1
-	:: 05/22 - kb 2976978 (https://support.microsoft.com/en-us/kb/2976978)
+	:: 05/22 - KB 2976978 (https://support.microsoft.com/en-us/kb/2976978)
 	start /wait "" wusa /uninstall /kb:2976978 /norestart /quiet >> "%LOGPATH%\%LOGFILE%" 2>&1
-	:: 06/22 - kb 2977759 (https://support.microsoft.com/en-us/kb/2977759)
+	:: 06/22 - KB 2977759 (https://support.microsoft.com/en-us/kb/2977759)
 	start /wait "" wusa /uninstall /kb:2977759 /norestart /quiet >> "%LOGPATH%\%LOGFILE%" 2>&1
-	:: 07/22 - kb 2990214 (https://support.microsoft.com/en-us/kb/2990214)
+	:: 07/22 - KB 2990214 (https://support.microsoft.com/en-us/kb/2990214)
 	start /wait "" wusa /uninstall /kb:2990214 /norestart /quiet >> "%LOGPATH%\%LOGFILE%" 2>&1
-	:: 08/22 - kb 3012973 (https://support.microsoft.com/en-us/kb/3012973)
+	:: 08/22 - KB 3012973 (https://support.microsoft.com/en-us/kb/3012973)
 	start /wait "" wusa /uninstall /kb:3012973 /norestart /quiet >> "%LOGPATH%\%LOGFILE%" 2>&1
-	:: 09/22 - kb 3014460 (https://support.microsoft.com/en-us/kb/3014460)
+	:: 09/22 - KB 3014460 (https://support.microsoft.com/en-us/kb/3014460)
 	start /wait "" wusa /uninstall /kb:3014460 /norestart /quiet >> "%LOGPATH%\%LOGFILE%" 2>&1
-	:: 10/22 - kb 3015249 (https://support.microsoft.com/en-us/kb/3015249)
+	:: 10/22 - KB 3015249 (https://support.microsoft.com/en-us/kb/3015249)
 	start /wait "" wusa /uninstall /kb:3015249 /norestart /quiet >> "%LOGPATH%\%LOGFILE%" 2>&1
-	:: 11/22 - kb 3021917 (https://support.microsoft.com/en-us/kb/3021917)
+	:: 11/22 - KB 3021917 (https://support.microsoft.com/en-us/kb/3021917)
 	start /wait "" wusa /uninstall /kb:3021917 /norestart /quiet >> "%LOGPATH%\%LOGFILE%" 2>&1
-	:: 12/22 - kb 3022345 (https://support.microsoft.com/en-us/kb/3022345)
+	:: 12/22 - KB 3022345 (https://support.microsoft.com/en-us/kb/3022345)
 	start /wait "" wusa /uninstall /kb:3022345 /norestart /quiet >> "%LOGPATH%\%LOGFILE%" 2>&1
-	:: 13/22 - kb 3035583 (https://support.microsoft.com/en-us/kb/3035583)
+	:: 13/22 - KB 3035583 (https://support.microsoft.com/en-us/kb/3035583)
 	start /wait "" wusa /uninstall /kb:3035583 /norestart /quiet >> "%LOGPATH%\%LOGFILE%" 2>&1
-	:: 14/22 - kb 3044374 (https://support.microsoft.com/en-us/kb/3044374)
+	:: 14/22 - KB 3044374 (https://support.microsoft.com/en-us/kb/3044374)
 	start /wait "" wusa /uninstall /kb:3044374 /norestart /quiet >> "%LOGPATH%\%LOGFILE%" 2>&1
-	:: 15/22 - kb 3050265 (https://support.microsoft.com/en-us/kb/3050265)
+	:: 15/22 - KB 3050265 (https://support.microsoft.com/en-us/kb/3050265)
 	start /wait "" wusa /uninstall /kb:3050265 /norestart /quiet >> "%LOGPATH%\%LOGFILE%" 2>&1
-	:: 16/22 - kb 3050267 (https://support.microsoft.com/en-us/kb/3050267)
+	:: 16/22 - KB 3050267 (https://support.microsoft.com/en-us/kb/3050267)
 	start /wait "" wusa /uninstall /kb:3050267 /norestart /quiet >> "%LOGPATH%\%LOGFILE%" 2>&1
-	:: 17/22 - kb 3065987 (https://support.microsoft.com/en-us/kb/3065987)
+	:: 17/22 - KB 3065987 (https://support.microsoft.com/en-us/kb/3065987)
 	start /wait "" wusa /uninstall /kb:3065987 /norestart /quiet >> "%LOGPATH%\%LOGFILE%" 2>&1
-	:: 18/22 - kb 3068708 (https://support.microsoft.com/en-us/kb/3068708)
+	:: 18/22 - KB 3068708 (https://support.microsoft.com/en-us/kb/3068708)
 	start /wait "" wusa /uninstall /kb:3068708 /norestart /quiet >> "%LOGPATH%\%LOGFILE%" 2>&1
-	:: 19/22 - kb 3075249 (https://support.microsoft.com/en-us/kb/3075249)
+	:: 19/22 - KB 3075249 (https://support.microsoft.com/en-us/kb/3075249)
 	start /wait "" wusa /uninstall /kb:3075249 /norestart /quiet >> "%LOGPATH%\%LOGFILE%" 2>&1
-	:: 20/22 - kb 3075851 (https://support.microsoft.com/en-us/kb/3075851)
+	:: 20/22 - KB 3075851 (https://support.microsoft.com/en-us/kb/3075851)
 	start /wait "" wusa /uninstall /kb:3075851 /norestart /quiet >> "%LOGPATH%\%LOGFILE%" 2>&1
-	:: 21/22 - kb 3075853 (https://support.microsoft.com/en-us/kb/3075853)
+	:: 21/22 - KB 3075853 (https://support.microsoft.com/en-us/kb/3075853)
 	start /wait "" wusa /uninstall /kb:3075853 /norestart /quiet >> "%LOGPATH%\%LOGFILE%" 2>&1
-	:: 22/22 - kb 3080149 (https://support.microsoft.com/en-us/kb/3080149)
+	:: 22/22 - KB 3080149 (https://support.microsoft.com/en-us/kb/3080149)
 	start /wait "" wusa /uninstall /kb:3080149 /norestart /quiet >> "%LOGPATH%\%LOGFILE%" 2>&1
+	:: Additional KB entries removed by Microsoft; originally associated with telemetry
+	start /wait "" wusa /uninstall /kb:2976987 /norestart /quiet >> "%LOGPATH%\%LOGFILE%" 2>&1
+	start /wait "" wusa /uninstall /kb:3068707 /norestart /quiet >> "%LOGPATH%\%LOGFILE%" 2>&1
 )

@@ -206,8 +213,8 @@
 :: This line needed if we're being called from Tron. In standalone mode we'll already be in the appropriate directory
 pushd stage_4_repair\purge_windows_telemetry 2>NUL

-::start "" /b /wait cscript.exe "%~dp0block_windows_updates.vbs" 2902907 2922324 2952664 2976978 2977759 2990214 3012973 3014460 3015249 3021917 3022345 3035583 3044374 3050265 3050267 3065987 3068708 3075249 3075851 3075853 3080149
-start "" /b /wait cscript.exe "block_windows_updates.vbs" 2902907 2922324 2952664 2976978 2977759 2990214 3012973 3014460 3015249 3021917 3022345 3035583 3044374 3050265 3050267 3065987 3068708 3075249 3075851 3075853 3080149
+::start "" /b /wait cscript.exe "%~dp0block_windows_updates.vbs" 2902907 2922324 2976987 2952664 2976978 2977759 2990214 3012973 3014460 3015249 3021917 3022345 3035583 3044374 3050265 3050267 3065987 3068707 3068708 3075249 3075851 3075853 3080149
+start "" /b /wait cscript.exe "block_windows_updates.vbs" 2902907 2922324 2976987 2952664 2976978 2977759 2990214 3012973 3014460 3015249 3021917 3022345 3035583 3044374 3050265 3050267 3065987 3068707 3068708 3075249 3075851 3075853 3080149

 popd

@@ -485,7 +492,7 @@
 	route -p add 65.52.108.29/32 0.0.0.0
 	:: wes.df.telemetry.microsoft.com
 	route -p add 65.52.100.93/32 0.0.0.0
-) else (
+) else (
 	:: a-0001.a-msedge.net
 	route -p add 204.79.197.200/32 0.0.0.0 >> "%LOGPATH%\%LOGFILE%" 2>&1
 	:: a23-218-212-69.deploy.static.akamaitechnologies.com


Fix windows installer

Fix windows installer

--- script/install-zpm.bat
+++ script/install-zpm.bat
@@ -21,15 +21,14 @@
 powershell -command "Expand-Archive premake5.zip -DestinationPath ."

 git clone https://github.com/Zefiros-Software/ZPM.git ./zpm --depth 1 -b features/refactor
+echo Finished cloning ZPM...

+echo Installing Miniconda...
 for /f "tokens=*" %%i in ('".\premake5 show install --file=zpm/zpm.lua"') do set ZPM_DIR=%%i
-set CONDA_DIR="ZPM_DIR%/conda/
+set CONDA_DIR=%ZPM_DIR%/conda/
 for /f "tokens=*" %%i in ('echo %CONDA_DIR:/=\%') do set CONDA_DIR=%%i
-echo %CONDA_DIR%
-echo %ZPM_DIR%
 start /wait "" Miniconda4-latest-Windows-x86_64.exe /InstallationType=JustMe /RegisterPython=0 /AddToPath=0 /S /D=%CONDA_DIR%

-echo Finished cloning ZPM...

 if defined GH_TOKEN (
     premake5.exe --github-token=%GH_TOKEN% --file=zpm/zpm.lua install zpm


Force cache removal.

Force cache removal.

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

 set REPOS=http://git.imagemagick.org/repos
-set DATE=2016-02-21 15:55
+set DATE=2016-02-21 15:56

 set BASH="%PROGRAMFILES%\Git\bin\bash.exe"
 if exist %BASH% goto EXECUTE


Added Sphinx docs

Added Sphinx docs

--- docs/make.bat
+++ docs/make.bat
@@ -1,36 +1,36 @@
-@ECHO OFF
-
-pushd %~dp0
-
-REM Command file for Sphinx documentation
-
-if "%SPHINXBUILD%" == "" (
-	set SPHINXBUILD=sphinx-build
-)
-set SOURCEDIR=.
-set BUILDDIR=_build
-set SPHINXPROJ=django-chemtrails
-
-if "%1" == "" goto help
-
-%SPHINXBUILD% >NUL 2>NUL
-if errorlevel 9009 (
-	echo.
-	echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
-	echo.installed, then set the SPHINXBUILD environment variable to point
-	echo.to the full path of the 'sphinx-build' executable. Alternatively you
-	echo.may add the Sphinx directory to PATH.
-	echo.
-	echo.If you don't have Sphinx installed, grab it from
-	echo.http://sphinx-doc.org/
-	exit /b 1
-)
-
-%SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS%
-goto end
-
-:help
-%SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS%
-
-:end
-popd
+@ECHO OFF
+
+pushd %~dp0
+
+REM Command file for Sphinx documentation
+
+if "%SPHINXBUILD%" == "" (
+	set SPHINXBUILD=sphinx-build
+)
+set SOURCEDIR=.
+set BUILDDIR=_build
+set SPHINXPROJ=django-chemtrails
+
+if "%1" == "" goto help
+
+%SPHINXBUILD% >NUL 2>NUL
+if errorlevel 9009 (
+	echo.
+	echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
+	echo.installed, then set the SPHINXBUILD environment variable to point
+	echo.to the full path of the 'sphinx-build' executable. Alternatively you
+	echo.may add the Sphinx directory to PATH.
+	echo.
+	echo.If you don't have Sphinx installed, grab it from
+	echo.http://sphinx-doc.org/
+	exit /b 1
+)
+
+%SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS%
+goto end
+
+:help
+%SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS%
+
+:end
+popd


Debug build script

Debug build script

--- app/package/scripts/build-package-j11.bat
+++ app/package/scripts/build-package-j11.bat
@@ -1,3 +1,5 @@
+@echo on
+
 set J11_HOME=%1
 set J14_HOME=%2


Update install_bigfix.bat

Update install_bigfix.bat

--- CMD/install_bigfix.bat
+++ CMD/install_bigfix.bat
@@ -1,4 +1,6 @@
 :<<"::CMDLITERAL"
+
+IF [%1] == [] ECHO no args && EXIT /B
 SET MASTHEADURL=http://%1:52311/masthead/masthead.afxm
 SET BASEFOLDER=C:\Windows\Temp


Removed obsolete Windows build script.

Removed obsolete Windows build script.

--- ext/sqlite3_api/win32/build.bat
+++ ext/sqlite3_api/win32/build.bat
@@ -1,7 +0,0 @@
-REM This is not guaranteed to work, ever. It's just a little helper
-REM script that I threw together to help me build the win32 version of
-REM the library. If someone with more win32-fu than I wants to make
-REM something more robust, please feel free! I'd love to include it.
-REM -- Jamis Buck
-
-cl /LD /Ie:\WinSDK\Include /Ic:\ruby\lib\ruby\1.8\i386-mswin32 /Ic:\ruby\sqlite3 /Ic:\ruby\src\ruby-1.8.4_2006-04-14 sqlite3_api_wrap.c /link /LIBPATH:c:\ruby\sqlite3 /LIBPATH:e:\WinSDK\Lib /LIBPATH:c:\ruby\lib sqlite3.lib msvcrt-ruby18.lib


Deal with case where specwre is used as base lisp.

git-svn-id: 9ecf60ce9baff443e30a0472d3fd222fcb8117cf@4959 7b97033b-253e-4a5c-9b07-e25f9089a9fd

--- Applications/Specware/bin/windows/check-and-set-environment.cmd
+++ Applications/Specware/bin/windows/check-and-set-environment.cmd
@@ -32,7 +32,14 @@
   set SWPATH=%SWPATH%;C:/
 )

-set LISP_EXECUTABLE=%ALLEGRO%\alisp.exe
+if exist %ALLEGRO%\alisp.exe (
+  set LISP_EXECUTABLE=%ALLEGRO%\alisp.exe
+  set XELI="%ALLEGRO%/xeli"
+) else (
+  set LISP_EXECUTABLE=C:\Progra~1\Kestrel\Specware-4-2-2\Specware4.exe
+  set XELI="%SPECWARE4%/Library/IO/Emacs/xeli"
+)
+
 set LISP_DIRECTORY=%Specware4%/
 set SPECWARE_BIN=%SPECWARE4%\Applications\Specware\bin\windows
 set LISP_HEAP_IMAGE=%SPECWARE_BIN%\Specware4.dxl
@@ -43,6 +50,7 @@
 echo "post SPECWARE4:       %SPECWARE4%"
 echo "post SWPATH:          %SWPATH%"
 echo "post LISP_EXECUTABLE: %LISP_EXECUTABLE%"
+echo "post LISP_HEAP_IMAGE: %LISP_HEAP_IMAGE%"
 echo "post LISP_DIRECTORY:  %LISP_DIRECTORY%"

 rem  Move to Specware4 main directory:


commit on 01/06/11 at 11:41:11

commit on 01/06/11 at 11:41:11

--- windows-cmd/startPipeLPC.cmd
+++ windows-cmd/startPipeLPC.cmd
@@ -1 +1 @@
-cd C:/02*/01*/01*/thinPlyMechanics/windows-cmd && startRVESimPipeOnlyHdispLPC.cmd 1_144S0A0
+cd C:/02*/01*/01*/thinPlyMechanics/windows-cmd && startRVESimPipeOnlyHdispLPC.cmd 1_144S10


We don't need to specify the fsx

We don't need to specify the fsx

--- fake.cmd
+++ fake.cmd
@@ -1,3 +1,3 @@
 @echo off
-"tools\FAKE\tools\Fake.exe" "build.fsx" "%1"
+"tools\FAKE\tools\Fake.exe" "%1"
 exit /b %errorlevel%


typos in build.bat

typos in build.bat

--- far/build.bat
+++ far/build.bat
@@ -54,7 +54,7 @@
   if "64" == "%~1" set LIB=%vsdir%VC\Lib\amd64;%mssdk%Lib\x64
   if "64" == "%~1" set pth=%vsdir%VC\Bin\x86_amd64;
   PATH=%pth%%vsdir%VC\Bin;%vsdir%VC\VCPackages;%vsdir%Common7\Tools;%vsdir%Common7\IDE;%mssdk%Bin;%opath%
-:goto :EOF
+goto :EOF

 :proc_param
   for %%p in (vc vcc msc) do if /i "%%p" == "%~1" set ccomp=vc
@@ -66,7 +66,7 @@
   for %%p in (debug dbg) do if /i "%%p" == "%~1" set deb_b=Y
   for %%p in (sln solution) do if /i "%%p" == "%~1" set vcsln=Y
   for %%p in (dwarf dw2) do if /i "%%p" == "%~1" set dwarf=Y
-goto :eof
+goto :EOF

 :init
   set dirbit=%2


Completely remove Python and verify

Completely remove Python and verify

error: pathspec 'pkg/windows/uninstall-and-wipe-Python.cmd' did not match any file(s) known to git

--- pkg/windows/uninstall-and-wipe-Python.cmd
+++ pkg/windows/uninstall-and-wipe-Python.cmd
@@ -0,0 +1,9 @@
+@echo off
+
+:: uninstall Python 2.7 64bit
+MsiExec.exe /X {16E52445-1392-469F-9ADB-FC03AF00CD62} /QN
+
+:: wipe the Python directory
+::  DOS hack first create dir because Windows cannot test not existing without error message
+md c:\Python27  1>nul 2>nul
+rd /s /q c:\Python27 || echo Failure: c:\Python27 still exists, please find out why and repeat.


update minor alternative version2

update minor alternative version2

--- test/test_app.bat
+++ test/test_app.bat
@@ -1,5 +1,5 @@
-### test_app.bat - 2013 - Carr Adrien 1.2.0-b ###
-version = "1.2.0-b"
+### test_app.bat - 2013 - Carr Adrien 1.2.0-c ###
+version = "1.2.0-c"
 build_hour = "11H00"

 echo "Build ${build_hour}"


Always rebuild and use release etw_list when generating etw headers

--- Tools/run_etw_list.cmd
+++ Tools/run_etw_list.cmd
@@ -1,21 +1,18 @@
-:: Copyright (C) 2020-2021 Intel Corporation
+:: Copyright (C) 2020-2022 Intel Corporation
 :: SPDX-License-Identifier: MIT
+@echo off
+setlocal

-@echo off
-setlocal enabledelayedexpansion
-set etw_list=%~1
-if not exist "%etw_list%" (
-    where msbuild > NUL
-    if %errorlevel% equ 0 (
-        msbuild /nologo /verbosity:quiet /maxCpuCount /p:Platform=x64,Configuration=release "%~dp0etw_list"
-        set etw_list=%~dp0..\build\Release\etw_list-dev-x64.exe
-    ) else (
-        echo error: path to etw_list not provided and msbuild is not available
-    )
-    if not exist "!etw_list!" (
-        echo usage: run_etw_list.cmd [path_to_etw_list_exe]
-        exit /b 1
-    )
+where msbuild > NUL
+if %errorlevel% neq 0 (
+    echo error: dependency missing: msbuild
+    exit /b 1
+)
+
+msbuild /nologo /verbosity:quiet /maxCpuCount /p:Platform=x64,Configuration=release "%~dp0etw_list"
+if %errorlevel% neq 0 (
+    echo error: failed to build etw_list
+    exit /b 1
 )

 for %%a in ("%~dp0..") do set out_dir=%%~fa\PresentData\ETW
@@ -80,6 +77,6 @@

 :etw_list
     echo %~2
-    %etw_list% --no_event_structs %events% --provider=%~1>%2
+    "%~dp0..\build\Release\etw_list-dev-x64.exe" --no_event_structs %events% --provider=%~1>%2
     exit /b 0


Опечатка

Опечатка

--- src/scripts/srmake.bat
+++ src/scripts/srmake.bat
@@ -4,7 +4,7 @@
 set BINDIR=%~dp0
 set BINDIR=%BINDIR:~0,-1%

-:: Получаем путь к дистрибутиву, удаяем концевой \
+:: Получаем путь к дистрибутиву, удаляем концевой \
 for %%d in ("%BINDIR%") do set DISTRDIR=%%~dpd
 set DISTRDIR=%DISTRDIR:~0,-1%


git-svn-id: svn://svn.code.sf.net/p/mediainfo/code/MediaInfo/trunk@1738 45c5ae6f-87cc-4fd0-92ee-e4f023fd80da

--- Release/Release_Source.bat
+++ Release/Release_Source.bat
@@ -99,10 +99,10 @@
 rem --- Compressing Archive ---
 if "%2"=="SkipCompression" goto SkipCompression
 move MediaInfo_Source MediaInfo
-rem ..\..\Shared\Binary\Windows_i386\7-zip\7z a -r -ttar -mx9 MediaInfo_Source.tar MediaInfo\*
-rem ..\..\Shared\Binary\Windows_i386\7-zip\7z a -r -tbzip2 -mx9 mediainfo_.tar.bz2 MediaInfo_Source.tar
-rem ..\..\Shared\Binary\Windows_i386\7-zip\7z a -r -tgzip -mx9 mediainfo_-1.tar.gz MediaInfo_Source.tar
-rem del MediaInfo_Source.tar
+..\..\Shared\Binary\Windows_i386\7-zip\7z a -r -ttar -mx9 MediaInfo_Source.tar MediaInfo\*
+..\..\Shared\Binary\Windows_i386\7-zip\7z a -r -tbzip2 -mx9 mediainfo_.tar.bz2 MediaInfo_Source.tar
+..\..\Shared\Binary\Windows_i386\7-zip\7z a -r -tgzip -mx9 mediainfo_-1.tar.gz MediaInfo_Source.tar
+del MediaInfo_Source.tar
 ..\..\Shared\Binary\Windows_i386\7-zip\7z a -r -t7z -mx9 mediainfo__AllInclusive.7z MediaInfo\* MediaInfoLib\* ZenLib\* wxMSW\* zlib\*
 move MediaInfo MediaInfo_Source
 :SkipCompression


增加cd到当前文件所在目录的命令，去掉安装命令

增加cd到当前文件所在目录的命令，去掉安装命令

--- run-main-quiet.bat
+++ run-main-quiet.bat
@@ -1,3 +1,4 @@
 @echo off
+cd /d %~dp0
 call setenv.bat
-mvn clean install exec:java -Dexec.mainClass="baichenguang.bing.BingDesktop" -q+mvn exec:java -Dexec.mainClass="baichenguang.bing.BingDesktop" -q


Netstandard minimal Unity AOT build

Netstandard minimal Unity AOT build

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

--- src/netStandardMinimalUnityAOT-copyDlls.bat
+++ src/netStandardMinimalUnityAOT-copyDlls.bat
@@ -0,0 +1,19 @@
+REM Excel formula if needed ="xcopy ""compiledlibraries\netStandardAOT\"&D1&""" ""compiledlibraries\netStandardMinimalUnityAOT\" & D1 & """ /s /y"
+
+xcopy "compiledlibraries\netStandardAOT\Nethereum.ABI.dll" "compiledlibraries\netStandardMinimalUnityAOT\Nethereum.ABI.dll" /s /y
+xcopy "compiledlibraries\netStandardAOT\Nethereum.Accounts.dll" "compiledlibraries\netStandardMinimalUnityAOT\Nethereum.Accounts.dll" /s /y
+xcopy "compiledlibraries\netStandardAOT\Nethereum.Contracts.dll" "compiledlibraries\netStandardMinimalUnityAOT\Nethereum.Contracts.dll" /s /y
+xcopy "compiledlibraries\netStandardAOT\Nethereum.Hex.dll" "compiledlibraries\netStandardMinimalUnityAOT\Nethereum.Hex.dll" /s /y
+xcopy "compiledlibraries\netStandardAOT\Nethereum.JsonRpc.Client.dll" "compiledlibraries\netStandardMinimalUnityAOT\Nethereum.JsonRpc.Client.dll" /s /y
+xcopy "compiledlibraries\netStandardAOT\Nethereum.JsonRpc.RpcClient.dll" "compiledlibraries\netStandardMinimalUnityAOT\Nethereum.JsonRpc.RpcClient.dll" /s /y
+xcopy "compiledlibraries\netStandardAOT\Nethereum.KeyStore.dll" "compiledlibraries\netStandardMinimalUnityAOT\Nethereum.KeyStore.dll" /s /y
+xcopy "compiledlibraries\netStandardAOT\Nethereum.Model.dll" "compiledlibraries\netStandardMinimalUnityAOT\Nethereum.Model.dll" /s /y
+xcopy "compiledlibraries\netStandardAOT\Nethereum.RLP.dll" "compiledlibraries\netStandardMinimalUnityAOT\Nethereum.RLP.dll" /s /y
+xcopy "compiledlibraries\netStandardAOT\Nethereum.RPC.dll" "compiledlibraries\netStandardMinimalUnityAOT\Nethereum.RPC.dll" /s /y
+xcopy "compiledlibraries\netStandardAOT\Nethereum.Signer.dll" "compiledlibraries\netStandardMinimalUnityAOT\Nethereum.Signer.dll" /s /y
+xcopy "compiledlibraries\netStandardAOT\Nethereum.Signer.EIP712.dll" "compiledlibraries\netStandardMinimalUnityAOT\Nethereum.Signer.EIP712.dll" /s /y
+xcopy "compiledlibraries\netStandardAOT\Nethereum.Siwe.Core.dll" "compiledlibraries\netStandardMinimalUnityAOT\Nethereum.Siwe.Core.dll" /s /y
+xcopy "compiledlibraries\netStandardAOT\Nethereum.Unity.dll" "compiledlibraries\netStandardMinimalUnityAOT\Nethereum.Unity.dll" /s /y
+xcopy "compiledlibraries\netStandardAOT\Nethereum.Util.dll" "compiledlibraries\netStandardMinimalUnityAOT\Nethereum.Util.dll" /s /y
+
+EXIT /B 0


removed slash after dp0, fixed ico [skip ci]

--- startfiles/console.bat
+++ startfiles/console.bat
@@ -23,8 +23,8 @@
 :: On the bottom - git bash
 IF EXIST "%~dp0\bin\git\git-bash.bat" (
 	%HIDECONSOLE% %CONEMU% -cmdlist ^
-	cmd.exe -cur_console:fn:t:"Cmd":C:"C:\cygwin64\Cygwin.ico" ^|^|^| ^
-	%~dp0bin\git\git-bash.bat -cur_console:sV:t:"GitBash":C:"C:%~dp0\bin\git\etc\git.ico"
+	cmd.exe -cur_console:fn:t:"Cmd":C:"%~dp0bin\conemu\terminal.ico" ^|^|^| ^
+	%~dp0bin\git\git-bash.bat -cur_console:sV:t:"GitBash":C:"%~dp0bin\git\etc\git.ico"
 ) ELSE (
 	%HIDECONSOLE% %CONEMU%
-)
+)


Changed release script output.

Changed release script output.