Remove windows env commands

Remove windows env commands

--- ci/run_with_env.cmd
+++ ci/run_with_env.cmd
@@ -1,88 +0,0 @@
-:: To build extensions for 64 bit Python 3, we need to configure environment
-:: variables to use the MSVC 2010 C++ compilers from GRMSDKX_EN_DVD.iso of:
-:: MS Windows SDK for Windows 7 and .NET Framework 4 (SDK v7.1)
-::
-:: To build extensions for 64 bit Python 2, we need to configure environment
-:: variables to use the MSVC 2008 C++ compilers from GRMSDKX_EN_DVD.iso of:
-:: MS Windows SDK for Windows 7 and .NET Framework 3.5 (SDK v7.0)
-::
-:: 32 bit builds, and 64-bit builds for 3.5 and beyond, do not require specific
-:: environment configurations.
-::
-:: Note: this script needs to be run with the /E:ON and /V:ON flags for the
-:: cmd interpreter, at least for (SDK v7.0)
-::
-:: More details at:
-:: https://github.com/cython/cython/wiki/64BitCythonExtensionsOnWindows
-:: http://stackoverflow.com/a/13751649/163740
-::
-:: Author: Olivier Grisel
-:: License: CC0 1.0 Universal: http://creativecommons.org/publicdomain/zero/1.0/
-::
-:: Notes about batch files for Python people:
-::
-:: Quotes in values are literally part of the values:
-::      SET FOO="bar"
-:: FOO is now five characters long: " b a r "
-:: If you don't want quotes, don't include them on the right-hand side.
-::
-:: The CALL lines at the end of this file look redundant, but if you move them
-:: outside of the IF clauses, they do not run properly in the SET_SDK_64==Y
-:: case, I don't know why.
-@ECHO OFF
-
-SET COMMAND_TO_RUN=%*
-SET WIN_SDK_ROOT=C:\Program Files\Microsoft SDKs\Windows
-SET WIN_WDK=c:\Program Files (x86)\Windows Kits\10\Include\wdf
-
-:: Extract the major and minor versions, and allow for the minor version to be
-:: more than 9.  This requires the version number to have two dots in it.
-SET MAJOR_PYTHON_VERSION=%PYTHON_VERSION:~0,1%
-IF "%PYTHON_VERSION:~3,1%" == "." (
-    SET MINOR_PYTHON_VERSION=%PYTHON_VERSION:~2,1%
-) ELSE (
-    SET MINOR_PYTHON_VERSION=%PYTHON_VERSION:~2,2%
-)
-
-:: Based on the Python version, determine what SDK version to use, and whether
-:: to set the SDK for 64-bit.
-IF %MAJOR_PYTHON_VERSION% == 2 (
-    SET WINDOWS_SDK_VERSION="v7.0"
-    SET SET_SDK_64=Y
-) ELSE (
-    IF %MAJOR_PYTHON_VERSION% == 3 (
-        SET WINDOWS_SDK_VERSION="v7.1"
-        IF %MINOR_PYTHON_VERSION% LEQ 4 (
-            SET SET_SDK_64=Y
-        ) ELSE (
-            SET SET_SDK_64=N
-            IF EXIST "%WIN_WDK%" (
-                :: See: https://connect.microsoft.com/VisualStudio/feedback/details/1610302/
-                REN "%WIN_WDK%" 0wdf
-            )
-        )
-    ) ELSE (
-        ECHO Unsupported Python version: "%MAJOR_PYTHON_VERSION%"
-        EXIT 1
-    )
-)
-
-IF %PYTHON_ARCH% == 64 (
-    IF %SET_SDK_64% == Y (
-        ECHO Configuring Windows SDK %WINDOWS_SDK_VERSION% for Python %MAJOR_PYTHON_VERSION% on a 64 bit architecture
-        SET DISTUTILS_USE_SDK=1
-        SET MSSdk=1
-        "%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Setup\WindowsSdkVer.exe" -q -version:%WINDOWS_SDK_VERSION%
-        "%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Bin\SetEnv.cmd" /x64 /release
-        ECHO Executing: %COMMAND_TO_RUN%
-        call %COMMAND_TO_RUN% || EXIT 1
-    ) ELSE (
-        ECHO Using default MSVC build environment for 64 bit architecture
-        ECHO Executing: %COMMAND_TO_RUN%
-        call %COMMAND_TO_RUN% || EXIT 1
-    )
-) ELSE (
-    ECHO Using default MSVC build environment for 32 bit architecture
-    ECHO Executing: %COMMAND_TO_RUN%
-    call %COMMAND_TO_RUN% || EXIT 1
-)


Fixes android build.xml files when generated from newproject.bat on Windows.

--- newproject.bat
+++ newproject.bat
@@ -152,7 +152,6 @@
 REM Generate relative path from project folder to GamePlay folder
 set gpPath=%cd%
 call:makerelative gpPath "%projPath%\"
-call:replacevar gpPath "\" "\"

 mkdir "%projPath%"
 mkdir "%projPath%\src"
@@ -169,6 +168,8 @@

 copy template\template.vcxproj.user "%projPath%\%projName%.vcxproj.user"
 call:replace "%projPath%\%projName%.vcxproj.user" GAMEPLAY_PATH "%gpPath%"
+
+call:replacevar gpPath "\" "/"

 REM Copy Apple XCode project files
 mkdir "%projPath%\%projName%.xcodeproj"


Fix hard space

Fix hard space

--- node/build.bat
+++ node/build.bat
@@ -1,4 +1,4 @@
 docker build -t node 4.2 || exit /b
-docker tag -f node:latest node:4.2.1 || exit /b
+docker tag -f node:latest node:4.2.1 || exit /b

 docker build -t node:onbuild 4.2/onbuild


fix nuget_push.cmd

fix nuget_push.cmd

--- nuget_push.cmd
+++ nuget_push.cmd
@@ -1,5 +1,8 @@
 set /p ver=<VERSION
 set sourceUrl=-s https://www.nuget.org/api/v2/package

-
+dotnet nuget push artifacts/Es.Logging.%ver%.nupkg %sourceUrl%
+dotnet nuget push artifacts/Es.Logging.Console.%ver%.nupkg %sourceUrl%
+dotnet nuget push artifacts/Es.Logging.NLog.%ver%.nupkg %sourceUrl%
+dotnet nuget push artifacts/Es.Logging.Log4.%ver%.nupkg %sourceUrl%
 dotnet nuget push artifacts/Es.Microsoft.Log.%ver%.nupkg %sourceUrl%


Fix Windows script

Fix Windows script

--- src/universal/bin/sbt.bat
+++ src/universal/bin/sbt.bat
@@ -127,7 +127,7 @@

 :copyrt
 if /I "%JAVA_VERSION%" GEQ "9" (
-  set rtexport=%SBT_HOME%java9-rt-export.jar
+  set rtexport="%SBT_HOME%java9-rt-export.jar"

   "%_JAVACMD%" %_JAVA_OPTS% %SBT_OPTS% -jar "%rtexport%" --rt-ext-dir > "%TEMP%.\rtext.txt"
   set /p java9_ext= < "%TEMP%.\rtext.txt"


tirando o cache

tirando o cache

--- app-admin/assets/sass.bat
+++ app-admin/assets/sass.bat
@@ -3,4 +3,4 @@

 cd /wamp/www/app/app-admin/assets

-sass --watch scss/app.scss:css/app.css --style compressed
+sass --watch scss/app.scss:css/app.css --style compressed --no-cache


Work on the bootstrap.bat file

Work on the bootstrap.bat file

--- templates/bootstrap.bat
+++ templates/bootstrap.bat
@@ -1,51 +1,75 @@
 @echo off

-echo Current environment variables
-SET
+REM echo --- Environment Variables
+REM SET

-echo Current directory
-chdir
+echo --- Creating Build Environment

-REM You can remove this conditional once you've added a repository
-IF "%BUILDBOX_REPO%" == "" (
-  echo Congratulations! You just ran a build! Now it's time to fill out this build script and customize your project
-  exit /b 0
+REM Returns the location of this file
+
+SET BUILDBOX_DIR=%~dp0
+
+REM Add the BUILDBOX_DIR to the PATH
+
+SET PATH=%PATH%;%BUILDBOX_DIR%
+
+REM Create the build directory
+
+SET SANITIED_PROJECT_SLUG=%BUILDBOX_PROJECT_SLUG:/=\%
+SET BUILDBOX_BUILD_DIR=%BUILDBOX_DIR%%BUILDBOX_AGENT_NAME%\%SANITIED_PROJECT_SLUG%
+
+IF NOT EXIST %BUILDBOX_BUILD_DIR% (
+  REM Create the build directory
+
+  ECHO ^> MKDIR %BUILDBOX_BUILD_DIR%
+  MKDIR %BUILDBOX_BUILD_DIR%
+  IF %ERRORLEVEL% NEQ 0 EXIT %ERRORLEVEL%
 )

-REM Here are some basic setup instructions for checking out a git repository.
-REM You have to manage checking out and updating the repo yourself.
+REM Move to the build directory
+
+ECHO ^> CD %BUILDBOX_BUILD_DIR%
+CD %BUILDBOX_BUILD_DIR%
+IF %ERRORLEVEL% NEQ 0 EXIT %ERRORLEVEL%
+
+REM Do we need to do a git checkout?

 IF NOT EXIST ".git" (
-  echo Cloning %BUILDBOX_REPO%
-  call git clone "%BUILDBOX_REPO%" .
-  if %errorlevel% neq 0 exit /b %errorlevel%
+  ECHO ^> git clone %BUILDBOX_REPO%
+  CALL git clone "%BUILDBOX_REPO%" . -v
+  ECHO It was this: %ERRORLEVEL%
+  IF %ERRORLEVEL% NEQ 0 EXIT %ERRORLEVEL%
 )

-echo Cleaning the repo
-call git clean -fd
-if %errorlevel% neq 0 exit /b %errorlevel%
+REM Clean the repo

-echo Fetching latest commits from origin
-call git fetch
-if %errorlevel% neq 0 exit /b %errorlevel%
+ECHO ^> git clean -fdq
+CALL git clean -fdq
+IF %ERRORLEVEL% NEQ 0 EXIT %ERRORLEVEL%

-echo Checking out %BUILDBOX_COMMIT%
-call git checkout -f "%BUILDBOX_COMMIT%"
-if %errorlevel% neq 0 exit /b %errorlevel%
+REM Fetch the latest code

-REM Here is an example on how to run tests for a Ruby on Rails project with rspec.
-REM You can change these commands to be what ever you like.
+ECHO ^> git fetch -q
+CALL git fetch -q
+IF %ERRORLEVEL% NEQ 0 EXIT %ERRORLEVEL%

-echo Bundling
-call bundle install
-if %errorlevel% neq 0 exit /b %errorlevel%
+REM Only reset to the branch if we're not on a tag

-REM bundle exec rake db:schema:load
-echo Running specs
-call bundle exec rspec
-if %errorlevel% neq 0 exit /b %errorlevel%
+IF "%BUILDBOX_TAG%" == "" (
+  ECHO ^> git reset --hard origin/%BUILDBOX_BRANCH%
+  CALL git reset --hard origin/%BUILDBOX_BRANCH%
+  IF %ERRORLEVEL% NEQ 0 EXIT %ERRORLEVEL%
+)

-REM Want to do something paticular for a specific branch? You can do that!
-IF "%BUILDBOX_BRANCH%" == "master" (
-  REM Do something special if the current branch is 'master'
+ECHO ^> git checkout -qf "%BUILDBOX_COMMIT%"
+CALL git checkout -qf "%BUILDBOX_COMMIT%"
+IF %ERRORLEVEL% NEQ 0 EXIT %ERRORLEVEL%
+
+echo --- Running %BUILDBOX_SCRIPT_PATH%
+
+IF "%BUILDBOX_SCRIPT_PATH%" == "" (
+  echo ERROR: No script path has been set for this project. Please go to \"Project Settings\" and add the path to your build script
+  exit 1
+) ELSE (
+  CALL %BUILDBOX_SCRIPT_PATH%
 )


Ongoing Windows support, switched the default main class of the launcher.

--- src/main/resources/antw.bat
+++ src/main/resources/antw.bat
@@ -128,14 +128,14 @@
 :runAnt
 if "%_USE_CLASSPATH%"=="no" goto runAntNoClasspath
 :runAntWithClasspath
-"%_JAVACMD%" %ANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%ANT_HOME%" org.apache.tools.ant.launch.Launcher %ANT_ARGS% -cp "%CLASSPATH%" %ANT_CMD_LINE_ARGS%
+"%_JAVACMD%" %ANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%ANT_HOME%" com.rimerosolutions.buildtools.ant.wrapper.AntWrapperMain  %ANT_ARGS% %ANT_CMD_LINE_ARGS%
 rem Check the error code of the Ant build
 if not "%OS%"=="Windows_NT" goto onError
 set ANT_ERROR=%ERRORLEVEL%
 goto end

 :runAntNoClasspath
-"%_JAVACMD%" %ANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%ANT_HOME%" org.apache.tools.ant.launch.Launcher %ANT_ARGS% %ANT_CMD_LINE_ARGS%
+"%_JAVACMD%" %ANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%ANT_HOME%" com.rimerosolutions.buildtools.ant.wrapper.AntWrapperMain  %ANT_ARGS% %ANT_CMD_LINE_ARGS%
 rem Check the error code of the Ant build
 if not "%OS%"=="Windows_NT" goto onError
 set ANT_ERROR=%ERRORLEVEL%


Add windows configure script

Add windows configure script

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

--- script/configure.cmd
+++ script/configure.cmd
@@ -0,0 +1,3 @@
+git submodule update --init --recursive
+.\externals\gyp\gyp project.gyp --depth .
+.\externals\gyp\gyp tests.gyp --depth .


Typo in run_ibis.bat

Typo in run_ibis.bat

git-svn-id: f22e84ca493ccad7df8d2727bca69d1c9fc2e5c5@1121 aaf88347-d911-0410-b711-e54d386773bb

--- scripts/run_ibis.bat
+++ scripts/run_ibis.bat
@@ -3,7 +3,7 @@

 @echo off

-if "%OS%=="Windows_NT" @beginlocal
+if "%OS%"=="Windows_NT" @beginlocal

 set JAVACLASSPATH=%CLASSPATH%;%IBIS_ROOT%\classlibs;%IBIS_ROOT%\build;build;.;

@@ -81,4 +81,4 @@

 %JAVA_ROOT%\bin\java -Xmx400M %Dlibpath% %Dibislibs% %Dpool_host_num% %Dprops%  %Dpool_total% %Dns_pool% %Dns_port% %Dns_server% -Dibis.pool.host_names="%HOSTS%" -Xbootclasspath/p:%JAVACLASSPATH% %PROFILING% -classpath %JAVACLASSPATH% %IBIS_APP_ARGS%

-if "%OS%=="Windows_NT" @endlocal
+if "%OS%"=="Windows_NT" @endlocal


work without M2_HOME - base on location of batch file

git-svn-id: 2c527eb49caa05e19d6b2be874bf74fa9d7ea670@163157 13f79535-47bb-0310-9956-ffa450edef68

--- maven-core/src/bin/m2.bat
+++ maven-core/src/bin/m2.bat
@@ -20,9 +20,9 @@
 @REM
 @REM Required ENV vars:
 @REM JAVA_HOME - location of a JDK home dir
-@REM M2_HOME - location of maven2's installed home dir
 @REM
 @REM Optional ENV vars
+@REM M2_HOME - location of maven2's installed home dir
 @REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
 @REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending
 @REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
@@ -65,6 +65,9 @@
 goto end

 :chkMHome
+if not "%M2_HOME%"=="" goto valMHome
+
+if "%OS%"=="Windows_NT" SET M2_HOME=%~dp0\..
 if not "%M2_HOME%"=="" goto valMHome

 echo.


build: add a workaround for CMake 3.20

build: add a workaround for CMake 3.20

CMake 3.20 had a bug on the release where the user supplied paths would
be processed without conversion.  This adds a workaround by using
`cygpath` to convert the path to a mixed model style which should avoid
the problem.

--- utils/build-windows.bat
+++ utils/build-windows.bat
@@ -1,376 +1,379 @@
-:: build-windows.bat
-::
-:: This source file is part of the Swift.org open source project
-::
-:: Copyright (c) 2014 - 2019 Apple Inc. and the Swift project authors
-:: Licensed under Apache License v2.0 with Runtime Library Exception
-::
-:: See https://swift.org/LICENSE.txt for license information
-:: See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-
-:: REQUIRED ENVIRONMENT VARIABLES
-:: This script requires to be executed inside one Visual Studio command line,
-:: in order for many of the tools and environment variables to be available.
-:: Additionally, it needs the following variables:
-:: - CMAKE_BUILD_TYPE: Kind of build: Release, RelWithDebInfo, Debug.
-:: - PYTHON_HOME: The Python installation directory.
-:: - REPO_SCHEME: Optional. The scheme name to checkout.
-
-:: REQUIRED PERMISSIONS
-:: Practically, it is easier to be in the Adminstrators group to run the
-:: script, but it should be possible to execute as a normal user.
-:: The user will need permission to write files into the Windows SDK and the
-:: VisualC++ folder.
-
-:: @echo off
-
-setlocal enableextensions enabledelayedexpansion
-
-PATH=%PATH%;%PYTHON_HOME%
-
-set icu_version_major=64
-set icu_version_minor=2
-set icu_version=%icu_version_major%_%icu_version_minor%
-set icu_version_dashed=%icu_version_major%-%icu_version_minor%
-
-set "exitOnError=|| (exit /b)"
-set current_directory=%~dp0
-set current_directory=%current_directory:~0,-1%
-set source_root=%current_directory%\..\..
-
-:: Resetting source_root with %CD% removes the ..\.. from the paths, and makes
-:: the output easier to read.
-cd %source_root%
-set source_root=%CD%
-
-set full_build_root=%source_root%\build
-mkdir %full_build_root%
-
-:: Use the shortest path we can for the build directory, to avoid Windows
-:: path problems as much as we can.
-subst T: /d
-subst T: %full_build_root% %exitOnError%
-set build_root=T:
-set install_directory=%build_root%\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain\usr
-
-md %build_root%\tmp
-set TMPDIR=%build_root%\tmp
-set TMP=%build_root%\tmp
-set TEMP=%build_root%\tmp
-
-md %build_root%\tmp\org.llvm.clang.9999
-set CUSTOM_CLANG_MODULE_CACHE=%build_root%\tmp\org.llvm.clang.9999
-
-md %build_root%\tmp\org.swift.package-manager
-set SWIFTPM_MODULECACHE_OVERRIDE=%build_root%\tmp\org.swift.package-manager
-
-call :clone_repositories %exitOnError%
-call :download_icu %exitOnError%
-:: TODO: Disabled until we need LLBuild/SwiftPM in this build script.
-:: call :download_sqlite3
-
-call :build_llvm %exitOnError%
-path %PATH%;%install_directory%\bin
-
-call :build_cmark %exitOnError%
-
-call :prepare_platform_modules %exitOnError%
-call :build_swift %exitOnError%
-
-call :build_lldb %exitOnError%
-
-call :build_libdispatch %exitOnError%
-
-path %source_root%\icu-%icu_version%\bin64;%install_directory%\bin;%build_root%\swift\bin;%build_root%\swift\libdispatch-prefix\bin;%PATH%;C:\Program Files\Git\usr\bin
-call :test_swift %exitOnError%
-call :test_libdispatch %exitOnError%
-
-goto :end
-endlocal
-
-:clone_repositories
-:: Clones the repositories used by the Windows build.
-:: It supposes that the swift repository is already cloned by CI.
-:: It supposes the %CD% is the source root.
-setlocal enableextensions enabledelayedexpansion
-
-if defined REPO_SCHEME SET "scheme_arg=--scheme %REPO_SCHEME%"
-
-git -C "%source_root%\swift" config --local core.autocrlf input
-git -C "%source_root%\swift" config --local core.symlink true
-git -C "%source_root%\swift" checkout-index --force --all
-
-:: Always skip Swift, since it is checked out by Jenkins
-@set "skip_repositories_arg=--skip-repository swift"
-@set "skip_repositories_arg=%skip_repositories_arg% --skip-repository llbuild"
-@set "skip_repositories_arg=%skip_repositories_arg% --skip-repository indexstore-db"
-@set "skip_repositories_arg=%skip_repositories_arg% --skip-repository ninja"
-@set "skip_repositories_arg=%skip_repositories_arg% --skip-repository sourcekit-lsp"
-@set "skip_repositories_arg=%skip_repositories_arg% --skip-repository swift-argument-parser"
-@set "skip_repositories_arg=%skip_repositories_arg% --skip-repository swift-corelibs-foundation"
-@set "skip_repositories_arg=%skip_repositories_arg% --skip-repository swift-corelibs-xctest"
-@set "skip_repositories_arg=%skip_repositories_arg% --skip-repository swift-driver"
-@set "skip_repositories_arg=%skip_repositories_arg% --skip-repository swift-format"
-@set "skip_repositories_arg=%skip_repositories_arg% --skip-repository swift-integration-tests"
-@set "skip_repositories_arg=%skip_repositories_arg% --skip-repository swiftpm"
-@set "skip_repositories_arg=%skip_repositories_arg% --skip-repository swift-stress-tester"
-@set "skip_repositories_arg=%skip_repositories_arg% --skip-repository swift-syntax"
-@set "skip_repositories_arg=%skip_repositories_arg% --skip-repository swift-tools-support-core"
-@set "skip_repositories_arg=%skip_repositories_arg% --skip-repository swift-xcode-playground-support"
-@set "skip_repositories_arg=%skip_repositories_arg% --skip-repository tensorflow-swift-apis"
-@set "skip_repositories_arg=%skip_repositories_arg% --skip-repository yams"
-
-call "%source_root%\swift\utils\update-checkout.cmd" %scheme_arg% %skip_repositories_arg% --clone --skip-history --skip-tags --github-comment "%ghprbCommentBody%" >NUL 2>NUL
-
-goto :eof
-endlocal
-
-
-:download_icu
-:: Downloads ICU, which will be used as a dependency for the Swift Standard
-:: Library and Foundation.
-setlocal enableextensions enabledelayedexpansion
-
-set file_name=icu4c-%icu_version%-Win64-MSVC2017.zip
-curl -L -O "https://github.com/unicode-org/icu/releases/download/release-%icu_version_dashed%/%file_name%" %exitOnError%
-:: unzip warns about the paths in the zip using slashes, which raises the
-:: errorLevel to 1. We cannot use exitOnError, and have to ignore errors.
-"C:\Program Files\Git\usr\bin\unzip.exe" -o %file_name% -d "%source_root%\icu-%icu_version%"
-exit /b 0
-
-goto :eof
-endlocal
-
-
-:download_sqlite3
-:: Downloads SQLite3, which will be used as a dependency for llbuild and
-:: Swift Package Manager.
-setlocal enableextensions enabledelayedexpansion
-
-set file_name=sqlite-amalgamation-3270200.zip
-curl -L -O "https://www.sqlite.org/2019/%file_name%" %exitOnError%
-"C:\Program Files\Git\usr\bin\unzip.exe" -o %file_name% %exitOnError%
-
-goto :eof
-endlocal
-
-
-:prepare_platform_modules
-:: Create files into the right places of the Windows SDK to the files in the
-:: swift repository, in order to consider the headers of the Windows SDK a
-:: module to compile Swift code against them.
-setlocal enableextensions enabledelayedexpansion
-
-copy /y "%source_root%\swift\stdlib\public\Platform\ucrt.modulemap" "%UniversalCRTSdkDir%\Include\%UCRTVersion%\ucrt\module.modulemap" %exitOnError%
-copy /y "%source_root%\swift\stdlib\public\Platform\winsdk.modulemap" "%UniversalCRTSdkDir%\Include\%UCRTVersion%\um\module.modulemap" %exitOnError%
-copy /y "%source_root%\swift\stdlib\public\Platform\visualc.modulemap" "%VCToolsInstallDir%\include\module.modulemap" %exitOnError%
-copy /y "%source_root%\swift\stdlib\public\Platform\visualc.apinotes" "%VCToolsInstallDir%\include\visualc.apinotes" %exitOnError%
-
-goto :eof
-endlocal
-
-
-:build_llvm
-:: Configures, builds, and installs LLVM
-setlocal enableextensions enabledelayedexpansion
-
-cmake^
-    -B "%build_root%\llvm"^
-    -G Ninja^
-    -DCMAKE_BUILD_TYPE=%CMAKE_BUILD_TYPE%^
-    -DCMAKE_C_COMPILER=cl^
-    -DCMAKE_CXX_COMPILER=cl^
-    -DCMAKE_MT=mt^
-    -DCMAKE_INSTALL_PREFIX:PATH=%install_directory%^
-    -DLLVM_DEFAULT_TARGET_TRIPLE=x86_64-unknown-windows-msvc^
-    -DLLVM_ENABLE_PDB:BOOL=YES^
-    -DLLVM_ENABLE_ASSERTIONS:BOOL=YES^
-    -DLLVM_ENABLE_PROJECTS:STRING=lld;clang^
-    -DLLVM_TARGETS_TO_BUILD:STRING="AArch64;ARM;X86"^
-    -DLLVM_INCLUDE_BENCHMARKS:BOOL=NO^
-    -DLLVM_INCLUDE_DOCS:BOOL=NO^
-    -DLLVM_INCLUDE_EXAMPLES:BOOL=NO^
-    -DLLVM_INCLUDE_GO_TESTS:BOOL=NO^
-    -DLLVM_TOOL_GOLD_BUILD:BOOL=NO^
-    -DLLVM_ENABLE_OCAMLDOC:BOOL=NO^
-    -DLLVM_ENABLE_LIBXML2:BOOL=NO^
-    -DLLVM_ENABLE_ZLIB:BOOL=NO^
-    -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON^
-    -DENABLE_X86_RELAX_RELOCATIONS:BOOL=YES^
-    -DLLVM_INSTALL_BINUTILS_SYMLINKS:BOOL=YES^
-    -DLLVM_INSTALL_TOOLCHAIN_ONLY:BOOL=YES^
-    -DLLVM_TOOLCHAIN_TOOLS:STRING="addr2line;ar;c++filt;dsymutil;dwp;llvm-ar;llvm-cov;llvm-cvtres;llvm-cxxfilt;llvm-dlltool;llvm-dwp;llvm-ranlib;llvm-lib;llvm-mt;llvm-nm;llvm-objdump;llvm-pdbutil;llvm-profdata;llvm-rc;llvm-readelf;llvm-readobj;llvm-size;llvm-strip;llvm-symbolizer;llvm-undname;nm;objcopy;objdump;ranlib;readelf;size;strings"^
-    -DCLANG_TOOLS="clang;clang-format;clang-headers;clang-tidy"^
-    -DCMAKE_CXX_FLAGS:STRING="/GS- /Oy"^
-    -DCMAKE_EXE_LINKER_FLAGS:STRING=/INCREMENTAL:NO^
-    -DCMAKE_SHARED_LINKER_FLAGS:STRING=/INCREMENTAL:NO^
-    -S "%source_root%\llvm-project\llvm" %exitOnError%
-
-cmake --build "%build_root%\llvm" %exitOnError%
-cmake --build "%build_root%\llvm" --target install %exitOnError%
-
-goto :eof
-endlocal
-
-
-:build_cmark
-:: Configures and builds CMark
-setlocal enableextensions enabledelayedexpansion
-
-cmake^
-    -B "%build_root%\cmark"^
-    -G Ninja^
-    -DCMAKE_BUILD_TYPE=%CMAKE_BUILD_TYPE%^
-    -DCMAKE_C_COMPILER=cl^
-    -DCMAKE_CXX_COMPILER=cl^
-    -DCMAKE_MT=mt^
-    -DCMAKE_CXX_FLAGS:STRING="/GS- /Oy"^
-    -DCMAKE_EXE_LINKER_FLAGS:STRING=/INCREMENTAL:NO^
-    -DCMAKE_SHARED_LINKER_FLAGS:STRING=/INCREMENTAL:NO^
-    -S "%source_root%\cmark" %exitOnError%
-
-cmake --build "%build_root%\cmark" %exitOnError%
-
-goto :eof
-endlocal
-
-
-:build_swift
-:: Configures, builds, and installs Swift and the Swift Standard Library
-setlocal enableextensions enabledelayedexpansion
-
-:: SWIFT_PARALLEL_LINK_JOBS=8 allows the build machine to use as many CPU as
-:: possible, while not exhausting the RAM.
-cmake^
-    -B "%build_root%\swift"^
-    -G Ninja^
-    -DCMAKE_BUILD_TYPE=%CMAKE_BUILD_TYPE%^
-    -DCMAKE_C_COMPILER=cl^
-    -DCMAKE_CXX_COMPILER=cl^
-    -DCMAKE_MT=mt^
-    -DCMAKE_INSTALL_PREFIX:PATH=%install_directory%^
-    -DClang_DIR:PATH=%build_root%\llvm\lib\cmake\clang^
-    -DSWIFT_PATH_TO_CMARK_BUILD:PATH=%build_root%\cmark^
-    -DSWIFT_PATH_TO_CMARK_SOURCE:PATH=%source_root%\cmark^
-    -DSWIFT_PATH_TO_LIBDISPATCH_SOURCE:PATH=%source_root%\swift-corelibs-libdispatch^
-    -DLLVM_DIR:PATH=%build_root%\llvm\lib\cmake\llvm^
-    -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON^
-    -DSWIFT_INCLUDE_DOCS:BOOL=NO^
-    -DSWIFT_WINDOWS_x86_64_ICU_UC_INCLUDE:PATH=%source_root%\icu-%icu_version%\include\unicode^
-    -DSWIFT_WINDOWS_x86_64_ICU_UC:PATH=%source_root%\icu-%icu_version%\lib64\icuuc.lib^
-    -DSWIFT_WINDOWS_x86_64_ICU_I18N_INCLUDE:PATH=%source_root%\icu-%icu_version%\include^
-    -DSWIFT_WINDOWS_x86_64_ICU_I18N:PATH=%source_root%\icu-%icu_version%\lib64\icuin.lib^
-    -DSWIFT_BUILD_DYNAMIC_STDLIB:BOOL=YES^
-    -DSWIFT_BUILD_DYNAMIC_SDK_OVERLAY:BOOL=YES^
-    -DSWIFT_BUILD_STATIC_STDLIB:BOOL=NO^
-    -DSWIFT_BUILD_STATIC_SDK_OVERLAY:BOOL=NO^
-    -DLLVM_INSTALL_TOOLCHAIN_ONLY:BOOL=YES^
-    -DSWIFT_BUILD_SOURCEKIT:BOOL=YES^
-    -DSWIFT_ENABLE_SOURCEKIT_TESTS:BOOL=YES^
-    -DSWIFT_ENABLE_EXPERIMENTAL_CONCURRENCY=YES^
-    -DSWIFT_ENABLE_EXPERIMENTAL_DISTRIBUTED=YES^
-    -DSWIFT_ENABLE_EXPERIMENTAL_DIFFERENTIABLE_PROGRAMMING=YES^
-    -DSWIFT_INSTALL_COMPONENTS="autolink-driver;compiler;clang-resource-dir-symlink;stdlib;sdk-overlay;editor-integration;tools;sourcekit-inproc;swift-remote-mirror;swift-remote-mirror-headers"^
-    -DSWIFT_PARALLEL_LINK_JOBS=8^
-    -DPYTHON_EXECUTABLE:PATH=%PYTHON_HOME%\python.exe^
-    -DCMAKE_CXX_FLAGS:STRING="/GS- /Oy"^
-    -DCMAKE_EXE_LINKER_FLAGS:STRING=/INCREMENTAL:NO^
-    -DCMAKE_SHARED_LINKER_FLAGS:STRING=/INCREMENTAL:NO^
-    -DSWIFT_LIT_ARGS="--time-tests"^
-    -S "%source_root%\swift" %exitOnError%
-
-cmake --build "%build_root%\swift" %exitOnError%
-cmake --build "%build_root%\swift" --target install %exitOnError%
-
-goto :eof
-endlocal
-
-
-:test_swift
-:: Tests the Swift compiler and the Swift Standard Library
-setlocal enableextensions enabledelayedexpansion
-
-cmake --build "%build_root%\swift" --target check-swift %exitOnError%
-
-goto :eof
-endlocal
-
-
-:build_lldb
-:: Configures, builds, and installs LLDB
-setlocal enableextensions enabledelayedexpansion
-
-cmake^
-    -B "%build_root%\lldb"^
-    -G Ninja^
-    -DCMAKE_BUILD_TYPE=%CMAKE_BUILD_TYPE%^
-    -DCMAKE_C_COMPILER=cl^
-    -DCMAKE_CXX_COMPILER=cl^
-    -DCMAKE_MT=mt^
-    -DCMAKE_INSTALL_PREFIX:PATH=%install_directory%^
-    -DLLVM_DIR:PATH=%build_root%\llvm\lib\cmake\llvm^
-    -DClang_DIR:PATH=%build_root%\llvm\lib\cmake\clang^
-    -DSwift_DIR:PATH=%build_root%\swift\lib\cmake\swift^
-    -DLLVM_ENABLE_ASSERTIONS:BOOL=YES^
-    -DLLDB_USE_STATIC_BINDINGS:BOOL=YES^
-    -DPYTHON_HOME:PATH=%PYTHON_HOME%^
-    -DCMAKE_CXX_FLAGS:STRING="/GS- /Oy"^
-    -DCMAKE_EXE_LINKER_FLAGS:STRING=/INCREMENTAL:NO^
-    -DCMAKE_SHARED_LINKER_FLAGS:STRING=/INCREMENTAL:NO^
-    -DLLDB_DISABLE_PYTHON=YES^
-    -DLLDB_INCLUDE_TESTS:BOOL=NO^
-    -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON^
-    -S "%source_root%\llvm-project\lldb" %exitOnError%
-
-cmake --build "%build_root%\lldb" %exitOnError%
-cmake --build "%build_root%\lldb" --target install %exitOnError%
-
-goto :eof
-endlocal
-
-
-:build_libdispatch
-:: Configures, builds, and installs Dispatch
-setlocal enableextensions enabledelayedexpansion
-
-cmake^
-    -B "%build_root%\swift-corelibs-libdispatch"^
-    -G Ninja^
-    -DCMAKE_BUILD_TYPE=%CMAKE_BUILD_TYPE%^
-    -DCMAKE_C_COMPILER=clang-cl^
-    -DCMAKE_CXX_COMPILER=clang-cl^
-    -DCMAKE_MT=mt^
-    -DCMAKE_Swift_COMPILER=swiftc^
-    -DSwift_DIR:PATH=%build_root%\swift\lib\cmake\swift^
-    -DCMAKE_INSTALL_PREFIX:PATH=%install_directory%^
-    -DCMAKE_C_COMPILER_TARGET=x86_64-unknown-windows-msvc^
-    -DCMAKE_CXX_COMPILER_TARGET=x86_64-unknown-windows-msvc^
-    -DENABLE_SWIFT:BOOL=YES^
-    -DENABLE_TESTING:BOOL=YES^
-    -DCMAKE_C_FLAGS:STRING="${CMAKE_C_FLAGS} --target=x86_64-unknown-windows-msvc /GS- /Oy /Gw /Gy"^
-    -DCMAKE_CXX_FLAGS:STRING="${CMAKE_CXX_FLAGS} --target=x86_64-unknown-windows-msvc /GS- /Oy /Gw /Gy"^
-    -DCMAKE_EXE_LINKER_FLAGS:STRING="/INCREMENTAL:NO"^
-    -DCMAKE_SHARED_LINKER_FLAGS:STRING="/INCREMENTAL:NO"^
-    -DCMAKE_Swift_COMPILER_TARGET:STRING=x86_64-unknown-windows-msvc^
-    -DCMAKE_Swift_FLAGS:STRING="-resource-dir \"%install_directory%\lib\swift\""^
-    -DCMAKE_Swift_LINK_FLAGS:STRING="-resource-dir \"%install_directory%\lib\swift\""^
-    -S "%source_root%\swift-corelibs-libdispatch" %exitOnError%
-
-cmake --build "%build_root%\swift-corelibs-libdispatch" %exitOnError%
-cmake --build "%build_root%\swift-corelibs-libdispatch" --target install %exitOnError%
-
-goto :eof
-endlocal
-
-
-:test_libdispatch
-:: Tests libdispatch C interface
-setlocal enableextensions enabledelayedexpansion
-
-cmake --build "%build_root%\swift-corelibs-libdispatch" --target ExperimentalTest %exitOnError%
-
-goto :eof
-endlocal
-
-
-:end
+:: build-windows.bat
+::
+:: This source file is part of the Swift.org open source project
+::
+:: Copyright (c) 2014 - 2019 Apple Inc. and the Swift project authors
+:: Licensed under Apache License v2.0 with Runtime Library Exception
+::
+:: See https://swift.org/LICENSE.txt for license information
+:: See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+
+:: REQUIRED ENVIRONMENT VARIABLES
+:: This script requires to be executed inside one Visual Studio command line,
+:: in order for many of the tools and environment variables to be available.
+:: Additionally, it needs the following variables:
+:: - CMAKE_BUILD_TYPE: Kind of build: Release, RelWithDebInfo, Debug.
+:: - PYTHON_HOME: The Python installation directory.
+:: - REPO_SCHEME: Optional. The scheme name to checkout.
+
+:: REQUIRED PERMISSIONS
+:: Practically, it is easier to be in the Adminstrators group to run the
+:: script, but it should be possible to execute as a normal user.
+:: The user will need permission to write files into the Windows SDK and the
+:: VisualC++ folder.
+
+:: @echo off
+
+setlocal enableextensions enabledelayedexpansion
+
+PATH=%PATH%;%PYTHON_HOME%
+
+set icu_version_major=64
+set icu_version_minor=2
+set icu_version=%icu_version_major%_%icu_version_minor%
+set icu_version_dashed=%icu_version_major%-%icu_version_minor%
+
+set "exitOnError=|| (exit /b)"
+set current_directory=%~dp0
+set current_directory=%current_directory:~0,-1%
+set source_root=%current_directory%\..\..
+
+:: Resetting source_root with %CD% removes the ..\.. from the paths, and makes
+:: the output easier to read.
+cd %source_root%
+set source_root=%CD%
+
+set full_build_root=%source_root%\build
+mkdir %full_build_root%
+
+:: Use the shortest path we can for the build directory, to avoid Windows
+:: path problems as much as we can.
+subst T: /d
+subst T: %full_build_root% %exitOnError%
+set build_root=T:
+set install_directory=%build_root%\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain\usr
+
+md %build_root%\tmp
+set TMPDIR=%build_root%\tmp
+set TMP=%build_root%\tmp
+set TEMP=%build_root%\tmp
+
+md %build_root%\tmp\org.llvm.clang.9999
+set CUSTOM_CLANG_MODULE_CACHE=%build_root%\tmp\org.llvm.clang.9999
+
+md %build_root%\tmp\org.swift.package-manager
+set SWIFTPM_MODULECACHE_OVERRIDE=%build_root%\tmp\org.swift.package-manager
+
+call :clone_repositories %exitOnError%
+call :download_icu %exitOnError%
+:: TODO: Disabled until we need LLBuild/SwiftPM in this build script.
+:: call :download_sqlite3
+
+call :build_llvm %exitOnError%
+path %PATH%;%install_directory%\bin
+
+call :build_cmark %exitOnError%
+
+call :prepare_platform_modules %exitOnError%
+call :build_swift %exitOnError%
+
+call :build_lldb %exitOnError%
+
+path %PATH%;C:\Program Files\Git\usr\bin
+call :build_libdispatch %exitOnError%
+
+path %source_root%\icu-%icu_version%\bin64;%install_directory%\bin;%build_root%\swift\bin;%build_root%\swift\libdispatch-prefix\bin;%PATH%
+call :test_swift %exitOnError%
+call :test_libdispatch %exitOnError%
+
+goto :end
+endlocal
+
+:clone_repositories
+:: Clones the repositories used by the Windows build.
+:: It supposes that the swift repository is already cloned by CI.
+:: It supposes the %CD% is the source root.
+setlocal enableextensions enabledelayedexpansion
+
+if defined REPO_SCHEME SET "scheme_arg=--scheme %REPO_SCHEME%"
+
+git -C "%source_root%\swift" config --local core.autocrlf input
+git -C "%source_root%\swift" config --local core.symlink true
+git -C "%source_root%\swift" checkout-index --force --all
+
+:: Always skip Swift, since it is checked out by Jenkins
+@set "skip_repositories_arg=--skip-repository swift"
+@set "skip_repositories_arg=%skip_repositories_arg% --skip-repository llbuild"
+@set "skip_repositories_arg=%skip_repositories_arg% --skip-repository indexstore-db"
+@set "skip_repositories_arg=%skip_repositories_arg% --skip-repository ninja"
+@set "skip_repositories_arg=%skip_repositories_arg% --skip-repository sourcekit-lsp"
+@set "skip_repositories_arg=%skip_repositories_arg% --skip-repository swift-argument-parser"
+@set "skip_repositories_arg=%skip_repositories_arg% --skip-repository swift-corelibs-foundation"
+@set "skip_repositories_arg=%skip_repositories_arg% --skip-repository swift-corelibs-xctest"
+@set "skip_repositories_arg=%skip_repositories_arg% --skip-repository swift-driver"
+@set "skip_repositories_arg=%skip_repositories_arg% --skip-repository swift-format"
+@set "skip_repositories_arg=%skip_repositories_arg% --skip-repository swift-integration-tests"
+@set "skip_repositories_arg=%skip_repositories_arg% --skip-repository swiftpm"
+@set "skip_repositories_arg=%skip_repositories_arg% --skip-repository swift-stress-tester"
+@set "skip_repositories_arg=%skip_repositories_arg% --skip-repository swift-syntax"
+@set "skip_repositories_arg=%skip_repositories_arg% --skip-repository swift-tools-support-core"
+@set "skip_repositories_arg=%skip_repositories_arg% --skip-repository swift-xcode-playground-support"
+@set "skip_repositories_arg=%skip_repositories_arg% --skip-repository tensorflow-swift-apis"
+@set "skip_repositories_arg=%skip_repositories_arg% --skip-repository yams"
+
+call "%source_root%\swift\utils\update-checkout.cmd" %scheme_arg% %skip_repositories_arg% --clone --skip-history --skip-tags --github-comment "%ghprbCommentBody%" >NUL 2>NUL
+
+goto :eof
+endlocal
+
+
+:download_icu
+:: Downloads ICU, which will be used as a dependency for the Swift Standard
+:: Library and Foundation.
+setlocal enableextensions enabledelayedexpansion
+
+set file_name=icu4c-%icu_version%-Win64-MSVC2017.zip
+curl -L -O "https://github.com/unicode-org/icu/releases/download/release-%icu_version_dashed%/%file_name%" %exitOnError%
+:: unzip warns about the paths in the zip using slashes, which raises the
+:: errorLevel to 1. We cannot use exitOnError, and have to ignore errors.
+"C:\Program Files\Git\usr\bin\unzip.exe" -o %file_name% -d "%source_root%\icu-%icu_version%"
+exit /b 0
+
+goto :eof
+endlocal
+
+
+:download_sqlite3
+:: Downloads SQLite3, which will be used as a dependency for llbuild and
+:: Swift Package Manager.
+setlocal enableextensions enabledelayedexpansion
+
+set file_name=sqlite-amalgamation-3270200.zip
+curl -L -O "https://www.sqlite.org/2019/%file_name%" %exitOnError%
+"C:\Program Files\Git\usr\bin\unzip.exe" -o %file_name% %exitOnError%
+
+goto :eof
+endlocal
+
+
+:prepare_platform_modules
+:: Create files into the right places of the Windows SDK to the files in the
+:: swift repository, in order to consider the headers of the Windows SDK a
+:: module to compile Swift code against them.
+setlocal enableextensions enabledelayedexpansion
+
+copy /y "%source_root%\swift\stdlib\public\Platform\ucrt.modulemap" "%UniversalCRTSdkDir%\Include\%UCRTVersion%\ucrt\module.modulemap" %exitOnError%
+copy /y "%source_root%\swift\stdlib\public\Platform\winsdk.modulemap" "%UniversalCRTSdkDir%\Include\%UCRTVersion%\um\module.modulemap" %exitOnError%
+copy /y "%source_root%\swift\stdlib\public\Platform\visualc.modulemap" "%VCToolsInstallDir%\include\module.modulemap" %exitOnError%
+copy /y "%source_root%\swift\stdlib\public\Platform\visualc.apinotes" "%VCToolsInstallDir%\include\visualc.apinotes" %exitOnError%
+
+goto :eof
+endlocal
+
+
+:build_llvm
+:: Configures, builds, and installs LLVM
+setlocal enableextensions enabledelayedexpansion
+
+cmake^
+    -B "%build_root%\llvm"^
+    -G Ninja^
+    -DCMAKE_BUILD_TYPE=%CMAKE_BUILD_TYPE%^
+    -DCMAKE_C_COMPILER=cl^
+    -DCMAKE_CXX_COMPILER=cl^
+    -DCMAKE_MT=mt^
+    -DCMAKE_INSTALL_PREFIX:PATH=%install_directory%^
+    -DLLVM_DEFAULT_TARGET_TRIPLE=x86_64-unknown-windows-msvc^
+    -DLLVM_ENABLE_PDB:BOOL=YES^
+    -DLLVM_ENABLE_ASSERTIONS:BOOL=YES^
+    -DLLVM_ENABLE_PROJECTS:STRING=lld;clang^
+    -DLLVM_TARGETS_TO_BUILD:STRING="AArch64;ARM;X86"^
+    -DLLVM_INCLUDE_BENCHMARKS:BOOL=NO^
+    -DLLVM_INCLUDE_DOCS:BOOL=NO^
+    -DLLVM_INCLUDE_EXAMPLES:BOOL=NO^
+    -DLLVM_INCLUDE_GO_TESTS:BOOL=NO^
+    -DLLVM_TOOL_GOLD_BUILD:BOOL=NO^
+    -DLLVM_ENABLE_OCAMLDOC:BOOL=NO^
+    -DLLVM_ENABLE_LIBXML2:BOOL=NO^
+    -DLLVM_ENABLE_ZLIB:BOOL=NO^
+    -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON^
+    -DENABLE_X86_RELAX_RELOCATIONS:BOOL=YES^
+    -DLLVM_INSTALL_BINUTILS_SYMLINKS:BOOL=YES^
+    -DLLVM_INSTALL_TOOLCHAIN_ONLY:BOOL=YES^
+    -DLLVM_TOOLCHAIN_TOOLS:STRING="addr2line;ar;c++filt;dsymutil;dwp;llvm-ar;llvm-cov;llvm-cvtres;llvm-cxxfilt;llvm-dlltool;llvm-dwp;llvm-ranlib;llvm-lib;llvm-mt;llvm-nm;llvm-objdump;llvm-pdbutil;llvm-profdata;llvm-rc;llvm-readelf;llvm-readobj;llvm-size;llvm-strip;llvm-symbolizer;llvm-undname;nm;objcopy;objdump;ranlib;readelf;size;strings"^
+    -DCLANG_TOOLS="clang;clang-format;clang-headers;clang-tidy"^
+    -DCMAKE_CXX_FLAGS:STRING="/GS- /Oy"^
+    -DCMAKE_EXE_LINKER_FLAGS:STRING=/INCREMENTAL:NO^
+    -DCMAKE_SHARED_LINKER_FLAGS:STRING=/INCREMENTAL:NO^
+    -S "%source_root%\llvm-project\llvm" %exitOnError%
+
+cmake --build "%build_root%\llvm" %exitOnError%
+cmake --build "%build_root%\llvm" --target install %exitOnError%
+
+goto :eof
+endlocal
+
+
+:build_cmark
+:: Configures and builds CMark
+setlocal enableextensions enabledelayedexpansion
+
+cmake^
+    -B "%build_root%\cmark"^
+    -G Ninja^
+    -DCMAKE_BUILD_TYPE=%CMAKE_BUILD_TYPE%^
+    -DCMAKE_C_COMPILER=cl^
+    -DCMAKE_CXX_COMPILER=cl^
+    -DCMAKE_MT=mt^
+    -DCMAKE_CXX_FLAGS:STRING="/GS- /Oy"^
+    -DCMAKE_EXE_LINKER_FLAGS:STRING=/INCREMENTAL:NO^
+    -DCMAKE_SHARED_LINKER_FLAGS:STRING=/INCREMENTAL:NO^
+    -S "%source_root%\cmark" %exitOnError%
+
+cmake --build "%build_root%\cmark" %exitOnError%
+
+goto :eof
+endlocal
+
+
+:build_swift
+:: Configures, builds, and installs Swift and the Swift Standard Library
+setlocal enableextensions enabledelayedexpansion
+
+:: SWIFT_PARALLEL_LINK_JOBS=8 allows the build machine to use as many CPU as
+:: possible, while not exhausting the RAM.
+cmake^
+    -B "%build_root%\swift"^
+    -G Ninja^
+    -DCMAKE_BUILD_TYPE=%CMAKE_BUILD_TYPE%^
+    -DCMAKE_C_COMPILER=cl^
+    -DCMAKE_CXX_COMPILER=cl^
+    -DCMAKE_MT=mt^
+    -DCMAKE_INSTALL_PREFIX:PATH=%install_directory%^
+    -DClang_DIR:PATH=%build_root%\llvm\lib\cmake\clang^
+    -DSWIFT_PATH_TO_CMARK_BUILD:PATH=%build_root%\cmark^
+    -DSWIFT_PATH_TO_CMARK_SOURCE:PATH=%source_root%\cmark^
+    -DSWIFT_PATH_TO_LIBDISPATCH_SOURCE:PATH=%source_root%\swift-corelibs-libdispatch^
+    -DLLVM_DIR:PATH=%build_root%\llvm\lib\cmake\llvm^
+    -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON^
+    -DSWIFT_INCLUDE_DOCS:BOOL=NO^
+    -DSWIFT_WINDOWS_x86_64_ICU_UC_INCLUDE:PATH=%source_root%\icu-%icu_version%\include\unicode^
+    -DSWIFT_WINDOWS_x86_64_ICU_UC:PATH=%source_root%\icu-%icu_version%\lib64\icuuc.lib^
+    -DSWIFT_WINDOWS_x86_64_ICU_I18N_INCLUDE:PATH=%source_root%\icu-%icu_version%\include^
+    -DSWIFT_WINDOWS_x86_64_ICU_I18N:PATH=%source_root%\icu-%icu_version%\lib64\icuin.lib^
+    -DSWIFT_BUILD_DYNAMIC_STDLIB:BOOL=YES^
+    -DSWIFT_BUILD_DYNAMIC_SDK_OVERLAY:BOOL=YES^
+    -DSWIFT_BUILD_STATIC_STDLIB:BOOL=NO^
+    -DSWIFT_BUILD_STATIC_SDK_OVERLAY:BOOL=NO^
+    -DLLVM_INSTALL_TOOLCHAIN_ONLY:BOOL=YES^
+    -DSWIFT_BUILD_SOURCEKIT:BOOL=YES^
+    -DSWIFT_ENABLE_SOURCEKIT_TESTS:BOOL=YES^
+    -DSWIFT_ENABLE_EXPERIMENTAL_CONCURRENCY=YES^
+    -DSWIFT_ENABLE_EXPERIMENTAL_DISTRIBUTED=YES^
+    -DSWIFT_ENABLE_EXPERIMENTAL_DIFFERENTIABLE_PROGRAMMING=YES^
+    -DSWIFT_INSTALL_COMPONENTS="autolink-driver;compiler;clang-resource-dir-symlink;stdlib;sdk-overlay;editor-integration;tools;sourcekit-inproc;swift-remote-mirror;swift-remote-mirror-headers"^
+    -DSWIFT_PARALLEL_LINK_JOBS=8^
+    -DPYTHON_EXECUTABLE:PATH=%PYTHON_HOME%\python.exe^
+    -DCMAKE_CXX_FLAGS:STRING="/GS- /Oy"^
+    -DCMAKE_EXE_LINKER_FLAGS:STRING=/INCREMENTAL:NO^
+    -DCMAKE_SHARED_LINKER_FLAGS:STRING=/INCREMENTAL:NO^
+    -DSWIFT_LIT_ARGS="--time-tests"^
+    -S "%source_root%\swift" %exitOnError%
+
+cmake --build "%build_root%\swift" %exitOnError%
+cmake --build "%build_root%\swift" --target install %exitOnError%
+
+goto :eof
+endlocal
+
+
+:test_swift
+:: Tests the Swift compiler and the Swift Standard Library
+setlocal enableextensions enabledelayedexpansion
+
+cmake --build "%build_root%\swift" --target check-swift %exitOnError%
+
+goto :eof
+endlocal
+
+
+:build_lldb
+:: Configures, builds, and installs LLDB
+setlocal enableextensions enabledelayedexpansion
+
+cmake^
+    -B "%build_root%\lldb"^
+    -G Ninja^
+    -DCMAKE_BUILD_TYPE=%CMAKE_BUILD_TYPE%^
+    -DCMAKE_C_COMPILER=cl^
+    -DCMAKE_CXX_COMPILER=cl^
+    -DCMAKE_MT=mt^
+    -DCMAKE_INSTALL_PREFIX:PATH=%install_directory%^
+    -DLLVM_DIR:PATH=%build_root%\llvm\lib\cmake\llvm^
+    -DClang_DIR:PATH=%build_root%\llvm\lib\cmake\clang^
+    -DSwift_DIR:PATH=%build_root%\swift\lib\cmake\swift^
+    -DLLVM_ENABLE_ASSERTIONS:BOOL=YES^
+    -DLLDB_USE_STATIC_BINDINGS:BOOL=YES^
+    -DPYTHON_HOME:PATH=%PYTHON_HOME%^
+    -DCMAKE_CXX_FLAGS:STRING="/GS- /Oy"^
+    -DCMAKE_EXE_LINKER_FLAGS:STRING=/INCREMENTAL:NO^
+    -DCMAKE_SHARED_LINKER_FLAGS:STRING=/INCREMENTAL:NO^
+    -DLLDB_DISABLE_PYTHON=YES^
+    -DLLDB_INCLUDE_TESTS:BOOL=NO^
+    -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON^
+    -S "%source_root%\llvm-project\lldb" %exitOnError%
+
+cmake --build "%build_root%\lldb" %exitOnError%
+cmake --build "%build_root%\lldb" --target install %exitOnError%
+
+goto :eof
+endlocal
+
+
+:build_libdispatch
+:: Configures, builds, and installs Dispatch
+setlocal enableextensions enabledelayedexpansion
+
+for /f "delims=" %%O in ('cygpath -m %install_directory%\lib\swift') do set RESOURCE_DIR=%%O
+
+cmake^
+    -B "%build_root%\swift-corelibs-libdispatch"^
+    -G Ninja^
+    -DCMAKE_BUILD_TYPE=%CMAKE_BUILD_TYPE%^
+    -DCMAKE_C_COMPILER=clang-cl^
+    -DCMAKE_CXX_COMPILER=clang-cl^
+    -DCMAKE_MT=mt^
+    -DCMAKE_Swift_COMPILER=swiftc^
+    -DSwift_DIR:PATH=%build_root%\swift\lib\cmake\swift^
+    -DCMAKE_INSTALL_PREFIX:PATH=%install_directory%^
+    -DCMAKE_C_COMPILER_TARGET=x86_64-unknown-windows-msvc^
+    -DCMAKE_CXX_COMPILER_TARGET=x86_64-unknown-windows-msvc^
+    -DENABLE_SWIFT:BOOL=YES^
+    -DENABLE_TESTING:BOOL=YES^
+    -DCMAKE_C_FLAGS:STRING="${CMAKE_C_FLAGS} --target=x86_64-unknown-windows-msvc /GS- /Oy /Gw /Gy"^
+    -DCMAKE_CXX_FLAGS:STRING="${CMAKE_CXX_FLAGS} --target=x86_64-unknown-windows-msvc /GS- /Oy /Gw /Gy"^
+    -DCMAKE_EXE_LINKER_FLAGS:STRING="/INCREMENTAL:NO"^
+    -DCMAKE_SHARED_LINKER_FLAGS:STRING="/INCREMENTAL:NO"^
+    -DCMAKE_Swift_COMPILER_TARGET:STRING=x86_64-unknown-windows-msvc^
+    -DCMAKE_Swift_FLAGS:STRING="-resource-dir \"%RESOURCE_DIR%\""^
+    -DCMAKE_Swift_LINK_FLAGS:STRING="-resource-dir \"%RESOURCE_DIR%\""^
+    -S "%source_root%\swift-corelibs-libdispatch" %exitOnError%
+
+cmake --build "%build_root%\swift-corelibs-libdispatch" %exitOnError%
+cmake --build "%build_root%\swift-corelibs-libdispatch" --target install %exitOnError%
+
+goto :eof
+endlocal
+
+
+:test_libdispatch
+:: Tests libdispatch C interface
+setlocal enableextensions enabledelayedexpansion
+
+cmake --build "%build_root%\swift-corelibs-libdispatch" --target ExperimentalTest %exitOnError%
+
+goto :eof
+endlocal
+
+
+:end


update repo clone script for npm download for win msi

--- tools/windows/scripts/prepareRepoClone.cmd
+++ tools/windows/scripts/prepareRepoClone.cmd
@@ -20,8 +20,7 @@

 set NODE_X86_DOWNLOAD_URL=http://nodejs.org/dist/v%NODE_VERSION%/win-x86/node.exe
 set NODE_X64_DOWNLOAD_URL=http://nodejs.org/dist/v%NODE_VERSION%/win-x64/node.exe
-set NPM_DOWNLOAD_URL=https://codeload.github.com/npm/npm/zip/v%NPM_VERSION%
-:: This is the redirect url for https://github.com/npm/npm/archive/v%NPM_VERSION%.zip
+set NPM_DOWNLOAD_URL=https://github.com/npm/cli/archive/v%NPM_VERSION%.zip

 echo Cleaning previous build artifacts...

@@ -103,12 +102,12 @@
 mkdir %TEMP_NPM_REPO%
 echo Downloading npm from %NPM_DOWNLOAD_URL%...
 pushd %TEMP_NPM_REPO%
-curl -k -o npm.zip %NPM_DOWNLOAD_URL%
+curl -k -o cli-%NPM_VERSION%.zip %NPM_DOWNLOAD_URL%
 if %errorlevel% neq 0 goto ERROR
 echo Unzipping npm from archive...
-unzip -q npm.zip
-if %errorlevel% neq 0 goto ERROR
-del npm.zip
+unzip -q cli-%NPM_VERSION%.zip
+if %errorlevel% neq 0 goto ERROR
+del cli-%NPM_VERSION%.zip
 popd

 echo.


Update prepareRepoClone.cmd

Update prepareRepoClone.cmd

--- tools/windows/scripts/prepareRepoClone.cmd
+++ tools/windows/scripts/prepareRepoClone.cmd
@@ -20,7 +20,8 @@

 set NODE_X86_DOWNLOAD_URL=http://nodejs.org/dist/v%NODE_VERSION%/win-x86/node.exe
 set NODE_X64_DOWNLOAD_URL=http://nodejs.org/dist/v%NODE_VERSION%/win-x64/node.exe
-set NPM_DOWNLOAD_URL=https://github.com/npm/cli/archive/v%NPM_VERSION%.zip
+set NPM_DOWNLOAD_URL=https://codeload.github.com/npm/cli/zip/v%NPM_VERSION%
+:: This is the redirect url for https://github.com/npm/cli/archive/v%NPM_VERSION%.zip

 echo Cleaning previous build artifacts...

@@ -102,12 +103,12 @@
 mkdir %TEMP_NPM_REPO%
 echo Downloading npm from %NPM_DOWNLOAD_URL%...
 pushd %TEMP_NPM_REPO%
-curl -k -o cli-%NPM_VERSION%.zip %NPM_DOWNLOAD_URL%
+curl -k -o npm.zip %NPM_DOWNLOAD_URL%
 if %errorlevel% neq 0 goto ERROR
 echo Unzipping npm from archive...
-unzip -q cli-%NPM_VERSION%.zip
-if %errorlevel% neq 0 goto ERROR
-del cli-%NPM_VERSION%.zip
+unzip -q npm.zip
+if %errorlevel% neq 0 goto ERROR
+del npm.zip
 popd

 echo.


added a batch for loop-testing

added a batch for loop-testing

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

--- loop-run.cmd
+++ loop-run.cmd
@@ -0,0 +1,10 @@
+@echo off
+set /a count=0
+set /a fails=0
+:do
+set /a count=%count%+1
+echo runs: %count% fails: %fails% command: %*
+%*
+if %errorlevel%==0 goto do
+set /a fails=%fails%+1
+goto do


add batch file for GoVM

add batch file for GoVM

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

--- bin/govm.bat
+++ bin/govm.bat
@@ -0,0 +1,2 @@
+@echo off
+python "%~dp0govm" %*


Allow for spaces in LEIN_HOME.

Allow for spaces in LEIN_HOME.

--- bin/lein.bat
+++ bin/lein.bat
@@ -25,13 +25,13 @@

 set LEIN_PLUGINS="
-for %%j in (.\lib\dev\*.jar) do (
+for %%j in (".\lib\dev\*.jar") do (
     set LEIN_PLUGINS=!LEIN_PLUGINS!;%%~fj
 )
 set LEIN_PLUGINS=!LEIN_PLUGINS!"

 set LEIN_USER_PLUGINS="
-for %%j in (%LEIN_HOME%\plugins\*.jar) do (
+for %%j in ("%LEIN_HOME%\plugins\*.jar") do (
     set LEIN_USER_PLUGINS=!LEIN_USER_PLUGINS!;%%~fj
 )
 set LEIN_USER_PLUGINS=!LEIN_USER_PLUGINS!"


build.cmd for teamcity

build.cmd for teamcity

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

--- build-ci.cmd
+++ build-ci.cmd
@@ -0,0 +1 @@
+extern\nant\NAnt.exe


Fix --jvm-debug not working on Windows

Fix --jvm-debug not working on Windows

--- src/universal/bin/sbt.bat
+++ src/universal/bin/sbt.bat
@@ -374,6 +374,9 @@
     if !JVM_DEBUG_PORT! EQU 0 (
       rem next argument wasn't a port, set a default and process next arg
       set /A JVM_DEBUG_PORT=5005
+      goto args_loop
+    ) else (
+      shift
       goto args_loop
     )
   )


embed manifest for VS2008

embed manifest for VS2008

--- recipe/bld.bat
+++ recipe/bld.bat
@@ -1,7 +1,14 @@

 cd win32

-cscript configure.js compiler=msvc iconv=yes icu=no zlib=yes lzma=no python=no ^
+REM have to set manifest for VS2008.
+REM No idea why, but exe's won't run otherwise
+set MANIFEST=no
+if "%VS_MAJOR%" == "9" (
+    set MANIFEST=yes
+)
+
+cscript configure.js compiler=msvc iconv=yes icu=no zlib=yes lzma=no python=no vcmanifest=%MANIFEST% ^
         prefix=%LIBRARY_PREFIX% include=%LIBRARY_INC% lib=%LIBRARY_LIB%

 if errorlevel 1 exit 1
@@ -11,3 +18,9 @@

 nmake /f Makefile.msvc install
 if errorlevel 1 exit 1
+
+REM For some reason the includes get put down one level
+move %LIBRARY_INC%\libxml2\libxml %LIBRARY_INC%
+if errorlevel 1 exit 1
+
+rmdir %LIBRARY_INC%\libxml2


Modified appveyor_before_build.bat

Modified appveyor_before_build.bat

--- appveyor_before_build.bat
+++ appveyor_before_build.bat
@@ -3,5 +3,5 @@
 IF NOT EXIST build64 md build64
 cd build64
 cmake -G "Visual Studio 15 2017 Win64" -DUSE_SDL=OFF ..
-rem NOTE: REMOVE -DUSE_SDL=OFF
+rem NOTE: REMOVE -DUSE_SDL=OFF when I work out how to get SDL
 cd ..


specify docfx version

specify docfx version

--- build-docs.bat
+++ build-docs.bat
@@ -1,3 +1,3 @@
-nuget install docfx.console
+nuget install docfx.console -Version 2.43.2

 docfx.console.2.43.2\tools\docfx.exe docs_source\docfx.json


fix menu point names

fix menu point names

--- build-menu.bat
+++ build-menu.bat
@@ -22,9 +22,9 @@
 echo.
 echo   [1] Start "One-Click Build"
 echo   [2] Download Components for all packaging Installation Wizards
-echo   [3] Build the packaging Installation Wizards
-echo   [4] Build the   web     Installation Wizard
-echo   [5] Build the "Server-Control-Panel" (Tray Application)
+echo   [3] Build  packaged  Installation Wizards
+echo   [4] Build    web     Installation Wizards
+echo   [5] Build "Server-Control-Panel" (Tray Application)
 echo   [x] Quit
 echo.


Removal of Old Files

Removal of Old Files

--- startupNoRestart.bat
+++ startupNoRestart.bat
@@ -1,34 +0,0 @@
-@echo off
-chcp 65001
-echo.
-pushd %~dp0
-
-::Attempts to start py launcher without relying on PATH
-%SYSTEMROOT%\py.exe --version > NUL 2>&1
-IF %ERRORLEVEL% NEQ 0 GOTO attempt
-%SYSTEMROOT%\py.exe -3.5 chronoxia.py
-PAUSE
-GOTO end
-
-::Attempts to start py launcher by relying on PATH
-:attempt
-py.exe --version > NUL 2>&1
-IF %ERRORLEVEL% NEQ 0 GOTO lastattempt
-py.exe -3.5 chronoxia.py
-PAUSE
-GOTO end
-
-::As a last resort, attempts to start whatever Python there is
-:lastattempt
-py.exe --version > NUL 2>&1
-IF %ERRORLEVEL% NEQ 0 GOTO message
-py.exe -3.5 chronoxia.py
-PAUSE
-GOTO end
-
-:message
-echo Couldn't find a valid Python 3.5 installation. Python needs to be installed and available in the PATH environment
-echo variable.
-PAUSE
-
-:end


Fixed a little issue which will cause just one duplicated classpath

git-svn-id: 5648d1bec6962b0a6d1d1b40eba8cf5cdb62da3d@1770 6f19259b-4bc3-4df7-8a09-765794883524

--- edksetup.bat
+++ edksetup.bat
@@ -67,7 +67,7 @@

 set FRAMEWORK_TOOLS_PATH=%WORKSPACE%\Tools\bin

-if not defined ORIGINAL_CLASSPATH set ORIGINAL_CLASSPATH=%CLASSPATH%
+if not defined ORIGINAL_CLASSPATH set ORIGINAL_CLASSPATH= %CLASSPATH%
 set CLASSPATH=%ORIGINAL_CLASSPATH%

 if defined WORKSPACE_TOOLS_PATH goto check_path


updated the executable name

updated the executable name

it has changed from tdsm.microsoft.exe to tdsm.exe

--- Binaries/start-server.cmd
+++ Binaries/start-server.cmd
@@ -8,7 +8,7 @@
 :: ~~~~ END USER EDIT ~~~~

 :start
-tdsm.microsoft.exe -config serverconfig.txt
+tdsm.exe -config serverconfig.txt

 if %AutoRestart%==1 (
 	echo.


Update MSBuild ref

Update MSBuild ref

--- BuildPackage/BuildOne.bat
+++ BuildPackage/BuildOne.bat
@@ -7,4 +7,4 @@
 ECHO ===============================================================
 ECHO.

-Call "C:\Program Files (x86)\MSBuild\12.0\Bin\MsBuild.exe" %1 /p:Configuration=Release /consoleloggerparameters:Summary;ErrorsOnly /nologo /p:PostBuildEvent=
+Call "C:\Program Files (x86)\MSBuild\14.0\Bin\MsBuild.exe" %1 /p:Configuration=Release /consoleloggerparameters:Summary;ErrorsOnly /nologo /p:PostBuildEvent=


minor correction

minor correction

--- CMSIS/DoxyGen/Core/doxygen_core_CM0-7.bat
+++ CMSIS/DoxyGen/Core/doxygen_core_CM0-7.bat
@@ -1 +1 @@
-doxygen core_no8M.dxy
+doxygen core_CM0-7.dxy


add batch to calc run time

add batch to calc run time

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


more spaces to tabs

more spaces to tabs

--- tron.bat
+++ tron.bat
@@ -192,7 +192,7 @@
 	echo    HELP:                   %HELP%
 	echo    NETWORK_AVAILABLE:      %NETWORK_AVAILABLE%
 	echo    REG:                    %REG%
-	echo    SAFE_MODE:              %SAFE_MODE%
+    echo    SAFE_MODE:              %SAFE_MODE%
     echo    SAFEBOOT_OPTION:        %SAFEBOOT_OPTION%
     echo    SMART_PROBLEM_CODE:     %SMART_PROBLEM_CODE%
 	echo    SYSTEM_LANGUAGE:        %SYSTEM_LANGUAGE%


add fix for npm install in Windows

add fix for npm install in Windows

--- continuous_integration/azure/install.bat
+++ continuous_integration/azure/install.bat
@@ -1,3 +1,7 @@
+:: npm using https for git
+git config --global url."https://github.com/".insteadOf git@github.com:
+git config --global url."https://".insteadOf git://
+
 :: Install dependencies
 if %USE_CONDA% == yes (
   if %PYTHON_VERSION% == 3.6 (


Script for binaries collecting.

Script for binaries collecting.

error: pathspec 'Examples/CYK/copy_binaries.cmd' did not match any file(s) known to git

--- Examples/CYK/copy_binaries.cmd
+++ Examples/CYK/copy_binaries.cmd
@@ -0,0 +1,10 @@
+if  exist yc (
+	rd /s /q yc )
+
+mkdir yc
+
+xcopy /Y ..\..\YaccConstructor\Main\bin\Release\*.dll yc
+xcopy /Y ..\..\YaccConstructor\Main\bin\Release\*.exe yc
+xcopy /Y ..\..\YaccConstructor\CYK\bin\Release\*.exe yc
+xcopy /Y ..\..\YaccConstructor\CYK\bin\Release\*.dll yc
+


Add sstablerepairedset.bat

Add sstablerepairedset.bat

Patch by pmotta; reviewed by jmckenzie for CASSANDRA-9982

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

--- tools/bin/sstablerepairedset.bat
+++ tools/bin/sstablerepairedset.bat
@@ -0,0 +1,46 @@
+@REM  Licensed to the Apache Software Foundation (ASF) under one or more
+@REM  contributor license agreements.  See the NOTICE file distributed with
+@REM  this work for additional information regarding copyright ownership.
+@REM  The ASF licenses this file to You under the Apache License, Version 2.0
+@REM  (the "License"); you may not use this file except in compliance with
+@REM  the License.  You may obtain a copy of the License at
+@REM
+@REM      http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM  Unless required by applicable law or agreed to in writing, software
+@REM  distributed under the License is distributed on an "AS IS" BASIS,
+@REM  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@REM  See the License for the specific language governing permissions and
+@REM  limitations under the License.
+
+@echo off
+
+if "%OS%" == "Windows_NT" setlocal
+
+pushd "%~dp0"
+call cassandra.in.bat
+
+if NOT DEFINED JAVA_HOME goto :err
+set TOOL_MAIN=org.apache.cassandra.tools.SSTableRepairedAtSetter
+
+REM ***** JAVA options *****
+set JAVA_OPTS=^
+ -Dlogback.configurationFile=logback-tools.xml
+
+"%JAVA_HOME%\bin\java" %JAVA_OPTS% %CASSANDRA_PARAMS% -cp %CLASSPATH% %TOOL_MAIN% %*
+goto finally
+
+:err
+echo JAVA_HOME environment variable must be set!
+set ERRORLEVEL=1
+pause
+
+:finally
+ENDLOCAL & set RC=%ERRORLEVEL%
+goto :exit_with_code
+
+:returncode
+exit /B %RC%
+
+:exit_with_code
+call :returncode %RC%


This is no longer advisable for XPlat repos.

--- SDKBuildScripts/XPlat_build.bat
+++ SDKBuildScripts/XPlat_build.bat
@@ -1,7 +1,6 @@
 setlocal
 set SdkName=XPlatCppSdk
 set targetSrc=xplatcppsdk
-set delSrc=true

 call shared_build.bat
 endlocal


fixes third party install BAT file

fixes third party install BAT file

--- thirdPartyLibs/installLibraries.bat
+++ thirdPartyLibs/installLibraries.bat
@@ -1,10 +1,8 @@
+echo off
+
 echo "Installing OWLIM Lite JAR in local Maven repository"

-if exist {owlim-lite-5.4.jar} (
-    call mvn install:install-file -Dfile=.\owlim-lite-5.4.jar -DgroupId=com.ontotext -DartifactId=owlim-lite -Dversion=5.4 -Dpackaging=jar
-) else (
-    echo "Could not find owlim-lite-5.4.jar, please place the file in this directory. See README.txt for more information."
-)
+if exist "owlim-lite-5.4.jar" (call mvn install:install-file -Dfile=.\owlim-lite-5.4.jar -DgroupId=com.ontotext -DartifactId=owlim-lite -Dversion=5.4 -Dpackaging=jar) Else (echo "Could not find owlim-lite-5.4.jar, please place the file in this directory. See README.txt for more information.")

 rem OpenRDF WAR files are automatically installed using Vagrant; otherwise, please manually deploy these in Tomcat.


updated build script

updated build script

Former-commit-id: 8129d616608d71931402a82f72ada17be98ecab2


Make MM buildable using Visual Studio 2008 Express (64 bit)

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

--- buildscripts/Buildx64.bat
+++ buildscripts/Buildx64.bat
@@ -48,23 +48,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|x64" .\MMCore\MMCore.vcproj
-devenv /%buildswitch% "Release|x64" .\MMCore\MMCore.vcproj
+echo vcbuild /M8 %buildswitch% .\MMCore\MMCore.vcproj "Release|x64"
+vcbuild /M8 %buildswitch% .\MMCore\MMCore.vcproj "Release|x64"

 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|x64"
+vcbuild /M8 %buildswitch% .\MMCorePy_wrap\MMCorePy_wrap.sln "Release|x64"
 copy .\bin_x64\MMCorePy.py .\Install_x64\micro-manager
 copy .\bin_x64\_MMCorePy.pyd .\Install_x64\micro-manager
 copy .\MMCorePy_wrap\MMCoreWrapDemo.py .\Install_x64\micro-manager

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

 echo Update the version number in MMStudioMainFrame
@@ -134,5 +134,5 @@
 :CANTINSTALLHERE

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


Fixed a typo in latest script

Fixed a typo in latest script

--- bin/create-windows-symlinks.cmd
+++ bin/create-windows-symlinks.cmd
@@ -10,4 +10,6 @@
 mklink /D css ..\src\stylesheets
 mklink /D themes ..\dist\themes
 mklink /D vendor ..\dist\vendor
-mklink /D packages ..\packages
+mklink /D packages ..\src\packages
+
+cd ..


Harden MSBUILD base script against various VS installations.

--- builds/msvc/build/buildbase.bat
+++ builds/msvc/build/buildbase.bat
@@ -1,13 +1,13 @@
 @ECHO OFF
-REM Usage: [buildbase.bat ..\vs2013\libzmq.sln 12]
+REM Usage: [buildbase.bat ..\vs2013\mysolution.sln 12]

 SET solution=%1
 SET version=%2
-
 SET log=build_%version%.log
-
-REM This breaks if visual studio is not installed or is installed to a non-default location.
-SET environment="C:\Program Files (x86)\Microsoft Visual Studio %version%.0\VC\vcvarsall.bat"
+SET tools=Microsoft Visual Studio %version%.0\VC\vcvarsall.bat
+SET environment="%programfiles(x86)%\%tools%"
+IF NOT EXIST %environment% SET environment="%programfiles%\%tools%"
+IF NOT EXIST %environment% GOTO no_tools

 ECHO Building: %solution%

@@ -59,7 +59,11 @@
 GOTO end

 :error
-ECHO *** ERROR, build terminated, see: %log%
+ECHO *** ERROR, build terminated early, see: %log%
+GOTO end
+
+:no_tools
+ECHO *** ERROR, build tools not found: %tools%

 :end


Added windows batch file to run unit tests on windows

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

--- tests/unit_project/run_tests.bat
+++ tests/unit_project/run_tests.bat
@@ -0,0 +1,3 @@
+set PYTHONPATH=..\..;..;.;%PYTHONPATH%
+set DJANGO_SETTINGS_MODULE=settings
+nosetests --with-django %*


Run build before pack

Run build before pack

--- MyGet.bat
+++ MyGet.bat
@@ -1,3 +1,4 @@
 cd ./src/AspNet.Mvc.Formatters.Protobuf
 dnu restore
+dnu build
 dnu pack


ENH: windows script finished (black magic done)

--- SuperBuild/Packaging/Files/selftester.bat
+++ SuperBuild/Packaging/Files/selftester.bat
@@ -4,6 +4,15 @@
 set CURRENT_SCRIPT_DIR=%~dp0
 set DIRNAME=%CURRENT_SCRIPT_DIR%..
 cd %DIRNAME%
+
+:: if "/q" is given, hide the error dialogs (hence make the script non-interactive)
+if /i not -%1-==-/q- (
+  goto :skip_hide_error
+)
+echo Hide error dialogs
+call :getDontShowUI
+if %DONTSHOWUI_VALUE% equ 0 call :setDontShowUI 1
+:skip_hide_error

 :: Get current PID
 type NUL > pid.log
@@ -11,32 +20,30 @@
 for /F "TOKENS=1" %%b in ('type pid.log ^| findstr [0-9]') do set CURRENT_PID=%%b

 :: setup the otbenv
-:: call otbenv.cmd
+call otbenv.cmd

 del selftest_report.log
 type NUL > selftest_report.log
 call :nb_report_lines
 set REF_SIZE=%nb_report_lines_out%
-
+:: -----------------------------------------------------------------------------------
 rem Check 1 : check binaries
 for /R %%i in (*.dll) do (
   call :check_binary %%i
 )
-
 for %%i in (bin\mapla.exe,bin\monteverdi.exe,bin\otbApplicationLauncherCommandLine.exe,bin\otbApplicationLauncherQt.exe) do (
   call :check_binary %%i
 )
+call :check_binary lib\python\_otbApplication.pyd

 call :nb_report_lines
 if %nb_report_lines_out% gtr %REF_SIZE% (
-echo Check 1/3 : FAIL
-rem should exit here
-rem goto :eof
-) else (
-echo Check 1/3 : PASS
+  echo Check 1/3 : FAIL
+) else (
+  echo Check 1/3 : PASS
 )
 set REF_SIZE=%nb_report_lines_out%
-
+:: -----------------------------------------------------------------------------------
 rem Check 2 : check applications and Python wrapping
 set /a app_count=0
 for /R %%i in (lib\otb\applications\otbapp_*.dll) do (
@@ -45,22 +52,38 @@
 if %app_count% leq 90 (
   echo WARNING: only %app_count% applications found ! Expected at least 90
 )
+call :check_python_wrapping

 call :nb_report_lines
 if %nb_report_lines_out% gtr %REF_SIZE% (
-echo Check 2/3 : FAIL
-) else (
-echo Check 2/3 : PASS
+  echo Check 2/3 : FAIL
+) else (
+  echo Check 2/3 : PASS
 )
 set REF_SIZE=%nb_report_lines_out%
-
+:: -----------------------------------------------------------------------------------
 rem Check 3 : check monteverdi & mapla
-
-
-endlocal
-goto :eof
-
-rem functions :
+call :check_desktop_app monteverdi
+call :check_desktop_app mapla 20
+
+call :nb_report_lines
+if %nb_report_lines_out% gtr %REF_SIZE% (
+  echo Check 3/3 : FAIL
+) else (
+  echo Check 3/3 : PASS
+)
+
+if /i not -%1-==-/q- (
+  goto :skip_restore_error
+)
+if %DONTSHOWUI_VALUE% equ 0 call :setDontShowUI 0
+:skip_restore_error
+del pid.log
+del tmp.log
+endlocal
+goto :eof
+
+::########################[ FUNCTIONS ]##################################
 :check_binary
 setlocal
 type NUL > tmp.log
@@ -68,52 +91,54 @@
 call :nb_tmp_lines
 if %nb_tmp_lines_out% gtr 0 (
   echo ERROR : otb_loader.exe %1
-  echo otb_loader.exe %1 > selftest_report.log
-  type tmp.log > selftest_report.log
-)
-endlocal
-goto :eof
-
+  echo otb_loader.exe %1 >> selftest_report.log
+  type tmp.log >> selftest_report.log
+)
+endlocal
+goto :eof
+::-----------------------------------------------------------------------
 :check_application
 setlocal
 set dll_path=%~n1
 set app=%dll_path:~7%
 if not exist bin\otbcli_%app%.bat (
   echo ERROR : missing cli launcher for application %app%
-  echo ERROR : missing cli launcher for application %app% > selftest_report.log
+  echo ERROR : missing cli launcher for application %app% >> selftest_report.log
   goto :check_gui
 )
 type NUL > tmp.log
-bin\otbcli_%app%.bat -help > tmp.log 2>&1
+cmd /C bin\otbcli_%app%.bat "-help" ^> tmp.log ^2^>^&^1
 call :parse_cli_output
 if %parse_cli_result% equ 0 (
   echo ERROR : error launching application otbcli_%app%
-  echo ERROR : error launching application otbcli_%app% > selftest_report.log
-  type tmp.log > selftest_report.log
+  echo ERROR : error launching application otbcli_%app% >> selftest_report.log
+  type tmp.log >> selftest_report.log
 )
 :check_gui
 if not exist bin\otbgui_%app%.bat (
   echo ERROR : missing gui launcher for application %app%
-  echo ERROR : missing gui launcher for application %app% > selftest_report.log
+  echo ERROR : missing gui launcher for application %app% >> selftest_report.log
   goto :check_application_end
 )
 if %app_count% geq 2 goto :check_application_end
 type NUL > tmp.log
-start /b bin\otbgui_%app%.bat
-timeout 5
+start /b bin\otbgui_%app%.bat ^> tmp.log ^2^>^&^1
+timeout 5 >nul
 call :get_child_pid %CURRENT_PID% cmd.exe
 set first_child=0
 if %child_pid% gtr 1 (
   set first_child=%child_pid%
 ) else (
   echo ERROR : could not launch otbgui_%app%
-  echo ERROR : could not launch otbgui_%app% > selftest_report.log
+  echo ERROR : could not launch otbgui_%app% >> selftest_report.log
+  type tmp.log >> selftest_report.log
   goto :check_application_clean
 )
 call :get_child_pid %first_child% otbApplicationLauncherQt.exe
 if not %child_pid% gtr 1 (
   echo ERROR : could not launch otbApplicationLauncherQt %app%
-  echo ERROR : could not launch otbApplicationLauncherQt %app% > selftest_report.log
+  echo ERROR : could not launch otbApplicationLauncherQt %app% >> selftest_report.log
+  type tmp.log >> selftest_report.log
 )
 :check_application_clean
 if not %first_child% == 0 (
@@ -122,61 +147,81 @@
 :check_application_end
 endlocal & set /a app_count=app_count+1
 goto :eof
-
-:launch_gui
-setlocal
-start /b bin\otbgui_%app%.bat
-endlocal
-goto :eof
-
+::-----------------------------------------------------------------------
+:check_desktop_app
+setlocal
+set appName=%1
+set delay=5
+if not -%2-==-- set delay=%2
+type NUL > tmp.log
+start /b bin\%appName%.exe > tmp.log 2>&1
+timeout %delay% >nul
+call :get_child_pid %CURRENT_PID% %appName%.exe
+if %child_pid% gtr 1 (
+  taskkill /PID %child_pid% /F /T > NUL 2>&1
+) else (
+  echo ERROR : could not launch %appName%.exe
+  echo ERROR : could not launch %appName%.exe >> selftest_report.log
+  type tmp.log >> selftest_report.log
+)
+endlocal
+goto :eof
+::-----------------------------------------------------------------------
+:check_python_wrapping
+setlocal
+type NUL > tmp.log
+python -c "import otbApplication" > tmp.log 2>&1
+call :nb_tmp_lines
+if %nb_tmp_lines_out% gtr 0 (
+  echo ERROR : failed to run python wrapping
+  echo ERROR : failed to run python wrapping >> selftest_report.log
+  type tmp.log >> selftest_report.log
+)
+endlocal
+goto :eof
+::-----------------------------------------------------------------------
 :parse_cli_output
 setlocal
-set ret=1
+set /a ret=1
 for /F %%a in ('findstr /n /r /c:"^This is the %app% application, version " tmp.log') do set output=%%a
 if not "%output%" gtr "1:" (
-  echo First line not found
-  set ret=0
+  set /a ret=0
   goto :parse_cli_output_end
 )
 set output=
 for /F %%a in ('findstr /n /r /c:"^Parameters:" tmp.log') do set output=%%a
 if not "%output%" gtr "3:" (
-  echo Parameters line not found
-  set ret=0
+  set /a ret=0
   goto :parse_cli_output_end
 )
 set output=
 for /F %%a in ('findstr /n /r /c:"^Examples:" tmp.log') do set output=%%a
 if not "%output%" gtr "1" (
-  echo Examples line not found
-  echo %output%
-  set ret=0
+  set /a ret=0
   goto :parse_cli_output_end
 )
 set output=
 for /F %%a in ('findstr /n /r /c:"FATAL" tmp.log') do set output=%%a
 if "%output%" gtr "1" (
-  echo FATAL found
-  echo %output%
-  set ret=0
+  set /a ret=0
   goto :parse_cli_output_end
 )
 :parse_cli_output_end
-endlocal & set parse_cli_result=%ret%
-goto :eof
-
+endlocal & set /a parse_cli_result=%ret%
+goto :eof
+::-----------------------------------------------------------------------
 :nb_report_lines
 setlocal
 for /F "delims=" %%i in ('find /C /V "" ^< selftest_report.log') do set output=%%i
 endlocal & set nb_report_lines_out=%output%
 goto :eof
-
+::-----------------------------------------------------------------------
 :nb_tmp_lines
 setlocal
 for /F "delims=" %%i in ('find /C /V "" ^< tmp.log') do set output=%%i
 endlocal & set nb_tmp_lines_out=%output%
 goto :eof
-
+::-----------------------------------------------------------------------
 :get_child_pid
 setlocal
 set parent_pid=%1
@@ -187,3 +232,16 @@
 for /F "TOKENS=1" %%a in ('type pid.log ^| findstr [0-9]') do set output=%%a
 endlocal & set child_pid=%output%
 goto :eof
+::-----------------------------------------------------------------------
+:getDontShowUI
+setlocal
+set output=0
+for /F "TOKENS=3" %%a in ('reg query "HKCU\Software\Microsoft\Windows\Windows Error Reporting" /v DontShowUI ^| findstr DontShowUI') do set output=%%a
+endlocal & set DONTSHOWUI_VALUE=%output:~2%
+goto :eof
+::-----------------------------------------------------------------------
+:setDontShowUI
+setlocal
+reg add "HKCU\Software\Microsoft\Windows\Windows Error Reporting" /v DontShowUI /t REG_DWORD /d %1 /f
+endlocal
+goto :eof


update docker image build script

update docker image build script

--- DeploymentTools/build-docker-image.cmd
+++ DeploymentTools/build-docker-image.cmd
@@ -13,7 +13,7 @@
 docker --tls --tlscacert="%2\ca.pem" --tlscert="%2\cert.pem" --tlskey="%2\key.pem" build -t jcorioland/vorlonjs:0.1 .

 @ECHO "LOG INTO DOCKER HUB"
-docker --tls --tlscacert="%2\ca.pem" --tlscert="%2\cert.pem" --tlskey="%2\key.pem" login -u "%3" -p "%4" -e "%5"
+docker --tls --tlscacert="%2\ca.pem" --tlscert="%2\cert.pem" --tlskey="%2\key.pem" login --username="%3" --password="%4" --email="%5" https://index.docker.io/v1/

 @ECHO "PUSH IMAGE INTO DOCKER HUB"
 docker --tls --tlscacert="%2\ca.pem" --tlscert="%2\cert.pem" --tlskey="%2\key.pem" push jcorioland/vorlonjs:0.1


Update publication version

Update publication version

--- TraceEtw/EventProviderGenerator/publish.cmd
+++ TraceEtw/EventProviderGenerator/publish.cmd
@@ -1,7 +1,7 @@
 @echo off
 setlocal

-set VERSION=1.0.2
+set VERSION=1.0.13

 set OUTPUT=c:\NuGet\


windows tweaks to my config file

windows tweaks to my config file

--- cmake/examples/hobu-windows.bat
+++ cmake/examples/hobu-windows.bat
@@ -75,7 +75,9 @@

-rem if EXIST CMakeCache.txt del CMakeCache.txt
+if EXIST CMakeCache.txt del CMakeCache.txt
+del /S /Q CMakeFiles
+cd %PDAL_DIR%/build
 cmake -G %GENERATOR% ^
     -DBOOST_INCLUDEDIR=%BOOST% ^
     -DWITH_GDAL=%GDAL_ENABLED% ^
@@ -97,7 +99,8 @@
 	-DNUMPY_VERSION=1.5.1 ^
     -DCMAKE_BUILD_TYPE=%BUILD_TYPE% ^
     -DCMAKE_VERBOSE_MAKEFILE=OFF ^
-    %PDAL_DIR%
+	-DWITH_SQLITE=ON ^
+    ..

 rem    -DBOOST_INCLUDEDIR=%BOOST_DIR% ^
 rem 	-DNUMPY_INCLUDE_DIR=%OSGEO4W_DIR%\apps\python27\lib\site-packages\numpy\core\include ^


missed change

missed change

git-svn-id: 8286f1aa0849172a171b18e797a5983a17159a76@62 699b1267-f50e-4533-8e1b-323e5631ef88

--- Scripts/Tests/batscripts/test_all.bat
+++ Scripts/Tests/batscripts/test_all.bat
@@ -7,18 +7,18 @@

 set /A __NEST_LVL+=1

-call "%%~dp0test_strlen.bat"
-call "%%~dp0test_strchr.bat"
-call "%%~dp0test_strrep.bat"
-call "%%~dp0test_stresc.bat"
-call "%%~dp0test_cstresc.bat"
-call "%%~dp0test_extract_version.bat"
-call "%%~dp0test_make_url_canonical.bat"
-call "%%~dp0test_make_url_absolute.bat"
-rem call "%%~dp0test_setvarsfromfile.bat"
+call "%%TESTS_ROOT%%/test_strlen.bat"
+call "%%TESTS_ROOT%%/test_strchr.bat"
+call "%%TESTS_ROOT%%/test_strrep.bat"
+call "%%TESTS_ROOT%%/test_stresc.bat"
+call "%%TESTS_ROOT%%/test_cstresc.bat"
+call "%%TESTS_ROOT%%/test_extract_version.bat"
+call "%%TESTS_ROOT%%/test_make_url_canonical.bat"
+call "%%TESTS_ROOT%%/test_make_url_absolute.bat"
+rem call "%%TESTS_ROOT%%/test_setvarsfromfile.bat"

-call "%%~dp0test_xml_sed.bat"
-call "%%~dp0test_xml__filter_xpath_list_by_xpath_list.bat"
+call "%%TESTS_ROOT%%/test_xml_sed.bat"
+call "%%TESTS_ROOT%%/test_xml__filter_xpath_list_by_xpath_list.bat"

 set /A __NEST_LVL-=1


Enable maui in nuget push

Enable maui in nuget push

--- Scripts/buildpackpush.bat
+++ Scripts/buildpackpush.bat
@@ -9,7 +9,7 @@
 nuget push .\Artifacts\Mapsui.iOS.%VERSION%.nupkg -source nuget.org || exit /B 1
 nuget push .\Artifacts\Mapsui.Forms.%VERSION%.nupkg -source nuget.org || exit /B 1
 nuget push .\Artifacts\Mapsui.Avalonia.%VERSION%.nupkg -source nuget.org || exit /B 1
-REM nuget push .\Artifacts\Mapsui.Maui.%VERSION%.nupkg -source nuget.org || exit /B 1
+nuget push .\Artifacts\Mapsui.Maui.%VERSION%.nupkg -source nuget.org || exit /B 1
 REM nuget push .\Artifacts\Mapsui.Uno.%VERSION%.nupkg -source nuget.org || exit /B 1
 REM nuget push .\Artifacts\Mapsui.WinUI.%VERSION%.nupkg -source nuget.org || exit /B 1
 nuget push .\Artifacts\Mapsui.Eto.%VERSION%.nupkg -source nuget.org || exit /B 1


added quotation marks around classpath

added quotation marks around classpath

git-svn-id: https://svn.apache.org/repos/asf/jakarta/jmeter/trunk@322567 13f79535-47bb-0310-9956-ffa450edef68

Former-commit-id: 836ceb37ad7271f836f2f42b652e9e60a8354016

--- bin/jmeter.bat
+++ bin/jmeter.bat
@@ -1,3 +1,3 @@
 @echo off

-java -classpath %classpath%;ApacheJMeter.jar org.apache.jmeter.JMeter %1
+java -classpath "%classpath%;ApacheJMeter.jar" org.apache.jmeter.JMeter %1


Delete StartSpellChecker.bat

Delete StartSpellChecker.bat

--- SpellChecker/install/StartSpellChecker.bat
+++ SpellChecker/install/StartSpellChecker.bat
@@ -1,2 +0,0 @@
-call node ../sources/server.js
-pause


added a grunt start bat file (so i remember to use grunt.cmd instead of just grunt... grrrr) will remove ones i get time to do some guides

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

--- grunt-start.bat
+++ grunt-start.bat
@@ -0,0 +1 @@
+grunt.cmd


Update runGame.bat

Update runGame.bat

--- airesources/CSharp/runGame.bat
+++ airesources/CSharp/runGame.bat
@@ -1,4 +1,4 @@
 csc /t:library /out:HaliteHelper.dll HaliteHelper.cs
 csc /reference:HaliteHelper.dll -out:MyBot.exe MyBot.cs
 csc /reference:HaliteHelper.dll -out:RandomBot.exe RandomBot.cs
-halite -d "30 30" "./MyBot.exe" "./RandomBot.exe"
+halite -d "30 30" "MyBot.exe" "RandomBot.exe"


BUG: fix otbenv.bat, problem with closing parenthesis in PATH

--- Packaging/Files/otbenv.bat
+++ Packaging/Files/otbenv.bat
@@ -16,7 +16,7 @@
 :: 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
 :: Setup environment for OTB package
 set CURRENT_SCRIPT_DIR=%~dp0

@@ -36,7 +36,11 @@
 set output=%~2
 set var=%1
 set content=
-if defined %var% ( set content=!%var%! )
-if not "%content%" == "" ( set output=%output%;%content% )
+if not defined %var% ( goto :prefix_path_testcontent )
+set content=!%var%!
+:prefix_path_testcontent
+if "%content%" == "" ( goto :prefix_path_end )
+set output=%output%;%content%
+:prefix_path_end
 endlocal & set %1=%output%
 goto :eof


- fixed typo in bat file preventing build. thanks to James Leotta.
PR:
Obtained from:
Submitted by:
Reviewed by:

git-svn-id: 7267684f36935cb3df12efc1f4c0216d758271d4@73236 13f79535-47bb-0310-9956-ffa450edef68

--- build/build-velocity.bat
+++ build/build-velocity.bat
@@ -58,8 +58,7 @@

 echo Now building %TARGET%...

-set
-CP=%CLASSPATH%;%TOOLS%;%ANT%;%ANTXML%;%XERCES%;%XALAN%;%SB%;%LOG%;%FOP%;%LIB%;%W3C%;%JAVACLASS%
+set CP=%CLASSPATH%;%TOOLS%;%ANT%;%ANTXML%;%XERCES%;%XALAN%;%SB%;%LOG%;%FOP%;%LIB%;%W3C%;%JAVACLASS%

 echo Classpath: %CP%
 echo JAVA_HOME: %JAVA_HOME%


add bld.bat

add bld.bat

Former-commit-id: 188c517328dd8f337d658c0f09604207e30ef8b5

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

--- cvxopt/bld.bat
+++ cvxopt/bld.bat
@@ -0,0 +1,8 @@
+"%PYTHON%" setup.py install
+if errorlevel 1 exit 1
+
+:: Add more build steps here, if they are necessary.
+
+:: See
+:: http://docs.continuum.io/conda/build.html
+:: for a list of environment variables that are set during the build process.


Relocated some assignments of environment variables in GDAL-admin.cmd script, to prepare for the addition of a new "distclean" command.

--- dist/GDAL-admin.cmd
+++ dist/GDAL-admin.cmd
@@ -28,13 +28,19 @@
 rem  The list of packages available for the specified GDAL version
 set ProjectUrl=http://landis-spatial.googlecode.com/
 set PackageList=gdal-%GdalVersion%-csharp.txt
+
+rem  Determine the platform (win32 or win64)
+call :getPlatform
+echo Platform = %Platform%
+
+rem  The binary package for the platform
+set PackageName=gdal-%GdalVersion:.=-%-csharp-%Platform%.zip
+set PackagePath=%GdalAdmin_InstallDir%\%PackageName%
+
+rem  Fetch the list of available packages
 if not exist %PackageList% set GetPackageList=yes
 if "%Action%" == "update" set GetPackageList=yes
 if "%GetPackageList%" == "yes" call :getPkgList
-
-rem  Determine the platform (win32 or win64)
-call :getPlatform
-echo Platform = %Platform%

 rem  Search for the platform in the package list
 set PackageSHA1=
@@ -44,9 +50,7 @@
 if "%PackageSHA1%" == "" goto :noPackage

 rem  Fetch the binary package for the platform
-set PackageName=gdal-%GdalVersion:.=-%-csharp-%Platform%.zip
 set PackageUrl=%ProjectUrl%/files/%PackageName%
-set PackagePath=%GdalAdmin_InstallDir%\%PackageName%
 set DirInPkg=%GdalAdmin_InstallDir%\managed

 call "%WinPkgTools%\getPackage" %PackageUrl% %PackagePath% %PackageSHA1% %DirInPkg%


added orphan file

added orphan file

error: pathspec 'bin/nimrodel-on-dir.bat' did not match any file(s) known to git

--- bin/nimrodel-on-dir.bat
+++ bin/nimrodel-on-dir.bat
@@ -0,0 +1,8 @@
+@echo off
+setlocal
+
+call %~dp0/env
+
+swipl -q -f %ELFAPP%\swiprolog.pl -g traverse_dir -t halt -- %*
+
+endlocal


Removed Pause

Removed Pause

--- binaries/1.0/taskel.bat
+++ binaries/1.0/taskel.bat
@@ -1,3 +1,2 @@
 @echo off
-java -jar taskel.jar %1
-pause+java -jar taskel.jar %1


Modified execution script for Windows.

Modified execution script for Windows.

--- wfdsl/exe/windows/run.bat
+++ wfdsl/exe/windows/run.bat
@@ -1 +1 @@
-java -jar .\..\..\target\scala-2.10\wfdsl_2.10-1.0.0-one-jar.jar %*+java -jar %~dp0..\..\target\scala-2.10\wfdsl_2.10-1.0.0-one-jar.jar %*


change step 2

change step 2

--- crawler/lottery/step2.bat
+++ crawler/lottery/step2.bat
@@ -1,2 +1,2 @@
-python ..\LD_v0.3.py Config.ini
+python ..\LD.py Config.ini
 pause


Update submit-perf-test-comparison.bat add example in itself.

--- scripts/perf/submit-perf-test-comparison.bat
+++ scripts/perf/submit-perf-test-comparison.bat
@@ -1,23 +1,35 @@
 @echo off
 rem Submit and compare new and old performance test on cluster by default.
+rem Example :
+rem set OldPerfExeDir=d:\msgit\Mobius-1.6.200-PREVIEW-1\csharp\Perf\Microsoft.Spark.CSharp\bin\Release
+rem set NewPerfExeDir=d:\msgit\revMobius\csharp\Perf\Microsoft.Spark.CSharp\bin\Release
+rem set JarOptions=--jars d:\msgit\Mobius-1.6.200-PREVIEW-1\build\dependencies\commons-csv-1.1.jar,d:\msgit\Mobius-1.6.200-PREVIEW-1\build\dependencies\spark-csv_2.10-1.3.0.jar
+rem set SparkOptions=--master yarn-cluster --total-executor-cores 50 --executor-memory 8G --conf spark.eventLog.enabled=true --conf spark.eventLog.dir=hdfs:///perf/eventlog %JarOptions%
+rem set OldPerfAppName=SparkCLRPerf.exe-Mobius-1.6.200-PREVIEW-1
+rem set JustShowCmd=1
+
 SetLocal EnableDelayedExpansion

 set ShellDir=%~dp0
 if %ShellDir:~-1%==\ set ShellDir=%ShellDir:~0,-1%
 set CommonToolDir=%ShellDir%\..\..\tools
-rem call %CommonToolDir%\set-common-dir-and-tools.bat
+call %CommonToolDir%\set-common-dir-and-tools.bat
+
 for /F "tokens=*" %%a in (' hostname ') do set hostname=%%a

 if "%~1" == "" (
-    echo Usage  :  %0  PerfRunCount SubmitTimes  NewPerfExeDir       OldPerfExeDir            MobiusJarDir           LogDir               LogName
-    echo Example : %0  1            1            D:\mobius\new-test  D:\mobius\latest-master  d:\mobius\dependencies D:\mobius\perf-logs  perf--by-%USERNAME%--on-%hostname%.log
+    echo Usage  :  %0  PerfRunCount [SubmitTimes]  [NewPerfExeDir]       [OldPerfExeDir]            [MobiusJarDir]           [LogDir]               [LogName]
+    echo Example : %0  1             1            D:\mobius\new-test  D:\mobius\latest-master  d:\mobius\dependencies D:\mobius\perf-logs  perf--by-%USERNAME%--on-%hostname%.log
     echo To avoid default, you can set variables of the above and : OldPerfAppName NewPerfAppName JarOptions SparkOptions .
     echo Such as :
     echo set OldPerfExeDir=D:\msgit\orgMobius\csharp\Perf\Microsoft.Spark.CSharp\bin\Release
     echo set NewPerfExeDir=D:\msgit\lqmMobius\csharp\Perf\Microsoft.Spark.CSharp\bin\Release
-    echo set MobiusJarDir=d:\mobius\perf-lz\dependencies
     echo set OldPerfAppName=org-perf
     echo set NewPerfAppName=new-perf
+    rem echo set MobiusJarDir=d:\mobius\perf-lz\dependencies
+    echo set PerfTestData=hdfs:///perf/data/deletions/*
+    echo set PerfTestTmpDir=D:\Temp\TempDirForSpark
+    echo set JustShowCmd=1 will just print the final command and not execute submitting.
     exit /b 5
 )

@@ -34,10 +46,12 @@
 if [%MobiusJarDir%] == [] set MobiusJarDir=d:\mobius\perf-lz\dependencies
 if [%LogDir%] == [] set LogDir=D:\mobius\perf-logs
 if [%LogName%] == [] set LogName=perf--by-%USERNAME%--on-%hostname%.log
+if not defined PerfTestTmpDir set PerfTestTmpDir=D:\Temp\TempDirForSpark
+if not defined PerfTestData set PerfTestData=hdfs:///perf/data/deletions/*

-if [%JarOptions%]==[] set JarOptions=--jars %MobiusJarDir%\spark-csv_2.10-1.4.0.jar,%MobiusJarDir%\commons-csv-1.4.jar
-
-set eventOptions=--conf spark.eventLog.enabled=true --conf spark.eventLog.dir=hdfs:///perf/eventlog
+rem JarOptions and EventOptions will not effect if defined SparkOptions
+if not defined JarOptions set JarOptions=--jars %MobiusJarDir%\spark-csv_2.10-1.4.0.jar,%MobiusJarDir%\commons-csv-1.4.jar
+if not defined EventOptions set EventOptions=--conf spark.eventLog.enabled=true --conf spark.eventLog.dir=hdfs:///perf/eventlog

 set PerfExeName=SparkCLRPerf.exe

@@ -52,28 +66,34 @@

 echo Submit parameters will be saved in %logPath%

-if [%SparkOptions%] == [] (
+if not defined SparkOptions (
     set SparkOptions=--total-executor-cores 30 --executor-memory 8G
     set SparkOptions=--total-executor-cores 100 --executor-memory 30G --driver-memory 32G
     set SparkOptions=--num-executors 100 --executor-cores 28 --executor-memory 30G --driver-memory 32G
     set SparkOptions=--num-executors 100 --executor-cores 28 --executor-memory 8G --driver-memory 12G
-    set SparkOptions=--master yarn-cluster !SparkOptions! %JarOptions% %eventOptions%
+    set SparkOptions=--master yarn-cluster !SparkOptions! %JarOptions% %EventOptions%
 )

-if [%OldPerfAppName%]==[] (
-    call %CommonToolDir%\bat\get-name-by-git-in-dir-to-var %OldPerfExeDir% OldPerfAppName
-    if not [!OldPerfAppName!]==[] set OldPerfAppName=%PerfExeName%-!OldPerfAppName!
+for /F "tokens=*" %%a in ('echo !SparkOptions! ^| lzmw -it ".*--jars\s+(\S+).*" -o "$1" -PAC ^| lzmw -it "\s*,\s*" -o "\n" -PAC ') do (
+    if not exist %%a ( echo Not exist %%a | lzmw -PA -it ".*" ) else (echo Found jar : %%a | lzmw -PA -ie ".*")
 )

-if [%NewPerfAppName%]==[] (
-    call %CommonToolDir%\bat\get-name-by-git-in-dir-to-var %NewPerfExeDir% NewPerfAppName
-    if not [!NewPerfAppName!]==[] set NewPerfAppName=%PerfExeName%-!NewPerfAppName!
+if not defined OldPerfAppName (
+    call %CommonToolDir%\bat\get-name-by-git-in-dir-to-var %OldPerfExeDir% OldPerfAppName
+    if not "!OldPerfAppName!" == "" ( set "OldPerfAppName=%PerfExeName%-!OldPerfAppName!" ) else ( set "OldPerfAppName=%PerfExeName%" )
 )

-if [%OldPerfAppName%] == [%NewPerfAppName%] (
+if not defined NewPerfAppName (
+    call %CommonToolDir%\bat\get-name-by-git-in-dir-to-var %NewPerfExeDir% NewPerfAppName
+    if not "!NewPerfAppName!" == "" ( set "NewPerfAppName=%PerfExeName%-!NewPerfAppName!" ) else ( set "NewPerfAppName=%PerfExeName%" )
+)
+
+if "%OldPerfAppName%" == "%NewPerfAppName%" (
     set OldPerfAppName=%PerfExeName%-old
     set NewPerfAppName=%PerfExeName%-new
 )
+
+echo PerfRunCount = %PerfRunCount%, SubmitTimes = %SubmitTimes% | lzmw -PA -ie "\w+"

 for /L %%k in (1,1,%SubmitTimes%) do (
     call :Submit_Dir_AppName %OldPerfExeDir% %OldPerfAppName%
@@ -84,7 +104,7 @@
 exit /b 0

 :Submit_Dir_AppName
-    set args=D:\Temp\TempDirForSpark %PerfRunCount% hdfs:///perf/data/deletions/*
+    set args=%PerfTestTmpDir% %PerfRunCount% %PerfTestData%
     set exeDir=%1
     if not "%~2" == "" set appName=%2
     rem Use test exe directory name if not input appName
@@ -92,8 +112,12 @@
     rem Append args as name tail to be obvious when lookup on cluster web page
     call %CommonToolDir%\bat\get-appendix-name-from %SparkOptions%
     set submitArgs=--name %appName%-run-%PerfRunCount%__%AppNameBySparkOptions% %SparkOptions% --exe SparkCLRPerf.exe %exeDir% %args%
-    echo %date% %time% sparkclr-submit.cmd %submitArgs%
+    echo.
+    echo %date% %time% sparkclr-submit.cmd %submitArgs% | lzmw -PA -ie "([\w\.]*\.\w*mobius\w*\.[\w\.]*)|SparkOption\w*|(?:=)\w+|\s+\d+\w{0,2}(\s+|$)" -t "((--name))\s+(((\S+)))" -a
+    if "%JustShowCmd%" == "1" exit /b 0
     echo %date% %time% sparkclr-submit.cmd %submitArgs% >> %logPath%
-    call sparkclr-submit.cmd %submitArgs%  2>&1 | lzmw -it "tracking URL|final status" -PC -c -T 2 >> %logPath%
+    call sparkclr-submit.cmd %submitArgs% 2>&1 | lzmw -P -it "error|exception|not found|cannot|failed|warn" -a
+    :: call sparkclr-submit.cmd %submitArgs%  2>&1 | lzmw -it "tracking URL|final status" -PC -c -T 2 >> %logPath%
     echo. >> %logPath%

+


It is enabled to build glew.

It is enabled to build glew.

--- 3rdpirty/Build3rdPirty.bat
+++ 3rdpirty/Build3rdPirty.bat
@@ -39,6 +39,12 @@

 %MSBUILD% %BUILD_DIR%\GLFW.sln /t:%TARGET% /p:Configuration=%CONFIG% /p:Platform=%PLATFORM% || goto error

+rem glew =============================
+
+set BUILD_DIR=glew\build\vc12
+
+%MSBUILD% %BUILD_DIR%\glew.sln /t:%TARGET% /p:Configuration=%CONFIG% /p:Platform=%PLATFORM% || goto error
+
 rem end ==============================

 cd /d %CURDIR%
@@ -49,4 +55,4 @@
 cd /d %CURDIR%
 echo "Error====="
 pause
-exist /b 1+exit /b 1


tea time

tea time

--- DevTools/qrumall_extra.bat
+++ DevTools/qrumall_extra.bat
@@ -8,3 +8,9 @@

 CD /D C:\pleiades\workspace\Test04
 CALL _rum.bat -qa
+
+CD /D C:\pleiades\workspace\Spica01
+CALL _rum.bat -qa
+
+CD /D C:\pleiades\workspace\Spica02
+CALL _rum.bat -qa


Use %* instead of enumerated arguments when calling java

git-svn-id: 0503cfb7d358eaa9bd718f348f448f10022ea703@939729 13f79535-47bb-0310-9956-ffa450edef68

--- modules/framework/scripts/executecommand.bat
+++ modules/framework/scripts/executecommand.bat
@@ -11,7 +11,7 @@
 for %%g in (define/*) do call script\setdefine.bat %%g
 rem restore old path here
 cd "%OLDDIR%"
-"%JAVA_HOME%\bin\java" "-Dorg.apache.lcf.configfile=%LCF_HOME%\properties.ini" %JAVADEFINES% -classpath "%CLASSPATH%" %1 %2 %3 %4 %5 %6 %7 %8 %9
+"%JAVA_HOME%\bin\java" "-Dorg.apache.lcf.configfile=%LCF_HOME%\properties.ini" %JAVADEFINES% -classpath "%CLASSPATH%" %*
 goto done
 :nojavahome
 echo Environment variable JAVA_HOME is not set properly.


GERINOMO-5159 add %% to windows environment variables

git-svn-id: 0d16bf2c240b8111500ec482b35765e5042f5526@931018 13f79535-47bb-0310-9956-ffa450edef68

--- framework/configs/geronimo-boilerplate/src/main/underlay/contents/bin/geronimo.bat
+++ framework/configs/geronimo-boilerplate/src/main/underlay/contents/bin/geronimo.bat
@@ -276,7 +276,7 @@
 @REM use long format of startup progress to be consistent with
 @REM the unix version of the start processing
 set _LONG_OPT=--long
-set _EXECJAVA=start "Geronimo" /d"GERONIMO_HOME\bin" %GERONIMO_WIN_START_ARGS% internalLauncher.bat
+set _EXECJAVA=start "Geronimo" /d"%GERONIMO_HOME%\bin" %GERONIMO_WIN_START_ARGS% internalLauncher.bat
 goto execCmd

 :doStop


update batch file.

update batch file.

--- build/make-dist-src.bat
+++ build/make-dist-src.bat
@@ -13,6 +13,14 @@

 RD /S /Q "%DISTBASE%\Poderosa-X.X.X\.git"

+
+for /F skip^=2^ delims^=^"^ tokens^=2 %%T in ('FIND "PODEROSA_VERSION" "%DISTBASE%\Poderosa-X.X.X\Plugin\VersionInfo.cs"') do (
+  set PODEROSA_VERSION=%%T
+)
+
+RD /S /Q "%DISTBASE%\Poderosa-%PODEROSA_VERSION%"
+REN "%DISTBASE%\Poderosa-X.X.X" "Poderosa-%PODEROSA_VERSION%"
+
 pause


Update build-msvc.bat

Update build-msvc.bat

--- deploy/win/build-msvc.bat
+++ deploy/win/build-msvc.bat
@@ -30,4 +30,4 @@
 echo "step 5"

 :: qt deploy
-C:\Qt\%QT_VER%\%qtplatform%\bin\windeployqt.exe %CurrDirName%\release\ --qmldir C:\project\qregovar\app\UI\
+C:\Qt\%QT_VER%\%qtplatform%\bin\windeployqt.exe %CurrDirName% --qmldir C:\project\qregovar\app\UI\


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

--- Release/Release_Source.bat
+++ Release/Release_Source.bat
@@ -74,15 +74,25 @@
 rem --- Copying : CVS files ---
 xcopy ..\*.cvsignore MediaInfo_Source\

+rem --- Copying : MediaInfoLib files ---
+cd ..\..\MediaInfoLib\Release
+call Release_Source.bat SkipCleanUp SkipCompression
+cd ..\..\MediaInfo\Release
+move ..\..\MediaInfoLib\Release\MediaInfo_Lib_Source .\MediaInfoLib
+
 rem --- Copying : ZenLib files ---
 cd ..\..\ZenLib\Release
-call Release_GNU_Prepare.bat SkipCleanUp SkipCompression
-cd ..\..\MediaInfoLib\Release
-move ..\..\ZenLib\Release\ZenLib_GNU_Prepare .\ZenLib
+call Release_Source.bat SkipCleanUp SkipCompression
+cd ..\..\MediaInfo\Release
+move ..\..\ZenLib\Release\ZenLib_Source .\ZenLib

 rem --- Copying : zlib files ---
 xcopy ..\..\Shared\Source\zlib .\zlib\ /S
 xcopy ..\..\Shared\Project\zlib\Template .\zlib\ /S
+
+rem --- Copying : Wx files ---
+xcopy ..\..\Shared\Source\wxMSW .\wxMSW\ /S
+xcopy ..\..\Shared\Project\WxWidgets\Template .\wxMSW\ /S

 rem --- Compressing Archive ---
@@ -92,7 +102,7 @@
 rem ..\..\Shared\Binary\Windows_i386\7-zip\7z a -r -tbzip2 -mx9 mediainfo_.tar.bz2 MediaInfo_Source.tar
 rem ..\..\Shared\Binary\Windows_i386\7-zip\7z a -r -tgzip -mx9 mediainfo_-1.tar.gz MediaInfo_Source.tar
 rem del MediaInfo_Source.tar
-..\..\Shared\Binary\Windows_i386\7-zip\7z a -r -t7z -mx9 mediainfo__AllInclusive.7z MediaInfo\* MediaInfoLib\* ZenLib\* zlib\*
+..\..\Shared\Binary\Windows_i386\7-zip\7z a -r -t7z -mx9 mediainfo__AllInclusive.7z MediaInfo\* MediaInfoLib\* ZenLib\* wxMSW\* zlib\*
 move MediaInfo MediaInfo_Source
 :SkipCompression

@@ -100,3 +110,7 @@
 if "%1"=="SkipCleanUp" goto SkipCleanUp
 rmdir MediaInfo_Source /S /Q
 :SkipCleanUp
+rmdir MediaInfoLib /S /Q
+rmdir ZenLib /S /Q
+rmdir wxMSW /S /Q
+rmdir zlib /S /Q


Updated

Updated

--- core/source/win32/Build_win32dbgmtdthr.bat
+++ core/source/win32/Build_win32dbgmtdthr.bat
@@ -47,9 +47,9 @@
 echo .
 echo . Create And Execute Build For Static Debug Threaded Libraries (win32dbgmtdthr)
 echo .
-WinCVSBuild.pl %GlobusLocation% win32dbgmtdthr 14.2
-call WinCVSBuildLibs
-call WinCVSBuildExes
+WinCVSBuild.pl %GlobusLocation% win32dbgmtdthr 15.0
+call WinCVSBuildLibs-win32dbgmtdthr
+call WinCVSBuildExes-win32dbgmtdthr

 echo .
 echo . Put A Closing Time Stamp In BuildResults.log


Change directory - useful with ConEmu and MinGW

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

--- batch/cdt.bat
+++ batch/cdt.bat
@@ -0,0 +1,41 @@
+function cdt()
+{
+
+    case "$1" in
+    "-h") showcdtusage;;
+
+    "") cdtbranches unstable;;
+    "unstable") cdtbranches $1;;
+    "10.3") cdtbranches $1;;
+    "10.2") cdtbranches $1;;
+    "10.1") cdtbranches $1;;
+
+    "conv") cd /c/src/conversion;;
+    "home") cd /c/users/chirag.shukla;;
+    "d") cd /d;;
+    "safe") cd /d/safe_exes;;
+    "tempsrc") cd /d/tempsrc;;
+    "stash") cd /d/stashedsrc;;
+    "review") cd /d/code-review;;
+    esac
+}
+
+function cdtbranches()
+{
+    cd /c/src/leds/branches/$1
+}
+
+function showcdtusage()
+{
+    echo 'Usage: . cdt 10.2        cd into 10.2 branch'
+    echo '       . cdt 10.1        cd into 10.1 branch'
+    echo '       . cdt unstable    cd into unstable branch'
+    echo '       . cdt             cd into unstable branch'
+    echo '       . cdt conv        cd into conversion'
+    echo '       . cdt home        cd into c:\users\zf'
+    echo '       . cdt d           cd into d: drive'
+    echo '       . cdt safe        cd into d:\safe_exes'
+    echo '       . cdt tempsrc     cd into d:\tempsrc'
+    echo '       . cdt stash       cd into d:\stashedsrc'
+    echo '       . cdt review      cd into d:\code-review'
+}


exit => exit /b

exit => exit /b

--- popcornd.cmd
+++ popcornd.cmd
@@ -66,5 +66,5 @@

 if "%async%" == "true" (
     start /b "%~f0" --sync %*
-    exit %errorlevel%
+    exit /b %errorlevel%
 )


Support %HOME% variables containing spaces

--- bin/agent.cmd
+++ bin/agent.cmd
@@ -38,8 +38,8 @@
 REM Check if ssh key has to be added
 :CHECKKEY
 SET VAR=
-FOR /f "tokens=*" %%J IN ('ssh-add -l ^| grep soldat_rsa') DO SET VAR=%%J
-IF "%VAR%" == "" SET KEYS=%KEYS% "%HOME%\.ssh\%1"
+FOR /f "tokens=*" %%J IN ('ssh-add -l ^| grep "%1"') DO SET VAR=%%J
+IF "%VAR%" == "" SET KEYS='%HOME%\.ssh\%1' %KEYS%
 GOTO:EOF

 :END


Anotehr try appveyor

Anotehr try appveyor

--- ci/appveyor/install.cmd
+++ ci/appveyor/install.cmd
@@ -8,7 +8,7 @@
 conda create -q -n test-environment python=%PYTHON_VERSION% numpy scipy nose
 activate test-environment

-:: Compile osqp
+
 mkdir build
 cd build
 cmake -G "%CMAKE_PROJECT%" ..


MINOR: Remove unintentional tilde character from kafka-run-class.bat script

It seems a tipo was made on a avariable for the log dir with commit 81e789ae3dc6ea8369db181c5aef440491d74f19. Then Windows tries to access by default the /log directory which of cause not exists.
klesta490 Is it ok so? Or was the tilde ~ intentional?

To test:
On Windows with the a fresh downloaded Kafka, adapt the properties:
* dataDir in config/zookeeper.properties with what you want, windows-compatible
* log.dirs in config/server.properties with what you want, windows-compatible
and executes:
bin\windows\zookeeper-server-start.bat config\zookeeper.properties

Author: u214578 <florian.hof@sbb.ch>

Reviewers: Vladimír Kleštinec <klestinec@gmail.com>, Vahid Hashemian <vahid.hashemian@gmail.com>

Closes #5837 from florianhof/feature/fix_windows_log_param

--- bin/windows/kafka-run-class.bat
+++ bin/windows/kafka-run-class.bat
@@ -111,7 +111,7 @@

 rem Log directory to use
 IF ["%LOG_DIR%"] EQU [""] (
-    set LOG_DIR="%BASE_DIR~%/logs"
+    set LOG_DIR="%BASE_DIR%/logs"
 )

 rem Log4j settings


WIndows watch script added

WIndows watch script added

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

--- bin/watch.bat
+++ bin/watch.bat
@@ -0,0 +1,10 @@
+@set d=%cd%
+@echo %d%
+@echo Press any key to start watching the library
+@start cmd /K "cd ..\wizyx && npm run watch"
+@pause
+@echo Press any key to start watching the showcase
+@start cmd /K "cd .. && npm run watch"
+@pause
+@echo Press any key to start the webserver
+@start cmd /K "cd .. && npm start"


Fixed the file attributes

Fixed the file attributes


remove unnecessary lines

remove unnecessary lines

--- build_setup_help_on_windows.bat
+++ build_setup_help_on_windows.bat
@@ -11,7 +11,6 @@
 set pythonexe="c:\python33\python"
 %pythonexe% clean_pyd.py
 %pythonexe% setup.py sdist --formats=gztar,zip --verbose
-%pythonexe% clean_pyd.py
 %pythonexe% setup.py bdist_wininst

 rem python 3.4
@@ -23,7 +22,6 @@
 set pythonexe="c:\python34\python"
 %pythonexe% clean_pyd.py
 %pythonexe% setup.py sdist --formats=gztar,zip --verbose
-%pythonexe% clean_pyd.py
 %pythonexe% setup.py bdist_wininst

 rem help


Fixed line endings.

Fixed line endings.

--- documentation/developer/api/genapidocs.bat
+++ documentation/developer/api/genapidocs.bat
@@ -1,2 +1,2 @@
-doxygen api.doxygen
-
+doxygen api.doxygen
+


TempFileCleanup.bat clean Windows Error Report folders foe each user, and remove duplicate code

--- resources/stage_1_tempclean/tempfilecleanup/TempFileCleanup.bat
+++ resources/stage_1_tempclean/tempfilecleanup/TempFileCleanup.bat
@@ -84,6 +84,8 @@
 		del /F /S /Q "%%x\Local Settings\Temporary Internet Files\*" 2>NUL
 		del /F /S /Q "%%x\Local Settings\Application Data\ApplicationHistory\*" 2>NUL
 		del /F /S /Q "%%x\My Documents\*.tmp" 2>NUL
+		del /F /S /Q "%%x\Application Data\Microsoft\Windows\WER\ReportArchive\*" 2>NUL
+		del /F /S /Q "%%x\Application Data\Microsoft\Windows\WER\ReportQueue\*" 2>NUL
 		del /F /S /Q "%%x\Application Data\Sun\Java\*" 2>NUL
 		del /F /S /Q "%%x\Application Data\Adobe\Flash Player\*" 2>NUL
 		del /F /S /Q "%%x\Application Data\Macromedia\Flash Player\*" 2>NUL
@@ -94,6 +96,8 @@
 		del /F /S /Q "%%x\AppData\Roaming\Microsoft\Windows\Recent\*" 2>NUL
 		del /F /S /Q "%%x\AppData\Local\Microsoft\Windows\Temporary Internet Files\*" 2>NUL
 		del /F /S /Q "%%x\My Documents\*.tmp" 2>NUL
+		del /F /S /Q "%%x\AppData\Local\Microsoft\Windows\WER\ReportArchive\*" 2>NUL
+		del /F /S /Q "%%x\AppData\Local\Microsoft\Windows\WER\ReportQueue\*" 2>NUL
 		del /F /S /Q "%%x\AppData\LocalLow\Sun\Java\*" 2>NUL
 		del /F /S /Q "%%x\AppData\Roaming\Adobe\Flash Player\*" 2>NUL
 		del /F /S /Q "%%x\AppData\Roaming\Macromedia\Flash Player\*" 2>NUL
@@ -151,8 +155,6 @@

 :: JOB: Clear queued and archived Windows Error Reporting (WER) reports
 echo. >> %LOGPATH%\%LOGFILE%
-if exist "%USERPROFILE%\AppData\Local\Microsoft\Windows\WER\ReportArchive" rmdir /s /q "%USERPROFILE%\AppData\Local\Microsoft\Windows\WER\ReportArchive"
-if exist "%USERPROFILE%\AppData\Local\Microsoft\Windows\WER\ReportQueue" rmdir /s /q "%USERPROFILE%\AppData\Local\Microsoft\Windows\WER\ReportQueue"
 if exist "%ALLUSERSPROFILE%\Microsoft\Windows\WER\ReportArchive" rmdir /s /q "%ALLUSERSPROFILE%\Microsoft\Windows\WER\ReportArchive"
 if exist "%ALLUSERSPROFILE%\Microsoft\Windows\WER\ReportQueue" rmdir /s /q "%ALLUSERSPROFILE%\Microsoft\Windows\WER\ReportQueue"


Added exit code checks.

Added exit code checks.

--- publish/Publish.cmd
+++ publish/Publish.cmd
@@ -2,7 +2,19 @@
 call "%vs140comntools%vsvars32.bat"

 msbuild "..\QRCodeCore.sln" /m /p:Configuration=Release
+if %ERRORLEVEL% neq 0 goto failed
+
 dotnet test ..\tests\QRCodeCore.Tests\project.json
+if %ERRORLEVEL% neq 0 goto failed
+
 dotnet pack --output . --no-build --configuration Release --version-suffix alpha4 ..\src\QRCodeCore\project.json
+if %ERRORLEVEL% neq 0 goto failed

 del *.symbols.nupkg
+
+goto done:
+
+:failed:
+pause
+
+:done


update mongocxx test for windows, build ok and run ok

--- build_x64.bat
+++ build_x64.bat
@@ -3,7 +3,7 @@
 cmake -G "Visual Studio 11 Win64" .
 msbuild.exe ALL_BUILD.vcxproj
 xcopy  /e /y  %cd%\dep\mongoc\x64\bin %cd%\bin\Debug
-xcopy  /e /y  %cd%\dep\mongocxx\x64\lib\mongoclient.dll %cd%\bin\Debug
+xcopy  /e /y  %cd%\dep\mongocxx\x64\lib\mongoclient-gd.dll %cd%\bin\Debug
 xcopy  /e /y  c:\local\boost_1_53_0\lib64-msvc-11.0\boost_date_time-vc110-mt-gd-1_53.dll %cd%\bin\Debug
 xcopy  /e /y  c:\local\boost_1_53_0\lib64-msvc-11.0\boost_thread-vc110-mt-gd-1_53.dll %cd%\bin\Debug
 xcopy  /e /y  c:\local\boost_1_53_0\lib64-msvc-11.0\boost_system-vc110-mt-gd-1_53.dll %cd%\bin\Debug


chore: docfx verbosity

chore: docfx verbosity

--- builddocs.cmd
+++ builddocs.cmd
@@ -1,4 +1,4 @@
 REM See https://github.com/dotnet/docfx/issues/1752#issuecomment-308909959
 set MSBUILD_EXE_PATH=C:\Program Files\dotnet\sdk\2.0.0\MSBuild.dll
 copy doc\MSBuild.dll.config "C:\Program Files\dotnet\sdk\2.0.0\MSBuild.dll.config" /Y
-docfx doc\docfx.json
+docfx doc\docfx.json --logLevel Warning


2017-05-09

--- commit_git.bat
+++ commit_git.bat
@@ -3,6 +3,6 @@
 git push

 @echo delpoy heroku
- git push heroku master
+git push heroku master

 pause


Use correct spec file in jasmine-webdriver example.

--- examples/jasmine-webdriver/bin/example.bat
+++ examples/jasmine-webdriver/bin/example.bat
@@ -2,5 +2,5 @@
 setlocal

 :run
-node_modules\.bin\jasmine-node --verbose spec\bottles-spec.js
+node_modules\.bin\jasmine-node --verbose spec\google-spec.js
 endlocal


show installed cmake version

show installed cmake version

--- module/tools/exec_tool.bat
+++ module/tools/exec_tool.bat
@@ -83,6 +83,7 @@
 	:: first find in PATH
 	call :run_installed cmake.exe
 	echo.
+	echo cmake.exe --version
 	if errorlevel 5 (
 		exit /b 5
 	)
@@ -135,4 +136,4 @@

 :failed
 	echo Download failed. Aborting.
-	goto :eof
+	exit /b 5