Switch on console for test-all freeze

Switch on console for test-all freeze

--- pkg_build_64.cmd
+++ pkg_build_64.cmd
@@ -52,7 +52,8 @@

 @if "%R_VERS_2%" GEQ "25" (
   set RUBY_FORCE_TEST_JIT=1
-  timeout.exe 25m make test-all "TESTOPTS=-a -j%M_JOBS% --job-status=normal --show-skip --retry --subprocess-timeout-scale=1.5" > %LOG_PATH_NAME%-test-all.log 2>&1
+@rem  timeout.exe 25m make test-all "TESTOPTS=-a -j%M_JOBS% --job-status=normal --show-skip --retry --subprocess-timeout-scale=1.5" > %LOG_PATH_NAME%-test-all.log 2>&1
+	timeout.exe 25m make test-all "TESTOPTS=--verbose -j%M_JOBS% --job-status=normal --show-skip --retry --subprocess-timeout-scale=1.5"
 ) else (
   make.exe test-all "TESTOPTS=-v --show-skip --retry" > %LOG_PATH_NAME%-test-all.log 2>&1
 )


For Git tools setup, also copy ssh-keygen.bat.

TBR=nsylvain@chromium.org
Review URL: http://codereview.chromium.org/7017005

git-svn-id: bd64dd6fa6f3f0ed0c0666d1018379882b742947@85596 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

--- bootstrap/win/win_tools.bat
+++ bootstrap/win/win_tools.bat
@@ -47,6 +47,7 @@
 call copy /y "%WIN_TOOLS_ROOT_DIR%\git_bin\git.bat" "%WIN_TOOLS_ROOT_DIR%\git.bat" 1>nul
 call copy /y "%WIN_TOOLS_ROOT_DIR%\git_bin\gitk.bat" "%WIN_TOOLS_ROOT_DIR%\gitk.bat" 1>nul
 call copy /y "%WIN_TOOLS_ROOT_DIR%\git_bin\ssh.bat" "%WIN_TOOLS_ROOT_DIR%\ssh.bat" 1>nul
+call copy /y "%WIN_TOOLS_ROOT_DIR%\git_bin\ssh-keygen.bat" "%WIN_TOOLS_ROOT_DIR%\ssh-keygen.bat" 1>nul
 goto :SVN_CHECK


Projects were built in Debug configuration for coverage calculation

--- build/CalculateCoverage.bat
+++ build/CalculateCoverage.bat
@@ -1,10 +1,10 @@
 powershell.exe -file build\SetFullDebugType.ps1

 nuget install OpenCover -ExcludeVersion -OutputDirectory tools
-tools\OpenCover\tools\OpenCover.Console.exe -target:"C:\Program Files\dotnet\dotnet.exe" -targetargs:" test ""test\GfPolynoms.Tests\project.json"" -c %1" -register:user -filter:"+[*]* -[xunit*]*" -threshold:100 -oldstyle -returntargetcode -output:coverage.xml
-tools\OpenCover\tools\OpenCover.Console.exe -target:"C:\Program Files\dotnet\dotnet.exe" -targetargs:" test ""test\GfAlgorithms.Tests\project.json"" -c %1" -register:user -filter:"+[*]* -[xunit*]*" -threshold:100 -oldstyle -returntargetcode -mergeoutput -output:coverage.xml
-tools\OpenCover\tools\OpenCover.Console.exe -target:"C:\Program Files\dotnet\dotnet.exe" -targetargs:" test ""test\RsCodesTools.Tests\project.json"" -c %1" -register:user -filter:"+[*]* -[xunit*]*" -threshold:100 -oldstyle -returntargetcode -mergeoutput -output:coverage.xml
-tools\OpenCover\tools\OpenCover.Console.exe -target:"C:\Program Files\dotnet\dotnet.exe" -targetargs:" test ""test\WaveletCodesTools.Tests\project.json"" -c %1" -register:user -filter:"+[*]* -[xunit*]*" -threshold:100 -oldstyle -returntargetcode -mergeoutput -output:coverage.xml
+tools\OpenCover\tools\OpenCover.Console.exe -target:"C:\Program Files\dotnet\dotnet.exe" -targetargs:" test ""test\GfPolynoms.Tests\project.json"" -c Debug" -register:user -filter:"+[*]* -[xunit*]*" -threshold:100 -oldstyle -returntargetcode -output:coverage.xml
+tools\OpenCover\tools\OpenCover.Console.exe -target:"C:\Program Files\dotnet\dotnet.exe" -targetargs:" test ""test\GfAlgorithms.Tests\project.json"" -c Debug" -register:user -filter:"+[*]* -[xunit*]*" -threshold:100 -oldstyle -returntargetcode -mergeoutput -output:coverage.xml
+tools\OpenCover\tools\OpenCover.Console.exe -target:"C:\Program Files\dotnet\dotnet.exe" -targetargs:" test ""test\RsCodesTools.Tests\project.json"" -c Debug" -register:user -filter:"+[*]* -[xunit*]*" -threshold:100 -oldstyle -returntargetcode -mergeoutput -output:coverage.xml
+tools\OpenCover\tools\OpenCover.Console.exe -target:"C:\Program Files\dotnet\dotnet.exe" -targetargs:" test ""test\WaveletCodesTools.Tests\project.json"" -c Debug" -register:user -filter:"+[*]* -[xunit*]*" -threshold:100 -oldstyle -returntargetcode -mergeoutput -output:coverage.xml

 SET PATH=C:\\Python34;C:\\Python34\\Scripts;%PATH%
 pip install codecov


fix git tagging

fix git tagging

--- push-release.bat
+++ push-release.bat
@@ -1,9 +1,9 @@
-rem if "%APPVEYOR_REPO_TAG%" NEQ "True" goto :ok
+if "%APPVEYOR_REPO_TAG%" NEQ "True" goto :ok

 set HERE=%~dp0

 git tag -a %APPVEYOR_BUILD_VERSION% -m "Release vesion %APPVEYOR_BUILD_VERSION%" || goto :ko
-git push --tags || goto :ko
+git push --tags https://%GITHUB_TOKEN%:@github.com/pchalamet/full-build.git || goto :ko

 %HERE%tools\github-release.exe release ^
                          --user pchalamet ^


build number for release artifact

build number for release artifact

--- push-release.bat
+++ push-release.bat
@@ -7,6 +7,7 @@
 echo APPVEYOR_BUILD_VERSION %APPVEYOR_BUILD_VERSION%
 echo APPVEYOR_REPO_COMMIT %APPVEYOR_REPO_COMMIT%
 echo APPVEYOR_REPO_COMMIT_MESSAGE  %APPVEYOR_REPO_COMMIT_MESSAGE%
+echo APPVEYOR_BUILD_NUMBER  %APPVEYOR_BUILD_NUMBER%

 7z a %HERE%%CONFIGURATION%.zip %HERE%\src\bin\%CONFIGURATION%\*

@@ -22,7 +23,7 @@
                      --user pchalamet ^
 					 --repo full-build ^
                      --tag %APPVEYOR_BUILD_VERSION% ^
-                     --name "%APPVEYOR_PROJECT_NAME%-net45-anycpu.zip" ^
+                     --name "%APPVEYOR_PROJECT_NAME%-net45-anycpu-%APPVEYOR_BUILD_NUMBER%.zip" ^
                      --file %HERE%%CONFIGURATION%.zip || goto :ko

 :ok


Copy the result files to their corresponding directories

--- CreateTestresults.cmd
+++ CreateTestresults.cmd
@@ -20,4 +20,12 @@
 call cucumber --format json_pretty --out "%~dp0\results-example-json.json" --tags ~@ignore
 cd "%~dp0"

+copy "%~dp0\results-example-nunit.xml" "%~dp0\..\Pickles\src\Pickles\Pickles.TestFrameworks.UnitTests\NUnit\NUnit2\"
+copy "%~dp0\results-example-nunit3.xml" "%~dp0\..\Pickles\src\Pickles\Pickles.TestFrameworks.UnitTests\NUnit\NUnit3\"
+copy "%~dp0\results-example-xunit.xml" "%~dp0\..\Pickles\src\Pickles\Pickles.TestFrameworks.UnitTests\XUnit\XUnit1\"
+copy "%~dp0\results-example-xunit2.xml" "%~dp0\..\Pickles\src\Pickles\Pickles.TestFrameworks.UnitTests\XUnit\XUnit2\"
+copy "%~dp0\results-example-specrun.html" "%~dp0\..\Pickles\src\Pickles\Pickles.TestFrameworks.UnitTests\SpecRun\"
+copy "%~dp0\results-example-mstest.trx" "%~dp0\..\Pickles\src\Pickles\Pickles.TestFrameworks.UnitTests\MsTest\"
+copy "%~dp0\results-example-json.json" "%~dp0\..\Pickles\src\Pickles\Pickles.TestFrameworks.UnitTests\CucumberJSON\"
+
 @popd


Fixed collision

Fixed collision

--- Scripts/Create/UMETRICS/__dump.cmd
+++ Scripts/Create/UMETRICS/__dump.cmd
@@ -45,9 +45,6 @@
 echo Create table scripts.
 "%_mysqldump_path%mysqldump.exe" --no-data --add-drop-database --skip-dump-date -u"%_mysql_username%" -p"%_mysql_password%" -h"%_mysql_host%" -T. "%_mysql_database%"

-echo Create stored proc script.
-"%_mysqldump_path%mysqldump.exe" --no-data --add-drop-database --no-create-info  -u"%_mysql_username%" -p"%_mysql_password%" -h"%_mysql_host%" -R "%_mysql_database%" --result-file=_create_procedures.sql
-
 echo.
 echo Finished!
 echo.


[FIX] EasyInstall doesn't use the good development environment if Matlab 32-bit is used under Windows 64-bit.

git-svn-id: ed06c97986a68fa016311908f99ed1538fbb9b5d@1627 93be6e1e-6fcc-11de-baec-69240fdc299a

--- Batch/EasyInstall_MSVC.bat
+++ Batch/EasyInstall_MSVC.bat
@@ -20,6 +20,42 @@
   SET PROGFILES=%ProgramW6432%
 ) ELSE (
   SET PROGFILES=%ProgramFiles%
+)
+
+:: Detect CMake
+SET CMAKE=""
+IF (%3) == () (
+  :: Create a temporary file to list the known CMAKE directories
+  > %TEMP%.\BTK-CMAKE.txt ECHO Known CMAKE directories
+  >> %TEMP%.\BTK-CMAKE.txt ECHO "!PROGFILES!\CMake 2.6"
+  >> %TEMP%.\BTK-CMAKE.txt ECHO "!PROGFILES!\CMake 2.8"
+  >> %TEMP%.\BTK-CMAKE.txt ECHO "!PROGFILES! (x86)\CMake 2.6"
+  >> %TEMP%.\BTK-CMAKE.txt ECHO "!PROGFILES! (x86)\CMake 2.8"
+  :: Look for CMAKE
+  FOR	/F "eol=;delims=," %%i IN (%TEMP%.\BTK-CMAKE.txt) DO IF EXIST %%i\bin\cmake.exe SET CMAKE=%%i
+  DEL %TEMP%.\BTK-CMAKE.txt
+  IF !CMAKE! == "" GOTO :missing_CMAKE
+) ELSE (
+  SET CMAKE=%3
+  IF NOT EXIST !CMAKE!\bin\cmake.exe GOTO missing_CMAKE
+)
+
+:: Special case if BTK is compiled with Matlab wrapper on a 64-bit OS
+:: but Matlab is a 32-bit binary => Must activate the 32-bit compiler
+IF (!ARCH! NEQ "") (
+  SET MATLAB_WRAPPING_ENABLED=0
+  IF "%options.1:~2,15%"=="BTK_WRAP_MATLAB" SET MATLAB_WRAPPING_ENABLED=1
+  IF "%options.2:~2,15%"=="BTK_WRAP_MATLAB" SET MATLAB_WRAPPING_ENABLED=1
+  IF "%options.3:~2,15%"=="BTK_WRAP_MATLAB" SET MATLAB_WRAPPING_ENABLED=1
+  IF "%options.4:~2,15%"=="BTK_WRAP_MATLAB" SET MATLAB_WRAPPING_ENABLED=1
+  IF "%options.5:~2,15%"=="BTK_WRAP_MATLAB" SET MATLAB_WRAPPING_ENABLED=1
+  IF !MATLAB_WRAPPING_ENABLED! == 1 (
+    !CMAKE!\bin\cmake.exe -P .\testWin64Matlab32.cmake
+    IF EXIST "%CD%\testWin64Matlab32_TRUE.txt" (
+      SET ARCH=
+      DEL .\testWin64Matlab32_TRUE.txt
+    )
+  )
 )

 :: Detect MSVC. If MSVC is not present, the script looks for Windows SDK 7.0 (or greater)
@@ -56,42 +92,6 @@
   IF NOT EXIST !MSVS!\VC\vcvarsall.bat GOTO missing_MSVS
 )
 SET setEnvCmd=!MSVS!\Bin\SetEnv.Cmd
-
-:: Detect CMake
-SET CMAKE=""
-IF (%3) == () (
-  :: Create a temporary file to list the known CMAKE directories
-  > %TEMP%.\BTK-CMAKE.txt ECHO Known CMAKE directories
-  >> %TEMP%.\BTK-CMAKE.txt ECHO "!PROGFILES!\CMake 2.6"
-  >> %TEMP%.\BTK-CMAKE.txt ECHO "!PROGFILES!\CMake 2.8"
-  >> %TEMP%.\BTK-CMAKE.txt ECHO "!PROGFILES! (x86)\CMake 2.6"
-  >> %TEMP%.\BTK-CMAKE.txt ECHO "!PROGFILES! (x86)\CMake 2.8"
-  :: Look for CMAKE
-  FOR	/F "eol=;delims=," %%i IN (%TEMP%.\BTK-CMAKE.txt) DO IF EXIST %%i\bin\cmake.exe SET CMAKE=%%i
-  DEL %TEMP%.\BTK-CMAKE.txt
-  IF !CMAKE! == "" GOTO :missing_CMAKE
-) ELSE (
-  SET CMAKE=%3
-  IF NOT EXIST !CMAKE!\bin\cmake.exe GOTO missing_CMAKE
-)
-
-:: Special case if BTK is compiled with Matlab wrapper on a 64-bit OS
-:: but Matlab is a 32-bit binary => Must activate the 32-bit compiler
-IF (!ARCH! NEQ "") (
-  SET MATLAB_WRAPPING_ENABLED=0
-  IF "%options.1:~2,15%"=="BTK_WRAP_MATLAB" SET MATLAB_WRAPPING_ENABLED=1
-  IF "%options.2:~2,15%"=="BTK_WRAP_MATLAB" SET MATLAB_WRAPPING_ENABLED=1
-  IF "%options.3:~2,15%"=="BTK_WRAP_MATLAB" SET MATLAB_WRAPPING_ENABLED=1
-  IF "%options.4:~2,15%"=="BTK_WRAP_MATLAB" SET MATLAB_WRAPPING_ENABLED=1
-  IF "%options.5:~2,15%"=="BTK_WRAP_MATLAB" SET MATLAB_WRAPPING_ENABLED=1
-  IF !MATLAB_WRAPPING_ENABLED! == 1 (
-    !CMAKE!\bin\cmake.exe -P .\testWin64Matlab32.cmake
-    IF EXIST "%CD%\testWin64Matlab32_TRUE.txt" (
-      SET ARCH=
-      DEL .\testWin64Matlab32_TRUE.txt
-    )
-  )
-)

 CD ..
 IF EXIST !setEnvCmd! (


Fixes #552: CallHierarchyIncomingCall.fromRanges comment is unclear

--- testbed/workspace/test.bat
+++ testbed/workspace/test.bat
@@ -3,7 +3,7 @@
 REM This is the location of the files that you want to sort
 FOR %%f IN (*.doc *.txt) DO XCOPY c:\source\"%%f" c:\text /m /y
 REM This moves any files with a .doc or
-REM .txt extension from c:\source to c:\textkkk
+REM .txt extension from . c:\source to c:\textkkk
 REM %%f is a variable
 FOR %%f IN (*.jpg *.png *.bmp) DO XCOPY C:\source\"%%f" c:\images /m /y
 REM This moves any files with a .jpg, .png,


modify tar.bat, pass first argument to tar.py script

--- tools/tar.bat
+++ tools/tar.bat
@@ -1,2 +1,2 @@
 @echo off
-py.exe tar.py+py.exe tar.py %1


Remove extra "\n".

Remove extra "\n".

--- tools/windows-build-deps.cmd
+++ tools/windows-build-deps.cmd
@@ -94,7 +94,7 @@
 cecho {0E}         When building Qt, you must press 'y' once for the script to proceed.{# #}{\n}
 echo.

-echo If you are not ready with the above, press Ctrl-C to abort!\n
+echo If you are not ready with the above, press Ctrl-C to abort!
 pause
 echo.


NXP-12981: Sign msi file with 'Nuxeo Drive SPC' certificate and verify code signature in a dedicated script to run after msi freeze

error: pathspec 'tools/windows/sign_msi.bat' did not match any file(s) known to git

--- tools/windows/sign_msi.bat
+++ tools/windows/sign_msi.bat
@@ -0,0 +1,23 @@
+@echo off
+
+set DIST_DIR=dist
+set CERTIFICATE_STORE=Root
+set CERTIFICATE_NAME="Nuxeo Drive SPC"
+set MSI_PROGRAM_NAME="Nuxeo Drive"
+set TIMESTAMP_URL=http://timestamp.verisign.com/scripts/timstamp.dll
+
+set SIGN_CMD=signtool sign /v /s %CERTIFICATE_STORE% /n %CERTIFICATE_NAME% /d %MSI_PROGRAM_NAME% /t %TIMESTAMP_URL%
+set VERIFY_CMD=signtool verify /v /pa
+
+FOR %%F IN (%DIST_DIR%\*.msi) DO (
+	echo ---------------------------------------------
+	echo Signing %%F
+    echo ---------------------------------------------
+	echo %SIGN_CMD% %%F
+	%SIGN_CMD% %%F
+	echo ---------------------------------------------
+    echo Verifying %%F
+	echo ---------------------------------------------
+    echo %VERIFY_CMD% %%F
+	%VERIFY_CMD% %%F
+)


+ Env changes required to get boinc/backfill working on Windows

--- NTconfig/set_vars.bat
+++ NTconfig/set_vars.bat
@@ -62,10 +62,10 @@
 ) else (
     echo No build-id defined (i.e. the file %cd%\BUILD-ID is missing)
 )
-echo Using build-id: %BID%
+echo Using build-id: %BID% & echo.
 popd

-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" /GR /D BUILDID=%BID%
+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" /GR /DHAVE_BACKFILL /DHAVE_BOINC /DBUILDID=%BID%
 set CONDOR_LIB=Crypt32.lib mpr.lib psapi.lib mswsock.lib netapi32.lib imagehlp.lib advapi32.lib ws2_32.lib user32.lib oleaut32.lib ole32.lib
 set CONDOR_LIBPATH=


Typo.

Typo.

--- scripts/win_wrapper.cmd
+++ scripts/win_wrapper.cmd
@@ -32,7 +32,7 @@
 ) ELSE IF %MAJOR_PYTHON_VERSION% == 3 (
     SET WINDOWS_SDK_VERSION="v7.1"
     IF %MINOR_PYTHON_VERSION% GEQ 5 (
-        SET SET_SDK_64=Y
+        SET NO_SET_SDK_64=Y
     )
 ) ELSE (
     ECHO Unsupported Python version: "%MAJOR_PYTHON_VERSION%"


CI: different cache xdk / otb

CI: different cache xdk / otb

--- CI/dev_env.bat
+++ CI/dev_env.bat
@@ -2,6 +2,12 @@
 :: check input arguments
 if %1.==. (
   echo "No arch"
+  call :Help
+  goto :eof
+)
+
+if %2.==. (
+  echo "No project"
   call :Help
   goto :eof
 )
@@ -22,17 +28,18 @@
 )

 set ARCH=%1
+set PROJECT=%2

-if %2.==. (
+if %3.==. (
   set SHORT_TARGET=10
 ) else (
-  set SHORT_TARGET=%2
+  set SHORT_TARGET=%3
 )

-if %3.==. (
+if %4.==. (
   set VCVER=14.0
 ) else (
-  set VCVER=%3
+  set VCVER=%4
 )

 set TARGET=%SHORT_TARGET%
@@ -48,7 +55,7 @@
 call "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" %ARCH% %TARGET% -vcvars_ver=%VCVER%

 :: Setup Clcache
-set CLCACHE_DIR=C:\clcache\%ARCH%-%TARGET%-%VCVER%
+set CLCACHE_DIR=C:\clcache\%PROJECT%-%ARCH%-%TARGET%-%VCVER%
 set CLCACHE_HARDLINK=1
 :: set CLCACHE_SERVER=1
 set CLCACHE_CL=
@@ -60,6 +67,9 @@
 copy C:\tools\Python35-%ARCH%\Scripts\clcache.exe C:\clcache\cl.exe
 set PATH=C:\clcache;%PATH%

+if "%PROJECT%"=="xdk" (
+  call "clcache.exe" -M 3000000000
+)
 :: if we need to change cache max size: clcache -M <size-in-bytes>

 set IMAGE_NAME=windows-%SHORT_TARGET%-%ARCH%-vc%VCVER%
@@ -72,8 +82,9 @@

 :Help
 setlocal
-echo "Usage: dev_env.bat <compiler_arch>  [<target-os>  [<vc_version>]]"
+echo "Usage: dev_env.bat <compiler_arch>  <project>  [<target-os>  [<vc_version>]]"
 echo "  <compiler_arch> : 'x86' | 'x64'"
+echo "  <project>       : 'xdk' | 'otb'"
 echo "  <target-os>     : '8.1' | '10' (default)"
 echo "  <vc_version>    :"
 echo "    '14.20' (i.e. VS 2019)"


Use studio64.exe instead of studio.exe

Use studio64.exe instead of studio.exe

--- _OpenInAndroidStudio.bat
+++ _OpenInAndroidStudio.bat
@@ -5,4 +5,4 @@
 rem Android Studio needs the project path without a trailing backslash
 if %projectPath:~-1%==\ set projectPath=%projectPath:~0,-1%

-start "" /D "%androidStudioBin%" "studio.exe" "%projectPath%"+start "" /D "%androidStudioBin%" "studio64.exe" "%projectPath%"


Add missing bld.bat for libhidapi

Add missing bld.bat for libhidapi

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

--- lib/hidapi/bld.bat
+++ lib/hidapi/bld.bat
@@ -0,0 +1,23 @@
+mkdir build
+cd build
+
+python -c "print(r'%PREFIX%'.replace('\\','/'))" > temp.txt
+set /p BASH_PREFIX=<temp.txt
+
+set MINGW=%MINGW64%
+set PATH=%MINGW%;%PATH%
+
+cmake ^
+	-G "MinGW Makefiles"^
+    -DHIDAPI_WITH_HIDRAW="FALSE"^
+    -DHIDAPI_WITH_LIBUSB="TRUE"^
+	-DCMAKE_C_FLAGS=-L%BASH_PREFIX%/lib -lusb-1.0^
+	-DCMAKE_INSTALL_PREFIX="%BASH_PREFIX%/Library"^
+	-DCMAKE_SH="CMAKE_SH-NOTFOUND"^
+	-Wno-dev ^
+	../  || exit 1
+
+cmake --build . || exit 1
+cmake --build . --target install || exit 1
+
+


comment out the addon and the silent setup build in make_packages.bat

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

--- wdkbuild/make_packages.bat
+++ wdkbuild/make_packages.bat
@@ -1,9 +1,9 @@
 @ECHO OFF
 SETLOCAL
-SET "PERL_PATH=G:\Installation Programs\Programs\Compiling Stuff\Other\ActivePerl-5.12.2.1202-MSWin32-x86-293621"
+rem SET "PERL_PATH=G:\Installation Programs\Programs\Compiling Stuff\Other\ActivePerl-5.12.2.1202-MSWin32-x86-293621"

 rem Check the building environment
-IF NOT EXIST "%PERL_PATH%" CALL :SUBMSG "INFO" "The Perl direcotry wasn't found; the addon won't be built"
+rem IF NOT EXIST "%PERL_PATH%" CALL :SUBMSG "INFO" "The Perl direcotry wasn't found; the addon won't be built"
 IF NOT DEFINED VS100COMNTOOLS CALL :SUBMSG "INFO" "Visual Studio 2010 wasn't found; the installer won't be built"

 CD /D %~dp0
@@ -105,19 +105,19 @@
 CALL "%VS100COMNTOOLS%vsvars32.bat" >NUL
 devenv setup.sln /Rebuild "Full|%ARCH%"
 IF %ERRORLEVEL% NEQ 0 CALL :SUBMSG "ERROR" "Compilation failed!"
-devenv setup.sln /Rebuild "Lite|%ARCH%"
-IF %ERRORLEVEL% NEQ 0 CALL :SUBMSG "ERROR" "Compilation failed!"
+rem devenv setup.sln /Rebuild "Lite|%ARCH%"
+rem IF %ERRORLEVEL% NEQ 0 CALL :SUBMSG "ERROR" "Compilation failed!"

-IF EXIST "%PERL_PATH%" (
-  "%PERL_PATH%\perl\bin\perl.exe" addon_build.pl
-)
+rem IF EXIST "%PERL_PATH%" (
+rem   "%PERL_PATH%\perl\bin\perl.exe" addon_build.pl
+rem )

 MD ..\wdkbuild\packages >NUL 2>&1
-IF EXIST "%PERL_PATH%" (
-  MOVE setup.%BINDIR%\addon.7z    ..\wdkbuild\packages\Notepad2-mod_Addon.%BINDIR%.7z >NUL
-)
+rem IF EXIST "%PERL_PATH%" (
+rem   MOVE setup.%BINDIR%\addon.7z    ..\wdkbuild\packages\Notepad2-mod_Addon.%BINDIR%.7z >NUL
+rem )
 MOVE setup.%BINDIR%\setupfull.exe ..\wdkbuild\packages\Notepad2-mod_Setup.%BINDIR%.exe >NUL
-MOVE setup.%BINDIR%\setuplite.exe ..\wdkbuild\packages\Notepad2-mod_Setup_Silent.%BINDIR%.exe >NUL
+rem MOVE setup.%BINDIR%\setuplite.exe ..\wdkbuild\packages\Notepad2-mod_Setup_Silent.%BINDIR%.exe >NUL

 rem Cleanup
 RD /Q setup.%BINDIR% temp >NUL 2>&1


update svn ignore

update svn ignore

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

--- 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


reverting the ng build --prod change because it broke stuff

--- src/PokerLeagueManager.UI.Web/BuildAngular.bat
+++ src/PokerLeagueManager.UI.Web/BuildAngular.bat
@@ -1,6 +1,6 @@
 call %~dp0\GenerateTypeScript.bat
 cd %~dp0\angular
 call npm install
-call npm run build-prod
+call npm run build
 cd ..
 powershell %~dp0\..\..\deploy\TransformIndex.ps1 -SourcePath %~dp0\angular\dist\index.html -TargetPath %~dp0\angular\dist\index.cshtml


Add gimp, paint.net and inconsolata

Add gimp, paint.net and inconsolata

--- windows/new-dev-system.cmd
+++ windows/new-dev-system.cmd
@@ -5,9 +5,11 @@
 choco feature enable -n allowGlobalConfirmation

 :: general apps
-choco upgrade chocolatey 7zip 7zip.commandline putty filezilla adobereader slack javaruntime
+choco upgrade chocolatey
+choco upgrade 7zip 7zip.commandline putty filezilla adobereader slack javaruntime gimp paint.net
 choco upgrade autoruns sdelete procexp procmon
 choco upgrade curl wget wput zip unzip optipng
+choco upgrade inconsolata

 :: dev apps
 choco upgrade postgresql-9.3 pgadmin3


restoring PYTHONHOME, gen source dist

restoring PYTHONHOME, gen source dist

--- winbuild.cmd
+++ winbuild.cmd
@@ -18,7 +18,8 @@
 SET PY33_32=C:\Python33
 SET PY34_32=C:\Python34

-
+SET OLD_PYTHONHOME=%PYTHONHOME%
+SET PYTHONHOME=

 IF NOT EXIST "%JDK64_HOME%" GOTO Build_32
 SET JAVA_HOME=%JDK64_HOME%
@@ -28,6 +29,7 @@
 IF NOT EXIST "%PYTHONHOME%" GOTO Build_PY33_64
 ECHO Starting build using "%PYTHONHOME%" and "%JAVA_HOME%"
 "%PYTHONHOME%\python.exe" setup.py --maven bdist_wheel
+

 :Build_PY33_64
 SET PYTHONHOME=%PY33_64%
@@ -67,3 +69,5 @@

 :Build_End
+IF EXIST "%PYTHONHOME%" "%PYTHONHOME%\python.exe" setup.py sdist
+SET PYTHONHOME=%OLD_PYTHONHOME%


修改从 zim notebook 自动发布 github pages 的脚本，使之正常显示 utf-8 中文输出；顺便修改输出文字的内容，给出更有用的执行结果说明。

--- pub_to_github.bat
+++ pub_to_github.bat
@@ -1,4 +1,10 @@
 @ECHO OFF
+
+REM **
+REM ** switch to utf-8 codepage
+REM **
+
+chcp.com 65001

 REM **
 REM ** define ZIM_DIR and GH_PAGES_BASE_DIR
@@ -37,7 +43,7 @@
 REM **
 %ZIM_CMD% --export -r -O --template ZeroFiveEight --index-page index -o %GH_PAGES_BASE_DIR%\zim %ZIM_FILE%

-echo 新的静态 HTML 站点发布操作执行完毕。
+echo 新的静态 HTML 站点发布前预处理操作执行完毕。
 pause

 %GIT_CMD% add .


Add Flash and Java cleaning to TempFileCleanup.bat

--- resources/stage_1_tempclean/tempfilecleanup/TempFileCleanup.bat
+++ resources/stage_1_tempclean/tempfilecleanup/TempFileCleanup.bat
@@ -87,6 +87,9 @@
 		del /F /Q "%%x\Local Settings\Temporary Internet Files\*" 2>NUL
 		del /F /Q "%%x\Local Settings\Application Data\ApplicationHistory\*" 2>NUL
 		del /F /Q "%%x\My Documents\*.tmp" 2>NUL
+		del /F /Q "%%x\Application Data\Sun\Java\*" 2>NUL
+		del /F /Q "%%x\Application Data\Adobe\Flash Player\*" 2>NUL
+		del /F /Q "%%x\Application Data\Macromedia\Flash Player\*" 2>NUL
 	)
 ) else (
 	for /D %%x in ("%SystemDrive%\Users\*") do (
@@ -94,6 +97,9 @@
 		del /F /Q "%%x\AppData\Roaming\Microsoft\Windows\Recent\*" 2>NUL
 		del /F /Q "%%x\AppData\Local\Microsoft\Windows\Temporary Internet Files\*" 2>NUL
 		del /F /Q "%%x\My Documents\*.tmp" 2>NUL
+		del /F /Q "%%x\AppData\LocalLow\Sun\Java\*" 2>NUL
+		del /F /Q "%%x\AppData\Roaming\Adobe\Flash Player\*" 2>NUL
+		del /F /Q "%%x\AppData\Roaming\Macromedia\Flash Player\*" 2>NUL
 		del /F /Q "%%x\AppData\Local\Microsoft\Windows\*.blf" 2>NUL
 		del /F /Q "%%x\AppData\Local\Microsoft\Windows\*.regtrans-ms" 2>NUL
 		del /F /Q "%%x\*.blf" 2>NUL


document input file format

document input file format

--- org.mwc.cmap.combined.feature/root_installs/sample_data/other_formats/sender.bat
+++ org.mwc.cmap.combined.feature/root_installs/sample_data/other_formats/sender.bat
@@ -1,4 +1,5 @@
-# Parameters:
-#
+REM run the PDU generator
+REM %1 the control file, containing ip, port, network mode, time-step, num participants, num messages
+REM e.g.  239.1.2.3 62040 multicast 1000 12 15
 java -cp ../../plugins/org.mwc.debrief.dis_1.0.2.jar org.mwc.debrief.dis.diagnostics.PduGenerator %1


Update buildqt5win64_github.bat

Update buildqt5win64_github.bat

--- windows-install/win64/buildqt5win64_github.bat
+++ windows-install/win64/buildqt5win64_github.bat
@@ -1,4 +1,4 @@
-set PATH=%Qt5_DIR%/bin;%Qt5_DIR%/../../Tools/mingw810_64/bin;%Qt5_DIR%/../../Tools/CMake_64/bin;%PATH%
+set PATH=%Qt5_DIR%/bin;%PATH%
 md build
 cd build
 cmake -G "MinGW Makefiles" -DBUILD_QT5=ON -DSQLITE_INCLUDE_DIR="%Qt5_DIR%/../../Tools/mingw810_64/opt/include" -DSQLITE_LIBRARY_RELEASE="%Qt5_DIR%/../../Tools/mingw810_64/opt/lib/sqlite3.21.0/sqlite3210.dll" ..


[The Dead Linger] Tweak the startup script

--- Oxide.Game.DeadLinger/Patched/TDL-LaunchDedicatedServer.bat
+++ Oxide.Game.DeadLinger/Patched/TDL-LaunchDedicatedServer.bat
@@ -1 +1 @@
-TDL.exe +dedicatedServer -batchmode+@TDL.exe +dedicatedServer -batchmode


Revert "Updated bld.bat"

Revert "Updated bld.bat"

This reverts commit bc7de89bd0ab8870fb1cadd8e941dd0164b69b46.

--- recipes/example/bld.bat
+++ recipes/example/bld.bat
@@ -1 +1,2 @@
-"%PYTHON%" setup.py install
+@echo print('An example') > %SP_DIR%\example.py
+if errorlevel 1 exit 1


Fix tag name

Fix tag name

--- traefik/push.bat
+++ traefik/push.bat
@@ -1,4 +1,4 @@
 docker tag traefik stefanscherer/traefik-windows
-docker tag traefik stefanscherer/traefik-windows:v1.2.0-rc1-windows.1
-docker push stefanscherer/traefik-windows:v1.2.0-rc1-windows.1
+docker tag traefik stefanscherer/traefik-windows:v1.2.0-rc1
+docker push stefanscherer/traefik-windows:v1.2.0-rc1
 docker push stefanscherer/traefik-windows


Added time stamp to generated index file.

git-svn-id: 4c7b768bc2e2a56aa1c56b1b5a9454ba68342430@250 ac9c905b-388a-4ddf-9b6a-4063a022bc57

--- xml/html.cmd
+++ xml/html.cmd
@@ -6,13 +6,10 @@
 SET SAX_PATH=c:\xt
 SET XP_PATH=c:\xt

-SET XSLT="lgthtml.xsl"
+SET XSLT=lgthtml.xsl

-IF !%1==! SET TITLE="Entity documentation index"
-IF NOT !%1==! SET TITLE = %1%
-
-ECHO %1%
-ECHO %TITLE%
+IF "%1" == "" SET INDEX_TITLE=Entity documentation index
+IF NOT "%1" == "" SET INDEX_TITLE=%1%

 ECHO This script converts all .xml files in the current directory to .html
 ECHO files applying the XSLT transformation defined in the $XSLT file
@@ -24,9 +21,9 @@
 ECHO.
 ECHO converting XML files to HTML...

-FOR %%f IN (*.xml) IF EXIST %%~nf.html DEL %%~nf.html
+FOR /f "tokens=1-2 delims=." %%f IN ('DIR /b *.xml') DO IF EXIST %%f.html DEL %%f.html

-FOR %%f IN (*.xml) DO %JAVA_HOME%\bin\java -cp "%XT_PATH%\xt.jar;%SAX_PATH%\sax.jar;%XP_PATH%\xp.jar" -Dcom.jclark.xsl.sax.parser=com.jclark.xml.sax.CommentDriver com.jclark.xsl.sax.Driver %%f %XSLT% %%~nf.html
+FOR /f "tokens=1-2 delims=." %%f IN ('DIR /b *.xml') DO %JAVA_HOME%\bin\java -cp "%XT_PATH%\xt.jar;%SAX_PATH%\sax.jar;%XP_PATH%\xp.jar" -Dcom.jclark.xsl.sax.parser=com.jclark.xml.sax.CommentDriver com.jclark.xsl.sax.Driver %%f.xml %XSLT% %%f.html

 ECHO conversion done
 ECHO.
@@ -37,20 +34,22 @@
 ECHO ^<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"^> >> index.html
 ECHO ^ >> index.html
 ECHO ^ >> index.html
-ECHO ^<title^>%TITLE%^</title^> >> index.html
+ECHO ^<title^>%INDEX_TITLE%^</title^> >> index.html
 ECHO ^<link rel="stylesheet" href="logtalk.css" type="text/css"^> >> index.html
 ECHO ^ >> index.html
 ECHO ^ >> index.html
-ECHO ^
%TITLE%^
 >> index.html
+ECHO ^
%INDEX_TITLE%^
 >> index.html
 ECHO ^
 >> index.html

-FOR %%f IN (*.xml) DO ECHO ^
^%%~nf^^
 >> index.html
+FOR /f "tokens=1-2 delims=." %%f IN ('DIR /b *.xml') DO ECHO ^
^%%f^^
 >> index.html

 ECHO ^
 >> index.html

-SET DATETIME=
+ECHO ^
Generated on >> index.html
+DATE/T >> index.html
+TIME/T >> index.html
+ECHO ^
 >> index.html

-ECHO ^
Generated on %DATETIME%^
 >> index.html
 ECHO ^ >> index.html
 ECHO ^ >> index.html


And yet one more update to ProcessGoldenImages.bat

--- Tests/GoldenImages/ProcessGoldenImages.bat
+++ Tests/GoldenImages/ProcessGoldenImages.bat
@@ -33,7 +33,7 @@
     set golden_images_root_dir=../../../Tests/GoldenImages
 )

-set build_folder=%1
+set build_folder=%~1
 shift

 set config=%1


Removed utility DOS script which is no longer needed.

git-svn-id: d596a19132b705a85694e062da4def6039642bfb@1824 4d38ed0c-b8d3-11de-a71d-8f2b2e058ad8

--- main/asmifier.bat
+++ main/asmifier.bat
@@ -1 +0,0 @@
-java -cp \Java\asm-2.2.3\lib\all\asm-all-2.2.3.jar;classes org.objectweb.asm.util.ASMifierClassVisitor Temp


Just comment.

Just comment.


Remove quotes around file from Windows batch

--- src/main/bin/unravl.bat
+++ src/main/bin/unravl.bat
@@ -12,4 +12,4 @@
         -classpath %UNRAVL_JAR_DIR%\*;%UNRAVL_LIB_DIR%\* ^
         %UNRAVL_OPT% ^
         com.sas.unravl.Main ^
-        "%*"
+        %*


[AS7-1343]:wsprovide.bat does not work

[AS7-1343]:wsprovide.bat does not work

--- build/src/main/resources/bin/wsprovide.bat
+++ build/src/main/resources/bin/wsprovide.bat
@@ -19,7 +19,7 @@

 rem Execute the command
 "%JAVA%" %JAVA_OPTS% ^
-    "-Djava.endorsed.dirs=file:%JBOSS_HOME%/modules/com/sun/xml/bin/main;file:%JBOSS_HOME%/modules/javax/xml/ws/api/main\" ^
+    "-Djava.endorsed.dirs=%JBOSS_HOME%/modules/com/sun/xml/bin/main;%JBOSS_HOME%/modules/javax/xml/ws/api/main" ^
     -jar "%JBOSS_HOME%\jboss-modules.jar" ^
     -mp "%JBOSS_HOME%\modules" ^
     -logmodule "org.jboss.logmanager" ^


close #8

close #8

--- backend/venv/venv.bat
+++ backend/venv/venv.bat
@@ -12,12 +12,20 @@
 pip install -r dev_requirements.txt --upgrade || goto :error

-cd ..\src || goto :error
+cd ..\plugins\appengine || goto :error
+
 IF NOT EXIST %cd%\lib (
-call :to_console "Creating symlink on src/lib so installed libs become visible to Google App Engine"
-MKLINK /D lib ..\venv\Lib\site-packages
+call :to_console "Creating symlink on plugins\appengine so installed libs become visible to Google App Engine"
+MKLINK /D lib ..\..\venv\Lib\site-packages
 )
-cd ..\venv || goto :error
+
+IF NOT EXIST %cd%\apps (
+call :to_console "Creating symlink on plugins\appengine so apps become visible to Google App Engine"
+MKLINK /D apps ..\..\apps
+)
+
+
+cd ..\..\venv || goto :error
 call :to_console "virtualenv and dependencies installed"
 goto:EOF


Made sure we always build with internal components

--- HOPSAN++/makeReleaseWin32.bat
+++ HOPSAN++/makeReleaseWin32.bat
@@ -42,13 +42,21 @@
 set innoDir2="C:\Program Files (x86)\Inno Setup 5"
 set scriptFile="HopsanReleaseInnoSetupScript.iss"
 set hopsanDir=%CD%
-set qtsdkDir="C:\Qt"
+set qtsdkDir="C:\QtSDK"
 set qmakeDir="%qtsdkDir%\Desktop\Qt\4.7.4\mingw\bin"
 set mingwDir="%qtsdkDir%\mingw\bin"
 set jomDir="%qtsdkDir%\QtCreator\bin"
 set msvc2008Dir="C:\Program Files\Microsoft SDKs\Windows\v7.0\bin"
 set msvc2010Dir="C:\Program Files\Microsoft SDKs\Windows\v7.1\bin"

+:: Make sure Qt SDK exist
+if not exist %qtsdkDir% (
+  COLOR 04
+  echo %qtsdkDir% could not be found, you may need to change default dir in this script!
+  echo Aborting!
+  pause
+  exit
+)

 :: Make sure the correct inno dir is used, 32 or 64 bit computers (Inno Setup is 32-bit)
 IF NOT EXIST %innoDir% (
@@ -93,7 +101,6 @@
   )
 )

-echo %dodevrelease%
 if "%dodevrelease%"=="false" (
   REM Set version numbers (by changing .h files) BEFORE build
   ThirdParty\sed-4.2.1\sed "s|#define HOPSANCOREVERSION.*|#define HOPSANCOREVERSION \"%version%\"|g" -i HopsanCore\include\version.h
@@ -109,13 +116,21 @@
   ThirdParty\sed-4.2.1\sed "s|.*#define DEVELOPMENT|//#define DEVELOPMENT|" -i HopsanGUI\common.h
 )

+:: Make sure we compile defaultLibrary into core
+ThirdParty\sed-4.2.1\sed "s|.*DEFINES \*= INTERNALDEFAULTCOMPONENTS|DEFINES *= INTERNALDEFAULTCOMPONENTS|g" -i HopsanCore\HopsanCore.pro
+ThirdParty\sed-4.2.1\sed "s|#INTERNALCOMPLIB.CC#|../componentLibraries/defaultLibrary/code/defaultComponentLibraryInternal.cc \\|" -i HopsanCore\HopsanCore.pro
+ThirdParty\sed-4.2.1\sed "s|componentLibraries||" -i HopsanNG.pro
+
+
 :: Rename TBB so it is not found when compiling with Visual Studio
 IF NOT EXIST HopsanCore\Dependencies\tbb30_20110704oss (
-  COLOR 04
-  echo Cannot find correct TBB version, you must use tbb30_20110704oss!
-  echo Aborting!
-  pause
-  goto cleanup
+  if not exist HopsanCore\Dependencies\tbb30_20110704oss_nope (
+    COLOR 04
+    echo Cannot find correct TBB version, you must use tbb30_20110704oss!
+    echo Aborting!
+    pause
+    goto cleanup
+  )
 )

 cd HopsanCore\Dependencies
@@ -343,7 +358,7 @@

 :: Export and copy "componentData" SVN directory to temporary directory
 svn export componentLibraries\defaultLibrary\components %tempDir%\componentLibraries\defaultLibrary\components
-xcopy componentLibraries\defaultLibrary\components\defaultComponentLibrary.dll %tempDir%\componentLibraries\defaultLibrary\components
+REM xcopy componentLibraries\defaultLibrary\components\defaultComponentLibrary.dll %tempDir%\componentLibraries\defaultLibrary\components

 ::Export "exampleComponentLib" SVN directory to temporary directory
@@ -351,8 +366,8 @@

 ::Change the include and lib paths to be correct
-ThirdParty\sed-4.2.1\sed.exe "s|$${PWD}/../../HopsanCore/include/|$${PWD}/../include/|" -i %tempDir%\exampleComponentLib\exampleComponentLib.pro
-ThirdParty\sed-4.2.1\sed.exe "s|$${PWD}/../../bin|$${PWD}/../bin|" -i %tempDir%\exampleComponentLib\exampleComponentLib.pro
+REM ThirdParty\sed-4.2.1\sed.exe "s|$${PWD}/../../HopsanCore/include/|$${PWD}/../include/|" -i %tempDir%\exampleComponentLib\exampleComponentLib.pro
+REM ThirdParty\sed-4.2.1\sed.exe "s|$${PWD}/../../bin|$${PWD}/../bin|" -i %tempDir%\exampleComponentLib\exampleComponentLib.pro

 :: Export "help" SVN directory to temporary directory


set PATH with quotes!

set PATH with quotes!

--- recipes/postgresql/bld.bat
+++ recipes/postgresql/bld.bat
@@ -8,7 +8,7 @@
 ::    Postgres writes here.  This one comes from the Win7 SDK (.net 4.0), and is known to work.
 if "%ARCH%" == "32" (
    COPY C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe .\
-   set PATH=%CD%;%PATH%
+   set "PATH=%CD%;%PATH%"
 )

 call build.bat


pretty up log message

pretty up log message

--- resources/stage_4_repair/disable_windows_telemetry/purge_windows_10_telemetry.bat
+++ resources/stage_4_repair/disable_windows_telemetry/purge_windows_10_telemetry.bat
@@ -355,7 +355,7 @@

 ::::::::::::::::::::::::::::::::::::::::::::::::::
 :: REGISTRY ENTRIES
-call functions\log.bat "%CUR_DATE% %TIME%    Adding official disable telemtry registry entries..."
+call functions\log.bat "%CUR_DATE% %TIME%    Toggling official MS telemetry registry entries..."

 if "%VERBOSE%"=="yes" (
 	reg import %~dp0disable_telemetry_registry_entries.reg


Add deploy.cmd

Add deploy.cmd

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

--- deploy.cmd
+++ deploy.cmd
@@ -0,0 +1 @@
+lx project cycle fullbuild -t Prod -s https://www.nuget.org/api/v2/package


fix restore path

fix restore path

--- deploy.cmd
+++ deploy.cmd
@@ -113,10 +113,10 @@

 :: 4. Restore nuget packages
 echo 4. Restore nuget packages
-IF EXIST "%DEPLOYMENT_TARGET%\package.json" (
+IF EXIST "%DEPLOYMENT_TARGET%\package.config" (
   echo Running nuget restore
   pushd "%DEPLOYMENT_TARGET%"
-  call :ExecuteCmd nuget restore "%DEPLOYMENT_TARGET%"
+  call :ExecuteCmd nuget restore "%DEPLOYMENT_TARGET%\package.config"
   IF !ERRORLEVEL! NEQ 0 goto error
   echo Completed nuget restore
   popd


Update build-and-pack.cmd

Update build-and-pack.cmd

--- build/build-and-pack.cmd
+++ build/build-and-pack.cmd
@@ -4,8 +4,10 @@
 dotnet restore
 dotnet build .\src\BenchmarkDotNet\BenchmarkDotNet.csproj -c Release
 dotnet build .\src\BenchmarkDotNet.Diagnostics.Windows\BenchmarkDotNet.Diagnostics.Windows.csproj  -c Release
-dotnet pack .\src\BenchmarkDotNet\BenchmarkDotNet.csproj -c Release
-dotnet pack .\src\BenchmarkDotNet.Diagnostics.Windows\BenchmarkDotNet.Diagnostics.Windows.csproj  -c Release
+dotnet build .\src\BenchmarkDotNet.Tool\BenchmarkDotNet.Tool.csproj  -c Release
+dotnet pack .\src\BenchmarkDotNet\BenchmarkDotNet.csproj -c Release --include-symbols -p:SymbolPackageFormat=snupkg
+dotnet pack .\src\BenchmarkDotNet.Diagnostics.Windows\BenchmarkDotNet.Diagnostics.Windows.csproj  -c Release --include-symbols -p:SymbolPackageFormat=snupkg
+dotnet pack .\src\BenchmarkDotNet.Tool\BenchmarkDotNet.Tool.csproj -c Release --include-symbols -p:SymbolPackageFormat=snupkg
 rmdir artifacts /s /q
 mkdir artifacts
 for /R %%x in (BenchmarkDotNet*.*nupkg) do copy "%%x" "artifacts/" /Y


Build script: Updated for Visual Studio 2017

--- buildscript/build.cmd
+++ buildscript/build.cmd
@@ -1,10 +1,14 @@
-@rem Specify Visual Studio version in vsver
-@set vsver=14
-@set vsvar=vs%vsver%0COMNTOOLS
-@setlocal enabledelayedexpansion
-@set vsct=!%vsvar%!
-@setlocal disabledelayedexpansion
-@set vstudio=%vsct%\..\..\VC\bin
+@set x86gcc=6.3.0
+@set x64gcc=6.3.0
+@set x86except=dwarf
+@set x64except=seh
+@set x86threading=posix
+@set x64threading=posix
+@set x86mingwver=5
+@set x64mingwver=5
+@set x86mingwrev=1
+@set x64mingwrev=1
+
 @set mesa=%cd%\
 @set mesaunix=%mesa:\=/%
 @set abi=x86
@@ -12,13 +16,26 @@
 @if /I %x64%==y @set abi=x64
 @set longabi=%abi%
 @if %abi%==x64 @set longabi=x86_64
-@set toolchain=Visual Studio %vsver%
+@set toolchain=Visual Studio 15 2017
 @if %abi%==x64 @set toolchain=%toolchain% Win64
-@set caller="%vstudio%
-@if %abi%==x86 set caller=%caller%\vcvars32.bat"
-@if %abi%==x64 set caller=%caller%\amd64\vcvars64.bat"
-@call %caller%
+@set altabi=i686
+@if %abi%==x64 @set altabi=%longabi%
+@set minabi=32
+@if %abi%==x64 set minabi=64
+@if "%ProgramW6432%"=="" set vsenv=%ProgramFiles%
+@if NOT "%ProgramW6432%"=="" set vsenv=%ProgramFiles% (x86)
+@if %abi%==x86 set gcc=%vsenv%
+@if %abi%==x64 set gcc=%ProgramFiles%
+@set vsenv="%vsenv%\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\
+@if %abi%==x86 set vsenv=%vsenv%\vcvars32.bat"
+@if %abi%==x64 set vsenv=%vsenv%\vcvars64.bat"
+@call %vsenv%
+
+@if %abi%==x86 set gcc=%gcc%\mingw-w64\%altabi%-%x86gcc%-%x86threading%-%x86except%-rt_v%x86mingwver%-rev%x86mingwrev%
+@if %abi%==x64 set gcc=%gcc%\mingw-w64\%altabi%-%x64gcc%-%x64threading%-%x64except%-rt_v%x64mingwver%-rev%x64mingwrev%
+
 @set PATH=%mesa%flexbison\;%mesa%m4\%abi%\bin\;%mesa%Python\%abi%\;%mesa%Python\%abi%\Scripts\;%mesa%cmake\%abi%\bin\;%PATH%
+@if EXIST "%gcc%" set PATH=%gcc%\mingw%minabi%\bin\;%PATH%

 @pip install -U mako
 @pip freeze > requirements.txt
@@ -26,8 +43,7 @@
 @del requirements.txt

 @set /p buildllvm=Begin LLVM build. Only needs to run once for each ABI and version. Proceed y/n?
-@if /I %buildllvm%==y GOTO build_llvm
-@if /I NOT %buildllvm%==y GOTO Next
+@if /I NOT %buildllvm%==y GOTO build_dxtn

 :build_llvm
 @cd %mesa%llvm
@@ -40,15 +56,33 @@
 @msbuild /p:Configuration=Release INSTALL.vcxproj
 @pause

-:Next
-@set /p buildmesa=Begin mesa build. Proceed y/n?
-@if /i %buildmesa%==y GOTO build_mesa
-@if /i NOT %buildmesa%==y @exit
+:build_dxtn
+@if NOT EXIST "%gcc%" GOTO build_mesa
+@set /p builddxtn=Do you want to build S3 texture compression library? (y/n):
+@if /i NOT %builddxtn%==y GOTO build_mesa
+@cd %mesa%dxtn
+@RD /S /Q %abi%
+@MD %abi%
+@set dxtn=gcc -shared
+@if %abi%==x86 set dxtn=%dxtn% -m32
+@set dxtn=%dxtn% -v txc_dxtn.h txc_compress_dxtn.c txc_fetch_dxtn.c -I ..\mesa\include  -Wl,--dll,--dynamicbase,--enable-auto-image-base,--nxcompat -o %abi%\dxtn.dll
+@echo.
+@%dxtn%
+@echo.

 :build_mesa
+@set /p buildmesa=Begin mesa build. Proceed (y/n):
+@if /i NOT %buildmesa%==y GOTO exit
 @set LLVM=%mesaunix%llvm/%abi%
 @cd %mesa%mesa
+@set mingw=n
+@rem if EXIST "%gcc%" set /p mingw=Do you want to build with MinGW-W64 instead of Visual Studio? (y=yes):
+@set buildmingw=
+@if /i %mingw%==y @set buildmingw=toolchain=crossmingw
 @set /p openswr=Do you want to build OpenSWR drivers? (y=yes):
 @set buildswr=
 @if /i %openswr%==y @set buildswr=swr=1
-@cmd /k "scons build=release platform=windows machine=%longabi% %buildswr% libgl-gdi"+@cmd /k "scons build=release platform=windows machine=%longabi% %buildmingw% %buildswr% libgl-gdi"
+
+:exit
+exit


New try...

New try...

--- scripts/build_and_test.bat
+++ scripts/build_and_test.bat
@@ -1,11 +1,6 @@
 @echo on

-if "%TOOLSET%" == "vs2010" (
-    if "%2" == "x64" (
-        call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" "/%1" "/%2"
-        if %errorlevel% neq 0 exit /b %errorlevel%
-    )
-)
+if "%TOOLSET%" == "vs2010" if "%2" == "x64" call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" "/%1" "/%2"

 msbuild /m /p:TrackFileAccess=false "/p:Configuration=%1" "/p:Platform=%2" "build\%TOOLSET%\sc.sln" /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
 if %errorlevel% neq 0 exit /b %errorlevel%


Change the executing name of class from ``Server`` to ``io.moquette.server`` in moquette.bat

--- distribution/src/main/scripts/moquette.bat
+++ distribution/src/main/scripts/moquette.bat
@@ -42,4 +42,4 @@
 set JAVA_OPTS_SCRIPT=-XX:+HeapDumpOnOutOfMemoryError -Djava.awt.headless=true
 set MOQUETTE_PATH=%MOQUETTE_HOME%
 set LOG_FILE=%MOQUETTE_HOME%\config\moquette-log.properties
-%JAVA% -server %JAVA_OPTS% %JAVA_OPTS_SCRIPT% -Dlog4j.configuration=file:%LOG_FILE% -Dmoquette.path=%MOQUETTE_PATH% -cp %MOQUETTE_HOME%\lib\* Server
+%JAVA% -server %JAVA_OPTS% %JAVA_OPTS_SCRIPT% -Dlog4j.configuration=file:%LOG_FILE% -Dmoquette.path=%MOQUETTE_PATH% -cp %MOQUETTE_HOME%\lib\* io.moquette.server.Server


Remove unnecessary flag when running JS server (#25517)

Summary:
This removes the `--projectRoot` flag in `launchPackager.bat` as it was removed,  fixing [this bundler not opening issue on cli repo](https://github.com/react-native-community/cli/issues/484) when `yarn react-native run-android` is run.

This is Windows related only so should be only tested on Windows.

## Changelog

[Internal] [Fixed] - Fixed Metro Bundler not opening when running `yarn react-native run-android`
Pull Request resolved: https://github.com/facebook/react-native/pull/25517

Test Plan:
1. Create a new repo using `react-native init`
2. Edit the `launchPackager.bat` file
3. Run `yarn react-native run-android`

Differential Revision: D16162108

Pulled By: cpojer

fbshipit-source-id: c12d9853ad49f00d56b9a8254a5b2c40a358cb2e

--- scripts/launchPackager.bat
+++ scripts/launchPackager.bat
@@ -6,6 +6,7 @@
 @echo off
 title Metro Bundler
 call .packager.bat
-node "%~dp0..\cli.js" --projectRoot ../../../ start
+cd ../../../
+node "%~dp0..\cli.js" start
 pause
 exit


windows install script

windows install script

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

--- windows/install.cmd
+++ windows/install.cmd
@@ -0,0 +1,22 @@
+# Install scoop
+set-executionpolicy remotesigned -s cu; iex (new-object net.webclient).downloadstring('https://get.scoop.sh')
+
+# Core dependencies
+scoop bucket add extras
+scoop bucket add versions
+scoop install sudo 7zip
+scoop install openssh git coreutils which
+scoop install concfg
+
+# Front-End dependencies
+scoop install php56
+scoop install Mysql56
+scoop install nvm
+nvm install 7.9.0
+scoop install yarn -i # Install yarn without node dependency
+
+
+# Powershell modules
+Install-Module posh-gvm
+Install-Module posh-git
+Install-Module PSReadline


ADAP-69: updated Runtime version in embed.bat to stable


Update VBox guest additions 6.0.8

Update VBox guest additions 6.0.8

--- scripts/vm-guest-tools.bat
+++ scripts/vm-guest-tools.bat
@@ -39,7 +39,7 @@
 )

 if not exist "C:\Windows\Temp\VBoxGuestAdditions.iso" (
-    powershell -Command "(New-Object System.Net.WebClient).DownloadFile('https://download.virtualbox.org/virtualbox/5.2.30/VBoxGuestAdditions_5.2.30.iso', 'C:\Windows\Temp\VBoxGuestAdditions.iso')" <NUL
+    powershell -Command "(New-Object System.Net.WebClient).DownloadFile('https://download.virtualbox.org/virtualbox/6.0.8/VBoxGuestAdditions_6.0.8.iso', 'C:\Windows\Temp\VBoxGuestAdditions.iso')" <NUL
 )

 cmd /c ""C:\Program Files\7-Zip\7z.exe" x C:\Windows\Temp\VBoxGuestAdditions.iso -oC:\Windows\Temp\virtualbox"


Fixe errors spotted by Adam

Fixe errors spotted by Adam

--- examples/toxd-example/run.bat
+++ examples/toxd-example/run.bat
@@ -1,18 +1,10 @@
-REM Run ample on windows
-
-REM Need to add path to shelxe
-set PATH=C:\Users\jmht42\Shelx\shelx64;%PATH%
+REM Toxd test case

 %CCP4%\bin\ample.bat ^
--fasta input/toxd_.fasta ^
--mtz input/1dtx.mtz ^
+-fasta input\toxd_.fasta ^
+-mtz input\1dtx.mtz ^
 -percent 50 ^
 -quick_mode True ^
 -nproc 6 ^
 -models ..\..\tests\testfiles\models

-
-
-
-
-


Fixed symbols publishing.

Fixed symbols publishing.

--- NugetPush.cmd
+++ NugetPush.cmd
@@ -1,3 +1,3 @@
-call nuget push build\packages\Simple.OData.Client.%1.nupkg    %2 -Source https://nuget.org
-call nuget push build\packages\Simple.OData.V3.Client.%1.nupkg %2 -Source https://nuget.org
-call nuget push build\packages\Simple.OData.V4.Client.%1.nupkg %2 -Source https://nuget.org +call nuget push build\packages\Simple.OData.Client.%1.nupkg    -Source https://api.nuget.org/v3/index.json -apikey %2
+call nuget push build\packages\Simple.OData.V3.Client.%1.nupkg -Source https://api.nuget.org/v3/index.json -apikey %2
+call nuget push build\packages\Simple.OData.V4.Client.%1.nupkg -Source https://api.nuget.org/v3/index.json -apikey %2


Create bld_cxx.bat

Create bld_cxx.bat

error: pathspec 'recipes/gz-gui/bld_cxx.bat' did not match any file(s) known to git

--- recipes/gz-gui/bld_cxx.bat
+++ recipes/gz-gui/bld_cxx.bat
@@ -0,0 +1,26 @@
+mkdir build
+cd build
+
+cmake ^
+    -G "Ninja" ^
+    -DCMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% ^
+    -DCMAKE_PREFIX_PATH=%LIBRARY_PREFIX% ^
+    -DCMAKE_BUILD_TYPE=Release ^
+    -DCMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP=True ^
+    -DCMAKE_INSTALL_LIBDIR=lib ^
+    -DBUILD_SHARED_LIBS=ON ^
+    -DBUILD_TESTING=ON ^
+    %SRC_DIR%
+if errorlevel 1 exit 1
+
+:: Build.
+cmake --build . --config Release
+if errorlevel 1 exit 1
+
+:: Install.
+cmake --build . --config Release --target install
+if errorlevel 1 exit 1
+
+:: Test.
+ctest --output-on-failure -C Release
+if errorlevel 1 exit 1


Directory tree refactoring #40 - Extracting SaaS specific from the server

git-svn-id: 8a2ccb88241e16c78017770bc38d91d6d5396a5a@49973 6b8eccd3-e8c5-4e7d-8186-e12b5326b719

--- scripts/batch.bat
+++ scripts/batch.bat
@@ -1 +0,0 @@
-php C:\opt\kaltura\app\batch\KGenericBatchMgr.class.php php C:\opt\kaltura\app\batch\config\pa-win1_config.ini


Revert "Minor change."

Revert "Minor change."

This reverts commit 202f21a25d0b692dab3e6b2f25cce9b230ab31d4.

--- report_export.bat
+++ report_export.bat
@@ -51,6 +51,8 @@
 ::
 :: After you have made your changes, you can schedule it via Windows Server Task Scheduler.
 :: Be sure to schedule to run with elevated permissions to avoid problems.
+
+:: START EDITING HERE!

 ::setup date time key
 for /F "TOKENS=1* DELIMS= " %%A IN ('DATE/T') DO SET CDATE=%%B
@@ -62,8 +64,6 @@
 set dt_key=%yyyy%%mm%%dd%
 set ts_key=%yyyy%%mm%%dd%-%hour%%minutes%
 set date_string=%mm%/%dd%/%yyyy%
-
-:: START EDITING HERE!

 :: THIS SETUP VAR SECTION IS THE ONLY PLACE YOU SHOULD NEED TO MAKE CHANGES.
 :: But you MUST check them all.  The ones below are either for examples or stubs.


remove echo off from tests

remove echo off from tests

--- scripts/test.bat
+++ scripts/test.bat
@@ -1,4 +1,3 @@
-@echo off
 setlocal

 set ATOM_SHELL_INTERNAL_RUN_AS_NODE=1