install.cmd: tweak comments

install.cmd: tweak comments

--- install.cmd
+++ install.cmd
@@ -108,8 +108,6 @@

 echo Installing binaries...
 FOR /R "%GITEXTRAS%\bin" %%i in (*.*) DO (
-::  Fixation for Windows 10.0.17134 Build 17134 (Won't install without /E)
-::  Echo file being written for testing
     IF "%DEBUG%=="true" ( ECHO "Writing File: %PREFIX%\bin\%%~ni" )

     ECHO #^^!/usr/bin/env bash > "%PREFIX%\bin\%%~ni"
@@ -117,20 +115,18 @@
     TYPE "%GITEXTRAS%\helper\git-extra-utility" >> "%PREFIX%\bin\%%~ni"
     TYPE "%GITEXTRAS%\helper\is-git-repo" >> "%PREFIX%\bin\%%~ni"

-    REM Added /E Option for Installation Fix On Windows 10 Higher Version
+    REM Added /E option for installation fix on Windows 10.0.17134 and higher
     MORE /E +2 "%GITEXTRAS%\bin\%%~ni" >> "%PREFIX%\bin\%%~ni"
 )

 FOR %%i in (%COMMANDS_WITHOUT_REPO%) DO (
-::  Fixation for Windows 10.0.17134 Build 17134 (Won't install without /E)
-::  Echo file being written for testing
     IF "%DEBUG%=="true" ( ECHO "Writing File: %PREFIX%\bin\%%i" )

     ECHO #^^!/usr/bin/env bash > "%PREFIX%\bin\%%i"
     TYPE "%GITEXTRAS%\helper\reset-env" >> "%PREFIX%\bin\%%i"
     TYPE "%GITEXTRAS%\helper\git-extra-utility" >> "%PREFIX%\bin\%%i"

-::  Added /E Option for Installation Fix On Windows 10 Higher Version
+    REM Added /E option for installation fix on Windows 10.0.17134 and higher
     MORE /E +2 "%GITEXTRAS%\bin\%%i" >> "%PREFIX%\bin\%%i"
 )


Attempt to fix #506

Attempt to fix #506

--- scripts/build-appveyor.bat
+++ scripts/build-appveyor.bat
@@ -43,6 +43,7 @@
 ::custom node for VS2015
 SET ARCHPATH=
 IF "%platform%"=="X64" (SET ARCHPATH=x64/)
+IF "%platform%"=="x64" (SET ARCHPATH=x64/)
 SET NODE_URL=https://mapbox.s3.amazonaws.com/node-cpp11/v%nodejs_version%/%ARCHPATH%node.exe
 ECHO downloading node^: %NODE_URL%
 powershell Invoke-WebRequest "${env:NODE_URL}" -OutFile node.exe


Create compile.bat

Create compile.bat

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

--- compile.bat
+++ compile.bat
@@ -0,0 +1 @@
+gcc -std=c99 -O3 -Wall -Wextra conversion.c conversionSample.c -o conversionSample


unterverzeichnis mit buildtools wird an PATH angehaengt

git-svn-id: 8d3f453d47e2d101802c47149790c6969eab0d00@115 ab522a7c-5096-11dc-afc5-cb66f0b61238

--- compile.bat
+++ compile.bat
@@ -3,7 +3,7 @@
 rem die Werkzeuge zum Bau befinden sich
 rem in einem Unterverzeichnis
 echo setting env
-set PATH=./sys/bin
+set PATH=%PATH%;sys\bin
 echo PATH=%PATH%

 rem make wird fuer das aktuelle Makefile


setup: deploy pyc files only (#6394)

setup: deploy pyc files only (#6394)

--- build_scripts/windows/scripts/build.cmd
+++ build_scripts/windows/scripts/build.cmd
@@ -144,14 +144,29 @@
 for /f %%a in ('dir %BUILDING_DIR%\Lib\site-packages\*.egg-info /b /s /a:d') do (
     rmdir /s /q %%a
 )
-for /d /r %BUILDING_DIR%\Lib\site-packages %%d in (__pycache__) do (
-    if exist %%d rmdir /s /q "%%d"
-)
+
 :: Use universal files and remove Py3 only files
 pushd %BUILDING_DIR%\Lib\site-packages\azure\mgmt
 for /f %%a in ('dir /b /s *_py3.py') do (
     set PY3_FILE=%%a
     if exist !PY3_FILE! del !PY3_FILE!
+)
+for /f %%a in ('dir /b /s *_py3.*.pyc') do (
+    set PY3_FILE=%%a
+    if exist !PY3_FILE! del !PY3_FILE!
+)
+popd
+
+:: Remove .py and only deploy .pyc files
+pushd %BUILDING_DIR%\Lib\site-packages
+for /f %%f in ('dir /b /s *.pyc') do (
+    set PARENT_DIR=%%~df%%~pf..
+    set FILENAME=%%~nf
+    set BASE_FILENAME=!FILENAME:~0,-11!
+    set pyc=!BASE_FILENAME!.pyc
+    del !PARENT_DIR!\!BASE_FILENAME!.py
+    copy %%~f !PARENT_DIR!\!pyc! >nul
+    del %%~f
 )
 popd


update odb

update odb

--- common/scripts/odb.d/10-trolley-fe.cmd
+++ common/scripts/odb.d/10-trolley-fe.cmd
@@ -7,6 +7,8 @@
 cd "/Equipment/TrolleyInterface/Monitor"

 create BOOL "Barcode Error"
+create FLOAT "LED Voltage"
+create INT "Barcode Readout[6]"
 create BOOL "Temperature Interrupt"
 create BOOL "Power Supply Status[3]"
 create BOOL "Read Thread Active"


Fix integration test util.

Fix integration test util.

--- Tests/run2.cmd
+++ Tests/run2.cmd
@@ -3,7 +3,7 @@
 if not defined NemerleBinPathRoot set NemerleBinPathRoot="%ProgramFiles%\Nemerle"
 if not defined Nemerle set Nemerle=%NemerleBinPathRoot%\Net-4.0
 set RuntimeDllPath=%~dp0\..\N2\N2.Runtime\bin\%Configuration%
-set N2CompilerDllPath=%~dp0\..\N2\N2.Compiler\bin\%Configuration%\Stage2
+set N2CompilerDllPath=%~dp0\..\N2\N2.Compiler\bin\%Configuration%\Stage1

 echo ---- POSITIVE TESTS ----
 set TeamCityArgs=


Add a gn.bat script that runs ./flutter/tools/gn. (#17799)

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

--- tools/gn.bat
+++ tools/gn.bat
@@ -0,0 +1 @@
+@call python "%~dp0gn" %*


Fix for spaces in py paths

Fix for spaces in py paths

--- Install.bat
+++ Install.bat
@@ -34,7 +34,7 @@
 goto checkpy

 :checkpy
-for /f "tokens=1" %%x in ('where python') do ( call :checkpyversion "%%x" "py2v" "py2path" "py3v" "py3path" )
+for /f "tokens=*" %%x in ('where python') do ( call :checkpyversion "%%x" "py2v" "py2path" "py3v" "py3path" )
 set "targetpy=3"
 if /i "!use_py3!" == "FALSE" (
     set "targetpy=2"


fix the compilation script on windows

fix the compilation script on windows

--- compile.bat
+++ compile.bat
@@ -1,7 +1,7 @@
 mkdir bin

-dir /s /B src/*.java > javafiles
+dir /s /B src\*.java > javafiles

-javac -verbose -cp lib/java_cup.jar:lib/JFlex-1.4.3.jar:lib/commons-math3-3.0.jar:lib/commons-math-2.2.jar:lib/junit-4.10.jar:lib/Jama.jar:bin/ -d bin/ @javafiles
+javac -verbose -cp lib\gson-2.2.4.jar;lib\java_cup.jar;lib\JFlex-1.4.3.jar;lib\commons-math3-3.0.jar;lib\commons-math-2.2.jar;lib\junit-4.10.jar;lib\Jama.jar;bin\ -d bin\ @javafiles

-delete javafiles+del javafiles


Expand python detection

Expand python detection

--- PlistTool.bat
+++ PlistTool.bat
@@ -6,6 +6,17 @@
 set "thisDir=%~dp0"
 set /a tried=0
 set "toask=yes"
+set "py2v="
+set "py2path="
+set "py3v="
+set "py3path="
+set "pypath="
+
+REM use_py3:
+REM   TRUE  = Use if found, use py2 otherwise
+REM   FALSE = Use py2
+REM   FORCE = Use py3
+set "use_py3=TRUE"

 goto checkscript

@@ -23,8 +34,22 @@
 goto checkpy

 :checkpy
-python -V > NUL 2>&1
-if not "!errorlevel!" == "0" (
+for /f "tokens=1" %%x in ('where python') do ( call :checkpyversion "%%x" "py2v" "py2path" "py3v" "py3path" )
+set "targetpy=3"
+if /i "!use_py3!" == "FALSE" (
+    set "targetpy=2"
+    set "pypath=!py2path!"
+) else if /i "!use_py3!" == "FORCE" (
+    set "pypath=!py3path!"
+) else if /i "!use_py3!" == "TRUE" (
+    set "pypath=!py3path!"
+    if "!pypath!" == "" set "pypath=!py2path!"
+)
+if not "!pypath!" == "" (
+    goto runscript
+)
+
+if "!pypath!" == "" (
     if %tried% lss 1 (
         if /i "!toask!"=="yes" (
             REM Better ask permission first
@@ -37,6 +62,7 @@
         echo   ###     ###
         echo  # Warning #
         echo ###     ###
+        echo.
         REM Couldn't install for whatever reason - give the error message
         echo Python is not installed or not found in your PATH var.
         echo Please install it from https://www.python.org/downloads/windows/
@@ -53,6 +79,62 @@
     )
 )
 goto runscript
+
+:checkpyversion <path> <py2v> <py2path> <py3v> <py3path>
+set "version="&for /f "tokens=2* USEBACKQ delims= " %%a in (`"%~1" -V 2^>^&1`) do (
+    REM Ensure we have a version number
+    call :isnumber "%%a"
+    if not "!errorlevel!" == "0" goto :EOF
+    set "version=%%a"
+)
+if not defined version goto :EOF
+if "!version:~0,1!" == "2" (
+    REM Python 2
+    call :comparepyversion "!version!" "!%~2!"
+    if "!errorlevel!" == "1" (
+        set "%~2=!version!"
+        set "%~3=%~1"
+    )
+) else (
+    REM Python 3
+    call :comparepyversion "!version!" "!%~4!"
+    if "!errorlevel!" == "1" (
+        set "%~4=!version!"
+        set "%~5=%~1"
+    )
+)
+goto :EOF
+
+:isnumber <check>
+set "var="&for /f "delims=0123456789." %%i in ("%~1") do set var=%%i
+if defined var (exit /b 1)
+exit /b 0
+
+:comparepyversion <version1> <version2> <return>
+REM Exits with status 0 if equal, 1 if v1 gtr v2, 2 if v1 lss v2
+for /f "tokens=1,2,3 delims=." %%a in ("%~1") do (
+    set a1=%%a
+    set a2=%%b
+    set a3=%%c
+)
+for /f "tokens=1,2,3 delims=." %%a in ("%~2") do (
+    set b1=%%a
+    set b2=%%b
+    set b3=%%c
+)
+if not defined a1 set a1=0
+if not defined a2 set a2=0
+if not defined a3 set a3=0
+if not defined b1 set b1=0
+if not defined b2 set b2=0
+if not defined b3 set b3=0
+if %a1% gtr %b1% exit /b 1
+if %a1% lss %b1% exit /b 2
+if %a2% gtr %b2% exit /b 1
+if %a2% lss %b2% exit /b 2
+if %a3% gtr %b3% exit /b 1
+if %a3% lss %b3% exit /b 2
+exit /b 0

 :askinstall
 cls
@@ -60,7 +142,7 @@
 echo  # Python Not Found #
 echo ###              ###
 echo.
-echo Python was not found on the system or in the PATH var.
+echo Python !targetpy! was not found on the system or in the PATH var.
 echo.
 set /p "menu=Would you like to install it now? [y/n]: "
 if /i "!menu!"=="y" (
@@ -92,7 +174,7 @@
 echo Parsing for latest...
 pushd "%TEMP%"
 :: Version detection code slimmed by LussacZheng (https://github.com/corpnewt/gibMacOS/issues/20)
-for /f "tokens=9 delims=< " %%x in ('findstr /i /c:"Latest Python 3 Release" pyurl.txt') do ( set "release=%%x" )
+for /f "tokens=9 delims=< " %%x in ('findstr /i /c:"Latest Python !targetpy! Release" pyurl.txt') do ( set "release=%%x" )
 popd

 echo Found Python !release! -  Downloading...
@@ -102,36 +184,39 @@
 REM At this point - we should have the version number.
 REM We can build the url like so: "https://www.python.org/ftp/python/[version]/python-[version]-amd64.exe"
 set "url=https://www.python.org/ftp/python/!release!/python-!release!-amd64.exe"
+set "pytype=exe"
+if "!targetpy!" == "2" (
+    set "url=https://www.python.org/ftp/python/!release!/python-!release!.amd64.msi"
+    set "pytype=msi"
+)
 REM Now we download it with our slick powershell command
-powershell -command "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; (new-object System.Net.WebClient).DownloadFile('!url!','%TEMP%\pyinstall.exe')"
+powershell -command "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; (new-object System.Net.WebClient).DownloadFile('!url!','%TEMP%\pyinstall.!pytype!')"
 REM If it doesn't exist - we bail
-if not exist "%TEMP%\pyinstall.exe" (
+if not exist "%TEMP%\pyinstall.!pytype!" (
     goto checkpy
 )
 REM It should exist at this point - let's run it to install silently
 echo Installing...
-echo pyinstall.exe /quiet PrependPath=1 Include_test=0 Shortcuts=0 Include_launcher=0
 pushd "%TEMP%"
-pyinstall.exe /quiet PrependPath=1 Include_test=0 Shortcuts=0 Include_launcher=0
+if /i "!pytype!" == "exe" (
+    echo pyinstall.exe /quiet PrependPath=1 Include_test=0 Shortcuts=0 Include_launcher=0
+    pyinstall.exe /quiet PrependPath=1 Include_test=0 Shortcuts=0 Include_launcher=0
+) else (
+    set "foldername=!release:.=!"
+    echo msiexec /i pyinstall.msi /qb ADDLOCAL=ALL TARGETDIR="%LocalAppData%\Programs\Python\Python!foldername:~0,2!"
+    msiexec /i pyinstall.msi /qb ADDLOCAL=ALL TARGETDIR="%LocalAppData%\Programs\Python\Python!foldername:~0,2!"
+)
 popd
-echo Installer finsihed with %ERRORLEVEL% status.
+echo Installer finished with %ERRORLEVEL% status.
 REM Now we should be able to delete the installer and check for py again
-del "%TEMP%\pyinstall.exe"
+del "%TEMP%\pyinstall.!pytype!"
 REM If it worked, then we should have python in our PATH
 REM this does not get updated right away though - let's try
 REM manually updating the local PATH var
 set "spath="
 set "upath="
-for /f "tokens=2* delims= " %%i in ('reg.exe query "HKCU\Environment" /v "Path" 2^> nul') do (
-    if NOT "%%j"=="" (
-		set "upath=%%j"
-	)
-)
-for /f "tokens=2* delims= " %%i in ('reg.exe query "HKLM\SYSTEM\CurrentControlSet\Control\Session Manager\Environment" /v "Path" 2^> nul') do (
-    if NOT "%%j"=="" (
-		set "spath=%%j"
-	)
-)
+for /f "tokens=2* delims= " %%i in ('reg.exe query "HKCU\Environment" /v "Path" 2^> nul') do ( if not "%%j" == "" set "upath=%%j" )
+for /f "tokens=2* delims= " %%i in ('reg.exe query "HKLM\SYSTEM\CurrentControlSet\Control\Session Manager\Environment" /v "Path" 2^> nul') do ( if not "%%j" == "" set "spath=%%j" )
 if not "!spath!" == "" (
     REM We got something in the system path
     set "PATH=!spath!"
@@ -151,8 +236,8 @@
 set "args=%*"
 set "args=!args:"=!"
 if "!args!"=="" (
-    python "!thisDir!!script_name!"
+    "!pypath!" "!thisDir!!script_name!"
 ) else (
-    python "!thisDir!!script_name!" %*
+    "!pypath!" "!thisDir!!script_name!" %*
 )
 goto :EOF


bugfix

bugfix

--- _ContinuousIntegration/deployUpdates.cmd
+++ _ContinuousIntegration/deployUpdates.cmd
@@ -10,4 +10,4 @@
 set MSDeployPath=%%j
 ))))))

-"%MSDeployPath%\msdeploy.exe" -verb:sync -source:contentpath="%WORKSPACE%/_UpdatePackage" -dest:contentPath="%1"+"%MSDeployPath%\msdeploy.exe" -verb:sync -source:contentpath="%WORKSPACE%/_UpdatePackage" -skip:skipaction='Delete',objectname='dirPath',absolutepath='/plugins/.*' -skip:skipaction='Delete',objectname='filePath',absolutepath='/plugins/.*' -dest:contentPath="%1"


Add a setlocal command to the beginning of build.bat. This is required to deal with buildenv.bat properly, so that PATH (for example) doesn't expand infintly. Per report from Joachim Wieland, patch from Magnus.

--- src/tools/msvc/build.bat
+++ src/tools/msvc/build.bat
@@ -1,4 +1,5 @@
 @echo off
+SETLOCAL
 SET STARTDIR=%CD%
 if exist src\tools\msvc\buildenv.bat call src\tools\msvc\buildenv.bat
 if exist buildenv.bat call buildenv.bat


Trying to use network CUDA distro

Trying to use network CUDA distro

--- init_ci.cmd
+++ init_ci.cmd
@@ -1,9 +1,9 @@
 @echo off
 echo Downloading CUDA toolkit 8
-rem appveyor DownloadFile  https://developer.nvidia.com/compute/cuda/8.0/prod/local_installers/cuda_8.0.44_windows-exe -FileName cuda_8.0.44_windows.exe
-appveyor DownloadFile  https://www.dropbox.com/s/ll2ay531hw3i1p7/cuda.zip?dl=1
-7z x cuda.zip -ocuda
-cd cuda
+appveyor DownloadFile  https://developer.nvidia.com/compute/cuda/8.0/Prod2/network_installers/cuda_8.0.61_win10_network-exe -FileName setup.exe
+rem appveyor DownloadFile  https://www.dropbox.com/s/ll2ay531hw3i1p7/cuda.zip?dl=1
+rem 7z x cuda.zip -ocuda
+rem cd cuda
 echo Installing CUDA toolkit 8
 setup.exe -s compiler_8.0 ^
                            cublas_8.0 ^


Windows用起動ファイルをアップ

Windows用起動ファイルをアップ

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

--- sh/check_apache_logs.bat
+++ sh/check_apache_logs.bat
@@ -0,0 +1,11 @@
+set TARGET_DIR=C:\Tools\Apache\logs
+cd %%TARGET_DIR
+
+rem JԂ{
+FOR /L %%i IN (1,1,1000000) Do (
+
+    rem t@CƂɎ{
+    for %%f in (access*) do dir %%f
+
+  )
+)


add start ssh agent

add start ssh agent

--- add_links.cmd
+++ add_links.cmd
@@ -6,6 +6,7 @@
 set cmd_args=

 call :set_link false git		"%ProgramFiles%\Git\cmd\git.exe" "%ProgramFiles%\Git\mingw64\bin\git.exe" "%ProgramFiles%\Git\bin\git.exe" "%ProgramFiles(x86)%\Git\bin\git.exe"
+call :set_link false start-ssh-agent	"%ProgramFiles%\Git\cmd\start-ssh-agent.cmd"
 call :set_link false py			"%ProgramFiles(x86)%\Python 3.5\python.exe" "%ProgramFiles(x86)%\Python35-32\python.exe"
 call :set_link false pip		"%ProgramFiles(x86)%\Python 3.5\Scripts\pip.exe" "%ProgramFiles(x86)%\Python35-32\Scripts\pip.exe"
 call :set_link true npp			"%ProgramFiles%\Notepad++\notepad++.exe" "%ProgramFiles(x86)%\Notepad++\notepad++.exe" "%windir%\system32\notepad.exe" "%windir%\notepad.exe"


Added the listHardLinks.bat file

Added the listHardLinks.bat file

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

--- listHardLinks.bat
+++ listHardLinks.bat
@@ -0,0 +1,103 @@
+REM The MIT License (MIT)
+REM Copyright (c) 2014 brunoais
+REM Permission is hereby granted, free of charge, to any person obtaining a copy
+REM of this software and associated documentation files (the "Software"), to deal
+REM in the Software without restriction, including without limitation the rights
+REM to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+REM copies of the Software, and to permit persons to whom the Software is
+REM furnished to do so, subject to the following conditions:
+REM
+REM The above copyright notice and this permission notice shall be included in all
+REM copies or substantial portions of the Software.
+REM
+REM THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+REM IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+REM FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+REM AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+REM LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+REM OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+REM SOFTWARE.
+
+@echo off
+setlocal enableextensions enabledelayedexpansion
+
+REM Parameters management (all optional)
+
+REM Set defaults
+SET PcheckDir=.
+
+REM Searching for files with single hard link (1) or multiple hard link (2, by default)
+SET PcheckKind=1
+
+IF %1 EQU 1 (
+	SET PcheckDir=.
+	SET PcheckKind=1
+) ELSE (
+	IF "%1"=="" (
+		SET PcheckDir=.
+	)
+	IF "%2"=="" (
+		SET PcheckKind=2
+	)
+)
+
+
+REM Rights elevation
+REM Adapted from http://superuser.com/a/757106/176343
+
+>nul 2>&1 "%SYSTEMROOT%\system32\cacls.exe" "%SYSTEMROOT%\system32\config\system"
+
+if '%errorlevel%' NEQ '0' (
+    goto UACPrompt
+) else ( goto gotAdmin )
+:UACPrompt
+	if exist "%temp%\getadmin.vbs" del "%temp%\getadmin.vbs"
+    echo Set UAC = CreateObject^("Shell.Application"^) > "%temp%\getadmin.vbs"
+	echo UAC.ShellExecute "%~f0", "%PcheckDir% %PcheckKind%", "%CD%", "runas", 1 >> "%temp%\getadmin.vbs"
+    "%temp%\getadmin.vbs"
+    exit /B
+:gotAdmin
+    if exist "%temp%\getadmin.vbs" del "%temp%\getadmin.vbs"
+    pushd "%CD%"
+    CD /D "%~dp0"
+
+
+REM adapted from http://stackoverflow.com/questions/17687358/batch-file-command-line-to-get-target-path-of-internet-shortcut-url-in-the
+
+pushd %1
+pushd %2
+
+@echo off
+
+REM For each file in directory
+for %%F in (%PcheckDir%\*) do (
+	call :checkHardLink "%%~dpnxF" %PcheckKind%
+)
+popd
+popd
+
+
+pause
+goto end
+
+
+:checkHardLink inputfile
+REM Get the hardlink list.
+REM This works because fsutil lists a single hardlink per line in the output
+set "cmd=fsutil hardlink list %1 | find /V /C """
+
+for /f %%l in ('!cmd!') do set copies=%%l
+
+
+IF %PcheckKind% EQU 1 (
+	REM Searching for files with single hard link
+	IF %copies% EQU 1 (
+		Echo %copies%: %1%
+	)
+) ELSE (
+	REM Searching for files with multiple hard link
+	IF %copies% NEQ 1 (
+		Echo %copies%: %1%
+	)
+)
+:end


Pack and push Reactivedomain.tests nuget

--- src/ReactiveDomain/build.cmd
+++ src/ReactiveDomain/build.cmd
@@ -5,6 +5,7 @@
 set NUGETDIR=%THISDIR%\.nuget\
 set SOLUTIONDIR=%THISDIR%
 set NUSPECDIR=%THISDIR%\ReactiveDomain
+set TESTNUSPECDIR=%THISDIR%\ReactiveDomain.Tests

 %NUGET% update -self

@@ -16,14 +17,30 @@
 "%programfiles(x86)%\MSBuild\14.0\Bin\MSBuild.exe" %SOLUTIONDIR%\ReactiveDomain.sln /p:Configuration="Debug" /m /v:M /fl /flp:LogFile=msbuild.log;Verbosity=Normal /nr:false

-echo Updating NuGet version in nuspec file...
+REM Make ReactiveDomain Nuget ***********************************************************************************************
+
+echo Updating ReactiveDomain NuGet version in nuspec file...
 PowerShell.exe -ExecutionPolicy Bypass -Command "& '%SOLUTIONDIR%\Tools\UpdateNugetVersion.ps1'"

-
-echo Package using the nuspec file...
+echo Package ReactiveDomain NuGet using the nuspec file...
 pushd %NUSPECDIR%
 %NUGET% pack ReactiveDomain.nuspec
 popd

 echo Push the nuget to PKI private feed
 %NUGET% push %NUSPECDIR%\*.nupkg 345541e5-c350-41fd-9541-2c1d091f5190 -source https://www.myget.org/F/pki_invivo_private/api/v2/package
+
+
+
+REM Make ReactiveDomain.Tests Nuget ***********************************************************************************************
+
+echo Updating ReactiveDomain.Tests NuGet version in nuspec file...
+PowerShell.exe -ExecutionPolicy Bypass -Command "& '%SOLUTIONDIR%\Tools\UpdateTestsNugetVersion.ps1'"
+
+echo Package using the nuspec file...
+pushd %TESTNUSPECDIR%
+%NUGET% pack ReactiveDomain.Tests.nuspec
+popd
+
+echo Push the nuget to PKI private feed
+%NUGET% push %TESTNUSPECDIR%\*.nupkg 345541e5-c350-41fd-9541-2c1d091f5190 -source https://www.myget.org/F/pki_invivo_private/api/v2/package


#40: Windows batch script fixed

#40: Windows batch script fixed

--- src/main/scripts/perfcake.bat
+++ src/main/scripts/perfcake.bat
@@ -58,34 +58,34 @@
 goto error

 :chkMHome
-if not "%PERFCAKE_HOME%"=="" goto valMHome
+if not "%PERFCAKE_HOME%"=="" goto valPCHome

 if "%OS%"=="Windows_NT" SET "PERFCAKE_HOME=%~dp0.."
 if "%OS%"=="WINNT" SET "PERFCAKE_HOME=%~dp0.."
-if not "%PERFCAKE_HOME%"=="" goto valMHome
+if not "%PERFCAKE_HOME%"=="" goto valPCHome

 echo.
 echo ERROR: PERFCAKE_HOME not found in your environment.
 echo Please set the PERFCAKE_HOME variable in your environment to match the
-echo location of the Maven installation
+echo location of the PerfCake installation
 echo.
 goto error

-:valMHome
+:valPCHome

-:stripMHome
-if not "_%PERFCAKE_HOME:~-1%"=="_\" goto checkMBat
+:stripPCHome
+if not "_%PERFCAKE_HOME:~-1%"=="_\" goto checkPCBat
 set "PERFCAKE_HOME=%PERFCAKE_HOME:~0,-1%"
-goto stripMHome
+goto stripPCHome

-:checkMBat
-if exist "%PERFCAKE_HOME%\bin\mvn.bat" goto init
+:checkPCBat
+if exist "%PERFCAKE_HOME%\bin\perfcake.bat" goto init

 echo.
 echo ERROR: PERFCAKE_HOME is set to an invalid directory.
 echo PERFCAKE_HOME = "%PERFCAKE_HOME%"
 echo Please set the PERFCAKE_HOME variable in your environment to match the
-echo location of the Maven installation
+echo location of the PerfCake installation
 echo.
 goto error
 @REM ==== END VALIDATION ====
@@ -129,7 +129,14 @@

 @REM Start PerfCake
 :runPERFCAKE
-%PERFCAKE_JAVA_EXE% -jar %PERFCAKE_HOME%\lib\perfcake*.jar %PERFCAKE_CMD_LINE_ARGS%
+for /f "delims=" %%i in ('dir /s /b %PERFCAKE_HOME%\lib\perfcake*.jar') do set PERFCAKE_JAR=%%i && goto pcJarFound
+:pcJarFound
+if not "%PERFCAKE_JAR%"=="" goto execPerfCake
+echo ERROR: could not find PerfCake jar file (%PERFCAKE_HOME%\lib\perfcake*.jar)
+goto error
+
+:execPerfCake
+%PERFCAKE_JAVA_EXE% -jar %PERFCAKE_JAR% %PERFCAKE_CMD_LINE_ARGS%
 if ERRORLEVEL 1 goto error
 goto end

@@ -154,15 +161,9 @@

 :postExec

-if not "%PERFCAKE_SKIP_RC%" == "" goto skipRcPost
-if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
-:skipRcPost
-
 @REM pause the batch file if PERFCAKE_BATCH_PAUSE is set to 'on'
 if "%PERFCAKE_BATCH_PAUSE%" == "on" pause

 if "%PERFCAKE_TERMINATE_CMD%" == "on" exit %ERROR_CODE%

 cmd /C exit /B %ERROR_CODE%
-
-


scripts
 * win32-generate-vc-proj.cmd : fixed the old "recall" tweak to a proper solution. Fixed the script to generate VS2010 projects.

git-svn-id: ed1ce8e5c168003d808aec37bc6fda77b178f7bb@3275 c330d7e9-fc0c-0410-a5b3-fd85c6f5aa8f

--- trunk/scripts/win32-generate-vc-proj.cmd
+++ trunk/scripts/win32-generate-vc-proj.cmd
@@ -1,21 +1,6 @@
 @echo off
-
-if "%1" == "" goto recall_me
-
-goto base
-
-REM #######################################################################################
-
-:recall_me
-
-cmd /e /v /c %0 dummy
-
-goto terminate
-
-REM #######################################################################################
-
-:base
-
+setlocal EnableDelayedExpansion
+setlocal enableextensions
 REM #######################################################################################

 if not exist "win32-init_env_command.cmd" (
@@ -64,7 +49,7 @@
 )

 cd ..\local-tmp\visual
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS=" /DWIN32 /D_WINDOWS /W3 /Zm1000 /EHsc /GR /wd4355" -Wno-dev -DCMAKE_MODULE_PATH="%saved_directory:\=/%/../cmake-modules;${CMAKE_MODULE_PATH}" . -G"%VSCMake%"
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS=" /DWIN32 /D_WINDOWS /W3 /Zm1000 /EHsc /GR /wd4355" -Wno-dev -DCMAKE_MODULE_PATH="%saved_directory:\=/%/../cmake-modules;${CMAKE_MODULE_PATH}" . -G"Visual Studio 10"
 cd %saved_directory%

 echo.


"rm" is not a Win32 command!  :)

"rm" is not a Win32 command!  :)

--- makezip.bat
+++ makezip.bat
@@ -1,3 +1,3 @@
-rm blender_nif_scripts-2.0.zip
+del blender_nif_scripts-2.0.zip
 "%PROGRAMFILES%\7-Zip\7z.exe" a -tzip blender_nif_scripts-2.0.zip scripts\nif_import.py scripts\nif_export.py scripts\bpymodules\nifImEx\__init__.py scripts\bpymodules\nifImEx\Config.py  scripts\bpymodules\nifImEx\Defaults.py scripts\bpymodules\nifImEx\Read.py scripts\bpymodules\nifImEx\Write.py scripts\bpymodules\nifImEx\niftools_logo.png ChangeLog README.html
 pause


1) implement the websocket client to support hybi-10 2) improved SuperWebSocket

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

--- mainline/BuildClient.bat
+++ mainline/BuildClient.bat
@@ -0,0 +1,23 @@
+@echo off
+
+set fdir=%WINDIR%\Microsoft.NET\Framework64
+
+if not exist %fdir% (
+	set fdir=%WINDIR%\Microsoft.NET\Framework
+)
+
+set msbuild=%fdir%\v4.0.30319\msbuild.exe
+
+%msbuild% WebSocketClient\WebSocketClient\WebSocketClient.csproj /p:Configuration=Release /t:Rebuild /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=..\..\superwebsocket.snk /p:OutputPath=..\..\bin\Net40
+FOR /F "tokens=*" %%G IN ('DIR /B /AD /S obj') DO RMDIR /S /Q "%%G"
+
+%msbuild% WebSocketClient\WebSocketClient\WebSocketClient.Mono.csproj /p:Configuration=Release /t:Rebuild /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=..\..\superwebsocket.snk /p:OutputPath=..\..\bin\Mono
+FOR /F "tokens=*" %%G IN ('DIR /B /AD /S obj') DO RMDIR /S /Q "%%G"
+
+set fdir=%WINDIR%\Microsoft.NET\Framework
+set msbuild=%fdir%\v4.0.30319\msbuild.exe
+
+%msbuild% WebSocketClient\WebSocketClient.Silverlight\WebSocketClient.Silverlight.csproj  /p:Configuration=Release /t:Rebuild /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=..\..\superwebsocket.snk /p:OutputPath=..\..\bin\Silverlight
+FOR /F "tokens=*" %%G IN ('DIR /B /AD /S obj') DO RMDIR /S /Q "%%G"
+
+pause


Win32 demo15

Win32 demo15

--- mc-sema/tests/demo15.bat
+++ mc-sema/tests/demo15.bat
@@ -6,15 +6,16 @@

 if exist "%IDA_PATH%\idaq.exe" (
     echo Using IDA to recover CFG
-    %BIN_DESCEND_PATH%\bin_descend_wrapper.py -march=x86 -d -func-map=%STD_DEFS% -entry-symbol=_imcdecl,_imstdcall@8,@imfastcall@8 -i=demo_test15.obj
+    %PYTHON% %BIN_DESCEND_PATH%\bin_descend_wrapper.py -march=x86 -d -func-map=%STD_DEFS% -entry-symbol=_imcdecl,_imstdcall@8,@imfastcall@8 -i=demo_test15.obj
 ) else (
-    echo Using bin_descend to recover CFG
-    %BIN_DESCEND_PATH%\bin_descend.exe -march=x86 -d -func-map=%STD_DEFS% -entry-symbol=_imcdecl,_imstdcall@8,@imfastcall@8 -i=demo_test15.obj
+    echo Bin_descend is no longer supported
+    exit 1
 )

-%CFG_TO_BC_PATH%\cfg_to_bc.exe -mtriple=i386-pc-win32 -i demo_test15.cfg -driver=imcdecl,_imcdecl,2,return,C -driver=imstdcall,_imstdcall@8,2,return,E -driver=imfastcall,@imfastcall@8,2,return,F -o demo_test15.bc
+%CFG_TO_BC_PATH%\cfg_to_bc.exe -mtriple=i386-pc-win32 -i demo_test15.cfg -entrypoint=_imcdecl -entrypoint=_imstdcall@8 -entrypoint=@imfastcall@8 -o demo_test15.bc

-%LLVM_PATH%\opt.exe -O1 -o demo_test15_opt.bc demo_test15.bc
-%LLVM_PATH%\llc.exe -filetype=obj -o demo_test15_lifted.obj demo_test15_opt.bc
-"%VCINSTALLDIR%\bin\cl.exe" /Zi /nologo demo_driver15.c demo_test15_lifted.obj
+clang -target i386-pc-win32 -O3 -m32 -c -o demo15_bc.obj demo_test15.bc
+clang -target i386-pc-win32 -O3 -m32 -c -o demo15_asm.obj ..\..\drivers\PE_32_windows.asm
+cl /Zi /nologo demo_driver15.c demo15_bc.obj demo15_asm.obj
+
 demo_driver15.exe


Delete gradlew.bat

Delete gradlew.bat

--- gradlew.bat
+++ gradlew.bat
@@ -1,84 +0,0 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega


Adds 64-bit windows CATs script

Adds 64-bit windows CATs script

error: pathspec 'ci/scripts/herd-cats-windows64.bat' did not match any file(s) known to git

--- ci/scripts/herd-cats-windows64.bat
+++ ci/scripts/herd-cats-windows64.bat
@@ -0,0 +1,17 @@
+git submodule update --init
+
+SET CLIPATH=c:\jenkins\workspace\go-cli-tests-windows64Bit
+SET GOPATH=%CLIPATH%
+c:\Go\bin\go build -v -o cf-windows-amd64.exe main
+
+SET GOPATH=c:\Users\Administrator\go
+SET CATSPATH=%GOPATH%\src\github.com\cloudfoundry\cf-acceptance-tests
+copy %CLIPATH%\cf-windows-amd64.exe %CATSPATH%\gcf.exe /Y
+
+SET PATH=%PATH%;%CATSPATH%;C:\Program Files\cURL\bin
+
+call %environment.bat
+
+cd %CATSPATH%
+SET CONFIG=%CATSPATH%\config.json
+%GOPATH%\bin\ginkgo -r -v -slowSpecThreshold=300 -skip="admin buildpack"


update windows build script

update windows build script

--- dist/win/build.bat
+++ dist/win/build.bat
@@ -2,6 +2,7 @@
 cd ..\..\
 qmake track-o-bot.pro
 nmake clean
+del build\Track-o-Bot.exe
 nmake release

 iscc dist/win/setup.iss


ARROW-15378: [C++][Release] GTest linking error during windows verification

Uninstall gtest and gmock from conda to prevent conflicts with the bundled counterpart.

Closes #12202 from kszucs/ARROW-15378

Authored-by: Krisztián Szűcs <6bab32dc957a05a87930e779f272342e159326fa@gmail.com>
Signed-off-by: Krisztián Szűcs <6bab32dc957a05a87930e779f272342e159326fa@gmail.com>

--- dev/release/verify-release-candidate.bat
+++ dev/release/verify-release-candidate.bat
@@ -49,6 +49,10 @@
     || exit /B 1

 call activate %_VERIFICATION_CONDA_ENV% || exit /B 1
+
+@rem With MSVC we always bundle a more recent GTest which causes a link conflict
+@rem for more context, see https://issues.apache.org/jira/browse/ARROW-15378
+call conda remove -y gtest gmock || exit /B 1

 set GENERATOR=Visual Studio 15 2017 Win64
 set CONFIGURATION=release


Change build script after moving DMLib to VS2017

--- netcore/Build.cmd
+++ netcore/Build.cmd
@@ -1,4 +1,3 @@
-echo off

 set BuildMode=Debug
 if not {%1} == {} (
@@ -11,8 +10,7 @@
 "%ProgramFiles(x86)%\MSBuild\14.0\Bin\msbuild" %TestPath%\DMLibTestCodeGen\DMLibTestCodeGen.csproj /t:Rebuild /p:Configuration=%BuildMode% >NUL
 %TestPath%\DMLibTestCodeGen\bin\Debug\DMLibTestCodeGen.exe %TestPath%\DMLibTest\bin\Debug\DMLibTest.dll %TestPath%\DMLibTest\Generated DNetCore

-cd %~dp0
-dotnet restore -s https://www.nuget.org/api/v2/
+dotnet restore -s https://www.nuget.org/api/v2/ %~dp0\DMLibTest
 cd %~dp0\Microsoft.WindowsAzure.Storage.DataMovement
 dotnet build -c %BuildMode%
 cd %~dp0\MsTestLib


convert: Add Windows batch file.

convert: Add Windows batch file.

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

--- convert.bat
+++ convert.bat
@@ -0,0 +1,2 @@
+REM Usage: convert.bat <infile> <outfile> <timestamp>
+ffmpeg -i %1 -ss %3 -t 60.5 -c:v h264 -tune film -crf 15 -c:a mp3 -b:a 320k -ac 2 %2


Fix from stable branch.

Fix from stable branch.

--- ms/test.bat
+++ ms/test.bat
@@ -1,195 +1,189 @@
-@echo off
-
-set test=..\ms
-set opath=%PATH%
-PATH=..\ms;%PATH%
-set OPENSSL_CONF=..\apps\openssl.cnf
-
-rem run this from inside the bin directory
-
-echo rsa_test
-rsa_test
-if errorlevel 1 goto done
-
-echo destest
-destest
-if errorlevel 1 goto done
-
-echo ideatest
-ideatest
-if errorlevel 1 goto done
-
-echo bftest
-bftest
-if errorlevel 1 goto done
-
-echo shatest
-shatest
-if errorlevel 1 goto done
-
-echo sha1test
-sha1test
-if errorlevel 1 goto done
-
-echo md5test
-md5test
-if errorlevel 1 goto done
-
-echo md2test
-md2test
-if errorlevel 1 goto done
-
-echo rc2test
-rc2test
-if errorlevel 1 goto done
-
-echo rc4test
-rc4test
-if errorlevel 1 goto done
-
-echo randtest
-randtest
-if errorlevel 1 goto done
-
-echo dhtest
-dhtest
-if errorlevel 1 goto done
-
-echo exptest
-exptest
-if errorlevel 1 goto done
-
-echo dsatest
-dsatest
-if errorlevel 1 goto done
-
-echo ectest
-ectest
-if errorlevel 1 goto done
-
-echo testenc
-call %test%\testenc openssl
-if errorlevel 1 goto done
-
-echo testpem
-call %test%\testpem openssl
-if errorlevel 1 goto done
-
-echo verify
-copy ..\certs\*.pem cert.tmp >nul
-openssl verify -CAfile cert.tmp ..\certs\*.pem
-
-echo testss
-call %test%\testss openssl
-if errorlevel 1 goto done
-
-set SSL_TEST=ssltest -key keyU.ss -cert certU.ss -c_key keyU.ss -c_cert certU.ss -CAfile certCA.ss
-
-echo test sslv2
-ssltest -ssl2
-if errorlevel 1 goto done
-
-echo test sslv2 with server authentication
-%SSL_TEST% -ssl2 -server_auth
-if errorlevel 1 goto done
-
-echo test sslv2 with client authentication
-%SSL_TEST% -ssl2 -client_auth
-if errorlevel 1 goto done
-
-echo test sslv2 with both client and server authentication
-%SSL_TEST% -ssl2 -server_auth -client_auth
-if errorlevel 1 goto done
-
-echo test sslv3
-ssltest -ssl3
-if errorlevel 1 goto done
-
-echo test sslv3 with server authentication
-%SSL_TEST% -ssl3 -server_auth
-if errorlevel 1 goto done
-
-echo test sslv3 with client authentication
-%SSL_TEST% -ssl3 -client_auth
-if errorlevel 1 goto done
-
-echo test sslv3 with both client and server authentication
-%SSL_TEST% -ssl3 -server_auth -client_auth
-if errorlevel 1 goto done
-
-echo test sslv2/sslv3
-ssltest
-if errorlevel 1 goto done
-
-echo test sslv2/sslv3 with server authentication
-%SSL_TEST% -server_auth
-if errorlevel 1 goto done
-
-echo test sslv2/sslv3 with client authentication
-%SSL_TEST% -client_auth
-if errorlevel 1 goto done
-
-echo test sslv2/sslv3 with both client and server authentication
-%SSL_TEST% -server_auth -client_auth
-if errorlevel 1 goto done
-
-echo test sslv2 via BIO pair
-ssltest -bio_pair -ssl2
-if errorlevel 1 goto done
-
-echo test sslv2/sslv3 with 1024 bit DHE via BIO pair
-ssltest -bio_pair -dhe1024dsa -v
-if errorlevel 1 goto done
-
-echo test sslv2 with server authentication via BIO pair
-%SSL_TEST% -bio_pair -ssl2 -server_auth
-if errorlevel 1 goto done
-
-echo test sslv2 with client authentication via BIO pair
-%SSL_TEST% -bio_pair -ssl2 -client_auth
-if errorlevel 1 goto done
-
-echo test sslv2 with both client and server authentication via BIO pair
-%SSL_TEST% -bio_pair -ssl2 -server_auth -client_auth
-if errorlevel 1 goto done
-
-echo test sslv3 via BIO pair
-ssltest -bio_pair -ssl3
-if errorlevel 1 goto done
-
-echo test sslv3 with server authentication via BIO pair
-%SSL_TEST% -bio_pair -ssl3 -server_auth
-if errorlevel 1 goto done
-
-echo test sslv3 with client authentication  via BIO pair
-%SSL_TEST% -bio_pair -ssl3 -client_auth
-if errorlevel 1 goto done
-
-echo test sslv3 with both client and server authentication via BIO pair
-%SSL_TEST% -bio_pair -ssl3 -server_auth -client_auth
-if errorlevel 1 goto done
-
-echo test sslv2/sslv3 via BIO pair
-ssltest -bio_pair
-if errorlevel 1 goto done
-
-echo test sslv2/sslv3 with server authentication
-%SSL_TEST% -bio_pair -server_auth
-if errorlevel 1 goto done
-
-echo test sslv2/sslv3 with client authentication via BIO pair
-%SSL_TEST% -bio_pair -client_auth
-if errorlevel 1 goto done
-
-echo test sslv2/sslv3 with both client and server authentication via BIO pair
-%SSL_TEST% -bio_pair -server_auth -client_auth
-if errorlevel 1 goto done
-
-del cert.tmp
-
-echo passed all tests
-goto end
-:done
-echo problems.....
-:end
-PATH=%opath%
+@echo off
+
+set test=..\ms
+set opath=%PATH%
+PATH=..\ms;%PATH%
+set OPENSSL_CONF=..\apps\openssl.cnf
+
+rem run this from inside the bin directory
+
+echo rsa_test
+rsa_test
+if errorlevel 1 goto done
+
+echo destest
+destest
+if errorlevel 1 goto done
+
+echo ideatest
+ideatest
+if errorlevel 1 goto done
+
+echo bftest
+bftest
+if errorlevel 1 goto done
+
+echo shatest
+shatest
+if errorlevel 1 goto done
+
+echo sha1test
+sha1test
+if errorlevel 1 goto done
+
+echo md5test
+md5test
+if errorlevel 1 goto done
+
+echo md2test
+md2test
+if errorlevel 1 goto done
+
+echo rc2test
+rc2test
+if errorlevel 1 goto done
+
+echo rc4test
+rc4test
+if errorlevel 1 goto done
+
+echo randtest
+randtest
+if errorlevel 1 goto done
+
+echo dhtest
+dhtest
+if errorlevel 1 goto done
+
+echo exptest
+exptest
+if errorlevel 1 goto done
+
+echo dsatest
+dsatest
+if errorlevel 1 goto done
+
+echo ectest
+ectest
+if errorlevel 1 goto done
+
+echo testenc
+call %test%\testenc openssl
+if errorlevel 1 goto done
+
+echo testpem
+call %test%\testpem openssl
+if errorlevel 1 goto done
+
+echo testss
+call %test%\testss openssl
+if errorlevel 1 goto done
+
+set SSL_TEST=ssltest -key keyU.ss -cert certU.ss -c_key keyU.ss -c_cert certU.ss -CAfile certCA.ss
+
+echo test sslv2
+ssltest -ssl2
+if errorlevel 1 goto done
+
+echo test sslv2 with server authentication
+%SSL_TEST% -ssl2 -server_auth
+if errorlevel 1 goto done
+
+echo test sslv2 with client authentication
+%SSL_TEST% -ssl2 -client_auth
+if errorlevel 1 goto done
+
+echo test sslv2 with both client and server authentication
+%SSL_TEST% -ssl2 -server_auth -client_auth
+if errorlevel 1 goto done
+
+echo test sslv3
+ssltest -ssl3
+if errorlevel 1 goto done
+
+echo test sslv3 with server authentication
+%SSL_TEST% -ssl3 -server_auth
+if errorlevel 1 goto done
+
+echo test sslv3 with client authentication
+%SSL_TEST% -ssl3 -client_auth
+if errorlevel 1 goto done
+
+echo test sslv3 with both client and server authentication
+%SSL_TEST% -ssl3 -server_auth -client_auth
+if errorlevel 1 goto done
+
+echo test sslv2/sslv3
+ssltest
+if errorlevel 1 goto done
+
+echo test sslv2/sslv3 with server authentication
+%SSL_TEST% -server_auth
+if errorlevel 1 goto done
+
+echo test sslv2/sslv3 with client authentication
+%SSL_TEST% -client_auth
+if errorlevel 1 goto done
+
+echo test sslv2/sslv3 with both client and server authentication
+%SSL_TEST% -server_auth -client_auth
+if errorlevel 1 goto done
+
+echo test sslv2 via BIO pair
+ssltest -bio_pair -ssl2
+if errorlevel 1 goto done
+
+echo test sslv2/sslv3 with 1024 bit DHE via BIO pair
+ssltest -bio_pair -dhe1024dsa -v
+if errorlevel 1 goto done
+
+echo test sslv2 with server authentication via BIO pair
+%SSL_TEST% -bio_pair -ssl2 -server_auth
+if errorlevel 1 goto done
+
+echo test sslv2 with client authentication via BIO pair
+%SSL_TEST% -bio_pair -ssl2 -client_auth
+if errorlevel 1 goto done
+
+echo test sslv2 with both client and server authentication via BIO pair
+%SSL_TEST% -bio_pair -ssl2 -server_auth -client_auth
+if errorlevel 1 goto done
+
+echo test sslv3 via BIO pair
+ssltest -bio_pair -ssl3
+if errorlevel 1 goto done
+
+echo test sslv3 with server authentication via BIO pair
+%SSL_TEST% -bio_pair -ssl3 -server_auth
+if errorlevel 1 goto done
+
+echo test sslv3 with client authentication  via BIO pair
+%SSL_TEST% -bio_pair -ssl3 -client_auth
+if errorlevel 1 goto done
+
+echo test sslv3 with both client and server authentication via BIO pair
+%SSL_TEST% -bio_pair -ssl3 -server_auth -client_auth
+if errorlevel 1 goto done
+
+echo test sslv2/sslv3 via BIO pair
+ssltest -bio_pair
+if errorlevel 1 goto done
+
+echo test sslv2/sslv3 with server authentication
+%SSL_TEST% -bio_pair -server_auth
+if errorlevel 1 goto done
+
+echo test sslv2/sslv3 with client authentication via BIO pair
+%SSL_TEST% -bio_pair -client_auth
+if errorlevel 1 goto done
+
+echo test sslv2/sslv3 with both client and server authentication via BIO pair
+%SSL_TEST% -bio_pair -server_auth -client_auth
+if errorlevel 1 goto done
+
+echo passed all tests
+goto end
+:done
+echo problems.....
+:end
+PATH=%opath%


configure.bat adjustments ~nb

configure.bat adjustments ~nb

--- configure.bat
+++ configure.bat
@@ -6,9 +6,9 @@
 SET CONFIG_LOG=config.log
 SET LAST_FUNC_RET=0

-del %PROJECT_ROOT%\config.in >>Nul
-del %PROJECT_ROOT%\config.log >>Nul
-del %PROJECT_ROOT%\depends.pri >>Nul
+if exist %PROJECT_ROOT%\config.in   del %PROJECT_ROOT%\config.in
+if exist %PROJECT_ROOT%\config.log  del %PROJECT_ROOT%\config.log
+if exist %PROJECT_ROOT%\depends.pri del %PROJECT_ROOT%\depends.pri

 echo #depends.pri > %PROJECT_ROOT%\depends.pri

@@ -159,78 +159,95 @@
 goto end

 :qmakeOK
+if "%QMAKESPEC%" == "win32-msvc"     goto testnmake
+if "%QMAKESPEC%" == "win32-msvc.net" goto testnmake
+if "%QMAKESPEC%" == "win32-msvc2005" goto testnmake
+
+:testmingw
+echo    Testing for mingw32-make...
+call mingw32-make -v >> %PROJECT_ROOT%\%CONFIG_LOG%
+if errorlevel 1 goto testnmake
+echo        Using mingw32-make.
+SET MAKE=mingw32-make
+GOTO detectTools_end_test_make
+
+:testnmake
+if "%QMAKESPEC%" == "win32-g++"     goto testgmake
 echo    Testing for nmake...
-nmake /? >> %PROJECT_ROOT%\%CONFIG_LOG%
-if errorlevel 1 goto nmakeERR
-echo    Using nmake.
+call nmake /? >> %PROJECT_ROOT%\%CONFIG_LOG%
+if errorlevel 1 goto testgmake
+echo        Using nmake.
 SET MAKE=nmake
 GOTO detectTools_end_test_make

-:nmakeERR
+:testgmake
 echo    Testing for GNU make...
-make -v >> %PROJECT_ROOT%\%CONFIG_LOG%
-if errorlevel 1 goto gmakeERR
-echo    Using GNU make.
+call make -v >> %PROJECT_ROOT%\%CONFIG_LOG%
+if errorlevel 1 goto missingmake
+echo        Using GNU make.
 SET MAKE=make
 GOTO detectTools_end_test_make
-
-:gmakeERR
-echo    Testing for mingw32-make...
-mingw32-make -v >> %PROJECT_ROOT%\%CONFIG_LOG%
-if errorlevel 1 goto mingwmakeERR
-echo    Using mingw32-make.
-SET MAKE=mingw32-make
-GOTO detectTools_end_test_make

-:mingwmakeERR
-echo    You don't seem to have 'make.' 'mingw32-make,' or 'nmake' in your PATH.
+:missingmake
+echo    You don't seem to have 'mingw32-make', 'nmake' or 'make' in your PATH.
 echo    Cannot proceed.
 goto end

 :detectTools_end_test_make
-if "%OPENSSL%"=="0" goto skipopenssltest
-echo Testing for OpenSSL...
+if "%OPENSSL%"=="0" goto detectcurses
+echo    Testing for OpenSSL...
 echo OpenSSL... >> %PROJECT_ROOT%\%CONFIG_LOG%
 cd %TESTDIR%\openssl
 %QMAKE% >> %PROJECT_ROOT%\%CONFIG_LOG%
-if errorlevel 1 goto testfailed
-%MAKE% clean >> %PROJECT_ROOT%\%CONFIG_LOG%
-%MAKE% >> %PROJECT_ROOT%\%CONFIG_LOG%
-if errorlevel 1 goto testfailed
-
-:skipopenssltest
+if errorlevel 1 goto opensslfailed
+call %MAKE% clean >> %PROJECT_ROOT%\%CONFIG_LOG%
+call %MAKE% >> %PROJECT_ROOT%\%CONFIG_LOG%
+if errorlevel 1 goto opensslfailed
+set OPENSSL=1
+goto detectcurses
+
+:opensslfailed
+set OPENSSL=0
+echo QXT_LIBS -= openssl >> %PROJECT_ROOT%\config.in
+
+:detectcurses
 if "%CURSES%"=="0" goto skipcursestest
-echo Testing for curses...
+echo    Testing for curses...
 echo curses... >> %PROJECT_ROOT%\%CONFIG_LOG%
 cd %TESTDIR%\curses
 %QMAKE% >> %PROJECT_ROOT%\%CONFIG_LOG%
-if errorlevel 1 goto testfailed
-%MAKE% clean >> %PROJECT_ROOT%\%CONFIG_LOG%
-%MAKE% >> %PROJECT_ROOT%\%CONFIG_LOG%
-if errorlevel 1 goto testfailed
-
+if errorlevel 1 goto cursesfailed
+call %MAKE% clean >> %PROJECT_ROOT%\%CONFIG_LOG%
+call %MAKE% >> %PROJECT_ROOT%\%CONFIG_LOG%
+if errorlevel 1 goto cursesfailed
+set CURSES=1
 goto alltestsok

-:testfailed
-echo Test failed. Cannot proceed.
-goto end
+:cursesfailed
+set CURSES=0
+echo QXT_BUILD -= curses >> %PROJECT_ROOT%\config.in

 :skipcursestest
 :alltestsok
 cd %PROJECT_ROOT%

-echo Configuration successful. Generating makefiles.
+echo    Configuration successful.
+if "%OPENSSL%"=="1" echo        OpenSSL enabled.
+if "%OPENSSL%"=="0" echo        OpenSSL disabled.
+if "%CURSES%"=="1"  echo        curses enabled.
+if "%CURSES%"=="0"  echo        curses disabled.
+echo    Generating makefiles...
 copy %PROJECT_ROOT%\config.pri %PROJECT_ROOT%\config.pri.bak >> %PROJECT_ROOT%\%CONFIG_LOG%
 copy %PROJECT_ROOT%\config.in %PROJECT_ROOT%\config.pri >> %PROJECT_ROOT%\%CONFIG_LOG%
 del %PROJECT_ROOT%\config.in >> %PROJECT_ROOT%\%CONFIG_LOG%
 %QMAKE% %MSVCMODE% -recursive
 if errorlevel 1 goto mainqmakeERR

-echo Makefiles generated. Run %MAKE% now.
+echo    Makefiles generated. Run %MAKE% now.
 goto end

 :mainqmakeERR
-echo Error running qmake. Cannot proceed.
+echo    Error running qmake. Cannot proceed.
 goto end

 :end


symbian: fixup commit 8302e4867fabee556f9ef55e5d4223240b77893d

Task-number:MOBILITY-1173 MOBILITY-1069

--- configure.bat
+++ configure.bat
@@ -63,6 +63,15 @@
 set QT_PATH=
 set QMAKE_CACHE=%BUILD_PATH%\.qmake.cache

+REM We use these variables to indicate which modules are selected
+REM They are used for example to see which modules need config.tests built
+set CONTACTS_SELECTED=yes
+set BEARER_SELECTED=yes
+set SYSTEMINFO_SELECTED=yes
+set SENSORS_SELECTED=yes
+set MESSAGING_SELECTED=yes
+set MULTIMEDIA_SELECTED=yes
+set LOCATION_SELECTED=yes
 if exist "%QMAKE_CACHE%" del /Q %QMAKE_CACHE%
 if exist "%PROJECT_LOG%" del /Q %PROJECT_LOG%
 if exist "%PROJECT_CONFIG%" del /Q %PROJECT_CONFIG%
@@ -247,13 +256,13 @@
 REM reset default modules as we expect a modules list
 set MOBILITY_MODULES=

-REM reset selected modules
 set CONTACTS_SELECTED=
 set BEARER_SELECTED=
 set SYSTEMINFO_SELECTED=
 set SENSORS_SELECTED=
 set MESSAGING_SELECTED=
 set MULTIMEDIA_SELECTED=
+set LOCATION_SELECTED=
 echo Checking selected modules:
 :modulesTag2

@@ -272,6 +281,7 @@
     set CONTACTS_SELECTED=yes
 ) else if %FIRST% == location (
     echo     Location selected
+    set LOCATION_SELECTED=yes
 ) else if %FIRST% == messaging (
     echo     Messaging selected
     set MESSAGING_SELECTED=yes
@@ -505,7 +515,6 @@
     call :compileTest Surfaces_s60 surfaces_s60
 )
 if "%CONTACTS_SELECTED%" == "yes" (
-    call :compileTest LBT lbt
     call :compileTest SymbianContactSIM symbiancntsim
 )
 if "%BEARER_SELECTED%" == "yes" (
@@ -522,7 +531,9 @@
 if "%SYSTEMINFO_SELECTED%" == "yes" (
     call :compileTest Symbian_Hb hb_symbian
 )
-
+if "%LOCATION_SELECTED%" == "yes" (
+    call :compileTest LBT lbt
+)
 :noTests

 echo End of compile tests
@@ -620,6 +631,13 @@
 SET REMAINING=
 SET FIRST=
 SET MODULES_TEMP=
+set CONTACTS_SELECTED=
+set BEARER_SELECTED=
+set SYSTEMINFO_SELECTED=
+set SENSORS_SELECTED=
+set MESSAGING_SELECTED=
+set MULTIMEDIA_SELECTED=
+set LOCATION_SELECTED=
 exit /b 1

 :exitTag
@@ -637,4 +655,11 @@
 SET REMAINING=
 SET FIRST=
 SET MODULES_TEMP=
+set CONTACTS_SELECTED=
+set BEARER_SELECTED=
+set SYSTEMINFO_SELECTED=
+set SENSORS_SELECTED=
+set MESSAGING_SELECTED=
+set MULTIMEDIA_SELECTED=
+set LOCATION_SELECTED=
 exit /b 0


Revert "Fix CRLF issue"

Revert "Fix CRLF issue"

This reverts commit 95619230c7b6007e4c17cc2bbc751a24d564ab07.

--- support/win32/titanium.bat
+++ support/win32/titanium.bat
@@ -1,14 +1,14 @@
-@echo off
-
-set pythonPath=
-call findpython.bat
-
-if ()==(%pythonPath%) goto NoPython
-
-"%pythonPath%" "%~dp0titanium.py" %*
-goto Exit
-
-:NoPython
-exit /b 1
-
+@echo off
+
+set pythonPath=
+call findpython.bat
+
+if ()==(%pythonPath%) goto NoPython
+
+"%pythonPath%" "%~dp0titanium.py" %*
+goto Exit
+
+:NoPython
+exit /b 1
+
 :Exit


Make the Maven wrapper call mvn.cmd and fall back to mvn.bat

Starting with Maven 3.3.1, mvn.bat was replaced with mvn.cmd. So try the
more modern .cmd first, and use the .bat only as a fall-back.

This also fixes the issue that arguments to mvnw were not properly passed
to mvn.

--- features/fixtures/maven-wrapper/mvnw.cmd
+++ features/fixtures/maven-wrapper/mvnw.cmd
@@ -1 +1,7 @@
-@call mvn.bat
+@echo off
+where /q mvn.cmd
+if %ERRORLEVEL% equ 0 (
+    mvn.cmd %*
+) else (
+    mvn.bat %*
+)


Delete relink.bat

Delete relink.bat

--- relink.bat
+++ relink.bat
@@ -1,12 +0,0 @@
-set ROOT=C:\Users\nguye\Documents\Programming\Working
-
-del %ROOT%\ApplicationProjects\MedicareProvidersSearch\MedicareProvidersSearch\Scripts\Medicare.js
-mklink %ROOT%\ApplicationProjects\MedicareProvidersSearch\MedicareProvidersSearch\Scripts\Medicare.js %ROOT%\NeoMedix\Trabectome\Scripts\Site\Medicare.js
-
-del %ROOT%\ApplicationProjects\MedicareProvidersSearch\MedicareProvidersSearch\Controllers\MedicareController.cs
-mklink %ROOT%\ApplicationProjects\MedicareProvidersSearch\MedicareProvidersSearch\Controllers\MedicareController.cs %ROOT%\NeoMedix\System.Controllers\MedicareController.cs
-
-del %ROOT%\ApplicationProjects\MedicareProvidersSearch\MedicareProvidersSearch\Views\Medicare
-mklink /D %ROOT%\ApplicationProjects\MedicareProvidersSearch\MedicareProvidersSearch\Views\Medicare %ROOT%\NeoMedix\Trabectome\Views\Medicare
-
-pause


Force depot_tools to be in the PATH before /usr/bin in cygwin.
Review URL: http://codereview.chromium.org/113208

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

--- gclient.bat
+++ gclient.bat
@@ -6,6 +6,10 @@
 :: This file is a stub to sync .\bootstrap first and defer control to
 :: .\bootstrap\gclient.bat, which will sync back '.'. This is unless auto
 :: update is disabled, were gclient.py is directly called.
+setlocal
+
+:: This is required with cygwin only.
+PATH=%~dp0;%PATH%

 :: Shall skip automatic update?
 IF "%DEPOT_TOOLS_UPDATE%" == "0" GOTO :SKIP_UPDATE


Initial conversion of packaging script.

Initial conversion of packaging script.

This is still a rough script to package up BTM in preparation for its
sharing on ArcGIS Online, and as a GitHub release. It still doesn't do
many of the things we'd like it to do, such as handling Git tagging, but
it's a starting point and produces consistent builds.

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

--- package.bat
+++ package.bat
@@ -0,0 +1,84 @@
+@echo off
+REM build and ship a new release of the software
+REM tools required: git, pandoc, zip, unzip. To install:
+REM   choco install -y git pandoc zip unzip
+REM then start from within a command prompt session.
+
+REM TODO: make this more generic and less tied to BTM exclusively and to
+REM promote reuse for other projects.
+
+REM run the build script build
+echo Building code...
+call build
+
+REM tag the resulting version with a new tag
+REM TODO: inspect the current tag list to set the version.
+REM TODO: update the config.xml
+REM the tag version should be named 'v$MAJOR.$MINOR{-$subversion}'.
+REM There is also version parsing code in the python stdlib I believe.
+set PROJECT=btm
+set VERSION=3.0-final
+set RELEASE_BASE=../btm-release
+set RELEASE_NAME=%PROJECT%-%VERSION%
+set RELEASE_DIR="%RELEASE_BASE%/%RELEASE_NAME%"
+set RELEASE_ARCHIVE=%RELEASE_NAME%.zip
+
+if EXIST %RELEASE_DIR% (
+    rmdir /q /s %RELEASE_DIR%
+)
+mkdir %RELEASE_DIR%
+
+echo Copying resources...
+REM copy in our addin compiled with makeaddin.py (run within build.bat)
+set closed=n
+set /p closed=Is the add-in installed or otherwise closed? (y/N)
+if "%closed%" == "y" (
+    copy ..\btm.esriaddin %RELEASE_DIR% > nul
+) else (
+  echo Can't build add-in when currently in-use.
+  exit /b
+)
+
+REM export the 'clean repository' to get rid of anything which is git ignored
+REM using third-party git-archive-all, otherwise we miss the datatypes submodule
+REM NOTE: currently requires build from Git, see https://github.com/Kentzo/git-archive-all/issues/33
+echo Build Git archive...
+git-archive-all tmp.zip
+echo Extracting archive...
+unzip -q tmp.zip
+
+REM copy in our toolbox elements to the release so it's usable from the
+REM catalog view.
+echo Add toolbox to archive...
+xcopy tmp\Install\toolbox %RELEASE_DIR% /e /q
+rmdir /q /s tmp
+del tmp.zip
+
+REM add tutorial and data; skip hidden
+echo Add tutorial and tutorial data...
+set TUTORIAL_DIR=%RELEASE_DIR%\tutorial
+mkdir %TUTORIAL_DIR%
+copy ..\btm-tutorial\*.pdf %TUTORIAL_DIR% > nul
+xcopy ..\btm-tutorial\sample_data %TUTORIAL_DIR% /q
+
+REM Add readme, plain and HTML
+echo Converting documentation to HTML...
+copy README.md %RELEASE_DIR%\README.txt > nul
+pandoc -t html README.md > %RELEASE_DIR%\README.html
+
+echo Re-creating archive...
+REM compress result
+set repo_dir=%cd%
+cd %RELEASE_BASE%
+if EXIST %RELEASE_ARCHIVE% (
+    del %RELEASE_ARCHIVE%
+)
+set RELEASE_ABS=%cd%
+zip -qr9 %RELEASE_ARCHIVE% %RELEASE_NAME%
+echo Completed build for %RELEASE_NAME%, archive: %RELEASE_ABS%\%RELEASE_ARCHIVE%
+REM rename to meet asinine limitation
+copy %RELEASE_ARCHIVE% "btm-3.0-beta.zip"
+cd %repo_dir%
+
+REM TODO: tag the resulting version with a new tag
+REM git tag -a v${VERSION} -m '3.0 release candidate 1'


whitespace

whitespace

--- install.bat
+++ install.bat
@@ -9,8 +9,8 @@
   echo Please specify Visual Studio version, e.g., 2017
   goto exit
 ) else (
-	echo Using version %1
-	set "D=%userprofile%\Documents\Visual Studio %1\Templates\ProjectTemplates"
+  echo Using version %1
+  set "D=%userprofile%\Documents\Visual Studio %1\Templates\ProjectTemplates"
 )

 set "F=%TEMP%\Revit2023AddinWizardCs0.zip"


minor textual fixes

minor textual fixes

--- install.bat
+++ install.bat
@@ -97,7 +97,7 @@
 	return exec("net session >NUL 2>&1") -- fails if not admin
 end

--- rename file (full path) to backup (name only), appending number if required
+-- rename filename (full path) to backupname (name only), appending number if required
 -- returns the new name (name only)
 local function backup(filename, backupname)
 	local path = filename:match("(.+)%\\.-$").."\\"
@@ -255,7 +255,7 @@
 			die("Cannot combine option /L with any of /LUA /BIN /LIB /INC")
 		end
 		if vars.LUA_VERSION ~= "5.1" then
-			die("Bundled Lua version is 5.1, cannot install 5.2")
+			die("Bundled Lua version is 5.1, cannot install "..vars.LUA_VERSION)
 		end
 	end
 	if vars.LUA_VERSION ~= "5.1" then


add install bat

add install bat

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

--- install.bat
+++ install.bat
@@ -0,0 +1,3 @@
+mklink %HOMEPATH%"\Documents\maya\plug-ins\Rush.py" %HOMEPATH%%"\Documents\maya\2017\scripts\rush\plug-ins\Rush.py"
+
+exit 0


added option to build the web installation wizard to the build menu

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

@@ -34,6 +35,7 @@
 if %input%==2 goto OPTION2
 if %input%==3 goto OPTION3
 if %input%==4 goto OPTION4
+if %input%==5 goto OPTION5
 IF %input%==x goto QUIT
 goto SHOWMENU

@@ -62,6 +64,13 @@

 :OPTION4
     echo.
+    echo Building "web" Installation Wizard
+    echo.
+    call bin\nant\bin\nant.exe -buildfile:build.xml compile-wpnxm-webinstaller-setup
+goto END
+
+:OPTION5
+    echo.
     echo Building the "Server-Control-Panel" (Tray Application)
     echo.
     call bin\nant\bin\nant.exe -buildfile:build.xml build-server-control-panel


SCCS cproto_all.bat 10/04/29 00:18:56: date and time created 10/04/29 00:18:56 by neo

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

--- run/cproto_all.bat
+++ run/cproto_all.bat
@@ -0,0 +1,33 @@
+@echo off
+set files=%1
+set files=%files:~1,-1%
+
+set tempfile=TEMP.PROTO.c
+
+echo.
+echo *** Generating prototypes ***
+echo %files%
+echo.
+
+rem Run a preprocessor.
+sh ppp -D MAKE_PROTOTYPES -I "%2" %files% >%tempfile%
+
+rem cl /nologo /E /DMAKE_PROTOTYPES /I "%2" %files% >%tempfile%
+rem mkptypes -A TEMP.PROTO.C
+
+rem remove Windows line breaks
+rem sed -e "s/\r//g" < %tempfile% >%tempfile%.1
+sh dos_to_unix %tempfile% %tempfile%.1
+move %tempfile%.1 %tempfile%
+
+rem run mkproto
+echo /* >%3
+echo  * This file was automatically generated with mkproto >>%3
+echo  *      MANUAL EDITING IS NOT RECOMMENDED! >>%3
+echo  */ >>%3
+echo. >>%3
+sh mkproto %4 %tempfile% >>%3
+
+rem Delete Temporary file
+del %tempfile%
+rem cproto %4 -DMAKE_PROTOTYPES -I %2 %files% >TEMP.PROTO1.c


Update for Travis CI integration

Update for Travis CI integration

--- gradlew.bat
+++ gradlew.bat
@@ -1,84 +0,0 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega


open_c/build_sources.cmd: fixed whitespace

darcs-hash:20081127232829-db55f-36648bed0d993a081e49f0a6501aa4a4f4f7ba0b.gz

--- open_c/build_sources.cmd
+++ open_c/build_sources.cmd
@@ -67,7 +67,7 @@
    TEMPLATE1=%PR2%.in ^
    TEMPLATE2=%PR3%.in ^
    TEMPLATE3=%PR4%.in ^
-   TEMPLATE=%PR5%.in %SIPEXTRA% < NUL
+   TEMPLATE=%PR5%.in %SIPEXTRA% < NUL
 %CHECK%

 %AWK_SIP_AWK% PT=%PT% TEMPLATE=%PT%.in ^


Aditional imptovemnets in doItAll.bat script

--- doItAll.bat
+++ doItAll.bat
@@ -2,7 +2,7 @@

 SETLOCAL EnableDelayedExpansion

-SET supportedInputArguments=;repo;branch;destinationFolder;recursive;prepare;publish;publishDestination;nugetTarget;nugetVersion;nugetDestination;prerelease;pack;packDestination;help;logLevel;
+SET supportedInputArguments=;repo;branch;destinationFolder;recursive;prepare;publish;publishDestination;nugetTarget;nugetVersion;nugetDestination;prerelease;pack;packDestination;help;logLevel;noClone;
 SET repo=https://github.com/ortclib/ortclib-sdk.git
 SET branch=master
 SET destinationFolder=""
@@ -18,6 +18,7 @@
 SET packDestination=""
 SET help=0
 SET logLevel=2
+SET noClone=0

 SET globalLogLevel=2
 SET error=0
@@ -47,7 +48,7 @@
 		GOTO:main
 	)
 )
-SET aux=%1
+SET aux=%~1
 IF "%aux:~0,1%"=="-" (
 	IF NOT "%nome%"=="" (
 		SET "%nome%=1"
@@ -70,7 +71,9 @@

 :main

-CALL:clone
+SET startTime=%time%
+
+IF %noClone% EQU 0 CALL:clone

 CALL:prepare

@@ -249,6 +252,8 @@
 	CALL:print %error% "FAILURE: Process has failed!"
 	ECHO.
 	POPD
+	SET endTime=%time%
+	CALL:showTime
 	::terminate batch execution
 	CALL:terminate
 )
@@ -270,7 +275,37 @@
 popd
 exit /b
 GOTO:EOF
+
+:showTime
+
+SET options="tokens=1-4 delims=:.,"
+FOR /f %options% %%a in ("%startTime%") do SET start_h=%%a&SET /a start_m=100%%b %% 100&SET /a start_s=100%%c %% 100&SET /a start_ms=100%%d %% 100
+FOR /f %options% %%a in ("%endTime%") do SET end_h=%%a&SET /a end_m=100%%b %% 100&SET /a end_s=100%%c %% 100&SET /a end_ms=100%%d %% 100
+
+SET /a hours=%end_h%-%start_h%
+SET /a mins=%end_m%-%start_m%
+SET /a secs=%end_s%-%start_s%
+SET /a ms=%end_ms%-%start_ms%
+IF %ms% lss 0 SET /a secs = %secs% - 1 & SET /a ms = 100%ms%
+IF %secs% lss 0 SET /a mins = %mins% - 1 & SET /a secs = 60%secs%
+IF %mins% lss 0 SET /a hours = %hours% - 1 & SET /a mins = 60%mins%
+IF %hours% lss 0 SET /a hours = 24%hours%
+
+SET /a totalsecs = %hours%*3600 + %mins%*60 + %secs%
+
+IF 1%ms% lss 100 SET ms=0%ms%
+IF %secs% lss 10 SET secs=0%secs%
+IF %mins% lss 10 SET mins=0%mins%
+IF %hours% lss 10 SET hours=0%hours%
+
+:: mission accomplished
+ECHO Total time: %hours%:%mins%:%secs% (%totalsecs%s total)
+
+GOTO:EOF
+
 :DONE
 ECHO.
 CALL:print %info% "Success:  Everything is done"
+SET endTime=%time%
+CALL:showTime
 ECHO.


smallpt - batch file to run the tester

smallpt - batch file to run the tester

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

--- smallpt/RUN_ME.bat
+++ smallpt/RUN_ME.bat
@@ -0,0 +1,13 @@
+@echo off
+
+echo Tester for smallpt in SYCL
+del output.txt
+
+echo Starting sycl-gtx program, no OpenCL
+echo .\smallpt.exe 20 0 2 2>&1 | tee.exe -a output.txt
+
+echo Starting sycl-gtx program, OpenCL only
+.\smallpt.exe 20 2 2>&1 | tee.exe -a output.txt
+
+echo Starting ComputeCpp program
+.\smallpt-ccpp.exe 20 2>&1 | tee.exe -a output.txt


Updated winbuild.bat

Updated winbuild.bat

--- winbuild.bat
+++ winbuild.bat
@@ -1,33 +1,41 @@
+:: Find the latest Qt for Visual Studio 2013 installation
 for /d %%f in (C:\Qt\5.*) do (set QTDIR=%%f\msvc2013)
-set PATH=%PATH%;%QTDIR%\bin

-:build
+:: Set up PATH
+set PATH=%PATH%;"%QTDIR%\bin"
+set PATH=%PATH%;"%PROGRAMFILES(x86)%\CMake\bin"
+set PATH=%PATH%;"%PROGRAMFILES(x86)%\MSBuild\12.0\Bin"
+
+
+
+:prepare
 :: Delete old dist dir; the last thing we need is partial builds
 rmdir /s /q dist
 mkdir dist
 mkdir dist\KanColleTool

+
+
+:build
 :: Build everything
 cmake -G "Visual Studio 12 2013" .
-"C:\Program Files (x86)\MSBuild\12.0\Bin\MSBuild.exe" KanColleTool.sln /property:Configuration=Release
+MSBuild KanColleTool.sln /property:Configuration=Release
 xcopy tool\bin\Release\KanColleTool.exe dist\KanColleTool
 xcopy viewer\bin\Release\KCTViewer.exe dist\KanColleTool

-:: Build the tool
-:: -- Disabled for now
-:: cd tool
-:: lrelease src\src.pro
-:: xcopy translations\*.qm ..\dist\KanColleTool
-
 :package
-:: Copy MinGW32 DLLs that Qt doesn't catch automatically
-:: xcopy %QTDIR%\mingw48_32\bin\libgcc_s_dw2-1.dll dist\KanColleTool
-:: xcopy %QTDIR%\mingw48_32\bin\libstdc++-6.dll dist\KanColleTool
-:: xcopy %QTDIR%\mingw48_32\bin\libwinpthread-1.dll dist\KanColleTool
+:: Copy Visual Studio redistributables, and always the 32bit one
+if exist C:\Windows\SysWOW64 (
+	xcopy /q /y C:\Windows\SysWOW64\msvcp120.dll dist\KanColleTool
+	xcopy /q /y C:\Windows\SysWOW64\msvcr120.dll dist\KanColleTool
+) else (
+	xcopy /q /y C:\Windows\System32\msvcp120.dll dist\KanColleTool
+	xcopy /q /y C:\Windows\System32\msvcr120.dll dist\KanColleTool
+)

 :: Let Qt collect DLLs
-windeployqt.exe dist\KanColleTool\KCTViewer.exe
-windeployqt.exe dist\KanColleTool\KanColleTool.exe
+windeployqt dist\KanColleTool\KCTViewer.exe
+windeployqt dist\KanColleTool\KanColleTool.exe

 :: Delete things we don't need at all
 rmdir /s /q dist\KanColleTool\accessible
@@ -36,7 +44,10 @@
 rmdir /s /q dist\KanColleTool\mediaservice
 rmdir /s /q dist\KanColleTool\playlistformats
 rmdir /s /q dist\KanColleTool\printsupport
+rmdir /s /q dist\KanColleTool\position
 rmdir /s /q dist\KanColleTool\qmltooling
+rmdir /s /q dist\KanColleTool\sensorgestures
+rmdir /s /q dist\KanColleTool\sensors

 :: Delete debug versions of frameworks
 del /q dist\KanColleTool\bearer\*d.dll
@@ -48,4 +59,4 @@
 del /q dist\KanColleTool\sqldrivers\qsqlodbc*
 del /q dist\KanColleTool\sqldrivers\qsqlpsql*

-pause
+:: pause


Delete p6doc.bat, unneded with CURLI

Delete p6doc.bat, unneded with CURLI

In windows, at install time CURLI creates a bat file when needed, and this file results in an non-functional perl6 wrapper created in ..\\site\\bin.

--- bin/p6doc.bat
+++ bin/p6doc.bat
@@ -1,14 +0,0 @@
-@rem = '--*-Perl-*--
-@echo off
-if "%OS%" == "Windows_NT" goto WinNT
-perl6 "%~dp0\%0" %1 %2 %3 %4 %5 %6 %7 %8 %9
-goto endofperl
-:WinNT
-perl6 "%~dp0\%~n0" %*
-if NOT "%COMSPEC%" == "%SystemRoot%\system32\cmd.exe" goto endofperl
-if %errorlevel% == 9009 echo You do not have Perl in your PATH.
-if errorlevel 1 goto script_failed_so_exit_with_non_zero_val 2>nul
-goto endofperl
-@rem ';
-__END__
-:endofperl


Fixed the deobfuscator to provide fully decompilable deobs.

--- decompile_fernflower.bat
+++ decompile_fernflower.bat
@@ -1,3 +1,3 @@
 @echo off
-java -Xmx4g -jar ./deps/fernflower.jar output_750_basic.jar ./fernflower
+java -Xmx4g -jar ./deps/fernflower.jar output.jar ./fernflower
 pause


only copy test ap files if they've changed

--- build/run.cmd
+++ build/run.cmd
@@ -1,3 +1,2 @@
-copy /y testapp\Resources\* win32\test\Resources
-copy /y testapp\* win32\test\
+xcopy /s /i /y /d testapp\* win32\test\
 win32\test\test.exe


Added reverse cdc support for batchfile.

--- cdc-batch.bat
+++ cdc-batch.bat
@@ -11,20 +11,39 @@
     set dest=.
 )

-:Entry
-cd %dest% 2>NUL
-
-if %errorlevel% neq 0 (
-    goto error
+if %dest% EQU .. (
+    goto CdcUp
 )

-:: Number of items in directory
-for /f %%i in (' "dir /B | findstr /R /N "^.*$" | find /C ":"" ') do set n=%%i
+:Entry

-:: If only dir entry, cd into it
-if %n% == 1 (
-    for /f %%i in (' "dir /B" ') do set dest=%%i
-    goto entry
-)
+    cd %dest% 2>NUL

-:Error+    if %errorlevel% neq 0 (
+        goto Finish
+    )
+
+    :: Number of items in directory
+    for /f %%i in (' "dir /B | findstr /R /N "^.*$" | c:\windows\system32\find /C ":"" ') do set n=%%i
+
+    :: If only dir entry, cd into it
+    if %n% == 1 (
+        for /f %%i in (' "dir /B" ') do set dest=%%i
+        goto entry
+    )
+
+goto Finish
+
+:CdcUp
+
+    cd ..
+
+    :: Number of items in directory
+    for /f %%i in (' "dir /B | findstr /R /N "^.*$" | c:\windows\system32\find /C ":"" ') do set n=%%i
+
+    :: If only dir entry, cd into it
+    if %n% == 1 (
+        goto CdcUp
+    )
+
+:Finish


Delete BuildVSIX.bat

Delete BuildVSIX.bat

--- BuildVSIX.bat
+++ BuildVSIX.bat
@@ -1,6 +0,0 @@
-
-xcopy /y %1\nuget\output\* %1\source\Grace.Templates\packages\
-
-chdir %1\output\Tools\
-
-Grace.VSIXPackageCreater.exe %2 %1\source\Grace.Templates\ %1\output\Grace.Templates.vsix


Add support for overridable DRMEMORY_COMMAND in tools/valgrind/chrome_tests.bat
Also, add a few minor refinements to the other parts of the script

TBR=bruening,rnk
Review URL: http://codereview.chromium.org/8775047

git-svn-id: de016e52bd170d2d4f2344f9bf92d50478b649e0@112670 0039d316-1c4b-4281-b951-d872f2087c98

--- tools/valgrind/chrome_tests.bat
+++ tools/valgrind/chrome_tests.bat
@@ -3,6 +3,7 @@
 :: Use of this source code is governed by a BSD-style license that can be
 :: found in the LICENSE file.

+:: TODO(timurrrr): batch files 'export' all the variables to the parent shell
 set THISDIR=%~dp0
 set TOOL_NAME="unknown"

@@ -16,22 +17,21 @@

 :TOOLNAME_NOT_FOUND
 echo "Please specify a tool (tsan or drmemory) by using --tool flag"
-set %ERRORLEVEL% 1
-goto :EOF
+exit /B 1

 :TOOLNAME_FOUND
 SHIFT
 set TOOL_NAME=%1
 :: }}}
-if %TOOL_NAME% == drmemory       GOTO :SETUP_DRMEMORY
-if %TOOL_NAME% == drmemory_light GOTO :SETUP_DRMEMORY
-if %TOOL_NAME% == drmemory_full  GOTO :SETUP_DRMEMORY
-if %TOOL_NAME% == tsan     GOTO :SETUP_TSAN
-echo "Unknown tool: %TOOL_NAME%! Only tsan and drmemory are supported right now"
-set %ERRORLEVEL% 1
-goto :EOF
+if "%TOOL_NAME%" == "drmemory"       GOTO :SETUP_DRMEMORY
+if "%TOOL_NAME%" == "drmemory_light" GOTO :SETUP_DRMEMORY
+if "%TOOL_NAME%" == "drmemory_full"  GOTO :SETUP_DRMEMORY
+if "%TOOL_NAME%" == "tsan"     GOTO :SETUP_TSAN
+echo "Unknown tool: `%TOOL_NAME%`! Only tsan and drmemory are supported right now"
+exit /B 1

 :SETUP_DRMEMORY
+if NOT "%DRMEMORY_COMMAND%"=="" GOTO :RUN_TESTS
 :: Set up DRMEMORY_COMMAND to invoke Dr. Memory {{{1
 set DRMEMORY_PATH=%THISDIR%..\..\third_party\drmemory
 set DRMEMORY_SFX=%DRMEMORY_PATH%\drmemory-windows-sfx.exe
@@ -39,8 +39,7 @@
 echo "Can't find Dr. Memory executables."
 echo "See http://www.chromium.org/developers/how-tos/using-valgrind/dr-memory"
 echo "for the instructions on how to get them."
-set %ERRORLEVEL% 1
-goto :EOF
+exit /B 1

 :DRMEMORY_BINARY_OK
 %DRMEMORY_SFX% -o%DRMEMORY_PATH%\unpacked -y
@@ -56,8 +55,7 @@
 echo "Can't find ThreadSanitizer executables."
 echo "See http://www.chromium.org/developers/how-tos/using-valgrind/threadsanitizer/threadsanitizer-on-windows"
 echo "for the instructions on how to get them."
-set %ERRORLEVEL% 1
-goto :EOF
+exit /B 1

 :TSAN_BINARY_OK
 %TSAN_SFX% -o%TSAN_PATH%\unpacked -y


fullbuild deps script: Restore QT congfigure -ltcg now that 4.7 series is back. This should be kept, Qt ships its VC releases with this flag as well. Only affects the release build.

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

    IF NOT EXIST "configure.cache". (
       cecho {0D}Configuring Qt build. Please answer 'y'!{# #}{\n}
-      configure -platform win32-msvc2008 -debug-and-release -opensource -shared -no-qt3support -no-opengl -no-openvg  -no-dbus -nomake examples -nomake demos -qt-zlib -qt-libpng -qt-libmng -qt-libjpeg -qt-libtiff %QT_OPENSSL_CONFIGURE%
+      configure -platform win32-msvc2008 -debug-and-release -opensource -shared -ltcg -no-qt3support -no-opengl -no-openvg -no-dbus -nomake examples -nomake demos -qt-zlib -qt-libpng -qt-libmng -qt-libjpeg -qt-libtiff %QT_OPENSSL_CONFIGURE%
       IF NOT %ERRORLEVEL%==0 GOTO :ERROR
    ) ELSE (
       cecho {0D}Qt already configured. Remove %DEPS%\Qt\configure.cache to trigger a reconfigure.{# #}{\n}


try different switch

try different switch

--- recipes/jbig2dec/bld.bat
+++ recipes/jbig2dec/bld.bat
@@ -1,4 +1,4 @@
 @echo on

-nmake LIBPNGDIR=%LIBRARY_LIB% ZLIBDIR=%LIBRARY_LIB%  @msvc.mak
+nmake /f msvc.mak LIBPNGDIR=%LIBRARY_LIB% ZLIBDIR=%LIBRARY_LIB%
 if errorlevel 1 exit 1


fix xcopy command

fix xcopy command

--- repository/mozilla/firefox/x64/Firefox.bat
+++ repository/mozilla/firefox/x64/Firefox.bat
@@ -49,8 +49,8 @@
 "%BINARY%" %FLAGS%

 :: Install customizations, built with CCK2
-if exist "%ProgramFiles(x86)%\Mozilla Firefox\" xcopy /s /e /y "autoconfig\*" "%ProgramFiles(x86)%\Mozilla Firefox"
-if exist "%ProgramFiles%\Mozilla Firefox\" xcopy /s /e /y "autoconfig\*" "%ProgramFiles(x86)%\Mozilla Firefox"
+echo D| if exist "%ProgramFiles(x86)%\Mozilla Firefox\" xcopy /s /e /y "autoconfig\*" "%ProgramFiles(x86)%\Mozilla Firefox"
+echo D| if exist "%ProgramFiles%\Mozilla Firefox\" xcopy /s /e /y "autoconfig\*" "%ProgramFiles(x86)%\Mozilla Firefox"

 :: Remove desktop icons
 REM if exist "%allusersprofile%\Desktop\Mozilla Firefox.lnk" del "%allusersprofile%\Desktop\Mozilla Firefox.lnk" /S


mk-curl.bat: -rtmp was fun, but disabled

(to avoid the hurdle of its lib dependency when using libcurl)

--- mk-curl.bat
+++ mk-curl.bat
@@ -26,9 +26,11 @@
 set CURL_LDFLAG_EXTRAS=-static-libgcc

 mingw32-make mingw32-clean
-:: Do not link WinIDN in 32-bit builds for Windows XP compatibility (missing normaliz.dll)
-if "%_CPU%" == "win32" mingw32-make mingw32-ssh2-ssl-sspi-zlib-ldaps-srp-rtmp-ipv6
-if "%_CPU%" == "win64" mingw32-make mingw32-ssh2-ssl-sspi-zlib-ldaps-srp-rtmp-ipv6-winidn
+:: - '-rtmp' is not enabled because libcurl then (of course) needs librtmp
+::   even if its functionality is not actually needed or used
+:: - Do not link WinIDN in 32-bit builds, for Windows XP compatibility (missing normaliz.dll)
+if "%_CPU%" == "win32" mingw32-make mingw32-ssh2-ssl-sspi-zlib-ldaps-srp-ipv6
+if "%_CPU%" == "win64" mingw32-make mingw32-ssh2-ssl-sspi-zlib-ldaps-srp-ipv6-winidn

 :: Download CA bundle
 if not exist ..\ca-bundle.crt curl -R -fsS -L --proto-redir =https https://raw.githubusercontent.com/bagder/ca-bundle/master/ca-bundle.crt -o ..\ca-bundle.crt


Changes made to install.bat, making OBV install in to %HOMEPATH%\openboardview rather than %PROGRAMS% because the latter requires admin priviledges

--- install.bat
+++ install.bat
@@ -1,72 +1,56 @@
-
+@echo off
 echo "Installing OpenFlex Board View"

-IF exist openboardview.exe (
-IF exist sample-obv.conf (

-
-
-;; Create the configuration and history file paths
-;;
+echo "Configuration setup"
 set OD=%APPDATA%\openboardview
-IF exist %OD% (
+IF exist "%OD%" (
 		echo "Config install path already exists"
 ) else (
 		echo "Creating config installation path %OD%..."
-		mkdir %OD%
+		mkdir "%OD%"
 )
-IF exist %OD%\obv.conf (
+set ODC=%OD%\obv.conf
+IF exist "%ODC%" (
 	echo "Configuration file already exists, not overwriting"
 ) else (
 	echo "Copying configuration file..."
-	copy sample-obv.conf %OD%\obv.conf
+	copy sample-obv.conf "%ODC%"
 )

-;; Create the binary install path
-;;
-set PD=%PROGRAMFILES%\openboardview
-IF exist %PD% (
+set PD=%HOMEPATH%\openboardview
+IF exist "%PD%" (
 		echo "Binary install path already exists"
 ) else (
 		echo "Creating binary installation path %PD%..."
-		mkdir %PD%
+		mkdir "%PD%"
 )
 echo "Copying binary...
-copy openboardview.exe %PD%
+copy openboardview.exe "%PD%"

-;; Attempt to create a desktop link
-;;
-set LNK="%HOMEDRIVE%%HOMEPATH%\Desktop\openboardview.lnk"
-if exist %LNK% (
+set LNK=%HOMEDRIVE%%HOMEPATH%\Desktop\openboardview.lnk
+if exist "%LNK%" (
 		echo "Desktop link already exists"
 		) else (
-			if exist %PD% (
-@echo off
+
 echo Set oWS = WScript.CreateObject("WScript.Shell") > CreateShortcut.vbs
-echo sLinkFile = "%HOMEDRIVE%%HOMEPATH%\Desktop\openboardview.lnk" >> CreateShortcut.vbs
+echo sLinkFile = "%LNK%" >> CreateShortcut.vbs
 echo Set oLink = oWS.CreateShortcut(sLinkFile) >> CreateShortcut.vbs
 echo oLink.TargetPath = "%PD%" >> CreateShortcut.vbs
 echo oLink.Save >> CreateShortcut.vbs
-@echo on
-		echo "Creating desktop link..."
+
+echo "Creating desktop link..."
 cscript CreateShortcut.vbs
-del CreateShortcut.vbs
-)
+;;del CreateShortcut.vbs
 )

 echo "Install finished."
-echo "You can now run the binary at %OD%\openboardview.exe"
-) else (
-	echo "Cannot find sample-obv.conf to install."
-	)
-) else (
-	echo "Cannot find openboardview.exe to install."
-	)
+echo "You can now run the binary at %PD%"

 echo


Install.bat

Install.bat

--- install.bat
+++ install.bat
@@ -0,0 +1,2 @@
+call gradlew setupDevWorkspace setupDecompWorkspace eclipse
+pause


Updated installer batch file library name to link against is now configurable, and a default list to look for is set Library and runtime will be written into the config files now /L can no longer be used with /LUA /INC /BIN /LIB (will error and exit) More verbose output while searching for a Lua installation

--- install.bat
+++ install.bat
@@ -2,7 +2,7 @@

 REM Boy, it feels like 1994 all over again.

-SETLOCAL
+SETLOCAL ENABLEDELAYEDEXPANSION

 SET PREFIX=C:\LuaRocks
 SET VERSION=2.0
@@ -16,12 +16,16 @@
 SET LUA_BINDIR=
 SET LUA_INCDIR=
 SET LUA_LIBDIR=
+SET LUA_LIBNAME=
 SET FORCE_CONFIG=
 SET MKDIR=.\bin\mkdir -p
+SET LUA_LIB_NAMES=lua5.1.lib lua51.dll liblua.dll.a

 REM ***********************************************************
 REM Option parser
 REM ***********************************************************
+ECHO LuaRocks %VERSION%.x installer.
+ECHO.

 :PARSE_LOOP
 IF [%1]==[] GOTO DONE_PARSING
@@ -29,7 +33,7 @@
    ECHO Installs LuaRocks.
    ECHO.
    ECHO /P [dir]       Where to install.
-   ECHO                Default is %PREFIX% (version; %VERSION%, will be
+   ECHO                Default is %PREFIX% ^(version; %VERSION%, will be
    ECHO                appended to this path^)
    ECHO /CONFIG [dir]  Location where the config file should be installed.
    ECHO                Default is same place of installation
@@ -39,8 +43,7 @@
    ECHO                Default is TREE/bin.
    ECHO.
    ECHO /L             Install LuaRocks' own copy of Lua even if detected.
-   ECHO                (/LUA, /INC, /LIB, /BIN will be ignored when used
-   ECHO                with /L^)
+   ECHO                ^(/LUA, /INC, /LIB, /BIN cannot be used with /L^)
    ECHO /LUA [dir]     Location where Lua is installed - e.g. c:\lua\5.1\
    ECHO                This is the base directory, the installer will look
    ECHO                for subdirectories bin, lib, include. Alternatively
@@ -138,6 +141,14 @@
 GOTO ERROR
 :DONE_PARSING

+REM check for combination flags
+IF [%INSTALL_LUA%]==[ON] (
+   IF NOT [%LUA_INCDIR%%LUA_BINDIR%%LUA_LIBDIR%%LUA_PREFIX%]==[] (
+      ECHO Cannot combine option /L with any of /LUA /BIN /LIB /INC
+      GOTO ERROR
+   )
+)
+
 SET FULL_PREFIX=%PREFIX%\%VERSION%

 SET BINDIR=%FULL_PREFIX%
@@ -151,20 +162,25 @@

 IF [%INSTALL_LUA%]==[ON] GOTO USE_OWN_LUA

+ECHO Looking for Lua interpreter
 FOR %%L IN (%LUA_PREFIX% c:\lua\5.1.2 c:\lua c:\kepler\1.1) DO (
+   ECHO    checking %%L
    SET CURR=%%L
    IF EXIST "%%L" (
       IF NOT [%LUA_BINDIR%]==[] (
          IF EXIST %LUA_BINDIR%\lua5.1.exe (
             SET LUA_INTERPRETER=lua5.1.exe
+            ECHO       Found .\!LUA_INTERPRETER!
             GOTO INTERPRETER_IS_SET
          )
          IF EXIST %LUA_BINDIR%\lua.exe (
             SET LUA_INTERPRETER=lua.exe
+            ECHO       Found .\!LUA_INTERPRETER!
             GOTO INTERPRETER_IS_SET
          )
          IF EXIST %LUA_BINDIR%\luajit.exe (
             SET LUA_INTERPRETER=luajit.exe
+            ECHO       Found .\!LUA_INTERPRETER!
             GOTO INTERPRETER_IS_SET
          )
          ECHO Lua executable lua.exe, luajit.exe or lua5.1.exe not found in %LUA_BINDIR%
@@ -175,51 +191,78 @@
          IF EXIST "%%L%%E\lua5.1.exe" (
             SET LUA_INTERPRETER=lua5.1.exe
             SET LUA_BINDIR=%%L%%E
+            ECHO       Found .\%%E\!LUA_INTERPRETER!
             GOTO INTERPRETER_IS_SET
          )
          IF EXIST "%%L%%E\lua.exe" (
             SET LUA_INTERPRETER=lua.exe
             SET LUA_BINDIR=%%L%%E
+            ECHO       Found .\%%E\!LUA_INTERPRETER!
             GOTO INTERPRETER_IS_SET
          )
          IF EXIST "%%L%%E\luajit.exe" (
             SET LUA_INTERPRETER=luajit.exe
             SET LUA_BINDIR=%%L%%E
-            GOTO INTERPRETER_IS_SET
-         )
-      )
+            ECHO       Found .\%%E\!LUA_INTERPRETER!
+            GOTO INTERPRETER_IS_SET
+         )
+      )
+      ECHO      No Lua interpreter found
       GOTO TRY_NEXT_LUA_DIR
       :INTERPRETER_IS_SET
-      IF NOT "%LUA_LIBDIR%"=="" (
-         IF EXIST %LUA_LIBDIR%\lua5.1.lib GOTO LIBDIR_IS_SET
-         ECHO lua5.1.lib not found in %LUA_LIBDIR%
+      ECHO Interpreter found, now looking for link libraries...
+      IF NOT [%LUA_LIBDIR%]==[] (
+         FOR %%T IN (%LUA_LIB_NAMES%) DO (
+            ECHO    checking for %LUA_LIBDIR%\%%T
+            IF EXIST "%LUA_LIBDIR%\%%T" (
+               SET LUA_LIBNAME=%%T
+               ECHO       Found %%T
+               GOTO LIBDIR_IS_SET
+            )
+         )
+         ECHO link library ^(one of; %LUA_LIB_NAMES%^) not found in %LUA_LIBDIR%
          GOTO ERROR
       )
       FOR %%E IN (\ \lib\ \bin\) DO (
-         IF EXIST "%CURR%%%E\lua5.1.lib" (
-            SET LUA_LIBDIR=%CURR%%%E
-            GOTO LIBDIR_IS_SET
+         FOR %%S IN (%LUA_LIB_NAMES%) DO (
+            ECHO    checking for %CURR%%%E\%%S
+            IF EXIST "%CURR%%%E\%%S" (
+               SET LUA_LIBDIR=%CURR%%%E
+               SET LUA_LIBNAME=%%S
+               ECHO       Found %%S
+               GOTO LIBDIR_IS_SET
+            )
          )
       )
       GOTO TRY_NEXT_LUA_DIR
       :LIBDIR_IS_SET
+      ECHO Link library found, now looking for headers...
       IF NOT [%LUA_INCDIR%]==[] (
-         IF EXIST %LUA_INCDIR%\lua.h GOTO INCDIR_IS_SET
+         ECHO    checking for %LUA_INCDIR%\lua.h
+         IF EXIST %LUA_INCDIR%\lua.h (
+            ECHO       Found lua.h
+            GOTO INCDIR_IS_SET
+         )
          ECHO lua.h not found in %LUA_INCDIR%
          GOTO ERROR
       )
       FOR %%E IN (\ \include\) DO (
+         ECHO    checking for %CURR%%%E\lua.h
          IF EXIST "%CURR%%%E\lua.h" (
             SET LUA_INCDIR=%CURR%%%E
+            ECHO       Found lua.h
             GOTO INCDIR_IS_SET
          )
       )
       GOTO TRY_NEXT_LUA_DIR
       :INCDIR_IS_SET
-	%LUA_BINDIR%\%LUA_INTERPRETER% -v 2>NUL
+      ECHO Headers found, now testing interpreter...
+      %LUA_BINDIR%\%LUA_INTERPRETER% -v 2>NUL
       IF NOT ERRORLEVEL 1 (
+         ECHO   Ok
          GOTO LUA_IS_SET
       )
+      ECHO   Interpreter returned an error, not ok
    )
 :TRY_NEXT_LUA_DIR
    REM wtf
@@ -232,13 +275,16 @@
 SET LUA_BINDIR=%BINDIR%
 SET LUA_LIBDIR=%LIBDIR%
 SET LUA_INCDIR=%INCDIR%
+SET LUA_LIBNAME=lua5.1.lib
 :LUA_IS_SET
 ECHO.
 ECHO Will configure LuaRocks with the following paths:
-ECHO Lua interpreter: %LUA_INTERPRETER%
-ECHO Lua binaries:    %LUA_BINDIR%
-ECHO Lua libraries:   %LUA_LIBDIR%
-ECHO Lua includes:    %LUA_INCDIR%
+ECHO LuaRocks       : %FULL_PREFIX%
+ECHO Lua interpreter: %LUA_BINDIR%\%LUA_INTERPRETER%
+ECHO Lua binaries   : %LUA_BINDIR%
+ECHO Lua libraries  : %LUA_LIBDIR%
+ECHO Lua includes   : %LUA_INCDIR%
+ECHO Binaries will be linked against: %LUA_LIBNAME%
 ECHO.

 REM ***********************************************************
@@ -248,6 +294,7 @@
 IF [%FORCE%]==[ON] (
    ECHO Removing %FULL_PREFIX%...
    RD /S /Q "%FULL_PREFIX%"
+   ECHO.
 )

 IF NOT EXIST "%FULL_PREFIX%" GOTO NOT_EXIST_PREFIX
@@ -348,6 +395,14 @@
    ECHO    [[%ROCKS_TREE%]]>> "%CONFIG_FILE%"
    ECHO }>> "%CONFIG_FILE%"
    IF NOT [%SCRIPTS_DIR%]==[] ECHO scripts_dir=[[%SCRIPTS_DIR%]]>> "%CONFIG_FILE%"
+   ECHO variables = {>> "%CONFIG_FILE%"
+   IF [%USE_MINGW%]==[ON] (
+   ECHO    MSVCRT = 'm',>> "%CONFIG_FILE%"
+   ) ELSE (
+   ECHO    MSVCRT = 'msvcr80',>> "%CONFIG_FILE%"
+   )
+   ECHO    LUALIB = '%LUA_LIB_NAME%'>> "%CONFIG_FILE%"
+   ECHO }>> "%CONFIG_FILE%"
    ECHO Created LuaRocks config file: %CONFIG_FILE%
 ) ELSE (
    ECHO LuaRocks config file already exists: %CONFIG_FILE%
@@ -373,18 +428,19 @@
 REM ***********************************************************

 ECHO.
+ECHO    *** LuaRocks is installed! ***
+ECHO.
 ECHO You may want to add the following elements to your paths;
 ECHO PATH     :   %LUA_BINDIR%;%FULL_PREFIX%
 ECHO LUA_PATH :   %ROCKS_TREE%\share\lua\5.1\?.lua;%ROCKS_TREE%\share\lua\5.1\?\init.lua
 ECHO LUA_CPATH:   %LUA_LIBDIR%\lua\5.1\?.dll
 ECHO.
-ECHO LuaRocks is installed!
 :QUIT
 ENDLOCAL
 EXIT /B 0

 :ERROR
 ECHO.
-ECHO Failed installing LuaRocks.
+ECHO Failed installing LuaRocks. Run with /? for help.
 ENDLOCAL
 EXIT /B 1


also install VirtualBox

also install VirtualBox

--- install.bat
+++ install.bat
@@ -67,20 +67,12 @@
 exit /b
 :PACKER_DONE

-echo Skipping VirtualBox installation
-goto VIRTUALBOX_DONE
-
-rem Install VirtualBox 4.3.6
+rem Install VirtualBox 4.3
 if not exist "%USERPROFILE%\.VirtualBox\VirtualBox.xml" (
   mkdir "%USERPROFILE%\.VirtualBox"
   call wget --no-check-certificate https://github.com/StefanScherer/basebox-slave/raw/master/VirtualBox.xml -O "%USERPROFILE%\.VirtualBox\VirtualBox.xml"
 )
 call cinst virtualbox
-if not exist %WORKDRIVE%\VirtualBox mkdir %WORKDRIVE%\VirtualBox
-rem if exist "C:\program files\oracle\virtualbox\vboxmanage.exe" goto VIRTUALBOX_INSTALLED
-rem wget http://download.virtualbox.org/virtualbox/4.3.6/VirtualBox-4.3.6-91406-Win.exe -O %TEMP%\VirtualBox-4.3.6-91406-Win.exe
-rem %TEMP%\VirtualBox-4.3.6-91406-Win.exe -s
-:VIRTUALBOX_INSTALLED
 where vboxmanage
 if ERRORLEVEL 1 call :addVirtualBoxToUserPath
 goto VIRTUALBOX_DONE


add install.cmd for installation on windows

The script install.cmd has two environment variables PREFIX and HTMLDIR.
PREFIX is where your git is installed and HTMLDIR is the location of html files under PREFIX.
This script is written for msysgit installed from https://github.com/git-for-windows/git.

Signed-off-by: gisphm <cbd264e511e6eb36fba78753dc6db760ed4e40f9@hotmail.com>

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

--- install.cmd
+++ install.cmd
@@ -0,0 +1,27 @@
+@ECHO OFF
+SET PREFIX=C:\SCM\PortableGit\mingw64
+SET HTMLDIR=%PREFIX%\share\doc\git-doc
+SET GITEXTRAS=%~dp0
+
+IF NOT EXIST %PREFIX%\bin MKDIR %PREFIX%\bin
+
+SET COMMANDS_WITHOUT_REPO=git-alias git-extras git-fork git-setup
+
+FOR /R %GITEXTRAS%\bin %%i in (*.*) DO (
+	ECHO #!/usr/bin/env bash > %PREFIX%\bin\%%~ni
+	TYPE %GITEXTRAS%\helper\reset-env >> %PREFIX%\bin\%%~ni
+	TYPE %GITEXTRAS%\helper\git-extra-utility >> %PREFIX%\bin\%%~ni
+	TYPE %GITEXTRAS%\helper\is-git-repo >> %PREFIX%\bin\%%~ni
+	MORE +2 %GITEXTRAS%\bin\%%~ni >> %PREFIX%\bin\%%~ni
+)
+
+FOR %%i in (%COMMANDS_WITHOUT_REPO%) DO (
+	ECHO #!/usr/bin/env bash > %PREFIX%\bin\%%i
+    TYPE %GITEXTRAS%\helper\reset-env >> %PREFIX%\bin\%%i
+    TYPE %GITEXTRAS%\helper\git-extra-utility >> %PREFIX%\bin\%%i
+    MORE +2 %GITEXTRAS%\bin\%%i >> %PREFIX%\bin\%%i
+)
+
+ROBOCOPY %GITEXTRAS%\man %HTMLDIR% *.html
+
+@ECHO ON


fixed dns problems with fixed ip

fixed dns problems with fixed ip

--- install.bat
+++ install.bat
@@ -39,11 +39,15 @@
 call cinst msysgit
 set PATH=%PATH%;C:\Program Files (x86)\Git\cmd

+set ROECLOUDSRV001=roecloudsrv001.sealsystems.local
+set ROECLOUDSRV001=10.100.100.101
+
+
 rem install firefox and all plugins needed to access vCloud via browser
 call cinst firefox
 call cinst flashplayerplugin
 if not exist "%TEMP%\VMware-ClientIntegrationPlugin-5.5.0.exe" (
-call wget -O "%TEMP%\VMware-ClientIntegrationPlugin-5.5.0.exe" http://roecloudsrv001.sealsystems.local/vmware/clientintegrationplugin/VMware-ClientIntegrationPlugin-5.5.0.exe
+call wget -O "%TEMP%\VMware-ClientIntegrationPlugin-5.5.0.exe" http://%ROECLOUDSRV001%/vmware/clientintegrationplugin/VMware-ClientIntegrationPlugin-5.5.0.exe
 )
 "%TEMP%\VMware-ClientIntegrationPlugin-5.5.0.exe" /s /v/qn
 del "%TEMP%\VMware-ClientIntegrationPlugin-5.5.0.exe"
@@ -111,7 +115,7 @@
 echo Install VMware PowerCLI...
 if not exist "c:\Program Files (x86)\VMware\VMware VIX" (
   if not exist "%TEMP%\VMware-PowerCLI-5.5.0-1671586.exe" (
-    call wget -O "%TEMP%\VMware-PowerCLI-5.5.0-1671586.exe" http://roecloudsrv001.sealsystems.local/vmware/powercli/VMware-PowerCLI-5.5.0-1671586.exe
+    call wget -O "%TEMP%\VMware-PowerCLI-5.5.0-1671586.exe" http://%ROECLOUDSRV001%/vmware/powercli/VMware-PowerCLI-5.5.0-1671586.exe
   )
   powershell -Command "Import-Module ServerManager; Add-WindowsFeature NET-Framework-Features"
   "%TEMP%\VMware-PowerCLI-5.5.0-1671586.exe" /s /v/qn /vADDLOCAL=ALL
@@ -126,7 +130,7 @@
 )
 if not exist "c:\Program Files (x86)\VMware\VMware Workstation" (
   if not exist "%TEMP%\VMware-workstation-full-10.0.0-1295980.exe" (
-    call wget -O "%TEMP%\VMware-workstation-full-10.0.0-1295980.exe" http://roecloudsrv001.sealsystems.local/vmware/workstation10/VMware-workstation-full-10.0.0-1295980.exe
+    call wget -O "%TEMP%\VMware-workstation-full-10.0.0-1295980.exe" http://%ROECLOUDSRV001%/vmware/workstation10/VMware-workstation-full-10.0.0-1295980.exe
   )
   rem "%TEMP%\VMware-workstation-full-10.0.0-1295980.exe" /s /nsr /v EULAS_AGREED=1 SERIALNUMBER="xxxxx-xxxxx-xxxxx-xxxxx-xxxxx"
   "%TEMP%\VMware-workstation-full-10.0.0-1295980.exe" /s /nsr /v EULAS_AGREED=1


release: update windows publish script

release: update windows publish script


Delete gradlew.bat

Delete gradlew.bat

--- gradlew.bat
+++ gradlew.bat
@@ -1,90 +0,0 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windowz variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega


AN-2 use secret archive

AN-2 use secret archive

--- gradlew.bat
+++ gradlew.bat
@@ -1,90 +1,90 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windowz variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega


edited gradlew.bat

edited gradlew.bat


Borland C++ builder.

Borland C++ builder.

Submitted by: Janez Jere <jj@void.si>

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

--- ms/bcb4.bat
+++ ms/bcb4.bat
@@ -0,0 +1,6 @@
+perl Configure BC-32
+perl util\mkfiles.pl > MINFO
+
+@rem create make file
+perl util\mk1mf.pl BC-NT no-asm > bcb.mak
+


Added instructions on how to make a debug build on Win32.

--- dist/build_installer.bat
+++ dist/build_installer.bat
@@ -25,10 +25,20 @@

 rem Cleanup
 rmdir /s /q build
-del ..\src\*.obj ..\src\*.lib ..\src\*.exp ..\src\*.res
+del /s ..\src\*.obj ..\src\*.lib ..\src\*.exp ..\src\*.res

 rem Build
 python setup.py.in bdist_wininst --install-script win32_postinstall.py
+GOTO END
+
+rem Use this instead of the previous line to create a debug build
+rem For this you need a Python debug build. The .py files will be installed
+rem directly in the Python debug build's site-packages. The .so file will remain
+rem in build/lib.win32-2.4, so you'll have to make sure your testconf.py file
+rem points to it instead of the copy that may already reside in LIBEXECDIR.
+
+rem python_d setup.py.in build --debug install
+rem GOTO END

 rem Compress the installer if possible
 upx.exe --no-color --no-progress --best dist\*.exe
@@ -36,7 +46,8 @@

 :BADAPACHESRC
 echo Currently APACHESRC points to %APACHESRC%
-echo This value seems wrong as we could not find a proper Apache installation here.
+echo This value seems wrong as we could not find a proper
+echo Apache installation here.

 :NOAPACHESRC
 echo Please set the APACHESRC variable to point to your Apache setup


adding check for repo token

adding check for repo token

--- tests/Grace.Tests/CodeCoverageAppVeyor.cmd
+++ tests/Grace.Tests/CodeCoverageAppVeyor.cmd
@@ -15,5 +15,6 @@
 REM Run code coverage analysis
 %opencover% -oldStyle -register:user -target:%dotnet% -output:%coveragefile% -targetargs:%targetargs% -filter:%filter% -skipautoprops -hideskipped:All

+
 REM publish
-%coveralls% --serviceName appveyor --opencover -i .\Coverage.xml+IF NOT "%COVERALLS_REPO_TOKEN%"=="" %coveralls% --serviceName appveyor --opencover -i .\Coverage.xml


v10.7.2

--- resources/functions/initialize_environment.bat
+++ resources/functions/initialize_environment.bat
@@ -6,8 +6,8 @@

 :: Tron Project version and date. These two variables determine the overall project version and date
-set TRON_VERSION=10.7.1
-set TRON_DATE=2018-11-31
+set TRON_VERSION=10.7.2
+set TRON_DATE=2018-11-19

 :: Set window title
 title Tron v%TRON_VERSION% (%TRON_DATE%)


Added vc2008 support to bootstrap.bat

Added vc2008 support to bootstrap.bat

--- bootstrap.bat
+++ bootstrap.bat
@@ -1,10 +1,14 @@
 @echo off
 if not exist vc2003 mkdir vc2003
 if not exist vc2005 mkdir vc2005
+if not exist vc2008 mkdir vc2008

 bakefile_gen %*
 if errorlevel 1 exit
-if not exist mysql++.sln goto no_bakefile
+if not exist vc2003\mysql++.sln goto no_bakefile
+if not exist vc2005\mysql++.sln goto no_bakefile
+copy vc2005\*.sln vc2008 > NUL
+copy vc2005\*.vcproj vc2008 > NUL

 cd lib
 perl querydef.pl