add build.cmd

add build.cmd

--- build.cmd
+++ build.cmd
@@ -0,0 +1,28 @@
+@echo off
+
+:: Check prerequisites
+set _msbuildexe="%ProgramFiles(x86)%\MSBuild\12.0\Bin\MSBuild.exe"
+if not exist %_msbuildexe% set _msbuildexe="%ProgramFiles%\MSBuild\12.0\Bin\MSBuild.exe"
+if not exist %_msbuildexe% set _msbuildexe="%ProgramFiles(x86)%\MSBuild\14.0\Bin\MSBuild.exe"
+if not exist %_msbuildexe% set _msbuildexe="%ProgramFiles%\MSBuild\14.0\Bin\MSBuild.exe"
+if not exist %_msbuildexe% echo Error: Could not find MSBuild.exe.  Please see http://www.microsoft.com/en-us/download/details.aspx?id=40760. && goto :eof
+
+set _gacutilexe="%ProgramFiles(x86)%\Microsoft SDKs\Windows\v8.1A\bin\NETFX 4.5.1 Tools\gacutil.exe"
+if not exist %_gacutilexe% echo Error: Could not find gacutil.exe.  && goto :eof
+
+::Build
+%_gacutilexe%  /i lkg\FSharp-2.0.50726.900\bin\FSharp.Core.dll
+%_msbuildexe% src\fsharp-proto-build.proj
+ngen install lib\proto\fsc-proto.exe
+%_msbuildexe% src/fsharp-library-build.proj
+%_msbuildexe% src/fsharp-compiler-build.proj
+%_msbuildexe% src/fsharp-library-build.proj /p:TargetFramework=net20
+%_msbuildexe% src/fsharp-library-build.proj /p:TargetFramework=portable47
+%_msbuildexe% src/fsharp-library-build.proj /p:TargetFramework=portable7
+%_msbuildexe% src/fsharp-library-build.proj /p:TargetFramework=portable78
+%_msbuildexe% src/fsharp-library-unittests-build.proj
+%_msbuildexe% src/fsharp-library-unittests-build.proj /p:TargetFramework=portable47
+%_msbuildexe% src/fsharp-library-unittests-build.proj /p:TargetFramework=portable7
+%_msbuildexe% src/fsharp-library-unittests-build.proj /p:TargetFramework=portable78
+src\update.cmd debug -ngen
+tests\BuildTestTools.cmd debug


Force build before generating docs

Force build before generating docs

--- build.cmd
+++ build.cmd
@@ -9,13 +9,14 @@
 for %%i in (dotnet.exe) do set dotnet=%%~dpnx$PATH:i
 if "%dotnet%"=="" goto :nodotnet
 if "%1"=="docs" shift & goto :docs
+:build
 dotnet --info ^
   && dotnet restore ^
   && for %%i in (debug release) do call msbuild.cmd "MoreLinq.sln" /v:m /p:Configuration=%%i %* || exit /b 1
 goto :EOF

 :docs
-call msbuild.cmd MoreLinq.shfbproj %1 %2 %3 %4 %5 %6 %7 %8 %9
+call :build && call msbuild.cmd MoreLinq.shfbproj %1 %2 %3 %4 %5 %6 %7 %8 %9
 goto :EOF

 :nodotnet


Added as a shorthand

Added as a shorthand

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

--- build.cmd
+++ build.cmd
@@ -0,0 +1,4 @@
+@ECHO OFF
+CALL npm install
+CALL grunt
+pause


Better factoring

Better factoring

--- build.cmd
+++ build.cmd
@@ -5,21 +5,17 @@

 if "%1" == "x64" (
   set ARCHITECTURE=x64
+  set GENERATOR=Visual Studio 11 2012 Win64
 ) else if "%1" == "x86" (
   set ARCHITECTURE=x86
+  set GENERATOR=Visual Studio 11 2012
 ) else (
   echo Usage: build x86^|x64 [zip]
   exit /b 1
 )

-if "%ARCHITECTURE%" == "x64" (
-  cmake -G "Visual Studio 11 2012 Win64" %SOURCE_DIR%
-) else (
-  cmake -G "Visual Studio 11 2012" %SOURCE_DIR%
-)
-
+cmake -G "%GENERATOR%" "%SOURCE_DIR%"
 cmake --build . --config Release --target ALL_BUILD --target test
-
 copy Release\BFArchive.exe .

 if "%2" == "zip" (


Fix Windows 'linuxmscorlib arm' build

Fix Windows 'linuxmscorlib arm' build

--- build.cmd
+++ build.cmd
@@ -170,7 +170,7 @@

 if %__BuildArchX64%==1      set __BuildArch=x64
 if %__BuildArchX86%==1      set __BuildArch=x86
-if %__BuildArchArm%==1      set __BuildArch=arm
+if %__BuildArchArm%==1      set __BuildArch=arm
 if %__BuildArchArm64%==1 (
     set __BuildArch=arm64
     set __CrossArch=x64


Nuget creation script: Added publishing function. Added timer. Added help. Updated log messages

--- newCreateNuget.bat
+++ newCreateNuget.bat
@@ -49,6 +49,8 @@
 ::helpers
 SET failure=0
 SET ortcAvailable=0
+SET startTime=0
+SET endingTime=0

 ::targets
 SET generate_Ortc_Nuget=0
@@ -56,9 +58,9 @@

 ::input arguments
 SET supportedInputArguments=;target;version;key;beta;destination;publish;help;logLevel;
-SET target=all
+SET target=""
 SET version=1.0.0
-SET key=
+SET key=""
 SET beta=1
 SET destination=d:\myNugetPackages
 SET publish=0
@@ -81,9 +83,7 @@
 SET debug=3
 SET trace=4

-ECHO.
-CALL:print %info% "Started creating nuget packages ..."
-ECHO.
+IF "%1"=="" SET help=1

 :parseInputArguments
 IF "%1"=="" (
@@ -114,7 +114,13 @@

 :main

-::CALL:showHelp
+CALL:showHelp
+
+SET startTime=%time%
+
+ECHO.
+CALL:print %info% "Started creating nuget packages ..."
+ECHO.

 CALL:checkOrtcAvailability

@@ -123,6 +129,8 @@
 CALL:downloadNuget

 CALL:generateNugetPackages
+
+IF %publish% EQU 1 CALL:publishNuget

 GOTO:DONE

@@ -135,6 +143,8 @@
 CALL:print %trace% "Identifying build targets"
 SET validInput=0
 SET messageText=
+
+IF "%target%"=="" CALL:error 1 "Target has to be specified. Available targets are Ortc and WebRtc."

 IF /I "%target%"=="all" (
 	SET generate_Ortc_Nuget=%ortcAvailable%
@@ -165,7 +175,7 @@
 IF !validInput!==1 (
 	CALL:print %warning% "!messageText!"
 ) ELSE (
-	CALL:error 1 %errorMessageInvalidTarget%
+	CALL:error 1 "Invalid target name provided. Available targets are Ortc and WebRtc."
 )
 GOTO:EOF

@@ -239,11 +249,11 @@
 IF ERRORLEVEL 1 CALL:error 1 "Building %~2 project for %PLATFORM% %CONFIGURATION% has failed"

 CALL:print %warning% "Building %~2 for %PLATFORM%"
-CALL:print %trace% "Solution: %~1"
-CALL:print %trace% "Project: %~2"
-CALL:print %trace% "Compiler option: %~3"
-CALL:print %trace% "CONFIGURATION: %CONFIGURATION%"
-pause
+CALL:print %debug% "Solution: %~1"
+CALL:print %debug% "Project: %~2"
+CALL:print %debug% "Compiler option: %~3"
+CALL:print %debug% "CONFIGURATION: %CONFIGURATION%"
+
 IF %logLevel% GEQ %trace% (
 	MSBuild %~1 /t:%~2 /property:Configuration=%CONFIGURATION% /property:Platform=%~3 /nodeReuse:False
 ) ELSE (
@@ -270,7 +280,8 @@
 GOTO:EOF

 :preparePackage
-CALL:print %trace% "Creating a package ..."
+CALL:print %debug% "Creating a package ..."
+
 SET nugetTargetPath=""
 SET nugetSpecPath=""
 SET nugetBasePath=""
@@ -296,8 +307,8 @@
 SET nugetSpecPath=%nugetBasePath%\%projectName%.nuspec
 SET nugetPackageVersion=%nugetBasePath%\%projectName%.version
 SET nugetPath=%nugetBasePath%\package
-SET nugetOutputPath=%nugetBasePath%\..\NugetOutput\%nugetName%
-	echo determine
+SET nugetOutputPath=%nugetBasePath%\..\NugetOutput
+
 CALL:determineNugetVersion

 SET nugetBuildPath=%nugetPath%\%nugetName%\build
@@ -331,6 +342,46 @@
 SET sourcexARMWinmdPath=%sourcexARMPath%\%projectNameForNuget%.winmd
 SET sourcexARMPdbPath=%sourcexARMPath%\%projectNameForNuget%.pdb
 SET nugetSpec=%nugetPath%\%nugetName%\%projectNameForNuget%.nuspec
+
+CALL:print %debug% "nugetTargetPath: !nugetTargetPath!"
+CALL:print %debug% "nugetSpecPath: !nugetSpecPath!"
+CALL:print %debug% "nugetPackageVersion: !nugetPackageVersion!"
+CALL:print %debug% "nugetPath: !nugetPath!"
+CALL:print %debug% "nugetOutputPath: !nugetOutputPath!"
+
+CALL:print %debug% "nugetBuildPath: !nugetBuildPath!"
+CALL:print %debug% "nugetBuildNativePath: !nugetBuildNativePath!"
+CALL:print %debug% "nugetBuildNetCorePath: !nugetBuildNetCorePath!"
+CALL:print %debug% "nugetBuildNetCorex86Path: !nugetBuildNetCorex86Path!"
+CALL:print %debug% "nugetBuildNetCorex64Path: !nugetBuildNetCorex64Path!"
+CALL:print %debug% "nugetBuildNetCoreARMPath: !nugetBuildNetCoreARMPath!"
+
+CALL:print %debug% "nugetLibPath: !nugetLibPath!"
+CALL:print %debug% "nugetLibNetCorePath: !nugetLibNetCorePath!"
+CALL:print %debug% "nugetLibUAPPath: !nugetLibUAPPath!"
+
+CALL:print %debug% "nugetRuntimesPath: !nugetRuntimesPath!"
+CALL:print %debug% "nugetRuntimesx86Path: !nugetRuntimesx86Path!"
+CALL:print %debug% "nugetRuntimesx64Path: !nugetRuntimesx64Path!"
+CALL:print %debug% "nugetRuntimesARMPath: !nugetRuntimesARMPath!"
+
+CALL:print %debug% "sourcex86Path: !sourcex86Path!"
+CALL:print %debug% "sourcex86DllPath: !sourcex86DllPath!"
+CALL:print %debug% "sourcex86WinmdPath: !sourcex86WinmdPath!"
+CALL:print %debug% "sourcex86PdbPath: !sourcex86PdbPath!"
+
+CALL:print %debug% "sourcex64Path: !sourcex64Path!"
+CALL:print %debug% "sourcex64DllPath: !sourcex64DllPath!"
+CALL:print %debug% "sourcex64WinmdPath: !sourcex64WinmdPath!"
+CALL:print %debug% "sourcex64PdbPath: !sourcex64PdbPath!"
+
+CALL:print %debug% "sourcexARMPath: !sourcexARMPath!"
+CALL:print %debug% "sourcexARMDllPath: !sourcexARMDllPath!"
+CALL:print %debug% "sourcexARMWinmdPath: !sourcexARMWinmdPath!"
+CALL:print %debug% "sourcexARMPdbPath: !sourcexARMPdbPath!"
+
+CALL:print %debug% "nugetSpec: !nugetSpec!"
+
 RMDIR /s /q %nugetPath%\%nugetName%\

 CALL:createFolder %nugetPath%\%nugetName%
@@ -410,12 +461,9 @@

 :makeNuget

-IF EXIST %nugetOutputPath%\%nugetName%\ (
-	RMDIR /s /q %nugetOutputPath%\%nugetName%\
-)
-CALL:createFolder %nugetOutputPath%\%nugetName%
-
-%nuget% pack %nugetSpec% -OutputDirectory %nugetOutputPath%\%nugetName%
+CALL:createFolder %nugetOutputPath%
+CALL:print %warning% "Packing a nuget package"
+%nuget% pack %nugetSpec% -OutputDirectory %nugetOutputPath%
 IF ERRORLEVEL 1 CALL:error 1 "Failed creating the %nugetName% nuget package"

 IF EXIST %nugetPath% (
@@ -425,6 +473,7 @@
 GOTO:EOF

 :setNugetApiKey
+CALL:print %warning% "Setting nuget key"
 %nuget% setapikey %publishKey%
 if ERRORLEVEL 1 CALL:error 0 "Failed creating the %nugetName% nuget package"
 GOTO:EOF
@@ -434,9 +483,11 @@

 IF %platform% EQU 1 (
 	IF NOT "%destination%"=="" (
-		%nuget% push %nugetOutputPath%\%nugetName%\%nugetName%.%nugetVersion%.nupkg -s %destination%
+		CALL:print %debug% "Nuget package will be pushed to %destination%"
+		%nuget% push %nugetOutputPath%\%nugetName%.%nugetVersion%.nupkg -s %destination%
 	) ELSE (
-		%nuget% push %nugetOutputPath%\%nugetName%\%nugetName%.%nugetVersion%.nupkg
+		CALL:print %debug% "Nuget package will be pushed to default location"
+		%nuget% push %nugetOutputPath%\%nugetName%.%nugetVersion%.nupkg
 	)
 )
 IF ERRORLEVEL 1 CALL:error 1 "Failed publishing the %nugetName% nuget package"
@@ -448,7 +499,7 @@
 	SET /p version=< %nugetPackageVersion%
 )

-ECHO Current Nuget Version is !version!
+CALL:print %debug% "Current Nuget Version is !version!"
 FOR /f "tokens=1-3 delims=." %%a IN ("!version!") DO (
   SET /a build=%%c+1
   SET version=%%a.%%b.!build!
@@ -460,13 +511,13 @@
 	SET nugetVersion=!version!
 )

-ECHO New Nuget Version is !nugetVersion!
+CALL:print %warning%  "New Nuget Version is !nugetVersion!"
 GOTO:EOF

 :copyFiles
 IF EXIST %1 (
 	CALL:createFolder %2
-	ECHO Copying %1 to %2
+	CALL:print %debug% "Copying %1 to %2"
 	COPY %1 %2
 	IF ERRORLEVEL 1 CALL:error 1 "Could not copy a %1"
 ) else (
@@ -476,45 +527,55 @@

 :createFolder
 IF NOT EXIST %1 (
+	CALL:print %trace% "Creating folder %1"
 	MKDIR %1
 	IF ERRORLEVEL 1 CALL:error 1 "Could not make a directory %1"
 )
 GOTO:EOF

 :showHelp
-IF NOT %help% EQU 0 GOTO:EOF
-
-echo Available commands:
-echo.
-echo -b 	Flag for creating prerelase nuget package.
-echo.
-echo -k	Api key that is used for publishing nuget package on nuget.org. This is used in combination with
-echo		publish flag -p. This will store your API key so that you never need to do this step again on this machine.
-echo.
-echo -h 	Show script usage
-echo.
-echo -p	Publish created nuget package. By default it will be uploaded on nuget.org server. If it is
-echo		desired to publish it locally or on some another server, it sholud be used option -s to specify
-echo		destination server
-echo.
-echo -s	Used for specifying nuget server where package will be published
-echo.
-echo -t	Flag that initiates setting up test environment for newly published nuget package
-echo.
-echo -v	Nuget package version number
-echo.
-echo Generated nuget package will be stored in winrt\NugetOutput\org.ortc.Adapter
-echo Examples:
-echo.
-echo Creating nuget package with version number 1.0.1
-echo bin\createNuget.bat
-echo.
-echo Creating prerelase nuget package with version number 1.0.1-Beta
-echo bin\createNuget.bat -b
-echo.
-echo Creating prerelase nuget package and publish it to locally nuget storage
-echo bin\createNuget.bat -b -p -s [path to local nuget storage]
-echo.
+IF %help% EQU 0 GOTO:EOF
+
+ECHO.
+ECHO    Available parameters:
+ECHO.
+ECHO  	-beta 		Flag for creating prerelase nuget package.
+ECHO.
+ECHO 	-key		Api key that is used for publishing nuget package on nuget.org. This is used in combination with
+ECHO		publish flag -publish. This will store your API key so that you never need to do this step again on this machine.
+ECHO.
+ECHO 	-help 		Show script usage
+ECHO.
+ECHO 	-logLevel	Log level (error, info, warning, debug, trace)
+ECHO.
+ECHO 	-publish	Publish created nuget package. By default it will be uploaded on nuget.org server. If it is
+ECHO		desired to publish it locally or on some another server, it sholud be used option -destination to specify
+ECHO		destination server
+ECHO.
+ECHO 	-destination	Used for specifying nuget server where package will be published. Default destination is nuget.org
+ECHO.
+ECHO 	-target		Name of the target to generate nuget package. Ortc or WebRtc.
+ECHO.
+ECHO 	-version	Nuget package version number. If this parameter is not passed it will be used incremented previous version number
+ECHO.
+ECHO    Generated nuget package will be stored in ortc\windows\NugetOutput\ for Ortc and in webrtc\windows\NugetOutput\ for WebRtc.
+ECHO.
+ECHO    Examples:
+ECHO.
+ECHO   Creating Ortc nuget package with automated versioning and storing in ortc\windows\NugetOutput\ without publishing it.
+ECHO    bin\createNuget.bat -target Ortc
+ECHO.
+ECHO   Creating WebRtc prerelase nuget package with version number 1.0.1-Beta
+ECHO    bin\createNuget.bat -beta -target WebRtc -version 1.0.1
+ECHO.
+ECHO   Creating prerelase Ortc nuget package and publish it to locally nuget storage
+ECHO    bin\createNuget.bat -target Ortc -beta -publish -destination [path to local nuget storage]
+ECHO.
+ECHO.
+ECHO   Creating prerelase WebRtc nuget package and publish it to nuget.org
+ECHO    bin\createNuget.bat -target WebRtc -beta -publish -key [nuget.org api key]
+ECHO.
+CALL bin\batchTerminator.bat

 GOTO:EOF

@@ -523,12 +584,12 @@
 SET logType=%1
 SET logMessage=%~2

-if %logLevel% GEQ  %logType% (
-	if %logType%==0 ECHO %logMessage%
-	if %logType%==1 ECHO %logMessage%
-	if %logType%==2 ECHO %logMessage%
-	if %logType%==3 ECHO %logMessage%
-	if %logType%==4 ECHO %logMessage%
+IF %logLevel% GEQ  %logType% (
+	IF %logType%==0 ECHO %logMessage%
+	IF %logType%==1 ECHO %logMessage%
+	IF %logType%==2 ECHO %logMessage%
+	IF %logType%==3 ECHO %logMessage%
+	IF %logType%==4 ECHO %logMessage%
 )

 GOTO:EOF
@@ -546,27 +607,53 @@

 IF %criticalError%==0 (
 	ECHO.
-	ECHO "WARNING: %errorMessage%"
+	CALL:print %warning% "WARNING: %errorMessage%"
 	ECHO.
 ) ELSE (
 	ECHO.
-	ECHO "CRITICAL ERROR: %errorMessage%"
+	CALL:print %error% "CRITICAL ERROR: %errorMessage%"
 	ECHO.
 	ECHO.
-	ECHO "FAILURE: Creating nuget package has failed!"
+	CALL:print %error% "FAILURE: Creating nuget package has failed!"
 	ECHO.
 	CALL:cleanup
+	SET endTime=%time%
+	CALL:showTime
 	::terminate batch execution
 	CALL bin\batchTerminator.bat
 )
 GOTO:EOF

+:showTime
+
+SET options="tokens=1-4 delims=:.,"
+FOR /f %options% %%a in ("%startTime%") do SET start_h=%%a&SET /a start_m=100%%b %% 100&SET /a start_s=100%%c %% 100&SET /a start_ms=100%%d %% 100
+FOR /f %options% %%a in ("%endTime%") do SET end_h=%%a&SET /a end_m=100%%b %% 100&SET /a end_s=100%%c %% 100&SET /a end_ms=100%%d %% 100
+
+SET /a hours=%end_h%-%start_h%
+SET /a mins=%end_m%-%start_m%
+SET /a secs=%end_s%-%start_s%
+SET /a ms=%end_ms%-%start_ms%
+IF %ms% lss 0 SET /a secs = %secs% - 1 & SET /a ms = 100%ms%
+IF %secs% lss 0 SET /a mins = %mins% - 1 & SET /a secs = 60%secs%
+IF %mins% lss 0 SET /a hours = %hours% - 1 & SET /a mins = 60%mins%
+IF %hours% lss 0 SET /a hours = 24%hours%
+IF 1%ms% lss 100 SET ms=0%ms%
+
+:: mission accomplished
+SET /a totalsecs = %hours%*3600 + %mins%*60 + %secs%
+ECHO Total execution time: %hours%:%mins%:%secs%.%ms% (%totalsecs%.%ms%s total)
+
+GOTO:EOF
+
 :done
 CALL:cleanup
-echo %version%
-echo %nugetPackageVersion%
-echo %version%>%nugetPackageVersion%
-echo.
-echo Success:  Nuget package is created.
-echo.
+ECHO %version%
+ECHO %nugetPackageVersion%
+ECHO %version%>%nugetPackageVersion%
+ECHO.
+ECHO Success:  Nuget package is created.
+ECHO.
+SET endTime=%time%
+CALL:showTime
 :end


commands

commands

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

--- cmds.bat
+++ cmds.bat
@@ -0,0 +1,62 @@
+@echo off
+cls
+:start
+echo ------------------
+echo u. update code
+echo c. clean target
+echo p. create package
+echo s. build site
+echo d. deploy
+echo r. release
+echo w. clear window
+echo q. quit
+echo ------------------
+CHOICE /N /C:ucpsdwrq
+set nr=%ERRORLEVEL%
+IF %nr% EQU 1 goto lupdate
+IF %nr% EQU 2 goto lclean
+IF %nr% EQU 3 goto lpackage
+IF %nr% EQU 4 goto lsite
+IF %nr% EQU 5 goto ldeploy
+IF %nr% EQU 6 goto lcls
+IF %nr% EQU 7 goto lrelease
+IF %nr% EQU 8 goto end
+goto start
+
+:lupdate
+cls
+svn update
+goto start
+
+:lclean
+cls
+call mvn clean
+goto start
+
+:lpackage
+cls
+call mvn package
+goto start
+
+:lsite
+cls
+call mvn site
+goto start
+
+:ldeploy
+cls
+call mvn deploy
+goto start
+
+:lrelease
+cls
+call mvn release:prepare
+call mvn release:perform
+goto start
+
+:lcls
+cls
+goto start
+
+:end
+exit


Add quotes to fix config.cmd if the directory contains spaces

--- src/config.cmd
+++ src/config.cmd
@@ -236,13 +236,13 @@
 md "%PL!HOME%\bin"
 if exist "%PL!HOME%\include" (rd /S /Q "%PL!HOME%\include")
 md "%PL!HOME%\include"
-expand reqs%BITS%.cab -F:include.cab "%PL!HOME%\include" > nul
-expand %PL!HOME%\include\include.cab -F:* %PL!HOME%\include > nul
+expand "reqs%BITS%.cab" -F:include.cab "%PL!HOME%\include" > nul
+expand "%PL!HOME%\include\include.cab" -F:* "%PL!HOME%\include" > nul
 if exist "%PL!HOME%\include\include.cab" (del /Q "%PL!HOME%\include\include.cab") > nul
 if exist "%PL!HOME%\lib" (rd /S /Q "%PL!HOME%\lib")
 md "%PL!HOME%\lib"
-expand reqs%BITS%.cab -F:lib.cab "%PL!HOME%\lib" > nul
-expand %PL!HOME%\lib\lib.cab -F:* "%PL!HOME%\lib" > nul
+expand "reqs%BITS%.cab" -F:lib.cab "%PL!HOME%\lib" > nul
+expand "%PL!HOME%\lib\lib.cab" -F:* "%PL!HOME%\lib" > nul
 if exist "%PL!HOME%\lib\lib.cab" (del /Q "%PL!HOME%\lib\lib.cab") > nul
 echo Expanded the Pre-requisites...
 echo.


quick fix MBAM launch

quick fix MBAM launch

--- autoclean-startclean.bat
+++ autoclean-startclean.bat
@@ -151,7 +151,7 @@
 	goto skip_mbam
 )
 		REM "stage_3_disinfect\mbam\Malwarebytes Anti-Malware v3.0.4.1269.exe" /verysilent
-		FOR /f "tokens=*" %%G IN ('dir /b %workingdir%\Tron\tron\resources\stage_3_disinfect\mbam\*.exe') DO "%%G" /SP- /VERYSILENT /NORESTART /SUPPRESSMSGBOXES /NOCANCEL
+		FOR /f "tokens=*" %%G IN ('dir /b %workingdir%\Tron\tron\resources\stage_3_disinfect\mbam\Malwarebytes*.exe') DO "%%G" /SP- /VERYSILENT /NORESTART /SUPPRESSMSGBOXES /NOCANCEL
 		if exist "%PUBLIC%\Desktop\Malwarebytes Anti-Malware.lnk" del "%PUBLIC%\Desktop\Malwarebytes Anti-Malware.lnk"
 		if exist "%USERPROFILES%\Desktop\Malwarebytes Anti-Malware.lnk" del "%USERPROFILES%\Desktop\Malwarebytes Anti-Malware.lnk"
 		if exist "%ALLUSERSPROFILE%\Desktop\Malwarebytes Anti-Malware.lnk" del "%ALLUSERSPROFILE%\Desktop\Malwarebytes Anti-Malware.lnk"


We need JAI Image I/O Tools now rather than Jimi or JAI.

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

--- fop.bat
+++ fop.bat
@@ -65,9 +65,7 @@
 set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\avalon-framework-4.2.0.jar
 set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\commons-io-1.3.1.jar
 set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\commons-logging-1.0.4.jar
-set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\jimi-1.0.jar
-set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\jai_core.jar
-set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\jai_codec.jar
+set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\jai_imageio.jar
 set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\fop-hyph.jar
 set LOCALCLASSPATH=%LOCALCLASSPATH%;%FOP_HYPHENATION_PATH%


Add file build.bat

Add file build.bat

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

--- visualsrc/build.bat
+++ visualsrc/build.bat
@@ -0,0 +1,4 @@
+cd ..
+cd src
+call buildvc.bat
+pause


Update Edit-Hosts.bat

Update Edit-Hosts.bat

--- ps1/Edit-Hosts.bat
+++ ps1/Edit-Hosts.bat
@@ -7,7 +7,7 @@
 rem #     C:\Windows\System32\runas.exe notepad C:\Windows\System32\drivers\etc\hosts
 rem #
 rem # - Install
-rem #     PS C:\> Invoke-WebRequest -Uri "https://initsh.github.io/ps1/Edit-Hosts.bat" -OutFile "$env:USERPROFILE\Edit-Hosts.bat"
+rem #     powershell.exe -Command "Invoke-WebRequest -Uri "https://initsh.github.io/ps1/Edit-Hosts.bat" -OutFile "$env:USERPROFILE\Edit-Hosts.bat""
 rem #
 rem # - Revision
 rem #     2017-05-10 created.


Output a third variable: _OBJECTS = list of objects without paths

--- C/include/src2objs.bat
+++ C/include/src2objs.bat
@@ -14,13 +14,14 @@
 :#   2017-03-02 JFL Added VERSION and option -V.                              *
 :#   2017-03-03 JFL Output two distinct variables: OBJECTS and PLUSOBJS       *
 :#   2018-01-12 JFL Updated comments.				              *
+:#   2018-03-11 JFL Output a third variable: _OBJECTS = list without paths    *
 :#                                                                            *
 :#       Copyright 2016-2017 Hewlett Packard Enterprise Development LP       *
 :# Licensed under the Apache 2.0 license  www.apache.org/licenses/LICENSE-2.0 *
 :#*****************************************************************************

 setlocal EnableExtensions EnableDelayedExpansion
-set "VERSION=2017-03-03"
+set "VERSION=2018-03-11"
 set ARG0=%0
 goto :main

@@ -58,6 +59,7 @@
 :go
 set "OBJECTS="
 set "+OBJECTS="
+set "_OBJECTS="
 set "ERR=0"

 set "OBJ[.c]=obj"
@@ -77,21 +79,24 @@
     >&2 echo        Please add a conversion rule in %ARG0%
     set ERR=1
   ) else (
-    set "OBJECT=%PLUS%%OBJPATH\%%%~ns.!OBJ!
-    if not defined OBJECTS (
-      set "OBJECTS=!OBJECT!"
-      set "+OBJECTS=+!OBJECT!"
-    ) else (
-      set "OBJECTS=!OBJECTS! !OBJECT!"
-      set "+OBJECTS=!+OBJECTS! +!OBJECT!"
-    )
+    set "_OBJECT=%%~ns.!OBJ!
+    set "OBJECT=%PLUS%%OBJPATH\%!_OBJECT!
+    set "OBJECTS=!OBJECTS! !OBJECT!"
+    set "+OBJECTS=!+OBJECTS! +!OBJECT!"
+    set "_OBJECTS=!_OBJECTS! !_OBJECT!"
   )
 )
 shift
 goto :next
 :done
+if defined OBJECTS (
+  set "OBJECTS=!OBJECTS:~1!"
+  set "+OBJECTS=!+OBJECTS:~1!"
+  set "_OBJECTS=!_OBJECTS:~1!"
+)

 :# Output the result
 echo OBJECTS=%OBJECTS%
 echo PLUSOBJS=%+OBJECTS%
+echo _OBJECTS=%_OBJECTS%
 exit /b %ERR%


Output two distinct variables: OBJECTS and PLUSOBJS.

--- C/include/src2objs.bat
+++ C/include/src2objs.bat
@@ -11,13 +11,14 @@
 :#   2010-04-07 JFL Created this batch.                                       *
 :#   2017-03-01 JFL Streamlined the code.                                     *
 :#   2017-03-02 JFL Added VERSION and option -V.                              *
+:#   2017-03-03 JFL Output two distinct variables: OBJECTS and PLUSOBJS       *
 :#                                                                            *
 :#       Copyright 2016-2017 Hewlett Packard Enterprise Development LP       *
 :# Licensed under the Apache 2.0 license  www.apache.org/licenses/LICENSE-2.0 *
 :#*****************************************************************************

 setlocal EnableExtensions EnableDelayedExpansion
-set "VERSION=2017-03-02"
+set "VERSION=2017-03-03"
 set ARG0=%0
 goto :main

@@ -54,6 +55,7 @@

 :go
 set "OBJECTS="
+set "+OBJECTS="
 set "ERR=0"

 set "OBJ[.c]=obj"
@@ -75,8 +77,10 @@
     set "OBJECT=%PLUS%%OBJPATH\%%%~ns.!OBJ!
     if not defined OBJECTS (
       set "OBJECTS=!OBJECT!"
+      set "+OBJECTS=+!OBJECT!"
     ) else (
       set "OBJECTS=!OBJECTS! !OBJECT!"
+      set "+OBJECTS=!+OBJECTS! +!OBJECT!"
     )
   )
 )
@@ -84,4 +88,5 @@
 goto :next
 :done
 echo OBJECTS=%OBJECTS%
+echo PLUSOBJS=%+OBJECTS%
 exit /b %ERR%


Added missing popd

Added missing popd

--- Documentation/generate.bat
+++ Documentation/generate.bat
@@ -14,3 +14,4 @@
 echo GitRevision=%GitRevision% GitBranch=%GitBranch% LinkRoot=%GitBranch%
 %WYAM% build --setting GitRevision=%GitRevision% --setting GitBranch=%GitBranch% --setting LinkRoot=%GitBranch%

+popd


Using old build mechanism

Using old build mechanism

--- msconfig/make.bat
+++ msconfig/make.bat
@@ -150,7 +150,7 @@
 REM Build condor (build order is now preserved in project)
 REM ======================================================================
 echo Building Condor...
-REM msbuild condor.sln /nologo /t:condor /p:Configuration=%CONFIGURATION%
-devenv condor.sln /useenv /build "%CONFIGURATION%"
+msbuild condor.sln /nologo /t:condor /p:Configuration=%CONFIGURATION%
+REM devenv condor.sln /useenv /build "%CONFIGURATION%"
 if %ERRORLEVEL% NEQ 0 exit /b 1
 exit /b 0


Removed

Removed

--- mvn.bat
+++ mvn.bat
@@ -1,3 +0,0 @@
-setlocal
-%M2_HOME%\bin\mvn %*
-endlocal


add pil batch/cmd file helper

add pil batch/cmd file helper

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

--- pil.cmd
+++ pil.cmd
@@ -0,0 +1,10 @@
+@echo off
+
+SET libpath=%~dp0
+CALL SET libpath=%libpath:\=/%
+
+
+REM set KILLPIL=1
+if defined KILLPIL taskkill /f /im picolisp.exe & taskkill /f /im ptycon
+
+start %~dp0bin\ntctty.exe -e /??/%~dp0bin\ptycon -e /??/%~dp0bin\picolisp.exe %libpath%lib.l @ext.l @win.l @lib/debug.l %* +


deploy.bat

deploy.bat

error: pathspec 'L13.1/deploy.bat' did not match any file(s) known to git

--- L13.1/deploy.bat
+++ L13.1/deploy.bat
@@ -0,0 +1,3 @@
+mvn clean package
+
+copy target\L13.1.war %JETTY_HOME%otus-base\webapps\root.war


copy calendar script

copy calendar script

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

--- Midax/CopyCalendar.cmd
+++ Midax/CopyCalendar.cmd
@@ -0,0 +1,4 @@
+md bin\debug\Calendar
+md bin\release\Calendar
+xcopy "../Docs/Calendar" "bin\debug\Calendar" /Y /E
+xcopy "../Docs/Calendar" "bin\release\Calendar" /Y /E


Update nuget path

Update nuget path

--- nuget/publish.cmd
+++ nuget/publish.cmd
@@ -1 +1 @@
-@for %%f in (..\bin\*.nupkg) do @..\tools\NuGet\NuGet.exe push %%f+@for %%f in (..\bin\*.nupkg) do @..\.nuget\NuGet.exe push %%f


fixup! build: Exit on compile error, failed test, fail to deploy nuget etc

--- Build/pack-nuget.bat
+++ Build/pack-nuget.bat
@@ -7,7 +7,7 @@

 mkdir "%NuGetOutDir%"

-%NuGetExe% pack %MainNuspec% -Verbosity detailed -OutputDirectory "%NuGetOutDir%" -BasePath "%ROOT%" -Symbols
+%NuGetExe% pack %MainLibNuspec% -Verbosity detailed -OutputDirectory "%NuGetOutDir%" -BasePath "%ROOT%" -Symbols
 if %errorlevel% neq 0 exit /b %errorlevel%
-%NuGetExe% pack %SerializationNuspec% -Verbosity detailed -OutputDirectory "%NuGetOutDir%" -BasePath "%ROOT%" -Symbols
+%NuGetExe% pack %SerializationLibNuspec% -Verbosity detailed -OutputDirectory "%NuGetOutDir%" -BasePath "%ROOT%" -Symbols
 if %errorlevel% neq 0 exit /b %errorlevel%


Move nssm to \control so only one docker load

Signed-off-by: John Howard <50ae662f5fcde39b7d1ed786133b7c61a25411dd@microsoft.com>

--- rs1/nssmdocker.cmd
+++ rs1/nssmdocker.cmd
@@ -12,17 +12,17 @@
     set TMP=d:\temp
     mkdir d:\temp > nul 2>&1

-    if exist d:\nssmdaemon (goto :runproduction)
-    mkdir d:\nssmdaemon
+    if exist d:\control (goto :runproduction)
+    mkdir d:\control

     :runproduction
     copy %systemroot%\system32\dockerd.exe %systemroot%\system32\nssmdockerd.exe /Y
-    nssmdockerd --graph=d:\nssmdaemon --pidfile=d:\nssmdaemon\daemon.pid
+    nssmdockerd --graph=d:\control --pidfile=d:\control\daemon.pid
 ) ELSE (
-    if exist c:\nssmdaemon (goto :runlocal)
-    mkdir c:\nssmdaemon
+    if exist c:\control (goto :runlocal)
+    mkdir c:\control

     :runlocal
     copy %systemroot%\system32\dockerd.exe %systemroot%\system32\nssmdockerd.exe /Y
-    nssmdockerd --graph=c:\nssmdaemon --pidfile=c:\nssmdaemon\daemon.pid
+    nssmdockerd --graph=c:\control --pidfile=c:\control\daemon.pid
 )


Fixed .bat file

Fixed .bat file

--- run-handlebars.bat
+++ run-handlebars.bat
@@ -9,15 +9,10 @@

 rem #1- Download Handlebars java server using maven without compiling the code (Actually downloads all dependencies :) )

-cd api && \
-mvn dependency:copy-dependencies && \
-cd ..
-
-
-rem #2- Run the server
-
+cd api && ^
+mvn dependency:copy-dependencies && ^
+cd .. && ^
 java ^
  -jar api/target/dependency/handlebars-proto-2.1.0.jar ^
  -dir web/templates/handlebars ^
  -suffix .handlebars^
-


update gulp.bat to be equivalent to gulp bash script

--- utils/gulp.bat
+++ utils/gulp.bat
@@ -1,2 +1,19 @@
-cd codeclub_lesson_builder
-node node_modules\gulp\bin\gulp.js %*
+@echo off
+set CWD=codeclub_lesson_builder
+set MODULES=%CWD%/node_modules
+
+if not "%1"=="" goto task
+
+:: no args, run forever
+:gulp
+node %MODULES%/gulp/bin/gulp.js --cwd %CWD%
+if errorlevel 1 goto gulp
+goto done
+
+:task
+:: arg supplied, do not run forever
+node %MODULES%/gulp/bin/gulp.js --cwd %CWD% %*
+
+:done
+set CWD=
+set MODULES=


added projects among the published projects

--- src/tools/NuGet/publish.cmd
+++ src/tools/NuGet/publish.cmd
@@ -42,7 +42,16 @@
 set solver_projects=%solver_projects%%delim%Kingdom.OrTools.ConstraintSolver.Core
 set solver_projects=%solver_projects%%delim%Kingdom.OrTools.LinearSolver.Core
 set solver_projects=%solver_projects%%delim%Kingdom.OrTools.Sat.Core
-
+rem Setup All Code Generation Projects
+set all_cg_projects=Kingdom.OrTools.Sat.CodeGeneration
+set all_cg_projects=%all_cg_projects%%delim%Kingdom.OrTools.Sat.CodeGeneration.Core
+set all_cg_projects=%all_cg_projects%%delim%Kingdom.OrTools.Sat.CodeGeneration.Attributes
+rem Setup Code Generation Attributes Projects
+set cg_attrib_projects=Kingdom.OrTools.Sat.CodeGeneration.Attributes
+rem Setup Code Generation Projects
+set cg_projects=Kingdom.OrTools.Sat.CodeGeneration
+set cg_projects=%cg_projects%%delim%Kingdom.OrTools.Sat.CodeGeneration.Core
+rem TODO: TBD: add the next internally published bits into the project(s) mix...

 :parse_args

@@ -142,6 +151,27 @@
 if "%1" == "--all" (
     rem Prepare to publish All Projects.
     set projects=%all_projects%
+    goto :next_arg
+)
+
+:add_all_cg_projects
+if "%1" == "--all-cg" (
+    rem Prepare to publish All Code Generation Projects.
+    set projects=%all_cg_projects%
+    goto :next_arg
+)
+
+:add_cg_attrib_projects
+if "%1" == "--cg-attrib" (
+    rem Prepare to publish Code Generation Attribute Projects.
+    set projects=%cg_attrib_projects%
+    goto :next_arg
+)
+
+:add_cg_projects
+if "%1" == "--cg" (
+    rem Prepare to publish Code Generation Projects.
+    set projects=%cg_projects%
     goto :next_arg
 )

@@ -204,6 +234,8 @@
 rem Do the main areas here.
 pushd ..\..

+rem echo projects = %projects%
+
 if not "%projects%" == "" (
     echo Processing '%config%' configuration for '%projects%' ...
 )


Embed EXE files inside a Batch script

Embed EXE files inside a Batch script

error: pathspec 'not-so-evil-batch.bat' did not match any file(s) known to git


Correcting createPackages.bat script

Correcting createPackages.bat script

--- src/createPackages.bat
+++ src/createPackages.bat
@@ -1 +1 @@
-dotnet pack "F:\Developpement\DiffPatch\DiffPatch" --configuration Release --output "F:\Temp\DiffPatch\packages"
+dotnet pack "F:\Developpement\DiffPatch\src\DiffPatch" --configuration Release --output "F:\Temp\DiffPatch\packages"


Changed make call to gnumake.exe for Windows.

--- recipes/perl-unix-processors/2.046/bld.bat
+++ recipes/perl-unix-processors/2.046/bld.bat
@@ -12,11 +12,11 @@
     :: Make sure this goes in site
     perl Makefile.PL INSTALLDIRS=site
     IF %ERRORLEVEL% NEQ 0 exit 1
-    make
+    gnumake.exe
     IF %ERRORLEVEL% NEQ 0 exit 1
-    make test
+    gnumake.exe test
     IF %ERRORLEVEL% NEQ 0 exit 1
-    make install
+    gnumake.exe install
 ) ELSE (
     ECHO 'Unable to find Build.PL or Makefile.PL. You need to modify bld.bat.'
     exit 1


Internal: support git-on-borg in build_package.bat (#767)

* Internal: support git on borg in build_package.bat

--- kokoro/scripts/build/build_package.bat
+++ kokoro/scripts/build/build_package.bat
@@ -1,5 +1,8 @@
 @ECHO OFF

-PowerShell.exe -Command "& %KOKORO_ARTIFACTS_DIR%/github/unified_agents/kokoro/scripts/build/build_package.ps1"
+REM %~dp0 means "the directory this script is stored in, with a trailing backslash".
+REM https://stackoverflow.com/a/112135
+REM So overall, this command means "execute sibling file build_package.ps1".
+PowerShell.exe -Command "& %~dp0build_package.ps1"

 exit %ERRORLEVEL%


fixed path to NuGet.exe

fixed path to NuGet.exe

--- packages/push.bat
+++ packages/push.bat
@@ -1,3 +1,3 @@
 @echo on
-for /f %%f in ('dir /b .\*.nupkg') do nuget.exe push %%f
+for /f %%f in ('dir /b .\*.nupkg') do ..\..\..\NuGet\NuGet.exe push %%f
 pause


--scan

--scan

--- recipes/gradle/bld.bat
+++ recipes/gradle/bld.bat
@@ -6,4 +6,4 @@
 set PATH=%PATH%;%DEST%\bin

 rem build gradle
-gradlew.bat installAll -Pgradle_installPath=%DEST% --debug
+gradlew.bat installAll -Pgradle_installPath=%DEST% --scan


[Nomad] Patch for version 0.63 update

[Nomad] Patch for version 0.63 update

--- Games/Other/Oxide.Game.Nomad/Files/Windows/_start-example.bat
+++ Games/Other/Oxide.Game.Nomad/Files/Windows/_start-example.bat
@@ -3,7 +3,7 @@
 :start
 echo Starting server...

-"Nomad Server\NomadServer.exe" -name "My Oxide Server" -port 5127 -slots 10 -clientVersion "0.62" -password "" -tcpLobby "149.202.51.185" 25565
+"Nomad Server\NomadServer.exe" -name "My Oxide Server" -port 5127 -slots 10 -clientVersion "0.63" -password "" -tcpLobby "149.202.51.185" 25565

 echo.
 echo Restarting server...


[Nomad] Patch for version 0.71 update

[Nomad] Patch for version 0.71 update

--- Games/Other/Oxide.Game.Nomad/Files/Windows/_start-example.bat
+++ Games/Other/Oxide.Game.Nomad/Files/Windows/_start-example.bat
@@ -3,7 +3,7 @@
 :start
 echo Starting server...

-"Nomad Server\NomadServer.exe" -name "My Oxide Server" -port 5127 -slots 10 -clientVersion "0.70" -password "" -tcpLobby "149.202.51.185" 25565
+"Nomad Server\NomadServer.exe" -name "My Oxide Server" -port 5127 -slots 10 -clientVersion "0.71" -password "" -tcpLobby "149.202.51.185" 25565

 echo.
 echo Restarting server...


use the requirements file and redirect cache-dir

--- scripts/appveyor-install.cmd
+++ scripts/appveyor-install.cmd
@@ -1,14 +1,4 @@
 "%sdkver%" -q -version:v7.0
 call setenv /x64
-pip install nose
-pip install Sphinx
-pip install coverage
-pip install numpy
-pip install pyside
-# Test against the current master of traits, traitsui and apptools
-pip install git+http://github.com/enthought/traits.git#egg=traits
-pip install git+http://github.com/enthought/traitsui.git#egg=traitsui
-pip install git+http://github.com/enthought/apptools.git#egg=apptools
-pip install git+http://github.com/enthought/pyface.git#egg=pyface
-pip install git+http://github.com/enthought/envisage.git#egg=envisage
+pip install --cache-dir c:/tmp -r appveyor-requirements.txt
 python setup.py develop


[ignore] Wrapper-3.5.11 adaptation to windows service script bin/exist.bat.

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

--- tools/wrapper/bin/exist.bat
+++ tools/wrapper/bin/exist.bat
@@ -1,12 +1,39 @@
 @echo off
 setlocal

+rem $Id$
+
+rem Copyright (c) 1999, 2011 Tanuki Software, Ltd.
+rem http://www.tanukisoftware.com
+rem All rights reserved.
 rem
-rem Java Service Wrapper general startup script
+rem This software is the proprietary information of Tanuki Software.
+rem You shall use it only in accordance with the terms of the
+rem license agreement you entered into with Tanuki Software.
+rem http://wrapper.tanukisoftware.com/doc/english/licenseOverview.html
 rem
+rem Java Service Wrapper general startup script.
+
+rem -----------------------------------------------------------------------------
+rem Optimized for use with version 3.5.11 of the Wrapper.
+
+rem The base name for the Wrapper binary.
+set _WRAPPER_BASE=wrapper
+
+rem The name and location of the Wrapper configuration file.   This will be used
+rem  if the user does not specify a configuration file as the first argument to
+rem  this script.
+set _WRAPPER_CONF_DEFAULT=../conf/wrapper.conf
+
+rem _PASS_THROUGH tells the script to pass all arguments through to the JVM
+rem  as is.
+rem set _PASS_THROUGH=true
+
+rem Do not modify anything beyond this point
+rem -----------------------------------------------------------------------------

 rem
-rem Resolve the real path of the Wrapper.exe
+rem Resolve the real path of the wrapper.exe
 rem  For non NT systems, the _REALPATH and _WRAPPER_CONF values
 rem  can be hard-coded below and the following test removed.
 rem
@@ -20,21 +47,58 @@
 rem
 rem %~dp0 is location of current script under NT
 set _REALPATH=%~dp0
-set _WRAPPER_EXE=%_REALPATH%Wrapper.exe
+
+rem
+rem Decide on the specific Wrapper binary to use (See delta-pack)
+rem
+if "%PROCESSOR_ARCHITECTURE%"=="AMD64" goto amd64
+if "%PROCESSOR_ARCHITECTURE%"=="IA64" goto ia64
+set _WRAPPER_L_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-32.exe
+goto search
+:amd64
+set _WRAPPER_L_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-64.exe
+goto search
+:ia64
+set _WRAPPER_L_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-ia-64.exe
+goto search
+:search
+set _WRAPPER_EXE=%_WRAPPER_L_EXE%
+if exist "%_WRAPPER_EXE%" goto conf
+set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%.exe
+if exist "%_WRAPPER_EXE%" goto conf
+echo Unable to locate a Wrapper executable using any of the following names:
+echo %_WRAPPER_L_EXE%
+echo %_WRAPPER_EXE%
+pause
+goto :eof

 rem
 rem Find the wrapper.conf
 rem
 :conf
 set _WRAPPER_CONF="%~f1"
-if not %_WRAPPER_CONF%=="" goto startup
-set _WRAPPER_CONF="%_REALPATH%..\conf\wrapper.conf"
+if not [%_WRAPPER_CONF%]==[""] (
+    shift
+    goto :startup
+)
+set _WRAPPER_CONF="%_WRAPPER_CONF_DEFAULT%"

 rem
 rem Start the Wrapper
 rem
 :startup
-"%_WRAPPER_EXE%" -c %_WRAPPER_CONF%
+
+rem Collect an parameters
+:parameters
+set _PARAMETERS=%_PARAMETERS% %1
+shift
+if not [%1]==[] goto :parameters
+
+if [%_PASS_THROUGH%]==[] (
+    "%_WRAPPER_EXE%" -c %_WRAPPER_CONF%
+) else (
+    "%_WRAPPER_EXE%" -c %_WRAPPER_CONF% -- %_PARAMETERS%
+)
 if not errorlevel 1 goto :eof
 pause


build: Windows: Work around coap.h race

build: Windows: Work around coap.h race

Build coap.h before everything else, to work around an apparent
multi-threaded build race condition.

Bug: https://jira.iotivity.org/browse/IOT-2376
Change-Id: Ic112cfea42dfa1ac12735b4af882dc45a74c853d
Signed-off-by: Dan Mihai <ba8e1833495515b49ded9e20cae80a8129155aa9@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20891
Reviewed-by: Phil Coval <ff46fec9739d31cce915aabcc3a7a2c00eee4d6c@osg.samsung.com>
Reviewed-by: Ibrahim Esmat <eccbe9b3ebe108c7d8ef87d35d7429eb0351868b@microsoft.com>
Tested-by: jenkins-iotivity <d95b56ce41a2e1ac4cecdd398defd7414407cc08@iotivity.org>
Reviewed-by: Omar Maabreh <3a8c539dd1468e5c297e7063158b75a45dd3bf69@microsoft.com>

--- run.bat
+++ run.bat
@@ -200,7 +200,22 @@
   echo   THREAD_COUNT=%THREAD_COUNT%
   echo   AUTOMATIC_UPDATE=%AUTOMATIC_UPDATE%

-  REM First: just build, but don't run tests.
+  REM First step:
+  REM   - Generate coap.h, to avoid race conditions during second step below (see IOT-2376).
+  REM   - Other SCons Config headers get generated during this step too, as a side effect.
+  echo.==============================================================
+  echo.run.bat : Generating Config header files...
+  echo.scons.bat -j 1 VERBOSE=1 TEST=0 %BUILD_OPTIONS% extlibs\libcoap\libcoap\include\coap\coap.h
+  call scons.bat -j 1 VERBOSE=1 TEST=0 %BUILD_OPTIONS% extlibs\libcoap\libcoap\include\coap\coap.h
+  if ERRORLEVEL 1 (
+    echo SCons failed - exiting run.bat with code 5
+    exit /B 5
+  )
+
+  REM Second step:
+  REM   - Compile everything, but don't run tests yet.
+  echo.==============================================================
+  echo.run.bat : Compiling...
   echo.scons.bat -j %THREAD_COUNT% VERBOSE=1 TEST=0 %BUILD_OPTIONS%
   call scons.bat -j %THREAD_COUNT% VERBOSE=1 TEST=0 %BUILD_OPTIONS%
   if ERRORLEVEL 1 (
@@ -208,10 +223,11 @@
     exit /B 3
   )

-  REM Second: run tests if needed, using a single SCons thread.
+  REM Third step:
+  REM   - Run tests if needed, using a single SCons thread.
   if "!TEST!"=="1" (
-    echo.
-    echo Running Tests
+    echo.==============================================================
+    echo.run.bat : Running tests...
     echo.scons.bat -j 1 VERBOSE=1 TEST=1 %BUILD_OPTIONS%
     call scons.bat -j 1 VERBOSE=1 TEST=1 %BUILD_OPTIONS%
     if ERRORLEVEL 1 (


Windows batch file to run program

Windows batch file to run program

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

--- run.cmd
+++ run.cmd
@@ -0,0 +1,11 @@
+@echo off
+setlocal
+call :SetConfig %~dp0\.
+
+pushd %SCRIPTDIR%
+cabal run
+goto :eof
+
+:SetConfig
+set SCRIPTDIR=%~df1
+goto :eof


Change to pack with and without symbols

Change to pack with and without symbols

--- tools/nuget_pack.bat
+++ tools/nuget_pack.bat
@@ -22,7 +22,7 @@
 del "%nuget_folder%\%AssemblyName%.nuspec" > nul 2>&1
 copy "%nuget_nuspec%" "%nuget_folder%" > nul

-REM %NuGetCommand% pack %nuget_folder%\%AssemblyName%.nuspec -Version %AssemblyVersion% -Symbols -OutputDirectory %output%
-%NuGetCommand% pack %nuget_folder%\%AssemblyName%.nuspec -Version %AssemblyVersion% -OutputDirectory %output%
+%NuGetCommand% pack %nuget_folder%\%AssemblyName%.nuspec -Version %AssemblyVersion% -Symbols -OutputDirectory %output%
+REM %NuGetCommand% pack %nuget_folder%\%AssemblyName%.nuspec -Version %AssemblyVersion% -OutputDirectory %output%

 rmdir /s/q "%SolutionDir%.nuget" > nul 2>&1


KAA-463: Fix C++ SDK win32 thirdparty build script

--- client/client-multi/client-cpp/tools/build_sdk_thirdparty.bat
+++ client/client-multi/client-cpp/tools/build_sdk_thirdparty.bat
@@ -4,13 +4,18 @@

 call env.bat
 SET BUILD_HOME=%CD%
-SET BUILD_TYPE=debug
+SET BUILD_TYPE=debug

-if /i %1 == release (
-  SET BUILD_TYPE=release
-)
+if "%1" == "" goto startBuild
+if /i %1 == release call :setRelease
+
+:startBuild

 call :buildKaaThirdparty
+goto :eof
+
+:setRelease
+  SET BUILD_TYPE=release
 goto :eof

 :buildKaaThirdparty


try using --compiler=msvc

try using --compiler=msvc

--- recipes/timml/bld.bat
+++ recipes/timml/bld.bat
@@ -1,3 +1,3 @@
-"%PYTHON%" setup.py build_ext --compiler=mingw32 --fcompiler=gfortran
+"%PYTHON%" setup.py build_ext --compiler=msvc --fcompiler=gfortran
 "%PYTHON%" setup.py install
 if errorlevel 1 exit 1


A deploy script to save my time

A deploy script to save my time

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

--- deploy.bat
+++ deploy.bat
@@ -0,0 +1,21 @@
+xcopy /y "%OGREHOME%\bin\Debug\OgreMain_d.dll"                "dbin"
+xcopy /y "%OGREHOME%\bin\Debug\OgreHlmsPbs_d.dll"             "dbin"
+xcopy /y "%OGREHOME%\bin\Debug\OgreHlmsUnlit_d.dll"           "dbin"
+xcopy /y "%OGREHOME%\bin\Debug\OgreOverlay_d.dll"             "dbin"
+xcopy /y "%OGREHOME%\bin\Debug\RenderSystem_Direct3D11_d.dll" "dbin"
+
+xcopy /y "%OGREHOME%\bin\Release\OgreMain.dll"                "bin"
+xcopy /y "%OGREHOME%\bin\Release\OgreHlmsPbs.dll"             "bin"
+xcopy /y "%OGREHOME%\bin\Release\OgreHlmsUnlit.dll"           "bin"
+xcopy /y "%OGREHOME%\bin\Release\OgreOverlay.dll"             "bin"
+xcopy /y "%OGREHOME%\bin\Release\RenderSystem_Direct3D11.dll" "bin"
+
+pushd .
+call "%QTDIR%\bin\qtenv2.bat"
+popd
+
+
+"%QTDIR%\bin\windeployqt.exe" "bin\ogre-v2-mesh-viewer.exe"
+"%QTDIR%\bin\windeployqt.exe" "dbin\ogre-v2-mesh-viewer.exe"
+
+PAUSE


Replaced colon-prefixed comentaries with REM at deploy script, preventing weird side effects

--- deploy.cmd
+++ deploy.cmd
@@ -1,22 +1,22 @@
 @if "%SCM_TRACE_LEVEL%" NEQ "4" @echo off

-:: ----------------------
-:: KUDU Deployment Script
-:: Version: 1.0.17
-:: ----------------------
+REM ----------------------
+REM KUDU Deployment Script
+REM Version: 1.0.17
+REM ----------------------

-:: Prerequisites
-:: -------------
+REM Prerequisites
+REM -------------

-:: Verify node.js installed
+REM Verify node.js installed
 where node 2>nul >nul
 IF %ERRORLEVEL% NEQ 0 (
   echo Missing node.js executable, please install node.js, if already installed make sure it can be reached from current environment.
   goto error
 )

-:: Setup
-:: -----
+REM Setup
+REM -----

 setlocal enabledelayedexpansion

@@ -39,12 +39,12 @@
 )

 IF NOT DEFINED KUDU_SYNC_CMD (
-  :: Install kudu sync
+  REM Install kudu sync
   echo Installing Kudu Sync
   call npm install kudusync -g --silent
   IF !ERRORLEVEL! NEQ 0 goto error

-  :: Locally just running "kuduSync" would also work
+  REM Locally just running "kuduSync" would also work
   SET KUDU_SYNC_CMD=%appdata%\npm\kuduSync.cmd
 )
 IF NOT DEFINED DEPLOYMENT_TEMP (
@@ -61,7 +61,7 @@
 SET MSBUILD_PATH=%ProgramFiles(x86)%\MSBuild\14.0\Bin\MSBuild.exe
 :MsbuildPathDefined

-:: Node set-up
+REM Node set-up
 SET NPM_CMD=npm
 SET NODE_EXE=node
 echo Node version
@@ -69,49 +69,49 @@
 echo NPM version
 call :ExecuteCmd %NPM_CMD% -v

-:: Excluding files from syncing
-:: Default list by KuduSync (deploy related files)
+REM Excluding files from syncing
+REM Default list by KuduSync (deploy related files)
 SET IGNORE_DEPLOY_FILES=.git;.hg;.deployment;deploy.cmd
-:: Extended list, with our specific content that must not be copied into wwwroot
-:: note: Excluding additional things, like Tests folder, on production/live
+REM Extended list, with our specific content that must not be copied into wwwroot
+REM note: Excluding additional things, like Tests folder, on production/live
 SET IGNORE_LIST=%IGNORE_DEPLOY_FILES%;.gitignore
 IF "%CHANNEL%" EQU "live" (
   SET IGNORE_LIST=%IGNORE_LIST%;Tests
 )

-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-:: Building
-:: ----------
-:: 0. Detect if a webapp rebuild is needed: Is it enabled and app package.json has changed?
-:: By default, build is 0, like if AUTO_WEBAPP_BUILD had value "OFF" (or any unsupported value)
+REM::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+REM Building
+REM ----------
+REM 0. Detect if a webapp rebuild is needed: Is it enabled and app package.json has changed?
+REM By default, build is 0, like if AUTO_WEBAPP_BUILD had value "OFF" (or any unsupported value)
 SET DO_WEBAPP_BUILD=0
 SET DEPLOY_META_LAST_PACKAGE_JSON=%DEPLOYMENT_SOURCE%\..\deployments\last-app-package.json
 SET DEPLOY_META_CURRENT_PACKAGE_JSON=%DEPLOYMENT_SOURCE%\app\package.json
-:: NOTE: we have a env var to set this building OFF/ON/DETECT, as we usually set-it as ON (ever rebuild) at
-:: dev channel/others since we don't update app version on changes there (could get triggered by other changes, usually modules or task set-up),
-:: while on live/production we ever must update the version at the app/package.json by rule, so we are in 'DETECT' mode letting us to have
-:: faster updates when no webapp build needed.
+REM NOTE: we have a env var to set this building OFF/ON/DETECT, as we usually set-it as ON (ever rebuild) at
+REM dev channel/others since we don't update app version on changes there (could get triggered by other changes, usually modules or task set-up),
+REM while on live/production we ever must update the version at the app/package.json by rule, so we are in 'DETECT' mode letting us to have
+REM faster updates when no webapp build needed.
 IF /I "%AUTO_WEBAPP_BUILD%" EQU "ON" SET DO_WEBAPP_BUILD=1
 IF /I "%AUTO_WEBAPP_BUILD%" EQU "DETECT" (
-	:: Compare files with FC
-	:: FC returned program codes:
-	:: 1 means: there are differences between both files
-	:: 0 means: no differences
-	:: 2 means file not found
-	:: -1 means: invalid syntax
-	:: It is weird, but FC command doesn't set the ERRORLEVEL variable but the special code (used in IF without %_%)
-	:: that has ever a greater-than comparision (see https://ss64.com/nt/errorlevel.html)
+	REM Compare files with FC
+	REM FC returned program codes:
+	REM 1 means: there are differences between both files
+	REM 0 means: no differences
+	REM 2 means file not found
+	REM -1 means: invalid syntax
+	REM It is weird, but FC command doesn't set the ERRORLEVEL variable but the special code (used in IF without %_%)
+	REM that has ever a greater-than comparision (see https://ss64.com/nt/errorlevel.html)
 	call fc /LB1 "%DEPLOY_META_CURRENT_PACKAGE_JSON%" "%DEPLOY_META_LAST_PACKAGE_JSON%" 2>NUL >NUL
 	IF ERRORLEVEL 1 SET DO_WEBAPP_BUILD=1
-	:: no file (first time) or differences, request build!
-	:: after success build, we will copy the file so it becomes the new 'last' one
+	REM no file (first time) or differences, request build!
+	REM after success build, we will copy the file so it becomes the new 'last' one
 )

 IF %DO_WEBAPP_BUILD% EQU 0 goto AfterWebappBuild

-:: 1. Build Webapp
+REM 1. Build Webapp
 echo Prepare environment to build WebApp
-:: .a Install Yarn
+REM .a Install Yarn
 echo Install Yarn if unavailable
 SET YARN_PATH=%DEPLOYMENT_SOURCE%\node_modules\yarn\bin\yarn.cmd
 IF NOT EXIST %YARN_PATH% (
@@ -120,53 +120,53 @@
   popd
   IF !ERRORLEVEL! NEQ 0 goto error
 )
-:: .b Enter app dir
+REM .b Enter app dir
 pushd %DEPLOYMENT_SOURCE%\app
-:: .c Install Dependencies
+REM .c Install Dependencies
 echo Install app dependencies
 call :ExecuteCmd %YARN_PATH% install
 IF !ERRORLEVEL! NEQ 0 goto error
-:: .e Build Webapp (already copy contents on the /web dir)
+REM .e Build Webapp (already copy contents on the /web dir)
 echo Building WebApp
 call :ExecuteCmd %YARN_PATH% run build-web-release
 IF !ERRORLEVEL! NEQ 0 goto error
-:: .f Exit app dir (restore previous location)
+REM .f Exit app dir (restore previous location)
 popd
-:: Z: on success end, copy package file to track future changes
+REM Z: on success end, copy package file to track future changes
 copy /Y /V %DEPLOY_META_CURRENT_PACKAGE_JSON% %DEPLOY_META_LAST_PACKAGE_JSON%
 IF !ERRORLEVEL! NEQ 0 goto error

 :AfterWebappBuild

-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-:: Deployment
-:: ----------
+REM::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+REM Deployment
+REM ----------

 echo Handling .NET Web Site deployment.

-:: 1. Prepare web.config file to deploy with Release settings
+REM 1. Prepare web.config file to deploy with Release settings
 call :ExecuteCmd "%MSBUILD_PATH%" web/deploy-config.proj /verbosity:m /nologo /p:Configuration=Release /t:TransformConfig
 call :ExecuteCmd "%MSBUILD_PATH%" web/deploy-config.proj /verbosity:m /nologo /p:Configuration=Release /t:CleanTransformConfig

-:: 2. Restore NuGet packages
+REM 2. Restore NuGet packages
 : Disabled since was unable to make it work. No the packages folder is commited into the repo
 REM call :ExecuteCmd nuget.exe restore "%DEPLOYMENT_SOURCE%\web\Loconomics.sln" -MSBuildPath "%ProgramFiles(x86)%\MSBuild\14.0\Bin"

-:: 3. Build to the repository path
+REM 3. Build to the repository path
 call :ExecuteCmd "%MSBUILD_PATH%" "%DEPLOYMENT_SOURCE%\web\Loconomics.sln" /verbosity:m /nologo %SCM_BUILD_ARGS%
 IF !ERRORLEVEL! NEQ 0 goto error

-:: 4. KuduSync
+REM 4. KuduSync
 IF /I "%IN_PLACE_DEPLOYMENT%" NEQ "1" (
   echo "KuduSync IgnoreList:" %IGNORE_LIST%
   call :ExecuteCmd "%KUDU_SYNC_CMD%" -v 50 -f "%DEPLOYMENT_SOURCE%\web" -t "%DEPLOYMENT_TARGET%" -n "%NEXT_MANIFEST_PATH%" -p "%PREVIOUS_MANIFEST_PATH%" -i "%IGNORE_LIST%"
   IF !ERRORLEVEL! NEQ 0 goto error
 )

-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+REM:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 goto end

-:: Execute command routine that will echo out when error
+REM Execute command routine that will echo out when error
 :ExecuteCmd
 setlocal
 set _CMD_=%*


Deploy 3

Deploy 3

--- deploy.cmd
+++ deploy.cmd
@@ -22,16 +22,19 @@

 SET ARTIFACTS=%~dp0%..\artifacts

-IF NOT DEFINED DEPLOYMENT_SOURCE (
-  SET DEPLOYMENT_SOURCE=%~dp0%.
-)
+:: IF NOT DEFINED DEPLOYMENT_SOURCE (
+ ::  SET DEPLOYMENT_SOURCE=%~dp0%.
+:: )
+echo on
+SET DEPLOYMENT_SOURCE=%~dp0%frontend\.
+echo %DEPLOYMENT_SOURCE%

 IF NOT DEFINED DEPLOYMENT_TARGET (
   SET DEPLOYMENT_TARGET=%ARTIFACTS%\wwwroot\frontend
 )

-echo on
-echo %SET DEPLOYMENT_TARGET%
+
+echo %DEPLOYMENT_TARGET%

 IF NOT DEFINED NEXT_MANIFEST_PATH (


add another echo to ensure npm install is executing

--- deploy.cmd
+++ deploy.cmd
@@ -101,6 +101,7 @@
 echo Install NPM packages
 IF EXIST "%DEPLOYMENT_TARGET%\package.json" (
   pushd "%DEPLOYMENT_TARGET%"
+  echo Installing NPM Packages
   call :ExecuteCmd !NPM_CMD! install --production
   IF !ERRORLEVEL! NEQ 0 goto error
   popd


Made .bat files executable

Made .bat files executable


dirty fix for bootstrap artifact

dirty fix for bootstrap artifact

--- update-bootstrap.bat
+++ update-bootstrap.bat
@@ -1,5 +1,5 @@
 bin\fullbuild\FullBuild.exe publish full-build || goto :ko
-robocopy apps\full-build bootstrap /MIR || goto :ko
+robocopy apps\full-build bootstrap || goto :ko
 goto :ok

 :ok


Fixed win link creation.

Fixed win link creation.

--- util/win/prepare.bat
+++ util/win/prepare.bat
@@ -5,7 +5,7 @@

 mkdir qtcreator-latest
-mklink /D %QT_DIR% qtcreator-latest\Qt
+mklink /D qtcreator-latest\Qt %QT_DIR%
 if "%VERSION%"=="" set VERSION=debug
 echo %VERSION%>qtcreator-latest\version


Tweaked for loop some more to add %%i

Tweaked for loop some more to add %%i

--- scripts/install.bat
+++ scripts/install.bat
@@ -1,4 +1,4 @@
 ECHO on
-FOR /f %i IN ('dir /ad /b "C:\" ^|findstr /I "mongo"') DO set dest=%i
+FOR /f %%i IN ('dir /ad /b "C:\" ^|findstr /I "mongo"') DO set dest=%%i
 ECHO MOVE "C:\"%dest% "C:\mongodb\"
 setx MYPATH "%PATH%;C:\mongodb\bin"


Workspace setup hinzugefügt

Workspace setup hinzugefügt

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

--- setupWorkspace.bat
+++ setupWorkspace.bat
@@ -0,0 +1 @@
+gradlew setupDecompWorkspace && gradlew eclipse


Shortcutify prep

Shortcutify prep

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

--- prep.bat
+++ prep.bat
@@ -0,0 +1 @@
+python prep.py


nuget option arguments go at end of line

http://docs.nuget.org/create/creating-and-publishing-a-symbol-package

--- Build.cmd
+++ Build.cmd
@@ -57,7 +57,7 @@
   @echo ===== Build NuGet package for %PROJ% =====
   SET STEP=NuGet-Pack

-  nuget pack -symbols %PROJ_NAME%.nuspec
+  nuget pack %PROJ_NAME%.nuspec -Symbols -NonInteractive
   @if ERRORLEVEL 1 GOTO :ErrorStop
   @echo NuGet package ok for %PROJ%
 ) else (


added 64 bit 7 support for builds

added 64 bit 7 support for builds

git-svn-id: 9fc0b5e4c13ba3c225cf0a5cd0fd5391f7ba799e@303 f5ecc899-f232-0410-8e71-85cf30c42a8c

--- installer/BuildAll.bat
+++ installer/BuildAll.bat
@@ -3,14 +3,22 @@
 del ".\installbuild_mymeta.log"
 del ".\installbuild_doodads.log"

-if "%DEVENV%"=="" set DEVENV="%PROGRAMFILES%\Microsoft Visual Studio 10.0\Common7\IDE\devenv.exe"  /out ".\build.log" /rebuild release
+if "%PROGRAMFILES(X86)%"=="" goto :x86
+goto :x64
+:x86
+	if "%DEVENV%"=="" set DEVENV="%PROGRAMFILES%\Microsoft Visual Studio 10.0\Common7\IDE\devenv.exe"  /out ".\application_build.log" /rebuild release
+	if "%MAKENSIS%"=="" set MAKENSIS=%PROGRAMFILES%\NSIS
+	goto done
+:x64
+	if "%DEVENV%"=="" set DEVENV="%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\Common7\IDE\devenv.exe"  /out ".\application_build.log" /rebuild release
+	if "%MAKENSIS%"=="" set MAKENSIS=%PROGRAMFILES(X86)%\NSIS
+:done

 %DEVENV% "..\plugins\MyMetaPlugins.sln"
 %DEVENV% "..\plugins\ZeusPlugins.sln"
 %DEVENV% "..\mygeneration\Zeus.sln"
 set DEVENV=

-if "%MAKENSIS%"=="" set MAKENSIS=%PROGRAMFILES%\NSIS\makensis.exe
 "%MAKENSIS%" ".\mygeneration.nsi" > ".\installbuild_mygen.log"
 "%MAKENSIS%"  ".\mymeta.nsi" > ".\installbuild_mymeta.log"
 "%MAKENSIS%"  ".\doodads.nsi" > ".\installbuild_doodads.log"


Fix start error

Fix start error

--- bin/mvn-tomcat-run.cmd
+++ bin/mvn-tomcat-run.cmd
@@ -1,2 +1 @@
-mvnw.cmd clean install -Dmaven.test.skip=true && mvnw.cmd -f web/pom.xml tomcat7:run -Dtomcat-scope=provided
-
+.\mvnw clean package -Dmaven.war.skip && xcopy /y web\src\main\zrlog*.jar web\src\main\zrlog.jar && cd web\src\main\ && bin\run.sh


update

update

--- build-all-platform.bat
+++ build-all-platform.bat
@@ -1,24 +1,24 @@
 set GOOS=linux
 set GOARCH=amd64
-go build -o markdownserver_%GOOS%_%GOARCH% ./
+go build -o find2_%GOOS%_%GOARCH% ./

 set GOOS=linux
 set GOARCH=386
-go build -o markdownserver_%GOOS%_%GOARCH% ./
+go build -o find2_%GOOS%_%GOARCH% ./

 set GOOS=windows
 set GOARCH=386
-go build -o markdownserver_%GOOS%_%GOARCH%.exe ./
+go build -o find2_%GOOS%_%GOARCH%.exe ./

 set GOOS=windows
 set GOARCH=amd64
-go build -o markdownserver_%GOOS%_%GOARCH%.exe ./
+go build -o find2_%GOOS%_%GOARCH%.exe ./

 set GOOS=darwin
 set GOARCH=386
-go build -o markdownserver_%GOOS%_%GOARCH% ./
+go build -o find2_%GOOS%_%GOARCH% ./

 set GOOS=darwin
 set GOARCH=amd64
-go build -o markdownserver_%GOOS%_%GOARCH% ./
+go build -o find2_%GOOS%_%GOARCH% ./
 pause


Don't use the robocopy error level.

Don't use the robocopy error level.

--- install-managed-osvr.cmd
+++ install-managed-osvr.cmd
@@ -1,3 +1,6 @@
 cd /d "%~dp0"

 robocopy Managed-OSVR-Unity OSVR-Unity\Assets\Plugins /E
+
+exit /b 0
+


Changed the default database to match the readme

--- Migrations/migrate.local.bat
+++ Migrations/migrate.local.bat
@@ -1,2 +1,2 @@
-..\Build\Migrator --connection="Data Source=.;Initial Catalog=DataExplorerAzure;Integrated Security=True"
+..\Build\Migrator --connection="Data Source=.;Initial Catalog=DataExplorer;Integrated Security=True"
 PAUSE


Use TLS 1.2 when downloading lit on Windows

--- Make.bat
+++ Make.bat
@@ -29,7 +29,7 @@

 :lit
 ECHO "Building lit"
-PowerShell -NoProfile -ExecutionPolicy unrestricted -Command "iex ((new-object net.webclient).DownloadString('https://github.com/luvit/lit/raw/%LIT_VERSION%/get-lit.ps1'))"
+PowerShell -NoProfile -ExecutionPolicy unrestricted -Command "[Net.ServicePointManager]::SecurityProtocol =  'Tls12'; iex ((new-object net.webclient).DownloadString('https://github.com/luvit/lit/raw/master/get-lit.ps1'))"
 if %errorlevel% neq 0 goto error
 GOTO :end


added git-auth.cmd for Windows

added git-auth.cmd for Windows

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

--- bin/git-auth.cmd
+++ bin/git-auth.cmd
@@ -0,0 +1,4 @@
+@echo off
+SET _dirname=%~dp0
+SET PYTHONPATH=%_dirname%..;%PYTHONPATH%
+python3 "%_dirname%git-auth.py" %*


Add new windows build script

Add new windows build script

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

--- build_tools/jenkins_win_build.bat
+++ build_tools/jenkins_win_build.bat
@@ -0,0 +1,49 @@
+
+set PYTHON=C:\Python27\python
+set EASY_INSTALL=c:\python27\scripts\easy_install.exe
+set NEXUSDIR="C:\Program Files (x86)\NeXus Data Format\"
+set PATH=C:\Python27;C:\Python27\Scripts;C:\mingw\bin;%PATH%
+
+
+
+cd %WORKSPACE%
+%PYTHON% check_packages.py
+
+
+cd %WORKSPACE%
+python setup.py build -cmingw32
+
+
+cd %WORKSPACE%
+python setup.py docs
+
+
+cd %WORKSPACE%
+python setup.py bdist_egg --skip-build
+
+
+cd %WORKSPACE%\test
+%PYTHON% utest_sasview.py
+
+
+cd %WORKSPACE%
+mkdir sasview-install
+set PYTHONPATH=%WORKSPACE%\sasview-install;%PYTHONPATH%
+
+
+cd %WORKSPACE%
+cd dist
+%EASY_INSTALL% -d ..\sasview-install sasview-3.1.2-py2.7-win32.egg
+
+
+cd %WORKSPACE%\sasview
+python setup_exe.py py2exe
+python installer_generator.py
+"C:\Program Files (x86)\Inno Setup 5\ISCC.exe" installer.iss
+
+
+cd Output
+xcopy setupSasView.exe %WORKSPACE%\dist
+
+
+cd  %WORKSPACE%


Add info how to install Meteor on Windows.

--- rebuild-wekan.bat
+++ rebuild-wekan.bat
@@ -1,4 +1,9 @@
 @ECHO OFF
+
+REM NOTE: You can try this to install Meteor on Windows, it works:
+REM       https://github.com/zodern/windows-meteor-installer/
+
+REM Installing Meteor with Chocolatey does not currently work.

 REM NOTE: THIS .BAT DOES NOT WORK !!
 REM Use instead this webpage instructions to build on Windows:


Changed fetch location of OpenSSL-UWP to a private branch until a fix is ported to the official branch

--- cpython/PCbuild/get_externals.bat
+++ cpython/PCbuild/get_externals.bat
@@ -6,7 +6,7 @@
 pushd "%~dp0..\externals"

 if "%SVNROOT%"=="" set SVNROOT=http://svn.python.org/projects/external/
-if "%MSSVNROOT%"=="" set MSSVNROOT=https://github.com/Microsoft/openssl/branches/OpenSSL_1_0_2_WinRT-stable/
+if "%MSSVNROOT%"=="" set MSSVNROOT=https://github.com/alanch-ms/openssl/branches/OpenSSL_1_0_2_WinRT-stable_vars_fix/

 rem Optionally clean up first.  Be warned that this can be very destructive!
 if not "%1"=="" (


Fix clone command for appveyor

Fix clone command for appveyor

--- .appveyor/install.cmd
+++ .appveyor/install.cmd
@@ -1,4 +1,4 @@
-git clone https://github.com/Vasar007/TIMLE.git
+git clone https://github.com/SFML/SFML.git
 cd SFML

 mkdir install


Improve jrun.cmd script

Improve jrun.cmd script

Make the script as flexible as the bash version.

--- jrun.cmd
+++ jrun.cmd
@@ -1,9 +1,20 @@
 @echo off
+setlocal EnableDelayedExpansion

-set MODULES=(org.jenetics org.jenetics.example)
+set SCRIPT_DIR=%~dp0

+set MODULES=(^
+	%SCRIPT_DIR%org.jenetics^
+	%SCRIPT_DIR%org.jenetics.example^
+	%SCRIPT_DIR%org.jenetics.tool^
+)
+
+set CLASSPATH=.
 for %%m in %MODULES% do (
-    set CLASSPATH=%%m\build\classes\main;%%m\build\resources\main;%%m\build\classes\test;%%m\build\resources\test
+	set CLASSPATH=!CLASSPATH!;%%m\build\classes\main
+	set CLASSPATH=!CLASSPATH!;%%m\build\resources\main
+	set CLASSPATH=!CLASSPATH!;%%m\build\classes\test
+	set CLASSPATH=!CLASSPATH!;%%m\build\resources\test
 )

 java -cp %CLASSPATH% %*


Update upload.bat

Update upload.bat

--- conda/upload.bat
+++ conda/upload.bat
@@ -31,7 +31,7 @@

 echo OFF

-anaconda login --username "$ANACONDA_USERNAME" --password "$ANACONDA_PASSWORD"
+anaconda login --username %ANACONDA_USERNAME% --password %ANACONDA_PASSWORD%
 if %errorlevel% neq 0 (
   exit /b %errorlevel%
 )


sakuli.bat: added exitcode

sakuli.bat: added exitcode

--- src/common/src/main/resources/org/sakuli/common/bin/sakuli.bat
+++ src/common/src/main/resources/org/sakuli/common/bin/sakuli.bat
@@ -43,3 +43,4 @@
 echo  -Dany.property.key=value           JVM option to set a property on runtime
 echo.
 :end
+EXIT /b %ERRORLEVEL%


Fixed UpdateDependencies.bat to reference proper STTP library location

--- Build/Scripts/UpdateDependencies.bat
+++ Build/Scripts/UpdateDependencies.bat
@@ -34,11 +34,11 @@
 SET defaulttarget=%LOCALAPPDATA%\Temp\PDQTracker
 IF "%remote%" == "" SET remote=git@github.com:GridProtectionAlliance/pdqtracker.git
 IF "%source%" == "" SET source=\\GPAWEB\NightlyBuilds\GridSolutionsFramework\Beta
-IF "%sttp%" == "" SET sttp=\\GPAWEB\NightlyBuilds\sttp.net\Beta
+IF "%sttp%" == "" SET sttp=\\GPAWEB\NightlyBuilds\sttp-gsfapi\Beta
 IF "%target%" == "" SET target=%defaulttarget%

 SET libraries=%source%\Libraries\*.*
-SET sttplibrary=%sttp%\lib\sttp.net.dll
+SET sttplibrary=%sttp%\lib\sttp.gsf.dll
 SET dependencies=%target%\Source\Dependencies\GSF
 SET sourcemasterbuild=%source%\Build Scripts\MasterBuild.buildproj
 SET targetmasterbuild=%target%\Build\Scripts


Commit script update

Commit script update

--- Framework/Build/Shell/Commit.cmd
+++ Framework/Build/Shell/Commit.cmd
@@ -4,13 +4,17 @@
 git status --short
 cd ..
 git status --short
+set /p branchName=BranchName (Default master):
+if "%branchName%"=="" (set branchName=master)
 set /p m=Commit message:
 cd Submodule
 git checkout master & REM Prevent detached branch
+git checkout -B "%branchName%"
 git add .
 git commit -m "%m%"
 git push
 cd ..
+git checkout -B "%branchName%"
 git add .
 git commit -m "%m%"
 git push


adding option for running on Microsoft CCS

git-svn-id: 9146c88ff6d39b48099bf954d15d68f687b3fa69@8555 28e8926c-6b08-0410-baaa-805c5e19b8d6

--- scripts/windows/nbody.bat
+++ scripts/windows/nbody.bat
@@ -8,10 +8,17 @@

 call init.bat
 if "%1" equ "displayft" goto ft
-if "%1" neq "-displayft" goto noft
+if "%1" equ "-displayft" goto ft
+if "%1" equ "-ccs" goto ccs
+if "%1" equ "ccs" goto ccs
+goto noft

 :ft
 set XMLDESCRIPTOR="%PROACTIVE%\descriptors\FaultTolerantWorkersLocal.xml"
+goto cmd
+
+:ccs
+set XMLDESCRIPTOR="%PROACTIVE%\descriptors\WorkersApplicationCCS.xml"
 goto cmd

 :noft


Add grunt.cmd

Add grunt.cmd

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

--- script/grunt.cmd
+++ script/grunt.cmd
@@ -0,0 +1,5 @@
+@IF EXIST "%~dp0\node.exe" (
+  "%~dp0\node.exe"  "%~dp0\grunt" %*
+) ELSE (
+  node  "%~dp0\grunt" %*
+)


Use case 9 script for Windows.

Use case 9 script for Windows.

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

--- scripts/uc09.bat
+++ scripts/uc09.bat
@@ -0,0 +1,14 @@
+call activate cate
+cate ds make_local esacci.CLOUD.mon.L3C.CLD_PRODUCTS.MODIS.Terra.MODIS_TERRA.1-0.r1 CLOUD_2007 2007
+cate ds make_local esacci.OZONE.mon.L3.NP.multi-sensor.multi-platform.MERGED.fv0002.r1 OZONE_2007 2007
+mkdir uc09
+cd uc09
+cate ws init
+cate res open cloud local.CLOUD_2007
+cate res open ozone local.OZONE_2007
+cate res set cloud_sub subset_spatial ds=cloud region=0,30,10,40
+cate res set ozone_sub subset_spatial ds=ozone region=0,30,10,40
+cate res set cloud_res coregister ds_master=ozone_sub ds_slave=cloud_sub
+cate ws save
+cate ws close
+cd ..


Add scripts (Windows + cygwin)  for prepare bgp prefix table


Removed set "OUTDIR=bin" as this is now the default.

--- configure.ag.bat
+++ configure.ag.bat
@@ -14,7 +14,6 @@

 :# To avoid overwriting the existing WIN32 subdirectories in . and src and win32\zlib...
 if not defined OUTDIR ( :# Unless already redirected elsewhere
-  set "OUTDIR=bin"	&rem :# Output all built files in the bin subdirectory. (Instead of the default WIN32 and WIN64)
   set "LOGDIR=."	&rem :# But leave the log file in the build directory itself.
 )


UPDATE: SDKBuilder Dependency 폴더 복사 기능 추가

--- Resources/Applications/SDKBuilder/sdkbuilder.bat
+++ Resources/Applications/SDKBuilder/sdkbuilder.bat
@@ -66,6 +66,7 @@
 md "%target_directory%\Libraries"
 md "%target_directory%\Libraries\Sounds"
 md "%target_directory%\Libraries\Modules"
+md "%target_directory%\Libraries\Modules\Dependencies"
 md "%target_directory%\Libraries\Scripts"
 md "%target_directory%\Includes"
 md "%target_directory%\Templates"
@@ -84,7 +85,6 @@

 copy /Y "%target_directory%\..\DeveloperGuide.docx" "%target_directory%"
 xcopy /e /h /Y /I "%source_directory%\Sources\*.*" "%target_directory%\Includes"
-xcopy /e /h /Y /I "%source_directory%\..\..\Resources\Scripts\*.*" "%target_directory%\Libraries\Scripts"
 xcopy /e /h /Y /I "%source_directory%\..\..\Resources\Sounds\*.*" "%target_directory%\Libraries\Sounds"
 xcopy /e /h /Y /I ".\..\..\..\Projects\MDK\Sources\*.*" "%target_directory%\Templates"
 xcopy /h /Y /I "%source_directory%\Binaries\Core\*.*" "%target_directory%\Libraries"


Batch additions to make samples on Windows

--- make.bat
+++ make.bat
@@ -30,6 +30,25 @@
 DEL /Q test.exe
 GOTO :end

+:winsvc
+DEL /Q winsvc.exe
+SET LUVI_APP=samples\winsvc.app
+SET LUVI_TARGET=winsvc.exe
+luvi.exe
+SET "LUVI_APP="
+SET "LUVI_TARGET="
+GOTO :end
+
+:repl
+DEL /Q repl.exe
+SET LUVI_APP=samples\repl.app
+SET LUVI_TARGET=repl.exe
+luvi.exe
+SET "LUVI_APP="
+SET "LUVI_TARGET="
+GOTO :end
+
+
 :clean
 IF EXIST build RMDIR /S /Q build
 IF EXIST luvi.exe DEL /F /Q luvi.exe


Fix bug on make.cmd when %GOPATH% is not defined

--- make.cmd
+++ make.cmd
@@ -7,6 +7,8 @@

 if exist goarch.txt for /F %%I in (goarch.txt) do set "GOARCH=%%I"
 if "%GOARCH%" == "" for /F "delims=/ tokens=2" %%I in ('go version') do set "GOARCH=%%I"
+
+if "%GOPATH%" == "" set "GOPATH=%USERPROFILE%\go"

 call :"%~1"
 @popd


Update command line runner file.

Update command line runner file.

--- run.cmd
+++ run.cmd
@@ -1,3 +1,3 @@
-start "IIS" "C:\Program Files (x86)\IIS Express\iisexpress.exe" /path:"%CD%\src\witness" /port:1234
+start "IIS" "C:\Program Files (x86)\IIS Express\iisexpress.exe" /path:"%CD%\src\witness.specs" /port:1234
 tools\phantomjs\phantomjs.exe phantom.js %1
 taskkill /im iisexpress.exe


--- C/include/BatProxy.bat
+++ C/include/BatProxy.bat
@@ -10,7 +10,7 @@
 :#                                                                            *
 :#                  Make any change needed regarding the actual configuration *
 :#		    process in %STINCLUDE%\configure.bat. Idem for the make   *
-:#                  process in make.bat.				      *                                                          *
+:#                  process in make.bat.				      *
 :#                                                                            *
 :#  History:                                                                  *
 :#   2016-10-10 JFL jf.larvoire@hpe.com created this file.		      *
@@ -23,13 +23,14 @@
 :#                  in many Unix+Windows open source projects.                *
 :#                  Fixed several :# comments, which should have been &:#.    *
 :#   2018-01-12 JFL Improved comments and the debugging output.               *
+:#   2020-12-10 JFL Search for batchs in [.|..|..\..]\[.|WIN32|C]\include.    *
 :#                                                                            *
 :#         Copyright 2016 Hewlett Packard Enterprise Development LP          *
 :# Licensed under the Apache 2.0 license  www.apache.org/licenses/LICENSE-2.0 *
 :#*****************************************************************************

 setlocal EnableExtensions EnableDelayedExpansion
-set "VERSION=2018-01-12"
+set "VERSION=2020-12-10"
 set "SCRIPT=%~nx0"				&:# Script name

 goto main
@@ -67,9 +68,9 @@
 if defined STINCLUDE %CHECKDIR% "%STINCLUDE%" &:# If pre-defined, make sure the value is valid

 :# As a first choice, use the make.bat provided in this project
-if not defined STINCLUDE %CHECKDIR% include win32\include &:# If we have one here, use it
+if not defined STINCLUDE %CHECKDIR% include win32\include C\include &:# If we have one here, use it
 :# Else try in the near context
-for %%p in (.. ..\..) do if not defined STINCLUDE %CHECKDIR% %%p\include %%p\win32\include &:# Default: Search it the parent directory, and 2nd level.
+for %%p in (.. ..\..) do if not defined STINCLUDE %CHECKDIR% %%p\include %%p\win32\include %%p\C\include &:# Default: Search it the parent directory, and 2nd level.
 :# We might also store the information in the registry
 if not defined STINCLUDE ( :# Try getting the copy in the master environment
   for /f "tokens=3" %%v in ('reg query "HKCU\Environment" /v STINCLUDE 2^>NUL') do set "STINCLUDE=%%v"


Adding cmd script to prepare windows build with buildbot.

--- win_prepare_build.cmd
+++ win_prepare_build.cmd
@@ -7,18 +7,11 @@

 SET PKTH_OldDir=%CD%
 SET PKTH_BaseDir=%1
-if exist %PKTH_BaseDir%\mingw64\bin\mingw32-make.exe goto mingw64
 SET PATH=%PKTH_BaseDir%\qt\bin;%PKTH_BaseDir%\mingw32\bin;%PATH%
-SET PKTH_Conf=""
-goto postmingw
-:mingw64
-SET PATH=%PKTH_BaseDir%\qt\bin;%PKTH_BaseDir%\mingw64\bin;%PATH%
-SET PKTH_Conf=pkth_win64
-:postmingw
 SET QMAKESPEC=win32-g++
 SET QTDIR=%PKTH_BaseDir%\qt

 if exist Makefile. (
 mingw32-make distclean
 )
-qmake "CONFIG+=release %PKTH_Conf%" DEFINES+=BOOST_USE_WINDOWS_H pokerth.pro
+qmake DEFINES+=BOOST_USE_WINDOWS_H pokerth.pro


修改run.bat

修改run.bat

--- run.bat
+++ run.bat
@@ -1,2 +1,2 @@
-cd sample\ICanPay.Demo
-dotnet run+cd sample\PaySharp.Demo
+ dotnet run


setup maven

setup maven

--- run.cmd
+++ run.cmd
@@ -1,5 +1,6 @@
+goto:MAIN

-
+:BUILD
 cmd /c  mvnw clean
 cmd /c  mvnw install
 cmd /c  mvnw dependency:resolve
@@ -32,3 +33,14 @@
 cmd /c  mvnw dependency:tree
 rem cmd /c  mvnw dependency:unpack
 rem cmd /c  mvnw dependency:unpack-dependencies
+goto:FINALE
+
+:RUN
+cmd /c  mvnw exec:java
+goto:FINALE
+
+:MAIN
+goto:RUN
+rem goto:BUILD
+
+:FINALE


Blogging//Blog

Blogging//Blog


maven run

maven run

--- mvnw.cmd
+++ mvnw.cmd
@@ -142,4 +142,4 @@

 if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%

-exit /B %ERROR_CODE%
+exit /B %ERROR_CODE%


Added a missing error check to the saltbootstrap branch of script/cmtool.bat

--- script/cmtool.bat
+++ script/cmtool.bat
@@ -211,6 +211,9 @@
   powershell "%SALT_PATH%" -version "%CM_VERSION%" %SALT_OPTIONS%
 )

+@if errorlevel 1 echo ==^> WARNING: Error %ERRORLEVEL% was returned by: "%SALT_PATH%" -version "%CM_VERSION%" %SALT_OPTIONS%
+ver>nul
+
 goto exit0

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


Build/build-tests.bat: Use MSBUILD in Visual Studio 2015

--- Build/build-tests.bat
+++ Build/build-tests.bat
@@ -1,3 +1,3 @@
 @echo off
 SET ROOT=%~dp0..
-%WinDir%\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe %ROOT%\Build\tests.msbuild /verbosity:normal /p:Configuration=Release /p:Platform="AnyCPU" /target:CleanAndBuild /p:RestorePackages=false
+"C:\Program Files (x86)\MSBuild\14.0\Bin\MsBuild.exe" %ROOT%\Build\tests.msbuild /verbosity:normal /p:Configuration=Release /p:Platform="AnyCPU" /target:CleanAndBuild /p:RestorePackages=false


xmx bugfix

xmx bugfix

--- run.bat
+++ run.bat
@@ -1 +1 @@
-java -Xmx=128m -jar StatsPoller.jar
+java -Xmx128m -jar StatsPoller.jar


delete branch names from zip.bat

delete branch names from zip.bat

--- zip.bat
+++ zip.bat
@@ -1,4 +1,4 @@
 @echo off
-7z a git-auto-commit_debug-$Branch$-$MajorVersion$.$MinorVersion$.$Revision$-$Commit$-$ShortHash$.zip .\bin\Debug\*.*
-7z a git-auto-commit_release-$Branch$-$MajorVersion$.$MinorVersion$.$Revision$-$Commit$-$ShortHash$.zip .\bin\Release\*.*
+7z a git-auto-commit_debug-$MajorVersion$.$MinorVersion$.$Revision$-$Commit$-$ShortHash$.zip .\bin\Debug\*.*
+7z a git-auto-commit_release-$MajorVersion$.$MinorVersion$.$Revision$-$Commit$-$ShortHash$.zip .\bin\Release\*.*
 exit


Fix params

Fix params

--- Samples/Provisioning.SelfHostedWithAzureWebJob/Engine/governance-daily.cmd
+++ Samples/Provisioning.SelfHostedWithAzureWebJob/Engine/governance-daily.cmd
@@ -1 +1 @@
-PowerShell.exe -ExecutionPolicy RemoteSigned -NonInteractive -File mrgovernance.ps1 -verifyBusinessOwner -irm -syncPermissions -ensureAboutPage+PowerShell.exe -ExecutionPolicy RemoteSigned -NonInteractive -File mrgovernance.ps1 -syncPermissions


added batch file

added batch file

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

--- create_msi_3.5_x64.bat
+++ create_msi_3.5_x64.bat
@@ -0,0 +1,2 @@
+c:\Python\Python35\python.exe setup.py bdist_msi > create_msi_3.5_x64.output.log 2>&1
+


Specify feature file.

Specify feature file.

--- mybnb.bat
+++ mybnb.bat
@@ -50,7 +50,7 @@
 set python=%scriptPath%Python27\python.exe
 echo %python%

-call %python% batch_download_pic.py
+call %python% batch_download_pic.py 'features\bnb.feature'

 :Failed
 set EXITCODE=1


chore: add exclusion of xunit for reportgen

--- tools/testcoverage.bat
+++ tools/testcoverage.bat
@@ -4,7 +4,7 @@
 rmdir /q /s %destination%
 mkdir %destination%
 cd content/tests
-dotnet test /p:AltCover=true
+dotnet test /p:AltCover=true /p:AltCoverAssemblyExcludeFilter="xunit"
 mv coverage.xml ../../%destination%/coverage.xml

 cd ../../%destination%


senv.bat fix getparentdir and compute unixpath

--- senv.bat
+++ senv.bat
@@ -4,8 +4,16 @@
 set parent=%script: =,%
 set parent=%parent:\= %
 set parentdir=
+set unixpath=
 call :getparentdir %parent%
 set parent=%parentdir:,= %
+set unixpath=%unixpath%/b2d
+
+rem echo script='%script%'
+rem echo parentdir='%parentdir%'
+rem echo parent='%parent%'
+rem echo unixpath='%unixpath%'
+goto :eof

 if not exist ..\env.bat (
 	echo Add %parent%\env.bat: (..\env.bat^)
@@ -44,12 +52,43 @@

 rem http://www.dostips.com/DtTutoFunctions.php#FunctionTutorial.ReturningValuesClassic
 :getparentdir
-if "%~1" EQU "b2d" goto :EOF
+setlocal enabledelayedexpansion
+set P=%~1
+rem echo 1='%P%'
+rem echo getparentdir parentdir='%parentdir%'
+rem echo getparentdir unixpath='%unixpath%'
+if "!P!" EQU "" goto :eof
+if "!P!" EQU "b2d" (
+	endlocal
+	set "parentdir=%parentdir%"
+	set "unixpath=%unixpath%"
+	goto :EOF
+)
 if not "%parentdir%" == "" (
-	set "parentdir=%parentdir%\%~1"
+	set "parentdir=!parentdir!\!P!"
+	set "unixpath=!unixpath!/!P!"
+	rem echo notempty: parentdir='%parentdir%'
+	rem echo notempty: unixpath='%unixpath%'
 )
+rem echo between: parentdir='%parentdir%'
+rem echo between: unixpath='%unixpath%'
 if "%parentdir%" == "" (
-	set parentdir=%~1
+	set "parentdir=!P!"
+	set "unixpath=/!P!"
+	set "unixpath=!unixpath::=!"
+	call :lowercase unixpath
+	rem echo empty: parentdir='!parentdir!'
+	rem echo empty: unixpath='!unixpath!'
 )
 shift
+( endlocal & REM.-- RETURN VALUES
+	set "parentdir=%parentdir%"
+	set "unixpath=%unixpath%"
+)
+rem echo shiftt: parentdir='%parentdir%'
+rem echo shiftt: unixpath='%unixpath%'
 goto getparentdir
+
+:lowercase
+set %~1=!%1:C=c!
+goto :eof


Add Windows batch file to update stdlib.

error: pathspec 'Src/StdLib/update-stdlib.cmd' did not match any file(s) known to git

--- Src/StdLib/update-stdlib.cmd
+++ Src/StdLib/update-stdlib.cmd
@@ -0,0 +1,53 @@
+@echo off
+setlocal
+
+if [%1]==[] goto usage
+
+set _pyrepo=%1
+if not exist "%_pyrepo%\Lib" (
+    echo "%_pyrepo% does not look like a CPython repo (no Lib directory)."
+    goto :fail
+)
+
+for /f %%I in ('hg -R "%_pyrepo%" id -i') do set _hgrev=%%I
+set _stdlibdir=%~dp0
+pushd "%_stdlibdir%"
+
+git diff-index --quiet HEAD
+if "%ERRORLEVEL%" NEQ "0" (
+    echo "There are uncomitted changes. Commit or stash before proceeding."
+    goto :fail
+)
+
+for /f %%I in ('git rev-parse --abbrev-ref HEAD') do set _curbranch=%%I
+if "%_curbranch%" NEQ "python-stdlib" (
+    echo "This should only be run on the python-stdlib branch (on %_curbranch%)."
+    goto :fail
+)
+
+robocopy "%_pyrepo%\Lib" "%_stdlibdir%Lib" /MIR /R:1 /W:1 /XD plat-*
+
+git update-index --refresh -q > NUL
+git add -A "%_stdlibdir%/Lib"
+git diff-index --quiet HEAD
+
+if "%ERRORLEVEL%" EQU "0" (
+    echo "No changes found."
+) else (
+    git commit -am "Import python stdlib @ %_hgrev%"
+)
+
+goto :exit
+
+:usage
+echo %~n0 ^<path^\to^\cpython^>
+exit /B 1
+
+:fail
+popd
+endlocal
+exit /B 1
+
+:exit
+popd
+endlocal


Trying again with %CD% this time.

Trying again with %CD% this time.

--- ObjectModel/build.bat
+++ ObjectModel/build.bat
@@ -1,4 +1,4 @@
-echo %CD%
-call NuGetRestorePackagesOnly.bat .\VersionOne.SDK.ObjectModel.csproj ..\..\GetBuildTools\bin
-call NuGetUpdatePackages.bat .\packages.config
-msbuild .\VersionOne.SDK.ObjectModel.csproj /p:NuGetExePath=..\..\GetBuildTools\bin\NuGet.exe /p:RequireRestoreConsent=false /p:Configuration=Release /p:Platform=AnyCPU /p:Major=12 /p:Minor=2  /p:Revision=0 /p:AssemblyInformationalVersion="12.2.1.3588 Summer 2012" /p:AssemblyCopyright="Copyright 2012, VersionOne, Inc. Licensed under modified BSD." /p:CompanyName="VersionOne, Inc" /p:AssemblyProduct="VersionOne.SDK.ObjectModel" /p:AssemblyTitle="VersionOne SDK Object Model" /p:AssemblyDescription="VersionOne SDK .NET Object Model Release Build"+
+call NuGetRestorePackagesOnly.bat %CD%\VersionOne.SDK.ObjectModel.csproj ..\..\GetBuildTools\bin
+call NuGetUpdatePackages.bat %CD%\packages.config
+msbuild %CD%\VersionOne.SDK.ObjectModel.csproj /p:NuGetExePath=..\..\GetBuildTools\bin\NuGet.exe /p:RequireRestoreConsent=false /p:Configuration=Release /p:Platform=AnyCPU /p:Major=12 /p:Minor=2  /p:Revision=0 /p:AssemblyInformationalVersion="12.2.1.3588 Summer 2012" /p:AssemblyCopyright="Copyright 2012, VersionOne, Inc. Licensed under modified BSD." /p:CompanyName="VersionOne, Inc" /p:AssemblyProduct="VersionOne.SDK.ObjectModel" /p:AssemblyTitle="VersionOne SDK Object Model" /p:AssemblyDescription="VersionOne SDK .NET Object Model Release Build"


Remove trait filler from test batch file

--- test.bat
+++ test.bat
@@ -4,6 +4,7 @@
 	-parallel all ^
 	-html Result.html ^
 	-nologo -quiet ^
-	-trait "category=para1"
+
+

 @echo on


Adjusted command line

Adjusted command line

--- test.bat
+++ test.bat
@@ -1 +1 @@
-c:\projects\csharphdf5\src\CSharpHDF5\packages\NUnit.ConsoleRunner.3.2.0\tools\nunit3-console.exe  /xml:"c:\projects\results-test.xml" "c:\projects\csharphdf5\src\CSharpHDF5Tests\bin\x64\Debug\CSharpHDF5Tests.dll"+c:\projects\csharphdf5\src\CSharpHDF5\packages\NUnit.ConsoleRunner.3.2.0\tools\nunit3-console.exe --result=c:\projects\results-test.xml;format=nunit2 "c:\projects\csharphdf5\src\CSharpHDF5Tests\bin\x64\Debug\CSharpHDF5Tests.dll"


Delete uninstall_services.bat

Delete uninstall_services.bat

--- uninstall_services.bat
+++ uninstall_services.bat
@@ -1,5 +0,0 @@
-NET STOP wampapache
-.\bin\apache\apache2.4.4\bin\httpd.exe -k uninstall -n wampapache
-NET STOP wampmysqld
-.\bin\mysql\mysql5.6.12\bin\mysqld.exe --remove wampmysqld
-wampmanager.exe -quit -id={wampserver}


Added a script to rebuild Windows icon cache

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

--- batch/rebuild_icon_cache.bat
+++ batch/rebuild_icon_cache.bat
@@ -0,0 +1,49 @@
+:: Created by: Shawn Brink
+:: Created on: April 27th 2015
+:: Tutorial: http://www.tenforums.com/tutorials/5645-icon-cache-rebuild-windows-10-a.html
+
+
+@echo off
+set iconcache=%localappdata%\IconCache.db
+
+echo.
+echo The explorer process must be temporarily killed before deleting the IconCache.db file.
+echo.
+echo Please SAVE ALL OPEN WORK before continuing.
+echo.
+pause
+echo.
+If exist "%iconcache%" goto delete
+echo.
+echo The IconCache.db file has already been deleted.
+goto restart
+
+
+:delete
+echo.
+echo Attempting to delete IconCache.db files...
+echo.
+ie4uinit.exe -show
+taskkill /IM explorer.exe /F
+del /A /Q "%iconcache%"
+del /A /F /Q "%localappdata%\Microsoft\Windows\Explorer\iconcache*"
+start explorer.exe
+echo.
+echo IconCache.db files have been successfully deleted.
+goto restart
+
+
+:restart
+echo.
+echo.
+echo You will need to restart the PC to finish rebuilding your icon cache.
+echo.
+CHOICE /C:YN /M "Do you want to restart the PC now?"
+IF ERRORLEVEL 2 goto no
+IF ERRORLEVEL 1 goto yes
+
+:yes
+shutdown /r /f /t 00
+
+:no
+exit /B


fix bugs

fix bugs

--- MCal.bat
+++ MCal.bat
@@ -12,6 +12,11 @@
 :start
 :: we will check if MCal has been installed.
 IF NOT EXIST "MCal_deps\setup.chk" (
+goto installask
+:: doing this because of the way batch is shit
+)
+
+::installask
 cls
 echo MCal has not been run before.
 CHOICE /C:yn "Install now"
@@ -53,4 +58,4 @@
 :: for testing
 echo Dev test!
 call cmd
-cd ..+cd ..


Oasys1.3

--- Windows/install_oasys1.3.bat
+++ Windows/install_oasys1.3.bat
@@ -1,4 +1,7 @@
 @echo off
+
+type nul>nul
+setlocal enableDelayedExpansion

 echo OASYS 1.3 has not been released, yet. This is an unstable beta version.
 echo We warmly suggest to install OASYS 1.2. Do you want to interrupt the current installation?
@@ -7,10 +10,10 @@
 set /p "user_decision=[y]es, [n]o> [y]"

 if /I "!user_decision!"=="y" (
-    goto begin_installation
+    goto batch_exit
 ) else (
 	if /I "!user_decision!"=="n" (
-        goto batch_exit
+        goto begin_installation
     ) else (
         echo Invalid answer, please try again
         goto ask_install


Delete GitLogOutput.bat

Delete GitLogOutput.bat

--- Tools/GitLogOutput.bat
+++ Tools/GitLogOutput.bat
@@ -1 +0,0 @@
-git log v0.5..HEAD --pretty="%%H - %%s" --no-merges >output.txt


Added --fatal flag to premake bat file to check for premake warnings

--- Libs/Core/Premake/GenerateVS2015Project.bat
+++ Libs/Core/Premake/GenerateVS2015Project.bat
@@ -1,4 +1,4 @@
 cd /d "../../../Premake"
-"bin/windows/premake5.exe" vs2015
+"bin/windows/premake5.exe" vs2015 --fatal
 @echo[
 PAUSE


Primitive build script

Primitive build script

--- prepare-build.cmd
+++ prepare-build.cmd
@@ -10,6 +10,7 @@
 xcopy TCPRelay\bin\Release\es-AR out\x86\es-AR /y /i
 xcopy TCPRelay\bin\Release\nl-NL out\x86\nl-NL /y /i
 copy TCPRelayCommon\readme.txt out\x86
+copy TCPRelayCommon\history.txt out\x86
 copy TCPRelayConsole\bin\Release\TCPRelayC.exe out\x86

 copy TCPRelay\bin\x64\Release\TCPRelay.exe out\x64
@@ -20,4 +21,5 @@
 xcopy TCPRelay\bin\x64\Release\es-AR out\x64\es-AR /y /i
 xcopy TCPRelay\bin\x64\Release\nl-NL out\x64\nl-NL /y /i
 copy TCPRelayCommon\readme.txt out\x64
+copy TCPRelayCommon\history.txt out\x64
 copy TCPRelayConsole\bin\x64\Release\TCPRelayC.exe out\x64


Updated release.cmd for the native dll to have date and time as part of the archive filename

--- native/tightdb_c_cs/tightdb_c_cs2012/release.cmd
+++ native/tightdb_c_cs/tightdb_c_cs2012/release.cmd
@@ -2,29 +2,48 @@
 echo Tightdb C# binding c++ Windows Build.
 Echo alpha 0.02
 echo ----------------------------------------------------------
-Echo Currently this batch file will create a release version of
-echo the already built source in the source directory used by
-echo the project residing where the batch
-echo file resides. The release version will be placed in
-echo (git checkout directory)\release\cppfiles\
-echo and (git checkout directory)\release\cpprelease\
-echo the directories are created if they does not exist.
-echo prior contents of release tree will be deleted,
-echo except .7z files.
+echo press any key to populate release directory with
+echo a set of DLL files used by C# programs that access tightdb.
+echo .
+echo In general, relase.cmd will create release directories
+echo with release versions of the already built solution in the
+echo same directory as where the solution file is.
+echo The release version will be placed in a directory called
+echo release, in two sub directories files\ and release\
+echo files\ will be an uncompressed release of all needed files
+echo laid out in a logical way, and release\ will contain
+echo a zipped version of the files\directory - named according
+echo to the time the winrelease.cmd file was run
+echo the zipfile will also contain the username from the
+echo computer that generated the zipfile
 echo the contents of the directory will be c++ dll files
 echo in various builds.
+echo these dll's will contain methods called by the C# binding
+echo the dll's contain compiled core code
 echo This release is in effect our C interface release on windows
 echo It is consumed by the C# binding,but could also
-echo be used by bindings for other windows languages.
+echo be adapted to be used by bindings for other
+echo windows languages. biggest task would be to create
+echo a header file, describing the contents of the dll
 echo ----------------------------------------------------------
 :echo parametres (%0)
 :echo where this file is located (%~dp0)
 :echo on

 set location=%~dp0
-set date=xdatex
-set time=xtimex
-set developer=xdeveloperx
+set reldate=%date:~6,4%-%date:~3,2%-%date:~0,2%
+set reltime=%time::=%
+set reltime=%reltime: =%
+set reltime=%reltime:,=%
+set reldeveloper=%USERNAME: =%
+set reldeveloper=%reldeveloper:,=%
+echo this batchfile is located at %location%
+echo -
+echo - release date will be set to %reldate%
+echo - release time will be set to %reltime%
+echo - release user will be set to %reldeveloper%
+echo -
+echo Press Any key to proceed, or close the window to abort
 set filesdestination=%location%release\files
 set releasedestination=%location%release\release
 set zipper=%location%..\..\..\7z.exe
@@ -59,7 +78,7 @@
 copy %location%x64\release\*.dll %filesdestination%
 :create archive
 cd %filesdestination%
-%zipper% a -tzip -r %releasedestination%\tightdb_c_%xdatex%_%xtimex%_%xdeveloperx% *.*
+%zipper% a -tzip -r %releasedestination%\tightdb_c_%reldate%_%reltime%_%reldeveloper% *.*

 :revision history
 :0.01


add more HP entries

add more HP entries

--- resources/stage_2_de-bloat/oem/programs_to_target_by_GUID.bat
+++ resources/stage_2_de-bloat/oem/programs_to_target_by_GUID.bat
@@ -375,6 +375,9 @@

 :: Business Complete Care Services Agreement
 start /wait msiexec /qn /norestart /x {A3BE3F1E-2472-4211-8735-E8239BE49D9F}
+
+:: Broadcom InConcert Maestro
+start /wait msiexec /qn /norestart /x {57DD35E9-D9BB-4089-BB05-EF933C586CB3}

 :: Browser Address Error Redirector
 start /wait msiexec /qn /norestart /x {DF9A6075-9308-4572-8932-A4316243C4D9}
@@ -543,6 +546,7 @@
 start /wait msiexec /qn /norestart /x {7D239561-1825-4E59-92FA-CA3230963BBD}
 start /wait msiexec /qn /norestart /x {A69D7B32-2BE9-42BF-B576-69B5E0FF7394}
 start /wait msiexec /qn /norestart /x {383FCD28-9484-48AC-9397-C8FCD9D8F76E}
+start /wait msiexec /qn /norestart /x {45160C56-61F6-468D-A5B0-9FAE2C3E68D6}

 :: Catalyst Control Center Graphics Previews Common (various version numbers)
 start /wait msiexec /qn /norestart /x {190A9F41-85D0-CDB3-AA2D-A076D30953C9}
@@ -581,6 +585,7 @@
 start /wait msiexec /qn /norestart /x {850C7BC5-8CBC-4635-552E-C0AD6A0EA01E}
 start /wait msiexec /qn /norestart /x {BCBEB9CF-2DEA-33F6-2C8D-733C2F243597}
 start /wait msiexec /qn /norestart /x {3A25676C-038C-504A-FA32-F971B36BF7EE}
+start /wait msiexec /qn /norestart /x {E755FF48-9936-FE6B-3910-490DFB39F56D}

 :: CCC Catalyst Control Center multi-lingual Help files. Too many to individually list, Google each GUID for more info. Also listed as CCC Help
 start /wait msiexec /qn /norestart /x {0EB8D099-E537-E3D3-039A-CBC50899C25B}
@@ -1315,6 +1320,13 @@
 start /wait msiexec /qn /norestart /x {947E1256-258E-60A2-7331-44D09E61CF99}
 start /wait msiexec /qn /norestart /x {2B642F70-BA82-5E78-41CE-BDFFD5C37530}
 start /wait msiexec /qn /norestart /x {2EA40F3D-0D93-A391-F383-6F1C708B80BF}
+start /wait msiexec /qn /norestart /x {5681FF4A-5469-D41F-F990-D1AC1037AB02}
+
+:: Catalyst Control Center Profiles Mobile
+start /wait msiexec /qn /norestart /x {5A6CB42D-AFB6-989E-E7EB-B3FF928C707F}
+
+:: Catalyst Control Center InstallProxy
+start /wait msiexec /qn /norestart /x {1267DA48-A6EA-3202-6C02-0AD5D3AAF360}

 :: ccc-utility64
 start /wait msiexec /qn /norestart /x {75BF0B9A-1E6E-FF5D-A0BA-1A0F3AE3B7C9}
@@ -1327,6 +1339,28 @@
 start /wait msiexec /qn /norestart /x {D5D4D47F-60C8-AAA1-6366-78EF6AF1221C}
 start /wait msiexec /qn /norestart /x {13059C0E-FF81-40C5-D15B-7905D3CDD783}
 start /wait msiexec /qn /norestart /x {D9C2E250-17A1-0D68-CB41-83232EC31C2C}
+start /wait msiexec /qn /norestart /x {63240320-9946-4A11-5135-DB66D8113842}
+start /wait msiexec /qn /norestart /x {1E8D5440-0CC6-6E2D-7A1A-1B02699C76DE}
+start /wait msiexec /qn /norestart /x {3C213840-A3A6-FD8C-91E5-AC7566FCB71B}
+start /wait msiexec /qn /norestart /x {CE7AE690-57AF-286B-B022-A808D30F08F2}
+start /wait msiexec /qn /norestart /x {68DDF0E0-42D9-B5C3-AD7A-3E1DCCE8D2E3}
+start /wait msiexec /qn /norestart /x {08E8F1F2-6E5B-C5A4-A5FD-B76CCF833F21}
+start /wait msiexec /qn /norestart /x {9F7E4DF2-1795-99AD-CDD7-29F440B61088}
+start /wait msiexec /qn /norestart /x {E1625943-425A-6675-6A52-6AE98AC3080F}
+start /wait msiexec /qn /norestart /x {C0116FFA-6568-B16B-09EF-01E97CEF89E9}
+start /wait msiexec /qn /norestart /x {11C8CD1B-B0F8-D6F5-3E5D-6103FA7A2740}
+start /wait msiexec /qn /norestart /x {C501064B-0925-A417-D08B-A96C07D11E01}
+start /wait msiexec /qn /norestart /x {A79846AB-AE6A-C993-71DF-99FF8E559613}
+start /wait msiexec /qn /norestart /x {AFF6CCCD-2C82-CF3F-58AD-1766D370622F}
+start /wait msiexec /qn /norestart /x {14FDECFD-FBA1-5D0A-16FE-51621197077E}
+start /wait msiexec /qn /norestart /x {D9965E8E-496F-F5E4-D8FF-78FB7EBE6ABA}
+start /wait msiexec /qn /norestart /x {DA8B96DE-3FE5-2079-D33B-7152C13AFC73}
+start /wait msiexec /qn /norestart /x {CDF2096F-1FBD-C097-15BC-8BC64AF0B6F7}
+start /wait msiexec /qn /norestart /x {F70487C4-B639-5576-6DE1-2D2D790AC51A}
+start /wait msiexec /qn /norestart /x {2F36E5A1-A627-3736-D4BC-7962DD22EE0B}
+start /wait msiexec /qn /norestart /x {44C72B93-46FA-6D17-4020-E796E8D9C808}
+start /wait msiexec /qn /norestart /x {2041A685-F8DC-A7C7-2AF4-CE646D1E2161}
+start /wait msiexec /qn /norestart /x {103729AF-35B8-7567-2739-905128A38CFE}

 :: CITIZEN bloatware (printer)
 start /wait msiexec /qn /norestart /x {546D97C7-9DF6-4A2D-BE02-2C0B25FFE1E3}
@@ -1973,6 +2007,7 @@
 start /wait msiexec /qn /norestart /x {54CE68A8-4F2D-4328-B1F7-D6C720405F7F}
 start /wait msiexec /qn /norestart /x {299625B9-6C69-462C-9CEA-8E06D878B1C5}
 start /wait msiexec /qn /norestart /x {85A42FF0-F0D0-44A3-B226-C124D6E8B1D5}
+start /wait msiexec /qn /norestart /x {DFB497E0-CE3F-40FC-9596-FC7A48775DE4}

 :: HP 64 Bit HP CIO Components Installer
 start /wait msiexec /qn /norestart /x {FF21C3E6-97FD-474F-9518-8DCBE94C2854}
@@ -2048,6 +2083,9 @@
 :: HP CinemaNow Media Manager
 start /wait msiexec /qn /norestart /x {A5E65B95-F016-474D-BC0D-6AF64412BBDF}

+:: HP Client Automation Preload
+start /wait msiexec /qn /norestart /x {52B18ABC-AD5F-4C3C-B391-04F57B380449}
+
 :: HP Client Security Manager (various versions)
 start /wait msiexec /qn /norestart /x {39930586-2677-432B-B928-F970FB43F46F}
 start /wait msiexec /qn /norestart /x {3B46DFDA-6155-423B-BCBB-F1C267E4ADD9}
@@ -2068,13 +2106,14 @@
 start /wait msiexec /qn /norestart /x {F1DD6CD2-6734-4089-9EF5-441F51E083B6}
 start /wait msiexec /qn /norestart /x {F243A34B-AB7F-4065-B770-B85B767C247C}

-:: HP Connection Manager (various versions)
+:: HP Connection Manager
 start /wait msiexec /qn /norestart /x {04C23662-CE15-48BE-AF77-7BD9028934E7}
 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}
+start /wait msiexec /qn /norestart /x {4B21E4B2-89B8-499D-803A-34ABF929401E}

 :: HP CoolSense
 start /wait msiexec /qn /norestart /x {85DF2EED-08BC-46FB-90DA-28B0D0A8E8A8}
@@ -2114,6 +2153,9 @@

 :: HP Connected Music
 start /wait msiexec /qn /norestart /x {8126E380-F9C6-4317-9CEE-9BBDDAB676E5}
+
+:: HP DayStarter
+start /wait msiexec /qn /norestart /x {483D5A49-A26B-4CB8-AA2D-0D1811322061}

 :: HP D2400_Help
 start /wait msiexec /qn /norestart /x {7EF7CCB0-52BF-4947-BE6E-E47D586E8842}
@@ -2186,6 +2228,7 @@
 start /wait msiexec /qn /norestart /x {89A12FD9-8FA0-4EB9-AE9A-34C7EB25C25B}
 start /wait msiexec /qn /norestart /x {25F3EC6C-BB03-4CEB-B36C-E656A9DD149E}
 start /wait msiexec /qn /norestart /x {0ABC7C72-64F0-4D7F-B9A4-9E82A56EC874}
+start /wait msiexec /qn /norestart /x {62272D4E-78E9-4BAD-B7AA-63072D06AAA9}

 :: HP DocProc
 start /wait msiexec /qn /norestart /x {676981B7-A2D9-49D0-9F4C-03018F131DA9}
@@ -2389,6 +2432,12 @@
 :: HP Setup
 start /wait msiexec /qn /norestart /x {E2831862-F131-4327-B9CC-FA30F587EB6C}

+:: HP Software Framework
+start /wait msiexec /qn /norestart /x {1DFA0C99-6E2E-46F4-B242-51C7CF41DDE5}
+
+:: HP Software Setup
+start /wait msiexec /qn /norestart /x {531000B3-DBEE-4115-BBF3-DA48B67C053F}
+
 :: HP SoftPaq Download Manager
 start /wait msiexec /qn /norestart /x {FE465061-894A-4023-8580-56FCDD4F23F9}

@@ -2460,6 +2509,7 @@
 :: HP Power Assistant
 start /wait msiexec /qn /norestart /x {3C33FD2E-6B21-4CD3-B41A-A7331D467617}
 start /wait msiexec /qn /norestart /x {84642787-58C0-44AE-8B26-E2F544E380A1}
+start /wait msiexec /qn /norestart /x {3D8EDF72-13CC-4E51-AAB6-32A20524D2E0}

 :: HP Power Data
 start /wait msiexec /qn /norestart /x {42DBA167-C25D-49CE-BBAF-DEC25E737DA8}
@@ -2579,6 +2629,7 @@
 start /wait msiexec /qn /norestart /x {34C821CA-6B55-44A0-8A9B-2EF471D6019E}
 start /wait msiexec /qn /norestart /x {6821D775-9303-46DD-977A-2D97CA18B054}
 start /wait msiexec /qn /norestart /x {2DA697D7-FED3-4DE2-A174-92A2A12F9688}
+start /wait msiexec /qn /norestart /x {344A1AA2-AC8E-4741-BDB0-65B68FDA883C}

 :: HP Software Framework
 start /wait msiexec /qn /norestart /x {B6F5C6D8-C443-4B55-932F-AE11B5743FC4}
@@ -2632,6 +2683,7 @@
 start /wait msiexec /qn /norestart /x {CA43FE4F-9FF2-4AD7-88F0-CC3BAC17B226}
 start /wait msiexec /qn /norestart /x {E959FD01-BD01-4CC4-9BB8-4EBE8309BF37}
 start /wait msiexec /qn /norestart /x {78E2C850-ADA6-420D-BA35-2F4A9BE733CC}
+start /wait msiexec /qn /norestart /x {E02FBF01-0DE3-4BCB-89E8-D300FEFC3289}

 :: HP Support Information
 start /wait msiexec /qn /norestart /x {B2B7B1C8-7C8B-476C-BE2C-049731C55992}
@@ -2650,6 +2702,7 @@
 start /wait msiexec /qn /norestart /x {28FE073B-1230-4BF6-830C-7434FD0C0069}
 start /wait msiexec /qn /norestart /x {C422BF2C-E570-4D3E-8718-7C641B190DB2}
 start /wait msiexec /qn /norestart /x {39011DEC-8956-401E-8369-421D402FFF52}
+start /wait msiexec /qn /norestart /x {54C65FE7-83BD-4A5B-A9B4-41F793C5F241}

 :: HP System Event Utility
 start /wait msiexec /qn /norestart /x {8B4EE87E-6D40-4C91-B5E8-0DC77DC412F1}
@@ -4209,6 +4262,9 @@
 :: Windows Live Sync
 start /wait msiexec /qn /norestart /x {84EBDF39-4B33-49D7-A0BD-EB6E2C4E81C1}

+:: Windows Media Player Firefox Plugin
+start /wait msiexec /qn /norestart /x {69FDFBB6-351D-4B8C-89D8-867DC9D0A2A4}
+
 :: WinZip (various versions) // WinZip Courier // Disabled by Vocatus for Tron
 :: start /wait msiexec /qn /norestart /x {CD95F661-A5C4-44F5-A6AA-ECDD91C240ED}
 :: start /wait msiexec /qn /norestart /x {CD95F661-A5C4-44F5-A6AA-ECDD91C240CD}