MSYS2 git config import: Use include directive

--- buildscript/modules/runmsys.cmd
+++ buildscript/modules/runmsys.cmd
@@ -1,4 +1,8 @@
+@IF %gitstate% GTR 0 for /f tokens^=2^ delims^=^\^ eol^= %%a IN ('whoami') DO @IF NOT EXIST "%msysloc%\home\%%a\.gitconfig" (
+@echo [include]
+@echo path ^= %USERPROFILE:\=\\%\\.gitconfig
+)>"%msysloc%\home\%%a\.gitconfig"
 @set CD=
-@IF %gitstate% GTR 0 echo PATH^=${PATH}^:${gitloc};cp -f ${USERPROFILE}/.gitconfig ~;cd "%CD%";%*  >"%devroot%\%projectname%\buildscript\assets\temp.sh"
+@IF %gitstate% GTR 0 echo PATH^=${PATH}^:${gitloc};cd "%CD%";%*  >"%devroot%\%projectname%\buildscript\assets\temp.sh"
 @IF %gitstate% EQU 0 echo cd "%CD%";%*  >"%devroot%\%projectname%\buildscript\assets\temp.sh"
 @"%msysloc%\usr\bin\bash.exe" -l "%devroot%\%projectname%\buildscript\assets\temp.sh"


Perform quoting in a different way

Perform quoting in a different way

--- setup.bat
+++ setup.bat
@@ -3,9 +3,8 @@
 %= Run this batch script from the top-level of the Balcazapy installation. =%
 %= Edit the following lines to the correct values, and add the bin folder  =%
 %= to your PATH. =%
-set PYTHON="C:\Python27\python"
-rem set BALCAZAPY_HOME="C:\balcazapy"
-set BALCAZAPY_HOME=C:\Users\Jon Giddy\Desktop\balcazapy\balcazapy
+set PYTHON_HOME=C:\Python27
+set BALCAZAPY_HOME=C:\Users\Ann Other\Desktop\balcazapy

 set BALC="bin\balc.bat"

@@ -13,9 +12,9 @@
 rmdir /q bin
 mkdir bin

-echo @echo off > %BALC%
-echo set BALCAZAPY_HOME=%BALCAZAPY_HOME% >> %BALC%
-echo set BALCAZAPROG=%%0 >> %BALC%
-echo set PYTHON=%PYTHON% >> %BALC%
-echo set PYTHONPATH=%CD%\python >> %BALC%
-echo %%PYTHON%% "%BALCAZAPY_HOME%\python\balcaza\T2FlowBuilder.py" %%* >> %BALC%
+echo @echo off> %BALC%
+echo set PYTHON=%PYTHON_HOME%\python>> %BALC%
+echo set BALCAZAPY_HOME=%BALCAZAPY_HOME%>> %BALC%
+echo set BALCAZAPROG=%%0>> %BALC%
+echo set PYTHONPATH=%CD%\python>> %BALC%
+echo "%%PYTHON%%" "%%BALCAZAPY_HOME%%\python\balcaza\T2FlowBuilder.py" %%*>> %BALC%


Replace forward slashes with back slashes

--- bin/stree.cmd
+++ bin/stree.cmd
@@ -17,7 +17,7 @@
 git rev-parse --show-toplevel 1> nul 2> nul

 if %errorlevel% EQU 0 (
-    start "" "C:\Program Files (x86)\Atlassian\SourceTree\SourceTree.exe" -f %directory%
+    start "" "C:\Program Files (x86)\Atlassian\SourceTree\SourceTree.exe" -f %directory:/=\%
 )

 popd


Delete bootstrap.cmd

Delete bootstrap.cmd

--- bootstrap.cmd
+++ bootstrap.cmd
@@ -1,8 +0,0 @@
-@echo off
-IF EXIST node_modules\cmaki_generator (
-  echo .
-) else (
-  md node_modules\cmaki_generator
-  cd node_modules && git clone -q https://github.com/makiolo/cmaki_generator.git && cd ..
-  cd node_modules/cmaki_generator && rm -Rf .git && cd ..\..
-)


windows ok

windows ok

--- websites/code/studygolang/install.bat
+++ websites/code/studygolang/install.bat
@@ -23,7 +23,7 @@
 gofmt -w src

 :: -tags "debug" 表示测试
-go install -tags "debug" -ldflags "-X util/version.Version "%VERSION%" -X util/version.Date "%date:~3,10%T%time%"" ./...
+go install -tags "debug" -ldflags "-X util/version.Version "%VERSION% ./...

 set GOPATH=%OLDGOPATH%


print MSI

print MSI

--- windows-install/win64/pack_github.bat
+++ windows-install/win64/pack_github.bat
@@ -8,6 +8,8 @@
 copy "C:\ProgramData\Chocolatey\lib\mingw\tools\install\mingw64\bin\libwinpthread-1.dll" output
 cd output
 windeployqt codequery.exe
-dir/b/a/s
+dir /b/a/s
 candle.exe -ext WixUIExtension -ext WixUtilExtension "..\..\windows-install\win64\codequery64.wxs"
 light.exe -ext WixUIExtension -ext WixUtilExtension codequery64.wixobj
+dir /a/s *.msi
+


Echo calculated version.

Echo calculated version.

--- build_win.bat
+++ build_win.bat
@@ -157,10 +157,11 @@
 copy tools\jpm.bat dist\jpm.bat

 @rem Create installer
-janet.exe -e "(print ((peg/match ''(* :d+ `.` :d+ `.` :d+) janet/version) 0))" > build\version.txt
+janet.exe -e "(->> janet/version (peg/match ''(* :d+ `.` :d+ `.` :d+)) first print)" > build\version.txt
 janet.exe -e "(print (= (os/arch) :x64))" > build\64bit.txt
 set /p JANET_VERSION= < build\version.txt
 set /p SIXTYFOUR= < build\64bit.txt
+echo "JANET_VERSION is %JANET_VERSION%"
 "C:\Program Files (x86)\NSIS\makensis.exe" janet-installer.nsi /DVERSION=%JANET_VERSION% /DSIXTYFOUR=%SIXTYFOUR%
 exit /b 0


[win] Updated zip packaging script for msvc2008

--- tools/win/create_portable_zip.bat
+++ tools/win/create_portable_zip.bat
@@ -7,7 +7,7 @@
 set PKG_DIR=MapsWithMe
 set BASE_PATH=C:\Qt\omim-build-%PKG_TYPE%-release
 set MINGW_BIN_PATH=C:\Qt\SDK\mingw\bin
-set QT_BIN_PATH=C:\Qt\SDK\Desktop\Qt\4.7.2\%PKG_TYPE%\bin
+set QT_BIN_PATH=C:\Qt\SDK\Desktop\Qt\4.7.3\%PKG_TYPE%\bin
 set RAR_CMD="C:\Program Files\WinRar\WinRar.exe"
 set ZIP_NAME=MapsWithMe-%PKG_TYPE%.zip
 set PKG_RES_DIR=%PKG_DIR%\resources
@@ -31,7 +31,7 @@
 copy %BASE_PATH%\data\maps.update %PKG_RES_DIR%
 copy %BASE_PATH%\data\World.mwm %PKG_RES_DIR%

-copy %BASE_PATH%\data\dictionary.slf %PKG_RES_DIR%
+REM copy %BASE_PATH%\data\dictionary.slf %PKG_RES_DIR%

 IF %PKG_TYPE%==mingw (
@@ -39,8 +39,8 @@
   copy %QT_BIN_PATH%\libgcc_s_dw2-1.dll %PKG_DIR%\
   copy %QT_BIN_PATH%\mingwm10.dll %PKG_DIR%\
 ) ELSE (
-  copy C:\Windows\winsxs\x86_microsoft.vc90.crt_1fc8b3b9a1e18e3b_9.0.30729.4926_none_508ed732bcbc0e5a\msvcp90.dll %PKG_DIR%\
-  copy C:\Windows\winsxs\x86_microsoft.vc90.crt_1fc8b3b9a1e18e3b_9.0.30729.4926_none_508ed732bcbc0e5a\msvcr90.dll %PKG_DIR%\
+  copy C:\Windows\winsxs\x86_microsoft.vc90.crt_1fc8b3b9a1e18e3b_9.0.30729.5570_none_509463cabcb6ef2a\msvcp90.dll %PKG_DIR%\
+  copy C:\Windows\winsxs\x86_microsoft.vc90.crt_1fc8b3b9a1e18e3b_9.0.30729.5570_none_509463cabcb6ef2a\msvcr90.dll %PKG_DIR%\
 )

 copy %QT_BIN_PATH%\QtCore4.dll %PKG_DIR%\


Oops, forgot to retarget to master

Oops, forgot to retarget to master

--- AppVeyorTestDolphinVM.cmd
+++ AppVeyorTestDolphinVM.cmd
@@ -1,5 +1,5 @@
 ECHO Clone Dolphin image environment
-git clone -q --branch=7.0 https://github.com/dolphinsmalltalk/Dolphin.git Dolphin
+git clone -q --branch=master https://github.com/dolphinsmalltalk/Dolphin.git Dolphin

 ECHO Copy executables
 copy ..\..\*.exe Dolphin


Починил виндозный билд.

Починил виндозный билд.

--- branches/ultimate-repo/generate-code.bat
+++ branches/ultimate-repo/generate-code.bat
@@ -41,5 +41,5 @@
 xcopy /y /e /c /h /r %GEN%\real_dynamic.qrc .
 :q
 echo "done"
-exit  0
+exit /B 0


Make sure the dist. file is copied to the web directory

--- win32/makedist.cmd
+++ win32/makedist.cmd
@@ -1,4 +1,5 @@
 @echo off
+SET zip_file=php-gtk-0.5.0-win32.zip
 md \php-gtk-dist
 cd \php-gtk-dist
 md php4
@@ -30,5 +31,8 @@
 copy \php\php-gtk\test\testgtkrc test
 copy \php\php-gtk\test\testgtkrc2 test
 copy \php\php-gtk\win32\README.txt
-"c:\Program Files\WinZip\WZZip" -ampr php-gtk-0.5.0-win32.zip
+copy \php\php-gtk\NEWS
+"c:\Program Files\WinZip\WZZip" -ampr %zip_file%
+copy %zip_file% \php\php-gtk-web\distributions
+del %zip_file%
 cd \php\php-gtk\win32


updated paths

updated paths

--- misc/builds/CPC.bat
+++ misc/builds/CPC.bat
@@ -2,7 +2,7 @@
 del PE /q /s
 rd PE
 set today=%date:~-4%%date:~-10,2%%date:~-7,2%
-svn export http://corkami.googlecode.com/svn/trunk/asm/PE PE --force
+svn export http://corkami.googlecode.com/svn/trunk/src/PE PE --force
 cd PE\bin
 call make
 :call test > test.txt
@@ -10,5 +10,5 @@
 cd ..
 "c:\program files\winrar\rar.exe" a ..\CPC-%today%-r.rar -r -m5 -s
 cd ..
-svn info http://corkami.googlecode.com/svn/trunk/asm/PE
+svn info http://corkami.googlecode.com/svn/trunk/src/PE
 echo CPC-%today%-r


updated the path to R to latest version. Got error syaing DVstats package could not be found when I used the earlier version of R. I did not have the package in the earlier version of R

--- pest-hspf-files/model.bat
+++ pest-hspf-files/model.bat
@@ -1,4 +1,4 @@
 @echo off
-E:\PEST\par2par %~dp0p2p_bigelk.dat > nul
+C:\PEST\par2par %~dp0p2p_bigelk.dat > nul
 C:\BASINS41\models\HSPF\bin\WinHspfLt.exe -1 -1 %~dp0bigelk.uci
-E:\PEST\surface_water_utilities\tsproc < %~dp0tsproc.in > nul
+"C:\Program Files\R\R-3.1.3\bin\x64\RScript.exe" M:\Models\Bacteria\HSPF\Big-Elk-Cadmus-HydCal-Updated-WDM\r-files\proc-mod-flow-for-pest.R


IGNITE-3184: Hadoop: fixed Windows setenv.bat.

--- bin/include/setenv.bat
+++ bin/include/setenv.bat
@@ -47,9 +47,9 @@

 if defined USER_LIBS set IGNITE_LIBS=%USER_LIBS%;%IGNITE_LIBS%

-FOR /F "delims=" %%i IN ('%JAVA_HOME%\bin\java.exe -cp %IGNITE_HOME%\libs\ignite-hadoop\* org.apache.ignite.internal.processors.hadoop.HadoopClasspathMain ";"' ) DO set IGNITE_HADOOP_CLASSPATH=%%i
+if "%HADOOP_EDITION%" == "1" FOR /F "delims=" %%i IN ('%JAVA_HOME%\bin\java.exe -cp %IGNITE_HOME%\libs\ignite-hadoop\* org.apache.ignite.internal.processors.hadoop.HadoopClasspathMain ";"' ) DO set IGNITE_HADOOP_CLASSPATH=%%i

-if "[%IGNITE_HADOOP_CLASSPATH%]" == "[]" exit 1
+if "%IGNITE_HADOOP_CLASSPATH%" == "" goto :eof

 set IGNITE_LIBS=%IGNITE_LIBS%;%IGNITE_HADOOP_CLASSPATH%


Culling old versions

Culling old versions

--- bootstrap-py32-x86.bat
+++ bootstrap-py32-x86.bat
@@ -1,47 +0,0 @@
-set pypath=C:\Python32
-set py=python-3.2.5.msi
-set pyurl=http://www.python.org/ftp/python/3.2.5/%py%
-@ECHO .
-set pywin=pywin32-218.win32-py3.2.exe
-set pywinurl="http://sourceforge.net/projects/pywin32/files/pywin32/Build 218/%pywin%/download#"
-@ECHO .
-set ez=ez_setup.py
-set ezurl="http://bitbucket.org/pypa/setuptools/raw/bootstrap/%ez%"
-@ECHO .
-set curl=curl\curl.exe
-@ECHO .
-@ECHO *** Downloading Python installer ***
-%curl% -o %py% %pyurl%
-@ECHO .
-@ECHO *** Running Python installer ***
-%py%
-@ECHO .
-@ECHO *** Downloading PyWin32 installer ***
-%curl% -L -o %pywin% %pywinurl%
-@ECHO .
-@ECHO *** running PyWin32 installer ***
-start "" /wait %pywin%
-@ECHO .
-@ECHO *** Downloading setuptools bootstrap script ***
-%curl% -L -k -o %ez% %ezurl%
-@ECHO .
-@ECHO *** Running setuptools bootstrap script ***
-%pypath%\python.exe ez_setup.py
-@ECHO .
-@ECHO *** easy_installing pip ***
-%pypath%\Scripts\easy_install.exe pip
-@ECHO .
-@ECHO *** pip installing virtualenv ***
-%pypath%\Scripts\pip.exe install virtualenv
-@ECHO .
-@ECHO *** Cleaning up Python installer ***
-del %py%
-@ECHO .
-@ECHO *** Cleaning up PyWin32 installer ***
-del %pywin%
-@ECHO .
-@ECHO *** Cleaning up setuptools installer ***
-del %ez%
-del setuptools*.tar.gz
-@ECHO .
-@ECHO  *** Finished  ***


Build fixes

Build fixes

--- build-package.bat
+++ build-package.bat
@@ -1,4 +1,4 @@
 @echo off
 SET "VERSION=1.0.0"

-SET "SBT_OPTS=-Xmx8G -Denable-tika=0 -Denable-javacv=0" && sbt desktopApp/universal:packageBin desktopApp/jdkPackager:packageBin && move /y "%~dp0desktop-app\target\universal\shadowcloud-desktop-%VERSION%.zip" "%~dp0desktop-app\target\universal\shadowcloud-%VERSION%-light.zip" && move /y "%~dp0desktop-app\target\universal\jdkpackager\bundles\shadowcloud-%VERSION%.exe" "%~dp0desktop-app\target\universal\jdkpackager\bundles\shadowcloud-%VERSION%-light.exe" && SET "SBT_OPTS=-Xmx8G -Denable-tika=1 -Denable-javacv=1" && sbt desktopApp/universal:packageBin desktopApp/jdkPackager:packageBin && move /y "%~dp0desktop-app\target\universal\shadowcloud-desktop-%VERSION%.zip" "%~dp0desktop-app\target\universal\shadowcloud-%VERSION%-full.zip" && move /y "%~dp0desktop-app\target\universal\jdkpackager\bundles\shadowcloud-%VERSION%.exe" "%~dp0desktop-app\target\universal\jdkpackager\bundles\shadowcloud-%VERSION%-full.exe"+SET "SBT_OPTS=-Xmx8G -Denable-tika=0 -Denable-javacv=0" && sbt desktopApp/universal:packageBin desktopApp/jdkPackager:packageBin && move /y "%~dp0desktop-app\target\universal\shadowcloud-desktop-%VERSION%.zip" "%~dp0desktop-app\target\universal\shadowcloud-%VERSION%-light.zip" && move /y "%~dp0desktop-app\target\universal\jdkpackager\bundles\shadowcloud-%VERSION%.exe" "%~dp0desktop-app\target\universal\jdkpackager\bundles\shadowcloud-%VERSION%-light.exe" && SET "SBT_OPTS=-Xmx8G -Denable-tika=1 -Denable-javacv=1" && sbt desktopApp/jdkPackager:packageBin && SET "SBT_OPTS=-Xmx8G -Denable-tika=1 -Denable-javacv-all=1" && sbt desktopApp/universal:packageBin && move /y "%~dp0desktop-app\target\universal\shadowcloud-desktop-%VERSION%.zip" "%~dp0desktop-app\target\universal\shadowcloud-%VERSION%-full.zip" && move /y "%~dp0desktop-app\target\universal\jdkpackager\bundles\shadowcloud-%VERSION%.exe" "%~dp0desktop-app\target\universal\jdkpackager\bundles\shadowcloud-%VERSION%-full.exe"


Serbian translation by kingW3

Serbian translation by kingW3

git-svn-id: 42973100b4634b3c653b0d04ba2ce8cb0267cb12@46 5d7abbe1-27f8-cb71-bef1-01d8ca34fe51

--- module/i18n.inc.bat
+++ module/i18n.inc.bat
@@ -322,6 +322,64 @@

 	goto echo_phrase

+:: Serbian - translation by kingW3
+:SRB
+	set MOTD_LANGUAGE=enUS
+
+	set PHRASE_1_0=  Visual Studio nije instaliran
+	set PHRASE_1_1=Izaberi kojom verzijom Visual Studia ces da Napravis pvpgn:
+	set PHRASE_1_2=%2 izabran kao kompajler
+	set PHRASE_1_3=da li zelis da downloadujes/updejtujes zadnji pvpgn iz svn-a (u %2 folder)?
+	set PHRASE_1_4=   PvPGN ce updejtovati iz svn-a
+	set PHRASE_1_5=   PvPGN nece updejtovati iz svn-a
+	set PHRASE_1_6=Izaberi PvPGN izgled:
+	set PHRASE_1_7=   1) Consola (defaut)
+	set PHRASE_1_8=   2) GUI(Graficki prikaz)
+	set PHRASE_1_9=Izaberi broj
+	set PHRASE_1_10=   izaberi PvPGN izgled as Console
+	set PHRASE_1_11=   izaveri PvPGN izgled as GUI (Graficki izgled)
+	set PHRASE_1_12=izaberi vrstu baze podataka:
+	set PHRASE_1_13=   1) Plain (default)
+	set PHRASE_1_14=   2) MySql
+	set PHRASE_1_15=   PvPGN ce praviti bez baze podataka
+	set PHRASE_1_16=CMake konfigurisanje nije uspelo
+
+	set PHRASE_2_1=Dostupne %2 verzije (mozes dodati svoju verziju %3):
+	set PHRASE_2_2=   izaberi broj
+	set PHRASE_2_3=   lose izabrano... probajte opet
+	set PHRASE_2_4=   PvPGN ce compilirati pomocu %2 v%3
+	set PHRASE_2_5=dali zelite da konfigurisete %2 now?
+	set PHRASE_2_6=    host baze podataka
+	set PHRASE_2_7=    korisnik baze podataka
+	set PHRASE_2_8=    pasvord korisnika
+	set PHRASE_2_9=    ime baze podataka
+	set PHRASE_2_10=    prefix tabele (default is %2)
+	set PHRASE_2_11=%2 konfiguracija sacuvana
+
+	set PHRASE_3_1=Gledanje za updejt ...
+	set PHRASE_3_2="v%2" je tvoja verzija
+	set PHRASE_3_3="v%2" je zadnja verzija
+	set PHRASE_3_4= Imas zadnju verziju PvPGN Magic Builder-a
+	set PHRASE_3_5=Verzija PvPGN Magic Builder nije jednaka tvojoj. Dali zelite da automatski updejtuje na zadnju verziju?
+	set PHRASE_3_6= Korisnik je zaustavio Updejt
+	set PHRASE_3_6_1= Can not connect to Updejt server
+	set PHRASE_3_7=pocinje Updejt ...
+	set PHRASE_3_8= skidanje fajlova %2 ...
+	set PHRASE_3_9=Updejt zavrsen
+	set PHRASE_3_10=Molimo vas, proverite fajl %2 za vise informacija oko promena
+
+	set PHRASE_4_1=Dali zelite da primenite patch u sourcu fajl ?
+	set PHRASE_4_2=Molimo vas, prvo stavite patch fajl(ove) u %2 directorijum. Mozete skinuti patchs sa ove webstranice: %3
+	set PHRASE_4_3=*** Upozorenje ***
+	set PHRASE_4_4=Lokacije u vasim *.patch fajlovima treba staviti kao u source codu (its placed in the SVN at %2)
+	set PHRASE_4_5=Na primer: dali zelite da primenite patch to %2, tako da lokacija za ovaj fajl treba da bude %3
+	set PHRASE_4_6=dali ste spremni da patcujete?
+	set PHRASE_4_7=primenjuje patch %2 ...
+	set PHRASE_4_8=Zavrseno. Molimo vas, pogledajte da nema sukoba.
+	set PHRASE_4_9=Dali zelite da nastavite pravljenjem pvpgn-a?
+
+	goto echo_phrase
+
 :: Czech
 :CSY
 	set MOTD_LANGUAGE=csCZ


0.0.16 VCbind.bat reporting VCINSTALLDIR

The %VCINSTALLDIR% is reported in verbose cases
for completeness and possible value in trouble-shooting.

--- dev/VCbinder/devBind/VCbind.bat
+++ dev/VCbinder/devBind/VCbind.bat
@@ -1,5 +1,5 @@
 @echo off
-rem VCbind.zip\VCbind.bat 0.0.15     UTF-8                          2016-11-22
+rem VCbind.zip\VCbind.bat 0.0.16     UTF-8                          2016-11-24
 rem -----1---------2---------3---------4---------5---------6---------7-------*

 rem                  SETTING VC++ COMMAND-SHELL ENVIRONMENT
@@ -154,7 +154,8 @@
 rem TRUST PREVIOUS SETTINGS TO BE REUSABLE
 rem      Avoid multiple running of VC\ settings and duplicating the PATH and
 rem      other parameter settings.
-ECHO:          Using existing VC++ %VCboundVer% %VCboundConfig% config setup.
+ECHO:          Using existing VC++ %VCboundVer% %VCboundConfig% config setup.
+ECHO:          %VCINSTALLDIR% %VCterse%
 GOTO :SUCCESS

 :SUCCESS
@@ -195,13 +196,15 @@
 ECHO:          *** FAIL: VC ENVIRONMENT ALREADY SET BY OTHER MEANS ***
 ECHO:          The environment is already set for compiling with a  %VCterse%
 ECHO:          VC++ compiler version %VisualStudioVersion%          %VCterse%
+ECHO:          %VCINSTALLDIR% %VCterse%
 GOTO :NOMIXING

 :FAIL3
 ECHO:          *** FAIL: VCBIND ENVIRONMENT HAS BEEN ALTERED ***
 ECHO:          Binding to VC++ %VisualStudioVersion% is changed     %VCterse%
-ECHO:          from version %VCboundVer% set by VCbind.  Continuing %VCterse%
-ECHO:          this session may lead to unexpected results.         %VCterse%
+ECHO:          from version %VCboundVer% set by VCbind.  Now at     %VCterse%
+ECHO:          %VCINSTALLDIR% %VCterse%
+ECHO:          Continuing this session may have unexpected results. %VCterse%
 GOTO :NOMIXING

 :FAIL2
@@ -312,6 +315,8 @@

 rem -----1---------2---------3---------4---------5---------6---------7-------*

+rem 0.0.16 2016-11-24-10:45 Report VCINSTALLDIR of the set environment
+rem        aiding trouble-shooting of success and of error cases.
 rem 0.0.15 2016-11-22-09:05 Touch-ups, smoothing connections to other material
 rem 0.0.14 2016-11-20-13:41 Complete annotations.  Re-order checking for
 rem        a previous setup, whether simple repetition or conflicting.


Fix typo in example's bat

Fix typo in example's bat

--- example/msvcbuild.bat
+++ example/msvcbuild.bat
@@ -7,7 +7,7 @@
 cd ..\..\ext\tsx
 call msvcbuild.bat

-cd ..\..\sample
+cd ..\..\example
 @setlocal
 @set SCHEME_H_DIR=..\src
 @set MSCOMPILE=cl /nologo /O2 /W3 /c /D_CRT_SECURE_NO_WARNINGS /I%SCHEME_H_DIR%


cygwin_setup.bat: check for running Cygwin processes

--- bin/cygwin_setup.bat
+++ bin/cygwin_setup.bat
@@ -23,10 +23,11 @@
         echo %_PREFIX% Rerun from a "Run as Administrator" command prompt
         exit /b 1
     :endif_check_admin
-goto :eof
+exit /b 0

 :stop_services
+    rem Stop all Cygwin services.
     if not exist "%_ROOTDIR%\bin\cygrunsrv.exe" goto :eof
     for /f "usebackq" %%s in (`%_ROOTDIR%\bin\cygrunsrv.exe --list`) do (
         echo %_PREFIX% Stopping %%s
@@ -36,12 +37,15 @@

 :start_service
+    rem Start a single Cygwin service.
     echo %_PREFIX% Starting %1
     %_ROOTDIR%\bin\cygrunsrv --start %1
 goto :eof

 :start_services
+    rem Start all Cygwin services.
+
     rem Start syslogd first.
     for /f "usebackq" %%s in (`%_ROOTDIR%\bin\cygrunsrv.exe --list`) do (
         if "%%s" == "syslogd" call :start_service %%s
@@ -54,6 +58,7 @@

 :get_setup_exe
+    rem Download latest setup.exe.
     if not exist %_ROOTDIR% (
         echo %_PREFIX% Creating %_ROOTDIR%
         mkdir %_ROOTDIR%
@@ -63,7 +68,33 @@
 goto :eof

+:check_for_cygwin_proc
+    rem Check for any Cygwin processes.
+    echo %_PREFIX% Checking for running Cygwin processes
+    set _TEMPFILE=%TEMP%\cygwin_setup.txt
+    :retry
+        %_ROOTDIR%\bin\ps -l | findstr /v /c:"/usr/bin/ps" > %_TEMPFILE%
+        findstr /v /r /c:"PID.*COMMAND" %_TEMPFILE% | findstr /r /c:"^..*" > NUL:
+        if ERRORLEVEL 1 goto :ignore
+        echo %_PREFIX% Found running Cygwin processes
+        type %_TEMPFILE%
+        del %_TEMPFILE%
+        :ask_abort_retry_ignore
+            set /p _ANSWER=Abort, Retry, or Ignore?
+            set _ANSWER=%_ANSWER:~0,1%
+            if "%_ANSWER%" == "a" exit /b 1
+            if "%_ANSWER%" == "A" exit /b 1
+            if "%_ANSWER%" == "r" goto :retry
+            if "%_ANSWER%" == "R" goto :retry
+            if "%_ANSWER%" == "i" goto :ignore
+            if "%_ANSWER%" == "I" goto :ignore
+        goto :ask_abort_retry_ignore
+    :ignore
+exit /b 0
+
+
 :setup
+    rem Run setup.exe.
     echo %_PREFIX% Running setup.exe for updates
     %_ROOTDIR%\setup.exe --site %_SITE% --quiet-mode --no-shortcuts --root %_ROOTDIR% --local-package-dir %_ROOTDIR%\LocalPackageDir
     echo %_PREFIX% Running setup.exe to install standard package set
@@ -72,6 +103,7 @@

 :create_passwd
+    rem Create local passwd and group files.
     if not exist %_ROOTDIR%\etc\passwd (
         echo %_PREFIX% Creating /etc/passwd
         %_ROOTDIR%\bin\bash --login -i -c '/usr/bin/mkpasswd --local > /etc/passwd'
@@ -129,6 +161,7 @@
     call :check_admin ||exit /b 1
     call :get_setup_exe
     call :stop_services
+    call :check_for_cygwin_proc ||exit /b 1
     call :setup
     call :create_passwd
     call :config_syslogd


grass_ip_all

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

--- bin/grass_ip_all.bat
+++ bin/grass_ip_all.bat
@@ -0,0 +1,114 @@
+@echo OFF
+del grass_test.csv
+
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 1 --dc_per_tile 1 --pure_color --use_idx_buf
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 1 --dc_per_tile 4 --pure_color --use_idx_buf
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 1 --dc_per_tile 16 --pure_color --use_idx_buf
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 1 --dc_per_tile 64 --pure_color --use_idx_buf
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 1 --dc_per_tile 256 --pure_color --use_idx_buf
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 1 --dc_per_tile 1024 --pure_color --use_idx_buf
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 1 --dc_per_tile 4096 --pure_color --use_idx_buf
+
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 1 --dc_per_tile 1 --pure_color  --use_idx_buf --ip1f
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 1 --dc_per_tile 4 --pure_color  --use_idx_buf --ip1f
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 1 --dc_per_tile 16  --pure_color --use_idx_buf  --ip1f
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 1 --dc_per_tile 64  --pure_color --use_idx_buf  --ip1f
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 1 --dc_per_tile 256  --pure_color --use_idx_buf  --ip1f
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 1 --dc_per_tile 1024  --pure_color --use_idx_buf  --ip1f
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 1 --dc_per_tile 4096  --pure_color --use_idx_buf  --ip1f
+
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 1 --dc_per_tile 1  --pure_color --use_idx_buf  --ip2f
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 1 --dc_per_tile 4  --pure_color --use_idx_buf  --ip2f
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 1 --dc_per_tile 16  --pure_color --use_idx_buf  --ip2f
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 1 --dc_per_tile 64  --pure_color --use_idx_buf  --ip2f
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 1 --dc_per_tile 256  --pure_color --use_idx_buf  --ip2f
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 1 --dc_per_tile 1024  --pure_color --use_idx_buf  --ip2f
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 1 --dc_per_tile 4096  --pure_color --use_idx_buf  --ip2f
+
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 1 --dc_per_tile 1  --pure_color --use_idx_buf  --ip3f
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 1 --dc_per_tile 4  --pure_color --use_idx_buf  --ip3f
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 1 --dc_per_tile 16  --pure_color --use_idx_buf  --ip3f
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 1 --dc_per_tile 64  --pure_color --use_idx_buf  --ip3f
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 1 --dc_per_tile 256  --pure_color --use_idx_buf  --ip3f
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 1 --dc_per_tile 1024  --pure_color --use_idx_buf  --ip3f
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 1 --dc_per_tile 4096  --pure_color --use_idx_buf  --ip3f
+
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 1 --dc_per_tile 1  --pure_color --use_idx_buf  --ip4f
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 1 --dc_per_tile 4  --pure_color --use_idx_buf  --ip4f
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 1 --dc_per_tile 16  --pure_color --use_idx_buf  --ip4f
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 1 --dc_per_tile 64  --pure_color --use_idx_buf  --ip4f
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 1 --dc_per_tile 256  --pure_color --use_idx_buf  --ip4f
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 1 --dc_per_tile 1024  --pure_color --use_idx_buf  --ip4f
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 1 --dc_per_tile 4096  --pure_color --use_idx_buf  --ip4f
+
+%= Geometry shader without texture, not shaded, not instanced, multi blade =%
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 1 --dc_per_tile 1 --gs_use_end_primitive --pure_color --gs_blades_per_run 1
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 1 --dc_per_tile 1 --gs_use_end_primitive --pure_color --gs_blades_per_run 2
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 1 --dc_per_tile 1 --gs_use_end_primitive --pure_color --gs_blades_per_run 4
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 1 --dc_per_tile 1 --gs_use_end_primitive --pure_color --gs_blades_per_run 8
+
+%= Geometry shader without texture, not shaded, not instanced, multi blade =%
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 1 --dc_per_tile 1 --gs_use_end_primitive --pure_color --gs_blades_per_run 1 --ip1f
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 1 --dc_per_tile 1 --gs_use_end_primitive --pure_color --gs_blades_per_run 2 --ip1f
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 1 --dc_per_tile 1 --gs_use_end_primitive --pure_color --gs_blades_per_run 4 --ip1f
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 1 --dc_per_tile 1 --gs_use_end_primitive --pure_color --gs_blades_per_run 8 --ip1f
+
+%= Geometry shader without texture, not shaded, not instanced, multi blade =%
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 1 --dc_per_tile 1 --gs_use_end_primitive --pure_color --gs_blades_per_run 1 --ip2f
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 1 --dc_per_tile 1 --gs_use_end_primitive --pure_color --gs_blades_per_run 2 --ip2f
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 1 --dc_per_tile 1 --gs_use_end_primitive --pure_color --gs_blades_per_run 4 --ip2f
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 1 --dc_per_tile 1 --gs_use_end_primitive --pure_color --gs_blades_per_run 8 --ip2f
+
+%= Geometry shader without texture, not shaded, not instanced, multi blade =%
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 1 --dc_per_tile 1 --gs_use_end_primitive --pure_color --gs_blades_per_run 1 --ip3f
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 1 --dc_per_tile 1 --gs_use_end_primitive --pure_color --gs_blades_per_run 2 --ip3f
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 1 --dc_per_tile 1 --gs_use_end_primitive --pure_color --gs_blades_per_run 4 --ip3f
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 1 --dc_per_tile 1 --gs_use_end_primitive --pure_color --gs_blades_per_run 8 --ip3f
+
+%= Geometry shader without texture, not shaded, not instanced, multi blade =%
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 1 --dc_per_tile 1 --gs_use_end_primitive --pure_color --gs_blades_per_run 1 --ip4f
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 1 --dc_per_tile 1 --gs_use_end_primitive --pure_color --gs_blades_per_run 2 --ip4f
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 1 --dc_per_tile 1 --gs_use_end_primitive --pure_color --gs_blades_per_run 4 --ip4f
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 1 --dc_per_tile 1 --gs_use_end_primitive --pure_color --gs_blades_per_run 8 --ip4f
+
+
+
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 0 --dc_per_tile 1 --pure_color --use_idx_buf
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 0 --dc_per_tile 4 --pure_color --use_idx_buf
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 0 --dc_per_tile 16 --pure_color --use_idx_buf
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 0 --dc_per_tile 64 --pure_color --use_idx_buf
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 0 --dc_per_tile 256 --pure_color --use_idx_buf
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 0 --dc_per_tile 1024 --pure_color --use_idx_buf
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 0 --dc_per_tile 4096 --pure_color --use_idx_buf
+
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 0 --dc_per_tile 1 --pure_color  --use_idx_buf --ip1f
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 0 --dc_per_tile 4 --pure_color  --use_idx_buf --ip1f
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 0 --dc_per_tile 16  --pure_color --use_idx_buf  --ip1f
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 0 --dc_per_tile 64  --pure_color --use_idx_buf  --ip1f
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 0 --dc_per_tile 256  --pure_color --use_idx_buf  --ip1f
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 0 --dc_per_tile 1024  --pure_color --use_idx_buf  --ip1f
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 0 --dc_per_tile 4096  --pure_color --use_idx_buf  --ip1f
+
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 0 --dc_per_tile 1  --pure_color --use_idx_buf  --ip2f
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 0 --dc_per_tile 4  --pure_color --use_idx_buf  --ip2f
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 0 --dc_per_tile 16  --pure_color --use_idx_buf  --ip2f
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 0 --dc_per_tile 64  --pure_color --use_idx_buf  --ip2f
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 0 --dc_per_tile 256  --pure_color --use_idx_buf  --ip2f
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 0 --dc_per_tile 1024  --pure_color --use_idx_buf  --ip2f
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 0 --dc_per_tile 4096  --pure_color --use_idx_buf  --ip2f
+
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 0 --dc_per_tile 1  --pure_color --use_idx_buf  --ip3f
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 0 --dc_per_tile 4  --pure_color --use_idx_buf  --ip3f
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 0 --dc_per_tile 16  --pure_color --use_idx_buf  --ip3f
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 0 --dc_per_tile 64  --pure_color --use_idx_buf  --ip3f
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 0 --dc_per_tile 256  --pure_color --use_idx_buf  --ip3f
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 0 --dc_per_tile 1024  --pure_color --use_idx_buf  --ip3f
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 0 --dc_per_tile 4096  --pure_color --use_idx_buf  --ip3f
+
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 0 --dc_per_tile 1  --pure_color --use_idx_buf  --ip4f
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 0 --dc_per_tile 4  --pure_color --use_idx_buf  --ip4f
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 0 --dc_per_tile 16  --pure_color --use_idx_buf  --ip4f
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 0 --dc_per_tile 64  --pure_color --use_idx_buf  --ip4f
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 0 --dc_per_tile 256  --pure_color --use_idx_buf  --ip4f
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 0 --dc_per_tile 1024  --pure_color --use_idx_buf  --ip4f
+dctest64.exe --test1 --procedural-scene --proc_scene_mode 0 --dc_per_tile 4096  --pure_color --use_idx_buf  --ip4f


Make sure bld.bat reports errors

Make sure bld.bat reports errors

--- recipes/goodvibes/bld.bat
+++ recipes/goodvibes/bld.bat
@@ -1,12 +1,20 @@
+@echo on
+
 :: Save source for C code and remove compiled libraries
-copy "%SRC_DIR%\goodvibes\share\symmetry.c" symmetry.c
-copy "%SRC_DIR%\goodvibes\share\LICENSE.txt" symmetry.LICENSE.txt
-rd /S /Q "%SRC_DIR%\goodvibes\share\"
+copy "%SRC_DIR%\goodvibes\share\symmetry.c" symmetry.c || goto :error
+copy "%SRC_DIR%\goodvibes\share\LICENSE.txt" symmetry.LICENSE.txt || goto :error
+rd /S /Q "%SRC_DIR%\goodvibes\share\" || goto :error

 :: Install Python
-"%PYTHON%" -m pip install . -vv
+"%PYTHON%" -m pip install . -vv || goto :error

 :: Compile C code and move to expected destination
-md %SP_DIR%\goodvibes\share\
-"%CC%" /LD symmetry.c /OUT:"%SP_DIR%\goodvibes\share\symmetry_win.dll"
+md %SP_DIR%\goodvibes\share\ || goto :error
+"%CC%" /LD symmetry.c /OUT:"%SP_DIR%\goodvibes\share\symmetry_win.dll" || goto :error
+
+goto :EOF
+
+:error
+echo Failed with error #%errorlevel%.
+exit /b %errorlevel%


r261/sofa-dev : FIX qmake4 config (QMAKEPATH is now used instead of QTDIR)

--- project.bat
+++ project.bat
@@ -3,8 +3,8 @@
 REM Visual C++ 6 or Visual dot Net 2003
 REM use : project [VC6 / VC7 / VC8 / clean]
 REM default visual project depends on the environment variable QMAKESPEC
-set QTDIR=%CD%\tools\qt4win
-set PATH=%QTDIR%\bin;%PATH%
+set QMAKEPATH=%CD%\tools\qt4win
+set PATH=%QMAKEPATH%\bin;%PATH%
 if "%1" == "VC6" goto vc6
 if "%1" == "VC7" goto vc7
 if "%1" == "VC8" goto vc8
@@ -29,7 +29,10 @@
 @REM cd src
 @REM for /R %%i in (*.pro) do qmake "%%i"
 @REM cd ..
-qmake -tp vc -recursive -o Sofa
+qmake -tp vc -recursive -o Sofa QT_INSTALL_PREFIX="%QTDIR%"
+@if "%ERRORLEVEL%"=="0" goto end
+echo ERROR %ERRORLEVEL%
+pause
 @goto end
 :clean
 @echo cleaning all VC6 Project or VC7 Project


3rdparty: do not check for INCLUDE

3rdparty: do not check for INCLUDE

--- 3rdparty/luajit/src/msvcbuild.bat
+++ 3rdparty/luajit/src/msvcbuild.bat
@@ -10,8 +10,6 @@
 @rem     setenv /release /x64
 @rem
 @rem Then cd to this directory and run this script.
-
-@if not defined INCLUDE goto :FAIL

 @setlocal
 @set LJCOMPILE=cl /nologo /c /O2 /W3 /D_CRT_SECURE_NO_DEPRECATE /D_CRT_STDIO_INLINE=__declspec(dllexport)__inline


ARROW-6755: [Release] Improve Windows release verification script

* Improve performance by only building shared libraries
* Use `--no-shortcuts` conda option to avoid annoying popups
* Use ninja-build for better performance

Closes #5559 from wesm/windows-rc-script-improvements and squashes the following commits:

b0d3092b5 <Wes McKinney> Do not build static libraries, avoid annoying UAC popup

Authored-by: Wes McKinney <3be70eed0275ec2606f002bff3514252e145d204@apache.org>
Signed-off-by: Antoine Pitrou <9359a4d812173b65a3a0094cd86363e79731a3c2@python.org>

--- dev/release/verify-release-candidate.bat
+++ dev/release/verify-release-candidate.bat
@@ -41,11 +41,14 @@

 @rem Using call with conda.bat seems necessary to avoid terminating the batch
 @rem script execution
-call conda create -p %_VERIFICATION_CONDA_ENV% -f -q -y python=%PYTHON% || exit /B
+call conda create -p %_VERIFICATION_CONDA_ENV% ^
+    --no-shortcuts -f -q -y python=%PYTHON% ^
+    || exit /B

 call activate %_VERIFICATION_CONDA_ENV% || exit /B

 call conda install -y ^
+     --no-shortcuts ^
      python=3.7 ^
      git ^
      --file=ci\conda_env_cpp.yml ^
@@ -68,8 +71,9 @@
 @rem This is the path for Visual Studio Community 2017
 call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools\VsDevCmd.bat" -arch=amd64

-cmake -G "%GENERATOR%" ^
+cmake -G "Ninja" ^
       -DCMAKE_INSTALL_PREFIX=%ARROW_HOME% ^
+      -DARROW_BUILD_STATIC=OFF ^
       -DARROW_BOOST_USE_SHARED=ON ^
       -DARROW_BUILD_TESTS=ON ^
       -DGTest_SOURCE=BUNDLED ^
@@ -79,7 +83,12 @@
       -DARROW_PYTHON=ON ^
       -DARROW_PARQUET=ON ^
       ..  || exit /B
-cmake --build . --target INSTALL --config %CONFIGURATION%  || exit /B
+
+@rem NOTE(wesm): Building googletest is flaky for me with ninja. Building it
+@rem first fixes the problem
+ninja googletest_ep || exit /B
+
+ninja install || exit /B

 @rem Get testing datasets for Parquet unit tests
 git clone https://github.com/apache/parquet-testing.git %_VERIFICATION_DIR%\parquet-testing


Updated external packages and clarified slightly.

--- topographica-win/create_python_topo/setup.bat
+++ topographica-win/create_python_topo/setup.bat
@@ -1,57 +1,58 @@
 @echo off

-REM CEBALERT: need to update Numeric-->numpy, update weave version
-REM (extracting it from the scipy binary), and install Gnosis_Utils
+REM add Gnosis_Utils, libsndfile, pyaudiolab, mlabwrap

-REM assumes we're going to c:\Python24
+REM Assumes we're going to c:\Python24; be careful to update everything if you decide to
+REM change this.

 set startdir=%CD%

+
+REM ** GRAB PACKAGES IN COMMON WITH topographica\external
+REM Pmw
 ..\util\gunzip -c ..\..\external\Pmw.tgz > ..\..\external\Pmw.tar
 ..\util\tar xvf ..\..\external\Pmw.tar
 copy ..\..\external\Pmw .

+cd ..

-..\util\gunzip weave.tar.gz
-..\util\tar xvf weave.tar
-..\util\gunzip scipy_test.tar.gz
-..\util\tar xvf scipy_test.tar
-
-
-
-cd ..
+REM CEBALERT: because of some path trouble with some of the installation
+REM programs, we move to working in c:\create_python_topo.
 xcopy /E /I create_python_topo c:\create_python_topo
 xcopy /E /I util c:\create_python_topo\util
-REM CEBHACKALERT: because the msi won't run from this directory, at least
-REM on my PC! Why? Is it a path problem?
 c:
 cd \
 cd create_python_topo

-start /w msiexec /i python-2.4.2.msi ALLUSERS=0 TARGETDIR=c:\python24 ADDLOCAL=DefaultFeature,TclTk
-start /w Numeric-24.2.win32-py2.4.exe
-start /w matplotlib-0.81.win32-py2.4.exe
+REM * python,tcl/tk
+start /w msiexec /i python-2.4.4.msi ALLUSERS=0 TARGETDIR=c:\python24 ADDLOCAL=DefaultFeature,TclTk
+
+REM * numpy
+start /w numpy-1.0.1.win32-py2.4.exe
+
+REM * matplotlib
+start /w matplotlib-0.90.0.win32-py2.4.exe
+
+REM * PIL
 start /w PIL-1.1.5.win32-py2.4.exe
-REM start /w scipy-0.5.1.win32-py2.4.exe

+REM * scipy
+start /w scipy-0.5.2.win32-py2.4.exe
+
+REM * PMW
 move Pmw c:\python24\Lib\site-packages

-REM this is weave that I think I compiled with mingw from
-REM scipy 0.3.2, since none was already compiled for
-REM python 2.4 and Numeric 24. The way scipy is organized
-REM has changed in later releases (notably weave has changed location;
-REM when topographica
-REM switches to use a recent scipy, we should just be able
-REM to use the scipy*.exe provided online (as for Numeric, etc).
-REM and remove these.
-move weave c:\python24\Lib\site-packages
-move scipy_test c:\python24\Lib\site-packages
+
+
+REM CEBALERT: when scipy is compiled by default in the linux distribution, and it's
+REM "from scipy import weave" rather than "import weave", then remove this
+xcopy /E /I c:\python24\Lib\site-packages\scipy\weave c:\python24\Lib\site-packages\weave

 REM ** For fixedpoint, the patched version from unix is used.
-REM ** CEBHACKALERT: use the patch executable in utils to create the
+REM ** CEBALERT: use the patch executable in utils to create the
 REM patch from the diff and fixedpoint.tgz file in external\
 move fixedpoint-0.1.2_patched.py c:\python24\Lib\site-packages\fixedpoint.py


Added release script for windows

Added release script for windows

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

--- release.bat
+++ release.bat
@@ -0,0 +1,8 @@
+@echo off
+
+premake4 gmake
+
+PATH=%PATH%;C:/MinGW/bin
+mingw32-make config=release
+
+pause


Also xcopy subdirectories

Also xcopy subdirectories

--- release.bat
+++ release.bat
@@ -1,7 +1,7 @@
 REM @echo off
 REM Useage: release major | minor | patch
-xcopy ..\csWeb\dist-bower\*.* dist-bower\ /Y
-xcopy ..\csWeb\dist-npm\*.*   dist-npm\   /Y
+xcopy ..\csWeb\dist-bower\*.* dist-bower\ /Y /S
+xcopy ..\csWeb\dist-npm\*.*   dist-npm\   /Y /S
 bower version %1
 REM Do not try to create a new git tag, as bower already did this.
 npm version --no-git-tag-version %1


quote some variables in install-emacs.bat

--- scripts/install-emacs.bat
+++ scripts/install-emacs.bat
@@ -4,7 +4,7 @@
 rem Author: Dan Harms <dan.harms@xrtrading.com>
 rem Created: Thursday, May 21, 2015
 rem Version: 1.0
-rem Modified Time-stamp: <2016-08-16 09:50:44 dan.harms>
+rem Modified Time-stamp: <2016-08-18 12:20:00 dan.harms>
 rem Modified by: Dan Harms
 rem Keywords: install perfect editor

@@ -34,8 +34,8 @@
 set msys="%MSYS%\bin"
 set emacs="%EMACS%\bin\emacs"

-set tar=%msys%\tar
-set grep=%msys%\grep
+set tar="%msys%\tar"
+set grep="%msys%\grep"
 set user=%USERNAME%
 set timeout=c:\Windows\System32\timeout
 set orig_dir=%cd%


[postgresql] set credentials in MIGRATE_DB.bat back to default

--- PostgreSQL/SQLScripts/MIGRATION/MIGRATE_DB.bat
+++ PostgreSQL/SQLScripts/MIGRATION/MIGRATE_DB.bat
@@ -3,10 +3,10 @@

 REM Provide your database details here
 set PGPORT=5432
-set PGHOST=localhost
-set PGUSER=vcs_user
-set CITYDB=dresden
-set PGBIN=C:\PostgreSQL\9.3\bin
+set PGHOST=your_host_address
+set PGUSER=your_username
+set CITYDB=your_database
+set PGBIN=path_to_psql

 REM cd to path of the shell script
 cd /d %~dp0


Еще скрипт

Еще скрипт

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

--- scripts/setup_pivotal.cmd
+++ scripts/setup_pivotal.cmd
@@ -0,0 +1,19 @@
+rem *** PIVOTAL ***
+set host=root@52.8.36.116
+set sourcePath=./bigdata
+set targetPath=/usr/local/bigdata
+set apiPath=C:/Program Files (x86)/PuTTY
+set keyFile=./ssh/aws.ppk
+set hdfsPath=/user/bigdata
+
+set plink="%apiPath%/plink.exe" -i %keyFile% %host%
+
+%plink% mkdir %targetPath%
+"%apiPath%/pscp.exe" -r -i %keyFile% %sourcePath%/ %host%:%targetPath%
+%plink% chown -R hdfs:hdfs %targetPath%
+%plink% chmod 777 %targetPath%/*.sh
+%plink% su hdfs -c 'hadoop fs -mkdir %hdfsPath%'
+%plink% su hdfs -c 'hadoop fs -mkdir %hdfsPath%/output'
+%plink% su hdfs -c 'hadoop fs -copyFromLocal %targetPath%/test.txt %hdfsPath%/test.txt'
+
+pause


Remove extensions/ringqt/converter.bat

Remove extensions/ringqt/converter.bat

--- extensions/ringqt/converter.bat
+++ extensions/ringqt/converter.bat
@@ -1,3 +0,0 @@
-cd %cd%/../../samples/tools/qtclassconverter
-start start.bat
-cd %cd%/../../../extensions/ringqt


fix: qmake cmd

fix: qmake cmd

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

--- qmake.build.bat
+++ qmake.build.bat
@@ -0,0 +1 @@
+qmake USE_UPNP=- USE_QRCODE=1 USE_IPV6=- RRCcoin-qt.pro


Update bld.bat

Update bld.bat

--- conda/vcs/bld.bat
+++ conda/vcs/bld.bat
@@ -8,11 +8,11 @@
 if errorlevel 1 exit 1
 git config --system alias.st status
 if errorlevel 1 exit 1
-git config --system alias.unstage 'reset HEAD --'
+git config --system alias.unstage reset HEAD --
 if errorlevel 1 exit 1
-git config --system alias.last 'log -1 HEAD'
+git config --system alias.last log -1 HEAD
 if errorlevel 1 exit 1
-git config --system credential.helper 'cache --timeout=3600'
+git config --system credential.helper cache --timeout=3600
 if errorlevel 1 exit 1

-echo OFF+echo OFF


Update install_mediawiki.cmd

Update install_mediawiki.cmd

Minor change

--- install_mediawiki.cmd
+++ install_mediawiki.cmd
@@ -16,7 +16,7 @@
 set MEDIAWIKIMINORVERSION=0
 set MEDIAWIKIURL=https://releases.wikimedia.org/mediawiki/%MEDIAWIKIVERSION%/mediawiki-%MEDIAWIKIVERSION%.%MEDIAWIKIMINORVERSION%.tar.gz
 set MEDIAWIKIDIR=mediawiki-%MEDIAWIKIVERSION%.%MEDIAWIKIMINORVERSION%
-cd %htmldir%
+cd %HTMLDIR%

 curl %MEDIAWIKIURL% --output wikijournals.tar.gz


Small fix in Appveyor CI job

Small fix in Appveyor CI job

--- ci/install_npcap.bat
+++ ci/install_npcap.bat
@@ -1,7 +1,7 @@
 appveyor DownloadFile https://nmap.org/npcap/dist/npcap-0.96.exe
 npcap-0.96.exe /S /winpcap_mode
-xcopy C:\Windows\System32\Npcap\wpcap.dll C:\Windows\System32
-xcopy C:\Windows\SysWOW64\Npcap\wpcap.dll C:\Windows\SysWOW64
+xcopy C:\Windows\System32\Npcap\*.dll C:\Windows\System32
+xcopy C:\Windows\SysWOW64\Npcap\*.dll C:\Windows\SysWOW64
 appveyor DownloadFile https://nmap.org/npcap/dist/npcap-sdk-1.04.zip
 mkdir C:\Npcap-sdk
 7z x .\npcap-sdk-1.04.zip -oC:\Npcap-sdk


Add additional KB entries

Add additional KB entries

--- resources/stage_4_repair/purge_windows_telemetry/purge_windows_10_telemetry.bat
+++ resources/stage_4_repair/purge_windows_telemetry/purge_windows_10_telemetry.bat
@@ -112,93 +112,93 @@
 ::::::::::::::::::::::::::::::::::::::::::::::::::
 :: REMOVE BAD UPDATES
 if "%VERBOSE%"=="yes" (
-	:: 02/22 - KB 2902907 (https://support.microsoft.com/en-us/kb/2902907)
+	:: KB 2902907 (https://support.microsoft.com/en-us/kb/2902907)
 	start /wait "" wusa /uninstall /kb:2902907 /norestart /quiet
-	:: 03/22 - KB 2922324 (https://support.microsoft.com/en-us/kb/2922324)
+	:: KB 2922324 (https://support.microsoft.com/en-us/kb/2922324)
 	start /wait "" wusa /uninstall /kb:2922324 /norestart /quiet
-	:: 04/22 - KB 2952664 (https://support.microsoft.com/en-us/kb/2952664)
+	:: KB 2952664 (https://support.microsoft.com/en-us/kb/2952664)
 	start /wait "" wusa /uninstall /kb:2952664 /norestart /quiet
-	:: 05/22 - KB 2976978 (https://support.microsoft.com/en-us/kb/2976978)
+	:: KB 2976978 (https://support.microsoft.com/en-us/kb/2976978)
 	start /wait "" wusa /uninstall /kb:2976978 /norestart /quiet
-	:: 06/22 - KB 2977759 (https://support.microsoft.com/en-us/kb/2977759)
+	:: KB 2977759 (https://support.microsoft.com/en-us/kb/2977759)
 	start /wait "" wusa /uninstall /kb:2977759 /norestart /quiet
-	:: 07/22 - KB 2990214 (https://support.microsoft.com/en-us/kb/2990214)
+	:: KB 2990214 (https://support.microsoft.com/en-us/kb/2990214)
 	start /wait "" wusa /uninstall /kb:2990214 /norestart /quiet
-	:: 08/22 - KB 3012973 (https://support.microsoft.com/en-us/kb/3012973)
+	:: KB 3012973 (https://support.microsoft.com/en-us/kb/3012973)
 	start /wait "" wusa /uninstall /kb:3012973 /norestart /quiet
-	:: 09/22 - KB 3014460 (https://support.microsoft.com/en-us/kb/3014460)
+	:: KB 3014460 (https://support.microsoft.com/en-us/kb/3014460)
 	start /wait "" wusa /uninstall /kb:3014460 /norestart /quiet
-	:: 10/22 - KB 3015249 (https://support.microsoft.com/en-us/kb/3015249)
+	:: KB 3015249 (https://support.microsoft.com/en-us/kb/3015249)
 	start /wait "" wusa /uninstall /kb:3015249 /norestart /quiet
-	:: 11/22 - KB 3021917 (https://support.microsoft.com/en-us/kb/3021917)
+	:: KB 3021917 (https://support.microsoft.com/en-us/kb/3021917)
 	start /wait "" wusa /uninstall /kb:3021917 /norestart /quiet
-	:: 12/22 - KB 3022345 (https://support.microsoft.com/en-us/kb/3022345)
+	:: KB 3022345 (https://support.microsoft.com/en-us/kb/3022345)
 	start /wait "" wusa /uninstall /kb:3022345 /norestart /quiet
-	:: 13/22 - KB 3035583 (https://support.microsoft.com/en-us/kb/3035583)
+	:: KB 3035583 (https://support.microsoft.com/en-us/kb/3035583)
 	start /wait "" wusa /uninstall /kb:3035583 /norestart /quiet
-	:: 14/22 - KB 3044374 (https://support.microsoft.com/en-us/kb/3044374)
+	:: KB 3044374 (https://support.microsoft.com/en-us/kb/3044374)
 	start /wait "" wusa /uninstall /kb:3044374 /norestart /quiet
-	:: 15/22 - KB 3050265 (https://support.microsoft.com/en-us/kb/3050265)
+	:: KB 3050265 (https://support.microsoft.com/en-us/kb/3050265)
 	start /wait "" wusa /uninstall /kb:3050265 /norestart /quiet
-	:: 16/22 - KB 3050267 (https://support.microsoft.com/en-us/kb/3050267)
+	:: KB 3050267 (https://support.microsoft.com/en-us/kb/3050267)
 	start /wait "" wusa /uninstall /kb:3050267 /norestart /quiet
-	:: 17/22 - KB 3065987 (https://support.microsoft.com/en-us/kb/3065987)
+	:: KB 3065987 (https://support.microsoft.com/en-us/kb/3065987)
 	start /wait "" wusa /uninstall /kb:3065987 /norestart /quiet
-	:: 18/22 - KB 3068708 (https://support.microsoft.com/en-us/kb/3068708)
+	:: KB 3068708 (https://support.microsoft.com/en-us/kb/3068708)
 	start /wait "" wusa /uninstall /kb:3068708 /norestart /quiet
-	:: 19/22 - KB 3075249 (https://support.microsoft.com/en-us/kb/3075249)
+	:: KB 3075249 (https://support.microsoft.com/en-us/kb/3075249)
 	start /wait "" wusa /uninstall /kb:3075249 /norestart /quiet
-	:: 20/22 - KB 3075851 (https://support.microsoft.com/en-us/kb/3075851)
+	:: KB 3075851 (https://support.microsoft.com/en-us/kb/3075851)
 	start /wait "" wusa /uninstall /kb:3075851 /norestart /quiet
-	:: 21/22 - KB 3075853 (https://support.microsoft.com/en-us/kb/3075853)
+	:: KB 3075853 (https://support.microsoft.com/en-us/kb/3075853)
 	start /wait "" wusa /uninstall /kb:3075853 /norestart /quiet
-	:: 22/22 - KB 3080149 (https://support.microsoft.com/en-us/kb/3080149)
+	:: KB 3080149 (https://support.microsoft.com/en-us/kb/3080149)
 	start /wait "" wusa /uninstall /kb:3080149 /norestart /quiet
 	:: Additional KB entries removed by Microsoft; originally associated with telemetry
 	start /wait "" wusa /uninstall /kb:2976987 /norestart /quiet
 	start /wait "" wusa /uninstall /kb:3068707 /norestart /quiet
 ) else (
-	:: 02/22 - KB 2902907 (https://support.microsoft.com/en-us/kb/2902907)
+	:: KB 2902907 (https://support.microsoft.com/en-us/kb/2902907)
 	start /wait "" wusa /uninstall /kb:2902907 /norestart /quiet >> "%LOGPATH%\%LOGFILE%" 2>&1
-	:: 03/22 - KB 2922324 (https://support.microsoft.com/en-us/kb/2922324)
+	:: KB 2922324 (https://support.microsoft.com/en-us/kb/2922324)
 	start /wait "" wusa /uninstall /kb:2922324 /norestart /quiet >> "%LOGPATH%\%LOGFILE%" 2>&1
-	:: 04/22 - KB 2952664 (https://support.microsoft.com/en-us/kb/2952664)
+	:: KB 2952664 (https://support.microsoft.com/en-us/kb/2952664)
 	start /wait "" wusa /uninstall /kb:2952664 /norestart /quiet >> "%LOGPATH%\%LOGFILE%" 2>&1
-	:: 05/22 - KB 2976978 (https://support.microsoft.com/en-us/kb/2976978)
+	:: KB 2976978 (https://support.microsoft.com/en-us/kb/2976978)
 	start /wait "" wusa /uninstall /kb:2976978 /norestart /quiet >> "%LOGPATH%\%LOGFILE%" 2>&1
-	:: 06/22 - KB 2977759 (https://support.microsoft.com/en-us/kb/2977759)
+	:: KB 2977759 (https://support.microsoft.com/en-us/kb/2977759)
 	start /wait "" wusa /uninstall /kb:2977759 /norestart /quiet >> "%LOGPATH%\%LOGFILE%" 2>&1
-	:: 07/22 - KB 2990214 (https://support.microsoft.com/en-us/kb/2990214)
+	:: KB 2990214 (https://support.microsoft.com/en-us/kb/2990214)
 	start /wait "" wusa /uninstall /kb:2990214 /norestart /quiet >> "%LOGPATH%\%LOGFILE%" 2>&1
-	:: 08/22 - KB 3012973 (https://support.microsoft.com/en-us/kb/3012973)
+	:: KB 3012973 (https://support.microsoft.com/en-us/kb/3012973)
 	start /wait "" wusa /uninstall /kb:3012973 /norestart /quiet >> "%LOGPATH%\%LOGFILE%" 2>&1
-	:: 09/22 - KB 3014460 (https://support.microsoft.com/en-us/kb/3014460)
+	:: KB 3014460 (https://support.microsoft.com/en-us/kb/3014460)
 	start /wait "" wusa /uninstall /kb:3014460 /norestart /quiet >> "%LOGPATH%\%LOGFILE%" 2>&1
-	:: 10/22 - KB 3015249 (https://support.microsoft.com/en-us/kb/3015249)
+	:: KB 3015249 (https://support.microsoft.com/en-us/kb/3015249)
 	start /wait "" wusa /uninstall /kb:3015249 /norestart /quiet >> "%LOGPATH%\%LOGFILE%" 2>&1
-	:: 11/22 - KB 3021917 (https://support.microsoft.com/en-us/kb/3021917)
+	:: KB 3021917 (https://support.microsoft.com/en-us/kb/3021917)
 	start /wait "" wusa /uninstall /kb:3021917 /norestart /quiet >> "%LOGPATH%\%LOGFILE%" 2>&1
-	:: 12/22 - KB 3022345 (https://support.microsoft.com/en-us/kb/3022345)
+	:: KB 3022345 (https://support.microsoft.com/en-us/kb/3022345)
 	start /wait "" wusa /uninstall /kb:3022345 /norestart /quiet >> "%LOGPATH%\%LOGFILE%" 2>&1
-	:: 13/22 - KB 3035583 (https://support.microsoft.com/en-us/kb/3035583)
+	:: KB 3035583 (https://support.microsoft.com/en-us/kb/3035583)
 	start /wait "" wusa /uninstall /kb:3035583 /norestart /quiet >> "%LOGPATH%\%LOGFILE%" 2>&1
-	:: 14/22 - KB 3044374 (https://support.microsoft.com/en-us/kb/3044374)
+	:: KB 3044374 (https://support.microsoft.com/en-us/kb/3044374)
 	start /wait "" wusa /uninstall /kb:3044374 /norestart /quiet >> "%LOGPATH%\%LOGFILE%" 2>&1
-	:: 15/22 - KB 3050265 (https://support.microsoft.com/en-us/kb/3050265)
+	:: KB 3050265 (https://support.microsoft.com/en-us/kb/3050265)
 	start /wait "" wusa /uninstall /kb:3050265 /norestart /quiet >> "%LOGPATH%\%LOGFILE%" 2>&1
-	:: 16/22 - KB 3050267 (https://support.microsoft.com/en-us/kb/3050267)
+	:: KB 3050267 (https://support.microsoft.com/en-us/kb/3050267)
 	start /wait "" wusa /uninstall /kb:3050267 /norestart /quiet >> "%LOGPATH%\%LOGFILE%" 2>&1
-	:: 17/22 - KB 3065987 (https://support.microsoft.com/en-us/kb/3065987)
+	:: KB 3065987 (https://support.microsoft.com/en-us/kb/3065987)
 	start /wait "" wusa /uninstall /kb:3065987 /norestart /quiet >> "%LOGPATH%\%LOGFILE%" 2>&1
-	:: 18/22 - KB 3068708 (https://support.microsoft.com/en-us/kb/3068708)
+	:: KB 3068708 (https://support.microsoft.com/en-us/kb/3068708)
 	start /wait "" wusa /uninstall /kb:3068708 /norestart /quiet >> "%LOGPATH%\%LOGFILE%" 2>&1
-	:: 19/22 - KB 3075249 (https://support.microsoft.com/en-us/kb/3075249)
+	:: KB 3075249 (https://support.microsoft.com/en-us/kb/3075249)
 	start /wait "" wusa /uninstall /kb:3075249 /norestart /quiet >> "%LOGPATH%\%LOGFILE%" 2>&1
-	:: 20/22 - KB 3075851 (https://support.microsoft.com/en-us/kb/3075851)
+	:: KB 3075851 (https://support.microsoft.com/en-us/kb/3075851)
 	start /wait "" wusa /uninstall /kb:3075851 /norestart /quiet >> "%LOGPATH%\%LOGFILE%" 2>&1
-	:: 21/22 - KB 3075853 (https://support.microsoft.com/en-us/kb/3075853)
+	:: KB 3075853 (https://support.microsoft.com/en-us/kb/3075853)
 	start /wait "" wusa /uninstall /kb:3075853 /norestart /quiet >> "%LOGPATH%\%LOGFILE%" 2>&1
-	:: 22/22 - KB 3080149 (https://support.microsoft.com/en-us/kb/3080149)
+	:: KB 3080149 (https://support.microsoft.com/en-us/kb/3080149)
 	start /wait "" wusa /uninstall /kb:3080149 /norestart /quiet >> "%LOGPATH%\%LOGFILE%" 2>&1
 	:: Additional KB entries removed by Microsoft; originally associated with telemetry
 	start /wait "" wusa /uninstall /kb:2976987 /norestart /quiet >> "%LOGPATH%\%LOGFILE%" 2>&1


Allow specifying build configuration for poor man's trybot.

TEST=none
BUG=none

Review URL: http://codereview.chromium.org/5225004

git-svn-id: http://src.chromium.org/svn/trunk/src@66917 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

Former-commit-id: 7d6d33d628c5ece6a653203bd4583918faf1c474


chore: use latest npm on Windows (#114)

chore: use latest npm on Windows (#114)

--- .kokoro/test.bat
+++ .kokoro/test.bat
@@ -1,4 +1,4 @@
-@rem Copyright 2018 gRPC authors.
+@rem Copyright 2018 Google LLC. All rights reserved.
 @rem
 @rem Licensed under the Apache License, Version 2.0 (the "License");
 @rem you may not use this file except in compliance with the License.
@@ -17,8 +17,7 @@
 cd /d %~dp0
 cd ..

-call npm install -g npm@5 || goto :error
-
+call npm install -g npm@latest || goto :error
 call npm install || goto :error
 call npm run test || goto :error


build: update windows configuration to match new vm

--- .kokoro/test.bat
+++ .kokoro/test.bat
@@ -17,14 +17,12 @@
 cd /d %~dp0
 cd ..

-@rem The image we're currently running has a broken version of Node.js enabled
-@rem by nvm (v10.15.3), which has no npm bin. This hack uses the functional
-@rem Node v8.9.1 to install npm@latest, it then uses this version of npm to
-@rem install npm for v10.15.3.
-call nvm use v8.9.1 || goto :error
-call node C:\Users\kbuilder\AppData\Roaming\nvm-ps\versions\v8.9.1\node_modules\npm-bootstrap\bin\npm-cli.js i npm -g || goto :error
-call nvm use v10.15.3 || goto :error
-call node C:\Users\kbuilder\AppData\Roaming\nvm-ps\versions\v8.9.1\node_modules\npm\bin\npm-cli.js i npm -g || goto :error
+@rem npm path is not currently set in our image, we should fix this next time
+@rem we upgrade Node.js in the image:
+SET PATH=%PATH%;/cygdrive/c/Program Files/nodejs/npm
+
+call nvm use v12.14.1
+call which node

 call npm install || goto :error
 call npm run test || goto :error


allow spaces in WXWIN path

allow spaces in WXWIN path

--- run_cmake.bat
+++ run_cmake.bat
@@ -1,4 +1,4 @@
 @mkdir tmp
 @cd tmp
-cmake -Wno-dev -G "Visual Studio 12" -DwxWidgets_PREFIX_DIRECTORY=%WXWIN% -DOpenCVRoot=%OPENCV_DIR% ..
+cmake -Wno-dev -G "Visual Studio 12" "-DwxWidgets_PREFIX_DIRECTORY=%WXWIN%" "-DOpenCVRoot=%OPENCV_DIR%" ..
 @cd ..


test script

test script

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

--- run_tests.cmd
+++ run_tests.cmd
@@ -0,0 +1 @@
+python setup.py test


CRAN_release.cmd only

CRAN_release.cmd only

--- CRAN_Release.cmd
+++ CRAN_Release.cmd
@@ -175,6 +175,7 @@
 cd ~/build
 wget -N https://stat.ethz.ch/R/daily/R-devel.tar.gz
 rm -rf R-devel
+rm -rf R-devel-strict
 tar xvf R-devel.tar.gz
 mv R-devel R-devel-strict
 cd R-devel-strict    # important to change directory name before building not after because the path is baked into the build, iiuc
@@ -194,13 +195,13 @@
 make
 alias Rdevel-strict='~/build/R-devel-strict/bin/R --vanilla'
 cd ~/GitHub/data.table
-## edit ~/.R/Makevars and activate "CFLAGS=-O0 -g" there to trace
-Rdevel-strict CMD INSTALL data.table_1.11.8.tar.gz
+Rdevel-strict CMD INSTALL data.table_1.11.9.tar.gz
 # Check UBSAN and ASAN flags appear in compiler output above. Rdevel was compiled with them so should be passed through to here
 Rdevel-strict
 install.packages(c("bit64","xts","nanotime","R.utils"), repos="http://cloud.r-project.org")  # minimum packages needed to not skip any tests in test.data.table()
 require(data.table)
 test.data.table()      # 7 mins (vs 1min normally) under UBSAN, ASAN and --strict-barrier
+# If any problems, edit ~/.R/Makevars and activate "CFLAGS=-O0 -g" to trace. Rerun 'Rdevel-strict CMD INSTALL' and rerun tests.
 for (i in 1:100) if (!test.data.table()) break  # try several runs; e.g a few tests generate data with a non-fixed random seed
 # gctorture(TRUE)      # very slow, many days
 gctorture2(step=100)   # [12-18hrs] under ASAN, UBSAN and --strict-barrier


Add script for deploying documentation

Add script for deploying documentation

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

--- DeployOutput.cmd
+++ DeployOutput.cmd
@@ -0,0 +1,7 @@
+@ECHO OFF
+
+cd ..\picklesdoc.github.com
+rmdir Output /s /q
+echo D | xcopy ..\pickles\Output Output /e
+powershell -Command "(gc index_template.md) -replace 'VERSION_PLACEHOLDER', '%1' | Out-File -encoding ASCII index.md"
+cd ..\pickles


Add Wix to env GHA

Add Wix to env GHA

--- windows-install/win64/pack_github.bat
+++ windows-install/win64/pack_github.bat
@@ -1,3 +1,4 @@
+set PATH=%PATH%;"%WIX%\bin"
 cd build
 md output
 copy *.exe output


#0000 Service: Integration of Seanox Devwex Service

--- program/service.cmd
+++ program/service.cmd
@@ -119,7 +119,7 @@
     echo.
     echo This script must run as Administrator.
   )
-  exit /B 0
+  goto exit

@@ -137,7 +137,7 @@
   if not exist "%jvm%" (
     echo.
     echo ERROR: Java Runtime Environment not found
-    exit /B 0
+    goto exit
   )
   for %%i in ("%jvm%") do echo    %%~fi

@@ -149,7 +149,7 @@
   if not exist "%home%\%service%" (
     echo.
     echo ERROR: Service runner ^(%service%^) not found
-    exit /B 0
+    goto exit
   )
   for %%i in ("%home%\%service%") do echo    %%~fi

@@ -237,7 +237,7 @@
   )

   echo %label%: Successfully completed
-  exit /B 0
+  goto exit

@@ -253,7 +253,7 @@
   if not exist "%home%\%service%" (
     echo.
     echo ERROR: Service runner ^(%service%^) not found
-    exit /B 0
+    goto exit
   )
   for %%i in ("%home%\%service%") do echo    %%~fi

@@ -264,7 +264,7 @@
   ) else echo %label%: Service has already been removed

   echo %label%: Successfully completed
-  exit /B 0
+  goto exit

@@ -273,10 +273,10 @@
   sc query %ServiceName% >nul 2>&1
   if not "%errorLevel%" == "0" (
     echo ERROR: Service is not present
-    exit /B 0
+    goto exit
   )
   net start %ServiceName%
-  exit /B 0
+  goto exit

@@ -285,11 +285,11 @@
   sc query %ServiceName% >nul 2>&1
   if not "%errorLevel%" == "0" (
     echo ERROR: Service is not present
-    exit /B 0
+    goto exit
   )
   net stop %ServiceName%
   net start %ServiceName%
-  exit /B 0
+  goto exit

@@ -298,10 +298,10 @@
   sc query %ServiceName% >nul 2>&1
   if not "%errorLevel%" == "0" (
     echo ERROR: Service is not present
-    exit /B 0
+    goto exit
   )
   net stop %ServiceName%
-  exit /B 0
+  goto exit

@@ -310,14 +310,14 @@
   sc query %ServiceName% >nul 2>&1
   if not "%errorLevel%" == "0" (
     echo ERROR: Service is not present
-    exit /B 0
+    goto exit
   )
   if not exist "%java%\bin\java.exe" (
     echo ERROR: Java Runtime Environment not found
   ) else (
     "%java%\bin\java.exe" -cp "%Classpath%" com.seanox.devwex.Service status
   )
-  exit /B 0
+  goto exit

@@ -327,9 +327,15 @@
   echo ERROR: An unexpected error occurred.
   echo ERROR: The script was canceled.

-  if not exist %~n0.log exit /B 0
-
-  echo.
-  type %~n0.log & del %~n0.log
-
+  if not exist %~n0.log goto exit
+
+  echo.
+  type %~n0.log
+  goto exit
+
+
+
+:exit
+
+  if exist %~n0.log del %~n0.log
   exit /B 0


fixed smooth.bat

fixed smooth.bat

--- src/script/smooth.bat
+++ src/script/smooth.bat
@@ -1,5 +1,5 @@
 @ECHO OFF

 SET SMOOTH_HOME=%~dp
-java -cp %SMOOTH_HOME%/smooth.jar;%SMOOTH_HOME%/funcs.jar org.smoothbuild.Main %*
+java -cp %SMOOTH_HOME%\smooth.jar;%SMOOTH_HOME%\funcs.jar org.smoothbuild.Main %*


Sort out echo

Sort out echo

--- Beamer_Custom_Theme_Install_Script.bat
+++ Beamer_Custom_Theme_Install_Script.bat
@@ -29,26 +29,30 @@
 )

 if !texPath!==nul (
-	cls&echo.&echo.&echo.&echo.&echo Please install LaTeX first.
+	call:echo "Please install LaTeX first."
 	color E3&set /p=&goto exit
 )

-cls&echo.&echo.&echo.&echo.&echo Install Theme Successful ^^! :-P&color 2A&ping 127.0.0.1 -n 3 >nul&goto exit
+call:echo "Install Theme Successful (^^)"&color 2A&ping 127.0.0.1 -n 3 >nul&goto exit

 :pushBeamerError
-cls&echo.&echo.&echo.&echo.&echo Please install Beamer on MiKTeX first.
+call:echo "Please install Beamer on MiKTeX first."
 color E3&set /p=&goto exit

 :pushCopyError
-cls&echo.&echo.&echo.&echo.&echo Not Found Path, please feedback.
+call:echo "Not Found Path, please feedback."
 color 4C&set /p=&goto exit

 :pushCompileError
-cls&echo.&echo.&echo.&echo.&echo Please stop LaTeX Compile first.
+call:echo "Please stop LaTeX Compile first."
 color 4C&set /p=&goto exit

 :pushProgress
-cls&echo.&echo.&echo.&echo.&echo Installing Theme , Wait .. [ %~1 of 4 ]
+call:echo "Installing Theme , Wait .. [ %~1 of 4 ]"
+goto exit
+
+:echo
+cls&echo.&echo.&echo.&echo.&echo %~1
 goto exit

 :copyFile


Skip VSIX build unless BuildOrleansVSIX env variable is set to true (#3199)

--- src/Build.cmd
+++ src/Build.cmd
@@ -110,6 +110,8 @@

 REM Build VSIX only if new tooling was found

+:VSIX
+if NOT "%BuildOrleansVSIX%" == "true" goto :EOF
 if "%VS2017InstallDir%" == "" goto :EOF

 @echo Build VSIX ============================


Clean up Build.cmd script - Specify main solution file in one place. - Fix some quoting and param insonsistencies in Build.cmd - Only build VSIX and WIX packages from Release bits.

--- src/Build.cmd
+++ src/Build.cmd
@@ -9,45 +9,52 @@
 SET MSBUILDEXEDIR=%FrameworkDir%\%FrameworkVersion%
 SET MSBUILDEXE=%MSBUILDEXEDIR%\MSBuild.exe

+set PROJ=%CMDHOME%\Orleans.sln
+
+@echo ===== Building %PROJ% =====
+
 @echo Build Debug ==============================
+
 SET CONFIGURATION=Debug
 SET OutDir=%CMDHOME%\..\Binaries\%CONFIGURATION%

-"%MSBUILDEXE%" %CMDHOME%\Orleans.sln
+"%MSBUILDEXE%" /p:Configuration=%CONFIGURATION% "%PROJ%"
 @if ERRORLEVEL 1 GOTO :ErrorStop
+@echo BUILD ok for %CONFIGURATION% %PROJ%

+@echo Build Release ============================
+
+SET CONFIGURATION=Release
+SET OutDir=%CMDHOME%\..\Binaries\%CONFIGURATION%
+
+"%MSBUILDEXE%" /p:Configuration=%CONFIGURATION% "%PROJ%"
+@if ERRORLEVEL 1 GOTO :ErrorStop
+@echo BUILD ok for %CONFIGURATION% %PROJ%
+
+@echo Build Release Installers =================
+
+SET CONFIGURATION=Release
+
+set STEP=VSIX
+@REM
 @REM Install Visual Studio SDK and uncomment the following lines
 @REM to build Visual Studio project templates.
 @REM
-@REM %MSBUILDEXE% %CMDHOME%\OrleansVSTools\OrleansVSTools.sln
+@REM "%MSBUILDEXE%" /p:Configuration=%CONFIGURATION% "%CMDHOME%\OrleansVSTools\OrleansVSTools.sln"
 @REM xcopy /s /y %CMDHOME%\SDK\VSIX %OutDir%\VSIX\
 @REM @if ERRORLEVEL 1 GOTO :ErrorStop
+@REM @echo BUILD ok for VSIX package for %PROJ%

-"%MSBUILDEXE%" /p:Configuration=%CONFIGURATION% /p:OutputPath=. %CMDHOME%\Build\OrleansSetup.wixproj
+set STEP=WIX
+"%MSBUILDEXE%" /p:Configuration=%CONFIGURATION% /p:OutputPath=. "%CMDHOME%\Build\OrleansSetup.wixproj"
 @if ERRORLEVEL 1 GOTO :ErrorStop
-@echo BUILD succeeded for %CONFIGURATION%
+@echo BUILD ok for WIX package for %PROJ%

-
-@echo Build Release ============================
-SET CONFIGURATION=Release
-SET OutDir=%CMDHOME%\..\Binaries\%CONFIGURATION%
-
-"%MSBUILDEXE%" %CMDHOME%\Orleans.sln
-@if ERRORLEVEL 1 GOTO :ErrorStop
-
-@REM Install Visual Studio SDK and uncomment the following lines
-@REM to build Visual Studio project templates.
-@REM
-@REM %MSBUILDEXE% %CMDHOME%\OrleansVSTools\OrleansVSTools.sln
-@REM xcopy /s /y %CMDHOME%\SDK\VSIX %OutDir%\VSIX\
-@REM @if ERRORLEVEL 1 GOTO :ErrorStop
-
-"%MSBUILDEXE%" /p:Configuration=%CONFIGURATION% /p:OutputPath=. %CMDHOME%\Build\OrleansSetup.wixproj
-@if ERRORLEVEL 1 GOTO :ErrorStop
-@echo BUILD succeeded for %CONFIGURATION%
+@echo ===== Build succeeded for %PROJ% =====
 @GOTO :EOF

 :ErrorStop
-@echo BUILD FAILED for %CONFIGURATION% with error %ERRORLEVEL% - CANNOT CONTINUE
+if "%STEP%" == "" set STEP=%CONFIGURATION%
+@echo ===== Build FAILED for %PROJ% -- %STEP% with error %ERRORLEVEL% - CANNOT CONTINUE =====

 :EOF


Add GetAndBuildThis.bat

Add GetAndBuildThis.bat

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

--- GetAndBuildThis.bat
+++ GetAndBuildThis.bat
@@ -0,0 +1,3 @@
+call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat"
+hg pull -u --rebase
+msbuild "Palaso VS2010.sln" /verbosity:quiet /maxcpucount


Update the version of Python and our code signing cert for Windows.

This updates the Windows installer to bundle Python 2.7.17 (the latest
2.7.x release), and to use our latest code signing cert, in preparation
for the release.

In the future, we'll want to upgrade to Python 3.x, but we're aiming not
to break anything for RBTools 1.0.x.


Add batch file implementation of jsc

Add batch file implementation of jsc

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

--- src/jsc.bat
+++ src/jsc.bat
@@ -0,0 +1,178 @@
+@echo off
+setlocal enableextensions
+
+goto entry
+
+:usage
+  echo usage: jsc dev      [-c^|--config CONFIG_JS] [BOOTSTRAP_TARGET]
+  echo     or jsc compile  [-c^|--config CONFIG_JS] MODULE_FILE ... COMPILE_TARGET
+  echo     or jsc identify MODULE_FILE
+  echo     or jsc inline   [-c^|--config CONFIG_JS] [-n^|--invoke-main MAIN_MODULE] [-r^|--register] COMPILE_FILE ... LINK_TARGET
+  echo     or jsc link     [-c^|--config CONFIG_JS] COMPILE_FILE ... LINK_TARGET
+  echo     or jsc help
+  echo.
+  echo arguments:
+  echo   BOOTSTRAP_TARGET file to generate for running in dev mode, this defaults
+  echo                    to a file called bootstrap.js in the same directory as
+  echo                    the config file
+  echo   MODULE_FILE      file containing an uncompiled module
+  echo   COMPILE_TARGET   file to generate when compiling, will contain the set of
+  echo                    modules and their dependencies
+  echo   COMPILE_FILE     file produced by compilation to use as input to linking,
+  echo                    COMPILE_FILE must have corresponding 'COMPILE_TARGET.meta'
+  echo   LINK_TARGET      file to generate when linking, will contain bootstrap
+  echo                    information: bolt, install and configuration
+  echo.
+  echo options:
+  echo   -c^|--config CONFIG_JS          override bolt configuration file
+  echo                                    default: config/bolt/prod.js
+  echo   -o^|--output OUTPUT_DIR         override compilation output directory
+  echo                                    default: scratch/main/js/compile
+  echo   -n^|--invoke-main MAIN_MODULE   specify main module of inline scripts
+  echo   -r^|--register                  register modules in global namespace
+  echo.
+
+  exit /b 0
+
+:fail_usage
+  echo.
+  call :usage
+  exit /b 1
+
+:fail
+  exit /b 1
+
+
+:entry
+
+set base=%~dp0
+
+if "%~1"=="" echo error: must specify mode. && goto fail_usage
+
+set mode=%~1
+shift
+
+if "%mode%"=="dev" goto done_mode_validation
+if "%mode%"=="compile" goto done_mode_validation
+if "%mode%"=="identify" goto done_mode_validation
+if "%mode%"=="inline" goto done_mode_validation
+if "%mode%"=="link" goto done_mode_validation
+if "%mode%"=="help" goto done_mode_validation
+
+echo invalid mode [%mode%], must be one of dev^|compile^|identify^|inline^|link^|help
+goto fail_usage
+
+:done_mode_validation
+
+if "%mode%"=="help" call :usage && exit /b 0
+
+:parse_flags
+  set flag=%~1
+  if not "%flag:~0,1%"=="-" goto done_parse_flags
+  shift
+
+  if "%flag%"=="-c" goto parse_config
+  if "%flag%"=="--config" goto parse_config
+  if "%flag%"=="-o" goto parse_output
+  if "%flag%"=="--output" goto parse_output
+  if "%flag%"=="-n" goto parse_invoke
+  if "%flag%"=="--invoke-main" goto parse_invoke
+  if "%flag%"=="-r" goto parse_register
+  if "%flag%"=="--register" goto parse_register
+  if "%flag%"=="--" goto done_parse_flags
+  echo invalid flag [%flag%] && goto fail_usage
+
+  goto parse_flags
+
+  :parse_config
+    if "%~1"=="" echo %flag% requires an argument to be specified && goto fail_usage
+    set config_js=%~1
+    shift
+  goto parse_flags
+
+  :parse_output
+    if "%~1"=="" echo %flag% requires an argument to be specified && goto fail_usage
+    set output_dir=%~1
+    shift
+  goto parse_flags
+
+  :parse_invoke
+    if "%~1"=="" echo %flag% requires an argument to be specified && goto fail_usage
+    set invoke_main=true
+    set main=%~1
+    shift
+  goto parse_flags
+
+  :parse_register
+    set register_modules=true
+  goto parse_flags
+
+:done_parse_flags
+
+if "%config_js%"=="" set config_js=config/bolt/prod.js
+if "%output_dir%"=="" set output_dir=scratch/main/js/compile
+if "%register_modules%"=="" set register_modules=false
+if "%invoke_main%"=="" set invoke_main=false
+
+if not exist "%config_js%" echo %config_js% does not exist or is not a file && goto fail
+for %%i in ("%config_js%") do if exist %%~si\NUL echo %config_js% does not exist or is not a file && goto fail
+
+for %%i in (node.exe) do set node=%%~$PATH:i
+if "%node%"=="" echo error: node.js is not on the system path && goto fail
+
+if "%mode%"=="dev" goto jsc_dev
+if "%mode%"=="compile" goto jsc_compile
+if "%mode%"=="identify" goto jsc_identify
+if "%mode%"=="inline" goto jsc_inline
+if "%mode%"=="link" goto jsc_link
+exit /b 0
+
+:jsc_dev
+  if "%~1"=="" for %%F in ("%config_js%") do (set bootstrap=%%~dpFbootstrap.js) && goto exec_jsc_dev
+  if "%~2"=="" set bootstrap=%~1 && goto exec_jsc_dev
+  echo invalid number of arguments for jsc %mode%
+  goto fail_usage
+
+  :exec_jsc_dev
+    "%node%" "%base%jsc.js" "%mode%" "%bootstrap%" "%config_js%"
+exit /b 0
+
+:jsc_compile
+  goto jsc_x
+
+:jsc_identify
+  if "%~1"=="" echo invalid number of arguments for jsc %mode% && goto fail_usage
+  if not "%~2"=="" echo invalid number of arguments for jsc %mode% && goto fail_usage
+  "%node%" "%base%jsc.js" "%mode%" "%~1"
+exit /b 0
+
+:jsc_inline
+  if "%~1"=="" echo invalid number of arguments for jsc %mode% && goto fail_usage
+  if "%~2"=="" echo invalid number of arguments for jsc %mode% && goto fail_usage
+
+  :jsc_inline_remaining
+  if "%~1"=="" goto end_jsc_inline_remaining
+  set remaining=%remaining% "%~1"
+  shift
+  goto :jsc_inline_remaining
+  :end_jsc_inline_remaining
+
+  "%node%" "%base%jsc.js" "%mode%" "%config_js%" "%invoke_main%" "%main%" "%register_modules%" %remaining%
+exit /b 0
+
+:jsc_link
+  goto jsc_x
+
+:jsc_x
+  if "%~1"=="" echo invalid number of arguments for jsc %mode% && goto fail_usage
+  if "%~2"=="" echo invalid number of arguments for jsc %mode% && goto fail_usage
+
+  :jsc_x_remaining
+  if "%~1"=="" goto end_jsc_x_remaining
+  set remaining=%remaining% "%~1"
+  shift
+  goto :jsc_x_remaining
+  :end_jsc_x_remaining
+
+  "%node%" "%base%jsc.js" "%mode%" "%config_js%" %remaining%
+exit /b 0


MAKE: QstComm 工程加入全编译脚本

MAKE: QstComm 工程加入全编译脚本

--- src/build.bat
+++ src/build.bat
@@ -84,6 +84,10 @@
 nmake -fQstCmdz.mak
 cd..
 rem =====================
+cd QstComm
+nmake -fQstComm.mak
+cd..
+rem =====================
 cd QstLibs
 nmake -fQstLibs.mak
 cd..


[NetKvm] temporary disable build errors checking

--- NetKVM/buildAll.bat
+++ NetKVM/buildAll.bat
@@ -3,13 +3,13 @@
 call tools\set_version.bat 0x0620
 call ..\tools\callVisualStudio.bat 12 netkvm.sln /Rebuild "Win8 Release|Win32" /Out buildfre_win8_x86.log
 endlocal
-if %ERRORLEVEL% NEQ 0 goto :eof
+rem if %ERRORLEVEL% NEQ 0 goto :eof

 setlocal
 call tools\set_version.bat 0x0620
 call ..\tools\callVisualStudio.bat 12 netkvm.sln /Rebuild "Win8 Release|x64" /Out buildfre_win8_amd64.log
 endlocal
-if %ERRORLEVEL% NEQ 0 goto :eof
+rem if %ERRORLEVEL% NEQ 0 goto :eof

 rem setlocal
 rem call tools\set_version.bat 0x0620
@@ -28,13 +28,13 @@
 call tools\set_version.bat 0x0610
 call ..\tools\callVisualStudio.bat 12 netkvm.sln /Rebuild "Win7 Release|Win32" /Out buildfre_win7_x86.log
 endlocal
-if %ERRORLEVEL% NEQ 0 goto :eof
+rem if %ERRORLEVEL% NEQ 0 goto :eof

 setlocal
 call tools\set_version.bat 0x0610
 call ..\tools\callVisualStudio.bat 12 netkvm.sln /Rebuild "Win7 Release|x64" /Out buildfre_win7_amd64.log
 endlocal
-if %ERRORLEVEL% NEQ 0 goto :eof
+rem if %ERRORLEVEL% NEQ 0 goto :eof

 rem setlocal
 rem call tools\set_version.bat 0x0610
@@ -53,13 +53,13 @@
 call tools\set_version.bat 0x0600
 call ..\tools\callVisualStudio.bat 12 netkvm.sln /Rebuild "Vista Release|Win32" /Out buildfre_wlh_x86.log
 endlocal
-if %ERRORLEVEL% NEQ 0 goto :eof
+rem if %ERRORLEVEL% NEQ 0 goto :eof

 setlocal
 call tools\set_version.bat 0x0600
 call ..\tools\callVisualStudio.bat 12 netkvm.sln /Rebuild "Vista Release|x64" /Out buildfre_wlh_amd64.log
 endlocal
-if %ERRORLEVEL% NEQ 0 goto :eof
+rem if %ERRORLEVEL% NEQ 0 goto :eof

 :: XP
 pushd NDIS5
@@ -75,4 +75,4 @@
 if %ERRORLEVEL% NEQ 0 goto :eof
 xcopy /S /I /Y NDIS5\Install\XP\amd64 Install\XP\amd64

-call create_dvl_log.cmd
+rem call create_dvl_log.cmd


Allow DOOM.bat to check the 'current directory' for PWADs

This helps our 'play.bat' scripts in the wad folders to list files within that folder, rather than relative to doom.bat

--- PortaDOOM/files/doom.bat
+++ PortaDOOM/files/doom.bat
@@ -255,7 +255,7 @@
         ECHO     Unlike when creating Windows shortcuts, the "%PWADS%" folder is assumed,
         ECHO     so that you don't need to include the base path on each file added.
 	ECHO:
-	ECHO     If a PWAD has been given, the PWAD's folder will also be checked so that
+	ECHO     If a PWAD has been given, that file's folder will also be checked so that
 	ECHO     you do not have to give the path for both the PWAD, and any files within
 	ECHO     the same folder. E.g.
 	ECHO:
@@ -312,9 +312,19 @@
 ECHO      doom.bat
 ECHO:

+REM # remember the current directory before we change it;
+REM # this will be used as an additional search location for finding PWADs
+SET "OLD_DIR=%CD%"
+
 REM # change current directory to that of this script;
 REM # ensures that shortcuts to this script don't end up looking elsewhere for files
 PUSHD "%~dp0"
+
+REM # if the directory this script was called from is somewhere within
+REM # the same heirarchy of this script, make the folder path relative
+SETLOCAL ENABLEDELAYEDEXPANSION
+SET "OLD_DIR=!OLD_DIR:%CD%\=!"
+ENDLOCAL & SET "OLD_DIR=%OLD_DIR%"

 REM # NOTE: many doom engines save their config files in the 'current directory', which is typically expected to be
 REM # that of the executable. However, we want to separate user-data (such as savegames) from the engines. whilst we
@@ -333,15 +343,15 @@
 SET "HAS_CONFIG=0"

 REM # detect 32-bit or 64-bit Windows for those engines that provide both
-SET "WINBIT=32"
-IF /I "%PROCESSOR_ARCHITECTURE%" == "EM64T" SET "WINBIT=64"	& REM # Itanium
-IF /I "%PROCESSOR_ARCHITECTURE%" == "AMD64" SET "WINBIT=64"	& REM # Regular x64
-IF /I "%PROCESSOR_ARCHITEW6432%" == "AMD64" SET "WINBIT=64"	& REM # 32-bit CMD on a 64-bit system (WOW64)
+SET WINBIT=32
+IF /I "%PROCESSOR_ARCHITECTURE%" == "EM64T" SET WINBIT=64	& REM # Itanium
+IF /I "%PROCESSOR_ARCHITECTURE%" == "AMD64" SET WINBIT=64	& REM # Regular x64
+IF /I "%PROCESSOR_ARCHITEW6432%" == "AMD64" SET WINBIT=64	& REM # 32-bit CMD on a 64-bit system (WOW64)

 REM # default option values:
-SET "CONSOLE=0"
-SET "DEFAULT=0"
-SET "WAIT=0"
+SET CONSOLE=0
+SET DEFAULT=0
+SET WAIT=0

 :options
@@ -349,7 +359,7 @@
 REM # echo engine output to the console
 IF /I "%~1" == "/CONSOLE" (
 	REM # set the feature flag, the launch section will handle it
-	SET "CONSOLE=1"
+	SET CONSOLE=1
 	REM # check for any other options
 	SHIFT & GOTO :options
 )
@@ -358,7 +368,7 @@
 IF /I "%~1" == "/DEFAULT" (
 	REM # we only need to enable the flag to indicate it,
 	REM # the config section will handle the specifics
-	SET "DEFAULT=1"
+	SET DEFAULT=1
 	REM # check for any other options
 	SHIFT & GOTO :options
 )
@@ -366,7 +376,7 @@
 REM # wait for engine before continuing execution
 IF /I "%~1" == "/WAIT" (
 	REM # set the feature flag, the launch section will handle it
-	SET "WAIT=1"
+	SET WAIT=1
 	REM # check for any other options
 	SHIFT & GOTO :options
 )
@@ -374,7 +384,7 @@
 REM # always use 32-bit binaries on a 64-bit system?
 IF /I "%~1" == "/32" (
 	REM # force this script to believe the system is 32-bit
-	SET "WINBIT=32"
+	SET WINBIT=32
 	REM # check for any other options
 	SHIFT & GOTO :options
 )
@@ -386,8 +396,8 @@
 SET "ENGINE_DIR="	& REM # the engine directory is also used to check for PWADs
 SET "ENGINE_EXE="	& REM # executable name in the engine folder

-IF "%WINBIT%" == "32" SET "ENGINE_BIT=x86"
-IF "%WINBIT%" == "64" SET "ENGINE_BIT=x64"
+IF %WINBIT% EQU 32 SET "ENGINE_BIT=x86"
+IF %WINBIT% EQU 64 SET "ENGINE_BIT=x64"

 REM # an identifier for config files used for an engine,
 REM # i.e. "zdoom" is expanded to "config.zdoom.ini"
@@ -1090,7 +1100,7 @@
         IF "%~1" == "" GOTO :params_continue
         IF "%~1" == "--" GOTO :params_continue
 	REM # is this a config parameter? (flag this so we don't use our own)
-	IF /I "%~1" == "-config" SET "HAS_CONFIG=1"
+	IF /I "%~1" == "-config" SET HAS_CONFIG=1
         REM # add to the parameters list
         SET ENGINE_PARAMS=%ENGINE_PARAMS% %1
         SHIFT
@@ -1197,6 +1207,11 @@

 :files
 REM ====================================================================================================================
+REM # keep track of which types of files have been added or not
+SET ANY_WAD=0
+SET ANY_DEH=0
+SET ANY_BEX=0
+SET ANY_CFG=0

 REM # are there any files to add?
 IF "%~1" == "" GOTO :launch
@@ -1223,8 +1238,6 @@
 REM # any DeHackEd patches?
 SET "DEH="
 SET "BEX="
-REM # any config files?
-SET "CONFIG="

 :files_loop
         REM # no more parameters remaining?
@@ -1247,15 +1260,19 @@
 	)
         REM # if the file doesn't exist, check the engine directory
         IF NOT EXIST "%FILE%" SET "FILE=%ENGINE_DIR%\%~1"
+	REM # also check the directory that called this script
+	IF NOT EXIST "%FILE%" SET "FILE=%OLD_DIR%\%~1"
         REM # finally, is it really there?
         IF NOT EXIST "%FILE%" (
                 ECHO:
                 ECHO  ERROR: the file "%~1" doesn't exist in either the "%PWADS%" folder,
                 ECHO         or the "%ENGINE_DIR%" folder.
+		ECHO:
                 ECHO  Command:
                 ECHO:
                 ECHO     doom.bat %*
                 ECHO:
+		ECHO %CD%
 		POPD
                 PAUSE
                 EXIT /B 1
@@ -1263,8 +1280,9 @@

         SET FILES=%FILES% "%FIX_PATH%\%FILE%"
 	CALL :prev_dir "%FILE%"
+	SET ANY_WAD=1
         ECHO         -file : %FILE%
-        SHIFT
+	SHIFT
         GOTO :files_loop

 	:deh
@@ -1283,6 +1301,7 @@
 	REM # accept the file
 	SET DEH=%DEH% "%FIX_PATH%\%FILE%"
 	CALL :prev_dir "%FILE%"
+	SET ANY_DEH=1
 	ECHO          -deh : %FILE%
 	SHIFT
 	GOTO :files_loop
@@ -1303,6 +1322,7 @@
 	REM # accept the file
 	SET BEX=%BEX% "%FIX_PATH%\%FILE%"
 	CALL :prev_dir "%FILE%"
+	SET ANY_BEX=1
 	ECHO          -bex : %FILE%
 	SHIFT
 	GOTO :files_loop
@@ -1364,6 +1384,7 @@
 	REM # we found it!
 	SET FILES=%FILES% "%FIX_PATH%\%FILE%"
 	CALL :prev_dir "%FILE%"
+	SET ANY_WAD=1
 	ECHO         -file : %FILE%
 	SHIFT
 	GOTO :files_loop
@@ -1404,19 +1425,15 @@
 REM --------------------------------------------------------------------------------------------------------------------

 :files_continue
-REM # config files?
-IF NOT "%CONFIG%" == "" (
-        SET "PARAMS=%PARAMS%%CONFIG%"
-)
 REM # were any files added?
-IF NOT "%FILES%" == "" (
+IF %ANY_WAD% EQU 1 (
         SET "PARAMS=%PARAMS% -file %FILES%"
 )
 REM # DeHackEd extensions?
-IF NOT "%DEH%" == "" (
+IF %ANY_DEH% EQU 1 (
         SET "PARAMS=%PARAMS% -deh %DEH%"
 )
-IF NOT "%BEX%" == "" (
+IF %ANY_BEX% EQU 1 (
         SET "PARAMS=%PARAMS% -bex %BEX%"
 )


util: delete intermediate files when building pagent util

--- util/build_pagent.bat
+++ util/build_pagent.bat
@@ -1 +1,2 @@
-@cl /Ox pagent.c User32.lib+@cl /Ox pagent.c User32.lib
+@del /Q *.obj


Fixed: configure-cpp.cmd made Windows platform-agnostic.

--- src/EventStore/Scripts/v8/configure-cpp.cmd
+++ src/EventStore/Scripts/v8/configure-cpp.cmd
@@ -1,17 +1,23 @@
-@echo off
-    path %~dp0..\..\v8\third_party\python_26\;C:\Windows\Microsoft.NET\Framework\v4.0.30319\;c:\Program Files (x86)\Git\bin;%PATH%; || goto :error
+rem @echo off
+    if [%ProgramFiles(x86)%] == [] (
+      set progfiles=%ProgramFiles%
+    ) else (
+      set progfiles=%ProgramFiles(x86)%
+    )
+
+    path %~dp0..\..\v8\third_party\python_26\;C:\Windows\Microsoft.NET\Framework\v4.0.30319\;%progfiles%\Git\bin;%PATH%; || goto :error
     if "%VisualStudioVersion%"=="10.0" (
-              set envconf="C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\vcvars32.bat"
+              set envconf="%progfiles%\Microsoft Visual Studio 10.0\VC\bin\vcvars32.bat"
               set platformtoolset=v100
               set VisualStudioVersion=10.0
     ) else (
-      if exist "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\bin\vcvars32.bat" (
-          set envconf="C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\bin\vcvars32.bat"
+      if exist "%progfiles%\Microsoft Visual Studio 11.0\VC\bin\vcvars32.bat" (
+          set envconf="%progfiles%\Microsoft Visual Studio 11.0\VC\bin\vcvars32.bat"
           set platformtoolset=v110
           set VisualStudioVersion=11.0
       ) else (
-          if exist "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\vcvars32.bat" (
-              set envconf="C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\vcvars32.bat"
+          if exist "%progfiles%\Microsoft Visual Studio 10.0\VC\bin\vcvars32.bat" (
+              set envconf="%progfiles%\Microsoft Visual Studio 10.0\VC\bin\vcvars32.bat"
               set platformtoolset=v100
               set VisualStudioVersion=10.0
           ) else (


Update generate_solution.bat

Update generate_solution.bat

--- script/generate_solution.bat
+++ script/generate_solution.bat
@@ -1,3 +1,4 @@
 mkdir build
 cd build
-cmake .. cd ..
+cmake ..
+cd ..


Простой файл запуска всех тестов из каталога #65

error: pathspec 'tests/start-all.cmd' did not match any file(s) known to git

--- tests/start-all.cmd
+++ tests/start-all.cmd
@@ -0,0 +1,46 @@
+@echo off
+
+setlocal
+set pathdir=%~dp0
+set success=1
+
+rem echo ᠬ  %CD%
+rem echo ਯ ஢ %pathdir%
+rem echo "%pathdir%\..\install\built\oscript.exe" %pathdir%\start.os -run %1 %2 %3 %4 %5
+
+for %%I in (*.os) do (
+if NOT "%%~nI"=="start" (
+if NOT "%%~nI"=="testrunner" (
+	echo ---
+	echo - 䠩  -   %%I
+	echo ---
+
+	@call "%pathdir%\..\install\built\oscript.exe" %pathdir%\start.os -run %%I %1 %2 %3 %4 %5
+
+	rem echo %ERRORLEVEL%
+	if NOT %ERRORLEVEL%==0 set success=%ERRORLEVEL%
+	rem set success=%ERRORLEVEL%
+
+	rem echo success = %success%
+	rem GOTO bad_exit
+)
+)
+)
+
+if NOT "%success%"=="0" GOTO bad_exit
+
+
+:success_exit
+rem echo ᯥ譮
+rem pause
+
+exit /B 0
+
+:bad_exit
+if "-1"=="%success%" GOTO success_exit
+echo .
+echo ᪮쪮 ⮢ 㯠
+echo 㤠.  ᭠
+
+if ".%1"=="." pause
+exit /B 1


adding datatables tagui.cmd for #5

adding datatables tagui.cmd for #5

--- src/tagui.cmd
+++ src/tagui.cmd
@@ -5,7 +5,7 @@
 setlocal enableextensions enabledelayedexpansion

 if "%~1"=="" (
-echo tagui: missing parameter^(s^) - use this syntax and below options to run ./tagui flow_filename option^(s^)
+echo tagui v1.0: missing parameter^(s^) - use this syntax and below options to run ./tagui flow_filename option^(s^)
 echo.
 echo firefox - run on visible Firefox web browser instead of invisible browser ^(first install Firefox^)
 echo report - generate a web report for easy sharing of run results ^(default is only a text log file^)
@@ -20,8 +20,8 @@

 rem check whether specified automation flow file exists
 if not exist "%~1" (
-echo ERROR - cannot find %~1
-exit /b 1
+	echo ERROR - cannot find %~1
+	exit /b 1
 )

 rem get and set absolute filename of automation flow file
@@ -39,7 +39,7 @@

 rem then set to node.js dependencies if they exist (for npm install tagui)
 if exist "%~dp0..\..\casperjs\bin\casperjs" set "path=%~dp0..\..\casperjs\bin;%path%"
-if exist "%~dp0..\..\phantomjs-prebuilt\bin\phantomjs" set "path=%~dp0..\..\phantomjs-prebuilt\bin;%path%"
+if exist "%~dp0..\..\phantomjs-prebuilt\lib\phantom\bin\phantomjs.exe" set "path=%~dp0..\..\phantomjs-prebuilt\lib\phantom\bin;%path%"
 if exist "%~dp0..\..\slimerjs\src\slimerjs.bat" set "SLIMERJS_EXECUTABLE=%~dp0..\..\slimerjs\src\slimerjs.bat"

 rem finally set to packaged dependencies if they exist (for packaged installation)
@@ -82,106 +82,106 @@
 set tagui_test_mode=false
 rem check test parameter to run flow as casperjs test automation script
 if "%arg2%"=="test" (
-set arg2=
-set tagui_test_mode=true
+	set arg2=
+	set tagui_test_mode=true
 )
 if "%arg3%"=="test" (
-set arg3=
-set tagui_test_mode=true
+	set arg3=
+	set tagui_test_mode=true
 )
 if "%arg4%"=="test" (
-set arg4=
-set tagui_test_mode=true
+	set arg4=
+	set tagui_test_mode=true
 )
 if "%arg5%"=="test" (
-set arg5=
-set tagui_test_mode=true
+	set arg5=
+	set tagui_test_mode=true
 )
 if "%arg6%"=="test" (
-set arg6=
-set tagui_test_mode=true
+	set arg6=
+	set tagui_test_mode=true
 )
 if "%arg7%"=="test" (
-set arg7=
-set tagui_test_mode=true
+	set arg7=
+	set tagui_test_mode=true
 )
 if "%arg8%"=="test" (
-set arg8=
-set tagui_test_mode=true
+	set arg8=
+	set tagui_test_mode=true
 )
 if "%arg9%"=="test" (
-set arg9=
-set tagui_test_mode=true
+	set arg9=
+	set tagui_test_mode=true
 )

 set tagui_quiet_mode=false
 rem check quiet parameter to run flow quietly by only showing explicit output
 if "%arg2%"=="quiet" (
-set arg2=
-set tagui_quiet_mode=true
+	set arg2=
+	set tagui_quiet_mode=true
 )
 if "%arg3%"=="quiet" (
-set arg3=
-set tagui_quiet_mode=true
+	set arg3=
+	set tagui_quiet_mode=true
 )
 if "%arg4%"=="quiet" (
-set arg4=
-set tagui_quiet_mode=true
+	set arg4=
+	set tagui_quiet_mode=true
 )
 if "%arg5%"=="quiet" (
-set arg5=
-set tagui_quiet_mode=true
+	set arg5=
+	set tagui_quiet_mode=true
 )
 if "%arg6%"=="quiet" (
-set arg6=
-set tagui_quiet_mode=true
+	set arg6=
+	set tagui_quiet_mode=true
 )
 if "%arg7%"=="quiet" (
-set arg7=
-set tagui_quiet_mode=true
+	set arg7=
+	set tagui_quiet_mode=true
 )
 if "%arg8%"=="quiet" (
-set arg8=
-set tagui_quiet_mode=true
+	set arg8=
+	set tagui_quiet_mode=true
 )
 if "%arg9%"=="quiet" (
-set arg9=
-set tagui_quiet_mode=true
+	set arg9=
+	set tagui_quiet_mode=true
 )

 set tagui_html_report=false
 rem check report parameter to generate html formatted automation log
 if "%arg2%"=="report" (
-set arg2=
-set tagui_html_report=true
+	set arg2=
+	set tagui_html_report=true
 )
 if "%arg3%"=="report" (
-set arg3=
-set tagui_html_report=true
+	set arg3=
+	set tagui_html_report=true
 )
 if "%arg4%"=="report" (
-set arg4=
-set tagui_html_report=true
+	set arg4=
+	set tagui_html_report=true
 )
 if "%arg5%"=="report" (
-set arg5=
-set tagui_html_report=true
+	set arg5=
+	set tagui_html_report=true
 )
 if "%arg6%"=="report" (
-set arg6=
-set tagui_html_report=true
+	set arg6=
+	set tagui_html_report=true
 )
 if "%arg7%"=="report" (
-set arg7=
-set tagui_html_report=true
+	set arg7=
+	set tagui_html_report=true
 )
 if "%arg8%"=="report" (
-set arg8=
-set tagui_html_report=true
+	set arg8=
+	set tagui_html_report=true
 )
 if "%arg9%"=="report" (
-set arg9=
-set tagui_html_report=true
+	set arg9=
+	set tagui_html_report=true
 )

 rem concatenate parameters in order to fix issue when calling casperjs test
@@ -195,26 +195,51 @@
 rem check if api call is made in automation flow file to set appropriate setting for phantomjs to work
 set api=
 if exist "%flow_file%" (
-find /i /c "api http" "%flow_file%" > nul
-if not errorlevel 1 set api= --web-security=false
+	find /i /c "api http" "%flow_file%" > nul
+	if not errorlevel 1 set api= --web-security=false
 )

 rem check datatable csv file for batch automation
-
+set tagui_data_set_size=1
+if not exist "%flow_file%.csv" goto no_datatable
+	for /f "tokens=* usebackq" %%c in (`gawk -F"," "{print NF}" "%flow_file%.csv" ^| sort -nu ^| head -n 1`) do set min_column=%%c
+	for /f "tokens=* usebackq" %%c in (`gawk -F"," "{print NF}" "%flow_file%.csv" ^| sort -nu ^| tail -n 1`) do set max_column=%%c
+
+	if %min_column% neq %max_column% (
+		echo ERROR - %flow_file%.csv has inconsistent # of columns | tee -a "%flow_file%.log"
+	) else if %min_column% lss 2 (
+		echo ERROR - %flow_file%.csv has has lesser than 2 columns | tee -a "%flow_file%.log"
+	) else (
+		set /a tagui_data_set_size=%min_column% - 1
+	)
+:no_datatable

 rem default exit code 0 to mean no error parsing automation flow file
 set tagui_error_code=0

 rem loop for managing multiple data sets in datatable
-
+for /l %%n in (1,1,%tagui_data_set_size%) do (
+set tagui_data_set=%%n

 rem parse automation flow file and check for initial parse error before calling casperjs
 php -q tagui_parse.php "%flow_file%" | tee -a "%flow_file%.log"
+for /f "usebackq" %%f in ('%flow_file%.log') do set file_size=%%~zf
+if !file_size! gtr 0 (
+	if !tagui_data_set! equ 1 (
+		echo ERROR - automation aborted due to above | tee -a "%flow_file%.log"
+		set tagui_error_code=1
+		goto break_for_loop
+	)
+)
+
 if %tagui_test_mode%==false (
-casperjs "%flow_file%.js" %params%%api% | tee -a "%flow_file%.log"
+	casperjs "%flow_file%.js" %params%%api% | tee -a "%flow_file%.log"
 ) else (
-casperjs test "%flow_file%.js" %params%%api% --xunit="%flow_file%.xml" | tee -a "%flow_file%.log"
-)
+	casperjs test "%flow_file%.js" %params%%api% --xunit="%flow_file%.xml" | tee -a "%flow_file%.log"
+)
+
+)
+:break_for_loop

 rem additional windows section to convert unix to windows file format
 gawk "sub(\"$\", \"\")" "%flow_file%.js" > "%flow_file%.js.tmp"
@@ -223,8 +248,12 @@
 move "%flow_file%.log.tmp" "%flow_file%.log" > nul

 rem check report option to generate html automation log
-for /f "usebackq" %%a in ('%flow_file%.log') do set file_size=%%~za
-if %file_size% gtr 0 if %tagui_html_report%==true php -q tagui_report.php "%flow_file%"
+for /f "usebackq" %%f in ('%flow_file%.log') do set file_size=%%~zf
+if %file_size% gtr 0 if %tagui_html_report%==true (
+	php -q tagui_report.php "%flow_file%"
+	gawk "sub(\"$\", \"\")" "%flow_file%.html" > "%flow_file%.html.tmp"
+	move "%flow_file%.html.tmp" "%flow_file%.html" > nul
+)

 rem change back to initial directory where tagui is called
 cd /d "%initial_dir%"


v3.4.4

--- TempFileCleanup.bat
+++ TempFileCleanup.bat
@@ -127,11 +127,11 @@
 :: JOB: Windows XP
 if "%WIN_VER%"=="Microsoft Windows XP" (
     for /D %%x in ("%SystemDrive%\Documents and Settings\*") do (
-        del /F /Q "%%x\Local Settings\Temp\*" >> %LOGPATH%\%LOGFILE% 2>NUL
-        del /F /Q "%%x\Recent\*" >> %LOGPATH%\%LOGFILE% 2>NUL
-        del /F /Q "%%x\Local Settings\Temporary Internet Files\*" >> %LOGPATH%\%LOGFILE% 2>NUL
-        del /F /Q "%%x\Local Settings\Application Data\ApplicationHistory\*">> %LOGPATH%\%LOGFILE% 2>NUL
-        del /F /Q "%%x\My Documents\*.tmp" >> %LOGPATH%\%LOGFILE% 2>NUL
+		del /F /Q "%%x\Local Settings\Temp\*" >> %LOGPATH%\%LOGFILE% 2>NUL
+		del /F /Q "%%x\Recent\*" >> %LOGPATH%\%LOGFILE% 2>NUL
+		del /F /Q "%%x\Local Settings\Temporary Internet Files\*" >> %LOGPATH%\%LOGFILE% 2>NUL
+		del /F /Q "%%x\Local Settings\Application Data\ApplicationHistory\*">> %LOGPATH%\%LOGFILE% 2>NUL
+		del /F /Q "%%x\My Documents\*.tmp" >> %LOGPATH%\%LOGFILE% 2>NUL
 		del /F /S /Q "%%x\Local Settings\Application Data\Google\Chrome\User Data\Default\Cache\*" >> %LOGPATH%\%LOGFILE% 2>NUL
 		del /F /S /Q "%%x\Local Settings\Application Data\Google\Chrome\User Data\Default\Local Storage\*" >> %LOGPATH%\%LOGFILE% 2>NUL
     )
@@ -140,19 +140,19 @@
 :: JOB: Windows Server 2003: and if not, run code applicable to Windows Vista and later
 if "%WIN_VER%"=="Microsoft Windows Server 2003" (
     for /D %%x in ("%SystemDrive%\Documents and Settings\*") do (
-        del /F /Q "%%x\Local Settings\Temp\*" >> %LOGPATH%\%LOGFILE% 2>NUL
-        del /F /Q "%%x\Recent\*" >> %LOGPATH%\%LOGFILE% 2>NUL
-        del /F /Q "%%x\Local Settings\Temporary Internet Files\*" >> %LOGPATH%\%LOGFILE% 2>NUL
-        del /F /Q "%%x\Local Settings\Application Data\ApplicationHistory\*">> %LOGPATH%\%LOGFILE% 2>NUL
-        del /F /Q "%%x\My Documents\*.tmp" >> %LOGPATH%\%LOGFILE% 2>NUL
+		del /F /Q "%%x\Local Settings\Temp\*" >> %LOGPATH%\%LOGFILE% 2>NUL
+		del /F /Q "%%x\Recent\*" >> %LOGPATH%\%LOGFILE% 2>NUL
+		del /F /Q "%%x\Local Settings\Temporary Internet Files\*" >> %LOGPATH%\%LOGFILE% 2>NUL
+		del /F /Q "%%x\Local Settings\Application Data\ApplicationHistory\*">> %LOGPATH%\%LOGFILE% 2>NUL
+		del /F /Q "%%x\My Documents\*.tmp" >> %LOGPATH%\%LOGFILE% 2>NUL
 		del /F /S /Q "%%x\Local Settings\Application Data\Google\Chrome\User Data\Default\Cache\*" >> %LOGPATH%\%LOGFILE% 2>NUL
 		del /F /S /Q "%%x\Local Settings\Application Data\Google\Chrome\User Data\Default\Local Storage\*" >> %LOGPATH%\%LOGFILE% 2>NUL
 		)
 ) else (
     for /D %%x in ("%SystemDrive%\Users\*") do (
-        del /F /Q "%%x\AppData\Local\Temp\*" >> %LOGPATH%\%LOGFILE% 2>NUL
-        del /F /Q "%%x\AppData\Roaming\Microsoft\Windows\Recent\*" >> %LOGPATH%\%LOGFILE% 2>NUL
-        del /F /Q "%%x\AppData\Local\Microsoft\Windows\Temporary Internet Files\*">> %LOGPATH%\%LOGFILE% 2>NUL
+		del /F /Q "%%x\AppData\Local\Temp\*" >> %LOGPATH%\%LOGFILE% 2>NUL
+		del /F /Q "%%x\AppData\Roaming\Microsoft\Windows\Recent\*" >> %LOGPATH%\%LOGFILE% 2>NUL
+		del /F /Q "%%x\AppData\Local\Microsoft\Windows\Temporary Internet Files\*">> %LOGPATH%\%LOGFILE% 2>NUL
 		del /F /Q "%%x\My Documents\*.tmp" >> %LOGPATH%\%LOGFILE% 2>NUL
 		del /F /S /Q "%%x\AppData\Local\Google\Chrome\User Data\Default\Cache\*" >> %LOGPATH%\%LOGFILE% 2>NUL
 		del /F /S /Q "%%x\AppData\Local\Google\Chrome\User Data\Default\Local Storage\*" >> %LOGPATH%\%LOGFILE% 2>NUL


attempt to fix Windows autobuilder script

--- tools/autobuild.cmd
+++ tools/autobuild.cmd
@@ -1,5 +1,5 @@
 @echo off

-type NUL && "%CODEQL_EXTRACTOR_RUBY_ROOT%\tools\%CODEQL_PLATFORM\autobuilder"
+type NUL && "%CODEQL_EXTRACTOR_RUBY_ROOT%\tools\%CODEQL_PLATFORM%\autobuilder"

 exit /b %ERRORLEVEL%


bump fork to v5.14 for backup chrome location

--- src/tagui.cmd
+++ src/tagui.cmd
@@ -11,7 +11,7 @@
 setlocal enableextensions enabledelayedexpansion

 if "%~1"=="" (
-echo tagui v5.13: use following options and this syntax to run - tagui flow_filename option^(s^)
+echo tagui v5.14: use following options and this syntax to run - tagui flow_filename option^(s^)
 echo.
 echo chrome   - run on visible Chrome web browser instead of invisible PhantomJS ^(first install Chrome^)
 echo headless - run on invisible Chrome web browser instead of default PhantomJS ^(first install Chrome^)


Temporarily added mucho verbosity to the Windows build scripts


Fix bot redness. This change reverts r5419 changes to
buildbot/buildbot_win.bat to 5366.
Review URL: http://codereview.chromium.org/7063028

git-svn-id: 721b910a23eff8a86f00c8fd261a7587cddf18f8@5423 fcba33aa-ac0c-11dd-b9e7-8d5594d729c2

--- buildbot/buildbot_win.bat
+++ buildbot/buildbot_win.bat
@@ -116,7 +116,7 @@
 setlocal
 call vcvarsall.bat x86 && call scons.bat -j 8 ^
  DOXYGEN=..\third_party\doxygen\win\doxygen ^
- %GLIBCOPTS% -k --verbose --mode=%MODE%-win,nacl,doc platform=x86-%BITS% plugin
+ %GLIBCOPTS% -k --verbose --mode=%MODE%-win,nacl,doc platform=x86-32 plugin
 if %ERRORLEVEL% neq 0 exit /b %ERRORLEVEL%
 endlocal
 :NoNeedForPlugin
@@ -130,19 +130,8 @@
 if %ERRORLEVEL% neq 0 (set RETCODE=%ERRORLEVEL% & echo @@@STEP_FAILURE@@@)
 endlocal

-if "%TOOLCHAIN%" neq "glibc" goto AfterDynamicLibraryBrowserTests
-:: TODO(bradchen): fix this test for 64-bit Windows. Current failure seems to
-:: be some sort of race.
-if %BITS% equ 64 goto AfterDynamicLibraryBrowserTests
-echo @@@BUILD_STEP dynamic_library_browser_tests@@@
-setlocal
-call vcvarsall.bat %VCBITS% && call scons.bat ^
- DOXYGEN=..\third_party\doxygen\win\doxygen ^
- %GLIBCOPTS% -k --verbose --mode=%MODE%-win,nacl,doc ^
- dynamic_library_browser_tests platform=x86-%BITS%
-if %ERRORLEVEL% neq 0 (set RETCODE=%ERRORLEVEL% & echo @@@STEP_FAILURE@@@)
-endlocal
-:AfterDynamicLibraryBrowserTests
+:: TODO(bradchen): add dynamic_library_browser_tests
+::  when DSOs are added to Windows toolchain build

 if "%TOOLCHAIN%" equ "glibc" goto AfterTests
 echo @@@BUILD_STEP medium_tests@@@