- Fix error handling in bootstrap, the exit that were called from functions didn't exit the bat - Add a timeout when it succeeds

--- bootstrap-sharpmake.bat
+++ bootstrap-sharpmake.bat
@@ -12,29 +12,28 @@
 )

 call "%VS140COMNTOOLS%VsMSBuildCmd.bat"
+if %errorlevel% NEQ 0 goto error

 call :NugetRestore Sharpmake/Sharpmake.csproj
+if %errorlevel% NEQ 0 goto error
+
 call :BuildCsproj Sharpmake.Application/Sharpmake.Application.csproj Debug AnyCPU
+if %errorlevel% NEQ 0 goto error

 set SM_CMD=%SHARPMAKE_EXECUTABLE% /sources("Sharpmake.Main.sharpmake.cs") /verbose
-
 echo %SM_CMD%
 %SM_CMD%
+if %errorlevel% NEQ 0 goto error

-if %errorlevel% NEQ 0 (
-    goto error
-)
-
-echo Sharpmake solution generated.
-goto end
+goto success

 @REM -----------------------------------------------------------------------
 :NugetRestore
 echo Restoring nuget packages for %~1
 dotnet restore "%~1"
-if errorlevel 1 (
+if %errorlevel% NEQ 0 (
     echo ERROR: Failed to restore nuget package for %~1
-    goto error
+    exit /b 1
 )
 exit /b 0

@@ -43,23 +42,29 @@
 echo Compiling %~1 in "%~2|%~3"...

 msbuild /nologo /verbosity:quiet /p:Configuration="%~2" /p:Platform="%~3" "%~1"
-if errorlevel 1 (
+if %errorlevel% NEQ 0 (
     echo ERROR: Failed to compile %~1 in "%~2|%~3".
-    goto error
+    exit /b 1
 )
 exit /b 0
+
+@REM -----------------------------------------------------------------------
+:success
+COLOR 2F
+echo Boostrap succeeded!
+timeout /t 5
+exit /b 0
+
+@REM -----------------------------------------------------------------------
+:error
+COLOR 4F
+echo Boostrap failed!
+pause
+set ERROR_CODE=1
+goto end

 @REM -----------------------------------------------------------------------
 :end
 :: restore caller current directory
 popd
-COLOR
-exit /b 0
-
-@REM -----------------------------------------------------------------------
-:error
-:: restore caller current directory
-popd
-COLOR 4F
-pause
-exit /b 1
+exit /b %ERROR_CODE%


Update cygwin version. New version fixes bug occuring on our bots.

BUG= http://code.google.com/p/nativeclient/issues/detail?id=1918
TEST= bots
Review URL: https://chromiumcodereview.appspot.com/10834356

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

--- buildbot/cygwin_env.bat
+++ buildbot/cygwin_env.bat
@@ -4,7 +4,7 @@

 @echo off
 setlocal
-set HERMETIC_CYGWIN=hermetic_cygwin_1_7_15-0_1-with-20120803-cygwin
+set HERMETIC_CYGWIN=hermetic_cygwin_1_7_15-0_1-with-20120816-cygwin
 if exist "%~dp0..\cygwin\%HERMETIC_CYGWIN%.installed" goto :skip_cygwin_install
 if exist "%~dp0..\tools\BUILD\.gcc-extras-version" del "%~dp0..\tools\BUILD\.gcc-extras-version"
 if exist "%~dp0..\tools\BACKPORTS\binutils" rmdir /s /q "%~dp0..\tools\BACKPORTS\binutils"


Bootstrap: Add alacritty.yml link

Bootstrap: Add alacritty.yml link

--- bootstrap/bootstrap.bat
+++ bootstrap/bootstrap.bat
@@ -29,6 +29,7 @@
 mklink %userprofile%\.zshrc %userprofile%\.dotfiles\.zshrc
 mklink %userprofile%\.zshrc.private %userprofile%\.dotfiles\.zshrc.private
 mklink %userprofile%\console_config.rb %userprofile%\.dotfiles\console_config.rb
+mklink %userprofile%\AppData\Roaming\alacritty\alacritty.yml %userprofile%\.dotfiles\alacritty.yml

 mkdir %userprofile%\Documents\WindowsPowerShell
 mklink %userprofile%\Documents\WindowsPowerShell\Microsoft.PowerShell_profile.ps1 %userprofile%\.dotfiles\powershell\Microsoft.PowerShell_profile.ps1


Test primesieve binary

Test primesieve binary

--- scripts/build_msvc.bat
+++ scripts/build_msvc.bat
@@ -14,3 +14,9 @@
 cd build-msvc

 cl /O2 /EHsc /W3 /D NDEBUG /I ../include ../src/*.cpp ../src/app/*.cpp /Feprimesieve.exe
+
+echo ""
+primesieve.exe --version
+
+echo ""
+primesieve.exe --test


Use unannotated tags for fetchvm as github creates these for releases

The FetchVM script uses the latest tag to decide which VM to download, but
was assuming that only annotated tags should be considered. However, since
the tags created by github releases are not annotated, this is not very
useful!

--- FetchVM.cmd
+++ FetchVM.cmd
@@ -3,5 +3,5 @@
 REM Specify a parameter to fetch a specific version or leave blank to
 REM get the recommended VM version for this release of the image.

-FOR /F "usebackq delims=" %%A in (`"git describe --abbrev=0"`) do SET tag=%%A
+FOR /F "usebackq delims=" %%A in (`"git describe --tags --abbrev=0"`) do SET tag=%%A
 powershell.exe -ExecutionPolicy RemoteSigned -file FetchVM.ps1 %tag% %*


Fixed script parameters.

Fixed script parameters.

--- RunTests_VC14.bat
+++ RunTests_VC14.bat
@@ -22,40 +22,40 @@
 @SET TEST_WHERE=--where="cat=EGL||cat=WGL||cat=Math||cat=Framework||cat=Toolkit_CoreUI"

 @SET OPENGL_NET_PLATFORM=WGL
-%TEST_RUN% OpenGL.Net.Test\bin\net461\Release\OpenGL.Net.Test.dll               %TEST_WHERE% %TEST_OPTS% --result=OpenGL.Net_net461.xml
+%TEST_RUN% OpenGL.Net.Test\bin\net461\Release\OpenGL.Net.Test.dll               %TEST_WHERE% %TEST_OPTS% --result=OpenGL.Net_net461.xml --inprocess
 %TEST_RUN% OpenGL.Net.Test\bin\net461\Release\OpenGL.Net.Test.dll               %TEST_WHERE% %TEST_OPTS% --result=OpenGL.Net_net461_x86.xml --x86
-%TEST_RUN% OpenGL.Net.Test\bin\net35\Release\OpenGL.Net.Test.dll                %TEST_WHERE% %TEST_OPTS% --result=OpenGL.Net_net35.xml
+%TEST_RUN% OpenGL.Net.Test\bin\net35\Release\OpenGL.Net.Test.dll                %TEST_WHERE% %TEST_OPTS% --result=OpenGL.Net_net35.xml --inprocess
 %TEST_RUN% OpenGL.Net.Test\bin\net35\Release\OpenGL.Net.Test.dll                %TEST_WHERE% %TEST_OPTS% --result=OpenGL.Net_net35_x86.xml --x86
-%TEST_RUN% OpenGL.Net.CoreUI.Test\bin\net461\Release\OpenGL.Net.CoreUI.Test.dll %TEST_WHERE% %TEST_OPTS% --result=OpenGL.Net.CoreUI_net461.xml
+%TEST_RUN% OpenGL.Net.CoreUI.Test\bin\net461\Release\OpenGL.Net.CoreUI.Test.dll %TEST_WHERE% %TEST_OPTS% --result=OpenGL.Net.CoreUI_net461.xml --inprocess
 %TEST_RUN% OpenGL.Net.CoreUI.Test\bin\net461\Release\OpenGL.Net.CoreUI.Test.dll %TEST_WHERE% %TEST_OPTS% --result=OpenGL.Net.CoreUI_net461_x86.xml --x86

 @SET OPENGL_NET_PLATFORM=EGL
-%TEST_RUN% OpenGL.Net.Test\bin\net461\Release\OpenGL.Net.Test.dll               %TEST_WHERE% %TEST_OPTS% --result=OpenGL.Net_net461.xml
+%TEST_RUN% OpenGL.Net.Test\bin\net461\Release\OpenGL.Net.Test.dll               %TEST_WHERE% %TEST_OPTS% --result=OpenGL.Net_net461.xml --inprocess
 %TEST_RUN% OpenGL.Net.Test\bin\net461\Release\OpenGL.Net.Test.dll               %TEST_WHERE% %TEST_OPTS% --result=OpenGL.Net_net461_x86.xml --x86
-%TEST_RUN% OpenGL.Net.Test\bin\net35\Release\OpenGL.Net.Test.dll                %TEST_WHERE% %TEST_OPTS% --result=OpenGL.Net_net35.xml
+%TEST_RUN% OpenGL.Net.Test\bin\net35\Release\OpenGL.Net.Test.dll                %TEST_WHERE% %TEST_OPTS% --result=OpenGL.Net_net35.xml --inprocess
 %TEST_RUN% OpenGL.Net.Test\bin\net35\Release\OpenGL.Net.Test.dll                %TEST_WHERE% %TEST_OPTS% --result=OpenGL.Net_net35_x86.xml --x86
-%TEST_RUN% OpenGL.Net.CoreUI.Test\bin\net461\Release\OpenGL.Net.CoreUI.Test.dll %TEST_WHERE% %TEST_OPTS% --result=OpenGL.Net.CoreUI_net461.xml
+%TEST_RUN% OpenGL.Net.CoreUI.Test\bin\net461\Release\OpenGL.Net.CoreUI.Test.dll %TEST_WHERE% %TEST_OPTS% --result=OpenGL.Net.CoreUI_net461.xml --inprocess
 %TEST_RUN% OpenGL.Net.CoreUI.Test\bin\net461\Release\OpenGL.Net.CoreUI.Test.dll %TEST_WHERE% %TEST_OPTS% --result=OpenGL.Net.CoreUI_net461_x86.xml --x86

 @SET COVER_RUN=packages\OpenCover.4.6.519\tools\OpenCover.Console.exe
 @SET COVER_OPTS=-register:user -target:"packages\NUnit.ConsoleRunner.3.7.0\tools\nunit3-console.exe" -hideskipped:All
-@SET COVER_EXCLUDE=-excludebyfile:"*OpenGL.Net.Test*;*OpenGL.Net\DeviceContextGLX.cs;*OpenGL.Net\Glx.cs" -excludebyattribute:OpenGL.RequiredByFeatureAttribute
+@SET COVER_EXCLUDE=-excludebyattribute:*.RequiredByFeature*
 @SET COVER_WHERE=--where=\"cat=EGL||cat=WGL||cat=Math||cat=Framework||cat=Toolkit_CoreUI\"

 @SET OPENGL_NET_PLATFORM=WGL
-%COVER_RUN% %COVER_OPTS% %COVER_EXCLUDE% -targetargs:"OpenGL.Net.Test\bin\net461\Release\OpenGL.Net.Test.dll %TEST_OPTS%" -output:.\CovWglOpenGL.Net_net461.xml
+%COVER_RUN% %COVER_OPTS% %COVER_EXCLUDE% -targetargs:"OpenGL.Net.Test\bin\net461\Release\OpenGL.Net.Test.dll %TEST_OPTS% --inprocess" -output:.\CovWglOpenGL.Net_net461.xml
 %COVER_RUN% %COVER_OPTS% %COVER_EXCLUDE% -targetargs:"OpenGL.Net.Test\bin\net461\Release\OpenGL.Net.Test.dll %TEST_OPTS% --x86" -output:.\CovWglOpenGL.Net_net461_x86.xml
-%COVER_RUN% %COVER_OPTS% %COVER_EXCLUDE% -targetargs:"OpenGL.Net.Test\bin\net35\Release\OpenGL.Net.Test.dll %TEST_OPTS%" -output:.\CovWglOpenGL.Net_net35.xml
+%COVER_RUN% %COVER_OPTS% %COVER_EXCLUDE% -targetargs:"OpenGL.Net.Test\bin\net35\Release\OpenGL.Net.Test.dll %TEST_OPTS% --inprocess" -output:.\CovWglOpenGL.Net_net35.xml
 %COVER_RUN% %COVER_OPTS% %COVER_EXCLUDE% -targetargs:"OpenGL.Net.Test\bin\net35\Release\OpenGL.Net.Test.dll %TEST_OPTS% --x86" -output:.\CovWglOpenGL.Net_net35_x86.xml
-%COVER_RUN% %COVER_OPTS% %COVER_EXCLUDE% -targetargs:"OpenGL.Net.CoreUI.Test\bin\net461\Release\OpenGL.Net.CoreUI.Test.dll %TEST_OPTS%" -output:.\CovWglOpenGL.Net.CoreUI_net461.xml
+%COVER_RUN% %COVER_OPTS% %COVER_EXCLUDE% -targetargs:"OpenGL.Net.CoreUI.Test\bin\net461\Release\OpenGL.Net.CoreUI.Test.dll %TEST_OPTS% --inprocess" -output:.\CovWglOpenGL.Net.CoreUI_net461.xml
 %COVER_RUN% %COVER_OPTS% %COVER_EXCLUDE% -targetargs:"OpenGL.Net.CoreUI.Test\bin\net461\Release\OpenGL.Net.CoreUI.Test.dll %TEST_OPTS% --x86" -output:.\CovWglOpenGL.Net.CoreUI_net461_x86.xml

 @SET OPENGL_NET_PLATFORM=EGL
-%COVER_RUN% %COVER_OPTS% %COVER_EXCLUDE% -targetargs:"OpenGL.Net.Test\bin\net461\Release\OpenGL.Net.Test.dll %TEST_OPTS%" -output:.\CovEglOpenGL.Net_net461.xml
+%COVER_RUN% %COVER_OPTS% %COVER_EXCLUDE% -targetargs:"OpenGL.Net.Test\bin\net461\Release\OpenGL.Net.Test.dll %TEST_OPTS% --inprocess" -output:.\CovEglOpenGL.Net_net461.xml
 %COVER_RUN% %COVER_OPTS% %COVER_EXCLUDE% -targetargs:"OpenGL.Net.Test\bin\net461\Release\OpenGL.Net.Test.dll %TEST_OPTS% --x86" -output:.\CovEglOpenGL.Net_net461_x86.xml
-%COVER_RUN% %COVER_OPTS% %COVER_EXCLUDE% -targetargs:"OpenGL.Net.Test\bin\net35\Release\OpenGL.Net.Test.dll %TEST_OPTS%" -output:.\CovEglOpenGL.Net_net35.xml
+%COVER_RUN% %COVER_OPTS% %COVER_EXCLUDE% -targetargs:"OpenGL.Net.Test\bin\net35\Release\OpenGL.Net.Test.dll %TEST_OPTS% --inprocess" -output:.\CovEglOpenGL.Net_net35.xml
 %COVER_RUN% %COVER_OPTS% %COVER_EXCLUDE% -targetargs:"OpenGL.Net.Test\bin\net35\Release\OpenGL.Net.Test.dll %TEST_OPTS% --x86" -output:.\CovEglOpenGL.Net_net35_x86.xml
-%COVER_RUN% %COVER_OPTS% %COVER_EXCLUDE% -targetargs:"OpenGL.Net.CoreUI.Test\bin\net461\Release\OpenGL.Net.CoreUI.Test.dll %TEST_OPTS%" -output:.\CovEglOpenGL.Net.CoreUI_net461.xml
+%COVER_RUN% %COVER_OPTS% %COVER_EXCLUDE% -targetargs:"OpenGL.Net.CoreUI.Test\bin\net461\Release\OpenGL.Net.CoreUI.Test.dll %TEST_OPTS% --inprocess" -output:.\CovEglOpenGL.Net.CoreUI_net461.xml
 %COVER_RUN% %COVER_OPTS% %COVER_EXCLUDE% -targetargs:"OpenGL.Net.CoreUI.Test\bin\net461\Release\OpenGL.Net.CoreUI.Test.dll %TEST_OPTS% --x86" -output:.\CovEglOpenGL.Net.CoreUI_net461_x86.xml

 @SET REPORT_RUN=packages\ReportGenerator.2.5.7\tools\ReportGenerator.exe


updae make-dist-bin.bat

updae make-dist-bin.bat

--- build/make-dist-bin.bat
+++ build/make-dist-bin.bat
@@ -6,7 +6,7 @@
 set DISTCONTRIB=%DISTBASE%\ContributedPlugins
 set DOCDIST_EN=%DISTBASE%\EN\Documents
 set DOCDIST_JA=%DISTBASE%\JA\Documents
-set BINDIR=\..\bin\Release
+set BINDIR=%PROJDIR%\bin\Release

 RD /S /Q "%DISTBASE%"
 MD "%DISTBASE%"
@@ -15,19 +15,19 @@
 MD "%DOCDIST_EN%"
 MD "%DOCDIST_JA%"

-copy "%PROJDIR%\Executable%BINDIR%\Poderosa.exe" "%DIST%"
-copy "%PROJDIR%\Executable%BINDIR%\Poderosa.pdb" "%DIST%"
+copy "%BINDIR%\Poderosa.exe" "%DIST%"
+copy "%BINDIR%\Poderosa.pdb" "%DIST%"

-copy "%PROJDIR%\Plugin%BINDIR%\Poderosa.Plugin.dll" "%DIST%"
-copy "%PROJDIR%\Plugin%BINDIR%\Poderosa.Plugin.pdb" "%DIST%"
+copy "%BINDIR%\Poderosa.Plugin.dll" "%DIST%"
+copy "%BINDIR%\Poderosa.Plugin.pdb" "%DIST%"

-copy "%PROJDIR%\Granados%BINDIR%\Granados.dll" "%DIST%"
-copy "%PROJDIR%\Granados%BINDIR%\Granados.pdb" "%DIST%"
+copy "%BINDIR%\Granados.dll" "%DIST%"
+copy "%BINDIR%\Granados.pdb" "%DIST%"

 for %%P in (Core Macro PortForwardingCommand Protocols SerialPort TerminalEmulator TerminalSession UI Usability XZModem Pipe SFTP) do (
   MD "%DIST%\%%P"
-  copy "%PROJDIR%\%%P%BINDIR%\Poderosa.%%P.dll" "%DIST%\%%P"
-  copy "%PROJDIR%\%%P%BINDIR%\Poderosa.%%P.pdb" "%DIST%\%%P"
+  copy "%BINDIR%\Poderosa.%%P.dll" "%DIST%\%%P"
+  copy "%BINDIR%\Poderosa.%%P.pdb" "%DIST%\%%P"
 )

 MD "%DIST%\Protocols\Cygterm"
@@ -37,10 +37,10 @@
 copy "%PROJDIR%\Misc\Macro\Sample\*.js" "%DIST%\Macro\Sample"

 MD "%DIST%\Portforwarding"
-copy "%PROJDIR%\Portforwarding%BINDIR%\Portforwarding.exe" "%DIST%\Portforwarding"
-copy "%PROJDIR%\Portforwarding%BINDIR%\Portforwarding.pdb" "%DIST%\Portforwarding"
-copy "%PROJDIR%\Granados%BINDIR%\Granados.dll" "%DIST%\Portforwarding"
-copy "%PROJDIR%\Granados%BINDIR%\Granados.pdb" "%DIST%\Portforwarding"
+copy "%BINDIR%\Portforwarding.exe" "%DIST%\Portforwarding"
+copy "%BINDIR%\Portforwarding.pdb" "%DIST%\Portforwarding"
+copy "%BINDIR%\Granados.dll" "%DIST%\Portforwarding"
+copy "%BINDIR%\Granados.pdb" "%DIST%\Portforwarding"

 copy "%PROJDIR%\LICENSE.txt" "%DIST%"
 copy "%PROJDIR%\ChangeLog.txt" "%DIST%"
@@ -57,13 +57,7 @@
 REM =====================================

 for %%P in ( ExtendPaste ) do (
-  MD "%DISTCONTRIB%\%%P"
-  copy "%PROJDIR%\%%P%BINDIR%\Poderosa.%%P.dll" "%DISTCONTRIB%\%%P"
-  copy "%PROJDIR%\%%P%BINDIR%\Poderosa.%%P.pdb" "%DISTCONTRIB%\%%P"
-
-  if exist "%PROJDIR%\ContributedPlugins\%%P\README*.txt" (
-    copy "%PROJDIR%\ContributedPlugins\%%P\README*.txt" "%DISTCONTRIB%\%%P"
-  )
+  xcopy "%BINDIR%\%%P" "%DISTCONTRIB%\%%P\" /S
 )

 pause


[GladiatorTool] backup

[GladiatorTool] backup

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

--- Scripts/jflash_stm32f207ig_806.bat
+++ Scripts/jflash_stm32f207ig_806.bat
@@ -0,0 +1 @@
+call jflash.bat "%GLADIATOR_HOME%\Scripts\JFlashPro\STM32F207IG_806000.jflash" "%~1,0x8060000"


Add Switcher

Add Switcher

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

--- SteamSwitcher.bat
+++ SteamSwitcher.bat
@@ -0,0 +1,52 @@
+@echo off
+goto license
+The MIT License (MIT)
+
+Copyright (c) 2014 Jesper S. Dramsch
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+:license
+
+tasklist /FI "IMAGENAME eq steam.exe" 2>NUL | find /I /N "steam.exe">NUL
+if "%ERRORLEVEL%"=="0" (
+echo Program is running
+set yup=1
+@"C:\Program Files (x86)\Steam\Steam.exe" -shutdown
+timeout /T 2  > nul
+)
+tasklist /FI "IMAGENAME eq steam.exe" 2>NUL | find /I /N "steam.exe">NUL
+if "%ERRORLEVEL%"=="0" (
+echo Attempting force close
+taskkill /F /IM steam.exe
+echo Program shut down
+) else (
+if "%yup%"=="1" (
+echo Program shut down
+) else (
+echo Program not running
+)
+)
+set /p id="Enter SteamID: "
+set "psCommand=powershell -Command "$pword = read-host 'Enter Password' -AsSecureString ; ^
+    $BSTR=[System.Runtime.InteropServices.Marshal]::SecureStringToBSTR($pword); ^
+        [System.Runtime.InteropServices.Marshal]::PtrToStringAuto($BSTR)""
+for /f "usebackq delims=" %%p in (`%psCommand%`) do set password=%%p
+echo Starting up
+@"C:\Program Files (x86)\Steam\Steam.exe" -login "%id%" "%password%"
+exit


Default choices and countdown

Default choices and countdown

Replaced the old picker with "choice" for countdown and default pick.

--- SteamSwitcher.bat
+++ SteamSwitcher.bat
@@ -58,6 +58,9 @@
 	set /p "another=Would you like to add another SteamID (y/n): "
 	set /A i_count=%i_count%+1
 	if "!another!"=="y" (goto Add Logins )
+
+	:Default Choices
+	set default_id=X
 )
 timeout /T 1 > nul
 :Import Config
@@ -75,25 +78,20 @@
 )
 echo.
 :Account picker
-set /p "choice=Your choice: "
-IF %choice% == X (
-	goto Add Logins
-) ELSE (
-	IF %choice% GEQ 0 (
-		IF %choice% LEQ %i_count%  (
-			set "login=!id[%choice%]!"
-			echo WIll now switch account to !login!
-		) ELSE (
-			GOTO Wrong Choice
-		)
-	) ELSE (
-		:Wrong Choice
-		echo Your choice is invalid.
-		echo Exiting.
-		timeout /T 5  > nul
-		exit
-	)
+
+set proto=X0123456789
+set /A i_choice=%i_count+1
+set choices=!proto:~0,%i_choice%!
+choice /N /T 5 /D %default_id% /C %choices% /M "Your choice: "
+IF %ERRORLEVEL% == 1 ( goto Add Logins )
+set /A pick=%ERRORLEVEL%-2
+IF %ERRORLEVEL% GEQ 2 (
+	set "login=!id[%pick%]!"
+	echo Will now switch account to !login!
+	echo set "default_id=!pick!" >> config.cmd
 )
+
+timeout /T 5  > nul
 echo.

 :Check if Program is running and shut down (first nice then rigorously)


This is for testing the database transformation

SVN-Revision: 1066

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

--- caadapter/runRDS_DB.bat
+++ caadapter/runRDS_DB.bat
@@ -0,0 +1,3 @@
+java -cp .;referenceLib/caAdapter.jar;components/dataviewer/lib/ojdbc14.jar -Ddriver=oracle.jdbc.OracleDriver -Durl=jdbc:oracle:thin:@cbiodb2-d:1521:cadev -Duser=caadapter -Dpass=go!ar987r gov.nih.nci.caadapter.ui.mapping.sdtm.TestDBAPITransform4RDS
+
+


More specific autoinstall instructions

More specific autoinstall instructions

--- checkinstall.bat
+++ checkinstall.bat
@@ -2,8 +2,7 @@
 cls
 set "a=1"
 if "%PCAP_ROOT_DIR%"==""  (
-	set "a=2"
-	echo PCAP_ROOT_DIR is not defined! WinPCAP needs to be installed.
+	echo PCAP_ROOT_DIR is not defined! Please set this environment variable.
 ) else (
 	if not exist "%PCAP_ROOT_DIR%\\Include\\pcap\\pcap.h" (
 		set "a=2"
@@ -22,4 +21,4 @@
 		%TEMP%/winpcap.exe
 		del %TEMP%\\winpcap.exe
 	)
-)+)


Update RingAllegro - buildvc.bat - Use Allegro 5.2 instead of Allegro 5.1 (Nice update because the new version of Allegro support dpi awareness on Microsoft Windows) - So when we run games in full screen, it will not be in wrong scale because when the user settings uses scaling like 125% or 150% and so on.

--- extensions/ringallegro/buildvc.bat
+++ extensions/ringallegro/buildvc.bat
@@ -1,5 +1,8 @@
 cls
 call ../../src/locatevc.bat
 cl /c /DEBUG ring_allegro.c -I"..\..\libdepwin\allegro\include" -I"..\..\include"
-link /DEBUG ring_allegro.obj  ..\..\lib\ring.lib ..\..\libdepwin\allegro\lib\allegro_monolith.lib /DLL /OUT:..\..\bin\ring_allegro.dll /SUBSYSTEM:CONSOLE,"5.01"
+link /DEBUG ring_allegro.obj  ..\..\lib\ring.lib ..\..\libdepwin\allegro\lib\allegro.lib ..\..\libdepwin\allegro\lib\allegro_image.lib ..\..\libdepwin\allegro\lib\allegro_dialog.lib ..\..\libdepwin\allegro\lib\allegro_ttf.lib ..\..\libdepwin\allegro\lib\allegro_acodec.lib ..\..\libdepwin\allegro\lib\allegro_primitives.lib ^
+..\..\libdepwin\allegro\lib\allegro_audio.lib ..\..\libdepwin\allegro\lib\allegro_color.lib ..\..\libdepwin\allegro\lib\allegro_font.lib ..\..\libdepwin\allegro\lib\allegro_video.lib ..\..\libdepwin\allegro\lib\allegro_primitives.lib ..\..\libdepwin\allegro\lib\allegro_memfile.lib ^
+		..\..\libdepwin\allegro\lib\allegro_physfs.lib ^
+	  /DLL /OUT:..\..\bin\ring_allegro.dll /SUBSYSTEM:CONSOLE,"5.01"
 del ring_allegro.obj


Add the MFORTH ROM build file.

Add the MFORTH ROM build file.

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

--- build.bat
+++ build.bat
@@ -0,0 +1,67 @@
+@ECHO OFF
+
+REM Configure our environment variables.  We assume that TASM is
+REM installed in ~\bin and that your MFORTH source is located in
+REM ~\Dev\main\MFORTH.
+SETLOCAL
+
+SET TASMDIR=%USERPROFILE%\bin\tasm3.2
+SET TASM=%TASMDIR%\tasm.exe
+SET TASMTABS=%TASMDIR%
+
+SET MFORTHDIR=%USERPROFILE%\Dev\main\MFORTH
+SET BINDIR=%MFORTHDIR%\bin
+SET SRCDIR=%MFORTHDIR%\src\MFORTH
+
+REM Enable the line below to generate a build with the MFORTH profiler.
+REM SET PROFILER=-dPROFILER
+
+
+REM Get the Perforce change number for this build if -v was specified.
+IF "%1"=="-v" (GOTO :getchange) ELSE (GOTO :nochange)
+
+:getchange
+FOR /F "Tokens=2" %%I IN ('p4 changes -i -m 1 //depot/main/MFORTH/src/...#have') DO SET MFORTH_CHANGE=%%I
+ECHO Change number is %MFORTH_CHANGE%.
+GOTO assemble
+
+:nochange
+SET MFORTH_CHANGE=0
+GOTO assemble
+
+
+:assemble
+REM TASM can only process relative includes if they are relative to the
+REM current directory.  That means that we need to change into the
+REM source directory before we try to assemble MFORTH.  We store the
+REM current directory so that we can return to that directory after
+REM assembling.
+SET PREVDIR=%CD%
+CD %SRCDIR%
+
+REM Assemble MFORTH using the standard, linked-list dictionary.
+%TASM% -85 -s -b -f00 ^
+	%PROFILER% -dMFORTH_CHANGE=%MFORTH_CHANGE% ^
+	main.asm ^
+	%BINDIR%\MFORTH.BX ^
+	%BINDIR%\MFORTH.LST ^
+	%BINDIR%\MFORTH.EXP ^
+	%BINDIR%\MFORTH.SYM
+
+REM Use PhashGen to generate a perfect hash table for the dictionary.
+%MFORTHDIR%\tools\PhashGen.exe ^
+	%BINDIR%\MFORTH.BX ^
+	%BINDIR%\MFORTH.SYM ^
+	%SRCDIR%\phash.asm
+
+REM Assemble MFORTH again, this time using the perfect hash table.
+%TASM% -85 -s -b -f00 ^
+	%PROFILER% -dPHASH -dMFORTH_CHANGE=%MFORTH_CHANGE% ^
+	main.asm ^
+	%BINDIR%\MFORTH.BX ^
+	%BINDIR%\MFORTH.LST ^
+	%BINDIR%\MFORTH.EXP ^
+	%BINDIR%\MFORTH.SYM
+
+REM Restore the previous directory.
+CD %PREVDIR%


Minor tweak.

Minor tweak.

--- build.bat
+++ build.bat
@@ -40,5 +40,6 @@
 exit 1

 :Finish
+cd ..
 ECHO All phase successful.
 exit 0


Remove debugging stuff

Remove debugging stuff

--- build.bat
+++ build.bat
@@ -1,4 +1,4 @@
-rem @echo off
+@echo off
 setlocal

 if not exist .\build\* mkdir build
@@ -15,7 +15,6 @@

 :build_font
-@echo Building %1
 set lig=%1
 set otf=%lig:Lig=%


codecov

codecov

--- build.bat
+++ build.bat
@@ -41,7 +41,6 @@

 mkdir Build
 call %nuget% pack "src\SearchAThing.Sci.csproj" -symbols -o Build -p Configuration=%config% %vv%
-goto debugend
 if not "%errorlevel%"=="0" goto failure

 REM Code Coverage
@@ -54,7 +53,7 @@
 call %nuget% install OpenCover -Version 4.6.519 -OutputDirectory packages
 if not "%errorlevel%"=="0" goto failure

-packages\OpenCover.4.6.519\tools\OpenCover.Console.exe -register:user -target:"packages\xunit.runner.console.2.2.0\tools\xunit.console.exe" -targetargs:".\tests\bin\Release\SearchAThing.Sci.Tests.dll -noshadow" -output:".\coverage.xml"
+packages\OpenCover.4.6.519\tools\OpenCover.Console.exe -register:user -target:"packages\xunit.runner.console.2.2.0\tools\xunit.console.exe" -targetargs:".\tests\bin\Release\SearchAThing.Sci.Tests.dll -noshadow" -output:".\coverage.xml" "-filter:+[*]* -[*]Microsoft.Xna.*"
 if not "%errorlevel%"=="0" goto failure

 echo "---> ensuring codecov"


Fix path

Fix path

--- build.bat
+++ build.bat
@@ -14,17 +14,14 @@
 	set nuget=nuget
 )

-dir
+powershell -Command "(new-object System.Net.WebClient).DownloadFile('https://dist.nuget.org/win-x86-commandline/latest/nuget.exe','nuget.exe')"

-echo "========"
-echo %WINDIR%
-
-powershell -Command "(new-object System.Net.WebClient).DownloadFile('https://dist.nuget.org/win-x86-commandline/latest/nuget.exe','nuget.exe')"
+cp nuget.exe Sigma.Core/
+cp nuget.exe Sigma.Core.Monitors.WPF/

 nuget.exe restore Sigma.sln

-
-%programfiles(x86)%\MSBuild\14.0\Bin\MsBuild.exe Sigma.sln /p:Configuration="%config%" /p:Platform=x64
+"%programfiles(x86)%\MSBuild\14.0\Bin\MsBuild.exe" Sigma.sln /p:Configuration="%config%" /p:Platform=x64

 REM pack Sigma.Core


Saving changes for merge in build.cmd

Saving changes for merge in build.cmd

--- build.cmd
+++ build.cmd
@@ -62,19 +62,12 @@
     SET MAKE=make.shade

     IF EXIST "%SAKEPKG%" (
-<<<<<<< HEAD
         rd "%SAKEPKG%" /s /q
-=======
-        rd "%SAKEPKG% /s /q
->>>>>>> origin/release/1.0.0
     )

-    "%NUGET%" install Sake -pre -o packages -ExcludeVersion
+    "%NUGET%" install Sake -pre -o packages -ExcludeVersion -NonInterative

-<<<<<<< HEAD
     ECHO.

-=======
->>>>>>> origin/release/1.0.0
     "%SAKE%" -I "%INCLUDES%" -f "%MAKE%" %*
-ENDLOCAL
+ENDLOCAL


Build now only builds the REPL.

Build now only builds the REPL.

--- build.cmd
+++ build.cmd
@@ -1,6 +1,6 @@
 @ECHO OFF
 call dmdenv 1.057-tango-0.99.9
-xfbuild -g -debug -unittest -version=Unittest +xtango +D.xf/LexerTest.deps +O.xf/LexerTest.objs +oLexerTest LexerTest.d
-xfbuild -g -debug -unittest -version=Unittest +xtango +D.xf/AstTest.deps +O.xf/AstTest.objs +oAstTest AstTest.d
-xfbuild -g -debug -unittest -version=Unittest +xtango +D.xf/EvalTest.deps +O.xf/EvalTest.objs +oEvalTest EvalTest.d
-xfbuild -g -debug -unittest -version=Unittest +xtango +D.xf/ReplTest.deps +O.xf/ReplTest.objs +oReplTest ReplTest.d
+REM xfbuild -g -debug -unittest -version=Unittest +xtango +D.xf/LexerTest.deps +O.xf/LexerTest.objs +oLexerTest LexerTest.d
+REM xfbuild -g -debug -unittest -version=Unittest +xtango +D.xf/AstTest.deps +O.xf/AstTest.objs +oAstTest AstTest.d
+REM xfbuild -g -debug -unittest -version=Unittest +xtango +D.xf/EvalTest.deps +O.xf/EvalTest.objs +oEvalTest EvalTest.d
+xfbuild -g -debug -unittest -version=Unittest +xtango +D.xf/ReplTest.deps +O.xf/ReplTest.objs +oMathEval ReplTest.d


Remove parallel building. Causes issues for nuget restore

--- build.cmd
+++ build.cmd
@@ -3,4 +3,4 @@
 if "%config%" == "" (
    set config=Debug
 )
-%WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild Build\Build.proj /p:Configuration="%config%" /m /v:M /fl /flp:LogFile=msbuild.log;Verbosity=Normal /nr:false+%WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild Build\Build.proj /p:Configuration="%config%" /v:M /fl /flp:LogFile=msbuild.log;Verbosity=Normal /nr:false


Added build.cmd to build the project

Added build.cmd to build the project

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

--- build.cmd
+++ build.cmd
@@ -0,0 +1,6 @@
+@echo Off
+set config=%1
+if "%config%" == "" (
+   set config=Debug
+)
+%WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild src\Sitecore.SharedSource.OutputCache.sln /p:Configuration="%config%" /fl /flp:LogFile=msbuild.log;Verbosity=Normal /nr:false


Fix for build script on Win7 - label too long

--- build.cmd
+++ build.cmd
@@ -58,7 +58,7 @@
 set "__CMakeBinDir=%__CMakeBinDir:\=/%"

 :: Configure environment if we are doing a clean build.
-if not defined __CleanBuild goto MakeDirectories
+if not defined __CleanBuild goto MakeDirs
 echo Doing a clean build
 echo.

@@ -74,7 +74,7 @@

 if exist "%__LogsDir%" del /f /q "%__LogsDir%\*_%__BuildOS%__%__BuildArch%__%__BuildType%.*"

-:MakeDirectories
+:MakeDirs
 if not exist "%__BinDir%" md "%__BinDir%"
 if not exist "%__IntermediatesDir%" md "%__IntermediatesDir%"
 if not exist "%__LogsDir%" md "%__LogsDir%"


Fix appveyor build nuget repository path.

--- build.cmd
+++ build.cmd
@@ -8,7 +8,7 @@
 SETLOCAL ENABLEEXTENSIONS
 SET "parent=%~dp0"
 SET "path_base=%~1"
-SET "nuget_pkg_path=%~1\..\nuget"
+SET "nuget_pkg_path=%~1\.nuget\packages"
 SET "msbuild_args=/verbosity:minimal /p:Platform=%~2 /p:Configuration=%~3"
 SET "proj_version=%~4"
 SET "msbuild_exe=msbuild"


Removed commented lines from build.cmd that are not required.

--- build.cmd
+++ build.cmd
@@ -28,8 +28,6 @@
 :install
 call dnvm install 1.0.0-beta5-11511
 call dnvm use 1.0.0-beta5-11511
-rem set the runtime path because the above commands set \.dnx<space>\runtimes
-rem set PATH=!USERPROFILE!\.dnx\runtimes\dnx-clr-win-x86.1.0.0-beta5-11511\bin;!PATH!

 :run
 call dnu restore src\Autofac


Fix build.cmd help text (#3197)

Fix build.cmd help text (#3197)

--- build.cmd
+++ build.cmd
@@ -37,10 +37,10 @@
 echo.    build.cmd vs               (build Visual Studio IDE Tools)
 echo.    build.cmd all              (build everything)
 echo.    build.cmd test             (build and test default targets)
-echo.    build.cmd net40 test       (build and test net40)
-echo.    build.cmd coreclr test     (build and test net40)
-echo.    build.cmd vs test          (build and test net40)
-echo.    build.cmd all test         (build and test net40)
+echo.    build.cmd net40 test       (build and test compiler for .NET Framework)
+echo.    build.cmd coreclr test     (build and test compiler for .NET Core)
+echo.    build.cmd vs test          (build and test Visual Studio IDE Tools)
+echo.    build.cmd all test         (build and test everything)
 echo.    build.cmd nobuild test include Conformance (run only tests marked with Conformance category)
 echo.    build.cmd nobuild test include Expensive (run only tests marked with Expensive category)
 echo.


Update default build script

Update default build script

--- build.cmd
+++ build.cmd
@@ -1 +1,8 @@
-msbuild WebJobs.Script.proj /p:Configuration=Release+@ECHO Off
+
+SET Config=%1
+IF "%1"=="" (
+  SET Config="Release"
+)
+
+msbuild WebJobs.Script.proj /p:Configuration=%Config%


command line build

command line build

--- build.bat
+++ build.bat
@@ -0,0 +1 @@
+"C:\Program Files (x86)\MSBuild\12.0\Bin\MSBuild.exe" Push_2013.sln /verbosity:minimal


Testing MyGet .sln detection

Testing MyGet .sln detection

--- build.bat
+++ build.bat
@@ -1,25 +0,0 @@
-@echo Off
-set config=%1
-if "%config%" == "" (
-   set config=Release
-)
-
-set version=1.0.0
-if not "%PackageVersion%" == "" (
-   set version=%PackageVersion%
-)
-
-set nuget=
-if "%nuget%" == "" (
-	set nuget=nuget
-)
-
-echo Building
-%MsBuildExe% src\ShuffleBag.sln /p:Configuration="%config%" /m /v:M /fl /flp:LogFile=msbuild.log;Verbosity=diag /nr:false
-
-echo Creating directories
-mkdir Build
-mkdir Build\lib
-
-echo Creating package
-%nuget% pack "src\ShuffleBag.nuspec" -NoPackageAnalysis -verbosity detailed -o Build -Version %version% -p Configuration="%config%"


i think it is finally good now

i think it is finally good now

--- build.bat
+++ build.bat
@@ -55,17 +55,7 @@

 REM cleanup...

-del /q staging\net40\*.*
-del staging\net40
-del /q staging\sl4\*.*
-del staging\sl4
-del staging
-
-del /q nuget\lib\net40\*.*
-del nuget\lib\net40
-del /q nuget\lib\sl4\*.*
-del nuget\lib\sl4
-del nuget\lib
-del staging
+del /q /s staging
+del /q /s nuget

 pause


fix build.bat script

fix build.bat script

--- build.bat
+++ build.bat
@@ -29,8 +29,7 @@
 cd build

 cls
-    cmake ../ -DTEST_APP=%test% -DCMAKE_BUILD_TYPE=%buildType% -DDOC=%doc% && msbuild FakeInput.sln
-        :: /p:Configuration=Release
+    cmake ../ -DTEST_APP=%test% -DCMAKE_BUILD_TYPE=%buildType% -DDOC=%doc% && msbuild FakeInput.sln /p:Configuration=Release

 cd ..


Specify build target in cargo build

Specify build target in cargo build

--- build.bat
+++ build.bat
@@ -8,37 +8,30 @@

 echo Building FFI bindings
 pushd %ffi%
-cargo build
-if %errorlevel% neq 0 (
-	echo Cargo build failed
-	goto :exit
-)
-cargo build --release
+cargo build --release --target=i686-pc-windows-msvc
 if %errorlevel% neq 0 (
 	echo Cargo build failed
 	goto :exit
 )
 popd

+echo Publishing FFI bindings to project build directory
 mkdir %proj%\costura32 2>nul
-
-echo Publishing FFI bindings to project build directory
-for /d %%d in (dll pdb) do (
-	REM cp %ffi%\target\debug\JsSourceMapper_FFI.%%d %proj%\costura32\
-	cp %ffi%\target\release\JsSourceMapper_FFI.%%d %proj%\costura32\
+cp %ffi%\target\i686-pc-windows-msvc\release\JsSourceMapper_FFI.dll %proj%\costura32\
+if %errorlevel% neq 0 (
+	echo Could not copy DLL to .NET project
+	goto :exit
+)
+cp %ffi%\target\i686-pc-windows-msvc\release\JsSourceMapper_FFI.pdb %proj%\costura32\
+if %errorlevel% neq 0 (
+	echo Could not copy PDB to .NET project
+	goto :exit
 )

 echo NuGet restore
 nuget restore %proj%.sln
 if %errorlevel% neq 0 (
 	echo Could not restore NuGet packages
-	goto :exit
-)
-
-echo Building solution
-%msbuild% %proj%.sln
-if %errorlevel% neq 0 (
-	echo C# build failed
 	goto :exit
 )


build.cmd: fix syntax.

build.cmd: fix syntax.

--- build.cmd
+++ build.cmd
@@ -40,7 +40,7 @@
 echo Deleting staging images from temp/...
 del temp\staging.*.image

-if "%1"!="net-bootstrap" (
+if not "%1"=="net-bootstrap" (
   echo Updating working copy from %GIT_BRANCH%...
   call git pull https://github.com/factor/factor %GIT_BRANCH%
   if errorlevel 1 goto fail


removed gitversion

removed gitversion

--- build.cmd
+++ build.cmd
@@ -1,11 +1,10 @@
+@echo Off
+
 WHERE mycommand
 IF NOT  "%ERRORLEVEL%" == "0" (
   GitVersion /output buildserver
 )

-GitVersion /output buildserver
-
-@echo Off
 ECHO Starting build

 set config=%1


Add build command

Add build command

--- build.cmd
+++ build.cmd
@@ -0,0 +1,2 @@
+@ECHO OFF
+PowerShell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command "[System.Threading.Thread]::CurrentThread.CurrentCulture = ''; [System.Threading.Thread]::CurrentThread.CurrentUICulture = '';& '%~dp0build.ps1' %*"


Fixed build.cmd

Fixed build.cmd

--- build.cmd
+++ build.cmd
@@ -1,13 +1,32 @@
 @echo off
 echo Deleting Release stuff
-for /d %%F in (_build\Release*) do del /s /q "%%F"
+for /d %%F in (%~dp0_build\Release*) do del /s /q "%%F"
+echo Deleting NuGet stuff
+del %~dp0..\..\nuget\nupkgsrc\CmdLineLib* /s /f /q
+::GOTO EOF
+echo Building stuff
+::msbuild CmdLineLib\CmdLineLib.csproj /p:Configuration=Release /p:TargetFrameworkVersion=v4.5.2
+::msbuild CmdLineLib\CmdLineLib.csproj /p:Configuration=Release /p:TargetFrameworkVersion=v4.6.1 /p:CreatePackage=true /p:PublishDir=%~dp0..\..\..\nupkgsrc

-echo Building stuff
-msbuild CmdLineLib\CmdLineLib.csproj /p:Configuration=Release /p:TargetFrameworkVersion=v4.5.2
-msbuild CmdLineLib\CmdLineLib.csproj /p:Configuration=Release /p:TargetFrameworkVersion=v4.6.1 /p:CreatePackage=true /p:PublishDir=..\..\..\nuget\nupkgsrc
+msbuild CmdLineLib.Tests\CmdLineLib.Tests.csproj /p:Configuration=Release /p:TargetFrameworkVersion=v4.5.2
+IF %ERRORLEVEL% NEQ 0 GOTO ERROR
+msbuild CmdLineLib.Tests\CmdLineLib.Tests.csproj /p:Configuration=Release /p:TargetFrameworkVersion=v4.6.1 /p:CreatePackage=true /p:PublishDir=%~dp0..\..\nuget\nupkgsrc
+IF %ERRORLEVEL% NEQ 0 GOTO ERROR
+mstest.exe /testcontainer:%~dp0_build\Release.v4.5.2\test\CmdLineLib.Tests\CmdLineLib.Tests.dll
+IF %ERRORLEVEL% NEQ 0 GOTO ERROR
+mstest.exe /testcontainer:%~dp0_build\Release.v4.6.1\test\CmdLineLib.Tests\CmdLineLib.Tests.dll
+IF %ERRORLEVEL% NEQ 0 GOTO ERROR

-echo Deleting other stuff
-del ..\..\nuget\nupkg\cmdlinelib\* /s /f /q
+echo NuGet source packages:
+dir %~dp0..\..\nuget\nupkgsrc
+
+echo Deleting NuGet source stuff
+del %~dp0..\..\nuget\nupkg\cmdlinelib\* /s /f /q

 echo Packaging stuff
-..\nuget.exe init ..\..\nuget\nupkgsrc ..\..\nuget\nupkg
+%~dp0..\nuget.exe init %~dp0..\..\nuget\nupkgsrc %~dp0..\..\nuget\nupkg
+
+GOTO EOF
+:ERROR
+echo Failed!!!
+:EOF


Verify yarn installation with yarn --version

--- build.cmd
+++ build.cmd
@@ -16,11 +16,10 @@
 )

 :: Verify yarn installed
-where yarn 2>nul >nul
+yarn --version 2>nul >nul
 IF %ERRORLEVEL% NEQ 0 (
   echo "Missing yarn, installing via npm"
-  call npm install yarn -g
-  echo "Checking yarn install error level :" !ERRORLEVEL!
+  call npm install yarn -g --silent
   IF !ERRORLEVEL! NEQ 0 goto error
   echo "Finished installing Yarn."
 )


added

added

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

--- doc/haxeserver.bat
+++ doc/haxeserver.bat
@@ -0,0 +1,2 @@
+@echo off
+nekotools server


update bat

update bat

--- build.bat
+++ build.bat
@@ -4,9 +4,9 @@
 ::
 :: Edit this line to run the batch file for Qt environment.
 ::
-::call "C:\Qt\Qt5.4.2-MinGW\5.4\mingw491_32\bin\qtenv2.bat"
+::call "C:\Qt\Qt5.4.1-MinGW\5.4\mingw491_32\bin\qtenv2.bat"
 ::call "C:\Qt\Qt5.5.1-MinGW\5.5\mingw492_32\bin\qtenv2.bat"
-::call "C:\Qt\Qt5.4.0-msvc2013_64\5.4\msvc2013_64_opengl\bin\qtenv2.bat"
+::call "C:\Qt\Qt5.4.1\5.4\msvc2013_64_opengl\bin\qtenv2.bat"
 call "C:\Qt\Qt5.5.1\5.5\msvc2013_64\bin\qtenv2.bat"

 call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" amd64


Build.bat

Build.bat


fix unit tests

fix unit tests

--- build.bat
+++ build.bat
@@ -25,7 +25,7 @@
 if not "%errorlevel%"=="0" goto failure

 REM Unit tests
-cd NugetyCore\src\NugetyCore.Tests
+cd src\NugetyCore.Tests
 call dotnet test  --configuration %config%
 if not "%errorlevel%"=="0" goto failure


Added optional parameters to the NAnt build script

--- build.cmd
+++ build.cmd
@@ -1 +1 @@
-tools\nant-0.85\binaries\nant -buildfile:project.build+tools\nant-0.85\binaries\nant -buildfile:project.build %1 %2 %3 %4 %5


Update 'build.cmd' to pull Sake from v2 NuGet feed.

--- build.cmd
+++ build.cmd
@@ -23,7 +23,7 @@
 ) ELSE (
 	.nuget\NuGet.exe install KoreBuild -version %BUILDCMD_KOREBUILD_VERSION% -ExcludeVersion -o packages -nocache -pre
 )
-.nuget\NuGet.exe install Sake -version 0.2 -o packages -ExcludeVersion
+.nuget\NuGet.exe install Sake -ExcludeVersion -Source https://www.nuget.org/api/v2/ -Out packages

 IF "%SKIP_DNX_INSTALL%"=="1" goto run
 IF %BUILDCMD_DNX_VERSION%=="" (


Attempt to force a rebuild of the cache (again).

--- .build_dependencies.cmd
+++ .build_dependencies.cmd
@@ -8,7 +8,7 @@
 cd mpir\build.vc14
 msbuild.exe lib_mpir_gc/lib_mpir_gc.vcxproj /p:Configuration=Release /p:Platform=%PLATFORM% /p:PlatformToolset=v140 /verbosity:minimal
 cd ..\..
-
+
 curl -fsSL -o mpfr.zip https://github.com/BrianGladman/mpfr/archive/master.zip
 7z x mpfr.zip > NUL
 rename mpfr-master mpfr


Added bat file

Added bat file

error: pathspec 'gateway/bin/accesstoken-client.bat' did not match any file(s) known to git

--- gateway/bin/accesstoken-client.bat
+++ gateway/bin/accesstoken-client.bat
@@ -0,0 +1,52 @@
+@echo OFF
+
+REM ##############################################################################
+REM ##
+REM ##  Continuuity Reactor start up script for WINDOWS
+REM ##  Copyright 2012-2014 Continuuity,Inc. All Rights Reserved.
+REM ##
+REM ##############################################################################
+
+SET CONTINUUITY_HOME=%~dp0
+SET CONTINUUITY_HOME=%CONTINUUITY_HOME:~0,-5%
+SET JAVACMD=%JAVA_HOME%\bin\java.exe
+
+SET CLASSPATH=%CONTINUUITY_HOME%\lib\*;%CONTINUUITY_HOME%\conf\
+SET PATH=%PATH%;%CONTINUUITY_HOME%\libexec\bin
+
+REM Check for 64-bit version of OS. Currently not supporting 32-bit Windows
+IF NOT EXIST "%PROGRAMFILES(X86)%" (
+  echo 32-bit Windows operating system is currently not supported
+  GOTO :FINALLY
+)
+
+REM Check for correct setting for JAVA_HOME path
+if [%JAVA_HOME%] == [] (
+  echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+  echo Please set the JAVA_HOME variable in your environment to match the location of your Java installation.
+  GOTO :FINALLY
+)
+
+REM Check for Java version
+setlocal ENABLEDELAYEDEXPANSION
+set /a counter=0
+for /f "tokens=* delims= " %%f in ('%JAVACMD% -version 2^>^&1') do @(
+  if "!counter!"=="0" set line=%%f
+  set /a counter+=1
+)
+set line=%line:java version "1.=!!%
+set line=%line:~0,1%
+if NOT "%line%" == "6" (
+  if NOT "%line%" == "7" (
+    echo ERROR: Java version not supported. Please install Java 6 or 7 - other versions of Java are not yet supported.
+    GOTO :FINALLY
+  )
+)
+endlocal
+
+mkdir %CONTINUUITY_HOME%\logs > NUL 2>&1
+
+%JAVACMD% -classpath %CLASSPATH% com.continuuity.security.tools.AccessTokenClient %*
+
+:FINALLY
+


New option of MS VS build - 'test' - check HEAD without mailing

--- tests/run_msvs2008_tests.cmd
+++ tests/run_msvs2008_tests.cmd
@@ -8,7 +8,7 @@
 REM this stuff is worth it, you can buy me a beer in return.
 REM ----------------------------------------------------------------------------

-set VERSION=W4
+set VERSION=W5

 rem We still need CygWin for Unix utils, also sendEmail.exe
 PATH=c:\cygwin\bin;c:\buildbot\bin;%PATH%
@@ -43,13 +43,19 @@
 if "%1" == "branch" (
     set BRANCHBUILD=1
     set BRANCHNAME=%2
+    if "%BRANCHNAME%" == "" (
+        echo Empty branch name!
+        goto :end
+        )
     ) else (
     set BRANCHBUILD=0
 )

-if "%BRANCHNAME%" == "" (
-    echo Empty branch name!
-    goto :end
+if "%1" == "test" (
+    echo Test run, the mail won't be sent
+    set NOMAIL=1
+) else (
+    set NOMAIL=0
 )

 echo ===============================================================
@@ -116,12 +122,17 @@
 rem Exit point -------------------------------------------
 :mailresults

+cd %HOMEPATH%
+
 if %BRANCHBUILD% == 1 (
     echo Branch testing is finished
     goto :end
 )
+if %NOMAIL% == 1 (
+    echo Main trunk testing is finished
+    goto :end
+)

-cd %HOMEPATH%
 set MAILADDRESS="multimedia-dsp-2010@googlegroups.com"
 rem set MAILADDRESS="ggg_mail@inbox.ru"
 set MAILNAME="mdsp.buildbot@inbox.ru"


change include/lib path for java

change include/lib path for java

--- java/make_wrap.bat
+++ java/make_wrap.bat
@@ -10,7 +10,7 @@
 echo %SWIG% -java -package %PACKAGE_NAME% -outdir %PACKAGE_DIR% -c++ -Wall elgamal_if.i
 %SWIG% -java -package %PACKAGE_NAME% -outdir %PACKAGE_DIR% -c++ -Wall elgamal_if.i
 echo [[make dll]]
-cl /MD /DNOMINMAX /LD /Ox /EHsc elgamal_if_wrap.cxx -I%JAVA_INCLUDE% -I%JAVA_INCLUDE%\win32 -I../include -I../../cybozulib/include -I../../mie/include -I../../cybozulib_ext/openssl/include -I../../cybozulib_ext/mpir/include -I../../xbyak -I../../Lifted-ElGamal/include /link /LIBPATH:../../cybozulib_ext/mpir/lib /LIBPATH:../../cybozulib_ext/openssl/lib /OUT:../bin/elgamal_if_wrap.dll
+cl /MT /DNOMINMAX /LD /Ox /EHsc elgamal_if_wrap.cxx -I%JAVA_INCLUDE% -I%JAVA_INCLUDE%\win32 -I../include -I../../cybozulib/include -I../../mie/include -I../../cybozulib_ext/include -I../../xbyak -I../../Lifted-ElGamal/include /link /LIBPATH:../../cybozulib_ext/lib /OUT:../bin/elgamal_if_wrap.dll

 call run-elgamal.bat


Increased the number of processes used for source compilation to 4. This seems to perform better than using project level concurrency. Why 4 you ask?  Well, years of research suggest that...

--- msconfig/set_vars.bat
+++ msconfig/set_vars.bat
@@ -131,7 +131,7 @@

 set CONDOR_NOWARN=/D_CRT_SECURE_NO_DEPRECATE /D_CRT_SECURE_NO_WARNINGS /D_CRT_NONSTDC_NO_WARNINGS /D_CRT_NON_CONFORMING_SWPRINTFS
 REM /D_CONST_RETURN
-set CONDOR_CPPARGS=/GR
+set CONDOR_CPPARGS=/GR /MP4
 set CONDOR_DEFINE=/DHAVE_CONFIG_H /DBUILDID=%BID% %CONDOR_CPPARGS% %CONDOR_NOWARN%
 set CONDOR_INCLUDE=/I "..\src\h" /I "..\src\condor_includes" /I "..\src\condor_c++_util" /I "..\src\condor_daemon_client" /I "..\src\condor_daemon_core.V6" /I "..\src\condor_schedd.V6"
 set CONDOR_LIB=crypt32.lib mpr.lib psapi.lib mswsock.lib netapi32.lib imagehlp.lib ws2_32.lib powrprof.lib iphlpapi.lib userenv.lib


started windows configure.bat

started windows configure.bat

error: pathspec 'Scripts/Windows/configure.bat' did not match any file(s) known to git

--- Scripts/Windows/configure.bat
+++ Scripts/Windows/configure.bat
@@ -0,0 +1,8 @@
+@ECHO OFF
+
+:: No args.
+
+:: Registry changes.
+REG ADD "HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "ShowSecondsInSystemClock" /t "REG_DWORD" /d "1" /f
+
+PAUSE


A batch file to ease copying a build from a network share to a local machine for testing.

NOTRY=true
BUG=none
TEST=none

Review URL: https://chromiumcodereview.appspot.com/10831087

git-svn-id: de016e52bd170d2d4f2344f9bf92d50478b649e0@149483 0039d316-1c4b-4281-b951-d872f2087c98

error: pathspec 'tools/win/copy-installer.bat' did not match any file(s) known to git

--- tools/win/copy-installer.bat
+++ tools/win/copy-installer.bat
@@ -0,0 +1,119 @@
+ECHO OFF
+
+REM Copyright (c) 2012 The Chromium Authors. All rights reserved.
+REM Use of this source code is governed by a BSD-style license that can be
+REM found in the LICENSE file.
+
+REM Copies an installer and symbols from a build directory on a network share
+REM into the directory \[out|build]\[Debug|Release] on the current drive.
+REM
+REM Usage:
+REM   \\build.share\<path_to_checkout>\src\tools\win\copy-installer.bat
+REM
+REM By default, the script will copy the Debug build in the tree, falling back
+REM to the Release build if one is not found.  Similarly, the ninja output
+REM directory is preferred over the devenv output directory.  Specify
+REM "out|build" and/or "Debug|Release" (case matters) on the command line in
+REM any order to influence selection.  The defaults for location and build type
+REM can also be overridden in a given build tree by creating a
+REM "copy-installer.cfg" file alongside the .gclient file that sets the OUTPUT
+REM and/or BUILDTYPE variables.
+REM
+REM Install Robocopy for superior performance on Windows XP if desired (it is
+REM present by default on Vista+).
+
+SETLOCAL
+
+REM Get the path to the build tree's src directory.
+CALL :_canonicalize "%~dp0..\.."
+SET FROM=%RET%
+
+REM Read local configuration (set OUTPUT and BUILDTYPE there).
+IF EXIST "%FROM%\..\copy-installer.cfg" CALL "%FROM%\..\copy-installer.cfg"
+
+REM Read OUTPUT and/or BUILDTYPE from command line.
+FOR %%a IN (%1 %2) do (
+IF "%%a"=="out" SET OUTPUT=out
+IF "%%a"=="build" SET OUTPUT=build
+IF "%%a"=="Debug" SET BUILDTYPE=Debug
+IF "%%a"=="Release" SET BUILDTYPE=Release
+)
+
+CALL :_find_build
+IF "%OUTPUT%%BUILDTYPE%"=="" (
+ECHO No build found to copy.
+EXIT 1
+)
+
+SET FROM=%FROM%\%OUTPUT%\%BUILDTYPE%
+SET TO=\%OUTPUT%\%BUILDTYPE%
+
+REM Figure out what files to copy based on the component type (shared/static).
+IF EXIST "%FROM%\base.dll" (
+SET TOCOPY=*.pdb setup.exe setup.exe.manifest chrome.packed.7z *.dll
+SET INSTALLER=setup.exe
+) ELSE (
+SET TOCOPY=*.pdb mini_installer.exe
+SET INSTALLER=mini_installer.exe
+)
+
+REM Branch to handle copying via robocopy (fast) or xcopy (slow).
+robocopy /? 1> nul 2> nul
+IF "%ERRORLEVEL%"=="9009" GOTO _xcopy else GOTO _robocopy
+
+REM robocopy is rsync, basically.
+:_robocopy
+robocopy "%FROM%" "%TO%" %TOCOPY% /J /MT
+GOTO _copydone
+
+REM xcopy is not.
+:_xcopy
+IF NOT exist "%TO%" mkdir "%TO%"
+call :_xcopy_hack %TOCOPY%
+GOTO _copydone
+
+:_copydone
+ECHO Ready to run/debug %TO%\%INSTALLER%.
+GOTO :EOF
+
+REM All labels henceforth are subroutines intended to be invoked by CALL.
+
+REM Search for a mini_installer.exe in the candidate build outputs.
+:_find_build
+IF "%OUTPUT%"=="" (
+SET OUTPUTS=out build
+) ELSE (
+SET OUTPUTS=%OUTPUT%
+SET OUTPUT=
+)
+
+IF "%BUILDTYPE%"=="" (
+SET BUILDTYPES=Debug Release
+) ELSE (
+SET BUILDTYPES=%BUILDTYPE%
+SET BUILDTYPE=
+)
+
+FOR %%o IN (%OUTPUTS%) DO (
+FOR %%f IN (%BUILDTYPES%) DO (
+IF EXIST "%FROM%\%%o\%%f\mini_installer.exe" (
+SET OUTPUT=%%o
+SET BUILDTYPE=%%f
+GOTO :EOF
+)
+)
+)
+GOTO :EOF
+
+REM We can't use a for..in..do loop since we have wildcards, so we make a call
+REM to this with the files to copy.
+:_xcopy_hack
+SHIFT
+IF "%0"=="" GOTO :EOF
+xcopy "%FROM%\%0" "%TO%" /y
+GOTO _xcopy_hack
+
+REM Canonicalize the first argument, returning it in RET.
+:_canonicalize
+SET RET=%~f1
+GOTO :EOF


windows-build-deps.cmd: Extract Qt sources to its own foldert and use deps/qt as the install prefix. Added make install step. This needs to be done if we want to extract the deps/qt/include to svn deps. If the install step is not done, or done to the build folder the include is littered with ../src/something/some.h lines and also private headers that should not be shipped.

--- tools/windows-build-deps.cmd
+++ tools/windows-build-deps.cmd
@@ -155,14 +155,8 @@

 :SKIP_OPENSSL

-:: Add qmake.exe from our downloaded Qt to PATH.
-set PATH=%DEPS%\Qt\bin;%PATH%
-
-set QMAKESPEC=%DEPS%\Qt\mkspecs\win32-msvc2008
-set QTDIR=%DEPS%\Qt
-
 :: Qt
-IF NOT EXIST "%DEPS%\Qt". (
+IF NOT EXIST "%DEPS%\qt". (
    cd "%DEPS%"
    IF NOT EXIST qt-everywhere-opensource-src-4.7.4.zip. (
       cecho {0D}Downloading Qt 4.7.4. Please be patient, this will take a while.{# #}{\n}
@@ -170,17 +164,19 @@
       IF NOT %ERRORLEVEL%==0 GOTO :ERROR
    )

-   cecho {0D}Extracting Qt 4.7.4 sources to "%DEPS%\Qt".{# #}{\n}
-   7za x -y qt-everywhere-opensource-src-4.7.4.zip
-   IF NOT %ERRORLEVEL%==0 GOTO :ERROR
-   ren qt-everywhere-opensource-src-4.7.4 qt
-   IF NOT EXIST "%DEPS%\Qt" GOTO :ERROR
+   cecho {0D}Extracting Qt 4.7.4 sources to "%DEPS%\qt".{# #}{\n}
+   mkdir qt
+   7za x -y -oqt qt-everywhere-opensource-src-4.7.4.zip
+   IF NOT %ERRORLEVEL%==0 GOTO :ERROR
+   cd qt
+   ren qt-everywhere-opensource-src-4.7.4 qt-src-4.7.4
+   IF NOT EXIST "%DEPS%\qt" GOTO :ERROR
 ) ELSE (
    cecho {0D}Qt already downloaded. Skipping.{# #}{\n}
 )

 IF %USE_JOM%==FALSE GOTO :SKIP_JOM
-IF NOT EXIST "%DEPS%\Qt\jom\jom.exe". (
+IF NOT EXIST "%DEPS%\qt\jom\jom.exe". (
    cd "%DEPS%"
    IF NOT EXIST jom_1_0_11.zip. (
       cecho {0D}Downloading JOM build tool for Qt.{# #}{\n}
@@ -188,11 +184,11 @@
       IF NOT %ERRORLEVEL%==0 GOTO :ERROR
    )

-   cecho {0D}Installing JOM build tool for to %DEPS%\Qt\jom.{# #}{\n}
-   mkdir %DEPS%\Qt\jom
-   7za x -y -oQt\jom jom_1_0_11.zip
-) ELSE (
-   cecho {0D}JOM already installed to %DEPS%\Qt\jom. Skipping.{# #}{\n}
+   cecho {0D}Installing JOM build tool for to %DEPS%\qt\jom.{# #}{\n}
+   mkdir %DEPS%\qt\jom
+   7za x -y -oqt\jom jom_1_0_11.zip
+) ELSE (
+   cecho {0D}JOM already installed to %DEPS%\qt\jom. Skipping.{# #}{\n}
 )

 :SKIP_JOM
@@ -202,34 +198,40 @@
 :: Hence the secondary IF to print it out when build is enabled. Only print these if Qt will be built
 SET QT_OPENSSL_CONFIGURE=
 IF %BUILD_OPENSSL%==TRUE (
-   IF NOT EXIST "%DEPS%\Qt\lib\QtWebKit4.dll". cecho {0D}Configuring OpenSSL into the Qt build with:{# #}{\n}
+   IF NOT EXIST "%DEPS%\qt\lib\QtWebKit4.dll". cecho {0D}Configuring OpenSSL into the Qt build with:{# #}{\n}
    SET QT_OPENSSL_CONFIGURE=-openssl -I "%DEPS%\openssl\include" -L "%DEPS%\openssl\lib"
 ) ELSE (
-   IF NOT EXIST "%DEPS%\Qt\lib\QtWebKit4.dll". cecho {0D}OpenSSL build disabled, not confguring OpenSSL to Qt.{# #}{\n}
+   IF NOT EXIST "%DEPS%\qt\lib\QtWebKit4.dll". cecho {0D}OpenSSL build disabled, not confguring OpenSSL to Qt.{# #}{\n}
 )
 IF %BUILD_OPENSSL%==TRUE (
-    IF NOT EXIST "%DEPS%\Qt\lib\QtWebKit4.dll". echo '%QT_OPENSSL_CONFIGURE%'
-)
-
-IF NOT EXIST "%DEPS%\Qt\lib\QtWebKit4.dll". (
-   cd "%DEPS%\Qt"
+    IF NOT EXIST "%DEPS%\qt\lib\QtWebKit4.dll". echo '%QT_OPENSSL_CONFIGURE%'
+)
+
+IF NOT EXIST "%DEPS%\qt\lib\QtWebKit4.dll". (
+   IF NOT EXIST "%DEPS%\qt\qt-src-4.7.4". (
+      cecho {0E}Warning: %DEPS%\qt\qt-src-4.7.4 does not exist, extracting Qt failed?.{# #}{\n}
+      GOTO :ERROR
+   )
+   cd "%DEPS%\qt\qt-src-4.7.4"

    IF NOT EXIST "configure.cache". (
       cecho {0D}Configuring Qt build. Please answer 'y'!{# #}{\n}
-      configure -platform win32-msvc2008 -debug-and-release -opensource -shared -ltcg -no-qt3support -no-opengl -no-openvg -no-dbus -nomake examples -nomake demos -qt-zlib -qt-libpng -qt-libmng -qt-libjpeg -qt-libtiff %QT_OPENSSL_CONFIGURE%
+      configure -platform win32-msvc2008 -debug-and-release -opensource -prefix "%DEPS%\qt" -shared -ltcg -no-qt3support -no-opengl -no-openvg -no-dbus -no-phonon -no-phonon-backend -nomake examples -nomake demos -qt-zlib -qt-libpng -qt-libmng -qt-libjpeg -qt-libtiff %QT_OPENSSL_CONFIGURE%
       IF NOT %ERRORLEVEL%==0 GOTO :ERROR
    ) ELSE (
-      cecho {0D}Qt already configured. Remove %DEPS%\Qt\configure.cache to trigger a reconfigure.{# #}{\n}
+      cecho {0D}Qt already configured. Remove %DEPS%\qt\qt-src-4.7.4\configure.cache to trigger a reconfigure.{# #}{\n}
    )

    cecho {0D}Building Qt. Please be patient, this will take a while.{# #}{\n}
    IF %USE_JOM%==TRUE (
       cecho {0D}- Building Qt with jom{# #}{\n}
-      jom\jom.exe
+      "%DEPS%\Qt\jom\jom.exe"
       :: Qt build system is slightly broken: see https://bugreports.qt-project.org/browse/QTBUG-6470. Work around the issue.
       set ERRORLEVEL=0
       del /s /q mocinclude.tmp
-      jom\jom.exe
+      "%DEPS%\Qt\jom\jom.exe"
+      cecho {0D}Installing Qt to prefix %DEPS%\qt{# #}{\n}
+      "%DEPS%\Qt\jom\jom.exe" install
    ) ELSE (
       cecho {0D}- Building Qt with nmake{# #}{\n}
       nmake /nologo
@@ -237,10 +239,12 @@
       set ERRORLEVEL=0
       del /s /q mocinclude.tmp
       nmake /nologo
+      cecho {0D}Installing Qt to prefix %DEPS%\qt{# #}{\n}
+      nmake install
    )

-   IF NOT EXIST "%DEPS%\Qt\lib\QtWebKit4.dll". (
-      cecho {0E}Warning: Qt\lib\QtWebKit4.dll not present, Qt build failed?.{# #}{\n}
+   IF NOT EXIST "%DEPS%\qt\bin\QtWebKit4.dll". (
+      cecho {0E}Warning: qt\bin\QtWebKit4.dll not present, Qt build failed?.{# #}{\n}
       GOTO :ERROR
    )

@@ -250,6 +254,12 @@
 ) ELSE (
    cecho {0D}Qt already built. Skipping.{# #}{\n}
 )
+
+:: Setup now built Qt to PATH (qmake), QTDIR and QMAKESPEC.
+:: These will be utilized by other dependencies that need Qt.
+set PATH=%DEPS%\qt\bin;%PATH%
+set QMAKESPEC=%DEPS%\qt\mkspecs\win32-msvc2008
+set QTDIR=%DEPS%\qt

 IF NOT EXIST "%TUNDRA_BIN%\QtWebKit4.dll". (
    cecho {0D}Deploying Qt DLLs to Tundra bin\.{# #}{\n}


Added automatic restarter

Added automatic restarter

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

--- utility.bat
+++ utility.bat
@@ -0,0 +1,4 @@
+taskkill /F /IM FacebookMessenger.exe
+timeout /T 5
+start C:\path\to\FacebookMessenger.exe
+exit


Fixed a bug with the new AWS CLI

Fixed a bug with the new AWS CLI

--- awsume.bat
+++ awsume.bat
@@ -6,7 +6,7 @@
   del "%userprofile%\.aws\cli\cache\%1*.json"
 )

-aws s3 ls --profile %1 > nul
+call aws s3 ls --profile %1 > nul

 IF ERRORLEVEL 1 GOTO end


- Removed pause - Silent deletion of previous zip

--- mso_maker/make_mso.bat
+++ mso_maker/make_mso.bat
@@ -31,10 +31,8 @@
 xcopy %BASE_DIR% %MP_DIR%\%CODE_DIR% /S /Y /Q

 echo Zipping up %MP_DIR% to %ZIPNAME%_%D_VER%.7z
-del %ZIPNAME%_%D_VER%.7z
+del %ZIPNAME%_%D_VER%.7z 1> nul
 "c:\program files\7-zip\7z.exe" a %ZIPNAME%_%D_VER%.7z %MP_DIR%
-
-pause

 rem cleanup
 echo Deleting %MP_DIR% working folder


--- C/include/configure.bat
+++ C/include/configure.bat
@@ -193,13 +193,14 @@
 :#                  Fixed option -vs, and split it into options -vsp and -vsn.*
 :#   2019-04-16 JFL Merged in the 2019-01-20 change made for Ag.              *
 :#   2019-06-12 JFL Added the user full name and email to %CONFIG.BAT%.	      *
+:#   2020-06-30 JFL Added the 7-Zip LZMA SDK to the list of known SDKs.       *
 :#                                                                            *
-:#       Copyright 2016-2019 Hewlett Packard Enterprise Development LP       *
+:#       Copyright 2016-2020 Hewlett Packard Enterprise Development LP       *
 :# Licensed under the Apache 2.0 license  www.apache.org/licenses/LICENSE-2.0 *
 :#*****************************************************************************

 setlocal EnableExtensions EnableDelayedExpansion
-set "VERSION=2019-06-15"
+set "VERSION=2020-06-30"
 set "SCRIPT=%~nx0"				&:# Script name
 set "SPATH=%~dp0" & set "SPATH=!SPATH:~0,-1!"	&:# Script path, without the trailing \
 set  "ARG0=%~f0"				&:# Script full pathname
@@ -2315,6 +2316,9 @@
 set "SDK.BOOST.NAME=Boost C++ libraries"
 set "SDK.BOOST.FILE=boost\preprocessor.hpp"

+set "SDK.LZMA.NAME=7-Zip LZMA SDK"
+set "SDK.LZMA.FILE=bin\7zS2con.sfx"
+
 :# At this stage, we have all configure.bat mechanics ready, and compilers identified
 :Configure_init_done


don't build twice

don't build twice

--- create.bat
+++ create.bat
@@ -1,5 +1,11 @@
+#!/bin/sh
+
+if [ `ls priv/db | wc -l` != "9" ]; then
+
 erl -noshell -pa ebin -s ucs rebuild_database unidata -s init stop
 erl -noshell -pa ebin -s ucs rebuild_database mnemonics -s init stop
 erl -noshell -pa ebin -s ucs rebuild_database mnemonics -s init stop
 erl -noshell -pa ebin -s ucs rebuild_database mibenum -s init stop
 erl -noshell -pa ebin -s ucs rebuild_database mappings testdata -s init stop
+
+fi


stop cleaning script from logging not found messages

--- clean.bat
+++ clean.bat
@@ -1,10 +1,12 @@
 @echo off

-for /d %%d in ("*") do rmdir /s /q "%%d\bin"
-for /d %%d in ("*") do rmdir /s /q "%%d\obj"
+for /d %%d in ("*") do (
+	if exist "%%d\bin" rmdir /s /q "%%d\bin"
+	if exist "%%d\obj" rmdir /s /q "%%d\obj"
+)

-del /q *.db
-del /q *.log
+if exist *.db del /q *.db
+if exist *.log del /q *.log

-rmdir /s /q "packages"
-rmdir /s /q "TestResults"
+if exist "packages" rmdir /s /q "packages"
+if exist "TestResults" rmdir /s /q "TestResults"


setup.py will not print each individual file

--- pkg/windows/build.bat
+++ pkg/windows/build.bat
@@ -36,7 +36,7 @@
 :: Install Current Version of salt
 @echo  %0 :: Install Current Version of salt...
 @echo ---------------------
-"%PyDir%\python.exe" "%SrcDir%\setup.py" install --force
+"%PyDir%\python.exe" "%SrcDir%\setup.py" --quiet install --force

 :: Build the Salt Package
 @echo  %0 :: Build the Salt Package...


support long format

support long format

--- test/test_address.bat
+++ test/test_address.bat
@@ -1,4 +1,5 @@
 @echo off
+set FILTER=cat
 if /i "%1"=="64" (
 	set OPT2=-DXBYAK64
 	set OPT3=win64
@@ -25,7 +26,7 @@
 address %1% > a.asm
 echo nasm -f %OPT3% -l a.lst a.asm
 nasm -f %OPT3% -l a.lst a.asm
-awk "!/warning:/ {print $3}" < a.lst > ok.lst
+awk "{if (index($3, ""-"")) { conti=substr($3, 0, length($3) - 1) } else { conti = conti $3; print conti; conti = """" }} " < a.lst |%FILTER% > ok.lst
 echo address %1% jit > nm.cpp
 address %1% jit > nm.cpp
 echo cl -I../ -DXBYAK_TEST nm_frame.cpp %OPT% %OPT2%


Vss2Git

--- src/makeTradeBuild.bat
+++ src/makeTradeBuild.bat
@@ -20,3 +20,5 @@
 pause
 vb6 /m TradeBuildUI\TradeBuildUI.vbp
 pause
+vb6 /m TBDataCollector\TBDataCollector.vbp
+pause


Update bigfix_setup_root_eval.bat

Update bigfix_setup_root_eval.bat

--- CMD/bigfix_setup_root_eval.bat
+++ CMD/bigfix_setup_root_eval.bat
@@ -15,8 +15,11 @@

 REM https://github.com/jgstew/bigfix-content/blob/f36708ebf7af38f84a286f3b79131faccb1d2e9c/fixlet/Install%20SQL%20Server%20Management%20Studio%2016.5.1%20-%20Windows.bes
-REM Download SQL Server Management Studio
+REM Download SQL Server Management Studio:
 powershell -command "& { (New-Object Net.WebClient).DownloadFile('https://download.microsoft.com/download/0/5/B/05B2AF8F-906F-4C57-A58E-5780F64F9D62/SSMS-Setup-ENU.exe', '%BASEFOLDER%\SSMS-Setup-ENU.exe') }" -ExecutionPolicy Bypass
 REM https://download.microsoft.com/download/0/5/B/05B2AF8F-906F-4C57-A58E-5780F64F9D62/SSMS-Setup-ENU.exe
-REM Install SQL Server Management Studio ?
+REM Install SQL Server Management Studio:
 %BASEFOLDER%\SSMS-Setup-ENU.exe /install /quiet /norestart
+
+REM for some reason, this didn't create a start menu shortcut it seems for SQL Server Management Studio
+


Fix execute error. iomter.exe -> iometer.exe

--- IOmeter_bat_tool/Run_me.bat
+++ IOmeter_bat_tool/Run_me.bat
@@ -33,11 +33,11 @@

 echo.
 echo b "iometer_HBA CARD.icf"
-::iomter.exe /c "iometer_HBA CARD.icf"  /r "results_%project_name%_HBA_CARD_%dt%.csv"
+iometer.exe /c "iometer_HBA CARD.icf"  /r "results_%project_name%_HBA_CARD_%dt%.csv"

 echo.
 echo b "HDD Compatibility.icf"
-::iomter.exe /c "HDD Compatibility.icf" /r "results_%project_name%_HDD_Comp_%dt%.csv"
+iometer.exe /c "HDD Compatibility.icf" /r "results_%project_name%_HDD_Comp_%dt%.csv"

 echo.
 echo ɦW "results_%project_name%_HBA_CARD_%dt%.csv"


Making copy more explicit

Making copy more explicit

--- deploy.bat
+++ deploy.bat
@@ -1 +1,2 @@
-copy TEA5767N.* "C:\Documents and Settings\Roger\Meus documentos\Arduino\libraries\TEA5767N\"+copy TEA5767N.cpp "C:\Documents and Settings\Roger\Meus documentos\Arduino\libraries\TEA5767N\"
+copy TEA5767N.h "C:\Documents and Settings\Roger\Meus documentos\Arduino\libraries\TEA5767N\"


put back nuget restore, without the solution directory path

--- deploy.cmd
+++ deploy.cmd
@@ -93,9 +93,7 @@
 :: 3. Run DNU Restore, Nuget restore for specific projects
 call %DNX_RUNTIME%\bin\dnu restore "%DEPLOYMENT_SOURCE%" %SCM_DNU_RESTORE_OPTIONS%
 IF !ERRORLEVEL! NEQ 0 goto error
-call :ExecuteCmd nuget restore "%DEPLOYMENT_SOURCE%\AllReady.Models\AllReady.Models.csproj" -SolutionDirectory %DEPLOYMENT_SOURCE%
-IF !ERRORLEVEL! NEQ 0 goto error
-call :ExecuteCmd nuget restore "%DEPLOYMENT_SOURCE%\NotificationsProcessor\NotificationsProcessor.csproj" -SolutionDirectory %DEPLOYMENT_SOURCE%
+call :ExecuteCmd nuget restore "%DEPLOYMENT_SOURCE%\NotificationsProcessor\NotificationsProcessor.csproj"
 IF !ERRORLEVEL! NEQ 0 goto error

 :: 4. Run Our Custom build steps:


Fix deploy script

Fix deploy script

--- deploy.cmd
+++ deploy.cmd
@@ -112,10 +112,10 @@
   popd
 )

-:: 4. Run Gulp task
+:: 4. Compile Typescript
 IF EXIST "%DEPLOYMENT_TARGET%\tsconfig.json" (
  pushd "%DEPLOYMENT_TARGET%"
- call .\node_modules\.bin\tsc
+ call :ExecuteCmd !NPM_CMD! run build
  IF !ERRORLEVEL! NEQ 0 goto error
  popd
 )


added unit tests to deploy script

added unit tests to deploy script

--- deploy.cmd
+++ deploy.cmd
@@ -24,6 +24,10 @@

 IF NOT DEFINED DEPLOYMENT_SOURCE (
   SET DEPLOYMENT_SOURCE=%~dp0%.
+)
+
+IF NOT DEFINED DEPLOYMENT_TEMP (
+  SET DEPLOYMENT_TEMP=%~dp0%..\temp
 )

 IF NOT DEFINED DEPLOYMENT_TARGET (
@@ -54,46 +58,29 @@

 echo Handling function App deployment.

-if "%SCM_USE_FUNCPACK%" == "1" (
-  call :DeployWithFuncPack
-) else (
-  call :DeployWithoutFuncPack
-)
+call :DeployWithoutFuncPack

 goto end
-
-:DeployWithFuncPack
-setlocal
-
-echo Using funcpack to optimize cold start
-
-:: 1. Copy to local storage
-echo Copying repository files to local storage
-xcopy "%DEPLOYMENT_SOURCE%\functions" "%DEPLOYMENT_TEMP%" /seyiq
-IF !ERRORLEVEL! NEQ 0 goto error
-
-:: 2. Restore npm
-call :RestoreNpmPackages "%DEPLOYMENT_TEMP%"
-
-:: 3. FuncPack
-pushd "%DEPLOYMENT_TEMP%"
-call funcpack pack .
-IF !ERRORLEVEL! NEQ 0 goto error
-popd
-
-:: 4. KuduSync
-call :ExecuteCmd "%KUDU_SYNC_CMD%" -v 50 -f "%DEPLOYMENT_TEMP%" -t "%DEPLOYMENT_TARGET%" -n "%NEXT_MANIFEST_PATH%" -p "%PREVIOUS_MANIFEST_PATH%" -i ".git;.hg;.deployment;deploy.cmd;node_modules"
-IF !ERRORLEVEL! NEQ 0 goto error
-
-exit /b %ERRORLEVEL%
-

 :DeployWithoutFuncPack
 setlocal

 echo Not using funcpack because SCM_USE_FUNCPACK is not set to 1

-:: 1. KuduSync
+:: 1. Copy to local storage
+echo Copying all files to local storage
+xcopy "%DEPLOYMENT_SOURCE%" "%DEPLOYMENT_TEMP%" /seyiq
+IF !ERRORLEVEL! NEQ 0 goto error
+
+:: 2. Restore npm for test
+call :RestoreNpmPackages "%DEPLOYMENT_TEMP%" "test"
+
+echo running unit tests
+pushd "%DEPLOYMENT_TEMP%"
+call node tests\test.run.all.js tests
+IF !ERRORLEVEL! NEQ 0 goto error
+popd
+
 IF /I "%IN_PLACE_DEPLOYMENT%" NEQ "1" (
   call :ExecuteCmd "%KUDU_SYNC_CMD%" -v 50 -f "%DEPLOYMENT_SOURCE%\functions" -t "%DEPLOYMENT_TARGET%" -n "%NEXT_MANIFEST_PATH%" -p "%PREVIOUS_MANIFEST_PATH%" -i ".git;.hg;.deployment;deploy.cmd"
   IF !ERRORLEVEL! NEQ 0 goto error
@@ -104,19 +91,27 @@
 IF !ERRORLEVEL! NEQ 0 goto error

 :: 2. Restore npm
-call :RestoreNpmPackages "%DEPLOYMENT_TARGET%"
+call :RestoreNpmPackages "%DEPLOYMENT_TARGET%" "prod"

 exit /b %ERRORLEVEL%
-

 :RestoreNpmPackages
 setlocal

-echo Restoring npm packages in %1
+echo Restoring npm packages in %1
+echo restore is %2

 IF EXIST "%1\package.json" (
   pushd "%1"
-  call npm install --production
+
+  if %2 == "test" (
+    echo calling install
+    call npm install
+  ) else (
+    echo calling install production
+    call npm install --production
+  )
+
   IF !ERRORLEVEL! NEQ 0 goto error
   popd
 )
@@ -124,7 +119,11 @@
 FOR /F "tokens=*" %%i IN ('DIR /B %1 /A:D') DO (
   IF EXIST "%1\%%i\package.json" (
     pushd "%1\%%i"
-    call npm install --production
+    if %2 == "test" (
+      call npm install
+    ) else (
+      call npm install --production
+    )
     IF !ERRORLEVEL! NEQ 0 goto error
     popd
   )


Weird issue

Weird issue

--- deploy.cmd
+++ deploy.cmd
@@ -30,4 +30,4 @@
 echo Sed command
 sed -i 's/GOAPPBINARY/%FOLDER%.exe/g' %HOME%\site\wwwroot\Web.Config

-echo Finished+echo Finished


boner rage

boner rage

--- deploy.cmd
+++ deploy.cmd
@@ -91,7 +91,7 @@
 echo Running Tests
 %DEPLOYMENT_SOURCE%\packages\NUnit.Runners.2.6.3\tools\nunit-console.exe "%DEPLOYMENT_SOURCE%\TeamSauce.Test\bin\Release\TeamSauce.Test.dll"
 echo Done runnning tests.
-TeamSauce.Test.dll
+
 IF !ERRORLEVEL! NEQ 0 (
 	echo TESTS FAILED!
 	goto error


exrun.bat fixes for MinGW

exrun.bat fixes for MinGW

git-svn-id: 1a57124bbb9aca193a920d0ffd753d488afb922b@2189 5946f024-35f4-0310-b1b3-9a3be3380cfb

--- exrun.bat
+++ exrun.bat
@@ -1,6 +1,8 @@
 @echo off
 set PROG=%1
+if not exist %PROG% set PROG=%1.exe
 if not exist %PROG% set PROG=Debug\%1
+if not exist %PROG% set PROG=Debug\%1.exe
 shift

 set PATH=Debug;%PATH%


Space support for path and repo names in Windows.

--- gitbox.bat
+++ gitbox.bat
@@ -83,7 +83,11 @@
     goto end
 )
 if /i '%1'=='create' (
-    set repository="%repos%"\%2.git
+    rem Strip sorrounding quotes
+    set repo_name=%2
+    set repo_name=!repo_name:"=!
+
+    set repository="%repos%\!repo_name!.git"
     if not exist !repository! (
         rem Create a new empty repository
         echo Creating empty repository...
@@ -92,12 +96,12 @@

         rem Since git doesn't like empty repos, place a README in there are save the user a lof of headaches
         echo Initializing new repository...
-        set checkout="%TEMP%"\%2
+        set checkout="%TEMP%\!repo_name!"
         md !checkout!
         git clone --quiet --origin gitbox file://!repository! !checkout! 2>nul

         echo Enjoy your GitBox repository > !checkout!\README
-        set pwd=%CD%
+        set pwd="%CD%"
         cd /d !checkout!
         git add README
         git commit --quiet -m "Created the repository" 2>nul
@@ -107,16 +111,21 @@
         rmdir /s /q !checkout!
         echo Repository successfully created.
     ) else (
-        echo A repository named "%2" is already tracked by GitBox.
+        echo A repository named "!repo_name!" is already tracked by GitBox.
         pause
     )
     goto end
 )
 if /i '%1'=='clone' (
+    rem Strip sorrounding quotes
+    set repo_name=%2
+    set repo_name=!repo_name:"=!
+
     rem Clone the specified repository with the gitbox repo as the master
-    set repository="%repos%"\%2.git
+    set repository="%repos%\!repo_name!.git"
     if exist !repository! (
         echo Cloning repository...
+        echo !repository!
         git clone --quiet --origin gitbox file://!repository!
         if errorlevel 1 (
             echo Failed to clone repository.
@@ -124,7 +133,7 @@
             echo Repository successfully cloned.
         )
     ) else (
-        echo GitBox couldn't find the repository named: %2
+        echo GitBox couldn't find the repository named: !repo_name!
         pause
     )
     goto end
@@ -137,8 +146,12 @@
         echo you need to invoke the command from within the repo.
         pause
     ) else (
+        rem Strip sorrounding quotes
+        set repo_name=%2
+        set repo_name=!repo_name:"=!
+
         rem Create a new empty repository
-        set repository="%repos%"\%2.git
+        set repository="%repos%\!repo_name!.git"
         if not exist !repository! (
             echo Creating empty repository...
             md !repository!
@@ -150,7 +163,7 @@
             git push --quiet gitbox master
             echo Repository successfully imported.
         ) else (
-            echo A repository named "%2" is already tracked by GitBox.
+            echo A repository named "!repo_name!" is already tracked by GitBox.
             pause
         )
     )


Updated bat

Updated bat

--- hangar.bat
+++ hangar.bat
@@ -1,11 +1,6 @@
 @ECHO off
 cls
-IF not exist node_modules (
-	echo node_modules folder is not present, I'm going to download packages
-	pause
-	call npm install
-	if errorlevel 1 goto errorNode
-)
+call npm install
 :start
 ECHO.
 ECHO Please select which tasks should Hangar run
@@ -27,7 +22,5 @@
 :weinre
 grunt weinre
 goto end
-:errorNode
-echo There are some errors in the package.json, download it again
 :end
-pause
+pause


docs/make.bat: Don't generate modules.rst as it duplicates what is in the table of contents. Fixes #154.

--- docs/make.bat
+++ docs/make.bat
@@ -83,7 +83,7 @@
 )

 if "%1" == "rst" (
-        %SPHINXAPIDOC% -f -o . .. ../tests
+        %SPHINXAPIDOC% -f -T -o . .. ../tests
 	if errorlevel 1 exit /b 1
 	echo.
 	echo.Build finished. The RST pages are in in the current directory.


Bugfix #27, missing make.bat

Bugfix #27, missing make.bat

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

--- docs/make.bat
+++ docs/make.bat
@@ -0,0 +1,242 @@
+@ECHO OFF
+
+REM Command file for Sphinx documentation
+
+if "%SPHINXBUILD%" == "" (
+	set SPHINXBUILD=sphinx-build
+)
+set BUILDDIR=_build
+set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS% .
+set I18NSPHINXOPTS=%SPHINXOPTS% .
+if NOT "%PAPER%" == "" (
+	set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS%
+	set I18NSPHINXOPTS=-D latex_paper_size=%PAPER% %I18NSPHINXOPTS%
+)
+
+if "%1" == "" goto help
+
+if "%1" == "help" (
+	:help
+	echo.Please use `make ^<target^>` where ^<target^> is one of
+	echo.  html       to make standalone HTML files
+	echo.  dirhtml    to make HTML files named index.html in directories
+	echo.  singlehtml to make a single large HTML file
+	echo.  pickle     to make pickle files
+	echo.  json       to make JSON files
+	echo.  htmlhelp   to make HTML files and a HTML help project
+	echo.  qthelp     to make HTML files and a qthelp project
+	echo.  devhelp    to make HTML files and a Devhelp project
+	echo.  epub       to make an epub
+	echo.  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter
+	echo.  text       to make text files
+	echo.  man        to make manual pages
+	echo.  texinfo    to make Texinfo files
+	echo.  gettext    to make PO message catalogs
+	echo.  changes    to make an overview over all changed/added/deprecated items
+	echo.  xml        to make Docutils-native XML files
+	echo.  pseudoxml  to make pseudoxml-XML files for display purposes
+	echo.  linkcheck  to check all external links for integrity
+	echo.  doctest    to run all doctests embedded in the documentation if enabled
+	goto end
+)
+
+if "%1" == "clean" (
+	for /d %%i in (%BUILDDIR%\*) do rmdir /q /s %%i
+	del /q /s %BUILDDIR%\*
+	goto end
+)
+
+
+%SPHINXBUILD% 2> nul
+if errorlevel 9009 (
+	echo.
+	echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
+	echo.installed, then set the SPHINXBUILD environment variable to point
+	echo.to the full path of the 'sphinx-build' executable. Alternatively you
+	echo.may add the Sphinx directory to PATH.
+	echo.
+	echo.If you don't have Sphinx installed, grab it from
+	echo.http://sphinx-doc.org/
+	exit /b 1
+)
+
+if "%1" == "html" (
+	%SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The HTML pages are in %BUILDDIR%/html.
+	goto end
+)
+
+if "%1" == "dirhtml" (
+	%SPHINXBUILD% -b dirhtml %ALLSPHINXOPTS% %BUILDDIR%/dirhtml
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The HTML pages are in %BUILDDIR%/dirhtml.
+	goto end
+)
+
+if "%1" == "singlehtml" (
+	%SPHINXBUILD% -b singlehtml %ALLSPHINXOPTS% %BUILDDIR%/singlehtml
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The HTML pages are in %BUILDDIR%/singlehtml.
+	goto end
+)
+
+if "%1" == "pickle" (
+	%SPHINXBUILD% -b pickle %ALLSPHINXOPTS% %BUILDDIR%/pickle
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished; now you can process the pickle files.
+	goto end
+)
+
+if "%1" == "json" (
+	%SPHINXBUILD% -b json %ALLSPHINXOPTS% %BUILDDIR%/json
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished; now you can process the JSON files.
+	goto end
+)
+
+if "%1" == "htmlhelp" (
+	%SPHINXBUILD% -b htmlhelp %ALLSPHINXOPTS% %BUILDDIR%/htmlhelp
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished; now you can run HTML Help Workshop with the ^
+.hhp project file in %BUILDDIR%/htmlhelp.
+	goto end
+)
+
+if "%1" == "qthelp" (
+	%SPHINXBUILD% -b qthelp %ALLSPHINXOPTS% %BUILDDIR%/qthelp
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished; now you can run "qcollectiongenerator" with the ^
+.qhcp project file in %BUILDDIR%/qthelp, like this:
+	echo.^> qcollectiongenerator %BUILDDIR%\qthelp\seabird.qhcp
+	echo.To view the help file:
+	echo.^> assistant -collectionFile %BUILDDIR%\qthelp\seabird.ghc
+	goto end
+)
+
+if "%1" == "devhelp" (
+	%SPHINXBUILD% -b devhelp %ALLSPHINXOPTS% %BUILDDIR%/devhelp
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished.
+	goto end
+)
+
+if "%1" == "epub" (
+	%SPHINXBUILD% -b epub %ALLSPHINXOPTS% %BUILDDIR%/epub
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The epub file is in %BUILDDIR%/epub.
+	goto end
+)
+
+if "%1" == "latex" (
+	%SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished; the LaTeX files are in %BUILDDIR%/latex.
+	goto end
+)
+
+if "%1" == "latexpdf" (
+	%SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
+	cd %BUILDDIR%/latex
+	make all-pdf
+	cd %BUILDDIR%/..
+	echo.
+	echo.Build finished; the PDF files are in %BUILDDIR%/latex.
+	goto end
+)
+
+if "%1" == "latexpdfja" (
+	%SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
+	cd %BUILDDIR%/latex
+	make all-pdf-ja
+	cd %BUILDDIR%/..
+	echo.
+	echo.Build finished; the PDF files are in %BUILDDIR%/latex.
+	goto end
+)
+
+if "%1" == "text" (
+	%SPHINXBUILD% -b text %ALLSPHINXOPTS% %BUILDDIR%/text
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The text files are in %BUILDDIR%/text.
+	goto end
+)
+
+if "%1" == "man" (
+	%SPHINXBUILD% -b man %ALLSPHINXOPTS% %BUILDDIR%/man
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The manual pages are in %BUILDDIR%/man.
+	goto end
+)
+
+if "%1" == "texinfo" (
+	%SPHINXBUILD% -b texinfo %ALLSPHINXOPTS% %BUILDDIR%/texinfo
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The Texinfo files are in %BUILDDIR%/texinfo.
+	goto end
+)
+
+if "%1" == "gettext" (
+	%SPHINXBUILD% -b gettext %I18NSPHINXOPTS% %BUILDDIR%/locale
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The message catalogs are in %BUILDDIR%/locale.
+	goto end
+)
+
+if "%1" == "changes" (
+	%SPHINXBUILD% -b changes %ALLSPHINXOPTS% %BUILDDIR%/changes
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.The overview file is in %BUILDDIR%/changes.
+	goto end
+)
+
+if "%1" == "linkcheck" (
+	%SPHINXBUILD% -b linkcheck %ALLSPHINXOPTS% %BUILDDIR%/linkcheck
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Link check complete; look for any errors in the above output ^
+or in %BUILDDIR%/linkcheck/output.txt.
+	goto end
+)
+
+if "%1" == "doctest" (
+	%SPHINXBUILD% -b doctest %ALLSPHINXOPTS% %BUILDDIR%/doctest
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Testing of doctests in the sources finished, look at the ^
+results in %BUILDDIR%/doctest/output.txt.
+	goto end
+)
+
+if "%1" == "xml" (
+	%SPHINXBUILD% -b xml %ALLSPHINXOPTS% %BUILDDIR%/xml
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The XML files are in %BUILDDIR%/xml.
+	goto end
+)
+
+if "%1" == "pseudoxml" (
+	%SPHINXBUILD% -b pseudoxml %ALLSPHINXOPTS% %BUILDDIR%/pseudoxml
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The pseudo-XML files are in %BUILDDIR%/pseudoxml.
+	goto end
+)
+
+:end


Stabilized custom GitHubPages-Sphinx synchronization process

--- docs/make.bat
+++ docs/make.bat
@@ -68,13 +68,13 @@
 	call git checkout master %GH_PAGES_SOURCES%
 	call git reset HEAD
 	call make html
-    pause
+    pause REM without pause, unfinished _static directory throws Access Denied
 	move .\build\html\_sources ..
 	move .\build\html\_static ..
 	move .\build\html\*.* ..
-	rmdir /s /q %GH_PAGES_SOURCES% build
+	rmdir /s /q %GH_PAGES_SOURCES% build REM delete source and make.bat
 	call git add -A :/
-	call git reset .
+	call git reset . REM un-stage docs directory
 	call git commit -m "Generated gh-pages for `git log master -1 --pretty=short --abbrev-commit`" && git push origin gh-pages ; git checkout master
 	echo.Build finished. The GitHub Pages Documentation site is updated.
 	goto end


DOC: add changed to make.bat

DOC: add changed to make.bat

--- docs/make.bat
+++ docs/make.bat
@@ -8,6 +8,7 @@
 set BUILDDIR=build
 set TOOLSPATH=../tools
 set EXAMPLEBUILD=examples_rst.py
+set FOLDTOC=fold_toc.py
 set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS% source
 if NOT "%PAPER%" == "" (
 	set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS%
@@ -46,6 +47,9 @@
 	python %TOOLSPATH%/%EXAMPLEBUILD%
 	%SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html
 	if errorlevel 1 exit /b 1
+	python %TOOLSPATH%/%FOLDTOC% %BUILDDIR%/html/index.html
+	python %TOOLSPATH%/%FOLDTOC% %BUILDDIR%/html/examples/index.html ../_static
+	python %TOOLSPATH%/%FOLDTOC% %BUILDDIR%/html/dev/index.html ../_static
 	echo.
 	echo.Build finished. The HTML pages are in %BUILDDIR%/html.
 	goto end


adapt gulpw.bat to use local node downloaded during gradle build

--- gulpw.bat
+++ gulpw.bat
@@ -1,2 +1,2 @@
 @echo off
-node node_modules\gulp\bin\gulp.js %*+build\nodejs\node-v0.10.33-windows-x64\bin\node node_modules\gulp\bin\gulp.js %*


try with buid_ext --inplace in bld.bat

try with buid_ext --inplace in bld.bat

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


Updated win32 build_sources.cmd to create sip_extra.h.

darcs-hash:20070102112616-77cd4-8138993ffe03e8502991735cbe982a674041ad1a.gz

--- win32/build_sources.cmd
+++ win32/build_sources.cmd
@@ -48,6 +48,8 @@
 @set PR2=../libsofia-sip-ua/sip/sofia-sip/sip_hclasses.h
 @set PR3=../libsofia-sip-ua/sip/sofia-sip/sip_protos.h
 @set PR4=../libsofia-sip-ua/sip/sofia-sip/sip_tag.h
+@set PR5=../libsofia-sip-ua/sip/sofia-sip/sip_extra.h
+@set SIPEXTRA=../libsofia-sip-ua/sip/sip_extra_headers.txt
 @set PT=../libsofia-sip-ua/sip/sip_parser_table.c

 %MSG_AWK% module=sip PR=%PR% %IN%  < NUL
@@ -57,6 +59,8 @@
 %MSG_AWK% module=sip PR=%PR3% %IN% < NUL
 %CHECK%
 %MSG_AWK% module=sip PR=%PR4% %IN% < NUL
+%CHECK%
+%MSG_AWK% module=sip PR=%PR5% TEMPLATE1=%PR2%.in TEMPLATE2=%PR3%.in TEMPLATE=%PR5%.in NO_FIRST=1 NO_LAST=1 < NUL %SIPEXTRA%
 %CHECK%

 %MSG_AWK% module=sip MC_HASH_SIZE=127 MC_SHORT_SIZE=26 ^


Remove the compressed oops flag for now.

--- ui/org.openmole.ui/src/main/resources/openmole.bat
+++ ui/org.openmole.ui/src/main/resources/openmole.bat
@@ -1,4 +1,5 @@
 rmdir /s /q "configuration\org.eclipse.core.runtime"
 rmdir /s /q "configuration\org.eclipse.equinox.app"
 rmdir /s /q "configuration\org.eclipse.osgi"
-java -ea -Dosgi.classloader.singleThreadLoads=true -XX:+UseCompressedOops -XX:MaxPermSize=128M -XX:+UseParallelGC -Xmx1G -jar plugins\org.eclipse.equinox.launcher.jar -p openmole-plugins -g openmole-plugins-gui %*
+
+java -ea -Dosgi.classloader.singleThreadLoads=true -XX:MaxPermSize=128M -XX:+UseParallelGC -Xmx1G -jar plugins\org.eclipse.equinox.launcher.jar -p openmole-plugins -g openmole-plugins-gui %*


Copy yet more files into condor_tests to accommodate unit tests. All except consumption should now pass. Ticket #4022

--- nmi_tools/glue/build/build.win.bat
+++ nmi_tools/glue/build/build.win.bat
@@ -257,6 +257,8 @@
 move src\condor_utils\tests\RelWithDebInfo\*.pdb src\condor_tests
 move src\condor_collector.V6\tests\RelWithDebInfo\*.exe src\condor_tests
 move src\condor_collector.V6\tests\RelWithDebInfo\*.pdb src\condor_tests
+copy bld_external\pcre-8.33\install\lib\pcre.dll src\condor_tests
+copy src\classad\tests\testdata.txt src\condor_tests
 goto finis

 REM common exit


Modified UpdateDependencies.bat script to properly call the new db-update.bat script.

git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/openPG/Main;C92763

--- Build/Scripts/UpdateDependencies.bat
+++ Build/Scripts/UpdateDependencies.bat
@@ -92,7 +92,7 @@
 %replace% /r /v "%targetschema%\*db-update.bat" GSFSchema substationSBG
 SET cwd=%CD%
 CD %targetschema%\SQLite
-ECHO "N" | db-update.bat
+CALL db-update.bat
 CD "%cwd%"

 :: ECHO.


[MRG] MNT Adds comment regarding coverage pinning (#15912)

* MNT Adds comment regarding coverage pinning

* CLN Improves english

--- build_tools/azure/install.cmd
+++ build_tools/azure/install.cmd
@@ -25,6 +25,10 @@
     pip install numpy scipy cython pytest wheel pillow joblib
 )
 if "%COVERAGE%" == "true" (
+    @rem Using coverage 5.0 will trigger relpath between 2 windows
+    @rem paths from different drives. Pinning can be removed when
+    @rem https://github.com/scikit-learn/scikit-learn/issues/15908
+    @rem is resolved.
     pip install coverage==4.5.3 codecov pytest-cov
 )
 python --version


Changed path delimiters from Unix to Windows.

--- bin/jks.bat
+++ bin/jks.bat
@@ -2,9 +2,9 @@
 setlocal
 set RUNDIR=%~dp0

-set CLPATH="%RUNDIR%..;%RUNDIR%../*;%RUNDIR%../lib/*"
+set CLPATH="%RUNDIR%..;%RUNDIR%..\*;%RUNDIR%..\lib\*"
 set MAINCL=com.jkoolcloud.jesl.simulator.TNT4JSimulator
-set TNT4JOPTS=-Dorg.slf4j.simpleLogger.defaultLogLevel=info -Dtnt4j.config="%RUNDIR%../config/tnt4j-simulator.properties" -Dtnt4j.token.repository="%RUNDIR%../config/tnt4j-tokens.properties"
+set TNT4JOPTS=-Dorg.slf4j.simpleLogger.defaultLogLevel=info -Dtnt4j.config="%RUNDIR%..\config\tnt4j-simulator.properties" -Dtnt4j.token.repository="%RUNDIR%..\config\tnt4j-tokens.properties"

 java %TNT4JOPTS% -classpath %CLPATH% %MAINCL% %*
 endlocal


Create backupDatabasesOnline.bat

Create backupDatabasesOnline.bat

error: pathspec 'DB2/Backup/backupDatabasesOnline.bat' did not match any file(s) known to git

--- DB2/Backup/backupDatabasesOnline.bat
+++ DB2/Backup/backupDatabasesOnline.bat
@@ -0,0 +1,16 @@
+@echo off
+REM
+REM Author: Klaus Bild
+REM E-Mail: klaus.bild@gmail.com
+
+REM Needed for variable expansion
+SETLOCAL ENABLEDELAYEDEXPANSION
+REM Set Backup-Directory, change to your environment
+set DBBACKUPPATH=E:\Transfer
+REM get all databases of db2 instance and loop through the list
+FOR /F "tokens=5" %%a IN ('DB2CMD.EXE -c -w -i DB2 list DATABASE DIRECTORY ^| findstr "Alias"') DO (
+				set DATABASES=%%a,!DATABASES!
+				title Starting database %%a backup on %date% at %time%...
+				DB2CMD.EXE -c -w -i DB2 BACKUP DATABASE %%a ONLINE to %DBBACKUPPATH% COMPRESS INCLUDE LOGS
+				)
+ECHO Successfull created backups for %DATABASES% in %DBBACKUPPATH%


run_cmake batch file

run_cmake batch file

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

--- projects/run_cmake.bat
+++ projects/run_cmake.bat
@@ -0,0 +1,2 @@
+cmake -G "Visual Studio 12 2013"
+pause


some spaces corrected

some spaces corrected

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

--- module/i18n.inc.bat
+++ module/i18n.inc.bat
@@ -47,7 +47,7 @@
 	set PHRASE_1_9=Choose a number
 	set PHRASE_1_10=  Set PvPGN interface as Console
 	set PHRASE_1_11=  Set PvPGN interface as GUI (Graphical User Interface)
-	set PHRASE_1_12= Select a database type:
+	set PHRASE_1_12=Select a database type:
 	set PHRASE_1_13=   1) Plain (default)
 	set PHRASE_1_14=
 	set PHRASE_1_15=  PvPGN will build without database support
@@ -88,13 +88,13 @@
 	set PHRASE_1_4=   PvPGN 㤥   SVN
 	set PHRASE_1_5=   PvPGN  㤥
 	set PHRASE_1_6=롥 䥩  PvPGN:
-	set PHRASE_1_7=    1) ᮫ (-㬮砭)
-	set PHRASE_1_8=    2)
+	set PHRASE_1_7=   1) ᮫ (-㬮砭)
+	set PHRASE_1_8=   2)
 	set PHRASE_1_9=
 	set PHRASE_1_10=    PvPGN ࠭ ᮫ 䥩
 	set PHRASE_1_11=    PvPGN ࠭  䥩
-	set PHRASE_1_12= 롥 ⨯  :
-	set PHRASE_1_13=    1) ⮢ 䠩 (-㬮砭)
+	set PHRASE_1_12=롥 ⨯  :
+	set PHRASE_1_13=   1) ⮢ 䠩 (-㬮砭)
 	set PHRASE_1_14=
 	set PHRASE_1_15=   PvPGN 㤥 ᮡ࠭  প
 	set PHRASE_1_16= 䨣樨 CMake  訡
@@ -140,7 +140,7 @@
 	set PHRASE_1_9=Kies een nummer
 	set PHRASE_1_10=  Zet PvPGN omgeving als Console
 	set PHRASE_1_11=  Set PvPGN interface as GUI (Graphical User Interface) Zet PvPGN omgeving als GUI ()
-	set PHRASE_1_12= Selecteer een database type:
+	set PHRASE_1_12=Selecteer een database type:
 	set PHRASE_1_13=   1) Normaal (Text) (Standaard)
 	set PHRASE_1_14=
 	set PHRASE_1_15=  PvPGN zal gebouwen worden zonder database ondersteuning


update to java 7u51

update to java 7u51

--- config.cmd
+++ config.cmd
@@ -7,10 +7,10 @@
 set ESI_VERSION=3

 rem set JAVA Version
-set JAVA_DIST_VERSION=7u45
-set JAVA_DIST_VERSION_PATCHLEVEL=b18
+set JAVA_DIST_VERSION=7u51
+set JAVA_DIST_VERSION_PATCHLEVEL=b13
 set JAVA_DIST_NAME=server-jre-%JAVA_DIST_VERSION%-windows-x64
-set JAVA_FOLDER_NAME=jdk1.7.0_45
+set JAVA_FOLDER_NAME=jdk1.7.0_51
 set JAVA_DIST_DOWNLOAD_URL=http://download.oracle.com/otn-pub/java/jdk/%JAVA_DIST_VERSION%-%JAVA_DIST_VERSION_PATCHLEVEL%/%JAVA_DIST_NAME%.tar.gz
 rem set JAVA_DIST_DOWNLOAD_URL=http://localhost:8010/%JAVA_DIST_NAME%.tar.gz


ignore droplet tests on windows as they involve cf curl only

--- ci/cli/tasks/cats-windows.bat
+++ ci/cli/tasks/cats-windows.bat
@@ -28,4 +28,4 @@

 cd %CATSPATH%

-ginkgo.exe -flakeAttempts=2 -slowSpecThreshold=180 -skip="go makes the app reachable via its bound route|SSO|takes effect after a restart, not requiring a push|doesn't die when printing 32MB|exercises basic loggregator|firehose data|dotnet-core|transparently proxies both reserved" -nodes=%NODES%
+ginkgo.exe -flakeAttempts=2 -slowSpecThreshold=180 -skip="go makes the app reachable via its bound route|SSO|takes effect after a restart, not requiring a push|doesn't die when printing 32MB|exercises basic loggregator|firehose data|dotnet-core|transparently proxies both reserved|manage droplet bits for an app" -nodes=%NODES%


Issue #221: Fix a crash when starting on Windows

--- scripts/lorawan-server.bat
+++ scripts/lorawan-server.bat
@@ -18,5 +18,5 @@
     set FILES=!FILES! "%%A\ebin"
 )

-set "ERL_ARGS=-lager log_root "log""
+set ERL_ARGS="-lager log_root "log""
 cd %ROOT_DIR% && %ERL_DIR% -noinput +Bd -sname lorawan -pa !FILES! -s lorawan_app %ERL_ARGS% -config releases/{{release_version}}/sys.config


Include CRT & ARCH in title

Include CRT & ARCH in title

The command box has a title 'PHP SDK' now.
Make it descriptive like 'PHP SDK vc15 x86'

--- phpsdk-starter.bat
+++ phpsdk-starter.bat
@@ -31,7 +31,7 @@
 set PHP_SDK_RUN_FROM_ROOT=1

-title PHP SDK
+title PHP SDK %CRT% %ARCH%

 call %PHP_SDK_ROOT_PATH%\bin\phpsdk_setshell.bat %CRT% %ARCH%


[LIB-153] Tests failed successfully

[LIB-153] Tests failed successfully

--- tools/appveyor/windows_tests/before_test.bat
+++ tools/appveyor/windows_tests/before_test.bat
@@ -2,6 +2,6 @@
 cd bin

 :: ### Clone MNE-CPP test data ###
-:: call git clone https://github.com/mne-tools/mne-cpp-test-data.git mne-cpp-test-data
+call git clone https://github.com/mne-tools/mne-cpp-test-data.git mne-cpp-test-data

 cd ..


clink.bat updated

clink.bat updated

--- etc/clink.bat
+++ etc/clink.bat
@@ -1,5 +1,5 @@
 @echo off

-"%~dp0..\vendors\clink\clink_x%PROCESSOR_ARCHITECTURE:~-2%.exe" inject --quiet --profile "%~dp0clink"
+if exist "%~dp0..\vendors\clink\clink_x%PROCESSOR_ARCHITECTURE:~-2%.exe" "%~dp0..\vendors\clink\clink_x%PROCESSOR_ARCHITECTURE:~-2%.exe" inject --quiet --profile "%~dp0clink"

 if exist "%~dp0cmd.env.bat" call "%~dp0cmd.env.bat"


msbuild

msbuild

--- build_project.bat
+++ build_project.bat
@@ -1,8 +1,13 @@
-SET PARAM=/clp:parameters:ErrorsOnly
+
+:: MS Build EXEs
 SET MSBUILD=C:\Windows\Microsoft.NET\Framework64\v4.0.30319\MSBuild.exe
 SET MSBUILD2017=C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\MSBuild.exe

+:: MS Build Config
+SET PARAM=/v:m /clp:parameters:ErrorsOnly

-%MSBUILD% /v:m msbuild_VS2012.proj
+:: Build VS 2012 projects - .NET FX
+%MSBUILD% %PARAM% msbuild_VS2012.proj

-%MSBUILD2017% /v:m msbuild_VS2017.proj+:: Build VS 2017 projects - .NET Core
+%MSBUILD2017% %PARAM% msbuild_VS2017.proj


project: Fix get dependencies batch file to only select lib archives.

--- SMP/project_get_dependencies.bat
+++ SMP/project_get_dependencies.bat
@@ -112,9 +112,12 @@
 FOR /F "tokens=2 delims=: " %%F in ("%TAG%") DO SET TAG=%%F
 IF "%TAG%"=="" ( ECHO Failed getting latest %REPONAME% release tag information & EXIT /B 1 )
 REM Get download name of latest release
-FOR /F "tokens=* USEBACKQ" %%F IN (`TYPE latest.json ^| FINDSTR "name="`) DO SET LIBNAME=%%F
-SET LIBNAME=%LIBNAME:*name=%
-FOR /F "tokens=1 delims=_" %%F in ("%LIBNAME:~1%") DO SET LIBNAME=%%F
+SET LIBNAME=
+FOR /F "tokens=* USEBACKQ" %%F IN (`TYPE latest.json ^| FINDSTR "name="`) DO ( SET TEMPF=%%F
+    SET TEMPF=!TEMPF:*name=!
+    IF "!TEMPF:~1,3!"=="lib" ( SET LIBNAME=!TEMPF:~1! )
+)
+FOR /F "tokens=1 delims=_" %%F in ("%LIBNAME%") DO SET LIBNAME=%%F
 IF "%LIBNAME%"=="" ( ECHO Failed getting latest %REPONAME% release name information & EXIT /B 1 )
 DEL /F /Q latest.json
 REM Get the download location for the required tag


Update editor name

Update editor name

--- sfsedit/kessler_editor.bat
+++ sfsedit/kessler_editor.bat
@@ -1,5 +1,5 @@
 @ECHO OFF
 MODE CON: COLS=120
-TITLE KSP SFSEdit
+TITLE KSP Kessler Editor

 CALL kessler\launcher.bat -jar kessler/sfsedit.jar saves/default/persistent.sfs


fix stuff fowler broke ;)

fix stuff fowler broke ;)

--- scripts/bootstrap.cmd
+++ scripts/bootstrap.cmd
@@ -10,9 +10,10 @@
 set REPOROOT=%CD%
 popd

-set STAGE0_DIR=%REPOROOT%\artifacts\stage0
-set STAGE1_DIR=%REPOROOT%\artifacts\stage1
-set STAGE2_DIR=%REPOROOT%\artifacts\stage2
+set RID=win7-x64
+set STAGE0_DIR=%REPOROOT%\artifacts\%RID%\stage0
+set STAGE1_DIR=%REPOROOT%\artifacts\%RID%\stage1
+set STAGE2_DIR=%REPOROOT%\artifacts\%RID%\stage2

 where dnvm >nul 2>nul
 if %errorlevel% == 0 goto have_dnvm
@@ -32,13 +33,7 @@
 if exist %STAGE1_DIR% rd /s /q %STAGE1_DIR%

 echo Running 'dnu restore' to restore packages for DNX-hosted projects
-call dnu restore "%REPOROOT%\src\Microsoft.DotNet.Cli"
-if errorlevel 1 goto fail
-
-call dnu restore "%REPOROOT%\src\Microsoft.DotNet.Tools.Compiler"
-if errorlevel 1 goto fail
-
-call dnu restore "%REPOROOT%\src\Microsoft.DotNet.Tools.Publish"
+call dnu restore "%REPOROOT%"
 if errorlevel 1 goto fail

 echo Building basic dotnet tools using older dotnet SDK version
@@ -49,15 +44,15 @@
 if errorlevel 1 goto fail

 echo Building stage1 dotnet.exe ...
-dotnet-publish --framework dnxcore50 --runtime win7-x64 --output "%STAGE1_DIR%" "%REPOROOT%\src\Microsoft.DotNet.Cli"
+dotnet-publish --framework dnxcore50 --runtime %RID% --output "%STAGE1_DIR%" "%REPOROOT%\src\Microsoft.DotNet.Cli"
 if errorlevel 1 goto fail

 echo Building stage1 dotnet-compile.exe ...
-dotnet-publish --framework dnxcore50 --runtime win7-x64 --output "%STAGE1_DIR%" "%REPOROOT%\src\Microsoft.DotNet.Tools.Compiler"
+dotnet-publish --framework dnxcore50 --runtime %RID% --output "%STAGE1_DIR%" "%REPOROOT%\src\Microsoft.DotNet.Tools.Compiler"
 if errorlevel 1 goto fail

 echo Building stage1 dotnet-publish.exe ...
-dotnet-publish --framework dnxcore50 --runtime win7-x64 --output "%STAGE1_DIR%" "%REPOROOT%\src\Microsoft.DotNet.Tools.Publish"
+dotnet-publish --framework dnxcore50 --runtime %RID% --output "%STAGE1_DIR%" "%REPOROOT%\src\Microsoft.DotNet.Tools.Publish"
 if errorlevel 1 goto fail

 echo Re-building dotnet tools with the bootstrapped version
@@ -71,15 +66,15 @@
 cd %STAGE1_DIR%

 echo Building stage2 dotnet.exe ...
-dotnet publish --framework dnxcore50 --runtime win7-x64 --output "%STAGE2_DIR%" "%REPOROOT%\src\Microsoft.DotNet.Cli"
+dotnet publish --framework dnxcore50 --runtime %RID% --output "%STAGE2_DIR%" "%REPOROOT%\src\Microsoft.DotNet.Cli"
 if errorlevel 1 goto fail

 echo Building stage2 dotnet-compile.exe ...
-dotnet publish --framework dnxcore50 --runtime win7-x64 --output "%STAGE2_DIR%" "%REPOROOT%\src\Microsoft.DotNet.Tools.Compiler"
+dotnet publish --framework dnxcore50 --runtime %RID% --output "%STAGE2_DIR%" "%REPOROOT%\src\Microsoft.DotNet.Tools.Compiler"
 if errorlevel 1 goto fail

 echo Building stage2 dotnet-publish.exe ...
-dotnet publish --framework dnxcore50 --runtime win7-x64 --output "%STAGE2_DIR%" "%REPOROOT%\src\Microsoft.DotNet.Tools.Publish"
+dotnet publish --framework dnxcore50 --runtime %RID% --output "%STAGE2_DIR%" "%REPOROOT%\src\Microsoft.DotNet.Tools.Publish"
 if errorlevel 1 goto fail

 echo Bootstrapped dotnet to %STAGE2_DIR%


Specify version suffix when building and packing

--- myget.bat
+++ myget.bat
@@ -7,18 +7,17 @@

 for %%P in (%PROJECTS%) do (
   echo Building %%P
-  dotnet build --configuration %Configuration% %%P || goto error
+  dotnet build --version-suffix %PrereleaseTag% --configuration %Configuration% %%P || goto error
 )

 for %%P in (%TESTS%) do (
   echo Testing %%P
-  dotnet build --configuration %Configuration% %%P || goto error
   dotnet test --configuration %Configuration% %%P || goto error
 )

 for %%P in (%PROJECTS%) do (
   echo Packing %%P
-  dotnet pack --configuration %Configuration% %%P || goto error
+  dotnet pack --version-suffix %PrereleaseTag% --configuration %Configuration% %%P || goto error
 )

 echo Done!


Fix relative path issue

Fix relative path issue

--- link_to_plugin_folder.bat
+++ link_to_plugin_folder.bat
@@ -1,2 +1,8 @@
+REM Run me under administrative privileges
+pushd %~dp0
+
 mklink "C:\Program Files (x86)\Notepad++\plugins\jN\includes\emmet.js" "dist\emmet.js"
 mklink /D "C:\Program Files (x86)\Notepad++\plugins\jN\includes\emmet\" "dist\emmet"
+mklink /D "C:\Program Files (x86)\Notepad++\plugins\jN\includes\dialog\" "dist\dialog"
+
+popd


Updated the deployment script, deployment now happens automatically every 5 min

--- deploy.bat
+++ deploy.bat
@@ -1,16 +1,21 @@
-taskkill /F /IM Webshop.exe
+Taskkill /F /IM Webshop.exe

+If Not Exist "%~dp0startApp.bat" (
+    Echo= startApp.bat file not found
+    GoTo Next
+)

-SET dest=%~dp0productionEnv
+Rem %~dp0 means the current folder where this .bat is executed from
+Set "dest=%~dp0productionEnv"
+Set "webDest=%dest%\webContent"

-if not exist "%dest%" mkdir "%dest%"
-xcopy /Y /s "%~dp0bin\Debug" "%dest%"
+If Not Exist "%dest%" MD "%dest%"
+XCopy "%~dp0Webshop\bin\Debug" "%dest%" /Y /S
+If Not Exist "%webDest%" MD "%webDest%"
+XCopy "%~dp0Webshop\webContent\web" "%webDest%" /Y /S
+Copy /Y "%~dp0startApp.bat" "%dest%"
+Call "%dest%\startApp.bat"
+Del "%~dp0startApp.bat"
+Echo= Deleted startApp.bat

-SET webDest="%dest%/webContent"
-
-if not exist %webDest% mkdir %webDest%
-xcopy /Y /s "%~dp0webContent\web" %webDest%
-
-copy /Y "%~dp0startApp.bat" "%dest%/startApp.bat"
-START "" "%dest%/startApp.bat"
-
+:Next


update

update

--- deploy.cmd
+++ deploy.cmd
@@ -136,4 +136,4 @@

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


More updates to deploy script

More updates to deploy script

--- deploy.cmd
+++ deploy.cmd
@@ -89,14 +89,15 @@
 echo Handling node.js deployment.

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

 :: 2. Select node version
 call :SelectNodeVersion

+echo installing packages
 :: 3. Install npm packages
 IF EXIST "%DEPLOYMENT_TARGET%\package.json" (
   pushd "%DEPLOYMENT_TARGET%"
@@ -117,11 +118,9 @@

 echo start the server
 :: 5. start the app
-IF EXIST "%DEPLOYMENT_TARGET%\package.json" (
-  pushd "%DEPLOYMENT_TARGET%"
-  call :ExecuteCmd !NPM_CMD! run start
+IF /I "%IN_PLACE_DEPLOYMENT%" NEQ "1" (
+  call :ExecuteCmd "%KUDU_SYNC_CMD%" -v 50 -f "%DEPLOYMENT_SOURCE%" -t "%DEPLOYMENT_TARGET%" -n "%NEXT_MANIFEST_PATH%" -p "%PREVIOUS_MANIFEST_PATH%" -i ".git;.hg;.deployment;deploy.cmd"
   IF !ERRORLEVEL! NEQ 0 goto error
-  popd
 )

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


Adding error codes for ROBOCOPY

Adding error codes for ROBOCOPY

--- deploy.cmd
+++ deploy.cmd
@@ -93,7 +93,24 @@
 :: 4. KuduSync
 IF /I "%IN_PLACE_DEPLOYMENT%" NEQ "1" (
   call :ExecuteCmd ROBOCOPY "%DEPLOYMENT_SOURCE%\AzureFunctions.Client" "%DEPLOYMENT_TARGET%" /E /IS
-  IF !ERRORLEVEL! NEQ 0 goto error
+  :: http://ss64.com/nt/robocopy-exit.html
+  IF %ERRORLEVEL% EQU 16 echo ***FATAL ERROR*** & goto error
+  IF %ERRORLEVEL% EQU 15 echo OKCOPY + FAIL + MISMATCHES + XTRA & goto error
+  IF %ERRORLEVEL% EQU 14 echo FAIL + MISMATCHES + XTRA & goto error
+  IF %ERRORLEVEL% EQU 13 echo OKCOPY + FAIL + MISMATCHES & goto error
+  IF %ERRORLEVEL% EQU 12 echo FAIL + MISMATCHES& goto error
+  IF %ERRORLEVEL% EQU 11 echo OKCOPY + FAIL + XTRA & goto error
+  IF %ERRORLEVEL% EQU 10 echo FAIL + XTRA & goto error
+  IF %ERRORLEVEL% EQU 9 echo OKCOPY + FAIL & goto error
+  IF %ERRORLEVEL% EQU 8 echo FAIL & goto error
+  IF %ERRORLEVEL% EQU 7 echo OKCOPY + MISMATCHES + XTRA & goto error
+  IF %ERRORLEVEL% EQU 6 echo MISMATCHES + XTRA & goto error
+  IF %ERRORLEVEL% EQU 5 echo OKCOPY + MISMATCHES & goto error
+  IF %ERRORLEVEL% EQU 4 echo MISMATCHES & goto error
+  IF %ERRORLEVEL% EQU 3 echo OKCOPY + XTRA
+  IF %ERRORLEVEL% EQU 2 echo XTRA
+  IF %ERRORLEVEL% EQU 1 echo OKCOPY
+  IF %ERRORLEVEL% EQU 0 echo No Change
 )


fixed some slashes

fixed some slashes

--- deploy.cmd
+++ deploy.cmd
@@ -7,21 +7,23 @@
 MKDIR %NEWHOME%\site\wwwroot\gopath\bin
 MKDIR %NEWHOME%\site\wwwroot\gopath\src

-rem set hr=%time:~0,2%
-rem if "%hr:~0,1%" equ " " set hr=0%hr:~1,1%
-rem SET FOLDER=%date:~-4,4%%date:~-10,2%%date:~-7,2%_%hr%%time:~3,2%%time:~6,2%
+set hr=%time:~0,2%
+if "%hr:~0,1%" equ " " set hr=0%hr:~1,1%
+SET FOLDER=%date:~-4,4%%date:~-10,2%%date:~-7,2%_%hr%%time:~3,2%%time:~6,2%

-rem MKDIR %HOME%\site\wwwroot\gopath\src\%FOLDER%
+ECHO FOLDER

-rem xcopy %DEPLOYMENT_SOURCE%\site\repository %HOME%\site\wwwroot\gopath\src\%FOLDER% /Y
-rem xcopy /r %DEPLOYMENT_SOURCE%\site\repository\Web.Config %HOME%\site\wwwroot\Web.Config* /Y
+rem MKDIR %NEWHOME%\site\wwwroot\gopath\src\%FOLDER%

-rem SET GOPATH=%HOME%\site\wwwroot\gopath
-rem SET GOROOT=%HOME%\site\wwwroot\go
-rem SET PATH=%PATH%;%GOPATH%\bin;%HOME%\site\wwwroot\go\bin
+rem xcopy %DEPLOYMENT_SOURCE%\site\repository %NEWHOME%\site\wwwroot\gopath\src\%FOLDER% /Y
+rem xcopy /r %DEPLOYMENT_SOURCE%\site\repository\Web.Config %NEWHOME%\site\wwwroot\Web.Config* /Y
+
+rem SET GOPATH=%NEWHOME%\site\wwwroot\gopath
+rem SET GOROOT=%NEWHOME%\site\wwwroot\go
+rem SET PATH=%PATH%;%GOPATH%\bin;%NEWHOME%\site\wwwroot\go\bin

 rem go get %FOLDER%

-rem sed -i 's/GOAPPBINARY/%FOLDER%.exe/g' %HOME%\site\wwwroot\Web.Config
+rem sed -i 's/GOAPPBINARY/%FOLDER%.exe/g' %NEWHOME%\site\wwwroot\Web.Config

 rem exit /b 1