GERONIMO-1490 - setjavaenv.bat not called by deploy.bat
GERONIMO-1610 - deploy.bat does not honour GERONIMO_BATCH_ECHO and GERONIMO_BATCH_PAUSE

git-svn-id: d69ffe4ccc4861bf06065bd0072b85c931fba7ed@376105 13f79535-47bb-0310-9956-ffa450edef68

--- modules/scripts/src/resources/bin/deploy.bat
+++ modules/scripts/src/resources/bin/deploy.bat
@@ -1,78 +1,158 @@
-@rem
-@rem  Copyright 2005 The Apache Software Foundation
-@rem
-@rem   Licensed under the Apache License, Version 2.0 (the "License");
-@rem   you may not use this file except in compliance with the License.
-@rem   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.
-@rem
-@rem --------------------------------------------------------------------
-@rem $Rev$ $Date$
-@rem --------------------------------------------------------------------
-@echo off
+@REM
+@REM  Copyright 2005 The Apache Software Foundation
+@REM
+@REM   Licensed under the Apache License, Version 2.0 (the "License");
+@REM   you may not use this file except in compliance with the License.
+@REM   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.

-@rem Verify we are running on Windows XP or Server
-if not "%OS%"=="Windows_NT" goto FailOS
+@REM --------------------------------------------------------------------
+@REM $Rev$ $Date$
+@REM --------------------------------------------------------------------
+
+@REM ---------------------------------------------------------------------------
+@REM Deploy batch file for Geronimo
+@REM
+@REM You should not have to edit this file.  If you wish to have
+@REM environment variables set each time you run this batch file
+@REM refer to the information on the setenv.bat file below.
+@REM
+@REM Invocation Syntax:
+@REM
+@REM   deploy [general options] command [command options]
+@REM
+@REM   For detailed usage information, just run deploy without
+@REM   arguments.
+@REM
+@REM Environment Variable Prequisites
+@REM
+@REM   GERONIMO_HOME   May point at your Geronimo top-level directory.
+@REM                   If not specified, this batch file will attempt to
+@REM                   discover it relative to the location of this file.
+@REM
+@REM   GERONIMO_BASE   (Optional) Base directory for resolving dynamic portions
+@REM                   of a Geronimo installation.  If not present, resolves to
+@REM                   the same directory that GERONIMO_HOME points to.
+@REM
+@REM   GERONIMO_OPTS   (Optional) Java runtime options (in addition to
+@REM                   those set in JAVA_OPTS).
+@REM
+@REM   GERONIMO_TMPDIR (Optional) Directory path location of temporary directory
+@REM                   the JVM should use (java.io.tmpdir).  Defaults to
+@REM                   %GERONIMO_BASE%\var\temp.
+@REM
+@REM   JAVA_HOME       Points to your Java Development Kit installation.
+@REM                   JAVA_HOME doesn't need to be set if JRE_HOME is set.
+@REM                   It is mandatory either JAVA_HOME or JRE_HOME are set.
+@REM
+@REM   JRE_HOME        (Optional) Points to your Java Runtime Environment
+@REM                   Set this if you wish to run Geronimo using the JRE
+@REM                   instead of the JDK.
+@REM                   Defaults to JAVA_HOME if empty.
+@REM                   It is mandatory either JAVA_HOME or JRE_HOME are set.
+@REM
+@REM   JAVA_OPTS       (Optional) Java runtime options used.
+@REM                   Also see the GERONIMO_OPTS environment variable.
+@REM
+@REM Troubleshooting execution of this batch file:
+@REM
+@REM   GERONIMO_BATCH_ECHO  (Optional) Environment variable that when set to
+@REM                        "on" results in batch commands being echoed.
+@REM
+@REM   GERONIMO_BATCH_PAUSE (Optional) Environment variable that when set to
+@REM                        "on" results in each batch file to pause at the
+@REM                        end of execution
+@REM
+@REM Batch files called by this batch file:
+@REM
+@REM   %GERONIMO_HOME%\bin\setenv.bat
+@REM                   (Optional) This batch file is called if it is present.
+@REM                   Its contents may set one or more of the above environment
+@REM                   variables. It is preferable (to simplify migration to
+@REM                   future Geronimo releases) to set environment variables
+@REM                   in this file rather than modifying Geronimo's batch files.
+@REM
+@REM   %GERONIMO_HOME%\bin\setjavaenv.bat
+@REM                   This batch file is called to set environment variables
+@REM                   relating to the java or jdb exe file to call.
+@REM                   This file should not need to be modified.
+@REM
+@REM Exit Codes:
+@REM
+@REM  0 - Success
+@REM  1 - Error
+@REM ---------------------------------------------------------------------------
+@if "%GERONIMO_BATCH_ECHO%" == "on"  echo on
+@if not "%GERONIMO_BATCH_ECHO%" == "on"  echo off
+
+if "%OS%" == "Windows_NT" goto okOsCheck
+echo Cannot process Geronimo command - you are running an unsupported operating system.
+set ERRORLEVEL=1
+goto end
+
+:okOsCheck
 setlocal
-goto Init

-:FailOS
-echo Error - Unrecognized OS type.
+if not "%GERONIMO_HOME%" == "" goto resolveHome
+@REM %~dp0 is expanded pathname of the current script
+set GERONIMO_HOME=%~dp0..
+
+@REM resolve .. and remove any trailing slashes
+:resolveHome
+set CURRENT_DIR=%cd%
+cd %GERONIMO_HOME%
+set GERONIMO_HOME=%cd%
+cd %CURRENT_DIR%
+
+:gotHome
+if exist "%GERONIMO_HOME%\bin\deploy.bat" goto okHome
+echo The GERONIMO_HOME environment variable is not defined correctly
+echo This environment variable is needed to run this program
+set ERRORLEVEL=1
+goto end
+:okHome
+
+@REM Get standard environment variables
+@REM Users can optionally create this file to set environment variables.
+if exist "%GERONIMO_HOME%\bin\setenv.bat" call "%GERONIMO_HOME%\bin\setenv.bat"
+if not %errorlevel% == 0 goto end
+
+@REM Get standard Java environment variables (based upon Tomcat's setclasspath.bat
+@REM but renamed since Deployer's classpath is set in the JAR manifest)
+if exist "%GERONIMO_HOME%\bin\setjavaenv.bat" goto okSetJavaEnv
+echo Cannot find %GERONIMO_HOME%\bin\setjavaenv.bat
+echo This file is needed to run this program
+set ERRORLEVEL=1
+goto end
+:okSetJavaEnv
+set BASEDIR=%GERONIMO_HOME%
+call "%GERONIMO_HOME%\bin\setJavaEnv.bat"
+if not %errorlevel% == 0 goto end
+
+if not "%GERONIMO_BASE%" == "" goto gotBase
+set GERONIMO_BASE=%GERONIMO_HOME%
+:gotBase
+
+if not "%GERONIMO_TMPDIR%" == "" goto gotTmpdir
+set GERONIMO_TMPDIR=%GERONIMO_BASE%\var\temp
+:gotTmpdir
+
+@REM Capture any passed in arguments
+set ARGS=%*
+set _JARFILE="%GERONIMO_HOME%"\bin\deployer.jar
+
+%_RUNJAVA% %JAVA_OPTS% %GERONIMO_OPTS% -Dorg.apache.geronimo.base.dir="%GERONIMO_BASE%" -Djava.io.tmpdir="%GERONIMO_TMPDIR%" -jar %_JARFILE% %CMD_LINE_ARGS%
+goto end
+
+:end
 echo.
-set ERRORLEVEL=1
-goto End
-
-:Init
-@rem Capture any passed in arguments
-set ARGS=%*
-@rem Capture the current dir the script was started in
-set CUR_DIR="%cd%"
-for %%z in (%CUR_DIR%) do set CUR_DIR=%%~sz
-
-@rem Set the path to the deployer.jar
-set DEPLOYER_JAR="%~dp0deployer.jar"
-for %%z in (%DEPLOYER_JAR%) do set DEPLOYER_JAR=%%~sz
-
-:CheckDeployerJar
-@rem Verify the deployer.jar exists:
-if exist "%DEPLOYER_JAR%" goto CheckJavaHome
-echo Error - Unable to locate the deployer jar file.
-echo.
-set ERRORLEVEL=1
-goto End
-
-:CheckJavaHome
-for %%z in ("%JAVA_HOME%") do set JAVA_HOME=%%~sz
-if not "%JAVA_HOME%"=="" goto CheckJavaExe
-echo Error - The JAVA_HOME env variable MUST be set.
-echo.
-set ERRORLEVEL=1
-goto End
-
-:CheckJavaExe
-if not exist "%JAVA_HOME%\bin" goto FailJavaHome
-if not exist "%JAVA_HOME%\bin\java.exe" goto FailJavaHome
-set JAVA="%JAVA_HOME%\bin\java.exe"
-goto StartDeployer
-
-:FailJavaHome
-echo Error - Unable to locate Java binary under the JAVA_HOME:
-echo   JAVA_HOME: [ %JAVA_HOME%\bin\java.exe ]
-echo.
-set ERRORLEVEL=1
-goto End
-
-:StartDeployer
-%JAVA% -jar %DEPLOYER_JAR% %ARGS%
-
-:End
-echo.
+@REM pause the batch file if GERONIMO_BATCH_PAUSE is set to 'on'
+if "%GERONIMO_BATCH_PAUSE%" == "on" pause
 @endlocal
-


upload code coverage directly from file

upload code coverage directly from file

--- .ci/appveyor/test.cmd
+++ .ci/appveyor/test.cmd
@@ -1,5 +1,3 @@
 %WITH_COMPILER% %PYTHON%\Scripts\pip.exe install -r dev_requirements.txt --upgrade --quiet || EXIT 1
 %WITH_COMPILER% %PYTHON%\Scripts\py.test.exe --strict --verbose --cov pywincffi --cov-report=xml || EXIT 1
-%PYTHON%\Scripts\coverage.exe xml || EXIT 1
-dir
-%PYTHON%\Scripts\codecov.exe -X gcov --required || EXIT 1
+%PYTHON%\Scripts\codecov.exe -f coverage.xml --required || EXIT 1


Fix a download failure.

Fix a download failure.

Fix a download failure that causes the vm tools to not be installed, cascading issues to use with vagrant.

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

 if not exist "C:\Windows\Temp\windows.iso" (
-    powershell -Command "(New-Object System.Net.WebClient).DownloadFile('https://softwareupdate.vmware.com/cds/vmw-desktop/ws/16.1.1/17801498/windows/packages/tools-windows.tar', 'C:\Windows\Temp\vmware-tools.tar')" <NUL
+    powershell -Command "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; (New-Object System.Net.WebClient).DownloadFile('https://softwareupdate.vmware.com/cds/vmw-desktop/ws/16.1.1/17801498/windows/packages/tools-windows.tar', 'C:\Windows\Temp\vmware-tools.tar')" <NUL
     cmd /c ""C:\Program Files\7-Zip\7z.exe" x C:\Windows\Temp\vmware-tools.tar -oC:\Windows\Temp"
     FOR /r "C:\Windows\Temp" %%a in (VMware-tools-windows-*.iso) DO REN "%%~a" "windows.iso"
     rd /S /Q "C:\Program Files (x86)\VMWare"


Upgrade VirtualBox 5.2.6 --> 5.2.10

Upgrade VirtualBox 5.2.6 --> 5.2.10


Fix SDK path.

Fix SDK path.

--- installer/build.cmd
+++ installer/build.cmd
@@ -42,7 +42,7 @@
 cscript "%ProgramFiles(x86)%\Windows Kits\10\bin\%SDK_VERSION%\x86\wisubstg.vbs" "%1\aspia-console-en-us.msi" "%1\console-uk-ua.mst" 1058
 cscript "%ProgramFiles(x86)%\Windows Kits\10\bin\%SDK_VERSION%\x86\wisubstg.vbs" "%1\aspia-console-en-us.msi" "%1\console-zh-cn.mst" 2052

-cscript "%ProgramFiles(x86)%\Windows Kits\%SDK_VERSION%\bin\x86\wilangid.vbs" "%1\aspia-console-en-us.msi" Package 1033,1031,1043,1046,1049,1058,2052
+cscript "%ProgramFiles(x86)%\Windows Kits\10\bin\%SDK_VERSION%\x86\wilangid.vbs" "%1\aspia-console-en-us.msi" Package 1033,1031,1043,1046,1049,1058,2052

 echo "Creating MSI packages for Aspia Client"
 "%WIX%\bin\candle" -out "%1\\" -ext WixUtilExtension -ext WixUIExtension client.wxs
@@ -70,7 +70,7 @@
 cscript "%ProgramFiles(x86)%\Windows Kits\10\bin\%SDK_VERSION%\x86\wisubstg.vbs" "%1\aspia-client-en-us.msi" "%1\client-uk-ua.mst" 1058
 cscript "%ProgramFiles(x86)%\Windows Kits\10\bin\%SDK_VERSION%\x86\wisubstg.vbs" "%1\aspia-client-en-us.msi" "%1\client-zh-cn.mst" 2052

-cscript "%ProgramFiles(x86)%\Windows Kits\%SDK_VERSION%\bin\x86\wilangid.vbs" "%1\aspia-client-en-us.msi" Package 1033,1031,1043,1046,1049,1058,2052
+cscript "%ProgramFiles(x86)%\Windows Kits\10\bin\%SDK_VERSION%\x86\wilangid.vbs" "%1\aspia-client-en-us.msi" Package 1033,1031,1043,1046,1049,1058,2052

 echo "Creating MSI packages for Aspia Host"
 "%WIX%\bin\candle" -out "%1\\" -ext WixUtilExtension -ext WixUIExtension host.wxs
@@ -98,7 +98,7 @@
 cscript "%ProgramFiles(x86)%\Windows Kits\10\bin\%SDK_VERSION%\x86\wisubstg.vbs" "%1\aspia-host-en-us.msi" "%1\host-uk-ua.mst" 1058
 cscript "%ProgramFiles(x86)%\Windows Kits\10\bin\%SDK_VERSION%\x86\wisubstg.vbs" "%1\aspia-host-en-us.msi" "%1\host-zh-cn.mst" 2052

-cscript "%ProgramFiles(x86)%\Windows Kits\%SDK_VERSION%\bin\x86\wilangid.vbs" "%1\aspia-host-en-us.msi" Package 1033,1031,1043,1046,1049,1058,2052
+cscript "%ProgramFiles(x86)%\Windows Kits\10\bin\%SDK_VERSION%\x86\wilangid.vbs" "%1\aspia-host-en-us.msi" Package 1033,1031,1043,1046,1049,1058,2052

 echo "Creating MSI packages for Aspia Router"
 "%WIX%\bin\candle" -out "%1\\" -ext WixUtilExtension -ext WixUIExtension router.wxs


Batch: Setup hourly incremental backups with Robocopy and Task Scheduler

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

--- batch/Hourly_Robocopy_Backup.bat
+++ batch/Hourly_Robocopy_Backup.bat
@@ -0,0 +1,39 @@
+:: Description: Batch script for creating a Scheduled Task which will run
+::              another .bat file which does a robocopy command to make
+::              incremental backups for the destination directory (and sub-directories).
+::              The scheduled task is scheduled to run every hour.
+
+:: Usage:	    Simply run this bat script and configure source and destination directories
+
+:: Note:        If the source directory and sub-directories are very large
+::              the script can take a while to complete the first time.
+::              After that it only does incremental backups and will normally run a lot quicker.
+
+:: Author:	     Kim Eirik Kvassheim
+:: Website:	     https://github.com/kek91
+
+@echo off
+
+title Setup Robocopy Backup
+echo.
+echo Configure hourly incremental backups with Robocopy and Task Scheduler
+echo.
+
+echo Step 1 - Configuration: Locations
+echo.
+set /p src=Source directory:
+set /p dest=Destination directory:
+(
+echo cd %userprofile%\Desktop
+echo robocopy "%src%" "%dest%" /E /W:1 /R:1 /XC /log+:"robocopy_log.txt"
+)> %userprofile%\robocopy.bat
+
+echo.
+echo Step 2 - Creating Scheduled Task...
+echo.
+schtasks /create /tn "Robocopy Backup" /tr "%userprofile%\robocopy.bat" /SC HOURLY
+echo.
+echo Complete!
+echo.
+
+pause


Use latest MSBuild.

Use latest MSBuild.

--- src/DBVer/BuildRelease.cmd
+++ src/DBVer/BuildRelease.cmd
@@ -1 +1 @@
-C:\Windows\Microsoft.NET\Framework64\v4.0.30319\msbuild DBVer.sln /t:Build /p:Configuration=Release+"C:\Program Files (x86)\MSBuild\14.0\Bin\msbuild.exe" DBVer.sln /t:Build /p:Configuration=Release


report error level on script for arduino


添加 jar 的 maven 脚本。

添加 jar 的 maven 脚本。

--- lib/install.bat
+++ lib/install.bat
@@ -1,3 +1,4 @@
 call mvn install:install-file -DgroupId=com.oracle -DartifactId=ojdbc14 -Dversion=10.2.0.3.0 -Dpackaging=jar -Dfile=ojdbc14-10.2.0.3.0.jar -DgeneratePom=true
 call mvn install:install-file -DgroupId=org.jtester -DartifactId=jtester -Dversion=1.1.8 -Dpackaging=jar -DpomFile=jtester-1.1.8.pom -Dfile=jtester-1.1.8.jar -Dsources=jtester-1.1.8-sources.jar
 call mvn install:install-file -DgroupId=mockit -DartifactId=jmockit -Dversion=0.999.10 -Dpackaging=jar -DpomFile=jmockit-0.999.10.pom -Dfile=jmockit-0.999.10.jar -Dsources=jmockit-0.999.10-sources.jar
+call mvn install:install-file -DgroupId=com.alibaba.fastsql -DartifactId=fastsql -Dversion=2.0.0_preview_159 -Dpackaging=jar -Dfile=fastsql-2.0.0_preview_135.jar -DgeneratePom=true


Remove local-build script

Remove local-build script

--- local-build.bat
+++ local-build.bat
@@ -1,15 +0,0 @@
-@echo off
-echo Starting SUL.js local build...
-echo ==============================
-echo [1/3] Gulp - JSHint
-call gulp hint
-echo [!] Press any key to continue or close the window
-pause
-echo [2/3] Gulp - Build
-call gulp build
-echo [3/3] Pushing changes to GitHub...
-git status
-git add .
-set /p commit="Enter commit description: "
-git commit -m "%commit%"
-git push origin master


Fix mising ^

Fix mising ^

--- recipes/sciplot/bld.bat
+++ recipes/sciplot/bld.bat
@@ -6,8 +6,13 @@
     -GNinja ^
     -DCMAKE_BUILD_TYPE=Release ^
     -DCMAKE_PREFIX_PATH=%LIBRARY_PREFIX% ^
-    -DCMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX%
-    -DCMAKE_EXE_LINKER_FLAGS="/FORCE:MULTIPLE"  REM This is needed to to bug in MSVC 14.1 in dealing with inline definitions of static data members (Plot::m_counter and Figure::m_counter)
+    -DCMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% ^
+    -DCMAKE_EXE_LINKER_FLAGS="/FORCE:MULTIPLE"
+
+REM Note: /FORCE:MULTIPLE is needed because of a bug in MSVC 14.1
+REM in dealing with inline definitions of static
+REM data members (Plot::m_counter and Figure::m_counter)
+
 if errorlevel 1 exit 1

 REM Build step


add additional Bing toolbar entry

add additional Bing toolbar entry

--- resources/stage_2_de-bloat/oem/toolbars_BHOs_to_target_by_GUID.bat
+++ resources/stage_2_de-bloat/oem/toolbars_BHOs_to_target_by_GUID.bat
@@ -1273,6 +1273,7 @@

 :: Microsoft Live Search Toolbar
 start /wait msiexec /qn /norestart /x {1E61ED7C-7CB8-49d6-B9E9-AB4C880C8414}
+start /wait msiexec /qn /norestart /x {7FC8C210-A319-4835-A87D-B935EFB4C148}

 :: midicair Toolbar
 start /wait msiexec /qn /norestart /x {77f8c945-4b74-4bd6-a073-e0d1997edce8}


Define MD_OUTDIR to trigger the creation of a bin\ link instead of a directory. Even if the right tools are available, avoid trying to build ag.exe for DOS and WIN95, which are not supported yet. The pthreads.lib output path has changed.

--- src/configure.msc_libs.bat
+++ src/configure.msc_libs.bat
@@ -15,6 +15,15 @@
 :# First search in Ag's wincompat libraries
 set "MY_SDKS=..\msc_libs %MY_SDKS%"

+:# Store output files one level up
+:# set "OUTDIR=..\bin"
+:# We use a junction instead of a symlinkd, because Windows allows creating junctions by default, but not symlinkds.
+set "MD_OUTDIR=mklink /j bin ..\bin >NUL"
+
+:# Even if the right tools are available, avoid trying to build ag.exe for DOS and WIN95, which are not supported yet.
+if "%OS%"=="Windows_NT" set "OS=" &:# This is the Windows' homonym default, same as undefined for us here.
+if not defined OS set "OS=WIN32 WIN64" &:# Only WIN32 and WIN64 are supported so far.
+
 :# Configure.bat does not know about these libraries
 set "SDK.PCRE.NAME=Perl Compatible Regular Expressions"
 set "SDK.PCRE.FILE=pcre.h.in"     &:# A unique file at the base of that library tree
@@ -24,7 +33,7 @@
 set "SDK.PTHREAD.NAME=Posix Threads for Windows"
 set "SDK.PTHREAD.FILE=pthread.h"  &:# A unique file at the base of that library tree
 set "SDK.PTHREAD.INCPATH=."       &:# Include files are in the base directory
-set "SDK.PTHREAD.LIBPATH=$(BR)"   &:# $(BR) = SysToolsLib OS-specific output directory
+set "SDK.PTHREAD.LIBPATH=$(BR)\LIBs" &:# $(BR) = SysToolsLib OS-specific output directory

 set "SDK.ZLIB.NAME=General Purpose Compression Library"
 set "SDK.ZLIB.FILE=zlib.h"        &:# A unique file at the base of that library tree


exclude auto-gen'd method from test coverage stats, bump up threshold

--- Build/test.cmd
+++ Build/test.cmd
@@ -1,4 +1,4 @@
-@call dotnet test -c Release /p:CollectCoverage=true /p:Threshold=75 /p:Exclude="[NUnit3.*]*" ..\test\Flurl.Test\
+@call dotnet test -c Release /p:CollectCoverage=true /p:Threshold=80 /p:Include=\"[Flurl]*,[Flurl.Http]*\" /p:Exclude="[*]*.GeneratedExtensions" ..\test\Flurl.Test\
 @if ERRORLEVEL 1 (
 echo Error! Tests for Flurl failed.
 exit /b 1


CI: fix vcvarsall path

CI: fix vcvarsall path

--- CI/dev_env.bat
+++ CI/dev_env.bat
@@ -40,7 +40,7 @@
 set PATH=%PATH%;C:\tools\Python35-%ARCH%\Scripts

 :: Setup compiler
-call "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\VC\vcvarsall.bat" %ARCH% %TARGET% -vcvars_ver=%VCVER%
+call "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" %ARCH% %TARGET% -vcvars_ver=%VCVER%

 :: Setup Clcache
 set CLCACHE_DIR=C:\clcache\%ARCH%-%TARGET%-%VCVER%


Revert "fix console input echo"

Revert "fix console input echo"

Didn't work.

This reverts commit 110f7c87aee87e59940b8ce3ecfe0a2298b644cc.

--- launch.bat
+++ launch.bat
@@ -1,2 +1,3 @@
+@echo off
 java -Xmx256m -Xms32m -jar SimpleServer.jar
 pause


Should not be in the repo!

Should not be in the repo!

--- start_Extrapolation.bat
+++ start_Extrapolation.bat
@@ -1,4 +0,0 @@
-@REM Use to start devenv
-@set ROOTSYS=C:\Users\Gordon\AppData\Local\Temp\root\root-5.34.36-vc12
-@set PATH=C:\Users\Gordon\AppData\Local\Temp\root\root-5.34.36-vc12\bin;%PATH%
-@C:\Users\Gordon\Documents\Code\calratio2015\Extrapolation\Extrapolation.sln


Allow building Nuget packages out of Debug binaries

--- tools/createNugetPackages.cmd
+++ tools/createNugetPackages.cmd
@@ -3,14 +3,18 @@
 SET parentDir=%cd%
 popd

+SET CONFIGURATION=%2
+IF '%CONFIGURATION%' == '' SET CONFIGURATION=Release
+
 SET SUFFIX=%1
 IF '%SUFFIX%' == '' GOTO NOSUFFIX
-for /f %%a in ('findstr /sm packOptions %parentDir%\src\project.json') do dotnet pack %%a --no-build -c Release -o "%parentDir%\nugets" --version-suffix %SUFFIX%
+
+for /f %%a in ('findstr /sm packOptions %parentDir%\src\project.json') do dotnet pack %%a --no-build -c %CONFIGURATION% -o "%parentDir%\nugets" --version-suffix %SUFFIX%
 "%~dp0\nuget.exe" pack "%parentDir%\nuspecs\Suite\Microsoft.Diagnostics.EventFlow.Suite.nuspec" -OutputDirectory "%parentDir%\nugets" -Suffix %SUFFIX%
 GOTO END

 :NOSUFFIX
-for /f %%a in ('findstr /sm packOptions %parentDir%\src\project.json') do dotnet pack %%a --no-build -c Release -o "%parentDir%\nugets"
+for /f %%a in ('findstr /sm packOptions %parentDir%\src\project.json') do dotnet pack %%a --no-build -c %CONFIGURATION% -o "%parentDir%\nugets"
 "%~dp0\nuget.exe" pack "%parentDir%\nuspecs\Suite\Microsoft.Diagnostics.EventFlow.Suite.nuspec" -OutputDirectory "%parentDir%\nugets"
 GOTO END


Win: bat variables

Win: bat variables

--- bin/console.bat
+++ bin/console.bat
@@ -6,15 +6,15 @@
 if "%OS%"=="Windows_NT" @setlocal

 rem %~dp0 is expanded pathname of the current script under NT
-set DEFAULT_CONSOLE_HOME=%~dp0..
+set DEFAULT_SIMPLETTE_CONSOLE_HOME=%~dp0..

 goto init
 goto cleanup

 :init

-if "%CONSOLE_HOME%" == "" set CONSOLE_HOME=%DEFAULT_CONSOLE_HOME%
-set DEFAULT_CONSOLE_HOME=
+if "%SIMPLETTE_CONSOLE_HOME%" == "" set SIMPLETTE_CONSOLE_HOME=%DEFAULT_SIMPLETTE_CONSOLE_HOME%
+set DEFAULT_SIMPLETTE_CONSOLE_HOME=

 if "%PHP_COMMAND%" == "" goto no_phpcommand

@@ -22,7 +22,7 @@
 goto cleanup

 :run
-"%PHP_COMMAND%" -d html_errors=off -qC "%CONSOLE_HOME%\bin\console" %*
+"%PHP_COMMAND%" -d html_errors=off -qC "%SIMPLETTE_CONSOLE_HOME%\bin\console" %*
 goto cleanup

 :no_phpcommand
@@ -31,8 +31,8 @@
 goto init

 :err_home
-echo ERROR: Environment var CONSOLE_HOME not set. Please point this
-echo variable to your local console installation!
+echo ERROR: Environment var SIMPLETTE_CONSOLE_HOME not set. Please point this
+echo variable to your local simplette_console installation!
 goto cleanup

 :cleanup


Update i18n.inc.bat

Update i18n.inc.bat

--- module/i18n.inc.bat
+++ module/i18n.inc.bat
@@ -130,7 +130,8 @@
 	set PHRASE_3_10=Please, check file %2 for more information about changes

 	set PHRASE_4_1=Enable Lua scripting support?
-	set PHRASE_4_2=   PvPGN will be compiled with Lua support
+	set PHRASE_4_2=   PvPGN will be compiled with Lua
+	set PHRASE_4_3=   PvPGN will be compiled without Lua

 	set PHRASE_9_1=Select your D2GS version:
 	set PHRASE_9_2=Setup admin password for Telnet connection (listening on port 8888), will be saved in d2gs.reg
@@ -187,7 +188,8 @@
 	set PHRASE_3_10=ଠ    ᬮ  䠩 %2

 	set PHRASE_4_1= প Lua ਯ⮢?
-	set PHRASE_4_2=   PvPGN 㤥 ᪮஢  প Lua
+	set PHRASE_4_2=   PvPGN 㤥 ᪮஢  Lua
+	set PHRASE_4_3=   PvPGN 㤥 ᪮஢  Lua

 	set PHRASE_9_1=롥  D2GS:
 	set PHRASE_9_2=⠭ ஫   Telnet ᮥ (ࠡ⠥   8888), 㤥 ࠭  d2gs.reg


Create .bat file in order to launch the game

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

--- DatDot.bat
+++ DatDot.bat
@@ -0,0 +1,2 @@
+@echo off
+start Interface.py


#64 : Build script change

#64 : Build script change

--- build/build.bat
+++ build/build.bat
@@ -14,7 +14,7 @@

 echo;
 echo This batch file requires softwares shown below.
-echo (1) Microsoft Visual Studio 2008 Professional Edition
+echo (1) Microsoft Visual Studio 2017
 echo (2) wkhtmltopdf 0.12.0.3
 echo (3) PDFtk Server 2.02
 echo (4) 7-Zip 9.20


#67 : KLOC calculation modified

#67 : KLOC calculation modified

--- build/build.bat
+++ build/build.bat
@@ -155,7 +155,6 @@
 if defined LOCALMACHINE (
   echo;
   %LCOUNTER% ..\src /subdir
-  %LCOUNTER% ..\src\resource\cmdfreak.js
 )

 echo;


Update build.cmd to always create artifacts

--- build/build.cmd
+++ build/build.cmd
@@ -20,18 +20,11 @@
 set build_output="%artifacts_sources_path%\Hangfire.Mongo\bin\Any CPU\Release"
 set nuget="%sources_path%\.nuget\NuGet.exe"

-echo build number : %APPVEYOR_BUILD_NUMBER%
-echo build tag    : %APPVEYOR_REPO_TAG%
-echo build version: %APPVEYOR_BUILD_VERSION%
-
 if %msbuild% == "" (
 	echo No MSBuild found.
 	exit /B 1
 )

-if "%APPVEYOR_REPO_TAG%"=="true" goto deploy
-
-:build
 rem BUILD
 echo Restoring NuGet packages...
 %nuget% restore %sources_path%\Hangfire.Mongo.sln
@@ -39,15 +32,7 @@
 echo build project using selected MSBuild
 %msbuild% %sources_path%\Hangfire.Mongo.sln /t:Rebuild /p:Configuration="Release" /p:Platform="Any CPU"

-if errorlevel 1 (
-	echo Build failed.
-	exit /B 1
-)
-
-exit /B 0
-
-:deploy
-rem DEPLOY
+rem CREATE ARTIFACTS
 echo delete and create artifacts folders
 rmdir artifacts /s /q


changed slashes so html links to subfiles will work

--- watir/build-rdoc.bat
+++ watir/build-rdoc.bat
@@ -1 +1 @@
-rdoc -o rdoc watir.rb watir\clickJSDialog.rb watir\cookiemanager.rb watir\exceptions.rb watir\winClicker.rb watir\watir_simple.rb
+rdoc -o rdoc watir.rb watir/clickJSDialog.rb watir/cookiemanager.rb watir/exceptions.rb watir/winClicker.rb watir/watir_simple.rb


please work

please work

--- logdna.cmd
+++ logdna.cmd
@@ -1,16 +1,17 @@
 {\rtf1\ansi\ansicpg1252\cocoartf1404\cocoasubrtf470
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;}
+{\fonttbl\f0\fswiss\fcharset0 ArialMT;}
+{\colortbl;\red255\green255\blue255;\red63\green63\blue63;\red234\green234\blue234;}
 \margl1440\margr1440\vieww10800\viewh8400\viewkind0
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0

-\f0\fs24 \cf0 @powershell -NoProfile -ExecutionPolicy Bypass -Command "iex ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1'))" && SET PATH=%PATH%;%ALLUSERSPROFILE%chocolateybin\
+\f0\fs20 \cf0 @powershell -NoProfile -ExecutionPolicy Bypass -Command "iex ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1'))" && SET PATH=%PATH%;%ALLUSERSPROFILE%chocolateybin\
 choco install logdna-agent -y
 \
 logdna-agent -k d8e14421399a44a9a35dfc49c7f5f0aa # this is your unique Agent API Key
 \
 :: by default the agent monitors %ALLUSERSPROFILE%logs
 \
-logdna-agent -d C:\\LogFiles
+logdna-agent -d \cf2 \cb3 \expnd0\expndtw0\kerning0
+\outl0\strokewidth0 \strokec2 D:\\home\\LogFiles\\\cf0 \cb1 \kerning1\expnd0\expndtw0 \outl0\strokewidth0
 \
 nssm start logdna-agent}


enable no prompt flag to the script can be used by CI

--- tools/windows/build.cmd
+++ tools/windows/build.cmd
@@ -13,6 +13,8 @@
 msbuild /t:rebuild /p:Configuration=Release

 echo.
-start .\out\

+if not "%1"=="-noprompt" (
+   start .\out\
+)
 popd


Build

Build

--- Qies.NodeJS/build.bat
+++ Qies.NodeJS/build.bat
@@ -1,4 +1,5 @@
 echo Building..
+npm install
 gulp clean
 gulp restore-modules
 gulp typescript-compile


Added bat file to run

Added bat file to run

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

--- Upload.bat
+++ Upload.bat
@@ -0,0 +1 @@
+python "AbsolutePathHere\AutoUpload.py" %*


Added debugging to test script

Added debugging to test script

--- ci/test-win.bat
+++ ci/test-win.bat
@@ -1,4 +1,4 @@
-echo Running Windows build and test
+echo Running Windows build and testscript  %cd%/matlab/CIBuildAndTest.m
 call "C:\Program Files\MATLAB\R2015b\bin\matlab.exe" -wait -nodisplay -nosplash -nodesktop -r "try, run('%cd%/matlab/CIBuildAndTest.m'), catch ex, disp(['Exception during CIBuildAndTest.m: ' ex.message]), exit(1), end, exit(0);"

 if not "%ERRORLEVEL%" == "0" (


Remove AppId and add Connectivity to pack script

--- nuspec/pack.bat
+++ nuspec/pack.bat
@@ -1,7 +1,7 @@
 del *.nupkg
 nuget setapikey

-nuget pack Cheesebaron.MvxPlugins.AppId.nuspec -symbols
+nuget pack Cheesebaron.MvxPlugins.Connectivity.nuspec -symbols
 nuget pack Cheesebaron.MvxPlugins.DeviceInfo.nuspec -symbols
 nuget pack Cheesebaron.MvxPlugins.Settings.nuspec -symbols
 nuget pack Cheesebaron.MvxPlugins.SimpleWebToken.nuspec -symbols


Enable cppcheck by default.

Enable cppcheck by default.

--- scripts/checkbuilds.bat
+++ scripts/checkbuilds.bat
@@ -108,8 +108,8 @@
 rem ************************************************************
 rem Target 12: cppcheck
 REM ~ call scite\scripts\clearboth
-REM ~ cppcheck -j 8 --enable=all --suppressions scintilla/cppcheck.suppress --max-configs=100 -I scintilla/src -I scintilla/include -I scintilla/lexlib -I scintilla/qt/ScintillaEditBase --template=gcc --quiet scintilla
-REM ~ cppcheck -j 8 --enable=all --max-configs=100 -I scite/src -I scintilla/include -I scite/lua/include --template=gcc --quiet scite
+cppcheck -j 8 --enable=all --suppressions scintilla/cppcheck.suppress --max-configs=100 -I scintilla/src -I scintilla/include -I scintilla/lexlib -I scintilla/qt/ScintillaEditBase --template=gcc --quiet scintilla
+cppcheck -j 8 --enable=all --max-configs=100 -I scite/src -I scintilla/include -I scite/lua/include --template=gcc --quiet scite
 rem
 rem Finished
 call scite\scripts\clearboth


win32/build_sources.cmd: added extra headers to sip_tag.c and sip_parser_table.c

darcs-hash:20071012173342-88462-eb39b2e7cb85846fcf7993e11127043f6b618750.gz

--- win32/build_sources.cmd
+++ win32/build_sources.cmd
@@ -44,6 +44,8 @@
   PT=%PT% %IN% < NUL
 %CHECK%

+@set AWK_SIP_AWK=%MSG_AWK% module=sip
+
 @set IN=../libsofia-sip-ua/sip/sofia-sip/sip.h
 @set PR=../libsofia-sip-ua/sip/sip_tag.c
 @set PR2=../libsofia-sip-ua/sip/sofia-sip/sip_hclasses.h
@@ -53,20 +55,25 @@
 @set SIPEXTRA=../libsofia-sip-ua/sip/sip_extra_headers.txt
 @set PT=../libsofia-sip-ua/sip/sip_parser_table.c

-%MSG_AWK% module=sip PR=%PR% %IN%  < NUL
+%AWK_SIP_AWK% PR=%PR% %IN% %SIPEXTRA% < NUL
 %CHECK%
-%MSG_AWK% module=sip PR=%PR2% %IN% < NUL
+%AWK_SIP_AWK% PR=%PR2% %IN% < NUL
 %CHECK%
-%MSG_AWK% module=sip PR=%PR3% %IN% < NUL
+%AWK_SIP_AWK% PR=%PR3% %IN% < NUL
 %CHECK%
-%MSG_AWK% module=sip PR=%PR4% %IN% < NUL
+%AWK_SIP_AWK% PR=%PR4% %IN% < NUL
 %CHECK%
-%MSG_AWK% module=sip PR=%PR5% TEMPLATE1=%PR2%.in TEMPLATE2=%PR3%.in TEMPLATE=%PR5%.in NO_FIRST=1 NO_LAST=1 < NUL %SIPEXTRA%
+%AWK_SIP_AWK% PR=%PR5% NO_FIRST=1 NO_LAST=1 ^
+   TEMPLATE1=%PR2%.in ^
+   TEMPLATE2=%PR3%.in ^
+   TEMPLATE3=%PR4%.in ^
+   TEMPLATE=%PR5%.in %SIPEXTRA% < NUL
 %CHECK%

-%MSG_AWK% module=sip MC_HASH_SIZE=127 MC_SHORT_SIZE=26 ^
+%AWK_SIP_AWK% PT=%PT% TEMPLATE=%PT%.in ^
   FLAGFILE=../libsofia-sip-ua/sip/sip_bad_mask ^
-  PT=%PT% %IN% < NUL
+  MC_HASH_SIZE=127 MC_SHORT_SIZE=26 ^
+  %IN% %SIPEXTRA% < NUL
 %CHECK%

 @set IN=../libsofia-sip-ua/http/sofia-sip/http.h


lowercased, removed tab+eof nl, added notice

--- startfiles/start-wpnxm.bat
+++ startfiles/start-wpnxm.bat
@@ -1,7 +1,8 @@
 @echo off

 if exist "%cd%\temp" (
-	RD "%cd%\temp\" /S /Q
+    echo Removing Temporary Files...
+    rd "%cd%\temp\" /S /Q
 )

 if not exist "%cd%\temp" (


Add PushCore.bat

Add PushCore.bat

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

--- PushCore.bat
+++ PushCore.bat
@@ -0,0 +1,7 @@
+@rem This is used to push changes in Core/ to the LoycCore repo on GitHub.
+@rem If the push fails due to changes in LoycCore, do a fetch+merge first:
+@rem     git subtree pull --prefix=Core core master
+rem It is typical that the first command fails (it only works the first time)
+git remote add core https://github.com/qwertie/LoycCore.git
+git subtree push --prefix=Core core master
+pause


fix Sikuli-IDE.bat

fix Sikuli-IDE.bat

--- sikuli-ide/target/win32/Sikuli-IDE.bat
+++ sikuli-ide/target/win32/Sikuli-IDE.bat
@@ -3,6 +3,6 @@
 set JAVA_EXE="java"
 REM 64bit Windows users: please uncomment the following line and make sure the path is pointed to your 32bit JRE
 REM set JAVA_EXE="C:\Program Files (x86)\Java\jre6\bin\java.exe"
-%JAVA_EXE% -Xms64M -Xmx512M -Dfile.encoding=UTF-8 -Dpython.path="%~d0%~p0sikuli-script.jar/" -jar %~d0%~p0sikuli-ide.jar %*
+%JAVA_EXE% -Xms64M -Xmx512M -Dfile.encoding=UTF-8 -Dpython.path="%~d0%~p0sikuli-script.jar/" -jar "%~d0%~p0sikuli-ide.jar" %*


:rocket: adding deployment files for azure

--- deploy.cmd
+++ deploy.cmd
@@ -139,10 +139,10 @@
 )

 ECHO 4. Run Lineman Tasks
-IF EXIST "Gruntfile.js" (
-  call !NPM_CMD! install lineman
-  IF !ERRORLEVEL! NEQ 0 goto error
-  call .\node_modules\.bin\lineman clean build
+IF EXIST "gruntfile.js" (
+  :: call !NPM_CMD! install lineman
+  :: IF !ERRORLEVEL! NEQ 0 goto error
+  call .\node_modules\.bin\grunt
   IF !ERRORLEVEL! NEQ 0 goto error
 )


fixed package.bat path bug

fixed package.bat path bug

--- package/Package.bat
+++ package/Package.bat
@@ -8,8 +8,8 @@
 copy ..\src\Ocelog\bin\Debug\netstandard2.0\Ocelog.dll lib\netstandard2.0
 copy ..\src\Ocelog.Formatting.Json\bin\Debug\netstandard2.0\Ocelog.Formatting.Json.dll lib\netstandard2.0
 copy ..\src\Ocelog.Formatting.Logstash\bin\Debug\netstandard2.0\Ocelog.Formatting.Logstash.dll lib\netstandard2.0
-copy ..\src\Ocelog.Transport\bin\netstandard2.0\Ocelog.Transport.dll lib\netstandard2.0
-copy ..\src\Ocelog.Testing\bin\netstandard2.0\Ocelog.Testing.dll lib\netstandard2.0
+copy ..\src\Ocelog.Transport\bin\Debug\netstandard2.0\Ocelog.Transport.dll lib\netstandard2.0
+copy ..\src\Ocelog.Testing\bin\Debug\netstandard2.0\Ocelog.Testing.dll lib\netstandard2.0

 copy ..\src\Ocelog\bin\Debug\netstandard2.0\Ocelog.pdb lib\netstandard2.0
 copy ..\src\Ocelog.Formatting.Json\bin\Debug\netstandard2.0\Ocelog.Formatting.Json.pdb lib\netstandard2.0


BaseTools: Convert BrotliCompress.bat to DOS format

Cc: Yonghong Zhu <78d981fe33a016071af5222c56d5cf77f30fb0b2@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Liming Gao <6480311aeeb4b006862f6d13ebabddc03f51e507@intel.com>
Reviewed-by: Yonghong Zhu <78d981fe33a016071af5222c56d5cf77f30fb0b2@intel.com>

--- BaseTools/Source/C/BrotliCompress/BrotliCompress.bat
+++ BaseTools/Source/C/BrotliCompress/BrotliCompress.bat
@@ -58,4 +58,4 @@

 :End
 Brotli %ARGS% %LVL%
-@echo on
+@echo on


Checkin Batchfile for single tests

Checkin Batchfile for single tests

git-svn-id: 344b71073909399dbfbb72461917dbf939dfdc0a@24 97a8069c-bbaa-4fa2-9e49-561d8e0b19ef

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

--- doTest.bat
+++ doTest.bat
@@ -0,0 +1,2 @@
+call build.bat
+java -Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,address=2000,server=y,suspend=n -classpath build\classes;lib\junit.jar %1 %2 %3 %4 %5 %6 %7 %8 %9


install cython

install cython

--- appveyor-install.cmd
+++ appveyor-install.cmd
@@ -5,6 +5,7 @@
 pip install --cache-dir c:/egg_cache nose
 pip install --cache-dir c:/egg_cache coverage
 pip install --cache-dir c:/egg_cache numpy
+pip install --cache-dir c:/egg_cache cython

 rem install mayavi
 python setup.py develop


upgrade pyinstaller before build nvpy.exe

--- generate-nvpy-exe.bat
+++ generate-nvpy-exe.bat
@@ -13,6 +13,9 @@
 rmdir /q /s build
 del dist\nvpy.exe
 del dist\nvpy-debug.exe
+
+rem Upgrade pyinstaller.
+pip install --upgrade pyinstaller

 rem When you generate windows binary, you need the certifi package.
 rem See workaround code on nvpy.py for details.


Create install_dev_tools.bat

Create install_dev_tools.bat

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

--- install_dev_tools.bat
+++ install_dev_tools.bat
@@ -0,0 +1 @@
+cinst packages.config


Switch statement in batch file

Switch statement in batch file

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

-echo "Not yet"
+IF "%~1"=="" (
+  goto usage
+) ELSE IF "%~1"=="init" (
+  mkdir _pill\bin
+  set CONDA_BIN_PATH="conda info --root"
+  set CONDA_DEFAULT_ENV
+) ELSE IF "%~1"=="in" (
+  echo "Ready to go in"
+) ELSE IF "%~1" == "out" (
+  echo "Ready to go out"
+) ELSE (
+  echo "error"
+  goto usage
+  exit /b 1
+)
+exit /b
+
+:usage
+echo usage: pill [COMMAND]
+echo.
+echo SYNOPSIS
+echo     Create a local python and conda environment in the current directory.
+echo     When activated all the libraries will be installed and imported from
+echo     the '_pill' directory in the root of your project.
+echo.
+echo USAGE
+echo     Create and run temporal/local environments.
+echo.
+echo       $ pill init
+echo       $ source pill in
+echo       $ source pill out
+echo.
+echo COMMANDS
+echo     init    Creates the .pill directory and create links.
+echo     in      Modifies CONDA_DEFAULT_ENV and PATH to use
+echo             the .pill directory and sets the PILL_NAME variable.
+echo     out     Restores the previous CONDA_DEFAULT_ENV and PATH. Also
+echo             unsets PILL_NAME.
+echo.
+exit /b
+
+:create_symlinks
+
+exit /b
+
+:backup
+set PILL_OLD_PATH=%PATH%
+set PILL_OLD_CONDA_DEFAULT_ENV=%CONDA_DEFAULT_ENV%
+set PILL_PROMPT=%PROMPT%
+exit /b
+
+:remove_current_conda
+  set CONDA_BIN_PATH="conda info --root"
+  set CONDA_BIN_PATH="%CONDA_BIN_PATH%\bin"
+  PATH=:$PATH:
+  PATH=${PATH//:$CONDA_BIN_PATH:/:}
+exit /b


Update .m2 repo cache (#3248)

Update .m2 repo cache (#3248)

--- kokoro/windows/continuous.bat
+++ kokoro/windows/continuous.bat
@@ -4,9 +4,9 @@

 rem To speed up build, download and unpack an M2 repo cache.
 pushd %USERPROFILE%
-call gsutil.cmd -q cp "gs://ct4e-m2-repositories-for-kokoro/m2-oxygen.tar" .
+call gsutil.cmd -q cp "gs://ct4e-m2-repositories-for-kokoro/m2-cache.tar" .
 @echo on
-tar xf m2-oxygen.tar && del m2-oxygen.tar
+tar xf m2-cache.tar && del m2-cache.tar
 popd

 cd github\google-cloud-eclipse


Add stub uninstall batch file for windows distro

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

--- resources/windows/uninstall.bat
+++ resources/windows/uninstall.bat
@@ -0,0 +1,2 @@
+@echo off
+REM Delete link on Desktop


Added script to build local dependencies into `.m2` folder in project root

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

--- build-local-maven.bat
+++ build-local-maven.bat
@@ -0,0 +1,10 @@
+call gradlew.bat annotations:buildUpload query:buildUpload database:buildUpload iterator:buildUpload lazy:buildUpload types:buildUpload serializer:buildUpload reflect:buildUpload --configure-on-demand
+call gradlew.bat stormscheme:scheme-runtime:buildUpload stormscheme:scheme-apt:buildUpload --configure-on-demand
+call gradlew.bat cursor-mock:buildUpload --configure-on-demand
+call gradlew.bat stormparser:parser-runtime:buildUpload stormparser:parser-apt:buildUpload --configure-on-demand
+call gradlew.bat core:buildUpload --configure-on-demand
+call gradlew.bat rx:buildUpload --configure-on-demand
+
+echo Press any key to exit...
+pause >nul
+exit


added NJsonSchema.Yaml.Tests to 04_RunTests.bat

added NJsonSchema.Yaml.Tests to 04_RunTests.bat

--- build/04_RunTests.bat
+++ build/04_RunTests.bat
@@ -2,3 +2,4 @@
 dotnet test "%~dp0/../src\NJsonSchema.CodeGeneration.Tests\NJsonSchema.CodeGeneration.Tests.csproj" -c Release
 dotnet test "%~dp0/../src\NJsonSchema.CodeGeneration.CSharp.Tests\NJsonSchema.CodeGeneration.CSharp.Tests.csproj" -c Release
 dotnet test "%~dp0/../src\NJsonSchema.CodeGeneration.TypeScript.Tests\NJsonSchema.CodeGeneration.TypeScript.Tests.csproj" -c Release
+dotnet test "%~dp0/../src\NJsonSchema.Yaml.Tests\NJsonSchema.Yaml.Tests.csproj" -c Release


elixir.bat defers to mix for handling help options

--- bin/elixir.bat
+++ bin/elixir.bat
@@ -1,4 +1,8 @@
 @echo off
+
+rem Mix handles its own help options (as when called by mix.bat)
+if not "%1"=="%1:mix%" goto parseopts
+
 set argc=0
 for %%A in (%*) do (
     if "%%A"=="--help" goto documentation


Added the bin dir and a mapgen.bat helper to generate the _Packets_.cs file in the correct place (to catch up with nant users)

git-svn-id: baf6e02d125cf6f9bfcfe153b2eb83d6e1f5ace6@311 52acb1d6-8a22-11de-b505-999d5b087335

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

--- bin/mapgen.bat
+++ bin/mapgen.bat
@@ -0,0 +1 @@
+mapgenerator.exe ../data/keywords.txt ../data/message_template.msg ../libsecondlife-cs/mapgenerator/template.cs ../libsecondlife-cs/_Packets_.cs


Move RuntimeIDArg initialization (#18747)

--- build-test.cmd
+++ build-test.cmd
@@ -358,6 +358,19 @@
 REM === Create the test overlay
 REM ===
 REM =========================================================================================
+
+set RuntimeIdArg=
+if defined __RuntimeId (
+    set RuntimeIdArg=-RuntimeID="%__RuntimeId%"
+)
+
+set TargetsWindowsArg=
+if "%__TargetsWindows%"=="1" (
+    set TargetsWindowsArg=-TargetsWindows=true
+) else if "%__TargetsWindows%"=="0" (
+    set TargetsWindowsArg=-TargetsWindows=false
+)
+
 echo %__MsgPrefix%Creating test overlay...

 set __BuildLogRootName=Tests_Overlay_Managed
@@ -402,19 +415,6 @@
 if defined __SkipManaged goto SkipBuildingWrappers

 echo %__MsgPrefix%Creating test wrappers...
-
-set RuntimeIdArg=
-set TargetsWindowsArg=
-
-if defined __RuntimeId (
-    set RuntimeIdArg=-RuntimeID="%__RuntimeId%"
-)
-
-if "%__TargetsWindows%"=="1" (
-    set TargetsWindowsArg=-TargetsWindows=true
-) else if "%__TargetsWindows%"=="0" (
-    set TargetsWindowsArg=-TargetsWindows=false
-)

 set __BuildLogRootName=Tests_XunitWrapper
 set __BuildLog=%__LogsDir%\%__BuildLogRootName%_%__BuildOS%__%__BuildArch%__%__BuildType%.log


do not attempt to create the feature directory if it exist already This is always the case for source tree builds

--- configure.bat
+++ configure.bat
@@ -252,7 +252,7 @@
 echo.
 REM compile tests go here. We don't have anything to test for at this stage.

-mkdir %BUILD_PATH%\features
+if not exist "%BUILD_PATH%\features" mkdir %BUILD_PATH%\features
 echo "Generating Mobility Headers..."
 rd /s /q %BUILD_PATH%\include
 mkdir %BUILD_PATH%\include


fix vscode terminal errors when setting cmder fast_init=1 outside cmder

--- vendor/lib/lib_console.cmd
+++ vendor/lib/lib_console.cmd
@@ -1,9 +1,9 @@
 @echo off
-
-if "%fast_init%" == "1" exit /b

 call "%~dp0lib_base.cmd"
 set lib_console=call "%~dp0lib_console.cmd"
+
+if "%fast_init%" == "1" exit /b

 if "%~1" == "/h" (
     %lib_base% help "%~0"


fixed iso copy

fixed iso copy

--- install.bat
+++ install.bat
@@ -69,18 +69,27 @@

 if not exist D:\GitHub mkdir D:\GitHub
 cd /D D:\GitHub
-git clone https://github.com/StefanScherer/basebox-packer.git
+if not exist basebox-packer (
+  git clone https://github.com/StefanScherer/basebox-packer.git
+) else (
+  cd basebox-packer
+  git pull
+  cd ..
+)

 if not exist D:\ISO mkdir D:\ISO
 if not exist D:\ISO\win2008r2sp1_datacenter_en mkdir D:\ISO\win2008r2sp1_datacenter_en
-if not exist D:\ISO\win2008r2sp1_datacenter_en\SW_DVD5_Windows_Svr_DC_EE_SE_Web_2008_R2_64Bit_English_w_SP1_MLF_X17-22580.ISO
-copy \\adminlin01\iso\windows\licensed\datacenter_san\win2008r2sp1_datacenter_en\SW_DVD5_Windows_Svr_DC_EE_SE_Web_2008_R2_64Bit_English_w_SP1_MLF_X17-22580.ISO D:\ISO\win2008r2sp1_datacenter_en
+if not exist D:\ISO\win2008r2sp1_datacenter_en\SW_DVD5_Windows_Svr_DC_EE_SE_Web_2008_R2_64Bit_English_w_SP1_MLF_X17-22580.ISO (
+  copy \\adminlin01\iso\windows\licensed\datacenter_san\win2008r2sp1_datacenter_en\SW_DVD5_Windows_Svr_DC_EE_SE_Web_2008_R2_64Bit_English_w_SP1_MLF_X17-22580.ISO D:\ISO\win2008r2sp1_datacenter_en
+)

 if not exist D:\ISO\win2012_datacenter_en mkdir D:\ISO\win2012_datacenter_en
-if not exist D:\ISO\win2012_datacenter_en\SW_DVD5_Win_Svr_Std_and_DataCtr_2012_64Bit_English_Core_MLF_X18-27588.ISO
-copy \\adminlin01\iso\windows\licensed\datacenter_san\win2012_datacenter_en\SW_DVD5_Win_Svr_Std_and_DataCtr_2012_64Bit_English_Core_MLF_X18-27588.ISO D:\ISO\win2012_datacenter_en
+if not exist D:\ISO\win2012_datacenter_en\SW_DVD5_Win_Svr_Std_and_DataCtr_2012_64Bit_English_Core_MLF_X18-27588.ISO (
+  copy \\adminlin01\iso\windows\licensed\datacenter_san\win2012_datacenter_en\SW_DVD5_Win_Svr_Std_and_DataCtr_2012_64Bit_English_Core_MLF_X18-27588.ISO D:\ISO\win2012_datacenter_en
+)

 if not exist D:\ISO\win2012r2_datacenter_en mkdir D:\ISO\win2012r2_datacenter_en
-if not exist D:\ISO\win2012r2_datacenter_en\SW_DVD9_Windows_Svr_Std_and_DataCtr_2012_R2_64Bit_English_-2_Core_MLF_X19-31419.ISO
-copy \\adminlin01\iso\windows\licensed\datacenter_san\win2012r2_datacenter_en\SW_DVD9_Windows_Svr_Std_and_DataCtr_2012_R2_64Bit_English_-2_Core_MLF_X19-31419.ISO D:\ISO\win2012r2_datacenter_en
+if not exist D:\ISO\win2012r2_datacenter_en\SW_DVD9_Windows_Svr_Std_and_DataCtr_2012_R2_64Bit_English_-2_Core_MLF_X19-31419.ISO (
+  copy \\adminlin01\iso\windows\licensed\datacenter_san\win2012r2_datacenter_en\SW_DVD9_Windows_Svr_Std_and_DataCtr_2012_R2_64Bit_English_-2_Core_MLF_X19-31419.ISO D:\ISO\win2012r2_datacenter_en
+ )


Test data for KEEP_CONFIG

Test data for KEEP_CONFIG

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

--- testdata_var_cache_extmods_and_files.cmd
+++ testdata_var_cache_extmods_and_files.cmd
@@ -0,0 +1,5 @@
+mkdir            c:\salt\var\cache\salt\minion\extmods
+copy README.md c:\salt\var\cache\salt\minion\extmods
+
+mkdir            c:\salt\var\cache\salt\minion\files
+copy README.md c:\salt\var\cache\salt\minion\files


update push

update push

--- nuspec/push.cmd
+++ nuspec/push.cmd
@@ -1,4 +1,4 @@
 @echo off
 copy *.nupkg %HOMEPATH%\dropbox\nuget\ /y
-rem nuget push *.nupkg -Source https://www.nuget.org/api/v2/package
+nuget push *.nupkg -Source https://www.nuget.org/api/v2/package
 pause


Simplify oq-console.bat

Simplify oq-console.bat

--- windows/nsis-installer/oq-console.bat
+++ windows/nsis-installer/oq-console.bat
@@ -5,8 +5,8 @@
 set PYTHONPATH=%mypath%\lib\site-packages

 doskey pip=python.exe -m pip $*
-doskey oq=python.exe -m openquake.commands.__main__ $*
-doskey oq-engine=python.exe -m openquake.commands.__main__ engine $*
+doskey oq=python.exe -m openquake.commands $*
+doskey oq-engine=python.exe -m openquake.commands engine $*

 echo OpenQuake environment loaded
 echo To see versions of installed software run 'pip freeze'


Added puppet module firewall

Added puppet module firewall

--- scripts/install-puppet-modules.cmd
+++ scripts/install-puppet-modules.cmd
@@ -8,3 +8,4 @@
 cmd /c "C:\Program Files\Puppet Labs\Puppet\bin\puppet.bat" module install puppetlabs-inifile
 cmd /c "C:\Program Files\Puppet Labs\Puppet\bin\puppet.bat" module install puppetlabs-powershell
 cmd /c "C:\Program Files\Puppet Labs\Puppet\bin\puppet.bat" module install chocolatey-chocolatey
+cmd /c "C:\Program Files\Puppet Labs\Puppet\bin\puppet.bat" module install gildas-firewall


fixed bob.bat to include BOB_LIB

fixed bob.bat to include BOB_LIB

--- dist/bob.bat
+++ dist/bob.bat
@@ -45,28 +45,45 @@
 goto stripClasspath

 :findBobHome
-if exist "%BOB_HOME%\lib\bob.jar" goto checkJava
+if exist "%BOB_HOME%\lib\bob.jar" goto checkBobLib
 if not exist "%ProgramFiles%\bob" goto checkSystemDrive
 set BOB_HOME=%ProgramFiles%\bob
-goto checkJava
+goto checkBobLib

 :checkSystemDrive
 if not exist "%SystemDrive%\bob\lib\bob.jar" goto checkCDrive
-set ANT_HOME=%SystemDrive%\bob
-goto checkJava
+set BOB_HOME=%SystemDrive%\bob
+goto checkBobLib

 :checkCDrive
 if not exist "C:\bob\lib\bob.jar" goto checkDDrive
-set ANT_HOME=C:\bob
-goto checkJava
+set BOB_HOME=C:\bob
+goto checkBobLib

 :checkDDrive
 if not exist "D:\bob\lib\bob.jar" goto noBobHome
-set ANT_HOME=D:\bob
-goto checkJava
+set BOB_HOME=D:\bob
+goto checkBobLib

 :noBobHome
 echo BOB_HOME is set incorrectly or Bob could not be located. Please set BOB_HOME.
+goto end
+
+:checkBobLib
+if "%BOB_LIB%"=="" goto setDefaultBobLib
+:stripBobLib
+if not _%BOB_LIB:~-1%==_\ goto checkJava
+set BOB_LIB=%BOB_LIB:~0,-1%
+REM make sure it's clean
+goto stripBobLib
+
+:setDefaultBobLib
+if not exist "%BOB_HOME%\lib" goto noBobLib
+set BOB_LIB=%BOB_HOME%\lib
+goto checkJava
+
+:noBobLib
+echo While BOB_HOME was resolved to %BOB_HOME%, BOB_LIB was not defined, and BOB_HOME\lib did not exist. Please check your installation.
 goto end

 :checkJava


Преобразование текстовых исходников к формату UNIX

--- make-setup/make-setup.bat
+++ make-setup/make-setup.bat
@@ -34,6 +34,8 @@
   for /d %%d in (..\..\distrib\*) do (
     xcopy /e /i /y %%d %%~nxd
   )
+
+  dos2unix bin/* bootstrap.* clear.* */*.cpp */*/*.froms */*/*.srefi

   if exist c-plus-plus.conf.bat erase c-plus-plus.conf.bat


factorize win32-cpp win64-cpp into win-cpp.bat

--- jenkins/win-cpp.bat
+++ jenkins/win-cpp.bat
@@ -1,7 +1,7 @@
 set WINBITS=%1
 echo WINBITS: %WINBITS%

-cd jenkins
+cd %~dp0.
 for /f "" %%i in (version.txt) do (
    set version=%%i
 )


Add steps for packaging Json extension. Use snupkg format for symbols.

--- package.bat
+++ package.bat
@@ -8,7 +8,21 @@
 echo.
 echo === PACKAGE ===
 echo.
-dotnet pack --include-symbols --include-source --configuration Release --output ..\.. src\DeepEqual\DeepEqual.csproj
+dotnet pack ^
+  --include-symbols ^
+	 -p:SymbolPackageFormat=snupkg ^
+	--include-source ^
+	--configuration Release ^
+	--output . ^
+	src\DeepEqual\DeepEqual.csproj
+
+dotnet pack ^
+  --include-symbols ^
+	 -p:SymbolPackageFormat=snupkg ^
+	--include-source ^
+	--configuration Release ^
+	--output . ^
+	src\DeepEqual.System.Text.Json\DeepEqual.System.Text.Json.csproj

 echo.
 pause


remove make.bat

remove make.bat

--- docs/make.bat
+++ docs/make.bat
@@ -1,36 +0,0 @@
-@ECHO OFF
-
-pushd %~dp0
-
-REM Command file for Sphinx documentation
-
-if "%SPHINXBUILD%" == "" (
-	set SPHINXBUILD=sphinx-build
-)
-set SOURCEDIR=source
-set BUILDDIR=build
-set SPHINXPROJ=Nanopolish
-
-if "%1" == "" goto help
-
-%SPHINXBUILD% >NUL 2>NUL
-if errorlevel 9009 (
-	echo.
-	echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
-	echo.installed, then set the SPHINXBUILD environment variable to point
-	echo.to the full path of the 'sphinx-build' executable. Alternatively you
-	echo.may add the Sphinx directory to PATH.
-	echo.
-	echo.If you don't have Sphinx installed, grab it from
-	echo.http://sphinx-doc.org/
-	exit /b 1
-)
-
-%SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS%
-goto end
-
-:help
-%SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS%
-
-:end
-popd


Fixed copy command.

Fixed copy command.

--- configure.bat
+++ configure.bat
@@ -49,7 +49,7 @@
 cd copasi
 echo Executing in copasi:

-cp copasi.pro tmp_win32.pro
+copy copasi.pro tmp_win32.pro
 echo   %QMAKE% -tp vc -r "CONFIG-=release" "CONFIG-=debug" %arguments% tmp_win32.pro
 %QMAKE% -tp vc -r "CONFIG-=release" "CONFIG-=debug" %arguments% tmp_win32.pro
 del tmp_win32*


Quick fix on package batch script.

Quick fix on package batch script.

--- package_files_for_release.bat
+++ package_files_for_release.bat
@@ -6,14 +6,10 @@

 SET "sevzip="C:\Program Files\7-Zip\7z.exe""
 SET "version=1.0.1.0"
-SET "filelist=HLAEServer.dll Release_x86 Release_x64 README.txt"
+SET "filelist=Release_x86 Release_x64 README.txt"

-CD release_x86
 %sevzip% a -t7z HLAEServer-%version%.7z %filelist%
 %sevzip% a -tzip HLAEServer-%version%.zip %filelist%
-
-MOVE HLAEServer-%version%.7z ..\
-MOVE HLAEServer-%version%.zip ..\

 ECHO.
 ECHO Packaged.


added asm.jar in the classpath

added asm.jar in the classpath

git-svn-id: 9146c88ff6d39b48099bf954d15d68f687b3fa69@114 28e8926c-6b08-0410-baaa-805c5e19b8d6

--- compile/pdfJavadoc.bat
+++ compile/pdfJavadoc.bat
@@ -4,7 +4,7 @@
 if "%JAVA_HOME%" == "" goto javahome

 SETLOCAL
-set CLASSPATH=mifdoclet.jar;..\classes;..\lib\bouncycastle.jar;..\lib\crimson.jar;..\lib\globus.jar;..\lib\javaxCrypto.jar;..\lib\jaxp.jar;..\lib\jini-core.jar;..\lib\jini-ext.jar;..\lib\reggie.jar;..\lib\bcel.jar;..\lib\sun-util.jar
+set CLASSPATH=mifdoclet.jar;..\classes;..\lib\bouncycastle.jar;..\lib\crimson.jar;..\lib\globus.jar;..\lib\javaxCrypto.jar;..\lib\jaxp.jar;..\lib\jini-core.jar;..\lib\jini-ext.jar;..\lib\reggie.jar;..\lib\bcel.jar;..\lib\asm.jar;..\lib\sun-util.jar
 echo %CLASSPATH%

 echo Filtering html doc-files...


recreate script for windows

recreate script for windows

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

--- recreate_db.cmd
+++ recreate_db.cmd
@@ -0,0 +1,21 @@
+@echo off
+rem removing db
+del db.sqlite3
+rem removing intial migration
+del claims\migrations\0001_initial.py
+rem removing temporary dir, if left
+rmdir temp.migrate /q /s
+rem storing migrations except 1st
+md temp.migrate
+move claims\migrations\*.py temp.migrate\
+move temp.migrate\__init__.py claims\migrations
+
+rem create migrations
+python manage.py makemigrations claims
+
+move temp.migrate\*.py claims\migrations\
+
+rmdir temp.migrate /q /s
+
+python manage.py migrate
+python manage.py createsuperuser


feat: add windows setup batch file.

feat: add windows setup batch file.

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

--- setup/win-setup.bat
+++ setup/win-setup.bat
@@ -0,0 +1,57 @@
+echo OFF
+echo Setting up your developmental environment. This may take a while.
+
+echo [*] Installing chocolatey...
+@"%SystemRoot%\System32\WindowsPowerShell\v1.0\powershell.exe" -NoProfile -InputFormat None -ExecutionPolicy Bypass -Command "iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))" && SET "PATH=%PATH%;%ALLUSERSPROFILE%\chocolatey\bin"
+
+echo [*] Installing ruby...
+choco install ruby2.devkit -y
+
+echo [*] Installing Node.js...
+choco install nodejs-lts -y
+
+echo [*] Installing Gems...
+call gem install bundler
+call bundle install
+
+echo [*] Installing Yarn...
+choco install yarn -y
+
+echo [*] Installing node modules...
+call yarn
+
+echo [*] Installing PhantomJs...
+call yarn global add phantomjs-prebuilt
+
+echo [*] Installing Bower...
+call yarn global add Bower
+
+echo [*] Installing Bower modules...
+call bower install
+
+echo [*] Installing Pandoc...
+choco install pandoc -y
+
+echo [*] Creating configuration files...
+copy config\application.example.yml config\application.yml
+copy config\database.example.yml config\database.yml
+
+echo [*] Installing XAMPP...
+choco install bitnami-xampp -y
+start C:\xampp\mysql\bin\mysqld
+
+echo [*] Setting up database...
+echo CREATE DATABASE dashboard DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_general_ci;CREATE DATABASE dashboard_testing DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_general_ci;exit| C:\xampp\mysql\bin\mysql -u root
+
+echo [*] Installing Redis...
+msiexec /i https://github.com/MicrosoftArchive/redis/releases/download/win-3.0.504/Redis-x64-3.0.504.msi
+
+echo [*] Installing Gulp...
+yarn global add gulp
+
+echo [*] Installing R...
+choco install r.project -y
+
+echo [*] Migrating databases...
+rake db:migrate
+rake db:migrate RAILS_ENV=test


Create bld_cxx.bat

Create bld_cxx.bat

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

--- recipes/gz-msgs/bld_cxx.bat
+++ recipes/gz-msgs/bld_cxx.bat
@@ -0,0 +1,22 @@
+mkdir build
+cd build
+
+cmake ^
+    -G "Ninja" ^
+    -DCMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% ^
+    -DCMAKE_BUILD_TYPE=Release ^
+    -DCMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP=True ^
+    %SRC_DIR%
+if errorlevel 1 exit 1
+
+:: Build.
+cmake --build . --config Release
+if errorlevel 1 exit 1
+
+:: Install.
+cmake --build . --config Release --target install
+if errorlevel 1 exit 1
+
+:: Test.
+ctest -C Release
+if errorlevel 1 exit 1


Add a script to set up symlinks in P: and game dir

This should help with module loading later so I don't have to restart
the game on every change.

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

--- tools/setup.bat
+++ tools/setup.bat
@@ -0,0 +1,28 @@
+@echo off
+
+set source_dir=%~dp0\..
+set arma3_dir=C:\Program Files (x86)\Steam\steamApps\common\Arma 3
+
+IF NOT EXIST P: GOTO NODRIVE
+IF NOT EXIST %arma3_dir% GOTO NOARMA3DIR
+
+mkdir P:\z
+mkdir "%arma3_dir%\z"
+
+echo "Run this script as administrator!"
+
+mklink /D "%arma3_dir%\z\hehu" "%source_dir%"
+mklink /D "P:\z\hehu" "%source_dir%"
+
+pause
+exit 0
+
+:NODRIVE
+echo "OMFG. Set up the P: drive!"
+pause
+exit 1
+
+:NOARMA3DIR
+echo You don't have a %arma3_dir% directory. Please adjust the path in this script!
+pause
+exit 1


Fixing email link

Fixing email link

--- Utilities/VSOBuildScripts/postBuildScript.cmd
+++ Utilities/VSOBuildScripts/postBuildScript.cmd
@@ -57,7 +57,7 @@
 echo on
 if "%1" == "local" goto skipEmail
 set MSGTITLE="BUILD: %BUILD_SOURCEVERSIONAUTHOR% %BUILD_DEFINITIONNAME% %BUILD_SOURCEBRANCH% = %agent.jobstatus%"
-set MSGBODY="%TFS_DROPLOCATION%    https://microsoft.visualstudio.com/OS/_build/index?buildId=%BUILD_BUILDID%&_a=summary"
+set MSGBODY="%TFS_DROPLOCATION%    https://microsoft.visualstudio.com/DefaultCollection/Xbox.Services/_build/index?buildId=%BUILD_BUILDID%&_a=summary"
 call \\scratch2\scratch\jasonsa\tools\send-build-email.cmd %MSGTITLE% %MSGBODY%

 :skipEmail


Delete commit.bat

Delete commit.bat


Don't always re-install npm packages in utility script

npm causes issues as it spawns a new shell on Windows and thus prevents script-execution from continuing

ref.: https://github.com/npm/npm/issues/2938

--- gen-wiki.cmd
+++ gen-wiki.cmd
@@ -1,7 +1,7 @@
 REM @ECHO OFF
 PUSHD "%~dp0."
 PUSHD wiki
-npm install
+REM npm install
 node airbit.wiki.js
 POPD
 IF EXIST public\wiki RD /Q public\wiki


[*] правка параметра сборки

[*] правка параметра сборки

--- deploy.bat
+++ deploy.bat
@@ -1 +1 @@
-mvn clean javadoc:javadoc scm-publish:publish-scm deploy
+mvn -f pom-javadoc.xml clean javadoc:javadoc scm-publish:publish-scm deploy


added rimrafing once again

added rimrafing once again

--- deploy.cmd
+++ deploy.cmd
@@ -100,6 +100,8 @@
 :: 3. Install npm packages
 IF EXIST "%DEPLOYMENT_TARGET%\package.json" (
   pushd "%DEPLOYMENT_TARGET%"
+  call :ExecuteCmd !NPM_CMD! install rimraf -g
+  call :ExecuteCmd rimraf dist node_modules
   call :ExecuteCmd !NPM_CMD! install
   IF !ERRORLEVEL! NEQ 0 goto error
   popd


test Precompiled

test Precompiled

--- deploy.cmd
+++ deploy.cmd
@@ -78,7 +78,7 @@
 IF /I "%IN_PLACE_DEPLOYMENT%" NEQ "1" (
   call :ExecuteCmd "%MSBUILD_PATH%" "%DEPLOYMENT_SOURCE%\src\Orchard.Web\Orchard.Web.csproj" /nologo /verbosity:m /t:Build /t:pipelinePreDeployCopyAllFilesToOneFolder /p:_PackageTempDir="%DEPLOYMENT_TEMP%";AutoParameterizationWebConfigConnectionStrings=false;Configuration=Release /p:SolutionDir="%DEPLOYMENT_SOURCE%\src\\" %SCM_BUILD_ARGS%
 ) ELSE (
-  call :ExecuteCmd "%MSBUILD_PATH%" "%DEPLOYMENT_SOURCE%\src\Orchard.Web\Orchard.Web.csproj" /nologo /verbosity:m /t:Build /p:AutoParameterizationWebConfigConnectionStrings=false;Configuration=Release /p:SolutionDir="%DEPLOYMENT_SOURCE%\src\\" %SCM_BUILD_ARGS%
+  call :ExecuteCmd "%MSBUILD_PATH%" "%DEPLOYMENT_SOURCE%\src\Orchard.Web\Orchard.Web.csproj" /nologo /verbosity:m /t:Precompiled /p:AutoParameterizationWebConfigConnectionStrings=false;Configuration=Release /p:SolutionDir="%DEPLOYMENT_SOURCE%\src\\" %SCM_BUILD_ARGS%
 )

 IF !ERRORLEVEL! NEQ 0 goto error


Fixing cmd to have the correct comparison.

--- deploy.cmd
+++ deploy.cmd
@@ -1,11 +1,11 @@
-if (%APP% == "api")
+if ("%APP%" == "api")
     call ".\src\dotnet\deploy-api.cmd"

-if (%APP% == "mvc")
+if ("%APP%" == "mvc")
     call ".\src\dotnet\deploy-mvc.cmd"

-if (%APP% == "angular")
+if ("%APP%" == "angular")
     call ".\src\angular\deploy.cmd"

-if (%APP% == "react")
+if ("%APP%" == "react")
     call ".\src\react\deploy.cmd"


fix kudu

fix kudu

--- deploy.cmd
+++ deploy.cmd
@@ -88,21 +88,21 @@
 :Deployment
 echo Handling node.js deployment.

-:: 1. KuduSync
+echo 1. Select node version
+call :SelectNodeVersion
+
+echo 2. Install npm packages
+IF EXIST "%DEPLOYMENT_SOURCE%\package.json" (
+  pushd "%DEPLOYMENT_SOURCE%"
+  call :ExecuteCmd !NPM_CMD! install --production -d
+  IF !ERRORLEVEL! NEQ 0 goto error
+  popd
+)
+
+echo 3. KuduSync
 IF /I "%IN_PLACE_DEPLOYMENT%" NEQ "1" (
   call :ExecuteCmd "%KUDU_SYNC_CMD%" -v 50 -f "%DEPLOYMENT_SOURCE%" -t "%DEPLOYMENT_TARGET%" -n "%NEXT_MANIFEST_PATH%" -p "%PREVIOUS_MANIFEST_PATH%" -i ".git;.hg;.deployment;deploy.cmd"
   IF !ERRORLEVEL! NEQ 0 goto error
-)
-
-:: 2. Select node version
-call :SelectNodeVersion
-
-:: 3. Install npm packages
-IF EXIST "%DEPLOYMENT_TARGET%\package.json" (
-  pushd "%DEPLOYMENT_TARGET%"
-  call :ExecuteCmd !NPM_CMD! install --production -d
-  IF !ERRORLEVEL! NEQ 0 goto error
-  popd
 )

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


fix to find global.json in azure deployment build

--- deploy.cmd
+++ deploy.cmd
@@ -75,6 +75,9 @@
 echo Storing Git Version Info for Runtime Display
 call :ExecuteCmd PowerShell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command "(Get-Content AllReadyApp\Web-App\AllReady\version.json).replace('GITVERSION', (git rev-parse --short HEAD)) | Set-Content AllReadyApp\Web-App\AllReady\version.json"

+echo Moving In to AllReadyApp Directory
+pushd "%DEPLOYMENT_SOURCE%\AllReadyApp"
+
 echo Building AllReady.Core Project (project.json)
 call :ExecuteCmd dotnet build "%DEPLOYMENT_SOURCE%\AllReadyApp\AllReady.Core\project.json" --configuration Debug
 IF !ERRORLEVEL! NEQ 0 goto error
@@ -89,6 +92,9 @@
 echo Publishing Allready Project (project.json) which includes building it
 call :ExecuteCmd dotnet publish "%DEPLOYMENT_SOURCE%\AllReadyApp\Web-App\AllReady" --output "%DEPLOYMENT_TEMP%" --configuration Debug
 IF !ERRORLEVEL! NEQ 0 goto error
+
+echo Moving Out of AllReadyApp Directory
+popd

 :: 2c. Publish WebJobs (AllReady.NotificationsWebJob)
 echo Publishing AllReady.NotificationsWebJob WebJob


Trying some stuff. Getting there!

Trying some stuff. Getting there!

--- deploy.cmd
+++ deploy.cmd
@@ -56,9 +56,14 @@

 :: 1. KuduSync
 IF /I "%IN_PLACE_DEPLOYMENT%" NEQ "1" (
-
-  :: hexo generate
-  call :ExecuteCmd "%KUDU_SYNC_CMD%" -v 50 -f "%DEPLOYMENT_SOURCE%" -t "%DEPLOYMENT_TARGET%" -n "%NEXT_MANIFEST_PATH%" -p "%PREVIOUS_MANIFEST_PATH%" -i ".git;.hg;.deployment;deploy.cmd"
+
+  echo Generating hexo blog
+  hexo generate
+
+  echo Executing Kudu Sync
+  echo - Source: %DEPLOYMENT_SOURCE%
+  echo - Target: %DEPLOYMENT_TARGET%
+  call :ExecuteCmd "%KUDU_SYNC_CMD%" -v 50 -f "%DEPLOYMENT_SOURCE%" -t "%DEPLOYMENT_TARGET%" -n "%NEXT_MANIFEST_PATH%" -p "%PREVIOUS_MANIFEST_PATH%" -i "node_modules;.git;.hg;.deployment;deploy.cmd"
   IF !ERRORLEVEL! NEQ 0 goto error
 )


Added PostgreSQL 8.4.22

Added PostgreSQL 8.4.22

error: pathspec 'PostgreSQLPortable/App/PgSQL/pgsql.cmd' did not match any file(s) known to git

--- PostgreSQLPortable/App/PgSQL/pgsql.cmd
+++ PostgreSQLPortable/App/PgSQL/pgsql.cmd
@@ -0,0 +1,37 @@
+@echo off
+title PostgreSQL 8.4
+cls
+
+:: set default code page
+chcp 1252 > nul
+
+:: find base directories
+for %%? in ("%~dp0..\..") do set APPBASE=%%~f?
+for %%? in ("%~dp0..\..\..") do set BASE=%%~f?
+
+:: set up postgres variables
+set PGSQL=%APPBASE%\App\PgSQL
+set PGDATA=%APPBASE%\Data\data
+set PGLOG=%APPBASE%\Data\log.txt
+set PGLOCALEDIR=%PGSQL%\share\
+set PGDATABASE=postgres
+set PGUSER=postgres
+set PATH=%PGSQL%\bin;%PATH%
+
+:: initialise a new database on first use
+if not exist "%PGDATA%" (
+    echo.
+    echo Initialising database for first use, please wait...
+    "%PGSQL%\bin\initdb" -U %PGUSER% -A trust -E utf8 --locale=C >nul
+)
+
+:: startup postgres server
+echo.
+"%PGSQL%\bin\pg_ctl" -D "%PGDATA%" -l "%PGLOG%" -w start
+cls
+echo.
+echo Type \q to quit and shutdown server
+echo.
+"%PGSQL%\bin\psql.exe"
+echo.
+"%PGSQL%\bin\pg_ctl" -D "%PGDATA%" stop


Fri 06/13/2014 22:00:49

Fri 06/13/2014 22:00:49

--- lib/tor-tun.bat
+++ lib/tor-tun.bat
@@ -40,7 +40,6 @@
 (echo %DefaultIPGateway% | find "10.177." ) || set DefaultIPGateway=%torIP%
 if not "%torIP%"=="127.0.0.1" ( curl -m 10 --proxy socks5h://%torIP%:9150 http://74.125.224.72 -o NUL || nc -z %torIP% 9150 ) && (
   start cmd /c "%meshr:/=\%\bin\sleep 5 && %meshr:/=\%\lib\DNS2SOCKS.bat %torIP% "%NetConnectionID%" "%IPAddress%" %DefaultIPGateway% "
-  badvpn-tun2socks --tundev "tap0901:%NetConnectionID%:10.177.254.1:10.177.254.0:255.255.255.0" --netif-ipaddr 10.177.254.2 --netif-netmask 255.255.255.0 --socks-server-addr %torIP%:9150
-  exit
+  start bin\badvpn-tun2socks --tundev "tap0901:%NetConnectionID%:10.177.254.1:10.177.254.0:255.255.255.0" --netif-ipaddr 10.177.254.2 --netif-netmask 255.255.255.0 --socks-server-addr %torIP%:9150
   rem if TODO BTap_Init failed then enable interface
 )


Fixed copy command

Fixed copy command

--- Windows/create-image.bat
+++ Windows/create-image.bat
@@ -8,7 +8,7 @@
 echo Extracting...
 wit extract . --DEST ./accf-data/ --wiimmfi --psel=DATA -ovv

-cp ./accf-data/disc/header.bin header.bin
+copy /b ./accf-data/disc/header.bin header.bin

 version.exe header.bin && wit id6 . > version.txt
 set /p VERSION=<version.txt


I think I'm using twistd wrong

I think I'm using twistd wrong

--- MultiServer.bat
+++ MultiServer.bat
@@ -1 +1 @@
-twistd -y MultiServer.tac+python C:\Python27\Lib\site-packages\twisted\scripts\twistd.py -noy C:\Users\Hubbe\Documents\GitHub\Hubbot_Twisted\MultiServer.tac


Attempt at Publish fix.

Attempt at Publish fix.

--- Publish-All.bat
+++ Publish-All.bat
@@ -1,2 +1,6 @@
 @echo off
-powershell "Set-ExecutionPolicy RemoteSigned Process; .\#build\Publish-All.ps1"+set powershell=powershell
+set sysnative="%SystemRoot%\sysnative\WindowsPowerShell\v1.0\powershell.exe"
+if exist %sysnative% (set powershell=%sysnative%)
+
+%powershell% "Set-ExecutionPolicy RemoteSigned Process; .\#build\Publish-All.ps1"


INTEGRATION: CWS jl2 (1.12.48); FILE MERGED 2004/07/26 09:56:31 jl 1.12.48.2: RESYNC: (1.12-1.13); FILE MERGED 2003/11/11 10:00:07 jl 1.12.48.1: #i22191# integratring Cli-uno examples into SDK

--- odk/setsdkenv_windows.bat
+++ odk/setsdkenv_windows.bat
@@ -22,6 +22,10 @@
 REM Directory of the C++ tools.
 REM Example:set OO_SDK_CPP_HOME=C:\Programme\Microsoft Visual Studio\VC98\bin
 set OO_SDK_CPP_HOME=
+
+REM Directory of the C# and VB.NET compilers.
+REM Example:set OO_SDK_CLI_HOME=C:\WINXP\Microsoft.NET\Framework\v1.0.3705
+set OO_SDK_CLI_HOME=

 REM Java installation directory.
 REM Example: set OO_SDK_JAVA_HOME=c:\j2sdk1.4.1_01
@@ -85,6 +89,9 @@
 REM Add directory of the C++ tools to the path, if necessary.
 if defined OO_SDK_CPP_HOME set PATH=%OO_SDK_CPP_HOME%;%PATH%

+REM Add directory of the C# and VB.NET compilers to the path, if necessary.
+if defined OO_SDK_CLI_HOME set PATH=%OO_SDK_CLI_HOME%;%PATH%
+
 REM Add directory of the Java tools to the path, if necessary.
 if defined OO_SDK_JAVA_HOME set PATH=%OO_SDK_JAVA_HOME%\bin;%OO_SDK_JAVA_HOME%\jre\bin;%PATH%


FIXED: процедура установки не везде вызывала dos2unix

dos2unix натыкался на отсутствующий файл */*/*.srefi и прерывал работу,
из-за чего скрипты в папке scripts не конвертировались.

Теперь dos2unix для каждой маски файлов вызывается отдельно, что
предотвращает пропуск последующих масок, если одна из них окажется
некорректной.

--- make-setup/make-setup.bat
+++ make-setup/make-setup.bat
@@ -38,7 +38,14 @@
   for %%f in (..\..\distrib\*) do copy %%f %%~nxf
   for /d %%d in (..\..\distrib\*) do xcopy /e /i /y %%d %%~nxd

-  dos2unix bin/* bootstrap.* clear.* */*.cpp */*/*.froms */*/*.refi */*/*.srefi scripts/*
+  dos2unix bin/*
+  dos2unix bootstrap.*
+  dos2unix clear.*
+  dos2unix */*.cpp
+  dos2unix */*/*.froms
+  dos2unix */*/*.refi
+  dos2unix scripts/*
+
   erase c-plus-plus.conf.* .gitignore

   if exist c-plus-plus.conf.bat erase c-plus-plus.conf.bat


documentation

documentation

--- open_ipython_notebook.bat
+++ open_ipython_notebook.bat
@@ -12,4 +12,4 @@

 :nextn:
 set path=%path%;%pythonexe%;%pythonexe%\Scripts
-ipython3 notebook --notebook-dir=_doc\notebooks+ipython3 notebook --notebook-dir=_doc\notebooks --matplotlib=inline


ci: change to plugin directory before calling action-install script

--- action-install-plugins-windows.bat
+++ action-install-plugins-windows.bat
@@ -11,10 +11,13 @@
 set slug=%1
 echo "plugin: %slug%"
 set plugin_project=%slug:*/=%
-set plugin_dir=plugins/%plugin_project:librime-=%
+set plugin_dir=plugins\%plugin_project:librime-=%
 git clone --depth 1 "https://github.com/%slug%.git" %plugin_dir%
 if errorlevel 1 exit /b
 if exist %plugin_dir%\action-install.bat (
-  call %plugin_dir%\action-install.bat
+  pushd %plugin_dir%
+  call action-install.bat
+  if errorlevel 1 exit /b
+  popd
 )
 exit /b


do not create symbol packages

do not create symbol packages

--- src/package.cmd
+++ src/package.cmd
@@ -7,9 +7,9 @@
 .nuget\NuGet.exe pack Premotion.Mansion.Web\Premotion.Mansion.Web.nuspec
 .nuget\NuGet.exe pack Premotion.Mansion.Web.Portal\Premotion.Mansion.Web.Portal.nuspec

-%windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe Premotion.Mansion.sln /t:Clean,Rebuild /p:Configuration=Debug /fileLogger
-.nuget\NuGet.exe pack Premotion.Mansion.Amazon\Premotion.Mansion.Amazon.symbols.nuspec -Symbols
-.nuget\NuGet.exe pack Premotion.Mansion.Core\Premotion.Mansion.Core.symbols.nuspec -Symbols
-.nuget\NuGet.exe pack Premotion.Mansion.Repository.SqlServer\Premotion.Mansion.Repository.SqlServer.symbols.nuspec -Symbols
-.nuget\NuGet.exe pack Premotion.Mansion.Web\Premotion.Mansion.Web.symbols.nuspec -Symbols
-.nuget\NuGet.exe pack Premotion.Mansion.Web.Portal\Premotion.Mansion.Web.Portal.symbols.nuspec -Symbols+# %windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe Premotion.Mansion.sln /t:Clean,Rebuild /p:Configuration=Debug /fileLogger
+# .nuget\NuGet.exe pack Premotion.Mansion.Amazon\Premotion.Mansion.Amazon.symbols.nuspec -Symbols
+# .nuget\NuGet.exe pack Premotion.Mansion.Core\Premotion.Mansion.Core.symbols.nuspec -Symbols
+# .nuget\NuGet.exe pack Premotion.Mansion.Repository.SqlServer\Premotion.Mansion.Repository.SqlServer.symbols.nuspec -Symbols
+# .nuget\NuGet.exe pack Premotion.Mansion.Web\Premotion.Mansion.Web.symbols.nuspec -Symbols
+# .nuget\NuGet.exe pack Premotion.Mansion.Web.Portal\Premotion.Mansion.Web.Portal.symbols.nuspec -Symbols


Fix Cmder issue #2290

Fix Cmder issue #2290

--- vendor/init.bat
+++ vendor/init.bat
@@ -124,10 +124,10 @@

 :: Pick right version of clink
 if "%PROCESSOR_ARCHITECTURE%"=="x86" (
-    set architecture=86
+    set clink_architecture=x86
     set architecture_bits=32
 ) else (
-    set architecture=64
+    set clink_architecture=x64
     set architecture_bits=64
 )

@@ -141,14 +141,14 @@
       copy "%CMDER_ROOT%\vendor\clink_settings.default" "%CMDER_USER_CONFIG%\settings"
       echo Additional *.lua files in "%CMDER_USER_CONFIG%" are loaded on startup.\
     )
-    "%CMDER_ROOT%\vendor\clink\clink_x%architecture%.exe" inject --quiet --profile "%CMDER_USER_CONFIG%" --scripts "%CMDER_ROOT%\vendor"
+    "%CMDER_ROOT%\vendor\clink\clink_%clink_architecture%.exe" inject --quiet --profile "%CMDER_USER_CONFIG%" --scripts "%CMDER_ROOT%\vendor"
   ) else (
     if not exist "%CMDER_ROOT%\config\settings" (
       echo Generating clink initial settings in "%CMDER_ROOT%\config\settings"
       copy "%CMDER_ROOT%\vendor\clink_settings.default" "%CMDER_ROOT%\config\settings"
       echo Additional *.lua files in "%CMDER_ROOT%\config" are loaded on startup.
     )
-    "%CMDER_ROOT%\vendor\clink\clink_x%architecture%.exe" inject --quiet --profile "%CMDER_ROOT%\config" --scripts "%CMDER_ROOT%\vendor"
+    "%CMDER_ROOT%\vendor\clink\clink_%clink_architecture%.exe" inject --quiet --profile "%CMDER_ROOT%\config" --scripts "%CMDER_ROOT%\vendor"
   )
 ) else (
   %lib_console% verbose_output "WARNING: Incompatible 'ComSpec/Shell' Detetected Skipping Clink Injection!"
@@ -374,4 +374,4 @@
 if %time_init% gtr 0 (
   "%cmder_root%\vendor\bin\timer.cmd" %CMDER_INIT_START% %CMDER_INIT_END%
 )
-exit /b+exit /b


Make sure any folder called "template" is copied on windows - fixes https://github.com/jasp-stats/jasp-test-release/issues/823 (pptx save fails) - maybe we should just stop stripping R on windows?

--- Tools/copyR.cmd
+++ Tools/copyR.cmd
@@ -68,6 +68,10 @@
     if exist %SOURCEDIR%\library\%%G\icc  ( XCOPY %SOURCEDIR%\library\%%G\icc  /Q /E /I icc >nul )

 	if exist %SOURCEDIR%\library\%%G\shinythemes  ( XCOPY %SOURCEDIR%\library\%%G\shinythemes  /Q /E /I shinythemes >nul )
+
+	rem for issue https://github.com/jasp-stats/jasp-test-release/issues/823
+	if exist %SOURCEDIR%\library\%%G\template  	  ( XCOPY %SOURCEDIR%\library\%%G\template     /Q /E /I template    >nul )
+

     rem for issue https://github.com/jasp-stats/jasp-test-release/issues/416#issuecomment-591899068
     if "%%G"=="viridisLite"               ( XCOPY %SOURCEDIR%\library\%%G\data /Q /E /I data >nul )


commit on 24/03/2018 at 15:40:47

commit on 24/03/2018 at 15:40:47

--- windows-cmd/startRVESimPipeLPC.cmd
+++ windows-cmd/startRVESimPipeLPC.cmd
@@ -1 +1 @@
-cd C:/Abaqus_WD/CurvedInterface && abaqus CAE noGUI=C:/02_Local-folder/01_Luca/01_WD/thinPlyMechanics/python/createAndAnalyzeRVEs.py -- -dir C:/Users/lucad/OneDrive/01_Luca/07_DocMASE/07_Data/03_FEM/InputData -data inputRVEdataL1_0992-LPC.deck -iterables inputRVEiterablesL1_0992-LPC.deck -plot inputRVEplot
+cd C:/Abaqus_WD/CurvedInterface && abaqus CAE noGUI=C:/02_Local-folder/01_Luca/01_WD/thinPlyMechanics/python/createAndAnalyzeRVEs.py -- -dir C:/Users/lucad/OneDrive/01_Luca/07_DocMASE/07_Data/03_FEM/InputData -data inputRVEdataL1_195-LPC.deck -iterables inputRVEiterablesL1_195-LPC.deck -plot inputRVEplot


Fix change of syntax and test with V2018

--- src/windows/V2018/TestPublishV2018.bat
+++ src/windows/V2018/TestPublishV2018.bat
@@ -41,12 +41,12 @@
     echo Getting catalogs for %%i organization
 	for /F %%j in ('%APIC_EXE_Full_PATH% catalogs:list -o %%i -s %APIC_SRV%') do (
 		if "%SCRIPT_DEBUG%"=="1" echo catalog %%j
-		for /f "tokens=6 delims=/" %%a in ("%%j") do (
+		for /f %%a in ("%%j") do (
 			echo Getting list of products from %%a catalog
-			for /F %%k in ('%APIC_EXE_Full_PATH% products:list-all -c %%a -o %%i -s %APIC_SRV%') do (
+			for /F %%k in ('%APIC_EXE_Full_PATH% products:list-all -c %%a -o %%i -s %APIC_SRV% --scope catalog') do (
 				echo Product: %%k
 			)
-			for /F %%k in ('%APIC_EXE_Full_PATH% apis:list-all -c %%a -o %%i -s %APIC_SRV%') do (
+			for /F %%k in ('%APIC_EXE_Full_PATH% apis:list-all -c %%a -o %%i -s %APIC_SRV% --scope catalog') do (
 				echo API: %%k
 			)
 		)
@@ -77,11 +77,11 @@
     echo Getting catalogs for %%i organization
 	for /F %%j in ('%APIC_EXE_Full_PATH% catalogs:list -o %%i -s %APIC_SRV%') do (
 		@rem if "%SCRIPT_DEBUG%"=="1" echo catalog %%j
-		for /f "tokens=6 delims=/" %%a in ("%%j") do (
+		for /F  %%a in ("%%j") do (
 			if not exist "%%a" mkdir %%a
 			pushd %%a
 			echo Extracting products from %%a catalog
-			cmd /c %APIC_EXE_Full_PATH% products:clone -c %%a -o %%i -s %APIC_SRV%
+			cmd /c %APIC_EXE_Full_PATH% products:clone -c %%a -o %%i -s %APIC_SRV% --scope catalog
 			popd
 		)
 	)


Improved target detection for msvcbuild.bat.

--- src/msvcbuild.bat
+++ src/msvcbuild.bat
@@ -30,12 +30,11 @@
   %LJMT% -manifest minilua.exe.manifest -outputresource:minilua.exe

 @set DASMFLAGS=-D WIN -D JIT -D FFI
-@set DASMX64=-D X64
-@if defined CPU goto :XCPU
-@set CPU=%PROCESSOR_ARCHITECTURE%
-:XCPU
+@set DASMX64=-D P64
+@if "%TARGET_CPU%"=="AMD64" goto :X64
+@if "%TARGET_CPU%"=="x64" goto :X64
 @if "%CPU%"=="AMD64" goto :X64
-@if "%CPU%"=="X64" goto :X64
+@if "%CPU%"=="x64" goto :X64
 @set DASMX64=
 :X64
 minilua %DASM% -LN %DASMFLAGS% %DASMX64% -o host\buildvm_arch.h vm_x86.dasc


Delete deploy_win.bat

Delete deploy_win.bat


Temporarily disable multithreaded on Jenkins for Windows.

This is to address random crashes with error 1033 like the following:
scons: *** [out\windows\amd64\debug\resource\IPCA\unittests\utresource\ipca\unittests\ipcatests] Error 1033

Change-Id: I4d2d47b495091fe325a7fe82b26fdf3a0e438ccb
Signed-off-by: Soemin Tjong <3568098a2f7652f8955d8972f2edda282f25325b@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/18099
Tested-by: jenkins-iotivity <d95b56ce41a2e1ac4cecdd398defd7414407cc08@iotivity.org>
Reviewed-by: Alex Kelley <b715314911e4c2b690fc64ea4cf8f2f989d18c99@microsoft.com>
Reviewed-by: Dan Mihai <ba8e1833495515b49ded9e20cae80a8129155aa9@microsoft.com>

--- run.bat
+++ run.bat
@@ -45,7 +45,16 @@
   set MULTIPLE_OWNER=1
 )

-set THREAD_COUNT=%NUMBER_OF_PROCESSORS%
+REM  Temporary solution to build single threaded in Jenkins to fix random build break.
+REM  This change will be reverted after pywin is installed in Jenkins and problem is confirmed fixed.
+REM  Difference between multi and single threaded Jenkins build for Windows is 5 minutes.
+REM  Tracking revert: https://jira.iotivity.org/browse/IOT-1948.
+if "%JENKINS_HOME%" == "" (
+  set THREAD_COUNT=%NUMBER_OF_PROCESSORS%
+) else (
+  set THREAD_COUNT=1
+)
+
 set ROUTING=EP
 set WITH_UPSTREAM_LIBCOAP=1
 set BINDIR=debug


fix typo in build.win.bat (sigh).  it would be nice if this was easier to test.. ===VersionHistory:None===

--- nmi_tools/glue/build/build.win.bat
+++ nmi_tools/glue/build/build.win.bat
@@ -26,7 +26,7 @@
 set ACTIVE_PERL_DIR=%_NMI_PREREQ_ActivePerl_ROOT%
 if NOT "~%ACTIVE_PERL_DIR%"=="~" goto got_active_perl
 :: Look for active perl in the registry
-for /F "tokens=3" %%I in('reg query HKLM\Software\Perl /v BinDir') do set ACTIVE_PERL_DIR=%%~sdpI
+for /F "tokens=3" %%I in ('reg query HKLM\Software\Perl /v BinDir') do set ACTIVE_PERL_DIR=%%~sdpI
 if NOT "~%ACTIVE_PERL_DIR%"=="~" goto got_active_perl
 :: look for perl in the path. this is dangerous, because we can't use cygwin perl. builds require active perl
 for %%I in (perl.exe) do set ACTIVE_PERL_DIR=%%~sdp$PATH:I


libuv build fix

libuv build fix

--- src/third_party/libuv-build.bat
+++ src/third_party/libuv-build.bat
@@ -1,5 +1,5 @@
-"c:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE\devenv.com" /build "Debug|x64" libuv\uv.sln
-"c:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE\devenv.com" /build "Release|x64" libuv\uv.sln
+"c:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\IDE\devenv.com" /build "Debug|x64" libuv\uv.sln
+"c:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\IDE\devenv.com" /build "Release|x64" libuv\uv.sln

 copy /y libuv\x64\Release\libuv.lib


Keep ssh state and execution modules in the installer

--- pkg/windows/build_pkg.bat
+++ pkg/windows/build_pkg.bat
@@ -386,8 +386,6 @@
     del /Q "%BinDir%\Lib\site-packages\salt\modules\solaris*" 1>nul
 If Exist "%BinDir%\Lib\site-packages\salt\modules\solr.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\solr.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\modules\ssh_*"^
-    del /Q "%BinDir%\Lib\site-packages\salt\modules\ssh_*" 1>nul
 If Exist "%BinDir%\Lib\site-packages\salt\modules\supervisord.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\supervisord.*" 1>nul
 If Exist "%BinDir%\Lib\site-packages\salt\modules\sysbench.py"^
@@ -522,8 +520,6 @@
     del /Q "%BinDir%\Lib\site-packages\salt\states\smartos.*" 1>nul
 If Exist "%BinDir%\Lib\site-packages\salt\states\snapper.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\states\snapper.*" 1>nul
-If Exist "%BinDir%\Lib\site-packages\salt\states\ssh_*"^
-    del /Q "%BinDir%\Lib\site-packages\salt\states\ssh_*" 1>nul
 If Exist "%BinDir%\Lib\site-packages\salt\states\supervisord.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\states\supervisord.*" 1>nul
 If Exist "%BinDir%\Lib\site-packages\salt\states\sysrc.py"^


Build into virtual environment of Conda

Build into virtual environment of Conda

--- contrib/packaging-python/conda/bld.bat
+++ contrib/packaging-python/conda/bld.bat
@@ -7,6 +7,7 @@

 REM Configure step
 cmake -G "%CMAKE_GENERATOR%" ^
+ -DCMAKE_INSTALL_PREFIX="%PREFIX%" ^
  -DPYTHON_EXECUTABLE:FILEPATH="%PYTHON%" ^
  -DPYTHON_INCLUDE_DIR:PATH="%PREFIX%"/include ^
  -DPYTHON_LIBRARY:FILEPATH="%PREFIX%"/libs/python%MY_PY_VER%.lib ^


Added silent removal in windows symlink creation script (#547)

--- bin/create-windows-symlinks.cmd
+++ bin/create-windows-symlinks.cmd
@@ -4,10 +4,10 @@

 cd dist-dev

-del client
-del themes
-del vendor
-del packages
+del /f /q client
+del /f /q themes
+del /f /q vendor
+del /f /q packages

 mklink /D client ..\src\client
 mklink /D themes ..\dist\themes


Update run-test script

Update run-test script

--- tests/run-tests.bat
+++ tests/run-tests.bat
@@ -1 +1 @@
-"../vendor/bin/tester.bat" -c php.ini %*+"../vendor/bin/tester" -c php.ini .


Add a windows batch file for building the documentation

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

--- docs/make.bat
+++ docs/make.bat
@@ -0,0 +1,170 @@
+@ECHO OFF
+
+REM Command file for Sphinx documentation
+
+if "%SPHINXBUILD%" == "" (
+	set SPHINXBUILD=sphinx-build
+)
+set BUILDDIR=build
+set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS% source
+if NOT "%PAPER%" == "" (
+	set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS%
+)
+
+if "%1" == "" goto help
+
+if "%1" == "help" (
+	:help
+	echo.Please use `make ^<target^>` where ^<target^> is one of
+	echo.  html       to make standalone HTML files
+	echo.  dirhtml    to make HTML files named index.html in directories
+	echo.  singlehtml to make a single large HTML file
+	echo.  pickle     to make pickle files
+	echo.  json       to make JSON files
+	echo.  htmlhelp   to make HTML files and a HTML help project
+	echo.  qthelp     to make HTML files and a qthelp project
+	echo.  devhelp    to make HTML files and a Devhelp project
+	echo.  epub       to make an epub
+	echo.  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter
+	echo.  text       to make text files
+	echo.  man        to make manual pages
+	echo.  changes    to make an overview over all changed/added/deprecated items
+	echo.  linkcheck  to check all external links for integrity
+	echo.  doctest    to run all doctests embedded in the documentation if enabled
+	goto end
+)
+
+if "%1" == "clean" (
+	for /d %%i in (%BUILDDIR%\*) do rmdir /q /s %%i
+	del /q /s %BUILDDIR%\*
+	goto end
+)
+
+if "%1" == "html" (
+	%SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The HTML pages are in %BUILDDIR%/html.
+	goto end
+)
+
+if "%1" == "dirhtml" (
+	%SPHINXBUILD% -b dirhtml %ALLSPHINXOPTS% %BUILDDIR%/dirhtml
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The HTML pages are in %BUILDDIR%/dirhtml.
+	goto end
+)
+
+if "%1" == "singlehtml" (
+	%SPHINXBUILD% -b singlehtml %ALLSPHINXOPTS% %BUILDDIR%/singlehtml
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The HTML pages are in %BUILDDIR%/singlehtml.
+	goto end
+)
+
+if "%1" == "pickle" (
+	%SPHINXBUILD% -b pickle %ALLSPHINXOPTS% %BUILDDIR%/pickle
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished; now you can process the pickle files.
+	goto end
+)
+
+if "%1" == "json" (
+	%SPHINXBUILD% -b json %ALLSPHINXOPTS% %BUILDDIR%/json
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished; now you can process the JSON files.
+	goto end
+)
+
+if "%1" == "htmlhelp" (
+	%SPHINXBUILD% -b htmlhelp %ALLSPHINXOPTS% %BUILDDIR%/htmlhelp
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished; now you can run HTML Help Workshop with the ^
+.hhp project file in %BUILDDIR%/htmlhelp.
+	goto end
+)
+
+if "%1" == "qthelp" (
+	%SPHINXBUILD% -b qthelp %ALLSPHINXOPTS% %BUILDDIR%/qthelp
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished; now you can run "qcollectiongenerator" with the ^
+.qhcp project file in %BUILDDIR%/qthelp, like this:
+	echo.^> qcollectiongenerator %BUILDDIR%\qthelp\traitsml.qhcp
+	echo.To view the help file:
+	echo.^> assistant -collectionFile %BUILDDIR%\qthelp\traitsml.ghc
+	goto end
+)
+
+if "%1" == "devhelp" (
+	%SPHINXBUILD% -b devhelp %ALLSPHINXOPTS% %BUILDDIR%/devhelp
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished.
+	goto end
+)
+
+if "%1" == "epub" (
+	%SPHINXBUILD% -b epub %ALLSPHINXOPTS% %BUILDDIR%/epub
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The epub file is in %BUILDDIR%/epub.
+	goto end
+)
+
+if "%1" == "latex" (
+	%SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished; the LaTeX files are in %BUILDDIR%/latex.
+	goto end
+)
+
+if "%1" == "text" (
+	%SPHINXBUILD% -b text %ALLSPHINXOPTS% %BUILDDIR%/text
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The text files are in %BUILDDIR%/text.
+	goto end
+)
+
+if "%1" == "man" (
+	%SPHINXBUILD% -b man %ALLSPHINXOPTS% %BUILDDIR%/man
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The manual pages are in %BUILDDIR%/man.
+	goto end
+)
+
+if "%1" == "changes" (
+	%SPHINXBUILD% -b changes %ALLSPHINXOPTS% %BUILDDIR%/changes
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.The overview file is in %BUILDDIR%/changes.
+	goto end
+)
+
+if "%1" == "linkcheck" (
+	%SPHINXBUILD% -b linkcheck %ALLSPHINXOPTS% %BUILDDIR%/linkcheck
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Link check complete; look for any errors in the above output ^
+or in %BUILDDIR%/linkcheck/output.txt.
+	goto end
+)
+
+if "%1" == "doctest" (
+	%SPHINXBUILD% -b doctest %ALLSPHINXOPTS% %BUILDDIR%/doctest
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Testing of doctests in the sources finished, look at the ^
+results in %BUILDDIR%/doctest/output.txt.
+	goto end
+)
+
+:end


MOB-1992: mmx windows installation. Updated mmx-console.bat to use the bundled nodejs if it is available

Former-commit-id: fcb8a2b9b29fa38cb7da909786ac842008d7650d
Former-commit-id: cba4ab106cc3f92b1ffd1696f0f6f3f264256aa4
Former-commit-id: f86792040371dbec1fa800c06a138847f9e60805
Former-commit-id: fe56ed3394f635441edc68e86b5b042eb35d910f

--- mmx-console.bat
+++ mmx-console.bat
@@ -7,6 +7,7 @@
 set check_port=true
 set TITLE="MagnetMessagingConsole"
 set PROG="mmx-console"
+set whichnode=bundle

 if "%selfWrapped%"=="" (
@@ -60,7 +61,12 @@
 		echo Error! %PROG% is already running or you have a stale pid file. If %PROG% is not running delete %PROG%.pid file and try again.
 		exit 1
 	)
-	start %TITLE% node start.js
+	if bundle==%whichnode% (
+		start %TITLE% .\node start.js
+	) else (
+		start %TITLE% node start.js
+	)
+	timeout /t 3
 	FOR /F "usebackq tokens=2" %%i IN (`tasklist /nh /fi "WINDOWTITLE eq %TITLE%"`) DO echo %%i > .\%PROG%.pid
 goto :end

@@ -78,18 +84,28 @@

 :check_node
+	REM check in path
 	node -v 1>NUL 2>NUL
-	if 0 neq %ERRORLEVEL% (
-		if not exist "nodejs\node.exe" (
+	set nodeinpath=%ERRORLEVEL%
+
+	REM for the bundled node
+	.\node -v 1>NUL 2>NUL
+	set nodebundle=%ERRORLEVEL%
+
+
+	if 0 neq %nodebundle% (
+		if 0 neq %nodeinpath% (
 			echo node.js is not installed
-			echo MMX console needs node.js version 10.0 OR higher
+			echo MMX console needs node.js version 0.10.0 OR higher
 			echo Please check https://nodejs.org/download/
 			exit 1
 		) else (
 			echo node.js is installed
+			set whichnode=env
 		)
 	) else (
-			echo node.js is installed
+		echo node.js is available
+		set whichnode=bundle
 	)
 goto :eof


Upadate

Upadate

--- iCatalyst.bat
+++ iCatalyst.bat
@@ -815,13 +815,9 @@
 ::%3 - thread number
 :savelog
 setlocal
-::echo.%~0: %~2	%~z1
-set "ts=%~2"
-set "is=%~z1"
-call:division2 ts 1024 100
-call:division2 is 1024 100
-set /a "change=%is%-%ts%"
-call:perccalc %ts% %change% perc
+::echo.%~0[in]: %1	%~2	%~z1
+set /a "change=%~z1-%~2"
+call:perccalc %~2 %change% perc
 set /a "change=%~z1-%~2"
 >>"%logfile2%" echo.%~1;%~2;%~z1;%change%;%perc%;ok
 if %thread% equ 1 (
@@ -865,16 +861,16 @@
 ::%3 - 10^(number of decimal places) - (100 - 2 decimal places, 1000 - 3 decimal places, 1 - no decimals places)
 ::Return: integer value: %1=!%1!/%2*%3
 :division2
-setlocal
-1>nul 2>&1 set /a "int=!%1!/%2"
+::echo.%~0[in]: %~1=!%~1! %~2 %~3
+setlocal
+1>nul 2>&1 set /a "int=!%~1!/%~2"
 if %~3 equ 1 (
-	endlocal & set "%1=%int%" & exit /b
+	endlocal & set "%~1=%int%" & exit /b
 	exit /b
 )
-1>nul 2>&1 set /a "fractd=!%1!%%%2*%3/%2"
-if "%fractd:~,1%" equ "-" (set "fractd=%fractd:~1%")
-1>nul 2>&1 set /a "fractd=%3+%fractd%"
-endlocal & set "%1=%int%%fractd:~1%"
+1>nul 2>&1 set /a "fractd=!%~1!%%%~2*%~3/%~2"
+endlocal & set /a "%~1=%int%*%~3+(%fractd%)"
+::echo.%~0[out]: !%~1!
 exit /b

 :end


bat_7zip - add get_kam_folder call

bat_7zip - add get_kam_folder call

--- bat/bat_7zip.bat
+++ bat/bat_7zip.bat
@@ -1,5 +1,8 @@
 REM @SET kp_version=Alpha 7 wip
 REM call bat_get_kp_folder.bat
+
+@REM
+call bat_get_kam_folder.bat

 REM ============================================================
 REM Erase previous archive to make sure new one is made from scratch


Added the `all` profile.

Added the `all` profile.

--- qrelease.bat
+++ qrelease.bat
@@ -10,16 +10,16 @@

 echo Performing a full clean build.
 rem pause
-call mvn clean install -DperformRelease -Ptests
+call mvn clean install -DperformRelease -Pall
 echo Full clean build completed.
 rem pause

 echo Setting new version to %1.
 rem pause
-call mvn versions:set -Ptests -DnewVersion=%1
+call mvn versions:set -Pall -DnewVersion=%1
 echo Version was set to %1.
 rem pause
-call mvn versions:commit -Ptests
+call mvn versions:commit -Pall
 echo Version %1 committed.
 rem pause

@@ -31,7 +31,7 @@

 echo Performing a full clean build.
 rem pause
-call mvn clean install -Ptests -DperformRelease
+call mvn clean install -Pall -DperformRelease
 echo Full clean build completed.
 rem pause

@@ -62,10 +62,10 @@

 echo Setting new version to %2.
 rem pause
-call mvn versions:set -Ptests -DnewVersion=%2
+call mvn versions:set -Pall -DnewVersion=%2
 echo Version was set to %2.
 rem pause
-call mvn versions:commit -Ptests
+call mvn versions:commit -Pall
 echo Version %2 was committed.
 rem pause

@@ -77,7 +77,7 @@

 echo Performing a full clean build.
 rem pause
-call mvn clean install -DperformRelease -Ptests
+call mvn clean install -DperformRelease -Pall
 echo Full clean build completed.
 rem pause


Remove $id

Remove $id

git-svn-id: https://svn.apache.org/repos/asf/jakarta/jmeter/branches/rel-2-2@498483 13f79535-47bb-0310-9956-ffa450edef68

Former-commit-id: 66885ae59d5d24c3e313302b15d1a717527b4ff0

--- bin/jmeter-n.cmd
+++ bin/jmeter-n.cmd
@@ -1,6 +1,5 @@
 @echo off

-rem   $Id$
 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.


indent tools

indent tools

--- tools/stylecode.bat
+++ tools/stylecode.bat
@@ -1,7 +1,10 @@
 @echo off

-cmd /C "_stylehelper.bat .. cpp"
-cmd /C "_stylehelper.bat .. h"
-cmd /C "_stylehelper.bat .. hpp"
+cmd /C "_stylehelper.bat ..\src cpp"
+cmd /C "_stylehelper.bat ..\src h"
+cmd /C "_stylehelper.bat ..\src hpp"
+cmd /C "_stylehelper.bat ..\inc cpp"
+cmd /C "_stylehelper.bat ..\inc h"
+cmd /C "_stylehelper.bat ..\inc hpp"

 pause


build_llvm_package.bat: Run more tests

build_llvm_package.bat: Run more tests

git-svn-id: 0ff597fd157e6f4fc38580e8d64ab130330d2411@351436 91177308-0d34-0410-b5e6-96231b3b80d8

--- utils/release/build_llvm_package.bat
+++ utils/release/build_llvm_package.bat
@@ -54,7 +54,7 @@
 REM Setting CMAKE_CL_SHOWINCLUDES_PREFIX to work around PR27226.
 set cmake_flags=-DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_ASSERTIONS=ON -DLLVM_INSTALL_TOOLCHAIN_ONLY=ON -DCMAKE_INSTALL_UCRT_LIBRARIES=ON -DCLANG_FORMAT_VS_VERSION=%clang_format_vs_version% -DPACKAGE_VERSION=%package_version% -DLLDB_RELOCATABLE_PYTHON=1 -DLLDB_TEST_COMPILER=%cd%\build32_stage0\bin\clang.exe -DCMAKE_CL_SHOWINCLUDES_PREFIX="Note: including file: "

-REM TODO: Run all tests, including lld and compiler-rt.
+REM TODO: Run the "check-all" tests.

 set "VSCMD_START_DIR=%CD%"
 call "%vsdevcmd%" -arch=x86
@@ -66,7 +66,9 @@
 cmake -GNinja %cmake_flags% -DPYTHON_HOME=%python32_dir% -DCMAKE_BUILD_TYPE=MinSizeRel ..\llvm || exit /b
 ninja all || ninja all || ninja all || exit /b
 ninja check || ninja check || ninja check || exit /b
-ninja check-clang || ninja check-clang || ninja check-clang ||  exit /b
+ninja check-clang || ninja check-clang || ninja check-clang || exit /b
+ninja check-lld || ninja check-lld || ninja check-lld || exit /b
+ninja check-sanitizer || ninja check-sanitizer || ninja check-sanitizer || exit /b
 cd..

 mkdir build32
@@ -76,7 +78,9 @@
 cmake -GNinja %cmake_flags% -DPYTHON_HOME=%python32_dir% ..\llvm || exit /b
 ninja all || ninja all || ninja all || exit /b
 ninja check || ninja check || ninja check || exit /b
-ninja check-clang || ninja check-clang || ninja check-clang ||  exit /b
+ninja check-clang || ninja check-clang || ninja check-clang || exit /b
+ninja check-lld || ninja check-lld || ninja check-lld || exit /b
+ninja check-sanitizer || ninja check-sanitizer || ninja check-sanitizer || exit /b
 ninja package || exit /b
 cd ..

@@ -101,7 +105,9 @@
 cmake -GNinja %cmake_flags% -DPYTHON_HOME=%python64_dir% -DCMAKE_BUILD_TYPE=MinSizeRel ..\llvm || exit /b
 ninja all || ninja all || ninja all || exit /b
 ninja check || ninja check || ninja check || exit /b
-ninja check-clang || ninja check-clang || ninja check-clang ||  exit /b
+ninja check-clang || ninja check-clang || ninja check-clang || exit /b
+ninja check-lld || ninja check-lld || ninja check-lld || exit /b
+ninja check-sanitizer || ninja check-sanitizer || ninja check-sanitizer || exit /b
 cd..

 mkdir build64
@@ -111,6 +117,8 @@
 cmake -GNinja %cmake_flags% -DPYTHON_HOME=%python64_dir% ..\llvm || exit /b
 ninja all || ninja all || ninja all || exit /b
 ninja check || ninja check || ninja check || exit /b
-ninja check-clang || ninja check-clang || ninja check-clang ||  exit /b
+ninja check-clang || ninja check-clang || ninja check-clang || exit /b
+ninja check-lld || ninja check-lld || ninja check-lld || exit /b
+ninja check-sanitizer || ninja check-sanitizer || ninja check-sanitizer || exit /b
 ninja package || exit /b
 cd ..


add push request

add push request

--- script/finish-feature-branch.bat
+++ script/finish-feature-branch.bat
@@ -41,9 +41,11 @@
 IF "%handwork%" == "y" GOTO exit
 echo.
 echo.
+echo Push uncommited changes to develop branch
+git push origin develop
 echo.
 echo "Switch to feature workspace"
-git checkout -b feature-%feature_branch% origin/feature-%feature_branch%
+git checkout feature-%feature_branch%
 echo.
 echo.
 echo "Merge from develop branch to feature branch"


Removed 'console.bat' file.

Removed 'console.bat' file.

--- bin/console.bat
+++ bin/console.bat
@@ -1 +0,0 @@
-@php console %*


Initial commit.

Initial commit.

--HG--
extra : convert_revision : svn%3A39a105f4-52d6-0310-bb1b-d6517044f2e4/trunk%40672

error: pathspec 'server/shellCommands/help.cmd' did not match any file(s) known to git

--- server/shellCommands/help.cmd
+++ server/shellCommands/help.cmd
@@ -0,0 +1,59 @@
+#
+# The help MUES::CommandShell command.
+# $Id: help.cmd,v 1.1 2002/09/12 12:54:42 deveiant Exp $
+#
+# == Authors:
+# * Michael Granger <ged@FaerieMUD.org>
+#
+
+### Help command
+= help
+
+== Abstract
+Fetch help about a command or all commands.
+
+== Description
+If a command is specified, list detailed help on the given command.
+
+If no command is given, list all available commands in a table with a brief
+description and its synonyms.
+
+== Usage
+  help [<command>]
+
+== Code
+
+  helpTable = nil
+  rows = []
+
+  ### Fetch the help table from the shell's command table
+  if argString =~ %r{(\w+)}
+	helpHash = context.shell.commandTable.getHelpForCommand( $1 )
+
+	# If there was no help available, just output a message to
+	# that effect
+	return OutputEvent.new( "No help found for '#{$1}'\n" ) if helpHash.nil?
+
+	rows << "\n#{helpHash[:name]}\n#{'-' * helpHash[:name].length}\n\n" <<
+		(helpHash[:description] || "#{helphash[:abstract]}\n\n") <<
+		"Usage:\n"
+	rows.push( *helpHash[:usage] )
+	if context.user.isImplementor?
+		rows << "Source: #{helpHash[:sourceFile]} line #{helpHash[:sourceLine]}\n"
+	end
+  else
+	helpTable = context.shell.commandTable.getHelpTable()
+	rows << "Help topics:\n"
+
+	### Add a row or two for each table entry
+	helpTable.sort.each {|cmd,desc|
+		rows << "\t%20s : %s" % [ cmd, desc[0] ]
+		rows << " [Synonyms: %s]" % desc[1].join(', ') unless desc[1].empty?
+		rows << "\n"
+	}
+  end
+
+  rows << "\n"
+  return [ OutputEvent.new( rows ) ]
+
+


Remove typo I introduced

Remove typo I introduced

--- script/vmtool.bat
+++ script/vmtool.bat
@@ -31,7 +31,7 @@
 if not errorlevel 1 goto return0

 :get_sevenzip
-for %%i in ("%SEVENZIP_URL%") do set SEVENZIP_MSI=%%~nxi`
+for %%i in ("%SEVENZIP_URL%") do set SEVENZIP_MSI=%%~nxi
 set SEVENZIP_DIR=%TEMP%\sevenzip
 set SEVENZIP_PATH=%SEVENZIP_DIR%\%SEVENZIP_MSI%
 echo ==^> Creating "%SEVENZIP_DIR%"


Update Batch File - bin/install.bat

Update Batch File - bin/install.bat

--- bin/install.bat
+++ bin/install.bat
@@ -21,6 +21,4 @@
 copy C:\Qt\Qt5.12.6\5.12.6\msvc2017\bin\*.dll bin
 cd bin
 rem Delete Allegro Dlls (Debug Version)
-del allegro*debug-5.2.dll
-rem Delete Qt 5 Dlls (Debug Version)
-del qt5*d.dll+del allegro*debug-5.2.dll


update freexl to 1.0.1

update freexl to 1.0.1

--- build_freexl.bat
+++ build_freexl.bat
@@ -1,9 +1,9 @@
 setlocal
 call settings.bat

-call fetch.bat http://www.gaia-gis.it/gaia-sins/freexl-1.0.0g.zip freexl-1.0.0g
+call fetch.bat http://www.gaia-gis.it/gaia-sins/freexl-1.0.1.zip freexl-1.0.1

-cd freexl-1.0.0g
+cd freexl-1.0.1

 if "%COMPILER%" == "MINGW" (
   SET "PATH=%PATH%;%MSYSDIR%"


update build_script

update build_script

--- build_script.bat
+++ build_script.bat
@@ -4,7 +4,7 @@
 goto custom_python:

 :default_value_python:
-set pythonexe="c:\Python34_x64\python"
+set pythonexe="c:\Python35_x64\python"
 :custom_python:
 %pythonexe% -u setup.py build_script
 if %errorlevel% neq 0 exit /b %errorlevel%


simulator batch file added that will load data in bulk.

error: pathspec 'sims/simulate-mobile-data.bat' did not match any file(s) known to git

--- sims/simulate-mobile-data.bat
+++ sims/simulate-mobile-data.bat
@@ -0,0 +1,11 @@
+REM Run this file from the dos prompt. You will need the command line simulator. This batch program will change the dates on your computer to simulate in bulk.
+
+FOR /L %%M IN (1,1,12) DO (
+  FOR /L %%D IN (1,1,28) DO (
+    FOR /L %%H IN (0,1,23) DO (
+      date %%M/%%D/2017
+      time %%H:00:00
+      jksim -A:<your-token> -f:<your-simulator-file> -i:2
+    )
+  )
+)