setup: Fix wrong nvim installation (windows)

--- setup.bat
+++ setup.bat
@@ -35,7 +35,8 @@
 call :MKDIR "%USERPROFILE%\.config\nvim\autoload"
 call :MKDIR "%USERPROFILE%\.config\nvim\lua\plugins"
 call :MKLINK "%USERPROFILE%\.config\nvim\init.lua"                  "%BATDIR%nvim\init.lua"
-call :MKLINK "%USERPROFILE%\.config\vimfiles\autoload\plug.vim"     "%BATDIR%nvim\autoload\plug.vim"
+call :MKLINK "%USERPROFILE%\.config\nvim\vimrc"                     "%BATDIR%vimfiles\vimrc"
+call :MKLINK "%USERPROFILE%\.config\nvim\autoload\plug.vim"         "%BATDIR%vimfiles\autoload\plug.vim"
 call :MKLINK "%USERPROFILE%\.config\nvim\lua\plugins\cmp.lua"       "%BATDIR%nvim\lua\plugins\cmp.lua"
 call :MKLINK "%USERPROFILE%\.config\nvim\lua\plugins\lualine.lua"   "%BATDIR%nvim\lua\plugins\lualine.lua"
 call :MKLINK "%USERPROFILE%\.config\nvim\lua\plugins\null-ls.lua"   "%BATDIR%nvim\lua\plugins\null-ls.lua"


Adding script to generate empty liquibase repository


profile: Link nvim config on Windows too

--- setup.bat
+++ setup.bat
@@ -31,6 +31,9 @@
 call :MKLINK "%USERPROFILE%\vimfiles\vimrc"             "%BATDIR%vimfiles\vimrc"
 call :MKLINK "%USERPROFILE%\vimfiles\coc-settings.json" "%BATDIR%vimfiles\coc-settings.json"
 call :MKLINK "%USERPROFILE%\vimfiles\autoload\plug.vim" "%BATDIR%vimfiles\autoload\plug.vim"
+
+call :MKDIR "%USERPROFILE%\.config\nvim"
+call :MKLINK "%USERPROFILE%\.config\nvim\init.vim"      "%BATDIR%nvim\init.vim"
 goto :EOF


fix bat file

fix bat file

--- start.bat
+++ start.bat
@@ -1 +1 @@
-node app.js+node server.js


Error with parameter #4 and cleaning up the quotes.

--- start.bat
+++ start.bat
@@ -5,7 +5,7 @@
 SET nid=%1
 SET cid=%2
 SET port=%3
-SET dderlport=%
+SET dderlport=%4

 IF "%4" == "" (
    SET nid=1
@@ -82,18 +82,17 @@
 SET start_opts=%paths% %cookie% %node_name% %dist_opts% %kernel_opts% %imem_opts% %dderl_opts%

 REM DDERL start options
-ECHO "------------------------------------------"
-ECHO "Starting DDERL (Opts)"
-ECHO "------------------------------------------"
-ECHO "Node Name : %node_name%
-ECHO "Cookie    : %cookie%
-ECHO "EBIN Path : %paths%
-ECHO "Dist      : %dist_opts%
-ECHO "Kernel    : %kernel_opts%
-ECHO "IMEM      : %imem_opts%
-ECHO "DDERL     : %dderl_opts%
-ECHO "------------------------------------------"
+ECHO ------------------------------------------
+ECHO Starting DDERL (Opts)
+ECHO ------------------------------------------
+ECHO Node Name : %node_name%
+ECHO Cookie    : %cookie%
+ECHO EBIN Path : %paths%
+ECHO Dist      : %dist_opts%
+ECHO Kernel    : %kernel_opts%
+ECHO IMEM      : %imem_opts%
+ECHO DDERL     : %dderl_opts%
+ECHO ------------------------------------------

 REM Starting dderl
 START /MAX werl %start_opts% -s dderl
-


增加一个方便的启动批处理

增加一个方便的启动批处理

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

--- start.bat
+++ start.bat
@@ -0,0 +1 @@
+python main.py


Fix build file

Fix build file

--- dev/build/windows/MakeCoq_MinGW.bat
+++ dev/build/windows/MakeCoq_MinGW.bat
@@ -345,7 +345,7 @@
 SET "EXTRAPACKAGES= "

 IF NOT "%APPVEYOR%" == "True" (
-  SET EXTRAPACKAGES="-P wget,curl,git,gcc-core,gcc-g++,automake1.5"
+  SET EXTRAPACKAGES=-P wget,curl,git,gcc-core,gcc-g++,automake1.5
 )

 IF "%RUNSETUP%"=="Y" (


parameterize windows install packages script

--- dependencies/common/install-rmarkdown.cmd
+++ dependencies/common/install-rmarkdown.cmd
@@ -2,42 +2,44 @@

 setlocal

+set PACKAGE=rmarkdown
+set PACKAGE_VERSION=master
+
 set PATH=%PATH%;%CD%\tools

 REM git clone if necessary
-set RMARKDOWN_DIR=rmarkdown
-if not exist "%RMARKDOWN_DIR%" (
-   git clone https://github.com/rstudio/rmarkdown.git
+set PACKAGE_DIR="%PACKAGE%"
+if not exist "%PACKAGE_DIR%" (
+   git clone "https://github.com/rstudio/%PACKAGE%.git"
 )

 REM clean and checkout target branch
-set RMARKDOWN_VERSION=master
-pushd "%RMARKDOWN_DIR%"
+pushd "%PACKAGE_DIR%"
 git checkout .
 git clean -df .
 git pull
-git checkout "%RMARKDOWN_VERSION%"
+git checkout "%PACKAGE_VERSION%"

 REM append GitHub fields to DESCRIPTION
-git rev-parse "%RMARKDOWN_VERSION%" > RMARKDOWN_SHA1
-set /p RMARKDOWN_SHA1= < RMARKDOWN_SHA1
-del RMARKDOWN_SHA1
-echo GithubRepo: rmarkdown >> DESCRIPTION
+git rev-parse "%PACKAGE_VERSION%" > PACKAGE_SHA1
+set /p PACKAGE_SHA1= < PACKAGE_SHA1
+del PACKAGE_SHA1
+echo GithubRepo: %PACKAGE% >> DESCRIPTION
 echo GithubUsername: rstudio >> DESCRIPTION
-echo GithubRef: %RMARKDOWN_VERSION% >> DESCRIPTION
-echo GithubSHA1: %RMARKDOWN_SHA1% >> DESCRIPTION
+echo GithubRef: %PACKAGE_VERSION% >> DESCRIPTION
+echo GithubSHA1: %PACKAGE_SHA1% >> DESCRIPTION
 echo Repository: RStudioIDE >> DESCRIPTION

 REM create source package
 popd
-set RMARKDOWN_ARCHIVE_PATTERN=rmarkdown*.tar.gz
-del /s /q %RMARKDOWN_ARCHIVE_PATTERN%
-R CMD build rmarkdown
+set PACKAGE_ARCHIVE_PATTERN="%PACKAGE%*.tar.gz"
+del /s /q %PACKAGE_ARCHIVE_PATTERN%
+R CMD build "%PACKAGE%"

 REM modify filename to include SHA1
-for %%f in (%RMARKDOWN_ARCHIVE_PATTERN%) do set RMARKDOWN_ARCHIVE=%%f
-set RMARKDOWN_ARCHIVE_STEM=%RMARKDOWN_ARCHIVE:~0,-7%
-set RMARKDOWN_ARCHIVE_SHA1=%RMARKDOWN_ARCHIVE_STEM%_%RMARKDOWN_SHA1%.tar.gz
-move %RMARKDOWN_ARCHIVE% %RMARKDOWN_ARCHIVE_SHA1%
+for %%f in (%PACKAGE_ARCHIVE_PATTERN%) do set PACKAGE_ARCHIVE=%%f
+set PACKAGE_ARCHIVE_STEM=%PACKAGE_ARCHIVE:~0,-7%
+set PACKAGE_ARCHIVE_SHA1=%PACKAGE_ARCHIVE_STEM%_%PACKAGE_SHA1%.tar.gz
+move %PACKAGE_ARCHIVE% %PACKAGE_ARCHIVE_SHA1%


Update paths to Python and Maven

Update paths to Python and Maven

--- ci/jenkins.cmd
+++ ci/jenkins.cmd
@@ -6,7 +6,9 @@
    set CF_USER=%%a
    set CF_PASS=%%b
 )
-SET MAVEN_HOME=C:\opt\apache\apache-maven-3.5.3
+
+SET PYTHON_HOME=C:\Python36
+SET MAVEN_HOME=C:\opt\apache\apache-maven-3.3.9

 ECHO [behave.userdata] > %USERINI%
 ECHO cf_apiurl = api.run.pcfbeta.io >> %USERINI%
@@ -14,7 +16,7 @@
 ECHO cf_username = %CF_USER% >> %USERINI%
 ECHO cf_password = %CF_PASS% >> %USERINI%

-SET PATH=%MAVEN_HOME%\bin;%PATH%
+SET PATH=%PYTHON_HOME%\Scripts;%MAVEN_HOME%\bin;%PATH%

 CALL %BASEDIR%\test-setup
 CALL %BASEDIR%\test-run %*


made it run again, added explanations

made it run again, added explanations

--- scripts/tseries_point-ws.bat
+++ scripts/tseries_point-ws.bat
@@ -1,10 +1,73 @@
+@echo off
+rem This script demonstrates
+rem - how to extract a time series of data
+rem - how to write a netCDF file
+rem - how to bring up (matplotlib) plots in interactive mode
+
 rem activate cate
+
+rem delete existing workspace (if any).
 cate ws del --yes
+rem Note that most "cate ws" commands will enter cate's interactive workspace mode.
+rem In this mode, a background process is keeping the resources used by workspaces alive.
+
+rem Create a new in-memory workspace.
+rem No workspace files will created until the workspace is saved.
 cate ws new
-cate res read ds ..\test\data\precip_and_temp.nc
-cate --traceback res set ts tseries_point ds=@ds point=0,0
+
+rem Read a netCDF file containing precipitation & temperature with (time,lat,lon) dimensions
+rem and assign the resulting dataset to resource "pt_ds".
+cate res read pt_ds ..\test\data\precip_and_temp.nc
+rem The "cate res read" command adds a new operation step to the workspace's workflow:
+rem    pt_ds = read_object(file='..\test\data\precip_and_temp.nc', format=None)
+rem Note that the command
+rem    cate res read NAME FILE [FORMAT]
+rem is a short form for the "cate res set" command:
+rem    cate res set NAME read_object file=FILE [format=FORMAT]
+
+rem Extract a time series and remember the result in resource "ts".
+cate res set ts tseries_point ds=@pt_ds point=0,0
+rem The "cate res set" command adds a new operation step to the workspace's workflow:
+rem    ts = tseries_point(ds=pt_ds, point=(0, 0))
+rem Please note the "@" prefix in "ds=@ds". This indicates that the value of
+rem the resource named "pt_ds" is assigned to the parameter "ds" required by the
+rem tseries_point() operation. Without the "@", the pt_ds would have been interpreted
+rem as the character string "pt_ds".
+
+rem Write a netCDF file.
 cate res write ts ts.nc
+rem The "cate res write" command does NOT add a new step to the workflow.
+rem To do so, you would have used "cate res set" with the write_object() operation:
+rem    cate res set out write_object obj=@ts file=ts.nc
+rem which would add the step:
+rem    out = write_object(obj=ts, file='ts.nc')
+rem Note that the command
+rem    cate res write DS FILE [FORMAT]
+rem is a short form for the "cate ws run" command
+rem    cate ws run write_object obj=@DS file=FILE [format=FORMAT]
+
+rem Plot a variable of a dataset.
+cate res plot ts
+rem The "cate res plot" command does NOT add a new step to the workflow.
+rem To do so, you would have used "cate res set" with the plot() operation:
+rem    cate res set plt plot ds=@ts file='ts_plot.png'
+rem Note that the command
+rem    cate res plot DS -o FILE
+rem is a short form for the "cate ws run" command
+rem    cate ws run plot ds=@DS file=FILE
+
+rem Plot individual variables
+cate res plot ts -v temperature
 cate res plot ts -v precipitation
-cate res plot ts
+
+rem Print current workspace status
 cate ws status
-cate ws close
+
+rem We use "cate ws exit" to exit interactive workspace mode and terminate
+rem a cate back-end process that is keeping the resource's state.
+cate ws exit --yes
+rem You could use "cate ws close" to close current workspace,
+rem but stay in interactive workspace mode. In this case, a Cate
+rem back-end process remains active in the background for a certain
+rem amount of time.
+


help ensure 'git' on path for 'install-pacakges.cmd'

--- dependencies/common/install-packages.cmd
+++ dependencies/common/install-packages.cmd
@@ -1,6 +1,11 @@
 @echo off

 setlocal
+
+REM Ensure (the default install location for) Git is on the PATH here. Having
+REM this directory on the PATH by default can be a pain because Rtools (and its
+REM competing tools) can compete with that directory.
+set "PATH=C:\Program Files (x86)\Git\bin;%PATH%"

 set PATH=%PATH%;%CD%\tools


build.cmd: check for build config from cli arg

--- build/build.cmd
+++ build/build.cmd
@@ -1,9 +1,13 @@
+@ECHO OFF
 SETLOCAL ENABLEEXTENSIONS
-@ECHO OFF

 IF EXIST ".\build.log" DEL ".\build.log"

 SET config=%1
+IF [%config%]==[] (
+    ECHO A build configuration ^(debug or release^) must be specified
+    EXIT /b 1
+)

 SET BUILD=msbuild /t:Rebuild /p:Configuration=%config% /flp:logfile=build.log;Append


Update to use ..\conf\tcp-nio.xml configuration.

--- bin/drawnio.bat
+++ bin/drawnio.bat
@@ -1,52 +1,11 @@
 @rem Convenience launcher for the Draw demo (contributed by Laran Evans lc278@cornell.edu)
 @echo off

-set CPATH=../classes;../conf;../lib/commons-logging.jar;../lib/log4j-1.2.6.jar;../lib/concurrent.jar;../conf/log4j.properties
+set CPATH=../classes;../conf;../lib/commons-logging.jar;../lib/log4j.jar;../lib/log4j-1.2.6.jar;../lib/concurrent.jar;../conf/log4j.properties

 set JAVA_OPTS=
 if -debug==%1 set JAVA_OPTS=-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_shmem,server=y,suspend=y,address=jgc1

-set PROPS=TCP_NIO(
-set PROPS=%PROPS%recv_buf_size=20000000;
-set PROPS=%PROPS%send_buf_size=640000;
-set PROPS=%PROPS%loopback=false;
-set PROPS=%PROPS%discard_incompatible_packets=true;
-set PROPS=%PROPS%max_bundle_size=64000;
-set PROPS=%PROPS%max_bundle_timeout=30;
-set PROPS=%PROPS%use_incoming_packet_handler=true;
-set PROPS=%PROPS%use_outgoing_packet_handler=false;
-set PROPS=%PROPS%enable_bundling=true;
-set PROPS=%PROPS%start_port=7800;
-set PROPS=%PROPS%sock_conn_timeout=300;skip_suspected_members=true;
-set PROPS=%PROPS%reader_threads=8;
-set PROPS=%PROPS%writer_threads=8;
-set PROPS=%PROPS%processor_threads=8;
-set PROPS=%PROPS%processor_minThreads=8;
-set PROPS=%PROPS%processor_maxThreads=8;
-set PROPS=%PROPS%use_send_queues=false)
-set PROPS=%PROPS%TCPPING(timeout=3000;
-set PROPS=%PROPS%initial_hosts=localhost[7800],localhost[7801];
-set PROPS=%PROPS%port_range=1;
-set PROPS=%PROPS%num_initial_members=3)
-set PROPS=%PROPS%MERGE2(max_interval=100000;
-set PROPS=%PROPS%min_interval=20000)
-set PROPS=%PROPS%FD_SOCK
-set PROPS=%PROPS%FD(timeout=10000;max_tries=5;shun=true)
-set PROPS=%PROPS%VERIFY_SUSPECT(timeout=1500)
-set PROPS=%PROPS%pbcast.NAKACK(max_xmit_size=60000;
-set PROPS=%PROPS%use_mcast_xmit=false;gc_lag=0;
-set PROPS=%PROPS%retransmit_timeout=300,600,1200,2400,4800;
-set PROPS=%PROPS%discard_delivered_msgs=true)
-set PROPS=%PROPS%pbcast.STABLE(stability_delay=1000;desired_avg_gossip=50000;
-set PROPS=%PROPS%max_bytes=400000)
-set PROPS=%PROPS%pbcast.GMS(print_local_addr=true;join_timeout=3000;
-set PROPS=%PROPS%join_retry_timeout=2000;shun=true;
-set PROPS=%PROPS%view_bundling=true)
-set PROPS=%PROPS%FC(max_credits=2000000;
-set PROPS=%PROPS%min_threshold=0.10)
-set PROPS=%PROPS%FRAG2(frag_size=60000)
-set PROPS=%PROPS%pbcast.STREAMING_STATE_TRANSFER(use_flush=true;use_reading_thread=true)
-set PROPS=%PROPS%pbcast.FLUSH

 @echo on
-java -classpath %CPATH% %JAVA_OPTS% org.jgroups.demos.Draw -props %PROPS%
+java -classpath %CPATH% %JAVA_OPTS% org.jgroups.demos.Draw -props c:\jboss\JGroups\conf\tcp-nio.xml


drop bat file due outdated

drop bat file due outdated

--- distribution/platform/win/bin/consulo.bat
+++ distribution/platform/win/bin/consulo.bat
@@ -1,80 +0,0 @@
-@ECHO OFF
-
-::----------------------------------------------------------------------
-:: Consulo startup script.
-::----------------------------------------------------------------------
-
-:: ---------------------------------------------------------------------
-:: Locate a JDK installation directory which will be used to run the IDE.
-:: Try (in order): CONSULO_JDK, ..\jre, JDK_HOME, JAVA_HOME.
-:: ---------------------------------------------------------------------
-IF EXIST "%CONSULO_JDK%" SET JDK=%CONSULO_JDK%
-IF NOT "%JDK%" == "" GOTO jdk
-IF EXIST "%~dp0\..\jre" SET JDK=%~dp0\..\jre
-IF NOT "%JDK%" == "" GOTO jdk
-IF EXIST "%JDK_HOME%" SET JDK=%JDK_HOME%
-IF NOT "%JDK%" == "" GOTO jdk
-IF EXIST "%JAVA_HOME%" SET JDK=%JAVA_HOME%
-IF "%JDK%" == "" GOTO error
-
-:jdk
-SET JAVA_EXE=%JDK%\bin\java.exe
-IF NOT EXIST "%JAVA_EXE%" SET JAVA_EXE=%JDK%\jre\bin\java.exe
-IF NOT EXIST "%JAVA_EXE%" GOTO error
-
-SET JRE=%JDK%
-IF EXIST "%JRE%\jre" SET JRE=%JDK%\jre
-SET BITS=
-IF EXIST "%JRE%\lib\amd64" SET BITS=64
-
-:: ---------------------------------------------------------------------
-:: Ensure IDE_HOME points to the directory where the IDE is installed.
-:: ---------------------------------------------------------------------
-SET IDE_BIN_DIR=%~dp0
-SET IDE_HOME=%IDE_BIN_DIR%\..
-
-SET MAIN_CLASS_NAME=%IDEA_MAIN_CLASS_NAME%
-IF "%MAIN_CLASS_NAME%" == "" SET MAIN_CLASS_NAME=com.intellij.idea.Main
-
-IF NOT "%IDEA_PROPERTIES%" == "" SET IDE_PROPERTIES_PROPERTY="-Didea.properties.file=%IDEA_PROPERTIES%"
-
-:: ---------------------------------------------------------------------
-:: Collect JVM options and properties.
-:: ---------------------------------------------------------------------
-SET VM_OPTIONS_FILE=%IDEA_VM_OPTIONS%
-IF "%VM_OPTIONS_FILE%" == "" SET VM_OPTIONS_FILE=%IDE_BIN_DIR%\consulo%BITS%.exe.vmoptions
-SET ACC=
-FOR /F "usebackq delims=" %%i IN ("%VM_OPTIONS_FILE%") DO CALL "%IDE_BIN_DIR%\append.bat" "%%i"
-IF EXIST "%VM_OPTIONS_FILE%" SET ACC=%ACC% -Djb.vmOptionsFile="%VM_OPTIONS_FILE%"
-
-SET COMMON_JVM_ARGS="-Xbootclasspath/a:%IDE_HOME%/lib/boot.jar" %IDE_PROPERTIES_PROPERTY%
-SET IDE_JVM_ARGS=
-SET ALL_JVM_ARGS=%ACC% %COMMON_JVM_ARGS% %IDE_JVM_ARGS% %REQUIRED_JVM_ARGS%
-
-SET CLASS_PATH=%IDE_HOME%\lib\bootstrap.jar
-SET CLASS_PATH=%CLASS_PATH%;%IDE_HOME%\lib\extensions.jar
-SET CLASS_PATH=%CLASS_PATH%;%IDE_HOME%\lib\util.jar
-SET CLASS_PATH=%CLASS_PATH%;%IDE_HOME%\lib\jdom.jar
-SET CLASS_PATH=%CLASS_PATH%;%IDE_HOME%\lib\log4j.jar
-SET CLASS_PATH=%CLASS_PATH%;%IDE_HOME%\lib\trove4j.jar
-SET CLASS_PATH=%CLASS_PATH%;%IDE_HOME%\lib\jna.jar
-IF NOT "%IDEA_CLASS_PATH%" == "" SET CLASS_PATH=%CLASS_PATH%;%IDEA_CLASS_PATH%
-
-:: ---------------------------------------------------------------------
-:: Run the IDE.
-:: ---------------------------------------------------------------------
-SET OLD_PATH=%PATH%
-SET PATH=%IDE_BIN_DIR%;%PATH%
-
-"%JAVA_EXE%" %ALL_JVM_ARGS% -cp "%CLASS_PATH%" %MAIN_CLASS_NAME% %*
-
-SET PATH=%OLD_PATH%
-GOTO end
-
-:error
-ECHO ERROR: cannot start Consulo.
-ECHO No JDK found. Please validate either CONSULO_JDK, JDK_HOME or JAVA_HOME points to valid JDK installation.
-ECHO
-PAUSE
-
-:end


remove json.dll

remove json.dll

--- CIMEL.Draw/ILMerge.bat
+++ CIMEL.Draw/ILMerge.bat
@@ -1 +1 @@
-%1Ilmerge.exe /log %2CIMEL.Draw.exe /log %2CIMEL.Core.dll /log %2CIMELDrawNative.dll /log %2MWArray.dll /log %2Newtonsoft.json.dll /t:exe /out:%2Draw.exe /targetplatform:v4 /internalize /ndebug+%1Ilmerge.exe /log %2CIMEL.Draw.exe /log %2CIMEL.Core.dll /log %2CIMELDrawNative.dll /log %2MWArray.dll /t:exe /out:%2Draw.exe /targetplatform:v4 /internalize /ndebug


added jaxp and crimson in classpath

added jaxp and crimson in classpath

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

--- scripts/windows/init.bat
+++ scripts/windows/init.bat
@@ -31,7 +31,8 @@
 IF EXIST %PROACTIVE%\lib\iaik_jce_full.jar set CLASSPATH=%CLASSPATH%;%PROACTIVE%\lib\iaik_jce_full.jar
 IF EXIST %PROACTIVE%\lib\iaik_ssl.jar set CLASSPATH=%CLASSPATH%;%PROACTIVE%\lib\iaik_ssl.jar
 IF EXIST %PROACTIVE%\lib\log4j-core.jar set CLASSPATH=%CLASSPATH%;%PROACTIVE%\lib\log4j-core.jar
-IF EXIST %PROACTIVE%\lib\xerces.jar set CLASSPATH=%CLASSPATH%;%PROACTIVE%\lib\xerces.jar
+IF EXIST %PROACTIVE%\lib\jaxp.jar set CLASSPATH=%CLASSPATH%;%PROACTIVE%\lib\jaxp.jar
+IF EXIST %PROACTIVE%\lib\crimson.jar set CLASSPATH=%CLASSPATH%;%PROACTIVE%\lib\crimson.jar
 echo CLASSPATH=%CLASSPATH%

 set JAVA_CMD=%JAVA_HOME%\bin\java.exe -Djava.security.manager -Djava.security.policy=proactive.java.policy


no external files on windows for now

no external files on windows for now

--- autotest.cmd
+++ autotest.cmd
@@ -110,8 +110,6 @@

 	:: trigger installation
 	php -f index.php
-        :: no external files on windows for now
-        php occ app:disable files_external

 	::test execution
 	echo "Testing with %~1 ..."
@@ -119,6 +117,8 @@
 	rmdir /s /q coverage-html-%~1
 	md coverage-html-%~1
 	php -f enable_all.php
+        :: no external files on windows for now
+        php occ app:disable files_external

 	call phpunit --bootstrap bootstrap.php --configuration phpunit-autotest.xml --log-junit autotest-results-%~1.xml --coverage-clover autotest-clover-%~1.xml --coverage-html coverage-html-%~1


r8821/sofa : ADD: copy the dlls corresponding to the Visual Studio version used after generating Sofa projects (useful for the new Windows dependency package)

Former-commit-id: 20307394c6bf730f49842c78e54c20dda54e5882

--- project.bat
+++ project.bat
@@ -44,6 +44,7 @@
 @echo on
 @echo Making Visual project 8
 qmake -tp vc -recursive -o Sofa.sln Sofa.pro QT_INSTALL_PREFIX="%QTDIR%"
+xcopy .\bin\dll_msvc2005_x86\*.* .\bin\*.* /y /q
 goto common

 :vc9
@@ -52,6 +53,7 @@
 @echo Making Visual project 9
 call "%VS90COMNTOOLS%..\..\VC\vcvarsall.bat" x86
 qmake -tp vc -recursive -o Sofa.sln Sofa.pro QT_INSTALL_PREFIX="%QTDIR%"
+xcopy .\bin\dll_msvc2008_x86\*.* .\bin\*.* /y /q
 goto common

 :vc10
@@ -60,6 +62,7 @@
 @echo Making Visual project 10
 call "%VS100COMNTOOLS%..\..\VC\vcvarsall.bat" x86
 qmake -tp vc -recursive -o Sofa.sln Sofa.pro QT_INSTALL_PREFIX="%QTDIR%"
+xcopy .\bin\dll_msvc2010_x86\*.* .\bin\*.* /y /q
 goto common

 :vc9_x64
@@ -69,6 +72,7 @@
 @echo Making Visual project 9 x64
 call "%VS90COMNTOOLS%..\..\VC\vcvarsall.bat" amd64
 qmake -tp vc -recursive -o Sofa.sln Sofa.pro QT_INSTALL_PREFIX="%QTDIR%"
+xcopy .\bin\dll_msvc2008_x64\*.* .\bin\*.* /y /q
 goto common

 :vc10_x64
@@ -78,6 +82,7 @@
 @echo Making Visual project 10 x64
 call "%VS100COMNTOOLS%..\..\VC\vcvarsall.bat" amd64
 qmake -tp vc -recursive -o Sofa.sln Sofa.pro QT_INSTALL_PREFIX="%QTDIR%"
+xcopy .\bin\dll_msvc2010_x64\*.* .\bin\*.* /y /q
 goto common

 :common


WIP: add sharpmake boostrap batch file, to compile sharpmake and generate the sharpmake solution Note: platforms are not supported yet

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

--- bootstrap-sharpmake.bat
+++ bootstrap-sharpmake.bat
@@ -0,0 +1,55 @@
+@echo off
+setlocal
+
+:: set batch file directory as current
+cd /d %~dp0%
+
+set SHARPMAKE_EXECUTABLE=%~dp0%Sharpmake.Application\bin\debug\Sharpmake.Application.exe
+set SHARPMAKEGEN_PATH=samples\SharpmakeGen
+
+if "%VS140COMNTOOLS%"=="" (
+    echo ERROR: Cannot determine the location of the VS Common Tools folder.
+    goto error
+    exit /b 1
+)
+
+@call "%VS140COMNTOOLS%VsMSBuildCmd.bat"
+
+@call :BuildCsproj Sharpmake/Sharpmake.csproj Debug AnyCPU
+@call :BuildCsproj Sharpmake.Generators/Sharpmake.Generators.csproj Debug AnyCPU
+@call :BuildCsproj Sharpmake.Platforms/Sharpmake.CommonPlatforms/Sharpmake.CommonPlatforms.csproj Debug AnyCPU
+@call :BuildCsproj Sharpmake.Application/Sharpmake.Application.csproj Debug AnyCPU
+
+echo  cd /d %SHARPMAKEGEN_PATH%
+cd /d %SHARPMAKEGEN_PATH%
+echo @call %SHARPMAKE_EXECUTABLE% "/sources(\"SharpmakeGen.sharpmake.cs\")" /verbose
+@call %SHARPMAKE_EXECUTABLE% /sources("SharpmakeGen.sharpmake.cs") /verbose
+popd
+
+echo Sharpmake solution generated.
+goto end
+
+@REM -----------------------------------------------------------------------
+:BuildCsproj
+echo Compiling %~1 in "%~2|%~3"...
+msbuild /nologo /verbosity:minimal /p:Configuration="%~2" /p:Platform="%~3" "%~1"
+if errorlevel 1 (
+    echo ERROR: Failed to compile %~1 in "%~2|%~3".
+    goto:error
+)
+exit /b 0
+
+@REM -----------------------------------------------------------------------
+:end
+:: restore caller current directory
+popd
+@COLOR
+exit /b 0
+
+@REM -----------------------------------------------------------------------
+:error
+:: restore caller current directory
+popd
+@COLOR 4F
+pause
+exit /b 1


fixed script to publish p2-repository to gh-pages

--- releng/repository/pub2gh.cmd
+++ releng/repository/pub2gh.cmd
@@ -14,9 +14,11 @@
 md %CLONE_DIR% >nul

 @rem clone gh-pages
+pushd %~dp0
 call git branch -q -D gh-pages
 call git fetch -q origin gh-pages:gh-pages
 call git clone -q -l -s -b gh-pages ../.. "%CLONE_DIR%\gh-pages"
+popd
 cd "%CLONE_DIR%\gh-pages"

 @rem cleanup old update-site


catch: save tests log

catch: save tests log

--- build_catch.bat
+++ build_catch.bat
@@ -12,7 +12,7 @@
 %ER%
 %MAKEC%
 %ER%
-ctest -VV
+ctest -VV >..\..\..\%~n0_tests.log
 %ER%

 cd ..\..\..


can't be bothered to keep checking cmd, so this batch file will do

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

--- gitRemind.bat
+++ gitRemind.bat
@@ -0,0 +1,12 @@
+rem Define "chk"
+SET chk=%ERRORLEVEL%
+
+rem Format Drive
+E:
+cd \Ironic-SRC
+
+rem Update it
+git pull
+
+rem Tell me when its done
+msg %Username% Pull Passed Exit Code %chk%


Make sure make_cert.bat is executed with admin rights

Otherwise, OpenSSL complains with the message "unable to write 'random state' "

--- resources/cert/make_cert.bat
+++ resources/cert/make_cert.bat
@@ -1,3 +1,36 @@
+@echo off
+REM We need admin rights, otherwise the random state cannot be written
+REM Thanks to http://stackoverflow.com/a/10052222/1531708
+
+:: BatchGotAdmin
+:-------------------------------------
+REM  --> Check for permissions
+    IF "%PROCESSOR_ARCHITECTURE%" EQU "amd64" (
+>nul 2>&1 "%SYSTEMROOT%\SysWOW64\cacls.exe" "%SYSTEMROOT%\SysWOW64\config\system"
+) ELSE (
+>nul 2>&1 "%SYSTEMROOT%\system32\cacls.exe" "%SYSTEMROOT%\system32\config\system"
+)
+
+REM --> If error flag set, we do not have admin.
+if '%errorlevel%' NEQ '0' (
+    echo Requesting administrative privileges...
+    goto UACPrompt
+) else ( goto gotAdmin )
+
+:UACPrompt
+    echo Set UAC = CreateObject^("Shell.Application"^) > "%temp%\getadmin.vbs"
+    set params = %*:"=""
+    echo UAC.ShellExecute "cmd.exe", "/c ""%~s0"" %params%", "", "runas", 1 >> "%temp%\getadmin.vbs"
+
+    "%temp%\getadmin.vbs"
+    del "%temp%\getadmin.vbs"
+    exit /B
+
+:gotAdmin
+    pushd "%CD%"
+    CD /D "%~dp0"
+:--------------------------------------
+
 del server.*

 c:\OpenSSL-Win32\bin\openssl.exe genrsa -des3 -out server.key 4096


update restart script, add 'cancel' option

--- restart.cmd
+++ restart.cmd
@@ -5,6 +5,9 @@
 :wait
 docker logs columns -t
 @echo --
-@choice /T 5 /D N /C YN /M "Press Y for re-generate web site."
+@choice /T 5 /D N /C YNC /M "Press Y for re-generate web site. (N: do not re-gen, C: cancel looping)"
 if %ERRORLEVEL% EQU 1 goto start
-goto wait+if %ERRORLEVEL% EQU 3 goto end
+goto wait
+
+:end


Tested that non preview Visual Studio versions work with the -prerelease flag. Changing the code to match corefx implementation.

--- src/corehost/build.cmd
+++ src/corehost/build.cmd
@@ -50,12 +50,7 @@

 set _VSWHERE="%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe"
 if exist %_VSWHERE% (
-  for /f "usebackq tokens=*" %%i in (`%_VSWHERE% -latest -property installationPath`) do set _VSCOMNTOOLS=%%i\Common7\Tools
-)
-if not exist "%_VSCOMNTOOLS%" (
-	if exist %_VSWHERE% (
-		for /f "usebackq tokens=*" %%i in (`%_VSWHERE% -latest -property installationPath -Prerelease`) do set _VSCOMNTOOLS=%%i\Common7\Tools
-	)
+  for /f "usebackq tokens=*" %%i in (`%_VSWHERE% -latest -prerelease -property installationPath`) do set _VSCOMNTOOLS=%%i\Common7\Tools
 )
 if not exist "%_VSCOMNTOOLS%" set _VSCOMNTOOLS=%VS140COMNTOOLS%
 if not exist "%_VSCOMNTOOLS%" goto :MissingVersion


Add nopause argument to install_requirements.bat

--- @Pythia/install_requirements.bat
+++ @Pythia/install_requirements.bat
@@ -9,6 +9,7 @@
 rem ###########################################################################

 set requirements_file=%1
+IF "%1"=="nopause" set requirements_file=%2
 IF %requirements_file%.==. GOTO END_MISSING_ARGUMENT

 FOR /D %%G IN ("%~dp0\python-*-embed-amd64" "%~dp0\python-*-embed-win32") DO (
@@ -46,4 +47,7 @@
 rem ### Error handling ########################################################

 :END_OK
+IF "%1"=="nopause" goto END_NOPAUSE
 pause
+
+:END_NOPAUSE


Roll windows git binary package up to v6 everywhere.

Thus solving the sh.exe problem once and for all...

R=hinoka@google.com, hinoka@chromium.org
BUG=383455, 241556, 389361, 380958

Review URL: https://codereview.chromium.org/372413002

git-svn-id: fd409f4bdeea2bb50a5d34bb4d4bfc2046a5a3dd@281844 0039d316-1c4b-4281-b951-d872f2087c98

--- bootstrap/win/win_tools.bat
+++ bootstrap/win/win_tools.bat
@@ -64,8 +64,8 @@

 :GIT_190_CHECK
-set GIT_ERASE_TOP=4
-set GIT_VERSION=1.9.0.chromium.5
+set GIT_ERASE_TOP=5
+set GIT_VERSION=1.9.0.chromium.6

 if not "%DEPOT_TOOLS_GIT_BLEEDING%" == "1" goto :GIT_190_CHECK_REST
 set GIT_ERASE_TOP=5


Adding build-one script for single configuration control.

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

--- build/scripts/build-one.bat
+++ build/scripts/build-one.bat
@@ -0,0 +1,3 @@
+CALL "%VS90COMNTOOLS%..\..\VC\vcvarsall.bat"
+msbuild %~dp0../slimdx.proj /target:build /property:Configuration=%1;Platform=%2
+exit %ERRORLEVEL%


Update build_te.bat

Update build_te.bat

remove not needed line

--- build_te.bat
+++ build_te.bat
@@ -5,7 +5,7 @@
 set current_dir=%CD%
 REM echo off

-REM ECHO We're working with "!location!"
+
 echo.
 echo.
 echo -------------------------------------


Request elevated command promt to install git (necessary for the install to succeed)

--- build/InstallGit.cmd
+++ build/InstallGit.cmd
@@ -1,23 +1,33 @@
 @ECHO OFF
 SETLOCAL
-REM SETLOCAL is on, so changes to the path not persist to the actual user's path
+	:: SETLOCAL is on, so changes to the path not persist to the actual user's path

 git.exe --version
-if %ERRORLEVEL%==9009 GOTO :trydefaultpath
+IF %ERRORLEVEL%==9009 GOTO :trydefaultpath
 GOTO :EOF
+	:: Git is installed, no need to to anything else

 :trydefaultpath
-path=C:\Program Files (x86)\Git\cmd;C:\Program Files\Git\cmd;%PATH%
+PATH=C:\Program Files (x86)\Git\cmd;C:\Program Files\Git\cmd;%PATH%
 git.exe --version
-if %ERRORLEVEL%==9009 GOTO :showerror
+IF %ERRORLEVEL%==9009 GOTO :showerror
 GOTO :EOF
+	:: Git is installed, no need to to anything else

 :showerror
 ECHO Git is not in your path and could not be found in C:\Program Files (x86)\Git\cmd nor in C:\Program Files\Git\cmd
-set /p install=" Do you want to install Git through Chocolatey [y/n]? " %=%
-if %install%==y (
+SET /p install=" Do you want to install Git through Chocolatey [y/n]? " %=%
+IF %install%==y (
+	:: Create a temporary batch file to execute either after elevating to admin or as-is when the user is already admin
+	ECHO @ECHO OFF > "%temp%\ChocoInstallGit.cmd"
+	ECHO SETLOCAL >> "%temp%\ChocoInstallGit.cmd"
+	ECHO ECHO Installing Chocolatey first >> "%temp%\ChocoInstallGit.cmd"
+	ECHO @powershell -NoProfile -ExecutionPolicy Bypass -Command "iex ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1'))" >> "%temp%\ChocoInstallGit.cmd"
+	ECHO SET PATH=%%PATH%%;%%ALLUSERSPROFILE%%\chocolatey\bin >> "%temp%\ChocoInstallGit.cmd"
+	ECHO choco install git -y >> "%temp%\ChocoInstallGit.cmd"
+
 	GOTO :installgit
-) else (
+) ELSE (
 	GOTO :cantcontinue
 )

@@ -26,7 +36,28 @@
 GOTO :EOF

 :installgit
-ECHO Installing Chocolatey first
-@powershell -NoProfile -ExecutionPolicy unrestricted -Command "iex ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1'))" && SET PATH=%PATH%;%ALLUSERSPROFILE%\chocolatey\bin
-ECHO Installing Git through Chocolatey
-choco install git+pushd %~dp0
+    :: Running prompt elevated
+
+:: --> Check for permissions
+>nul 2>&1 "%SYSTEMROOT%\system32\cacls.exe" "%SYSTEMROOT%\system32\config\system"
+
+:: --> If error flag set, we do not have admin.
+IF '%errorlevel%' NEQ '0' (
+    GOTO UACPrompt
+) ELSE ( GOTO gotAdmin )
+
+:UACPrompt
+    ECHO You're not currently running this with admin privileges, we'll now try to execute the install of Git through Chocolatey after elevating to admin privileges
+    ECHO Set UAC = CreateObject^("Shell.Application"^) > "%temp%\getadmin.vbs"
+    ECHO UAC.ShellExecute "%temp%\ChocoInstallGit.cmd", "", "", "runas", 1 >> "%temp%\getadmin.vbs"
+
+    "%temp%\getadmin.vbs"
+    EXIT /B
+
+:gotAdmin
+    IF EXIST "%temp%\getadmin.vbs" ( DEL "%temp%\getadmin.vbs" )
+    pushd "%CD%"
+    CD /D "%~dp0"
+
+    CALL "%temp%\ChocoInstallGit.cmd"


Convert windows batch script to use windows line endings.

--- script/bin/bolt.bat
+++ script/bin/bolt.bat
@@ -1,9 +1,9 @@
-@echo off
-setlocal enableextensions
-
-set base=%~dp0
-
-for %%i in (node.bat node.exe) do if not "%%~$PATH:i"=="" set node=%%~$PATH:i
-if "%node%"=="" echo error: node.js is not on the system path && exit /b 1
-
-"%node%" "%base%bolt.js" %*
+@echo off
+setlocal enableextensions
+
+set base=%~dp0
+
+for %%i in (node.bat node.exe) do if not "%%~$PATH:i"=="" set node=%%~$PATH:i
+if "%node%"=="" echo error: node.js is not on the system path && exit /b 1
+
+"%node%" "%base%bolt.js" %*


Revert "Merge pull request #195 from williamtsoi1/master"

This reverts commit 8b68d4958c283101e7624a20702686a982f4f357, reversing
changes made to 0ae9e8a721a1b3a7ab0962118c7e93ae3f9dba86.

--- scripts/compact.bat
+++ scripts/compact.bat
@@ -12,7 +12,7 @@
 )

 if not exist "C:\Windows\Temp\SDelete.zip" (
-  powershell -Command "(New-Object System.Net.WebClient).DownloadFile('http://download.sysinternals.com/files/sdelete.zip', 'C:\Windows\Temp\SDelete.zip')" <NUL
+  powershell -Command "(New-Object System.Net.WebClient).DownloadFile('http://download.sysinternals.com/files/SDelete.zip', 'C:\Windows\Temp\SDelete.zip')" <NUL
 )

 if not exist "C:\Windows\Temp\sdelete.exe" (


Changed MYPATH to actual PATH variable

Changed MYPATH to actual PATH variable

--- scripts/install.bat
+++ scripts/install.bat
@@ -1,4 +1,4 @@
 ECHO on
 FOR /f %%i IN ('dir /ad /b "C:\" ^|findstr /I "mongo"') DO set dest=%%i
 MOVE C:\%dest% C:\mongodb
-setx MYPATH "%PATH%;C:\mongodb\bin"
+SETX PATH "%PATH%;C:\mongodb\bin"


remove all .diff.png images before a test run, so we do not get results from other tests

--- casperjs.bat
+++ casperjs.bat
@@ -1,7 +1,8 @@
 @ECHO OFF

-REM *** delete old debug screen captures, as they are not overwritten automatically
+REM *** delete old screen captures, as they are not overwritten automatically
 del failures\fail.png /s /f /q  >nul 2>&1
+del screenshots\*.diff.png /s /f /q  >nul 2>&1
 del last_screen.png /s /f /q  >nul 2>&1


removing bat file

removing bat file

--- config-msvs.bat
+++ config-msvs.bat
@@ -1,2 +0,0 @@
-python waf configure --bundle=ALL,-waf-tools --waf-tools-path="../external-waf-tools" --bundle-path="../deps" --options=cxx_mkspec=cxx_msvc11_x86 msvs -vvv
-pause


-- Changed to pythonw.exe to suppress command prompt when launching from eco prompt. -- eclipse-luna alias added start to launch as a separate process and have get back access to eco prompt.

--- bin/ecosystem-init.bat
+++ bin/ecosystem-init.bat
@@ -1,6 +1,6 @@
 @ECHO OFF

-set python_exe=S:\python\Python27\python.exe
+set python_exe=S:\python\Python27\pythonw.exe

 for %%d in (%~dp0..) do set ECO_ROOT=%%~fd

@@ -17,4 +17,4 @@
 Doskey    maya-2015-dev=%python_exe% %ECO_ROOT%\bin\ecosystem.py -t base,maya2015,mayaportable,dev -r maya
 Doskey maya-2015-dev-jc=%python_exe% %ECO_ROOT%\bin\ecosystem.py -t base,maya2015,mayaportable,devjc -r maya

-Doskey     eclipse-luna=%python_exe% %ECO_ROOT%\bin\ecosystem.py -t base,eclipse-luna -r eclipse-luna-setup.bat+Doskey     eclipse-luna=start %python_exe% %ECO_ROOT%\bin\ecosystem.py -t base,eclipse-luna -r eclipse-luna-setup.bat


[SPARK-32434][CORE][FOLLOW-UP] Fix load-spark-env.cmd to be able to run in Windows properly

### What changes were proposed in this pull request?

This PR is basically a followup of SPARK-26132 and SPARK-32434. You can't define an environment variable within an-if to use it within the block. See also https://superuser.com/questions/78496/variables-in-batch-file-not-being-set-when-inside-if

### Why are the changes needed?

For Windows users to use Spark and fix the build in AppVeyor.

### Does this PR introduce _any_ user-facing change?

No, it's only in unreleased branches.

### How was this patch tested?

Manually tested on a local Windows machine, and AppVeyor build at https://github.com/HyukjinKwon/spark/pull/13. See https://ci.appveyor.com/project/HyukjinKwon/spark/builds/34316409

Closes #29254 from HyukjinKwon/SPARK-32434.

Authored-by: HyukjinKwon <2680965ad5aae29275c8fb10150cb10f5554e78b@apache.org>
Signed-off-by: HyukjinKwon <2680965ad5aae29275c8fb10150cb10f5554e78b@apache.org>

--- bin/load-spark-env.cmd
+++ bin/load-spark-env.cmd
@@ -22,7 +22,7 @@
 rem conf\ subdirectory.

 set SPARK_ENV_CMD=spark-env.cmd
-if [%SPARK_ENV_LOADED%] == [] (
+if not defined SPARK_ENV_LOADED (
   set SPARK_ENV_LOADED=1

   if [%SPARK_CONF_DIR%] == [] (
@@ -37,18 +37,19 @@

 rem Setting SPARK_SCALA_VERSION if not already set.

-if [%SPARK_SCALA_VERSION%] == [] (
-  set SCALA_VERSION_1=2.13
-  set SCALA_VERSION_2=2.12
+set SCALA_VERSION_1=2.13
+set SCALA_VERSION_2=2.12

-  set ASSEMBLY_DIR1=%SPARK_HOME%\assembly\target\scala-%SCALA_VERSION_1%
-  set ASSEMBLY_DIR2=%SPARK_HOME%\assembly\target\scala-%SCALA_VERSION_2%
-  set ENV_VARIABLE_DOC=https://spark.apache.org/docs/latest/configuration.html#environment-variables
+set ASSEMBLY_DIR1=%SPARK_HOME%\assembly\target\scala-%SCALA_VERSION_1%
+set ASSEMBLY_DIR2=%SPARK_HOME%\assembly\target\scala-%SCALA_VERSION_2%
+set ENV_VARIABLE_DOC=https://spark.apache.org/docs/latest/configuration.html#environment-variables
+
+if not defined SPARK_SCALA_VERSION (
   if exist %ASSEMBLY_DIR2% if exist %ASSEMBLY_DIR1% (
-    echo "Presence of build for multiple Scala versions detected (%ASSEMBLY_DIR1% and %ASSEMBLY_DIR2%)."
-    echo "Remove one of them or, set SPARK_SCALA_VERSION=%SCALA_VERSION_1% in %SPARK_ENV_CMD%."
-    echo "Visit %ENV_VARIABLE_DOC% for more details about setting environment variables in spark-env.cmd."
-    echo "Either clean one of them or, set SPARK_SCALA_VERSION in spark-env.cmd."
+    echo Presence of build for multiple Scala versions detected ^(%ASSEMBLY_DIR1% and %ASSEMBLY_DIR2%^).
+    echo Remove one of them or, set SPARK_SCALA_VERSION=%SCALA_VERSION_1% in spark-env.cmd.
+    echo Visit %ENV_VARIABLE_DOC% for more details about setting environment variables in spark-env.cmd.
+    echo Either clean one of them or, set SPARK_SCALA_VERSION in spark-env.cmd.
     exit 1
   )
   if exist %ASSEMBLY_DIR1% (


revert build_dep.bat

revert build_dep.bat

Former-commit-id: 1efde25aea917dd4fb36a339e5a92335af6218f0 [formerly 67607831e2cabb246b05fb23a8b8df4742e93428] [formerly 2b1444fa41641f6eab93fdff9363c70781dca64f] [formerly 93b9a332d453d329a4d089046ed01ac957dcc80d]
Former-commit-id: a50a20718aa90862eef6712a6c5bbbe498d9ab76
Former-commit-id: 0f7dcc2b94c2d227ed3c0c988b9abb8361187c66
Former-commit-id: 3bc7152cb628ae8ddd0808e809724ddf658d5aa5

--- Dep/build_dep.bat
+++ Dep/build_dep.bat
@@ -2,8 +2,64 @@

 echo Building dependencies...

+if exist lib (rd lib /q /s)
+md lib
+cd lib
+md Debug
+md Release
+cd ../
+REM ######################################################################################################
+echo Building protobuf...
+
+if exist protobuf (rd protobuf /q /s)
+git clone -b 2.7.0 https://github.com/google/protobuf.git
+
+cd protobuf/cmake
+md build
+cd build
+cmake -G "Visual Studio 14 Win64" -Dprotobuf_BUILD_SHARED_LIBS=ON -Dprotobuf_BUILD_TESTS=OFF ..
+"%VS140COMNTOOLS%..\IDE\Devenv" protobuf.sln /build "Debug|x64"
+"%VS140COMNTOOLS%..\IDE\Devenv" protobuf.sln /build "Release|x64"
+copy Debug\*.dll ..\..\..\lib\Debug /Y
+copy Debug\*.lib ..\..\..\lib\Debug /Y
+copy Release\*.dll ..\..\..\lib\Release /Y
+copy Release\*.lib ..\..\..\lib\Release /Y
+cd ..\..\..\
+REM ######################################################################################################
+echo Building libevent...
+
+if exist libevent (rd libevent /q /s)
+git clone -b master https://github.com/libevent/libevent.git
+
+cd libevent
+md build
+cd build
+cmake -G "Visual Studio 14 Win64" -DEVENT__DISABLE_OPENSSL=ON ..
+"%VS140COMNTOOLS%..\IDE\Devenv" libevent.sln /build "Debug|x64" /project event_core_static.vcxproj
+"%VS140COMNTOOLS%..\IDE\Devenv" libevent.sln /build "Release|x64" /project event_core_static.vcxproj
+"%VS140COMNTOOLS%..\IDE\Devenv" libevent.sln /build "Debug|x64" /project event_static.vcxproj
+"%VS140COMNTOOLS%..\IDE\Devenv" libevent.sln /build "Release|x64" /project event_static.vcxproj
+"%VS140COMNTOOLS%..\IDE\Devenv" libevent.sln /build "Debug|x64" /project event_extra_static.vcxproj
+"%VS140COMNTOOLS%..\IDE\Devenv" libevent.sln /build "Release|x64" /project event_extra_static.vcxproj
+copy lib\Debug\*.lib ..\..\lib\Debug /Y
+copy lib\Release\*.lib ..\..\lib\Release /Y
+cd ..\..\
+REM ######################################################################################################
+echo Building glog...
+if exist glog (rd glog /q /s)
+git clone -b v035 https://github.com/google/glog.git
+
+cd glog
+md build
+cd build
+cmake -G "Visual Studio 14 Win64" ..
+"%VS140COMNTOOLS%..\IDE\Devenv" google-glog.sln /build "Debug|x64"
+"%VS140COMNTOOLS%..\IDE\Devenv" google-glog.sln /build "Release|x64"
+copy Debug\*.lib ..\..\lib\Debug /Y
+copy Release\*.lib ..\..\lib\Release /Y
+cd ..\..\
+REM ######################################################################################################
 echo Building evpp...
-

 cd evpp
 cd vsprojects


added a script that figures out the version of IE you have, in case we need it.

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

--- ieVersion.bat
+++ ieVersion.bat
@@ -0,0 +1,9 @@
+@echo off
+REM Thanks to Jerold Scheulamn <http://www.windowsitpro.com/article/internet/jsi-tip-8332-how-can-i-use-the-command-line-to-determine-the-version-of-internet-explorer-that-is-installed->
+setlocal
+set qry=reg query "HKEY_LOCAL_MACHINE\Software\Microsoft\Internet Explorer" /v Version
+set fnd=findstr /I /L /C:"REG_SZ"
+for /f "Tokens=2*" %%u in ('%qry%^|%fnd%') do (
+ @echo %%v
+)
+endlocal


fix incorrect -sk detection

fix incorrect -sk detection

--- resources/stage_3_disinfect/stage_3_disinfect.bat
+++ resources/stage_3_disinfect/stage_3_disinfect.bat
@@ -79,7 +79,7 @@

 :: JOB: Kaspersky Virus Removal Tool (KVRT)
 title TRON v%SCRIPT_VERSION% [stage_3_disinfect] [Kaspersky VRT]
-if /i %SKIP_KASPERSKY_SCAN%==no (
+if /i %SKIP_KASPERSKY_SCAN%==yes (
 	call :log "%CUR_DATE% %TIME% ! SKIP_KASPERSKY_SCAN (-sk) set. Skipping KVRT scan."
 ) else (
 	call :log "%CUR_DATE% %TIME%    Launch job 'Kaspersky Virus Removal Tool'..."


Do not open web browser automatically in Collect startup link (Windows)

--- collect-installer/src/main/resources/startup-windows.cmd
+++ collect-installer/src/main/resources/startup-windows.cmd
@@ -1,4 +1,3 @@
 set JRE_HOME=install_directory/java
 cd "install_directory/collect-server/tomcat/bin"
-startup.bat
-start http://localhost:8080/collect+startup.bat


TEMPLATE notify script

TEMPLATE notify script

Borrowed from docker-gen and consul

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

--- testecho.bat
+++ testecho.bat
@@ -0,0 +1 @@
+echo "Success"


add ipautoset.bat to automatically set ip addr based on XenStore data;

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

--- ipautoset.bat
+++ ipautoset.bat
@@ -0,0 +1,57 @@
+@echo off
+ echo Copyright (c) 2014 Cai Guanhao (Choi Goon-ho)
+ echo Licensed under the terms of the MIT license.
+ echo Report bugs on https://github.com/caiguanhao/xen-config/issues
+ echo --------------------------------------------------------------
+
+rem This is an auto script that changes the IP addresses of Windows VMs.
+rem It should run once on the first-time startup.
+
+rem This script requires xenstore_client.exe from XenTools to run.
+rem Make sure you append its folder path, something like:
+rem "C:\Program Files\Citrix\XenTools" to the Path environment variable.
+
+rem Local Area Connection name
+set local_conn="LocalConnection"
+set local_conn=%local_conn:"=%
+
+rem "
+rem Make sure you have written IP addresses to the XenStore of each VM domain.
+rem For a list of domain IDS, run `xl list` or `xenstore-list /local/domain`
+rem on XenServer host.
+set /a domain_id_max="8"
+
+for /l %%i in (0,1,%domain_id_max%) do (
+  for /f %%o in ('xenstore_client read /local/domain/%%i/ip') do (
+    for /f "tokens=1-4 delims=." %%a in ("%%o") do (
+      if not [%%d]==[] set ipaddr=%%a.%%b.%%c.%%d ))
+
+  for /f %%o in ('xenstore_client read /local/domain/%%i/subnetmask') do (
+    for /f "tokens=1-4 delims=." %%a in ("%%o") do (
+      if not [%%d]==[] set subnetmask=%%a.%%b.%%c.%%d ))
+
+  for /f %%o in ('xenstore_client read /local/domain/%%i/gateway') do (
+    for /f "tokens=1-4 delims=." %%a in ("%%o") do (
+      if not [%%d]==[] set gateway=%%a.%%b.%%c.%%d ))
+)
+
+rem Check if defined:
+if "%ipaddr%"==""     echo Cannot get IP address         & goto theend
+if "%subnetmask%"=="" echo Cannot get subnet mask        & goto theend
+if "%gateway%"==""    echo Cannot get gateway IP address & goto theend
+
+echo           IP Address: %ipaddr%
+echo          Subnet Mask: %subnetmask%
+echo              Gateway: %gateway%
+echo.
+echo Applying TCP/IP settings...
+
+netsh interface ip set address name="%local_conn%" ^
+  static %ipaddr% %subnetmask% %gateway% 1
+netsh interface ip set dns     name="%local_conn%" ^
+  static 8.8.8.8 >nul
+netsh interface ip add dns     name="%local_conn%" ^
+  8.8.4.4 index=2 >nul
+
+:theend
+timeout /t 3


Create FFmpegTemp.bat

Create FFmpegTemp.bat

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

--- src/FFmpegTemp.bat
+++ src/FFmpegTemp.bat
@@ -0,0 +1,20 @@
+@echo off
+
+REM ← の行はコメントです。
+REM
+REM 【置換情報】
+REM ツールによって置き換えされる文字列があります。
+REM 仕様書\バッチ置換特殊定数一覧.html をご覧ください。
+REM
+
+REM ↓【例：番組名とURLを表示する】
+echo 番組名：後藤沙緒里と喜多村英梨のSEラジオ
+echo 回数：第3-4回
+echo URL：https://vms-api.hibiki-radio.jp/api/v1/videos/playlist.m3u8?token=fAHi7H9hBw8W1Wyvmutje0fblokRLLZ1laMmqpNcBCA%%3D^&vms_video_id=372^&user_id=-1
+
+title 後藤沙緒里と喜多村英梨のSEラジオ 第3-4回
+
+REM ↓【例：ffmpegと連携する場合は以下のように記述します】
+ffmpeg -i "https://vms-api.hibiki-radio.jp/api/v1/videos/playlist.m3u8?token=fAHi7H9hBw8W1Wyvmutje0fblokRLLZ1laMmqpNcBCA%%3D&vms_video_id=372&user_id=-1" -vcodec copy -acodec copy -bsf:a aac_adtstoasc "D:\WebRadio\HibikiTool300_beta7\download\後藤沙緒里と喜多村英梨のSEラジオ 第3-4回.mp4"
+
+pause


文件格式转换：linux -> window

文件格式转换：linux -> window

--- init.bat
+++ init.bat
@@ -1,12 +1,8 @@
-@echo off
-
-rem [+] 安装 selenium
-pip install selenium
-
-rem [+] 安装 jupyter, git
-conda install -y jupyter git
-
-rem [+] 下载练习文件
-git clone https://github.com/YaleGaussian/at_selector tutorial
-
-@echo on
+rem [+] 安装 selenium
+pip install selenium
+
+rem [+] 安装 jupyter, git
+conda install -y jupyter git
+
+rem [+] 下载练习文件
+git clone https://github.com/YaleGaussian/at_selector tutorial


Roll windows git to include htmlpathalt.

This will allow e.g. `git help rebase-update` to work.

R=agable@chromium.org
BUG=238428

Review URL: https://codereview.chromium.org/253243002

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

--- bootstrap/win/win_tools.bat
+++ bootstrap/win/win_tools.bat
@@ -64,8 +64,8 @@

 :GIT_190_CHECK
-set GIT_ERASE_TOP=2
-set GIT_VERSION=1.9.0.chromium.3
+set GIT_ERASE_TOP=3
+set GIT_VERSION=1.9.0.chromium.4

 if not "%DEPOT_TOOLS_GIT_BLEEDING%" == "1" goto :GIT_190_CHECK_REST
 set GIT_ERASE_TOP=3


修改Bat

修改Bat

--- dependency.bat
+++ dependency.bat
@@ -17,25 +17,25 @@

 call mvn dependency:tree

-REM 鿴ṹ
-REM call mvn dependency:tree -Dverbose -Dincludes=org.apache.curator:curator-recipes
+rem 鿴ṹ
+rem call mvn dependency:tree -Dverbose -Dincludes=org.apache.curator:curator-recipes

-REM ȫlib
-REM call mvn dependency:copy-dependencies -DoutputDirectory=lib
+rem ȫlib
+rem call mvn dependency:copy-dependencies -DoutputDirectory=lib

-REM ֻlib
-REM call mvn dependency:copy-dependencies -DoutputDirectory=lib -DincludeScope=compile
+rem ֻlib
+rem call mvn dependency:copy-dependencies -DoutputDirectory=lib -DincludeScope=compile

-REM WAR
-REM call mvn archetype:generate -DgroupId=nepxion -DartifactId=coroutine-common -Dversion=1.0.0-SNAPSHOT -DarchetypeArtifactId=maven-archetype-webapp -DarchetypeCatalog=internal
+rem WAR
+rem call mvn archetype:generate -DgroupId=nepxion -DartifactId=coroutine-common -Dversion=1.0.0-SNAPSHOT -DarchetypeArtifactId=maven-archetype-webapp -DarchetypeCatalog=internal

-REM POM
-REM call mvn archetype:generate -DgroupId=nepxion -DartifactId=coroutine-common -DarchetypeArtifactId=maven-archetype-site-simple -DarchetypeCatalog=internal
+rem POM
+rem call mvn archetype:generate -DgroupId=nepxion -DartifactId=coroutine-common -DarchetypeArtifactId=maven-archetype-site-simple -DarchetypeCatalog=internal

-REM JAR
-REM call mvn archetype:generate -DgroupId=nepxion -DartifactId=coroutine-common -DarchetypeArtifactId=maven-archetype-quickstart -DinteractiveMode=false -DarchetypeCatalog=internal
+rem JAR
+rem call mvn archetype:generate -DgroupId=nepxion -DartifactId=coroutine-common -DarchetypeArtifactId=maven-archetype-quickstart -DinteractiveMode=false -DarchetypeCatalog=internal

-REM 뵽ؿ
-REM call mvn install:install-file -DgroupId=kilim -DartifactId=kilim -Dversion=1.0 -Dfile=lib/kilim-1.0.jar -Dpackaging=jar -DgeneratePom=true
+rem 뵽ؿ
+rem call mvn install:install-file -DgroupId=kilim -DartifactId=kilim -Dversion=1.0 -Dfile=lib/kilim-1.0.jar -Dpackaging=jar -DgeneratePom=true

 pause


Create justSETUP.bat

Create justSETUP.bat

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

--- justSETUP.bat
+++ justSETUP.bat
@@ -0,0 +1 @@
+echo justBASH setup script working.


msvc: Silence -Wmicrosoft-enum-value on Windows, it's very noisy

--- clazy-cl.bat
+++ clazy-cl.bat
@@ -1,2 +1,2 @@
 @echo off
-clang.exe --driver-mode=cl -Qunused-arguments -Xclang -load -Xclang ClangLazy.dll -Xclang -add-plugin -Xclang clang-lazy %*
+clang.exe --driver-mode=cl -Qunused-arguments -Xclang -load -Xclang ClangLazy.dll -Xclang -add-plugin -Xclang clang-lazy -Wno-microsoft-enum-value %*


Simpler Windows command script

Simpler Windows command script

--- cmd/todo.cmd
+++ cmd/todo.cmd
@@ -1,10 +1,11 @@
 @echo off
+setlocal

 rem this is where todo.md will be stored if the file doesn't exist locally
 set folder=%USERPROFILE%\OneDrive\Documents

 if exist todo.md (
-  "%~dp0\..\bin\todo" %*
+  "%~dp0..\bin\todo" %*
 ) else (
-  setlocal & cd %folder% && "%~dp0\..\bin\todo" %* & endlocal
+  cd %folder% && "%~dp0..\bin\todo" %*
 )


Add coursier.bat script

Add coursier.bat script

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

--- coursier.bat
+++ coursier.bat
@@ -0,0 +1,29 @@
+@REM https://github.com/xerial/sbt-pack/blob/master/src/main/templates/launch-bat.mustache
+@REM would be worth getting more inspiration from
+
+@echo off
+
+SET ERROR_CODE=0
+
+SET LAUNCHER_PATH=%~dp0/coursier
+
+IF NOT EXIST %LAUNCHER_PATH% (
+  bitsadmin /transfer "DownloadCoursierLauncher" https://github.com/alexarchambault/coursier/raw/master/coursier %LAUNCHER_PATH%
+)
+
+SET CMD_LINE_ARGS=%*
+
+java -jar %LAUNCHER_PATH% %CMD_LINE_ARGS%
+
+IF ERRORLEVEL 1 GOTO error
+GOTO end
+
+:error
+SET ERROR_CODE=1
+
+:end
+SET LAUNCHER_PATH=
+SET CMD_LINE_ARGS=
+
+EXIT /B %ERROR_CODE%
+


S-53296 hacking now.

S-53296 hacking now.

--- src/app/deploy.cmd
+++ src/app/deploy.cmd
@@ -26,6 +26,9 @@
   SET DEPLOYMENT_SOURCE=%~dp0%\src\app
   echo %DEPLOYMENT_SOURCE%
 )
+
+SET DEPLOYMENT_SOURCE=%~dp0%\src\app
+echo %DEPLOYMENT_SOURCE%

 IF NOT DEFINED DEPLOYMENT_TARGET (
   SET DEPLOYMENT_TARGET=%ARTIFACTS%\wwwroot


Bugfixes in windows installer error handling.

--- R/bin/install.cmd
+++ R/bin/install.cmd
@@ -45,8 +45,10 @@
   )
   echo Ignored option:%1
   shift
-  goto parproc
+  goto parms
 :eofparm
+
+echo Check setup >&2

 call :chksetup
 if errorlevel 1 goto :error
@@ -60,11 +62,14 @@
 rem small subroutines
 rem -----------------

+rem Install a single package. Set stop indicator as we cannot
+rem break the loop.
 :instpkg
-rem no if / else as libpath may contain parenthesis
 if %failed%==1 goto :EOF
 echo Install package "%1"
+rem Yes R likes to have a slash here instead of a backslash.
 if "%libpathSet%"=="1" "%rexec%" CMD INSTALL -l "%libpath%" ./packages/"%1"
+rem no if / else as libpath may contain parenthesis
 if not "%libpathSet%"=="1" "%rexec%" CMD INSTALL ./packages/"%1"
 if errorlevel 1 (
   set failed=1
@@ -74,15 +79,16 @@

 :chksetup
 set chk=0
-for /D %%p in (packages) do set chk=1
-if chk==0 (
+rem for won't look into file system without a single wildcard
+for /D %%p in (packag?s) do set chk=1
+if %chk%==0 (
   echo Directory "packages" not found >&2
   ver /invalid 2>NUL
   goto :EOF
 )
 set chk=0
-for /D %%p in (packages\*) do set chk=1
-if chk==0 (
+for /D %%p in (.\packages\*) do set chk=1
+if %chk%==0 (
   echo Not a single package found for installation >&2
   ver /invalid 2>NUL
   goto :EOF


add bat

add bat

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

--- csscover.bat
+++ csscover.bat
@@ -0,0 +1 @@
+node %~dp0phantomrun.js


remove arm launcher compilation from msvc-build-launcher.cmd

--- msvc-build-launcher.cmd
+++ msvc-build-launcher.cmd
@@ -34,16 +34,3 @@
 ) else (
   echo Windows SDK 6.1 not found to build Windows 64-bit version
 )
-
-REM now for arm 64-bit
-REM Cross compile for arm64
-call VCVARSx86_arm64
-if "%ERRORLEVEL%"=="0" (
-  cl /D "GUI=0" /D "WIN32_LEAN_AND_MEAN" launcher.c /O2 /link /MACHINE:arm64 /SUBSYSTEM:CONSOLE /out:setuptools/cli-arm64.exe
-  cl /D "GUI=1" /D "WIN32_LEAN_AND_MEAN" launcher.c /O2 /link /MACHINE:arm64 /SUBSYSTEM:WINDOWS /out:setuptools/gui-arm64.exe
-) else (
-  echo Windows SDK 6.1 not found to build Windows 64-bit version
-)
-
-set PATH=%PATH_OLD%
-


Added Make.bat for Windows.

Added Make.bat for Windows.

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

--- make.bat
+++ make.bat
@@ -0,0 +1,263 @@
+@ECHO OFF
+
+REM Command file for Sphinx documentation
+
+if "%SPHINXBUILD%" == "" (
+	set SPHINXBUILD=sphinx-build
+)
+set BUILDDIR=_build
+set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS% .
+set I18NSPHINXOPTS=%SPHINXOPTS% .
+if NOT "%PAPER%" == "" (
+	set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS%
+	set I18NSPHINXOPTS=-D latex_paper_size=%PAPER% %I18NSPHINXOPTS%
+)
+
+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.  texinfo    to make Texinfo files
+	echo.  gettext    to make PO message catalogs
+	echo.  changes    to make an overview over all changed/added/deprecated items
+	echo.  xml        to make Docutils-native XML files
+	echo.  pseudoxml  to make pseudoxml-XML files for display purposes
+	echo.  linkcheck  to check all external links for integrity
+	echo.  doctest    to run all doctests embedded in the documentation if enabled
+	echo.  coverage   to run coverage check of 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
+)
+
+
+REM Check if sphinx-build is available and fallback to Python version if any
+%SPHINXBUILD% 1>NUL 2>NUL
+if errorlevel 9009 goto sphinx_python
+goto sphinx_ok
+
+:sphinx_python
+
+set SPHINXBUILD=python -m sphinx.__init__
+%SPHINXBUILD% 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
+)
+
+:sphinx_ok
+
+
+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\VirtlinkVfs.qhcp
+	echo.To view the help file:
+	echo.^> assistant -collectionFile %BUILDDIR%\qthelp\VirtlinkVfs.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" == "latexpdf" (
+	%SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
+	cd %BUILDDIR%/latex
+	make all-pdf
+	cd %~dp0
+	echo.
+	echo.Build finished; the PDF files are in %BUILDDIR%/latex.
+	goto end
+)
+
+if "%1" == "latexpdfja" (
+	%SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
+	cd %BUILDDIR%/latex
+	make all-pdf-ja
+	cd %~dp0
+	echo.
+	echo.Build finished; the PDF 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" == "texinfo" (
+	%SPHINXBUILD% -b texinfo %ALLSPHINXOPTS% %BUILDDIR%/texinfo
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The Texinfo files are in %BUILDDIR%/texinfo.
+	goto end
+)
+
+if "%1" == "gettext" (
+	%SPHINXBUILD% -b gettext %I18NSPHINXOPTS% %BUILDDIR%/locale
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The message catalogs are in %BUILDDIR%/locale.
+	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
+)
+
+if "%1" == "coverage" (
+	%SPHINXBUILD% -b coverage %ALLSPHINXOPTS% %BUILDDIR%/coverage
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Testing of coverage in the sources finished, look at the ^
+results in %BUILDDIR%/coverage/python.txt.
+	goto end
+)
+
+if "%1" == "xml" (
+	%SPHINXBUILD% -b xml %ALLSPHINXOPTS% %BUILDDIR%/xml
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The XML files are in %BUILDDIR%/xml.
+	goto end
+)
+
+if "%1" == "pseudoxml" (
+	%SPHINXBUILD% -b pseudoxml %ALLSPHINXOPTS% %BUILDDIR%/pseudoxml
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The pseudo-XML files are in %BUILDDIR%/pseudoxml.
+	goto end
+)
+
+:end


Fixing first_arg initialization

Fixing first_arg initialization

--- make.bat
+++ make.bat
@@ -7,12 +7,13 @@
 set FIRST_ARG=%1
 set ACTION=%FIRST_ARG%

+set FIRST_ARG_IS_TOOL=0
 for %%A in ("pads_maker" "pads_std_plus") do if "%FIRST_ARG%"==%%A (
 	set ACTION=singlehtml
 	set FIRST_ARG_IS_TOOL=1
 )

-if not "%FIRST_ARG_IS_TOOL%" == "" (
+if not "%FIRST_ARG_IS_TOOL%" == "1" (
 	shift
 )


Updated gh-pages makefile

Updated gh-pages makefile

--- make.bat
+++ make.bat
@@ -82,35 +82,62 @@
 	goto end
 )
 if "%1" == "gh-pages" (
-
-    git checkout gh-pages
-
-    if errorlevel 1 exit /b 1
-    # Continue only if branch switching worked
-    RD /S /Q _sources
-    RD /S /Q _static
-    RD /S /Q _images
-    DEL /Q *.*
-    git checkout master data source make.bat Makefile
-    git reset HEAD
-    make html
-    # Ensure that images are rendered properly by building again
-    make html
-    # Clean the repo
-    DEL make.bat
-    DEL Makefile
-    RD /S /Q data
-    MOVE /Y docs\*.*
-    MOVE /Y docs\_images
-    MOVE /Y docs\_static
-    MOVE /Y docs\_sources
-    RD /S /Q docs
-    RD /S /Q source
-    git add -A
-    git commit -m "Generated gh-pages for `git log master -1 --pretty=short --abbrev-commit`"
-    git push origin gh-pages
-    git checkout master
-    goto end
+    SETLOCAL ENABLEDELAYEDEXPANSION
+
+    :: Update remote refs
+    git remote update
+
+    :: Check if there are incoming changes
+    for /f "tokens=*" %%a in ('git status -uno ^| find /I "git pull"') do set _CmdResult=%%a
+
+    :: If command output is empty, we can start building the pages
+    if "!_CmdResult!"=="" (
+
+        echo Building GitHub Pages..
+
+        git checkout gh-pages
+
+        :: Continue only if branch switching worked
+        if errorlevel 1 exit /b 1
+
+        :: Pull possible changes
+        git pull origin gh-pages
+
+        :: Make a clean branch
+        DEL /Q *.*
+        FOR /D %%i in (*.*) DO @RMDIR /S /Q "%%i"
+
+        :: Checkout necessary files to build the pages
+        git checkout master source data img make.bat
+        git reset HEAD
+
+        :: Build pages
+        make html
+        :: Ensure that images are rendered properly by building again
+        make html
+
+        :: Copy everything from docs folder to the root
+        XCOPY /E /V docs
+
+        :: Clean the repo from unnecessary files
+        DEL make.bat
+        DEL Makefile
+        RD /S /Q docs
+        RD /S /Q source
+
+        :: Commit and push changes
+        git add -A
+        ::for /f "tokens=*" %%a in ('git log master -1 -s --abbrev-commit') do set _PrettyResult=%%a
+        ::git commit -m "%_PrettyResult%"
+        git commit -m "Auto-generated"
+        git push origin gh-pages
+
+        :: Checkout to original master
+        git checkout master
+        goto end
+        ) else (
+            echo There are incoming changes in the master/origin. Pull and merge changes.
+        )
 )

 if "%1" == "dirhtml" (


make.cmd: make get: use `go get -u -v ../...`

--- make.cmd
+++ make.cmd
@@ -61,18 +61,6 @@
     Get-ChildItem . -Recurse |
     Where-Object{ $_.Extension -eq '.go' } |
     ForEach-Object{ Split-Path $_.FullName -Parent } |
-    Sort-Object |
-    Get-Unique
-}
-
-function Get-Imports {
-    Get-ChildItem . -Recurse |
-    Where-Object{ $_.Extension -eq '.go' } |
-    ForEach-Object{ Get-Content $_.FullName  } |
-    ForEach-Object{ ($_ -replace '\s*//.*$','').Split()[-1] <# remove comment #>} |
-    ?{ ($_ -match 'github.com/' -and $_ -notmatch '/nyagos/') `
-        -or $_ -match 'golang.org/' } |
-    %{ $_ -replace '"','' } |
     Sort-Object |
     Get-Unique
 }
@@ -503,7 +491,7 @@
     }
     "get" {
         Go-Generate
-        Get-Imports | ForEach-Object{ Write-Output $_ ; & $GO get -u $_ }
+        & $GO get -u -v ./...
     }
     "fmt" {
         Go-Fmt | Out-Null


internal changes

internal changes

--- etc/postinstall/notepad-replace-win11.bat
+++ etc/postinstall/notepad-replace-win11.bat
@@ -47,6 +47,6 @@

 :np_show
-reg query "%np_registry%"
+reg query "%np_registry%" /s
 goto :EOF


Initial revision

Initial revision

git-svn-id: e2e1a767b54e5f731ad8ac18fa5089ee37d5625a@2 7ec92016-0320-0410-acc4-a06ded1c099a

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

--- s.bat
+++ s.bat
@@ -0,0 +1,3 @@
+set PATH=%PATH%;"C:\Program Files\GNU\WinCvs 1.2";"C:\Program Files\SSH Communications Security\SSH Secure Shell"
+set CVSROOT=:ext:aandrei@cvs.loki-lib.sourceforge.net:/cvsroot/loki-lib
+set CVS_RSH=ssh2


Fixing BOM

Fixing BOM

--- nuget/re-pack-nupkg.cmd
+++ nuget/re-pack-nupkg.cmd
@@ -1,4 +1,4 @@
-rem REBUILD NUPKG
+rem REBUILD NUPKG
 call ..\set-version.cmd
 for %%f in (*.nuspec) do set srcfile=%%f
 echo SRC: %srcfile%


Adding timestamp server to publishing script.

--- Setup/Publish.cmd
+++ Setup/Publish.cmd
@@ -5,7 +5,7 @@
 SET      FILES_EXECUTABLE="..\Binaries\VhdAttach.exe" "..\Binaries\VhdAttachService.exe"
 SET           FILES_OTHER="..\Binaries\ReadMe.txt"
 SET   CERTIFICATE_SUBJECT="Josip Medved"
-SET CERTIFICATE_TIMESTAMP=
+SET CERTIFICATE_TIMESTAMP="http://www.startssl.com/timestamp/"

 ECHO --- BUILD SOLUTION


pushpdb: Use Win10 SDK

pushpdb: Use Win10 SDK

Win8.1 SDK may not be installed on virtio-win build machines.
Use Win10 instead.

Signed-off-by: Ladi Prosek <727f16b97cf99ec0710180d99386e4875fb7e2eb@redhat.com>

--- Tools/pushpdb.cmd
+++ Tools/pushpdb.cmd
@@ -6,7 +6,7 @@

 :: Set this to the path of the sysStore exe file on your local machine.----------::
 ::-------------------------------------------------------------------------------::
-set path_to_systore_exe=C:\Program Files (x86)\Windows Kits\8.1\Debuggers\x86\symstore.exe
+set path_to_systore_exe=C:\Program Files (x86)\Windows Kits\10\Debuggers\x86\symstore.exe

 :: Set this to the minimum size of an iso file in bytes to be considered valid.--::
 ::-------------------------------------------------------------------------------::


pushpdb: Don't loop indefinitely if symbol store is broken

If the store is not accessible the script should not get stuck
in an inifinite loop trying to create the lock file. This commit
adds another check which aborts the pushpdb attempt in such a
case.

Also fixing 'timeout' invocation to make sure it runs the Windows
tool and not the GNU one when running under Cygwin.

Signed-off-by: Ladi Prosek <727f16b97cf99ec0710180d99386e4875fb7e2eb@redhat.com>

--- Tools/pushpdb.cmd
+++ Tools/pushpdb.cmd
@@ -203,6 +203,9 @@
     for /f "tokens=2 delims=," %%t in ('findstr /b "DriverVer" "%~n1.inf"') do (
         for /f "tokens=1 delims= " %%v in ('echo %%~t') do (
             call :lock_file
+            if  ERRORLEVEL 1 (
+                exit /b 1
+            )
             echo Pushing %~1 version %%~v to the symbol store.
             if "%DSTORE_BUILD_TAG%"=="" (
                 call "%path_to_systore_exe%" add /s "%store_address%" /f "%~1" /t "%~n1" /v "%%~v" /c "eng" > NUL
@@ -225,6 +228,8 @@
 :: Creates a lock file with its unique stamp, tries to copy it to the stores
 :: location, then compares the lock at the store with its own, if equal then
 :: we locked and we continue, if not then we wait for 2 seconds then try again.
+:: If we're unable to create a uniquely named file in the store directory we
+:: abort the loop and return an error.
 :lock_file
 :loop
 (
@@ -241,8 +246,14 @@
 if not ERRORLEVEL 1 (
     exit /b 0
 ) else (
+    copy /y %GUID%.lock "%store_address%\%GUID%.lock" > NUL
+    if ERRORLEVEL 1 (
+        echo store appears to be broken, aborting
+        exit /b 1
+    )
+    del "%store_address%\%GUID%.lock" > NUL
     echo someone else is pushing, waiting for 2 secs
-    timeout /t 2 /nobreak > NUL
+    %windir%\system32\timeout /t 2 /nobreak > NUL
     goto :loop
 )


setup.py will not print each individual file


Push libimobiledevice, usbmuxd versions

Push libimobiledevice, usbmuxd versions

--- download.cmd
+++ download.cmd
@@ -1,5 +1,5 @@
-set USBMUXD_VERSION=131
-set LIBIMOBILEDEVICE_VERSION=168
+set USBMUXD_VERSION=132
+set LIBIMOBILEDEVICE_VERSION=169
 set LIBIDEVICEACTIVATION_VERSION=33

 REM download the archives


add new line

add new line

--- bin/phpsdk_dumpenv.bat
+++ bin/phpsdk_dumpenv.bat
@@ -4,6 +4,8 @@
 	echo PHP SDK is not setup
 	exit /b 3
 )
+
+echo.

 call %PHP_SDK_BIN_PATH%\phpsdk_version.bat
 echo.


old sonar commandline

old sonar commandline

--- .scripts/InitializeSonarqubeAnalysis.bat
+++ .scripts/InitializeSonarqubeAnalysis.bat
@@ -37,10 +37,11 @@
 	) ELSE (
 		echo Analysing commit %APPVEYOR_REPO_COMMIT%
 		@echo off
+		REM /d:"sonar.cs.vstest.reportsPaths=%APPVEYOR_BUILD_FOLDER%\TestResults.trx"
 		REM SonarQube.Scanner.MSBuild.exe begin /k:"PlaygroundDotNetCore" /d:"sonar.host.url=https://sonarcloud.io" /v:"%appveyor_build_version%" /d:"sonar.cs.opencover.reportsPaths=coverage-dotnet.xml" /d:"sonar.cs.xunit.reportsPaths=xunit-results.xml"              /d:"sonar.login=%sonar_login%" /n:"PlaygroundDotNetCore
-		SonarQube.Scanner.MSBuild.exe begin /k:"PlaygroundDotNetCore" /d:"sonar.host.url=https://sonarcloud.io" /v:"%appveyor_build_version%" /d:"sonar.cs.opencover.reportsPaths=coverage-dotnet.xml" /d:"sonar.cs.vstest.reportsPaths=%APPVEYOR_BUILD_FOLDER%\TestResults.trx" /d:"sonar.login=%sonar_login%" /n:"PlaygroundDotNetCore"
-		REM SonarQube.Scanner.MSBuild.exe begin /k:"Stryker.NET"          /d:"sonar.host.url=https://sonarcloud.io" /v:"%appveyor_build_version%" /d:"sonar.cs.opencover.reportsPaths=coverage-dotnet.xml" /d:"sonar.cs.vstest.reportsPaths=%APPVEYOR_BUILD_FOLDER%\Stryker.NET\TestResults.trx" /d:"sonar.login=%sonar_login%"
-
+		SonarQube.Scanner.MSBuild.exe begin    /k:"PlaygroundDotNetCore" /n:"PlaygroundDotNetCore" /d:sonar.cs.opencover.reportsPaths="coverage-dotnet.xml" /d:"sonar.organization=coenm-github" /d:"sonar.host.url=https://sonarcloud.io" /d:"sonar.login=%sonar_login%" /v:%appveyor_build_version% /d:"sonar.branch=%GitVersion_BranchName%" /d:"sonar.cpd.cross_project=true"
+
+		REM SonarQube.Scanner.MSBuild.exe begin /X /k:"PlaygroundDotNetCore" /d:"sonar.host.url=https://sonarcloud.io" /v:"%appveyor_build_version%" /d:"sonar.cs.opencover.reportsPaths=coverage-dotnet.xml" /d:"sonar.login=%sonar_login%" /n:"PlaygroundDotNetCore"
 	)

 ) ELSE (


Update bld.bat

Update bld.bat

--- libboost-python/bld.bat
+++ libboost-python/bld.bat
@@ -5,7 +5,7 @@
 :: IF errorlevel 1 exit 1
 ECHO .\bootstrap.bat mingw
 CALL .\bootstrap.bat mingw
-:: IF errorlevel 1 exit 1
+IF errorlevel 1 exit 1
 :: ECHO .\b2.exe install toolset=gcc --prefix=%SRC_DIR%\b2_for_mingw
 :: CALL .\b2.exe install toolset=gcc --prefix=%SRC_DIR%\b2_for_mingw
 :: ECHO cd %SRCDIR%


updated to current version

updated to current version

--- pack.bat
+++ pack.bat
@@ -1 +1 @@
-dotnet restore && dotnet build src\Remote.Linq test\Remote.Linq.Tests && dotnet test test\Remote.Linq.Tests && dotnet pack src\Remote.Linq --output artifacts --configuration Release --version-suffix 004+dotnet restore && dotnet build src\Remote.Linq test\Remote.Linq.Tests && dotnet test test\Remote.Linq.Tests && dotnet pack src\Remote.Linq --output artifacts --configuration Release --version-suffix 005


Updated windows build

Updated windows build

--- windows-install/win64/buildqt5win64.bat
+++ windows-install/win64/buildqt5win64.bat
@@ -1,13 +1,13 @@
 cd c:\workspace\codequery
 md build
 cd build
-cmake -G "MinGW Makefiles" -DBUILD_QT5=ON -DSQLITE_INCLUDE_DIR=c:\qt\Tools\mingw730_64\x86_64-w64-mingw32\include -DSQLITE_LIBRARY_RELEASE=c:\qt\Tools\mingw730_64\bin\sqlite3.dll ..
-mingw32-make
+cmake -G "Ninja" -DBUILD_QT5=ON -DSQLITE_INCLUDE_DIR="%MinGW64_DIR%\x86_64-w64-mingw32\include" -DSQLITE_LIBRARY_RELEASE="%MinGW64_DIR%\bin\sqlite3.dll" ..
+ninja
 md output
 copy *.exe output
-copy c:\Qt\tools\mingw730_64\bin\sqlite3.dll output
+copy "%MinGW64_DIR%\bin\sqlite3.dll" output
 cd output
 windeployqt --release codequery.exe
 dir/b/a/s
-candle.exe -ext WixUIExtension -ext WixUtilExtension c:\workspace\codequery\windows-install\win64\codequery64.wxs
+candle.exe -ext WixUIExtension -ext WixUtilExtension "c:\workspace\codequery\windows-install\win64\codequery64.wxs"
 light.exe -ext WixUIExtension -ext WixUtilExtension codequery64.wixobj


no token

no token

--- push-release.bat
+++ push-release.bat
@@ -2,11 +2,11 @@

 set HERE=%~dp0

-git config --global user.email "%APPVEYOR_REPO_COMMIT_AUTHOR%"
-git config --global user.name "%APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL%"
+git config --global user.email "%APPVEYOR_REPO_COMMIT_AUTHOR%" 1>NUL 2>NUL
+git config --global user.name "%APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL%" 1>NUL 2>NUL

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

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


run.bat: use double-colon to comment text

LGTM=rsc
R=golang-codereviews, rsc
CC=golang-codereviews
https://codereview.appspot.com/64980043

--- src/run.bat
+++ src/run.bat
@@ -52,10 +52,10 @@
 if errorlevel 1 goto fail
 echo.

-# Race detector only supported on Linux and OS X,
-# and only on amd64, and only when cgo is enabled.
-# Disabled due to golang.org/issue/7334; remove XXX below
-# and in run.bash to reenable.
+:: Race detector only supported on Linux and OS X,
+:: and only on amd64, and only when cgo is enabled.
+:: Disabled due to golang.org/issue/7334; remove XXX below
+:: and in run.bash to reenable.
 if not "%GOHOSTOS%-%GOOS%-%GOARCH%-%CGO_ENABLED%" == "XXXwindows-windows-amd64-1" goto norace
 echo # Testing race detector.
 go test -race -i runtime/race flag


TOOLS: 增加 CRHACK/GFX3 导入库处理脚本

TOOLS: 增加 CRHACK/GFX3 导入库处理脚本

--- lib/crhack/makelib.bat
+++ lib/crhack/makelib.bat
@@ -30,11 +30,17 @@
 coff2omf CrH_EXTZ.lib CrH_EXTZ_bcc.lib
 ren CrH_EXTZ.lib CrH_EXTZ_msc.lib
 :crh_fmtz
-if not exist CrH_FMTZ.lib goto crh_math
+if not exist CrH_FMTZ.lib goto crh_gfx3
 del CrH_FMTZ_bcc.lib
 del CrH_FMTZ_msc.lib
 coff2omf CrH_FMTZ.lib CrH_FMTZ_bcc.lib
 ren CrH_FMTZ.lib CrH_FMTZ_msc.lib
+:crh_gfx3
+if not exist CrH_GFX3.lib goto crh_math
+del CrH_GFX3_bcc.lib
+del CrH_GFX3_msc.lib
+coff2omf CrH_GFX3.lib CrH_GFX3_bcc.lib
+ren CrH_GFX3.lib CrH_GFX3_msc.lib
 :crh_math
 if not exist CrH_MATH.lib goto crh_vsys
 del CrH_MATH_bcc.lib


[C] Fix a call to `VsDevCmd.bat`

[C] Fix a call to `VsDevCmd.bat`

--- cppbuild/cppbuild-vs.cmd
+++ cppbuild/cppbuild-vs.cmd
@@ -35,7 +35,7 @@
 )

 rem Set Visual Studion ENV variables for command line builds (requires at least Visual Studio 2017)
-@for /f "usebackq delims=#" %a in (`"%programfiles(x86)%\Microsoft Visual Studio\Installer\vswhere" -latest -property installationPath`) do "%a\Common7\Tools\VsDevCmd.bat"
+@for /f "usebackq delims=#" %%a in (`"%programfiles(x86)%\Microsoft Visual Studio\Installer\vswhere" -latest -property installationPath`) do "%%a\Common7\Tools\VsDevCmd.bat"

 if EXIST %BUILD_DIR% rd /S /Q %BUILD_DIR%


Support for MSVS 2017 for AppVeyor build.

--- msvc/build_csoundqt.bat
+++ msvc/build_csoundqt.bat
@@ -24,6 +24,7 @@
     LCSOUND=%APPVEYOR_BUILD_FOLDER%\\msvc\\csound-vs\\Release\\csound64.lib ^
     LIBS+="%VCPKGDir%\\installed\\x64-windows\\lib\\libsndfile-1.lib" ^
     LIBS+="%APPVEYOR_BUILD_FOLDER%\\msvc\\csound-vs\\Release\\csound64.lib" ^
+    LIBS+="Ole32.lib" ^
     CSOUND_INTERFACES_INCLUDE_DIR+="%~dp0deps\\include" ^
     CSOUND_INTERFACES_INCLUDE_DIR+="%APPVEYOR_BUILD_FOLDER%\\deps\\include" ^
     CSOUND_INTERFACES_INCLUDE_DIR+="%VCPKGDir%\\installed\\x64-windows\\include" ^


Add example Windows batch to be placed in a global path

You only need to change `ffpath`

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

--- ff.bat
+++ ff.bat
@@ -0,0 +1,4 @@
+@echo off
+SET ffpath=C:\wnmap\public\fast-forward\
+call php %ffpath%cli-launch.php %*
+call %ffpath%cli-launch.temp.bat


windows-build-deps.cmd: Actually remove all QtCLucence dlls, not just release version.

--- tools/windows-build-deps.cmd
+++ tools/windows-build-deps.cmd
@@ -3,7 +3,7 @@

 :: User defined variables
 set GENERATOR="Visual Studio 9 2008"
-SET BUILD_RELEASE=FALSE
+set BUILD_RELEASE=FALSE
 set BUILD_OPENSSL=TRUE
 set USE_JOM=TRUE

@@ -276,7 +276,7 @@
    :: Clean out some definately not needed Qt DLLs from bin
    :: QtCLucene does not have a public API and QtDesigner* are for QtCretor etc.
    :: Others we could (should) remove right here: QtSvg, QtSql, QtTest and QtHelp.
-   del /Q "%TUNDRA_BIN%\QtCLucene4*.dll"
+   del /Q "%TUNDRA_BIN%\QtCLucene*.dll"
    del /Q "%TUNDRA_BIN%\QtDesigner*.dll"
 )


Fix window build path, add comments, remove unneeded code

--- recipes/itk-dev/bld.bat
+++ recipes/itk-dev/bld.bat
@@ -1,11 +1,11 @@
+# Building ITK inside the conda-build directory creates excessively
+# long paths. Due to the number of includes for needed during ITK, the
+# command line exceed the system limits. So a short build directory is
+# required.
 set BUILD_DIR=C:\b\%PY_VER%-%ARCH%
 IF EXIST %BUILD_DIR% ( echo "Please remove %BUILD_DIR%"; exit 1 )
 mkdir %BUILD_DIR%
 cd %BUILD_DIR%
-
-REM Remove dot from PY_VER for use in library name
-set MY_PY_VER=%PY_VER:.=%
-

 REM Configure Step
 cmake -G "Ninja" ^
@@ -24,7 +24,7 @@
     -D Module_ITKReview:BOOL=ON ^
     -D "CMAKE_SYSTEM_PREFIX_PATH:PATH=%PREFIX%/Library" ^
     -D "CMAKE_INSTALL_PREFIX=%PREFIX% ^
-    "%SRC_DIR%/SuperBuild"
+    "%SRC_DIR%"

 if errorlevel 1 exit 1

@@ -35,6 +35,3 @@
 REM Install step
 cmake -D CMAKE_INSTALL_PREFIX=%PREFIX% -P %BUILD_DR%/cmake_install.cmake
 if errorlevel 1 exit 1
-
-
-IF "%DIRTY%" NEQ "1" (rmdir /s /q %BUILD_DIR%)


mp.cmd: use python from path if C:\python27 is not found.

--- mp.cmd
+++ mp.cmd
@@ -1,2 +1,8 @@
-@set PYTHONPATH=%~dp0
-@c:\python27\python.exe scripts\mailpile %*
+@echo off
+set PYTHONPATH=%~dp0
+if exist c:\python27\python.exe (
+  set PYTHONBIN=c:\python27\python.exe
+) else (
+  set PYTHONBIN=python
+)
+%PYTHONBIN% scripts\mailpile %*


Updated publish script

Updated publish script

--- DwellerBot/publish.bat
+++ DwellerBot/publish.bat
@@ -3,12 +3,12 @@
 mkdir %publishpath%
 echo Publishing to %publishpath%

-cd bin\debug\
+cd bin\debug\net5.0
 @echo on
-copy /Y DwellerBot.exe %publishpath%
-copy /Y DwellerBot.exe.config %publishpath%
-copy /Y Resources\changelog.json %publishpath%\Resources
+xcopy /y /d DwellerBot.exe %publishpath%
+xcopy /y /d Resources\changelog.json %publishpath%\Resources\
 xcopy /y /d  "*.dll" %publishpath%
+xcopy /y /d  "*.json" %publishpath%
 @echo off
 echo Done


add bat file

add bat file

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

--- push.bat
+++ push.bat
@@ -0,0 +1,3 @@
+git add .
+git commit -m %1
+git push origin master


java9

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

--- run9.bat
+++ run9.bat
@@ -0,0 +1,6 @@
+call cd /D %userprofile%\IdeaProjects\VirtaMarketAnalyzerInGit\
+call mvn clean
+call mvn package
+set currentDate=%date%
+set dayOfMonth=%currentDate:~0,2%
+call "C:\Program Files\Java\jdk-9\bin\java" -Djava.util.Arrays.useLegacyMergeSort=true -Djava.net.preferIPv4Stack=true -Djava.io.tmpdir=d:\tmp -Xmx12G -Dfile.encoding=utf-8 -cp "%userprofile%\IdeaProjects\VirtaMarketAnalyzerInGit\target\VirtaMarketAnalyzer-jar-with-dependencies.jar" ru.VirtaMarketAnalyzer.main.TrendUpdater > "%userprofile%\IdeaProjects\VirtaMarketAnalyzerInGit\logs\log_%dayOfMonth%.txt" 2>"%userprofile%\IdeaProjects\VirtaMarketAnalyzerInGit\logs\log_err_%dayOfMonth%.txt"


Removed unneeded file

Removed unneeded file

Signed-off-by: Peter Nelson <4b8373d016f277527198385ba72fda0feb5da015@peterdn.com>

--- JSCore/fixdll.bat
+++ JSCore/fixdll.bat
@@ -1 +0,0 @@
-sn -R ..\bin\Debug\JSCore.dll "..\WebKit.Net.snk"


Omit 'Feature' postfix in feature name

Omit 'Feature' postfix in feature name

--- com.codeaffine.xiliary.archetype/create-module.bat
+++ com.codeaffine.xiliary.archetype/create-module.bat
@@ -11,7 +11,7 @@
 rem Input plugin name and compute test- and feature-name
 set /p bundleName="Please input the plug-in name and press enter to continue: "
 set testName=%bundleName% Tests
-set featureName=%bundleName% Feature
+set featureName=%bundleName%

 rem Input plugin version used for maven and bundle/feature
 set /p version="Please input the plug-in version and press enter to continue: "


Create NetCore-Patch.cmd

Create NetCore-Patch.cmd

[skip ci]

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

--- NetCore-Patch.cmd
+++ NetCore-Patch.cmd
@@ -0,0 +1,17 @@
+@echo off
+setlocal
+set msvcp140_x86 = "c:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.10.25008\x86\Microsoft.VC150.CRT\msvcp140.dll"
+set vcruntime140_x86 = "c:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.10.25008\x86\Microsoft.VC150.CRT\vcruntime140.dll"
+set msvcp140_x64 = "c:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.10.25008\x64\Microsoft.VC150.CRT\msvcp140.dll"
+set vcruntime140_x64 = "c:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.10.25008\x64\Microsoft.VC150.CRT\vcruntime140.dll"
+set editbin = "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Tools\MSVC\14.10.25017\bin\HostX86\x86\editbin.exe"
+set win7_x86 = "src\Draw2D.NetCore\bin\win7-x86"
+set win7_x64 = "src\Draw2D.NetCore\bin\win7-x64"
+set executable = "Draw2D.NetCore.exe"
+copy /Y %msvcp140_x86% %win7_x86%
+copy /Y %vcruntime140_x86% %win7_x86%
+copy /Y %msvcp140_x64% %win7_x64%
+copy /Y %vcruntime140_x64% %win7_x64%
+%editbin% /subsystem:windows %win7_x86%\%executable%
+%editbin% /subsystem:windows %win7_x64%\%executable%
+endlocal


windows で起動中に停止することがあったので修正。

windows で起動中に停止することがあったので修正。

--- bin/hubot.cmd
+++ bin/hubot.cmd
@@ -1,4 +1,12 @@
 @echo off
-SET BASE=https://direct4b.com/ja/bot/dev/modules
-if not exist node_modules\hubot\README_direct.md npm install %BASE%/hubot.tgz
-npm install && node_modules\.bin\hubot.cmd -d -a direct %*
+setlocal
+
+rem installer bug. http://stackoverflow.com/a/25095327
+mkdir "%APPDATA%\npm" > NUL 2>&1
+
+set BASE=https://direct4b.com/ja/bot/dev/modules
+if not exist node_modules\hubot\README_direct.md call npm install %BASE%/hubot.tgz
+
+set PATH=node_modules\.bin;node_modules\hubot\node_modules\.bin;%PATH%
+call npm install
+call node_modules\.bin\hubot.cmd -d -a direct %*


Move gvimrc log message so it doesn't print unnecessarily.

--- bootstrap.bat
+++ bootstrap.bat
@@ -10,8 +10,8 @@
 echo source %CD%\vim\vimrc >> %USERPROFILE%\_vimrc

 :GVIMRC
+if exist %USERPROFILE%\_gvimrc goto END
 echo Installing _gvimrc
-if exist %USERPROFILE%\_gvimrc goto END
 echo source %CD%\vim\gvimrc > %USERPROFILE%\_gvimrc

 :END


無駄な空白を削除

無駄な空白を削除

--- make_site.bat
+++ make_site.bat
@@ -9,7 +9,7 @@

 call mvn clean
 mkdir target
-call mvn site -Dgpg.skip=true > target/site.log 2>&1
+call mvn site -Dgpg.skip=true > target/site.log 2>&1

 start target/site.log


updated tag comment

updated tag comment

--- RELEASE-major.bat
+++ RELEASE-major.bat
@@ -50,7 +50,7 @@

 	%ZIP% "sar-controls %VERSION%.zip" .\release\*.*

-	svn commit -m "sar version %VERSION%"
+	svn commit -m "sar-controls version %VERSION%"
 	svn copy %REPO%/trunk %REPO%/tags/%VERSION% -m "Tagging the %VERSION% version release of the project"
 	svn update


Update stage_6_optimize.bat

Update stage_6_optimize.bat

--- resources/stage_6_optimize/stage_6_optimize.bat
+++ resources/stage_6_optimize/stage_6_optimize.bat
@@ -18,6 +18,8 @@

 :: Check for standalone vs. Tron execution and build the environment if running in standalone mode
 if /i "%LOGFILE%"=="" (
+	pushd ..
+
 	:: Load the settings file
 	call functions\tron_settings.bat


commit a commander file

commit a commander file

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


Tests executed from other dir

Tests executed from other dir

--- tests/allTests.bat
+++ tests/allTests.bat
@@ -1,19 +1,19 @@
-call test.bat TestsAppenders.sql
+call tests\test.bat tests\TestsAppenders.sql
 pause
-call test.bat TestsCascadeCallLimit.sql
+call tests\test.bat tests\TestsCascadeCallLimit.sql
 pause
-call test.bat TestsConfAppenders.sql
+call tests\test.bat tests\TestsConfAppenders.sql
 pause
-call test.bat TestsConfiguration.sql
+call tests\test.bat tests\TestsConfiguration.sql
 pause
-call test.bat TestsConfLoggers.sql
+call tests\test.bat tests\TestsConfLoggers.sql
 pause
-call test.bat TestsConfLoggersDelete.sql
+call tests\test.bat tests\TestsConfLoggersDelete.sql
 pause
-call test.bat TestsConfLoggersEffective.sql
+call tests\test.bat tests\TestsConfLoggersEffective.sql
 pause
-call test.bat TestsFunctionGetDefinedParentLogger.sql
+call tests\test.bat tests\TestsFunctionGetDefinedParentLogger.sql
 pause
-call test.bat TestsGetLogger.sql
+call tests\test.bat tests\TestsGetLogger.sql
 pause
-call test.bat TestsLevels.sql+call tests\test.bat tests\TestsLevels.sql


fix notepad++ name

fix notepad++ name

--- windows.bat
+++ windows.bat
@@ -3,5 +3,4 @@
 winget install googlechrome
 winget install keepass
 winget install dropbox
-winget install notepadplusplus
-winget install onenote
+winget install notepad++


Fixed win32 lib download script. The script runs fine, but PokerTH build is still untested.

--- docs/win32_build_scripts/pokerth_download_libs.cmd
+++ docs/win32_build_scripts/pokerth_download_libs.cmd
@@ -11,7 +11,7 @@
 pause
 echo.

-SET SOURCEFORGE_MIRROR=mesh.dl
+SET SOURCEFORGE_MIRROR=heanet.dl
 SET PKTH_OldDir=%CD%
 SET PKTH_BaseDir=%1
 if not defined PKTH_BaseDir goto noDir
@@ -51,7 +51,7 @@
 pause
 echo.
 echo Downloading mingw packages
-%PKTH_OldDir%\third_party_apps\curl -O http://%SOURCEFORGE_MIRROR%.sourceforge.net/sourceforge/mingw/gcc-core-3.4.5-20060117-3.tar.gz -O http://%SOURCEFORGE_MIRROR%.sourceforge.net/sourceforge/mingw/gcc-g++-3.4.5-20060117-3.tar.gz -O http://%SOURCEFORGE_MIRROR%.sourceforge.net/sourceforge/mingw/binutils-2.18.50-20080109-2.tar.gz -O http://%SOURCEFORGE_MIRROR%.sourceforge.net/sourceforge/mingw/mingw-runtime-3.14.tar.gz -O http://%SOURCEFORGE_MIRROR%.sourceforge.net/sourceforge/mingw/w32api-3.11.tar.gz -O http://%SOURCEFORGE_MIRROR%.sourceforge.net/sourceforge/mingw/mingw32-make-3.81-20080326-3.tar.gz -O http://%SOURCEFORGE_MIRROR%.sourceforge.net/sourceforge/mingw/mingw-utils-0.3.tar.gz
+%PKTH_OldDir%\third_party_apps\curl -O http://%SOURCEFORGE_MIRROR%.sourceforge.net/sourceforge/mingw/gcc-core-3.4.5-20060117-3.tar.gz -O http://%SOURCEFORGE_MIRROR%.sourceforge.net/sourceforge/mingw/gcc-g++-3.4.5-20060117-3.tar.gz -O http://%SOURCEFORGE_MIRROR%.sourceforge.net/sourceforge/mingw/binutils-2.18.50-20080109-2.tar.gz -O http://%SOURCEFORGE_MIRROR%.sourceforge.net/sourceforge/mingw/mingwrt-3.15.1-mingw32-dev.tar.gz -O http://%SOURCEFORGE_MIRROR%.sourceforge.net/sourceforge/mingw/mingwrt-3.15.1-mingw32-dll.tar.gz -O http://%SOURCEFORGE_MIRROR%.sourceforge.net/sourceforge/mingw/w32api-3.11.tar.gz -O http://%SOURCEFORGE_MIRROR%.sourceforge.net/sourceforge/mingw/mingw32-make-3.81-20080326-3.tar.gz -O http://%SOURCEFORGE_MIRROR%.sourceforge.net/sourceforge/mingw/mingw-utils-0.3.tar.gz
 if not errorlevel 0 goto downloadFailed
 echo.
 echo Unpacking mingw packages
@@ -65,9 +65,12 @@
 %PKTH_OldDir%\third_party_apps\7za x -y binutils-2.18.50-20080109-2.tar.gz
 %PKTH_OldDir%\third_party_apps\7za x -y -omingw binutils-2.18.50-20080109-2.tar
 del binutils-2.18.50-20080109-2.tar
-%PKTH_OldDir%\third_party_apps\7za x -y mingw-runtime-3.14.tar.gz
-%PKTH_OldDir%\third_party_apps\7za x -y -omingw mingw-runtime-3.14.tar
-del mingw-runtime-3.14.tar
+%PKTH_OldDir%\third_party_apps\7za x -y mingwrt-3.15.1-mingw32-dev.tar.gz
+%PKTH_OldDir%\third_party_apps\7za x -y -omingw mingwrt-3.15.1-mingw32-dev.tar
+del mingwrt-3.15.1-mingw32-dev.tar
+%PKTH_OldDir%\third_party_apps\7za x -y mingwrt-3.15.1-mingw32-dll.tar.gz
+%PKTH_OldDir%\third_party_apps\7za x -y -omingw mingwrt-3.15.1-mingw32-dll.tar
+del mingwrt-3.15.1-mingw32-dll.tar
 %PKTH_OldDir%\third_party_apps\7za x -y w32api-3.11.tar.gz
 %PKTH_OldDir%\third_party_apps\7za x -y -omingw w32api-3.11.tar
 del w32api-3.11.tar
@@ -90,14 +93,14 @@
 if not exist %PKTH_BaseDir%\qt. (
 echo.
 echo Downloading Qt
-%PKTH_OldDir%\third_party_apps\curl -O http://ftp.ntua.gr/pub/X11/Qt/qt/source/qt-win-opensource-src-4.4.1.zip
+%PKTH_OldDir%\third_party_apps\curl -O ftp://ftp.ntua.gr/pub/X11/Qt/qt/source/qt-win-opensource-src-4.4.3.zip
 if not errorlevel 0 goto downloadFailed
 echo.
 echo Unpacking Qt
-%PKTH_OldDir%\third_party_apps\7za x -y qt-win-opensource-src-4.4.1.zip
-REM Wait 5 seconds for the file cache, else ren might fail.
-@ping 127.0.0.1 -n 5 -w 1000 > nul
-ren qt-win-opensource-src-4.4.1 qt
+%PKTH_OldDir%\third_party_apps\7za x -y qt-win-opensource-src-4.4.3.zip
+REM Wait 5 seconds for the file cache, else ren might fail.
+@ping 127.0.0.1 -n 5 -w 1000 > nul
+ren qt-win-opensource-src-4.4.3 qt
 )
 if not exist %PKTH_BaseDir%\qt goto qtFailure
 echo.
@@ -106,7 +109,7 @@
 SET QMAKESPEC=win32-g++
 SET QTDIR=%PKTH_BaseDir%\qt
 cd qt
-configure -static -fast -no-qt3support -no-openssl -no-sql-sqlite -no-dbus -no-opengl -no-openssl -no-phonon -no-webkit
+configure -static -fast -no-qt3support -no-openssl -no-sql-sqlite -no-dbus -no-opengl -no-openssl -no-phonon -no-webkit -no-direct3d
 qmake projects.pro -o Makefile -spec win32-g++
 mingw32-make sub-src
 echo.
@@ -140,9 +143,9 @@
 if not exist %PKTH_BaseDir%\GnuTLS. (
 echo.
 echo Downloading GnuTLS
-%PKTH_OldDir%\third_party_apps\curl -O http://josefsson.org/gnutls4win/gnutls-2.2.5.zip
+%PKTH_OldDir%\third_party_apps\curl -O http://josefsson.org/gnutls4win/gnutls-2.6.0.zip
 mkdir GnuTLS
-%PKTH_OldDir%\third_party_apps\7za x -y -oGnuTLS gnutls-2.2.5.zip
+%PKTH_OldDir%\third_party_apps\7za x -y -oGnuTLS gnutls-2.6.0.zip
 REM Wait 5 seconds for the file cache.
 @ping 127.0.0.1 -n 5 -w 1000 > nul
 REM Remove files for dynamic linking, we do not want to accidently use them
@@ -154,16 +157,16 @@
 if not exist %PKTH_BaseDir%\curl. (
 echo.
 echo Downloading curl
-%PKTH_OldDir%\third_party_apps\curl -O http://curl.haxx.se/download/curl-7.18.2.tar.bz2
+%PKTH_OldDir%\third_party_apps\curl -O http://curl.haxx.se/download/curl-7.19.0.tar.bz2
 if not errorlevel 0 goto downloadFailed
 echo.
 echo Unpacking curl
-%PKTH_OldDir%\third_party_apps\7za x -y curl-7.18.2.tar.bz2
-%PKTH_OldDir%\third_party_apps\7za x -y curl-7.18.2.tar
-del curl-7.18.2.tar
-REM Wait 5 seconds for the file cache, else ren might fail.
-@ping 127.0.0.1 -n 5 -w 1000 > nul
-ren curl-7.18.2 curl
+%PKTH_OldDir%\third_party_apps\7za x -y curl-7.19.0.tar.bz2
+%PKTH_OldDir%\third_party_apps\7za x -y curl-7.19.0.tar
+del curl-7.19.0.tar
+REM Wait 5 seconds for the file cache, else ren might fail.
+@ping 127.0.0.1 -n 5 -w 1000 > nul
+ren curl-7.19.0 curl
 )
 echo.
 echo Compiling curl
@@ -198,7 +201,7 @@
 if not exist %PKTH_BaseDir%\SDL. (
 echo.
 echo Downloading SDL precompiled
-%PKTH_OldDir%\third_party_apps\curl -O http://www.libsdl.org/release/SDL-devel-1.2.13-mingw32.tar.gz
+%PKTH_OldDir%\third_party_apps\curl -O http://libsdl.org:9096/release/SDL-devel-1.2.13-mingw32.tar.gz
 if not errorlevel 0 goto downloadFailed
 echo.
 echo Unpacking SDL
@@ -212,7 +215,7 @@
 if not exist %PKTH_BaseDir%\SDL_mixer. (
 echo.
 echo Downloading SDL_mixer precompiled
-%PKTH_OldDir%\third_party_apps\curl -O http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-1.2.8.zip -O http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-1.2.8-win32.zip
+%PKTH_OldDir%\third_party_apps\curl -O http://libsdl.org:9096/projects/SDL_mixer/release/SDL_mixer-1.2.8.zip -O http://libsdl.org:9096/projects/SDL_mixer/release/SDL_mixer-1.2.8-win32.zip
 if not errorlevel 0 goto downloadFailed
 echo.
 echo Unpacking SDL_mixer
@@ -234,14 +237,14 @@
 if not exist %PKTH_BaseDir%\svn. (
 echo.
 echo Downloading subversion
-%PKTH_OldDir%\third_party_apps\curl -O http://subversion.tigris.org/files/documents/15/43244/svn-win32-1.5.1.zip
+%PKTH_OldDir%\third_party_apps\curl -O http://subversion.tigris.org/files/documents/15/44095/svn-win32-1.5.4.zip
 if not errorlevel 0 goto downloadFailed
 echo.
 echo Unpacking subversion
-%PKTH_OldDir%\third_party_apps\7za x -y svn-win32-1.5.1.zip
-REM Wait 5 seconds for the file cache, else ren might fail.
-@ping 127.0.0.1 -n 5 -w 1000 > nul
-ren svn-win32-1.5.1 svn
+%PKTH_OldDir%\third_party_apps\7za x -y svn-win32-1.5.4.zip
+REM Wait 5 seconds for the file cache, else ren might fail.
+@ping 127.0.0.1 -n 5 -w 1000 > nul
+ren svn-win32-1.5.4 svn
 )
 SET PATH=%PKTH_BaseDir%\svn\bin;%PATH%
 if not exist %PKTH_BaseDir%\svn\bin\svn.exe goto svnFailure


Update stage_5_patch.bat

Update stage_5_patch.bat

--- resources/stage_5_patch/stage_5_patch.bat
+++ resources/stage_5_patch/stage_5_patch.bat
@@ -24,6 +24,8 @@

 :: Check for standalone vs. Tron execution and build the environment if running in standalone mode
 if /i "%LOGFILE%"=="" (
+	pushd ..
+
 	:: Load the settings file
 	call functions\tron_settings.bat


ajusts

ajusts

git-svn-id: 80960b1af802dc749f4fe4aaeef1d170bd8270eb@522 d2da55db-5866-43f3-bc33-3da1c376b5d1

--- lvp_mock.bat
+++ lvp_mock.bat
@@ -1,4 +1,5 @@
 @echo off
 rmdir "app/cache/prod" /s /q
 rmdir "app/cache/dev" /s /q
+svn update
 composer install --prefer-dist --optimize-autoloader && php app/console assetic:dump --env=prod --no-debug && php app/console cache:clear --env=prod --no-warmup


Give message about how to run it.

Give message about how to run it.

--- expat/sample/build.bat
+++ expat/sample/build.bat
@@ -1,5 +1,4 @@
 @echo off
-set LIB=..\xmlparse\Release;..\xmltok\Release;..\lib;%LIB%
-set INCLUDE=..\xmlparse;..\xmltok;%INCLUDE%
-set CL=/nologo /DXMLTOKAPI=__declspec(dllimport) /DXMLPARSEAPI=__declspec(dllimport) xmlparse.lib xmltok.lib
-cl /Fe..\bin\elements elements.c
+set LIB=..\xmlparse\Release;..\lib;%LIB%
+cl /nologo /DXMLTOKAPI=__declspec(dllimport) /DXMLPARSEAPI=__declspec(dllimport) /I..\xmlparse /Fe..\bin\elements elements.c xmlparse.lib
+@echo Run it using: ..\bin\elements ^<..\expat.html


Fix VsChromium package file name.

Fix VsChromium package file name.

--- install_vsix_helper.bat
+++ install_vsix_helper.bat
@@ -3,6 +3,7 @@
 REM found in the LICENSE file.

 set VSIX_ID=a10cf7af-5f0a-4502-b44b-51ff1b7c8a87
+set VSIX_FILENAME=VsChromium.vsix

 REM ---------------------------------------------------
 REM Detect location of VSIXInstaller.exe
@@ -46,7 +47,7 @@
 REM ---------------------------------------------------
 REM Detect location of VSIX file
 set PROJECT_LOCATION=%~dp0
-if exist "%PROJECT_LOCATION%Binaries\%CONFIG_NAME%\VsChromium.vsix" set VSIX_FILE="%PROJECT_LOCATION%Binaries\%CONFIG_NAME%\VsChromiumPackage.vsix"
+if exist "%PROJECT_LOCATION%Binaries\%CONFIG_NAME%\VsChromium.vsix" set VSIX_FILE="%PROJECT_LOCATION%Binaries\%CONFIG_NAME%\%VSIX_FILENAME%"
 if "%VSIX_FILE%"=="" goto vsix_file_not_found

 "%VSIX_INSTALLER%" /skuName:Pro /skuVersion:%SKU_VERSION% /u:%VSIX_ID%


fix typo

fix typo

--- mk-nghttp2.bat
+++ mk-nghttp2.bat
@@ -42,9 +42,9 @@
  copy /y    COPYING              "%_DST%\COPYING.txt"
  copy /y    README.rst           "%_DST%\README.rst"

-if exist *.a  xcopy /y /s lib\*.a  "%_DST%\lib\"
-if exist *.la xcopy /y /s lib\*.la "%_DST%\lib\"
-if exist *.pc xcopy /y /s lib\*.pc "%_DST%\lib\"
+if exist lib\*.a  xcopy /y /s lib\*.a  "%_DST%\lib\"
+if exist lib\*.la xcopy /y /s lib\*.la "%_DST%\lib\"
+if exist lib\*.pc xcopy /y /s lib\*.pc "%_DST%\lib\"

 unix2dos -k %_DST:\=/%/*.txt
 unix2dos -k %_DST:\=/%/*.rst


uploaded 32-bit counterpart to the DDK make script

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

--- make_w32.cmd
+++ make_w32.cmd
@@ -0,0 +1,16 @@
+@ECHO OFF
+
+set target=i386
+REM set target=amd64
+
+set DDK=C:\WinDDK\7600.16385.1
+set MSVC=%DDK%\bin\x86\x86
+set incl=/I"%DDK%\inc\crt" /I"%DDK%\inc\api"
+set libs=/LIBPATH:"%DDK%\lib\crt\%target%" /LIBPATH:"%DDK%\lib\wnet\%target%"
+
+set C_FLAGS=/Wall /Ox /Ob1 /Oi /GS- /MD /TC
+set LINK_FLAGS=%libs% /ENTRY:"main" /FILEALIGN:512 /MERGE:.rdata=.text
+
+%MSVC%\cl.exe %CD%\spconfig.c %incl% %C_FLAGS% /link %LINK_FLAGS%
+
+pause


v4.2.1

--- tron.bat
+++ tron.bat
@@ -4,7 +4,8 @@
 :: Requirements:  1. Administrator access
 ::                2. Safe mode is strongly recommended (though not required)
 :: Author:        vocatus on reddit.com/r/sysadmin ( vocatus.gate@gmail.com ) // PGP key ID: 0x82A211A2
-:: Version:       4.2.0 + feature: Add -er flag (Email Report) and associated EMAIL_REPORT variable to automatically send an email report when Tron is finished. Requires you to input your SMTP information in \resources\stage_6_wrap-up\email_report\SwithMailSettings.xml. Thanks to /u/bodkov
+:: Version:       4.2.1 ! bugfix:  Fix broken -x (self-destruct) functionality due to uninitialized variable. Thanks to /u/HittingSmoke
+::                4.2.0 + feature: Add -er flag (Email Report) and associated EMAIL_REPORT variable to automatically send an email report when Tron is finished. Requires you to input your SMTP information in \resources\stage_6_wrap-up\email_report\SwithMailSettings.xml. Thanks to /u/bodkov
 ::                      + stages:  Add stage_6_wrap-up to support new email report functionality
 ::                      / stages:  Rename stage_6_manual_tools to stage_7_manual_tools
 ::
@@ -52,7 +53,7 @@
 set QUARANTINE_PATH=%LOGPATH%\tron_quarantined_files

 :: ! All variables here are overridden if their respective command-line flag is used
-:: AUTORUN               (-a)  = Automatic execution (no welcome screen or prompts)
+:: AUTORUN               (-a)  = Automatic execution (no welcome screen or prompts), implies -e.
 :: DRY_RUN               (-d)  = Run through script but skip all actual actions (test mode)
 :: EULA_ACCEPTED         (-e)  = Accept EULA (suppress display of disclaimer warning screen)
 :: EMAIL_REPORT          (-er) = Email post-run report with log file. Requires you to have configured SwithMailSettings.xml prior to running
@@ -96,8 +97,8 @@
 :::::::::::::::::::::
 cls
 color 0f
-set SCRIPT_VERSION=4.2.0
-set SCRIPT_DATE=2014-11-26
+set SCRIPT_VERSION=4.2.1
+set SCRIPT_DATE=2014-11-30
 title TRON v%SCRIPT_VERSION% (%SCRIPT_DATE%)

 :: Get the date into ISO 8601 standard date format (yyyy-mm-dd) so we can use it
@@ -1460,9 +1461,10 @@
 if /i %AUTO_SHUTDOWN%==yes shutdown -f -t %AUTO_REBOOT_DELAY% -s

 :: De-rez self if requested
+set CWD=%CD%
 if /i %SELF_DESTRUCT%==yes (
-	set CWD=%CD%
-	cd ..
+	%SystemDrive%
+	cd \
 	rmdir /s /q %CWD%
 	)


Redirect performance degradation notifications to #tp-performance

Do not flood #tp-development.

--- run_analyzer.bat
+++ run_analyzer.bat
@@ -1,4 +1,4 @@
 call scripts\setup-environment.bat
 .env\Scripts\python.exe src\run_perf_time_analysis.py -mf "%1" --es-host "%4" --es-region "%5" --es-access-key-id "%6" --es-secret-access-key "%7"
-.env\Scripts\python.exe src\notify_slack.py -f "%1" --slack-notification-url "%2" --slack-channel "#tp-development" --build-url "%3"
+.env\Scripts\python.exe src\notify_slack.py --file "%1" --slack-notification-url "%2" --slack-channel "#tp-performance" --build-url "%3"
 call scripts\cleanup-environment.bat


Changed to 'logs' to 'log' directory for commons-daemon.log

--- src/main/daemon/install-service.bat
+++ src/main/daemon/install-service.bat
@@ -67,7 +67,7 @@
     --Description "Red5 Media Server" ^
     --DisplayName "Red5 Media Server" ^
     --Install "%EXECUTABLE%" ^
-    --LogPath "%RED5_HOME%\logs" ^
+    --LogPath "%RED5_HOME%\log" ^
     --StdOutput "%RED5_HOME%\log\red5_service.log" ^
     --StdError "%RED5_HOME%\log\stderr.log" ^
     --Classpath "%CLASSPATH%" ^
@@ -91,4 +91,4 @@
 echo The service '%SERVICE_NAME%' has been installed.

 :end
-ENDLOCAL+ENDLOCAL