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


Modified deploy script to match current .application for staging

Former-commit-id: 044367ab1970b6a37bed14196749c7c780ec49a8

--- MeTLMeeting/DeployStagingClickonce.bat
+++ MeTLMeeting/DeployStagingClickonce.bat
@@ -20,5 +20,5 @@
 pause
 pscp.exe -r -pw bananaman "C:\specialMeTL\MeTLMeeting\SandRibbon\publish\Application Files" deploy@refer.adm.monash.edu.au:/srv/racecarDeploy/MeTLStaging/
 pscp.exe -pw bananaman "C:\specialMeTL\MeTLMeeting\SandRibbon\publish\index.html" deploy@refer.adm.monash.edu.au:/srv/racecarDeploy/MeTLStaging/
-pscp.exe -pw bananaman "C:\specialMeTL\MeTLMeeting\SandRibbon\publish\MeTL Staging.application" deploy@refer.adm.monash.edu.au:/srv/racecarDeploy/MeTLStaging/
+pscp.exe -pw bananaman "C:\specialMeTL\MeTLMeeting\SandRibbon\publish\MeTL Presenter.application" deploy@refer.adm.monash.edu.au:/srv/racecarDeploy/MeTLStaging/
 pscp.exe -pw bananaman "C:\specialMeTL\MeTLMeeting\SandRibbon\publish\setup.exe" deploy@refer.adm.monash.edu.au:/srv/racecarDeploy/MeTLStaging/


Issue 1882:  Fix earlier patch to scons.bat by adding ~dp0;~dp0.. to the front of %PATH%, and only executing endlocal on NT-based systems. (Anatoly Techtonik)

--- src/script/scons.bat
+++ src/script/scons.bat
@@ -9,11 +9,12 @@
 :WinNT
 setlocal
 @REM ensure the script will be executed with the Python it was installed for
-set path=%path%;%~dp0
+set path=%~dp0;%~dp0..;%path%
 python -c "from os.path import join; import sys; sys.path = [ join(sys.prefix, 'Lib', 'site-packages', 'scons-__VERSION__'), join(sys.prefix, 'Lib', 'site-packages', 'scons'), join(sys.prefix, 'scons-__VERSION__'), join(sys.prefix, 'scons')] + sys.path; import SCons.Script; SCons.Script.main()" %*
-if NOT "%COMSPEC%" == "%SystemRoot%\system32\cmd.exe" goto endscons
+if NOT "%COMSPEC%" == "%SystemRoot%\system32\cmd.exe" goto endsconsnt
 if errorlevel 9009 echo you do not have python in your PATH
 @REM color 00 causes this script to exit with non-zero exit status
 if errorlevel 1 color 00
+:endsconsnt
+endlocal
 :endscons
-endlocal


make .bat files execute .py script with the same name instead of trying to set sys.path inline it is a final fix for issue #2051 to make SCons easy_installable on Windows

--- src/script/scons.bat
+++ src/script/scons.bat
@@ -17,7 +17,10 @@
 setlocal
 @REM ensure the script will be executed with the Python it was installed for
 set path=%~dp0;%~dp0..;%path%
-python -c "from os.path import join; import sys; sys.path = [ join(sys.prefix, 'Lib', 'site-packages', 'scons-__VERSION__'), join(sys.prefix, 'Lib', 'site-packages', 'scons'), join(sys.prefix, 'scons-__VERSION__'), join(sys.prefix, 'scons')] + sys.path; import SCons.Script; SCons.Script.main()" %*
+@REM try the script named as the .bat file in current dir, then in Scripts subdir
+set scriptname=%~dp0%~n0.py
+if not exist %scriptname% set scriptname=%~dp0Scripts\%~n0.py
+python "%scriptname%" %*
 endlocal & set SCONS_ERRORLEVEL=%ERRORLEVEL%

 if NOT "%COMSPEC%" == "%SystemRoot%\system32\cmd.exe" goto returncode


Test errorlevel 1

Test errorlevel 1

--- conda/upload.bat
+++ conda/upload.bat
@@ -42,45 +42,41 @@
 echo ON

 conda install -n root anaconda-client
-echo !errorlevel!
-rem if !errorlevel! neq 0 (
-rem    exit /b !errorlevel!
-rem )
+if errorlevel 1 (
+    exit /b 1
+)

 echo OFF

 echo y|anaconda login --username %ANACONDA_USERNAME% --password %ANACONDA_PASSWORD%
-echo !errorlevel!
-rem if !errorlevel! neq 0 (
-rem     exit /b !errorlevel!
-rem )
+if errorlevel 1 (
+    exit /b 1
+)

 echo ON

 if "%TOOLCHAIN%" == "" (
     git clone https://gist.github.com/c491cb08d570beeba2c417826a50a9c3.git toolchain
-    echo !errorlevel!
-    rem if !errorlevel! neq 0 (
-    rem     anaconda logout
-    rem     exit /b !errorlevel!
-    rem )
+    if errorlevel 1 (
+        anaconda logout
+        exit /b 1
+    )
+
     cd toolchain
     call config.bat
-    echo !errorlevel!
-    rem if !errorlevel! neq 0 (
-    rem     cd ..
-    rem     anaconda logout
-    rem     rmdir toolchain /s /q
-    rem     exit /b !errorlevel!
-    rem )
+    if errorlevel 1 (
+        cd ..
+        anaconda logout
+        rmdir toolchain /s /q
+        exit /b 1
+    )
     cd ..
     rmdir toolchain /s /q
-    echo !errorlevel!
 )

 set ANACONDA_BUILD_FLAGS=%ANACONDA_CHANNEL_FLAGS% %ANACONDA_BUILD_FLAGS%
 for %%i in (%ANACONDA_BUILD_RECIPES%) do (
-    for /f %%j in ('conda build %%i %ANACONDA_BUILD_FLAGS% --output') do anaconda upload %%i --user %ANACONDA_CHANNEL% %ANACONDA_UPLOAD_FLAGS%
+    for /f %%j in ('conda build %%i %ANACONDA_BUILD_FLAGS% --output') do anaconda upload %%j --user %ANACONDA_CHANNEL% %ANACONDA_UPLOAD_FLAGS%
 )

 anaconda logout


Fixed up the debug-embedded build product path for build.bat.

--- web/source/build.bat
+++ web/source/build.bat
@@ -93,6 +93,26 @@
       --js_output_file %outPath%\%basefile% --warning_level VERBOSE --output_wrapper %wrapper%

   EXIT /B 0
+
+rem Credit to https://stackoverflow.com/questions/23075953/batch-script-to-find-and-replace-a-string-in-text-file-without-creating-an-extra
+rem It's not the most efficient thing ever, but it gets the job done.  The shell script's version is WAY faster due to available tools.
+:replace_in_file
+@echo off
+    setlocal enableextensions disabledelayedexpansion
+
+    set "search=%1"
+    set "replace=%2"
+
+    set "textFile=%3"
+
+    for /f "delims=" %%i in ('type "%textFile%" ^& break ^> "%textFile%" ') do (
+        set "line=%%i"
+        setlocal enabledelayedexpansion
+        >>"%textFile%" echo(!line:%search%=%replace%!
+        endlocal
+    )
+
+    EXIT /B 0

 :main

@@ -221,8 +241,15 @@
 exit /B 2

 :debug_embedded
-REM copy /B /Y %SOURCE%\kmwstring.js+%SOURCE%\kmwbase.js+%SOURCE%\keymanweb.js+%SOURCE%\kmwcallback.js+%SOURCE%\kmwosk.js+kmwembedded.js+%SOURCE%\kmwkeymaps.js+%SOURCE%\kmwlayout.js+%SOURCE%\kmwinit.js %EMBED_OUTPUT%\keymanios.js
-REM echo Uncompiled embedded application saved as keymanios.js
+copy %INTERMEDIATE%\keyman.js %EMBED_OUTPUT%\keymanios.js
+
+copy %INTERMEDIATE%\keyman.js.map %EMBED_OUTPUT%\keymanios.js.map
+
+rem Problem - must correct the resulting map location!
+echo Correcting source map link.  This may take a while; using the shell script or manually correcting the link will be faster.
+call :replace_in_file keyman.js.map keymanios.js.map %EMBED_OUTPUT%\keymanios.js
+
+echo Uncompiled embedded application saved as keymanios.js

 goto done


Build help file before copying it!

Build help file before copying it!

--- mkDistribution.bat
+++ mkDistribution.bat
@@ -1,4 +1,4 @@
-@echo "mkDistribution v1.3"
+@echo "mkDistribution v1.4"

 if exist current (
 	rmdir /s /q current
@@ -19,6 +19,8 @@
 nant -t:net-2.0 -D:build.output.dir=current\net-20 -buildfile:sharpZLib.build build

+"c:\Program Files\EWSoftware\Sandcastle Help File Builder\SandcastleBuilderConsole.exe" .\SharpZipLib.shfb
+
 mkdir current\doc
 copy doc\readme.rtf current\doc
 copy doc\Changes.txt current\doc
@@ -27,8 +29,6 @@
 copy installGAC.bat current
 copy uninstallGAC.bat current

-"c:\Program Files\EWSoftware\Sandcastle Help File Builder\SandcastleBuilderConsole.exe" .\SharpZipLib.shfb
-
 samples\cs\bin\sz -rc current\SharpZipLib.zip current\*.dll

 @echo TODO Compress source to SharpZipLib_SourceSamples.zip


build: script updated for new Windows image (#350)

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

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

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


Ticket 5 : Update nuget package

Ticket 5 : Update nuget package

--- BuildProject.cmd
+++ BuildProject.cmd
@@ -4,20 +4,26 @@

 call dnvm upgrade
 call dnu restore
+call dnu build src\System.Security.Cryptography.Algorithms.Extensions
+call dnu build src\SimpleIdentityServer.UserInformation.Authentication
+call dnu build src\SimpleIdentityServer.RateLimitation
+call dnu build src\SimpleIdentityServer.Oauth2Instrospection.Authentication
 call dnu build src\SimpleIdentityServer.Host
 call dnu build src\SimpleIdentityServer.Core
-call dnu build src\SimpleIdentityServer.Core.Jwt
+call dnu build src\SimpleIdentityServer.Logging
 call dnu build src\SimpleIdentityServer.DataAccess.Fake
 call dnu build src\SimpleIdentityServer.DataAccess.SqlServer
-call dnu build src\SimpleIdentityServer.RateLimitation
-call dnu build src\SimpleIdentityServer.Core.Common
+call dnu build src\SimpleIdentityServer.Core.Jwt
 call dnu build src\SimpleIdentityServer.Common

-call dnu pack src\SimpleIdentityServer.Common --out nuget\
-call dnu pack src\SimpleIdentityServer.Core.Common --out nuget\
+call dnu pack src\System.Security.Cryptography.Algorithms.Extensions --out nuget\
+call dnu pack src\SimpleIdentityServer.UserInformation.Authentication --out nuget\
 call dnu pack src\SimpleIdentityServer.RateLimitation --out nuget\
+call dnu pack src\SimpleIdentityServer.Oauth2Instrospection.Authentication --out nuget\
+call dnu pack src\SimpleIdentityServer.Host --out nuget\
+call dnu pack src\SimpleIdentityServer.Core --out nuget\
+call dnu pack src\SimpleIdentityServer.Logging --out nuget\
+call dnu pack src\SimpleIdentityServer.DataAccess.Fake --out nuget\
 call dnu pack src\SimpleIdentityServer.DataAccess.SqlServer --out nuget\
-call dnu pack src\SimpleIdentityServer.DataAccess.Fake --out nuget\
 call dnu pack src\SimpleIdentityServer.Core.Jwt --out nuget\
-call dnu pack src\SimpleIdentityServer.Core --out nuget\
-call dnu pack src\SimpleIdentityServer.Host --out nuget\+call dnu pack src\SimpleIdentityServer.Common --out nuget\


Remove optimization in cygwin that leads to race conditions.
This version is based on 20120817 cygwin snapshot.

BUG= http://code.google.com/p/nativeclient/issues/detail?id=1918
TEST= win bots
Review URL: https://chromiumcodereview.appspot.com/10870065

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

--- buildbot/cygwin_env.bat
+++ buildbot/cygwin_env.bat
@@ -4,7 +4,7 @@

 @echo off
 setlocal
-set HERMETIC_CYGWIN=hermetic_cygwin_1_7_15-0_1-with-20120816-cygwin
+set HERMETIC_CYGWIN=hermetic_cygwin_1_7_15-0_1-with-20120817-cygwin
 if exist "%~dp0..\cygwin\%HERMETIC_CYGWIN%.installed" goto :skip_cygwin_install
 if exist "%~dp0..\tools\BUILD\.gcc-extras-version" del "%~dp0..\tools\BUILD\.gcc-extras-version"
 if exist "%~dp0..\tools\BACKPORTS\binutils" rmdir /s /q "%~dp0..\tools\BACKPORTS\binutils"


Update integration-tests.bat

Update integration-tests.bat

--- integration-tests.bat
+++ integration-tests.bat
@@ -60,7 +60,7 @@

 REM ******************************************************
-REM ************ Test if Maven Batch file exists ***********
+REM ***  Test if Maven batch file exists.             ***
 REM ******************************************************

 :testIfExists
@@ -70,7 +70,7 @@

 REM ******************************************************
-REM ************** Batch file has been found *************
+REM ***  Batch file has been found.                    ***
 REM ******************************************************

 :BatchFound
@@ -80,32 +80,32 @@
 goto :EOF

 REM ******************************************************
-REM ************* Execute Batch file only once ***********
+REM ***  Execute batch file only once.                 ***
 REM ******************************************************

 :ExecuteBatch

-REM Support for testsuite profile processing
+REM  Support for testsuite profile processing
 set CMD_LINE_PARAMS=
 set TESTS_SPECIFIED=N

-REM each test module executes a different type of test
-set API_TESTS=-Dapi.module
+REM  Each test module executes a different type of test
 set BENCHMARK_TESTS=-Dbenchmark.module
 set INTEGRATION_TESTS=-Dintegration.module -Dbasic.integration.tests -Dcompat.integration.tests -Dclustering.integration.tests -Dtimerservice.integration.tests
 set SMOKE_TESTS=-Dintegration.module -Dsmoke.integration.tests
-set SPEC_TESTS=-Dspec.module
 set STRESS_TESTS=-Dstress.module
 set DOMAIN_TESTS=-Ddomain.module
+set COMPAT_TESTS=-Dcompat.module
+

 set MVN=%1%
 set GOAL=%2
 if "%GOAL%"=="" set GOAL=install

-REM process test directives before calling maven
+REM  Process test directives before calling maven
 call :processTestDirectives %GOAL% %3 %4 %5 %6 %7 %8

-REM change to testsuite directory before executing mvn
+REM  Change to testsuite directory before executing mvn.
 cd %DIRNAME%\testsuite

 echo Calling ..\%MVN% %CMD_LINE_PARAMS%
@@ -113,50 +113,62 @@

 cd %DIRNAME%

-REM Pause the batch script when maven terminates
+REM  Pause the batch script when maven terminates.
 if "%NOPAUSE%" == "" pause

 goto :EOF

 REM ******************************************************
-REM **** Function to process testsuite directives ********
+REM ***  Function to process testsuite directives.     ***
 REM ******************************************************
 :processTestDirectives

 REM echo "Calling processTestDirectives %*"
 :loop

-REM check if we have no more parameters to process
+REM  Check if we have no more parameters to process.
 if "%1" == "" (
   if "%TESTS_SPECIFIED%" == "N" set "CMD_LINE_PARAMS=%CMD_LINE_PARAMS% %SMOKE_TESTS%"
   goto :eof
 )
-REM Replace occurrences of directives with corresponding maven profiles
-REM -DallTests
+REM  Replace occurrences of directives with corresponding maven profiles
+REM  -DallTests
 if "%1" == "-DallTests" (
   set "CMD_LINE_PARAMS=%CMD_LINE_PARAMS% %INTEGRATION_TESTS% %SPEC_TESTS% %API_TESTS% %DOMAIN_TESTS%"
   set "TESTS_SPECIFIED=Y"
   goto processed
 )
-REM -Dbenchmark-tests
+REM  -Dbenchmark-tests
 if "%1" == "-Dbenchmark-tests" (
   set "CMD_LINE_PARAMS=%CMD_LINE_PARAMS% %BENCHMARK_TESTS%"
   set "TESTS_SPECIFIED=Y"
   goto processed
 )
-REM -Dsmoke-tests
+REM  -Ddomain-tests
+if "%1" == "-Ddomain-tests" (
+  set "CMD_LINE_PARAMS=%CMD_LINE_PARAMS% %DOMAIN_TESTS%"
+  set "TESTS_SPECIFIED=Y"
+  goto processed
+)
+REM  -Dcompat-tests
+if "%1" == "-Dcompat-tests" (
+  set "CMD_LINE_PARAMS=%CMD_LINE_PARAMS% %COMPAT_TESTS%"
+  set "TESTS_SPECIFIED=Y"
+  goto processed
+)
+REM  -Dsmoke-tests
 if "%1" == "-Dsmoke-tests" (
   set "CMD_LINE_PARAMS=%CMD_LINE_PARAMS% %SMOKE_TESTS%"
   set "TESTS_SPECIFIED=Y"
   goto processed
 )
-REM -Dstress-tests
+REM  -Dstress-tests
 if "%1" == "-Dstress-tests" (
   set "CMD_LINE_PARAMS=%CMD_LINE_PARAMS% %STRESS_TESTS%"
   set "TESTS_SPECIFIED=Y"
   goto processed
 )
-REM pass through other params
+REM  Pass through other params.
 set "CMD_LINE_PARAMS=%CMD_LINE_PARAMS% %1"

 :processed


install.bat :check find command for Windows

--- install.bat
+++ install.bat
@@ -4,6 +4,14 @@

 @echo off
 cd /d %~dp0
+
+find /? >NUL 2>&1
+if not "%ERRORLEVEL%"=="0" (
+	echo find is not Windows find.
+	echo unsupported. exit.
+	exit/b
+)
+

 if not "%~2"=="" (
 	for %%s in (%*) do cmd /c %~dpnx0 %%s


Create initial windows install/setup script

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

--- install.bat
+++ install.bat
@@ -0,0 +1,9 @@
+python -m venv env
+CALL env\Scripts\activate.bat
+python -m pip install -U pip
+powershell -Command "(New-Object Net.WebClient).DownloadFile('http://ftp.esrf.eu/pub/scisoft/silx/wheelhouse/lxml-3.6.0-cp35-cp35m-win_amd64.whl', 'lxml-3.6.0-cp35-cp35m-win_amd64.whl')"
+pip install lxml-3.6.0-cp35-cp35m-win_amd64.whl
+del lxml-3.6.0-cp35-cp35m-win_amd64.whl
+pip install -r requirements.txt
+python create_local_settings.py
+python manage.py migrate


fix install.bat

fix install.bat

--- install.bat
+++ install.bat
@@ -1,3 +1,4 @@
+rem ensures conda is installed and installs gdsfactory package
 rem https://gist.github.com/nimaid/a7d6d793f2eba4020135208a57f5c532
 @echo off

@@ -39,10 +40,6 @@
 echo Conda is already installed!
 goto END

-:END
-exit /B 0
-
-
 rem https://gist.github.com/maximlt/531419545b039fa33f8845e5bc92edd6
 call conda create -f environment.yml
 call conda activate gdsfactory
@@ -50,3 +47,6 @@
 git clone https://github.com/gdsfactory/gdslib.git -b data
 pre-commit install
 gf tool install
+
+:END
+exit /B 0


Use lowercase parameters

Use lowercase parameters

--- install.bat
+++ install.bat
@@ -56,9 +56,9 @@
   move "%sublime%\Installed Packages" "%sublime%\Backup"
   move "%sublime%\Packages" "%sublime%\Backup"
   move "%sublime%\Pristine Packages" "%sublime%\Backup"
-  mklink /D "%sublime%\Installed Packages" "%~dp0sublime\Installed Packages"
-  mklink /D "%sublime%\Packages" "%~dp0sublime\Packages"
-  mklink /D "%sublime%\Pristine Packages" "%~dp0sublime\Pristine Packages"
+  mklink /d "%sublime%\Installed Packages" "%~dp0sublime\Installed Packages"
+  mklink /d "%sublime%\Packages" "%~dp0sublime\Packages"
+  mklink /d "%sublime%\Pristine Packages" "%~dp0sublime\Pristine Packages"
 )

 mklink %USERPROFILE%\init.bat "%dotfilesdir%\init.bat"


Removed unrequired installer batch file

Removed unrequired installer batch file

--- install.bat
+++ install.bat
@@ -1,57 +0,0 @@
-@echo off
-echo Installing OpenFlex Board View
-
-
-echo Configuration setup
-set OD=%APPDATA%\openboardview
-IF exist "%OD%" (
-		echo Config install path already exists
-) else (
-		echo Creating config installation path %OD%...
-		mkdir "%OD%"
-)
-set ODC=%OD%\obv.conf
-IF exist "%ODC%" (
-	echo Configuration file already exists, not overwriting
-) else (
-	echo Copying configuration file...
-	copy sample-obv.conf "%ODC%"
-)
-
-
-
-set PD=%HOMEDRIVE%%HOMEPATH%\openboardview
-IF exist "%PD%" (
-		echo Binary install path already exists
-) else (
-		echo Creating binary installation path %PD%...
-		mkdir "%PD%"
-)
-echo Copying binary...
-copy openboardview.exe "%PD%"
-
-
-set LNK=%HOMEDRIVE%%HOMEPATH%\Desktop\openboardview.lnk
-
-echo Set oWS = WScript.CreateObject("WScript.Shell") > CreateShortcut.vbs
-echo sLinkFile = "%LNK%" >> CreateShortcut.vbs
-echo Set oLink = oWS.CreateShortcut(sLinkFile) >> CreateShortcut.vbs
-echo oLink.TargetPath = "%PD%\openboardview.exe" >> CreateShortcut.vbs
-echo oLink.Save >> CreateShortcut.vbs
-
-if exist "%LNK%" (
-	echo Desktop link already exists
-) else (
-	echo Creating desktop link...
-	cscript CreateShortcut.vbs
-)
-
-echo .
-echo .
-echo Install finished.
-echo You can now run the binary at %PD%\openboardview.exe
-echo Check for a link on the desktop too.
-echo .
-echo .
-@echo on
-


Set the execute bit so that it will run

Set the execute bit so that it will run

git-svn-id: f3880c1fc5096ce2109c8aec392d8e07f619f417@526 c2973edb-eda0-4c78-bc6a-9341b269661f


Fix ant test

Fix ant test

--- test/test-sequence-in-container.bat
+++ test/test-sequence-in-container.bat
@@ -1,22 +1,14 @@
 echo "Testing Ant Now"

-IF NOT DEFINED RUBY_HOME (
-	echo "%%RUBY_HOME%% is missing"
+IF NOT DEFINED ANT_HOME (
+	echo "%%ANT_HOME%% is missing"
 	exit 1
 )

-IF NOT EXIST %RUBY_HOME%\bin\ruby.exe(
-	echo "%RUBY_HOME%\bin\ruby.exe didn't exit"
+IF NOT EXIST %ANT_HOME%\bin\ant.bat (
+	echo "%%ANT_HOME%%\bin\ant.bat"
 	exit 2
 )

-gem install haml
-IF %ERRORLEVEL% NEQ 0 (
-	echo "gem command doesn't work"
-	exit %ERRORLEVEL%
-)
-ruby hello-world.rb
-IF %ERRORLEVEL% NEQ 0 (
-	echo "ruby command doesn't work"
-	exit %ERRORLEVEL%
-)
+ant -f hello-ant.xml
+IF %ERRORLEVEL% NEQ 0 exit %ERRORLEVEL%


Added simple preset .bat for Windows users importing DoW rips

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

--- dow_rip.bat
+++ dow_rip.bat
@@ -0,0 +1,4 @@
+@echo off
+cd /d "%~dp0"
+python pyninjaobj.py %1 --exists --tga
+PAUSE


Fixed: clean ..\bin directory

Fixed: clean ..\bin directory

--- src/clean.bat
+++ src/clean.bat
@@ -1,6 +1,6 @@
 @echo off
-for /R %%x in (bin) do if exist "%%x" rmdir /s /q "%%x" 1>NUL 2>NUL
-for /R %%x in (obj) do if exist "%%x" rmdir /s /q "%%x" 1>NUL 2>NUL
+for /R .. %%x in (bin) do if exist "%%x" rmdir /s /q "%%x" 1>NUL 2>NUL
+for /R .. %%x in (obj) do if exist "%%x" rmdir /s /q "%%x" 1>NUL 2>NUL

 rmdir /s /q .vs 1>NUL 2>NUL
 rmdir /s /q packages 1>NUL 2>NUL


Try another approach (#126)

Try another approach (#126)

--- scripts/win_wrapper.cmd
+++ scripts/win_wrapper.cmd
@@ -26,36 +26,31 @@
 SET MAJOR_PYTHON_VERSION=%PYTHON_VERSION:~0,1%
 SET MINOR_PYTHON_VERSION=%PYTHON_VERSION:~2%

-:: Based on the Python version, determine what SDK version to use, and whether
-:: to set the SDK for 64-bit.
+SET NO_SET_SDK_64=N
 IF %MAJOR_PYTHON_VERSION% == 2 (
     SET WINDOWS_SDK_VERSION="v7.0"
-    SET SET_SDK_64=Y
-)
-IF %MAJOR_PYTHON_VERSION% == 3 (
+) ELSE IF %MAJOR_PYTHON_VERSION% == 3 (
     SET WINDOWS_SDK_VERSION="v7.1"
-    IF %MINOR_PYTHON_VERSION% LEQ 4 (
+    IF %MINOR_PYTHON_VERSION% GEQ 5 (
         SET SET_SDK_64=Y
-    ) ELSE (
-        SET SET_SDK_64=N
     )
+) ELSE (
+    ECHO Unsupported Python version: "%MAJOR_PYTHON_VERSION%"
+    EXIT 1
 )

-ECHO "Python: %MAJOR_PYTHON_VERSION%, %MINOR_PYTHON_VERSION%"
-ECHO "SDK %WINDOWS_SDK_VERSION%, 64? %SET_SDK_64%"
-
-IF %PYTHON_ARCH% == 64 (
-    IF %SET_SDK_64% == Y (
-        SET DISTUTILS_USE_SDK=1
-        SET MSSdk=1
-        "%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Setup\WindowsSdkVer.exe" -q -version:%WINDOWS_SDK_VERSION%
-        "%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Bin\SetEnv.cmd" /x64 /release
-    ) ELSE (
-        IF EXIST "%WIN_WDK%" (
-            :: See: https://connect.microsoft.com/VisualStudio/feedback/details/1610302/
-            REN "%WIN_WDK%" 0wdf
-        )
+IF "%NO_SET_SDK_64%"=="Y" (
+    IF EXIST "%WIN_WDK%" (
+        :: See: https://connect.microsoft.com/VisualStudio/feedback/details/1610302/
+        REN "%WIN_WDK%" 0wdf
     )
+   call %COMMAND_TO_RUN% || EXIT 1
+) ELSE IF "%PYTHON_ARCH%"=="64" (
+    SET DISTUTILS_USE_SDK=1
+    SET MSSdk=1
+    "%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Setup\WindowsSdkVer.exe" -q -version:%WINDOWS_SDK_VERSION%
+    "%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Bin\SetEnv.cmd" /x64 /release
+    call %COMMAND_TO_RUN% || EXIT 1
+) ELSE (
+    call %COMMAND_TO_RUN% || EXIT 1
 )
-
-call %COMMAND_TO_RUN% || EXIT 1


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


more comments

more comments

--- 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


auto crfl changed

auto crfl changed


Convert line-endings from CRLF to LF.

Convert line-endings from CRLF to LF.


{FIX} Remove bat file

{FIX} Remove bat file


use AIMP 3.55.1338 by default.

use AIMP 3.55.1338 by default.

--- setup_vs_project_variables.bat
+++ setup_vs_project_variables.bat
@@ -5,4 +5,4 @@
 set BOOST_DIR=c:\libraries\boost\boost_1_52_0
 set FREEIMAGELIB_DIR=c:\libraries\FreeImage\%FreeImage_VERSION%
 ::set AIMP_PLUGINS_DIR=%ProgramFiles%\AIMP3\Plugins
-set AIMP_PLUGINS_DIR=c:\AIMP\AIMP3.55.1332\Plugins+set AIMP_PLUGINS_DIR=c:\AIMP\AIMP3.55.1338\Plugins


initPHP update

initPHP update

needs & ver > nul hack as well

--- wordpress/initPHP.cmd
+++ wordpress/initPHP.cmd
@@ -1,4 +1,4 @@
 copy c:\php\php.ini-production c:\php\php.ini
-%spn_fart% -C c:\php\php.ini "; extension_dir = \"./\"" "extension_dir = \"./\""
-%spn_fart% -C c:\php\php.ini "; extension_dir = \"ext\"" "extension_dir = \"ext\""
-%spn_fart% c:\php\php.ini ";extension=php_mysql.dll" "extension=php_mysql.dll"+%spn_fart% -C c:\php\php.ini "; extension_dir = \"./\"" "extension_dir = \"./\"" & ver > nul
+%spn_fart% -C c:\php\php.ini "; extension_dir = \"ext\"" "extension_dir = \"ext\""  & ver > nul
+%spn_fart% c:\php\php.ini ";extension=php_mysql.dll" "extension=php_mysql.dll"  & ver > nul


Update bld.bat

Update bld.bat

--- libboost-python/bld.bat
+++ libboost-python/bld.bat
@@ -1,20 +1,20 @@
 :: Start with bootstrap
-cd .\tools\build
+:: cd .\tools\build
 ECHO .\bootstrap.bat
 CALL .\bootstrap.bat
 IF errorlevel 1 exit 1
 ECHO .\bootstrap.bat gcc
 CALL .\bootstrap.bat gcc
 IF errorlevel 1 exit 1
-ECHO .\b2.exe install toolset=gcc --prefix=%SRC_DIR%\b2_for_mingw
-CALL .\b2.exe install toolset=gcc --prefix=%SRC_DIR%\b2_for_mingw
-IF errorlevel 1 exit 1
-ECHO cd %SRCDIR%
-cd %SRCDIR%
-IF errorlevel 1 exit 1
-set PATH=%PATH%;%SRCDIR%\b2_for_mingw\bin
-IF errorlevel 1 exit 1
-ECHO b2 toolset=gcc --build-type=complete stage ^
+::ECHO .\b2.exe install toolset=gcc --prefix=%SRC_DIR%\b2_for_mingw
+:: CALL .\b2.exe install toolset=gcc --prefix=%SRC_DIR%\b2_for_mingw
+:: IF errorlevel 1 exit 1
+:: ECHO cd %SRCDIR%
+:: cd %SRCDIR%
+:: IF errorlevel 1 exit 1
+:: set PATH=%PATH%;%SRCDIR%\b2_for_mingw\bin
+:: IF errorlevel 1 exit 1
+ECHO .\b2 toolset=gcc --build-type=complete stage ^
         --build-dir=buildboost ^
         --prefix=%LIBRARY_PREFIX% ^
         address-model=%ARCH% ^
@@ -25,7 +25,7 @@
         -s ZLIB_INCLUDE="%LIBRARY_INC%" ^
         -s ZLIB_LIBPATH="%LIBRARY_LIB%" ^
         --with-python
-CALL b2 toolset=gcc ^
+CALL .\b2 toolset=gcc ^
         address-model=%ARCH% ^
         variant=release ^
         threading=multi ^


update

update

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

--- yampt-convert.cmd
+++ yampt-convert.cmd
@@ -0,0 +1,68 @@
+REM Set path to folders where you keep native and foreign master files
+SET PATH_NATIVE=
+SET PATH_FOREIGN=
+
+REM Set path to your Wrye Mash installers folder or where you keep files
+SET PATH_PLUGIN=
+
+REM Skip
+SET BASE=dictionaries_base
+SET USER=dictionaries_user
+SET NEW=dictionaries_new
+SET OUT=converted_files
+
+REM Change path to base dictionaries if you use modified
+SET DICT_NATIVE=%BASE%\NATIVE.dic
+SET DICT_FOREIGN=%BASE%\FOREIGN.dic
+
+REM ############### DON'T EDIT ###############
+
+mkdir %BASE%
+mkdir %USER%
+mkdir %NEW%
+mkdir %OUT%
+
+del /f /q %NEW%\*
+del /f /q %OUT%\*
+
+REM Create new native dictionary
+yampt.exe --make-base -f "%PATH_NATIVE%\Morrowind.esm" "%PATH_FOREIGN%\Morrowind.esm"
+yampt.exe --make-base -f "%PATH_NATIVE%\Tribunal.esm" "%PATH_FOREIGN%\Tribunal.esm"
+yampt.exe --make-base -f "%PATH_NATIVE%\Bloodmoon.esm" "%PATH_FOREIGN%\Bloodmoon.esm"
+yampt.exe --merge -d "Morrowind.dic" "Tribunal.dic" "Bloodmoon.dic" -o "NATIVE.dic"
+
+del "Morrowind.dic" "Tribunal.dic" "Bloodmoon.dic"
+move "NATIVE.dic" %BASE%
+
+REM Create new foreign dictionary
+yampt.exe --make-all -f "%PATH_FOREIGN%\Morrowind.esm" -d "base_dictionaries\NATIVE.dic"
+yampt.exe --make-all -f "%PATH_FOREIGN%\Tribunal.esm" -d "base_dictionaries\NATIVE.dic"
+yampt.exe --make-all -f "%PATH_FOREIGN%\Bloodmoon.esm" -d "base_dictionaries\NATIVE.dic"
+yampt.exe --merge -d "Morrowind.ALL.dic" "Tribunal.ALL.dic" "Bloodmoon.ALL.dic" -o "FOREIGN.dic"
+
+del "Morrowind.ALL.dic" "Tribunal.ALL.dic" "Bloodmoon.ALL.dic"
+move "FOREIGN.dic" %BASE%
+
+REM Convert native master files (if you change DICT_NATIVE act like patch)
+for /R "%PATH_NATIVE%" %%f in (*.esm) do echo | set /p name=" "%%f" " >> master_list.txt
+for /f "delims=" %%x in (master_list.txt) do yampt.exe --convert -f %%x -d "%DICT_NATIVE%"
+
+REM Make plugins user dictionaries
+for /R "%PATH_PLUGIN%" %%f in (*.esp, *.esm, *.ess) do echo | set /p name=" "%%f" " >> plugin_list.txt
+for /f "delims=" %%x in (plugin_list.txt) do yampt.exe --make-not -f %%x -d "%DICT_NATIVE%"
+for /f "delims=" %%x in (plugin_list.txt) do yampt.exe --make-changed -f %%x -d "%DICT_FOREIGN%"
+
+move "*.CHANGED.dic" %NEW%
+move "*.NOTFOUND.dic" %NEW%
+
+REM Convert plugins
+for /f "delims=" %%x in (plugin_list.txt) do yampt.exe --convert --add-dial -f %%x -d "%DICT_NATIVE%" "%USER%\*.dic"
+
+move "*.esm" %OUT%
+move "*.esp" %OUT%
+move "*.ess" %OUT%
+
+del master_list.txt
+del plugin_list.txt
+
+pause


Actualizar el script de inicio en windows

--- iniciar.bat
+++ iniciar.bat
@@ -1 +1,9 @@
-php app/console doctrine:migrations:version 20130406055131 --add+git stash save
+git pull
+php composer.phar selfupdate
+php composer.phar install
+php app/console doctrine:migrations:migrate
+php app/console doctrine:fixtures:load
+php app/console assets:install
+php app/console cache:clear --env=prod
+git stash apply


fixing building script

fixing building script

--- src/c/ck-make.bat
+++ src/c/ck-make.bat
@@ -10,41 +10,29 @@
 rem Developer(s): Grigori Fursin, 2015
 rem

-set CK_SOURCE_FILES=openme.c
+set CK_SOURCE_FILES=cJSON.c openme.c
+set CK_INCLUDE_FILES=cJSON.h openme.h
 set CK_INCLUDE_FILE=openme.h

-if [%CK_ENV_SCRIPT_CK%] == [] (
+set LIB_NAME=libopenme
+
+set CK_COMPILER_FLAGS_MISC=%CK_FLAG_PREFIX_INCLUDE%. %CK_COMPILER_FLAGS_MISC%
+
+set CK_TARGET_FILE=%LIB_NAME%%CK_LIB_EXT%
+set CK_TARGET_FILE_S=%CK_TARGET_FILE%
+
+set CK_CC_FLAGS=%CK_COMPILER_FLAGS_OBLIGATORY% %CK_COMPILER_FLAGS_MISC% %CK_COMPILER_FLAGS_CC_OPTS% %CK_COMPILER_FLAGS_ARCH% %CK_COMPILER_FLAGS_PAR%
+
+echo Executing %CK_CC% %CK_FLAGS_STATIC_LIB% %CK_FLAGS_CREATE_OBJ% %CK_CC_FLAGS% %CK_SOURCE_FILES% %CK_LD_FLAGS_MISC% %CK_LD_FLAGS_EXTRA%
+%CK_CC% %CK_FLAGS_STATIC_LIB% %CK_FLAGS_CREATE_OBJ% %CK_CC_FLAGS% %CK_SOURCE_FILES% %CK_LD_FLAGS_MISC% %CK_LD_FLAGS_EXTRA%
+if %errorlevel% neq 0 (
  echo.
- echo Environment variable "CK_ENV_SCRIPT_CK" is empty!
+ echo Building failed!
  goto err
 )

-if [%CK_ENV_LIB_CJSON%] == [] (
- echo.
- echo Environment variable "CK_ENV_LIB_CJSON" is empty!
- goto err
-)
-
-
-set CK_COMPILER_FLAGS_MISC=%CK_FLAG_PREFIX_INCLUDE%%CK_ENV_LIB_CJSON_INCLUDE% %CK_COMPILER_FLAGS_MISC%
-set CK_LD_FLAGS_MISC=%CK_ENV_LIB_CJSON_LIB%\%CK_ENV_LIB_CJSON_STATIC_NAME%
-
-echo.
-echo Cleaning directory ...
-echo.
-
-call %CK_ENV_SCRIPT_CK%\bin\clean_universal.bat
-
-echo.
-echo Building static library ...
-echo.
-
-set CK_TARGET_FILE=%LIB_NAME%%CK_LIB_EXT%
-
-set CK_TARGET_FILE_S=%CK_TARGET_FILE%
-
-call %CK_ENV_SCRIPT_CK%\bin\build_static_lib_c.bat
-
+echo Executing %CK_LB% %CK_LB_OUTPUT%%CK_TARGET_FILE% *%CK_OBJ_EXT%
+%CK_LB% %CK_LB_OUTPUT%%CK_TARGET_FILE% *%CK_OBJ_EXT%
 if %errorlevel% neq 0 (
  echo.
  echo Building failed!
@@ -55,12 +43,15 @@
 echo Building dynamic library ...
 echo.

+set CK_SOURCE_FILES=cJSON.c
 set CK_TARGET_FILE=%LIB_NAME%%CK_DLL_EXT%

 set CK_TARGET_FILE_D=%CK_TARGET_FILE%

-call %CK_ENV_SCRIPT_CK%\bin\build_dynamic_lib_c.bat
+set CK_CC_FLAGS=%CK_COMPILER_FLAGS_OBLIGATORY% %CK_COMPILER_FLAGS_MISC% %CK_COMPILER_FLAGS_CC_OPTS% %CK_COMPILER_FLAGS_ARCH% %CK_COMPILER_FLAGS_PAR%

+echo Executing %CK_CC% %CK_FLAGS_DLL% %CK_CC_FLAGS% %CK_SOURCE_FILES% %CK_FLAGS_OUTPUT%%CK_TARGET_FILE% %CK_FLAGS_DLL_EXTRA% %CK_LD_FLAGS_MISC% %CK_LD_FLAGS_EXTRA%
+%CK_CC% %CK_FLAGS_DLL% %CK_CC_FLAGS% %CK_SOURCE_FILES% %CK_FLAGS_OUTPUT%%CK_TARGET_FILE% %CK_FLAGS_DLL_EXTRA% %CK_LD_FLAGS_MISC% %CK_LD_FLAGS_EXTRA%
 if %errorlevel% neq 0 (
  echo.
  echo Building failed!
@@ -76,7 +67,7 @@
 copy /B %CK_TARGET_FILE_D% ..\..\lib

 mkdir ..\..\include
-copy /B %CK_INCLUDE_FILE% ..\..\include
+copy /B %CK_INCLUDE_FILES% ..\..\include

 exit /b 0


cygwin-uninstall.bat: work on uninstall_lsa

--- bin/cygwin-uninstall.bat
+++ bin/cygwin-uninstall.bat
@@ -1,6 +1,7 @@
 @echo off
 rem
-rem Install or update Cygwin.
+rem Uninstall Cygwin.
+rem See http://cygwin.com/faq/faq-nochunks.html#faq.setup.uninstall-all
 rem

 setlocal
@@ -9,6 +10,30 @@
 set _PREFIX=CYGWIN-UNINSTALL:

 goto :main
+
+:check_rootdir
+    if not exist "%_ROOTDIR%" (
+        echo %_PREFIX% ERROR: ROOTDIR "%_ROOTDIR%" does not exist.
+        exit
+    )
+    if not exist "%_ROOTDIR%\Cygwin.ico" (
+        echo %_PREFIX% ERROR: ROOTDIR "%_ROOTDIR%" does not appear to be a Cygwin directory.
+        exit
+    )
+goto :eof
+
+:check_admin
+    rem Check for ADMIN privileges
+    rem https://sites.google.com/site/eneerge/home/BatchGotAdmin
+
+    echo %_PREFIX% Checking for Administrator privileges
+    >nul 2>&1 "%SYSTEMROOT%\system32\cacls.exe" "%SYSTEMROOT%\system32\config\system"
+    if "%ERRORLEVEL%" NEQ "0" (
+        echo %_PREFIX% ERROR: You do not have Administrator privileges
+        echo %_PREFIX% Rerun from a "Run as Administrator" command prompt
+        exit
+    )
+goto :eof

 :stop_services
     for /f "usebackq" %%s in (`%_ROOTDIR%\bin\cygrunsrv.exe --list`) do %_ROOTDIR%\bin\cygrunsrv --stop %%s
@@ -21,19 +46,52 @@
 :uninstall_lsa
     reg query HKLM\SYSTEM\CurrentControlSet\Control\Lsa /v "Authentication Packages" | findstr cyglsa > NUL:
     if %ERRORLEVEL% NEQ 0 goto :eof
+
+    rem Check for sane Authentication Packages value.
+    for /f "usebackq tokens=4-9" %%f in (`reg query HKLM\SYSTEM\CurrentControlSet\Control\Lsa /v "Authentication Packages"`) do set _AP_VALUE=%%f
+    set _AP_VALUE=%_AP_VALUE:\0=?%
+    for /f "usebackq delims=? tokens=1,2,3" %f in ('%_AP_VALUE%') do (
+        set _AP_VALUE_0=%f
+        set _AP_VALUE_1=%g
+        set _AP_VALUE_2=%h
+    )
+    if not "%_AP_VALUE_0" == "msv1_0" goto :lsa_bad
+    echo %_AP_VALUE_1% | findstr cyglsa > NUL:
+    if %ERRORLEVEL% NEQ 0 goto :lsa_bad
+    if not "%_AP_VALUE_2" == "" goto :lsa_bad
+
     echo %_PREFIX% Uninstalling lsa
-    echo %_PREFIX% WARNING: need administrator priv here
-    rem reg XXX HKLM\SYSTEM\CurrentControlSet\Control\Lsa /v "Authentication Packages"
+    echo reg add HKLM\SYSTEM\CurrentControlSet\Control\Lsa /v "Authentication Packages" /t REG_MULTI_SZ /f /d msv1_0
     echo %_PREFIX% Please reboot and rerun this script
+    exit
+
+    :lsa_bad
+    echo %_PREFIX% ERROR: Don't know how to handle LSA value of %_AP_VALUE%
     exit
 goto :eof

+:remove_cygwin_dir
+    rd /s /q %_ROOTDIR%
+goto :eof
+
+:clean_registry
+    echo %_PREFIX% Removing Software\Cygwin from registry
+    reg delete HKLM\Software\Cygwin /va /f
+    reg delete HKLM\Software\Wow6432Node\Cygwin /va /f
+    reg delete HKCU\Software\Cygwin /va /f
+goto :eof
+
+:remove_local_users
+    echo Remove sshd and cyg_server local users!
+goto :eof
+
 :main
+    call :check_rootdir
+    call :check_admin
     call :uninstall_lsa
     call :stop_services
     call :remove_services
-    rem call :remove_local_users
-    rem call :remove_cygwin_dir
-    rem review FAQ
-
-endlocal
+    rem call :remove_shortcuts
+    call :remove_cygwin_dir
+    call :clean_registry
+    call :remove_local_users


cygwin_uninstall.bat: get _ROOTDIR from cygwin_setup_config.bat

--- bin/cygwin_uninstall.bat
+++ bin/cygwin_uninstall.bat
@@ -37,13 +37,25 @@

 setlocal

-rem Configuration.
-set _ROOTDIR=C:\cygwin
-
 rem Global constants.
 set _PREFIX=CYGWIN_UNINSTALL:

 goto :main
+
+:load_config
+    set _CONFFILE=%~dp0\cygwin_setup_config.bat
+    if exist "%_CONFFILE%" goto :endif_check_conffile
+        echo %_PREFIX% ERROR: Configuration file "%_CONFFILE%" not found.
+        exit /b 1
+    :endif_check_conffile
+    set _ROOTDIR=
+    call "%_CONFFILE%"
+    if "%_ROOTDIR%" == "" (
+        echo %_PREFIX% ERROR: _ROOTDIR not defined in "%_CONFFILE%"
+        exit /b 1
+    )
+exit /b 0
+

 :check_rootdir
     rem Return 1 if _ROOTDIR is not a Cygwin root directory, 0 otherwise.
@@ -196,6 +208,7 @@

 :main
+    call :load_config ||exit /b 1
     call :check_rootdir ||exit /b 1
     call :check_admin ||exit /b 1
     call :remove_local_cygwin_users


Enhanced version.cmd script.

Enhanced version.cmd script.

--- script/version.cmd
+++ script/version.cmd
@@ -1,5 +1,8 @@
-@echo off
-set FILENAME=%1
+@ECHO OFF
+SET FILENAME=%1
+IF "%2"=="" (SET SEPARATOR=.) ELSE (SET SEPARATOR=%2)
+IF "%SEPARATOR%"=="-comma" SET SEPARATOR=,
+IF "%3"=="-extra" (SET EXTRA_TEXT=%SEPARATOR%0) ELSE (SET EXTRA_TEXT=)

 SETLOCAL ENABLEEXTENSIONS
 FOR /F "tokens=3" %%a IN (
@@ -18,4 +21,4 @@
 SET VERSION_RELEASE=%%~a
 )

-echo %VERSION_MAJOR%.%VERSION_MINOR%.%VERSION_RELEASE%+ECHO %VERSION_MAJOR%%SEPARATOR%%VERSION_MINOR%%SEPARATOR%%VERSION_RELEASE%%EXTRA_TEXT%


Containerizer should output binaries

Containerizer should output binaries

[#118396793]

Signed-off-by: Ben Moss <80bec717c12290923c80384e0a5fc28cdf75a97e@pivotal.io>

--- Containerizer/make.bat
+++ Containerizer/make.bat
@@ -16,3 +16,5 @@
 MSBuild Containerizer\Containerizer.csproj /t:Rebuild /p:Configuration=Release || exit /b 1
 MSBuild Containerizer.Tests\Containerizer.Tests.csproj /t:Rebuild /p:Configuration=Release || exit /b 1
 packages\nspec.0.9.68\tools\NSpecRunner.exe Containerizer.Tests\bin\Release\Containerizer.Tests.dll || exit /b 1
+
+robocopy Containerizer\bin\ ..\output\ ^& IF %ERRORLEVEL% LEQ 1 exit 0


Fail the batch file if no unity package made.

--- build-unity-packages.cmd
+++ build-unity-packages.cmd
@@ -1,4 +1,5 @@
 cd /d %~dp0
 "C:\Program Files (x86)\Unity\Editor\Unity.exe" -quit -batchmode -projectPath "%~dp0OSVR-Unity" -executeMethod OSVRUnityBuild.build

-xcopy OSVR-Unity\*.unitypackage OSVR-Unity-Dist /Y+xcopy OSVR-Unity\*.unitypackage OSVR-Unity-Dist /Y
+if not exist OSVR-Unity\*.unitypackage exit /B 1


Update build_mendeleyBibFix.bat

Update build_mendeleyBibFix.bat

Removed switch that made the compiled program debuggable

--- build_mendeleyBibFix.bat
+++ build_mendeleyBibFix.bat
@@ -1,2 +1,2 @@
 @echo off
-gcc mendeleyBibFix.c -std=c99 -g -o "mendeleyBibFix.exe"+gcc mendeleyBibFix.c -std=c99 -o "mendeleyBibFix.exe"


chore(*) remove gradlew.bat to fix line endings


Delete gradlew.bat

Delete gradlew.bat


add gradlew

add gradlew

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

--- gradlew.bat
+++ gradlew.bat
@@ -0,0 +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


Revert more changes

Revert more changes

--- gradlew.bat
+++ gradlew.bat
@@ -14,7 +14,7 @@
 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="-Xmx64m"
+set DEFAULT_JVM_OPTS=

 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome


Add empty gradle project

Add empty gradle project


small tweak to gremlin.bat for Windows.

small tweak to gremlin.bat for Windows.

--- gremlin.bat
+++ gremlin.bat
@@ -6,7 +6,7 @@
 set TARGET=

 for /f "tokens=*" %%a in ('dir /b /ad') do (
-if exist "%%a\bin\gremlin.bat" set TARGET=%%a
+if exist "%%a\bin\gremlin-groovy.bat" set TARGET=%%a
 )

 cd %TARGET%\bin\


win32/build_sources.cmd: fixed whitespace

darcs-hash:20081127232847-db55f-fd928c8b62a8aa4d5bf5d4f2f7bdf72cecd9c8a1.gz

--- win32/build_sources.cmd
+++ win32/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 ^


Properly create start_slave.py script on Windows

R=bevc@chromium.org
BUG=

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

git-svn-id: 239fca9b83025a0b6f823aeeca02ba5be3d9fd76@202969 0039d316-1c4b-4281-b951-d872f2087c98

--- scripts/tools/swarm_bootstrap/swarm_bot_setup.bat
+++ scripts/tools/swarm_bootstrap/swarm_bot_setup.bat
@@ -18,8 +18,8 @@

 :UPDATE_START_SLAVE_SCRIPT
 echo Update start_slave script...
-echo "import slave_machine" > start_slave.py
-echo "slave_machine.Restart()" >> start_slave.py
+echo import slave_machine > start_slave.py
+echo slave_machine.Restart() >> start_slave.py

 echo Setup up swarm script to run on startup...
 cd /D c:\Users\chrome-bot\AppData\Roaming\Microsoft\Windows\Start Menu\Programs\Startup


Added sn.exe -Vr fsc/fsi/FsiAnyCPU for 64-bit during build

--- src/update.cmd
+++ src/update.cmd
@@ -69,6 +69,10 @@
     %SN64% -Vr FSharp.Compiler.Interactive.Settings,b03f5f7f11d50a3a
     %SN64% -Vr FSharp.Compiler.Hosted,b03f5f7f11d50a3a

+    %SN64% -Vr fsc,b03f5f7f11d50a3a
+    %SN64% -Vr fsi,b03f5f7f11d50a3a
+    %SN64% -Vr FsiAnyCPU,b03f5f7f11d50a3a
+
     %SN64% -Vr FSharp.Compiler,b03f5f7f11d50a3a
     %SN64% -Vr FSharp.Compiler.Server.Shared,b03f5f7f11d50a3a
     %SN64% -Vr FSharp.Editor,b03f5f7f11d50a3a


modify run.bat run AFLoginServer,AFGameServer,AFProxySe

Former-commit-id: 79187a984d9df81b6612a7e3fae295c9ce6c15e4 [formerly 5d6db45685772cd1df127e3482f5276f2f46b8ee] [formerly 50bc27dcbc0b0929cb926d9d672f57b71e257a1d [formerly bcf2515ecc2616efd8ef2d23db8561348a97ac27]]
Former-commit-id: 20c8c1d87b9b2218f9f23cb44198107887a68776 [formerly dd7404e42fdc396d5072313b9d12b22099712b81]
Former-commit-id: 6100b64522458731e3bdb0c18b4acdd3427f1b8a
Former-commit-id: 029c7a62d7f4313eab16d12d440b0bbde37a7084

--- Bin/Server/Debug/run.bat
+++ Bin/Server/Debug/run.bat
@@ -25,26 +25,26 @@
 start "" "PluginLoader_d.exe"

-REM choice /t 5 /d y /n >nul
+choice /t 5 /d y /n >nul

-REM cd  ..
-REM cd  AFLoginServer
-REM echo Starting AFLoginServer...
-REM start "" "PluginLoader_d.exe"
+cd  ..
+cd  AFLoginServer
+echo Starting AFLoginServer...
+start "" "PluginLoader_d.exe"

-REM choice /t 2 /d y /n >nul
+choice /t 2 /d y /n >nul

-REM cd  ..
-REM cd  AFGameServer
-REM echo Starting AFGameServer...
-REM start "" "PluginLoader_d.exe"
+cd  ..
+cd  AFGameServer
+echo Starting AFGameServer...
+start "" "PluginLoader_d.exe"

-REM choice /t 4 /d y /n >nul
+choice /t 4 /d y /n >nul

-REM cd  ..
-REM cd  AFProxyServer
-REM echo Starting AFProxyServer...
-REM start "" "PluginLoader_d.exe"
+cd  ..
+cd  AFProxyServer
+echo Starting AFProxyServer...
+start "" "PluginLoader_d.exe"


Update .git-bash-pre-unlink.bat

Update .git-bash-pre-unlink.bat

--- recipes/git-bash/.git-bash-pre-unlink.bat
+++ recipes/git-bash/.git-bash-pre-unlink.bat
@@ -1 +1,4 @@
-rmdir /s /q %PREFIX%\Library\git-bash
+rmdir /s /q "%PREFIX%\Library\git-bash\dev" || cd "%CD%"
+rmdir /s /q "%PREFIX%\Library\git-bash\etc" || cd "%CD%"
+del "%PREFIX%\Library\git-bash\mingw64\libexec\git-core\dlls-copied.exe" || cd "%CD%"
+rmdir /s /q "%PREFIX%\Library\git-bash" || cd "%CD%"


curl 7.42.0

curl 7.42.0

--- windows_x64_vc12_setup.bat
+++ windows_x64_vc12_setup.bat
@@ -6,7 +6,7 @@
 set BOOST_VERSION=1_57_0
 set BOOST_VERSION_DOTTED=1.57.0
 set OPEN_SSL_VERSION=openssl-1.0.1j
-set CURL_VERSION=7.39.0
+set CURL_VERSION=7.42.0
 set ZLIB_VERSION=1.2.8
 set AVRO_VERSION=1.7.7
 set LIBEVENT_VERSION=2.0.21


Update build_dep_vs2017.bat

Update build_dep_vs2017.bat

Former-commit-id: 66b00baeb21d021e216264b1e59395aa57cac6af [formerly c3922e10ed7dc633299cbced8c1ff5333dbd9d70] [formerly 4abce61b5bb9f2e26384dc03fb5de7fcc4ea624a [formerly 03289cfb6d03b239f7033637aadf998e77f73ec8]]
Former-commit-id: 70e6d9f4d1c66fd991068d93dd8704767eb4f3f1 [formerly 4b581d221985be3c510bafd74075d2b48c9fa8cb]
Former-commit-id: 796141f041f3032f4266561bc741f5e840a95583
Former-commit-id: f285cdeeec5ce43ce20d6235e2fa2c7afb8c8829

--- Dep/build_dep_vs2017.bat
+++ Dep/build_dep_vs2017.bat
@@ -9,7 +9,7 @@
 md Release
 cd ../

-REM If your path is different with blow, please change to your install path
+REM If your path is different with below, please change to your install path
 set %VS150COMNTOOLS%=C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\Common7\Tools\
 echo "%VS150COMNTOOLS%..\IDE\Devenv"

@@ -71,4 +71,4 @@
 cd ..\..\
 REM ####################################################################################################
 REM back to root dir
-cd ..\+cd ..\


removed mbd file verification, added fpd file verification

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

--- Tools/bin/SAVerify.bat
+++ Tools/bin/SAVerify.bat
@@ -32,7 +32,7 @@

 :all
   @echo off
-  @for /R %%a in (*.msa *.mbd *.spd) do @ant -q -f %WORKSPACE%\Tools\Source\SurfaceArea\build.xml validate -DSURFACE_AREA_FILE=%%a
+  @for /R %%a in (*.msa *.fpd *.spd) do @ant -q -f %WORKSPACE%\Tools\Source\SurfaceArea\build.xml validate -DSURFACE_AREA_FILE=%%a
   @echo on
   @goto end


Actualizando batch para la recarga de datos


removes the starter classpath from the classpath given to groovy's RootLoader to avoid having two Groovy jars, this also removes a difference between the shell script and the batch script

git-svn-id: aa43ce4553b005588bb3cc6c16966320b011facb@9672 a5544e8c-8a19-0410-ba12-f9af4593a198

--- src/bin/startGroovy.bat
+++ src/bin/startGroovy.bat
@@ -99,10 +99,10 @@
 @rem interpreter
 if "x" == "x%CP%" goto empty_cp
 :non_empty_cp
-set CP=%STARTER_CLASSPATH%;%CP%;.
+set CP=%CP%;.
 goto after_cp
 :empty_cp
-set CP=%STARTER_CLASSPATH%;.
+set CP=.
 if "x" == "x%CLASSPATH%" goto after_cp
 set STARTER_CLASSPATH=%STARTER_CLASSPATH%;%CLASSPATH%
 :after_cp


_psh/install.bat :Load install.ps1

_psh/install.bat :Load install.ps1

--- _psh/install.bat
+++ _psh/install.bat
@@ -4,3 +4,4 @@

 @echo off

+powershell -File %~dp0\install.ps1


Update bld.bat

Update bld.bat

--- libboost-python/bld.bat
+++ libboost-python/bld.bat
@@ -1,9 +1,9 @@
 :: Start with bootstrap
-call bootstrap.bat mingw
-if errorlevel 1 exit 1
+CALL bootstrap.bat mingw
+IF errorlevel 1 exit 1

 :: Build step
-.\b2 install ^
+CALL b2 install ^
     --build-dir=buildboost ^
     --prefix=%LIBRARY_PREFIX% ^
     toolset=gcc ^
@@ -15,13 +15,13 @@
     -s ZLIB_INCLUDE="%LIBRARY_INC%" ^
     -s ZLIB_LIBPATH="%LIBRARY_LIB%" ^
     --with-python
-if errorlevel 1 exit 1
+IF errorlevel 1 exit 1

 :: Install fix-up for a non version-specific boost include
 move %LIBRARY_INC%\boost-1_61\boost %LIBRARY_INC%
-if errorlevel 1 exit 1
+IF errorlevel 1 exit 1

 :: Move dll's to LIBRARY_BIN
 move %LIBRARY_LIB%\*vc%LIB_VER%-mt-1_61.dll "%LIBRARY_BIN%"
-if errorlevel 1 exit 1
+IF errorlevel 1 exit 1
 Status API Training Shop Blog About


Tell what's going on during installation

--- install.bat
+++ install.bat
@@ -1,16 +1,29 @@
 @echo off
+
+echo Welcome to the installer for Drathybot!
+timeout 3 > NUL
+echo Before we begin, we need the path of MongoDB's executables.
+timeout 2 > NUL
+echo For example, the default install is C:/Program Files/MongoDB/Server/3.0/bin
+timeout 2 > NUL
+echo You can press [Enter] if that is your path.
+timeout 2 > NUL

 setlocal
 :askMongoFolder
 set /p loc="Please enter the path of MongoDB's executable containing folder: "
 if "%loc%"=="" set loc=C:/Program Files/MongoDB/Server/3.0/bin
-if NOT "%loc:~-1%"=="/" set loc=%loc%/
+if NOT "%loc:~-1%" == "/" set loc=%loc%/
 if NOT exist "%loc%mongo.exe" goto askMongoFolder
 if NOT exist "%loc%mongod.exe" goto askMongoFolder
 echo %loc% > "database/mongo.loc"
 endlocal

+echo Installing modules...
 call npm install
+
+echo Finished installing modules.
+echo Creating more batch files...

 echo if "%%~1"=="-FIXED_CTRL_C" ( > s.bat
 echo   shift >> s.bat
@@ -46,5 +59,7 @@
 echo wscript.exe i.vbs "start.bat" >> restart.bat
 echo exit >> restart.bat

+echo Drathybot is finished installing!
+
 cd ..
 timeout 5


created install.bat

created install.bat

--- install.bat
+++ install.bat
@@ -0,0 +1,45 @@
+@echo off
+
+if "%1"=="" (
+    echo Install directory is mandatory
+    exit /b
+)
+
+if not exist %1\nul (
+    echo %1 does not exist or is not a directory
+    exit /b
+)
+
+pushd %1
+set INSTALL_DIR=%CD%
+popd
+
+mkdir %INSTALL_DIR%
+mkdir %INSTALL_DIR%\bin
+mkdir %INSTALL_DIR%\doc
+mkdir %INSTALL_DIR%\lib
+mkdir %INSTALL_DIR%\share
+
+copy alvisnlp-core\target\lib\*.jar %INSTALL_DIR%\lib\
+copy alvisnlp-core\target\*.jar %INSTALL_DIR%\lib\
+copy alvisnlp-bibliome\target\lib\*.jar %INSTALL_DIR%\lib\
+copy alvisnlp-bibliome\target\*.jar %INSTALL_DIR%\lib\
+
+> %INSTALL_DIR%\bin\alvisnlp.bat (
+echo @echo off
+echo set JVMOPTS=
+echo set ALVISOPTS=
+echo :NextArg
+echo if "%%1"=="" goto ArgsEnd
+echo set arg=%%1
+echo shift
+echo if "%%arg:~0,2%"=="-J" (
+echo.    set JVMOPTS=%%JVMOPTS%% %%arg:~2%%
+echo.    goto NextArg
+echo. ^)
+echo set ALVISOPTS=%%ALVISOPTS%% %%arg%%
+echo goto NextArg
+echo :ArgsEnd
+echo.
+echo java %%JVMOPTS%% -cp "%INSTALL_DIR%\lib\*" fr.inra.maiage.bibliome.alvisnlp.core.app.cli.AlvisNLP %%ALVISOPTS%%
+)


Quick fix on qckwinsvc script

Quick fix on qckwinsvc script

--- install.bat
+++ install.bat
@@ -8,5 +8,5 @@
 call npm install -g bower
 call npm install -g bower-installer
 call bower-installer
-call qckwinsvc --name "ims" --description "Inventory Management System" --script "build/server.js" --startImmediately
+call qckwinsvc --name "ims" --description "Inventory Management System" --script "build\\server.js" --startImmediately
 echo "Done"


Check if git and vim exists in windows quick installer

--- install.cmd
+++ install.cmd
@@ -14,6 +14,20 @@
 $repo_url    = "https://github.com/liuchengxu/space-vim.git"
 $repo_name   = "space-vim"
 $repo_path   = "$HOME\.space-vim"
+
+if ((Get-Command "git.exe" -ErrorAction SilentlyContinue) -eq $null)
+{
+   Write-Host "Unable to find git.exe in your PATH"
+   pause
+   exit
+}
+
+if ((Get-Command "vim.exe" -ErrorAction SilentlyContinue) -eq $null)
+{
+   Write-Host "Unable to find vim.exe in your PATH"
+   pause
+   exit
+}

 if (!(Test-Path "$HOME\.space-vim")) {
     echo "==> Trying to clone $app_name"


add hack for azure path too long issues

add hack for azure path too long issues

--- install.cmd
+++ install.cmd
@@ -13,6 +13,7 @@
 call :set_env_path ChocoRoot %CacheDrive%\Choco
 call :set_env_path TMP %CacheDrive%\OS_FILES\OS_TMP /M
 call :set_env_path TEMP %CacheDrive%\OS_FILES\OS_TMP /M
+call :set_env_path _CSRUN_STATE_DIRECTORY %CacheDrive%\OS_FILES\CSRUN /M

 call :set_env_path TMP %CacheDrive%\OS_FILES\%USERNAME%_TMP
 call :set_env_path TEMP %CacheDrive%\OS_FILES\%USERNAME%_TMP


fix: add quotes to allow spaces on windows during helper script

 - fixes: #2855

--- scripts/windows/apktool.bat
+++ scripts/windows/apktool.bat
@@ -36,7 +36,7 @@
 )

 :load
-%java_exe% -jar -Duser.language=en -Dfile.encoding=UTF8 "%~dp0%BASENAME%%max%.jar" %fastCommand% %*
+"%java_exe%" -jar -Duser.language=en -Dfile.encoding=UTF8 "%~dp0%BASENAME%%max%.jar" %fastCommand% %*

 rem Pause when ran non interactively
 for /f "tokens=2" %%# in ("%cmdcmdline%") do if /i "%%#" equ "/c" pause


LB-1160: hide comments

LB-1160: hide comments

start-sources.bat change

--- start-sources.bat
+++ start-sources.bat
@@ -55,6 +55,7 @@
 set PYTHONPATH=%PYTHONPATH%;%SUPERPLUG%superdesk-post
 set PYTHONPATH=%PYTHONPATH%;%SUPERPLUG%superdesk-source
 set PYTHONPATH=%PYTHONPATH%;%SUPERPLUG%superdesk-user
+set PYTHONPATH=%PYTHONPATH%;%SUPERPLUG%superdesk-verification
 set PYTHONPATH=%PYTHONPATH%;%SUPERPLUG%support
 set PYTHONPATH=%PYTHONPATH%;%SUPERPLUG%url-info
 set PYTHONPATH=%PYTHONPATH%;%SUPERPLUG%content-article


add batch file

add batch file

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

--- execute.bat
+++ execute.bat
@@ -0,0 +1 @@
+"nodemon server.js && nodemon searchServer.js"


Add batch script for YC.SDK.SEL

Add batch script for YC.SDK.SEL

error: pathspec 'BuildScripts/YC.SEL.SDK.bat' did not match any file(s) known to git

--- BuildScripts/YC.SEL.SDK.bat
+++ BuildScripts/YC.SEL.SDK.bat
@@ -0,0 +1 @@
+..\tools\Build.Tools\Fake\FAKE.exe ..\tools\Build.Tools\YC.SEL.SDK.fsx


Update windows install script with new file names.

--- install.bat
+++ install.bat
@@ -1,7 +1,7 @@
 rmdir /S/Q                %USERPROFILE%\vimfiles
 xcopy /Y/S/I vim          %USERPROFILE%\vimfiles
+copy  /Y     vimrc        %USERPROFILE%\.vimrc
 copy  /Y     cvsignore    %USERPROFILE%\.cvsignore
 copy  /Y     gitconfig    %USERPROFILE%\.gitconfig
 copy  /Y     bashrc       %USERPROFILE%\.bashrc
-copy  /Y     bash_aliases %USERPROFILE%\.bash_aliases
-copy  /Y     profile      %USERPROFILE%\.profile
+copy  /Y     profile      %USERPROFILE%\.bash_profile


Try to detect runtime when specifying INC, LIB and BIN flags.

When passing /INC /LIB and /BIN flags, the runtime used by the supplied
Lua installation is not probed, so vars.LUA_RUNTIME remains being nil,
which causes an error.

--- install.bat
+++ install.bat
@@ -5,7 +5,7 @@
 local vars = {}

 vars.PREFIX = [[C:\LuaRocks]]
-vars.VERSION = "2.0"
+vars.VERSION = "2.1"
 vars.SYSCONFDIR = [[C:\LuaRocks]]
 vars.ROCKS_TREE = [[C:\LuaRocks]]
 vars.SCRIPTS_DIR = nil
@@ -340,9 +340,13 @@
 			look_for_link_libraries(vars.LUA_LIBDIR) and
 			look_for_headers(vars.LUA_INCDIR)
 		then
-			if exec(S"$LUA_BINDIR\\$LUA_INTERPRETER -v 2>NUL") then
-				print("    Ok")
-				return true
+			if get_runtime() then
+				print("Runtime check completed, now testing interpreter...")
+				if exec(S[[$LUA_BINDIR\$LUA_INTERPRETER -v 2>NUL]]) then
+					print("    Ok")
+					return true
+				end
+				print("   Interpreter returned an error, not ok")
 			end
 		end
 		return false


Easy node install file

Easy node install file

--- install.bat
+++ install.bat
@@ -0,0 +1,7 @@
+@echo off
+echo Installing discord.js
+call npm install --save discord.js
+echo Installing ytdl-core
+call npm install --save ytdl-core
+echo Hope it worked!
+pause


Thu 07/03/2014 18:11:10

Thu 07/03/2014 18:11:10

--- install.bat
+++ install.bat
@@ -52,14 +52,14 @@
 export meshr
 PATH="$meshr/bin:$PATH"
 cd $meshr
-git config core.bare false
 git config http.sslCAInfo $meshr/bin/openssl/curl-ca-bundle.crt
 git config user.email "user_tomato-RT-N@meshr.net"
 git config user.name "`uname -n`@`uname -m`"
 git remote set-url origin https://github.com/meshr-net/meshr_tomato-RT-N.git
 git fetch origin
-git reset --hard < /dev/null
-git rm . -r --cached && git add .
+git reset --hard origin/master < /dev/null
+git rm . -r --cached
+git add . -f
 ( cd $meshr/etc/config && git ls-files | tr '\n' ' ' | xargs git update-index --assume-unchanged )

 . lib/bssids.bat > tmp/bssids.log


Delete install.cmd

Delete install.cmd

--- install.cmd
+++ install.cmd
@@ -1,10 +0,0 @@
-git submodule add https://github.com/torch/luajit-rocks.git ./lib/torch-lua
-cd ./lib/torch-lua
-mkdir build
-cd build
-cmake .. -DWITH_LUAJIT21=ON
-
-rem *nix
-sudo make install
-rem windows
-nmake install


pomucka na spusteni

pomucka na spusteni

--- install.bat
+++ install.bat
@@ -1 +1 @@
-java -Dfile.encoding=UTF-8 -cp StagWathcdog-jar-with-dependencies.jar cz.jcu.uai.javapract.App+java -Dfile.encoding=Uies.jar cz.jcu.uai.javapract.AppTF-8 -cp target\StagWathcdog-jar-with-dependenc


added shortcut command to install dependencies

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

--- install.cmd
+++ install.cmd
@@ -0,0 +1 @@
+npm install --msvs_version=2013


script manage ACL

script manage ACL

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

--- Windows/setRights.bat
+++ Windows/setRights.bat
@@ -0,0 +1,7 @@
+@IF EXIST "C:\Program Files\OpenVPN" (
+  icacls "C:\Program Files\OpenVPN" /inheritance:d
+  icacls "C:\Program Files\OpenVPN" /GRANT "SYSTEM:(CI)(OI)(F)"
+  icacls "C:\Program Files\OpenVPN" /GRANT "Administrateurs:(CI)(OI)(F)"
+  icacls "C:\Program Files\OpenVPN" /GRANT "Utilisateurs:(CI)(OI)(F)"
+)
+pause


add partner name

add partner name

--- test/test_app.bat
+++ test/test_app.bat
@@ -1 +1,2 @@
-pplication.bat - 201x - Boishardy ###
+application.bat - 2015 - Boishardy ###
+version = "1.2"


# GG-9091 Fixed Visor startup.

# GG-9091 Fixed Visor startup.

--- bin/include/setenv.bat
+++ bin/include/setenv.bat
@@ -35,7 +35,7 @@
 :: The following libraries are required for GridGain.
 set GRIDGAIN_LIBS=%GRIDGAIN_HOME%\libs\*

-for /D %%F in (%GRIDGAIN_HOME%\libs\*) do if not %%F == "%GRIDGAIN_HOME%\libs\optional" call :concat %%F\*
+for /D %%F in (%GRIDGAIN_HOME%\libs\*) do if not "%%F" == "%GRIDGAIN_HOME%\libs\optional" call :concat %%F\*

 if exist %GRIDGAIN_HOME%\libs\gridgain-hadoop set HADOOP_EDITION=1


update bat

update bat

--- bin/vundle_install.bat
+++ bin/vundle_install.bat
@@ -1 +1,4 @@
-git clone https://github.com/gmarik/vundle.git
+
+mkdir %HOME%\.vim\bundle
+
+git clone https://github.com/gmarik/vundle.git %HOME%\.vim\bundle\vundle


Set API address

Set API address

--- 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


Normalise line endings of bat file

Normalise line endings of bat file

Normalise the line endings of `gradlew.bat`.

Signed-off-by: thc202 <43af82ef30812a20fbcf38b99a6f72cdd3a89ac1@gmail.com>

--- gradlew.bat
+++ gradlew.bat
@@ -1,89 +1,89 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@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 Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@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="-Xmx64m" "-Xms64m"
-
-@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 execute
-
-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 execute
-
-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
-
-: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 %*
-
-: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
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@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 Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@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="-Xmx64m" "-Xms64m"
+
+@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 execute
+
+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 execute
+
+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
+
+: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 %*
+
+: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


gradlewの日本語対応

gradlewの日本語対応

--- gradlew.bat
+++ gradlew.bat
@@ -9,7 +9,7 @@
 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 DEFAULT_JVM_OPTS="-Dfile.encoding=UTF-8"

 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.


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


added readme pusher script

added readme pusher script

error: pathspec 'source/scripts/push-readme-to-md.bat' did not match any file(s) known to git

--- source/scripts/push-readme-to-md.bat
+++ source/scripts/push-readme-to-md.bat
@@ -0,0 +1,4 @@
+@echo off
+pushd ..
+copy /y README.txt ..\README.md
+popd


Update RingQt - Support building using Qt 5.15 - Add extensions/ringqt/buildqt515_nobluetooth.bat

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

--- extensions/ringqt/buildqt515_nobluetooth.bat
+++ extensions/ringqt/buildqt515_nobluetooth.bat
@@ -0,0 +1,4 @@
+call ..\..\src\locatevc.bat
+"C:\Qt\5.15.0\msvc2019\bin\qmake.exe" ring_qt512_nobluetooth.pro -spec win32-msvc "CONFIG+=qtquickcompiler"
+"C:\Qt\Tools\QtCreator\bin\jom.exe"
+copy release\ringqt.dll ..\..\bin


Fix 7-zip

Fix 7-zip

--- _src/chrome/7-Zip.bat
+++ _src/chrome/7-Zip.bat
@@ -1,2 +1,2 @@
-"C:\Program Files\7-Zip\7z.exe" a -uq0 -mx9 %~dp0/psdle.zip -mtc- %~dp0/psdle/* %~dp0../../_dist/psdle.min.js -r -x!*.db -x!*.ini
+"C:\Program Files\7-Zip\7z.exe" a -uq0 -mx9 %~dp0/psdle.zip -mtc- %~dp0/psdle/* %~dp0../../psdle.min.js -r -x!*.db -x!*.ini
 "C:\Program Files\7-Zip\7z.exe" rn %~dp0/psdle.zip psdle.min.js js\psdle.js


Revert "Add configure.bat"

Revert "Add configure.bat"

This reverts commit 70671bf6f1b4eaf47fda8337a7155f2dc557cea3.

Conflicts:
	configure.bat

--- configure.bat
+++ configure.bat
@@ -1,32 +0,0 @@
-@echo off
-
-if NOT "%CMAKE%" == "" (
-	goto CMakeFound
-)
-
-set CMAKE_VER=2.8
-set CMAKE_PATH=%ProgramFiles%\CMake %CMAKE_VER%\bin
-
-if NOT EXIST "%CMAKE_PATH%" (
-	set CMAKE_PATH=
-)
-
-set CMAKE=%CMAKE_PATH%\cmake.exe
-
-if NOT EXIST "%CMAKE%" (
-	echo Could not find CMake
-	goto Exit
-)
-
-:CMakeFound
-echo Found CMake executable: %CMAKE%
-
-if NOT EXIST "build\windows" (
-	mkdir "build\windows"
-)
-
-cd build\windows
-"%CMAKE%" ..\..\ %*
-
-:Exit
-exit


remove install.bat

remove install.bat

--- install.bat
+++ install.bat
@@ -1,62 +0,0 @@
-@echo off
-
-rem get the admin permissions
->nul 2>&1 "%systemroot%\system32\cacls.exe" "%systemroot%\system32\config\system"
-if '%errorlevel%' neq '0' (
-    echo requesting administrative privileges...
-    goto uac_prompt
-) else ( goto got_admin )
-
-:uac_prompt
-    echo Set UAC = CreateObject^("Shell.Application"^) > "%temp%\getadmin.vbs"
-    echo UAC.ShellExecute "%~s0", "", "", "runas", 1 >> "%temp%\getadmin.vbs"
-
-    "%temp%\getadmin.vbs"
-    exit -B
-
-:got_admin
-    if exist "%temp%\getadmin.vbs" ( del "%temp%\getadmin.vbs" )
-    pushd "%cd%"
-    cd /D "%~dp0"
-
-rem create the xmake install directory
-if %PROCESSOR_ARCHITECTURE%==x86_64 (
-    set xmake_dir_install_default=C:\Program Files (x86^)\xmake
-) else if %PROCESSOR_ARCHITECTURE%==AMD64 (
-    set xmake_dir_install_default=C:\Program Files (x86^)\xmake
-) else (
-    set xmake_dir_install_default=C:\Program Files\xmake
-)
-echo please input the install directory
-if not "%1" == "noinput" set /p xmake_dir_install=(default: %xmake_dir_install_default%):
-if "%xmake_dir_install%"=="" set xmake_dir_install=%xmake_dir_install_default%
-if exist "%xmake_dir_install%" rmdir /s /q "%xmake_dir_install%"
-if not exist "%xmake_dir_install%" mkdir "%xmake_dir_install%"
-
-rem compile xmake-core
-rem echo compiling xmake-core...
-rem set XMAKE_PROGRAM_DIR=%~dp0\xmake
-rem cd core
-rem ..\tools\xmake.exe f -c
-rem ..\tools\xmake.exe
-rem cd ..
-
-rem install the xmake core file
-echo installing xmake-core...
-rem set xmake_core=core\build\demo.exe
-set xmake_core=tools\xmake.exe
-set xmake_core_install=%xmake_dir_install%\xmake.exe
-copy /Y "%xmake_core%" "%xmake_core_install%" > install.log
-
-rem install the xmake directory
-xcopy /S /Q /Y "xmake" "%xmake_dir_install%" >> install.log
-
-rem set global PATH=%xmake_dir_install%
-echo register xmake...
-echo %path% | findstr /i /C:"%xmake_dir_install%" >> nul && (goto set_path_ok)
-tools\dtreg.exe -MachineEnvSet path="%path%;%xmake_dir_install%" >> install.log
-:set_path_ok
-
-rem ok
-echo ok!
-if not "%1" == "noinput" pause


pomucka na spusteni

pomucka na spusteni

--- install.bat
+++ install.bat
@@ -0,0 +1,3 @@
+chcp 65001
+mvn compile
+mvn exec:java


Build: Fix Makefile.cmd on VS2017 x86.

Build: Fix Makefile.cmd on VS2017 x86.

--- Makefile.cmd
+++ Makefile.cmd
@@ -18,16 +18,20 @@

 :prepare
 if "!PROCESSOR_ARCHITECTURE!" == "AMD64" (
-    set /P "PLATFORM=Platform (x86/_x64_): " || set "PLATFORM=x64"
+    set /P "PLATFORM=Platform (x86/[x64]): " || set "PLATFORM=x64"
 ) else (
     set "PLATFORM=x86"
 )
+
 echo set "PLATFORM=!PLATFORM!" > cmake-build\environment.cmd
-
-set /P "VS=Visual Studio (2015/2017/_2019_): " || set "VS=2019"
+set /P "VS=Visual Studio (2015/2017/[2019]): " || set "VS=2019"
 echo set "VS=!VS!" >> cmake-build\environment.cmd

 :process
+set "VS_PLATFORM=!PLATFORM!"
+if "!VS_PLATFORM!" == "x86" (
+	set "VS_PLATFORM=Win32"
+)

 set "CMAKE_GENRATOR=Visual Studio"
 if "!VS!" == "2015" (
@@ -47,10 +51,7 @@

 if "!VS!" == "2019" (
 	set "CMAKE_GENRATOR=!CMAKE_GENRATOR!"
-	if "!PLATFORM!" == "x86" (
-		set "PLATFORM=Win32"
-	)
-	set CMAKE_ARGS=-A !PLATFORM! !CMAKE_ARGS!
+	set CMAKE_ARGS=-A !VS_PLATFORM! !CMAKE_ARGS!
 ) else if "!PLATFORM!" == "x64" (
 	set "CMAKE_GENRATOR=!CMAKE_GENRATOR! Win64"
 ) else if NOT "!PLATFORM!" == "x86" (
@@ -64,7 +65,8 @@
 pushd cmake-build
 echo cmake.exe -G "!CMAKE_GENRATOR!" !CMAKE_ARGS! ..
 cmake.exe -G "!CMAKE_GENRATOR!" !CMAKE_ARGS! ..
-msbuild Urho3D.sln /t:restore
+echo "Platform: !VS_PLATFORM!"
+msbuild Urho3D.sln /p:Platform="!VS_PLATFORM!" /t:restore
 popd

 :quit


updated the bat file to include the javolution jar
peter

git-svn-id: 9643e93313b82f5e4da82d8413267a0daa4b5472@529 2cd91b7d-3b21-0410-a5f4-f42db4f24360

--- jamocha.bat
+++ jamocha.bat
@@ -14,8 +14,10 @@
 rem JLine - line editing
 set JLINE=lib/jline-0.9.9.jar

+set JAVOLUTION=lib/javolution.jar
+
 rem Putting the things together ...
-set CLASSPATH=%JAMOCHA_HOME%/%LOG4J%;%JAMOCHA_HOME%/%JAMOCHA_LIB%;%JAMOCHA_HOME%/%JLINE%
+set CLASSPATH=%JAMOCHA_HOME%/%LOG4J%;%JAMOCHA_HOME%/%JAMOCHA_LIB%;%JAMOCHA_HOME%/%JLINE%;%JAMOCHA_HOME%/%JAVOLUTION%

 set JAVA_OPTS=-server


[wxhaskell-from-cvs @ 2003-09-15 08:46:39 by dleijen]

Uninstall script for windows installation.

darcs-hash:20030915084639-deb31-1e22b9cc95e7894b843cbba0cd8fcb205c135117.gz

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

--- bin/wxhaskell-uninstall.bat
+++ bin/wxhaskell-uninstall.bat
@@ -0,0 +1,39 @@
+@ECHO OFF
+IF EXIST wx.pkg GOTO foundwx
+
+ECHO error: already uninstalled or trying to uninstall from another
+ECHO        directory than the ghc install directory.
+ECHO for example: c:\program files\ghc\ghc-6.0.1
+ECHO.
+PAUSE
+goto end
+
+:foundwx
+ECHO uninstall wxhaskell:
+
+ECHO - unregister packages
+ghc-pkg -r wx
+ghc-pkg -r wxcore
+
+ECHO - deleting binary libraries
+DEL wx.pkg wxcore.pkg
+DEL libwx.a libwxcore.a libwxcore0.a
+DEL wx.o wxcore.o wxcore0.o
+DEL /Q libwxc*.a
+DEL /Q bin/wxc*.dll
+
+ECHO - deleting haskell interface files
+DEL imports\Graphics\UI\WX.hi
+DEL imports\Graphics\UI\WXCore.hi
+RMDIR /S /Q imports\Graphics\UI\WX
+RMDIR /S /Q imports\Graphics\UI\WXCore
+
+ECHO - deleting scripts
+DEL wxhaskell-register wxhaskell-register.bat
+DEL wxhaskell-uninstall.bat
+
+ECHO done.
+ECHO.
+PAUSE
+
+:end


Build UI script updates

Build UI script updates

--- UI/build.bat
+++ UI/build.bat
@@ -1,21 +1,16 @@
-set OPENEMAPADMIN_VERSION=1.5.0
-set ZIPFILE=OpenEMap-Admin%OPENEMAPADMIN_VERSION%.zip
-set OPENEMAPADMIN=OpenEMap-Admin-%OPENEMAPADMIN_VERSION%-min.js
-set OPENEMAPADMIN_DEBUG=OpenEMap-Admin-%OPENEMAPADMIN_VERSION%-debug.js
-#set OPENEMAP_VERSION=1.5.0-rc.4
-#set OPENEMAP=OpenEMap-%OPENEMAP_VERSION%-min.js
-#set OPENEMAP_DEBUG=OpenEMap-%OPENEMAP_VERSION%-debug.js
+set OPENEMAPADMIN=OpenEMap-Admin-1.6.0-rc.1
+set OPENEMAPADMINJS=%OPENEMAPADMIN%-min.js
+set OPENEMAPADMINJS_DEBUG=%OPENEMAPADMIN%-debug.js

-sencha compile --classpath=src/main/javascript,../../libs/ext-4.2.1/src,../../libs/geoext-2.0.1/src,../../OpenEMap-WebUserInterface/src/main/javascript exclude -all and include -namespace AdmClient,OpenEMap and concat -closure %OPENEMAPADMIN%
-sencha compile --classpath=src/main/javascript,../../libs/ext-4.2.1/src,../../libs/geoext-2.0.1/src,../../OpenEMap-WebUserInterface/src/main/javascript exclude -all and include -namespace AdmClient,OpenEMap and concat %OPENEMAPADMIN_DEBUG%
+cd release
+rd /s /q %OPENEMAPADMIN%
+del %OPENEMAPADMIN%.zip
+sencha compile --classpath=../src/main/javascript,../../../libs/ext-4.2.1/src,../../../libs/geoext-2.0.1/src,../../../OpenEMap-WebUserInterface/src/main/javascript exclude -all and include -namespace AdmClient,OpenEMap and concat -closure %OPENEMAPADMIN%/%OPENEMAPADMINJS%
+sencha compile --classpath=../src/main/javascript,../../../libs/ext-4.2.1/src,../../../libs/geoext-2.0.1/src,../../../OpenEMap-WebUserInterface/src/main/javascript exclude -all and include -namespace AdmClient,OpenEMap and concat %OPENEMAPADMIN%/%OPENEMAPADMINJS_DEBUG%
+xcopy /s /y ..\src\main\webapp\resources %OPENEMAPADMIN%
+7z a -tzip %OPENEMAPADMIN%.zip -r %OPENEMAPADMIN% -x!doc

-copy %OPENEMAPADMIN% ..\..\
-copy %OPENEMAPADMIN_DEBUG% ..\..\
-xcopy /s /y src\main\webapp\resources .
-del /q ..\Modules\src\org\oemap\services\modules\staticcontent\*
-copy /v %OPENEMAPADMIN% ..\Modules\src\org\oemap\services\modules\staticcontent\
-copy /v %OPENEMAPADMIN_DEBUG% ..\Modules\src\org\oemap\services\modules\staticcontent\
-#copy /v ..\..\OpenEMap-WebUserInterface\release\OpenEMap-%OPENEMAP_VERSION%\%OPENEMAP% ..\Modules\src\org\oemap\services\modules\staticcontent\
-#copy /v ..\..\OpenEMap-WebUserInterface\release\OpenEMap-%OPENEMAP_VERSION%\%OPENEMAP_DEBUG% ..\Modules\src\org\oemap\services\modules\staticcontent\
-#cpoy OPENEMAP_RESOURCES?
+#del /q ..\Modules\src\org\oemap\services\modules\staticcontent\*
+#copy /v %OPENEMAPADMIN% ..\Modules\src\org\oemap\services\modules\staticcontent\
+#copy /v %OPENEMAPADMIN_DEBUG% ..\Modules\src\org\oemap\services\modules\staticcontent\
 pause


Add zip batch file

Add zip batch file

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

--- makezip.bat
+++ makezip.bat
@@ -0,0 +1,8 @@
+@echo off
+"%PROGRAMFILES%\7-Zip\7z" a -tzip "AITD-tools.zip" ^
+ ".\CacheViewer\CacheViewer\bin\Release\*.exe" ^
+ ".\LifeDISA\LifeDISA\bin\Release\*.exe" ^
+ ".\MemoryViewer\MemoryViewer\bin\Release\*.exe" ^
+ ".\MemoryViewer\MemoryViewer\bin\Release\*.dll" ^
+ ".\TrackDISA\TrackDISA\bin\Release\*.exe" ^
+ ".\VarsViewer\VarsViewer\bin\Release\*.exe"


Modify cythonize.bat to pass command line to Cython

--- cythonize.bat
+++ cythonize.bat
@@ -1,4 +1,4 @@
 @echo off
-python -m cython --cleanup 3 -w src -I include mpi4py.MPE.pyx
-python -m cython --cleanup 3 -w src -I include mpi4py.MPI.pyx
-move src\mpi4py.MPI*.h src\include\mpi4py
+python -m cython --cleanup 3 -w src -I include %* mpi4py.MPE.pyx
+python -m cython --cleanup 3 -w src -I include %* mpi4py.MPI.pyx
+move src\mpi4py.MPI*.h src\include\mpi4py


BOOTSTRAP:  update path to ant on stilton

[git-p4: depot-paths = "//open/dt/dev/": change = 2736]

--- bootstrap/doant-stilton.bat
+++ bootstrap/doant-stilton.bat
@@ -1,2 +1,2 @@
-set ANT_HOME=c:\cruise\bootstrap\thirdparty\ant
+set ANT_HOME=g:\cruise\bootstrap\thirdparty\ant
 %ANT_HOME%\bin\ant.bat %*


Don't reinstall *every* time. Just if the batch file doesn't exist.
Review URL: http://codereview.chromium.org/115085

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

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

 :SVN_CHECK
 :: If the batch file exists, skip the svn check.
-if "%WIN_TOOLS_FORCE%" == "1" goto :SVN_INSTALL
 if exist "%WIN_TOOLS_ROOT_DIR%\svn.bat" goto :PYTHON_CHECK
+if "%WIN_TOOLS_FORCE%" == "1" goto :SVN_FORCE
 call svn --version 2>nul 1>nul
 if errorlevel 1 goto :SVN_INSTALL
 goto :PYTHON_CHECK
@@ -54,9 +54,9 @@

 :PYTHON_CHECK
 :: If the batch file exists, skip the python check.
-if "%WIN_TOOLS_FORCE%" == "1" goto :PYTHON_INSTALL
 set ERRORLEVEL=0
 if exist "%WIN_TOOLS_ROOT_DIR%\python.bat" goto :END
+if "%WIN_TOOLS_FORCE%" == "1" goto :PYTHON_INSTALL
 call python --version 2>nul 1>nul
 if errorlevel 1 goto :PYTHON_INSTALL


fix(windows): use new signtime.bat on build agents


also link libev

also link libev

--- mk-curl.bat
+++ mk-curl.bat
@@ -24,7 +24,7 @@
 if "%_CPU%" == "win32" set ARCH=w32
 if "%_CPU%" == "win64" set ARCH=w64
 set CURL_CFLAG_EXTRAS=-DCURL_STATICLIB -DNGHTTP2_STATICLIB -fno-ident
-set CURL_LDFLAG_EXTRAS=-static-libgcc
+set CURL_LDFLAG_EXTRAS=-static-libgcc -L../../libev/lib -lev

 mingw32-make mingw32-clean
 :: - '-rtmp' is not enabled because libcurl then (of course) needs librtmp


Changed the sign.bat script to handle msi files

--- mk/sign.bat
+++ mk/sign.bat
@@ -1,11 +1,11 @@
 @echo off
-rem Copyright (c) Citrix Systems Inc.
+rem Copyright (c) Citrix Systems Inc.
 rem All rights reserved.
-rem
+rem
 rem Redistribution and use in source and binary forms,
 rem with or without modification, are permitted provided
 rem that the following conditions are met:
-rem
+rem
 rem *   Redistributions of source code must retain the above
 rem     copyright notice, this list of conditions and the
 rem     following disclaimer.
@@ -13,7 +13,7 @@
 rem     copyright notice, this list of conditions and the
 rem     following disclaimer in the documentation and/or other
 rem     materials provided with the distribution.
-rem
+rem
 rem THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
 rem CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
 rem INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
@@ -32,7 +32,7 @@
 set ddk_path=noDDK
 if exist c:\winddk\6001.18001 set ddk_path=c:\winddk\6001.18001
 if exist c:\winddk\6000 set ddk_path=c:\winddk\6000
-signtool sign /? >nul 2>&1 && (set ddk_path=SigntoolInPath) || (echo "Unable to find signtool in the path.")
+signtool sign /? >nul 2>&1 && (where signtool & set ddk_path=SigntoolInPath) || (echo "Unable to find signtool in the path.")

 if "%ddk_path%" == "noDDK" goto no_ddk
 goto found_ddk
@@ -42,17 +42,23 @@
 goto end

 :found_ddk
-rem do not display this because the tool is called too many times and it polutes the output.
-IF DEFINED DEBUG (echo ddk is %ddk_path%)
+rem do not display this because the tool is called too many times and it pollutes the output.
+if defined debug (echo ddk is %ddk_path%)

 set descr="Citrix XenCenter"
-set timestamp=http://timestamp.geotrust.com/tsa
+set timestamp_sha1=http://timestamp.verisign.com/scripts/timestamp.dll
+set timestamp_sha2=http://timestamp.geotrust.com/tsa
+set check_msi=%1
 if not [%2]==[] set descr=%2

-if /I NOT "%ddk_path%" == "SigntoolInPath" (
-    %ddk_path%\bin\catalog\signtool.exe sign -a -s my -n "Citrix Systems, Inc" -d %descr% -t http://timestamp.verisign.com/scripts/timestamp.dll %1
-) ELSE (
-    C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -Command "$c = Get-ChildItem -Path cert:\\CurrentUser\\My, cert:\\LocalMachine\\My | Where-Object { $_.Thumbprint -like \"9c0ac20110aaf4733fc0eae7ec3ec8d5cc74dbcc\" }; If ($c) { signtool sign -v -sm -as -sha1 9c0ac20110aaf4733fc0eae7ec3ec8d5cc74dbcc -d `\"%descr%`\" -tr %timestamp% -td sha256 %1; signtool sign -v -sm -as -sha1 3d502d724093ef56499e24ce9c664a3471382ea9 -d `\"%descr%`\" -tr %timestamp% -td sha1 %1 } else {signtool sign -v -s -as -sha1 0699c0e67181f87ecdf7a7a6ad6f4481ee6c76cf -d `\"%descr%`\" -tr %timestamp% -td sha1 %1 ; }" <NUL
+if /I not "%ddk_path%" == "SigntoolInPath" (
+    %ddk_path%\bin\catalog\signtool.exe sign -a -s my -n "Citrix Systems, Inc" -d `\"%descr%`\" -t %timestamp_sha1% %1
+) else (
+    if /I not x%check_msi:.msi=% == x%check_msi% (
+        signtool sign -v -sm -sha1 3d502d724093ef56499e24ce9c664a3471382ea9 -d `\"%descr%`\" -tr %timestamp_sha2% -td sha256 %1
+        goto end
+    ) else (
+        C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -Command "$c = Get-ChildItem -Path cert:\\CurrentUser\\My, cert:\\LocalMachine\\My | Where-Object { $_.Thumbprint -like \"9c0ac20110aaf4733fc0eae7ec3ec8d5cc74dbcc\" }; If ($c) { signtool sign -v -sm -sha1 3d502d724093ef56499e24ce9c664a3471382ea9 -d `\"%descr%`\" -t %timestamp_sha1% %1; signtool sign -v -sm -as -sha1 9c0ac20110aaf4733fc0eae7ec3ec8d5cc74dbcc -d `\"%descr%`\" -tr %timestamp_sha2% -td sha256 %1 } else {signtool sign -v -s -sha1 0699c0e67181f87ecdf7a7a6ad6f4481ee6c76cf -d `\"%descr%`\" -tr %timestamp_sha1% %1 ; }" <NUL
+    )
 )
-
 :end


Update run-tests-dart.cmd

Update run-tests-dart.cmd

--- .github/scripts-windows/run-tests-dart.cmd
+++ .github/scripts-windows/run-tests-dart.cmd
@@ -1,4 +1,4 @@
-choco -y install dart-sdk
+C:\ProgramData\chocolatey\bin\choco.exe -y install dart-sdk

 cd runtime-testsuite
 mvn -Dparallel=classes -DthreadCount=4 -Dtest=dart.** test -Dantlr-dart-dart="C:\tools\dart-sdk\bin\dart.exe" -Dantlr-dart-pub="C:\tools\dart-sdk\bin\pub.bat" -Dantlr-dart-dart2native="C:\tools\dart-sdk\bin\dart2native.bat"


Fixed line endings in windows update_patches

--- forge/update_patches.bat
+++ forge/update_patches.bat
@@ -47,6 +47,8 @@
 )

 xcopy ..\conf conf /E /I /Y
+tr -d \r < ../conf/mcp.cfg > conf/mcp.cfg
+tr -d \r < ../conf/patches/Start.java > conf/patches/Start.java

 echo Finished
 pause


missing file

missing file

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

--- bin/lcp.bat
+++ bin/lcp.bat
@@ -0,0 +1,30 @@
+REM
+REM Copyright  2001-2004 The Apache Software Foundation
+REM
+REM  Licensed under the Apache License, Version 2.0 (the "License");
+REM  you may not use this file except in compliance with the License.
+REM  You may obtain a copy of the License at
+REM
+REM      http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM  Unless required by applicable law or agreed to in writing, software
+REM  distributed under the License is distributed on an "AS IS" BASIS,
+REM  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+REM  See the License for the specific language governing permissions and
+REM  limitations under the License.
+REM
+REM
+
+set _CLASSPATHCOMPONENT=%1
+if ""%1""=="""" goto gotAllArgs
+shift
+
+:argCheck
+if ""%1""=="""" goto gotAllArgs
+set _CLASSPATHCOMPONENT=%_CLASSPATHCOMPONENT% %1
+shift
+goto argCheck
+
+:gotAllArgs
+set LOCALCLASSPATH=%_CLASSPATHCOMPONENT%;%LOCALCLASSPATH%
+