Created renaming batch file to add hire-dates to picture file names.

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

--- SourceAssets/RenameWithDates.bat
+++ SourceAssets/RenameWithDates.bat
@@ -0,0 +1,101 @@
+rename "Adam_Schuman_Art.png" "Adam_Schuman_Art_2015-07-06.png"
+rename "Alan_Lee_Art.png" "Alan_Lee_Art_2013-06-24.png"
+rename "Alberto_Terrones_Operations.png" "Alberto_Terrones_Operations_2015-09-28.png"
+rename "Allan_Veletanic_Art.png" "Allan_Veletanic_Art_2016-07-25.png"
+rename "Amanda_Khoury_Production.png" "Amanda_Khoury_Production_2016-01-25.png"
+rename "Amber_Boswell_Production.png" "Amber_Boswell_Production_2015-09-28.png"
+rename "Andreea_Enache-Thune_Executive.png" "Andreea_Enache-Thune_Executive_2015-10-30.png"
+rename "Andrew_Luby_Engineering.png" "Andrew_Luby_Engineering_2015-01-05.png"
+rename "Beth_Hendricks_Operations.png" "Beth_Hendricks_Operations_2013-10-01.png"
+rename "Bob_Mitchell_Engineering.png" "Bob_Mitchell_Engineering_2016-04-25.png"
+rename "Brad_Hendricks_Executive.png" "Brad_Hendricks_Executive_2011-07-11.png"
+rename "Brett_Mitchell_QA.png" "Brett_Mitchell_QA_2015-11-18.png"
+rename "Brian_Littrell_Engineering.png" "Brian_Littrell_Engineering_2016-02-29.png"
+rename "Chris_Ballinger_Engineering.png" "Chris_Ballinger_Engineering_2015-09-01.png"
+rename "Chris_Kagel_Design.png" "Chris_Kagel_Design_2015-07-20.png"
+rename "Chris_Toft_QA.png" "Chris_Toft_QA_2015-08-24.png"
+rename "Chris_Wade_Engineering.png" "Chris_Wade_Engineering_2015-09-01.png"
+rename "Codey_Robinson_Engineering.png" "Codey_Robinson_Engineering_2017-03-13.png"
+rename "Cordell_Felix_Art.png" "Cordell_Felix_Art_2015-06-09.png"
+rename "Craig_Drageset_Art.png" "Craig_Drageset_Art_2013-06-24.png"
+rename "Craig_Ostrander_Production.png" "Craig_Ostrander_Production_2016-04-18.png"
+rename "Danny_Huynh_Art.png" "Danny_Huynh_Art_2017-03-27.png"
+rename "Danny_Mak_Art.png" "Danny_Mak_Art_2015-06-01.png"
+rename "Dave_Baker_Executive.png" "Dave_Baker_Executive_2015-06-01.png"
+rename "David_Forrest_Engineering.png" "David_Forrest_Engineering_2011-07-11.png"
+rename "Dimitri_Del Castillo_QA.png" "Dimitri_Del Castillo_QA_2015-08-10.png"
+rename "Dominic_Camargo_Engineering.png" "Dominic_Camargo_Engineering_2013-06-17.png"
+rename "Donovan_McCartney_QA.png" "Donovan_McCartney_QA_2015-10-05.png"
+rename "Drew_Bradford_Operations.png" "Drew_Bradford_Operations_2014-10-06.png"
+rename "Dustin_Mesa_QA.png" "Dustin_Mesa_QA_2016-07-18.png"
+rename "Dylan_Cockerham_Engineering.png" "Dylan_Cockerham_Engineering_2017-03-27.png"
+rename "Eric_Ruff_IT.png" "Eric_Ruff_IT_2016-02-29.png"
+rename "Frank_Chen_Engineering.png" "Frank_Chen_Engineering_2015-06-15.png"
+rename "Frank_Occhiato_Operations.png" "Frank_Occhiato_Operations_2015-12-07.png"
+rename "Galen_Davis_Art.png" "Galen_Davis_Art_2013-07-26.png"
+rename "Handerson_Lee_Engineering.png" "Handerson_Lee_Engineering_2016-02-29.png"
+rename "Indigo_Alvarado_QA.png" "Indigo_Alvarado_QA_2017-03-30.png"
+rename "Jaime_Roman_QA.png" "Jaime_Roman_QA_2017-02-10.png"
+rename "Jason_Hazelroth_Art.png" "Jason_Hazelroth_Art_2016-02-01.png"
+rename "Jason_Neal_Engineering.png" "Jason_Neal_Engineering_2012-04-13.png"
+rename "Jason_Priest_Art.png" "Jason_Priest_Art_2016-03-01.png"
+rename "Jeffrey_Joyce_Engineering.png" "Jeffrey_Joyce_Engineering_2013-06-17.png"
+rename "Jeff_Zugale_Art.png" "Jeff_Zugale_Art_2013-07-08.png"
+rename "Jeremy_Rice_Engineering.png" "Jeremy_Rice_Engineering_2015-10-06.png"
+rename "Jimmy_Rivas_QA.png" "Jimmy_Rivas_QA_2016-06-27.png"
+rename "John_Alvarado_Engineering.png" "John_Alvarado_Engineering_2016-08-29.png"
+rename "John_Plou_Engineering.png" "John_Plou_Engineering_2012-03-15.png"
+rename "Jolene_Goya_Art.png" "Jolene_Goya_Art_2015-06-01.png"
+rename "Jonathan_Rebar_Engineering.png" "Jonathan_Rebar_Engineering_2015-08-05.png"
+rename "Jonathan_Rucker_Engineering.png" "Jonathan_Rucker_Engineering_2015-08-03.png"
+rename "Jose_Gomez_Engineering.png" "Jose_Gomez_Engineering_2016-02-22.png"
+rename "Josh_Edwards_Engineering.png" "Josh_Edwards_Engineering_2015-10-05.png"
+rename "Josh_Carlos_Art.png" "Josh_Carlos_Art_2016-02-12.png"
+rename "Josh_Mikkelsen_Operations.png" "Josh_Mikkelsen_Operations_2016-01-11.png"
+rename "Josh_Shucker_Engineering.png" "Josh_Shucker_Engineering_2017-03-20.png"
+rename "Justin_Hilton_Engineering.png" "Justin_Hilton_Engineering_2013-06-18.png"
+rename "Katlan_Merrill_Engineering.png" "Katlan_Merrill_Engineering_2015-06-15.png"
+rename "Kaysaun_Franklin_QA.png" "Kaysaun_Franklin_QA_2016-04-11.png"
+rename "Ken_Dopher_Executive.png" "Ken_Dopher_Executive_2017-01-09.png"
+rename "Kimie_Kim-Mizutani_Art.png" "Kimie_Kim-Mizutani_Art_2016-07-05.png"
+rename "Kitty_Lee_Production.png" "Kitty_Lee_Production_2015-06-01.png"
+rename "Koy_VanOteghem_Art.png" "Koy_VanOteghem_Art_2013-08-05.png"
+rename "Leo_Simkin_Engineering.png" "Leo_Simkin_Engineering_2015-06-01.png"
+rename "Mark_Gabby_Engineering.png" "Mark_Gabby_Engineering_2015-07-06.png"
+rename "Masana_Pawlan_Engineering.png" "Masana_Pawlan_Engineering_2015-10-12.png"
+rename "Matthew_Fawcett_Executive.png" "Matthew_Fawcett_Executive_2011-07-11.png"
+rename "Matt_Campbell_Engineering.png" "Matt_Campbell_Engineering_2011-07-11.png"
+rename "Matt_Phillips_Production.png" "Matt_Phillips_Production_2016-08-08.png"
+rename "Max_Sena_Production.png" "Max_Sena_Production_2014-10-06.png"
+rename "Mike_Popovich_Production.png" "Mike_Popovich_Production_2015-06-15.png"
+rename "Mike_Winfield_Engineering.png" "Mike_Winfield_Engineering_2012-01-24.png"
+rename "Myles_Salholm_Engineering.png" "Myles_Salholm_Engineering_2015-06-09.png"
+rename "Nick_Storm_Engineering.png" "Nick_Storm_Engineering_2016-02-08.png"
+rename "Nolan_Carnahan_Engineering.png" "Nolan_Carnahan_Engineering_2015-08-10.png"
+rename "Patrick_Ghiocel_Engineering.png" "Patrick_Ghiocel_Engineering_2015-06-15.png"
+rename "Paul_Laska_Engineering.png" "Paul_Laska_Engineering_2016-02-01.png"
+rename "Rex_Rockwell_Engineering.png" "Rex_Rockwell_Engineering_2015-08-03.png"
+rename "Rio_Velarde_Engineering.png" "Rio_Velarde_Engineering_2017-04-10.png"
+rename "Robby_Wong_Engineering.png" "Robby_Wong_Engineering_2015-08-31.png"
+rename "Robb_Zindt_Art.png" "Robb_Zindt_Art_2015-07-07.png"
+rename "Ron_Bitzer_IT-QA.png" "Ron_Bitzer_IT-QA_2015-08-01.png"
+rename "Scott_Army_Art.png" "Scott_Army_Art_2013-11-08.png"
+rename "Sean_Creveling_Production.png" "Sean_Creveling_Production_2015-07-13.png"
+rename "Sean_Madigan_Design.png" "Sean_Madigan_Design_2016-02-01.png"
+rename "Sebastien_St-Laurent_Engineering.png" "Sebastien_St-Laurent_Engineering_2017-03-13.png"
+rename "Shelby_Peterson_Art.png" "Shelby_Peterson_Art_2015-06-01.png"
+rename "Shelley_Lovejoy_Operations.png" "Shelley_Lovejoy_Operations_2015-07-20.png"
+rename "Shephard_Lima_Engineering.png" "Shephard_Lima_Engineering_2017-03-20.png"
+rename "Todd_Morgan_Production.png" "Todd_Morgan_Production_2017-03-20.png"
+rename "Tom_Vu_QA.png" "Tom_Vu_QA_2017-03-20.png"
+rename "Tyler_Kirk_Engineering.png" "Tyler_Kirk_Engineering_2015-03-02.png"
+rename "Violet_Krueger_Operations.png" "Violet_Krueger_Operations_2017-01-23.png"
+rename "Will_Hurd_Art.png" "Will_Hurd_Art_2016-03-02.png"
+rename "Yvonne_Chung_Art.png" "Yvonne_Chung_Art_2011-07-11.png"
+rename "Brandon_Ly_Engineering.png" "Brandon_Ly_Engineering_2017-04-03.png"
+rename "Carlos_Collazo_QA.png" "Carlos_Collazo_QA_2017-04-24.png"
+rename "Chris_Turnley_QA.png" "Chris_Turnley_QA_2017-04-06.png"
+rename "Corey_Lightner_Production.png" "Corey_Lightner_Production_2017-04-24.png"
+rename "Doug_Damron_Production.png" "Doug_Damron_Production_2017-04-25.png"
+rename "Jessica_Ferrarella_QA.png" "Jessica_Ferrarella_QA_2017-04-06.png"
+rename "Josh_Turner_Art.png" "Josh_Turner_Art_2016-02-29.png"


update comments

update comments

--- bin/_mkproject.bat
+++ bin/_mkproject.bat
@@ -1,18 +1,27 @@
-:: Project API
+::  Project API
 ::
-:: This file is called whenever a user enters a project, such p999_Meindbender_Sync
+::  This file is called whenever a user enters a project, such p999_Meindbender_Sync
 ::
-:: Arguments:
-::   %1: Path = Absolute path to projects
-:: 	 %2: Name = Name of project
-::   %3: \f02_prod
-:: 	 %4: Silo = Parent directory name of assets
+::  Arguments:
+::    %1: Path = Absolute path to projects
+:: 	  %2: Name = Name of project
+::    %3: \f02_prod
+::    %4: Silo = Parent directory name of assets
 ::
-:: Variables:
-::   %PROJECTDIR%: Absolute path to project directory
+::  Variables set by bat:
+::    %MINDBENDER_SETASSETCATEGORY%: Is the currently chosen category of assets
+::    %MINDBENDER_ASSETCATEGORY%: Is a list of asset category to be listed
+::    %%
+::    %MINDBENDER_FPS%: Is the project FPS
+::    %MINDBENDER_RESOLUTION_WIDTH%: Is the project width
+::    %MINDBENDER_RESOLUTION_HEIGHT%: Is the project height
 ::
-:: Example:
-::   $ call _mkproject.bat %~dp0ProjectName assets
+::  Variables:
+::    %PROJECTDIR%: Absolute path to project directory
+::
+::  Example:
+::    $ call _mkproject.bat %~dp0ProjectName assets
+::    $ set MINDBENDER_FPS=24

 @echo off


only compress the actual compiled revision's files

git-svn-id: 756506b3b0ea8c31733a8f0a5bb416c7e269da3d@456 28bd50df-7adb-d945-0439-6e466c6a13cc

--- build/make_zip.bat
+++ build/make_zip.bat
@@ -134,11 +134,24 @@
 rem Compress everything into a single ZIP file
 PUSHD "packages"
 DEL "Notepad2-mod.zip" >NUL 2>&1
-
-START "" /B /WAIT "..\..\distrib\tools\7za.exe" a -tzip -mx=9 Notepad2-mod.zip * >NUL
+RD /S /Q "temp_zip" >NUL 2>&1
+MD "temp_zip" >NUL 2>&1
+
+COPY /Y /V "Notepad2-mod.%NP2_VER%_r%VerRev%*.zip" "temp_zip\" >NUL 2>&1
+COPY /Y /V "Notepad2-mod.%NP2_VER%_r%VerRev%*.exe" "temp_zip\" >NUL 2>&1
+
+PUSHD "temp_zip"
+
+START "" /B /WAIT "..\..\..\distrib\tools\7za.exe" a -tzip -mx=9 Notepad2-mod.zip * >NUL
 IF %ERRORLEVEL% NEQ 0 CALL :SUBMSG "ERROR" "Compilation failed!"

 CALL :SUBMSG "INFO" "Notepad2-mod.zip created successfully!"
+
+MOVE /Y "Notepad2-mod.zip" ".." >NUL 2>&1
+
+POPD
+RD /S /Q "temp_zip" >NUL 2>&1
+
 POPD

@@ -169,7 +182,7 @@
  "Notepad2.ini" "Notepad2.txt" "Readme.txt" "Readme-mod.txt" >NUL
 IF %ERRORLEVEL% NEQ 0 CALL :SUBMSG "ERROR" "Compilation failed!"

-CALL :SUBMSG "INFO" Notepad2-mod.%NP2_VER%_r%VerRev%_%2%SUFFIX%.zip created successfully!"
+CALL :SUBMSG "INFO" "Notepad2-mod.%NP2_VER%_r%VerRev%_%2%SUFFIX%.zip created successfully!"

 MOVE /Y "Notepad2-mod.%NP2_VER%_r%VerRev%_%2%SUFFIX%.zip" "..\packages" >NUL 2>&1
 POPD


Typo.

Typo.

--- packaging/standalone/src/main/distribution/shell-scripts/bin/base.bat
+++ packaging/standalone/src/main/distribution/shell-scripts/bin/base.bat
@@ -91,7 +91,7 @@
 )

 if "%javaVersion%" == "" (
-  set javaHomeError=Unable to locate jvm. Could not find %keyName%/%valueName% entry in windows registry. Please make sure you either have %JAVA_HOME% ennvironment variable defined and pointing to a JRE installation, or the registry key defined.
+  set javaHomeError=Unable to locate jvm. Could not find %keyName%/%valueName% entry in windows registry. Please make sure you either have %JAVA_HOME% environment variable defined and pointing to a JRE installation, or the registry key defined.
   goto:eof
 )


change LF to CRLF for Windows file

change LF to CRLF for Windows file

--- dbflute_maihamadb/_project.bat
+++ dbflute_maihamadb/_project.bat
@@ -1,9 +1,9 @@
-@echo off
-
-set ANT_OPTS=-Xmx512m
-
-set DBFLUTE_HOME=..\mydbflute\dbflute-1.x
-
-set MY_PROPERTIES_PATH=build.properties
-
-if "%pause_at_end%"=="" set pause_at_end=y
+@echo off
+
+set ANT_OPTS=-Xmx512m
+
+set DBFLUTE_HOME=..\mydbflute\dbflute-1.x
+
+set MY_PROPERTIES_PATH=build.properties
+
+if "%pause_at_end%"=="" set pause_at_end=y


fixed svn properties

fixed svn properties

git-svn-id: b349400a064d1b7ba2fe2e12028965f19dc7fbaa@2423 ee427ae8-e902-0410-961c-c3ed070cd9f9

--- data/bin/symfony.bat
+++ data/bin/symfony.bat
@@ -1,39 +1,39 @@
-@echo off
-
-rem *************************************************************
-rem ** symfony CLI for Windows based systems (based on phing.bat)
-rem *************************************************************
-
-rem This script will do the following:
-rem - check for PHP_COMMAND env, if found, use it.
-rem   - if not found detect php, if found use it, otherwise err and terminate
-
-if "%OS%"=="Windows_NT" @setlocal
-
-rem %~dp0 is expanded pathname of the current script under NT
-set SCRIPT_DIR=%~dp0
-
-goto init
-
-:init
-
-if "%PHP_COMMAND%" == "" goto no_phpcommand
-
-IF EXIST ".\symfony" (
-  %PHP_COMMAND% -d html_errors=off ".\symfony" %1 %2 %3 %4 %5 %6 %7 %8 %9
-) ELSE (
-  %PHP_COMMAND% -d html_errors=off "%SCRIPT_DIR%\symfony" %1 %2 %3 %4 %5 %6 %7 %8 %9
-)
-goto cleanup
-
-:no_phpcommand
-rem echo ------------------------------------------------------------------------
-rem echo WARNING: Set environment var PHP_COMMAND to the location of your php.exe
-rem echo          executable (e.g. C:\PHP\php.exe).  (assuming php.exe on PATH)
-rem echo ------------------------------------------------------------------------
-set PHP_COMMAND=php.exe
-goto init
-
-:cleanup
-if "%OS%"=="Windows_NT" @endlocal
-rem pause
+@echo off
+
+rem *************************************************************
+rem ** symfony CLI for Windows based systems (based on phing.bat)
+rem *************************************************************
+
+rem This script will do the following:
+rem - check for PHP_COMMAND env, if found, use it.
+rem   - if not found detect php, if found use it, otherwise err and terminate
+
+if "%OS%"=="Windows_NT" @setlocal
+
+rem %~dp0 is expanded pathname of the current script under NT
+set SCRIPT_DIR=%~dp0
+
+goto init
+
+:init
+
+if "%PHP_COMMAND%" == "" goto no_phpcommand
+
+IF EXIST ".\symfony" (
+  %PHP_COMMAND% -d html_errors=off ".\symfony" %1 %2 %3 %4 %5 %6 %7 %8 %9
+) ELSE (
+  %PHP_COMMAND% -d html_errors=off "%SCRIPT_DIR%\symfony" %1 %2 %3 %4 %5 %6 %7 %8 %9
+)
+goto cleanup
+
+:no_phpcommand
+rem echo ------------------------------------------------------------------------
+rem echo WARNING: Set environment var PHP_COMMAND to the location of your php.exe
+rem echo          executable (e.g. C:\PHP\php.exe).  (assuming php.exe on PATH)
+rem echo ------------------------------------------------------------------------
+set PHP_COMMAND=php.exe
+goto init
+
+:cleanup
+if "%OS%"=="Windows_NT" @endlocal
+rem pause


Add verbosity to glass output from androidtest.cmd

For debugging/writing a single test, /v to androidtest.cmd will now output
from glass onto the command line.

--- test/Android/androidtest.cmd
+++ test/Android/androidtest.cmd
@@ -85,12 +85,19 @@
 if "%_DeviceId%"=="" echo ERROR: DeviceId must be specified. Possible devices are:& "%_AdbExe%" devices &goto Help
 if "%_Platform%"=="" echo ERROR: Platform must be specified.& goto Help

+set _GlassFlags=-f TestScript.xml -e ErrorLog.xml -s SessionLog.xml -err -nodefaultsetup
+if not "%_Verbose%"=="1" set _GlassFlags=%_GlassFlags% -q
+
+set _GlassLog=
+if NOT "%_Verbose%"=="1" set _GlassLog=^> glass.log
+
 if "%_Verbose%"=="1" (
-    echo DeviceId:  %_DeviceId%
-    echo Platform:  %_Platform%
-    echo SdkRoot:   "%_SdkRoot%"
-    echo NdkRoot:   "%_NdkRoot%"
-    echo Tests:     %_TestsToRun%
+    echo DeviceId:    %_DeviceId%
+    echo Platform:    %_Platform%
+    echo SdkRoot:     "%_SdkRoot%"
+    echo NdkRoot:     "%_NdkRoot%"
+    echo Tests:       %_TestsToRun%
+	echo Glass Flags: %_GlassFlags%
 )

 if "%_TestsToRun%"=="" goto RunAll
@@ -152,7 +159,7 @@
     call %_GlassDir%LaunchOptionsGen.exe LaunchOptions.xml.template "SdkRoot=%_SdkRoot%\ " "NdkRoot=%_NdkRoot%\ " "TargetArchitecture=%_Platform%" "IntermediateDirectory=%~dp1temp\ " "AdditionalSOLibSearchPath=%~dp1%_Platform%\Debug\ " "DeviceId=%_DeviceId%"

     ::Run Glass
-    call "%_GlassDir%glass2.exe" -f TestScript.xml -e ErrorLog.xml -s SessionLog.xml -q -err -nodefaultsetup > glass2.log
+    call "%_GlassDir%glass2.exe" %_GlassFlags% %_GlassLog%
     if NOT "%ERRORLEVEL%"=="0" echo ERROR: Test failed. See ErrorLog.xml for more information.& set FAILED_TESTS="%~1" %FAILED_TESTS%

     :RunSingleTestDone


Recheckin mmx-console.bat

Recheckin mmx-console.bat

Former-commit-id: 28b775ce2dbaf240d098fd6eee40bd7d9fecd34a
Former-commit-id: eec74d7e94db8ea6b6f0f8ffd6dca187e21b5cf5
Former-commit-id: a34a69a53e3657d5828abd8fe0473be1fa03dc98
Former-commit-id: 0aab4e319fdde76666c853b6ee188b41500cf100

--- mmx-console.bat
+++ mmx-console.bat
@@ -1,8 +1,13 @@
 @echo off

+setlocal
+rem Change the following if it has been changed to use another port
+set PORT_TO_CHECK=3000

+set check_port=true
+set TITLE="MagnetMessagingConsole"
+set PROG="mmx-console"

-setlocal

 if "%selfWrapped%"=="" (
   SET selfWrapped=true
@@ -10,10 +15,10 @@
   GOTO :EOF
 )

-set TITLE="MagnetMessagingConsole"
-set PROG="mmx-console"
-
-
+if "-p"=="%1" (
+	set check_port=false
+	shift
+)

 if "start"=="%1" (
 	call :start
@@ -24,8 +29,7 @@
 		if "restart"=="%1" (
 			call :restart
 		) else (
-			echo Usage: %0 {start^|stop^|restart}
-			exit /b
+			call :print_usage
 		)
 	)
 )
@@ -34,10 +38,27 @@

+:print_usage
+	echo Usage: mmx-console.bat [-p] {start^|stop^|restart}
+	echo.
+	echo Start, stop, or restart the Magnet Mesaging console.
+	echo.
+	echo Options:
+	echo    -p    No port check when starting.
+	echo.
+exit /b
+
+
+
 :start
+	if %check_port%==true (
+		call :check_ports
+	)
+	call :check_node
+
 	if exist %PROG%.pid (
-		echo Error! %PROG% is already running or you have a stale pid file. If %PROG% is not running delete %PROG%.pid file and restart"
-		exit /b 1
+		echo Error! %PROG% is already running or you have a stale pid file. If %PROG% is not running delete %PROG%.pid file and try again.
+		exit 1
 	)
 	start %TITLE% node start.js
 	FOR /F "usebackq tokens=2" %%i IN (`tasklist /nh /fi "WINDOWTITLE eq %TITLE%"`) DO echo %%i > .\%PROG%.pid
@@ -45,9 +66,39 @@

+:check_ports
+	netstat -aon | findstr "%PORT_TO_CHECK%" 1>NUL
+	if %ERRORLEVEL% equ 0 (
+		echo TCP port "%PORT_TO_CHECK%" is already in use, cannot start messaging server
+		exit 1
+	)
+	echo Using ports "%PORT_TO_CHECK%"
+goto :eof
+
+
+
+:check_node
+	node -v 1>NUL 2>NUL
+	if 0 neq %ERRORLEVEL% (
+		if not exist "nodejs\node.exe" (
+			echo node.js is not installed
+			echo MMX console needs node.js version 10.0 OR higher
+			echo Please check https://nodejs.org/download/
+			exit 1
+		) else (
+			echo node.js is installed
+		)
+	) else (
+			echo node.js is installed
+	)
+goto :eof
+
+
+
 :stop
+	set /p pid=<.\%PROG%.pid
+	taskkill /f /pid %pid% /t
 	del .\%PROG%.pid
-	taskkill /f /im node.exe /t
 goto :end

@@ -59,4 +110,4 @@

-:end
+:end


Add basic cibuild script

Add basic cibuild script

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

--- devtools/cibuild.cmd
+++ devtools/cibuild.cmd
@@ -0,0 +1,14 @@
+cd /d "%~dp0"
+cd ..
+rmdir /s /q build
+mkdir build
+cd build
+cmake .. -G "Visual Studio 12"
+cmake --build . --config Debug
+cmake --build . --config RelWithDebInfo
+cmake --build . --config Debug --target doc
+
+rem bin\Debug\LoadTest.exe --gtest_output=xml:test_details.Debug.xml
+rem bin\RelWithDebInfo\LoadTest.exe --gtest_output=xml:test_details.RelWithDebInfo.xml
+
+pause


GS-8703
Fix script to use the right label in goto

svn path=/trunk/openspaces/; revision=97579

Former-commit-id: 080d94e5ca15d4426ce1155ae3632175105f73f0

--- tools/groovy/bin/startGroovy.bat
+++ tools/groovy/bin/startGroovy.bat
@@ -61,7 +61,7 @@

 :default_JAVA_EXE
 set JAVA_EXE=java.exe
-goto check_GROOVY_HOME
+goto check_GS_GROOVY_HOME

 :valid_JAVA_HOME_DIR
 set JAVA_EXE=%JAVA_HOME%\bin\java.exe


[platform] rewriting VM options file lookup conditions in Windows .bat launcher

... to prevent repeated existence checks for a same file, and to make the code easier to evolve (IDEA-240526)

GitOrigin-RevId: 1033c0424a1d4cdd79412790aac358567b219ab6

--- platform/build-scripts/resources/win/scripts/executable-template.bat
+++ platform/build-scripts/resources/win/scripts/executable-template.bat
@@ -66,31 +66,37 @@
 :: ---------------------------------------------------------------------
 IF NOT "%@@product_uc@@_PROPERTIES%" == "" SET IDE_PROPERTIES_PROPERTY="-Didea.properties.file=%@@product_uc@@_PROPERTIES%"

-:: explicit
-SET VM_OPTIONS_FILE=%@@product_uc@@_VM_OPTIONS%
-IF NOT EXIST "%VM_OPTIONS_FILE%" (
+SET VM_OPTIONS_FILE=
+IF NOT "%@@product_uc@@_VM_OPTIONS%" == "" (
+  :: explicit
+  IF EXIST "%@@product_uc@@_VM_OPTIONS%" SET VM_OPTIONS_FILE=%@@product_uc@@_VM_OPTIONS%
+)
+IF "%VM_OPTIONS_FILE%" == "" (
   :: Toolbox
-  SET VM_OPTIONS_FILE=%IDE_HOME%.vmoptions
+  IF EXIST "%IDE_HOME%.vmoptions" SET VM_OPTIONS_FILE=%IDE_HOME%.vmoptions
 )
-IF NOT EXIST "%VM_OPTIONS_FILE%" (
+IF "%VM_OPTIONS_FILE%" == "" (
   :: user-overridden
-  SET VM_OPTIONS_FILE=%APPDATA%\@@product_vendor@@\@@system_selector@@\@@vm_options@@.vmoptions
+  SET _VM_OPTIONS_CANDIDATE=%APPDATA%\@@product_vendor@@\@@system_selector@@\@@vm_options@@.vmoptions
+  IF EXIST "%_VM_OPTIONS_CANDIDATE%" SET VM_OPTIONS_FILE=%_VM_OPTIONS_CANDIDATE%
 )
-IF NOT EXIST "%VM_OPTIONS_FILE%" (
+IF "%VM_OPTIONS_FILE%" == "" (
   :: default, standard installation
-  SET VM_OPTIONS_FILE=%IDE_BIN_DIR%\@@vm_options@@.vmoptions
+  SET _VM_OPTIONS_CANDIDATE=%IDE_BIN_DIR%\@@vm_options@@.vmoptions
+  IF EXIST "%_VM_OPTIONS_CANDIDATE%" SET VM_OPTIONS_FILE=%_VM_OPTIONS_CANDIDATE%
 )
-IF NOT EXIST "%VM_OPTIONS_FILE%" (
+IF "%VM_OPTIONS_FILE%" == "" (
   :: default, universal package
-  SET VM_OPTIONS_FILE=%IDE_BIN_DIR%\win\@@vm_options@@.vmoptions
+  SET _VM_OPTIONS_CANDIDATE=%IDE_BIN_DIR%\win\@@vm_options@@.vmoptions
+  IF EXIST "%_VM_OPTIONS_CANDIDATE%" SET VM_OPTIONS_FILE=%_VM_OPTIONS_CANDIDATE%
 )
-IF NOT EXIST "%VM_OPTIONS_FILE%" (
+IF "%VM_OPTIONS_FILE%" == "" (
   ECHO ERROR: cannot find VM options file.
+) ELSE (
+  SET ACC=
+  FOR /F "eol=# usebackq delims=" %%i IN ("%VM_OPTIONS_FILE%") DO CALL "%IDE_BIN_DIR%\append.bat" "%%i"
+  SET ACC=%ACC% -Djb.vmOptionsFile="%VM_OPTIONS_FILE%"
 )
-
-SET ACC=
-FOR /F "eol=# usebackq delims=" %%i IN ("%VM_OPTIONS_FILE%") DO CALL "%IDE_BIN_DIR%\append.bat" "%%i"
-IF EXIST "%VM_OPTIONS_FILE%" SET ACC=%ACC% -Djb.vmOptionsFile="%VM_OPTIONS_FILE%"

 SET COMMON_JVM_ARGS="-XX:ErrorFile=%USERPROFILE%\java_error_in_@@base_name@@_%%p.log" "-XX:HeapDumpPath=%USERPROFILE%\java_error_in_@@base_name@@.hprof" -Didea.vendor.name=@@product_vendor@@ -Didea.paths.selector=@@system_selector@@ %IDE_PROPERTIES_PROPERTY%
 SET IDE_JVM_ARGS=@@ide_jvm_args@@


update reg query with output to Nul

update reg query with output to Nul

--- scripts/chef.bat
+++ scripts/chef.bat
@@ -7,12 +7,12 @@
 :: Download chef client
 if not exist "C:\Windows\Temp\chef.msi" (
   echo ==^> Downloading Chef Client
-  powershell -Command "(New-Object System.Net.WebClient).DownloadFile('https://www.chef.io/chef/install.msi', 'C:\Windows\Temp\chef.msi')" >nul
+  powershell -Command "(New-Object System.Net.WebClient).DownloadFile('https://www.chef.io/chef/install.msi', 'C:\Windows\Temp\chef.msi')" > nul
   @if errorlevel 1 echo ==^> WARNING: Error %ERRORLEVEL% was returned by: powershell -Command "(New-Object System.Net.WebClient).DownloadFile('https://www.chef.io/chef/install.msi', 'C:\Windows\Temp\chef.msi')"
 )

 :: Install chef client
-reg query "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Installer\UserData\S-1-5-18\Products\1945256682812F8459C51AA05AD1CF7D" >nul
+reg query "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Installer\UserData\S-1-5-18\Products\1945256682812F8459C51AA05AD1CF7D" > nul 2>&1
 if errorlevel 1 (
   echo ==^> Installing Chef Client
   msiexec /qb /i C:\Windows\Temp\chef.msi


add git build cmd

add git build cmd

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

--- Instructor-Resources/git-build.cmd
+++ Instructor-Resources/git-build.cmd
@@ -0,0 +1,3 @@
+git remote add upstream https://github.com/Azure/LearnAnalytics-mr4ds.git
+git pull upstream master
+git push origin master


Create add-firewall-rules.cmd

Create add-firewall-rules.cmd

error: pathspec 'hMailServer/add-firewall-rules.cmd' did not match any file(s) known to git

--- hMailServer/add-firewall-rules.cmd
+++ hMailServer/add-firewall-rules.cmd
@@ -0,0 +1,7 @@
+@ECHO OFF
+
+REM -- Enable e-mail related protocols for hMailServer in Windows Firewall
+netsh advfirewall firewall add rule name="hMailServer SMTP" program="C:\Program Files (x86)\hMailServer\Bin\hMailServer.exe" service=hMailServer dir=in action=allow protocol=TCP localport=25
+netsh advfirewall firewall add rule name="hMailServer POP3" program="C:\Program Files (x86)\hMailServer\Bin\hMailServer.exe" service=hMailServer dir=in action=allow protocol=TCP localport=110
+netsh advfirewall firewall add rule name="hMailServer IMAP" program="C:\Program Files (x86)\hMailServer\Bin\hMailServer.exe" service=hMailServer dir=in action=allow protocol=TCP localport=143
+netsh advfirewall firewall add rule name="hMailServer SMTP-587" program="C:\Program Files (x86)\hMailServer\Bin\hMailServer.exe" service=hMailServer dir=in action=allow protocol=TCP localport=587


whitespace

whitespace

--- tools/minify.bat
+++ tools/minify.bat
@@ -3,10 +3,13 @@

 REM the folder this script is in (*/enyo/tools)
 SET TOOLS=%~DP0
+
 REM enyo location
 SET ENYO=%TOOLS%\..
+
 REM default node location
 SET NODE=%TOOLS%\node.exe
+
 REM minify script location
 SET MINIFY=%TOOLS%\minifier\minify.js


build support for VS2015

build support for VS2015

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

--- update_solution_2015_x64.cmd
+++ update_solution_2015_x64.cmd
@@ -0,0 +1,4 @@
+if not exist _cmake_win64 mkdir _cmake_win64
+cd _cmake_win64
+cmake -G "Visual Studio 14 Win64" .. -DCMAKE_TOOLCHAIN_FILE=../../vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows-static
+cd ..


Added a script to export all PuTTY settings and sessions

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

--- batch/export_putty_settings_and_sessions.bat
+++ batch/export_putty_settings_and_sessions.bat
@@ -0,0 +1 @@
+regedit /e "%USERPROFILE%\Desktop\putty.reg" HKEY_CURRENT_USER\Software\SimonTatham


Add cmd script to run the new single test case

error: pathspec 'FileSyncandWOPI/Source/Scripts/MS-ONESTORE/RunMSONESTORE_S02_TC06.cmd' did not match any file(s) known to git

--- FileSyncandWOPI/Source/Scripts/MS-ONESTORE/RunMSONESTORE_S02_TC06.cmd
+++ FileSyncandWOPI/Source/Scripts/MS-ONESTORE/RunMSONESTORE_S02_TC06.cmd
@@ -0,0 +1,4 @@
+@echo off
+pushd %~dp0
+"%VS120COMNTOOLS%..\IDE\mstest" /test:Microsoft.Protocols.TestSuites.MS_ONESTORE.S02_OneNoteRevisionStore.MSONESTORE_S02_TC06_LoadOneNoteWithAlternativePackaging /testcontainer:..\..\MS-ONESTORE\TestSuite\bin\Debug\MS-ONESTORE_TestSuite.dll /runconfig:..\..\MS-ONESTORE\MS-ONESTORE.testsettings /unique
+pause


use 32-bit version of Pandoc for now

use 32-bit version of Pandoc for now

--- dependencies/windows/install-dependencies.cmd
+++ dependencies/windows/install-dependencies.cmd
@@ -21,7 +21,7 @@
 set BOOST_FILES=boost-1.65.1-win-msvc141.zip

 set PANDOC_VERSION=2.3.1
-set PANDOC_NAME=pandoc-%PANDOC_VERSION%-windows-x86_64
+set PANDOC_NAME=pandoc-%PANDOC_VERSION%-windows-i386
 set PANDOC_FILE=%PANDOC_NAME%.zip

 set LIBCLANG_VERSION=5.0.2


Remove -Xdebug

Remove -Xdebug

--- build/src/main/resources/bin/domain.conf.bat
+++ build/src/main/resources/bin/domain.conf.bat
@@ -68,12 +68,12 @@
 set "HOST_CONTROLLER_JAVA_OPTS=%JAVA_OPTS%"

 rem # Sample JPDA settings for remote socket debugging
-rem set "PROCESS_CONTROLLER_JAVA_OPTS=%PROCESS_CONTROLLER_JAVA_OPTS% -Xdebug -Xrunjdwp:transport=dt_socket,address=8788,server=y,suspend=n"
-rem set "HOST_CONTROLLER_JAVA_OPTS=%HOST_CONTROLLER_JAVA_OPTS% -Xdebug -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n"
+rem set "PROCESS_CONTROLLER_JAVA_OPTS=%PROCESS_CONTROLLER_JAVA_OPTS% -Xrunjdwp:transport=dt_socket,address=8788,server=y,suspend=n"
+rem set "HOST_CONTROLLER_JAVA_OPTS=%HOST_CONTROLLER_JAVA_OPTS% -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n"

 rem # Sample JPDA settings for shared memory debugging
-rem set "PROCESS_CONTROLLER_JAVA_OPTS=%PROCESS_CONTROLLER_JAVA_OPTS% -Xdebug -Xrunjdwp:transport=dt_shmem,address=jboss,server=y,suspend=n"
-rem set "HOST_CONTROLLER_JAVA_OPTS=%HOST_CONTROLLER_JAVA_OPTS% -Xdebug -Xrunjdwp:transport=dt_shmem,address=jboss,server=y,suspend=n"
+rem set "PROCESS_CONTROLLER_JAVA_OPTS=%PROCESS_CONTROLLER_JAVA_OPTS% -Xrunjdwp:transport=dt_shmem,address=jboss,server=y,suspend=n"
+rem set "HOST_CONTROLLER_JAVA_OPTS=%HOST_CONTROLLER_JAVA_OPTS% -Xrunjdwp:transport=dt_shmem,address=jboss,server=y,suspend=n"

 :JAVA_OPTS_SET


Mod argument call in InstallPortal.bat (#38)

Added argument value for Use_SSL parameter in call to
SetServicesDirectoryProps.py.

--- Install/Portal/InstallPortal.bat
+++ Install/Portal/InstallPortal.bat
@@ -69,6 +69,6 @@
 echo locally hosted ArcGIS for JavaScript API...
 echo.
 Call "%~dp0..\..\SupportFiles\SetServicesDirectoryProps.py" ^
- %FQDN% # %ops_userName% %ops_passWord%
+ %FQDN% # %ops_userName% %ops_passWord% Yes
 echo.


Also search %HOMEDRIVE% if it's not C:.

Also search %HOMEDRIVE% if it's not C:.

--- Batch/PySetup.bat
+++ Batch/PySetup.bat
@@ -18,6 +18,7 @@
 :#   2017-01-24 JFL Added steps for the InstallPath and PythonPath setup.     #
 :#                  Always display test results, even in setup mode.	      #
 :#   2017-04-14 JFL Added a check of Explorer File Extensions User Choice.    #
+:#   2018-04-13 JFL Also search %HOMEDRIVE% if it's not C:.                   #
 :#                                                                            #
 :#          Copyright 2017 Hewlett Packard Enterprise Development LP         #
 :# Licensed under the Apache 2.0 license  www.apache.org/licenses/LICENSE-2.0 #
@@ -25,7 +26,7 @@

 :init_batch
 setlocal EnableExtensions EnableDelayedExpansion
-set "VERSION=2017-04-14"
+set "VERSION=2018-04-13"
 set "SCRIPT=%~nx0"				&:# Script name
 set "SPATH=%~dp0" & set "SPATH=!SPATH:~0,-1!"	&:# Script path, without the trailing \
 set "SFULL=%~f0"				&:# Script full pathname
@@ -1727,6 +1728,7 @@

 :Main
 set "SEARCHDRIVES=C U"		&:# List of drives where to search for python.exe.
+if not "%HOMEDRIVE%"=="C:" set "SEARCHDRIVES=%HOMEDRIVE:~0,1% %SEARCHDRIVES%"
 set "PYTHONVER="		&:# Version to use. Default: The most recent one
 set "ACTION="
 set ">DEBUGOUT=>&2"	&:# Send debug output to stderr, so that it does not interfere with subroutines output capture


reorder build.bat

reorder build.bat

--- src/RunBuild.bat
+++ src/RunBuild.bat
@@ -3,4 +3,4 @@
 "tools\nuget\nuget.exe" "install" "xunit.runner.console" "-OutputDirectory" "tools" "-ExcludeVersion"
 "tools\nuget\nuget.exe" "install" "PhantomJS" "-OutputDirectory" "tools" "-ExcludeVersion"

-"tools\FAKE\tools\FAKE.exe" "Build.fsx" "publishDirectory=Publish buildMode=%1 target=%2"
+"tools\FAKE\tools\FAKE.exe" "Build.fsx" %2 "publishDirectory=Publish" "buildMode=%1"


Updated the ImportFromSDK.cmd script to work with the installed version of render manager, vs the cmake build.

--- ImportFromSDK.cmd
+++ ImportFromSDK.cmd
@@ -123,7 +123,7 @@
 set SRC=%1
 set DEST=%2
 set BITS=%3
-for %%F in (%SRC%\bin\osvrRenderManager.dll) do (
+for %%F in (%SRC%\osvrRenderManager.dll) do (
   xcopy %%F "%DEST%\Win%BITS%\" /Y
 )
 endlocal


Adding for jenkins...

Adding for jenkins...

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

--- APIClient/buildProjectJenkins.bat
+++ APIClient/buildProjectJenkins.bat
@@ -0,0 +1,2 @@
+cd APIClient
+msbuild VersionOne.SDK.APIClient.csproj /p:Configuration=Release /p:Platform=AnyCPU /p:Major=12 /p:Minor=2  /p:Revision=0 /p:AssemblyInformationalVersion="12.2.1.3588 Summer 2012" /p:AssemblyCopyright="Copyright 2012, VersionOne, Inc. Licensed under modified BSD." /p:CompanyName="VersionOne, Inc" /p:AssemblyProduct="VersionOne.SDK.APIClient" /p:AssemblyTitle="VersionOne SDK API Client" /p:AssemblyDescription="VersionOne SDK .NET API Client Release Build"


Uncomment echo off

Uncomment echo off

--- BulkCrapUninstaller/CleanLogs.bat
+++ BulkCrapUninstaller/CleanLogs.bat
@@ -1,6 +1,6 @@
 title Removing BCU log files...
-rem @echo off
-rem cls
+@echo off
+cls

 if not exist %LOCALAPPDATA% (
 REM LOCALAPPDATA doesn't exist on windows older than Vista


Created release 2015-04-16.

Created release 2015-04-16.

--- create-release.bat
+++ create-release.bat
@@ -6,7 +6,7 @@

 REM -- Get the current date time in the format YYYY-MM-DD
 set current_date=%DATE:~10,4%-%DATE:~4,2%-%DATE:~7,2%
-set release_dir=release\%current_date%
+set release_dir=release\current

 REM -- Update with contents from bin folder and copy to release directory
 lib\utils\echoc 2 Creating release binaries...
@@ -23,7 +23,7 @@
 lib\utils\echoc 2 Compressing binary release...
 del %release_dir%\%current_date%-solum-bin.zip
 cd %release_dir%
-%orig_path%\lib\utils\zip -r %current_date%-solum-bin.zip bin\* -x data
+%orig_path%\lib\utils\zip -r %current_date%-solum-bin.zip bin\*
 cd %orig_path%

 lib\utils\echoc 2 Compressing lib release...


scripts installation

scripts installation

--- install.bat
+++ install.bat
@@ -8,5 +8,6 @@

 :update
 cd %userprofile%\desktop\gestion-paroisse
+git pull
 call rake db:migrate
 call bundle install


WFCORE-1719 Wildfly does not start as a windows service

--- core-feature-pack/src/main/resources/content/docs/contrib/scripts/service/service.bat
+++ core-feature-pack/src/main/resources/content/docs/contrib/scripts/service/service.bat
@@ -115,7 +115,7 @@
 set SHORTNAME=Wildfly
 set DISPLAYNAME=WildFly
 rem NO quotes around the description here !
-set DESCRIPTION="WildFly Application Server"
+set DESCRIPTION=WildFly Application Server
 set CONTROLLER=localhost:9990
 set DC_HOST=master
 set IS_DOMAIN=false


+ add install shell script for windows

+ add install shell script for windows

error: pathspec 'vcs-conf/install.bat' did not match any file(s) known to git

--- vcs-conf/install.bat
+++ vcs-conf/install.bat
@@ -0,0 +1,11 @@
+@echo off
+
+@if not exist "%HOME%" @set HOME=%HOMEDRIVE%%HOMEPATH%
+@if not exist "%HOME%" @set HOME=%USERPROFILE%
+
+call copy /Y gitconfig "%HOME%\.gitconfig"
+call copy /Y mercurial.ini "%HOME%\mercurial.ini"
+
+echo installing VCS-Conf successfully ...
+pause
+@echo on


new alias create syntax

new alias create syntax

--- vendor/bin/alias.cmd
+++ vendor/bin/alias.cmd
@@ -14,6 +14,8 @@
 rem #region parseargument
 goto parseargument

+set args=
+
 :do_shift
   shift

@@ -22,10 +24,15 @@

   if /i "%currentarg%" equ "/f" (
     set ALIASES=%~2
+    set ALT_ALIASES=%~2
     shift
     goto :do_shift
   ) else if /i "%currentarg%" == "/reload" (
     goto :p_reload
+  ) else if "%currentarg%" equ "/H" (
+    goto :p_help
+  ) else if "%currentarg%" equ "/h" (
+    goto :p_help
   ) else if "%currentarg%" equ "/?" (
     goto :p_help
   ) else if /i "%currentarg%" equ "/d" (
@@ -43,11 +50,28 @@
       doskey /macros | %WINDIR%\System32\findstr /b %currentarg%= && exit /b
       echo insufficient parameters.
       goto :p_help
+    ) else if "%currentarg%" == "create" (
+      set action=create
+      if [%ALT_ALIASES%] neq [] (
+        echo 1
+        for /f "tokens=1,2,3,* usebackq" %%G in (`echo %*`) do (
+          set args=%%J
+        )
+      ) else (
+        echo 2
+        for /f "tokens=1,2,* usebackq" %%G in (`echo %*`) do (
+          set args=%%H %%I
+        )
+      )
     ) else (
       :: handle quotes within command definition, e.g. quoted long file names
       set _x=%*
     )
   )
+
+:: echo _x=%_x%
+:: echo args=%args%
+
 rem #endregion parseargument

 if "%ALIASES%" neq "%CMDER_ROOT%\config\user_aliases.cmd" (
@@ -63,25 +87,38 @@
   )
 )

-:: validate alias
-for /f "delims== tokens=1,* usebackq" %%G in (`echo "%_x%"`) do (
-  set alias_name=%%G
-  set alias_value=%%H
+:: create with multiple parameters
+if [%action%] == [create] (
+  if not ["%args%"] == [""] (
+    for /f "tokens=1,* usebackq" %%G in (`echo %args%`) do (
+      set alias_name=%%G
+      set alias_value=%%H
+    )
+  )
+) else (
+  :: validate alias
+  echo %_x%
+  set x=!_x:%=^^%!
+  echo !_x!
+  for /f "delims== tokens=1,* usebackq" %%G in (`echo "!_x!"`) do (
+    set alias_name=%%G
+    set alias_value=%%H
+  )
+
+  :: leading quotes added while validating
+  set alias_name=!alias_name:~1!
+
+  :: trailing quotes added while validating
+  set alias_value=!alias_value:~1,-1!
 )
-
-:: leading quotes added while validating
-set alias_name=%alias_name:~1%
-
-:: trailing quotes added while validating
-set alias_value=%alias_value:~0,-1%

 ::remove spaces
 set _temp=%alias_name: =%

 if not ["%_temp%"] == ["%alias_name%"] (
-	echo Your alias name can not contain a space
-	endlocal
-	exit /b
+  echo Your alias name can not contain a space
+  endlocal
+  exit /b
 )

 :: replace already defined alias
@@ -111,9 +148,11 @@
 :p_help
 echo.Usage:
 echo.
-echo.	alias [options] [alias=full command]
+echo.     alias [options] [alias=alias command] or [[create [alias] [alias command]]]
 echo.
 echo.Options:
+echo.
+echo.     Note: Options MUST precede the alias definition.
 echo.
 echo.     /d [alias]     Delete an [alias].
 echo.     /f [macrofile] Path to the [macrofile] you want to store the new alias in.
@@ -121,11 +160,14 @@
 echo.     /reload        Reload the aliases file.  Can be used with /f argument.
 echo.                    Default: %cmder_root%\config\user_aliases.cmd
 echo.
-echo.	If alias is called with no parameters, it will display the list of existing aliases.
+echo. If alias is called with no parameters, it will display the list of existing aliases.
 echo.
-echo.	In the command, you can use the following notations:
-echo.	$* allows the alias to assume all the parameters of the supplied command.
-echo.	$1-$9 Allows you to seperate parameter by number, much like %%1 in batch.
-echo.	$T is the command seperator, allowing you to string several commands together into one alias.
-echo.	For more information, read DOSKEY/?
+echo. In the alias command, you can use the following notations:
+echo.
+echo. ^^^^^^^^%% - '%%' in env vars must be escaped if preserving the variable in the alias is desired.
+echo. $*    - allows the alias to assume all the parameters of the supplied command.
+echo. $1-$9 - Allows you to seperate parameter by number, much like %%1 in batch.
+echo. $T    - Command seperator, allowing you to string several commands together into one alias.
+echo.
+echo. For more information, read DOSKEY /?
 exit /b


mk-curl.bat: run binary after build [ci skip]

--- mk-curl.bat
+++ mk-curl.bat
@@ -46,6 +46,10 @@
 touch -c lib/*.a          -r CHANGES
 touch -c lib/*.lib        -r CHANGES

+:: Test run
+
+src\curl.exe --version
+
 :: Create package

 set _BAS=%_NAM%-%_VER%-%_CPU%-mingw


Add "Fleischwolf.bat", a sriptfile to make a met-File from the example .bin file (needs to be copied to Fleischwolfs location. MetraTec_Met-Maker.exe is needed, too.

error: pathspec 'LPC_1226_Bootloader_PC-Part/MetraTec_Met-Maker/Release/Fleischwolf.bat' did not match any file(s) known to git

--- LPC_1226_Bootloader_PC-Part/MetraTec_Met-Maker/Release/Fleischwolf.bat
+++ LPC_1226_Bootloader_PC-Part/MetraTec_Met-Maker/Release/Fleischwolf.bat
@@ -0,0 +1 @@
+MetraTec_Met-Maker.exe MetraTec_ExampleProject_LPC1226.bin Example_Project.met -d


清理issues

清理issues

--- generate-project.bat
+++ generate-project.bat
@@ -3,7 +3,7 @@

 if not exist  generated-projects mkdir generated-projects
 cd generated-projects
-call mvn archetype:generate -DarchetypeGroupId=org.springside.examples -DarchetypeArtifactId=quickstart-archetype
+call mvn archetype:generate -DarchetypeGroupId=org.springside.examples -DarchetypeArtifactId=quickstart-archetype -DarchetypeVersion=4.1.1-SNAPSHOT

 pause


Added .cmd for other test

Added .cmd for other test

error: pathspec 'test/test-files/foundry-release-bad-spec-version/foundry-release-bad-spec-version.cmd' did not match any file(s) known to git

--- test/test-files/foundry-release-bad-spec-version/foundry-release-bad-spec-version.cmd
+++ test/test-files/foundry-release-bad-spec-version/foundry-release-bad-spec-version.cmd
@@ -0,0 +1,7 @@
+@IF EXIST "%~dp0\node.exe" (
+  "%~dp0\node.exe"  "%~dp0\foundry-release-bad-spec-version" %*
+) ELSE (
+  @SETLOCAL
+  @SET PATHEXT=%PATHEXT:;.JS;=;%
+  node  "%~dp0\foundry-release-bad-spec-version" %*
+)


added set_classpath

added set_classpath

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

--- set_classpath.bat
+++ set_classpath.bat
@@ -0,0 +1,2 @@
+set path=C:\Workspace\Development\java\apache-maven-2.2.1\bin;%PATH%
+set JAVA_HOME=C:\Program Files\Java\jdk1.7.0_17


* minor refactor

* minor refactor

git-svn-id: e4e5150cbaae966e82617adf20e509dfc2de7bc3@51 c83cf141-d9d7-4975-98f5-23f3ee83e49f

--- Scripts/gen_branch_workingset.bat
+++ Scripts/gen_branch_workingset.bat
@@ -1024,7 +1024,7 @@
 set HAS_TO_RESOLVE_REMOVE_FIRST_FILE=1

 rem resolve binary differences by indexing difference file on unresolved state values
-call "%%CONTOOLS_ROOT%%/index_patch_file.bat" BRANCH_DIFF_FILE_INDEX "%%BRANCH_DIFF_FILE%%"
+call "%%CONTOOLS_ROOT%%/diff/index_patch_file.bat" BRANCH_DIFF_FILE_INDEX "%%BRANCH_DIFF_FILE%%"

 if %RETURN_VALUE% LSS 1 exit /b 0
 for /L %%i in (1,1,%RETURN_VALUE%) do (


Fix one more spaces in path problem with dart_analyzer.
Review URL: https://codereview.chromium.org//11572054

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

--- compiler/scripts/dart_analyzer.bat
+++ compiler/scripts/dart_analyzer.bat
@@ -13,7 +13,7 @@
 if %SCRIPT_DIR:~-1%==\ set SCRIPT_DIR=%SCRIPT_DIR:~0,-1%

 rem DART_ANALYZER_HOME=$(dirname $SCRIPT_DIR)
-for %%A in ("%SCRIPT_DIR\..") do set "DART_ANALYZER_HOME=%%~fA"
+for %%I in ("%SCRIPT_DIR%\..") do set "DART_ANALYZER_HOME=%%~fI"
 if %DART_ANALYZER_HOME:~-1%==\ set DART_ANALYZER_HOME=%DART_ANALYZER_HOME:~0,-1%

 set FOUND_BATCH=0
@@ -45,7 +45,7 @@
 set DART_SDK=""
 if [%FOUND_SDK%] == [0] (
   if exist "%DART_ANALYZER_HOME%\lib\core\core.dart" (
-    set DART_SDK=--dart-sdk %DART_ANALYZER_HOME%
+    set DART_SDK=--dart-sdk "%DART_ANALYZER_HOME%"
   ) else (
     for /f %%i in ('echo %DART_ANALYZER_HOME%') do set DART_SDK_HOME=%%~dpi\dart-sdk
     if exist "!DART_SDK_HOME!" (


Updating setup script for Visual Studio 2017.

--- Setup/Publish.cmd
+++ Setup/Publish.cmd
@@ -6,31 +6,41 @@
 SET  FILES_EXECUTABLE="..\Binaries\Summae.exe" "..\Binaries\sum.exe"
 SET       FILES_OTHER="..\Binaries\ReadMe.txt" "..\Binaries\License.txt"

-SET    COMPILE_TOOL_1="%PROGRAMFILES(X86)%\Microsoft Visual Studio 14.0\Common7\IDE\devenv.exe"
-SET    COMPILE_TOOL_2="%PROGRAMFILES(X86)%\Microsoft Visual Studio 14.0\Common7\IDE\WDExpress.exe"
+SET   COMPILE_TOOL_15="%PROGRAMFILES(X86)%\Microsoft Visual Studio\2017\Community\Common7\IDE\devenv.exe"
+SET   COMPILE_TOOL_14="%PROGRAMFILES(X86)%\Microsoft Visual Studio 14.0\Common7\IDE\devenv.exe"
+SET  COMPILE_TOOL_14E="%PROGRAMFILES(X86)%\Microsoft Visual Studio 14.0\Common7\IDE\WDExpress.exe"
+
 SET        SETUP_TOOL="%PROGRAMFILES(x86)%\Inno Setup 5\iscc.exe"

-SET       SIGN_TOOL_1="%PROGRAMFILES(X86)%\Windows Kits\8.1\bin\x86\signtool.exe"
-SET       SIGN_TOOL_2="%PROGRAMFILES(X86)%\Windows Kits\8.0\bin\x86\signtool.exe"
+SET       SIGN_TOOL_1="%PROGRAMFILES(X86)%\Microsoft SDKs\ClickOnce\SignTool\signtool.exe"
+SET       SIGN_TOOL_2="%PROGRAMFILES(X86)%\Windows Kits\10\App Certification Kit\signtool.exe"
+SET       SIGN_TOOL_3="%PROGRAMFILES(X86)%\Windows Kits\10\bin\x86\signtool.exe"
 SET   SIGN_THUMBPRINT="df26e797ffaee47a40c1fab756e995d3763da968"
 SET SIGN_TIMESTAMPURL="http://timestamp.comodoca.com/rfc3161"

 SET        GIT_TOOL_1="%PROGRAMFILES%\Git\mingw64\bin\git.exe"

+SET          RAR_TOOL="%PROGRAMFILES%\WinRAR\WinRAR.exe"
+

 ECHO --- DISCOVER TOOLS
 ECHO.

-IF EXIST %COMPILE_TOOL_1% (
-    ECHO Visual Studio 2015
-    SET COMPILE_TOOL=%COMPILE_TOOL_1%
-) ELSE (
-    IF EXIST %COMPILE_TOOL_2% (
-        ECHO Visual Studio Express 2015
-        SET COMPILE_TOOL=%COMPILE_TOOL_2%
-    ) ELSE (
-        ECHO Cannot find Visual Studio^^!
-        PAUSE && EXIT /B 255
+IF EXIST %COMPILE_TOOL_15% (
+    ECHO Visual Studio 2017
+    SET COMPILE_TOOL=%COMPILE_TOOL_15%
+) ELSE (
+    IF EXIST %COMPILE_TOOL_14% (
+        ECHO Visual Studio 2015
+        SET COMPILE_TOOL=%COMPILE_TOOL_14%
+    ) ELSE (
+        IF EXIST %COMPILE_TOOL_14E% (
+            ECHO Visual Studio Express 2015
+            SET COMPILE_TOOL=%COMPILE_TOOL_14E%
+        ) ELSE (
+            ECHO Cannot find Visual Studio^^!
+            PAUSE && EXIT /B 255
+        )
     )
 )

@@ -42,15 +52,20 @@
 )

 IF EXIST %SIGN_TOOL_1% (
-    ECHO Windows SignTool 8.1
+    ECHO Windows SignTool 10 ^(ClickOnce^)
     SET SIGN_TOOL=%SIGN_TOOL_1%
 ) ELSE (
     IF EXIST %SIGN_TOOL_2% (
-        ECHO Windows SignTool 8.0
+        ECHO Windows SignTool 10 ^(App Certification Kit^)
         SET SIGN_TOOL=%SIGN_TOOL_2%
     ) ELSE (
-        ECHO Cannot find Windows SignTool^^!
-        PAUSE && EXIT /B 255
+        IF EXIST %SIGN_TOOL_3% (
+            ECHO Windows SignTool 10 ^(SDK^)
+            SET SIGN_TOOL=%SIGN_TOOL_3%
+        ) ELSE (
+            ECHO Cannot find Windows SignTool^^!
+            PAUSE && EXIT /B 255
+        )
     )
 )

@@ -59,6 +74,10 @@
     SET GIT_TOOL=%GIT_TOOL_1%
 ) ELSE (
     GIT_TOOL="git"
+)
+
+IF NOT EXIST %RAR_TOOL% (
+    ECHO WinRAR not present^^!
 )

 ECHO.
@@ -175,9 +194,13 @@
 ECHO --- BUILD ZIP
 ECHO.

-ECHO Zipping into %_SETUPEXE:.exe=.zip%
-"%PROGRAMFILES%\WinRAR\WinRAR.exe" a -afzip -ep -m5 ".\Temp\%_SETUPEXE:.exe=.zip%" %FILES_EXECUTABLE% %FILES_OTHER%
-IF ERRORLEVEL 1 PAUSE && EXIT /B %ERRORLEVEL%
+IF EXIST %RAR_TOOL% (
+    ECHO Zipping into %_SETUPEXE:.exe=.zip%
+    "%PROGRAMFILES%\WinRAR\WinRAR.exe" a -afzip -ep -m5 ".\Temp\%_SETUPEXE:.exe=.zip%" %FILES_EXECUTABLE% %FILES_OTHER%
+    IF ERRORLEVEL 1 PAUSE && EXIT /B %ERRORLEVEL%
+) ELSE (
+    ECHO No WinRAR
+)

 ECHO.
 ECHO.


some sweat and tears to create an equivalent windows batch file for checkout.sh

error: pathspec 'reahl-doc/reahl/doc_dev/checkout.bat' did not match any file(s) known to git

--- reahl-doc/reahl/doc_dev/checkout.bat
+++ reahl-doc/reahl/doc_dev/checkout.bat
@@ -0,0 +1,72 @@
+REM to redirect output: checkout.bat > testout.txt 2>&1
+@ECHO off
+setlocal ENABLEDELAYEDEXPANSION
+SET ORIGINAL_DIR=%cd%
+SET REAHL_TMP=%ORIGINAL_DIR%\tmp
+mkdir %REAHL_TMP%
+REM Perhaps use pushd an popd?
+cd %REAHL_TMP%
+SET EXAMPLE_LIST=('reahl listexamples')
+REM SET EXAMPLE_LIST=("tutorial.hello")
+for /F %%i in %EXAMPLE_LIST% do (
+    REM get the 4th token grepping the output for a string
+    for /F "tokens=4" %%j in ('reahl example -f %%i ^| findstr "Checking out to" ') do set EXAMPLE_DIR_OR_FILE=%%j
+    REM only do this it the checkout worked
+    if [!EXAMPLE_DIR_OR_FILE!] NEQ [] (
+        if exist !EXAMPLE_DIR_OR_FILE!\NUL  (
+            echo ---Example [%%i] is in a directory: !EXAMPLE_DIR_OR_FILE!
+            cd !EXAMPLE_DIR_OR_FILE!
+            reahl setup -- develop -N
+            REM reahl unit
+            reahl setup -- develop -N --uninstall
+            cd %REAHL_TMP%
+        ) else (
+            echo ---Example [%%i] is in a file: !EXAMPLE_DIR_OR_FILE!
+            REM nosetests !EXAMPLE_DIR_OR_FILE!
+        )
+    )
+)
+ENDLOCAL
+cd %ORIGINAL_DIR%
+rmdir /S /Q %REAHL_TMP%
+
+
+REM do
+    REM result="E"
+    REM out=$(cd /tmp; reahl example -f $i | awk '/Checking out to/ {print $4}')
+    REM if [ -f $out ]
+    REM then
+        REM if nosetests $out
+        REM then
+            REM result="."
+        REM fi
+    REM else
+        REM cd $out
+        REM reahl setup -- develop -N
+        REM if reahl unit
+        REM then
+            REM result="."
+        REM fi
+        REM reahl setup -- develop -N --uninstall
+        REM cd -
+    REM fi
+    REM results["$i"]=$result
+    REM rm -rf $out
+REM done
+
+REM cd /tmp; reahl example -f tutorial.migrationexample
+REM cd /tmp/migrationexample
+REM chmod u+x /tmp/migrationexample/migrationexample_dev/test.sh
+REM if /tmp/migrationexample/migrationexample_dev/test.sh
+REM then
+    REM results["migrationexample (actual migrating)"]="."
+REM else
+    REM results["migrationexample (actual migrating)"]="E"
+REM fi
+REM cd -
+REM rm -rf /tmp/migrationexample
+
+REM for x in "${!results[@]}"
+REM do
+    REM echo ${results["$x"]} $x
+REM done


run.cmd nie je v repo.

run.cmd nie je v repo.


remove unused lib

remove unused lib

--- Dependencies/build_dep.bat
+++ Dependencies/build_dep.bat
@@ -17,10 +17,6 @@

 vcpkg install sdl2:x64-windows-static

-vcpkg install gtest:x64-windows-static
-
-vcpkg install glm:x64-windows-static
-
 cd..

 xcopy vcpkg\installed\x64-windows-static\lib lib\Release\ /s /e /Y


added script for generating 32bit import lib for VS

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

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


Deletes source browsing files.

Deletes source browsing files.

--- delbin.bat
+++ delbin.bat
@@ -10,4 +10,5 @@
 del /S /Q *.plg
 del /S /Q *.ilk
 del /S /Q *.pdb
+del /S /Q *.sbr
 del /S /Q *.idb


Deploy - Open webstore editing page.

Deploy - Open webstore editing page.

Also a comment describing its purpose.

--- deploy.bat
+++ deploy.bat
@@ -1,9 +1,19 @@
+::This is a near full-circle deployment script for PSDLE.
+::It does two major things:
+:: - ./chrome/7-zip.bat - Zip up the PSDLE chrome extension properly for the webstore (and then opens the webstore for uploading).
+:: - ./deploy-sync.bat  - Copy psdle.js, psdle.user.js, and psdle.min.js to the gh-pages branch for everything else.
+::Generally, only actual developers will find this useful. The 7-zip.bat is universally functional though.
+::Currently the min file is generated manually with Notepad++'s JSTool plugin which has JSMin built in. This may change in the future.
+::deploy-sync expects git available in PATH and ready to go.
+
 @echo off

 ::Move into chrome directory, zip it, then return here.
 cd chrome && call "7-zip.bat" && cd ..
+::Open the chrome extension editing page on webstore.
+explorer "https://chrome.google.com/webstore/developer/edit/jdjhhapoddhnimgdemnpbfagndcnmhii"

-::Merge psdle.js, psdle.user.js, and psdle.min.js to gh-pages.
+::Checkout psdle.js, psdle.user.js, and psdle.min.js to gh-pages.
 call "deploy-sync.bat"

 pause


Update deployment script

Update deployment script

--- deploy.cmd
+++ deploy.cmd
@@ -18,13 +18,6 @@
 :: Setup
 :: -----
 :: Setup npm global path to d:\home
-IF NOT EXIST "%HOME%\tools" (
-  MD "%HOME%\tools"
-)
-
-SET PATH=%PATH%;%HOME%\tools
-
-npm config set prefix "%HOME%\tools"

 echo Print variables
 echo dp0=%~dp0%
@@ -70,6 +63,13 @@

   IF NOT EXIST "%PREVIOUS_CLIENT_MANIFEST_PATH%" (MKDIR "%PREVIOUS_CLIENT_MANIFEST_PATH%")
 )
+
+IF NOT EXIST "%HOME%\tools" (MKDIR "%HOME%\tools")
+
+SET PATH=%PATH%;%HOME%\tools
+
+call npm config set prefix "%HOME%\tools"
+IF !ERRORLEVEL! NEQ 0 goto error

 IF NOT DEFINED KUDU_SYNC_CMD (
   :: Install kudu sync


Fixed deploy bug because of filtered packages.config

--- deploy.cmd
+++ deploy.cmd
@@ -73,7 +73,9 @@
 :: Default list by KuduSync (deploy related files)
 SET IGNORE_DEPLOY_FILES=.git;.hg;.deployment;deploy.cmd
 :: Extended list, with our specific content that must not be copied into wwwroot
-SET IGNORE_LIST=%IGNORE_DEPLOY_FILES%;.gitignore;packages.config
+:: note 1: packages.config is needed or will not load required binaries
+:: note 2: TODO to exclude Tests folder on production/live
+SET IGNORE_LIST=%IGNORE_DEPLOY_FILES%;.gitignore

 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 :: Custom steps


Revert "Revert "put quote around MSBUILD_PATH to avoid space issue""

This reverts commit 4f0434c8a5c89910cf6ba08ccf61b55ba3255c94.

--- deploy.cmd
+++ deploy.cmd
@@ -70,9 +70,9 @@

 :: 1. Build to the temporary path
 IF /I "%IN_PLACE_DEPLOYMENT%" NEQ "1" (
-  %MSBUILD_PATH% "%DEPLOYMENT_SOURCE%\JabbR\JabbR.csproj" /nologo /verbosity:m /t:Build /t:pipelinePreDeployCopyAllFilesToOneFolder /p:_PackageTempDir="%DEPLOYMENT_TEMP%";AutoParameterizationWebConfigConnectionStrings=false;Configuration=Release /p:SolutionDir="%DEPLOYMENT_SOURCE%\.\\" %SCM_BUILD_ARGS%
+  "%MSBUILD_PATH%" "%DEPLOYMENT_SOURCE%\JabbR\JabbR.csproj" /nologo /verbosity:m /t:Build /t:pipelinePreDeployCopyAllFilesToOneFolder /p:_PackageTempDir="%DEPLOYMENT_TEMP%";AutoParameterizationWebConfigConnectionStrings=false;Configuration=Release /p:SolutionDir="%DEPLOYMENT_SOURCE%\.\\" %SCM_BUILD_ARGS%
 ) ELSE (
-  %MSBUILD_PATH% "%DEPLOYMENT_SOURCE%\JabbR\JabbR.csproj" /nologo /verbosity:m /t:Build /p:AutoParameterizationWebConfigConnectionStrings=false;Configuration=Release /p:SolutionDir="%DEPLOYMENT_SOURCE%\.\\" %SCM_BUILD_ARGS%
+  "%MSBUILD_PATH%" "%DEPLOYMENT_SOURCE%\JabbR\JabbR.csproj" /nologo /verbosity:m /t:Build /p:AutoParameterizationWebConfigConnectionStrings=false;Configuration=Release /p:SolutionDir="%DEPLOYMENT_SOURCE%\.\\" %SCM_BUILD_ARGS%
 )

 IF !ERRORLEVEL! NEQ 0 goto error


I have no idea what I'm doing

I have no idea what I'm doing

--- deploy.cmd
+++ deploy.cmd
@@ -1,5 +1,5 @@
 @echo Deploy the web api
-deploy.api.cmd
+CALL deploy.api.cmd

 @echo Deploy the webjob
-deploy.webjob.cmd
+CALL deploy.webjob.cmd


Adds conf directory in classpath to get rid of logback complaints

--- packaging/standalone/src/main/distribution/shell-scripts/bin/Neo4j.bat
+++ packaging/standalone/src/main/distribution/shell-scripts/bin/Neo4j.bat
@@ -20,7 +20,7 @@
 set serviceName=Neo4j-Server
 set serviceDisplayName=Neo4j-Server
 set serviceStartType=auto
-set classpath="-DserverClasspath=lib/*.jar;system/lib/*.jar;plugins/*.jar;system/coordinator/lib/*.jar"
+set classpath="-DserverClasspath=lib/*.jar;system/lib/*.jar;plugins/*.jar;system/coordinator/lib/*.jar;./conf*"
 set mainclass="-DserverMainClass=org.neo4j.server.Bootstrapper"
 set configFile="conf\neo4j-wrapper.conf"


Set ExecutionPolicy to Bypass

Set ExecutionPolicy to Bypass

--- bin/create-eclipse-shortcuts.cmd
+++ bin/create-eclipse-shortcuts.cmd
@@ -1,3 +1,3 @@
 @echo off

-powershell create-eclipse-shortcuts.ps1
+powershell -ExecutionPolicy Bypass create-eclipse-shortcuts.ps1


Fix ren command in build script

Fix ren command in build script

Second parameter is the file name - the path can't be changed.

--- build/buildNuget.XSerializer.bat
+++ build/buildNuget.XSerializer.bat
@@ -1,7 +1,7 @@
 msbuild /p:Configuration=Build ..\XSerializer\XSerializer.csproj

 ildasm ..\XSerializer\bin\Build\XSerializer.dll /out:..\XSerializer\bin\Build\XSerializer.il
-ren ..\XSerializer\bin\Build\XSerializer.dll ..\XSerializer\bin\Build\XSerializer.dll.orig
+ren ..\XSerializer\bin\Build\XSerializer.dll XSerializer.dll.orig
 ilasm ..\XSerializer\bin\Build\XSerializer.il /res:..\XSerializer\bin\Build\XSerializer.res /dll /key=..\XSerializer\XSerializer.snk

 nuget pack ..\XSerializer\XSerializer.csproj -Properties Configuration=Build


add batch script

add batch script

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

--- script/process_check_windows.bat
+++ script/process_check_windows.bat
@@ -0,0 +1,21 @@
+@echo off
+
+setlocal enabledelayedexpansion
+
+for %%f in (%*) do (
+	tasklist | findstr "^%%~nxf" >NUL 2>&1
+
+	if !ERRORLEVEL! NEQ 0 (
+		rem "start %%f" is interpreted %%f is title.
+		start "" %%f
+
+		rem start command success status is 1
+		if !ERRORLEVEL! EQU 1 (
+			echo %%~nxf is started ^(%%f^)
+		)
+	) else (
+		echo %%~nxf is already running ^(%%f^)
+	)
+)
+
+endlocal


Added support for checking JAVA_HOME as well as registry to find java.exe

--- packaging/standalone/src/main/distribution/shell-scripts/bin/base.bat
+++ packaging/standalone/src/main/distribution/shell-scripts/bin/base.bat
@@ -17,7 +17,6 @@
 rem You should have received a copy of the GNU General Public License
 rem along with this program.  If not, see <http://www.gnu.org/licenses/>.

-cls
 setlocal ENABLEEXTENSIONS

 call:main %1
@@ -59,28 +58,49 @@

 rem
 rem function findJavaHome
+rem Tries to find java.exe using JAVA_HOME
+rem or using registry keys.
 rem

 :findJavaHome
+if not "%JAVA_HOME%" == "" (
+
+  set javaPath=%JAVA_HOME%
+  if exist "%javaPath%\bin\javac.exe" (
+    set javaPath=%javaPath%\jre
+  )
+
+  if exist "%javaPath%\bin\client\java.exe" (
+    set javaPath= %javaPath%\bin\client\java.exe
+
+    goto:eof
+  )
+
+  if exist "%javaPath%\bin\server\java.exe" (
+    set javaPath= %javaPath%\bin\server\java.exe
+    goto:eof
+  )
+)
+
+rem Attempt finding JVM via registry
 set keyName=HKLM\SOFTWARE\JavaSoft\Java Runtime Environment
 set valueName=CurrentVersion

 FOR /F "usebackq skip=2 tokens=3" %%a IN (`REG QUERY "%keyName%" /v %valueName% 2^>nul`) DO (
-	set javaVersion=%%a
+  set javaVersion=%%a
 )

 if "%javaVersion%" == "" (
-    set javaHomeError=Unable to locate jvm. Could not find %keyName%/%valueName% entry in windows registry.
-	goto:eof
+  set javaHomeError=Unable to locate jvm. Could not find %keyName%/%valueName% entry in windows registry, and could not find it via JAVA_HOME.
+  goto:eof
 )

 set javaCurrentKey=HKLM\SOFTWARE\JavaSoft\Java Runtime Environment\%javaVersion%
 set javaHomeKey=JavaHome

 FOR /F "usebackq skip=2 tokens=3,4" %%a IN (`REG QUERY "%javaCurrentKey%" /v %javaHomeKey% 2^>nul`) DO (
-    set javaPath=%%a %%b
-)
-
+  set javaPath=%%a %%b
+)
 goto:eof

 rem end function findJavaHome


3a_build_boost.bat

3a_build_boost.bat

3a_build_boost.bat

error: pathspec 'easywinbuilder/3a_build_boost.bat' did not match any file(s) known to git

--- easywinbuilder/3a_build_boost.bat
+++ easywinbuilder/3a_build_boost.bat
@@ -0,0 +1,22 @@
+@call set_vars.bat
+@echo Building boost...
+@cd ..\%EWBLIBS%\%BOOST%
+
+@echo bootstrap...
+call bootstrap.bat mingw
+@echo.
+@echo.
+@echo building...
+b2.exe --build-type=minimal --with-chrono --with-filesystem --with-program_options --with-system --with-thread^
+ --layout=versioned -sNO_BZIP2=1 -sNO_ZLIB=1^
+ variant=release^
+ toolset=gcc^
+ link=static^
+ threading=multi^
+ target-os=windows^
+ threadapi=win32^
+ cxxflags="%ADDITIONALCCFLAGS%"^
+ cflags="%ADDITIONALCCFLAGS%"^
+ stage
+@cd ..\..\easywinbuilder
+@if not "%RUNALL%"=="1" pause


A minor modification of setEnv.cmd

A minor modification of setEnv.cmd

--- tools/setEnv.cmd
+++ tools/setEnv.cmd
@@ -1,7 +1,10 @@
 @ECHO OFF
-
+pushd %~dp0
+
 where dotnet >NUL 2>NUL
 IF %ERRORLEVEL% NEQ 0 powershell.exe -File InstallCoreSDK.ps1

 ECHO %PATH% | findstr /I /C:"C:\Program Files\dotnet" >NUL 2>NUL
-IF %ERRORLEVEL% NEQ 0 SET PATH=%PATH%;C:\Program Files\dotnet\+IF %ERRORLEVEL% NEQ 0 SET PATH=%PATH%;C:\Program Files\dotnet\
+
+popd


It builds, not sure if complete

It builds, not sure if complete

--- winbuild.bat
+++ winbuild.bat
@@ -1,11 +1,5 @@
-for /d %%f in (C:\Qt\*) do (set QTDIR=%%f)
-for /d %%f in (%QTDIR%) do (set QTDIR2=%%f)
-IF NOT DEFINED QTDIR2 set QTDIR2=%QTDIR%
-for /d %%f in (%QTDIR2%\5.*) do (set QTBIN=%%f\mingw48_32\bin)
-
-set PATH=%PATH%;%QTBIN%
-set PATH=%PATH%;%QTDIR%\Tools\mingw48_32\bin
-set PATH=%PATH%;C:\Qt\Tools\mingw48_32\bin
+for /d %%f in (C:\Qt\5.*) do (set QTDIR=%%f\msvc2013)
+set PATH=%PATH%;%QTDIR%\bin

 :build
 :: Delete old dist dir; the last thing we need is partial builds
@@ -13,37 +7,27 @@
 mkdir dist
 mkdir dist\KanColleTool

+:: Build everything
+cmake -G "Visual Studio 12 2013" .
+"C:\Program Files (x86)\MSBuild\12.0\Bin\MSBuild.exe" KanColleTool.sln /property:Configuration=Release
+xcopy tool\bin\Release\KanColleTool.exe dist\KanColleTool
+xcopy viewer\bin\Release\KCTViewer.exe dist\KanColleTool
+
 :: Build the tool
-cd tool
-lrelease src\src.pro
-xcopy translations\*.qm ..\dist\KanColleTool
-qmake
-mingw32-make release
-xcopy bin\KanColleTool.exe ..\dist\KanColleTool
-mingw32-make clean
-rmdir /s /q debug
-rmdir /s /q release
-cd ..
-
-:: Build the viewer
-cd viewer
-qmake
-mingw32-make release
-xcopy bin\KCTViewer.exe ..\dist\KanColleTool
-mingw32-make clean
-rmdir /s /q debug
-rmdir /s /q release
-cd ..
+:: -- Disabled for now
+:: cd tool
+:: lrelease src\src.pro
+:: xcopy translations\*.qm ..\dist\KanColleTool

 :package
 :: Copy MinGW32 DLLs that Qt doesn't catch automatically
-xcopy %QTDIR%\mingw48_32\bin\libgcc_s_dw2-1.dll dist\KanColleTool
-xcopy %QTDIR%\mingw48_32\bin\libstdc++-6.dll dist\KanColleTool
-xcopy %QTDIR%\mingw48_32\bin\libwinpthread-1.dll dist\KanColleTool
+:: xcopy %QTDIR%\mingw48_32\bin\libgcc_s_dw2-1.dll dist\KanColleTool
+:: xcopy %QTDIR%\mingw48_32\bin\libstdc++-6.dll dist\KanColleTool
+:: xcopy %QTDIR%\mingw48_32\bin\libwinpthread-1.dll dist\KanColleTool

 :: Let Qt collect DLLs
-windeployqt dist\KanColleTool\KCTViewer.exe
-windeployqt dist\KanColleTool\KanColleTool.exe
+windeployqt.exe dist\KanColleTool\KCTViewer.exe
+windeployqt.exe dist\KanColleTool\KanColleTool.exe

 :: Delete things we don't need at all
 rmdir /s /q dist\KanColleTool\accessible
@@ -64,4 +48,4 @@
 del /q dist\KanColleTool\sqldrivers\qsqlodbc*
 del /q dist\KanColleTool\sqldrivers\qsqlpsql*

-::pause
+pause


FIXUP: Исправлена ошибка в скрипте запуска автотестов на Windows

--- autotests/run.bat
+++ autotests/run.bat
@@ -6,9 +6,9 @@
 setlocal
   call ..\c-plus-plus.conf.bat
   if {%1}=={} (
-    for %%s in (*.sref) do call :RUN_TEST %%s
+    for %%s in (*.sref) do call :RUN_TEST %%s || exit /b 1
   ) else (
-    for %%s in (%*) do call :RUN_TEST %%s
+    for %%s in (%*) do call :RUN_TEST %%s || exit /b 1
   )
 endlocal
 goto :EOF
@@ -16,15 +16,15 @@
 :RUN_TEST
 setlocal
   set SRFLAGS=
-  for %%s in (%~n1) do call :RUN_TEST_AUX%%~xs %1
+  for %%s in (%~n1) do call :RUN_TEST_AUX%%~xs %1 || exit /b 1
   set SRFLAGS=-OP
-  for %%s in (%~n1) do call :RUN_TEST_AUX%%~xs %1
+  for %%s in (%~n1) do call :RUN_TEST_AUX%%~xs %1 || exit /b 1
   set SRFLAGS=-OR
-  for %%s in (%~n1) do call :RUN_TEST_AUX%%~xs %1
+  for %%s in (%~n1) do call :RUN_TEST_AUX%%~xs %1 || exit /b 1
   set SRFLAGS=--gen=direct
-  for %%s in (%~n1) do call :RUN_TEST_AUX%%~xs %1
+  for %%s in (%~n1) do call :RUN_TEST_AUX%%~xs %1 || exit /b 1
   set SRFLAGS=--gen=interp
-  for %%s in (%~n1) do call :RUN_TEST_AUX%%~xs %1
+  for %%s in (%~n1) do call :RUN_TEST_AUX%%~xs %1 || exit /b 1
 endlocal
 goto :EOF


Create bld.bat

Create bld.bat

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

--- zlib/bld.bat
+++ zlib/bld.bat
@@ -0,0 +1,17 @@
+mkdir build
+cd build
+
+REM Configure step
+cmake -G "%CMAKE_GENERATOR%" -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH=%LIBRARY_PREFIX% -DCMAKE_INSTALL_PREFIX:PATH=%LIBRARY_PREFIX% %SRC_DIR%
+if errorlevel 1 exit 1
+
+REM Build step
+devenv %PKG_NAME%.sln /Build "%RELEASE_TARGET%"
+if errorlevel 1 exit 1
+
+REM Install step
+devenv %PKG_NAME%.sln /Build "%RELEASE_TARGET%" /Project INSTALL
+if errorlevel 1 exit 1
+
+REM Some OSS libraries are happier if z.lib exists, even though it's not typical on Windows
+copy %LIBRARY_LIB%\zlibstatic.lib %LIBRARY_LIB%\z.lib


x64 cmd

x64 cmd

--- qemu-raspberry-pi/raspbian-qemu-x64/run.cmd
+++ qemu-raspberry-pi/raspbian-qemu-x64/run.cmd
@@ -1,4 +1,5 @@
 PUSHD %~dp0
+echo Copyright (c) 2014 SBTM Lab.
 if exist *.img(

 for %%a in (*.img) do (


Pass kernel cmdline using new stdin option in current qemu launch script.

git-svn-id: 38cedb3a26441909d4c4a02637a61d2c70533dbc@16632 55e972cd-5a19-0410-ae62-a4d7a52db4cd

--- build/win32/files/run.bat
+++ build/win32/files/run.bat
@@ -13,4 +13,4 @@
 SET DEVICE="Local Area Connection"
 SET RAMSZ=32

-qemu.exe -name " Tor VM " -L . -kernel vmlinuz -append "quiet loglevel=1" -hda hdd.img -m %RAMSZ% -std-vga -net nic,model=pcnet,macaddr=%MAC% -net pcap,devicename=%DEVICE%
+echo quiet loglevel=1 | qemu.exe -name " Tor VM " -L . -kernel vmlinuz -appendstdin -hda hdd.img -m %RAMSZ% -std-vga -net nic,model=pcnet,macaddr=%MAC% -net pcap,devicename=%DEVICE%


Fix typo issues of template file paths in profileSetup.bat #7431

--- modules/distribution/product/src/main/startup-scripts/profileSetup.bat
+++ modules/distribution/product/src/main/startup-scripts/profileSetup.bat
@@ -17,21 +17,21 @@
 set userLocation=%cd%
 set pathToApiManagerXML=..\repository\conf\api-manager.xml
 set pathToAxis2XML=..\repository\conf\axis2\axis2.xml
-set pathToAxis2XMLTemplate=..\repository\resources\conf\template\repository\conf\axis2\axis2.xml.j2
-set pathToRegistry=..\repository\resources\conf\template\repository\conf\registry.xml.j2
-set pathToRegistryTemplate=..\repository\conf\registry.xml
+set pathToAxis2XMLTemplate=..\repository\resources\conf\templates\repository\conf\axis2\axis2.xml.j2
+set pathToRegistryTemplate=..\repository\resources\conf\templates\repository\conf\registry.xml.j2
+set pathToRegistry=..\repository\conf\registry.xml
 set pathToInboundEndpoints=..\repository\deployment\server\synapse-configs\default\inbound-endpoints
 set pathToWebapps=..\repository\deployment\server\webapps
 set pathToJaggeryapps=..\repository\deployment\server\jaggeryapps
 set pathToSynapseConfigs=..\repository\deployment\server\synapse-configs\default
 set pathToAxis2TMXml=..\repository\conf\axis2\axis2_TM.xml
-set pathToAxis2TMXmlTemplate=..\repository\resources\conf\template\repository\conf\axis2\axis2_TM.xml.j2
+set pathToAxis2TMXmlTemplate=..\repository\resources\conf\templates\repository\conf\axis2\axis2_TM.xml.j2
 set pathToRegistryTM=..\repository\conf\registry_TM.xml
-set pathToRegistryTMTemplate=..\repository\resources\conf\template\repository\conf\registry_TM.xml.j2
+set pathToRegistryTMTemplate=..\repository\resources\conf\templates\repository\conf\registry_TM.xml.j2
 set axis2XMLBackup=axis2backup.xml
-set axis2XMLBackupTemplate=axis2.backup
+set axis2XMLBackupTemplate=axis2.xml.j2.backup
 set registryBackup=registryBackup.xml
-set registryBackupTemplate=registry.backup
+set registryBackupTemplate=registry.xml.j2.backup
 set axis2XML=axis2.xml
 set axis2XMLTemplate=axis2.xml.j2
 set registryXML=registry.xml
@@ -340,7 +340,7 @@
 	if exist %pathToAxis2TMXmlTemplate% (
 		ren %pathToAxis2XMLTemplate% %axis2XMLBackupTemplate%
 		call :Timestamp value
-		echo %value% INFO - Rename the existing %pathToAxis2XML% file as %axis2XMLBackupTemplate%
+		echo %value% INFO - Rename the existing %pathToAxis2XMLTemplate% file as %axis2XMLBackupTemplate%
 		ren %pathToAxis2TMXmlTemplate% %pathToAxis2XMLTemplate%
 		call :Timestamp value
 		echo %value% INFO - Rename the existing %pathToAxis2TMXmlTemplate% file as %axis2XMLTemplate%


Updated to latest DSSL version

Updated to latest DSSL version


windows: run node-gyp.js instead of opening it

PR-URL: https://github.com/npm/npm/pull/8324

--- bin/node-gyp-bin/node-gyp.cmd
+++ bin/node-gyp-bin/node-gyp.cmd
@@ -1,5 +1,5 @@
 if not defined npm_config_node_gyp (
   node "%~dp0\..\..\node_modules\node-gyp\bin\node-gyp.js" %*
 ) else (
-  %npm_config_node_gyp% %*
+  node %npm_config_node_gyp% %*
 )


Lean on system path for python.

Lean on system path for python.

--- 3rdParty/v8-build.bat
+++ 3rdParty/v8-build.bat
@@ -42,7 +42,7 @@

 cd V8-%V8_VERSION%

-third_party\python_26\python build\gyp_v8 %CMD%
+python build\gyp_v8 %CMD%

 cd build


Fixed sublime text build system so it abort on building errors.

--- DemoAndroid/build.bat
+++ DemoAndroid/build.bat
@@ -2,15 +2,8 @@
 @echo off

 call update_assets.bat
-call ndk-build

-call ant debug
-REM call ant release
+set INSTALL=adb install -r bin/TinkerbellDemo-debug.apk
+set RUN=adb shell am start -n com.demo.tinkerbell/.TinkerbellActivity

-call adb install -r bin/TinkerbellDemo-debug.apk
-call adb shell am start -n com.demo.tinkerbell/.TinkerbellActivity
-
-echo "Success!"
-goto :eof
-:error
-echo "Failed!"
+ndk-build && ant debug && %INSTALL% && %RUN%


Update tmp/bower_components/ace-builds/demo/kitchen-sink/docs/batchfile.bat

Signed-off-by: Bernard Ojengwa <fccb4cc00c1ba7e51bf5c2b5f77130b9fe8d917e@gmail.com>

--- tmp/bower_components/ace-builds/demo/kitchen-sink/docs/batchfile.bat
+++ tmp/bower_components/ace-builds/demo/kitchen-sink/docs/batchfile.bat
@@ -1,15 +0,0 @@
-:: batch file highlighting in Ace!
-@echo off
-
-CALL set var1=%cd%
-echo unhide everything in %var1%!
-
-:: FOR loop in bat is super strange!
-FOR /f "tokens=*" %%G IN ('dir /A:D /b') DO (
-echo %var1%%%G
-attrib -r -a -h -s "%var1%%%G" /D /S
-)
-
-pause
-
-REM that's all


Update extensions/ringthreads/buildvc.bat

--- extensions/ringthreads/buildvc.bat
+++ extensions/ringthreads/buildvc.bat
@@ -1,5 +1,5 @@
 cls
 call ../../language/src/locatevc.bat
-cl /c /DEBUG ring_threads.c -I"..\..\language\include"
+cl /nologo /W2 /O2 /c /DEBUG ring_threads.c -I"..\..\language\include"
 link /DEBUG ring_threads.obj  ..\..\lib\ring.lib /DLL /OUT:..\..\bin\ring_threads.dll /SUBSYSTEM:CONSOLE,"5.01"
 del ring_threads.obj


commit on 02/02/2019 at 17:21:24

commit on 02/02/2019 at 17:21:24

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

--- windows-cmd/startClusteredRVESimPipeEEIGM.cmd
+++ windows-cmd/startClusteredRVESimPipeEEIGM.cmd
@@ -0,0 +1 @@
+cd D:/01*/07*/03*/Curved* && abaqus CAE noGUI=D:/01_Luca/06_WD/thinPlyMechanics/python/createAndAnalyzeClusteredRVEs.py -- -dir D:/OneDrive/01_Luca/07_DocMASE/07_Data/03_FEM/InputData/ClUDvk -data inputRVEdataClUDvkL%1COARED.deck -iterables inputRVEiterablesClUDvkL%1COARED.deck -plot inputRVEplot && python D:/01_Luca/06_WD/thinPlyMechanics/python/reportData.py -w D:/OneDrive/01_Luca/07_DocMASE/07_Data/03_FEM/LucaPC/sweepOverDeltathetaClUDvkL%1COARED -i ABQ-RVE-generation-and-analysis_csvfileslist.csv -f sweepClUDvkL%1COARED.xlsx --excel


Adjusting publish script for VS 2019

Adjusting publish script for VS 2019

--- Setup/Publish.cmd
+++ Setup/Publish.cmd
@@ -6,9 +6,8 @@
 SET  FILES_EXECUTABLE="..\Binaries\WrtSettings.exe"
 SET       FILES_OTHER="..\Binaries\ReadMe.txt" "..\Binaries\License.txt"

+SET   COMPILE_TOOL_16="%PROGRAMFILES(X86)%\Microsoft Visual Studio\2019\Community\Common7\IDE\devenv.exe"
 SET   COMPILE_TOOL_15="%PROGRAMFILES(X86)%\Microsoft Visual Studio\2017\Community\Common7\IDE\devenv.exe"
-SET   COMPILE_TOOL_14="%PROGRAMFILES(X86)%\Microsoft Visual Studio 14.0\Common7\IDE\devenv.exe"
-SET  COMPILE_TOOL_14E="%PROGRAMFILES(X86)%\Microsoft Visual Studio 14.0\Common7\IDE\WDExpress.exe"

 SET        SETUP_TOOL="%PROGRAMFILES(x86)%\Inno Setup 5\iscc.exe"

@@ -26,21 +25,16 @@
 ECHO --- DISCOVER TOOLS
 ECHO.

-IF EXIST %COMPILE_TOOL_15% (
-    ECHO Visual Studio 2017
-    SET COMPILE_TOOL=%COMPILE_TOOL_15%
-) ELSE (
-    IF EXIST %COMPILE_TOOL_14% (
-        ECHO Visual Studio 2015
-        SET COMPILE_TOOL=%COMPILE_TOOL_14%
-    ) ELSE (
-        IF EXIST %COMPILE_TOOL_14E% (
-            ECHO Visual Studio Express 2015
-            SET COMPILE_TOOL=%COMPILE_TOOL_14E%
-        ) ELSE (
-            ECHO Cannot find Visual Studio^^!
-            PAUSE && EXIT /B 255
-        )
+IF EXIST %COMPILE_TOOL_16% (
+    ECHO Visual Studio 2019
+    SET COMPILE_TOOL=%COMPILE_TOOL_16%
+) ELSE (
+    IF EXIST %COMPILE_TOOL_15% (
+        ECHO Visual Studio 2017
+        SET COMPILE_TOOL=%COMPILE_TOOL_15%
+    ) ELSE (
+		ECHO Cannot find Visual Studio^^!
+		PAUSE && EXIT /B 255
     )
 )


adding erloci to conflicting deps

adding erloci to conflicting deps

--- rbc.cmd
+++ rbc.cmd
@@ -41,7 +41,7 @@
 call rebar compile

 :deps
-echo rebar compile skip deps=dderloci,erlscrypt
-call rebar compile skip_deps=dderloci,erlscrypt
+echo rebar compile skip deps=erloci,dderloci,erlscrypt
+call rebar compile skip_deps=erloci,dderloci,erlscrypt

 :end


Add script to start bot on Windows

Add script to start bot on Windows

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

--- run.bat
+++ run.bat
@@ -0,0 +1,12 @@
+@echo off
+
+REM StarBot run script for Windows.
+
+REM Get latest version and star bot.
+echo Updating...
+git pull
+echo Starting bot...
+python main.py
+
+REM Loop back again.
+goto start


Use gradlew.bat on Windows

Use gradlew.bat on Windows

--- run.bat
+++ run.bat
@@ -1 +1 @@
-gradlew && java -jar build\libs\sokoban-kt.jar
+gradlew.bat && java -jar build\libs\sokoban-kt.jar


Changed from absolute path

Changed from absolute path

--- gen/gen.bat
+++ gen/gen.bat
@@ -5,9 +5,9 @@
 rd /q /s love-api
 git clone https://github.com/rm-code/love-api

-"C:\Program Files\LOVE\0.10.0\love" . >out.txt
+love . >out.txt

 if not exist ..\syntax mkdir ..\syntax
 move out.txt ..\syntax\lua.vim

-rd /q /s love-api+rd /q /s love-api


adapted push script

adapted push script

--- Push.bat
+++ Push.bat
@@ -1,3 +1,3 @@
-git push origin master:master
-git push github master:master
+git push origin v1.6:v1.6
+git push github v1.6:v1.6
 pause


Upgrade from linking with PCRE v5.0 to PCRE v7.6, due to security vulnerabilities found in PCRE v5.0.

--- NTconfig/set_vars.bat
+++ NTconfig/set_vars.bat
@@ -31,7 +31,7 @@
 set EXT_POSTGRESQL_VERSION=postgresql-8.0.2
 set EXT_KERBEROS_VERSION=krb5-1.4.3
 set EXT_GLOBUS_VERSION=
-set EXT_PCRE_VERSION=pcre-5.0
+set EXT_PCRE_VERSION=pcre-7.6
 set EXT_DRMAA_VERSION=drmaa-1.5.1

 REM Now tell the build system what externals we need built.


[wdk] ddk_build improvements

[wdk] ddk_build improvements

* easier to spot comments
* simplify errors through the use of a %PWD%
* used a BUILD_CMD variable with updated options

--- msvc/ddk_build.cmd
+++ msvc/ddk_build.cmd
@@ -1,18 +1,20 @@
-@rem default builds static library.
-@rem you can pass the following arguments (case insensitive):
-@rem - "DLL" to build a DLL instead of a static library
-@rem - "/MT" to build a static library compatible with MSVC's /MT option (LIBCMT vs MSVCRT)
 @echo off
+::# default builds static library.
+::# you can pass the following arguments (case insensitive):
+::# - "DLL" to build a DLL instead of a static library
+::# - "/MT" to build a static library compatible with MSVC's /MT option (LIBCMT vs MSVCRT)

 if Test%BUILD_ALT_DIR%==Test goto usage

-rem process commandline parameters
+::# process commandline parameters
 set TARGET=LIBRARY
 set STATIC_LIBC=
 set version=1.0
+set PWD=%~dp0
+set BUILD_CMD=build -bcwgZ -M2

 if "%1" == "" goto no_more_args
-rem /I for case insensitive
+::# /I for case insensitive
 if /I Test%1==TestDLL set TARGET=DYNLINK
 if /I Test%1==Test/MT set STATIC_LIBC=1
 :no_more_args
@@ -22,7 +24,7 @@
 copy target+..\..\msvc\libusb_sources sources >NUL 2>&1
 del target
 @echo on
-build -cwgZ
+%BUILD_CMD%
 @echo off
 if errorlevel 1 goto builderror
 cd ..\..
@@ -73,9 +75,9 @@
 cd examples\lsusb_ddkbuild
 copy ..\..\msvc\lsusb_sources sources >NUL 2>&1
 @echo on
-build -cwgZ
+%BUILD_CMD%
 @echo off
-if errorlevel 1 goto buildlsusberror
+if errorlevel 1 goto builderror
 cd ..\..

 set srcPath=examples\lsusb_ddkbuild\obj%BUILD_ALT_DIR%\%cpudir%
@@ -93,9 +95,9 @@
 cd examples\xusb_ddkbuild
 copy ..\..\msvc\xusb_sources sources >NUL 2>&1
 @echo on
-build -cwgZ
+%BUILD_CMD%
 @echo off
-if errorlevel 1 goto buildxusberror
+if errorlevel 1 goto builderror
 cd ..\..

 set srcPath=examples\xusb_ddkbuild\obj%BUILD_ALT_DIR%\%cpudir%
@@ -109,25 +111,13 @@
 cd msvc
 goto done

-
-:builderror
-cd ..\..\msvc
-echo Build failed
-goto done
-
-:buildlsusberror
-cd ..\..\msvc
-echo lsusb build failed
-goto done
-
-:buildxusberror
-cd ..\..\msvc
-echo xusb build failed
-goto done
-
 :usage
 echo ddk_build must be run in a WDK build environment
 pause
 goto done

-:done+:builderror
+echo Build failed
+
+:done
+cd %PWD%


added maven export script

added maven export script

error: pathspec 'mvn/mvn-export.bat' did not match any file(s) known to git

--- mvn/mvn-export.bat
+++ mvn/mvn-export.bat
@@ -0,0 +1,9 @@
+@echo off
+set path=%path%;..\..\..\..\tools\apache-maven-3.1.1\bin
+mvn deploy:deploy-file^
+ -DgroupId=com.mashape.unirest^
+ -DartifactId=unirest-android^
+ -Dversion=1.0.1^
+ -Dpackaging=aar^
+ -Dfile=..\unirest-android\build\libs\unirest-android.aar^
+ -Durl=file:..\..\unirest-android-mvn-repo\


Fixed path

Fixed path

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


Auto Sync

Auto Sync

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

--- script.bat
+++ script.bat
@@ -0,0 +1,5 @@
+git status
+git add *
+git commit -m "Auto Sync"
+git push
+git status


forgot to update the showhelp function

forgot to update the showhelp function

--- updater.bat
+++ updater.bat
@@ -244,15 +244,15 @@
 ECHO:     new user-overrides.js. When there are conflicting records for the same
 ECHO:     pref, the value of the last one declared will be used. Visit the wiki
 ECHO:     for usage examples and more detailed information.
-CALL :message "  -multiBackups"
-ECHO:     Don't overwrite previous backups. New backups are still created only
-ECHO:     when the updated user.js is different from the previous one.
 CALL :message "  -multiOverrides"
 ECHO:     Use any and all .js files in a user.js-overrides sub-folder as overrides
 ECHO:     instead of the default user-overrides.js file. Files are appended in
 ECHO:     alphabetical order.
 CALL :message "  -unattended"
 ECHO:     Run without user input.
+CALL :message "  -singleBackup"
+ECHO:     Use a single backup file and overwrite it on new updates, instead of
+ECHO:     cumulative backups. This was the default behaviour before v4.3.
 CALL :message "  -updatebatch"
 ECHO:     Update the script itself on execution, before the normal routine.
 CALL :message ""


Update bld.bat

Update bld.bat

--- conda/python-scons/bld.bat
+++ conda/python-scons/bld.bat
@@ -4,6 +4,9 @@
   2to3 --output-dir=engine/SCons3 -W -n engine/SCons
   rmdir engine/SCons /s /q
   move engine/SCons3 engine/SCons
+  2to3 -w -n scripts/scons
+  2to3 -w -n scripts/sconsign
+  2to3 -w -n scripts/scons-time
   powershell -Command "Get-Content ".\setup.py" | select -First 49"
   powershell -Command "Get-Content ".\setup.py" | select -First 49" > setup.back
   more +54 setup.py > setup.back


Correct site_scons path for windows

Correct site_scons path for windows

--- conda/python-scons/bld.bat
+++ conda/python-scons/bld.bat
@@ -11,8 +11,8 @@
 type NUL > %PREFIX%\etc\conda\deactivate.d\scons_vars.bat
 if errorlevel 1 exit 1

-echo set "CONDA_PREFIX=%CONDA_PREFIX:/=\%" > %PREFIX%\etc\conda\activate.d\scons_vars.bat
-echo set SCONSFLAGS="--site-dir=%CONDA_PREFIX%\share\site_scons" > %PREFIX%\etc\conda\activate.d\scons_vars.bat
+echo set "REAL_CONDA_PREFIX=%CONDA_PREFIX:/=\%" > %PREFIX%\etc\conda\activate.d\scons_vars.bat
+echo set SCONSFLAGS="--site-dir=%REAL_CONDA_PREFIX%\share\site_scons" > %PREFIX%\etc\conda\activate.d\scons_vars.bat
 if errorlevel 1 exit 1
 echo set SCONSFLAGS= > %PREFIX%\etc\conda\deactivate.d\scons_vars.bat
 if errorlevel 1 exit 1


Altered cudaruntime.dll build for windows to use environment variables

--- native/compileCudaRuntime2.bat
+++ native/compileCudaRuntime2.bat
@@ -1,2 +1,4 @@
-@call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat"
-cl -c /I"C:\Program Files\Java\jdk1.6.0_26\include" /I"C:\Program Files\Java\jdk1.6.0_26\include\win32" /I"C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v4.0\include" CudaRuntime2.c+@echo off
+@call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" amd64
+cl /I"%JAVA_HOME%\include" /I"%JAVA_HOME%\include\win32" /I"%CUDA_INC_PATH%" CudaRuntime2.c FastMemory.c Handles.c Cuda2DeviceMemory.c /link "%CUDA_LIB_PATH%\cuda.lib" /DLL /OUT:cudaruntime.dll /MACHINE:X64
+move /-y .\cudaruntime.* ..\src\edu\syr\pcpratts\rootbeer\runtime2\native\


[windows] ignore existing and copy as directory

--- devtools/conda-recipe/bld.bat
+++ devtools/conda-recipe/bld.bat
@@ -1,3 +1,3 @@
 mkdir "%PREFIX%\share\"
-xcopy msmb_data "%PREFIX%\share\msmb_data" /e
+xcopy msmb_data "%PREFIX%\share\msmb_data" /e /i /y
 if errorlevel 1 exit 1


fix batch changing dir + inconsistencies

--- version.bat
+++ version.bat
@@ -1,10 +1,16 @@
 @echo off
+set OLDDIR=%CD%
 cd /d %~dp0
 for /f "delims=" %%a in ('svnversion') do echo #define GPAC_SVN_REVISION "%%a" > test.h
 if not exist include\gpac\revision.h goto create
 ECHO n|COMP test.h include\gpac\revision.h > nul
 if errorlevel 1 goto create
 DEL test.h
-exit/b
+goto done
+
 :create
 MOVE /Y test.h include\gpac\revision.h
+
+:done
+cd /d %OLDDIR%
+exit/b


add windows gradle script

add windows gradle script

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

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


Create InstallChrome.bat

Create InstallChrome.bat

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

--- InstallChrome.bat
+++ InstallChrome.bat
@@ -0,0 +1,5 @@
+clr
+cd c:
+mkdir tmp
+cd tmp
+wget "https://dl.google.com/windows64/direct/google-chrome-"


New install script for Windows.

New install script for Windows.

--- forge/install/install.cmd
+++ forge/install/install.cmd
@@ -1,26 +1,34 @@
 @echo off
-echo Minecraft Forge Build Script v1.1
+echo Minecraft Forge Install and Build Script v1.2
 echo -Searching for components...
 set MCP=ERROR!
 set HOME=ERROR!
-if /i exist %~dp0\%~nx0 (set MCP=%~dp0..&& set HOME=%~dp0)
-if /i exist %~dp0\forge\%~nx0 (set MCP=%~dp0&& set HOME=%~dp0\forge)
+if /i exist "%~dp0\%~nx0" (set MCP="%~dp0.."&& set HOME="%~dp0")
+if /i exist "%~dp0..\install\%~nx0" (set MCP="%~dp0..\.."&& set HOME="%~dp0..")
+if /i exist "%~dp0\forge\%~nx0" (set MCP="%~dp0" && set HOME="%~dp0\forge")
 if %MCP%==ERROR! (echo -Error: Forge Not Detected! && echo -Please be sure you've installed it properly.)
 if %HOME%==ERROR! (echo -Error: MCP Not Detected! && echo -Please be sure you've installed it - and Forge - properly.)
 echo -MCP detected in %MCP%
 echo -Forge detected in %HOME%
-if /i not exist %MCP%\src\minecraft\net\minecraft\client\minecraft.java (echo -Decompiled source not detected, decompiling minecraft.jar... && pushd %MCP% && echo -NEW SESSION >> compile.log && decompile >> compile.log && popd) else (echo -Decompiled source detected)
+echo -Rectifying Paths...
+set MCP=%MCP:"=%
+set MCP=%MCP:'=%
+set HOME=%HOME:"=%
+set HOME=%HOME:'=%
+if /i not exist "%MCP%\src\minecraft\net\minecraft\client\minecraft.java" (echo -Decompiled source not detected, decompiling minecraft.jar... && pushd %MCP% && echo -NEW SESSION >> compile.log && cmd /c "runtime\bin\python\python_mcp runtime\decompile.py %*" && popd) else (echo -Decompiled source detected)
 pushd %MCP%\src
 echo -Applying forge to the sourcetree...
-xcopy /Y /E /G /Q %HOME%\forge_client\src\net\* %MCP%\src\minecraft\net
-xcopy /Y /E /G /Q %HOME%\forge_common\net\* %MCP%\src\minecraft\net
-echo D | xcopy /Y /E /G /Q %HOME%\forge_common\net\* %MCP%\src\minecraft_server\net
+xcopy /Y /E /G /Q "%HOME%"\forge_client\src\net\* "%MCP%"\src\minecraft\net
+xcopy /Y /E /G /Q "%HOME%"\forge_common\net\* "%MCP%"\src\minecraft\net
+echo D | xcopy /Y /E /G /Q "%HOME%\forge_common\net\*" "%MCP%"\src\minecraft_server\net
 echo -NEW SESSION >> forgepatch.log
-%MCP%\runtime\bin\python\python_mcp %HOME%\lfcr.py %HOME%\minecraft.patch %HOME%\minecraft-win.patch >> forgepatch.log
+"%MCP%\runtime\bin\python\python_mcp" "%HOME%\lfcr.py" "%HOME%\minecraft.patch" "%HOME%\minecraft-win.patch" >> forgepatch.log
 echo -Patching necessary source files for forge...
-%MCP%\runtime\bin\applydiff.exe -uf -p2 < %HOME%\minecraft-win.patch >> forgepatch.log
+"%MCP%\runtime\bin\applydiff.exe" -uf -p2 < "%HOME%\minecraft-win.patch" >> forgepatch.log
 popd
 echo -Forge ready for use, recompiling...
 pushd %MCP%
-cmd /c recompile.bat
+cmd /c "runtime\bin\python\python_mcp runtime\recompile.py %*"
 popd
+echo -Recompilation complete!
+echo.


TempFileCleanup.bat sort user directory cleaning

--- resources/stage_1_tempclean/tempfilecleanup/TempFileCleanup.bat
+++ resources/stage_1_tempclean/tempfilecleanup/TempFileCleanup.bat
@@ -79,43 +79,43 @@
 :: so if we don't find "Microsoft" in the first 9 characters we can safely assume we're not on XP/2k3.
 if /i "%WIN_VER:~0,9%"=="Microsoft" (
 	for /D %%x in ("%SystemDrive%\Documents and Settings\*") do (
-		del /F /S /Q "%%x\Local Settings\Temp\*" 2>NUL
-		del /F /S /Q "%%x\Recent\*" 2>NUL
-		del /F /S /Q "%%x\Local Settings\Temporary Internet Files\*" 2>NUL
-		del /F /S /Q "%%x\Local Settings\Application Data\ApplicationHistory\*" 2>NUL
-		del /F /S /Q "%%x\My Documents\*.tmp" 2>NUL
+		del /F /S /Q "%%x\Application Data\Adobe\Flash Player\*" 2>NUL
+		del /F /S /Q "%%x\Application Data\Macromedia\Flash Player\*" 2>NUL
 		del /F /S /Q "%%x\Application Data\Microsoft\Windows\WER\ReportArchive\*" 2>NUL
 		del /F /S /Q "%%x\Application Data\Microsoft\Windows\WER\ReportQueue\*" 2>NUL
 		del /F /S /Q "%%x\Application Data\Sun\Java\*" 2>NUL
-		del /F /S /Q "%%x\Application Data\Adobe\Flash Player\*" 2>NUL
-		del /F /S /Q "%%x\Application Data\Macromedia\Flash Player\*" 2>NUL
-		del /F /S /Q "%%x\Local Settings\Application Data\Microsoft\Internet Explorer\Recovery\*" 2>NUL
+		del /F /S /Q "%%x\Local Settings\Application Data\ApplicationHistory\*" 2>NUL
 		del /F /S /Q "%%x\Local Settings\Application Data\Google\Chrome\User Data\Default\Cache\*" 2>NUL
+		del /F /S /Q "%%x\Local Settings\Application Data\Google\Chrome\User Data\Default\JumpListIconsOld\*" 2>NUL
 		del /F /S /Q "%%x\Local Settings\Application Data\Google\Chrome\User Data\Default\JumpListIcons\*" 2>NUL
-		del /F /S /Q "%%x\Local Settings\Application Data\Google\Chrome\User Data\Default\JumpListIconsOld\*" 2>NUL
 		del /F /S /Q "%%x\Local Settings\Application Data\Google\Chrome\User Data\Default\Local Storage\*" 2>NUL
 		del /F /S /Q "%%x\Local Settings\Application Data\Google\Chrome\User Data\Default\Media Cache\*" 2>NUL
+		del /F /S /Q "%%x\Local Settings\Application Data\Microsoft\Internet Explorer\Recovery\*" 2>NUL
+		del /F /S /Q "%%x\Local Settings\Temp\*" 2>NUL
+		del /F /S /Q "%%x\Local Settings\Temporary Internet Files\*" 2>NUL
+		del /F /S /Q "%%x\My Documents\*.tmp" 2>NUL
+		del /F /S /Q "%%x\Recent\*" 2>NUL
 	)
 ) else (
 	for /D %%x in ("%SystemDrive%\Users\*") do (
-		del /F /S /Q "%%x\AppData\Local\Temp\*" 2>NUL
-		del /F /S /Q "%%x\AppData\Roaming\Microsoft\Windows\Recent\*" 2>NUL
+		del /F /S /Q "%%x\*.blf" 2>NUL
+		del /F /S /Q "%%x\*.regtrans-ms" 2>NUL
+		del /F /S /Q "%%x\AppData\LocalLow\Sun\Java\*" 2>NUL
+		del /F /S /Q "%%x\AppData\Local\Google\Chrome\User Data\Default\Cache\*" 2>NUL
+		del /F /S /Q "%%x\AppData\Local\Google\Chrome\User Data\Default\JumpListIconsOld\*" 2>NUL
+		del /F /S /Q "%%x\AppData\Local\Google\Chrome\User Data\Default\JumpListIcons\*" 2>NUL
+		del /F /S /Q "%%x\AppData\Local\Google\Chrome\User Data\Default\Local Storage\*" 2>NUL
+		del /F /S /Q "%%x\AppData\Local\Google\Chrome\User Data\Default\Media Cache\*" 2>NUL
+		del /F /S /Q "%%x\AppData\Local\Microsoft\Internet Explorer\Recovery\*" 2>NUL
+		del /F /S /Q "%%x\AppData\Local\Microsoft\Windows\INetCache\*" 2>NUL
 		del /F /S /Q "%%x\AppData\Local\Microsoft\Windows\Temporary Internet Files\*" 2>NUL
-		del /F /S /Q "%%x\AppData\Local\Microsoft\Windows\INetCache\*" 2>NUL
-		del /F /S /Q "%%x\My Documents\*.tmp" 2>NUL
 		del /F /S /Q "%%x\AppData\Local\Microsoft\Windows\WER\ReportArchive\*" 2>NUL
 		del /F /S /Q "%%x\AppData\Local\Microsoft\Windows\WER\ReportQueue\*" 2>NUL
-		del /F /S /Q "%%x\AppData\LocalLow\Sun\Java\*" 2>NUL
+		del /F /S /Q "%%x\AppData\Local\Temp\*" 2>NUL
 		del /F /S /Q "%%x\AppData\Roaming\Adobe\Flash Player\*" 2>NUL
 		del /F /S /Q "%%x\AppData\Roaming\Macromedia\Flash Player\*" 2>NUL
-		del /F /S /Q "%%x\AppData\Local\Microsoft\Internet Explorer\Recovery\*" 2>NUL
-		del /F /S /Q "%%x\AppData\Local\Google\Chrome\User Data\Default\Cache\*" 2>NUL
-		del /F /S /Q "%%x\AppData\Local\Google\Chrome\User Data\Default\JumpListIcons\*" 2>NUL
-		del /F /S /Q "%%x\AppData\Local\Google\Chrome\User Data\Default\JumpListIconsOld\*" 2>NUL
-		del /F /S /Q "%%x\AppData\Local\Google\Chrome\User Data\Default\Local Storage\*" 2>NUL
-		del /F /S /Q "%%x\AppData\Local\Google\Chrome\User Data\Default\Media Cache\*" 2>NUL
-		del /F /S /Q "%%x\*.blf" 2>NUL
-		del /F /S /Q "%%x\*.regtrans-ms" 2>NUL
+		del /F /S /Q "%%x\AppData\Roaming\Microsoft\Windows\Recent\*" 2>NUL
+		del /F /S /Q "%%x\My Documents\*.tmp" 2>NUL
 	)
 )


Fix for ShowBuildMenu with Blanks in Folder Names

Activating a Test Configuration did not work before adding those quotation marks.

--- ShowBuildMenu.bat
+++ ShowBuildMenu.bat
@@ -138,7 +138,7 @@
 del folder.tmp
 mkdir "%CURRENT_CONFIGURATION%" 2> nul
 del /q "%CURRENT_CONFIGURATION%\*"
-copy %FOLDER%\* "%CURRENT_CONFIGURATION%"
+copy "%FOLDER%\*" "%CURRENT_CONFIGURATION%"
 echo Configuration activated.
 goto main-menu


http://issues.apache.org/activemq/browse/AMQ-953

git-svn-id: 7f3df76e74c7ad56904d6048df705810748eb1a6@452108 13f79535-47bb-0310-9956-ffa450edef68

--- assembly/src/release/bin/activemq.bat
+++ assembly/src/release/bin/activemq.bat
@@ -68,7 +68,6 @@

 :checkJava
 set _JAVACMD=%JAVACMD%
-set LOCALCLASSPATH=%CLASSPATH%

 set JAVA_EXT_DIRS=%JAVA_HOME%\lib\ext;%ACTIVEMQ_HOME%;%ACTIVEMQ_HOME%\lib;%ACTIVEMQ_HOME%\lib\optional

@@ -96,16 +95,13 @@
 REM Uncomment to enable remote debugging
 REM SET ACTIVEMQ_DEBUG_OPTS=-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005

-set LOCALCLASSPATH=%ACTIVEMQ_HOME%\conf;%LOCALCLASSPATH%
-
 set ACTIVEMQ_TASK="start"
-"%_JAVACMD%" %SUNJMX% %ACTIVEMQ_DEBUG_OPTS% %ACTIVEMQ_OPTS% -classpath %ACTIVEMQ_CLASSPATH% -Dactivemq.home="%ACTIVEMQ_HOME%" -jar "%ACTIVEMQ_HOME%/bin/run.jar" %ACTIVEMQ_TASK% %ACTIVEMQ_CMD_LINE_ARGS%
+"%_JAVACMD%" %SUNJMX% %ACTIVEMQ_DEBUG_OPTS% %ACTIVEMQ_OPTS% -classpath "%ACTIVEMQ_CLASSPATH%" -Dactivemq.home="%ACTIVEMQ_HOME%" -jar "%ACTIVEMQ_HOME%/bin/run.jar" %ACTIVEMQ_TASK% %ACTIVEMQ_CMD_LINE_ARGS%

 goto end

 :end
-set LOCALCLASSPATH=
 set _JAVACMD=
 set ACTIVEMQ_CMD_LINE_ARGS=


Fixing post build script (#186)

Fixing post build script (#186)

* Post build script was previously updated in release branches and never properly merged back to master
* Removes some unneeded copying and changes to clearer variable names

--- Utilities/VSOBuildScripts/postBuildScript.cmd
+++ Utilities/VSOBuildScripts/postBuildScript.cmd
@@ -15,35 +15,26 @@

 :ready

-echo [start] Copying %TFS_SourcesDirectory% to %TFS_DropLocation%\Source
+set packageDir=%TFS_DropLocation%\Packages
+set packagePath=%packageDir%\XboxLive.unitypackage
+mkdir %packageDir%
+
+set remoteAssetsPath=%TFS_DropLocation%\Source\Assets
+set localAssetsPath=%TFS_SourcesDirectory%\Assets
+
+echo [start] Copying output from other build agents locally from %remoteAssetsPath% to %localAssetsPath%
+robocopy /NJS /NJH /MT:16 /S /NP %remoteAssetsPath% %localAssetsPath%
+echo [done] Copying %remoteAssetsPath% to %localAssetsPath%
+
+echo [start] Copying local sources to build share from %TFS_SourcesDirectory% to %TFS_DropLocation%\Source
 robocopy /NJS /NJH /MT:16 /S /NP %TFS_SourcesDirectory% %TFS_DropLocation%\Source
 echo [done] Copying %TFS_SourcesDirectory% to %TFS_DropLocation%\Source

-echo [start] Binplacing c dlls into Plugins folder
-set PLUGIN_BUILD_SHARE_x86=%TFS_DropLocation%\Release\x86
-set PLUGIN_BUILD_SHARE_x64=%TFS_DropLocation%\Release\x64
-set PLUGIN_BIN_SHARE_x86=%TFS_DropLocation%\Source\Assets\Plugins\x86
-set PLUGIN_BIN_SHARE_x64=%TFS_DropLocation%\Source\Assets\Plugins\x64
-copy %PLUGIN_BUILD_SHARE_x86%\Microsoft.Xbox.Services.140.UWP.C.dll %PLUGIN_BIN_SHARE_x86%\Microsoft.Xbox.Services.140.UWP.C.dll
-copy %PLUGIN_BUILD_SHARE_x64%\Microsoft.Xbox.Services.140.UWP.C.dll %PLUGIN_BIN_SHARE_x64%\Microsoft.Xbox.Services.140.UWP.C.dll
-echo [done] Binplacing c dlls into Plugins folder
-
-set exportPath=%TFS_DropLocation%\Source\Assets
-set projectPath=%TFS_DropLocation%\Packages\XboxLive.unitypackage
-set libPath=%exportPath%\Xbox Live\Libs
-
-mkdir "%exportPath%\Xbox Live\Libs"
-
-robocopy /NJS /NJH /MT:16 /S /NP "%TFS_DropLocation%\UWP" "%libPath%\UWP"
-robocopy /NJS /NJH /MT:16 /S /NP "%TFS_DropLocation%\UnityEditor" "%libPath%\UnityEditor"
-
-mkdir %TFS_DropLocation%\Packages
-
-set SRC_GAMESAVE=%exportPath%\Xbox Live\GameSave
-set SRC_GAMESAVE_PACKAGE=%exportPath%\Xbox Live\GameSave\GameSave.unitypackage
+set SRC_GAMESAVE=%localAssetsPath%\Xbox Live\GameSave
+set SRC_GAMESAVE_PACKAGE=%localAssetsPath%\Xbox Live\GameSave\GameSave.unitypackage
 set DEST_GAMESAVE=%TFS_DropLocation%\TempGameSave

-"C:\Program Files\Unity\Editor\Unity.exe" -ea SilentlyContinue -batchmode -logFile "%TFS_DropLocation%\gamesave-unity.log" -projectPath "%TFS_DropLocation%\Source" -exportPackage "Assets\Xbox Live\GameSave" "%SRC_GAMESAVE_PACKAGE%" -quit
+"C:\Program Files\Unity\Editor\Unity.exe" -ea SilentlyContinue -batchmode -logFile "%TFS_DropLocation%\gamesave-unity.log" -projectPath "%TFS_SourcesDirectory%" -exportPackage "Assets\Xbox Live\GameSave" "%SRC_GAMESAVE_PACKAGE%" -quit

 rmdir /q /s "%DEST_GAMESAVE%"
 robocopy /NJS /NJH /MT:16 /S /NP "%SRC_GAMESAVE%" "%DEST_GAMESAVE%"
@@ -54,28 +45,13 @@
 copy "%DEST_GAMESAVE%\readme.txt" "%SRC_GAMESAVE%"
 copy "%DEST_GAMESAVE%\GameSave.unitypackage" "%SRC_GAMESAVE%"

-
-set DEST_SCENES=%TFS_DropLocation%\TempScenes
-rmdir /q /s "%DEST_SCENES%"
-mkdir "%DEST_SCENES%"
-robocopy /NJS /NJH /MT:16 /S /NP "%exportPath%\Scenes" "%DEST_SCENES%\Scenes"
-copy "%exportPath%\Scenes.meta" "%DEST_SCENES%"
-rmdir /q /s "%exportPath%\Scenes"
-del "%exportPath%\Scenes"
-del "%exportPath%\Scenes.meta"
-
-"C:\Program Files\Unity\Editor\Unity.exe" -ea SilentlyContinue -batchmode -logFile "%TFS_DropLocation%\unity.log" -projectPath "%TFS_DropLocation%\Source" -exportPackage "Assets" "%projectPath%" -quit
+"C:\Program Files\Unity\Editor\Unity.exe" -ea SilentlyContinue -batchmode -logFile "%TFS_DropLocation%\unity.log" -projectPath "%TFS_SourcesDirectory%" -exportPackage "Assets" "%packagePath%" -quit

 rmdir /q /s "%SRC_GAMESAVE%"
 robocopy /NJS /NJH /MT:16 /S /NP "%DEST_GAMESAVE%" "%SRC_GAMESAVE%"
 rmdir /q /s "%DEST_GAMESAVE%"
 del "%SRC_GAMESAVE%\GameSave.unitypackage"
 del "%SRC_GAMESAVE%\GameSave.unitypackage.meta"
-
-robocopy /NJS /NJH /MT:16 /S /NP "%DEST_SCENES%\Scenes" "%exportPath%\Scenes"
-copy "%DEST_SCENES%\Scenes.meta" "%exportPath%\Scenes.meta"
-rmdir /q /s "%DEST_SCENES%"
-

 echo Running postBuildScript.cmd
 echo on


Fetch and reset in webjob to avoid git conflicts

--- WebJobs/templates-update/templates-update.cmd
+++ WebJobs/templates-update/templates-update.cmd
@@ -10,5 +10,12 @@
 )

 pushd "%TEMPLATES_PATH%"
-git pull
+git fetch
+
+IF "%FUNCTIONS_SLOT_NAME%" == "next" (
+    git reset --hard origin/dev
+) ELSE (
+    git reset --hard origin/master
+)
+
 popd


Make sure MajorsilenceReporting-WpfViewer version is increased with other packages.

--- Release-Builds/prepare-files-for-release.bat
+++ Release-Builds/prepare-files-for-release.bat
@@ -35,5 +35,6 @@
 sed.exe -i "5s/.*/    <version>%Version%<\/version>/" "%CD%\nuget\MajorsilenceReporting-Core\MajorsilenceReporting-Core.nuspec"
 sed.exe -i "5s/.*/    <version>%Version%<\/version>/" "%CD%\nuget\MajorsilenceReporting-XwtViewer\MajorsilenceReporting-XwtViewer.nuspec"
 sed.exe -i "5s/.*/    <version>%Version%<\/version>/" "%CD%\nuget\MajorsilenceReporting-Viewer\MajorsilenceReporting-Viewer.nuspec"
+sed.exe -i "5s/.*/    <version>%Version%<\/version>/" "%CD%\nuget\MajorsilenceReporting-WpfViewer\MajorsilenceReporting-WpfViewer.nuspec"

 del "sed*"