Fix deployment script

Fix deployment script

--- deploy.cmd
+++ deploy.cmd
@@ -24,46 +24,15 @@
 echo ARTIFACTS=%ARTIFACTS%
 echo DEPLOYMENT_SOURCE=%DEPLOYMENT_SOURCE%
 echo DEPLOYMENT_TARGET=%DEPLOYMENT_TARGET%
-echo DEPLOYMENT_TARGET_ANGULAR=%DEPLOYMENT_TARGET_ANGULAR%
 echo NEXT_MANIFEST_PATH=%NEXT_MANIFEST_PATH%
 echo PREVIOUS_MANIFEST_PATH=%PREVIOUS_MANIFEST_PATH%
 echo DEPLOYMENT_TEMP=%DEPLOYMENT_TEMP%
 echo IN_PLACE_DEPLOYMENT=%IN_PLACE_DEPLOYMENT%
-echo YARN=%YARN%
 echo ANGUALR_CLI=%ANGUALR_CLI%

 setlocal enabledelayedexpansion

 SET ARTIFACTS=%~dp0%..\artifacts
-
-IF NOT DEFINED DEPLOYMENT_SOURCE (
-	SET DEPLOYMENT_SOURCE=%~dp0%.
-	echo SET DEPLOYMENT_SOURCE
-)
-
-IF NOT DEFINED DEPLOYMENT_TARGET (
-  SET DEPLOYMENT_TARGET=%ARTIFACTS%\wwwroot
-)
-
-IF NOT DEFINED NEXT_MANIFEST_PATH (
-  SET NEXT_MANIFEST_PATH=%ARTIFACTS%\manifest
-
-  IF NOT DEFINED PREVIOUS_MANIFEST_PATH (
-    SET PREVIOUS_MANIFEST_PATH=%ARTIFACTS%\manifest
-  )
-)
-
-IF NOT DEFINED NEXT_CLIENT_MANIFEST_PATH (
-  SET NEXT_CLIENT_MANIFEST_PATH=%ARTIFACTS%\client-manifest
-
-  IF NOT EXIST "%NEXT_CLIENT_MANIFEST_PATH%" (MKDIR "%NEXT_CLIENT_MANIFEST_PATH%")
-
-  IF NOT DEFINED PREVIOUS_CLIENT_MANIFEST_PATH (
-    SET PREVIOUS_CLIENT_MANIFEST_PATH=%ARTIFACTS%\client-manifest
-  )
-
-  IF NOT EXIST "%PREVIOUS_CLIENT_MANIFEST_PATH%" (MKDIR "%PREVIOUS_CLIENT_MANIFEST_PATH%")
-)

 IF NOT EXIST "%HOME%\tools" (MKDIR "%HOME%\tools")

@@ -72,45 +41,9 @@
 call npm config set prefix "%HOME%\tools"
 IF !ERRORLEVEL! NEQ 0 goto error

-IF NOT DEFINED KUDU_SYNC_CMD (
-  :: Install kudu sync
-  echo Installing Kudu Sync
-  call npm install kudusync -g --silent
-  IF !ERRORLEVEL! NEQ 0 goto error
-
-  :: Locally just running "kuduSync" would also work
-  SET KUDU_SYNC_CMD=%appdata%\npm\kuduSync.cmd
-)
-
-IF NOT DEFINED YARN (
-  :: Install yarn
-  echo Installing yarn
-  call npm install -g yarn
-
-  IF !ERRORLEVEL! NEQ 0 goto error
-
-  SET YARN=true
-)
-
-IF NOT DEFINED ANGUALR_CLI (
-  :: Install angular-cli
-  echo Installing @angular/cli
-  call npm install -g @angular/cli@1.0.0
-
-  IF !ERRORLEVEL! NEQ 0 goto error
-
-  SET ANGUALR_CLI=true
-)
-
-IF NOT DEFINED DEPLOYMENT_TEMP (
-  SET DEPLOYMENT_TEMP=%temp%\___deployTemp%random%
-  SET CLEAN_LOCAL_DEPLOYMENT_TEMP=true
-)
-
-IF DEFINED CLEAN_LOCAL_DEPLOYMENT_TEMP (
-  IF EXIST "%DEPLOYMENT_TEMP%" rd /s /q "%DEPLOYMENT_TEMP%"
-  mkdir "%DEPLOYMENT_TEMP%"
-)
+echo Installing yarn
+call npm install -g yarn
+IF !ERRORLEVEL! NEQ 0 goto error

 IF DEFINED MSBUILD_PATH goto MsbuildPathDefined
 SET MSBUILD_PATH=%ProgramFiles(x86)%\MSBuild\14.0\Bin\MSBuild.exe
@@ -120,91 +53,35 @@
 :: Deployment
 :: ----------

-echo Print variables
-echo dp0=%~dp0%
-echo ARTIFACTS=%ARTIFACTS%
-echo DEPLOYMENT_SOURCE=%DEPLOYMENT_SOURCE%
-echo DEPLOYMENT_TARGET=%DEPLOYMENT_TARGET%
-echo DEPLOYMENT_TARGET_ANGULAR=%DEPLOYMENT_TARGET_ANGULAR%
-echo NEXT_MANIFEST_PATH=%NEXT_MANIFEST_PATH%
-echo PREVIOUS_MANIFEST_PATH=%PREVIOUS_MANIFEST_PATH%
-echo DEPLOYMENT_TEMP=%DEPLOYMENT_TEMP%
-echo IN_PLACE_DEPLOYMENT=%IN_PLACE_DEPLOYMENT%
-echo YARN=%YARN%
-echo ANGUALR_CLI=%ANGUALR_CLI%
-
 echo Handling backend WebApi project.
 echo Restore NuGet packages
-IF /I "AzureFunctions.sln" NEQ "" (
-  call :ExecuteCmd nuget restore "%DEPLOYMENT_SOURCE%\AzureFunctions.sln"
-  IF !ERRORLEVEL! NEQ 0 goto error
-)
+call :ExecuteCmd nuget restore "%DEPLOYMENT_SOURCE%\AzureFunctions.sln"
+IF !ERRORLEVEL! NEQ 0 goto error

 :: 1. Build backend WebApi to the temporary path
-IF /I "%IN_PLACE_DEPLOYMENT%" NEQ "1" (
-  echo "%MSBUILD_PATH%" "%DEPLOYMENT_SOURCE%\AzureFunctions\AzureFunctions.csproj" /nologo /verbosity:m /t:Build /t:pipelinePreDeployCopyAllFilesToOneFolder /p:_PackageTempDir="%DEPLOYMENT_TEMP%";AutoParameterizationWebConfigConnectionStrings=false;Configuration=Release;UseSharedCompilation=false  /p:DeleteExistingFiles=False /p:SolutionDir="%DEPLOYMENT_SOURCE%\.\\" %SCM_BUILD_ARGS%
-  call :ExecuteCmd "%MSBUILD_PATH%" "%DEPLOYMENT_SOURCE%\AzureFunctions\AzureFunctions.csproj" /nologo /verbosity:m /t:Build /t:pipelinePreDeployCopyAllFilesToOneFolder /p:_PackageTempDir="%DEPLOYMENT_TEMP%";AutoParameterizationWebConfigConnectionStrings=false;Configuration=Release;UseSharedCompilation=false  /p:DeleteExistingFiles=False /p:SolutionDir="%DEPLOYMENT_SOURCE%\.\\" %SCM_BUILD_ARGS%
-  IF !ERRORLEVEL! NEQ 0 goto error
-) ELSE (
-  call :ExecuteCmd "%MSBUILD_PATH%" "%DEPLOYMENT_SOURCE%\AzureFunctions\AzureFunctions.csproj" /nologo /verbosity:m /t:Build /p:AutoParameterizationWebConfigConnectionStrings=false;Configuration=Release;UseSharedCompilation=false  /p:DeleteExistingFiles=False /p:SolutionDir="%DEPLOYMENT_SOURCE%\.\\" %SCM_BUILD_ARGS%
-  IF !ERRORLEVEL! NEQ 0 goto error
-)
+echo "%MSBUILD_PATH%" "%DEPLOYMENT_SOURCE%\AzureFunctions\AzureFunctions.csproj" /nologo /verbosity:m /t:Build /t:pipelinePreDeployCopyAllFilesToOneFolder /p:_PackageTempDir="%DEPLOYMENT_TEMP%";AutoParameterizationWebConfigConnectionStrings=false;Configuration=Release;UseSharedCompilation=false  /p:DeleteExistingFiles=False /p:SolutionDir="%DEPLOYMENT_SOURCE%\.\\" %SCM_BUILD_ARGS%
+call :ExecuteCmd "%MSBUILD_PATH%" "%DEPLOYMENT_SOURCE%\AzureFunctions\AzureFunctions.csproj" /nologo /verbosity:m /t:Build /t:pipelinePreDeployCopyAllFilesToOneFolder /p:_PackageTempDir="%DEPLOYMENT_TEMP%";AutoParameterizationWebConfigConnectionStrings=false;Configuration=Release;UseSharedCompilation=false  /p:DeleteExistingFiles=False /p:SolutionDir="%DEPLOYMENT_SOURCE%\.\\" %SCM_BUILD_ARGS%
+IF !ERRORLEVEL! NEQ 0 goto error

 echo Handling frontend Angular2 project.
-echo IF EXIST "%DEPLOYMENT_SOURCE%\AzureFunctions.AngularClient\package.json" (
 :: 2. Bundle frontend angular2 app to the temporary path
-IF EXIST "%DEPLOYMENT_SOURCE%\AzureFunctions.AngularClient\package.json" (
-
-	echo "In IF EXIST for Handling frontend Angular2 project"
-
-	IF /I "%IN_PLACE_DEPLOYMENT%" NEQ "1" (
-		echo ROBOCOPY "%DEPLOYMENT_SOURCE%\AzureFunctions.AngularClient" "%ARTIFACTS%\AzureFunctions.AngularClient" /E /IS
-		call :ExecuteCmd ROBOCOPY "%DEPLOYMENT_SOURCE%\AzureFunctions.AngularClient" "%ARTIFACTS%\AzureFunctions.AngularClient" /E /IS
-		:: http://ss64.com/nt/robocopy-exit.html
-		IF %ERRORLEVEL% EQU 16 echo ***FATAL ERROR*** & goto error
-		IF %ERRORLEVEL% EQU 15 echo OKCOPY + FAIL + MISMATCHES + XTRA & goto error
-		IF %ERRORLEVEL% EQU 14 echo FAIL + MISMATCHES + XTRA & goto error
-		IF %ERRORLEVEL% EQU 13 echo OKCOPY + FAIL + MISMATCHES & goto error
-		IF %ERRORLEVEL% EQU 12 echo FAIL + MISMATCHES& goto error
-		IF %ERRORLEVEL% EQU 11 echo OKCOPY + FAIL + XTRA & goto error
-		IF %ERRORLEVEL% EQU 10 echo FAIL + XTRA & goto error
-		IF %ERRORLEVEL% EQU 9 echo OKCOPY + FAIL & goto error
-		IF %ERRORLEVEL% EQU 8 echo FAIL & goto error
-		IF %ERRORLEVEL% EQU 7 echo OKCOPY + MISMATCHES + XTRA & goto error
-		IF %ERRORLEVEL% EQU 6 echo MISMATCHES + XTRA & goto error
-		IF %ERRORLEVEL% EQU 5 echo OKCOPY + MISMATCHES & goto error
-		IF %ERRORLEVEL% EQU 4 echo MISMATCHES & goto error
-		IF %ERRORLEVEL% EQU 3 echo OKCOPY + XTRA
-		IF %ERRORLEVEL% EQU 2 echo XTRA
-		IF %ERRORLEVEL% EQU 1 echo OKCOPY
-		IF %ERRORLEVEL% EQU 0 echo No Change
-	)
-
-	pushd "%ARTIFACTS%\AzureFunctions.AngularClient"
-	echo Restore npm packages
+	pushd "%DEPLOYMENT_SOURCE%\AzureFunctions.AngularClient"
+	echo Restore yarn packages
 	call :ExecuteCmd yarn install
 	IF !ERRORLEVEL! NEQ 0 (
 		call :ExecuteCmd yarn install
 		IF !ERRORLEVEL! NEQ 0 goto error
 	)
 	echo Bundle angular2 app
-	:: Temporarily disabling minification for prod troubleshooting
-	call :ExecuteCmd ng build --environment=prod --output-path="%ARTIFACTS%\AzureFunctions.AngularClient\dist"
+	call :ExecuteCmd node_modules\.bin\ng build --environment=prod --output-path="%ARTIFACTS%\dist"
 	IF !ERRORLEVEL! NEQ 0 (
-		call :ExecuteCmd ng build --environment=prod --output-path="%ARTIFACTS%\AzureFunctions.AngularClient\dist"
+		call :ExecuteCmd node_modules\.bin\ng build --environment=prod --output-path="%ARTIFACTS%\dist"
 		IF !ERRORLEVEL! NEQ 0 goto error
 	)

-	:: pushd "%ARTIFACTS%\AzureFunctions.AngularClient\dist"
-	::	mv main.*.bundle.js main.bundle.js
-	::	mv scripts.*.bundle.js scripts.bundle.js
-	::	mv styles.*.bundle.js styles.bundle.js
-	:: popd
-
 	echo Copy angular output to the temporary path
-	IF /I "%IN_PLACE_DEPLOYMENT%" NEQ "1" (
-		echo ROBOCOPY "%ARTIFACTS%\AzureFunctions.AngularClient\dist" "%DEPLOYMENT_TEMP%" /E /IS
-		call :ExecuteCmd ROBOCOPY "%ARTIFACTS%\AzureFunctions.AngularClient\dist" "%DEPLOYMENT_TEMP%" /E /IS
+		echo ROBOCOPY "%ARTIFACTS%\dist" "%DEPLOYMENT_TEMP%" /E /IS
+		call :ExecuteCmd ROBOCOPY "%ARTIFACTS%\dist" "%DEPLOYMENT_TEMP%" /E /IS
 		:: http://ss64.com/nt/robocopy-exit.html
 		IF %ERRORLEVEL% EQU 16 echo ***FATAL ERROR*** & goto error
 		IF %ERRORLEVEL% EQU 15 echo OKCOPY + FAIL + MISMATCHES + XTRA & goto error
@@ -224,10 +101,10 @@
 		IF %ERRORLEVEL% EQU 1 echo OKCOPY
 		IF %ERRORLEVEL% EQU 0 echo No Change

-		IF EXIST "%ARTIFACTS%\AzureFunctions.AngularClient\node_modules\swagger-editor" (
+		IF EXIST "%DEPLOYMENT_SOURCE%\AzureFunctions.AngularClient\node_modules\swagger-editor" (
 			echo Copy Swagger Editor to output
-			echo ROBOCOPY "%ARTIFACTS%\AzureFunctions.AngularClient\node_modules\swagger-editor" "%DEPLOYMENT_TEMP%\node_modules\swagger-editor" /E /IS
-			call :ExecuteCmd ROBOCOPY "%ARTIFACTS%\AzureFunctions.AngularClient\node_modules\swagger-editor" "%DEPLOYMENT_TEMP%\node_modules\swagger-editor" /E /IS
+			echo ROBOCOPY "%DEPLOYMENT_SOURCE%\AzureFunctions.AngularClient\node_modules\swagger-editor" "%DEPLOYMENT_TEMP%\node_modules\swagger-editor" /E /IS
+			call :ExecuteCmd ROBOCOPY "%DEPLOYMENT_SOURCE%\AzureFunctions.AngularClient\node_modules\swagger-editor" "%DEPLOYMENT_TEMP%\node_modules\swagger-editor" /E /IS
 			:: http://ss64.com/nt/robocopy-exit.html
 			IF %ERRORLEVEL% EQU 16 echo ***FATAL ERROR*** & goto error
 			IF %ERRORLEVEL% EQU 15 echo OKCOPY + FAIL + MISMATCHES + XTRA & goto error
@@ -247,17 +124,9 @@
 			IF %ERRORLEVEL% EQU 1 echo OKCOPY
 			IF %ERRORLEVEL% EQU 0 echo No Change
 		)
-	)
-)
-
-echo "After IF EXIST for Handling frontend Angular2 project"

 :: 4. KuduSync
-IF /I "%IN_PLACE_DEPLOYMENT%" NEQ "1" (
-  call :ExecuteCmd "%KUDU_SYNC_CMD%" -v 50 -f "%DEPLOYMENT_TEMP%" -t "%DEPLOYMENT_TARGET%" -n "%NEXT_MANIFEST_PATH%" -p "%PREVIOUS_MANIFEST_PATH%" -i ".git;.hg;.deployment;deploy.cmd"
-  IF !ERRORLEVEL! NEQ 0 goto error
-)
-
+call :ExecuteCmd "%KUDU_SYNC_CMD%" -v 50 -f "%DEPLOYMENT_TEMP%" -t "%DEPLOYMENT_TARGET%" -n "%NEXT_MANIFEST_PATH%" -p "%PREVIOUS_MANIFEST_PATH%" -i ".git;.hg;.deployment;deploy.cmd"
 IF !ERRORLEVEL! NEQ 0 goto error

 :: 4. Copy templates-update webjob
@@ -305,4 +174,4 @@

 :end
 endlocal
-echo Finished successfully.
+echo Finished successfully.


updated deplyoment script

updated deplyoment script

--- deploy.cmd
+++ deploy.cmd
@@ -47,14 +47,31 @@
   :: Locally just running "kuduSync" would also work
   SET KUDU_SYNC_CMD=%appdata%\npm\kuduSync.cmd
 )
+IF NOT DEFINED DEPLOYMENT_TEMP (
+  SET DEPLOYMENT_TEMP=%temp%\___deployTemp%random%
+  SET CLEAN_LOCAL_DEPLOYMENT_TEMP=true
+)
+
+IF DEFINED CLEAN_LOCAL_DEPLOYMENT_TEMP (
+  IF EXIST "%DEPLOYMENT_TEMP%" rd /s /q "%DEPLOYMENT_TEMP%"
+  mkdir "%DEPLOYMENT_TEMP%"
+)
+
+IF DEFINED MSBUILD_PATH goto MsbuildPathDefined
+SET MSBUILD_PATH=%ProgramFiles(x86)%\MSBuild\14.0\Bin\MSBuild.exe
+:MsbuildPathDefined

 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 :: Deployment
 :: ----------

-echo Handling Basic Web Site deployment.
+echo Handling .NET Web Site deployment.

-:: 1. KuduSync
+:: 1. Build to the repository path
+call :ExecuteCmd "%MSBUILD_PATH%" "%DEPLOYMENT_SOURCE%\PowerBI-embedded.sln" /verbosity:m /nologo %SCM_BUILD_ARGS%
+IF !ERRORLEVEL! NEQ 0 goto error
+
+:: 2. KuduSync
 IF /I "%IN_PLACE_DEPLOYMENT%" NEQ "1" (
   call :ExecuteCmd "%KUDU_SYNC_CMD%" -v 50 -f "%DEPLOYMENT_SOURCE%" -t "%DEPLOYMENT_TARGET%" -n "%NEXT_MANIFEST_PATH%" -p "%PREVIOUS_MANIFEST_PATH%" -i ".git;.hg;.deployment;deploy.cmd"
   IF !ERRORLEVEL! NEQ 0 goto error


Re-enabled webapp building at deploy

Re-enabled webapp building at deploy

--- deploy.cmd
+++ deploy.cmd
@@ -83,21 +83,21 @@
 :: Building
 :: ----------

-REM :: 1. Build Webapp
-REM :: .a Install Yarn
-REM echo Prepare environment to build WebApp
-REM call :ExecuteCmd %NPM_CMD% install yarn -g
-REM :: .b Enter app dir
-REM pushd %DEPLOYMENT_SOURCE%\app
-REM :: .c Install Dependencies
-REM call :ExecuteCmd yarn install
-REM IF !ERRORLEVEL! NEQ 0 goto error
-REM :: .e Build Webapp (already copy contents on the /web dir)
-REM echo Building WebApp
-REM call :ExecuteCmd yarn run build-web-release
-REM IF !ERRORLEVEL! NEQ 0 goto error
-REM :: .f Exit app dir (restore previous location)
-REM popd
+:: 1. Build Webapp
+:: .a Install Yarn
+echo Prepare environment to build WebApp
+call :ExecuteCmd %NPM_CMD% install yarn -g
+:: .b Enter app dir
+pushd %DEPLOYMENT_SOURCE%\app
+:: .c Install Dependencies
+call :ExecuteCmd yarn install
+IF !ERRORLEVEL! NEQ 0 goto error
+:: .e Build Webapp (already copy contents on the /web dir)
+echo Building WebApp
+call :ExecuteCmd yarn run build-web-release
+IF !ERRORLEVEL! NEQ 0 goto error
+:: .f Exit app dir (restore previous location)
+popd

 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 :: Deployment


SCCS dmake.bat 11/01/24 00:08:28: Updated Copyright

--- run/dmake.bat
+++ run/dmake.bat
@@ -1,7 +1,7 @@
 @echo off
 rem ----------------------------------------------------------------------------
 rem Phorward Software Development Kit
-rem Copyright (C) 2009, 2010 by Phorward Software Technologies, Jan Max Meyer
+rem Copyright (C) 2009-2011 by Phorward Software Technologies, Jan Max Meyer
 rem http://www.phorward-software.com ++ contact<at>phorward<dash>software<dot>com
 rem All rights reserved. See $PHOME/LICENSE for more information.
 rem


Test(devscripts/test-sqlobject.cmd): Run tests with Python 3.9

[skip ci]

--- devscripts/test-sqlobject.cmd
+++ devscripts/test-sqlobject.cmd
@@ -3,7 +3,7 @@
 SetLocal EnableDelayedExpansion
 set SavePATH=%PATH%

-for %%V in (27 34 35 36 37 38) do (
+for %%V in (27 34 35 36 37 38 39) do (
    for %%s in (32 64) do (
       set PATH=C:\Python%%V-%%s;C:\Python%%V-%%s\Scripts;!SavePATH!
       set TOXPYTHON=C:\Python%%V-%%s\python.exe


add significantly more entries from user feedback

--- resources/stage_2_de-bloat/programs_to_target_by_GUID.bat
+++ resources/stage_2_de-bloat/programs_to_target_by_GUID.bat
@@ -12,6 +12,15 @@
 :: Adobe Refresh Manager
 start /wait msiexec /x {AC76BA86-0804-1033-1959-001824147215} /qn /norestart

+:: AMD Accelerated Video Transcoding
+start /wait msiexec /x {A6AFFBD8-D006-967F-51AF-0120F0261080} /qn /norestart
+
+:: AMD Catalyst Control Center - Branding
+start /wait msiexec /x {24D38277-CE6E-4E12-A2EE-F46832A4FA2F} /qn /norestart
+
+:: AMD OEM Application Profile
+start /wait msiexec /x {C89A97B6-F991-EBB5-77B7-927BCF420EBE} /qn /norestart
+
 :: Ask Toolbar
 start /wait msiexec /x {4F524A2D-5637-006A-76A7-A758B70C0300} /qn /norestart
 start /wait msiexec /x {86D4B82A-ABED-442A-BE86-96357B70F4FE} /qn /norestart
@@ -28,6 +37,9 @@
 :: Bing Desktop
 start /wait msiexec /x {7D095455-D971-4D4C-9EFD-9AF6A6584F3A} /qn /norestart

+:: Connect To Tech-Support (malware)
+start /wait msiexec /x {A22B8513-EA8C-46A1-9735-F5BE971C368D} /qn /norestart
+
 :: CyberLink Power2Go 8
 start /wait msiexec /x {2A87D48D-3FDF-41fd-97CD-A1E370EFFFE2} /qn /norestart

@@ -56,7 +68,7 @@
 start /wait msiexec /x {975DFE7C-8E56-45BC-A329-401E6B1F8102} /qn /norestart
 start /wait msiexec /x {50B4B603-A4C6-4739-AE96-6C76A0F8A388} /qn /norestart
 start /wait msiexec /x {731B0E4D-F4C7-450C-95B0-E1A3176B1C75} /qn /norestart
-rd /s /q C:\dell\dbrm
+rd /s /q %SystemDrive%\dell\dbrm

 :: Dell Client System Update
 start /wait msiexec /x {69093D49-3DD1-4FB5-A378-0D4DB4CF86EA} /qn /norestart
@@ -104,6 +116,7 @@

 :: DTS Sound
 start /wait msiexec /x {793B70D2-41E9-46AB-9DDC-B34C99D07DB5} /qn /norestart
+start /wait msiexec /x {F8EB8FFC-C535-49A1-A84D-CC75CB2D6ADA} /qn /norestart

 :: EA Download Manager
 start /wait msiexec /x {EF7E931D-DC84-471B-8DB6-A83358095474} /qn /norestart
@@ -125,6 +138,13 @@

 :: Get Dropbox (also called "Dropbox 25 GB" or "Dropbox 15 GB")
 start /wait msiexec /x {597A58EC-42D6-4940-8739-FB94491B013C} /qn /norestart
+
+:: Google Toolbar for Internet Explorer
+start /wait msiexec /x {18455581-E099-4BA8-BC6B-F34B2F06600C} /qn /norestart
+
+:: Google Update Helper
+start /wait msiexec /x {60EC980A-BDA2-4CB6-A427-B07A5498B4CA} /qn /norestart
+start /wait msiexec /x {A92DAB39-4E2C-4304-9AB6-BC44E68B55E2} /qn /norestart

 :: Hewlett-Packard ACLM.NET v1.2.2.3
 start /wait msiexec /x {6F340107-F9AA-47C6-B54C-C3A19F11553F} /qn /norestart
@@ -214,7 +234,11 @@
 :: Intel Trusted Connect Client
 start /wait msiexec /x {44B72151-611E-429D-9765-9BA093D7E48A} /qn /norestart

-:: Intel (R) Trusted Connect Service Client
+:: Intel(R) Technology Access
+start /wait msiexec /x {413fe921-b226-41c8-bc3c-574074ceec4d} /qn /norestart
+start /wait msiexec /x {583882E7-EA75-4BF0-94FA-7DD5A3731C76} /qn /norestart
+
+:: Intel(R) Trusted Connect Service Client
 start /wait msiexec /x {1B444AF9-1DBE-4884-8F35-969BEFCF69A8} /qn /norestart
 start /wait msiexec /x {7D84E343-A23D-451C-B123-0195B2D903A6} /qn /norestart

@@ -238,6 +262,7 @@

 :: Intel Update Manager
 start /wait msiexec /x {608E1B9B-A2E8-4A1F-8BAB-874EB0DD25E3} /qn /norestart
+start /wait msiexec /x {43FA4AC8-46F8-423F-96FD-9A7D67048F1C} /qn /norestart

 :: Intel(R) Rapid Storage Technology
 start /wait msiexec /x {205AE40D-8AD7-4F29-A430-DD2168DA562D} /qn /norestart
@@ -336,44 +361,63 @@
 :: Skype Click 2 Call
 start /wait msiexec /x {6D1221A9-17BF-4EC0-81F2-27D30EC30701} /qn /norestart

+:: Toshiba Audio Enhancement
+start /wait msiexec /x {1515F5E3-29EA-4CD1-A981-032D88880F09} /qn /norestart
+
 :: Toshiba Display Utility
 start /wait msiexec /x {0B39C39A-3ECE-4582-9C91-842D22819A24} /qn /norestart

+:: Toshiba Application Installer
+start /wait msiexec /x {21A63CA3-75C0-4E56-B602-B7CD2EF6B621} /qn /norestart
+start /wait msiexec /x {970472D0-F5F9-4158-A6E3-1AE49EFEF2D3} /qn /norestart
+
+:: Toshiba App Place
+start /wait msiexec /x {ED3CBA78-488F-4E8C-B33F-8E3BF4DDB4D2} /qn /norestart
+
+:: Toshiba Book Place
+start /wait msiexec /x {11244D6B-9842-440F-8579-6A4D771A0D9B} /qn /norestart
+
+:: Toshiba Desktop Assist
+start /wait msiexec /x {95CCACF0-010D-45F0-82BF-858643D8BC02} /qn /norestart
+
+:: Toshiba System Driver
+start /wait msiexec /x {1E6A96A1-2BAB-43EF-8087-30437593C66C} /qn /norestart
+
+:: TOSHIBA Eco Utility
+start /wait msiexec /x {72EFCFA8-3923-451D-AF52-7CE9D87BC2A1} /qn /norestart
+start /wait msiexec /x {5944B9D4-3C2A-48DE-931E-26B31714A2F7} /qn /norestart
+
+:: TOSHIBA Recovery Media Creator
+start /wait msiexec /x {B65BBB06-1F8E-48F5-8A54-B024A9E15FDF} /qn /norestart
+
+:: Toshiba Password Utility
+start /wait msiexec /x {26BB68BB-CF93-4A12-BC6D-A3B6F53AC8D9} /qn /norestart
+
+:: Toshiba User's Guide
+start /wait msiexec /x {3384E1D9-3F18-4A98-8655-180FEF0DFC02} /qn /norestart
+
+:: TOSHIBARegistration
+start /wait msiexec /x {5AF550B4-BB67-4E7E-82F1-2C4300279050} /qn /norestart
+
+:: Toshiba ReelTime
+start /wait msiexec /x {24811C12-F4A9-4D0F-8494-A7B8FE46123C} /qn /norestart
+
+:: TOSHBA VIDEO PLAYER
+start /wait msiexec /x {FF07604E-C860-40E9-A230-E37FA41F103A} /qn /norestart
+
+:: Toshiba Book Place
+start /wait msiexec /x {92C7DC44-DAD3-49FE-B89B-F92C6BA9A331} /qn /norestart
+
+:: Toshiba Value Added Package
+start /wait msiexec /x {066CFFF8-12BF-4390-A673-75F95EFF188E} /qn /norestart
+
 :: Toshiba Service Station
 start /wait msiexec /x {0DFA8761-7735-4DE8-A0EB-2286578DCFC6} /qn /norestart
-
-:: Toshiba Audio Enhancement
-start /wait msiexec /x {1515F5E3-29EA-4CD1-A981-032D88880F09} /qn /norestart
-
-:: Toshiba System Driver
-start /wait msiexec /x {1E6A96A1-2BAB-43EF-8087-30437593C66C} /qn /norestart
-
-:: Toshiba Application Installer
-start /wait msiexec /x {21A63CA3-75C0-4E56-B602-B7CD2EF6B621} /qn /norestart
-
-:: Toshiba Password Utility
-start /wait msiexec /x {26BB68BB-CF93-4A12-BC6D-A3B6F53AC8D9} /qn /norestart
-
-:: Toshiba User's Guide
-start /wait msiexec /x {3384E1D9-3F18-4A98-8655-180FEF0DFC02} /qn /norestart
-
-:: TOSHIBARegistration
-start /wait msiexec /x {5AF550B4-BB67-4E7E-82F1-2C4300279050} /qn /norestart
-
-:: TOSHIBA Eco Utility
-start /wait msiexec /x {72EFCFA8-3923-451D-AF52-7CE9D87BC2A1} /qn /norestart
-
-:: Toshiba ReelTime
-start /wait msiexec /x {24811C12-F4A9-4D0F-8494-A7B8FE46123C} /qn /norestart
-
-:: Toshiba Book Place
-start /wait msiexec /x {92C7DC44-DAD3-49FE-B89B-F92C6BA9A331} /qn /norestart
-
-:: Toshiba Value Added Package
-start /wait msiexec /x {066CFFF8-12BF-4390-A673-75F95EFF188E} /qn /norestart
+start /wait msiexec /x {6499E894-43F8-458B-AE35-724F4732BCDE} /qn /norestart

 :: Toshiba System Settings
 start /wait msiexec /x {B040D5C9-C9AA-430A-A44E-696656012E61} /qn /norestart
+start /wait msiexec /x {05A55927-DB9B-4E26-BA44-828EBFF829F0} /qn /norestart

 :: Toshiba Wireless LAN Indicator
 start /wait msiexec /x {CDADE9BC-612C-42B8-B929-5C6A823E7FF9} /qn /norestart


Fix windows script start collector failure.

--- apm-collector/apm-collector-worker/bin/collector-service.bat
+++ apm-collector/apm-collector-worker/bin/collector-service.bat
@@ -8,10 +8,13 @@
 set CLASSPATH=%COLLECTOR_BASE_PATH%\config;
 SET CLASSPATH=%COLLECTOR_BASE_PATH%\libs\*;%CLASSPATH%

-if ""%JAVA_HOME%"" == """" (
-  set _EXECJAVA=java
-) else (
-  set _EXECJAVA="%JAVA_HOME%"/bin/java
+if defined JAVA_HOME (
+ set _EXECJAVA="%JAVA_HOME:"=%"\bin\java
+)
+
+if not defined JAVA_HOME (
+ echo "JAVA_HOME not set."
+ set _EXECJAVA=java
 )

 start /MIN "%COLLECOTR_PROCESS_TITLE%" %_EXECJAVA% "%COLLECTOR_RUNTIME_OPTIONS%" -cp "%CLASSPATH%" org.skywalking.apm.collector.worker.CollectorBootStartUp &


backup-to-cloud-dev.cmd Исправление ошибок. Блок проверки уже созданного архива. Блок удаления старых архивов.

--- backup-to-cloud-dev.cmd
+++ backup-to-cloud-dev.cmd
@@ -70,7 +70,7 @@
 if not exist %Backup% (goto NoBackupDir)
 rem
 rem %DATE%   ( )
-if exist %Backup%%DATE%.rar (goto ExistBackup)
+if exist %Backup%\%DATE%.rar (goto ExistBackup)

 rem    WinRar
 ::
@@ -173,7 +173,7 @@
 :: /M *.rar -   rar
 :: /D -%NumberArchives% -
 :: /C "cmd /c del /q @PATH" -
-if exist %Backup%%DATE%.rar (forfiles /P %Backup% /M *.rar /D -%NumberArchives% /C "cmd /c del /q @PATH")
+if exist %Backup%\%DATE%.rar (forfiles /P %Backup% /M *.rar /D -%NumberArchives% /C "cmd /c del /q @PATH")

 rem
 ::


Removed debugging information

Removed debugging information

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

--- fop.bat
+++ fop.bat
@@ -79,6 +79,6 @@
 if "%JAVACMD%" == "" set JAVACMD=java

 :runFop
-ECHO "%JAVACMD%"
+rem ECHO "%JAVACMD%"
 "%JAVACMD%" %LOGCHOICE% %LOGLEVEL% -cp "%LOCALCLASSPATH%" org.apache.fop.cli.Main %FOP_CMD_LINE_ARGS%


commit on 02/06/2018 at 17:04:49

commit on 02/06/2018 at 17:04:49

--- ansys-APDL/transverseCrack.cmd
+++ ansys-APDL/transverseCrack.cmd
@@ -68,6 +68,39 @@
 AL, 2, 3, 10, 11, 12 ! 3, lower ply, coarse area
 AL, 9, 10, 4, 5, 6   ! 4, upper ply

+! Define Material Properties
+
+MP,EX,1,ET        ! 1 is cross-ply, 2 is ud-ply
+MP,EY,1,ET        ! 1 is cross-ply, 2 is ud-ply
+MP,EZ,1,EL        ! 1 is cross-ply, 2 is ud-ply
+MP,NUXY,1,nuTT    ! mp,Poisson's ratio,material number,value
+MP,NUYZ,1,nuLT    ! mp,Poisson's ratio,material number,value
+MP,NUXZ,1,nuLT    ! mp,Poisson's ratio,material number,value
+MP,GXY,1,GTT      ! mp,Poisson's ratio,material number,value
+MP,GYZ,1,GLT      ! mp,Poisson's ratio,material number,value
+MP,GXZ,1,GLT      ! mp,Poisson's ratio,material number,value
+MP,EX,2,EL        ! 1 is cross-ply, 2 is ud-ply
+MP,EY,2,ET        ! 1 is cross-ply, 2 is ud-ply
+MP,EZ,2,ET        ! 1 is cross-ply, 2 is ud-ply
+MP,NUXY,2,nuLT    ! mp,Poisson's ratio,material number,value
+MP,NUYZ,2,nuTT    ! mp,Poisson's ratio,material number,value
+MP,NUXZ,2,nuLT    ! mp,Poisson's ratio,material number,value
+MP,GXY,2,GLT      ! mp,Poisson's ratio,material number,value
+MP,GYZ,2,GTT      ! mp,Poisson's ratio,material number,value
+MP,GXZ,2,GLT      ! mp,Poisson's ratio,material number,value
+
+! Assign properties to areas
+! ASEL, Type, Item, Comp, VMIN, VMAX, VINC, KSWP
+! AATT, MAT, REAL, TYPE, ESYS, SECN
+ASEL, S, 1
+AATT, 1
+ASEL, S, 2
+AATT, 1
+ASEL, S, 3
+AATT, 1
+ASEL, S, 4
+AATT, 2
+
 ! Seed the edges
 ! LESIZE, NL1, SIZE, ANGSIZ, NDIV, SPACE, KFORC, LAYER1, LAYER2, KYNDIV
 LESIZE, 1, elSize
@@ -91,26 +124,6 @@
 MSHKEY, 0
 AMESH, 3, 4, 1

-! Define Material Properties
-
-MP,EX,1,ET        ! 1 is cross-ply, 2 is ud-ply
-MP,EY,1,ET        ! 1 is cross-ply, 2 is ud-ply
-MP,EZ,1,EL        ! 1 is cross-ply, 2 is ud-ply
-MP,NUXY,1,nuTT    ! mp,Poisson's ratio,material number,value
-MP,NUYZ,1,nuLT    ! mp,Poisson's ratio,material number,value
-MP,NUXZ,1,nuLT    ! mp,Poisson's ratio,material number,value
-MP,GXY,1,GTT      ! mp,Poisson's ratio,material number,value
-MP,GYZ,1,GLT      ! mp,Poisson's ratio,material number,value
-MP,GXZ,1,GLT      ! mp,Poisson's ratio,material number,value
-MP,EX,2,EL        ! 1 is cross-ply, 2 is ud-ply
-MP,EY,2,ET        ! 1 is cross-ply, 2 is ud-ply
-MP,EZ,2,ET        ! 1 is cross-ply, 2 is ud-ply
-MP,NUXY,2,nuLT    ! mp,Poisson's ratio,material number,value
-MP,NUYZ,2,nuTT    ! mp,Poisson's ratio,material number,value
-MP,NUXZ,2,nuLT    ! mp,Poisson's ratio,material number,value
-MP,GXY,2,GLT      ! mp,Poisson's ratio,material number,value
-MP,GYZ,2,GTT      ! mp,Poisson's ratio,material number,value
-MP,GXZ,2,GLT      ! mp,Poisson's ratio,material number,value

 FINISH              ! Finish pre-processing


Add msvc-build-launcher-arm64.cmd to use VS 2019 to compile arm binaries

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

--- msvc-build-launcher-arm64.cmd
+++ msvc-build-launcher-arm64.cmd
@@ -0,0 +1,17 @@
+@echo off
+
+set PATH_OLD=%PATH%
+set PATH=C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build;%PATH_OLD%
+
+REM now for arm 64-bit
+REM Cross compile for arm64
+call VCVARSx86_arm64
+if "%ERRORLEVEL%"=="0" (
+  cl /D "GUI=0" /D "WIN32_LEAN_AND_MEAN" launcher.c /O2 /link /MACHINE:arm64 /SUBSYSTEM:CONSOLE /out:setuptools/cli-arm64.exe
+  cl /D "GUI=1" /D "WIN32_LEAN_AND_MEAN" launcher.c /O2 /link /MACHINE:arm64 /SUBSYSTEM:WINDOWS /out:setuptools/gui-arm64.exe
+) else (
+  echo Visual Studio 2019 with arm64 toolchain not installed
+)
+
+set PATH=%PATH_OLD%
+


Reset.bat now works without global grunt installation

--- reset.bat
+++ reset.bat
@@ -13,12 +13,12 @@
 echo =====Resetting Android=====
 echo.
 echo grunt configAndroidBootstrap
-call grunt configAndroidBootstrap
+call node_modules\.bin\grunt configAndroidBootstrap
 echo.
 echo gruntbuildAndroidBootstrap
-call grunt buildAndroidBootstrap
+call node_modules\.bin\grunt buildAndroidBootstrap
 echo.
 echo grunt setConfigVer:android
-call grunt setConfigVer:android
+call node_modules\.bin\grunt setConfigVer:android
 echo.
 echo =====Reset Complete=====


Trying to diagnose CsoundQt build failure on AppVeyor (#793).

--- msvc/build_csoundqt.bat
+++ msvc/build_csoundqt.bat
@@ -8,7 +8,7 @@
     DEFINES+="USE_DOUBLE=1" ^
     CSOUND_API_INCLUDE_DIR=%~dp0/"../include" ^
     CSOUND_INTERFACES_INCLUDE_DIR=%~dp0/"../interfaces" ^
-    CSOUND_LIBRARY_DIR=%~dp0csound-vs/\Release ^
+    CSOUND_LIBRARY_DIR=%APPVEYOR_BUILD_FOLDER%\msvc\csound-vs\Release\ ^
     DEFAULT_CSOUND_LIBS=csound64.lib ^
     CSOUND_LIBRARY=csound64.lib ^
     LIBS+=%~dp0/deps/lib/libsndfile-1.lib ^


Trying to build CsoundQt on AppVeyor (#793).

--- msvc/build_csoundqt.bat
+++ msvc/build_csoundqt.bat
@@ -7,8 +7,10 @@
 qmake.exe qcs.pro ^
     CONFIG+=html_webengine ^
     CONFIG+=perfThread_build ^
+    CONFIG+=QCS_QT59 ^
     QT+=xml ^
     DEFINES+="USE_DOUBLE=1" ^
+    DEFINES+="USE_QT_GT_59=1" ^
     CSOUND_API_INCLUDE_DIR="%APPVEYOR_BUILD_FOLDER%\\include" ^
     CSOUND_INTERFACES_INCLUDE_DIR="%APPVEYOR_BUILD_FOLDER%\\interfaces" ^
     CSOUND_LIBRARY_DIR=%APPVEYOR_BUILD_FOLDER%\\msvc\\csound-vs\\Release" ^


* tools/buildbot/slaves/win32-Sharpsvn/Sharpsvntest-build.cmd
  Reduce output to what Visual Studio would show.

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

--- tools/buildbot/slaves/win32-SharpSvn/svntest-build.cmd
+++ tools/buildbot/slaves/win32-SharpSvn/svntest-build.cmd
@@ -30,7 +30,7 @@

 POPD

-msbuild subversion_vcnet.sln /m /p:Configuration=Debug /p:Platform=win32 /t:__ALL_TESTS__
+msbuild subversion_vcnet.sln /m /v:m /p:Configuration=Debug /p:Platform=Win32 /t:__ALL_TESTS__
 IF ERRORLEVEL 1 EXIT /B 1

 EXIT /B 0


try ctest at windows

try ctest at windows

--- scripts/speck/build_win.bat
+++ scripts/speck/build_win.bat
@@ -4,6 +4,7 @@
 set SCRIPTDIR=%~dp0
 set PROJDIR=%SCRIPTDIR%..\..\
 set MSBUILDBIN="C:\Program Files (x86)\MSBuild\14.0\Bin\msbuild.exe"
+set ORIGPATH=%PATH%

 cd %PROJDIR%

@@ -15,6 +16,8 @@
 cd %BUILDDIR%
 cmake %PROJDIR% -G"Visual Studio 14 2015" -DBUILD_SHARED_LIBS=ON -DCMAKE_CONFIGURATION_TYPES=Release
 %MSBUILDBIN% ALL_BUILD.vcxproj /property:Configuration=Release
+set PATH=%PROJDIR%build_win32/Release;%PATH%
+ctest .
 cd ..

 set BUILDDIR=%PROJDIR%build_win64\
@@ -24,4 +27,6 @@
 cd %BUILDDIR%
 cmake %PROJDIR% -G"Visual Studio 14 2015 Win64" -DBUILD_SHARED_LIBS=ON -DCMAKE_CONFIGURATION_TYPES=Release
 %MSBUILDBIN% ALL_BUILD.vcxproj /property:Configuration=Release
+set PATH=%PROJDIR%build_win64/Release;%PATH%
+ctest .
 cd ..


Redo pause

Redo pause

--- setup.bat
+++ setup.bat
@@ -1,2 +1,3 @@
-@cscript //NoLogo $0/../nvms.js setup
-@pause
+@echo off
+cscript //NoLogo $0/../nvms.js setup
+pause


corrected paths

corrected paths

--- reo.bat
+++ reo.bat
@@ -1,3 +1,3 @@
 @echo off

-irb -f -r lib/robust_excel_ole -r lib/reo_console.rb
+irb -f -r ./lib/robust_excel_ole -r ./lib/reo_console.rb


Update

Update

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

--- run.bat
+++ run.bat
@@ -0,0 +1 @@
+bundle exec jekyll serve


sdk_configs -> configs

sdk_configs -> configs

--- run.bat
+++ run.bat
@@ -35,7 +35,7 @@
 CD /D %~dp0\..\sdkjs\build
 call npm install -g grunt-cli
 call npm install
-call grunt --src="./sdk_configs" --level=WHITESPACE_ONLY --nomap=true --formatting=PRETTY_PRINT --private=true
+call grunt --src="./configs" --level=WHITESPACE_ONLY --nomap=true --formatting=PRETTY_PRINT --private=true

 ECHO.


add utf-8 support for windows console

add utf-8 support for windows console

--- run.bat
+++ run.bat
@@ -1,5 +1,5 @@
 @echo off
-
+@chcp 65001
 REM read configuration file
 FOR /F "tokens=2 delims==" %%a IN ('find "phpPath" ^<run.ini') DO SET phpPath=%%a

@@ -7,4 +7,4 @@

 %phpPath% bootstrapper.php %*

-if %errorlevel% NEQ 0 pause+if %errorlevel% NEQ 0 pause


commit on 06/06/2018 at 12:12:42

commit on 06/06/2018 at 12:12:42

--- ansys-APDL/transverseCrack.cmd
+++ ansys-APDL/transverseCrack.cmd
@@ -245,30 +245,31 @@
 LSEL,S,,,8                                ! Crack
 NSLL,S,1                                  !Select nodes associated to this line
 *GET,NNodes,NODE,0,COUNT                  !Get the number of nodes in the selected set
-*DIM, CrackDisps, ARRAY, NNodes, 11
+*DIM, CrackDisps, ARRAY, NNodes, 12
 *VGET, CrackDisps(1,2), NODE, 1, LOC, X
 *VGET, CrackDisps(1,3), NODE, 1, LOC, Y
-*VGET, CrackDisps(1,4), NODE, 1, U, X
-*VGET, CrackDisps(1,5), NODE, 1, U, Y
-*VGET, CrackDisps(1,6), NODE, 1, S, X
-*VGET, CrackDisps(1,7), NODE, 1, S, Y
-*VGET, CrackDisps(1,8), NODE, 1, S, XY
-*VGET, CrackDisps(1,9), NODE, 1, EPEL, X
-*VGET, CrackDisps(1,10), NODE, 1, EPEL, Y
-*VGET, CrackDisps(1,11), NODE, 1, EPEL, XY
+*VGET, CrackDisps(1,4), NODE, 1, LOC, Z
+*VGET, CrackDisps(1,5), NODE, 1, U, X
+*VGET, CrackDisps(1,6), NODE, 1, U, Y
+*VGET, CrackDisps(1,7), NODE, 1, S, X
+*VGET, CrackDisps(1,8), NODE, 1, S, Y
+*VGET, CrackDisps(1,9), NODE, 1, S, XY
+*VGET, CrackDisps(1,10), NODE, 1, EPEL, X
+*VGET, CrackDisps(1,11), NODE, 1, EPEL, Y
+*VGET, CrackDisps(1,12), NODE, 1, EPEL, XY
 *VGET, CrackDisps(1,1), NODE(CrackDisps(1,2),CrackDisps(1,3))

 *CFOPEN, CFFileCoordDisp, csv
 *VWRITE, 'NODE LABEL, X [mm], Z [mm], UX [mm], UZ [mm]'
 (A)
-*VWRITE, CrackDisps(1,1), ', ', CrackDisps(1,2), ', ', CrackDisps(1,3), ', ', CrackDisps(1,4), ', ', CrackDisps(1,5)
+*VWRITE, CrackDisps(1,1), ', ', CrackDisps(1,2), ', ', CrackDisps(1,3), ', ', CrackDisps(1,5), ', ', CrackDisps(1,6)
 (F12.8,A2,F12.8,A2,F12.8,A2,F12.8,A2,F12.8)
 *CFCLOS

 *CFOPEN, CFFileStressStrain, csv
 *VWRITE, 'NODE LABEL, SX [MPa], SZ [MPa], SXZ [MPa], EX [-], EZ [-], EXZ [-]'
 (A)
-*VWRITE, CrackDisps(1,1), ', ', CrackDisps(1,6), ', ', CrackDisps(1,7), ', ', CrackDisps(1,8), ', ', CrackDisps(1,9), ', ', CrackDisps(1,10), ', ', CrackDisps(1,11)
+*VWRITE, CrackDisps(1,1), ', ', CrackDisps(1,7), ', ', CrackDisps(1,8), ', ', CrackDisps(1,9), ', ', CrackDisps(1,10), ', ', CrackDisps(1,11), ', ', CrackDisps(1,12)
 (F12.8,A2,F12.8,A2,F12.8,A2,F12.8,A2,F12.8,A2,F12.8,A2,F12.8)
 *CFCLOS


commit on 02/06/2018 at 14:15:50

commit on 02/06/2018 at 14:15:50

--- ansys-APDL/transverseCrack.cmd
+++ ansys-APDL/transverseCrack.cmd
@@ -56,7 +56,8 @@

 ! Areas

-al, 1, 2, 7, 6     ! lower ply
+al, 1, 8, 9, 6     ! lower ply, refined area
+al, 8, 2, 7, 9     ! lower ply, coarse area
 al, 7, 3, 4, 5     ! upper ply

 ! Define Element Type


commit on 07/06/2018 at 11:25:35

commit on 07/06/2018 at 11:25:35

--- ansys-APDL/transverseCrack.cmd
+++ ansys-APDL/transverseCrack.cmd
@@ -8,15 +8,10 @@

 ! ===> START INPUT DATA

-CFFileCoordDisp = 'C:/Ansys_WD/Debug/debug_CFCoordDisp'
-CFFileStressStrain = 'C:/Ansys_WD/Debug/debug_CFStressStrain'
-
-YsymmLow = 'C:/Ansys_WD/Debug/ysymmLowerData'
-YsymmUp = 'C:/Ansys_WD/Debug/ysymmUpperData'
-XsymmLeft = 'C:/Ansys_WD/Debug/xsymmLeftData'
-XsymmRight = 'C:/Ansys_WD/Debug/xsymmRightData'
-loadUp = 'C:/Ansys_WD/Debug/loadUpperData'
-loadLow = 'C:/Ansys_WD/Debug/loadLowerData'
+*DIM,wd,STRING,18
+wd = 'C:/Ansys_WD/Debug/'
+*DIM,wd,STRING,6
+basename = 'debug_'

 wd = 'C:/Ansys_WD/Debug'
 basename = 'debug_'
@@ -51,6 +46,16 @@
 elSize = daOvera*a ! [mm] size of element in refined region close to crack tip

 appliedDisp = epsx*L ! [mm] applied displacement
+
+CFFileCoordDisp = 'C:/Ansys_WD/Debug/debug_CFCoordDisp'
+CFFileStressStrain = 'C:/Ansys_WD/Debug/debug_CFStressStrain'
+
+YsymmLow = 'C:/Ansys_WD/Debug/ysymmLowerData'
+YsymmUp = 'C:/Ansys_WD/Debug/ysymmUpperData'
+XsymmLeft = 'C:/Ansys_WD/Debug/xsymmLeftData'
+XsymmRight = 'C:/Ansys_WD/Debug/xsymmRightData'
+loadUp = 'C:/Ansys_WD/Debug/loadUpperData'
+loadLow = 'C:/Ansys_WD/Debug/loadLowerData'

 ! Create Geometry


Trying to apply a fix to AppVeyor tests as suggested by AppVeyor themselves

--- scripts/appveyor-tests.bat
+++ scripts/appveyor-tests.bat
@@ -1 +1 @@
-dotnet test -f netcoreapp1.1 -c Release %APPVEYOR_BUILD_FOLDER%\test\DeveelDb.Core.Tests\DeveelDb.Core.Tests.csproj+dotnet test -f netcoreapp1.1 %APPVEYOR_BUILD_FOLDER%\test\DeveelDb.Core.Tests\DeveelDb.Core.Tests.csproj


AppVeyor: be more verbose about deleting/copying custom node.exe

--- scripts/build-appveyor.bat
+++ scripts/build-appveyor.bat
@@ -31,16 +31,17 @@
 powershell Invoke-WebRequest $env:NODE_URL -OutFile $env:HOME\node.exe
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR

-IF EXIST "%ProgramFiles(x86)%\nodejs\node.exe" DEL /Q "%ProgramFiles(x86)%\nodejs\node.exe"
+IF EXIST "%ProgramFiles(x86)%\nodejs\node.exe" ECHO found "%ProgramFiles(x86)%\nodejs\node.exe" && DEL /Q "%ProgramFiles(x86)%\nodejs\node.exe"
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR
-IF EXIST "%ProgramFiles%\nodejs\node.exe" DEL /Q "%ProgramFiles%\nodejs\node.exe"
+IF EXIST "%ProgramFiles%\nodejs\node.exe" ECHO found "%ProgramFiles%\nodejs\node.exe" && DEL /Q "%ProgramFiles%\nodejs\node.exe"
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR

-IF EXIST "%ProgramFiles(x86)%\nodejs" COPY node.exe "%ProgramFiles(x86)%\nodejs\"
+IF EXIST "%ProgramFiles(x86)%\nodejs" ECHO copying node.exe to "%ProgramFiles(x86)%\nodejs" && COPY node.exe "%ProgramFiles(x86)%\nodejs\"
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR
-IF EXIST "%ProgramFiles%\nodejs" COPY node.exe "%ProgramFiles%\nodejs\"
+IF EXIST "%ProgramFiles%\nodejs" ECHO copying node.exe to "%ProgramFiles%\nodejs" && COPY node.exe "%ProgramFiles%\nodejs\"
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR

+WHERE node

 :RUN_INSTALL


Start script for Windows.

Start script for Windows.

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

--- start.bat
+++ start.bat
@@ -0,0 +1,99 @@
+@ECHO OFF
+
+REM Parameters:  NodeID ClusterID IMEMPort DDERLPort
+
+SET nid=%1
+SET cid=%2
+SET port=%3
+SET dderlport=%4
+
+IF "%4" == "" (
+   SET nid=1
+   SET cid=2
+   SET port=1236
+   SET dderlport=8449
+)
+
+IF NOT "%5" == "" (
+   SET nid=1
+   SET cid=2
+   SET port=1236
+   SET dderlport=8449
+)
+
+SET unamestr=%USERNAME%
+SET host=Hostname
+REM SET hostArrayIn=(${host//./ })
+REM SET host=${hostArrayIn[0]}
+SET host=127.0.0.1
+
+SET name=dderl%nid%@%host%
+SET cmname=dderl%cid%@%host%
+SET imemtyp=disc
+SET ck=dderl
+
+REM Node name
+SET node_name=-name %name%
+
+REM Cookie
+SET cookie=-setcookie %ck%
+
+REM PATHS
+SET paths=-pa
+SET paths=%paths% %cd%\ebin
+SET paths=%paths% %cd%\_build\default\lib\cowboy\ebin
+SET paths=%paths% %cd%\_build\default\lib\cowlib\ebin
+SET paths=%paths% %cd%\_build\default\lib\dderl\ebin
+SET paths=%paths% %cd%\_build\default\lib\egambo\ebin
+SET paths=%paths% %cd%\_build\default\lib\erlimem\ebin
+SET paths=%paths% %cd%\_build\default\lib\erloci\ebin
+SET paths=%paths% %cd%\_build\default\lib\erlpkg\ebin
+SET paths=%paths% %cd%\_build\default\lib\erlscrypt\ebin
+SET paths=%paths% %cd%\_build\default\lib\esaml\ebin
+SET paths=%paths% %cd%\_build\default\lib\goldrush\ebin
+SET paths=%paths% %cd%\_build\default\lib\imem\ebin
+SET paths=%paths% %cd%\_build\default\lib\jpparse\ebin
+SET paths=%paths% %cd%\_build\default\lib\jsx\ebin
+SET paths=%paths% %cd%\_build\default\lib\lager\ebin
+SET paths=%paths% %cd%\_build\default\lib\mimetypes\ebin
+SET paths=%paths% %cd%\_build\default\lib\ranch\ebin
+SET paths=%paths% %cd%\_build\default\lib\sext\ebin
+SET paths=%paths% %cd%\_build\default\lib\sqlparse\ebin
+
+REM Proto dist module
+SET dist_opts=-proto_dist
+SET dist_opts=%dist_opts% imem_inet_tcp
+
+REM Kernel Opts
+SET kernel_opts=-kernel
+SET kernel_opts=%kernel_opts% inet_dist_listen_min 7000
+SET kernel_opts=%kernel_opts% inet_dist_listen_max 7020
+
+SET Imem Opts
+SET imem_opts=-imem
+SET imem_opts=%imem_opts% mnesia_node_type %imemtyp%
+SET imem_opts=%imem_opts% erl_cluster_mgrs ['%cmname%']
+SET imem_opts=%imem_opts% mnesia_schema_name egambo
+SET imem_opts=%imem_opts% tcp_port %port%
+
+REM dderl opts
+SET dderl_opts=-dderl
+SET dderl_opts=%dderl_opts% port %dderlport%
+
+SET start_opts=%paths% %cookie% %node_name% %dist_opts% %kernel_opts% %imem_opts% %dderl_opts%
+
+REM DDERL start options
+ECHO ------------------------------------------
+ECHO Starting DDERL (Opts)
+ECHO ------------------------------------------
+ECHO Node Name : %node_name%
+ECHO Cookie    : %cookie%
+ECHO EBIN Path : %paths%
+ECHO Dist      : %dist_opts%
+ECHO Kernel    : %kernel_opts%
+ECHO IMEM      : %imem_opts%
+ECHO DDERL     : %dderl_opts%
+ECHO ------------------------------------------
+
+REM Starting dderl
+START /MAX werl %start_opts% -s egambo


Create start.bat

Create start.bat

--- start.bat
+++ start.bat
@@ -0,0 +1,3 @@
+@echo off
+TITLE MCPEBukkit
+#placeholder


Changes in the sh script should also be reflected in the bat scipt.

--- start.bat
+++ start.bat
@@ -11,14 +11,14 @@
    SET nid=1
    SET cid=2
    SET port=1236
-   SET dderlport=8443
+   SET dderlport=443
 )

 IF NOT "%5" == "" (
    SET nid=1
    SET cid=2
    SET port=1236
-   SET dderlport=8443
+   SET dderlport=443
 )

 SET unamestr=%USERNAME%


clean

clean

--- build/build-rmwebdemo/make.bat
+++ build/build-rmwebdemo/make.bat
@@ -15,6 +15,7 @@

 echo copy quickbundle-rmwebdemo...
 cd ..\..\..\..\..\quickbundle-rmwebdemo
+rem call mvn clean eclipse:clean eclipse:eclipse
 call mvn clean
 cd ..
 echo extract quickbundle-rmwebdemo.jar...


attempt to get perl_bdi test working on Windows by setting the PERL_LIBDIR properly

--- MonetDB4/tests/mapi/examples/C/Tests/perl_dbi.MIL.bat
+++ MonetDB4/tests/mapi/examples/C/Tests/perl_dbi.MIL.bat
@@ -2,7 +2,7 @@

 set PATH=%CLIENTS_PREFIX%\lib\MonetDB\Tests;%PATH%

-if "%PERL_LIBDIR%"=="" set PERL_LIBDIR=share\MonetDB\perl
+if "%PERL_LIBDIR%" == "" set PERL_LIBDIR=share\MonetDB\perl
 set PERLLIB=%CLIENTS_PREFIX%\%PERL_LIBDIR%

 prompt # $t $g


Use TDM's g++ 4.3.3 mingw Dwarf2 compiler (instead of SJLJ, which seems to cause exception problems).

--- docs/win32_build_scripts/pokerth_download_libs.cmd
+++ docs/win32_build_scripts/pokerth_download_libs.cmd
@@ -51,16 +51,16 @@
 pause
 echo.
 echo Downloading mingw packages
-%PKTH_OldDir%\third_party_apps\curl -O http://%SOURCEFORGE_MIRROR%.sourceforge.net/sourceforge/tdm-gcc/gcc-4.3.3-tdm-1-core.tar.gz -O http://%SOURCEFORGE_MIRROR%.sourceforge.net/sourceforge/tdm-gcc/gcc-4.3.3-tdm-1-g++.tar.gz -O http://%SOURCEFORGE_MIRROR%.sourceforge.net/sourceforge/mingw/binutils-2.19.1-mingw32-bin.tar.gz -O http://%SOURCEFORGE_MIRROR%.sourceforge.net/sourceforge/mingw/mingwrt-3.15.2-mingw32-dev.tar.gz -O http://%SOURCEFORGE_MIRROR%.sourceforge.net/sourceforge/mingw/mingwrt-3.15.2-mingw32-dll.tar.gz -O http://%SOURCEFORGE_MIRROR%.sourceforge.net/sourceforge/mingw/w32api-3.11.tar.gz -O http://%SOURCEFORGE_MIRROR%.sourceforge.net/sourceforge/mingw/mingw32-make-3.81-20080326-3.tar.gz -O http://%SOURCEFORGE_MIRROR%.sourceforge.net/sourceforge/mingw/mingw-utils-0.3.tar.gz
+%PKTH_OldDir%\third_party_apps\curl -O http://%SOURCEFORGE_MIRROR%.sourceforge.net/sourceforge/tdm-gcc/gcc-4.3.3-tdm-1-dw2-core.tar.gz -O http://%SOURCEFORGE_MIRROR%.sourceforge.net/sourceforge/tdm-gcc/gcc-4.3.3-tdm-1-dw2-g++.tar.gz -O http://%SOURCEFORGE_MIRROR%.sourceforge.net/sourceforge/mingw/binutils-2.19.1-mingw32-bin.tar.gz -O http://%SOURCEFORGE_MIRROR%.sourceforge.net/sourceforge/mingw/mingwrt-3.15.2-mingw32-dev.tar.gz -O http://%SOURCEFORGE_MIRROR%.sourceforge.net/sourceforge/mingw/mingwrt-3.15.2-mingw32-dll.tar.gz -O http://%SOURCEFORGE_MIRROR%.sourceforge.net/sourceforge/mingw/w32api-3.11.tar.gz -O http://%SOURCEFORGE_MIRROR%.sourceforge.net/sourceforge/mingw/mingw32-make-3.81-20080326-3.tar.gz -O http://%SOURCEFORGE_MIRROR%.sourceforge.net/sourceforge/mingw/mingw-utils-0.3.tar.gz
 if not errorlevel 0 goto downloadFailed
 echo.
 echo Unpacking mingw packages
 mkdir mingw
-%PKTH_OldDir%\third_party_apps\7za x -y gcc-4.3.3-tdm-1-core.tar.gz
-%PKTH_OldDir%\third_party_apps\7za x -y -omingw gcc-4.3.3-tdm-1-core.tar
+%PKTH_OldDir%\third_party_apps\7za x -y gcc-4.3.3-tdm-1-dw2-core.tar.gz
+%PKTH_OldDir%\third_party_apps\7za x -y -omingw gcc-4.3.3-tdm-1-dw2-core.tar
 del gcc-4.3.3-tdm-1-core.tar
-%PKTH_OldDir%\third_party_apps\7za x -y gcc-4.3.3-tdm-1-g++.tar.gz
-%PKTH_OldDir%\third_party_apps\7za x -y -omingw gcc-4.3.3-tdm-1-g++.tar
+%PKTH_OldDir%\third_party_apps\7za x -y gcc-4.3.3-tdm-1-dw2-g++.tar.gz
+%PKTH_OldDir%\third_party_apps\7za x -y -omingw gcc-4.3.3-tdm-1-dw2-g++.tar
 del gcc-4.3.3-tdm-1-g++.tar
 %PKTH_OldDir%\third_party_apps\7za x -y binutils-2.19.1-mingw32-bin.tar.gz
 %PKTH_OldDir%\third_party_apps\7za x -y -omingw binutils-2.19.1-mingw32-bin.tar
@@ -81,6 +81,20 @@
 %PKTH_OldDir%\third_party_apps\7za x -y -omingw mingw-utils-0.3.tar
 del mingw-utils-0.3.tar
 echo.
+echo Renaming compiler files (remove dw2-postfix).
+cd /d %PKTH_BaseDir%
+cd mingw\bin
+ren c++-dw2.exe c++.exe
+ren cpp-dw2.exe cpp.exe
+ren g++-dw2.exe g++.exe
+ren gcc-dw2.exe gcc.exe
+ren gcov-dw2.exe gcov.exe
+ren mingw32-c++-dw2.exe mingw32-c++.exe
+ren mingw32-g++-dw2.exe mingw32-g++.exe
+ren mingw32-gcc-4.3.3-dw2.exe mingw32-gcc-4.3.3.exe
+ren mingw32-gcc-dw2.exe mingw32-gcc.exe
+cd /d %PKTH_BaseDir%
+echo.
 echo Testing g++
 set PATH=%PKTH_BaseDir%\mingw\bin;%PATH%
 g++ %PKTH_OldDir%\helper_src\pkth_test.cpp -o pkth_test


added --quick

added --quick

--- bin/test-box-vcloud.bat
+++ bin/test-box-vcloud.bat
@@ -1,17 +1,25 @@
 rem
 rem bin\test-box-vcloud.bat ubuntu1204_vcloud.box ubuntu1204 vcloud vcloud

+set quick=0
+
+if "%1x"=="--quickx" (
+  shift
+  set quick=1
+)
 set box_path=%1
 set box_name=%2
 set box_provider=vcloud
 set vagrant_provider=vcloud
 set test_src_path=../test/*_spec.rb

-set tmp_path=boxtest
-
 set result=0

+set tmp_path=boxtest
 if exist %tmp_path% rmdir /s /q %tmp_path%
+
+if %quick%==1 goto :do_test
+

 rem tested only with box-provider=vcloud
 vagrant plugin install vagrant-%box_provider%
@@ -21,7 +29,6 @@
 vagrant box add %box_name% %box_path%
 if ERRORLEVEL 1 set result=%ERRORLEVEL%
 if ERRORLEVEL 1 goto :done
-mkdir %tmp_path%

 @set vcloud_hostname=YOUR-VCLOUD-HOSTNAME
 @set vcloud_username=YOUR-VCLOUD-USERNAME
@@ -50,8 +57,10 @@
 @echo solution that waits until the import is really finished.
 @ping 1.1.1.1 -n 1 -w 240000 > nul

+:do_test
 set result=0

+mkdir %tmp_path%
 pushd %tmp_path%
 call :create_vagrantfile
 set VAGRANT_LOG=debug
@@ -69,6 +78,8 @@
 vagrant destroy -f
 if ERRORLEVEL 1 set result=%ERRORLEVEL%
 popd
+
+if %quick%==1 goto :done

 vagrant box remove %box_name% --provider=%box_provider%
 if ERRORLEVEL 1 set result=%ERRORLEVEL%


always cleanup vApp

always cleanup vApp

--- bin/test-box-vcloud.bat
+++ bin/test-box-vcloud.bat
@@ -9,6 +9,8 @@

 set tmp_path=boxtest

+set result=0
+
 if exist %tmp_path% rmdir /s /q %tmp_path%

 rem tested only with box-provider=vcloud
@@ -17,6 +19,7 @@

 vagrant box remove %box_name% --provider=%box_provider%
 vagrant box add %box_name% %box_path%
+if ERRORLEVEL 1 set result=%ERRORLEVEL%
 if ERRORLEVEL 1 goto :done
 mkdir %tmp_path%

@@ -47,6 +50,8 @@
 @echo solution that waits until the import is really finished.
 @ping 1.1.1.1 -n 1 -w 240000 > nul

+set result=0
+
 pushd %tmp_path%
 call :create_vagrantfile
 set VAGRANT_LOG=debug
@@ -55,18 +60,18 @@
 del /F %USERPROFILE%\.ssh\known_hosts
 if exist %USERPROFILE%\.ssh\known_hosts echo known_hosts still here!!
 vagrant up --provider=%vagrant_provider%
-if ERRORLEVEL 1 goto :done
+if ERRORLEVEL 1 set result=%ERRORLEVEL%

 set VAGRANT_LOG=warn
 @echo Sleep 10 seconds
 @ping 1.1.1.1 -n 1 -w 10000 > nul

 vagrant destroy -f
-if ERRORLEVEL 1 goto :done
+if ERRORLEVEL 1 set result=%ERRORLEVEL%
 popd

 vagrant box remove %box_name% --provider=%box_provider%
-if ERRORLEVEL 1 goto :done
+if ERRORLEVEL 1 set result=%ERRORLEVEL%

 goto :done

@@ -95,3 +100,4 @@
 exit /b

 :done
+exit %result%


Another fix to xspec.bat to handle whitespace in Windows file paths.

git-svn-id: 2dbaadbaf98ca174f7b0d7d7583b0de64790c4d8@22 7466eb41-2b56-0410-9bce-5946398f495e

--- xspec.bat
+++ xspec.bat
@@ -1,6 +1,6 @@
 @echo off

-SET CP=C:\Program Files\Oxygen XML Editor 9.2\lib\saxon9.jar
+SET CP=C:\Program Files\Oxygen XML Editor\lib\saxon9.jar

 SET XSPEC=%1

@@ -39,7 +39,7 @@
 REM ================================================
 REM Create xspec subdirectory for running the tests
 REM ================================================
-IF NOT EXIST %TEST_DIR% GOTO notestdir
+IF NOT EXIST "%TEST_DIR%" GOTO notestdir
 GOTO endif2
 :notestdir
 echo Creating XSpec Directory at "%TEST_DIR%" ...


Updated script to build native AAR

Updated script to build native AAR

--- build-native.bat
+++ build-native.bat
@@ -1,4 +1,4 @@
-::cd vendor\MaterialSpinner\
-::gradlew check
-::cd ..
+cd vendor\MaterialSpinner\
+gradlew check
+cd ..
 copy library\build\outputs\aar\library*.aar ..\..\MaterialSpinner-Xamarin\Jars


update for Visual Studio 2013

update for Visual Studio 2013

--- build/deploy.bat
+++ build/deploy.bat
@@ -15,8 +15,8 @@
 copy vcmswu\syncped.exe.manifest syncped

 rem Copy msvc DLL's
-copy c:\windows\syswow64\msvcp110.dll syncped
-copy c:\windows\syswow64\msvcr110.dll syncped
+copy c:\windows\syswow64\msvcp120.dll syncped
+copy c:\windows\syswow64\msvcr120.dll syncped

 rem Copy templates and xml data.
 copy ..\extension\data\*.txt syncped


update script

update script

--- build_script.bat
+++ build_script.bat
@@ -5,8 +5,8 @@
 goto custom_python:

 :default_value_python:
-set pythonexe="c:\Python363_x64\python"
-if not exist %pythonexe% set pythonexe="c:\Python36_x64\python"
+set pythonexe="c:\Python363_x64\python.exe"
+if not exist %pythonexe% set pythonexe="c:\Python36_x64\python.exe"
 :custom_python:
 @echo [python] %pythonexe%
 %pythonexe% -u setup.py build_script


#17 : Build script change (build2.bat)

#17 : Build script change (build2.bat)

--- build/build2.bat
+++ build/build2.bat
@@ -48,9 +48,11 @@
 rem ########## Building ##########
 echo;
 echo Building agent.sln...
-%DEVENV% "..\src\agent\agent.sln" /rebuild Release
+%MSBUILD% "..\src\agent\agent.sln" /t:clean;build /p:Configuration=Release
+rem %DEVENV% "..\src\agent\agent.sln" /rebuild Release
 echo Building agentsvc.sln...
-%DEVENV% "..\src\agentsvc\agentsvc.sln" /rebuild Release
+%MSBUILD% "..\src\agentsvc\agentsvc.sln" /t:clean;build /p:Configuration=Release
+rem %DEVENV% "..\src\agentsvc\agentsvc.sln" /rebuild Release

 rem ########## Checking file existence ##########


add SeExpr library

add SeExpr library

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

--- build_SeExpr.bat
+++ build_SeExpr.bat
@@ -0,0 +1,16 @@
+setlocal
+call settings.bat
+
+git clone --depth 1 https://github.com/wdas/SeExpr.git seexpr
+
+cd seexpr
+
+xcopy windows7\SeExpr src\SeExpr /s /e /y
+xcopy windows7\SeExprEditor src\SeExprEditor /s /e /y
+
+cmake %GENERATOR% -DCMAKE_BUILD_TYPE=%VARIANT% -DCMAKE_INSTALL_PREFIX=%PREFIX1%
+%ER%
+%MSBUILDINSTALL%
+%ER%
+
+cd ..


Typo in runprebuild2008.bat

Typo in runprebuild2008.bat

git-svn-id: baf6e02d125cf6f9bfcfe153b2eb83d6e1f5ace6@2070 52acb1d6-8a22-11de-b505-999d5b087335


Enable Coquelicot, Flocq, Interval and Gappa in extended/release Windows builds

--- dev/ci/gitlab.bat
+++ dev/ci/gitlab.bat
@@ -48,9 +48,13 @@
     -addon=compcert ^
     -addon=extlib ^
     -addon=quickchick ^
+    -addon=coquelicot ^
     -addon=vst ^
-    -addon=aactactics
-REM -addon=coquelicot ^
+    -addon=aactactics ^
+    -addon=flocq ^
+    -addon=interval ^
+    -addon=gappa_tool ^
+    -addon=gappa
 ) ELSE (
   SET "EXTRA_ADDONS= "
 )


Removed recursive autoinstall check

Removed recursive autoinstall check

--- checkinstall.bat
+++ checkinstall.bat
@@ -20,7 +20,6 @@
 	if "%choice%"=="y" (
 		bitsadmin /transfer WinPCAPInstall /download /priority normal https://www.winpcap.org/install/bin/WinPcap_4_1_3.exe %TEMP%\\winpcap.exe
 		%TEMP%/winpcap.exe
-		checkinstall.bat
 		del %TEMP%\\winpcap.exe
 	)
 )


Fixed job_filexfer_trans-excut-true_van, it was assuming the default behavior of should_transfer_files and when_to_transfer_output, #2273

--- src/condor_tests/job_filexfer_trans-excut-true_van.cmd
+++ src/condor_tests/job_filexfer_trans-excut-true_van.cmd
@@ -10,5 +10,7 @@
 transfer_executable = true
 Notification = NEVER
 arguments  = --noextrainput
+should_transfer_files = NO
+when_to_transfer_output = NONE
 queue


Delete CreateMaintenanceDB - lab.bat

Delete CreateMaintenanceDB - lab.bat


only set JALLIB_PYTHON when it is not defined

--- bin/jaluino_svn.bat
+++ bin/jaluino_svn.bat
@@ -39,7 +39,9 @@

 rem get python from default/standard location, but honor PYTHON_EXEC
-set JALLIB_PYTHON=C:\Python25\Python.exe
+
+if not defined JALLIB_PYTHON set JALLIB_PYTHON=C:\Python25\Python.exe
+
 if defined PYTHON_EXEC set JALLIB_PYTHON=%PYTHON_EXEC%
 %JALLIB_PYTHON% "%JALLIB_ROOT%\tools\jallib.py" %1 %2 %3 %4 %5 %6 %7 %8 %9


RunPesterTests - 64-bit powershell and new nunit xml format.

--- _buildTools/RunPesterTests.bat
+++ _buildTools/RunPesterTests.bat
@@ -3,6 +3,12 @@
 if NOT '%1'=='' SET ARGS=%ARGS:"=\"%
 if '%1'=='' SET ARGS=-Tag PSCI.unit,PSCI.integration -Path %~dp0..

-%SystemRoot%\System32\WindowsPowerShell\v1.0\powershell.exe -NonInteractive -NoProfile -ExecutionPolicy Bypass -Command ^
+if exist { %systemroot%\sysnative } (
+   set pspath=%systemroot%\sysnative\WindowsPowerShell\v1.0\powershell.exe
+) else (
+   set pspath=%systemroot%\system32\WindowsPowerShell\v1.0\powershell.exe
+)
+%pspath% -NonInteractive -NoProfile -ExecutionPolicy Bypass -Command ^
  "& { Import-Module '%~dp0\Pester\Pester.psm1'; Invoke-Pester -OutputFile Test.xml -OutputFormat NUnitXml -Strict -EnableExit %ARGS%}"
 if '%TEAMCITY_VERSION%'=='' pause
+exit /B %errorlevel%


Add client to package script

Add client to package script

--- scripts/package.cmd
+++ scripts/package.cmd
@@ -1,4 +1,5 @@
 rm *.nupkg
 %userprofile%\bin\nuget.exe pack IntegrationEngine.Model\IntegrationEngine.Model.csproj -Prop Configuration=Release -Prop Platform=AnyCPU
+%userprofile%\bin\nuget.exe pack IntegrationEngine.Client\IntegrationEngine.Client.csproj -Prop Configuration=Release -Prop Platform=AnyCPU
 %userprofile%\bin\nuget.exe pack IntegrationEngine.Core\IntegrationEngine.Core.csproj -Prop Configuration=Release -Prop Platform=AnyCPU
 %userprofile%\bin\nuget.exe pack IntegrationEngine\IntegrationEngine.csproj -Prop Configuration=Release -Prop Platform=AnyCPU


remove old POPPLER_0_20_OR_LATER etc defines as they were cleaned up in gdal rev d9ff536

--- recipe/set_bld_opts.bat
+++ recipe/set_bld_opts.bat
@@ -83,7 +83,7 @@
     LIBICONV_INCLUDE="-I%LIBRARY_INC% -DICONV_CONST= " ^
     LIBICONV_LIBRARY="%LIBRARY_LIB%\iconv.lib" ^
     POPPLER_ENABLED=YES ^
-    POPPLER_CFLAGS="-I%LIBRARY_INC%\poppler -DPOPPLER_0_20_OR_LATER= -DPOPPLER_0_23_OR_LATER= -DPOPPLER_0_58_OR_LATER= -DPOPPLER_HAS_OPTCONTENT= -DPOPPLER_BASE_STREAM_HAS_TWO_ARGS= " ^
+    POPPLER_CFLAGS="-I%LIBRARY_INC%\poppler -DPOPPLER_HAS_OPTCONTENT= -DPOPPLER_BASE_STREAM_HAS_TWO_ARGS= " ^
     POPPLER_MAJOR_VERSION=%POPPLER_MAJOR_VERSION% ^
     POPPLER_MINOR_VERSION=%POPPLER_MINOR_VERSION% ^
     POPPLER_LIBS="%LIBRARY_LIB%\poppler.lib" ^


Update upload.bat

Update upload.bat

--- conda/upload.bat
+++ conda/upload.bat
@@ -54,12 +54,12 @@
 cd ..
 rmdir toolchain /s /q

-for %%x in (%UPLOAD_TARGETS%) do (
-    for /f %%i in ('conda build %%x -c %ANACONDA_CHANNEL% %ANACONDA_UPLOAD_FLAGS% --output') do (set UPLOAD_FILE=%%i)
-    anaconda upload --user %ANACONDA_CHANNEL% %UPLOAD_FILE%
-    if %errorlevel% neq 0 (
-      echo "upload failed"
-    )
-)
+:: for %%x in (%UPLOAD_TARGETS%) do (
+::    for /f %%i in ('conda build %%x -c %ANACONDA_CHANNEL% %ANACONDA_UPLOAD_FLAGS% --output') do (set UPLOAD_FILE=%%i)
+::    anaconda upload --user %ANACONDA_CHANNEL% %UPLOAD_FILE%
+::    if %errorlevel% neq 0 (
+::      echo "upload failed"
+::    )
+:: )

 anaconda logout


Detect if java can't be find (on windows)

Closes #333

--- src/main/scripts/fscrawler.bat
+++ src/main/scripts/fscrawler.bat
@@ -5,6 +5,16 @@

 set SCRIPT_DIR=%~dp0
 for %%I in ("%SCRIPT_DIR%..") do set FS_HOME=%%~dpfI
+
+IF DEFINED JAVA_HOME (
+  set JAVA="%JAVA_HOME%\bin\java.exe"
+) ELSE (
+  FOR %%I IN (java.exe) DO set JAVA=%%~$PATH:I
+)
+IF NOT EXIST %JAVA% (
+  ECHO Could not find any executable java binary. Please install java in your PATH or set JAVA_HOME 1>&2
+  EXIT /B 1
+)

 REM set to headless, just in case
 set JAVA_OPTS=%JAVA_OPTS% -Djava.awt.headless=true
@@ -50,6 +60,6 @@
 	)
 )

-"%JAVA_HOME%\bin\java" %JAVA_OPTS% -cp "%FS_CLASSPATH%" -jar "%FS_HOME%/lib/${project.build.finalName}.jar" !newparams!
+%JAVA% %JAVA_OPTS% -cp "%FS_CLASSPATH%" -jar "%FS_HOME%/lib/${project.build.finalName}.jar" !newparams!

 ENDLOCAL


storing urho state

storing urho state

--- FullBuild_Win64.bat
+++ FullBuild_Win64.bat
@@ -1,6 +1,6 @@
 @echo off
 ::run cmake
-call cmake_vs2015.bat Build/Win64 -DURHO3D_64BIT=1 -DURHO3D_C++11=1 -DURHO3D_OPENGL=1 -DURHO3D_LUA=0 -DURHO3D_SAMPLES=0
+call cmake_vs2017.bat Build/Win64 -DURHO3D_64BIT=1 -DURHO3D_C++11=1 -DURHO3D_OPENGL=1 -DURHO3D_LUA=0 -DURHO3D_SAMPLES=0
 ::build
 start "" "C:\Program Files (x86)\MSBuild\14.0\Bin\msbuild.exe" .\Build\Win64\Urho3D.sln /p:Configuration=Release /maxcpucount:4
 start "" "C:\Program Files (x86)\MSBuild\14.0\Bin\msbuild.exe" .\Build\Win64\Urho3D.sln /p:Configuration=Debug /maxcpucount:4


Fix a broken code comment

Fix a broken code comment

--- buildscript/modules/mesa3d.cmd
+++ buildscript/modules/mesa3d.cmd
@@ -53,11 +53,10 @@
 @echo 1 > mesapatched.ini
 @echo.

-@rem Apply a patch that disables osmesa when building GLES or swr driver when using Scons.
+@rem Apply a patch that disables osmesa when building GLES when using Scons build.
 @rem GLES linking with osmesa is disabled due to build failure - https://bugs.freedesktop.org/show_bug.cgi?id=106843
-@rem Now do the same for swr as it fails to link with osmesa when using LLVM 7.0.
-@rem We'll do a 2-pass build in either case. Build everything requested without GLES and swr, then build everything again
-@rem with GLES or swr or both.
+@rem We'll do a 2-pass build in this case. Build everything requested without GLES, then build everything again
+@rem with GLES.
 @IF %pythonver%==2 git apply -v ..\mesa-dist-win\patches\osmesa.patch
 @IF %pythonver%==2 echo.


mytime

mytime

--- auto.bat
+++ auto.bat
@@ -6,9 +6,7 @@

 For /f "tokens=2-4 delims=/ " %%a in ('date /t') do (set mydate=%%a-%%b-%%c)
 For /f "tokens=1-2 delims=/:" %%a in ('time /t') do (set mytime=%%a:%%b)
-SET commit_time = %mydate-%mytime
-echo %commit_time%

-git commit -m %commit_time
+git commit -m %mydate-%mytime

 git push origin master:master


Add comments to JVM options parsing for Windows

This commit adds some comments to the portion of bin/elasticsearch.bat
that is responsible for parsing the JVM options.

--- distribution/src/main/resources/bin/elasticsearch.bat
+++ distribution/src/main/resources/bin/elasticsearch.bat
@@ -36,10 +36,13 @@
 SET HOSTNAME=%COMPUTERNAME%

 if "%ES_JVM_OPTIONS%" == "" (
+rem '0' is the batch file, '~dp' appends the drive and path
 set ES_JVM_OPTIONS="%~dp0\..\config\jvm.options"
 )

 @setlocal
+rem extract the options from the JVM options file %ES_JVM_OPTIONS%
+rem such options are the lines beginning with '-', thus "findstr /b"
 for /F "usebackq delims=" %%a in (`findstr /b \- "%ES_JVM_OPTIONS%"`) do set JVM_OPTIONS=!JVM_OPTIONS! %%a
 @endlocal & set ES_JAVA_OPTS=%JVM_OPTIONS% %ES_JAVA_OPTS%


WIP: HighFive Conda bld.bat

WIP: HighFive Conda bld.bat

error: pathspec 'conda-recipes/highfive/bld.bat' did not match any file(s) known to git

--- conda-recipes/highfive/bld.bat
+++ conda-recipes/highfive/bld.bat
@@ -0,0 +1,13 @@
+@echo off
+
+mkdir build
+cd build
+
+set CMAKE_CONFIG="Release"
+
+cmake .. -LAH -G"%CMAKE_GENERATOR%"                       ^
+    -DCMAKE_INSTALL_PREFIX="%LIBRARY_PREFIX%"
+
+cmake --build . --config %CMAKE_CONFIG% --target ALL_BUILD
+cmake --build . --config %CMAKE_CONFIG% --target INSTALL
+if errorlevel 1 exit 1


KAFKA-6055; Fix typo in KAFKA_JVM_PERFORMANCE_OPTS for Windows

Author: Vahid Hashemian <vahidhashemian@us.ibm.com>

Reviewers: Ismael Juma <ismael@juma.me.uk>

Closes #4062 from vahidhashemian/KAFKA-6055

--- bin/windows/kafka-run-class.bat
+++ bin/windows/kafka-run-class.bat
@@ -168,7 +168,7 @@

 rem JVM performance options
 IF ["%KAFKA_JVM_PERFORMANCE_OPTS%"] EQU [""] (
-	set KAFKA_JVM_PERFORMANCE_OPTS=-server -XX:+UseG1GC -XX:MaxGCPauseMillis=20 -XX:InitiatingHeapOccupancyPercent=35 -XX:ExplicitGCInvokesConcurrent -Djava.awt.headless=true
+	set KAFKA_JVM_PERFORMANCE_OPTS=-server -XX:+UseG1GC -XX:MaxGCPauseMillis=20 -XX:InitiatingHeapOccupancyPercent=35 -XX:+ExplicitGCInvokesConcurrent -Djava.awt.headless=true
 )

 IF not defined CLASSPATH (


Slightly better testing

Slightly better testing

--- .ci/script.bat
+++ .ci/script.bat
@@ -1,4 +1,12 @@
 echo off
 call "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\Common7\Tools\VsDevCmd.bat" -host_arch=amd64 -arch=amd64
 call "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\Common7\Tools\VsDevCmd.bat" -test
-cd dist/msvc-compatible && cl *.c /I ../kremlin/include /I . /I ../kremlin/kremlib/dist/minimal /c && echo "SUCCESS"
+cd dist/msvc-compatible
+cl *.c /I ../kremlin/include /I . /I ../kremlin/kremlib/dist/minimal /c || goto :error
+for /F %i in ('dir /b *-x86_64-msvc.asm') do (ml64 /c %i || goto :error)
+lib *.obj || goto :error
+echo "SUCCESS"
+
+:error
+echo "Failed"
+exit /b %errorlevel%


windows: add /p:Platform="Any CPU" to build-banshee.bat (bgo#641513)

Signed-off-by: Gabriel Burt <ce11a5f747b579a775c140646376daaba8c3eb7d@gmail.com>

--- build/windows/build-banshee.bat
+++ build/windows/build-banshee.bat
@@ -1,2 +1,2 @@
 cd ..\..
-C:\WINDOWS\Microsoft.NET\Framework\v3.5\msbuild Banshee.sln /p:Configuration=Windows
+C:\WINDOWS\Microsoft.NET\Framework\v3.5\msbuild Banshee.sln /p:Configuration=Windows /p:Platform="Any CPU"


catch more errors when building the documentation

--- build_setup_help_on_windows.bat
+++ build_setup_help_on_windows.bat
@@ -21,6 +21,7 @@

 set pythonexe="c:\Python34\python"
 %pythonexe% -u setup.py clean_space
+if %errorlevel% neq 0 exit /b %errorlevel%
 %pythonexe% -u setup.py unittests
 if %errorlevel% neq 0 exit /b %errorlevel%
 echo #######################################################
@@ -29,6 +30,7 @@

 set pythonexe="c:\Python33_x64\python"
 %pythonexe% clean_pyd.py
+if %errorlevel% neq 0 exit /b %errorlevel%
 %pythonexe% setup.py build bdist_wininst --plat-name=win-amd64
 if %errorlevel% neq 0 exit /b %errorlevel%
 echo #######################################################
@@ -36,6 +38,7 @@
 set pythonexe="c:\Python33\python"
 %pythonexe% clean_pyd.py
 %pythonexe% setup.py sdist --formats=gztar,zip --verbose
+if %errorlevel% neq 0 exit /b %errorlevel%
 %pythonexe% setup.py bdist_wininst
 if %errorlevel% neq 0 exit /b %errorlevel%
 echo #######################################################
@@ -45,6 +48,7 @@
 set pythonexe="c:\Python34_x64\python"
 %pythonexe% clean_pyd.py
 %pythonexe% setup.py build bdist_wininst --plat-name=win-amd64
+if %errorlevel% neq 0 exit /b %errorlevel%
 %pythonexe% setup.py build bdist_msi --plat-name=win-amd64
 if %errorlevel% neq 0 exit /b %errorlevel%
 echo #######################################################
@@ -52,7 +56,9 @@
 set pythonexe="c:\Python34\python"
 %pythonexe% clean_pyd.py
 %pythonexe% setup.py sdist --formats=gztar,zip --verbose
+if %errorlevel% neq 0 exit /b %errorlevel%
 %pythonexe% setup.py bdist_wininst
+if %errorlevel% neq 0 exit /b %errorlevel%
 %pythonexe% setup.py bdist_msi
 if %errorlevel% neq 0 exit /b %errorlevel%
 echo #######################################################
@@ -65,4 +71,4 @@

 if not exist dist\html mkdir dist\html
 xcopy /E /C /I /Y _doc\sphinxdoc\build\html dist\html
-if %errorlevel% neq 0 exit /b %errorlevel%+if %errorlevel% neq 0 exit /b %errorlevel%


setup

setup

--- build_setup_help_on_windows.bat
+++ build_setup_help_on_windows.bat
@@ -57,5 +57,6 @@
 if not exist dist\html mkdir dist\html
 xcopy /E /C /I /Y _doc\sphinxdoc\build\html dist\html
 xcopy /E /C /I /Y _doc\sphinxdoc\build2\html dist\html2
+xcopy /E /C /I /Y _doc\sphinxdoc\build\latex dist\latex


Allow selecting Mesa3D code branch when building with Meson now that 19.3 has been branched.

--- buildscript/modules/mesa3d.cmd
+++ buildscript/modules/mesa3d.cmd
@@ -21,8 +21,8 @@
 @if NOT EXIST mesa echo.
 @if NOT EXIST mesa if /i NOT "%buildmesa%"=="y" GOTO skipmesa
 @if NOT EXIST mesa set branch=master
-@if NOT EXIST mesa IF %mesabldsys%==scons set /p branch=Enter Mesa source code branch name - defaults to master:
-@if NOT EXIST mesa IF %mesabldsys%==scons echo.
+@if NOT EXIST mesa set /p branch=Enter Mesa source code branch name - defaults to master:
+@if NOT EXIST mesa echo.
 @if NOT EXIST mesa git clone --recurse-submodules --depth=1 --branch=%branch% https://gitlab.freedesktop.org/mesa/mesa.git mesa
 @if NOT EXIST mesa echo.


add call in front of git

add call in front of git

--- src/setup.bat
+++ src/setup.bat
@@ -8,12 +8,12 @@
 call git fetch

 set BRANCH=1700
-git config --replace-all svn-remote.svn_$BRANCH.url http://src.chromium.org/chrome
+call git config --replace-all svn-remote.svn_$BRANCH.url http://src.chromium.org/chrome
 REM only for committers call git config --replace-all svn-remote.svn_%BRANCH%.url svn://svn.chromium.org/chrome
 call git config --replace-all svn-remote.svn_%BRANCH%.fetch branches/%BRANCH%/src:refs/remotes/origin/%BRANCH%
 REM NEW for 2014: You also need to convince git-svn that the commits on http://src.chromium.org/chrome are the same as those on svn://svn.chromium.org/chrome
-git config --replace-all svn-remote.svn_$BRANCH.rewriteRoot "svn://svn.chromium.org/chrome"
-git config --replace-all svn-remote.svn_$BRANCH.rewriteUUID "0039d316-1c4b-4281-b951-d872f2087c98"
+call git config --replace-all svn-remote.svn_$BRANCH.rewriteRoot "svn://svn.chromium.org/chrome"
+call git config --replace-all svn-remote.svn_$BRANCH.rewriteUUID "0039d316-1c4b-4281-b951-d872f2087c98"

 REM   This "initializes" the %BRANCH% refspec, to prevent 'git svn fetch' from scanning
 REM   the whole svn repo history for the branch commits we already synced above.


Revert update to qt 5.15 for windows. Now only mac is on qt 5.15

--- Tools/autobuild.cmd
+++ Tools/autobuild.cmd
@@ -40,7 +40,7 @@
 rem --- default values ---
 SET JASP_BASE_DIR_DEFAULT=%STARTDIR%\..\..
 SET QTDIR_DEFAULT=C:\Qt
-SET QTVER_DEFAULT=5.15.0
+SET QTVER_DEFAULT=5.12.7
 SET RTOOLSDIR_DEFAULT=C:\Rtools
 SET WIX_DEFAULT=C:\Program Files (x86)\WiX Toolset v3.11
 SET MSVCDIR_DEFAULT=C:\Program Files (x86)\Microsoft Visual Studio\2017\Community
@@ -127,12 +127,12 @@

 if "%ARCH%" == "64" (
 SET MINGWDIR=%RTOOLSDIR%\mingw_64\bin
-SET QTVCDIR=%QTDIR%\%QTVER%\msvc2019_64\bin
+SET QTVCDIR=%QTDIR%\%QTVER%\msvc2017_64\bin
 SET WIXARCH="x64"
 SET COPY_R_ARCH="x64"
 ) else (
 SET MINGWDIR=%RTOOLSDIR%\mingw_32\bin
-SET QTVCDIR=%QTDIR%\%QTVER%\msvc2019\bin
+SET QTVCDIR=%QTDIR%\%QTVER%\msvc2017\bin
 SET WIXARCH="x86"
 SET COPY_R_ARCH="i386"
 )
@@ -313,13 +313,7 @@

 cd %JASP_BASE_DIR%\%JASP_WIX_DIR%

-SET MERGEMODULENAME=Microsoft_VC142_CRT_%WIXARCH%.msm
-
-REM a workaround because for some reason they decided nobody needs VCToolsRedistDir in vs 2019...  https://developercommunity.visualstudio.com/content/problem/544305/vs2019-vctoolsredistdir-environment-variable-incor.html
-if "%VCToolsRedistDir%"=="" (
-    set VCToolsRedistDir="C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC\14.24.28127"
-)
-
+SET MERGEMODULENAME=Microsoft_VC141_CRT_%WIXARCH%.msm

 COPY "%VCToolsRedistDir%\MergeModules\%MERGEMODULENAME%" /Y
 "%WIX%\bin\heat.exe" dir .\%JASP_INSTALL_DIR% -cg JASPFiles -gg -scom -sreg -sfrag -srd -dr INSTALLLOCATION -var var.JASP_INSTALL_DIR -out JASPFilesFragment.wxs || exit /B 7


Update comment to clarify why 'Visual Studio' is referenced for the SDK.

--HG--
branch : distribute
extra : rebase_source : 1f0b5eeb82b7551c66b15fb4379ec03e61d68344

--- msvc-build-launcher.cmd
+++ msvc-build-launcher.cmd
@@ -1,11 +1,12 @@
 @echo off

-REM VCVARSALL may be in Program Files or Program Files (x86)
 REM Use old Windows SDK 6.1 so created .exe will be compatible with
 REM old Windows versions.
 REM Windows SDK 6.1 may be downloaded at:
 REM  http://www.microsoft.com/en-us/download/details.aspx?id=11310
 set PATH_OLD=%PATH%
+
+REM The SDK creates a false install of Visual Studio at one of these locations
 set PATH=C:\Program Files\Microsoft Visual Studio 9.0\VC\bin;%PATH%
 set PATH=C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin;%PATH%


No need for nuget restore

No need for nuget restore

--- build/Package.build.cmd
+++ build/Package.build.cmd
@@ -1,2 +1 @@
-nuget restore ../src/UmbracoContentFiles.sln
 C:\WINDOWS\Microsoft.NET\Framework\v4.0.30319\msbuild.exe Package.build.xml


Added script to internalize protobuf-net

error: pathspec 'src/EventStore/Scripts/ilmerge/merge-client-assemblies.cmd' did not match any file(s) known to git

--- src/EventStore/Scripts/ilmerge/merge-client-assemblies.cmd
+++ src/EventStore/Scripts/ilmerge/merge-client-assemblies.cmd
@@ -0,0 +1,19 @@
+@echo on
+pushd %~dp0 || goto :error
+cd ..\..\..\..\bin\eventstore\release\anycpu || goto :error
+
+call :merge-assemblies || goto :error
+
+popd || goto :error
+
+goto :EOF
+
+:error
+echo FAILED. See previous messages
+exit /b 1
+
+:merge-assemblies
+
+..\..\..\..\tools\ilmerge\ILMerge.exe /internalize /targetplatform:v4 /out:EventStore.ClientAPI.Merged.dll eventstore.clientapi.dll protobuf-net.dll
+
+exit /b 0


Fix compile error from build.bat

Fix compile error from build.bat

--- example/build.bat
+++ example/build.bat
@@ -1 +1 @@
-g++ -std=c++11 -Wall -Werror -Wextra -pedantic -I "C:/Program Files/boost/boost_1_55_0" -I ../include -O3 main.cpp+g++ -std=c++11 -Wall -Werror -Wextra -pedantic -I "C:/Program Files/boost/boost_1_55_0" -I ../tiny_cnn -O3 main.cpp


Update dev.cmd

Update dev.cmd

Changed some old paths from a previous setup to the new naming
convention

--- support/bootstrap/skel/dev.cmd
+++ support/bootstrap/skel/dev.cmd
@@ -10,15 +10,15 @@
 set USERNAME=seapagan
 set COMPUTERNAME=development
 set HOSTNAME=%COMPUTERNAME%
-set TMP=%~dp0root\tmp
+set TMP=%~dp0msys\tmp

 rem set location of SSL certificates...
 set SSL_CERT_FILE=%HOME%\ca-bundle.crt

 rem update the fstab to point to the correct drive, as it may have changed...
-echo %~dp0mingw32 /mingw > %~dp0root\etc\fstab
-echo %~dp0local /usr/local >> %~dp0root\etc\fstab
-echo %~dp0home /home >> %~dp0root\etc\fstab
+echo %~dp0mingw32 /mingw > %~dp0msys\etc\fstab
+echo %~dp0local /usr/local >> %~dp0msys\etc\fstab
+echo %~dp0home /home >> %~dp0msys\etc\fstab

 cd %HOME%


Added test script

Added test script

git-svn-id: 271780961ce0c2fbd127a88e7bddae13e4800ab4@155 f3a24b6a-cf45-0410-b55a-8c22e2698227

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

--- bin/run_test.cmd
+++ bin/run_test.cmd
@@ -0,0 +1,19 @@
+set SOUND_DIR=d:\dev\test_sounds
+set OUT_DIR=.
+set TEST_NAME=semmari
+set OUT_NAME=out
+set SS=soundstretch
+set TEST_PARAM=-pitch=-3 -bpm
+
+call %SS% %SOUND_DIR%\%TEST_NAME%-8b1.wav %OUT_DIR%\%OUT_NAME%-8b1.wav %TEST_PARAM%
+call %SS% %SOUND_DIR%\%TEST_NAME%-8b2.wav %OUT_DIR%\%OUT_NAME%-8b2.wav %TEST_PARAM%
+
+call %SS% %SOUND_DIR%\%TEST_NAME%-16b1.wav %OUT_DIR%\%OUT_NAME%-16b1.wav %TEST_PARAM%
+call %SS% %SOUND_DIR%\%TEST_NAME%-16b2.wav %OUT_DIR%\%OUT_NAME%-16b2.wav %TEST_PARAM%
+
+call %SS% %SOUND_DIR%\%TEST_NAME%-24b1.wav %OUT_DIR%\%OUT_NAME%-24b1.wav %TEST_PARAM%
+call %SS% %SOUND_DIR%\%TEST_NAME%-24b2.wav %OUT_DIR%\%OUT_NAME%-24b2.wav %TEST_PARAM%
+
+call %SS% %SOUND_DIR%\%TEST_NAME%-32b1.wav %OUT_DIR%\%OUT_NAME%-32b1.wav %TEST_PARAM%
+call %SS% %SOUND_DIR%\%TEST_NAME%-32b2.wav %OUT_DIR%\%OUT_NAME%-32b2.wav %TEST_PARAM%
+


Update generate.cmd

Update generate.cmd

Enabling api version generation

--- tools/generate.cmd
+++ tools/generate.cmd
@@ -56,7 +56,7 @@

 :: code generation
 @echo on
-call autorest %configFile% --csharp --csharp-sdks-folder=%sdksFolder% --version=%version%
+call autorest %configFile% --csharp --csharp-sdks-folder=%sdksFolder% --version=%version% --reflect-api-versions
 @echo off

 :: metadata


修正 bat

修正 bat

--- html/convert.bat
+++ html/convert.bat
@@ -1,5 +1,5 @@
 @echo off
-echo ĿļöӦ nested expanded compact compressed
+
 echo You can edit this file to adapt your project. ( nested expanded compact compressed )
-echo -------------------------------------------------------------------------------------
+
 sass --style compressed --watch style.scss:style.css


Test change run_me.bat

Test change run_me.bat

--- lib/src/test/installer/run_me.bat
+++ lib/src/test/installer/run_me.bat
@@ -1,12 +1,6 @@
 @echo off

 bike relative_path_test.bk
-
-echo ****************
-md c:\lib_for_bike
-@set BIKE_LIBS=c:\lib_for_bike
-bike addon_library_path_test.bk
-rmdir c:\lib_for_bike

 echo ****************
 bike home_installation_path_test.bk


scripts/build_all_configs.cmd

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

--- scripts/build_all_configs.cmd
+++ scripts/build_all_configs.cmd
@@ -0,0 +1,23 @@
+@echo off
+
+echo x64-debug
+msbuild /nologo /verbosity:quiet /p:Configuration=debug /p:Platform=x64 "%~dp0..\source\PresentMon.sln"
+if not "%errorlevel%"=="0" goto fail
+
+echo x64-release
+msbuild /nologo /verbosity:quiet /p:Configuration=release /p:Platform=x64 "%~dp0..\source\PresentMon.sln"
+if not "%errorlevel%"=="0" goto fail
+
+echo x86-debug
+msbuild /nologo /verbosity:quiet /p:Configuration=debug /p:Platform=x86 "%~dp0..\source\PresentMon.sln"
+if not "%errorlevel%"=="0" goto fail
+
+echo x86-release
+msbuild /nologo /verbosity:quiet /p:Configuration=release /p:Platform=x86 "%~dp0..\source\PresentMon.sln"
+if not "%errorlevel%"=="0" goto fail
+
+exit /b 0
+
+:fail
+    echo FAILED!
+    exit /b 1


Update sublime_setting_dropbox.bat

Update sublime_setting_dropbox.bat

バックアップ機能を追加

--- sublime_setting_dropbox.bat
+++ sublime_setting_dropbox.bat
@@ -1,3 +1,6 @@
+:: Backup
+robocopy /E /S "C:\Users\%username%\Dropbox\SublimeText3" "C:\Users\%username%\Desktop"
+
 :: Move Sublime text Setting.
 move "C:\Users\%username%\AppData\Roaming\Sublime Text 3\Installed Packages" "C:\Users\%username\Dropbox\"
 move "C:\Users\%username%\AppData\Roaming\Sublime Text 3\Packages" "C:\Users\%username\Dropbox\"


Check for appropriate java version in jing.bat

--- jing.bat
+++ jing.bat
@@ -2,17 +2,26 @@
 setlocal
 set MAIN_CLASS=com.thaiopensource.relaxng.util.Driver
 set JAR_FILE=jing.jar
+set JAVA_PROBLEM_EXIT_CODE=1
 set JRE_KEY=HKLM\SOFTWARE\JavaSoft\Java Runtime Environment
+set JAVA_VERSION=unknown
 if not exist "%JAVA_HOME%\bin\java.exe" (
-  for /f "tokens=2*" %%u in ('reg query "%JRE_KEY%" /v CurrentVersion') do for /f "tokens=2*" %%i in ('reg query "%JRE_KEY%\%%v" /v JavaHome') do set JAVA_HOME=%%j
+  for /f "tokens=2* skip=2" %%u in ('reg query "%JRE_KEY%" /v CurrentVersion') do for /f "tokens=2* skip=2" %%i in ('reg query "%JRE_KEY%\%%v" /v JavaHome') do (
+    set JAVA_VERSION=%%v
+    set JAVA_HOME=%%j
+  )
 ) 2>nul
 if exist "%JAVA_HOME%\bin\java.exe" goto found_java
-echo Could not find a Java Runtime Environment. Download one from <http://java.sun.com/javase/downloads/>.
-exit /b 1
+echo Could not find a Java Runtime Environment. Download one from http://java.sun.com/javase/downloads/.
+exit /b %JAVA_PROBLEM_EXIT_CODE%
 :found_java
+if not x1.4==x%JAVA_VERSION% if not x1.3==x%JAVA_VERSION% goto java_version_ok
+echo Version 5.0 or newer of the Java Runtime Environment is required. Download one from http://java.sun.com/javase/downloads/.
+exit /b %JAVA_PROBLEM_EXIT_CODE%
+:java_version_ok
 set JAR_DIR=%~dp0
 if exist "%JAR_DIR%%JAR_FILE%" goto found_jar
 echo Could not find %JAR_FILE%. Must be in the same directory as %~nx0 (%JAR_DIR%).
-exit /b 1
+exit /b %JAVA_PROBLEM_EXIT_CODE%
 :found_jar
 "%JAVA_HOME%\bin\java.exe" -classpath "%JAR_DIR%%JAR_FILE%" %MAIN_CLASS% %*


fixed batch files

fixed batch files

--- runner/windows-cmd/kafka-orchestrated-shipping.bat
+++ runner/windows-cmd/kafka-orchestrated-shipping.bat
@@ -1,2 +1,4 @@
+@echo off
+FOR /F "tokens=1,2 delims==" %%G IN (environment.properties) DO (set %%G=%%H)
 TITLE Shipping
-mvn package exec:java -f shipping/+mvn package exec:java -f %flowing%\kafka\java\shipping\


Edit make.bat

Edit make.bat

--- make.bat
+++ make.bat
@@ -1,17 +1,17 @@
 SET ANTLR=java -jar C:\Javalib\antlr-4.7-complete.jar
 SET CURR_DIR=%cd%
-SET GRAMMAR_IFC=%CURR_DIR%/Express.g4
-SET GRAMMAR_STEP=%CURR_DIR%/STEP.g4
-SET SCHEMA=%CURR_DIR%/IFC4.exp
+SET GRAMMAR_IFC=%CURR_DIR%\Express.g4
+SET GRAMMAR_STEP=%CURR_DIR%\STEP.g4
+SET SCHEMA=%CURR_DIR%\IFC4.exp

 ::csharp:
-	%ANTLR% -Dlanguage=CSharp -package Express -o ./src/antlr %GRAMMAR_IFC%
-	%ANTLR% -Dlanguage=CSharp -package STEP -o ./lang/csharp/src/antlr %GRAMMAR_STEP%
+	%ANTLR% -Dlanguage=CSharp -package Express -o %CURR_DIR%\src\antlr %GRAMMAR_IFC%
+	%ANTLR% -Dlanguage=CSharp -package STEP -o %CURR_DIR%\lang\csharp\src\antlr %GRAMMAR_STEP%
 	dotnet build .\src\IFC-gen.csproj
-	dotnet run -p .\src\IFC-gen.csproj %SCHEMA% ./lang/csharp/src
+	dotnet run -p .\src\IFC-gen.csproj %SCHEMA% .\lang\csharp\src

 ::clean:
-	rmdir /s /q .\lang\csharp\src\antlr
+	::rmdir /s /q .\lang\csharp\src\antlr
 	rmdir /s /q .\src\antlr
 	rmdir /s /q .\src\bin
 	rmdir /s /q .\src\obj


Add generated windows make script

Add generated windows make script

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

--- make.bat
+++ make.bat
@@ -0,0 +1,3 @@
+REM Automatically generated from Makefile
+.\gbdk\bin\lcc -Wa-l -Wl-m -Wl-j -c -o main.o main.c
+.\gbdk\bin\lcc -Wa-l -Wl-m -Wl-j -o main.gb main.o


Wibbles

Wibbles

Signed-off-by: Austin Seipp <e672e89da89e9883fbf1dfdcea7453aa4c4c7323@gmail.com>

--- make.bat
+++ make.bat
@@ -1,8 +1,5 @@
 @echo off
-
 setlocal
-
 set PATH=C:\MinGW\bin:%PATH%
 C:\MinGW\bin\make.exe CC=C:\MinGW\bin\gcc.exe MINGW=YES
-
 endlocal


Check for missing NodeJS and CoffeeScript installations and auto-run tests from make.bat.

--- make.bat
+++ make.bat
@@ -1,12 +1,32 @@
+@ECHO OFF
 set target=%1
 IF "%target%"=="" set target=all

-IF "%target%"=="all" GOTO BUILD
-IF "%target%"=="package" GOTO BUILD
-IF "%target%"=="test" GOTO BUILD
-GOTO EXIT
+for /f %%j in ("node.exe") do (
+  set NODE_HOME=%%~dp$PATH:j
+)
+for /f %%j in ("coffee.cmd") do (
+  set COFFEE_HOME=%%~dp$PATH:j
+)
+if "%NODE_HOME%"=="" GOTO NONODE
+if "%COFFEE_HOME%"=="" GOTO NOCOFFEE
+
+IF "%target%"=="all" GOTO BUILD
+IF "%target%"=="package" GOTO BUILD
+IF "%target%"=="test" GOTO BUILD
+GOTO :EOF
+
+:NONODE
+echo "Missing node.exe, please download and install NodeJS from http://nodejs.org/"
+GOTO :EOF
+
+:NOCOFFEE
+echo "Missing coffee, please run: npm install -g coffee-script"
+GOTO :EOF

 :BUILD
+echo "Building CIRC."
+rmdir bin /s /q
 mkdir bin
 copy src\*.* bin
 copy src\chat\* bin
@@ -18,27 +38,30 @@
 mkdir bin\font
 copy static\font\*.* bin\font
 call coffee -c bin
+IF %ERRORLEVEL% GEQ 1 GOTO :EOF
 del bin\*.coffee
-IF "%target%"=="package" GOTO PACKAGE
+IF "%target%"=="package" GOTO PACKAGE

-:TEST
+:TEST
+echo "Creating tests, run test.bat or open bin\test_runner.html in your browser."
 mkdir bin\mocks
 copy test\*.* bin
 copy test\mocks\*.* bin
 mkdir bin\jasmine-1.2.0
-xcopy /E third_party\jasmine-1.2.0 bin\jasmine-1.2.0
+xcopy /E /Y third_party\jasmine-1.2.0 bin\jasmine-1.2.0
 call coffee -c bin
+IF %ERRORLEVEL% GEQ 1 GOTO :EOF
 del bin\*.coffee
-IF "%target%"=="test" GOTO EXIT
+IF "%target%"=="test" start bin\test_runner.html
+IF "%target%"=="test" GOTO :EOF

-:PACKAGE
+:PACKAGE
+echo "Creating packaged app in directory 'package'."
 rmdir package /s /q
 mkdir package
 mkdir package\bin
-xcopy /E bin package\bin
+xcopy /E /Y bin package\bin
 mkdir package\static
 mkdir package\static\icon
 copy static\icon\*.png package\static\icon
 copy manifest.json package
-
-:EXIT


Fix release script

Fix release script

--- make.cmd
+++ make.cmd
@@ -52,16 +52,23 @@

 :RELEASE
     if "%2"== "" goto :usage
-    if not exist "messages/release-%2.md" (
-        echo Missing release-%2.md
+    set st3_changelog=release-st3-%2.md
+    set st4_changelog=release-st4-%2.md
+
+    if not exist "messages/%st3_changelog%" (
+        echo Missing %st3_changelog%
         exit /b 1
     )
-    git checkout st3176 --autostash && git merge st3-develop --no-ff
+    if not exist "messages/%st4_changelog%" (
+        echo Missing %st4_changelog%
+        exit /b 1
+    )
+    git checkout st3176 && git merge st3-develop --no-ff
     if not errorlevel 0 (
         echo Unable to merge st3-develop into st3176!
         exit /b 1
     )
-    git checkout master --autostash && git merge st4-develop --no-ff
+    git checkout master && git merge st4-develop --no-ff
     if not errorlevel 0 (
         echo Unable to merge st4-develop into master!
         exit /b 1
@@ -81,9 +88,9 @@
     echo Hit any key to publish release!
     pause
     : create release for ST3
-    gh release create --target st3176 -t "MarkdownEditing %2 (ST3176+)" -F "messages/release-%2.md" "3176-%2"
+    gh release create --target st3176 -t "MarkdownEditing %2 (ST3176+)" -F "messages/%st3_changelog%" "3176-%2"
     : create release for ST3
-    gh release create --target master -t "MarkdownEditing %2 (ST4107+)" -F "messages/release-%2.md" "4107-%2"
+    gh release create --target master -t "MarkdownEditing %2 (ST4107+)" -F "messages/%st4_changelog%" "4107-%2"
     git fetch
     goto :eof


ENH: Specify python executable to point to 3.8

--- CI/dev_env.bat
+++ CI/dev_env.bat
@@ -76,6 +76,7 @@
 :: Setup Python
 set PATH=C:\tools\Python38-%ARCH%;%PATH%
 set PATH=C:\tools\Python38-%ARCH%\Scripts;%PATH%
+set PYTHON_EXECUTABLE=C:\tools\Python38\python.exe

 :: Setup GL dlls
 set PATH=%PATH%;C:\tools\GL\%ARCH%\bin


Make Windows Installer more robust & auto updating

--- spf13-vim-windows-install.cmd
+++ spf13-vim-windows-install.cmd
@@ -2,12 +2,30 @@
 @if not exist "%HOME%" @set HOME=%USERPROFILE%

 @set BASE_DIR=%HOME%\.spf13-vim-3
-call git clone --recursive -b 3.0 git://github.com/spf13/spf13-vim.git "%BASE_DIR%"
-call mkdir "%BASE_DIR%\.vim\bundle"
-call mklink /J "%HOME%\.vim" "%BASE_DIR%\.vim"
+IF NOT EXIST "%BASE_DIR%" (
+  call git clone --recursive -b 3.0 https://github.com/spf13/spf13-vim.git "%BASE_DIR%"
+) ELSE (
+	@set ORIGINAL_DIR=%CD%
+    echo updating spf13-vim
+    chdir /d "%BASE_DIR%"
+	call git pull
+    chdir /d "%ORIGINAL_DIR%"
+	call cd "%BASE_DIR%"
+)
+
 call mklink "%HOME%\.vimrc" "%BASE_DIR%\.vimrc"
 call mklink "%HOME%\_vimrc" "%BASE_DIR%\.vimrc"
+call mklink "%HOME%\.vimrc.fork" "%BASE_DIR%\.vimrc.fork"
 call mklink "%HOME%\.vimrc.bundles" "%BASE_DIR%\.vimrc.bundles"
+call mklink "%HOME%\.vimrc.bundles.fork" "%BASE_DIR%\.vimrc.bundles.fork"
+call mklink /J "%HOME%\.vim" "%BASE_DIR%\.vim"

-call git clone http://github.com/gmarik/vundle.git "%HOME%/.vim/bundle/vundle"
+IF NOT EXIST "%BASE_DIR%\.vim\bundle" (
+	call mkdir "%BASE_DIR%\.vim\bundle"
+)
+
+IF NOT EXIST "%HOME%/.vim/bundle/vundle" (
+	call git clone https://github.com/gmarik/vundle.git "%HOME%/.vim/bundle/vundle"
+)
+
 call vim -u "%BASE_DIR%/.vimrc.bundles" +BundleInstall! +BundleClean +qall


Integrated Authoring tool is now correctly exported

--- AuthoringTools/IntegratedAuthoringToolWF/toolExport.bat
+++ AuthoringTools/IntegratedAuthoringToolWF/toolExport.bat
@@ -1,7 +1,7 @@
 @echo off

 SET origin=bin\Debug
-SET include=*.exe *.dll
+SET include=*.exe *.dll config6
 SET exclude=*vshost.exe *vshost.dll

 ROBOCOPY "%origin%" "%~f1" %include% /XF %exclude% /S /NP /NFL /NDL /NJH /NJS


Trim down the Windows installer size

Trim down the Windows installer size

--- deploy_win32.bat
+++ deploy_win32.bat
@@ -19,7 +19,11 @@
 copy .\release\presi-aoke.exe .\staging

 echo Copying qt libraries to staging
-.\windeployqt\release\windeployqt.exe .\staging\presi-aoke.exe -no-translations -no-webkit2 -opengl
+.\windeployqt\release\windeployqt.exe .\staging\presi-aoke.exe -no-translations -no-webkit -no-webkit2 -no-opengl -no-svg
+rem Trim a bunch of plugins that we don't use
+del /Q /S .\staging\iconengines
+erase .\staging\imageformats\qdds*.dll .\staging\imageformats\qicns*.dll .\staging\imageformats\qico*.dll .\staging\imageformats\qjp2*.dll .\staging\imageformats\qmng*.dll .\staging\imageformats\qsvg*.dll .\staging\imageformats\qtga*.dll .\staging\imageformats\qtiff*.dll .\staging\imageformats\qweb*.dll
+erase .\staging\imageformats\qgifd.dll .\staging\imageformats\qjpegd.dll .\staging\imageformats\qwbmpd.dll

 echo Creating installer


install Go 1.13 on windows

install Go 1.13 on windows

--- tools/internal_ci/helper_scripts/prepare_build_windows.bat
+++ tools/internal_ci/helper_scripts/prepare_build_windows.bat
@@ -35,6 +35,10 @@
 powershell -File src\csharp\install_dotnet_sdk.ps1
 set PATH=%LOCALAPPDATA%\Microsoft\dotnet;%PATH%

+@rem Newest version of Go is required to be able to build boringssl with cmake
+@rem TODO(jtattermusch): try to eliminate the dependency on Go
+choco install golang -y --version 1.13.1 --limit-output
+
 @rem Disable some unwanted dotnet options
 set NUGET_XMLDOC_MODE=skip
 set DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true


Use -nopath

Use -nopath

--- eng/helix/content/runtests.cmd
+++ eng/helix/content/runtests.cmd
@@ -29,11 +29,11 @@
 set PATH=%DOTNET_ROOT%;!PATH!;%HELIX_CORRELATION_PAYLOAD%\node\bin
 echo Set path to: %PATH%

-powershell.exe -noLogo -NoProfile -ExecutionPolicy unrestricted -command ". eng\common\tools.ps1; InstallDotNet %DOTNET_ROOT% %$sdkVersion% %$arch% '' $true"
+powershell.exe -noLogo -NoProfile -ExecutionPolicy unrestricted -command ". eng\common\tools.ps1; InstallDotNet %DOTNET_ROOT% %$sdkVersion% %$arch% '' $true '' '' $true"
 IF [%$feedCred%] == [] (
-    powershell.exe -noLogo -NoProfile -ExecutionPolicy unrestricted -command ". eng\common\tools.ps1; InstallDotNet %DOTNET_ROOT% %$runtimeVersion% %$arch% dotnet $true"
+    powershell.exe -noLogo -NoProfile -ExecutionPolicy unrestricted -command ". eng\common\tools.ps1; InstallDotNet %DOTNET_ROOT% %$runtimeVersion% %$arch% dotnet $true '' '' $true"
 ) else (
-    powershell.exe -noLogo -NoProfile -ExecutionPolicy unrestricted -command ". eng\common\tools.ps1; InstallDotNet %DOTNET_ROOT% %$runtimeVersion% %$arch% dotnet $true https://dotnetclimsrc.blob.core.windows.net/dotnet %$feedCred%"
+    powershell.exe -noLogo -NoProfile -ExecutionPolicy unrestricted -command ". eng\common\tools.ps1; InstallDotNet %DOTNET_ROOT% %$runtimeVersion% %$arch% dotnet $true https://dotnetclimsrc.blob.core.windows.net/dotnet %$feedCred% $true"
 )

 set exit_code=0


Added some echos to install.bat.

Added some echos to install.bat.

--- src/main/assembly/install.bat
+++ src/main/assembly/install.bat
@@ -4,12 +4,14 @@
 if exist C:\NMD\avbagent\pharmacy-agent\bin\pharmacy-agent (
 	C:\NMD\avbagent\pharmacy-agent\bin\pharmacy-agent remove
 	taskkill /im java.exe /F
+	echo Removing very old Pharmacy Agent
 )

 :: If previous version of java-auto-update and agent is running remove them
 if exist c:\opt\java-auto-update\bin\java-auto-update (
 	c:\opt\java-auto-update\bin\java-auto-update remove
 	taskkill /im java.exe /F
+	echo Removing old Java-Auto-Update
 )


- Script to automatize the compilation in Windows.

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

--- utils/scripts/build_cdr.bat
+++ utils/scripts/build_cdr.bat
@@ -0,0 +1,79 @@
+:: This script build DDSRecorder library for any platform.
+
+@echo off
+
+:: Initialize the returned value to 0 (all succesfully)
+set errorstatus=0
+
+:: i86 Platform
+
+:: Release DLL Configuration
+:: Clean the visual solution
+msbuild "..\..\win32\cpp\CDR\CDR.sln" /t:Clean /p:Configuration="ReleaseDLL" /p:Platform="Win32"
+:: Build the visual solution
+msbuild "..\..\win32\cpp\CDR\CDR.sln" /t:Build /p:Configuration="ReleaseDLL" /p:Platform="Win32"
+set errorstatus=%ERRORLEVEL%
+if not %errorstatus%==0 goto :EOF
+
+:: Debug DLL Configuration
+:: Clean the visual solution
+msbuild "..\..\win32\cpp\CDR\CDR.sln" /t:Clean /p:Configuration="DebugDLL" /p:Platform="Win32"
+:: Build the visual solution
+msbuild "..\..\win32\cpp\CDR\CDR.sln" /t:Build /p:Configuration="DebugDLL" /p:Platform="Win32"
+set errorstatus=%ERRORLEVEL%
+if not %errorstatus%==0 goto :EOF
+
+:: Release Configuration
+:: Clean the visual solution
+msbuild "..\..\win32\cpp\CDR\CDR.sln" /t:Clean /p:Configuration="Release" /p:Platform="Win32"
+:: Build the visual solution
+msbuild "..\..\win32\cpp\CDR\CDR.sln" /t:Build /p:Configuration="Release" /p:Platform="Win32"
+set errorstatus=%ERRORLEVEL%
+if not %errorstatus%==0 goto :EOF
+
+:: Debug Configuration
+:: Clean the visual solution
+msbuild "..\..\win32\cpp\CDR\CDR.sln" /t:Clean /p:Configuration="Debug" /p:Platform="Win32"
+:: Build the visual solution
+msbuild "..\..\win32\cpp\CDR\CDR.sln" /t:Build /p:Configuration="Debug" /p:Platform="Win32"
+set errorstatus=%ERRORLEVEL%
+if not %errorstatus%==0 goto :EOF
+
+:: x64 Platform
+
+:: Release DLL Configuration
+:: Clean the visual solution
+msbuild "..\..\win32\cpp\CDR\CDR.sln" /t:Clean /p:Configuration="ReleaseDLL" /p:Platform="x64"
+:: Build the visual solution
+msbuild "..\..\win32\cpp\CDR\CDR.sln" /t:Build /p:Configuration="ReleaseDLL" /p:Platform="x64"
+set errorstatus=%ERRORLEVEL%
+if not %errorstatus%==0 goto :EOF
+
+:: Debug DLL Configuration
+:: Clean the visual solution
+msbuild "..\..\win32\cpp\CDR\CDR.sln" /t:Clean /p:Configuration="DebugDLL" /p:Platform="x64"
+:: Build the visual solution
+msbuild "..\..\win32\cpp\CDR\CDR.sln" /t:Build /p:Configuration="DebugDLL" /p:Platform="x64"
+set errorstatus=%ERRORLEVEL%
+if not %errorstatus%==0 goto :EOF
+
+:: Release Configuration
+:: Clean the visual solution
+msbuild "..\..\win32\cpp\CDR\CDR.sln" /t:Clean /p:Configuration="Release" /p:Platform="x64"
+:: Build the visual solution
+msbuild "..\..\win32\cpp\CDR\CDR.sln" /t:Build /p:Configuration="Release" /p:Platform="x64"
+set errorstatus=%ERRORLEVEL%
+if not %errorstatus%==0 goto :EOF
+
+:: Debug Configuration
+:: Clean the visual solution
+msbuild "..\..\win32\cpp\CDR\CDR.sln" /t:Clean /p:Configuration="Debug" /p:Platform="x64"
+:: Build the visual solution
+msbuild "..\..\win32\cpp\CDR\CDR.sln" /t:Build /p:Configuration="Debug" /p:Platform="x64"
+set errorstatus=%ERRORLEVEL%
+if not %errorstatus%==0 goto :EOF
+
+echo "BUILD SUCCESSFULLY"
+
+goto :EOF
+


update

update

--- lib/w2tags/c.bat
+++ lib/w2tags/c.bat
@@ -1 +1 @@
-copy . C:\bin\ruby\lib\ruby\gems\1.8\gems\w2tags-0.8.1\lib\w2tags /Y+copy . C:\bin\ruby\lib\ruby\gems\1.8\gems\w2tags-0.8.2\lib\w2tags /Y


Revert "cleanup windows build script"

Revert "cleanup windows build script"

This reverts commit 68a1949106546fdb4e1d2eb82fb74cbce48c5510.

error: pathspec 'recipes/r-censusgeography/bld.bat' did not match any file(s) known to git

--- recipes/r-censusgeography/bld.bat
+++ recipes/r-censusgeography/bld.bat
@@ -0,0 +1,2 @@
+"%R%" CMD INSTALL --build . %R_ARGS%
+IF %ERRORLEVEL% NEQ 0 exit /B 1


remove diff with develop (#28504)

remove diff with develop (#28504)

--- paddle/scripts/paddle_build.bat
+++ paddle/scripts/paddle_build.bat
@@ -82,11 +82,11 @@
     goto :mkbuild
 )

-git diff HEAD origin/develop --stat --name-only
-git diff HEAD origin/develop --stat --name-only | findstr "cmake CMakeLists.txt paddle_build.bat"
-if %ERRORLEVEL% EQU 0 (
-    rmdir build /s/q
-)
+:: git diff HEAD origin/develop --stat --name-only
+:: git diff HEAD origin/develop --stat --name-only | findstr "cmake CMakeLists.txt paddle_build.bat"
+:: if %ERRORLEVEL% EQU 0 (
+::     rmdir build /s/q
+:: )

 :mkbuild
 if not exist build (


Support sccache distributed storage on windows (#34879)

--- paddle/scripts/paddle_build.bat
+++ paddle/scripts/paddle_build.bat
@@ -161,13 +161,23 @@
     del D:\sccache\sccache_log.txt
     cmd /C sccache -V || call :install_sccache
     sccache --stop-server 2> NUL
+
+    :: Localy storage on windows
     if not exist D:\sccache mkdir D:\sccache
     set SCCACHE_DIR=D:\sccache\.cache
-    :: sccache will shut down if a source file takes more than 10 mins to compile
+
+    :: Sccache will shut down if a source file takes more than 10 mins to compile
     set SCCACHE_IDLE_TIMEOUT=0
-    set SCCACHE_CACHE_SIZE=30G
+    set SCCACHE_CACHE_SIZE=100G
     set SCCACHE_ERROR_LOG=D:\sccache\sccache_log.txt
     set SCCACHE_LOG=quiet
+
+    :: Distributed storage on windows
+    set SCCACHE_ENDPOINT=s3.bj.bcebos.com
+    set SCCACHE_BUCKET=paddle-windows
+    set SCCACHE_S3_KEY_PREFIX=sccache/
+    set SCCACHE_S3_USE_SSL=true
+
     sccache --start-server
     sccache -z
     goto :CASE_%1


Adds one Windows script

Adds one Windows script

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

--- windows-scripts/client1.bat
+++ windows-scripts/client1.bat
@@ -0,0 +1,4 @@
+@echo off
+cd ..\\dissent\\
+go run main.go config.go relay.go -client=1
+pause


Delete make32.bat

Delete make32.bat

--- make32.bat
+++ make32.bat
@@ -1,3 +0,0 @@
-g++ -std=c++14 -fopenmp -O3 main.cpp jampack.cpp ans.cpp bwt.cpp checksum.cpp divsufsort.cpp lz77.cpp lpx.cpp model.cpp rank.cpp rle.cpp format.cpp filters.cpp sys_detect.cpp utils.cpp -o Jampack_x86 -m32 -s -static
-PAUSE
-


include/arch/arc: fix memory permissions

Change-Id: Ibb77088a7c9095f4725b6a65bc30a1db4220f254
Signed-off-by: cjordan <c464ed312fa6f818297227c7e5018fc9f4bd95ad@synopsys.com>

--- include/arch/arc/v2/linker.cmd
+++ include/arch/arc/v2/linker.cmd
@@ -48,8 +48,8 @@

 MEMORY {
 	FLASH (rx) : ORIGIN = FLASH_START, LENGTH = FLASH_SIZE*1k
-	SRAM  (wx) : ORIGIN = SRAM_START,  LENGTH = SRAM_SIZE*1k
-	DCCM  (wx) : ORIGIN = DCCM_START,  LENGTH = DCCM_SIZE*1k
+	SRAM  (rwx) : ORIGIN = SRAM_START,  LENGTH = SRAM_SIZE*1k
+	DCCM  (rw) : ORIGIN = DCCM_START,  LENGTH = DCCM_SIZE*1k
 }

 SECTIONS {


windows: add support for Erlang 17.1 in the batch scripts


Moving the regression tests to a Windows environment (a really bad experience)

git-svn-id: a20303ca0449e3ef575223833049c5e6a53b9062@645531 13f79535-47bb-0310-9956-ffa450edef68

error: pathspec 'src/test/bin/testme.bat' did not match any file(s) known to git

--- src/test/bin/testme.bat
+++ src/test/bin/testme.bat
@@ -0,0 +1,19 @@
+@ECHO OFF
+@REM
+@REM Licensed to the Apache Software Foundation (ASF) under one or more
+@REM contributor license agreements.  See the NOTICE file distributed with
+@REM this work for additional information regarding copyright ownership.
+@REM The ASF licenses this file to You under the Apache License, Version 2.0
+@REM (the "License"); you may not use this file except in compliance with
+@REM the License.  You may obtain a copy of the License at
+@REM
+@REM      http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing, software
+@REM distributed under the License is distributed on an "AS IS" BASIS,
+@REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@REM See the License for the specific language governing permissions and
+@REM limitations under the License.
+@REM
+
+%JAVA_HOME%\bin\java -cp .\lib\junit-3.8.1.jar;.\lib\exec-test-1.0-SNAPSHOT.jar;.\lib\exec-1.0-SNAPSHOT.jar org.apache.commons.exec.TestRunner


execute composer with "bin/php/php.exe" and current call folder as working dir, close https://github.com/WPN-XM/WPN-XM/issues/486

--- startfiles/composer.bat
+++ startfiles/composer.bat
@@ -13,6 +13,6 @@
 SET COMPOSER_CACHE_DIR="%~dp0cache"

 :: call composer
-echo "%~dp0..\php\php.exe" "%~dp0composer.phar" %*
+"%~dp0..\php\php.exe" --working-dir="%cd%" "%~dp0composer.phar" %*

 pause


Trying a new build method

Trying a new build method

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


修改build.bat添加不输出Windows资源文件参数

修改build.bat添加不输出Windows资源文件参数

--- lzUI/build.bat
+++ lzUI/build.bat
@@ -1,5 +1,5 @@
 @echo off
-res2go -outmain false -outpath "../" -pause "ew"
+res2go -outmain false -outpath "../" -pause "ew" -outres false
 echo // +build gui>> $
 echo.>> $
 type "..\MainForm.go" >> $


release package to nuget

release package to nuget

--- tools/publish-nupkg.cmd
+++ tools/publish-nupkg.cmd
@@ -1,2 +1,2 @@
 cd ..\jose-jwt\bin\Release
-..\..\..\tools\nuget.exe Push jose-jwt.3.0.0.nupkg -Source https://www.nuget.org+..\..\..\tools\nuget.exe Push jose-jwt.3.1.0.nupkg -Source https://www.nuget.org


Fix to #211

Fix to #211

--- Install/GeoEvent/SupportFiles/ConfigureGeoEvent.bat
+++ Install/GeoEvent/SupportFiles/ConfigureGeoEvent.bat
@@ -238,10 +238,17 @@
 echo.
 echo.
 echo    4. On the "Edit ArcGIS Server" dialog, click in the "URL" text box and
-echo       specify the URL to the ArcGIS Server ^(connect through port inorder
-echo       to connect to ArcGIS Server primary site administrator^):
-echo.
-echo       https^://%ops_FQDN%:6443/arcgis/
+echo       specify the URL to the ArcGIS Server:
+echo.
+echo       https^://%ops_FQDN%/%ops_WebAdaptor_AGS%/
+echo.
+echo.
+echo       **********  WARNING  **********  WARNING  **********
+echo       If you change the authentication method to Integrated Windows
+echo       Authentication ^(IWA^) or PKI you will have to alter how you
+echo       sign in to ArcGIS Server and modify the GeoEvent Processor
+echo       configuration.
+echo       **********  WARNING  **********  WARNING  **********
 echo.
 echo.
 echo    5. Generate a token:


please use qt 6.3.2 for building windows nightlies

--- Tools/wix/BuildBotScript.cmd
+++ Tools/wix/BuildBotScript.cmd
@@ -27,7 +27,7 @@
 cmake -E make_directory build

 echo start build
-cmake -S . -B build -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH=D:/Qt/6.2.4/msvc2019_64
+cmake -S . -B build -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH=D:/Qt/6.3.2/msvc2019_64

 cmake --build build --target all


Fix NuGet buid script

Fix NuGet buid script

--- VAR.PdfTools/Build.NuGet.cmd
+++ VAR.PdfTools/Build.NuGet.cmd
@@ -1,8 +1,9 @@
 @echo off

 :: MSBuild and tools path
-if exist "%ProgramFiles%\MSBuild\14.0\bin" set PATH=%ProgramFiles%\MSBuild\14.0\bin;%PATH%
-if exist "%ProgramFiles(x86)%\MSBuild\14.0\bin" set PATH=%ProgramFiles(x86)%\MSBuild\14.0\bin;%PATH%
+if exist "%windir%\Microsoft.Net\Framework\v4.0.30319" set MsBuildPath=%windir%\Microsoft.NET\Framework\v4.0.30319
+if exist "%windir%\Microsoft.Net\Framework64\v4.0.30319" set MsBuildPath=%windir%\Microsoft.NET\Framework64\v4.0.30319
+set PATH=%MsBuildPath%;%PATH%

 :: NuGet
 set nuget="nuget"
@@ -18,7 +19,7 @@

 :: Packing Nuget
 Title Packing Nuget
-%nuget% pack VAR.PdfTools.csproj -Verbosity detailed -OutputDir "NuGet" -MSBuildVersion "14.0" -Properties Configuration="Release .Net 4.6.1" -Prop Platform=AnyCPU
+%nuget% pack VAR.PdfTools.csproj -Verbosity detailed -OutputDir "NuGet" -Properties Configuration="Release .Net 4.6.1" -Prop Platform=AnyCPU

 title Finished
 pause


fixed wrapper path in dist/kobaltw.bat

fixed wrapper path in dist/kobaltw.bat

--- dist/kobaltw.bat
+++ dist/kobaltw.bat
@@ -1,2 +1,2 @@
 @echo off
-java -jar "%~dp0/kobalt/wrapper/kobalt-wrapper.jar" %*
+java -jar "%~dp0/../kobalt/wrapper/kobalt-wrapper.jar" %*


Check for errors regarding ICProjConvert150

--- scripts/release_win.bat
+++ scripts/release_win.bat
@@ -14,6 +14,10 @@
 del CMakeCache.txt rem make sure to use default settings
 cmake -D CMAKE_INSTALL_PREFIX=%destroot%\x64 -D COMPILER=ICC -G "Visual Studio 12 2013 Win64" ..
 ICProjConvert150 embree.sln /IC /s /f
+if %ERRORLEVEL%==9009 (
+  echo Problems converting the project to ICC, aborting
+  goto abort
+)
 cmake --build . --config Release --target INSTALL -- /m
 cmake --build . --config Release --target PACKAGE -- /m
 copy embree*.exe %destroot%
@@ -24,10 +28,15 @@
 del CMakeCache.txt rem make sure to use default settings
 cmake -D CMAKE_INSTALL_PREFIX=%destroot%\win32 -D COMPILER=ICC -G "Visual Studio 12 2013" ..
 ICProjConvert150 embree.sln /IC /s /f
+if %ERRORLEVEL%==9009 (
+  echo Problems converting the project to ICC, aborting
+  goto abort
+)
 cmake --build . --config Release --target INSTALL -- /m
 cmake --build . --config Release --target PACKAGE -- /m
 copy embree*.exe %destroot%
 cd ..

+:abort
 endlocal
 :end