update svn ignore

update svn ignore

--- wdkbuild/make_packages.bat
+++ wdkbuild/make_packages.bat
@@ -130,7 +130,7 @@

 MD ..\wdkbuild\packages >NUL 2>&1
 rem IF EXIST "%PERL_PATH%" (
-rem   MOVE setup.%BINDIR%\addon.7z    ..\wdkbuild\packages\Notepad2-mod_Addon.%BINDIR%.7z >NUL
+rem   MOVE setup.%BINDIR%\addon.7z    ..\wdkbuild\packages\Notepad2-mod.%NP2_VER%_r%VerRev%_%BINDIR%_Addon.7z >NUL
 rem )
 MOVE setup.%BINDIR%\setupfull.exe ..\wdkbuild\packages\Notepad2-mod.%NP2_VER%_r%VerRev%_%BINDIR%_Setup.exe >NUL
 rem MOVE setup.%BINDIR%\setuplite.exe ..\wdkbuild\packages\Notepad2-mod.%NP2_VER%_r%VerRev%_%BINDIR%_Setup_Silent.exe >NUL


Added NuGet pack command.

Added NuGet pack command.

error: pathspec 'src/uJetMaps-nuget-pack.bat' did not match any file(s) known to git

--- src/uJetMaps-nuget-pack.bat
+++ src/uJetMaps-nuget-pack.bat
@@ -0,0 +1 @@
+nuget pack Logikfabrik.Umbraco.Jet.Maps\Logikfabrik.Umbraco.Jet.Maps.csproj -Build -MSBuildVersion 14 -Prop Configuration=Release


git-svn-id: svn://svn.code.sf.net/p/mediainfo/code/MediaInfoLib/trunk@2872 45c5ae6f-87cc-4fd0-92ee-e4f023fd80da

--- Release/Release_Source.bat
+++ Release/Release_Source.bat
@@ -43,8 +43,8 @@
 xcopy ..\Project\*.cpp MediaInfo_Lib_Source\Project\ /S
 xcopy ..\Project\*.bdsgroup MediaInfo_Lib_Source\Project\ /S
 xcopy ..\Project\*.bdsproj MediaInfo_Lib_Source\Project\ /S
-xcopy ..\Project\*.groupproj MediaInfo_Source\Project\ /S /Y
-xcopy ..\Project\*.cbproj MediaInfo_Source\Project\ /S /Y
+xcopy ..\Project\*.groupproj MediaInfo_Lib_Source\Project\ /S /Y
+xcopy ..\Project\*.cbproj MediaInfo_Lib_Source\Project\ /S /Y
 xcopy ..\Project\*.dpr MediaInfo_Lib_Source\Project\ /S
 xcopy ..\Project\*.pas MediaInfo_Lib_Source\Project\ /S
 xcopy ..\Project\*.dof MediaInfo_Lib_Source\Project\ /S


senv.bat: use docker-machine, update paths

--- senv.bat
+++ senv.bat
@@ -24,9 +24,9 @@
 set PATH=%PATH%;%script%

 rem http://stackoverflow.com/a/7218493/6309: test substring
-echo.%PATH%| findstr /C:"Boot2Docker" 1>nul
+echo.%PATH%| findstr /C:"dm\latest" 1>nul
 if %errorlevel% == 1 (
-	echo "Boot2Docker is not found in PATH: check your ..\env.bat"
+	echo "docker-machine is not found in PATH: check your ..\env.bat"
 	exit /B 1
 )
 echo.%PATH%| findstr /i /C:"Git" 1>nul
@@ -34,11 +34,19 @@
 	echo "Git is not found in PATH: check your ..\env.bat"
 	exit /B 1
 )
-echo.%PATH%| findstr /C:"VirtualBox" 1>nul
+echo.%PATH%| findstr /C:"vbox\latest" 1>nul
 if %errorlevel% == 1 (
 	echo "VirtualBox is not found in PATH: check your ..\env.bat"
 	exit /B 1
 )
+
+doskey dm=docker-machine $*
+rem doskey dmcv=docker-machine create -d virtualbox --engine-env HTTP_PROXY=%http_proxy% --engine-env HTTPS_PROXY=%https_proxy% --engine-env http_proxy=%http_proxy% --engine-env https_proxy=%https_proxy% --engine-env NO_PROXY=%no_proxy% --engine-env no_proxy=%no_proxy% $*
+doskey dmcv=docker-machine create -d virtualbox $*
+
+set DOCKER_TOOLBOX_INSTALL_PATH=C:/prgs/latest
+set DOCKER_MACHINE=%DOCKER_TOOLBOX_INSTALL_PATH%/docker-machine.exe
+set VBOXMANAGE=C:/prgs/vbox/latest/vboxmanage.exe

 doskey vbm="VBoxManage.exe" $*
 doskey vbmmt="VBoxManage.exe modifyvm \"boot2docker-vm\" natpf1 \"tcp-port$1,tcp,,$1,,$1\";"
@@ -62,6 +70,16 @@
 	sed -i -e "s;#no_proxy#;%NO_PROXY%;g" dfsmudge.sh
 )
 sed -i -e "s;_unixpath_;%unixpath%;g" dfsmudge.sh
+
+doskey alias=doskey /macros:all
+doskey h=doskey /history
+doskey gl=git lg -20
+doskey glba=git lg -20 --branches --all
+doskey glab=git lg -20 --all --branches
+doskey gla=git lg -20 --all
+
+set LANG=en_US.UTF-8
+
 goto :eof


hopefully fixed stupid whitespace issues

--- webpicmdfix/WebpiCmd.bat
+++ webpicmdfix/WebpiCmd.bat
@@ -10,3 +10,4 @@

 exit /b %ERRORLEVEL%
+


Explicit npm installation on Windows

Explicit npm installation on Windows

--- windows_cygwin/build.bat
+++ windows_cygwin/build.bat
@@ -1,5 +1,6 @@
 @echo on
-choco install -y --allowEmptyChecksum firefox googlechrome wget notepadplusplus sublimetext3 mono monodevelop gtksharp visualstudiocode microsoft-build-tools visualstudio2015community p4merge dotnet4.5 ruby nodejs stylecop
+choco install -y --allowEmptyChecksum firefox googlechrome wget notepadplusplus sublimetext3 mono monodevelop gtksharp visualstudiocode microsoft-build-tools visualstudio2015community p4merge dotnet4.5 ruby nodejs.install stylecop
+refreshenv

 wget -c https://cygwin.com/setup-x86_64.exe
 setup-x86_64.exe -R "C:\cygwin64" -s http://cygwin.netbet.org/ -q -g -P curl,zsh,git,vim,wget,xz,tar,gawk,bzip2,subversion,zlib,fontconfig,clang,cmake,lua,perl


git-svn-id: svn://svn.code.sf.net/p/mediainfo/code/MediaInfoLib/trunk@2856 45c5ae6f-87cc-4fd0-92ee-e4f023fd80da

--- Release/Release_Source.bat
+++ Release/Release_Source.bat
@@ -14,6 +14,7 @@
 xcopy ..\debian\* MediaInfo_Lib_Source\debian\ /S

 @rem --- Copying : Sources ---
+xcopy ..\Source\*.c MediaInfo_Lib_Source\Source\ /S
 xcopy ..\Source\*.cpp MediaInfo_Lib_Source\Source\ /S
 xcopy ..\Source\*.h MediaInfo_Lib_Source\Source\ /S
 xcopy ..\Source\*.rc MediaInfo_Lib_Source\Source\ /S


Revert "Don't do a BootDPRO but instead call the boot directly."

This reverts commit 8eac068e56c69f5eb92d7f97b4a933b12074c53d.

--- AppVeyorTestDolphinVM.cmd
+++ AppVeyorTestDolphinVM.cmd
@@ -10,5 +10,5 @@

 ECHO Boot and test image
 cd Dolphin
-Dolphin7 DBOOT.img7 DolphinProfessional
-CALL TestDPRO
+CALL BootDPRO
+CALL TestDPRO


fix syntax error in documentation generation

--- Documentation/generate.bat
+++ Documentation/generate.bat
@@ -2,15 +2,13 @@

 pushd %~dp0

-IF "%APPVEYOR_REPO_BRANCH%"=="" (
+SET GitBranch=%APPVEYOR_REPO_BRANCH%
+IF "%GitBranch%"=="" (
 	SET WYAM=%USERPROFILE%\.nuget\packages\wyam\1.4.1\tools\net462\Wyam.exe
 	git rev-parse HEAD > head.txt
 	set /p GitRevision=<head.txt
 	del head.txt
 	for /F "tokens=3 delims=/" %%i in (..\.git\HEAD) do SET GitBranch=%%i
-)
-ELSE (
-	SET GitBranch=%APPVEYOR_REPO_BRANCH%
 )

 rmdir /S /Q input\assets\js\alphaTab


clean

clean

--- deleteLog.bat
+++ deleteLog.bat
@@ -1,4 +1,3 @@
 del *.log /S
-del *FontResource.log.bmp /S
 del CSharpGL.*.nupkg /S
 pause


Added dev update bat

Added dev update bat

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

--- update.bat
+++ update.bat
@@ -0,0 +1 @@
+npm install abalabahaha/eris#dev


add CPRJ.xsd to pack

add CPRJ.xsd to pack

--- CMSIS/Utilities/gen_pack.bat
+++ CMSIS/Utilities/gen_pack.bat
@@ -92,6 +92,7 @@
 XCOPY /Q /S /Y ..\..\CMSIS\Utilities\CMSIS-SVD.xsd       %RELEASE_PATH%\CMSIS\Utilities\*.*
 XCOPY /Q /S /Y ..\..\CMSIS\Utilities\PACK.xsd            %RELEASE_PATH%\CMSIS\Utilities\*.*
 XCOPY /Q /S /Y ..\..\CMSIS\Utilities\PackIndex.xsd       %RELEASE_PATH%\CMSIS\Utilities\*.*
+XCOPY /Q /S /Y ..\..\CMSIS\Utilities\CPRJ.xsd            %RELEASE_PATH%\CMSIS\Utilities\*.*

 XCOPY /Q /S /Y ..\..\CMSIS\Utilities\Win32\*.*           %RELEASE_PATH%\CMSIS\Utilities\Win32\*.*
 XCOPY /Q /S /Y ..\..\CMSIS\Utilities\Linux64\*.*         %RELEASE_PATH%\CMSIS\Utilities\Linux64\*.*


Testing AppVeyor.

Testing AppVeyor.

--- tools/buildModAssets-CI.cmd
+++ tools/buildModAssets-CI.cmd
@@ -1,3 +1,2 @@
 @echo Building %1 mod assets...
-echo on
-"C:\Program Files\Unity\Editor\Unity.exe" -projectPath  C:\projects\buildron-classic-mods\src\Buildron.ClassicMods.%1 -username "%2" -password "%3" -quit -batchmode -executeMethod ModBuilder.BuildFromCommandLine  C:\projects\buildron-classic-mods\build StandaloneWindows+@"C:\Program Files\Unity\Editor\Unity.exe" -projectPath  C:\projects\buildron-classic-mods\src\Buildron.ClassicMods.%1 -username "%2" -password "%3" -force-free -quit -batchmode -executeMethod ModBuilder.BuildFromCommandLine  C:\projects\buildron-classic-mods\build StandaloneWindows


Added windows runfile. (Make sure to have NodeJS installed)

error: pathspec 'chat/node-engine/nexus.bat' did not match any file(s) known to git

--- chat/node-engine/nexus.bat
+++ chat/node-engine/nexus.bat
@@ -0,0 +1,3 @@
+@echo off
+color a
+node nexus.js


[Nomad] Patch for version 0.73 update

[Nomad] Patch for version 0.73 update

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

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

 echo.
 echo Restarting server...


update ci

update ci

--- Deploy/NAppUpdate/build.bat
+++ Deploy/NAppUpdate/build.bat
@@ -1 +1 @@
-%~dp0FeedBuilder.exe "FeedBuilder.config" -Build
+%~dp0FeedBuilder.exe "%~dp0FeedBuilder.config" -Build


Cleanup before jenkins rebuild

Cleanup before jenkins rebuild

--- tools/jenkins/build_win.bat
+++ tools/jenkins/build_win.bat
@@ -10,7 +10,7 @@
 call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" amd64

 qmake ../mne-cpp/mne-cpp.pro -r
-:: nmake clean
+nmake clean
 nmake

 cd ..


Update

Update

1) Changed output when determining a random execution order.


* Added -incomplete- support for alltt

* Added -incomplete- support for alltt

--- packages/ltx2htm/latex.cmd
+++ packages/ltx2htm/latex.cmd
@@ -30,6 +30,7 @@
 {abstract}
 {quote}
 {verbatim}=verbatim
+{alltt}=verbatim
 {code}=verbatim
 {titlepage}
 {minipage}{-}


Update calendar-service.bat

Update calendar-service.bat

run calendar service jar from tools folder

--- tools/calendar-service.bat
+++ tools/calendar-service.bat
@@ -52,7 +52,7 @@
 @rem import proactive user accounts to radicale
 TYPE %APP_HOME%\config\authentication\login.cfg > %RADICLAE_HOME%\Data\config\htpasswd.txt

-"%JAVA_EXE%" -Dpa.scheduler.home=%APP_HOME% -jar %APP_HOME%\addons\calendar-service*.jar
+"%JAVA_EXE%" -Dpa.scheduler.home=%APP_HOME% -jar %APP_HOME%\tools\calendar-service*.jar

 :end
 @rem End local scope for the variables with windows NT shell


Add script to conditionally start Bridge

This CMD is meant to be called only on Windows machines
that need to ensure the Bridge is running without the
overhead checking whether it needs to be built.

It is intended to be invoked in automated Windows test
runs that require the Bridge.

error: pathspec 'src/System.Private.ServiceModel/tools/setupfiles/EnsureBridgeRunning.cmd' did not match any file(s) known to git

--- src/System.Private.ServiceModel/tools/setupfiles/EnsureBridgeRunning.cmd
+++ src/System.Private.ServiceModel/tools/setupfiles/EnsureBridgeRunning.cmd
@@ -0,0 +1,28 @@
+echo off
+setlocal
+
+tasklist /FI "IMAGENAME eq Bridge.exe" 2>NUL | find /I /N "Bridge.exe">NUL
+if "%ERRORLEVEL%"=="0" (
+  echo The Bridge is already running.
+  goto running
+)
+
+pushd %~dp0
+echo Building the Bridge...
+call BuildWCFTestService.cmd
+popd
+
+if '%BridgeResourceFolder%' == '' (
+   set _bridgeResourceFolder=..\..\Bridge\Resources
+) else (
+   set _bridgeResourceFolder=%BridgeResourceFolder%
+)
+
+pushd %~dp0..\..\..\..\bin\wcf\tools\Bridge
+echo Invoking Bridge.exe with arguments: /BridgeResourceFolder:%_bridgeResourceFolder% %*
+start /MIN Bridge.exe /BridgeResourceFolder:%_bridgeResourceFolder% %*
+popd
+
+:running
+exit /b
+