Not sure why I felt the need to have all Env Vars in ALL CAPS

--- cmd/SetupEnv.cmd
+++ cmd/SetupEnv.cmd
@@ -1,27 +1,27 @@
 @ECHO OFF
 ECHO Making Command Prompt suck slightly less...

+REM So that we can safely run via AutoRun
+REM Use something like: IF NOT DEFINED SetupEnv Path\To\SetupEnv.Cmd
+SET SetupEnv=Yes
+
 REM Uncomment to enable verbose mode
-REM SET VERBOSE=YES
+REM SET SetupEnvVerbose=Yes

-REM So that we can safely run via AutoRun
-REM Use something like: IF NOT DEFINED SETUPENV Path\To\SetupEnv.Cmd
-SET SETUPENV=YES
-
-REM Because I'm tired of forgetting this
+REM Because I'm tired of forgetting Cmd is not a *nix shell
 DOSKEY clear=cls
 DOSKEY ls=dir $*
 DOSKEY man=help $*
 DOSKEY which=where $*

 REM Add alias for Sublime Text
-SET SUBLREGPATH=HKLM\Software\Microsoft\Windows\CurrentVersion\Uninstall\Sublime Text 2_is1
-SET SUBLBINNAME=sublime_text.exe
-REG QUERY "%SUBLREGPATH%" /v InstallLocation > NUL 2>&1
+SET SublRegPath=HKLM\Software\Microsoft\Windows\CurrentVersion\Uninstall\Sublime Text 2_is1
+SET SublBinName=sublime_text.exe
+REG QUERY "%SublRegPath%" /v InstallLocation > NUL 2>&1
 IF NOT ERRORLEVEL 1 (
-    FOR /F "tokens=2*" %%a IN ('REG QUERY "%SUBLREGPATH%" /v InstallLocation ^| FINDSTR /R "[a-z]:\\.*\\$"') DO @SET SUBLDIRPATH=%%b
+    FOR /F "tokens=2*" %%a IN ('REG QUERY "%SublRegPath%" /v InstallLocation ^| FINDSTR /R "[a-z]:\\.*\\$"') DO @SET SublDirPath=%%b
 ) ELSE (
-    IF DEFINED VERBOSE ECHO Couldn't locate Sublime Text install; not adding 'subl' alias.
+    IF DEFINED SetupEnvVerbose ECHO Couldn't locate Sublime Text install; not adding 'subl' alias.
 )
-IF DEFINED SUBLDIRPATH DOSKEY subl="%SUBLDIRPATH%%SUBLBINNAME%" $*
-FOR /F "delims==" %%i IN ('SET SUBL') DO @SET %%i=
+IF DEFINED SublDirPath DOSKEY subl="%SublDirPath%%SublBinName%" $*
+FOR /F "delims==" %%i IN ('SET Subl') DO @SET %%i=


Limited Data Set from Users

Limited Data Set from Users

Limited User Attributes queried to only those used in current audits

--- Batch/Get-ADAuditData.cmd
+++ Batch/Get-ADAuditData.cmd
@@ -34,7 +34,7 @@
 echo( >> "%CD%\%domain%\consoleOutput.txt"
 echo ----------------------------------------------------- >> "%CD%\%domain%\consoleOutput.txt"

-csvde -r "(sAMAccountType=805306368)" -l msDS-ResultantPSO,msDS-User-Account-Control-Computed,msDS-UserPasswordExpiryTimeComputed,* -f "%CD%\%domain%\%domain%-Users.csv" >> "%CD%\%domain%\consoleOutput.txt"
+csvde -r "(sAMAccountType=805306368)" -l "accountExpires,adminCount,assistant,canonicalName,cn,comment,company,controlAccessRights,department,departmentNumber,description,displayName,distinguishedName,division,employeeID,employeeNumber,employeeType,generationQualifier,givenName,info,lastLogonTimestamp,lockoutTime,mail,managedObjects,manager,memberOf,middleName,msDS-AllowedToDelegateTo,msDS-PSOApplied,msDS-ResultantPSO,msDS-SourceObjectDN,msDS-User-Account-Control-Computed,msDS-UserPasswordExpiryTimeComputed,name,nTSecurityDescriptor,o,objectSid,ou,personalTitle,primaryGroupID,pwdLastSet,sAMAccountName,secretary,seeAlso,servicePrincipalName,sIDHistory,sn,title,uid,uidNumber,userAccountControl,userWorkstations,whenChanged,whenCreated" -f "%CD%\%domain%\%domain%-Users.csv" >> "%CD%\%domain%\consoleOutput.txt"

 echo Active Directory Users Exported
 echo( >> "%CD%\%domain%\consoleOutput.txt"
@@ -89,23 +89,23 @@
 :::::::::::::::::::::::::::::::::::::::::
 :: Active Directory Computers (csvde)
 :::::::::::::::::::::::::::::::::::::::::
-echo Pulling Active Directory Computers
-echo( >> "%CD%\%domain%\consoleOutput.txt"
-echo Computers Extraction >> "%CD%\%domain%\consoleOutput.txt"
-echo( >> "%CD%\%domain%\consoleOutput.txt"
-echo Execution Started at %DATE% %TIME% >> "%CD%\%domain%\consoleOutput.txt"
-echo( >> "%CD%\%domain%\consoleOutput.txt"
-echo ----------------------------------------------------- >> "%CD%\%domain%\consoleOutput.txt"
-
-csvde -r "(objectClass=computer)" -f "%CD%\%domain%\%domain%-Computers.csv" >> "%CD%\%domain%\consoleOutput.txt"
-
-echo Active Directory Computers Exported
-echo( >> "%CD%\%domain%\consoleOutput.txt"
-echo Execution Finished at %DATE% %TIME% >> "%CD%\%domain%\consoleOutput.txt"
-echo( >> "%CD%\%domain%\consoleOutput.txt"
-echo(
-echo -----------------------------------------------------
-echo(
+:: echo Pulling Active Directory Computers
+:: echo( >> "%CD%\%domain%\consoleOutput.txt"
+:: echo Computers Extraction >> "%CD%\%domain%\consoleOutput.txt"
+:: echo( >> "%CD%\%domain%\consoleOutput.txt"
+:: echo Execution Started at %DATE% %TIME% >> "%CD%\%domain%\consoleOutput.txt"
+:: echo( >> "%CD%\%domain%\consoleOutput.txt"
+:: echo ----------------------------------------------------- >> "%CD%\%domain%\consoleOutput.txt"
+::
+:: csvde -r "(objectClass=computer)" -f "%CD%\%domain%\%domain%-Computers.csv" >> "%CD%\%domain%\consoleOutput.txt"
+::
+:: echo Active Directory Computers Exported
+:: echo( >> "%CD%\%domain%\consoleOutput.txt"
+:: echo Execution Finished at %DATE% %TIME% >> "%CD%\%domain%\consoleOutput.txt"
+:: echo( >> "%CD%\%domain%\consoleOutput.txt"
+:: echo(
+:: echo -----------------------------------------------------
+:: echo(

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


Handle Java paths with spaces in them (#1534)

--- packaging/standalone/src/main/distribution/shell-scripts/bin/Neo4jInstaller.bat
+++ packaging/standalone/src/main/distribution/shell-scripts/bin/Neo4jInstaller.bat
@@ -50,7 +50,7 @@
   call %~dps0functions.bat :findJavaHome
   set javaPath=%javaPath:"="""%

-  set binPath="%javaPath%\bin\java.exe %loggingProperties% -DworkingDir="%~dps0.." -DconfigFile=%configFile% %classpath% %mainclass% -Dorg.neo4j.cluster.logdirectory="%~dps0..\data\log" -jar %~dps0%wrapperJarFilename%  %serviceName%"
+  set binPath="\"%javaPath%\bin\java.exe\" %loggingProperties% -DworkingDir="%~dps0.." -DconfigFile=%configFile% %classpath% %mainclass% -Dorg.neo4j.cluster.logdirectory="%~dps0..\data\log" -jar %~dps0%wrapperJarFilename%  %serviceName%"

   sc create "%serviceName%" binPath= %binpath% DisplayName= "%serviceDisplayName:"=%" start= %serviceStartType%
   sc start %serviceName%


Add ClojureEditor to windows build

Add ClojureEditor to windows build

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

--- buildscripts/buildJars.bat
+++ buildscripts/buildJars.bat
@@ -41,6 +41,10 @@
 call ant -buildfile build.xml %cleantarget% compile build
 popd

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


Revert "replace user-aliases with user_aliases"

This reverts commit d91438de47b47f7ceb4c3c09923cea9f20052673.


Add win32 release build script to fully automate all the local steps in generating a release. The only steps you have to perform are uploading the resultin zip files and moving symbol files onto the crashcollector server.

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

--- tools/release/build-win32-release.bat
+++ tools/release/build-win32-release.bat
@@ -0,0 +1,117 @@
+REM build-win32-release.bat x.y.z
+REM Builds a Windows binary release. This doesn't perform a complete build:
+REM it depends on you already having setup dependencies properly.  You must
+REM also have all the necessary tools: Visual Studio, the dependencies,
+REM Python (for the symbol generation script), and 7zip for generating zip
+REM files.
+
+set VERSION=%1
+
+
+REM This entire upper block is for determining where Visual Studio is. Search for TOPDIR for the real code (after a big empty block)
+
+@SET VSINSTALLDIR=C:\Program Files (x86)\Microsoft Visual Studio 9.0
+@SET VCINSTALLDIR=C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC
+@SET FrameworkDir=C:\WINDOWS\Microsoft.NET\Framework
+@SET FrameworkVersion=v2.0.50727
+@SET Framework35Version=v3.5
+@if "%VSINSTALLDIR%"=="" goto error_no_VSINSTALLDIR
+@if "%VCINSTALLDIR%"=="" goto error_no_VCINSTALLDIR
+
+@echo Setting environment for using Microsoft Visual Studio 2008 x86 tools.
+
+@call :GetWindowsSdkDir
+
+@if not "%WindowsSdkDir%" == "" (
+	set "PATH=%WindowsSdkDir%bin;%PATH%"
+	set "INCLUDE=%WindowsSdkDir%include;%INCLUDE%"
+	set "LIB=%WindowsSdkDir%lib;%LIB%"
+)
+
+
+@rem
+@rem Root of Visual Studio IDE installed files.
+@rem
+@set DevEnvDir=C:\Program Files (x86)\Microsoft Visual Studio 9.0\Common7\IDE
+
+@set PATH=C:\Program Files (x86)\Microsoft Visual Studio 9.0\Common7\IDE;C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\BIN;C:\Program Files (x86)\Microsoft Visual Studio 9.0\Common7\Tools;C:\WINDOWS\Microsoft.NET\Framework\v3.5;C:\WINDOWS\Microsoft.NET\Framework\v2.0.50727;C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\VCPackages;%PATH%
+@set INCLUDE=C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\INCLUDE;%INCLUDE%
+@set LIB=C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\LIB;%LIB%
+@set LIBPATH=C:\WINDOWS\Microsoft.NET\Framework\v3.5;C:\WINDOWS\Microsoft.NET\Framework\v2.0.50727;C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\LIB;%LIBPATH%
+
+@goto end
+
+:GetWindowsSdkDir
+@call :GetWindowsSdkDirHelper HKLM > nul 2>&1
+@if errorlevel 1 call :GetWindowsSdkDirHelper HKCU > nul 2>&1
+@if errorlevel 1 set WindowsSdkDir=%VCINSTALLDIR%\PlatformSDK\
+@exit /B 0
+
+:GetWindowsSdkDirHelper
+@for /F "tokens=1,2*" %%i in ('reg query "%1\SOFTWARE\Microsoft\Microsoft SDKs\Windows" /v "CurrentInstallFolder"') DO (
+	if "%%i"=="CurrentInstallFolder" (
+		SET "WindowsSdkDir=%%k"
+	)
+)
+@if "%WindowsSdkDir%"=="" exit /B 1
+@exit /B 0
+
+:error_no_VSINSTALLDIR
+@echo ERROR: VSINSTALLDIR variable is not set.
+@goto end
+
+:error_no_VCINSTALLDIR
+@echo ERROR: VCINSTALLDIR variable is not set.
+@goto end
+
+:end
+
+
+
+
+
+
+
+
+
+set TOPDIR=%CD%
+set BUILDDIR=%TOPDIR%\build\cmake
+set INSTALLDIR=%TOPDIR%\sirikata_win32
+set INSTALLPDBDIR=%TOPDIR%\sirikata_win32_pdb
+set INSTALLSYMDIR=%TOPDIR%\sirikata_win32_sym
+
+set CMAKE="C:\Program Files (x86)\CMake 2.8\bin\cmake.exe"
+set PYTHON="C:\Python27\python.exe"
+set SEVENZIP="C:\Program Files\7-Zip\7z.exe"
+
+
+REM Main build and install
+cd %BUILDDIR%
+%CMAKE% -E remove_directory %INSTALLDIR%
+%CMAKE% -E remove %BUILDDIR%\CMakeCache.txt
+call %CMAKE% -G "Visual Studio 9 2008" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=%INSTALLDIR% %BUILDDIR%
+REM not sure what you're supposed to use here, why doesn't VCExpress.exe support /clean?
+vcbuild /clean Sirikata.sln
+VCExpress.exe /build RelWithDebInfo /project ALL_BUILD /log sirikata.win32.release.warning.log /out sirikata.win32.release.error.log Sirikata.sln
+VCExpress.exe /build RelWithDebInfo /project INSTALL Sirikata.sln
+
+REM Breakpad symbols
+%CMAKE% -E remove_directory %INSTALLSYMDIR%
+%CMAKE% -E make_directory %INSTALLSYMDIR%
+%CMAKE% -E remove_directory symbols
+call %PYTHON% %TOPDIR%\tools\crashcollector\symbolstore.py
+call xcopy /E symbols\* %INSTALLSYMDIR%
+
+REM PDB files
+%CMAKE% -E remove_directory %INSTALLPDBDIR%
+%CMAKE% -E make_directory %INSTALLPDBDIR%
+call copy RelWithDebInfo\*.pdb %INSTALLPDBDIR%
+
+REM Archives
+cd %TOPDIR%
+%CMAKE% -E remove sirikata-%VERSION%-win32.zip sirikata-%VERSION%-win32.dbg.zip
+call %SEVENZIP% a sirikata-%VERSION%-win32.zip sirikata_win32
+call %SEVENZIP% a sirikata-%VERSION%-win32.dbg.zip sirikata_win32_pdb sirikata_win32_sym
+
+:finished
+cd %TOPDIR%


Normalize capitalization of Debug/Release

--- BuildDeps.cmd
+++ BuildDeps.cmd
@@ -1,7 +1,7 @@
 @echo off

 set __BuildArch=x64
-set __BuildType=debug
+set __BuildType=Debug

 :Arg_Loop
@@ -9,8 +9,8 @@
 if /i "%1" == "/?" goto Usage
 if /i "%1" == "x64"    (set __BuildArch=x64&&shift&goto Arg_Loop)

-if /i "%1" == "debug"    (set __BuildType=Debug&shift&goto Arg_Loop)
-if /i "%1" == "release"   (set __BuildType=Release&shift&goto Arg_Loop)
+if /i "%1" == "Debug"    (set __BuildType=Debug&shift&goto Arg_Loop)
+if /i "%1" == "Release"   (set __BuildType=Release&shift&goto Arg_Loop)

 echo Invalid commandline argument: %1
 goto Usage
@@ -38,7 +38,7 @@

 if /i "%__BuildArch%" == "x64" set arch=amd64
 set SUFFIX=
-if /i "%__BuildType%" == "debug" set SUFFIX=_d
+if /i "%__BuildType%" == "Debug" set SUFFIX=_d

 copy %arch%\python36%SUFFIX%.lib ..\..\Libs\%__BuildType%\%__BuildArch%\


Added startosiris.bat for easier startup

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

--- startosiris.bat
+++ startosiris.bat
@@ -0,0 +1,5 @@
+@echo off
+
+SET PATH=%PATH%;"%CD%\..\..\commonlibs\play-2.0.3"
+
+play run


Update Ring For Android - extensions/android/ringqt/update_ring/updateringonly.bat

--- extensions/android/ringqt/update_ring/updateringonly.bat
+++ extensions/android/ringqt/update_ring/updateringonly.bat
@@ -1,7 +1,7 @@
 rem	Simple Batch file to update Ring only Android-Qt Version
 rem	Author : Mahmoud Fayed <msfclipper@yahoo.com>

-copy ..\..\..\..\src\*.c ..\project\
-copy ring_ext.c ..\project\
-copy ..\..\..\..\include\*.h ..\project\
-copy ring_ext.h ..\project\
+copy ..\..\..\..\src\*.c ..\project\ring\src\
+copy ring_ext.c ..\project\ring\src\
+copy ..\..\..\..\include\*.h ..\project\ring\include\
+copy ring_ext.h ..\project\ring\include


add autobuild batch file

add autobuild batch file

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

--- docs/autobuild.bat
+++ docs/autobuild.bat
@@ -0,0 +1 @@
+sphinx-autobuild.exe . .\_build\html\


more windows tweaks

more windows tweaks

--- recipes/quantlib/bld.bat
+++ recipes/quantlib/bld.bat
@@ -1,4 +1,4 @@
-cmake -G "NMake Makefiles" -D CMAKE_BUILD_TYPE=Release -D CMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% -D Boost_NO_BOOST_CMAKE=ON %SRC_DIR%
+cmake -G "NMake Makefiles" -D CMAKE_BUILD_TYPE=Release -D CMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% -D Boost_USE_STATIC_LIBS=OFF -D Boost_USE_STATIC_RUNTIME=OFF %SRC_DIR%
 if errorlevel 1 exit 1

 nmake


added handy(?) script to start Mserver with Mapi listener ("MapiServer") on Windows

error: pathspec 'MonetDB/NT/MapiServer.bat' did not match any file(s) known to git

--- MonetDB/NT/MapiServer.bat
+++ MonetDB/NT/MapiServer.bat
@@ -0,0 +1,8 @@
+@rem figure out the folder name
+@set MONETDB=%~dp0
+
+@rem remove the final backslash from the path
+@set MONETDB=%MONETDB:~0,-1%
+
+@rem start the real server
+@"%MONETDB%\Mserver.bat" "%MONETDB%\lib\MonetDB\mapi.mil" %*


plain and cdb are built-in, so text changed from "Plain" to "Plain / CDB"

git-svn-id: 42973100b4634b3c653b0d04ba2ce8cb0267cb12@75 5d7abbe1-27f8-cb71-bef1-01d8ca34fe51

--- module/i18n.inc.bat
+++ module/i18n.inc.bat
@@ -92,7 +92,7 @@
 	set PHRASE_1_10=   Set PvPGN interface as Console
 	set PHRASE_1_11=   Set PvPGN interface as GUI (Graphical User Interface)
 	set PHRASE_1_12=Select a database type:
-	set PHRASE_1_13=   1) Plain (default)
+	set PHRASE_1_13=   1) Plain / CDB (default)
 	set PHRASE_1_14=
 	set PHRASE_1_15=   PvPGN will build without database support
 	set PHRASE_1_16=CMake configuration failed
@@ -150,7 +150,7 @@
 	set PHRASE_1_10=    PvPGN ࠭ ᮫ 䥩
 	set PHRASE_1_11=    PvPGN ࠭  䥩
 	set PHRASE_1_12=롥 ⨯  :
-	set PHRASE_1_13=   1) ⮢ 䠩 (-㬮砭)
+	set PHRASE_1_13=   1) ⮢ 䠩 / CDB (-㬮砭)
 	set PHRASE_1_14=
 	set PHRASE_1_15=   PvPGN 㤥 ᮡ࠭  প
 	set PHRASE_1_16= 䨣樨 CMake  訡
@@ -208,7 +208,7 @@
 	set PHRASE_1_10=  Zet PvPGN omgeving als Console
 	set PHRASE_1_11=  Set PvPGN interface as GUI (Graphical User Interface) Zet PvPGN omgeving als GUI ()
 	set PHRASE_1_12=Selecteer een database type:
-	set PHRASE_1_13=   1) Normaal (Text) (Standaard)
+	set PHRASE_1_13=   1) Normaal (Text / CDB) (Standaard)
 	set PHRASE_1_14=
 	set PHRASE_1_15=  PvPGN zal gebouwen worden zonder database ondersteuning
 	set PHRASE_1_16=CMake configuratie mislukt
@@ -266,7 +266,7 @@
 	set PHRASE_1_10=   Wybrany interfejs: Wiersz polecen
 	set PHRASE_1_11=   Wybrany interfejs: Interfejs graficzny
 	set PHRASE_1_12=Wybierz typ bazy danych:
-	set PHRASE_1_13=   1) Pliki (domyslnie)
+	set PHRASE_1_13=   1) Pliki / CDB (domyslnie)
 	set PHRASE_1_14=
 	set PHRASE_1_15=   PvPGN zostanie skompilowany bez obslugi bazy danych
 	set PHRASE_1_16=Blad podczas konfiguracji CMake
@@ -324,7 +324,7 @@
 	set PHRASE_1_10=   Fur PvPGN wurde die Konsolenschnittstelle gewahlt
 	set PHRASE_1_11=   Fur PvPGN wurde die Fensterschnittstelle gewahlt
 	set PHRASE_1_12=Wahlen Sie den Datenbanktyp:
-	set PHRASE_1_13=   1) Textdateien (Standardeinstellung)
+	set PHRASE_1_13=   1) Textdateien / CDB (Standardeinstellung)
 	set PHRASE_1_14=
 	set PHRASE_1_15=   PvPGN wird ohne Datenbankunterstutzung gewahlt
 	set PHRASE_1_16=Bei der CMake-Konfiguration entstanden die Fehler
@@ -382,7 +382,7 @@
 	set PHRASE_1_10=   izaberi PvPGN izgled as Console
 	set PHRASE_1_11=   izaveri PvPGN izgled as GUI (Graficki izgled)
 	set PHRASE_1_12=izaberi vrstu baze podataka:
-	set PHRASE_1_13=   1) Plain (default)
+	set PHRASE_1_13=   1) Plain / CDB (default)
 	set PHRASE_1_14=   2) MySql
 	set PHRASE_1_15=   PvPGN ce praviti bez baze podataka
 	set PHRASE_1_16=CMake konfigurisanje nije uspelo


language strings

language strings

git-svn-id: 42973100b4634b3c653b0d04ba2ce8cb0267cb12@33 5d7abbe1-27f8-cb71-bef1-01d8ca34fe51

--- module/i18n.inc.bat
+++ module/i18n.inc.bat
@@ -36,9 +36,10 @@
 :ENU
 	set MOTD_LANGUAGE=enUS

-	set PHRASE_1_1= Visual Studio is not installed
-	set PHRASE_1_2= Visual C++ environment was not found!
-	set PHRASE_1_3=Do you want to download/update the latest PvPGN source from the SVN (in "source" directory)?
+	set PHRASE_1_0= Visual Studio is not installed
+	set PHRASE_1_1=Select a Visual Studio version to build PvPGN:
+	set PHRASE_1_2=%2 chosen as a build environment
+	set PHRASE_1_3=Do you want to download/update the latest PvPGN source from the SVN (in %2 directory)?
 	set PHRASE_1_4=  PvPGN will update from the SVN
 	set PHRASE_1_5=  PvPGN will not update
 	set PHRASE_1_6=Select a PvPGN interface:
@@ -52,8 +53,8 @@
 	set PHRASE_1_14=
 	set PHRASE_1_15=  PvPGN will build without database support
 	set PHRASE_1_16=CMake configuration failed
-
-	set PHRASE_2_1=Available %2 versions (you can add your own into modules\include\%2):
+
+	set PHRASE_2_1=Available %2 versions (you can add your own into %3):
 	set PHRASE_2_2=   Choose a number
 	set PHRASE_2_3=   Wrong choice... try again
 	set PHRASE_2_4=   PvPGN will compile with support %2 v%3
@@ -62,9 +63,9 @@
 	set PHRASE_2_7=    Connection user
 	set PHRASE_2_8=    Connection password
 	set PHRASE_2_9=    Database name
-	set PHRASE_2_10=    Tables prefix (default is "pvpgn_")
+	set PHRASE_2_10=    Tables prefix (default is %2)
 	set PHRASE_2_11=%2 configuration saved
-
+
 	set PHRASE_3_1=Checking for update ...
 	set PHRASE_3_2="v%2" is your version
 	set PHRASE_3_3="v%2" is remote version
@@ -73,12 +74,12 @@
 	set PHRASE_3_6= Update was cancelled by user
 	set PHRASE_3_6_1= Can not connect to update server
 	set PHRASE_3_7=Starting update ...
-	set PHRASE_3_8= Downloading file "%2" ...
+	set PHRASE_3_8= Downloading file %2 ...
 	set PHRASE_3_9=Update finished
-	set PHRASE_3_10=Please, check file "version-history.txt" for more information about changes
+	set PHRASE_3_10=Please, check file %2 for more information about changes

 	set PHRASE_4_1=Do you want to apply patch(es) to your PvPGN source code?
-	set PHRASE_4_2=Please, first put your patch files to the "%2" directory. You could download patches from the url: %3
+	set PHRASE_4_2=Please, first put your patch files to the %2 directory. You could download patches from the url: %3
 	set PHRASE_4_3=*** WARNING ***
 	set PHRASE_4_4=Paths into your *.patch files should set to relative of the root to the source code (it placed in the SVN at %2)
 	set PHRASE_4_5=For example: you want to apply patch to %2, so path to this file should be %3
@@ -86,16 +87,17 @@
 	set PHRASE_4_7=Applying patch %2 ...
 	set PHRASE_4_8=Finished. Please, check for conflicts.
 	set PHRASE_4_9=Do you want to continue building a PvPGN?
-
+
 	goto switch_lang

 :: Russian
 :RUS
 	set MOTD_LANGUAGE=ruRU

-	set PHRASE_1_1=  Visual Studio  ⠭
-	set PHRASE_1_2=  । Visual C++
-	set PHRASE_1_3=/ ᫥ 室 PvPGN  SVN (  "source")?
+	set PHRASE_1_0=  Visual Studio  ⠭
+	set PHRASE_1_1=롥  Visual Studio  樨 PvPGN:
+	set PHRASE_1_2=%2 ࠭  ⢥
+	set PHRASE_1_3=/ ᫥ 室 PvPGN  SVN (  %2)?
 	set PHRASE_1_4=   PvPGN 㤥   SVN
 	set PHRASE_1_5=   PvPGN  㤥
 	set PHRASE_1_6=롥 䥩  PvPGN:
@@ -110,7 +112,7 @@
 	set PHRASE_1_15=   PvPGN 㤥 ᮡ࠭  প
 	set PHRASE_1_16= 䨣樨 CMake  訡

-	set PHRASE_2_1=㯭 ᨨ %2 (  ᢮  modules\include\%2):
+	set PHRASE_2_1=㯭 ᨨ %2 (  ᢮  %3):
 	set PHRASE_2_2=
 	set PHRASE_2_3=   ࠢ ... ஡  ࠧ
 	set PHRASE_2_4=   PvPGN 㤥 ᪮஢  প %2 v%3
@@ -119,9 +121,9 @@
 	set PHRASE_2_7=    짮⥫
 	set PHRASE_2_8=    ஫
 	set PHRASE_2_9=
-	set PHRASE_2_10=    䨪  ⠡ (-㬮砭 "pvpgn_"):
+	set PHRASE_2_10=    䨪  ⠡ (-㬮砭 %2):
 	set PHRASE_2_11=䨣 %2 ࠭
-
+
 	set PHRASE_3_1=஢ઠ  ...
 	set PHRASE_3_2="v%2"
 	set PHRASE_3_3="v%2" ᫥
@@ -130,10 +132,10 @@
 	set PHRASE_3_6=  ⬥ 짮⥫
 	set PHRASE_3_6_1=  ᮥ  ࢥ஬
 	set PHRASE_3_7=稭  ...
-	set PHRASE_3_8= 㧪 䠩 "%2" ...
+	set PHRASE_3_8= 㧪 䠩 %2 ...
 	set PHRASE_3_9= 襭
-	set PHRASE_3_10=ଠ    ᬮ  䠩 "version-history.txt"
-
+	set PHRASE_3_10=ଠ    ᬮ  䠩 %2
+
 	set PHRASE_4_1=  ਬ ()  室  PvPGN?
 	set PHRASE_4_2= 砫,  䠩 祩   %2.     뫪: %3
 	set PHRASE_4_3=***   ***
@@ -143,17 +145,17 @@
 	set PHRASE_4_7=ਬ  %2 ...
 	set PHRASE_4_8=襭. ஢ 稥 䫨⮢.
 	set PHRASE_4_9=த ஥ PvPGN?
-
-	goto echo_phrase
-
-
+
+	goto echo_phrase
+
 :: Dutch - translation by MusicDemon
 :NLD
 	set MOTD_LANGUAGE=nlNL

-	set PHRASE_1_1= Visual Studio is niet geinstaleerd
-	set PHRASE_1_2= Visual C++ omgeving was niet gevonden!
-	set PHRASE_1_3=Download/update de laatste PvPGN broncode van de SVN (in de "source" directory)?
+	set PHRASE_1_0= Visual Studio is niet geinstaleerd
+	set PHRASE_1_1=Selecteer een Visual Studio versie om PvPGN te bouwen:
+    set PHRASE_1_2=%2 is gekozen als bouw omgeving
+	set PHRASE_1_3=Download/update de laatste PvPGN broncode van de SVN (in de %2 directory)?
 	set PHRASE_1_4=  PvPGN zal updaten van de SVN
 	set PHRASE_1_5=  PvPGN zal niet worden geupdate
 	set PHRASE_1_6=Selecteer PvPGN omgeving:
@@ -167,8 +169,8 @@
 	set PHRASE_1_14=
 	set PHRASE_1_15=  PvPGN zal gebouwen worden zonder database ondersteuning
 	set PHRASE_1_16=CMake configuratie mislukt
-
-	set PHRASE_2_1=Beschikbare %2 versies (u kunt uw eigen in modules\includes\%2):
+
+	set PHRASE_2_1=Beschikbare %2 versies (u kunt uw eigen in %3):
 	set PHRASE_2_2=   Kies een nummer
 	set PHRASE_2_3=   Verkeerde keuze... Probeer het opnieuw
 	set PHRASE_2_4=   PvPGN word gebouwd met %2 ondersteuning op v%3
@@ -177,61 +179,73 @@
 	set PHRASE_2_7=    Connectie gebruiker
 	set PHRASE_2_8=    Connectie wachtwoord
 	set PHRASE_2_9=    Database naam
-	set PHRASE_2_10=    Tafel voorvoegsel (Table prefix, standaard is "pvpgn_")
+	set PHRASE_2_10=    Tafel voorvoegsel (Table prefix, standaard is %2)
 	set PHRASE_2_11=%2 configuratie opgeslagen
-
+
 	set PHRASE_3_1=Checken voor updates...
 	set PHRASE_3_2=U hebt versie "v%2"
 	set PHRASE_3_3=Nieuwe versie is "v%2"
 	set PHRASE_3_4= U hebt de laatste versie van PvPGN Magic Builder
 	set PHRASE_3_5=Externe versie van PvPGN Magic Builder is niet gelijk aan met de jouwe. Wilt u automatisch bijgewerkt naar de nieuwe versi
 	set PHRASE_3_6= Update was geannuleerd door gebruiker
+	set PHRASE_3_6_1= Kan geen connectie maken met update server
 	set PHRASE_3_7=Starten van update...
-	set PHRASE_3_8= Downloaden van bestand "%2"...
+	set PHRASE_3_8= Downloaden van bestand %2...
 	set PHRASE_3_9=Update voltooid
-	set PHRASE_3_10=Controleer het bestand "version-history.txt" voor meer informatie over wijzigingen
-
-	goto echo_phrase
-
-:: Polish
+	set PHRASE_3_10=Controleer het bestand %2 voor meer informatie over wijzigingen
+
+	set PHRASE_4_1=Wilt u patches toevoegen aan uw PvPGN bron code?
+	set PHRASE_4_2=Gelieve de patch bestanden in %2 te plaatsen. U kunt the patches downloaden vanaf: %3
+	set PHRASE_4_3=*** WAARSCHUWING ***
+	set PHRASE_4_4=Paden in uw *.patch-bestand(en) moeten relatief zijn naar het begin of naar de bron code (Het is geplaatst in de SVN op %2)
+	set PHRASE_4_5=Voorbeeld: U wilt patch %2 toevoegen, dus het patch-bestand moet %3 zijn
+	set PHRASE_4_6=Bent u klaar om te patchen?
+	set PHRASE_4_7=Patch %2 toevoegen ...
+	set PHRASE_4_8=Voltooid. Gelieve na te kijken voor conflicten
+	set PHRASE_4_9=Wilt u doorgaan met het bouwen van PvPGN?
+
+	goto echo_phrase
+
+:: Polish - translation by
 :PLK
 	set MOTD_LANGUAGE=plPL
-	goto echo_phrase
+	goto echo_phrase
+
+:: German - translation by
+:DEU
+	set MOTD_LANGUAGE=deDE
+	goto echo_phrase

 :: Czech
 :CSY
 	set MOTD_LANGUAGE=csCZ
-	goto echo_phrase
+	goto echo_phrase

 :: Spanish
 :ESN
 	set MOTD_LANGUAGE=esES
-	goto echo_phrase
+	goto echo_phrase

 :: French
 :FRA
 	set MOTD_LANGUAGE=frFR
-	goto echo_phrase
-
-:: German
-:DEU
-	set MOTD_LANGUAGE=deDE
-	goto echo_phrase
-
+	goto echo_phrase
+
+
 :: Chinese - China
 :CHS
 	set MOTD_LANGUAGE=zhCN
-	goto echo_phrase
+	goto echo_phrase

 :: Chinese - Taiwan
 :CHT
 	set MOTD_LANGUAGE=zhTW
-	goto echo_phrase
+	goto echo_phrase

 :: Portuguese - Brazil
 :PTB
 	set MOTD_LANGUAGE=ptBR
-	goto echo_phrase
+	goto echo_phrase

 :: Portuguese - Portugal
 :PTG


STLink flash: add verify after programming and disable progress bar

--- mbed/stlinkflash.bat
+++ mbed/stlinkflash.bat
@@ -1 +1 @@
-"C:\Program Files (x86)\STMicroelectronics\STM32 ST-LINK Utility\ST-LINK Utility\ST-LINK_CLI" -c SWD -P %1 0x08000000 -Rst -Run+"C:\Program Files (x86)\STMicroelectronics\STM32 ST-LINK Utility\ST-LINK Utility\ST-LINK_CLI" -c SWD -P %1 0x08000000 -Rst -Run -Q -V after_programming


Fix windows build: update msys repo URL (#490)

This is needed since msys main repo had been down for several days
now.

--- kokoro/windows/build.bat
+++ kokoro/windows/build.bat
@@ -51,14 +51,16 @@
 c:\tools\msys64\usr\bin\bash --login -c "pacman -R --noconfirm catgets libcatgets"
 REM Use an old version of patch known to work with the msys runtime
 REM version that comes on Kokoro.
-wget -q http://repo.msys2.org/msys/x86_64/patch-2.7.5-1-x86_64.pkg.tar.xz
+set REPO_MSYS2=https://sourceforge.net/projects/msys2/files/REPOS/MSYS2/x86_64
+set REPO_MINGW=https://sourceforge.net/projects/msys2/files/REPOS/MINGW/x86_64
+wget -q %REPO_MSYS2%/patch-2.7.5-1-x86_64.pkg.tar.xz
 c:\tools\msys64\usr\bin\bash --login -c "pacman -v -U --noconfirm  /t/src/patch-2.7.5-1-x86_64.pkg.tar.xz"
-wget -q http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-binutils-2.33.1-1-any.pkg.tar.xz
+wget -q %REPO_MINGW%/mingw-w64-x86_64-binutils-2.33.1-1-any.pkg.tar.xz
 c:\tools\msys64\usr\bin\bash --login -c "pacman -U --noconfirm /t/src/mingw-w64-x86_64-binutils-2.33.1-1-any.pkg.tar.xz"
-wget -q http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-9.2.0-2-any.pkg.tar.xz
-wget -q http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-libs-9.2.0-2-any.pkg.tar.xz
+wget -q %REPO_MINGW%/mingw-w64-x86_64-gcc-9.2.0-2-any.pkg.tar.xz
+wget -q %REPO_MINGW%/mingw-w64-x86_64-gcc-libs-9.2.0-2-any.pkg.tar.xz
 c:\tools\msys64\usr\bin\bash --login -c "pacman -U --noconfirm /t/src/mingw-w64-x86_64-gcc-9.2.0-2-any.pkg.tar.xz /t/src/mingw-w64-x86_64-gcc-libs-9.2.0-2-any.pkg.tar.xz"
-wget -q http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-crt-git-8.0.0.5647.1fe2e62e-1-any.pkg.tar.xz
+wget -q %REPO_MINGW%/mingw-w64-x86_64-crt-git-8.0.0.5647.1fe2e62e-1-any.pkg.tar.xz
 c:\tools\msys64\usr\bin\bash --login -c "pacman -U --noconfirm /t/src/mingw-w64-x86_64-crt-git-8.0.0.5647.1fe2e62e-1-any.pkg.tar.xz"
 set PATH=c:\tools\msys64\mingw64\bin;c:\tools\msys64\usr\bin;%PATH%
 set BAZEL_SH=c:\tools\msys64\usr\bin\bash


Call python.bat in archive step.

Call python.bat in archive step.

Calling archive coverage python in hopes this will solve archive failure.

BUG=None
TEST=None
R=jfb@chromium.org

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

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


Ported build script

Ported build script

--- build/windows/build.cmd
+++ build/windows/build.cmd
@@ -5,14 +5,13 @@
 set TARGET=%ROOT%\dist\windows\
 set APP_NAME=Spark IDE
 call :GETTEMPDIR
-rem mkdir %TEMP_DIR%
-set TEMP_DIR=C:\Users\Wojtek\Documents\GitHub\spark-ide\build\windows\tmp-7856-25.tmp
+mkdir %TEMP_DIR%

-rem if exist "%TARGET%" DEL /Q %TARGET%
-rem mkdir %TARGET%
-rem cd %TEMP_DIR%
+if exist "%TARGET%" DEL /Q %TARGET%
+mkdir %TARGET%
+cd %TEMP_DIR%
 echo "Working directory is %TEMP_DIR%"
-rem git clone --depth=1 https://github.com/atom/atom.git .
+git clone --depth=1 https://github.com/atom/atom.git .

 rem Copy resources
 copy %BUILD%\sparkide.ico %TEMP_DIR%\resources\win\atom.ico
@@ -23,7 +22,29 @@
 patch %TEMP_DIR%\.npmrc < %BUILD%\..\mac\npmrc.patch

 cd %TEMP_DIR%
-rem script\build --install-dir="%TARGET%/%APP_NAME%.exe"
+
+rem Append 3rd party packages to package.json
+node %BUILD%\..\mac\append-package %TEMP_DIR%\package.json language-arduino "0.2.0"
+node %BUILD%\..\mac\append-package %TEMP_DIR%\package.json file-type-icons "0.4.4"
+node %BUILD%\..\mac\append-package %TEMP_DIR%\package.json switch-header-source "0.8.0"
+node %BUILD%\..\mac\append-package %TEMP_DIR%\package.json resize-panes "0.1.0"
+node %BUILD%\..\mac\append-package %TEMP_DIR%\package.json maximize-panes "0.1.0"
+node %BUILD%\..\mac\append-package %TEMP_DIR%\package.json move-panes "0.1.2"
+node %BUILD%\..\mac\append-package %TEMP_DIR%\package.json swap-panes "0.1.0"
+
+rem Bootstrap Atom
+script/bootstrap
+
+echo "Installing Spark IDE package"
+rem git clone --depth=1 git@github.com:spark/spark-ide.git node_modules\spark-ide
+cd node_modules\spark-ide
+$env:ATOM_NODE_VERSION="0.17.1"
+..\..\apm\node_modules\atom-package-manager\bin\apm.cmd install . --verbose
+rem ls -lha node_modules\serialport\build\serialport\v1.4.6\Release\
+cd ..\..
+node %BUILD%\..\mac\append-package %TEMP_DIR%\package.json spark-ide "0.0.7"
+
+rem node build\node_modules\.bin\grunt --gruntfile build\Gruntfile.coffee --install-dir "%TARGET%/%APP_NAME%.exe"

 goto :EOF


Delete pepe.bat

Delete pepe.bat

--- pianotrain/pepe.bat
+++ pianotrain/pepe.bat
@@ -1 +0,0 @@
-cmd


Microsoft Office 15 click-to-run and other entries

--- resources/stage_2_de-bloat/programs_to_target_by_GUID.bat
+++ resources/stage_2_de-bloat/programs_to_target_by_GUID.bat
@@ -905,6 +905,18 @@
 :: CyberLink Blu-ray Disc Suite
 start /wait msiexec /qn /norestart /x {1FBF6C24-C1FD-4101-A42B-0C564F9E8E79}

+:: CyberLink MediaEspresso 6.50.0000
+start /wait msiexec /qn /norestart /x {1FBF6C24-C1fD-4101-A42B-0C564F9E8E79}
+
+:: CyberLink Media Suite 10
+start /wait msiexec /qn /norestart /x {8DE5BF1E-6857-47C9-84FC-3DADF459493F}
+
+:: CyberLink MediaShow, MediaSmart DVD/Photo/Video
+start /wait msiexec /qn /norestart /x {E3739848-5329-48E3-8D28-5BBD6E8BE384}
+start /wait msiexec /qn /norestart /x {D12E3E7F-1B13-4933-A915-16C7DD37A095}
+start /wait msiexec /qn /norestart /x {80E158EA-7181-40FE-A701-301CE6BE64AB}
+start /wait msiexec /qn /norestart /x {6DAF8CDC-9B04-413B-A0F2-BCC13CF8A5BF}
+
 :: CyberLink Power2Go
 start /wait msiexec /qn /norestart /x {2A87D48D-3FDF-41fd-97CD-A1E370EFFFE2}
 start /wait msiexec /qn /norestart /x {40BF1E83-20EB-11D8-97C5-0009C5020658}
@@ -1028,9 +1040,16 @@
 :: Dell Getting Started Guide 1.00.0000
 start /wait msiexec /qn /norestart /x {7B7D73E7-79D5-4133-AB7A-E27BB5F64725}

+:: Dell Help and Support Customization (hidden)
+start /wait msiexec /qn /norestart /x {4E5563B6-DE0A-4F3B-A5D6-15789FD12D9B}
+
 :: Dell Home Systems Service Agreement 2.0.0
 start /wait msiexec /qn /norestart /x {AB2CED80-0F16-476F-8769-30A363562F16}

+:: Dell mDrWifi
+start /wait msiexec /qn /norestart /x {90CC4231-94AC-45CD-991A-0253BFAC0650}
+start /wait msiexec /qn /norestart /x {A0F925BF-5C55-44C2-A4E7-5A4C59791C29}
+
 :: Dell Mobile Broadband Utility 3.00.23.003
 start /wait msiexec /qn /norestart /x {C8B8C745-D288-41B4-9512-01E397F77449}

@@ -1039,6 +1058,9 @@

 :: Dell MusicStage 1.4.162.0
 start /wait msiexec /qn /norestart /x {EC542D5D-B608-4145-A8F7-749C02BE6D94}
+
+:: Dell Music, Photos & Videos Launcher
+start /wait msiexec /qn /norestart /x {E4761915-C73A-4ef4-BB14-E380AB1D1CFB}

 :: Dell Open Print Driver 1.31.7527.0
 start /wait msiexec /qn /norestart /x {B96348BD-6B0D-42E3-80B1-FA6718067BFE}
@@ -1132,6 +1154,9 @@

 :: Dell Getting Started Guide
 start /wait msiexec /qn /norestart /x {7DB9F1E5-9ACB-410D-A7DC-7A3D023CE045}
+
+:: Dell misc help and support GUIDs
+start /wait msiexec /qn /norestart /x {9EDA3DD1-130D-4EE1-A3D2-5A3D795CC8C9}

 :: Dell Power Manager
 start /wait msiexec /qn /norestart /x {CAC1E444-ECC4-4FF8-B328-5E547FD608F8}
@@ -1208,6 +1233,29 @@
 :: FlashCatch browser plugin
 start /wait msiexec /qn /norestart /x {A0AB2980-1FDD-4b6c-940C-FC87C84F05B7}

+:: Fujitsu Button Utilities 7.04.1209.2010
+start /wait msiexec /qn /norestart /x {EC314CDF-3521-482B-A21C-65AC95664814}
+
+:: Fujitsu Display Manager 7.00.20.212
+start /wait msiexec /qn /norestart /x {191C41F6-4BA8-4D3D-BBC5-AAC8F3077E3F}
+
+:: Fujitsu Driver Update 1.3.0012
+start /wait msiexec /qn /norestart /x {32782FFE-4BAC-48A4-A4FA-532560515E48}
+
+:: Fujitsu Fingerprint Authentication Library 1.00.49.0
+start /wait msiexec /qn /norestart /x {C8E4B31D-337C-483D-822D-16F11441669B}
+
+:: Fujitsu Hotkey Utility
+start /wait msiexec /qn /norestart /x {9FC6AD75-5B07-46E2-B80D-E9C13BBF45E0}
+start /wait msiexec /qn /norestart /x {C32028B6-E056-429C-B839-0DCF21528E71}
+
+:: Fujitsu MobilityCenter Extension Utility
+start /wait msiexec /qn /norestart /x {0C216C82-F950-4C79-A63E-322C7280AC30}
+start /wait msiexec /qn /norestart /x {E8A5B78F-4456-4511-AB3D-E7BFFB974A7A}
+
+:: Fujitsu System Extension Utility 2.1.1.0
+start /wait msiexec /qn /norestart /x {DED08875-D1AE-4E66-BE84-BB746019B9F9}
+
 :: Get Dropbox (also called "Dropbox 25 GB" or "Dropbox 15 GB")
 start /wait msiexec /qn /norestart /x {597A58EC-42D6-4940-8739-FB94491B013C}

@@ -1224,9 +1272,28 @@

 :: Hewlett-Packard ACLM.NET
 start /wait msiexec /qn /norestart /x {6F340107-F9AA-47C6-B54C-C3A19F11553F}
+start /wait msiexec /qn /norestart /x {06FCC605-92A1-4A1C-B7D1-85E5778290A4}
+
+:: HP 3.00.xxxx (various versions)
+start /wait msiexec /qn /norestart /x {B2B7B1C8-7C8B-476C-BE2C-049731C55992}
+start /wait msiexec /qn /norestart /x {2F518061-89DB-4AF0-9A7A-2BF73B60E6F0}
+start /wait msiexec /qn /norestart /x {912D30CF-F39E-4B31-AD9A-123C6B794EE2}
+start /wait msiexec /qn /norestart /x {F9569D00-4576-46C8-B6C7-207A4FD39745}

 :: HP 3D DriveGuard
 start /wait msiexec /qn /norestart /x {E8D0E2B8-B64B-44BC-8E01-00DDACBDF78A}
+start /wait msiexec /qn /norestart /x {E5823036-6F09-4D0A-B05C-E2BAA129288A}
+start /wait msiexec /qn /norestart /x {0C57987A-A03A-4B95-A309-D23F78F406CA}
+start /wait msiexec /qn /norestart /x {55CA337D-2BE3-4AA4-BA1E-652F4C02E893}
+start /wait msiexec /qn /norestart /x {675D093B-815D-47FD-AB2C-192EC751E8E2}
+start /wait msiexec /qn /norestart /x {5B08AF35-B699-4A44-BB89-3E51E70611E8}
+start /wait msiexec /qn /norestart /x {C05002F1-06F8-4A15-B6F8-E4DC655C28AA}
+start /wait msiexec /qn /norestart /x {6BA7C52E-4071-47CC-9060-ABB143862DB0}
+start /wait msiexec /qn /norestart /x {ADE2F6A7-E7BD-4955-BD66-30903B223DDF}
+start /wait msiexec /qn /norestart /x {07E79F52-1D78-4081-814E-BF093FF7A1BF}
+start /wait msiexec /qn /norestart /x {F792E5B0-11C4-4C68-8A63-FB5F52749180}
+start /wait msiexec /qn /norestart /x {130E5108-547F-4482-91EE-F45C784E08C7}
+start /wait msiexec /qn /norestart /x {D79A02E9-6713-4335-9668-AAC7474C0C0E}

 :: HP 64 Bit HP CIO Components Installer
 start /wait msiexec /qn /norestart /x {FF21C3E6-97FD-474F-9518-8DCBE94C2854}
@@ -1235,6 +1302,12 @@
 :: HP ActiveCheck component for HP Active Support Libary
 start /wait msiexec /qn /norestart /x {254C37AA-6B72-4300-84F6-98A82419187E}
 start /wait msiexec /qn /norestart /x {CBB639E0-B534-4827-97B5-CA1A4CA985B5}
+
+:: HP Advisor 3.4.10262.3295
+start /wait msiexec /qn /norestart /x {403996EB-2DCE-4C43-A2B8-2B956880772D}
+
+:: HP Auto 1.0.12935.3667
+start /wait msiexec /qn /norestart /x {CB7D766C-879F-4800-BB09-3D29E306EF63}

 :: HP BufferChm
 start /wait msiexec /qn /norestart /x {FA0FF682-CC70-4C57-93CD-E276F3E7537E}
@@ -1257,6 +1330,35 @@
 :: HP CinemaNow Media Manager
 start /wait msiexec /qn /norestart /x {A5E65B95-F016-474D-BC0D-6AF64412BBDF}

+:: HP Client Security Manager (various versions)
+start /wait msiexec /qn /norestart /x {3AF15EEA-8EDF-4393-BB6C-CF8A9986486A}
+start /wait msiexec /qn /norestart /x {CA19DC3C-DA9E-40B1-B501-710F437604C0}
+start /wait msiexec /qn /norestart /x {D5510D28-D0E4-433E-A0F3-EE3FCECA60D2}
+start /wait msiexec /qn /norestart /x {167AA1D5-8412-44BC-A003-B7A3662D1CE2}
+start /wait msiexec /qn /norestart /x {82E616DB-8BE9-46B7-AE42-60200985AD78}
+
+:: HP Client Services 1.1.12938.3539
+start /wait msiexec /qn /norestart /x {28074A47-851D-4599-A270-87609F58EB57}
+
+:: HP Color LaserJet Pro MFP M476 Scan Shortcuts 32.0.74.0
+start /wait msiexec /qn /norestart /x {B411AD10-1BC9-4939-8848-BC5E66F662B7}
+
+:: HP Connected Remote 1.0.1218
+start /wait msiexec /qn /norestart /x {F1DD6CD2-6734-4089-9EF5-441F51E083B6}
+
+:: HP Connection Manager (various versions)
+start /wait msiexec /qn /norestart /x {7940DAB9-AC72-4422-8908-DCF58C2C1D21}
+start /wait msiexec /qn /norestart /x {226837D8-0BF8-4CBE-BAB2-8F07E2C2B4DD}
+start /wait msiexec /qn /norestart /x {40FB8D7C-6FF8-4AF2-BC8B-0B1DB32AF04B}
+start /wait msiexec /qn /norestart /x {EB58480C-0721-483C-B354-9D35A147999F}
+start /wait msiexec /qn /norestart /x {7B7FF4D0-D4E2-4E8E-908D-90AB01BC4568}
+
+:: HP CoolSense
+start /wait msiexec /qn /norestart /x {85DF2EED-08BC-46FB-90DA-28B0D0A8E8A8}
+start /wait msiexec /qn /norestart /x {DFD6EBE3-F0DA-4E24-9202-37AF8D20888B}
+start /wait msiexec /qn /norestart /x {ADDF4B84-5D28-4EAE-8511-EF808C8BC81C}
+start /wait msiexec /qn /norestart /x {1504CF6F-8139-497F-86FC-46174B67CF7F}
+
 :: HP Copy (various versions)
 start /wait msiexec /qn /norestart /x {3C92B2E6-380D-4fef-B4DF-4A3B4B669771}
 start /wait msiexec /qn /norestart /x {55D003F4-9599-44BF-BA9E-95D060730DD3}
@@ -1271,6 +1373,7 @@
 :: HP Customer Experience Enhancements
 start /wait msiexec /qn /norestart /x {07FA4960-B038-49EB-891B-9F95930AA544}
 start /wait msiexec /qn /norestart /x {C9EF1AAF-B542-41C8-A537-1142DA5D4AEC}
+start /wait msiexec /qn /norestart /x {07F6DC37-0857-4B68-A675-4E35989E85E3}

 :: HP CustomerResearchQFolder
 start /wait msiexec /qn /norestart /x {6F5E2F4A-377D-4700-B0E3-8F7F7507EA15}
@@ -1278,9 +1381,6 @@

 :: HP Connected Music
 start /wait msiexec /qn /norestart /x {8126E380-F9C6-4317-9CEE-9BBDDAB676E5}
-
-:: HP CoolSense
-start /wait msiexec /qn /norestart /x {1504CF6F-8139-497F-86FC-46174B67CF7F}

 :: HP D2400_Help
 start /wait msiexec /qn /norestart /x {7EF7CCB0-52BF-4947-BE6E-E47D586E8842}
@@ -1301,6 +1401,11 @@

 :: HP DeviceManagementQFolder
 start /wait msiexec /qn /norestart /x {AB5D51AE-EBC3-438D-872C-705C7C2084B0}
+start /wait msiexec /qn /norestart /x {F769B78E-FF0E-4db5-95E2-9F4C8D6352FE}
+
+:: HP Discover hp Touchpoint Manager
+start /wait msiexec /qn /norestart /x {74FE39A0-FB76-47CD-84BA-91E2BBB17EF2}
+start /wait msiexec /qn /norestart /x {37EC8980-A8E5-411D-8CDD-CB1CCA95057F}

 :: HP Documentation
 start /wait msiexec /qn /norestart /x {C8D60CF4-BE7A-487E-BD36-535111BDB0FE}
@@ -1320,6 +1425,12 @@
 start /wait msiexec /qn /norestart /x {95CC589C-8D98-4539-9878-4E6A342304F2}
 start /wait msiexec /qn /norestart /x {9D20F550-4222-49A7-A7A7-7CAAB2E16C9C}

+:: HP DocProc
+start /wait msiexec /qn /norestart /x {676981B7-A2D9-49D0-9F4C-03018F131DA9}
+start /wait msiexec /qn /norestart /x {C29C1940-CB85-4F3B-906C-33FEE0E67103}
+start /wait msiexec /qn /norestart /x {679EC478-3FF9-4987-B2FF-C2C2B27532A2}
+start /wait msiexec /qn /norestart /x {9B362566-EC1B-4700-BB9C-EC661BDE2175}
+
 :: HPDiagnosticAlert
 start /wait msiexec /qn /norestart /x {B6465A32-8BE9-4B38-ADC5-4B4BDDC10B0D}
 start /wait msiexec /qn /norestart /x {846B5DED-DC8C-4E1A-B5B4-9F5B39A0CACE}
@@ -1354,7 +1465,7 @@
 :: HP GPBaseService2 (popups)
 start /wait msiexec /qn /norestart /x {BB3447F6-9553-4AA9-960E-0DB5310C5779}

-:: HP miscellaneous Help and eDocs GUIDs (various versions for various products; most of these should be caught in the wildcard scan)
+:: HP misc 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 {24C7AD6B-F418-4D3B-B7F2-F3603FD720BF}
 start /wait msiexec /qn /norestart /x {B6B9006D-5A0A-4F17-B69A-42F48C1FC30C}
@@ -1368,15 +1479,63 @@
 start /wait msiexec /qn /norestart /x {7F94FB03-6617-4442-9817-CDDB36EAE529}
 start /wait msiexec /qn /norestart /x {86BC184E-CFCD-48D5-829A-666A36C6ACC9}
 start /wait msiexec /qn /norestart /x {B8454F30-79EC-4959-BCF1-3776DEC406AB}
+start /wait msiexec /qn /norestart /x {BCFAA37D-A6DB-43BF-A351-43F183E52D07}
+start /wait msiexec /qn /norestart /x {5C76ED0D-0F6F-4985-8B34-F9AE7834848F}
+start /wait msiexec /qn /norestart /x {74038F40-03AE-4785-865B-07EC7F6A5E97}
+start /wait msiexec /qn /norestart /x {97486FBE-A3FC-4783-8D55-EA37E9D171CC}
+start /wait msiexec /qn /norestart /x {04D66C1E-E5E2-483C-8715-916C42703924}
+start /wait msiexec /qn /norestart /x {5D3E11CE-2C9A-44E3-A561-ED9BAC439E83}
+start /wait msiexec /qn /norestart /x {83A375B6-6FC2-4F8A-948E-E506DB9DCDF0}
+start /wait msiexec /qn /norestart /x {D2A2E5CD-801A-4B8D-8119-F79449A09B67}
+start /wait msiexec /qn /norestart /x {F6D61EC9-347B-4019-9F8E-E24169F7C330}
+start /wait msiexec /qn /norestart /x {2A186F69-BCC4-4529-9F24-A8FFB7F4E1C9}
+start /wait msiexec /qn /norestart /x {6357258D-2BF9-49E7-A9EF-0C609D52C46D}
+start /wait msiexec /qn /norestart /x {563ADFC1-38E6-4EF0-8763-7CDA8289944B}
+start /wait msiexec /qn /norestart /x {C1223A79-3983-4877-B162-75031E7CE322}
+start /wait msiexec /qn /norestart /x {DDEBEA89-2B5A-4E5B-8702-369882BB3F52}
+start /wait msiexec /qn /norestart /x {BD019D8F-25B9-49D6-B301-07AFF65E35DD}
+start /wait msiexec /qn /norestart /x {4989DD05-86FB-4CA2-96C5-923DFAD89DA3}
+start /wait msiexec /qn /norestart /x {55D8D1AB-94C2-498F-A165-608B834A30EA}
+start /wait msiexec /qn /norestart /x {274E6D9A-7CCD-4D67-9660-639486F466B2}
+start /wait msiexec /qn /norestart /x {92AB9371-D327-4D56-9BDD-B38A671A631D}
+start /wait msiexec /qn /norestart /x {32A4CF00-9FAC-47c8-9B37-91CC23815D64}
+
+:: HP Insight Diagnostics Online Edition for Windows 9.3.0
+start /wait msiexec /qn /norestart /x {DBE16A07-DDFF-4453-807A-212EF93916E0}

 :: HP MarketResearch
 start /wait msiexec /qn /norestart /x {95D08F4E-DFC2-4ce3-ACB7-8C8E206217E9}
 start /wait msiexec /qn /norestart /x {D360FA88-17C8-4F14-B67F-13AAF9607B12}
+
+:: HP MediaSmart SmartMenu
+start /wait msiexec /qn /norestart /x {5A5F45AE-0250-4C34-9D89-F10BDDEE665F}
+start /wait msiexec /qn /norestart /x {A3B64280-DE4C-40F0-86BB-CCB2A6056BA2}
+
+:: HP MediaSmart/TouchSmart Netflix (various versions)
+start /wait msiexec /qn /norestart /x {34FF930E-DBF9-4858-BAB5-BAC957BF616E}
+start /wait msiexec /qn /norestart /x {2D5E3D2B-919F-407C-8757-E64827518BB6}
+start /wait msiexec /qn /norestart /x {BB1C717E-376C-4AA1-8940-81BFC38D9778}
+
+:: HP MyRoom 10.0.0274
+start /wait msiexec /qn /norestart /x {BB760C1D-98F4-4E38-8CC4-3B67329AA981}
+start /wait msiexec /qn /norestart /x {9B9B8EE4-2EDB-41C2-AF2E-63E75D37CDDF}
+
+:: HPProductAssistant (shows up as Network, hidden)
+start /wait msiexec /qn /norestart /x {7910018D-02CF-4410-A7E5-CF5C10D05B7F}
+start /wait msiexec /qn /norestart /x {8A27C0FE-87C7-4169-BF5A-05BF94F70A54}
+start /wait msiexec /qn /norestart /x {21706D5B-A09C-42F1-95B5-CBDFE20F9852}
+
+:: HP Odometer 2.10.0000
+start /wait msiexec /qn /norestart /x {B899AE89-9B09-4F11-B299-A1209CAB8D00}

 :: HP On Screen Display (various versions)
 start /wait msiexec /qn /norestart /x {9ADABDDE-9644-461B-9E73-83FA3EFCAB50}
 start /wait msiexec /qn /norestart /x {D734D743-2385-46ED-9B3E-168A24A9E1A9}
 start /wait msiexec /qn /norestart /x {EC8D12E4-A73C-4C27-B1C7-E9683052E556}
+
+:: HP PageLift
+start /wait msiexec /qn /norestart /x {7059BDA7-E1DB-442C-B7A1-6144596720A4}
+start /wait msiexec /qn /norestart /x {274A948D-DD41-4B8F-B66F-0F4AD233200F}

 :: HPPhotoGadget
 start /wait msiexec /qn /norestart /x {CAE4213F-F797-439D-BD9E-79B71D115BE3}
@@ -1390,10 +1549,15 @@
 :: HP Photosmart Essential
 start /wait msiexec /qn /norestart /x {EB21A812-671B-4D08-B974-2A347F0D8F70}
 start /wait msiexec /qn /norestart /x {D79113E7-274C-470B-BD46-01B10219DF6A}
+start /wait msiexec /qn /norestart /x {BAC712C6-4061-4C9F-AB58-A5C53E76704A}

 :: HP Product Assistant
 start /wait msiexec /qn /norestart /x {150B6201-E9E6-4DFB-960E-CCBD53FBDDED}
 start /wait msiexec /qn /norestart /x {67D3F1A0-A1F2-49b7-B9EE-011277B170CD}
+start /wait msiexec /qn /norestart /x {36FDBE6E-6684-462b-AE98-9A39A1B200CC}
+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}

 :: HP Product Detection
 start /wait msiexec /qn /norestart /x {A436F67F-687E-4736-BD2B-537121A804CF}
@@ -1403,6 +1567,22 @@

 :: HP PostScript Converter
 start /wait msiexec /qn /norestart /x {6E14E6D6-3175-4E1A-B934-CAB5A86367CD}
+
+:: HP Power Manager
+start /wait msiexec /qn /norestart /x {8704FEEF-A6A8-4E7E-B124-BD6122C66E2C}
+start /wait msiexec /qn /norestart /x {E35A3B13-78CD-4967-8AC8-AA9FDA693EDE}
+
+:: HP Product Detection 11.14.0006
+start /wait msiexec /qn /norestart /x {424CECC6-CEB1-4A5F-9A42-ADE64F035DEB}
+
+:: HP ProtectTools Security Manager 7.0.0.1177
+start /wait msiexec /qn /norestart /x {A40F60B1-F1E1-452E-96A5-FF97F9A2D102}
+
+:: HP ProtectTools Security Manager 7.0.1.1199
+start /wait msiexec /qn /norestart /x {6F8071B2-5ECA-4A71-8E5D-7E2FE8174559}
+
+:: hp psc 1200 series 1.10.0000
+start /wait msiexec /qn /norestart /x {C88F84E5-AE23-44BD-922C-2ABEACACAF7A}

 :: HP Quick Launch and Quick Start (various versions)
 start /wait msiexec /qn /norestart /x {E92D47A1-D27D-430A-8368-0BAFD956507D}
@@ -1429,6 +1609,18 @@

 :: HP SimplePass
 start /wait msiexec /qn /norestart /x {314FAD12-F785-4471-BCE8-AB506642B9A1}
+start /wait msiexec /qn /norestart /x {F1390872-2500-4408-A46C-CD16C960C661}
+start /wait msiexec /qn /norestart /x {BBEB46E1-810D-449F-A9C5-4D60F3BF187D}
+start /wait msiexec /qn /norestart /x {30E20E5D-5E4E-4874-A35A-952DB3582C29}
+
+:: HP Security Assistant 3.0.4
+start /wait msiexec /qn /norestart /x {ED1BD69A-07E3-418C-91F1-D856582581BF}
+
+:: HP Setup 9.1.15453.4066
+start /wait msiexec /qn /norestart /x {42D10994-A566-495D-A5E7-D0C6B5C6B35C}
+
+:: HP Setup Manager 1.1.13253.3682
+start /wait msiexec /qn /norestart /x {AE2F1669-5B1F-47C5-B639-78D74DD0BCE4}

 :: HP SmartWebPrinting
 start /wait msiexec /qn /norestart /x {8FF6F5CA-4E30-4E3B-B951-204CAAA2716A}
@@ -1436,6 +1628,30 @@

 :: HP Status Alerts
 start /wait msiexec /qn /norestart /x {9D1DE902-8058-4555-A16A-FBFAA49587DB}
+
+:: HP SoftPaq Download Manager
+start /wait msiexec /qn /norestart /x {3F019647-AC80-4859-B023-42D9DA71953F}
+start /wait msiexec /qn /norestart /x {5B4F3B85-83F0-4BBF-9052-7A38B6B09634}
+start /wait msiexec /qn /norestart /x {46235FF7-2CBE-4A84-BEDA-87348D1F7850}
+start /wait msiexec /qn /norestart /x {20D6301E-0A14-4238-841D-45ECA567DB69}
+start /wait msiexec /qn /norestart /x {FC3C2B77-6800-48C6-A15D-9D1031130C16}
+start /wait msiexec /qn /norestart /x {34C821CA-6B55-44A0-8A9B-2EF471D6019E}
+start /wait msiexec /qn /norestart /x {6821D775-9303-46DD-977A-2D97CA18B054}
+
+:: HP Software Framework
+start /wait msiexec /qn /norestart /x {B6F5C6D8-C443-4B55-932F-AE11B5743FC4}
+start /wait msiexec /qn /norestart /x {285F722C-0E45-47DE-B38E-5B3B10FA4A7C}
+start /wait msiexec /qn /norestart /x {95EEB814-D454-4176-A6B5-D708CB48064F}
+start /wait msiexec /qn /norestart /x {6663B59B-E9CE-44CA-8654-7BE9060D653D}
+start /wait msiexec /qn /norestart /x {DAE3B13B-5097-4EAE-BC26-C463377BD80E}
+
+:: HP Software Setup
+start /wait msiexec /qn /norestart /x {65514800-1E09-48D6-B520-3DC70572E891}
+start /wait msiexec /qn /norestart /x {D160035A-CFF0-49C6-BE19-B9EFDE4AEBF2}
+start /wait msiexec /qn /norestart /x {7ED7BF91-D145-480A-B206-6891576F6935}
+start /wait msiexec /qn /norestart /x {B1A4A13D-4665-4ED3-9DFE-F845725FBBD8}
+start /wait msiexec /qn /norestart /x {741CFE3A-1C0B-4A7D-8E08-5D78C911C09D}
+start /wait msiexec /qn /norestart /x {F4D304D9-7647-4253-957E-44286B8631F4}

 :: HP Solution Center
 start /wait msiexec /qn /norestart /x {BC5DD87B-0143-4D14-AAE6-97109614DC6B}
@@ -1471,6 +1687,13 @@
 :: HP Support Solutions Framework
 start /wait msiexec /qn /norestart /x {D7D5F438-26EF-45AB-AB89-C476FBCF8584}

+:: HP System Default Settings
+start /wait msiexec /qn /norestart /x {5C90D8CF-F12A-41C6-9007-3B651A1F0D78}
+start /wait msiexec /qn /norestart /x {28FE073B-1230-4BF6-830C-7434FD0C0069}
+start /wait msiexec /qn /norestart /x {D1E8F2D7-7794-4245-B286-87ED86C1893C}
+start /wait msiexec /qn /norestart /x {C422BF2C-E570-4D3E-8718-7C641B190DB2}
+start /wait msiexec /qn /norestart /x {39011DEC-8956-401E-8369-421D402FFF52}
+
 :: HP System Event Utility
 start /wait msiexec /qn /norestart /x {8B4EE87E-6D40-4C91-B5E8-0DC77DC412F1}

@@ -1491,8 +1714,28 @@
 start /wait msiexec /qn /norestart /x {9652051B-BC94-4588-A84B-B9B34660FB5E}
 start /wait msiexec /qn /norestart /x {456E4C16-227D-48E4-BA3B-52D1B15CB196}

+:: HP Theft Recovery
+start /wait msiexec /qn /norestart /x {B9A03B7B-E0FF-4FB3-BA83-762E58A1B0AA}
+start /wait msiexec /qn /norestart /x {B1CB7E99-4685-45CB-867E-2FB58EDA0A39}
+
 :: HP "Toolbox" (hidden)
 start /wait msiexec /qn /norestart /x {292F0F52-B62D-4E71-921B-89A682402201}
+
+:: HP TouchSmart Browser, Calendar, Canvas, Clock, Notes, RSS, Tutorials, Twitter and Weather
+start /wait msiexec /qn /norestart /x {4127C2C0-0AC7-4947-9CC1-AACBEFC6EC02}
+start /wait msiexec /qn /norestart /x {DE77FE3F-A33D-499A-87AD-5FC406617B40}
+start /wait msiexec /qn /norestart /x {03D15668-8F54-47C0-BFF2-6F966E4DF052}
+start /wait msiexec /qn /norestart /x {84814E6B-2581-46EC-926A-823BD1C670F6}
+start /wait msiexec /qn /norestart /x {4EDBB1CC-C418-443B-A0B0-A94DEA1ED8B2}
+start /wait msiexec /qn /norestart /x {55C48613-A2DF-4286-9467-E3BCB23CD8F4}
+start /wait msiexec /qn /norestart /x {872B1C80-38EC-4A31-A25C-980820593900}
+start /wait msiexec /qn /norestart /x {70F9BF10-3729-4333-BCBE-5218F69582FA}
+start /wait msiexec /qn /norestart /x {A535F266-291E-447F-ABE6-0BE17D0CB036}
+start /wait msiexec /qn /norestart /x {19484EF1-E27A-43D1-9EEB-685D41888AC8}
+
+:: HP Trust Circles
+start /wait msiexec /qn /norestart /x {C4E9E8A4-EEC4-4F9E-B140-520A8B75F430}
+start /wait msiexec /qn /norestart /x {0DF3F266-B52E-4309-B3CC-233607DF4E50}

 :: HP UnloadSupport (hidden)
 start /wait msiexec /qn /norestart /x {E06F04B9-45E6-4AC0-8083-85F7515F40F7}
@@ -1516,6 +1759,17 @@

 :: HP Utility Center
 start /wait msiexec /qn /norestart /x {B7B82520-8ECE-4743-BFD7-93B16C64B277}
+start /wait msiexec /qn /norestart /x {07FA4960-B038-49EB-891B-9F95930AA544}
+start /wait msiexec /qn /norestart /x {35021DFB-F9CA-402A-89A2-47F91E506465}
+
+:: HP Vision Hardware Diagnostics
+start /wait msiexec /qn /norestart /x {D7670221-BF9B-4DFF-B26B-5BE55A87329F}
+
+:: HP Wallpaper 3.0.0.1
+start /wait msiexec /qn /norestart /x {11B83AD3-7A46-4C2E-A568-9505981D4C6F}
+
+:: HP Web Camera 1.0.0
+start /wait msiexec /qn /norestart /x {C6363DC5-17A4-4E36-B701-9EC719390D48}

 :: HP WebReg
 start /wait msiexec /qn /norestart /x {179C56A4-F57F-4561-8BBF-F911D26EB435}
@@ -1524,6 +1778,8 @@
 start /wait msiexec /qn /norestart /x {29FA38B4-0AE4-4D0D-8A51-6165BB990BB0}
 start /wait msiexec /qn /norestart /x {43CDF946-F5D9-4292-B006-BA0D92013021}
 start /wait msiexec /qn /norestart /x {087A66B8-1F0F-4a8d-A649-0CFE276AA7C0}
+start /wait msiexec /qn /norestart /x {06C4BA69-5210-4707-B5BE-E26D487E1854}
+start /wait msiexec /qn /norestart /x {14CF9AF8-10A6-4FA7-9E57-D22DBD644C77}

 :: HP Wireless Assistant // Wireless Button Driver // Wireless Hotspot
 start /wait msiexec /qn /norestart /x {9AB1B6EC-AEA4-4D78-ADDB-0291BF7230F4}
@@ -1539,16 +1795,8 @@

 :: Intel(R) Identity Protection Technology
 start /wait msiexec /qn /norestart /x {C01A86F5-56E7-101F-9BC9-E3F1025EB779}
-
-:: Intel(R) Management Engine Components
-start /wait msiexec /qn /norestart /x {5D1BFBB8-4923-4388-9559-C86F5D9E2740}
-start /wait msiexec /qn /norestart /x {B434599E-E35F-4612-9803-A2FB7A8E066B}
-start /wait msiexec /qn /norestart /x {65153EA5-8B6E-43B6-857B-C6E4FC25798A}
-
-:: Intel(R) ME UninstallLegacy
-start /wait msiexec /qn /norestart /x {FD37351B-3074-4652-8188-1B3FB784EC4E}
-start /wait msiexec /qn /norestart /x {C9A90201-B2DE-44D0-A618-EF8C9060D318}
-start /wait msiexec /qn /norestart /x {ECA145AF-55D0-42BA-870F-4213F0198A46}
+start /wait msiexec /qn /norestart /x {BE77874C-0353-49DF-A5BC-36A8FE51D95E}
+start /wait msiexec /qn /norestart /x {EAF826C0-245E-4D02-9D51-BA4C98717EAE}

 :: Intel Trusted Connect Client
 start /wait msiexec /qn /norestart /x {44B72151-611E-429D-9765-9BA093D7E48A}
@@ -1560,6 +1808,26 @@
 :: Intel(R) Trusted Connect Service Client
 start /wait msiexec /qn /norestart /x {1B444AF9-1DBE-4884-8F35-969BEFCF69A8}
 start /wait msiexec /qn /norestart /x {7D84E343-A23D-451C-B123-0195B2D903A6}
+start /wait msiexec /qn /norestart /x {457D6189-416A-44CD-A0A6-D6D75AD25CCF}
+start /wait msiexec /qn /norestart /x {EB5FF09B-F44E-416D-ACEC-3AE0BE72C900}
+start /wait msiexec /qn /norestart /x {09536BA1-E498-4CC3-B834-D884A67D7E34}
+start /wait msiexec /qn /norestart /x {F27A944C-C95A-4DB7-BC8A-AEFD9B1B5E40}
+start /wait msiexec /qn /norestart /x {89AFB053-A343-46EF-97E4-D593AD7184E6}
+start /wait msiexec /qn /norestart /x {B5E49E64-0C1B-49AD-AE21-119CE68750E9}
+start /wait msiexec /qn /norestart /x {6548B189-BEA4-4041-80E0-AEB60548E046}
+start /wait msiexec /qn /norestart /x {F4404AFD-2EF3-40C1-8C09-29E5F3B6972B}
+start /wait msiexec /qn /norestart /x {3DE97849-544D-4D68-9255-11DF6F9F10D8}
+start /wait msiexec /qn /norestart /x {7AB8C73F-03FE-48AE-990C-CCB8D6C4FAB8}
+start /wait msiexec /qn /norestart /x {977D1ABF-4089-4CA7-BA33-CC75808B7ACE}
+start /wait msiexec /qn /norestart /x {44B72151-611E-429D-9765-9BA093D7E48A}
+start /wait msiexec /qn /norestart /x {1B444AF9-1DBE-4884-8F35-969BEFCF69A8}
+start /wait msiexec /qn /norestart /x {A61059F4-F902-4417-8ED2-20A29972EC40}
+start /wait msiexec /qn /norestart /x {3181229B-05DA-46F9-B8D4-4966BDA99A74}
+start /wait msiexec /qn /norestart /x {181BBF43-CA17-4E1A-A78D-81E67A57B8A4}
+start /wait msiexec /qn /norestart /x {51A66ED3-200E-4147-8D1E-E8D30936FD26}
+
+:: Intel(R) Wake on Voice 1.0.6
+start /wait msiexec /qn /norestart /x {A39CDDD2-3FB3-4C98-BDE9-E3032443417C}

 :: Intel(R) Trusted Execution Engine
 start /wait msiexec /qn /norestart /x {E14B99BA-3282-4990-8BD7-20FD584A217F}
@@ -1569,6 +1837,7 @@

 :: Intel(R) Turbo Boost Technology
 start /wait msiexec /qn /norestart /x {D6C630BF-8DBB-4042-8562-DC9A52CB6E7E}
+start /wait msiexec /qn /norestart /x {B7368FC9-A295-4A95-A9EB-AFD659BA7B71}

 :: Intel Update
 start /wait msiexec /qn /norestart /x {78091D68-706D-4893-B287-9F1DFB24F7AF}
@@ -1576,11 +1845,13 @@
 :: Intel Update Manager
 start /wait msiexec /qn /norestart /x {608E1B9B-A2E8-4A1F-8BAB-874EB0DD25E3}
 start /wait msiexec /qn /norestart /x {43FA4AC8-46F8-423F-96FD-9A7D67048F1C}
-
-:: Intel(R) Rapid Storage Technology
-start /wait msiexec /qn /norestart /x {205AE40D-8AD7-4F29-A430-DD2168DA562D}
-start /wait msiexec /qn /norestart /x {409CB30E-E457-4008-9B1A-ED1B9EA21140}
-start /wait msiexec /qn /norestart /x {3E29EE6C-963A-4aae-86C1-DC237C4A49FC}
+start /wait msiexec /qn /norestart /x {75060E95-A018-47BD-BCC5-06DE7DB2744D}
+start /wait msiexec /qn /norestart /x {0D01BDA8-C995-40AD-95F8-26B7EA4DCF9F}
+start /wait msiexec /qn /norestart /x {83F793B5-8BBF-42FD-A8A6-868CB3E2AAEA}
+start /wait msiexec /qn /norestart /x {43A76F9B-48F1-4E0D-A9B4-8E4F6C42E28C}
+
+:: Intel Viiv(TM) Software 1.7.512.0
+start /wait msiexec /qn /norestart /x {A6C48A9F-694A-4234-B3AA-62590B668927}

 :: Intel WiMAX Tutorial
 start /wait msiexec /qn /norestart /x {4F26C164-9373-4974-8F43-E0F2176AF937}
@@ -1592,10 +1863,12 @@
 :: iSEEK AnswerWorks English Runtime
 start /wait msiexec /qn /norestart /x {18A8E78B-9EF2-496E-B310-BCD8E4C1DAB3}
 start /wait msiexec /qn /norestart /x {DBCC73BA-C69A-4BF5-B4BF-F07501EE7039}
+start /wait msiexec /qn /norestart /x {FE0133FE-9AEE-4A36-9F46-749E069540D3}

 :: Java Auto Updater
 start /wait msiexec /qn /norestart /x {4A03706F-666A-4037-7777-5F2748764D10}
 start /wait msiexec /qn /norestart /x {CCB6114E-9DB9-BD54-5AA0-BC5123329C9D}
+start /wait msiexec /qn /norestart /x {32A3A4F4-B792-11D6-A78A-00B0D0170550}

 :: Kaspersky Lab Network Agent
 start /wait msiexec /qn /norestart /x {786A9F7E-CFEC-451F-B3C4-22EB11550FD8}
@@ -1603,8 +1876,16 @@
 :: Kaspersky Internet Security
 start /wait msiexec /qn /norestart /x {793B70D2-41E9-46AB-9DDC-B34C99D07DB5}

+:: KODAK Share Button App
+start /wait msiexec /qn /norestart /x {DE9B51D7-C575-4587-A848-DE95CD7F7684}
+
+:: Lenovo Idea Notes
+start /wait msiexec /qn /norestart /x {BF601122-9F0A-41A9-BA06-3158D9FB4B80}
+
 :: Lenovo Message Center Plus
 start /wait msiexec /qn /norestart /x {3849486C-FF09-4F5D-B491-3E179D58EE15}
+start /wait msiexec /qn /norestart /x {7F8205DE-DDFA-4156-ADA2-766E9CB4FABC}
+start /wait msiexec /qn /norestart /x {8C6D6116-B724-4810-8F2D-D047E6B7D68E}

 :: Lenovo Metrics Collector SDK
 start /wait msiexec /qn /norestart /x {DDAA788F-52E6-44EA-ADB8-92837B11BF26}
@@ -1620,6 +1901,13 @@

 :: Lenovo Registration
 start /wait msiexec /qn /norestart /x {6707C034-ED6B-4B6A-B21F-969B3606FBDE}
+
+:: Lenovo SimpleTap
+start /wait msiexec /qn /norestart /x {C0C17EF3-83ED-4956-8638-7354EBE7FFFF}
+start /wait msiexec /qn /norestart /x {792920BD-8D8D-4868-AE2F-16F4B05D3AE9}
+
+:: Lenovo Slim USB Keyboard
+start /wait msiexec /qn /norestart /x {2DC26D10-CC6A-494F-BEA3-B5BC21126D5E}

 :: Lenovo SMB Customizations
 start /wait msiexec /qn /norestart /x {AFD7B869-3B70-40C7-8983-769256BA3BD2}
@@ -1629,6 +1917,9 @@
 start /wait msiexec /qn /norestart /x {13BD494D-9ACD-420B-A291-E145DED92EF6}
 start /wait msiexec /qn /norestart /x {4C2B6F96-3AED-4E3F-8DCE-917863D1E6B1}
 start /wait msiexec /qn /norestart /x {1CA74803-5CB2-4C03-BDBE-061EDC81CC7F}
+start /wait msiexec /qn /norestart /x {6707C034-ED6B-4B6A-B21F-969B3606FBDE}
+start /wait msiexec /qn /norestart /x {494D80C4-3557-4D73-A153-65FE4B3ECDC3}
+start /wait msiexec /qn /norestart /x {13F59938-C595-479C-B479-F171AB9AF64F}

 :: Lenovo System Update
 start /wait msiexec /qn /norestart /x {25C64847-B900-48AD-A164-1B4F9B774650}
@@ -1637,12 +1928,23 @@

 :: Lenovo User Guide
 start /wait msiexec /qn /norestart /x {13F59938-C595-479C-B479-F171AB9AF64F}
+start /wait msiexec /qn /norestart /x {A923CF0A-44D9-4357-B2E8-0A2352151A3C}

 :: Lenovo Warranty Info
 start /wait msiexec /qn /norestart /x {FD4EC278-C1B1-4496-99ED-C0BE1B0AA521}
+start /wait msiexec /qn /norestart /x {EFC9FE7C-ECE8-4282-8F77-FEDCAD374C77}

 :: Lenovo Web Start
 if exist "%LOCALAPPDATA%\Pokki\Engine\HostAppService.exe" "%LOCALAPPDATA%\Pokki\Engine\HostAppService.exe" /UNINSTALL04bb6df446330549a2cb8d67fbd1a745025b7bd1
+
+:: Lenovo Welcome
+start /wait msiexec /qn /norestart /x {1CA74803-5CB2-4C03-BDBE-061EDC81CC7F}
+
+:: LightScribe
+start /wait msiexec /qn /norestart /x {6226477E-444F-4DFE-BA19-9F4F7D4565BC}
+start /wait msiexec /qn /norestart /x {A87B11AC-4344-4E5D-8B12-8F471A87DAD9}
+start /wait msiexec /qn /norestart /x {D755C7A3-C03E-4460-8C00-AC6E55505FB5}
+start /wait msiexec /qn /norestart /x {FA8BFB25-BF48-4F8B-8859-B30810745190}

 :: Logitech eReg
 start /wait msiexec /qn /norestart /x {3EE9BCAE-E9A9-45E5-9B1C-83A4D357E05C}
@@ -1658,6 +1960,18 @@
 start /wait msiexec /qn /norestart /x {31AF8802-BF43-4C43-984B-EC597CF51505}
 start /wait msiexec /qn /norestart /x {5A3F6A80-7913-475E-8B96-477A952CFA43}

+:: Macromedia Flash Player 7 (!!)
+start /wait msiexec /qn /norestart /x {DA7F7862-AB37-4464-B4CF-1256EC5E4B65}
+
+:: MarketResearch
+start /wait msiexec /qn /norestart /x {175F0111-2968-4935-8F70-33108C6A4DE3}
+start /wait msiexec /qn /norestart /x {13F00518-807A-4B3A-83B0-A7CD90F3A398}
+start /wait msiexec /qn /norestart /x {D2E0F0CC-6BE0-490b-B08B-9267083E34C9}
+start /wait msiexec /qn /norestart /x {b145ec69-66f5-11d8-9d75-000129760d75}
+
+:: MarketSplace Shortcuts
+start /wait msiexec /qn /norestart /x {D360FA88-17C8-4F14-B67F-13AAF9607B12}
+
 :: McAfee LiveSafe - Internet Security
 if exist %ProgramFiles(x86)%\McAfee\MSC\mcuihost.exe %ProgramFiles(x86)%\McAfee\MSC\mcuihost.exe /body:misp://MSCJsRes.dll::uninstall.html /id:uninstall
 if exist %ProgramFiles%\McAfee\MSC\mcuihost.exe %ProgramFiles%\McAfee\MSC\mcuihost.exe /body:misp://MSCJsRes.dll::uninstall.html /id:uninstall
@@ -1667,6 +1981,22 @@

 :: Microsoft Application Error Reporting
 start /wait msiexec /qn /norestart /x {95120000-00B9-0409-1000-0000000FF1CE}
+
+:: Microsoft Mouse and Keyboard Center (various versions)
+start /wait msiexec /qn /norestart /x {91150000-0051-0000-1000-0000000FF1CE}
+start /wait msiexec /qn /norestart /x {7A56D81D-6406-40E7-9184-8AC1769C4D69}
+start /wait msiexec /qn /norestart /x {B8A9EB6B-E41A-4B69-B996-3BFCFA743E5C}
+start /wait msiexec /qn /norestart /x {E20B2752-0909-4B28-B8A9-A9BE519CA1A1}
+start /wait msiexec /qn /norestart /x {22F9A831-CA56-4406-85FE-47FFB0472804}
+
+:: Microsoft Office 15 Click-to-Run Extensibility Component (various versions)
+start /wait msiexec /qn /norestart /x {90150000-008C-0000-0000-0000000FF1CE}
+start /wait msiexec /qn /norestart /x {90150000-007E-0000-1000-0000000FF1CE}
+start /wait msiexec /qn /norestart /x {D535FC73-1F63-4347-896A-C97A45F11E9C}
+start /wait msiexec /qn /norestart /x {90150000-007E-0000-0000-0000000FF1CE}
+start /wait msiexec /qn /norestart /x {90150000-008C-0409-1000-0000000FF1CE}
+start /wait msiexec /qn /norestart /x {90150000-008C-0000-1000-0000000FF1CE}
+start /wait msiexec /qn /norestart /x {90150000-008C-0409-0000-0000000FF1CE}

 :: Microsoft Office 2007 "Get Started Tab" for PowerPoint, Excel, and Word
 start /wait msiexec /qn /norestart /x {5AE5DB70-5CE6-4876-A83E-8246CC36FC28}
@@ -1697,9 +2027,24 @@
 :: 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}

+:: Modem Diagnostic Tool
+start /wait msiexec /qn /norestart /x {779DECD7-E072-4B56-9B6B-BEB5973EEEB5}
+
+:: MobileME Control Panel (deprecated Apple service)
+start /wait msiexec /qn /norestart /x {AC2BA148-EE9C-4F1A-AFCE-F38C2C71D29B}
+start /wait msiexec /qn /norestart /x {3AC54383-31D1-4907-961B-B12CBB1D0AE8}
+
 :: Network64, HP? malware?
 start /wait msiexec /qn /norestart /x {6BFAB6C1-6D46-46DB-A538-A269907C9F2F}
 start /wait msiexec /qn /norestart /x {48C0866E-57EB-444C-8371-8E4321066BC3}
+
+:: NETGEAR A6100 Genie 1.0.0.12
+start /wait msiexec /qn /norestart /x {56C049BE-79E9-4502-BEA7-9754A3E60F9B}
+
+:: Norton 360, Internet Security, Online Backup
+start /wait msiexec /qn /norestart /x {E4FC1ED9-E20C-4621-B834-03C388278DD8}
+start /wait msiexec /qn /norestart /x {63A6E9A9-A190-46D4-9430-2DB28654AFD8}
+start /wait msiexec /qn /norestart /x {7B15D70E-9449-4CFB-B9BC-798465B2BD5C}

 :: Nuance Cloud Connector
 start /wait msiexec /qn /norestart /x {EEE31B2B-F517-4BD2-8F92-57E4AE938BA3}


Fixed last commit

Fixed last commit

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

--- start.bat
+++ start.bat
@@ -0,0 +1 @@
+python launcher.py


Remove call to ssh-agent in user-profile

--- windows/cmder-config/user-profile.cmd
+++ windows/cmder-config/user-profile.cmd
@@ -2,7 +2,7 @@
 :: use  in front of the command to prevent printing the command

 :: uncomment this to have the ssh agent load when cmder starts
-call "%GIT_INSTALL_ROOT%\cmd/start-ssh-agent.cmd"
+:: call "%GIT_INSTALL_ROOT%\cmd/start-ssh-agent.cmd"

 :: uncomment this next two lines to use pageant as the ssh authentication agent
 :: SET SSH_AUTH_SOCK=\tmp/.ssh-pageant-auth-sock


add compression to other tools as well

add compression to other tools as well

--- upx_go-hana.bat
+++ upx_go-hana.bat
@@ -1,3 +1,6 @@
 @echo off
 echo "Compressing binary using UPX"
-upx -k --brute lfa1.exe ekko.exe ekpo.exe t024.exe t024e.exe tcurr.exe zstxl.exe mara.exe +exes\upx.exe -k --brute lfa1.exe ekko.exe ekpo.exe t024.exe t024e.exe tcurr.exe zstxl.exe mara.exe
+
+echo "Compressing utilities using UPX"
+exes\upx.exe -k --brute upload_gl_consol_pack_map.exe gen_code_ddf.exe dl_gl_consol_pack_map.exe dl_consolpack_rtemplate.exe


- CHG: eclipseArduino.bat: start without splash and without workspace selector

Signed-off-by: Dieter Niklaus <13cee11e5fda859ff5a615f7dc08ab74ce847c6d@gmx.net>

--- eclipseArduino.bat
+++ eclipseArduino.bat
@@ -7,4 +7,4 @@
 set ThisProjTools=%ProjectHome%\tools

 :: Run the workbench
-start %ThisProjTools%\eclipseArduino\eclipseArduinoIDE.exe %WorkspaceDir%
+start %ThisProjTools%\eclipseArduino\eclipseArduinoIDE.exe -data %WorkspaceDir% -nosplash


Fix typo in init.bat

Fix typo in init.bat

--- vendor/init.bat
+++ vendor/init.bat
@@ -121,12 +121,12 @@
 :: Make sure we have a self-extracting user-aliases.cmd file
 setlocal enabledelayedexpansion
 if not exist "%user-aliases%" (
-    echo Creating intial user-aliases store in "%user-aliases%"...
+    echo Creating initial user-aliases store in "%user-aliases%"...
     copy "%CMDER_ROOT%\vendor\user-aliases.cmd.example" "%user-aliases%"
 ) else (
     type "%user-aliases%" | findstr /i ";= Add aliases below here" >nul
     if "!errorlevel!" == "1" (
-        echo Creating intial user-aliases store in "%user-aliases%"...
+        echo Creating initial user-aliases store in "%user-aliases%"...
         copy "%CMDER_ROOT%\%user-aliases%" "%user-aliases%.old_format"
         copy "%CMDER_ROOT%\vendor\user-aliases.cmd.example" "%user-aliases%"
     )


* tools/buildbot/slaves/win32-SharpSvn/svntest-cleanup.cmd
  Also kill mspdbsrv.exe as that currently sometimes hangs
  (caused by a problem in svnsync.exe)

git-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@1426767 13f79535-47bb-0310-9956-ffa450edef68

--- tools/buildbot/slaves/win32-SharpSvn/svntest-cleanup.cmd
+++ tools/buildbot/slaves/win32-SharpSvn/svntest-cleanup.cmd
@@ -61,6 +61,7 @@
 taskkill /im op-depth-test.exe /f 2> nul:
 taskkill /im java.exe /f 2> nul:
 taskkill /im perl.exe /f 2> nul:
+taskkill /im mspdbsrv.exe /f 2> nul:
 IF EXIST "%TESTDIR%\tests\subversion\tests\cmdline\httpd\" (
   rmdir /s /q  "%TESTDIR%\tests\subversion\tests\cmdline\httpd"
 )


autoparrot - second try

autoparrot - second try

--- updater.bat
+++ updater.bat
@@ -148,7 +148,7 @@
 			)
 			(
 				ECHO:
-				ECHO:user_pref("_user-overrides.js.parrot", "Parrot successfully overridden");
+				ECHO:user_pref("_user.js.parrot", "Parrot successfully overridden");
 			)>>user.js
 		) ELSE (CALL :message "No override files found.")
 		ECHO:
@@ -163,7 +163,7 @@
 			)
 			(
 				ECHO:
-				ECHO:user_pref("_user-overrides.js.parrot", "Parrot successfully overridden");
+				ECHO:user_pref("_user.js.parrot", "Parrot successfully overridden");
 			)>>user.js
 		) ELSE (CALL :message "user-overrides.js not found.")
 		ECHO:


doc.bat modified

doc.bat modified

--- doc.bat
+++ doc.bat
@@ -1 +1 @@
-cmd /k java -jar E:/dev/js/jsdoc_toolkit-2.4.0/jsrun.jar E:/dev/js/jsdoc_toolkit-2.4.0/app/run.js src/ -r=3 -a -d=doc/ -t=doc_template/ --exclude="casual.js" --exclude="EventManager.js" --exclude="Astar.js"+java -jar E:/dev/js/jsdoc_toolkit-2.4.0/jsrun.jar E:/dev/js/jsdoc_toolkit-2.4.0/app/run.js src/ -r=3 -a -d=doc/ -t=doc_template/ --exclude="casual.js" --exclude="EventManager.js" --exclude="Astar.js"


Use asar archive.

Use asar archive.

--- build.bat
+++ build.bat
@@ -1,2 +1,2 @@
-electron-packager ./ --out=c:/KolpaqueClientElectron --platform=win32,darwin,linux --arch=x64 --icon=./icon --win32metadata.ProductName=KolpaqueClientElectron --win32metadata.InternalName=KolpaqueClientElectron --win32metadata.FileDescription=KolpaqueClientElectron --win32metadata.OriginalFilename=KolpaqueClientElectron.exe --ignore=.idea --overwrite
+electron-packager ./ --out=c:/KolpaqueClientElectron --platform=win32,darwin,linux --arch=x64 --icon=./icon --win32metadata.ProductName=KolpaqueClientElectron --win32metadata.InternalName=KolpaqueClientElectron --win32metadata.FileDescription=KolpaqueClientElectron --win32metadata.OriginalFilename=KolpaqueClientElectron.exe --ignore=.idea --overwrite --asar
 pause


fix: set echo off

fix: set echo off

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

--- build.bat
+++ build.bat
@@ -1,4 +1,4 @@
-echo on
+@echo off

 echo Fop Build System
 echo ----------------


Adjust the windows build script

Adjust the windows build script

--- build.bat
+++ build.bat
@@ -1,4 +1,5 @@
 cd src
+call "go" test ./...
 call "go" build -o alpinepass.exe
 move alpinepass.exe ../alpinepass.exe
 cd ..


run tests after copying mapnik.lib in place

--- build.bat
+++ build.bat
@@ -275,29 +275,28 @@
 :: /v:diag > build.log
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR

+:: install mapnik libs
+xcopy /i /d /s /q .\build\Release\mapnik.lib ..\mapnik-sdk\libs\ /Y
+IF %ERRORLEVEL% NEQ 0 GOTO ERROR
+xcopy /i /d /s /q .\build\Release\mapnik.dll ..\mapnik-sdk\libs\ /Y
+IF %ERRORLEVEL% NEQ 0 GOTO ERROR
+
+:: plugins
+xcopy /i /d /s /q .\build\Release\*input ..\mapnik-sdk\libs\mapnik\input\ /Y
+IF %ERRORLEVEL% NEQ 0 GOTO ERROR
+
+:: install mapnik headers
+xcopy /i /d /s /q .\deps\mapnik\sparsehash ..\mapnik-sdk\includes\mapnik\sparsehash /Y
+IF %ERRORLEVEL% NEQ 0 GOTO ERROR
+xcopy /i /d /s /q .\deps\agg\include ..\mapnik-sdk\includes\mapnik\agg /Y
+IF %ERRORLEVEL% NEQ 0 GOTO ERROR
+xcopy /i /d /s /q .\deps\clipper\include ..\mapnik-sdk\includes\mapnik\agg /Y
+IF %ERRORLEVEL% NEQ 0 GOTO ERROR
+xcopy /i /d /s /q .\include\mapnik ..\mapnik-sdk\includes\mapnik /Y
+
 :: run tests
 SET PATH=%CD%\..\mapnik-sdk\libs;%PATH%
-for %%t in (build\Release\*test.exe) do ( %%t -d %CD% )
-
-:: install mapnik libs
-xcopy /i /d /s /q .\build\Release\mapnik.lib ..\mapnik-sdk\libs\ /Y
-IF %ERRORLEVEL% NEQ 0 GOTO ERROR
-xcopy /i /d /s /q .\build\Release\mapnik.dll ..\mapnik-sdk\libs\ /Y
-IF %ERRORLEVEL% NEQ 0 GOTO ERROR
-
-:: plugins
-xcopy /i /d /s /q .\build\Release\*input ..\mapnik-sdk\libs\mapnik\input\ /Y
-IF %ERRORLEVEL% NEQ 0 GOTO ERROR
-
-:: install mapnik headers
-xcopy /i /d /s /q .\deps\mapnik\sparsehash ..\mapnik-sdk\includes\mapnik\sparsehash /Y
-IF %ERRORLEVEL% NEQ 0 GOTO ERROR
-xcopy /i /d /s /q .\deps\agg\include ..\mapnik-sdk\includes\mapnik\agg /Y
-IF %ERRORLEVEL% NEQ 0 GOTO ERROR
-xcopy /i /d /s /q .\deps\clipper\include ..\mapnik-sdk\includes\mapnik\agg /Y
-IF %ERRORLEVEL% NEQ 0 GOTO ERROR
-xcopy /i /d /s /q .\include\mapnik ..\mapnik-sdk\includes\mapnik /Y
-
+::for %%t in (build\Release\*test.exe) do ( %%t -d %CD% )

 GOTO DONE


removed build.bat

removed build.bat

--- build.bat
+++ build.bat
@@ -1 +0,0 @@
-cmake --build


add simple build and install batch script

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

--- build.bat
+++ build.bat
@@ -0,0 +1,2 @@
+python ./makeaddin.py
+start ../btm.esriaddin


no message

no message

--- build.bat
+++ build.bat
@@ -1,2 +1,2 @@
-electron-packager ./ --out=c:/KolpaqueClientElectron --platform=win32,linux,darwin --arch=ia32,x64 --icon=./icon.ico --overwrite
+electron-packager ./ --out=c:/KolpaqueClientElectron --platform=win32,darwin,linux --arch=ia32,x64 --icon=./icon --win32metadata.ProductName=KolpaqueClientElectron --win32metadata.InternalName=KolpaqueClientElectron --win32metadata.FileDescription=KolpaqueClientElectron --win32metadata.OriginalFilename=KolpaqueClientElectron.exe --ignore=.idea --overwrite
 pause


Use velocity and jdom that was copied from jakarta-site2

git-svn-id: de9d04cf23151003780adc3e4ddb7078e3680318@107714 13f79535-47bb-0310-9956-ffa450edef68

--- build.bat
+++ build.bat
@@ -5,7 +5,7 @@
 echo -------------------

 set ANT_HOME=tools
-set CLASSPATH=lib\xerces.jar
+set CLASSPATH=lib\xerces-1.4.3.jar;tools\lib\velocity-1.3-dev.jar;tools\lib\jdom-b7.jar

 %ANT_HOME%\bin\ant.bat -emacs %1 %2 %3 %4 %5 %6 %7 %8
 goto cleanup


Add support to build release binaries in the repo.

--- build.cmd
+++ build.cmd
@@ -1,6 +1,13 @@
 @echo off

 setlocal EnableDelayedExpansion
+
+for %%a IN (%*) DO (
+  if /I "%%a"=="release" set CONFIGURATION=Release
+  if /I "%%a"=="debug" set CONFIGURATION=Debug
+)
+
+if "%CONFIGURATION%" equ "" set CONFIGURATION=Debug

 REM UTC Timestamp of the last commit is used as the build number. This is for easy synchronization of build number between Windows, OSX and Linux builds.
 REM Using powershell is way easier to retrive and format the timestamp in any way we want.
@@ -17,7 +24,7 @@
 )

 :continue
-echo *** Building dotnet ***
+echo *** Building dotnet - %CONFIGURATION% ***
 call %~dp0scripts/bootstrap.cmd
 if %errorlevel% neq 0 exit /b %errorlevel%


add tools to dnu restore

add tools to dnu restore

--- build.cmd
+++ build.cmd
@@ -94,7 +94,7 @@
 :RestorePackage

 :RestoreDnuPackage
-FOR /D %%x IN ("src","Documentation","test") DO (
+FOR /D %%x IN ("src","Documentation","test","tools") DO (
 PUSHD %%x
 CMD /C dnu restore --parallel
 POPD


Add IBCMerge restore source to the restore command. (#24250)

--- build.cmd
+++ build.cmd
@@ -672,8 +672,8 @@
         )

         echo Restoring IBCMerge version !__IbcMergeVersion!...
-        echo Running: %__ProjectDir%\dotnet.cmd restore "%INIT_TOOLS_RESTORE_PROJECT%" --no-cache --packages "%__PackagesDir%" --source "%BUILDTOOLS_SOURCE%"
-        call %__ProjectDir%\dotnet.cmd restore src/.nuget/optdata/ibcmerge.csproj --no-cache --packages "%__PackagesDir%" /p:UsingToolIbcOptimization=True
+        echo Running: %__ProjectDir%\dotnet.cmd restore src/.nuget/optdata/ibcmerge.csproj --no-cache --packages "%__PackagesDir%" --source "https://devdiv.pkgs.visualstudio.com/_packaging/dotnet-core-internal-tooling/nuget/v3/index.json"
+        call %__ProjectDir%\dotnet.cmd restore src/.nuget/optdata/ibcmerge.csproj --no-cache --packages "%__PackagesDir%" --source "https://devdiv.pkgs.visualstudio.com/_packaging/dotnet-core-internal-tooling/nuget/v3/index.json"

         set IbcMergePath=%__PackagesDir%\microsoft.dotnet.ibcmerge\!__IbcMergeVersion!\tools\netcoreapp2.0\ibcmerge.dll
         if exist !IbcMergePath! (


Allow for falling back to msbuild 12 if msbuild 14 is not available (will build but not run)

--- build.cmd
+++ build.cmd
@@ -4,17 +4,26 @@

 SET CACHED_NUGET=%LocalAppData%\NuGet\NuGet.exe
 SET SOLUTION_PATH=%~dp0src\CodeFormatter.sln
-SET BUILD_TOOLS_PATH="%ProgramFiles(x86)%\MSBuild\14.0\bin\MSBuild.exe"
+SET MSBUILD14_TOOLS_PATH="%ProgramFiles(x86)%\MSBuild\14.0\bin\MSBuild.exe"
+SET MSBUILD12_TOOLS_PATH="%ProgramFiles(x86)%\MSBuild\12.0\bin\MSBuild.exe"
+SET BUILD_TOOLS_PATH=%MSBUILD14_TOOLS_PATH%

-IF NOT EXIST %BUILD_TOOLS_PATH% (
-  echo In order to build or run this tool you need either Visual Studio 2015 or
+IF NOT EXIST %MSBUILD14_TOOLS_PATH% (
+  echo In order to run this tool you need either Visual Studio 2015 or
   echo Microsoft Build Tools 2015 tools installed.
   echo.
   echo Visit this page to download either:
   echo.
   echo http://www.visualstudio.com/en-us/downloads/visual-studio-2015-downloads-vs
   echo.
-  goto :eof
+  echo Attempting to fall back to MSBuild 12 for building only
+  echo.
+  IF NOT EXIST %MSBUILD12_TOOLS_PATH% (
+    echo Could not find MSBuild 12.  Please install build tools ^(See above^)
+    exit /b 1
+  ) else (
+    set BUILD_TOOLS_PATH=%MSBUILD12_TOOLS_PATH%
+  )
 )

 IF EXIST %CACHED_NUGET% goto restore
@@ -28,4 +37,4 @@

 :build

-%BUILD_TOOLS_PATH% %SOLUTION_PATH% /p:OutDir="%~dp0bin " /nologo /m /v:m /flp:verbosity=normal %*
+%BUILD_TOOLS_PATH% %SOLUTION_PATH% /p:OutDir="%~dp0bin" /nologo /m /v:m /flp:verbosity=normal %*


Fixed windows build

Fixed windows build

--- build.cmd
+++ build.cmd
@@ -2,13 +2,13 @@

 setlocal

-set PYTHON_VER=36
+set PYTHON_VER=3.6.0
 set PYTHON_DIR=d:\python

-%PYTHON_DIR%\python%PYTHON_VER%\python.exe setup-all.win32.cx_freeze.py
+%PYTHON_DIR%\python%PYTHON_VER%_x64\python.exe setup-all.win32.cx_freeze.py
 call release.cmd x64

-%PYTHON_DIR%\python%PYTHON_VER%_32\python.exe setup-all.win32.cx_freeze.py
+%PYTHON_DIR%\python%PYTHON_VER%_x86\python.exe setup-all.win32.cx_freeze.py
 call release.cmd x86

 endlocal


build.cmd: Get boot images from the branch you're on.

--- build.cmd
+++ build.cmd
@@ -1,14 +1,19 @@
 @echo off
 setlocal
+
+: Fun syntax
+for /f %%x in ('git describe --all') do set GIT_DESCRIBE=%%x
+for /f %%y in ('git rev-parse HEAD') do set GIT_ID=%%y
+for /f %%z in ('git rev-parse --abbrev-ref HEAD') do set GIT_BRANCH=%%z

 if "%1"=="/?" (
     goto usage
 ) else if "%1"=="" (
-    set _bootimage_version=latest
+    set _bootimage_version=%GIT_BRANCH%
 ) else if "%1"=="latest" (
-    set _bootimage_version=latest
+    set _bootimage_version=%GIT_BRANCH%
 ) else if "%1"=="update" (
-    set _bootimage_version=latest
+    set _bootimage_version=%GIT_BRANCH%
 ) else if "%1"=="clean" (
     set _bootimage_version=clean
 ) else goto usage
@@ -28,11 +33,6 @@
         set _bootimage=boot.windows-x86.64.image
     ) else goto nocl
 )
-
-: Fun syntax
-for /f %%x in ('git describe --all') do set GIT_DESCRIBE=%%x
-for /f %%y in ('git rev-parse HEAD') do set GIT_ID=%%y
-for /f %%z in ('git rev-parse --abbrev-ref HEAD') do set GIT_BRANCH=%%z

 set git_label=%GIT_DESCRIBE%-%GIT_ID%
 set version=0.98


Update BuildLib 0.3.4

Update BuildLib 0.3.4

--- build.cmd
+++ build.cmd
@@ -12,10 +12,10 @@
   COPY NUL %PACKAGEPATH%FAKE\Ver_4.25.4
 )

-IF NOT EXIST %PACKAGEPATH%FAKE.BuildLib\Ver_0.3.3 (
+IF NOT EXIST %PACKAGEPATH%FAKE.BuildLib\Ver_0.3.4 (
   RD /S/Q %PACKAGEPATH%FAKE.BuildLib
-  %NUGET% install FAKE.BuildLib -Version 0.3.3 %NUGETOPTIONS%
-  COPY NUL %PACKAGEPATH%FAKE.BuildLib\Ver_0.3.3
+  %NUGET% install FAKE.BuildLib -Version 0.3.4 %NUGETOPTIONS%
+  COPY NUL %PACKAGEPATH%FAKE.BuildLib\Ver_0.3.4
 )

 set encoding=utf-8


use del not rm

use del not rm

--- vcbuild.bat
+++ vcbuild.bat
@@ -2,10 +2,10 @@
 set GDAL_DATA=C:\dev2\gdal\data
 set MAPNIK_INPUT_PLUGINS="c:\\mapnik-2.0\\lib\\mapnik\\input"
 set MAPNIK_FONTS="c:\\mapnik-2.0\\lib\\mapnik\\fonts"
-set target=Build
-set config=Release
+rd /q /s Default
+del lib\\_mapnik.node
 python gen_settings.py
-rm build.sln
+del build.sln
 python gyp/gyp build.gyp --depth=. -f msvs -G msvs_version=2010
 rem msbuild build.sln /t:%target% /p:Configuration=%config%
 msbuild build.sln


Fix issue with msbuild not being able to find the project files in vcbuild.

--- vcbuild.bat
+++ vcbuild.bat
@@ -99,6 +99,7 @@

 :do-build
 @rem Build the sln with msbuild.
+cd "%scriptroot%"
 msbuild shieldbattery.sln /m /t:%target% /p:Configuration=%config% /clp:NoSummary;NoItemAndPropertyList;Verbosity=minimal /nologo
 if errorlevel 1 goto exit
 goto link-modules


Deprecate unsuppored MSVC versions

Deprecate unsuppored MSVC versions

--- vcbuild.bat
+++ vcbuild.bat
@@ -179,14 +179,14 @@
 goto exit

 :help
-echo vcbuild.bat [debug/release] [test] [clean] [noprojgen] [nobuild] [x86/x64] [inttest] [MSVC2008/MSVC2010/MSVC2012/MSVC2013]
+echo vcbuild.bat [debug/release] [test] [clean] [noprojgen] [nobuild] [x86/x64] [inttest] [MSVC2012/MSVC2013]
 echo Examples:
 echo   vcbuild.bat                : builds release build
 echo   vcbuild.bat nobuild        : generate MSVS project files only
 echo   vcbuild.bat debug          : builds debug build
 echo   vcbuild.bat test           : builds debug build and runs tests
 echo   vcbuild.bat inttest        : include integration tests
-echo   vcbuild.bat MSVC2013       : indicate target solution's version, could also define as MSVC2008 , MSVC2010 , MSVC2012, MSVC2013
+echo   vcbuild.bat MSVC2013       : indicate target solution's version, could also define as MSVC2012, MSVC2013
 goto exit

 :exit


Now building releases with installed builds, may need updating later for Linux


Fix watch.bat to call default task

Fix watch.bat to call default task

--- watch.bat
+++ watch.bat
@@ -1 +1 @@
-grunt serve+grunt


Test watcher script for Windows

Test watcher script for Windows

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

--- watch.bat
+++ watch.bat
@@ -0,0 +1,3 @@
+rem watches, compiles & runs tests
+rem skips running any tests which have LONG in description
+ginkgo watch --skip=LONGTEST


Added 'setlocal' and '@echo off' to httpd.cmd

BUG= http://code.google.com/p/nativeclient/issues/detail?id=1642
TEST=Manually ran httpd.cmd on windows computer and verified its output

Review URL: http://codereview.chromium.org/6882100

git-svn-id: e22621a84199d42b34715cdc089545aeedbbf23f@809 050acbb0-2703-11df-ab0a-9f3f633ae91d

--- examples/httpd.cmd
+++ examples/httpd.cmd
@@ -1,3 +1,6 @@
+@echo off
+setlocal
+
 REM Relative path of CygWin
 set CYGWIN=%~dp0%..\third_party\cygwin\bin


added the vshik property to batch file used for releases.

SVN: 488784591515bd4cdaa016be4ec9b172dc4e7caf@1426

--- release-package.bat
+++ release-package.bat
@@ -1,2 +1,2 @@
 NAnt -D:project.config=release -D:sign=true clean build-with-clover test >release-with-clover.log
-NAnt -D:project.config=release -D:sign=true -D:nunit2report.installed=true clean-bin package >release-package.log+NAnt -D:project.config=release -D:sign=true -D:vshik.installed=true -D:nunit2report.installed=true clean-bin package >release-package.log


Fallback for platform variable

Fallback for platform variable

--- .appveyor/install.bat
+++ .appveyor/install.bat
@@ -14,6 +14,9 @@
 	set LJ_SHORTV=%LJ_VER:~0,3%
 	set LUA_SHORTV=5.1
 )
+
+:: unless we specify a platform on appveyor.yaml, we won't get this variable
+if not defined platform set platform=x86

 :: defines LUA_DIR so Cmake can find this Lua install
 if "%LUA%"=="luajit" (


testing install: appveyor

testing install: appveyor

--- .ci/appveyor_test.bat
+++ .ci/appveyor_test.bat
@@ -5,6 +5,8 @@
 set root=%cd%
 cd test

+set PIP=%PYTHON%\Scripts\pip
+set "PIPINSTALL=%PIP% install"
 set PYTHON=%PYTHON%\python.exe
 call %root%\test\run.bat
 set stat=%ERRORLEVEL%


[KARAF-6062]CLASSPATH error when using KARAF with JDK11 on windows

--- assemblies/features/base/src/main/filtered-resources/resources/bin/karaf.bat
+++ assemblies/features/base/src/main/filtered-resources/resources/bin/karaf.bat
@@ -229,6 +229,12 @@
     if %%j==1 (set JAVA_VERSION=%%k) else (set JAVA_VERSION=%%j)
 )

+if %JAVA_VERSION% GTR 8 (
+   pushd "%KARAF_HOME%\lib\jdk9plus"
+       for %%G in (*.jar) do call:APPEND_TO_JDK9PLUS_CLASSPATH %%G
+   popd
+)
+
 :CheckRootInstance
     set ROOT_INSTANCE_RUNNING=false
     if exist "%KARAF_HOME%\instances\instance.properties" (
@@ -419,9 +425,6 @@
         rem If major version is greater than 1 (meaning Java 9 or 10), we don't use endorsed lib but module
         rem If major version is 1 (meaning Java 1.6, 1.7, 1.8), we use endorsed lib
         if %JAVA_VERSION% GTR 8 (
-            pushd "%KARAF_HOME%\lib\jdk9plus"
-                for %%G in (*.jar) do call:APPEND_TO_JDK9PLUS_CLASSPATH %%G
-            popd
             "%JAVA%" %JAVA_OPTS% %OPTS% ^
                 --add-reads=java.xml=java.logging ^
                 --add-exports=java.base/org.apache.karaf.specs.locator=java.xml,ALL-UNNAMED ^


Adding teamcity specific .bat wrapper to run build

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

--- teamcity.bat
+++ teamcity.bat
@@ -0,0 +1 @@
+C:\WINDOWS\system32\windowspowershell\v1.0\Powershell.exe .\psake.ps1


--- src/electron/add_tap_device.bat
+++ src/electron/add_tap_device.bat
@@ -13,9 +13,18 @@
 :: limitations under the License.

 @echo off
+setlocal

 set DEVICE_NAME=outline-tap0
 set DEVICE_HWID=tap0901
+
+:: Because we've seen multiple failures due to commands (netsh, etc.) not being
+:: found, append some common directories to the PATH.
+::
+:: Note:
+::  - %SystemRoot% almost always expands to c:\windows.
+::  - Do *not* surround with quotes.
+set PATH=%PATH%;%SystemRoot%\system32;%SystemRoot%\system32\wbem;%SystemRoot%\system32\WindowsPowerShell/v1.0

 :: Check whether the device already exists.
 netsh interface show interface name=%DEVICE_NAME% >nul


Use powershell instead of bitsadmin for download genie.exe

--- scripts/build.bat
+++ scripts/build.bat
@@ -2,7 +2,8 @@

 if not exist "genie.exe" (
 	echo Downloading genie...
-	bitsadmin /transfer "genie" "https://github.com/bkaradzic/bx/raw/master/tools/bin/windows/genie.exe" "%~dp0\genie.exe"
+	rem bitsadmin /transfer "genie" "https://github.com/bkaradzic/bx/raw/master/tools/bin/windows/genie.exe" "%~dp0\genie.exe"
+	powershell Invoke-WebRequest -Uri "https://github.com/bkaradzic/bx/raw/master/tools/bin/windows/genie.exe" -OutFile "%~dp0\genie.exe"
 )

 IF "%1"=="" (


Updated appveyor environment configuration batch file to compile correctly for Python versions 3.x (64bit).

--- appveyor/run_with_env.cmd
+++ appveyor/run_with_env.cmd
@@ -6,7 +6,8 @@
 :: variables to use the MSVC 2008 C++ compilers from GRMSDKX_EN_DVD.iso of:
 :: MS Windows SDK for Windows 7 and .NET Framework 3.5 (SDK v7.0)
 ::
-:: 32 bit builds do not require specific environment configurations.
+:: 32 bit builds, and 64-bit builds for 3.5 and beyond, do not require specific
+:: environment configurations.
 ::
 :: Note: this script needs to be run with the /E:ON and /V:ON flags for the
 :: cmd interpreter, at least for (SDK v7.0)
@@ -17,31 +18,69 @@
 ::
 :: Author: Olivier Grisel
 :: License: CC0 1.0 Universal: http://creativecommons.org/publicdomain/zero/1.0/
+::
+:: Notes about batch files for Python people:
+::
+:: Quotes in values are literally part of the values:
+::      SET FOO="bar"
+:: FOO is now five characters long: " b a r "
+:: If you don't want quotes, don't include them on the right-hand side.
+::
+:: The CALL lines at the end of this file look redundant, but if you move them
+:: outside of the IF clauses, they do not run properly in the SET_SDK_64==Y
+:: case, I don't know why.
 @ECHO OFF

 SET COMMAND_TO_RUN=%*
 SET WIN_SDK_ROOT=C:\Program Files\Microsoft SDKs\Windows
+SET WIN_WDK=c:\Program Files (x86)\Windows Kits\10\Include\wdf

-SET MAJOR_PYTHON_VERSION="%PYTHON_VERSION:~0,1%"
-IF %MAJOR_PYTHON_VERSION% == "2" (
+:: Extract the major and minor versions, and allow for the minor version to be
+:: more than 9.  This requires the version number to have two dots in it.
+SET MAJOR_PYTHON_VERSION=%PYTHON_VERSION:~0,1%
+IF "%PYTHON_VERSION:~3,1%" == "." (
+    SET MINOR_PYTHON_VERSION=%PYTHON_VERSION:~2,1%
+) ELSE (
+    SET MINOR_PYTHON_VERSION=%PYTHON_VERSION:~2,2%
+)
+:: Based on the Python version, determine what SDK version to use, and whether
+:: to set the SDK for 64-bit.
+IF %MAJOR_PYTHON_VERSION% == 2 (
     SET WINDOWS_SDK_VERSION="v7.0"
-) ELSE IF %MAJOR_PYTHON_VERSION% == "3" (
-    SET WINDOWS_SDK_VERSION="v7.1"
+    SET SET_SDK_64=Y
 ) ELSE (
-    ECHO Unsupported Python version: "%MAJOR_PYTHON_VERSION%"
-    EXIT 1
+    IF %MAJOR_PYTHON_VERSION% == 3 (
+        SET WINDOWS_SDK_VERSION="v7.1"
+        IF %MINOR_PYTHON_VERSION% LEQ 4 (
+            SET SET_SDK_64=Y
+        ) ELSE (
+            SET SET_SDK_64=N
+            IF EXIST "%WIN_WDK%" (
+                :: See: https://connect.microsoft.com/VisualStudio/feedback/details/1610302/
+                REN "%WIN_WDK%" 0wdf
+            )
+        )
+    ) ELSE (
+        ECHO Unsupported Python version: "%MAJOR_PYTHON_VERSION%"
+        EXIT 1
+    )
 )
-
-IF "%PYTHON_ARCH%"=="64" (
-    ECHO Configuring Windows SDK %WINDOWS_SDK_VERSION% for Python %MAJOR_PYTHON_VERSION% on a 64 bit architecture
-    SET DISTUTILS_USE_SDK=1
-    SET MSSdk=1
-    "%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Setup\WindowsSdkVer.exe" -q -version:%WINDOWS_SDK_VERSION%
-    "%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Bin\SetEnv.cmd" /x64 /release
-    ECHO Executing: %COMMAND_TO_RUN%
-    call %COMMAND_TO_RUN% || EXIT 1
+IF %PYTHON_ARCH% == 64 (
+    IF %SET_SDK_64% == Y (
+        ECHO Configuring Windows SDK %WINDOWS_SDK_VERSION% for Python %MAJOR_PYTHON_VERSION% on a 64 bit architecture
+        SET DISTUTILS_USE_SDK=1
+        SET MSSdk=1
+        "%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Setup\WindowsSdkVer.exe" -q -version:%WINDOWS_SDK_VERSION%
+        "%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Bin\SetEnv.cmd" /x64 /release
+        ECHO Executing: %COMMAND_TO_RUN%
+        call %COMMAND_TO_RUN% || EXIT 1
+    ) ELSE (
+        ECHO Using default MSVC build environment for 64 bit architecture
+        ECHO Executing: %COMMAND_TO_RUN%
+        call %COMMAND_TO_RUN% || EXIT 1
+    )
 ) ELSE (
     ECHO Using default MSVC build environment for 32 bit architecture
     ECHO Executing: %COMMAND_TO_RUN%
     call %COMMAND_TO_RUN% || EXIT 1
-)
+)


Temporary fix while I work out the problem

--- appveyor_before_build.bat
+++ appveyor_before_build.bat
@@ -8,6 +8,6 @@
 IF NOT EXIST install md install
 IF NOT EXIST build64 md build64
 cd build64
-cmake -G "Visual Studio 15 2017 Win64" -DUSE_SDL=OFF -DSTATIC=ON -DCMAKE_INSTALL_PREFIX="..\install" ..
+cmake -G "Visual Studio 15 2017 Win64" -DUSE_SDL=OFF -DSTATIC=ON -DCOMPILE_TESTS=OFF -DCMAKE_INSTALL_PREFIX="..\install" ..
 rem NOTE: REMOVE -DUSE_SDL=OFF when I work out how to get SDL
 cd ..


Don't worry about envs

Don't worry about envs

--- pkg/windows/clean_env.bat
+++ pkg/windows/clean_env.bat
@@ -15,13 +15,6 @@
     goto eof
 )
 echo.
-
-:: Remove environment variables
-    echo %0 :: Removing Environment Variables ...
-    echo ---------------------------------------------------------------------
-    if defined PyDir (
-        reg delete "HKLM\SYSTEM\CurrentControlSet\Control\Session Manager\Environment" /F /V "PyDir"
-    )

 :CheckPython27
 if exist "\Python27" goto RemovePython27


Update mrl.bat

Update mrl.bat

kill java before launch

--- home/moz4r/mrl.bat
+++ home/moz4r/mrl.bat
@@ -1 +1,3 @@
+taskkill.exe /F /IM java.exe
+taskkill.exe /F /IM javaW.exe
 java -jar myrobotlab.jar -service python Python webGui WebGui -invoke python execFile %cd%/script.py


[win] show non-mountable disk drives

[win] show non-mountable disk drives

--- scripts/win32.bat
+++ scripts/win32.bat
@@ -29,6 +29,7 @@

 For Each objDrive In colDiskDrives
     strDeviceID = Replace(objDrive.DeviceID, "\", "\\")
+    foundLDs = 0
     Set colPartitions = objWMIService.ExecQuery _
         ("ASSOCIATORS OF {Win32_DiskDrive.DeviceID=""" & _
             strDeviceID & """} WHERE AssocClass = " & _
@@ -39,6 +40,7 @@
                 objPartition.DeviceID & """} WHERE AssocClass = " & _
                     "Win32_LogicalDiskToPartition")
         For Each objLogicalDisk In colLogicalDisks
+            foundLDs = foundLDs + 1
             Wscript.Echo "device: """ & Replace(objDrive.DeviceID, "\", "\\") & """"
             Wscript.Echo "description: """ & objDrive.Caption & """"
             Wscript.Echo "size: " & objDrive.Size
@@ -54,5 +56,14 @@
             Wscript.Echo ""
         Next
     Next
+    If foundLDs = 0 Then
+      Wscript.Echo "device: """ & Replace(objDrive.DeviceID, "\", "\\") & """"
+      Wscript.Echo "description: """ & objDrive.Caption & """"
+      Wscript.Echo "size: " & objDrive.Size
+      Wscript.Echo "mountpoint: Null"
+      Wscript.Echo "name: Null"
+      Wscript.Echo "system: False"
+      Wscript.Echo ""
+    End If
 Next
 </script></job>


add win run.cmd

add win run.cmd

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

--- test/run.cmd
+++ test/run.cmd
@@ -0,0 +1,3 @@
+@echo off
+set root=%~dp0%
+%root%..\node_modules\.bin\mocha  %root%ut --recursive -R spec


Enable tests when link qt5-staick

Enable tests when link qt5-staick

--- contrib/appveyor-msys2-qt5-static.bat
+++ contrib/appveyor-msys2-qt5-static.bat
@@ -44,6 +44,6 @@
 cmake -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=Release -DUSE_STATIC_QT=1 ^
 -DCMAKE_PREFIX_PATH=%QTDIR% -DCMAKE_INSTALL_PREFIX=../INSTALL ..
 cmake --build . --target install
+ctest -VV
 strip ..\INSTALL\bin\nvim-qt.exe

-rem ctest -VV


Update developer_install.bat

Update developer_install.bat

--- doc/developer/developer_install.bat
+++ doc/developer/developer_install.bat
@@ -1,5 +1,3 @@
-setlocal EnableDelayedExpansion
-
 echo OFF

 where curl
@@ -24,8 +22,6 @@
 call user_install.bat
 if errorlevel 1 exit 1
 if "%CLEAN_INSTALL%"=="1" del user_install.bat
-echo ON
-echo !PATH!

 python -c "import conda_build" >nul 2>nul
 if errorlevel 1 (
@@ -40,24 +36,24 @@
     conda update -n root anaconda-client -y
 )

-if "%ENVIRONMENT%"== "" (
-    conda env update statiskit/statiskit-dev
-    if errorlevel 1 (
-        echo "Installation of the development environment failed."
-        echo "Developer configuration failed."
-        exit 1
-    ) else (
-        echo "Developer configuration succeded."
-    )
-) else (
-    conda env update statiskit/statiskit-dev -n %ENVIRONMENT%
-    if errorlevel 1 (
-        echo "Installation of the development environment failed."
-        echo "Developer configuration failed."
-        exit 1
-    ) else (
-        echo "Developer configuration succeded."
-    )
-)
+:: if "%ENVIRONMENT%"== "" (
+::     conda env update statiskit/statiskit-dev
+::     if errorlevel 1 (
+::         echo "Installation of the development environment failed."
+::         echo "Developer configuration failed."
+::         exit 1
+::     ) else (
+::         echo "Developer configuration succeded."
+::     )
+:: ) else (
+::     conda env update statiskit/statiskit-dev -n %ENVIRONMENT%
+::     if errorlevel 1 (
+::         echo "Installation of the development environment failed."
+::         echo "Developer configuration failed."
+::         exit 1
+::     ) else (
+::         echo "Developer configuration succeded."
+::     )
+:: )

 echo OFF


msis -> msi

msis -> msi

--- install_python.bat
+++ install_python.bat
@@ -3,8 +3,8 @@
 if not exist installers\python\modules (
     mkdir installers\python\modules
 )
-if not exist installers\python\msis (
-    mkdir installers\python\msis
+if not exist installers\python\msi (
+    mkdir installers\python\msi
 )

 :: get python installers
@@ -25,13 +25,14 @@
 echo Downloading get-pip.py
 curl --silent -o installers\python\modules\get-pip.py https://bootstrap.pypa.io/get-pip.py

+
 :download_python
     if not "%~1" == "" (
         set PYTHON_VERSION=%~1
         echo Downloading Python %PYTHON_VERSION% 32-bit
-        curl --silent -C - -o installers\python\msis\python-%PYTHON_VERSION%-x86.msi https://www.python.org/ftp/python/%PYTHON_VERSION%/python-%PYTHON_VERSION%.msi
+        curl --silent -C - -o installers\python\msi\python-%PYTHON_VERSION%-x86.msi https://www.python.org/ftp/python/%PYTHON_VERSION%/python-%PYTHON_VERSION%.msi
         echo Downloading Python %PYTHON_VERSION% 64-bit
-        curl --silent -C - -o installers\python\msis\python-%PYTHON_VERSION%-x64.msi https://www.python.org/ftp/python/%PYTHON_VERSION%/python-%PYTHON_VERSION%.amd64.msi
+        curl --silent -C - -o installers\python\msi\python-%PYTHON_VERSION%-x64.msi https://www.python.org/ftp/python/%PYTHON_VERSION%/python-%PYTHON_VERSION%.amd64.msi
     )
 goto :eof


minor: Change runprebuild2012.bat to say it is creating vs2010 files and not vs2012


Allow reusing "set_compiler" command.

Allow reusing "set_compiler" command.

--- platform/set_pycompiler.bat
+++ platform/set_pycompiler.bat
@@ -9,12 +9,15 @@
 set COMPILER=%2

 REM Create "distutils.cfg"
-echo [build]>> "%PYTHON_DIR%\Lib\distutils\distutils.cfg"
-echo compiler=%COMPILER%>> "%PYTHON_DIR%\Lib\distutils\distutils.cfg"
-
+set DISTUTILS=%PYTHON_DIR%\Lib\distutils\distutils.cfg
+if exist "%DISTUTILS%" del "%DISTUTILS%" /Q /S
+echo [build]>> "%DISTUTILS%"
+echo compiler=%COMPILER%>> "%DISTUTILS%"
+echo patched file "%DISTUTILS%"
 REM Apply the patch of "cygwinccompiler.py".
 REM Unix "patch" command of Msys.
-patch "%PYTHON_DIR%\lib\distutils\cygwinccompiler.py" "%HERE%patch.diff"
+patch -N "%PYTHON_DIR%\lib\distutils\cygwinccompiler.py" "%HERE%\patch.diff"

 REM Copy "vcruntime140.dll" to "libs".
 copy "%PYTHON_DIR%\vcruntime140.dll" "%PYTHON_DIR%\libs"
+echo copied "vcruntime140.dll".


ask user for device number

ask user for device number

--- Android_Setup_Win.bat
+++ Android_Setup_Win.bat
@@ -22,6 +22,8 @@
 	exit
 )

+set /p id="Enter device number: " %=%
+(echo ##### Device number: %id% & echo. ) >> "log_%timestamp%.txt" 2>&1
 echo.
 echo.
 echo.


Added architecture to compiled file name

--- util/win/build.bat
+++ util/win/build.bat
@@ -29,8 +29,8 @@
 if %errorlevel% neq 0 exit /b %errorlevel%
 copy /Y %SELF_PATH%\..\..\translation\*.qm dist\share\qtcreator\translations

-if exist %PLUGIN_NAME%-%VERSION%-win.zip del /Q %PLUGIN_NAME%-%VERSION%-win.zip
+if exist %PLUGIN_NAME%-%VERSION%-win-%ARCH%.zip del /Q %PLUGIN_NAME%-%VERSION%-win-%ARCH%.zip
 cd dist
-7z a ..\%PLUGIN_NAME%-%VERSION%-win.zip *
+7z a ..\%PLUGIN_NAME%-%VERSION%-win-%ARCH%.zip *
 cd ..


valgrind-instrumented R-devel working

valgrind-instrumented R-devel working

--- CRAN_Release.cmd
+++ CRAN_Release.cmd
@@ -201,21 +201,24 @@

 ###############################################
-#  valgrind (see R-exts$4.3.2)
-###############################################
-
-cd ~/build/R-devel
-make clean
+#  valgrind in R-devel (see R-exts$4.3.2)
+###############################################
+
+cd ~/build
+rm -rf R-devel    # easiest way to remove ASAN from compiled packages in R-devel/library
+                  # to avoid "ASan runtime does not come first in initial library list" error; no need for LD_PRELOAD
+tar xvf R-devel.tar.gz
+cd R-devel
 ./configure --without-recommended-packages --disable-byte-compiled-packages --disable-openmp --with-valgrind-instrumentation=1 CC="gcc" CFLAGS="-O0 -g -Wall -pedantic" LIBS="-lpthread"
 make
 cd ~/GitHub/data.table
 vi ~/.R/Makevars  # make the -O0 -g line active, for info on source lines with any problems
 Rdevel CMD INSTALL data.table_1.11.1.tar.gz
-export LD_PRELOAD=/usr/lib/gcc/x86_64-linux-gnu/7/libasan.so
 Rdevel -d "valgrind --tool=memcheck --leak-check=full --track-origins=yes --show-leak-kinds=definite"
 # gctorture(TRUE)      # very slow, many days
 # gctorture2(step=100)
 print(Sys.time()); require(data.table); print(Sys.time()); started.at<-proc.time(); try(test.data.table()); print(Sys.time()); print(timetaken(started.at))
+# 3m require; 62m test

 # Investigated and ignore :
 # Tests 648 and 1262 (see their comments) have single precision issues under valgrind that don't occur on CRAN, even Solaris.


Fix issue 9844 by adressing additional review comments

Comments by Peter here should fix it:
https://codereview.chromium.org/13812019/
Review URL: https://codereview.chromium.org//14222009

git-svn-id: c93d8a2297af3b929165606efe145742a534bc71@21331 260f80e4-7a28-3924-810f-c04153c831b5

--- sdk/bin/dart2js.bat
+++ sdk/bin/dart2js.bat
@@ -27,7 +27,7 @@

 if exist "%SNAPSHOT%" (
   echo Using snapshot "%SNAPSHOT%" >&2
-  set EXTRA_OPTIONS=%EXTRA_OPTIONS% --library-root=%SDK_DIR%
+  set EXTRA_OPTIONS=%EXTRA_OPTIONS% --library-root="%SDK_DIR%"
 )

 rem See comments regarding options below in dart2js shell script.