semver-major: rename arg `prerelase` -> `prerelease`

--- vswhere_usability_wrapper.cmd
+++ vswhere_usability_wrapper.cmd
@@ -1,10 +1,11 @@
 :: Copyright 2017 - Refael Ackermann
 :: Distributed under MIT style license
 :: See accompanying file LICENSE at https://github.com/node4good/windows-autoconf
-:: version: 1.15.5
+:: version: 2.0.0

 @if not defined DEBUG_HELPER @ECHO OFF
 setlocal
+if "%~1"=="prerelease" set VSWHERE_WITH_PRERELEASE=1
 set "InstallerPath=%ProgramFiles(x86)%\Microsoft Visual Studio\Installer"
 if not exist "%InstallerPath%" set "InstallerPath=%ProgramFiles%\Microsoft Visual Studio\Installer"
 if not exist "%InstallerPath%" goto :no-vswhere
@@ -16,8 +17,7 @@
 set VSWHERE_PRP=-property installationPath
 set VSWHERE_LMT=-version "[15.0,16.0)"
 vswhere -prerelease > nul
-if "%~1"=="prerelase" set VSWHERE_WITH_PRERELASE=1
-if not errorlevel 1 if "%VSWHERE_WITH_PRERELASE%"=="1" set "VSWHERE_LMT=%VSWHERE_LMT% -prerelease"
+if not errorlevel 1 if "%VSWHERE_WITH_PRERELEASE%"=="1" set "VSWHERE_LMT=%VSWHERE_LMT% -prerelease"
 SET VSWHERE_ARGS=-latest -products * %VSWHERE_REQ% %VSWHERE_PRP% %VSWHERE_LMT%
 for /f "usebackq tokens=*" %%i in (`vswhere %VSWHERE_ARGS%`) do (
     endlocal


MNT: make "clean" behave the same on Windows as on Linux (#1020)

--- doc/make.bat
+++ doc/make.bat
@@ -43,6 +43,11 @@
 if "%1" == "clean" (
 	for /d %%i in (%BUILDDIR%\*) do rmdir /q /s %%i
 	del /q /s %BUILDDIR%\*
+	if exist auto_examples rd /q /s auto_examples
+	if exist auto_mayavi_examples rd /q /s auto_mayavi_examples
+	if exist auto_pyvista_examples rd /q /s auto_pyvista_examples
+	if exist tutorials rd /q /s tutorials
+	if exist gen_modules rd /q /s gen_modules
 	goto end
 )


clink: generating aliases everytime is slow

--- clink/cinit.cmd
+++ clink/cinit.cmd
@@ -4,7 +4,9 @@
 call clink inject --quiet

 :: Setup aliases
-"%GIT_INSTALL_ROOT%\usr\bin\bash" --login %DOT%\clink\collect-aliases.sh
+if not exist %DOT%\clink\aliases (
+  "%GIT_INSTALL_ROOT%\usr\bin\bash" --login %DOT%\clink\collect-aliases.sh
+)
 doskey /macrofile=%DOT%\clink\aliases

 :: Setup PATH


show progress

show progress

--- zuninstall-KEEP_CONFIG-no.cmd
+++ zuninstall-KEEP_CONFIG-no.cmd
@@ -4,4 +4,4 @@

 @echo on

-msiexec /x wix\MinionMSI\bin\Release\%msi% /qb! /l*v log-uninstall.log KEEP_CONFIG=0
+msiexec /x wix\MinionMSI\bin\Release\%msi% /qb! /l*v log-uninstall-KEEP_CONFIG=0.log KEEP_CONFIG=0


Update cygwin default packages

Update cygwin default packages

--- .dotenv/other/setup-cygwin.cmd
+++ .dotenv/other/setup-cygwin.cmd
@@ -71,7 +71,7 @@
 del "%DLOAD_SCRIPT%"

 REM -- These are the packages we will install (in addition to the default packages)
-SET PACKAGES=bash-completion,bc,bind,ca-certificates,curl,fdupes,git,git-completion,git-svn
+SET PACKAGES=bash-completion,bc,bind,ca-certificates,curl,cygutils-extra,fdupes,git,git-completion,git-svn
 SET PACKAGES=%PACKAGES%,inetutils,nc,nc6,ncurses,openssh,openssl,procps,rsync,screen,unzip,vim,wget,xxd
 REM -- Extra packages
 SET PACKAGES=%PACKAGES%,heimdal


Menu label bugfix

Menu label bugfix

--- MCal.bat
+++ MCal.bat
@@ -239,15 +239,15 @@
 echo                                        Total Balance: %sign%%currentbal%
 if "%todaysbal_ad%" == "No change" (
 MCal_deps\chgcolor.exe f8
-echo                                        Today^'s Change: %todaysbal_ad% - %sign%%currentbal%
+echo                                        Today^'s Change: %todaysbal_ad% - %sign%%todaysbal%
 )
 if "%todaysbal_ad%" == "Added" (
 MCal_deps\chgcolor.exe f2
-echo                                        Today^'s Change: %todaysbal_ad% - %sign%%currentbal%
+echo                                        Today^'s Change: %todaysbal_ad% - %sign%%todaysbal%
 )
 if "%todaysbal_ad%" == "Spent" (
 MCal_deps\chgcolor.exe f4
-echo                                        Today^'s Change: %todaysbal_ad% - %sign%%currentbal%
+echo                                        Today^'s Change: %todaysbal_ad% - %sign%%todaysbal%
 )
 MCal_deps\chgcolor.exe f3
 echo.
@@ -474,7 +474,7 @@
 echo ^/_^/  ^/_^/^\____^/^\__,_^/_^/  by LiteSec
 echo.
 MCal_deps\chgcolor.exe f2
-echo CURRENT BALANCE: %sign%%currentbal% REMOVED BALANCE: %sign%%addedbal%
+echo CURRENT BALANCE: %sign%%currentbal% REMOVED BALANCE: %sign%%rembal%
 echo.
 MCal_deps\chgcolor.exe f8
 echo Enter spent amount, without dollarsigns, letters or commas.


Add build script for Windows environments.

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

--- Make.bat
+++ Make.bat
@@ -0,0 +1,24 @@
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::
+:: aartifact
+:: http://www.aartifact.org/src/
+:: Copyright (C) 2008-2010
+:: A. Lapets
+::
+:: This software is made available under the GNU GPLv3.
+::
+:: Make.bat
+::   Batch script for compiling with GHC under Windows
+::   environments.
+
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::
+
+@IF EXIST o GOTO make
+@MD o
+@IF EXIST hi GOTO make
+@MD hi
+:make
+ghc -O2 --make -odir o -hidir hi Main -o aa.exe
+
+::eof


different 7z name for windows

different 7z name for windows

--- ci/build.bat
+++ ci/build.bat
@@ -4,4 +4,4 @@

 serve-d.exe --version

-7za a serve-d.zip serve-d.exe libcurl.dll libeay32.dll ssleay32.dll
+7z a serve-d.zip serve-d.exe libcurl.dll libeay32.dll ssleay32.dll


removed direct link since node recieves updates often

--- run.bat
+++ run.bat
@@ -15,7 +15,7 @@

 echo "~~Hitagi-Script Windows Edition~~"
 echo "Please ensure that you have installed NodeJS 7.x"
-echo "https://nodejs.org/dist/v7.10.0/node-v7.10.0-x64.msi"
+echo "https://nodejs.org/en/download/current/"

 echo "STEP ONE: configure config.json  (as is seen on the github page)"
 set /p name="Name of target art? "
@@ -37,4 +37,4 @@
 REM TODO: imgur upload

-pause+pause


Initialize (cleranup) env.variable before using


* missed change

* missed change

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

--- Scripts/Tools/std/xcopy_file_rename.bat
+++ Scripts/Tools/std/xcopy_file_rename.bat
@@ -177,7 +177,7 @@

 call "%%?~dp0%%__init__.bat" || exit /b

-set "XCOPY_BARE_FLAGS= "
+set "XCOPY_BARE_FLAGS="
 if defined FLAG_CHCP set XCOPY_BARE_FLAGS= -chcp "%FLAG_CHCP%"

 if /i not "%FROM_ROOT%" == "%TO_ROOT%" (


msvc10_to_msvc11.cmd: Helper script for Visual Studio 2010 to 2012 conversion.

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

--- scripts/msvc10_to_msvc11.cmd
+++ scripts/msvc10_to_msvc11.cmd
@@ -0,0 +1,34 @@
+@echo on
+setlocal
+set "THIS_SCRIPT_FILE=%~nx0"
+
+if "%1" == "" (
+  echo.
+  echo USAGE: %THIS_SCRIPT_FILE% log4cplus.sln
+  echo.
+  exit /b 1
+)
+
+if not defined VS110COMNTOOLS (
+  echo.
+  echo VS110COMNTOOLS environment variable is not defined
+  echo.
+  exit /b 2
+)
+
+set "SLN_PATH=%~f1"
+set "SLN_BASE_DIR=%~dp1"
+set "SLN_FILE_NAME=%~nx1"
+set "MSVC11_BASE_DIR=%SLN_BASE_DIR%\..\msvc11"
+
+rmdir /S /Q "%MSVC11_BASE_DIR%"
+mkdir "%MSVC11_BASE_DIR%"
+xcopy /F /H /Y /Z /I "%SLN_BASE_DIR%\*.*" "%MSVC11_BASE_DIR%"
+xcopy /F /H /Y /Z /I "%SLN_BASE_DIR%\tests\*.*" "%MSVC11_BASE_DIR%\tests"
+
+call "%VS110COMNTOOLS%\..\IDE\devenv.com" "%MSVC11_BASE_DIR%\%SLN_FILE_NAME%" /Upgrade
+
+start "Migration log" "%MSVC11_BASE_DIR%\UpgradeLog.htm"
+
+endlocal
+


update build script for wp8 under multi-vc version

--- build/AutoBuildForWPAndWindows.bat
+++ build/AutoBuildForWPAndWindows.bat
@@ -3,29 +3,29 @@
 rem   usage:
 rem      AutoBuildForWPAndWindows.bat % Configuration %
 rem      --For debug  version:
-rem          Win32-C-Only: AutoBuildForWPAndWindows.bat  Win32-Debug-C
-rem          Win32-ASM:    AutoBuildForWPAndWindows.bat  Win32-Debug-ASM
-rem          Win64-C-Only: AutoBuildForWPAndWindows.bat  Win64-Debug-C
-rem          Win64-ASM:    AutoBuildForWPAndWindows.bat  Win64-Debug-ASM
-rem          ARM-C-Only:   AutoBuildForWPAndWindows.bat  ARM-Debug-C
-rem          ARM-ASM:      AutoBuildForWPAndWindows.bat  ARM-Debug-ASM
+rem          Win32-C-Only:      AutoBuildForWPAndWindows.bat  Win32-Debug-C
+rem          Win32-ASM:         AutoBuildForWPAndWindows.bat  Win32-Debug-ASM
+rem          Win64-C-Only:      AutoBuildForWPAndWindows.bat  Win64-Debug-C
+rem          Win64-ASM:         AutoBuildForWPAndWindows.bat  Win64-Debug-ASM
+rem          ARM-C-Only(WP8):   AutoBuildForWPAndWindows.bat  ARM-Debug-C
+rem          ARM-ASM(WP8):      AutoBuildForWPAndWindows.bat  ARM-Debug-ASM
 rem      --For release version:
-rem          Win32-C-Only: AutoBuildForWPAndWindows.bat  Win32-Release-C
-rem          Win32-ASM:    AutoBuildForWPAndWindows.bat  Win32-Release-ASM
-rem          Win64-C-Only: AutoBuildForWPAndWindows.bat  Win64-Release-C
-rem          Win64-ASM:    AutoBuildForWPAndWindows.bat  Win64-Release-ASM
-rem          ARM-C-Only:   AutoBuildForWPAndWindows.bat  ARM-Release-C
-rem          ARM-ASM:      AutoBuildForWPAndWindows.bat  ARM-Release-ASM
+rem          Win32-C-Only:      AutoBuildForWPAndWindows.bat  Win32-Release-C
+rem          Win32-ASM:         AutoBuildForWPAndWindows.bat  Win32-Release-ASM
+rem          Win64-C-Only:      AutoBuildForWPAndWindows.bat  Win64-Release-C
+rem          Win64-ASM(WP8):    AutoBuildForWPAndWindows.bat  Win64-Release-ASM
+rem          ARM-C-Only(WP8):   AutoBuildForWPAndWindows.bat  ARM-Release-C
+rem          ARM-ASM(WP8):      AutoBuildForWPAndWindows.bat  ARM-Release-ASM
 rem      --For debug and release version:
-rem          Win32-C-Only: AutoBuildForWPAndWindows.bat  Win32-All-C
-rem          Win32-ASM:    AutoBuildForWPAndWindows.bat  Win32-All-ASM
-rem          Win64-C-Only: AutoBuildForWPAndWindows.bat  Win64-All-C
-rem          Win64-ASM:    AutoBuildForWPAndWindows.bat  Win64-All-ASM
-rem          ARM-C-Only:   AutoBuildForWPAndWindows.bat  ARM-All-C
-rem          ARM-ASM:      AutoBuildForWPAndWindows.bat  ARM-All-ASM
+rem          Win32-C-Only:      AutoBuildForWPAndWindows.bat  Win32-All-C
+rem          Win32-ASM:         AutoBuildForWPAndWindows.bat  Win32-All-ASM
+rem          Win64-C-Only:      AutoBuildForWPAndWindows.bat  Win64-All-C
+rem          Win64-ASM:         AutoBuildForWPAndWindows.bat  Win64-All-ASM
+rem          ARM-C-Only(WP8):   AutoBuildForWPAndWindows.bat  ARM-All-C
+rem          ARM-ASM(WP8):      AutoBuildForWPAndWindows.bat  ARM-All-ASM
 rem      --For default:
 rem         AutoBuildForWPAndWindows.bat
-rem           ARM-All-ASM
+rem           ARM-All-ASM(WP8)
 rem
 rem      --lib/dll files will be copied to folder .\bin
 rem         --win32 folder bin\i386*
@@ -46,6 +46,8 @@
 rem
 rem   2015/03/15 huashi@cisco.com
 rem *************************************************************************************************
+
+set WP8Flag=0
 call :BasicSetting
 call :PathSetting
 call :SetBuildOption %1
@@ -107,11 +109,12 @@
   set VC12ArmLib02=C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\lib\arm
   set WP8KitLib=C:\Program Files (x86)\Windows Phone Kits\8.1\lib\arm

-  if exist "%VC9Path%"  set VCPATH=%VC9Path%
-  if exist "%VC10Path%" set VCPATH=%VC10Path%
-  if exist "%VC11Path%" set VCPATH=%VC11Path%
-  if exist "%VC12Path%" set VCPATH=%VC12Path%
-  if exist "%VC14Path%" set VCPATH=%VC14Path%
+  if exist "%VC9Path%"     set VCPATH=%VC9Path%
+  if exist "%VC10Path%"    set VCPATH=%VC10Path%
+  if exist "%VC11Path%"    set VCPATH=%VC11Path%
+  if exist "%VC12Path%"    set VCPATH=%VC12Path%
+  if exist "%VC14Path%"    set VCPATH=%VC14Path%
+  if %WP8Flag%==1          set VCPATH=%VC12Path%

   set GasScriptPath=%VCPATH%\bin

@@ -123,7 +126,7 @@
   if "%vArcType%" =="i386"   call "%VCPATH%\vcvarsall.bat" x86
   if "%vArcType%" =="x86_64" call "%VCPATH%\vcvarsall.bat" x64
   if "%vArcType%" =="arm"    call "%VCPATH%\vcvarsall.bat" x86_arm
-  if "%vArcType%" =="arm"    call :WPSetting
+  if %WP8Flag%==1            call :WPSetting

   echo PATH is %PATH%
   echo LIB  is %LIB%
@@ -131,6 +134,8 @@

 :WPSetting
   set LIB=%VC12ArmLib01%;%VC12ArmLib02%;%WP8KitLib%
+  echo LIB setting for wp8 is:
+  echo   %LIB%
   if  not exist "%VC12Path%" (
       echo    VC12 does not exist,
       echo ******************************************
@@ -148,69 +153,73 @@
       set vOSType=msvc-wp
       set vEnable64BitFlag=No
       set vASMFlag=Yes
-    echo default setting
+      set WP8Flag=1
+      echo default setting
   ) else if "%1"=="Win32-Debug-C" (
       set aConfigurationList=Debug
       set vArcType=i386
       set vOSType=msvc
       set vEnable64BitFlag=No
       set vASMFlag=No
-    echo Win32-Debug-C setting
+      echo Win32-Debug-C setting
   )  else if "%1"=="Win32-Release-C" (
       set aConfigurationList=Release
       set vArcType=i386
       set vOSType=msvc
       set vEnable64BitFlag=No
       set vASMFlag=No
-    echo Win32-Release-C setting
+      echo Win32-Release-C setting
   )  else if "%1"=="Win64-Debug-C" (
       set aConfigurationList=Debug
       set vArcType=x86_64
       set vOSType=msvc
       set vEnable64BitFlag=Yes
       set vASMFlag=No
-    echo All-C setting
+      echo All-C setting
   )  else if "%1"=="Win64-Release-C" (
       set aConfigurationList=Release
       set vArcType=x86_64
       set vOSType=msvc
       set vEnable64BitFlag=Yes
       set vASMFlag=No
-    echo Win64-Release-C setting
+      echo Win64-Release-C setting
   )  else if "%1"=="ARM-Debug-C" (
       set aConfigurationList=Debug
       set vArcType=arm
       set vOSType=msvc-wp
       set vEnable64BitFlag=No
       set vASMFlag=No
-    echo ARM-Debug-C setting
+      set WP8Flag=1
+      echo ARM-Debug-C setting
   )  else if "%1"=="ARM-Release-C" (
       set aConfigurationList=Debug Release
       set vArcType=arm
       set vOSType=msvc-wp
       set vEnable64BitFlag=No
       set vASMFlag=No
-    echo ARM-Release-C setting
+      set WP8Flag=1
+      echo ARM-Release-C setting
   )   else if "%1"=="Win32-All-C" (
       set aConfigurationList=Debug Release
       set vArcType=i386
       set vOSType=msvc
       set vEnable64BitFlag=No
       set vASMFlag=No
-    echo Win32-All-C setting
+      echo Win32-All-C setting
   )  else if "%1"=="Win64-All-C" (
       set aConfigurationList=Debug Release
       set vArcType=x86_64
       set vOSType=msvc
       set vEnable64BitFlag=Yes
       set vASMFlag=No
-    echo All-C setting
+      echo All-C setting
   )  else if "%1"=="ARM-All-C" (
       set aConfigurationList=Debug Release
       set vArcType=arm
       set vOSType=msvc-wp
       set vEnable64BitFlag=No
       set vASMFlag=No
+      set WP8Flag=1
     echo ARM-All-C setting
   )  else if "%1"=="Win32-Debug-ASM" (
       set aConfigurationList=Debug
@@ -218,63 +227,66 @@
       set vOSType=msvc
       set vEnable64BitFlag=No
       set vASMFlag=Yes
-    echo Win32-Debug-ASM setting
+      echo Win32-Debug-ASM setting
   )  else if "%1"=="Win32-Release-ASM" (
       set aConfigurationList=Release
       set vArcType=i386
       set vOSType=msvc
       set vEnable64BitFlag=No
       set vASMFlag=Yes
-    echo Win32-Release-ASM setting
+      echo Win32-Release-ASM setting
   )  else if "%1"=="Win64-Debug-ASM" (
       set aConfigurationList=Debug
       set vArcType=x86_64
       set vOSType=msvc
       set vEnable64BitFlag=Yes
       set vASMFlag=Yes
-    echo All-ASM setting
+      echo All-ASM setting
   )  else if "%1"=="Win64-Release-ASM" (
       set aConfigurationList=Release
       set vArcType=x86_64
       set vOSType=msvc
       set vEnable64BitFlag=Yes
       set vASMFlag=Yes
-    echo Win64-Release-ASM setting
+      echo Win64-Release-ASM setting
   )  else if "%1"=="ARM-Debug-ASM" (
       set aConfigurationList=Debug
       set vArcType=arm
       set vOSType=msvc-wp
       set vEnable64BitFlag=No
       set vASMFlag=Yes
-    echo ARM-Debug-ASM setting
+      set WP8Flag=1
+      echo ARM-Debug-ASM setting
   )  else if "%1"=="ARM-Release-ASM" (
       set aConfigurationList=Release
       set vArcType=arm
       set vOSType=msvc-wp
       set vEnable64BitFlag=No
       set vASMFlag=Yes
-    echo ARM-Release-ASM setting
+      set WP8Flag=1
+      echo ARM-Release-ASM setting
   )   else if "%1"=="Win32-All-ASM" (
       set aConfigurationList=Debug Release
       set vArcType=i386
       set vOSType=msvc
       set vEnable64BitFlag=No
       set vASMFlag=Yes
-    echo Win32-All-ASM setting
+      echo Win32-All-ASM setting
   )  else if "%1"=="Win64-All-ASM" (
       set aConfigurationList=Debug Release
       set vArcType=x86_64
       set vOSType=msvc
       set vEnable64BitFlag=Yes
       set vASMFlag=Yes
-    echo All-ASM setting
+      echo All-ASM setting
   )  else if "%1"=="ARM-All-ASM" (
       set aConfigurationList=Debug Release
       set vArcType=arm
       set vOSType=msvc-wp
       set vEnable64BitFlag=No
       set vASMFlag=Yes
-    echo ARM-All-ASM setting
+      set WP8Flag=1
+      echo ARM-All-ASM setting
   )  else (
       call :help
       goto :ErrorReturn
@@ -341,29 +353,29 @@
   echo   usage:
   echo      AutoBuildForWPAndWindows.bat % Configuration %
   echo      --For debug  version:
-  echo          Win32-C-Only: AutoBuildForWPAndWindows.bat  Win32-Debug-C
-  echo          Win32-ASM:    AutoBuildForWPAndWindows.bat  Win32-Debug-ASM
-  echo          Win64-C-Only: AutoBuildForWPAndWindows.bat  Win64-Debug-C
-  echo          Win64-ASM:    AutoBuildForWPAndWindows.bat  Win64-Debug-ASM
-  echo          ARM-C-Only:   AutoBuildForWPAndWindows.bat  ARM-Debug-C
-  echo          ARM-ASM:      AutoBuildForWPAndWindows.bat  ARM-Debug-ASM
+  echo          Win32-C-Only:      AutoBuildForWPAndWindows.bat  Win32-Debug-C
+  echo          Win32-ASM:         AutoBuildForWPAndWindows.bat  Win32-Debug-ASM
+  echo          Win64-C-Only:      AutoBuildForWPAndWindows.bat  Win64-Debug-C
+  echo          Win64-ASM:         AutoBuildForWPAndWindows.bat  Win64-Debug-ASM
+  echo          ARM-C-Only(WP8):   AutoBuildForWPAndWindows.bat  ARM-Debug-C
+  echo          ARM-ASM(WP8):      AutoBuildForWPAndWindows.bat  ARM-Debug-ASM
   echo      --For release version:
-  echo          Win32-C-Only: AutoBuildForWPAndWindows.bat  Win32-Release-C
-  echo          Win32-ASM:    AutoBuildForWPAndWindows.bat  Win32-Release-ASM
-  echo          Win64-C-Only: AutoBuildForWPAndWindows.bat  Win64-Release-C
-  echo          Win64-ASM:    AutoBuildForWPAndWindows.bat  Win64-Release-ASM
-  echo          ARM-C-Only:   AutoBuildForWPAndWindows.bat  ARM-Release-C
-  echo          ARM-ASM:      AutoBuildForWPAndWindows.bat  ARM-Release-ASM
+  echo          Win32-C-Only:      AutoBuildForWPAndWindows.bat  Win32-Release-C
+  echo          Win32-ASM:         AutoBuildForWPAndWindows.bat  Win32-Release-ASM
+  echo          Win64-C-Only:      AutoBuildForWPAndWindows.bat  Win64-Release-C
+  echo          Win64-ASM:         AutoBuildForWPAndWindows.bat  Win64-Release-ASM
+  echo          ARM-C-Only(WP8):   AutoBuildForWPAndWindows.bat  ARM-Release-C
+  echo          ARM-ASM(WP8):      AutoBuildForWPAndWindows.bat  ARM-Release-ASM
   echo      --For debug and release version:
-  echo          Win32-C-Only: AutoBuildForWPAndWindows.bat  Win32-All-C
-  echo          Win32-ASM:    AutoBuildForWPAndWindows.bat  Win32-All-ASM
-  echo          Win64-C-Only: AutoBuildForWPAndWindows.bat  Win64-All-C
-  echo          Win64-ASM:    AutoBuildForWPAndWindows.bat  Win64-All-ASM
-  echo          ARM-C-Only:   AutoBuildForWPAndWindows.bat  ARM-All-C
-  echo          ARM-ASM:      AutoBuildForWPAndWindows.bat  ARM-All-ASM
+  echo          Win32-C-Only:      AutoBuildForWPAndWindows.bat  Win32-All-C
+  echo          Win32-ASM:         AutoBuildForWPAndWindows.bat  Win32-All-ASM
+  echo          Win64-C-Only:      AutoBuildForWPAndWindows.bat  Win64-All-C
+  echo          Win64-ASM:         AutoBuildForWPAndWindows.bat  Win64-All-ASM
+  echo          ARM-C-Only(WP8):   AutoBuildForWPAndWindows.bat  ARM-All-C
+  echo          ARM-ASM(WP8):      AutoBuildForWPAndWindows.bat  ARM-All-ASM
   echo      --For default:
   echo         AutoBuildForWPAndWindows.bat
-  echo           ARM-All-ASM
+  echo           ARM-All-ASM(WP8)
   echo *******************************************************************************
 goto :EOF


Read OGREVERSION correctly

Read OGREVERSION correctly

--- SDK/Win32/buildsdk.bat
+++ SDK/Win32/buildsdk.bat
@@ -32,7 +32,7 @@
 if errorlevel 1 goto cmakeerror

 rem Read OGRE version
-set /p OGREVERSION=<%BUILD_DIR%\version.txt
+set /p OGREVERSION=<version.txt

 rem Detect whether we're using full version of VStudio or Express
 devenv /? > NUL


Add -Wd and -3 to the flags used to run the tests on Windows.

--- PCbuild/rt.bat
+++ PCbuild/rt.bat
@@ -40,7 +40,7 @@

 PATH %PATH%;..\..\%tcltk%\bin
 set exe=%prefix%\python%suffix%
-set cmd=%exe% %dashO% -E -tt ../lib/test/regrtest.py %1 %2 %3 %4 %5 %6 %7 %8 %9
+set cmd=%exe% %dashO% -Wd -3 -E -tt ../lib/test/regrtest.py %1 %2 %3 %4 %5 %6 %7 %8 %9
 if defined qmode goto Qmode

 echo Deleting .pyc/.pyo files ...


Add bat file for generating installer for windows

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

--- create_installer_for_windows.bat
+++ create_installer_for_windows.bat
@@ -0,0 +1,76 @@
+REM create windows installer package(runtime included) for LLPAD
+REM In order to execute this batch file, java 8 or later needs to be installed
+REM In case creating exe installer, Download Inno Setup 5 or later from http://www.jrsoftware.org and add it to the PATH.
+REM In case creating msi installer, Download WiX 3.0 or later from http://wix.sf.net and add it to the PATH.
+
+echo off
+
+set APP_VERSION=0.5.0
+
+
+IF "%JAVA_HOME%" == "" (
+    echo Please set the JAVA_HOME variable in your environment to match the location of your Java installation.
+    exit /B
+)
+
+REM change dir to project dir where this bat is placed.
+cd %~dp0
+
+set JAR_NAME=llpad-%APP_VERSION%-jar-with-dependencies.jar
+set JAR_FULLPATH=%CD%\target\%JAR_NAME%
+set PACKAGE_PATH=%CD%\package
+set PACKAGE_RESOURCE_PATH=%CD%\package_resource
+set INFILE_PATH=%PACKAGE_PATH%\infiles
+set OUTFILE_PATH=%PACKAGE_PATH%\outfiles
+set PACKAGE_FOR_WINDOWS_PATH=%PACKAGE_PATH%\windows
+
+IF NOT EXIST "%JAR_FULLPATH%" (
+echo The jar file "%JAR_FULLPATH%" not found.Please run "mvn install" first. Or APP_VERSION %APP_VERSION% may be incorrect.
+echo The version code must be same as project/version in the POM.xml
+    exit /B
+)
+
+
+rmdir /s /q %PACKAGE_PATH%
+mkdir %PACKAGE_PATH%
+
+rmdir %INFILE_PATH%
+mkdir %INFILE_PATH%
+
+rmdir %OUTFILE_PATH%
+mkdir %OUTFILE_PATH%
+
+rmdir %PACKAGE_FOR_WINDOWS_PATH%
+mkdir %PACKAGE_FOR_WINDOWS_PATH%
+
+copy %JAR_FULLPATH% %INFILE_PATH%
+copy %PACKAGE_RESOURCE_PATH%\license.txt %INFILE_PATH%
+
+REM Create a directory "[PJ_ROOT]/package/windows" and put app icon named "[APPNAME].ico" it's a rule of javapackager.
+copy %PACKAGE_RESOURCE_PATH%\LLPAD.ico %PACKAGE_FOR_WINDOWS_PATH%
+
+
+"%JAVA_HOME%\bin\javapackager" ^
+-deploy ^
+-native exe ^
+-BappVersion=%APP_VERSION% ^
+-BshortcutHint=true ^
+-Bvendor="Riversun" ^
+-Bwin.menuGroup="LLPAD" ^
+-BsystemWide=true ^
+-srcdir package/infiles ^
+-outdir package/outfiles ^
+-outfile LLPAD_OUT ^
+-appclass org.riversun.llpad.AppMain ^
+-BlicenseFile=license.txt ^
+-name "LLPAD" ^
+-title "LLPAD" ^
+-Bruntime="%JAVA_HOME%\jre" ^
+-srcfiles %JAR_NAME%;license.txt ^
+-v
+
+echo package creation finished.
+
+pause
+
+


Added help message for "NewBuild" and "--nt32" option

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

--- edksetup.bat
+++ edksetup.bat
@@ -31,69 +31,6 @@
 pushd .
 cd %~dp0
 set WORKSPACE=%CD%
-
-@if /I not "%1"=="--nt32" goto check_new_build
-shift
-goto check_vc
-
-:check_new_build
-@if /I "%1"=="NewBuild" goto NewBuild
-
-:AntBuild
-@REM
-@REM Check the required system environment variables
-@REM
-
-:check_vc
-if defined VCINSTALLDIR goto check_cygwin
-if defined VS71COMNTOOLS (
- call "%VS71COMNTOOLS%\vsvars32.bat"
-) else (
-  echo.
-  echo !!! WARNING !!!! Cannot find Visual Studio !!!
-  echo.
-)
-goto check_new_build
-
-:check_cygwin
-if defined CYGWIN_HOME goto check_java
-if exist c:\cygwin (
-  set CYGWIN_HOME=c:\cygwin
-) else (
-  echo.
-  echo !!! WARNING !!!! Not set CYGWIN_HOME, gcc build may not be used !!!
-  echo.
-)
-
-:check_java
-if "%JAVA_HOME%"=="" goto no_jdk
-
-:check_ant
-if "%ANT_HOME%"=="" goto no_ant
-if not exist %ANT_HOME%\lib\ant-contrib.jar goto no_antcontrib
-
-:check_xmlbeans
-if "%XMLBEANS_HOME%"=="" goto no_xmlbeans
-if not exist %XMLBEANS_HOME%\lib\saxon8.jar goto no_saxon8
-
-set FRAMEWORK_TOOLS_PATH=%WORKSPACE%\Tools\bin
-
-if not defined ORIGINAL_CLASSPATH set ORIGINAL_CLASSPATH=%CLASSPATH%
-set CLASSPATH=%ORIGINAL_CLASSPATH%
-
-if defined WORKSPACE_TOOLS_PATH goto check_path
-set PATH=%FRAMEWORK_TOOLS_PATH%;%JAVA_HOME%\bin;%ANT_HOME%\bin;%XMLBEANS_HOME%\bin;%PATH%
-set WORKSPACE_TOOLS_PATH=%FRAMEWORK_TOOLS_PATH%
-echo Setting the PATH variable to include the FRAMEWORK_TOOLS_PATH for this WORKSPACE
-goto path_ok
-
-:check_path
-if "%FRAMEWORK_TOOLS_PATH%"=="%WORKSPACE_TOOLS_PATH%" goto path_ok
-set PATH=%FRAMEWORK_TOOLS_PATH%;%PATH%
-set WORKSPACE_TOOLS_PATH=%WORKSPACE%\Tools\bin
-echo Resetting the PATH variable to include the FRAMEWORK_TOOLS_PATH for this WORKSPACE
-
-:path_ok

 @if /I "%1"=="-h" goto Usage
 @if /I "%1"=="-help" goto Usage
@@ -101,6 +38,69 @@
 @if /I "%1"=="/h" goto Usage
 @if /I "%1"=="/?" goto Usage
 @if /I "%1"=="/help" goto Usage
+@if /I not "%1"=="--nt32" goto check_new_build
+shift
+goto check_vc
+
+:check_new_build
+@if /I "%1"=="NewBuild" goto NewBuild
+
+:AntBuild
+@REM
+@REM Check the required system environment variables
+@REM
+
+:check_vc
+if defined VCINSTALLDIR goto check_cygwin
+if defined VS71COMNTOOLS (
+ call "%VS71COMNTOOLS%\vsvars32.bat"
+) else (
+  echo.
+  echo !!! WARNING !!!! Cannot find Visual Studio !!!
+  echo.
+)
+goto check_new_build
+
+:check_cygwin
+if defined CYGWIN_HOME goto check_java
+if exist c:\cygwin (
+  set CYGWIN_HOME=c:\cygwin
+) else (
+  echo.
+  echo !!! WARNING !!!! Not set CYGWIN_HOME, gcc build may not be used !!!
+  echo.
+)
+
+:check_java
+if "%JAVA_HOME%"=="" goto no_jdk
+
+:check_ant
+if "%ANT_HOME%"=="" goto no_ant
+if not exist %ANT_HOME%\lib\ant-contrib.jar goto no_antcontrib
+
+:check_xmlbeans
+if "%XMLBEANS_HOME%"=="" goto no_xmlbeans
+if not exist %XMLBEANS_HOME%\lib\saxon8.jar goto no_saxon8
+
+set FRAMEWORK_TOOLS_PATH=%WORKSPACE%\Tools\bin
+
+if not defined ORIGINAL_CLASSPATH set ORIGINAL_CLASSPATH=%CLASSPATH%
+set CLASSPATH=%ORIGINAL_CLASSPATH%
+
+if defined WORKSPACE_TOOLS_PATH goto check_path
+set PATH=%FRAMEWORK_TOOLS_PATH%;%JAVA_HOME%\bin;%ANT_HOME%\bin;%XMLBEANS_HOME%\bin;%PATH%
+set WORKSPACE_TOOLS_PATH=%FRAMEWORK_TOOLS_PATH%
+echo Setting the PATH variable to include the FRAMEWORK_TOOLS_PATH for this WORKSPACE
+goto path_ok
+
+:check_path
+if "%FRAMEWORK_TOOLS_PATH%"=="%WORKSPACE_TOOLS_PATH%" goto path_ok
+set PATH=%FRAMEWORK_TOOLS_PATH%;%PATH%
+set WORKSPACE_TOOLS_PATH=%WORKSPACE%\Tools\bin
+echo Resetting the PATH variable to include the FRAMEWORK_TOOLS_PATH for this WORKSPACE
+
+:path_ok
+
 @if /I "%1"=="ForceRebuild" goto ForceBuild
 @if /I "%1"=="Reconfig" goto Reconfig

@@ -273,7 +273,9 @@

 :Usage
 echo.
-echo  Usage: %0 [Rebuild] [ForceRebuild] [Reconfig]
+echo  Usage: %0 [--nt32] [NewBuild] [Rebuild] [ForceRebuild] [Reconfig]
+echo         --nt32         Call vsvars32.bat for NT32 platform build
+echo         NewBuild       Using new build tools in BaseTools package
 echo         Rebuild:       Incremental build, only build those updated tools;
 echo         ForceRebuild:  Rebuild all tools neither updated or not;
 echo         Reconfig:      Reinstall target.txt, tools_def.txt, FrameworkDatabase.db.
@@ -282,6 +284,7 @@
 echo  only copied to target.txt, tools_def.txt, FrameworkDatabase.db respectively if they
 echo  are not existed. Using option [Reconfig] to do the force copy.
 echo.
+@goto end

 :NewBuild
 @IF NOT EXIST "BaseTools\toolsetup.bat" goto AntBuild


edksetup.bat: Fixed corrupts CYGWIN_HOME

The .BAT file checks for existance of the directory c:\cygwin and,
if it exists, always resets CYGWIN_HOME to that path.
That means that if CYGWIN_HOME is set to say c:\cygwin64, it gets corrupted.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <olivier.martin@arm.com>
Reviewed-by Yingke Liu <yingke.d.liu@intel.com>

git-svn-id: 3158a46dfd52e07d1fda3e32e1ab2e353a00b20f@15254 6f19259b-4bc3-4df7-8a09-765794883524

--- edksetup.bat
+++ edksetup.bat
@@ -110,6 +110,13 @@
   goto end

 :check_cygwin
+if defined CYGWIN_HOME (
+  if not exist "%CYGWIN_HOME%" (
+    @echo.
+    @echo !!! WARNING !!! CYGWIN_HOME not found, gcc build may not be used !!!
+    @echo.
+  )
+) else (
   if exist c:\cygwin (
     set CYGWIN_HOME=c:\cygwin
   ) else (
@@ -117,9 +124,10 @@
     @echo !!! WARNING !!! No CYGWIN_HOME set, gcc build may not be used !!!
     @echo.
   )
+)

-if NOT "%1"=="" goto Usage
-goto end
+:cygwin_done
+if "%1"=="" goto end

 :Usage
   @echo.
@@ -129,8 +137,8 @@
   @echo         Reconfig       Reinstall target.txt, tools_def.txt and build_rule.txt.
   @echo.
   @echo  Note that target.template, tools_def.template and build_rules.template
-  @echo  will be only copied to target.txt, tools_def.txt and build_rule.txt
-  @echo  respectively if they do not exist. Using option [Reconfig] to force the copy.
+  @echo  will only be copied to target.txt, tools_def.txt and build_rule.txt
+  @echo  respectively if they do not exist. Use option [Reconfig] to force the copy.
   @echo.
   goto end


BaseTools: suppress usage instructions with rebuild options

When using edksetup.bat Rebuild, the script outputs usage instructions
to the console, when no usage error is encountered.  Update the usage
instructions and suppress these usage instructions when using the
Rebuild, ForceRebuild options.

Change-Id: Ica98e19f3d5198df2519106e4c55314c255e04ac
Cc: Liming Gao <6480311aeeb4b006862f6d13ebabddc03f51e507@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Chris Ruffin <05d5244e02d8463f5582fcf573b3889fdcd5f61e@intel.com>
Reviewed-by: Yonghong Zhu <78d981fe33a016071af5222c56d5cf77f30fb0b2@intel.com>

--- edksetup.bat
+++ edksetup.bat
@@ -14,10 +14,10 @@

 @REM set CYGWIN_HOME=C:\cygwin

-@REM usage:
+@REM usage:
 @REM   edksetup.bat [--nt32] [AntBuild] [Rebuild] [ForceRebuild] [Reconfig]
 @REM if the argument, skip is present, only the paths and the
-@REM test and set of environment settings are performed.
+@REM test and set of environment settings are performed.

 @REM ##############################################################
 @REM # You should not have to modify anything below this line
@@ -72,7 +72,7 @@
     ) else (
       echo.
       echo !!! ERROR !!! Cannot find BaseTools !!!
-      echo.
+      echo.
       goto BadBaseTools
     )
   )
@@ -141,11 +141,13 @@
 )

 :cygwin_done
+if /I "%1"=="Rebuild" shift
+if /I "%1"=="ForceRebuild" shift
 if "%1"=="" goto end

 :Usage
   @echo.
-  @echo  Usage: "%0 [-h | -help | --help | /h | /help | /?] [--nt32 [X64]] [Reconfig]"
+  @echo  Usage: "%0 [-h | -help | --help | /h | /help | /?] [--nt32 [X64]] [Reconfig] [Rebuild] [ForceRebuild]"
   @echo         --nt32 [X64]   If a compiler tool chain is not available in the
   @echo                        environment, call a script to attempt to set one up.
   @echo                        This flag is only required if building the
@@ -157,6 +159,8 @@
   @echo                        rebuild.
   @echo.
   @echo         Reconfig       Reinstall target.txt, tools_def.txt and build_rule.txt.
+  @echo         Rebuild        Perform incremental rebuild of BaseTools binaries.
+  @echo         ForceRebuild   Force a full rebuild of BaseTools binaries.
   @echo.
   @echo  Note that target.template, tools_def.template and build_rules.template
   @echo  will only be copied to target.txt, tools_def.txt and build_rule.txt
@@ -166,4 +170,3 @@

 :end
   popd
-


only package the tool directory of opencover nuget package

--- TFSExtension/build.bat
+++ TFSExtension/build.bat
@@ -15,7 +15,7 @@
 echo Building RunOpenCoverTask
 xcopy /S /I .\packages\NUnit.ConsoleRunner.3.2.1  .\RunNunitWithOpenCover\dist\NUnit.ConsoleRunner.3.2.1
 xcopy /S /I .\packages\NUnit.Extension.NUnitProjectLoader.3.2.1 .\RunNunitWithOpenCover\dist\NUnit.Extension.NUnitProjectLoader.3.2.1
-xcopy /S /I .\packages\OpenCover.4.6.519  .\RunNunitWithOpenCover\dist\OpenCover.4.6.519
+xcopy /S /I .\packages\OpenCover.4.6.519\tools  .\RunNunitWithOpenCover\dist\OpenCover.4.6.519\tools
 xcopy /S /I /Exclude:xcopy1.excl .\packages\ReportGenerator.2.4.5.0  .\RunNunitWithOpenCover\dist\ReportGenerator.2.4.5.0
 xcopy .\RunNunitWithOpenCover\ResultDummy.xml .\RunNunitWithOpenCover\dist\
 xcopy /S /I .\TFSRestTool\bin\Debug .\RunNunitWithOpenCover\dist\RestHelper


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

--- Release/Release_Source.bat
+++ Release/Release_Source.bat
@@ -16,7 +16,7 @@
 xcopy ..\Source\*.txt MediaInfo_Source\Source\ /S
 xcopy ..\Source\*.csv MediaInfo_Source\Source\ /S
 xcopy ..\Source\*.ico MediaInfo_Source\Source\ /S
-xcopy ..\Source\*.nsi MediaInfo_Source\Source\ /S
+xcopy ..\Source\Install\MediaInfo.nsi MediaInfo_Source\Source\Install\
 xcopy ..\Source\*.sh  MediaInfo_Source\Source\ /S
 xcopy ..\Source\*.png MediaInfo_Source\Source\ /S
 xcopy ..\Source\*.xpm MediaInfo_Source\Source\ /S


Remove site-extension workarounds (#13044)

--- src/SiteExtensions/build.cmd
+++ src/SiteExtensions/build.cmd
@@ -10,9 +10,9 @@
 )

 ECHO Building LoggingBranch
-REM Remove /p:DisablePackageAssetsCache=true /p:DisableTransitiveFrameworkReferences=true which workarounds dotnet store and publish behaviour changes in preview 6
-CALL %RepoRoot%\build.cmd -forceCoreMsbuild -arch x64 -projects %~dp0LoggingBranch\LB.csproj /p:DisablePackageAssetsCache=true /p:DisableTransitiveFrameworkReferences=true /bl:artifacts/log/SiteExtensions-LoggingBranch-x64.binlog %*
-CALL %RepoRoot%\build.cmd -forceCoreMsbuild -arch x86 -projects %~dp0LoggingBranch\LB.csproj /p:DisablePackageAssetsCache=true /p:DisableTransitiveFrameworkReferences=true /bl:artifacts/log/SiteExtensions-LoggingBranch-x86.binlog %*
+REM /p:DisableTransitiveFrameworkReferences=true is needed to prevent SDK from picking up transitive references to Microsoft.AspNetCore.App as framework references https://github.com/dotnet/sdk/pull/3221
+CALL %RepoRoot%\build.cmd -forceCoreMsbuild -arch x64 -projects %~dp0LoggingBranch\LB.csproj /p:DisableTransitiveFrameworkReferences=true /bl:artifacts/log/SiteExtensions-LoggingBranch-x64.binlog %*
+CALL %RepoRoot%\build.cmd -forceCoreMsbuild -arch x86 -projects %~dp0LoggingBranch\LB.csproj /p:DisableTransitiveFrameworkReferences=true /bl:artifacts/log/SiteExtensions-LoggingBranch-x86.binlog %*

 IF %ERRORLEVEL% NEQ 0 (
    EXIT /b %ErrorLevel%


Allow to compile with dependencies (Windows)

--- frascati.bat
+++ frascati.bat
@@ -21,12 +21,12 @@
 @setlocal

 if defined JAVA_HOME (
-  set JAVA=%JAVA_HOME%\bin\java
-  set JAVAC=%JAVA_HOME%\bin\javac
-  set JAR=%JAVA_HOME%\bin\jar
-  set JAVA_OPTS=-Xms16m -Xmx32m
+	set JAVA=%JAVA_HOME%\bin\java
+	set JAVAC=%JAVA_HOME%\bin\javac
+	set JAR=%JAVA_HOME%\bin\jar
+	set JAVA_OPTS=-Xms16m -Xmx32m
 ) else (
-  echo The JAVA_HOME variable is not set. Please initialize it in your environment
+	echo The JAVA_HOME variable is not set. Please initialize it in your environment
 )

 if exist "%FRASCATI_HOME%" goto CONFIG
@@ -63,10 +63,13 @@

 if "%1" == "wsdl2java" (
 	echo Compiling ...
-    goto WSDL2JAVA
+		goto WSDL2JAVA
 ) else if "%1" == "compile" (
 	echo Compiling ...
-    goto COMPILE
+		goto COMPILE
+) else if "%1" == "compile-libs" (
+	echo Compiling with libs ...
+		goto COMPILELIBS
 ) else if "%1" == "run" (
 	echo Running OW2 FraSCAti ...
 	"%JAVA%" %JAVA_OPTS% -Djava.security.policy="%FRASCATI_HOME%\conf\java.policy" -Djava.util.logging.config.file="%LOGGING%" -Dlog4j.configuration=logging.properties -cp "%FRASCATI_HOME%"\conf;"%LAUNCHER_LIB%" %LAUNCHER_MAIN% %FRASCATI_MAIN% -lib "%FRASCATI_LIB%" %PARAMS:~4%
@@ -103,8 +106,8 @@
 rem Search java sources in .\src\...
 setlocal ENABLEDELAYEDEXPANSION
 IF ERRORLEVEL 1 (
-  echo Impossible d'activer les extensions
-  goto END
+	echo Impossible d'activer les extensions
+	goto END
 )
 set SRC_FILES=
 for /r %1 %%X in (*.java) do (set SRC_FILES=!SRC_FILES! "%%X")
@@ -113,8 +116,8 @@
 echo %SRC_FILES% > javasrc.tmp~

 if ERRORLEVEL 1 (
-  echo Cannot find Java source files in %1
-  goto END
+	echo Cannot find Java source files in %1
+	goto END
 )

 rem Compile Java sources
@@ -138,9 +141,63 @@
 goto END

 :COMPILE_USAGE
-echo Usage: frascati compile [src] [name]
+echo Usage: frascati compile-libs [src] [name]
 echo [src]  = directory of the sources to compile
 echo [name] = name of the jar to build
+goto END
+
+:COMPILELIBS
+for /f "usebackq tokens=3*" %%i in (`echo %*`) DO @ set LIBPARAMS=%%j
+shift
+if "%1"=="" goto COMPILELIBS_USAGE
+if "%2"=="" goto COMPILELIBS_USAGE
+
+set CURRENT_DIR=%CD%
+set OUTPUT=tmp
+mkdir %OUTPUT%
+
+rem Search java sources in .\src\...
+setlocal ENABLEDELAYEDEXPANSION
+IF ERRORLEVEL 1 (
+	echo Impossible d'activer les extensions
+	goto END
+)
+set SRC_FILES=
+for /r %1 %%X in (*.java) do (set SRC_FILES=!SRC_FILES! "%%X")
+setlocal DISABLEDELAYEDEXPANSION
+set SRC_FILES=%SRC_FILES:\=/%
+echo %SRC_FILES% > javasrc.tmp~
+
+if ERRORLEVEL 1 (
+	echo Cannot find Java source files in %1
+	goto END
+)
+
+rem Compile Java sources
+"%JAVAC%" -d "%OUTPUT%" -cp "%FRASCATI_LIB%\osoa-java-api-2.0.1.2.jar;%FRASCATI_LIB%\jaxb-api-2.1.jar;%FRASCATI_LIB%\geronimo-ws-metadata_2.0_spec-1.1.2.jar;%FRASCATI_LIB%\geronimo-jaxws_2.1_spec-1.0.jar;%FRASCATI_LIB%\jsr311-api-1.1.1.jar;%FRASCATI_LIB%\explorer-1.0.jar;%FRASCATI_LIB%\frascati-explorer-api-%FRASCATI_VERSION%.jar;%LIBPARAMS%" @javasrc.tmp~
+rem Copy composite files
+for /r %1 %%X in (*.composite) do (copy /Y "%%X" "%OUTPUT%")
+rem Copy Explorer files
+mkdir %OUTPUT%\META-INF
+for /r %1 %%X in (FraSCAti-Explorer.xml) do (copy /Y "%%X" "%OUTPUT%\META-INF")
+
+rem Build jar file
+cd %OUTPUT%
+"%JAR%" cf ../%2.jar *
+cd %CURRENT_DIR%
+echo Library %2.jar created
+
+rem clean up
+rmdir /S/Q "%OUTPUT%"
+del /Q javasrc.tmp~
+
+goto END
+
+:COMPILELIBS_USAGE
+echo Usage: frascati compile-libs [src] [name] [jar-files]
+echo [src]  = directory of the sources to compile
+echo [name] = name of the jar to build
+echo [jar-files] =  comma-separated jar libraries to include in the CLASSPATH
 goto END

 :EXPLORER
@@ -152,31 +209,31 @@
 echo Running the OW2 FraSCAti Explorer ...

 if "%FRASCATI_REMOTE_FLAG%" == "TRUE" (
-  set EXPLORER_CLASSPATH=%EXPLORER_CLASSPATH%,%FRASCATI_LIB%\fscript,%FRASCATI_LIB%\remote
-  set EXPLORER_BOOTSTRAP="-Dorg.ow2.frascati.bootstrap=org.ow2.frascati.bootstrap.FraSCAtiJDTFractalRest"
-  echo -^> FraSCAti Remote plugin activated
-  if "%FRASCATI_SCRIPT_FLAG%" == "TRUE" (
-    set EXPLORER_CLASSPATH=%EXPLORER_CLASSPATH%,%FRASCATI_LIB%\explorer-fscript-plugin
-    echo -^> FraSCAti Script plugin activated
-  )
+	set EXPLORER_CLASSPATH=%EXPLORER_CLASSPATH%,%FRASCATI_LIB%\fscript,%FRASCATI_LIB%\remote
+	set EXPLORER_BOOTSTRAP="-Dorg.ow2.frascati.bootstrap=org.ow2.frascati.bootstrap.FraSCAtiJDTFractalRest"
+	echo -^> FraSCAti Remote plugin activated
+	if "%FRASCATI_SCRIPT_FLAG%" == "TRUE" (
+		set EXPLORER_CLASSPATH=%EXPLORER_CLASSPATH%,%FRASCATI_LIB%\explorer-fscript-plugin
+		echo -^> FraSCAti Script plugin activated
+	)
 ) else (
-  if "%FRASCATI_SCRIPT_FLAG%" == "TRUE" (
-    set EXPLORER_CLASSPATH=%EXPLORER_CLASSPATH%,%FRASCATI_LIB%\fscript,%FRASCATI_LIB%\explorer-fscript-plugin
-    echo -^> FraSCAti Script plugin activated
-  )
+	if "%FRASCATI_SCRIPT_FLAG%" == "TRUE" (
+		set EXPLORER_CLASSPATH=%EXPLORER_CLASSPATH%,%FRASCATI_LIB%\fscript,%FRASCATI_LIB%\explorer-fscript-plugin
+		echo -^> FraSCAti Script plugin activated
+	)
 )

 if exist %SCA_APPS_FOLDER% (
-  rem update the classpath with user libraries
-  pushd "%SCA_APPS_FOLDER%"
-  for /d %%X in ("*") do (set EXPLORER_CLASSPATH=%EXPLORER_CLASSPATH%,%%~X)
-  popd
-
-  rem search for composite files
-  setlocal EnableDelayedExpansion
-  set COMPOSITES=
-  for /r "%SCA_APPS_FOLDER%" %%X in (*.composite) do ( set COMPOSITES=!COMPOSITES! %%~nX )
-  setlocal DISABLEDELAYEDEXPANSION
+	rem update the classpath with user libraries
+	pushd "%SCA_APPS_FOLDER%"
+	for /d %%X in ("*") do (set EXPLORER_CLASSPATH=%EXPLORER_CLASSPATH%,%%~X)
+	popd
+
+	rem search for composite files
+	setlocal EnableDelayedExpansion
+	set COMPOSITES=
+	for /r "%SCA_APPS_FOLDER%" %%X in (*.composite) do ( set COMPOSITES=!COMPOSITES! %%~nX )
+	setlocal DISABLEDELAYEDEXPANSION
 )

 "%JAVA%" %JAVA_OPTS% %EXPLORER_BOOTSTRAP% -cp "%LAUNCHER_LIB%" %LAUNCHER_MAIN% %EXPLORER_LAUNCHER% -lib "%EXPLORER_CLASSPATH%" %COMPOSITES%


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

--- Release/Release_Source.bat
+++ Release/Release_Source.bat
@@ -62,6 +62,8 @@
 xcopy ..\Project\*.cbp MediaInfo_Lib_Source\Project\ /S /Y
 xcopy ..\Project\*.resx MediaInfo_Lib_Source\Project\ /S
 xcopy ..\Project\*.rc MediaInfo_Lib_Source\Project\ /S
+xcopy ..\Project\*.def MediaInfo_Lib_Source\Project\ /S
+xcopy ..\Project\*.idl MediaInfo_Lib_Source\Project\ /S
 xcopy ..\Project\BCB\*.h MediaInfo_Lib_Source\Project\BCB\ /S
 xcopy ..\Project\CMake\*.txt MediaInfo_Lib_Source\Project\CMake\ /S
 xcopy ..\Project\MSVC\*.h MediaInfo_Lib_Source\Project\MSVC\ /S


CRAN_Release script update only

CRAN_Release script update only

--- .dev/CRAN_Release.cmd
+++ .dev/CRAN_Release.cmd
@@ -304,13 +304,14 @@
 ./configure CFLAGS="-O2 -Wall -pedantic"
 make

-# use latest available below `apt-cache search gcc-` or `clang-`
-cd ../R-devel-strict-clang
-./configure --without-recommended-packages --disable-byte-compiled-packages --disable-openmp --enable-strict-barrier --disable-long-double CC="clang-8 -fsanitize=undefined,address -fno-sanitize=float-divide-by-zero -fno-omit-frame-pointer"
+# use latest available `apt-cache search gcc-` or `clang-`
+cd ~/build/R-devel-strict-clang
+./configure --without-recommended-packages --disable-byte-compiled-packages --disable-openmp --enable-strict-barrier --disable-long-double CC="clang-10 -fsanitize=undefined,address -fno-sanitize=float-divide-by-zero -fno-omit-frame-pointer"
 make

-cd ../R-devel-strict-gcc
-./configure --without-recommended-packages --disable-byte-compiled-packages --disable-openmp --enable-strict-barrier --disable-long-double CC="gcc-8 -fsanitize=undefined,address -fno-sanitize=float-divide-by-zero -fno-omit-frame-pointer"
+cd ~/build/R-devel-strict-gcc
+# gcc-10 (in dev currently) failed to build R, so using regular gcc-9 (9.3.0 as per focal/Pop!_OS 20.04)
+./configure --without-recommended-packages --disable-byte-compiled-packages --disable-openmp --enable-strict-barrier --disable-long-double CC="gcc-9 -fsanitize=undefined,address -fno-sanitize=float-divide-by-zero -fno-omit-frame-pointer"
 make

 # See R-exts#4.3.3


Add support for VS 2017

Add support for VS 2017

--- bat/build_proton.bat
+++ bat/build_proton.bat
@@ -22,8 +22,9 @@
 :: build_proton.bat
 :: Version 1.5 2015-07-09
 :: Version 1.6 2016-03-08 Add VS2015
-::
-:: Usage: build_proton.bat INSTALL_ROOT_PATH [2008|2010|2012|2013|2015 x64|x86 [any         [any]]]
+:: Version 1.7 2017-10-25 Add VS2017, Remove VS2008
+::
+:: Usage: build_proton.bat INSTALL_ROOT_PATH [2010|2012|2013|2015|2017 x64|x86 [any         [any]]]
 ::                         %1                 %2                       %3       %4           %5
 ::                                                                              keep build  keep install
 :: A script to cmake/make/install proton on windows.
@@ -34,15 +35,11 @@
 :: It produces an installed directory that qpid can share to get 1.0 support.
 ::
 :: Cmake and the compiles will be in subfolder of the current directory:
-::      .\build_2008_x86
 ::      .\build_2010_x86
-::      .\build_2008_x64
 ::      .\build_2010_x64
 ::
 :: Installs are steered to sub directories under INSTALL_ROOT_PATH in %1.
-::      %1%\install_2008_x86
 ::      %1%\install_2010_x86
-::      %1%\install_2008_x64
 ::      %1%\install_2010_x64
 ::
 ::   The install directories are suitable to be consumed in a
@@ -59,7 +56,7 @@

 :: Check that CD is a proton checkout
 IF NOT exist .\proton-c (echo This script must execute from a proton checkout root && pause && goto :eof)
-IF NOT exist .\proton-j (echo This script must execute from a proton checkout root && pause && goto :eof)
+IF NOT exist .\proton-j (echo This script must execute from a proton checkout root. If this is a distribution kit then proton-j is absent. Just 'mkdir proton-j' and build again. && pause && goto :eof)

 :: Check that the INSTALL_ROOT_PATH is specified
 IF "%1"=="" (echo You must specify an INSTALL_ROOT_PATH && GOTO :Usage)
@@ -96,23 +93,23 @@
 IF "%cli_build%"=="true" (
     call :build_proton %cli_compiler% %cli_arch% %INSTALL_ROOT% "%keep_build%" "%keep_install%"
 ) ELSE (
-    call :build_proton 2008 x86  %INSTALL_ROOT% "%keep_build%" "%keep_install%"
     call :build_proton 2010 x86  %INSTALL_ROOT% "%keep_build%" "%keep_install%"
     call :build_proton 2012 x86  %INSTALL_ROOT% "%keep_build%" "%keep_install%"
     call :build_proton 2013 x86  %INSTALL_ROOT% "%keep_build%" "%keep_install%"
     call :build_proton 2015 x86  %INSTALL_ROOT% "%keep_build%" "%keep_install%"
-    call :build_proton 2008 x64  %INSTALL_ROOT% "%keep_build%" "%keep_install%"
+    call :build_proton 2017 x86  %INSTALL_ROOT% "%keep_build%" "%keep_install%"
     call :build_proton 2010 x64  %INSTALL_ROOT% "%keep_build%" "%keep_install%"
     call :build_proton 2012 x64  %INSTALL_ROOT% "%keep_build%" "%keep_install%"
     call :build_proton 2013 x64  %INSTALL_ROOT% "%keep_build%" "%keep_install%"
     call :build_proton 2015 x64  %INSTALL_ROOT% "%keep_build%" "%keep_install%"
+    call :build_proton 2017 x64  %INSTALL_ROOT% "%keep_build%" "%keep_install%"
 )
 goto :eof

 ::
 :: build a proton
 ::  %1 selects architecture x86 or x64
-::  %2 selects studio 2008 or 2010 or 2012 or 2013
+::  %2 selects studio  2010 or 2012 or 2013 or 2015 or 2017
 ::  %3 is fully qualified install root path with no trailing slash
 ::  %4 true|false to keep build directory
 ::  %5 true|false to keep install directory
@@ -130,20 +127,7 @@
 set   build_dir=build_%vsname%_%arch%
 set install_dir=%INSTALL_ROOT_PATH%\install_%vsname%_%arch%

-REM VS2008 or VS2010 or VS2012 or VS2013 or VS2015, x86 or x64
-if "%vsname%"=="2008" (
-    if "%arch%" == "x86" (
-        call "%VS90COMNTOOLS%..\..\VC\vcvarsall.bat" x86
-        if ERRORLEVEL 1 exit /b 1
-        set cmakegen="Visual Studio 9 2008"
-        set proton_arch=Win32
-    ) else (
-        call "%VS90COMNTOOLS%..\..\VC\vcvarsall.bat" amd64
-        if ERRORLEVEL 1 exit /b 1
-        set cmakegen="Visual Studio 9 2008 Win64"
-        set proton_arch=x64
-    )
-)
+REM VS2010 or VS2012 or VS2013 or VS2015 or VS2017, x86 or x64
 if "%vsname%"=="2010" (
     if "%arch%" == "x86" (
         call "%VS100COMNTOOLS%..\..\VC\vcvarsall.bat" x86
@@ -193,6 +177,19 @@
         call "%VS140COMNTOOLS%..\..\VC\vcvarsall.bat" amd64
         if ERRORLEVEL 1 exit /b 1
         set cmakegen="Visual Studio 14 2015 Win64"
+        set proton_arch=x64
+    )
+)
+if "%vsname%"=="2017" (
+    if "%arch%" == "x86" (
+        call "%VS150COMNTOOLS%..\..\VC\Auxiliary\build\vcvarsall.bat" x86
+        if ERRORLEVEL 1 exit /b 1
+        set cmakegen="Visual Studio 15 2017"
+        set proton_arch=Win32
+    ) else (
+        call "%VS150COMNTOOLS%..\..\VC\Auxiliary\build\vcvarsall.bat" amd64
+        if ERRORLEVEL 1 exit /b 1
+        set cmakegen="Visual Studio 15 2017 Win64"
         set proton_arch=x64
     )
 )


more bugs

more bugs

--- MCal.bat
+++ MCal.bat
@@ -11,12 +11,12 @@

 :start
 :: we will check if MCal has been installed.
+:: using a goto because of unexpected bug :P
 IF NOT EXIST "MCal_deps\setup.chk" (
 goto installask
-:: doing this because of the way batch is shit
 )

-::installask
+:installask
 cls
 echo MCal has not been run before.
 CHOICE /C:yn "Install now"


Also export variables with short versions

--- .appveyor/install.bat
+++ .appveyor/install.bat
@@ -1,11 +1,11 @@
 @echo off
-Setlocal EnableDelayedExpansion EnableExtensions

 cd %APPVEYOR_BUILD_FOLDER%

 :: =========================================================
 :: Set some defaults. Infer some variables.
 ::
+:: These are set globally
 if "%LUA_VER%" NEQ "" (
 	set LUA=lua
 	set LUA_SHORTV=%LUA_VER:~0,3%
@@ -14,6 +14,9 @@
 	set LJ_SHORTV=%LJ_VER:~0,3%
 	set LUA_SHORTV=5.1
 )
+
+:: Now we declare a scope
+Setlocal EnableDelayedExpansion EnableExtensions

 set LUAROCKS_SHORTV=%LUAROCKS_VER:~0,3%

@@ -160,8 +163,7 @@
 set LR_SYSTREE=%LR_SYSTREE%&^
 set LUA_PATH=%LUA_PATH%&^
 set LUA_CPATH=%LUA_CPATH%&^
-set LR_EXTERNAL=%LR_EXTERNAL%&^
-set LUA=%LUA%
+set LR_EXTERNAL=%LR_EXTERNAL%

 echo ======================================================
 if "%LUA%"=="luajit" (
@@ -169,9 +171,14 @@
 ) else (
 	echo Installation of Lua %LUA_VER% and LuaRocks %LUAROCKS_VER% done.
 )
-echo Platform - %platform%
-echo LUA_PATH  - %LUA_PATH%
-echo LUA_CPATH - %LUA_CPATH%
+echo Platform         - %platform%
+echo LUA              - %LUA%
+echo LUA_SHORTV       - %LUA_SHORTV%
+echo LJ_SHORTV        - %LJ_SHORTV%
+echo LUA_PATH         - %LUA_PATH%
+echo LUA_CPATH        - %LUA_CPATH%
+echo
+echo LR_EXTERNAL      - %LR_EXTERNAL%
 echo ======================================================

 goto :eof


Fixed setenv.bat by using vcvarsall instead of vsdevcmd as the latter does not set up a proper VC++ environment given arguments

--- utility-scripts/setenv.bat
+++ utility-scripts/setenv.bat
@@ -11,9 +11,6 @@

 @echo off

-:: Exit script if the environment is already set up.
-nmake /? 2>NUL >NUL && echo Environment already set up! && exit /b
-
 :: Tries to set up development environment starting with the latest visual studio
 :: down to the oldest Windows SDK

@@ -21,17 +18,17 @@

 set SETENV_ARGS=
 set SETENV_ARGS_STR=
-set VSDEVCMD_ARGS=
-set VSDEVCMD_ARGS_STR=
+set VCVARSALL_ARGS=
+set VCVARSALL_ARGS_STR=

 :: Append correct flags
 ECHO.%*| FIND /I "x64">Nul && (
   set SETENV_ARGS=/x64 %SETENV_ARGS%
-  set VSDEVCMD_ARGS=x86_amd64 %VSDEVCMD_ARGS%
+  set VCVARSALL_ARGS=x86_amd64 %VCVARSALL_ARGS%
 )
 ECHO.%*| FIND /I "x86">Nul && (
   set SETENV_ARGS=/x86 %SETENV_ARGS%
-  set VSDEVCMD_ARGS=x86 %VSDEVCMD_ARGS%
+  set VCVARSALL_ARGS=x86 %VCVARSALL_ARGS%
 )
 ECHO.%*| FIND /I "Release">Nul && (
   set SETENV_ARGS=/Release %SETENV_ARGS%
@@ -60,10 +57,31 @@
 set SETENV_ARGS=%SETENV_ARGS:~0,-1%
 set SETENV_ARGS_STR=with SetEnv.cmd %SETENV_ARGS%
 :SKIP_SETENV_ARGS
-IF "%VSDEVCMD_ARGS%"=="" GOTO SKIP_VSDEVCMD_ARGS
-set VSDEVCMD_ARGS=%VSDEVCMD_ARGS:~0,-1%
-set VSDEVCMD_ARGS_STR=with VsDevCmd.bat %VSDEVCMD_ARGS%
-:SKIP_VSDEVCMD_ARGS
+IF "%VCVARSALL_ARGS%"=="" GOTO SKIP_VCVARSALL_ARGS
+set VCVARSALL_ARGS=%VCVARSALL_ARGS:~0,-1%
+set VCVARSALL_ARGS_STR=with vcvarsall.bat %VCVARSALL_ARGS%
+:SKIP_VCVARSALL_ARGS

 :: Actually call the implementations
-((call "%VS160COMNTOOLS%VsDevCmd.bat" %VSDEVCMD_ARGS% 2>NUL) && echo Using Visual Studio 16.0 %VSDEVCMD_ARGS_STR%) || ((call "%programfiles(x86)%\Microsoft SDKs\Windows\v12.1\Bin\SetEnv.cmd" %SETENV_ARGS% 2>NUL) && echo Using Windows SDK 12.1 %SETENV_ARGS_STR%) || ((call "%programfiles(x86)%\Microsoft SDKs\Windows\v12\Bin\SetEnv.cmd" %SETENV_ARGS% 2>NUL) && echo Using Windows SDK 12 %SETENV_ARGS_STR%) || ((call "%VS150COMNTOOLS%VsDevCmd.bat" %VSDEVCMD_ARGS% 2>NUL) && echo Using Visual Studio 15.0 %VSDEVCMD_ARGS_STR%) || ((call "%programfiles(x86)%\Microsoft SDKs\Windows\v11.1\Bin\SetEnv.cmd" %SETENV_ARGS% 2>NUL) && echo Using Windows SDK 11.1 %SETENV_ARGS_STR%) || ((call "%programfiles(x86)%\Microsoft SDKs\Windows\v11\Bin\SetEnv.cmd" %SETENV_ARGS% 2>NUL) && echo Using Windows SDK 11 %SETENV_ARGS_STR%) || ((call "%programfiles(x86)%\Microsoft SDKs\Windows\v10.1\Bin\SetEnv.cmd" %SETENV_ARGS% 2>NUL) && echo Using Windows SDK 10.1 %SETENV_ARGS_STR%) || ((call "%VS140COMNTOOLS%VsDevCmd.bat" %VSDEVCMD_ARGS% 2>NUL) && echo Using Visual Studio 2015 %VSDEVCMD_ARGS_STR%) || ((call "%programfiles(x86)%\Microsoft SDKs\Windows\v10\Bin\SetEnv.cmd" %SETENV_ARGS% 2>NUL) && echo Using Windows SDK 10 [2015] %SETENV_ARGS_STR%) || ((call "%VS120COMNTOOLS%VsDevCmd.bat" %VSDEVCMD_ARGS% 2>NUL) && echo Using Visual Studio 2013 %VSDEVCMD_ARGS_STR%) || ((call "%programfiles(x86)%\Microsoft SDKs\Windows\v8.1\Bin\SetEnv.cmd" %SETENV_ARGS% 2>NUL) && echo Using Windows SDK 8.1 [2013] %SETENV_ARGS_STR%) || ((call "%VS110COMNTOOLS%vsvars32.bat" %VSDEVCMD_ARGS% 2>NUL) && echo Using Visual Studio 2012 %VSDEVCMD_ARGS_STR%) || ((call "%programfiles(x86)%\Microsoft SDKs\Windows\v8.0\Bin\SetEnv.cmd" %SETENV_ARGS% 2>NUL) && echo Using Windows SDK 8.0 [2012] %SETENV_ARGS_STR%) || ((call "%programfiles(x86)%\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" %SETENV_ARGS% 2>NUL) && echo Using Windows SDK 7.1 [2010] %SETENV_ARGS_STR%) || ((call "%VS100COMNTOOLS%..\..\VC\vcvarsall.bat" %VSDEVCMD_ARGS% 2>NUL) && echo Using Visual Studio 2010 %VSDEVCMD_ARGS_STR%)  || ((call "%programfiles(x86)%\Microsoft SDKs\Windows\v7.0\Bin\SetEnv.cmd" %SETENV_ARGS% 2>NUL) && echo Using Windows SDK 7.0 [2009] %SETENV_ARGS_STR%) || ((call "%programfiles(x86)%\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" %VSDEVCMD_ARGS% 2>NUL) && echo Using Visual Studio [2008] %VSDEVCMD_ARGS_STR%) || ((call "%programfiles(x86)%\Microsoft SDKs\Windows\v6.1\Bin\SetEnv.cmd" %SETENV_ARGS% 2>NUL) && echo Using Windows SDK 6.1 [2007] %SETENV_ARGS_STR%) || ((call "%programfiles(x86)%\Microsoft SDKs\Windows\v6.0\Bin\SetEnv.cmd" %SETENV_ARGS% 2>NUL) && echo Using Windows SDK 6.0 [2006] %SETENV_ARGS_STR%) || ((call "%programfiles(x86)%\Microsoft Visual Studio 8\VC\vcvarsall.bat" %VSDEVCMD_ARGS% 2>NUL) && echo Using Visual Studio 2005 %VSDEVCMD_ARGS_STR%) || ((call "%programfiles(x86)%\Microsoft Visual Studio 7\VC\vcvarsall.bat" %VSDEVCMD_ARGS% 2>NUL) && echo Using Visual Studio .NET [2002] %VSDEVCMD_ARGS_STR%) || ((call "%programfiles(x86)%\Microsoft Visual Studio\vc98\bin\vcvars32.bat" %VSDEVCMD_ARGS% 2>NUL) && echo Using Visual Studio 6.0 [1998] %VSDEVCMD_ARGS_STR%)
+((call "%VS160COMNTOOLS%..\..\VC\vcvarsall.bat" %VCVARSALL_ARGS% 2>NUL) && echo Using Visual Studio 16.0 %VCVARSALL_ARGS_STR% && exit /b 0)
+((call "%programfiles(x86)%\Microsoft SDKs\Windows\v12.1\Bin\SetEnv.cmd" %SETENV_ARGS% 2>NUL) && echo Using Windows SDK 12.1 %SETENV_ARGS_STR% && exit /b 0)
+((call "%programfiles(x86)%\Microsoft SDKs\Windows\v12\Bin\SetEnv.cmd" %SETENV_ARGS% 2>NUL) && echo Using Windows SDK 12 %SETENV_ARGS_STR% && exit /b 0)
+((call "%VS150COMNTOOLS%..\..\VC\vcvarsall.bat" %VCVARSALL_ARGS% 2>NUL) && echo Using Visual Studio 15.0 %VCVARSALL_ARGS_STR% && exit /b 0)
+((call "%programfiles(x86)%\Microsoft SDKs\Windows\v11.1\Bin\SetEnv.cmd" %SETENV_ARGS% 2>NUL) && echo Using Windows SDK 11.1 %SETENV_ARGS_STR% && exit /b 0)
+((call "%programfiles(x86)%\Microsoft SDKs\Windows\v11\Bin\SetEnv.cmd" %SETENV_ARGS% 2>NUL) && echo Using Windows SDK 11 %SETENV_ARGS_STR% && exit /b 0)
+((call "%programfiles(x86)%\Microsoft SDKs\Windows\v10.1\Bin\SetEnv.cmd" %SETENV_ARGS% 2>NUL) && echo Using Windows SDK 10.1 %SETENV_ARGS_STR% && exit /b 0)
+((call "%VS140COMNTOOLS%..\..\VC\vcvarsall.bat" %VCVARSALL_ARGS% 2>NUL) && echo Using Visual Studio 2015 %VCVARSALL_ARGS_STR% && exit /b 0)
+((call "%programfiles(x86)%\Microsoft SDKs\Windows\v10\Bin\SetEnv.cmd" %SETENV_ARGS% 2>NUL) && echo Using Windows SDK 10 [2015] %SETENV_ARGS_STR% && exit /b 0)
+((call "%VS120COMNTOOLS%..\..\VC\vcvarsall.bat" %VCVARSALL_ARGS% 2>NUL) && echo Using Visual Studio 2013 %VCVARSALL_ARGS_STR% && exit /b 0)
+((call "%programfiles(x86)%\Microsoft SDKs\Windows\v8.1\Bin\SetEnv.cmd" %SETENV_ARGS% 2>NUL) && echo Using Windows SDK 8.1 [2013] %SETENV_ARGS_STR% && exit /b 0)
+((call "%VS110COMNTOOLS%..\..\VC\vcvarsall.bat" %VCVARSALL_ARGS% 2>NUL) && echo Using Visual Studio 2012 %VCVARSALL_ARGS_STR% && exit /b 0)
+((call "%programfiles(x86)%\Microsoft SDKs\Windows\v8.0\Bin\SetEnv.cmd" %SETENV_ARGS% 2>NUL) && echo Using Windows SDK 8.0 [2012] %SETENV_ARGS_STR% && exit /b 0)
+((call "%programfiles(x86)%\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" %SETENV_ARGS% 2>NUL) && echo Using Windows SDK 7.1 [2010] %SETENV_ARGS_STR% && exit /b 0)
+((call "%VS100COMNTOOLS%..\..\VC\vcvarsall.bat" %VCVARSALL_ARGS% 2>NUL) && echo Using Visual Studio 2010 %VCVARSALL_ARGS_STR% && exit /b 0)
+((call "%programfiles(x86)%\Microsoft SDKs\Windows\v7.0\Bin\SetEnv.cmd" %SETENV_ARGS% 2>NUL) && echo Using Windows SDK 7.0 [2009] %SETENV_ARGS_STR% && exit /b 0)
+((call "%programfiles(x86)%\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" %VCVARSALL_ARGS% 2>NUL) && echo Using Visual Studio [2008] %VCVARSALL_ARGS_STR% && exit /b 0)
+((call "%programfiles(x86)%\Microsoft SDKs\Windows\v6.1\Bin\SetEnv.cmd" %SETENV_ARGS% 2>NUL) && echo Using Windows SDK 6.1 [2007] %SETENV_ARGS_STR% && exit /b 0)
+((call "%programfiles(x86)%\Microsoft SDKs\Windows\v6.0\Bin\SetEnv.cmd" %SETENV_ARGS% 2>NUL) && echo Using Windows SDK 6.0 [2006] %SETENV_ARGS_STR% && exit /b 0)
+((call "%programfiles(x86)%\Microsoft Visual Studio 8\VC\vcvarsall.bat" %VCVARSALL_ARGS% 2>NUL) && echo Using Visual Studio 2005 %VCVARSALL_ARGS_STR% && exit /b 0)
+((call "%programfiles(x86)%\Microsoft Visual Studio 7\VC\vcvarsall.bat" %VCVARSALL_ARGS% 2>NUL) && echo Using Visual Studio .NET [2002] %VCVARSALL_ARGS_STR% && exit /b 0)
+((call "%programfiles(x86)%\Microsoft Visual Studio\vc98\bin\vcvars32.bat" %VCVARSALL_ARGS% 2>NUL) && echo Using Visual Studio 6.0 [1998] %VCVARSALL_ARGS_STR% && exit /b 0)


Removed build.bat; use the Makefile instead.

Former-commit-id: a3986b7074b845174788dbd7e0a0ab4db14bdb71

--- bootloader/build.bat
+++ bootloader/build.bat
@@ -1,6 +0,0 @@
-avr-gcc -g -Wall -O3 -mmcu=atmega8 -DCRUMB8 -c -o ATmegaBOOT.o ATmegaBOOT.c
-avr-gcc -g -Wall -O3 -mmcu=atmega8 -DCRUMB8 -Wl,-Map,ATmegaBOOT.map,--section-start=.text=0x1800 -o ATmegaBOOT.elf ATmegaBOOT.o
-avr-objdump -S -h ATmegaBOOT.elf > ATmegaBOOT.lst
-avr-objcopy -j .text -j .data -O ihex ATmegaBOOT.elf ATmegaBOOT.hex
-avr-objcopy -j .text -j .data -O binary ATmegaBOOT.elf ATmegaBOOT.bin
-avr-objcopy -j .text -j .data -O srec ATmegaBOOT.elf ATmegaBOOT.srec


Update bld.bat

Update bld.bat

--- conda/bld.bat
+++ conda/bld.bat
@@ -55,8 +55,8 @@
 cd ..
 rmdir toolchain /s /q

-for %%ANACONDA_BUILD_RECIPE in (%ANACONDA_BUILD_RECIPES%) do (
-    conda build %%ANACONDA_BUILD_RECIPE %ANACONDA_CHANNEL_FLAGS% %ANACONDA_BUILD_FLAGS%
+for %%i in (%ANACONDA_BUILD_RECIPES%) do (
+    conda build %%i %ANACONDA_CHANNEL_FLAGS% %ANACONDA_BUILD_FLAGS%
     if %errorlevel% neq 0 (
         if exist %GITHUB_REPOSITORY% (
             rmdir %GITHUB_REPOSITORY% /s /q


Partial fixes for windows

Partial fixes for windows

--- conda/bld.bat
+++ conda/bld.bat
@@ -6,26 +6,24 @@
 rem Need to handle Python 3.x case at some point (Visual Studio 2010)
 if %ARCH%==32 (
   if %PY_VER% LSS 3 (
-    set CMAKE_GENERATOR="Visual Studio 9 2008"
     set CMAKE_CONFIG="Release|Win32"
   )
 )
 if %ARCH%==64 (
   if %PY_VER% LSS 3 (
-    set CMAKE_GENERATOR="Visual Studio 9 2008 Win64"
     set CMAKE_CONFIG="Release|x64"
   )
 )

-cmake ../tools/python -G"$CMAKE_GENERATOR" ^
+cmake ..\tools\python ^
 -DCMAKE_PREFIX_PATH="%PREFIX%" ^
 -DBUILD_SHARED_LIBS=1 ^
 -DBoost_USE_STATIC_LIBS=0 ^
 -DBoost_USE_STATIC_RUNTIME=0 ^
--DBOOST_INCLUDEDIR="%PREFIX%\include" ^
--DBOOST_LIBRARYDIR="%PREFIX%\lib" ^
--DPYTHON_LIBRARY="%PREFIX%\lib\libpython$PY_VER.dll" ^
--DPYTHON_INCLUDE_DIR="%PREFIX%\include\python$PY_VER" ^
+-DBOOST_INCLUDEDIR="%LIBRARY_INC%" ^
+-DBOOST_LIBRARYDIR="%LIBRARY_LIB%" ^
+-DPYTHON_LIBRARY="%PREFIX%\libs\python%PY_VER%.lib" ^
+-DPYTHON_INCLUDE_DIR="%PREFIX%\include\python%PY_VER%" ^
 -DDLIB_NO_GUI_SUPPORT=1 ^
 -DDLIB_USE_BLAS=0 ^
 -DDLIB_USE_LAPACK=0


commit on 04/02/2019 at 15:58:47

commit on 04/02/2019 at 15:58:47


Update AppVeyorAfterDeploy.bat

Update AppVeyorAfterDeploy.bat

--- AppVeyor/AppVeyorAfterDeploy.bat
+++ AppVeyor/AppVeyorAfterDeploy.bat
@@ -8,6 +8,7 @@
 git config --global user.name "%GIT_B%"

 @echo on
+git checkout master
 git add -f Source\ACE.Server\ServerBuildInfo_Dynamic.cs
 git commit -m "[ci skip] Updating ServerBuildInfo_Dynamic with latest build and version information"
 git push origin master


Added VS2010 support in edksetup script.

Signed-off-by: Yu Wang <yu.wang@intel.com>
Reviewed-by: Jikui Su <jikui.su@intel.com>

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

--- edksetup.bat
+++ edksetup.bat
@@ -1,7 +1,7 @@
 @REM @file
 @REM   Windows batch file to setup a WORKSPACE environment
 @REM
-@REM Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.

+@REM Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.

 @REM This program and the accompanying materials
 @REM are licensed and made available under the terms and conditions of the BSD License
 @REM which accompanies this distribution.  The full text of the license may be found at
@@ -61,18 +61,22 @@
 @REM and headers to interface with Windows.

 if not defined VCINSTALLDIR (
-  if defined VS71COMNTOOLS (
-    call "%VS71COMNTOOLS%\vsvars32.bat"
+  if defined VS100COMNTOOLS (
+    call "%VS100COMNTOOLS%\vsvars32.bat"
   ) else (
-    if defined VS80COMNTOOLS (
-      call "%VS80COMNTOOLS%\vsvars32.bat"
+    if defined VS90COMNTOOLS (
+      call "%VS90COMNTOOLS%\vsvars32.bat"
     ) else (
-      if defined VS90COMNTOOLS (
-        call "%VS90COMNTOOLS%\vsvars32.bat"
+      if defined VS80COMNTOOLS (
+        call "%VS80COMNTOOLS%\vsvars32.bat"
       ) else (
-        echo.
-        echo !!! WARNING !!! Cannot find Visual Studio !!!
-        echo.
+	if defined VS71COMNTOOLS (
+          call "%VS71COMNTOOLS%\vsvars32.bat"
+        ) else (
+          echo.
+          echo !!! WARNING !!! Cannot find Visual Studio !!!
+          echo.
+        )
       )
     )
   )


Fix configure.bat with the requests/filters/details public header fix.

Need to run syncqt on those subdirs of contacts, too.

--- configure.bat
+++ configure.bat
@@ -447,6 +447,9 @@
     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 (
@@ -464,6 +467,9 @@
     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
 )

 if "%REMAINING%" == "" (


Delete config.in earlier.

Delete config.in earlier.

--- configure.bat
+++ configure.bat
@@ -191,6 +191,9 @@

 :startProcessing

+copy %PROJECT_CONFIG% %BUILD_PATH%\config.pri
+del %PROJECT_CONFIG%
+
 echo CONFIG += %RELEASEMODE% >> %PROJECT_CONFIG%
 echo CONTACTS_BACKENDS = %CONTACTS_PLUGIN% >> %PROJECT_CONFIG%

@@ -225,9 +228,6 @@
 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%

-
-copy %PROJECT_CONFIG% %BUILD_PATH%\config.pri
-del %PROJECT_CONFIG%

 echo Checking available Qt
 %QT_PATH%qmake -v >> %PROJECT_LOG% 2>&1


* fixed: configure.bat

* fixed: configure.bat

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

--- configure.bat
+++ configure.bat
@@ -5,7 +5,7 @@
 set "CONFIGURE_ROOT=%~dp0"
 set "CONFIGURE_ROOT=%CONFIGURE_ROOT:~0,-1%"

-if exist "%CONFIGURE_ROOT%/Scripts/__init__.bat" exit /b 1
+if exist "%CONFIGURE_ROOT%/Scripts/Tools/scm/svn/__init__.bat" exit /b 1

 rem generate __init__.bat in "Tools/scm/svn"
 (


Fix configure script

Fix configure script

--- configure.cmd
+++ configure.cmd
@@ -2,5 +2,5 @@
 @mkdir "%~dp0build"
 pushd "%~dp0build"
 @rem "-DCMAKE_MAKE_PROGRAM=%ANDROID_NDK%prebuilt\windows-x86_64\bin\make.exe"
-cmake .. -G "MinGW Makefiles" "-DCMAKE_MAKE_PROGRAM=%ANDROID_NDK%prebuilt\windows-x86_64\bin\make.exe" -DCMAKE_BUILD_TYPE=Release
+cmake .. -G "MinGW Makefiles" "-DCMAKE_MAKE_PROGRAM=%ANDROID_NDK%\prebuilt\windows-x86_64\bin\make.exe" -DCMAKE_BUILD_TYPE=Release
 popd


Disabling echo to make 'cat' output correct.


FindVisualStudio.bat: Better MSBuild detection. VisualStudioVersion environment variable is available in VS Code terminal and Package Manager Console, but MSBuild is not in the PATH.

--- Tools/Build/FindVisualStudio.bat
+++ Tools/Build/FindVisualStudio.bat
@@ -1,5 +1,5 @@
 @REM Starts Visual Studio Developer Command Prompt.
-@IF DEFINED VisualStudioVersion EXIT /B 0
+WHERE /Q MSBuild.exe && EXIT /B 0

 @REM https://developercommunity.visualstudio.com/content/problem/26780/vsdevcmdbat-changes-the-current-working-directory.html
 SET "VSCMD_START_DIR=%CD%"


Update edksetup.bat to check NASM system environment variable

If the NASM_PREFIX variable is not set, it would report warning message.
If there exist the C:\nasm\nasm.exe file, it would set the NASM_PREFIX
variable to C:\nasm\.

Cc: Liming Gao <6480311aeeb4b006862f6d13ebabddc03f51e507@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Yonghong Zhu <78d981fe33a016071af5222c56d5cf77f30fb0b2@intel.com>
Reviewed-by: Liming Gao <6480311aeeb4b006862f6d13ebabddc03f51e507@intel.com>

--- edksetup.bat
+++ edksetup.bat
@@ -125,6 +125,7 @@
 IF NOT EXIST "%EDK_TOOLS_PATH%\toolsetup.bat" goto BadBaseTools
 call %EDK_TOOLS_PATH%\toolsetup.bat %*
 if /I "%1"=="Reconfig" shift
+goto check_NASM
 goto check_cygwin

 :BadBaseTools
@@ -140,6 +141,15 @@
   @echo The setup script, toolsetup.bat must reside in this folder.
   @echo.
   goto end
+
+:check_NASM
+if not defined NASM_PREFIX (
+    @echo.
+    @echo !!! WARNING !!! NASM_PREFIX environment variable is not set
+    @if exist "C:\nasm\nasm.exe" @set "NASM_PREFIX=C:\nasm\"
+    @if exist "C:\nasm\nasm.exe" @echo   Found nasm.exe, setting the environment variable to C:\nasm\
+    @if not exist "C:\nasm\nasm.exe" echo   Attempting to build modules that require NASM will fail.
+)

 :check_cygwin
 if defined CYGWIN_HOME (


windows start scripts: detect Erlang R15B01

--- bin/find_erlang.bat
+++ bin/find_erlang.bat
@@ -3,6 +3,7 @@

 SETLOCAL ENABLEDELAYEDEXPANSION

+set ERL_R15B01=5.9.1
 set ERL_R15B=5.9
 set ERL_R14B04=5.8.5
 set ERL_R14B03=5.8.4
@@ -14,7 +15,7 @@
 set ERL_R13B03=5.7.4
 set ERL_R13B02=5.7.3
 set ERL_R13B01=5.7.2
-set ERL_ALL=%ERL_R15B% %ERL_R14B04% %ERL_R14B03% %ERL_R14B02% %ERL_R14B01% %ERL_R14B% %ERL_R14A% %ERL_R13B04% %ERL_R13B03% %ERL_R13B02% %ERL_R13B01%
+set ERL_ALL=%ERL_R15B01% %ERL_R15B% %ERL_R14B04% %ERL_R14B03% %ERL_R14B02% %ERL_R14B01% %ERL_R14B% %ERL_R14A% %ERL_R13B04% %ERL_R13B03% %ERL_R13B02% %ERL_R13B01%
 if not defined ERLANG_HOME (
     FOR %%c in (%ERL_ALL%) DO (
         FOR %%p in ("C:\Program Files\erl%%c" "C:\Program Files (x86)\erl%%c") DO (


Update programs_to_target_by_GUID.bat

Update programs_to_target_by_GUID.bat

--- resources/stage_2_de-bloat/oem/programs_to_target_by_GUID.bat
+++ resources/stage_2_de-bloat/oem/programs_to_target_by_GUID.bat
@@ -101,6 +101,7 @@

 :: Adobe Community Help
 start /wait msiexec /qn /norestart /x {A127C3C0-055E-38CF-B38F-1E85F8BBBFFE}
+start /wait msiexec /qn /norestart /x {0D2DBE8A-43D0-7830-7AE7-CA6C99A832E7}

 :: Adobe Download Assistant
 start /wait msiexec /qn /norestart /x {5C804EBB-475F-4555-A225-1D6573F158BD}
@@ -121,6 +122,10 @@
 start /wait msiexec /qn /norestart /x {A2BCA9F1-566C-4805-97D1-7FDC93386723}
 start /wait msiexec /qn /norestart /x {AC76BA86-0804-1033-1959-001802114130}
 start /wait msiexec /qn /norestart /x {AC76BA86-0804-1033-1959-001824144531}
+start /wait msiexec /qn /norestart /x {AC76BA86-0804-1033-1959-001824166751}
+start /wait msiexec /qn /norestart /x {AC76BA86-0804-1033-1959-001824184103}
+start /wait msiexec /qn /norestart /x {AC76BA86-0804-1033-1959-001824157129}
+start /wait msiexec /qn /norestart /x {AC76BA86-0804-1033-1959-001824161310}

 :: Adobe Setup (various versions)
 start /wait msiexec /qn /norestart /x {11A955CD-4398-405A-886D-E464C3618FBF}
@@ -160,6 +165,8 @@
 start /wait msiexec /qn /norestart /x {F6BF49D7-479E-23FE-A8A9-63D193D05697}
 start /wait msiexec /qn /norestart /x {8F2415FA-72F2-F029-0450-4EB2FAE484C5}
 start /wait msiexec /qn /norestart /x {8E7CCFB3-4102-6A32-8C4F-202B7AB7C8E3}
+start /wait msiexec /qn /norestart /x {698121AE-4A85-719E-539D-977A1E65C283}
+start /wait msiexec /qn /norestart /x {2676B059-A878-CEA7-CB24-97F4F5377385}

 :: AMD Catalyst Control Center - Branding
 start /wait msiexec /qn /norestart /x {24D38277-CE6E-4E12-A2EE-F46832A4FA2F}
@@ -171,6 +178,8 @@
 start /wait msiexec /qn /norestart /x {D42B82F2-116E-8588-D868-5E98EF9B0CF8}
 start /wait msiexec /qn /norestart /x {FEA214BD-EE6F-B3B9-FE9E-80D2B14849D5}
 start /wait msiexec /qn /norestart /x {CF84CD21-FC52-857E-AF41-9DEE9C76D245}
+start /wait msiexec /qn /norestart /x {0D12E51B-490F-99B7-E4B6-FF7EF0530061}
+start /wait msiexec /qn /norestart /x {30948398-D7CA-3BF8-CC2F-02FCDD6FAE61}

 :: AMD OEM Application Profile
 start /wait msiexec /qn /norestart /x {C89A97B6-F991-EBB5-77B7-927BCF420EBE}
@@ -180,6 +189,7 @@
 start /wait msiexec /qn /norestart /x {8A079327-5B79-24B5-9E95-91960E763CB2}
 start /wait msiexec /qn /norestart /x {C36C7280-879A-D8A7-570F-844CB6E5F7E8}
 start /wait msiexec /qn /norestart /x {2E794F67-DAC1-C4A3-9128-0C841DF8A1BE}
+start /wait msiexec /qn /norestart /x {6845AC1A-1202-BB5F-6E69-90C9C537B1C4}

 :: AMD Wireless Display v3.0
 start /wait msiexec /qn /norestart /x {0A2E1907-D0DE-0D01-CA64-CB0AB0BFE539}
@@ -313,6 +323,9 @@
 :: AVG PC TuneUp 2015
 start /wait msiexec /qn /norestart /x {4AC74ED1-719B-46DA-8B8A-340FBF892291}
 start /wait msiexec /qn /norestart /x {A996C182-3724-4DF1-A4BC-66154FE57DFE}
+
+:: AVG Zen
+start /wait msiexec /qn /norestart /x {F1A0BB73-A9DC-4B18-9F20-6368191FBAC5}

 :: Avira Launcher
 start /wait msiexec /qn /norestart /x {EA226E08-91E7-4F05-B61E-3EDBBBEB15BB}
@@ -344,6 +357,7 @@

 :: Blio (eBook reader app)
 start /wait msiexec /qn /norestart /x {741006D1-7B2B-4E33-B2B0-831F282EEF64}
+start /wait msiexec /qn /norestart /x {400182B4-CA55-46A9-9D88-F8413DCFB36D}

 :: Boot Configure
 start /wait msiexec /qn /norestart /x {E9C22B7A-5D6A-4CC7-A493-38B27519C4D6}
@@ -1482,12 +1496,16 @@
 :: Dell Solution Center 1.00.0000
 start /wait msiexec /qn /norestart /x {11DB380B-48CF-46EA-8B03-51874E2733C9}

+:: Dell Stage Remote
+start /wait msiexec /qn /norestart /x {AF4D3C63-009B-4A17-B02E-D395065DD3F0}
+
 :: Dell Support Center (various versions)
 start /wait msiexec /qn /norestart /x {E2CAA395-66B3-4772-85E3-6134DBAB244E}
 start /wait msiexec /qn /norestart /x {644B991F-B109-4360-9DA3-40CDAD13961C}

-:: Dell SupportAssistAgent 1.1.0.47
+:: Dell SupportAssistAgent
 start /wait msiexec /qn /norestart /x {284D3B99-E8F5-4411-A7DD-7072EFCF3A46}
+start /wait msiexec /qn /norestart /x {3ED468C2-2235-4747-90AD-A7A34F0FE70A}

 :: Dell System E-support Tool 2.2
 start /wait msiexec /qn /norestart /x {13766F76-6C8C-4E57-A9F3-3212D1C6E0D1}
@@ -1509,8 +1527,10 @@
 :: Dell Unified Wireless Suite 1.0.158
 start /wait msiexec /qn /norestart /x {D850CB7E-72BC-4510-BA4F-48932BFAB295}

-:: Dell Update 1.7.1015.0
+:: Dell Update
 start /wait msiexec /qn /norestart /x {DA24AEC5-5BD8-4248-AADE-16BB620E4E62}
+start /wait msiexec /qn /norestart /x {90437913-9D4D-4D9D-B438-B8664DF851E9}
+start /wait msiexec /qn /norestart /x {865DEA2F-E2A1-4A23-8CB7-5C2C322DE3D9}

 :: Dell_DTM_X64 1.0.0.6
 start /wait msiexec /qn /norestart /x {FF79C05D-1E19-4FE5-BDD4-AAAFC28DDDDD}
@@ -1578,7 +1598,7 @@
 :: Dell Support Center
 start /wait msiexec /qn /norestart /x {0090A87C-3E0E-43D4-AA71-A71B06563A4A}

-:: :: Dell VideoStage
+:: Dell VideoStage
 start /wait msiexec /qn /norestart /x {DCE0E79A-B9AC-41AC-98C1-7EF0538BCA7F}

 :: Dell Wave Crypto Runtime // Infrastructure Installer // Support Software Installer // ESC Home Page Plugin // Preboot Manager // Private Information Manager
@@ -1643,6 +1663,9 @@
 :: EA Download Manager (deprecated, replaced with Origin)
 start /wait msiexec /qn /norestart /x {EF7E931D-DC84-471B-8DB6-A83358095474}

+:: eBay
+start /wait msiexec /qn /norestart /x {A8B88634-7F90-402F-B66A-86429755F6A5}
+
 :: eBay Worldwide
 start /wait msiexec /qn /norestart /x {8549CF08-D327-4B73-9036-75564C0BBCFC}
 start /wait msiexec /qn /norestart /x {91589413-6675-4C27-8AFC-EFB9103B90A5}
@@ -1739,6 +1762,7 @@

 :: Garmin WebUpdater
 start /wait msiexec /qn /norestart /x {338ADB80-9C9E-4C71-9403-798057D7FFA6}
+start /wait msiexec /qn /norestart /x {AE1EC58E-B2AC-4959-A4C2-C38202A25239}

 :: Gateway Explorer Agent; shared by Acer Explorer Agent
 start /wait msiexec /qn /norestart /x {4D0F42CF-1693-43D9-BDC8-19141D023EE0}
@@ -1760,6 +1784,9 @@
 start /wait msiexec /qn /norestart /x {A92DAB39-4E2C-4304-9AB6-BC44E68B55E2}
 start /wait msiexec /qn /norestart /x {A4DE5CD7-96D6-3979-8C39-E864396AFFC0}
 start /wait msiexec /qn /norestart /x {5BAA8884-F661-464B-B5B2-5C6C632BFC21}
+
+:: Help and Support Customization
+start /wait msiexec /qn /norestart /x {90D55A3F-1D99-4C94-A77E-46DC14F0BF08}

 :: Hewlett-Packard ACLM.NET
 start /wait msiexec /qn /norestart /x {6F340107-F9AA-47C6-B54C-C3A19F11553F}
@@ -1799,6 +1826,28 @@
 start /wait msiexec /qn /norestart /x {FF21C3E6-97FD-474F-9518-8DCBE94C2854}
 start /wait msiexec /qn /norestart /x {BC741628-0AFC-405C-8946-DD46D1005A0A}
 start /wait msiexec /qn /norestart /x {345F3F90-0505-4EDF-B7A9-5E3AC1AC6CE4}
+start /wait msiexec /qn /norestart /x {BE930E38-7BB3-45B6-85B2-5251F374F844}
+start /wait msiexec /qn /norestart /x {9DE3F260-B88E-42CE-90E7-73C78C37D95E}
+start /wait msiexec /qn /norestart /x {61B4684A-F09D-49D5-ADD8-7EA95D8EC790}
+start /wait msiexec /qn /norestart /x {6553F4A8-B67F-49BA-A882-FF499C83CF4B}
+start /wait msiexec /qn /norestart /x {2614F54E-A828-49FA-93BA-45A3F756BFAA}
+start /wait msiexec /qn /norestart /x {B20A5104-24DD-4435-B965-ED84BE258F59}
+start /wait msiexec /qn /norestart /x {D7EC8A27-CDA2-46AE-8A26-4104A04FA5BE}
+start /wait msiexec /qn /norestart /x {ABDE6E3C-E806-4930-8554-D8E6079EA34D}
+start /wait msiexec /qn /norestart /x {60FFB3E0-6D5B-4D73-AE5B-07E58B83AF0C}
+start /wait msiexec /qn /norestart /x {0360D8F0-626A-4E87-8A16-938BD0BEBCC5}
+start /wait msiexec /qn /norestart /x {ACCC614F-2B0E-4F35-BE76-9B936D1E91A0}
+start /wait msiexec /qn /norestart /x {30689060-43BD-46E9-8A54-E6CDB18AAB88}
+start /wait msiexec /qn /norestart /x {47ECCB1F-2811-49C0-B6A7-26778639ABA0}
+start /wait msiexec /qn /norestart /x {86924253-1BCC-4BF5-B995-33C1DB7EECAE}
+start /wait msiexec /qn /norestart /x {F8776060-6929-480C-9CD0-AD4920C354EF}
+start /wait msiexec /qn /norestart /x {3138F992-045B-4F55-825C-53B231E647CA}
+start /wait msiexec /qn /norestart /x {0EBC740B-4363-489B-8C27-98CE0740BA19}
+start /wait msiexec /qn /norestart /x {55D55008-E5F6-47D6-B16F-B2A40D4D145F}
+start /wait msiexec /qn /norestart /x {FD868C71-6CCF-42E2-B90D-0504AB0036FE}
+start /wait msiexec /qn /norestart /x {5737101A-27C4-408A-8A57-D1DC78DF84B4}
+start /wait msiexec /qn /norestart /x {C788B026-20BD-4E96-B698-533F1D6C5013}
+start /wait msiexec /qn /norestart /x {9301985B-D116-4A93-A93D-94580084FF86}

 :: HP ActiveCheck component for HP Active Support Libary
 start /wait msiexec /qn /norestart /x {254C37AA-6B72-4300-84F6-98A82419187E}
@@ -1905,6 +1954,7 @@
 start /wait msiexec /qn /norestart /x {C27C82E4-9C53-4D76-9ED3-A01A3D5EE679}
 start /wait msiexec /qn /norestart /x {C9EF1AAF-B542-41C8-A537-1142DA5D4AEC}
 start /wait msiexec /qn /norestart /x {57A5AEC1-97FC-474D-92C4-908FCC2253D4}
+start /wait msiexec /qn /norestart /x {0CC8AE1D-F5AA-4143-8FAD-E017E0E9EE70}

 :: HP CustomerResearchQFolder
 start /wait msiexec /qn /norestart /x {7206B668-FEE0-455B-BB1F-9B5A2E0EC94A}
@@ -1982,6 +2032,7 @@
 start /wait msiexec /qn /norestart /x {9D20F550-4222-49A7-A7A7-7CAAB2E16C9C}
 start /wait msiexec /qn /norestart /x {89A12FD9-8FA0-4EB9-AE9A-34C7EB25C25B}
 start /wait msiexec /qn /norestart /x {25F3EC6C-BB03-4CEB-B36C-E656A9DD149E}
+start /wait msiexec /qn /norestart /x {0ABC7C72-64F0-4D7F-B9A4-9E82A56EC874}

 :: HP DocProc
 start /wait msiexec /qn /norestart /x {676981B7-A2D9-49D0-9F4C-03018F131DA9}
@@ -1989,6 +2040,9 @@
 start /wait msiexec /qn /norestart /x {679EC478-3FF9-4987-B2FF-C2C2B27532A2}
 start /wait msiexec /qn /norestart /x {9B362566-EC1B-4700-BB9C-EC661BDE2175}

+:: HP Dropbox Plugin
+start /wait msiexec /qn /norestart /x {19EDEC5D-055E-4AD0-88AC-C342608FC47E}
+
 :: HPDiagnosticAlert
 start /wait msiexec /qn /norestart /x {B6465A32-8BE9-4B38-ADC5-4B4BDDC10B0D}
 start /wait msiexec /qn /norestart /x {846B5DED-DC8C-4E1A-B5B4-9F5B39A0CACE}
@@ -2009,8 +2063,14 @@
 start /wait msiexec /qn /norestart /x {FC0ADA4D-8FA5-4452-8AFF-F0A0BAC97EF7}
 start /wait msiexec /qn /norestart /x {0FA995CC-C849-4755-B14B-5404CC75DC24}

-:: HP ENVY 4500 series Help
+:: HP ENVY xxxx series Help
 start /wait msiexec /qn /norestart /x {95BECC50-22B4-4FCA-8A2E-BF77713E6D3A}
+start /wait msiexec /qn /norestart /x {3B1BE080-D477-4B94-AAE4-8B0BEC5D0CE3}
+start /wait msiexec /qn /norestart /x {B04B1DB6-0AA9-4790-95CE-5A45C8F647FD}
+start /wait msiexec /qn /norestart /x {607F50D9-40BD-4F17-A584-152F563293B4}
+
+
+

 :: HP ESU for Microsoft Windows (Windows update hijacker)
 start /wait msiexec /qn /norestart /x {240B2BF7-E7E6-425C-A2A4-A3149189BF7F}
@@ -2038,6 +2098,9 @@
 for /r "%ProgramFiles%\HP Games" %%i in (Uninstall.exe) do ( if exist "%%i" "%%i" /silent )
 for /r "%ProgramFiles(x86)%\HP Games" %%i in (Uninstall.exe) do ( if exist "%%i" "%%i" /silent )

+:: HP Google Drive Plugin (wtf??)
+start /wait msiexec /qn /norestart /x {1B225296-B1F1-40B3-8427-844E97CB2D1B}
+
 :: HP GPBaseService2 (popups)
 start /wait msiexec /qn /norestart /x {BB3447F6-9553-4AA9-960E-0DB5310C5779}

@@ -2048,7 +2111,7 @@
 start /wait msiexec /qn /norestart /x {9CAB2212-0732-4827-8EC4-61D8EF0AA65B}
 start /wait msiexec /qn /norestart /x {5A847522-375C-4D05-BD3D-88C450CC047F}

-:: HP misc Help, eDocs and User Guide GUIDs (various versions for various products; most of these should be caught in the wildcard scan)
+:: HP Help, eDocs and User Guide GUIDs (various versions for various products; most of these should be caught in the wildcard scan)
 start /wait msiexec /qn /norestart /x {11C9A461-DD9D-4C71-85A4-6DCE7F99CC44}
 start /wait msiexec /qn /norestart /x {B6B9006D-5A0A-4F17-B69A-42F48C1FC30C}
 start /wait msiexec /qn /norestart /x {445CC807-9384-47FA-A2B6-FFE970352B88}
@@ -2083,6 +2146,16 @@
 start /wait msiexec /qn /norestart /x {6357D25F-A9C9-4CC7-A1FB-0DCF344E7C40}
 start /wait msiexec /qn /norestart /x {1F670068-9589-4DC7-8FE4-1D0D13AF2526}
 start /wait msiexec /qn /norestart /x {E1AE0CB7-1333-4728-8520-CB3F88A252B4}
+start /wait msiexec /qn /norestart /x {53036DC6-EB27-47D3-A286-B74CF21E8480}
+start /wait msiexec /qn /norestart /x {9F79230F-EE1C-407E-94E1-D69021954C9B}
+start /wait msiexec /qn /norestart /x {B852F7F8-618D-4FAC-9A6E-190A9CF7F04E}
+start /wait msiexec /qn /norestart /x {10173615-D9A7-4C50-A036-38CA89221708}
+start /wait msiexec /qn /norestart /x {606C37AB-EB04-4270-A592-201A03C2DB36}
+start /wait msiexec /qn /norestart /x {9A4D71AB-9C68-4702-A4A2-A4DB7B0FE270}
+start /wait msiexec /qn /norestart /x {22FE3793-5961-4ADE-AE66-69D9291C22B1}
+start /wait msiexec /qn /norestart /x {A5763105-D1D5-4862-A3FE-EC058F9AA73E}
+start /wait msiexec /qn /norestart /x {F4BD608A-8296-43DA-A400-1E8432AB1304}
+start /wait msiexec /qn /norestart /x {37EE481E-E4E9-4F1D-8CEA-4089E8D5280D}

 :: HP PC Hardware Diagnostics UEFI
 start /wait msiexec /qn /norestart /x {DD43EA67-DAF3-4879-BFF7-E534675BDEA5}
@@ -2138,6 +2211,9 @@
 start /wait msiexec /qn /norestart /x {C927FC7E-4061-44AC-BE09-496AF6BAC131}
 start /wait msiexec /qn /norestart /x {4B3264AA-951A-4A6B-B837-125224261F12}
 start /wait msiexec /qn /norestart /x {791D3241-C6A4-417F-82E6-00543B6E5012}
+start /wait msiexec /qn /norestart /x {EE629820-EACD-4AAE-966D-DF1560A0ED2D}
+start /wait msiexec /qn /norestart /x {3CF97AC1-219E-44DA-B3DE-32FCAD606231}
+start /wait msiexec /qn /norestart /x {2CFC157D-6224-4072-9732-54DD8C07F334}

 :: HP Privacy Manager for HP ProtectTools
 start /wait msiexec /qn /norestart /x {D69F9215-B06A-4ADF-A464-E2607B2FA296}
@@ -2188,6 +2264,7 @@
 start /wait msiexec /qn /norestart /x {9D1B99B7-DAD8-440d-B4FB-1915332FBCC2}
 start /wait msiexec /qn /norestart /x {C75CDBA2-3C86-481e-BD10-BDDA758F9DFF}
 start /wait msiexec /qn /norestart /x {83F51BBA-48BE-4BB6-B96A-F4AAE4C462F9}
+start /wait msiexec /qn /norestart /x {C43326F5-F135-4551-8270-7F7ABA0462E1}

 :: HP Product Detection
 start /wait msiexec /qn /norestart /x {A436F67F-687E-4736-BD2B-537121A804CF}
@@ -2376,6 +2453,8 @@
 start /wait msiexec /qn /norestart /x {79C54A05-F146-4EA0-8A70-D4EFE6181E52}
 start /wait msiexec /qn /norestart /x {C595BE0A-1215-4A80-8765-23A0AAAE14EE}
 start /wait msiexec /qn /norestart /x {CA43FE4F-9FF2-4AD7-88F0-CC3BAC17B226}
+start /wait msiexec /qn /norestart /x {E959FD01-BD01-4CC4-9BB8-4EBE8309BF37}
+start /wait msiexec /qn /norestart /x {78E2C850-ADA6-420D-BA35-2F4A9BE733CC}

 :: HP Support Information
 start /wait msiexec /qn /norestart /x {B2B7B1C8-7C8B-476C-BE2C-049731C55992}
@@ -2384,6 +2463,10 @@
 start /wait msiexec /qn /norestart /x {D7D5F438-26EF-45AB-AB89-C476FBCF8584}
 start /wait msiexec /qn /norestart /x {348A1F5B-07B3-4436-9A47-FFE44EFE856E}
 start /wait msiexec /qn /norestart /x {55065080-504F-43BB-BE00-36B80D7D39A5}
+start /wait msiexec /qn /norestart /x {E2CB09C1-3C76-4395-BB47-50C066535CF8}
+start /wait msiexec /qn /norestart /x {CE7447C2-EF12-4EF3-BE51-BFC3B049C0F6}
+start /wait msiexec /qn /norestart /x {E35601C0-BA8E-4F32-919A-C7EF4CA81F67}
+start /wait msiexec /qn /norestart /x {44157EB3-D8D0-4BB1-B0F5-AD2C38814ED1}

 :: HP System Default Settings
 start /wait msiexec /qn /norestart /x {5C90D8CF-F12A-41C6-9007-3B651A1F0D78}
@@ -2539,6 +2622,12 @@
 start /wait msiexec /qn /norestart /x {B4FF8C31-F307-4873-A244-BBC0233CAD4B}
 start /wait msiexec /qn /norestart /x {06F2A7C5-19F0-4962-B8D2-A495B7DD2A30}
 start /wait msiexec /qn /norestart /x {8B0B53D2-F5B8-4A67-93B0-5960D6ED6186}
+start /wait msiexec /qn /norestart /x {74541060-2DB1-4E8C-B239-3A78EA50F2F6}
+start /wait msiexec /qn /norestart /x {CA07FCB1-DAE9-4F8A-8698-F9C30D1E375F}
+start /wait msiexec /qn /norestart /x {5F6F9FDB-4B94-4912-8966-77356C01303C}
+start /wait msiexec /qn /norestart /x {DE17F6E4-FC32-468C-A407-113E414E3A3C}
+start /wait msiexec /qn /norestart /x {F4A2F4E7-870C-44AC-A99E-DA2E8A80D91E}
+start /wait msiexec /qn /norestart /x {B47AA9C8-ACBE-47CF-A4BA-CE1D58AD1F36}

 :: Intel(R) ME UninstallLegacy
 start /wait msiexec /qn /norestart /x {013FAB2E-017D-4330-8179-B5FE02E7F81C}
@@ -2550,7 +2639,6 @@
 :: Intel(R) Rapid Storage Technology // often the culprit behind BSODs when scanning drives with smartctl
 :: ! NOTE: /u/kamakaze_chickn suggested disabling for Tron as it reportedly gives noticable performance improvement over stock msahci driver
 ::  Please comment on this program at reddit.com/r/TronScript on the main release thread
-:: Disabled by /u/vocatus for Tron, due to it causing issues in a few limited scenarios
 ::start /wait msiexec /qn /norestart /x {96714280-14E6-4DF7-BACD-F797C0F17C3D}
 ::start /wait msiexec /qn /norestart /x {205AE40D-8AD7-4F29-A430-DD2168DA562D}
 ::start /wait msiexec /qn /norestart /x {93F692D4-0C4D-4EED-9BFE-657C1D5959FE}
@@ -2811,7 +2899,6 @@
 start /wait msiexec /qn /norestart /x {A5591EC4-8AD6-48EE-9F8D-FACFA8BA4E35}
 start /wait msiexec /qn /norestart /x {DD00F699-6861-4DCF-A19F-8CF61E5E28ED}

-
 :: Lenovo Solutions for Small Business
 start /wait msiexec /qn /norestart /x {6A6D86CD-B004-46b7-8951-7BB75A776F8C}
 start /wait msiexec /qn /norestart /x {5B5DEF99-85E9-423D-A1A3-B83202697B09}
@@ -2942,9 +3029,14 @@

 :: Microsoft Application Error Reporting
 start /wait msiexec /qn /norestart /x {95120000-00B9-0409-1000-0000000FF1CE}
+start /wait msiexec /qn /norestart /x {91710409-8000-11D3-8CFE-0150048383C9}
+start /wait msiexec /qn /norestart /x {95120000-00B9-0409-0000-0000000FF1CE}

 :: Microsoft DVD App Installation for Microsoft.WindowsDVDPlayer_2019.6.11761.0_neutral_~_8wekyb3d8bbwe (x64)
 start /wait msiexec /qn /norestart /x {986E003C-E56D-5A47-110E-D3C81F0E8535}
+
+:: Microsoft Help Viewer
+start /wait msiexec /qn /norestart /x {E5748D30-7E6D-3A8E-BFE6-C1D02C6DDABB}

 :: Microsoft Mouse and Keyboard Center (various versions) // Disabled by /u/kamakaze_chickn for Tron
 ::start /wait msiexec /qn /norestart /x {91150000-0051-0000-1000-0000000FF1CE}
@@ -3042,7 +3134,32 @@
 :: My Way Search Assistant
 start /wait msiexec /qn /norestart /x {05F1B866-2372-4E82-9AA8-C64FB11CEF8B}

-:: Nero: Welcome App
+:: Nero: various Help entries
+start /wait msiexec /qn /norestart /x {EF0D1292-8FC1-41BE-9740-DBC134F66415}
+start /wait msiexec /qn /norestart /x {5B79E730-D897-4B8F-A1AD-7BB2D1F22B96}
+start /wait msiexec /qn /norestart /x {2890E324-6F3B-4975-8B95-E7D6D80E0226}
+start /wait msiexec /qn /norestart /x {F6BDD7C5-89ED-4569-9318-469AA9732572}
+start /wait msiexec /qn /norestart /x {523B2B1B-D8DB-4B41-90FF-C4D799E2758A}
+start /wait msiexec /qn /norestart /x {C994C746-C6D0-4EBA-B09E-DF7B18381B69}
+start /wait msiexec /qn /norestart /x {CE96F5A5-584D-4F8F-AA3E-9BAED413DB72}
+start /wait msiexec /qn /norestart /x {60C731FB-C951-41CE-AD41-8E54C8594609}
+start /wait msiexec /qn /norestart /x {C18A0418-442A-4186-AF98-D08F5054A2FC}
+start /wait msiexec /qn /norestart /x {CC019E3F-59D2-4486-8D4B-878105B62A71}
+start /wait msiexec /qn /norestart /x {E5C7D048-F9B4-4219-B323-8BDB01A2563D}
+start /wait msiexec /qn /norestart /x {33643918-7957-4839-92C7-EA96CB621A98}
+start /wait msiexec /qn /norestart /x {83202942-84B3-4C50-8622-B8C0AA2D2885}
+start /wait msiexec /qn /norestart /x {0708FF30-78C0-47B0-81F0-C84604DC769C}
+start /wait msiexec /qn /norestart /x {20400DBD-E6DB-45B8-9B6B-1DD7033818EC}
+start /wait msiexec /qn /norestart /x {1F16820E-D0E7-4636-939E-45CBFEFB06E1}
+start /wait msiexec /qn /norestart /x {5E08ECD1-C98E-4711-BF65-8FD736B3F969}
+start /wait msiexec /qn /norestart /x {0B311221-05A5-4766-8D03-7A6446794156}
+start /wait msiexec /qn /norestart /x {F6117F9C-ADB5-4590-9BE4-12C7BEC28702}
+start /wait msiexec /qn /norestart /x {2348B586-C9AE-46CE-936C-A68E9426E214}
+start /wait msiexec /qn /norestart /x {B128179D-A5E1-43AC-9422-12A109ECD2A0}
+start /wait msiexec /qn /norestart /x {5D9BE3C1-8BA4-4E7E-82FD-9F74FA6815D1}
+start /wait msiexec /qn /norestart /x {86847081-B387-4F49-AED1-C9B0A090D66C}
+
+:: Nero Welcome App
 start /wait msiexec /qn /norestart /x {828175FA-7307-4DBF-95AD-9CEE086B6F45}

 :: Nero SyncUP
@@ -3060,6 +3177,9 @@

 :: New York Times Reader
 start /wait msiexec /qn /norestart /x {491ADA37-04EE-2ECE-9F86-DDC0106047AC}
+
+:: Nikon Message Center
+start /wait msiexec /qn /norestart /x {B014EE44-9197-4513-9613-71E6EB1B514E}

 :: Nitro Pro 8
 start /wait msiexec /qn /norestart /x {2269F0D5-DE47-4313-9003-BB6357919314}
@@ -3677,6 +3797,12 @@

 :: Uniblue SpeedUpMyPC
 start /wait msiexec /qn /norestart /x {E55B3271-7CA8-4D0C-AE06-69A24856E996}
+
+:: Uninstall Helper (malware)
+start /wait msiexec /qn /norestart /x {82BF2C5E-79A7-4A13-B508-D5E64A5B141E}
+
+:: Verizon Software Upgrade Assistant
+start /wait msiexec /qn /norestart /x {F933562A-45B5-4730-8A5E-0D282AA9866B}

 :: VIP Access (Lenovo-installed OEM bloatware for Verisign)
 start /wait msiexec /qn /norestart /x {E8D46836-CD55-453C-A107-A59EC51CB8DC}
@@ -3784,6 +3910,8 @@
 :: Windows Live Language Selector
 start /wait msiexec /qn /norestart /x {180C8888-50F1-426B-A9DC-AB83A1989C65}
 start /wait msiexec /qn /norestart /x {D07A61E5-A59C-433C-BCBD-22025FA2287B}
+start /wait msiexec /qn /norestart /x {5EB6F3CB-46F4-451F-A028-7F6D8D35D7D0}
+start /wait msiexec /qn /norestart /x {027E5FAB-1476-4C59-AAB4-32EF28520399}

 :: Windows Live Mesh (deprecated MS product)
 start /wait msiexec /qn /norestart /x {841F1FB4-FDF8-461C-A496-3E1CFD84C0B5}
@@ -3793,6 +3921,10 @@

 :: Windows Live Messenger
 start /wait msiexec /qn /norestart /x {A85FD55B-891B-4314-97A5-EA96C0BD80B5}
+start /wait msiexec /qn /norestart /x {EB4DF488-AAEF-406F-A341-CB2AAA315B90}
+start /wait msiexec /qn /norestart /x {E5B21F11-6933-4E0B-A25C-7963E3C07D11}
+start /wait msiexec /qn /norestart /x {2A3FC24C-6EC0-4519-A52B-FDA4EA9B2D24}
+start /wait msiexec /qn /norestart /x {6057E21C-ABE9-4059-AE3E-3BEB9925E660}

 :: Windows Live MIME IFilter
 start /wait msiexec /qn /norestart /x {DA54F80E-261C-41A2-A855-549A144F2F59}
@@ -3826,6 +3958,11 @@
 start /wait msiexec /qn /norestart /x {81128EE8-8EAD-4DB0-85C6-17C2CE50FF71}
 start /wait msiexec /qn /norestart /x {CDC1AB00-01FF-4FC7-816A-16C67F0923C0}
 start /wait msiexec /qn /norestart /x {45338B07-A236-4270-9A77-EBB4115517B5}
+start /wait msiexec /qn /norestart /x {61AD15B2-50DB-4686-A739-14FE180D4429}
+start /wait msiexec /qn /norestart /x {8256F87F-8554-4457-8C3D-3F3324697D9F}
+start /wait msiexec /qn /norestart /x {10A44844-4465-456E-8C97-80BDD4F68845}
+start /wait msiexec /qn /norestart /x {C6150D8A-86ED-41D3-87BB-F3BB51B0B77F}
+start /wait msiexec /qn /norestart /x {0840B4D6-7DD1-4187-8523-E6FC0007EFB7}

 :: Windows Live Sync
 start /wait msiexec /qn /norestart /x {84EBDF39-4B33-49D7-A0BD-EB6E2C4E81C1}


commit on 11/06/2018 at 18:28:50

commit on 11/06/2018 at 18:28:50

--- ansys-APDL/transverseCrack.cmd
+++ ansys-APDL/transverseCrack.cmd
@@ -1,4 +1,37 @@
 ! Command File mode of 2D Model of Transverse Cracking in Thin-ply FRPC
+
+!
+!==============================================================================
+! Copyright (c) 2016-2018 Université de Lorraine & Luleå tekniska universitet
+! Author: Luca Di Stasio <luca.distasio@gmail.com>
+!                        <luca.distasio@ingpec.eu>
+!
+! Redistribution and use in source and binary forms, with or without
+! modification, are permitted provided that the following conditions are met:
+!
+!
+! Redistributions of source code must retain the above copyright
+! notice, this list of conditions and the following disclaimer.
+! Redistributions in binary form must reproduce the above copyright
+! notice, this list of conditions and the following disclaimer in
+! the documentation and/or other materials provided with the distribution
+! Neither the name of the Université de Lorraine & Luleå tekniska universitet
+! nor the names of its contributors may be used to endorse or promote products
+! derived from this software without specific prior written permission.
+!
+! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+! AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+! IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+! ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+! LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+! CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+! SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+! INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+! CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+! ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+! POSSIBILITY OF SUCH DAMAGE.
+!==============================================================================
+!

 /title, 2D Model of Transverse Cracking in Thin-ply FRPC


commit on 05/06/2018 at 19:26:49

commit on 05/06/2018 at 19:26:49

--- ansys-APDL/transverseCrack.cmd
+++ ansys-APDL/transverseCrack.cmd
@@ -189,7 +189,7 @@
 DL, 6, ,SYMM
 DL, 7, ,SYMM
 DL, 3, ,UX,appliedDisp
-DL, 4, ,UY,appliedDisp
+DL, 4, ,UX,appliedDisp

 ! Apply pressure, if present
 ! SFL, Line, Lab, VALI, VALJ, VAL2I, VAL2J


elixir.bat: accomodate for paths with spaces

Signed-off-by: José Valim <0c2436ea76ed86e37cc05f66dea18d48ef390882@plataformatec.com.br>

--- bin/elixir.bat
+++ bin/elixir.bat
@@ -47,7 +47,7 @@

 rem Recursive loop called for each parameter that parses the cmd line parameters
 :startloop
-set par=%1
+set par="%1"
 shift
 if "%par%"=="" (
   rem if no parameters defined


Fixed find-android.bat

Fixed find-android.bat

--- find-android.bat
+++ find-android.bat
@@ -1,6 +1,8 @@
 @echo off
+del local.properties
 for %%i in (android.bat) do set x=%%~dp$PATH:i
 set x=%x:\tools=%
+set x=%x:\=/%

-# not yet tested!
-@echo "sdk.dir=%x%" >> local.properties
+rem not yet tested!
+@echo sdk.dir=%x%>> local.properties


Remove outdated and wrong comment.

Remove outdated and wrong comment.


Allow for spaces in LEIN_JAR path in lein.bat.

--- bin/lein.bat
+++ bin/lein.bat
@@ -71,11 +71,11 @@
 echo You can try running "lein self-install"
 echo or change LEIN_JAR environment variable
 echo or edit lein.bat to set appropriate LEIN_JAR path.
-echo.
+echo.
 goto EOF

 :SELF_INSTALL
-if exist %LEIN_JAR% (
+if exist "%LEIN_JAR%" (
     echo %LEIN_JAR% already exists. Delete and retry.
     goto EOF
 )
@@ -89,9 +89,9 @@
 set LEIN_DIR=%~dp0
 set LEIN_JAR=%LEIN_DIR%leiningen-%LEIN_VERSION%-standalone.jar
 set LEIN_JAR_URL=http://github.com/downloads/technomancy/leiningen/leiningen-%LEIN_VERSION%-standalone.jar
-%HTTP_CLIENT% %LEIN_JAR% %LEIN_JAR_URL%
+%HTTP_CLIENT% "%LEIN_JAR%" %LEIN_JAR_URL%
 if ERRORLEVEL 1 (
-    del %LEIN_JAR%>nul 2>&1
+    del "%LEIN_JAR%">nul 2>&1
     goto DOWNLOAD_FAILED
 )
 goto EOF


added cleanup script for the includes folder

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

--- build/cleanup-includes.bat
+++ build/cleanup-includes.bat
@@ -0,0 +1,17 @@
+@echo off
+
+:: cleanup the includes folder
+
+pushd ..\..\fifengine-dependencies\includes
+rd share /s /q
+move lib\x86\*.dll bin
+move lib\x86\*.lib lib
+rd lib\x86 /s /q
+mkdir licenses
+move lib\x86\*.txt licenses
+popd
+
+pushd ..\..\fifengine-dependencies\includes\lib
+rd x64 /s /q
+rd libpng /s /q
+popd


Delete old cf executable properly when running GATS on Windows

--- bin/test.bat
+++ bin/test.bat
@@ -1,4 +1,4 @@
-DEL c:\Users\Administrator\go\src\github.com\pivotal-cf-experimental\GATS\gcf.exe
+DEL c:\Users\Administrator\go\src\github.com\pivotal-cf-experimental\GATS\cf.exe
 bitsadmin.exe /transfer "DownloadStableCLI" https://s3.amazonaws.com/go-cli/builds/cf-windows-amd64.exe c:\Users\Administrator\go\src\github.com\pivotal-cf-experimental\GATS\cf.exe

 go get -u github.com/pivotal-cf-experimental/GATS/...


Fix script path change in buildStandalonePackage.cmd.

--- buildStandalonePackage.cmd
+++ buildStandalonePackage.cmd
@@ -24,9 +24,9 @@
     echo %CD%

 	echo Bundle angular2 app
-	call :ExecuteCmd node_modules\.bin\ng build --output-path="%PACKAGEPATH%\ng"
+	call :ExecuteCmd node_modules\.bin\ng build --output-path="%PACKAGEPATH%\ng-full"
 	IF !ERRORLEVEL! NEQ 0 (
-		call :ExecuteCmd node_modules\.bin\ng build --output-path="%PACKAGEPATH%\ng"
+		call :ExecuteCmd node_modules\.bin\ng build --output-path="%PACKAGEPATH%\ng-full"
 		IF !ERRORLEVEL! NEQ 0 goto error
 	)


Add missing popd

Add missing popd

git-svn-id: 03a8048b5ee8463be5048a3801110fb50f378627@8143 d0ab736e-dc22-4aeb-8dc9-08def0aa14fd

--- buildscripts/buildJars.bat
+++ buildscripts/buildJars.bat
@@ -51,6 +51,7 @@

 pushd plugins\CRISP
 call build
+popd

 rem pushd plugins\Bleach
 rem call ant -buildfile build.xml %cleantarget% compile build


Added buildjar.bat so that Windows users can build the settings.jar file.

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

--- buildjar.bat
+++ buildjar.bat
@@ -0,0 +1,9 @@
+mkdir .\colors
+copy "Solarized Light.xml" .\colors
+copy "Solarized Dark.xml" .\colors
+copy /y nul .\"IntelliJ IDEA Global Settings"
+
+jar cfM settings.jar "IntelliJ IDEA Global Settings" .\colors
+
+rd /S /Q .\colors
+del .\"IntelliJ IDEA Global Settings"


编译efront2不再报错

--- tools/build-efront.bat
+++ tools/build-efront.bat
@@ -15,7 +15,7 @@
 set libs_path=./
 set libs=typescript,esprima,escodegen,esmangle,pngjs,less-node
 set destpath=efront.js
-rd /s /q %public_path%
+rd /s /q "%public_path%"
 call node . publish
 popd
 goto :end