Refactore fetching icu

Refactore fetching icu

--- Common/3dParty/icu/fetch.bat
+++ Common/3dParty/icu/fetch.bat
@@ -1,5 +1,8 @@
 SET SCRIPTPATH=%~dp0
 CD /D %~dp0
+
+SET ICU_MAJOR_VER=55
+SET ICU_MINOR_VER=1

 SET platform=win_32
 if defined ProgramFiles(x86) (
@@ -31,7 +34,7 @@
 if exist "%SCRIPTPATH%%platform%\icu\" (
 	echo "icu already exported"
 ) else (
-	svn export http://source.icu-project.org/repos/icu/tags/release-60-2/icu4c ./icu
+	svn export http://source.icu-project.org/repos/icu/tags/release-%ICU_MAJOR_VER%-%ICU_MINOR_VER%/icu4c ./icu
 )

 SET VC=%ProgramFiles%\Microsoft Visual Studio 14.0\VC
@@ -43,19 +46,19 @@
 call "%VC%\vcvarsall.bat" %MACHINE%

 if "%platform%" == "win_64" (
-	MSBuild.exe icu\source\allinone\allinone.sln /p:Configuration=Release /p:Platform="X64"
+MSBuild.exe icu\source\allinone\allinone.sln /p:Configuration=Release /p:PlatformToolset=v140 /p:Platform="X64"
 ) else (
-	MSBuild.exe icu\source\allinone\allinone.sln /p:Configuration=Release /p:Platform="Win32"
+MSBuild.exe icu\source\allinone\allinone.sln /p:Configuration=Release /p:PlatformToolset=v140 /p:Platform="Win32"
 )

 if "%platform%" == "win_64" (
-XCOPY /Y "%SCRIPTPATH%%platform%\icu\bin64\icudt60.dll" "%SCRIPTPATH%%platform%\build\"
-XCOPY /Y "%SCRIPTPATH%%platform%\icu\bin64\icuuc60.dll" "%SCRIPTPATH%%platform%\build\"
+XCOPY /Y "%SCRIPTPATH%%platform%\icu\bin64\icudt%ICU_MAJOR_VER%.dll" "%SCRIPTPATH%%platform%\build\"
+XCOPY /Y "%SCRIPTPATH%%platform%\icu\bin64\icuuc%ICU_MAJOR_VER%.dll" "%SCRIPTPATH%%platform%\build\"
 XCOPY /Y "%SCRIPTPATH%%platform%\icu\lib64\icudt.lib" "%SCRIPTPATH%%platform%\build\"
 XCOPY /Y "%SCRIPTPATH%%platform%\icu\lib64\icuuc.lib" "%SCRIPTPATH%%platform%\build\"
 ) else (
-XCOPY /Y "%SCRIPTPATH%%platform%\icu\bin\icudt60.dll" "%SCRIPTPATH%%platform%\build\"
-XCOPY /Y "%SCRIPTPATH%%platform%\icu\bin\icuuc60.dll" "%SCRIPTPATH%%platform%\build\"
+XCOPY /Y "%SCRIPTPATH%%platform%\icu\bin\icudt%ICU_MAJOR_VER%.dll" "%SCRIPTPATH%%platform%\build\"
+XCOPY /Y "%SCRIPTPATH%%platform%\icu\bin\icuuc%ICU_MAJOR_VER%.dll" "%SCRIPTPATH%%platform%\build\"
 XCOPY /Y "%SCRIPTPATH%%platform%\icu\lib\icudt.lib" "%SCRIPTPATH%%platform%\build\"
 XCOPY /Y "%SCRIPTPATH%%platform%\icu\lib\icuuc.lib" "%SCRIPTPATH%%platform%\build\"
 )


Add jq to cygwin setup

Add jq to cygwin setup

--- dotenv/other/cygwin/setup-cygwin.cmd
+++ dotenv/other/cygwin/setup-cygwin.cmd
@@ -68,7 +68,7 @@

 REM -- These are the packages we will install (in addition to the default packages)
 SET PACKAGES=bash-completion,bc,bind,ca-certificates,curl,cygutils-extra,git,git-completion,git-svn,gnupg
-SET PACKAGES=%PACKAGES%,inetutils,nc,nc6,ncurses,openssh,openssl,procps,rsync,screen,unzip,vim,wget,xxd
+SET PACKAGES=%PACKAGES%,inetutils,jq,nc,nc6,ncurses,openssh,openssl,procps,rsync,screen,unzip,vim,wget,xxd
 REM -- Extra packages
 SET PACKAGES=%PACKAGES%,GraphicsMagick,ImageMagick,aspell,aspell-en,bzip2,fdupes,heimdal,mkisofs,p7zip


Make FFTW3 work for windows

Make FFTW3 work for windows

Former-commit-id: 3c55074b3421ec9ea51ee762e039ca5c64a16954

--- fftw3f/bld.bat
+++ fftw3f/bld.bat
@@ -1 +1,15 @@
-exit 1+IF "%ARCH%"=="32" (
+    powershell -command "& { iwr ftp://ftp.fftw.org/pub/fftw/fftw-3.3.4-dll32.zip -OutFile fftw-3.3.4-dll32.zip }"
+    7z e .\fftw-3.3.4-dll32.zip -offtw3
+) ELSE (
+    powershell -command "& { iwr ftp://ftp.fftw.org/pub/fftw/fftw-3.3.4-dll64.zip -OutFile fftw-3.3.4-dll64.zip }"
+    7z e .\fftw-3.3.4-dll64.zip -offtw3
+)
+
+cd fftw3
+lib /def:libfftw3f-3.def
+cd ..
+
+ls fftw3
+move fftw3\libfftw3f-3.lib %LIBRARY_LIB%\
+move fftw3\fftw3.f %LIBRARY_INC%\


Add new line at end of file.

Add new line at end of file.

--- Bin/UpdateDocument.bat
+++ Bin/UpdateDocument.bat
@@ -12,4 +12,4 @@
 echo Converting Doxygen files to HTML...
 doxygen Doxyfile 1>nul
 echo Finish.
-popd+popd


Update install_bigfix.bat

Update install_bigfix.bat

--- CMD/install_bigfix.bat
+++ CMD/install_bigfix.bat
@@ -2,6 +2,9 @@
 @ECHO OFF
 SET MASTHEADURL=http://%1:52311/masthead/masthead.afxm
 ECHO
+
+REM http://stackoverflow.com/questions/4781772/how-to-test-if-an-executable-exists-in-the-path-from-a-windows-batch-file
+where /q powershell || ECHO Cound not find powershell. && EXIT /B

 powershell -command "& { (New-Object Net.WebClient).DownloadFile('http://software.bigfix.com/download/bes/95/BigFix-BES-Client-9.5.1.9.exe', 'c:\Windows\Temp\BESClient.exe') }" -ExecutionPolicy Bypass
 powershell -command "& { (New-Object Net.WebClient).DownloadFile('%MASTHEADURL%', 'c:\Windows\Temp\masthead.afxm') }" -ExecutionPolicy Bypass


Update install_bigfix.bat

Update install_bigfix.bat

--- CMD/install_bigfix.bat
+++ CMD/install_bigfix.bat
@@ -4,6 +4,7 @@
 ECHO

 bitsadmin /transfer bigfixdl%random% /download /priority FOREGROUND http://software.bigfix.com/download/bes/95/BigFix-BES-Client-9.5.1.9.exe C:\Windows\Temp\bigfixclient.exe
+bitsadmin /transfer bigfixcfgdl%random% /download /priority FOREGROUND %MASTHEADURL% C:\Windows\Temp\masthead.afxm

 ECHO I am %COMSPEC%
 ECHO put CMD/BAT lines in here.


Use visual studio instead of msbuild

Use visual studio instead of msbuild

Signed-off-by: Dave_Goddard <a5692579077bf98cb035292473fe12572309d028@pivotal.io>

--- Containerizer/make.bat
+++ Containerizer/make.bat
@@ -1,12 +1,15 @@
 :: msbuild must be in path
-SET PATH=%PATH%;%WINDIR%\Microsoft.NET\Framework64\v4.0.30319
+SET DEVENV_PATH=%programfiles(x86)%\Microsoft Visual Studio 12.0\Common7\IDE
+SET PATH=%PATH%;%DEVENV_PATH%;%WINDIR%\Microsoft.NET\Framework64\v4.0.30319
 where msbuild
 if errorLevel 1 ( echo "msbuild was not found on PATH" && exit /b 1 )

 git submodule update --init --recursive
-cd IronFrame
-call build.bat build || exit /b 1
-cd ..
+pushd IronFrame || exit /b 1
+  ..\bin\nuget restore || exit /b 1
+  devenv IronFrame.sln /build "Release" || exit /b 1
+  :: call build.bat build || exit /b 1
+popd

 rmdir /S /Q packages
 bin\nuget restore || exit /b 1


Copyright update.

Copyright update.

git-svn-id: 769d22dfa2d22aad706b9a451492fb87c0735f19@12066 08b38cba-cd3b-11de-854e-f91c5b6e4272

--- modules/jackal/tools/ConfigUpdater/cfgupdater.bat
+++ modules/jackal/tools/ConfigUpdater/cfgupdater.bat
@@ -2,11 +2,7 @@
 rem
 rem ************* <auto-copyright.pl BEGIN do not edit this line> *************
 rem
-rem VR Juggler is (C) Copyright 1998, 1999, 2000 by Iowa State University
-rem VRJuggler
-rem   Copyright (C) 1997,1998,1999,2000
-rem   Iowa State University Research Foundation, Inc.
-rem   All Rights Reserved
+rem VR Juggler is (C) Copyright 1998-2003 by Iowa State University
 rem
 rem Original Authors:
 rem   Allen Bierbaum, Christopher Just,


fixed startup script

fixed startup script

git-svn-id: b3a16cacd9d642da9fc3c446880e0abaf87e3e06@17434 bf0df8d0-2c1f-0410-b170-bd30377b63dc

--- sgw/boot/src/main/config/run.bat
+++ sgw/boot/src/main/config/run.bat
@@ -14,15 +14,15 @@
 if "%OS%" == "Windows_NT" set PROGNAME=%~nx0%

 pushd %DIRNAME%..
-set MMS_HOME=%CD%
+set SGW_HOME=%CD%
 echo ========
-echo %MMS_HOME%
+echo %SGW_HOME%

 popd

 REM Add bin/native to the PATH if present
-if exist "%MMS_HOME%\native" set PATH=%MMS_HOME%\native;%PATH%
-if exist "%MMS_HOME%\native" set JAVA_OPTS=%JAVA_OPTS% -Djava.library.path="%PATH%"
+if exist "%SGW_HOME%\native" set PATH=%SGW_HOME%\native;%PATH%
+if exist "%SGW_HOME%\native" set JAVA_OPTS=%JAVA_OPTS% -Djava.library.path="%PATH%"

 REM Run section  - here we define node and default ip
 set IP=127.0.0.1
@@ -55,7 +55,7 @@

 rem Find run.jar, or we can't continue

-set RUNJAR=%MMS_HOME%\bin\run.jar
+set RUNJAR=%SGW_HOME%\bin\run.jar
 if exist "%RUNJAR%" goto FOUND_RUN_JAR
 echo Could not locate %RUNJAR%. Please check that you are in the
 echo bin directory when running this script.
@@ -89,10 +89,10 @@
 rem result in including the local directory in the classpath, which makes
 rem error tracking harder.
 if not "%JAVAC_JAR%" == "" set RUNJAR=%JAVAC_JAR%;%RUNJAR%
-if "%MMS_CLASSPATH%" == "" set RUN_CLASSPATH=%RUNJAR%
-if "%RUN_CLASSPATH%" == "" set RUN_CLASSPATH=%MMS_CLASSPATH%;%RUNJAR%
+if "%SGW_CLASSPATH%" == "" set RUN_CLASSPATH=%RUNJAR%
+if "%RUN_CLASSPATH%" == "" set RUN_CLASSPATH=%SGW_CLASSPATH%;%RUNJAR%

-set MMS_CLASSPATH=%RUN_CLASSPATH%
+set SGW_CLASSPATH=%RUN_CLASSPATH%

 rem Setup JBoss specific properties
 set JAVA_OPTS=%JAVA_OPTS% -Dprogram.name=%PROGNAME%
@@ -115,28 +115,28 @@
 rem set JAVA_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y %JAVA_OPTS%

 rem Setup the java endorsed dirs
-set MMS_ENDORSED_DIRS=%MMS_HOME%\lib
+set SGW_ENDORSED_DIRS=%SGW_HOME%\lib

 echo ===============================================================================
 echo.
-echo   MMS Bootstrap Environment
+echo   SGW Bootstrap Environment
 echo.
-echo   MMS_HOME: %MMS_HOME%
+echo   SGW_HOME: %SGW_HOME%
 echo.
 echo   JAVA: %JAVA%
 echo.
 echo   JAVA_OPTS: %JAVA_OPTS%
 echo.
-echo   CLASSPATH: %MMS_CLASSPATH%
+echo   CLASSPATH: %SGW_CLASSPATH%
 echo
-echo   MMS_ENDORSED_DIRS: %MMS_ENDORSED_DIRS%
+echo   SGW_ENDORSED_DIRS: %SGW_ENDORSED_DIRS%
 echo.
 echo ===============================================================================
 echo.

 :RESTART
-"%JAVA%" %JAVA_OPTS% -Djava.ext.dirs="%MMS_ENDORSED_DIRS%" -Dmbrola.base="%MMS_HOME%/mbrola" -classpath "%MMS_CLASSPATH%" org.mobicents.media.server.bootstrap.Main %*
+"%JAVA%" %JAVA_OPTS% -Djava.ext.dirs="%SGW_ENDORSED_DIRS%" -classpath "%SGW_CLASSPATH%" org.mobicents.ss7.sgw.boot.Main %*
 rem if ERRORLEVEL 10 goto RESTART

 :END


use python setup.py build/install instead of bdist_wheel/pip

bdist_wheel doesn't support the --compiler option

--- recipes/fastscapelib-f2py/bld.bat
+++ recipes/fastscapelib-f2py/bld.bat
@@ -8,16 +8,12 @@

 mkdir "%SRC_DIR%\dist"

-"%PYTHON%" setup.py bdist_wheel ^
-           --dist-dir="%SRC_DIR%\dist" ^
+"%PYTHON%" setup.py build ^
            --compiler=mingw32 ^
+           -G "MinGW Makefiles" ^
            -- ^
            -DF2PY_EXECUTABLE:FILEPATH="%F2PY%"

-"%PYTHON%" -m pip install ^
-           --no-index ^
-           --find-links="%SRC_DIR%\dist" ^
-           fastscapelib_fortran ^
-           -vvv
+"%PYTHON%" setup.py install

 if errorlevel 1 exit 1


Update bld.bat

Update bld.bat

--- recipes/ycm-cmake-modules/bld.bat
+++ recipes/ycm-cmake-modules/bld.bat
@@ -18,5 +18,6 @@
 if errorlevel 1 exit 1

 :: Test.
-ctest --output-on-failure -C Release
+:: Some tests disabled for https://github.com/robotology/ycm/issues/382
+ctest --output-on-failure -C Release -E "YCMBootstrap-not-use-system|YCMBootstrap-disable-find|RunCMake.IncludeUrl"
 if errorlevel 1 exit 1


path corrected

path corrected

git-svn-id: 98f681d7a2907ee2a41df434552134740bcc8829@73452 81fbe566-5dc4-48c1-bdea-7421811ca204

--- nuget-push.cmd
+++ nuget-push.cmd
@@ -3,4 +3,4 @@
 SET Id=ZXing.Net
 SET VERSION=0.3.0.0

-3rdParty\nuget\nuget push Build\nuget\%ID%.%VERSION%.nupkg+3rdParty\nuget\nuget push Build\Deployment\%ID%.%VERSION%.nupkg


Changed build.bat to take password as parameter

--- panda-tray/build.bat
+++ panda-tray/build.bat
@@ -34,8 +34,8 @@
 echo unzipping %zipfile%
 %zip% x -odist -y %zipfile%
 echo "signing executables"
-"C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin\signtool.exe" sign /f %pandapfx% /p pandasignpass "dist\panda-tray-w.exe"
-"C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin\signtool.exe" sign /f %pandapfx% /p pandasignpass "dist\Digital Panda Tray Application-%version%.win32\panda-tray-w.exe"
+"C:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\Bin\signtool.exe" sign /f %pandapfx% /p %2 "dist\panda-tray-w.exe"
+"C:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\Bin\signtool.exe" sign /f %pandapfx% /p %2 "dist\Digital Panda Tray Application-%version%.win32\panda-tray-w.exe"
 echo "re-creating zip file"
 del %zipfile%
 set f1=".\dist\Digital Panda Tray Application-%version%.win32\panda-tray-w.exe"
@@ -53,7 +53,7 @@
 :inno
 echo "F.Y.I: you need to install innosetup and have the pfx file in the correct place!"
 del "Output\setup.exe"
-"c:\Program Files (x86)\Inno Setup 5\ISCC.exe" "/sStandard=$qC:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin\signtool.exe$q sign /f %pandapfx% /p pandasignpass /d $qDigital Panda - Cloud Storage Synchronisation Client$q $f" installer.iss
+"c:\Program Files (x86)\Inno Setup 5\ISCC.exe" "/sStandard=$qC:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\Bin\signtool.exe$q sign /f %pandapfx% /p %2 /d $qDigital Panda - Cloud Storage Synchronisation Client$q $f" installer.iss
 del "Output\Setup.Digital Panda Tray Application-%version%.win32.exe"
 rename "Output\setup.exe" "Setup.Digital Panda Tray Application-%version%.win32.exe"
 goto end


Creating out32dllForNuget and copying 32 bits output there.


Added variable to point to MSDev to allow running it when not on path.

--- scripts/checkbuilds.bat
+++ scripts/checkbuilds.bat
@@ -8,6 +8,7 @@
 cd ..\..
 set
 set BORLAND_BASE=G:\Borland\bcc55
+set MSDEV_BASE=C:\Program Files\Microsoft Visual Studio\Common\MSDev98\Bin
 rem
 rem Target 1: Normal gcc build
 call scite\scripts\clearboth
@@ -49,6 +50,7 @@
 rem Target 4: Visual C++ using scite\vcbuild\scite.dsp
 call scite\scripts\clearboth
 cd scintilla\vcbuild
+path %MSDEV_BASE%;%path%
 msdev SciLexer.dsp /MAKE "SciLexer - Win32 Release" /REBUILD
 if ERRORLEVEL 2 goto ERROR
 cd ..\..
@@ -81,4 +83,5 @@
 set SAVE_PATH=
 set SAVE_INCLUDE=
 set BORLAND_BASE=
+set MSDEV_BASE=
 set


Fixed release script for 4.15

Fixed release script for 4.15

--- Scripts/GenerateRelease-Gwenn.bat
+++ Scripts/GenerateRelease-Gwenn.bat
@@ -2,7 +2,7 @@

 set OutputDir=D:\HR-Builds
 set ProjectDir=D:\HeliumRain
-set EngineDir=D:\Dock\UE4_Packaged\4.14
+set EngineDir=D:\Dock\UE4_Packaged\4.15

 set VersionName=dev
 if not "%1"=="" (


Issue 4012: WIP - fails checking compile exit code and setting path for test


Fixes to Java build system

Fixes to Java build system

More Java build script improvements.

--- java/build.bat
+++ java/build.bat
@@ -1,12 +1,15 @@
-../cpp/build.bat
+cd ..\cpp
+call build.bat
+cd ..\java
 rmdir /s /q build
 mkdir build
 mkdir build\win32-x86
-copy "..\cpp\lib\Release\MSVC\Release\x86\rrdtp_module.dll" "build\win32-x86\rrdtp_module.dll"
-copy "..\cpp\lib\Release\MSVC\Release\x64\rrdtp_module.dll" "build\win32-x86_64\rrdtp_module.dll"
+mkdir build\win32-x86_64
+copy "..\cpp\lib\MSVC\x86\Release\rrdtp_module.dll" "build\win32-x86\rrdtp_module.dll"
+copy "..\cpp\lib\MSVC\x64\Release\rrdtp_module.dll" "build\win32-x86_64\rrdtp_module.dll"
 javac -cp "3rd-party\*;." -d "build" src\edu\cwu\rrdtp\*.java
 cd build
 jar xf ../3rd-party/jna-4.2.2.jar
 rmdir /s /q META-INF
 jar cvf rrdtp.jar ./*
-cd ../+cd ..\..\


Added '/scripts/Git-Rebase-Master-Into-Current-Branch.bat'.

error: pathspec 'scripts/Git-Rebase-Master-Into-Current-Branch.bat' did not match any file(s) known to git

--- scripts/Git-Rebase-Master-Into-Current-Branch.bat
+++ scripts/Git-Rebase-Master-Into-Current-Branch.bat
@@ -0,0 +1,39 @@
+@echo off
+
+rem Show current git branch.
+git status
+
+rem Confirm continue with rebase.
+echo.
+choice Are you sure you want to rebase master into the current branch?
+if "%errorlevel%" neq "1" goto exit
+
+rem Changes to master branch
+git checkout master
+if "%errorlevel%" neq "0" goto error
+
+rem Update master branch with changes on origin
+git pull
+if "%errorlevel%" neq "0" goto error
+
+rem Change back to the feature branch
+git checkout -
+if "%errorlevel%" neq "0" goto error
+
+rem Rebase master into feature branch
+git rebase master
+if "%errorlevel%" neq "0" goto error
+
+goto exit
+
+:error
+echo.
+echo.
+echo ********************************************
+echo * ERROR '%ERRORLEVEL%' WAS THROWN.
+echo ********************************************
+
+:exit
+echo.
+echo.
+pause


Use pkgdef files to control MIEngine logging (#451)

* Use pkgdef files to control MIEngine logging

This checkin changes SetMIDebugLogging.cmd to use pkgdef files instead of directly writing to the registry. This should resolve issues that customers who have multiple _Config keys have been having. I believe this will also fix logging for Dev15, though I don't have a Dev15 machine with the Android tools installed at the moment to verify.

* Update help text / comment to make it more clear what happens if /VSRootDir is NOT set

--- src/MICore/SetMIDebugLogging.cmd
+++ src/MICore/SetMIDebugLogging.cmd
@@ -1,8 +1,5 @@
 @echo off
 setlocal
-
-:: Change this for SxS
-set VSVersion=14.0

 if /i "%~1"=="" goto Help
 if /i "%~1"=="-?" goto Help
@@ -11,22 +8,25 @@
 set LoggingValue=
 set Exp=0
 set ServerLogging=
+set VSRootDir=
+set MIEngineRelativeDir=Common7\IDE\CommonExtensions\Microsoft\MDD\Debugger
+set MIEngineRelativePath=%MIEngineRelativeDir%\Microsoft.MIDebugEngine.dll

 :ArgLoop
 if /i "%~1"=="on" set LoggingValue=1& goto ArgLoopCondition
 if /i "%~1"=="off" set LoggingValue=0& goto ArgLoopCondition
-if /i "%~1"=="/exp" set Exp=1& goto ArgLoopCondition
-if /i "%~1"=="-exp" set Exp=1& goto ArgLoopCondition
-if /i "%~1"=="/version" goto SetVersion
-if /i "%~1"=="-version" goto SetVersion
+if /i "%~1"=="/VSRootDir" goto SetVSRoot
+if /i "%~1"=="-VSRootDir" goto SetVSRoot
 if /i "%~1"=="-serverlogging" goto SetServerLogging
 if /i "%~1"=="/serverlogging" goto SetServerLogging
 echo ERROR: Unknown argument '%~1'& exit /b -1

-:SetVersion
+:SetVSRoot
 shift
 if "%~1"=="" echo ERROR: Expected version number.
-set VSVersion=%~1
+set VSRootDir=%~1
+if not exist "%VSRootDir%" echo ERROR: '/VSRootDir' value '%VSRootDir%' does not exist & exit /b -1
+if not exist "%VSRootDir%\%MIEngineRelativePath%" echo ERROR: '/VSRootDir' value '%VSRootDir%' does not contain MIEngine (%VSRootDir%\%MIEngineRelativePath%) & exit /b -1
 goto ArgLoopCondition

 :SetServerLogging
@@ -42,68 +42,85 @@
 if "%LoggingValue%"=="" echo ERROR: 'on' or 'off' must be specified.& exit /b -1
 if /i NOT "%LoggingValue%"=="1" if NOT "%ServerLogging%"=="" echo ERROR: '/serverlogging' can only be used with 'on'& exit /b -1

-set reg_exe=reg.exe
-if /i "%PROCESSOR_ARCHITECTURE%"=="AMD64" set reg_exe=%windir%\syswow64\reg.exe
+set SetLoggingError=
+if NOT "%VSRootDir%"=="" call :SetLogging "%VSRootDir%" & goto Done

-set MainRegRoot=HKLM\SOFTWARE\Microsoft\VisualStudio\%VSVersion%
-set OptionalRegRoots=HKCU\SOFTWARE\Microsoft\VisualStudio\%VSVersion%_Config HKLM\SOFTWARE\Microsoft\Glass\%VSVersion%
+REM If '/VSRootDir' is NOT specified, try ALL the default locations
+set ProgRoot=%ProgramFiles(x86)%
+if "%ProgRoot%"=="" set ProgRoot=%ProgramFiles%
+set VSVersionFound=
+set MIEngineFound=
+call :TryVSPath "%ProgRoot%\Microsoft Visual Studio 14.0"
+call :TryVSPath "%ProgRoot%\Microsoft Visual Studio\VS15Preview"
+if "%VSVersionFound%"=="" echo ERROR: Visual Studio 2015+ is not installed, or not installed to the default location. Use '/VSRootDir' to specify the directory. & exit /b -1
+if "%MIEngineFound%"=="" echo ERROR: The found version(s) of Visual Studio do not have the MIEngine installed. & exit /b -1
+goto Done

-if "%Exp%"=="1" goto :SetExpRegRoots
+:Done
+    echo.
+    if NOT "%SetLoggingError%"=="" exit /b -1
+    echo SetMIDebugLogging.cmd succeeded. Restart Visual Studio to take effect.
+    if "%LoggingValue%"=="1" echo Logging will be saved to %TMP%\Microsoft.MIDebug.log.
+    exit /b 0

-call :SetRegRoot %MainRegRoot%
-for %%r in (%OptionalRegRoots%) do call :SetForRegRootIfExists %%r
-exit /b 0
+:TryVSPath
+    REM Arg1: path to VS Root

-:SetExpRegRoots
-reg query HKCU\Software\Microsoft\VisualStudio | findstr %VSVersion%Exp_Config > %TMP%\%VSVersion%ExpRegRoots.txt
-set ExpRoots=
-set ExpRootFound=
-for /f "delims=" %%r in (%TMP%\%VSVersion%ExpRegRoots.txt) do set ExpRootFound=1& call set ExpRoots=%%ExpRoots%% %%r
-if NOT "%ExpRootFound%"=="1" echo ERROR: Experimental instance could not be found. Experimental instance must be started before this batch script can work.& exit /b -1
+    if NOT "%SetLoggingError%"=="" goto :EOF
+    if not exist "%~1" goto :EOF
+    set VSVersionFound=1
+    if not exist "%~1\%MIEngineRelativePath%" goto :EOF
+    set MIEngineFound=1
+    goto SetLogging

-for %%r in (%ExpRoots%) do call :SetRegRoot %%r
-exit /b 0
+:SetLogging
+    REM Arg1: path to VS Root
+    set PkgDefFile=%~1\%MIEngineRelativeDir%\logging.pkgdef

-:SetForRegRootIfExists
-REM check if the registry root exists
-call %reg_exe% query %1 /ve 1>NUL 2>NUL
-if NOT %ERRORLEVEL%==0 goto eof
+    if NOT exist "%PkgDefFile%" goto SetLogging_NoPkgDef
+        del "%PkgDefFile%"
+        if NOT exist "%PkgDefFile%" goto SetLogging_NoPkgDef
+        echo ERROR: Failed to remove "%PkgDefFile%". Ensure this script is run as an administrator.
+        set SetLoggingError=1
+        goto :EOF
+    :SetLogging_NoPkgDef

-:SetRegRoot
-call %reg_exe% add %1\Debugger /v EnableMIDebugLogger /t REG_DWORD /d %LoggingValue% /f
-if not %ERRORLEVEL%==0 echo ERROR: failed to write to the registry (%1) & exit /b -1
+    if "%LoggingValue%"=="0" goto UpdateConfiguration

-if "%ServerLogging%"=="" goto DeleteServerLogging
-goto AddServerLogging
+    :EnableLogging
+        echo [$RootKey$\Debugger]> "%PkgDefFile%"
+            if exist "%PkgDefFile%" goto EnableLogging_PkgDefCreated
+            echo ERROR: Failed to create "%PkgDefFile%". Ensure this script is run as an administrator.
+            set SetLoggingError=1
+            goto :EOF
+        :EnableLogging_PkgDefCreated

-:AddServerLogging
-call %reg_exe% add %1\Debugger /v GDBServerLoggingArguments /t REG_SZ /d "%ServerLogging%" /f
-if not %ERRORLEVEL%==0 echo ERROR: failed to write to the registry (%1) & exit /b -1
-goto eof
+        echo "Logging"=dword:00000001>> "%PkgDefFile%"
+        if NOT "%ServerLogging%"=="" echo "GDBServerLoggingArguments"="%ServerLogging%">> "%PkgDefFile%"

-:DeleteServerLogging
-call %reg_exe% delete %1\Debugger /v GDBServerLoggingArguments /f 1>NUL 2>NUL
-goto eof
+    :UpdateConfiguration
+    echo Setting logging for %1
+    call "%~1\Common7\IDE\devenv.com" /updateconfiguration
+    if "%ERRORLEVEL%"=="0" goto :EOF
+    echo ERROR: '"%~1\Common7\IDE\devenv.com" /updateconfiguration' failed with error %ERRORLEVEL%.
+    set SetLoggingError=1
+    goto :EOF

 :Help
-echo SetMIDebugLogging.cmd ^<on^|off^> [/serverlogging [full]] [/exp] [/version 12.0 ^| 14.0]
+echo SetMIDebugLogging.cmd ^<on^|off^> [/serverlogging [full]] [/VSRootDir ^<value^>]
 echo.
 echo SetMIDebugLogging.cmd is used to enable/disable logging for the Microsoft
 echo MI debug engine.
 echo.
 echo Logging will be saved to %TMP%\Microsoft.MIDebug.log.
 echo.
-echo /exp              Changes the setting for the experimental instance of
-echo                   Visual Studio instead of the normal instance.
-echo                   NOTE: For the experimental instance, this command must be
-echo                   run after the experimental instance is started, but before
-echo                   start debugging.
+echo /serverlogging [full] Enables logging from gdbserver. This option is only
+echo            supported when enabling logging ('on'). 'full' logging will
+echo            turn on packet logging in addition to normal logging.
 echo.
-echo /version ^<number^> Changes the version of Visual Studio which is affected.
-echo                   Default is '%VSVersion%'.
-echo.
-echo /serverlogging [full] Enables logging from gdbserver. This option is only
-echo                   supported when enabling logging ('on'). 'full' logging will
-echo                   turn on packet logging in addition to normal logging.
+echo /VSRootDir ^<value^> sets the path to the root of Visual Studio
+echo            (ex: C:\Program Files (x86)\Microsoft Visual Studio 14.0). If not
+echo            specified, the default install directories for all versions of VS
+echo            2015+ will be used.
 echo.
 :eof


Fix incorrect VS version bug

Fix incorrect VS version bug

--- recipes/mdal/bld.bat
+++ recipes/mdal/bld.bat
@@ -1,7 +1,7 @@
 mkdir build
 cd build

-cmake -G "Visual Studio 16 2019" ^
+cmake  ^
 	-DCMAKE_BUILD_TYPE=Rel  ^
 	-DENABLE_TESTS=OFF ^
 	-DNETCDF_PREFIX="%LIBRARY_PREFIX%" ^


Permission fixed

Permission fixed

error: pathspec 'platforms/android/cordova/lib/start-emulator.bat' did not match any file(s) known to git

--- platforms/android/cordova/lib/start-emulator.bat
+++ platforms/android/cordova/lib/start-emulator.bat
@@ -0,0 +1,26 @@
+:: Licensed to the Apache Software Foundation (ASF) under one
+:: or more contributor license agreements.  See the NOTICE file
+:: distributed with this work for additional information
+:: regarding copyright ownership.  The ASF licenses this file
+:: to you under the Apache License, Version 2.0 (the
+:: "License"); you may not use this file except in compliance
+:: with the License.  You may obtain a copy of the License at
+::
+:: http://www.apache.org/licenses/LICENSE-2.0
+::
+:: Unless required by applicable law or agreed to in writing,
+:: software distributed under the License is distributed on an
+:: "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+:: KIND, either express or implied.  See the License for the
+:: specific language governing permissions and limitations
+:: under the License.
+
+@ECHO OFF
+SET script_path="%~dp0start-emulator"
+IF EXIST %script_path% (
+        node "%script_path%" %*
+) ELSE (
+    ECHO.
+    ECHO ERROR: Could not find 'start-emulator' script in 'cordova\lib' folder, aborting...>&2
+    EXIT /B 1
+)


GROOVY-2690: groovy.bat faile to start script that are in a folder with a dash follow with "s"

git-svn-id: aa43ce4553b005588bb3cc6c16966320b011facb@11082 a5544e8c-8a19-0410-ba12-f9af4593a198

--- src/bin/startGroovy.bat
+++ src/bin/startGroovy.bat
@@ -125,7 +125,7 @@
 :process_arg
 if "%_ARG%" == "" goto execute

-rem now unescape -q, is, -d
+rem now unescape -q, -s, -d
 set _ARG=%_ARG:-q="%
 set _ARG=%_ARG:-s=*%
 set _ARG=%_ARG:-d=-%


msys2_shell.cmd: Fixed return value - printing help is not an error.

--- filesystem/msys2_shell.cmd
+++ filesystem/msys2_shell.cmd
@@ -18,7 +18,7 @@
 rem Help option
 if "x%~1" == "x-help" (
   call :printhelp "%~nx0"
-  exit /b 1
+  exit /b %ERRORLEVEL%
 )
 rem Shell types
 if "x%~1" == "x-msys" shift& set MSYSTEM=MSYS& goto :checkparams


daily

daily

--- Common/Options/uintx/gen/Clean.bat
+++ Common/Options/uintx/gen/Clean.bat
@@ -20,3 +20,15 @@

 C:\Factory\SubTools\rept.exe /P $BIT 4096 /P $hBIT 2048 /P $SZ 128 /P $hSZ 64 uintx.c.h ..\uint4096.c
 C:\Factory\SubTools\rept.exe /P $BIT 4096 /P $hBIT 2048 /P $SZ 128 /P $hSZ 64 uintx.h.h ..\uint4096.h
+
+rem C:\Factory\SubTools\rept.exe /P $BIT 8192 /P $hBIT 4096 /P $SZ 256 /P $hSZ 128 uintx.c.h ..\uint8192.c
+rem C:\Factory\SubTools\rept.exe /P $BIT 8192 /P $hBIT 4096 /P $SZ 256 /P $hSZ 128 uintx.h.h ..\uint8192.h
+
+rem C:\Factory\SubTools\rept.exe /P $BIT 16384 /P $hBIT 8192 /P $SZ 512 /P $hSZ 256 uintx.c.h ..\uint16384.c
+rem C:\Factory\SubTools\rept.exe /P $BIT 16384 /P $hBIT 8192 /P $SZ 512 /P $hSZ 256 uintx.h.h ..\uint16384.h
+
+rem C:\Factory\SubTools\rept.exe /P $BIT 32768 /P $hBIT 16384 /P $SZ 1024 /P $hSZ 512 uintx.c.h ..\uint32768.c
+rem C:\Factory\SubTools\rept.exe /P $BIT 32768 /P $hBIT 16384 /P $SZ 1024 /P $hSZ 512 uintx.h.h ..\uint32768.h
+
+rem C:\Factory\SubTools\rept.exe /P $BIT 65536 /P $hBIT 32768 /P $SZ 2048 /P $hSZ 1024 uintx.c.h ..\uint65536.c
+rem C:\Factory\SubTools\rept.exe /P $BIT 65536 /P $hBIT 32768 /P $SZ 2048 /P $hSZ 1024 uintx.h.h ..\uint65536.h


Removing build directories in build dependencies

--- maketools/build_dependencies.bat
+++ maketools/build_dependencies.bat
@@ -1,4 +1,4 @@
-set VCDIR="c:\Program Files (x86)\Microsoft Visual Studio 9.0\"
+set VCDIR="c:\Program Files (x86)\Microsoft Visual Studio 8\"

 @echo OFF
 set DEVENV=%VCDIR%\Common7\IDE\devenv.exe
@@ -7,18 +7,21 @@
 echo "Working dir: " %PWD%
 echo "Basedir: " %BASEDIR%
 set PATH=%PATH%;%PWD%\cmake-2.8.12-win32-x86\bin;%PWD%\premake4.3
+rm -r %BASEDIR%\deps\glfw-3.0.3\build
 md %BASEDIR%\deps\glfw-3.0.3\build
 cd %BASEDIR%\deps\glfw-3.0.3\build
 cmake ..
 %DEVENV% GLFW.sln /Build
 %DEVENV% GLFW.sln /Build "Release"
 cd %PWD%
+rm -r %BASEDIR%\deps\zlib-1.2.8\build
 md %BASEDIR%\deps\zlib-1.2.8\build
 cd %BASEDIR%\deps\zlib-1.2.8\build
 cmake ..
 %DEVENV% zlib.sln /Build
 %DEVENV% zlib.sln /Build "Release"
 copy zconf.h ..
+rm -r %BASEDIR%\deps\lpng166\build
 md %BASEDIR%\deps\lpng166\build
 cd %BASEDIR%\deps\lpng166\build
 set ZLIB_INCLUDE_DIR=%BASEDIR%\deps\zlib-1.2.8\


redirect nul

redirect nul

--- mk/sign-ps.bat
+++ mk/sign-ps.bat
@@ -31,6 +31,6 @@
 @echo on
 if not exist C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe goto done

-C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -Command "$a = @(Get-ChildItem \"cert:\\CurrentUser\\My\" | where { $_.Subject -like \"*Citrix Systems, Inc*\" } ; Set-AuthenticodeSignature -cert $c %1"); foreach ($c in $a) { Set-AuthenticodeSignature -cert $c %1" } done <NUL
+C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -Command "$a = @(Get-ChildItem \"cert:\\CurrentUser\\My\" | where { $_.Subject -like \"*Citrix Systems, Inc*\" } ; Set-AuthenticodeSignature -cert $c %1"); foreach ($c in $a) { Set-AuthenticodeSignature -cert $c %1" } done >NUL

 :done


Sample with locale (128-255) characters added

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

--- tests/localized.bat
+++ tests/localized.bat
@@ -0,0 +1,4 @@
+blabla
+echo %123%!"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~!!!
+copy 1 2
+rem super


Fixed the name of the script.

Fixed the name of the script.

--- mts-timestamp-prefixer.cmd
+++ mts-timestamp-prefixer.cmd
@@ -1 +1 @@
-cscript rename-as-timestamp.js+cscript mts-timestamp-prefixer.js


Updated the BuildNightly.bat script to skip help files since there is no shfbproj project to build.

git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/siegate/Feature Development;C92750

--- Build/Scripts/BuildNightly.bat
+++ Build/Scripts/BuildNightly.bat
@@ -18,4 +18,4 @@
 ::*******************************************************************************************************

 @ECHO OFF
-C:\WINDOWS\Microsoft.NET\Framework\v4.0.30319\msbuild.exe SIEGate.buildproj /l:FileLogger,Microsoft.Build.Engine;logfile=SIEGate.output+C:\WINDOWS\Microsoft.NET\Framework\v4.0.30319\msbuild.exe SIEGate.buildproj /p:SkipHelpFiles=true /l:FileLogger,Microsoft.Build.Engine;logfile=SIEGate.output


Update bigfix_setup_root_eval.bat

Update bigfix_setup_root_eval.bat

--- CMD/bigfix_setup_root_eval.bat
+++ CMD/bigfix_setup_root_eval.bat
@@ -9,4 +9,4 @@

 powershell -command "& { (New-Object Net.WebClient).DownloadFile('http://download.microsoft.com/download/2/5/0/2508F7B4-6DDE-4C3E-B1FA-E1EB66F2F79F/SQLServer2016-SSEI-Dev.exe', '%BASEFOLDER%\SQLServer-SSEI-Dev.exe') }" -ExecutionPolicy Bypass

-REM SQLServer-SSEI-Dev.exe /Q /ACTION=Install /IACCEPTSQLSERVERLICENSETERMS
+%BASEFOLDER%\SQLServer-SSEI-Dev.exe /Q /ACTION=Install /IACCEPTSQLSERVERLICENSETERMS


[new downloader][android] fix: replace_links.bat for Windows.

--- android/script/replace_links.bat
+++ android/script/replace_links.bat
@@ -11,7 +11,7 @@
 cp ../data/drules_proto_dark.bin assets/
 cp ../data/drules_proto_clear.bin assets/
 cp ../data/drules_proto_legacy.bin assets/
-cp ../data/editor.xml assets/
+cp ../data/editor.config assets/
 cp ../data/external_resources.txt assets/
 cp ../data/faq.html assets/
 cp ../data/fonts_blacklist.txt assets/


fix 'alias ..=cd ..' removing 2 char aliases

--- vendor/bin/alias.cmd
+++ vendor/bin/alias.cmd
@@ -81,6 +81,9 @@
 :: trailing quotes added while validating
 set alias_value=!alias_value:~0,-1!

+:: '.' escaped
+set alias_name_esc=!alias_name:.=\.!
+
 ::remove spaces
 set _temp=%alias_name: =%

@@ -91,7 +94,7 @@
 )

 :: replace already defined alias
-%WINDIR%\System32\findstr /b /v /i "%alias_name%=" "%ALIASES%" >> "%ALIASES%.tmp"
+%WINDIR%\System32\findstr /v /i "^%alias_name_esc%=" "%ALIASES%" >> "%ALIASES%.tmp"
 echo %alias_name%=%alias_value% >> "%ALIASES%.tmp" && type "%ALIASES%.tmp" > "%ALIASES%" & @del /f /q "%ALIASES%.tmp"
 doskey /macrofile="%ALIASES%"
 endlocal
@@ -99,7 +102,11 @@

 :p_del
 set del_alias=%~1
-%WINDIR%\System32\findstr /b /v /i "%del_alias%=" "%ALIASES%" >> "%ALIASES%.tmp"
+
+:: '.' escaped
+set del_alias_esc=!del_alias:.=\.!
+
+%WINDIR%\System32\findstr /v /i "^%del_alias_esc%=" "%ALIASES%" >> "%ALIASES%.tmp"
 type "%ALIASES%".tmp > "%ALIASES%" & @del /f /q "%ALIASES%.tmp"
 doskey %del_alias%=
 doskey /macrofile="%ALIASES%"


Add publish script for Infinni.Demo

Add publish script for Infinni.Demo

error: pathspec 'Infinni.Demo/publish.bat' did not match any file(s) known to git

--- Infinni.Demo/publish.bat
+++ Infinni.Demo/publish.bat
@@ -0,0 +1,2 @@
+dotnet restore -r win10-x64 & dotnet publish -r win10-x64
+dotnet restore -r ubuntu.16.04-x64 & dotnet publish -r ubuntu.16.04-x64


append pkgconfig to LIBRARY_LIB for PKG_CONFIG_PATH

--- recipes/cdm/bld.bat
+++ recipes/cdm/bld.bat
@@ -1,6 +1,6 @@
 mkdir build && cd build

-set PKG_CONFIG_PATH=%LIBRARY_LIB%
+set PKG_CONFIG_PATH=%LIBRARY_LIB%\pkgconfig

 cmake -LAH -G "NMake Makefiles" ^
   -DCMAKE_INSTALL_PREFIX:PATH=%LIBRARY_PREFIX% ^


Add support for easily collecting JitFuncInfoLogFile for the tests

Simply uncomment one of the three methods for doing the collection in
the ryujit_x86_testenv.cmd file.

--- tests/x86/ryujit_x86_testenv.cmd
+++ tests/x86/ryujit_x86_testenv.cmd
@@ -12,3 +12,44 @@
 @REM as much as possible with RyuJIT, and not just stop at the first NYI. It means
 @REM we will fall back to x86 legacy JIT for many functions.
 @REM set COMPLUS_AltJitAssertOnNYI=1
+
+@REM -------------------------------------------------------------------------
+@REM A JitFuncInfoLogFile is a per-function record of which functions were
+@REM compiled, and what asserts and NYI were hit.
+@REM
+@REM If you wish to collect FuncInfo, choose one of the following collection
+@REM methods to use, by uncommenting the appropriate option.
+
+@REM Option 1: collect a single FuncInfoLogFile for all tests.
+@REM TO DO: set a single, fully-qualified pathname here.
+@REM ==== Uncomment below
+@REM set COMPLUS_JitFuncInfoLogFile=%TEMP%\JitFuncInfoLogFile.txt
+@REM ==== Uncomment above
+
+@REM Option #2: collect one FuncInfoLogFile per test, and put it in
+@REM the same directory as the test. Note that each tests lives in
+@REM its own directory, and the current directory is set to the unique
+@REM test directory before this script is invoked.
+@REM ==== Uncomment below
+@REM set __TestDir=%CD%
+@REM if %__TestDir:~-1%==\ set __TestDir=%__TestDir:~0,-1%
+@REM set COMPLUS_JitFuncInfoLogFile=%__TestDir%\FuncInfo.txt
+@REM ==== Uncomment above
+
+@REM Option #3: collect one FuncInfoLogFile per test, and put all of
+@REM them in a separate directory tree rooted at %__FuncInfoRootDir%.
+@REM If that is set globally already, then use it. Otherwise, use a
+@REM default set here. The directory tree will mirror the test binary tree.
+@REM Note that the current directory is set to the unique test directory
+@REM before this script is invoked.
+@REM ==== Uncomment below
+@REM if not defined __FuncInfoRootDir set __FuncInfoRootDir=c:\FuncInfos
+@REM set __TestDir=%CD%
+@REM if %__TestDir:~-1%==\ set __TestDir=%__TestDir:~0,-1%
+@REM if %__TestDir:~1,1%==: set __TestDir=%__TestDir:~3%
+@REM set __FuncInfoDir=%__FuncInfoRootDir%\%__TestDir%
+@REM if not exist %__FuncInfoDir% mkdir %__FuncInfoDir%
+@REM set COMPLUS_JitFuncInfoLogFile=%__FuncInfoDir%\FuncInfo.txt
+@REM ==== Uncomment above
+
+@REM -------------------------------------------------------------------------


add ALL_BUILD and ZERO_CHECK

add ALL_BUILD and ZERO_CHECK

--- recipe/bld.bat
+++ recipe/bld.bat
@@ -10,4 +10,7 @@

 ECHO VS files have been generated in build\windows

-cmake --build . --config Release
+dir
+
+cmake --build . --config Release --target ALL_BUILD
+cmake --build . --config Release --target ZERO_CHECK


Another path correction.

Another path correction.

--- src/Magick.Native/build/Build.cmd
+++ src/Magick.Native/build/Build.cmd
@@ -17,7 +17,7 @@
 powershell .\build.Native.ps1 -config  %config% -quantumName %quantumName% -platformName %platformName%
 if %errorlevel% neq 0 goto done

-cd ..\..\..\src\Magick.Native\bin\Debug%quantumName%\%platformName%
+cd ..\..\src\Magick.Native\bin\Debug%quantumName%\%platformName%

 copy /y Magick.Native-%quantumName%-%platformName%.dll ..\..\..\..\..\..\Magick.NET\tests\Magick.NET.Tests\bin\%config%%quantumName%\%platformName%\net452
 copy /y Magick.Native-%quantumName%-%platformName%.pdb ..\..\..\..\..\..\Magick.NET\tests\Magick.NET.Tests\bin\%config%%quantumName%\%platformName%\net452


Corrected path due to changes in Magick.Native.

--- src/Magick.Native/build/Build.cmd
+++ src/Magick.Native/build/Build.cmd
@@ -9,7 +9,7 @@
 if "%quantumName%"=="" goto invalid
 if "%platformName%"=="" goto invalid

-cd ..\..\..\..\Magick.Native\build\dotnet\windows\
+cd ..\..\..\..\Magick.Native\build\windows\

 powershell .\build.ImageMagick.ps1 -config %config% -quantumName %quantumName% -platformName %platformName%
 if %errorlevel% neq 0 goto done


try this

try this

--- recipes/atari-py/bld.bat
+++ recipes/atari-py/bld.bat
@@ -2,11 +2,10 @@
 .\installzlib.bat
 mkdir -p atari_py\ale_interface\build && cd atari_py\ale_interface\build

-cmake -G "NMake Makefiles" ..
-      -DCMAKE_GENERATOR_PLATFORM=x64 ..
+cmake -G "%CMAKE_GENERATOR%" ^
+      -DCMAKE_GENERATOR_PLATFORM=x64 ^
+
 cmake --build .
-cp Debug\ale_c.dll ..\
-cd ..\..\..\

 rm -rf atari_py*
 %PYTHON% -m pip install . --no-deps -vv


another attempt

another attempt

--- recipes/libxfoil/bld.bat
+++ recipes/libxfoil/bld.bat
@@ -13,14 +13,13 @@

 rem create the libxfoil.lib which is needed for linking!!
 rem copied from lapack-feedstock
-for %%i in (xfoil) do (
-    dumpbin /exports "%LIBRARY_PREFIX%/lib%%i.dll" > exports%%i.txt
-    echo LIBRARY lib%%i.dll > %%i.def
-    echo EXPORTS >> %%i.def
-    for /f "skip=19 tokens=4" %%A in (exports%%i.txt) do echo %%A >> %%i.def
-    lib /def:%%i.def /out:%%i.lib /machine:x64
-    copy %%i.lib "%LIBRARY_PREFIX%/lib/%%i.lib"
-)
+for xfoil in (xfoil) do (
+dumpbin /exports "%LIBRARY_PREFIX%/lib/libxfoil.dll" > exportsxfoil.txt
+echo LIBRARY libxfoil.dll > xfoil.def
+echo EXPORTS >> xfoil.def
+for /f "skip=19 tokens=4" %%A in (exportsxfoil.txt) do echo %%A >> xfoil.def
+lib /def:xfoil.def /out:xfoil.lib /machine:x64
+copy xfoil.lib "%LIBRARY_PREFIX%/lib/xfoil.lib"

 cd ..


change hash_reader shell startup script

change hash_reader shell startup script

--- win_start_hash.bat
+++ win_start_hash.bat
@@ -1 +1 @@
-erl -pa ebin -noshell -run db_hash_reader_sup start_standalone localhost 27017 10
+erl -pa ebin -noshell -run hash_reader_sup start_standalone localhost 27017 10


Update extract_includes.bat to include new public headers in rev 120.

--- vsprojects/extract_includes.bat
+++ vsprojects/extract_includes.bat
@@ -8,6 +8,7 @@
 md include\google\protobuf\compiler\java
 md include\google\protobuf\compiler\python
 copy ..\src\google\protobuf\stubs\common.h include\google\protobuf\stubs\common.h
+copy ..\src\google\protobuf\stubs\once.h include\google\protobuf\stubs\once.h
 copy ..\src\google\protobuf\descriptor.h include\google\protobuf\descriptor.h
 copy ..\src\google\protobuf\descriptor.pb.h include\google\protobuf\descriptor.pb.h
 copy ..\src\google\protobuf\descriptor_database.h include\google\protobuf\descriptor_database.h
@@ -23,6 +24,7 @@
 copy ..\src\google\protobuf\wire_format.h include\google\protobuf\wire_format.h
 copy ..\src\google\protobuf\wire_format_inl.h include\google\protobuf\wire_format_inl.h
 copy ..\src\google\protobuf\io\coded_stream.h include\google\protobuf\io\coded_stream.h
+copy ..\src\google\protobuf\io\gzip_stream.h include\google\protobuf\io\gzip_stream.h
 copy ..\src\google\protobuf\io\printer.h include\google\protobuf\io\printer.h
 copy ..\src\google\protobuf\io\tokenizer.h include\google\protobuf\io\tokenizer.h
 copy ..\src\google\protobuf\io\zero_copy_stream.h include\google\protobuf\io\zero_copy_stream.h


Fix bug in pop.bat CLI script

Fix bug in pop.bat CLI script

--- script/pop.bat
+++ script/pop.bat
@@ -32,7 +32,7 @@
             SET TEMPFILE=%2%
             SET TESTFILE=..\vendor\Popcorn\src\Pop\%TEMPFILE%%EXT%
         )
-        IF EXIST %TESTFILE% (
+        IF EXIST "%TESTFILE%" (
             FOR /f "delims=" %%i IN ('dir /B ..\vendor\Popcorn\src\Pop\*%EXT%') DO (
                 echo Unpacking %%i...
                 %CMD% ../vendor/Popcorn/src/Pop/%%i


10.13.1.1224

--- Automated.Setup.cmd
+++ Automated.Setup.cmd
@@ -1,5 +1,5 @@
 @Echo Off
-SET forgeVer=10.13.1.1217
+SET forgeVer=10.13.1.1224
 :DLForge
 IF NOT EXIST "%CD%\forge-1.7.10-%forgeVer%-src.zip" (
 	wget -c --no-check-certificate --no-cookies "http://files.minecraftforge.net/maven/net/minecraftforge/forge/1.7.10-%forgeVer%/forge-1.7.10-%forgeVer%-src.zip" -O forge-1.7.10-%forgeVer%-src.zip


Removed space for echo before redirection operator

--- set-global.bat
+++ set-global.bat
@@ -21,11 +21,11 @@

     FOR /F "TOKENS=1,2*" %%I IN (%IN_GLOBALS_FILE%) DO (
         IF NOT %%I == %IN_VAR_NAME% (
-            ECHO %%I %%J >> "%TEMP_GLOBALS_FILE%"
+            ECHO %%I %%J>> "%TEMP_GLOBALS_FILE%"
         )
     )

-    ECHO %IN_VAR_NAME% %IN_VALUE% >> "%TEMP_GLOBALS_FILE%"
+    ECHO %IN_VAR_NAME% %IN_VALUE%>> "%TEMP_GLOBALS_FILE%"
     TYPE "%TEMP_GLOBALS_FILE%" > "%IN_GLOBALS_FILE%"
     DEL /S /Q "%TEMP_GLOBALS_FILE%" > NUL 2>&1


Add npm install for clean builds

Add npm install for clean builds

--- src/VsCode/Extension/run-vcse.cmd
+++ src/VsCode/Extension/run-vcse.cmd
@@ -1,2 +1,3 @@
 cd %1
+npm install
 vsce package


Update install_bigfix_universal.bat

Update install_bigfix_universal.bat

--- CMD/install_bigfix_universal.bat
+++ CMD/install_bigfix_universal.bat
@@ -34,6 +34,7 @@
 type NUL > %BASEFOLDER%\clientsettings.cfg
 REM  TODO: only do the following line if FQDN_variable is set
 >>%BASEFOLDER%\clientsettings.cfg ECHO _BESClient_RelaySelect_FailoverRelay=http://%1:52311/bfmirror/downloads/
+>>%BASEFOLDER%\clientsettings.cfg ECHO __RelaySelect_Automatic=1
 >>%BASEFOLDER%\clientsettings.cfg ECHO _BESClient_Resource_StartupNormalSpeed=1
 >>%BASEFOLDER%\clientsettings.cfg ECHO _BESClient_Download_RetryMinutes=1
 >>%BASEFOLDER%\clientsettings.cfg ECHO _BESClient_Resource_WorkIdle=20


minor batch fix

minor batch fix

--- src/ocl/perf_cases_googlenet.bat
+++ src/ocl/perf_cases_googlenet.bat
@@ -18,7 +18,7 @@
 echo "conv2/relu_3x3_reduce 1x64x256x512x64"
 rem .\driver\Debug\MLOpenDriver.exe conv -i 1 -n %B% -W 56 -H 56 -c 64 -k 64 -F 1 -t %T% -V %V%
 echo "conv2/3x3 10x64x56x56x192x3x3"
-.\driver\Debug\MLOpenDriver.exe conv -i 1 -n %B% -W 64 -H 56 -c 56 -k 192 -x 3 -y 3 -p 1 -q 1  -F 1 -t %T% -V %V% -s %S%
+.\driver\Debug\MLOpenDriver.exe conv -i 1 -n %B% -W 56 -H 56 -c 64 -k 192 -x 3 -y 3 -p 1 -q 1  -F 1 -t %T% -V %V% -s %S%
 echo "conv2/relu_3x3 1x192x256x512x192"
 rem .\driver\Debug\MLOpenDriver.exe conv -i 1 -n %B% -W 56 -H 56 -c 192 -k 192 -F 1 -t %T% -V %V%
 echo "conv2/norm2 1x192x256x512x192x5x5"


Add test runner script.

Add test runner script.

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

--- build/RunUnitTests.cmd
+++ build/RunUnitTests.cmd
@@ -0,0 +1,11 @@
+nunit3-console %APPVEYOR_BUILD_FOLDER%/test/MsgPack.UnitTest/bin/Debug/MsgPack.UnitTest.dll --framework:net-4.5 --result=test-result-net45.xml;format=AppVeyor
+nunit3-console %APPVEYOR_BUILD_FOLDER%/test/MsgPack.UnitTest.BclExtensions/bin/Debug/MsgPack.UnitTest.BclExtensions.dll --framework:net-4.5 --result=test-result-net45-bclext.xml;format=AppVeyor
+nunit3-console %APPVEYOR_BUILD_FOLDER%/test/MsgPack.UnitTest.CodeDom/bin/Debug/MsgPack.UnitTest.CodeDom.dll --framework:net-4.5 --result=test-result-net45-codedom.xml;format=AppVeyor
+nunit3-console %APPVEYOR_BUILD_FOLDER%/test/MsgPack.UnitTest.Net35/bin/Debug/MsgPack.UnitTest.Net35.dll --framework:net-3.5 --result=test-result-net35.xml;format=AppVeyor
+nunit3-console %APPVEYOR_BUILD_FOLDER%/test/MsgPack.UnitTest.CodeDom.Net35/bin/Debug/MsgPack.UnitTest.CodeDom.Net35.dll --framework:net-3.5 --result=test-result-net35-codedom.xml;format=AppVeyor
+nunit3-console %APPVEYOR_BUILD_FOLDER%/test/MsgPack.UnitTest.Unity.Il2Cpp.Full.Desktop/bin/Debug/MsgPack.UnitTest.dll --framework:net-3.5 --result=test-result-unity-il2cpp-desktop.xml;format=AppVeyor
+vstest.console /logger:Appveyor %APPVEYOR_BUILD_FOLDER%/test/MsgPack.UnitTest.WinRT/bin/Debug/MsgPack.UnitTest.dll
+vstest.console /logger:Appveyor %APPVEYOR_BUILD_FOLDER%/test/MsgPack.UnitTest.BclExtensions.WinRT/bin/Debug/MsgPack.UnitTest.BclExtensions.dll
+vstest.console /logger:Appveyor %APPVEYOR_BUILD_FOLDER%/test/MsgPack.UnitTest.WinRT.WindowsPhone/bin/x86/Debug/MsgPack.UnitTest.dll
+:: UWP test with NUnit3 is not available in cli
+:: Xamarin tests are not available in cli


Make MM buildable using Visual Studio 2008 Express

git-svn-id: 03a8048b5ee8463be5048a3801110fb50f378627@8270 d0ab736e-dc22-4aeb-8dc9-08def0aa14fd

--- buildscripts/Build.bat
+++ buildscripts/Build.bat
@@ -50,23 +50,23 @@

 echo continue working in:
 cd
-set buildswitch=BUILD
-IF "%1%"=="FULL" SET buildswitch=REBUILD
+set buildswitch=
+IF "%1%"=="FULL" SET buildswitch=/rebuild

 echo building core with command:
-echo devenv /%buildswitch% "Release|Win32" .\MMCore\MMCore.vcproj
-devenv /%buildswitch% "Release|Win32" .\MMCore\MMCore.vcproj
+echo vcbuild /M8 %buildswitch% .\MMCore\MMCore.vcproj "Release|Win32"
+vcbuild /M8 %buildswitch% .\MMCore\MMCore.vcproj "Release|Win32"

 echo building python wrapper with command:
-echo devenv /%buildswitch% Release .\MMCorePy_wrap\MMCorePy_wrap.sln
-devenv /%buildswitch% Release .\MMCorePy_wrap\MMCorePy_wrap.sln
+echo vcbuild /M8 %buildswitch% .\MMCorePy_wrap\MMCorePy_wrap.sln "Release|Win32"
+vcbuild /M8 %buildswitch% .\MMCorePy_wrap\MMCorePy_wrap.sln "Release|Win32"
 copy .\bin_Win32\MMCorePy.py .\Install_Win32\micro-manager
 copy .\bin_Win32\_MMCorePy.pyd .\Install_Win32\micro-manager
 copy .\MMCorePy_wrap\MMCoreWrapDemo.py .\Install_Win32\micro-manager

 echo building Java wrapper with command:
-echo devenv /%buildswitch% "Release|Win32" .\MMCoreJ_wrap\MMCoreJ_wrap.sln
-devenv /%buildswitch% "Release|Win32" .\MMCoreJ_wrap\MMCoreJ_wrap.sln
+echo vcbuild /M8 %buildswitch% .\MMCoreJ_wrap\MMCoreJ_wrap.sln "Release|Win32"
+vcbuild /M8 %buildswitch% .\MMCoreJ_wrap\MMCoreJ_wrap.sln "Release|Win32"

 echo Update the version number in MMStudioMainFrame
@@ -126,5 +126,5 @@

 ECHO "Done installing"
 IF NOT "%3%" == "UPLOAD" GOTO FINISH
-pscp -i c:\projects\MM.ppk -batch /projects/micromanager/Install_Win32/Output/%TARGETNAME% MM@valelab.ucsf.edu:./public_html/nightlyBuilds/1.4/Windows/%TARGETNAME%
+pscp -i c:\projects\MM.ppk -batch /projects/micromanager/Install_Win32/Output/%TARGETNAME% arthur@valelab.ucsf.edu:../MM/public_html/nightlyBuilds/1.4/Windows/%TARGETNAME%
 :FINISH


Oops! Change back to Win32

Oops! Change back to Win32

git-svn-id: 03a8048b5ee8463be5048a3801110fb50f378627@8514 d0ab736e-dc22-4aeb-8dc9-08def0aa14fd

--- buildscripts/Build.bat
+++ buildscripts/Build.bat
@@ -62,9 +62,9 @@
 echo building python wrapper with command:
 echo start /wait vcexpress .\MMCorePy_wrap\MMCorePy_wrap.sln %buildswitch% "Release|Win32"
 start /wait vcexpress .\MMCorePy_wrap\MMCorePy_wrap.sln %buildswitch% "Release|Win32"
-copy .\bin_x64\MMCorePy.py .\Install_x64\micro-manager
-copy .\bin_x64\_MMCorePy.pyd .\Install_x64\micro-manager
-copy .\MMCorePy_wrap\MMCoreWrapDemo.py .\Install_x32\micro-manager
+copy .\bin_Win32\MMCorePy.py .\Install_Win32\micro-manager
+copy .\bin_Win32\_MMCorePy.pyd .\Install_Win32\micro-manager
+copy .\MMCorePy_wrap\MMCoreWrapDemo.py .\Install_Win32\micro-manager

 echo building Java wrapper with command:


Create bld.bat

Create bld.bat

Add Windows Build

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

--- recipe/bld.bat
+++ recipe/bld.bat
@@ -0,0 +1,2 @@
+"%PYTHON%" setup.py install
+if errorlevel 1 exit 1


Update windows.bat

Update windows.bat

--- Windows/windows.bat
+++ Windows/windows.bat
@@ -1,7 +1,7 @@
 REM Add other things if could be automated, RUN THIS AS ADMIN
 @echo off
 REM Windows Defender scan
-cd C:\Program Files\Windows Defender\MpCmdRun.exe -Scan 2
+C:\Program Files\Windows Defender\MpCmdRun.exe -Scan 2
 REM Listing possible penetrations
 wmic process list brief
 PAUSE


remove rmdir build (#26965)

remove rmdir build (#26965)

--- paddle/scripts/paddle_build.bat
+++ paddle/scripts/paddle_build.bat
@@ -21,7 +21,6 @@

 rem -------clean up environment-----------
 set work_dir=%cd%
-if exist build rmdir build /s/q
 mkdir build
 cd /d build
 tree .


Opara now installs itself to a recognizable name

* Installs itself to "Opera Test (<version_name>)", where <version_name> is one of stable|next|development|daily
+ Added exit code to exit statement

--- opera15-backup/install.bat
+++ opera15-backup/install.bat
@@ -67,7 +67,7 @@

 :INSTALL_OPERA
 pushd downloads
-"%OUTPUTFILE%" /install /runimmediately /launchopera=0 /installfolder="%INSTALL_PATH%" /singleprofile=1 /copyonly=1
+"%OUTPUTFILE%" /install /runimmediately /launchopera=0 /installfolder="%INSTALL_PATH%/Opera Test (%VERSION%)" /singleprofile=1 /copyonly=1
 popd

 :INSTALL_BACKUP_SCRIPT
@@ -77,4 +77,4 @@

 :EXIT
 SET ERRORLEVEL=0
-exit /b+exit /b 0


Create start.bat

Create start.bat

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

--- minecraft-server/start.bat
+++ minecraft-server/start.bat
@@ -0,0 +1,10 @@
+@echo "* "
+@echo "* "
+@echo "* Nu starter vi MineCraft serveren Kys min mås"
+@echo "* "
+@echo "* "
+
+java -Xmx1024M -Xms1024M -jar minecraft_server.jar nogui
+#java -Xmx1024M -Xms1024M -jar minecraft_server.jar
+
+@pause


add var to script

add var to script

--- src/application.bat
+++ src/application.bat
@@ -1,4 +1,6 @@
-### application.bat - 2015 - Thibault ROGER ###
-echo "Copyright company - 2015"
-echo "Build : 10:00"
-echo "version 1.1"+### application.bat - 201x - votre nom ###
+version = "2"
+build_hour = "11H00"
+
+echo "Build ${build_hour}"
+echo "version ${version}"


Add file header

Add file header

--- src/application.bat
+++ src/application.bat
@@ -1,2 +1,3 @@
+ ### application.bat - 201x - Laurent THOMAS ###
 echo "Build:10:00"
 echo "version 1"


Updated build script

Updated build script

--- Dependencies/BuildIotivity.cmd
+++ Dependencies/BuildIotivity.cmd
@@ -1,11 +1,17 @@
 @ECHO OFF
 REM BUILD PREREQS:
-REM PYTHON2.7, 7-ZIP, CMake
+REM Python 2.x (3.x won't work!) http://www.python.org
+REM scons Windows Installer (into 2.x python when asked): http://scons.org/pages/download.html
+REM 7-ZIP
+REM CMake
+REM Pull AllJoyn submodule.
+REM At first build you might be asked to pull more repos
+
 SET PATH=%PATH%;C:\Python27\;C:\Python27\Scripts;C:\Program Files\CMake\bin;C:\Program Files\7-Zip;c:\Program Files (x86)\Git\bin

 ECHO ********************************** BUILDING x86 Release **********************************
 CD iotivity
-scons TARGET_OS=windows TARGET_ARCH=x86 RELEASE=1 WITH_RA=0 TARGET_TRANSPORT=IP SECURED=0 WITH_TCP=0 BUILD_SAMPLE=OFF LOGGING=OFF TEST=0 resource/csdk
+CALL scons TARGET_OS=windows TARGET_ARCH=x86 RELEASE=1 WITH_RA=0 TARGET_TRANSPORT=IP SECURED=0 WITH_TCP=0 BUILD_SAMPLE=OFF LOGGING=OFF TEST=0 resource/csdk
 MD ..\..\Libs\octbstack\Windows\x86\
 COPY out\windows\x86\release\resource\csdk\octbstack.dll ..\..\Libs\octbstack\Windows\x86\ /Y


Removed net20 from go-all.cmd

Removed net20 from go-all.cmd

--- src/go-all.cmd
+++ src/go-all.cmd
@@ -1,4 +1,3 @@
 @echo off
 @Resource\Nant\Nant.exe -buildfile:Autofac.build %*
-@Resource\Nant\Nant.exe -buildfile:Autofac.build silverlight %*
-@Resource\Nant\Nant.exe -buildfile:Autofac.build net20 %*+@Resource\Nant\Nant.exe -buildfile:Autofac.build silverlight %*


Add strong name validation skip for test library FSharp.Compiler.Hosted (changeset 1227695)

--- src/update.cmd
+++ src/update.cmd
@@ -29,6 +29,7 @@
 %SN32% -Vr FSharp.Compiler,f536804aa0eb945b
 %SN32% -Vr FSharp.Compiler.Interactive.Settings,f536804aa0eb945b
 %SN32% -Vr FSharp.Compiler.Server.Shared,f536804aa0eb945b
+%SN32% -Vr FSharp.Compiler.Hosted,b03f5f7f11d50a3a

 if /i "%PROCESSOR_ARCHITECTURE%"=="AMD64" (
     %SN64% -Vr FSharp.Core,b03f5f7f11d50a3a
@@ -36,6 +37,7 @@
     %SN64% -Vr FSharp.Compiler,f536804aa0eb945b
     %SN64% -Vr FSharp.Compiler.Interactive.Settings,f536804aa0eb945b
     %SN64% -Vr FSharp.Compiler.Server.Shared,f536804aa0eb945b
+    %SN64% -Vr FSharp.Compiler.Hosted,b03f5f7f11d50a3a
 )

 rem Only GACing FSharp.Core for now


Distribute update

Distribute update

changes where the build actions go to (only works locally for me at the
moment)

--- ToUmbracoInstall.cmd
+++ ToUmbracoInstall.cmd
@@ -12,7 +12,7 @@
 REM

-SET UmbracoPath=D:\Development\Web\Umbraco\DevUmbraco7.2.2
+SET UmbracoPath=D:\Development\Web\Umbraco\DevUmbraco7.2.6
 ECHO Copying File %1 to "%UmbracoPath%\%2"
 XCOPY %1 "%UmbracoPath%\%2" /y /i /q


Set git user.name and user.email

Set git user.name and user.email

--- versiontag.bat
+++ versiontag.bat
@@ -9,6 +9,8 @@
 	SET _TAG_=%_TAG_%.%2
 )

+git config --global user.email "%3@outlook.com"
+git config --global user.name "%3"
 git remote set-url origin https://%3:%4@github.com/wasteam/waslibs.git
 git tag -a %_TAG_% -m "Version built: %_TAG_%"
 git push origin %_TAG_%


Updated the provisioning script/KB2999226.cmd to be more resilient by assigning the platform's flavor to a variable, and checking for negative error codes.

--- script/KB2999226.cmd
+++ script/KB2999226.cmd
@@ -47,7 +47,15 @@
   for /f "tokens=*" %%v in ("%%b") do set PlatformVersionMinor=%%v
 )

-echo ==^> Detected Windows Platform Version: %PlatformVersionMajor%.%PlatformVersionMinor%
+:: Detect whether we're using a server or client flavor
+systeminfo | find "OS Name:" | find /c "Microsoft Windows Server" >NUL
+if errorlevel 1 (
+    set PlatformFlavor="Client"
+) else (
+    set PlatformFlavor="Server"
+)
+
+echo ==^> Detected Windows Platform Version ^(%PlatformFlavor%^): %PlatformVersionMajor%.%PlatformVersionMinor%

 :: Set some reasonable defaults for where to put the downloaded update.
 if not defined TEMP set TEMP=%LOCALAPPDATA%\Temp
@@ -64,19 +72,22 @@
 :: We figured out that we're in the correct family. Now we need to figure out the
 :: architecture and whether it's the Windows server or client.
 :Windows7Family
-systeminfo | find "OS Name:" | find /c "Microsoft Windows Server" >NUL
-if errorlevel 1 goto Windows7
-goto Windows2008R2
+if "%PlatformFlavor%" == "Client" goto Windows7
+if "%PlatformFlavor%" == "Server" goto Windows2008R2
+echo ==^> Unable to determine platform flavor: %PlatformFlavor%
+goto exit1

 :Windows80Family
-systeminfo | find "OS Name:" | find /c "Microsoft Windows Server" >NUL
-if errorlevel 1 goto Windows2012
-goto Windows80
+if "%PlatformFlavor%" == "Client" goto Windows80
+if "%PlatformFlavor%" == "Server" goto Windows2012
+echo ==^> Unable to determine platform flavor: %PlatformFlavor%
+goto exit1

 :Windows81Family
-systeminfo | find "OS Name:" | find /c "Microsoft Windows Server" >NUL
-if errorlevel 1 goto Windows81
-goto Windows2012R2
+if "%PlatformFlavor%" == "Client" goto Windows81
+if "%PlatformFlavor%" == "Server" goto Windows2012R2
+echo ==^> Unable to determine platform flavor: %PlatformFlavor%
+goto exit1

 :: If it wasn't a server class operating system, then we must be a client.. In
 :: this case, we need to distinguish which architecture we actually are and then
@@ -201,6 +212,14 @@
   goto exit 1
 )

+:: If our errorlevel is signed, then errorlevel1 won't catch all error codes. InIf our errorlevel is signed, then errorlevel1 won't catch all error codes. In
+:: this case, we'll do an explicit check here just to make sure.
+:: this case, we'll do an explicit check here just to make sure.
+if "%ERRORLEVEL%" == "-2146498530" (
+  echo ==^> ERROR: Unable to install Windows Update ^(KB2999226^) with %KB2999226_URL% on current platform (%PlatformFlavor% %PlatformVersionMajor%.%PlatformVersionMinor%)
+  goto exit1
+)
+
 echo ==^> Successfully installed Windows Update ^(KB2999226^)
 goto exit0


Racc tests generation script is updated

Racc tests generation script is updated

git-svn-id: 4e738cf37591b764a66fd1fa8495c1154957a94e@688 b8160d1e-d411-11dd-a2b5-e5f827957e07

--- YaccConstructor/genRACCTests.cmd
+++ YaccConstructor/genRACCTests.cmd
@@ -1,18 +1,18 @@
-Main\bin\Release\Main.exe -f YardFrontend -g RACCGenerator -t test_seq.yrd --testpath ..\Tests\RACC\test_seq\
-Main\bin\Release\Main.exe -f YardFrontend -g RACCGenerator -t test_alt.yrd --testpath ..\Tests\RACC\test_alt\
-Main\bin\Release\Main.exe -f YardFrontend -g RACCGenerator -t test_cls.yrd --testpath ..\Tests\RACC\test_cls\
-Main\bin\Release\Main.exe -f YardFrontend -g RACCGenerator -t test_alt_in_cls.yrd --testpath ..\Tests\RACC\test_alt_in_cls\
-Main\bin\Release\Main.exe -f YardFrontend -g RACCGenerator -t test_cls_with_tail.yrd --testpath ..\Tests\RACC\test_cls_with_tail\
-Main\bin\Release\Main.exe -f YardFrontend -g RACCGenerator -t test_cls_with_head.yrd --testpath ..\Tests\RACC\test_cls_with_head\
-Main\bin\Release\Main.exe -f YardFrontend -g RACCGenerator -t test_arithm_glr.yrd --testpath ..\Tests\RACC\test_arithm_glr\
-Main\bin\Release\Main.exe -f YardFrontend -g RACCGenerator -t test_l_attr.yrd --testpath ..\Tests\RACC\test_l_attr\
-Main\bin\Release\Main.exe -f YardFrontend -g RACCGenerator -t test_simple_checker.yrd --testpath ..\Tests\RACC\test_simple_checker\
-Main\bin\Release\Main.exe -f YardFrontend -g RACCGenerator -t test_checker_on_glr.yrd --testpath ..\Tests\RACC\test_checker_on_glr\
-Main\bin\Release\Main.exe -f YardFrontend -g RACCGenerator -t test_summator_1.yrd --testpath ..\Tests\RACC\test_summator_1\
-Main\bin\Release\Main.exe -f YardFrontend -g RACCGenerator -t test_opt.yrd --testpath ..\Tests\RACC\test_opt\
-Main\bin\Release\Main.exe -f YardFrontend -g RACCGenerator -t test_reduce_reduce.yrd --testpath ..\Tests\RACC\test_reduce_reduce\
-Main\bin\Release\Main.exe -f YardFrontend -g RACCGenerator -i "..\Tests\RACC\claret\braces_1\test_simple_braces.yrd"
-Main\bin\Release\Main.exe -f YardFrontend -g RACCGenerator -i "..\Tests\RACC\claret\braces_2\test_simple_braces_2.yrd"
+Main\bin\Release\YaccConstructor.exe -f YardFrontend -g RACCGenerator -t test_seq.yrd --testpath ..\Tests\RACC\test_seq\
+Main\bin\Release\YaccConstructor.exe -f YardFrontend -g RACCGenerator -t test_alt.yrd --testpath ..\Tests\RACC\test_alt\
+Main\bin\Release\YaccConstructor.exe -f YardFrontend -g RACCGenerator -t test_cls.yrd --testpath ..\Tests\RACC\test_cls\
+Main\bin\Release\YaccConstructor.exe -f YardFrontend -g RACCGenerator -t test_alt_in_cls.yrd --testpath ..\Tests\RACC\test_alt_in_cls\
+Main\bin\Release\YaccConstructor.exe -f YardFrontend -g RACCGenerator -t test_cls_with_tail.yrd --testpath ..\Tests\RACC\test_cls_with_tail\
+Main\bin\Release\YaccConstructor.exe -f YardFrontend -g RACCGenerator -t test_cls_with_head.yrd --testpath ..\Tests\RACC\test_cls_with_head\
+Main\bin\Release\YaccConstructor.exe -f YardFrontend -g RACCGenerator -t test_arithm_glr.yrd --testpath ..\Tests\RACC\test_arithm_glr\
+Main\bin\Release\YaccConstructor.exe -f YardFrontend -g RACCGenerator -t test_l_attr.yrd --testpath ..\Tests\RACC\test_l_attr\
+Main\bin\Release\YaccConstructor.exe -f YardFrontend -g RACCGenerator -t test_simple_checker.yrd --testpath ..\Tests\RACC\test_simple_checker\
+Main\bin\Release\YaccConstructor.exe -f YardFrontend -g RACCGenerator -t test_checker_on_glr.yrd --testpath ..\Tests\RACC\test_checker_on_glr\
+Main\bin\Release\YaccConstructor.exe -f YardFrontend -g RACCGenerator -t test_summator_1.yrd --testpath ..\Tests\RACC\test_summator_1\
+Main\bin\Release\YaccConstructor.exe -f YardFrontend -g RACCGenerator -t test_opt.yrd --testpath ..\Tests\RACC\test_opt\
+Main\bin\Release\YaccConstructor.exe -f YardFrontend -g RACCGenerator -t test_reduce_reduce.yrd --testpath ..\Tests\RACC\test_reduce_reduce\
+Main\bin\Release\YaccConstructor.exe -f YardFrontend -g RACCGenerator -i "..\Tests\RACC\claret\braces_1\test_simple_braces.yrd"
+Main\bin\Release\YaccConstructor.exe -f YardFrontend -g RACCGenerator -i "..\Tests\RACC\claret\braces_2\test_simple_braces_2.yrd"

 RD /S /Q RACCGeneratedTests
 mkdir RACCGeneratedTests


Create appveyor.bat

Create appveyor.bat

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

--- scripts/appveyor.bat
+++ scripts/appveyor.bat
@@ -0,0 +1,17 @@
+echo Web-OS compiler + installer v1.0
+echo Copyright Gum-Joe
+echo This is for app veyor
+
+echo ""
+
+echo Installing bower and mocha
+npm install -g bower mocha
+
+echo Installing npm packages...
+npm install
+
+echo ""
+
+echo Compiling apps...
+cd app/console-app
+compile.bat


commit on 31/01/2019 at 12:40:07

commit on 31/01/2019 at 12:40:07

--- ansys-APDL/fiberVKstress.cmd
+++ ansys-APDL/fiberVKstress.cmd
@@ -42,33 +42,20 @@

 ! ===> START INPUT DATA

-Vf = 0.0! [-] Fiber volume fraction
-
-t = 1             ! [mm] 2t = thickness of the element
-tRatio = 1        ! [-]  ratio of bounding ply thickness to main ply
-epsx = 0.01       ! [-]  applied strain
-
-EL = 3500.0! [MPa] UD longitudinal Young's modulus
-ET = 3500.0! [MPa] UD transverse Young's modulus
-nuLT = 0.4! [-] UD in-plane Poisson ratio
-nuTT = 0.4! [-] UD transverse Poisson ratio
-!GL = ! [MPa] UD in-plane shear modulus
-!GT = ! [MPa] UD transverse shear modulus
+Vf = 0.6! [-] Fiber volume fraction
+
+Rf = 1.0           ! [mum] radius of the fiber
+L = 1.144          ! [mum] length of the RVE
+tRatio = 1         ! [-]  ratio of bounding ply thickness to main ply
+epsx = 0.01        ! [-]  applied strain
+
+EG = 3500.0! [MPa] Glass fiber Young's modulus
+nuG = 0.4! [-] Glass fiber Poisson ratio
+
+EEp = 3500.0! [MPa] Carbon fiber Young's modulus
+nuEp = 0.4! [-] Carbon fiber Poisson ratio

 ! ===> END INPUT DATA
-
-L = 2*t/rhon        ! [mm] length of the RVE
-a = aLRatio*L     ! [mm] 2a = crack length
-
-refHlow = (1-reftRatio)*t
-refHup = (1+reftRatio)*t
-
-tBPly = tRatio*(2*t) ! [mm] thickness of the bounding ply
-tTOT = t + tBPly     ! [mm] thickness of the bounding ply
-
-elSize = daOvera*a ! [mm] size of element in refined region close to crack tip
-
-vcctRegion = a+elSize

 appliedDisp = epsx*L ! [mm] applied displacement

@@ -79,60 +66,31 @@

 ! Points

-K, 1, 0.0, 0.0
-K, 2, L, 0.0
-K, 3, L, tTOT
-K, 4, 0.0, tTOT
-
-K, 5, 0.0, refHlow
-K, 6, L, refHlow
-K, 7, L, refHup
-K, 8, 0.0, refHup
-
-K, 9, a, refHlow
-K,10, a, t
-K,11, a, t
-K,12, a, refHup
-K,13, 0.0, t
-K,14, 0.0, t
-K,15, vcctRegion,t
-
-K,16, L, t
+K, 1, 0.0, 0.0      ! SW corner
+K, 2, L, 0.0        ! SE corner
+K, 3, L, L          ! NE corner
+K, 4, 0.0, L        ! NW corner
+
+K, 5, Rf, 0.0
+K, 6, 0.0, Rf

 ! Lines

-L, 1, 2            !1
-L, 2, 6            !2
-L, 6, 16           !3
-L, 16, 7           !4
-L, 7, 3            !5
-L, 3, 4            !6
-L, 4, 8            !7
-L, 8, 14           !8
-L, 13, 5           !9
-L, 5, 1            !10
-L, 5, 9            !11
-L, 9, 6            !12
-L, 8, 12           !13
-L, 12, 7           !14
-L, 10, 15          !15
-L, 11, 15          !16
-L, 15, 16          !17
-L, 13, 10          !18
-L, 14, 11          !19
-L, 9, 10           !20
-L, 11, 12          !21
+L, 1, 5            !1 -- S side, fiber
+L, 5, 2            !1 -- S side, matrix
+L, 2, 3            !2 -- E side
+L, 3, 4            !3 -- N side
+L, 4, 6            !4 -- W side, matrix
+L, 6, 1            !4 -- W side, fiber
+
+! Arcs
+
+LARC, 5, 6, 1, Rf

 ! Areas

-AL, 1, 2, 12, 11, 10     ! 1, lower ply, coarse area
-AL, 13, 14, 5, 6, 7      ! 2, upper ply, coarse area
-
-AL, 11, 20, 18, 9        ! 3, lower ply, free area
-AL, 19, 21, 13, 8        ! 4, upper ply, free area
-
-AL, 12, 3, 17, 15, 20    ! 5, lower ply, bonded area
-AL, 4, 14, 21, 16, 17    ! 6, upper ply, bonded area
+AL, 1, 2, 12, 11, 10     ! 1, fiber
+AL, 13, 14, 5, 6, 7      ! 2, matrix

 ! Define Material Properties


forgot to change the repo uri

forgot to change the repo uri

--- Scripts/PurgeHistory.cmd
+++ Scripts/PurgeHistory.cmd
@@ -4,5 +4,5 @@
 git add .
 git commit -m "Initial Commit"

-git remote add origin https://github.com/thuriot/thuriot.github.io.git
+git remote add origin <git master repo uri>
 git push -u --force origin master


Run tests twice by default, first time deleting .pyc/.pyo files. New option "-q" to leave .pyc/.pyo alone.

--- PCbuild/rt.bat
+++ PCbuild/rt.bat
@@ -1,12 +1,30 @@
 @rem Run Tests.  Run the regression test suite.
 @rem Plain "rt" runs Release build, arguments passed on to regrtest.
 @rem "rt -d" runs Debug build similarly, after shifting off -d.
+@rem Normally the tests are run twice, the first time after deleting
+@rem all the .py[co] files from Lib/ and Lib/test.  But
+@rem "rt -q" (for Quick) runs the tests just once, and without
+@rem bothering to delete .py[co] files.
 @set _exe=python
-@if "%1" =="-d" set _exe=python_d
-@if "%1" =="-d" shift
+@set _qmode=no
+@if "%1"=="-q" set _qmode=yes
+@if "%1"=="-q" shift
+@if "%1"=="-d" set _exe=python_d
+@if "%1"=="-d" shift
+@if "%_qmode%"=="yes" goto LeavePyc
+@if "%1"=="-q" set _qmode=yes
+@if "%1"=="-q" shift
+@if "%_qmode%"=="yes" goto LeavePyc
+@echo Deleting .pyc/.pyo files ...
 @del ..\Lib\*.pyc
 @del ..\Lib\*.pyo
 @del ..\Lib\test\*.pyc
 @del ..\Lib\test\*.pyo
+:LeavePyc
 %_exe% ../lib/test/regrtest.py %1 %2 %3 %4 %5 %6 %7 %8 %9
+@if "%_qmode%"=="yes" goto Done
+@echo Running again without deleting .pyc/.pyo first:
+%_exe% ../lib/test/regrtest.py %1 %2 %3 %4 %5 %6 %7 %8 %9
+:Done
 @set _exe=
+@set _qmode=


vs express install

vs express install

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

--- visual_sudio_express_download.bat
+++ visual_sudio_express_download.bat
@@ -0,0 +1,18 @@
+@echo off
+
+if [%SOURCES%] == [] (
+    set SOURCES=sources
+)
+
+if not exist %SOURCES%\isos (
+    mkdir %SOURCES%\isos
+)
+
+echo "Downloading Visual Studio 2008"
+curl --silent -C - -o %SOURCES%\isos\VS2008.iso http://download.microsoft.com/download/E/8/E/E8EEB394-7F42-4963-A2D8-29559B738298/VS2008ExpressWithSP1ENUX1504728.iso
+echo "Downloading Visual Studio 2010"
+curl --silent -C - -o %SOURCES%\isos\VS2010.iso http://download.microsoft.com/download/1/E/5/1E5F1C0A-0D5B-426A-A603-1798B951DDAE/VS2010Express1.iso
+echo "Extracting Visual Studio 2008"
+7z x %SOURCES%\isos\VS2008.iso -o%SOURCES%\isos\VS2008 -bd
+echo "Extracting Visual Studio 2010"
+7z x %SOURCES%\isos\VS2010.iso -o%SOURCES%\isos\VS2010 -bd


EOF exit added

EOF exit added

--- MCal.bat
+++ MCal.bat
@@ -254,11 +254,13 @@
 echo ^(A^)dd money to balance.
 echo ^(R^)ecord an expense.
 echo ^(V^)iew log.
+echo ^(E^)xit.
 CHOICE /C:arv /N
 set menuchoice=%ERRORLEVEL%
 if "%menuchoice%" == "1" goto add_money
 if "%menuchoice%" == "2" goto expense
 if "%menuchoice%" == "3" goto view_log
+if "%menuchoice%" == "4" goto eof
 goto dashboard

 :add_money


Changed release script to make zipfiles from the debug files too.

--- script/copyreleasedebuginfo.cmd
+++ script/copyreleasedebuginfo.cmd
@@ -33,3 +33,6 @@

 COPY %BIN_DIR%\ScalienClient.pdb %DEBUG_BUILD_DIR%
 IF %ERRORLEVEL% NEQ 0 EXIT /B 1
+
+CALL ..\script\ziprelease.cmd "%DEBUG_BUILD_DIR%" %BUILD_NAME%-Debug
+IF %ERRORLEVEL% NEQ 0 EXIT /B 1


Add windows start script, run.cmd (#182)


Fixed copying the lib files.

Fixed copying the lib files.

--- Tools/AppVeyor/Build.cmd
+++ Tools/AppVeyor/Build.cmd
@@ -3,9 +3,9 @@

 set LIBDIR=C:\Magick.NET.libs
 set TARGET=C:\Magick.NET\ImageMagick
-xcopy %LIBDIR%\lib %TARGET%\lib\Release /Y /S /I
-xcopy %LIBDIR%\Q8\lib %TARGET%\Q8\lib\Release /Y /S /I
-xcopy %LIBDIR%\Q16\lib %TARGET%\Q16\lib\Release /Y /S /I
-xcopy %LIBDIR%\Q16-HDRI\lib %TARGET%\Q16-HDRI\lib\Release /Y /S /I
+xcopy %LIBDIR%\lib\Release %TARGET%\lib\Release /Y /S /I
+xcopy %LIBDIR%\Q8\lib\Release %TARGET%\Q8\lib\Release /Y /S /I
+xcopy %LIBDIR%\Q16\lib\Release %TARGET%\Q16\lib\Release /Y /S /I
+xcopy %LIBDIR%\Q16-HDRI\lib\Release %TARGET%\Q16-HDRI\lib\Release /Y /S /I

 powershell -ExecutionPolicy Unrestricted ..\Scripts\AppVeyor\Build.ps1 %1 %2


Solo instala binarios de openocd. Algunos windows dan problemas con los nombres de archivos de scripts/*

--- win32/openocd-dl.bat
+++ win32/openocd-dl.bat
@@ -43,8 +43,8 @@
 	echo Downloading OpenOCD 'On Chip Debugger'...
 	wget "%OPENOCD_URL%" -O %LOCALFILE%
 )
-if not exist cygwin\usr\local\openocd (
+if not exist cygwin\usr\local\bin\openocd-0.8.0.exe (
 	echo Uncompress...
 	7za x %LOCALFILE%
-	move/Y openocd-0.8.0 cygwin\usr\local\openocd
+	move/Y openocd-0.8.0\bin\* cygwin\usr\local\bin
 )


Add logging message in install script

Add logging message in install script

--- .appveyor/install.cmd
+++ .appveyor/install.cmd
@@ -14,8 +14,13 @@
 cd ../../
 echo "Process TIMLE project"
 cd TIMLE
+echo "cd into TIMLE project"

 mkdir build
+echo "mkdir build"
+
 mkdir build/TIMLE
+echo "mkdir build/TIMLE"

-cmake . -G "Visual Studio 15 Win64" -DCMAKE_BUILD_TYPE=$CONFIGURATION -DTARGET_CPU=$PLATFORM -DCMAKE_INSTALL_PREFIX=./build/TIMLE -DCMAKE_PREFIX_PATH=./SFML/install+cmake . -G "Visual Studio 15 Win64" -DCMAKE_INSTALL_PREFIX=./build/TIMLE -DCMAKE_PREFIX_PATH=./SFML/install
+echo "Process TIMLE by CMake"


comment nosetests for debugging

comment nosetests for debugging

--- .conda-recipe/bld.bat
+++ .conda-recipe/bld.bat
@@ -13,18 +13,18 @@
 REM Install source directory as Python package.
 "%PYTHON%" -m pip install --no-cache --find-links http://192.99.4.95/wheels --trusted-host 192.99.4.95 .
 REM TODO: Find way to get source directory path from within appveyor
-nosetests "%SRC_DIR%" -vv --with-xunit
-if errorlevel 1 (
-  IF DEFINED PROJECT_DIRECTORY (
-    cp .\\nosetests.xml "%PROJECT_DIRECTORY%"\\nosetests.xml
-    dir "%PROJECT_DIRECTORY%"
-  )
-  exit 1
-)
-
-REM If a project directory specified, then copy results into the directory
-IF DEFINED PROJECT_DIRECTORY (
-  cp .\\nosetests.xml "%PROJECT_DIRECTORY%"\\nosetests.xml
-  dir "%PROJECT_DIRECTORY%"
-)
+REM nosetests "%SRC_DIR%" -vv --with-xunit
+REM if errorlevel 1 (
+REM   IF DEFINED PROJECT_DIRECTORY (
+REM     cp .\\nosetests.xml "%PROJECT_DIRECTORY%"\\nosetests.xml
+REM     dir "%PROJECT_DIRECTORY%"
+REM   )
+REM   exit 1
+REM )
+REM
+REM REM If a project directory specified, then copy results into the directory
+REM IF DEFINED PROJECT_DIRECTORY (
+REM   cp .\\nosetests.xml "%PROJECT_DIRECTORY%"\\nosetests.xml
+REM   dir "%PROJECT_DIRECTORY%"
+REM )
 if errorlevel 1 exit 1


Fix position to current directory

Fix position to current directory

--- .appveyor/install.cmd
+++ .appveyor/install.cmd
@@ -16,3 +16,5 @@
 cd build

 cmake .. -G "Visual Studio 15 Win64" -DCMAKE_BUILD_TYPE=$CONFIGURATION -DTARGET_CPU=$PLATFORM -DCMAKE_INSTALL_PREFIX=../install -DCMAKE_PREFIX_PATH=C:/projects/timle/SFML/install
+
+cd ../


Change clcache size and set CLCACHE_NODIRECT

--- .ci/setup_clcache.cmd
+++ .ci/setup_clcache.cmd
@@ -8,9 +8,11 @@

 @rem Use clcache for faster builds
 pip install -q git+https://github.com/frerich/clcache.git
+clcache -M 3221225472
 clcache -s
 set CLCACHE_SERVER=1
 set CLCACHE_HARDLINK=1
+set CLCACHE_NODIRECT=1
 powershell.exe -Command "Start-Process clcache-server"

 if %errorlevel% neq 0 exit /b %errorlevel%


fix versiontag.bat return error

fix versiontag.bat return error

--- versiontag.bat
+++ versiontag.bat
@@ -2,18 +2,16 @@
 IF  "%1"=="" (
 	GOTO HELL
 ) ELSE (
-	SET _TAG_=%1
+	SET _TAG_=v%1
 )

 IF  NOT "%2"=="" (
-	SET _TAG_=%1.%2
+	SET _TAG_=%_TAG_%.%2
 )

 git remote set-url origin https://%3:%4@github.com/wasteam/waslibs.git
-git tag v%_TAG_%
-git push --tag
-
-
+git tag -a %_TAG_% -m "Version built: %_TAG_%"
+git push origin %_TAG_%

 GOTO END

@@ -23,3 +21,4 @@

 :END
 ECHO PROCESS FINISHED
+EXIT 0


test on_infer off problem in windows (#37366)

* test on_infer off problem in windows

* turn off on infer in windows-ci

--- paddle/scripts/paddle_build.bat
+++ paddle/scripts/paddle_build.bat
@@ -222,13 +222,13 @@
 set WITH_GPU=ON
 set WITH_AVX=ON
 set MSVC_STATIC_CRT=OFF
-set ON_INFER=ON
+set ON_INFER=OFF

 call :cmake || goto cmake_error
 call :build || goto build_error
 call :test_whl_pacakage || goto test_whl_pacakage_error
 call :test_unit || goto test_unit_error
-call :test_inference || goto test_inference_error
+:: call :test_inference || goto test_inference_error
 :: call :check_change_of_unittest || goto check_change_of_unittest_error
 goto:success


Make wrapper extract absolute path of remote fle


Fix debug option for msvcbuild.bat.

Fix debug option for msvcbuild.bat.

--- src/msvcbuild.bat
+++ src/msvcbuild.bat
@@ -53,8 +53,8 @@

 @if "%1" neq "debug" goto :NODEBUG
 @shift
-@set LJCOMPILE=%LJCOMPILE% /Zi /Fdluajit.pdb
-@set LJLINK=%LJLINK% /debug /PDB:luajit.pdb
+@set LJCOMPILE=%LJCOMPILE% /Zi
+@set LJLINK=%LJLINK% /debug
 :NODEBUG
 @if "%1"=="amalg" goto :AMALGDLL
 @if "%1"=="static" goto :STATIC


Attempt at better error handling with the Windows update script.

* Use `call` to run Ctags because apparently, the way Vim runs background
  Windows scripts means the whole thing will abort if there's an error.
  But here we want to keep going so we get a chance to unlock the tags file
  if possible.
* Add some `ERRORLEVEL` handling code.
* Log more stuff to the log file.

--- plat/win32/update_tags.cmd
+++ plat/win32/update_tags.cmd
@@ -83,15 +83,27 @@
 )

 echo Running ctags >> %LOG_FILE%
-echo "%CTAGS_EXE%" -R -f "%TAGS_FILE%.temp" %CTAGS_ARGS% %PROJECT_ROOT% >> %LOG_FILE%
-"%CTAGS_EXE%" -R -f "%TAGS_FILE%.temp" %CTAGS_ARGS% %PROJECT_ROOT%
+echo call "%CTAGS_EXE%" -R -f "%TAGS_FILE%.temp" %CTAGS_ARGS% %PROJECT_ROOT% >> %LOG_FILE%
+call "%CTAGS_EXE%" -R -f "%TAGS_FILE%.temp" %CTAGS_ARGS% %PROJECT_ROOT% >> %LOG_FILE% 2>&1
+if ERRORLEVEL 1 (
+    echo ERROR: Ctags executable returned non-zero code. >> %LOG_FILE%
+    goto :Unlock
+)

 echo Replacing tags file >> %LOG_FILE%
 echo move /Y "%TAGS_FILE%.temp" "%TAGS_FILE%" >> %LOG_FILE%
-move /Y "%TAGS_FILE%.temp" "%TAGS_FILE%" >NUL 2>&1
+move /Y "%TAGS_FILE%.temp" "%TAGS_FILE%" >> %LOG_FILE% 2>&1
+if ERRORLEVEL 1 (
+    echo ERROR: Unable to rename temp tags file into actual tags file. >> %LOG_FILE%
+    goto :Unlock
+)

+:Unlock
 echo Unlocking tags file... >> %LOG_FILE%
 del /F "%TAGS_FILE%.lock"
+if ERRORLEVEL 1 (
+    echo ERROR: Unable to remove file lock. >> %LOG_FILE%
+)

 echo Done. >> %LOG_FILE%
 if [%PAUSE_BEFORE_EXIT%]==[1] (


add missing depedencies

add missing depedencies

--- appveyor-install.cmd
+++ appveyor-install.cmd
@@ -2,6 +2,8 @@
 call setenv /x64

 rem install python packages
+pip install --cache-dir c:/temp nose
+pip install --cache-dir c:/temp nose-exclude
 pip install --cache-dir c:/temp pyside
 pip install --cache-dir c:/temp pygments
 pip install --cache-dir c:/temp traits


Delete dev.bat

Delete dev.bat

--- dev.bat
+++ dev.bat
@@ -1,14 +0,0 @@
-E:
-cd tibass\data\stem_density
-git init
-git add -A
-git commit -m "first commit"
-git config --global user.name "Maike Heuner"
-git config --global user.email heuner@bafg.de
-git config --global http.sslVerify false
-REM git remote add gitbucket https://apps.bafg.de/gitbucket/git/heuner/stem_density.git
-REM git remote add github https://github.com/heuner/stem_density.git
-REM git push -u gitbucket master
-REM git push -u github master
-pause
-exit


add comment to enable running cmdize.bat with .hta files

--- bin/cmdize.bat
+++ bin/cmdize.bat
@@ -176,6 +176,10 @@
 goto :EOF

+:: I don't know the root cause of the issue but for some reasons cmd.exe
+:: is not able to see the first label from below. Others are fine. That's
+:: why these comments are included into this script -- they do allow to
+:: launch the script with no issues similar to this.
 :cmdize.hta
 :cmdize.htm
 :cmdize.html


Re-added java.bat which I accidentally deleted

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

--- bin/javacc.bat
+++ bin/javacc.bat
@@ -0,0 +1,3 @@
+@echo off
+
+java -classpath "%~dp0lib\javacc.jar;%~dp0lib\javacc.jar;%~f0\..\lib\javacc.jar" javacc %1 %2 %3 %4 %5 %6 %7 %8 %9


Added package batch file

Added package batch file

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

--- .nuget/pack.cmd
+++ .nuget/pack.cmd
@@ -0,0 +1 @@
+NuGet.exe pack ..\SimpleMvcSitemap.nuspec


use %~dp0 to make calling relative

use %~dp0 to make calling relative

--- build/cleanup-includes-x86.bat
+++ build/cleanup-includes-x86.bat
@@ -2,7 +2,7 @@

 :: cleanup the includes folder

-pushd ..\..\fifengine-dependencies\includes
+pushd %~dp0..\..\fifengine-dependencies\includes
 rd share /s /q
 move lib\x86\*.dll bin
 move lib\x86\*.lib lib
@@ -11,7 +11,7 @@
 move lib\x86\*.txt licenses
 popd

-pushd ..\..\fifengine-dependencies\includes\lib
+pushd %~dp0..\..\fifengine-dependencies\includes\lib
 rd x64 /s /q
 rd libpng /s /q
 popd


One more place for the V8-upgrade.

One more place for the V8-upgrade.

--- 3rdParty/v8-build.bat
+++ 3rdParty/v8-build.bat
@@ -11,7 +11,7 @@
 SET VISUAL_STUDIO_VC="C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC"

 :: Set this to the version of ICU you are building
-SET V8_VERSION=4.2.77.1
+SET V8_VERSION=4.3.61

 :: x86_amd64 or x86
 set ARCHITECTURE=%1


add backup script

add backup script

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

--- @backup_to_gdrive.bat
+++ @backup_to_gdrive.bat
@@ -0,0 +1,5 @@
+
+:: backup all files excluding the data directory to dropbox
+:: also exclude the SPICE .bsp files, which are huge
+:: robocopy . c:\projects\voyager\backup /mir /xd data /xf *.bsp
+robocopy . c:\users\bburns\gdrive\projects\voyager\backup /mir /xd data /xf *.bsp


fix disable tests on Windows

fix disable tests on Windows

--- recipes/s2geometry/bld.bat
+++ recipes/s2geometry/bld.bat
@@ -7,7 +7,7 @@
                 -DCMAKE_BUILD_TYPE=Release ^
                 -DBUILD_SHARED_LIBS=ON ^
                 -DBUILD_EXAMPLES=OFF ^
-                -DGTEST_ROOT="%PREFIX"
+                -UGTEST_ROOT
 if errorlevel 1 exit 1

 nmake