Add link to -XX documentation

Add link to -XX documentation

git-svn-id: https://svn.apache.org/repos/asf/jakarta/jmeter/trunk@659803 13f79535-47bb-0310-9956-ffa450edef68

Former-commit-id: fe4957192e419fff586feebf3c3504bedce18400

--- bin/jmeter.bat
+++ bin/jmeter.bat
@@ -61,6 +61,9 @@
 rem This label provides a place for the argument list loop to break out
 rem and for NT handling to skip to.

+rem The following link describes the -XX options:
+rem http://java.sun.com/javase/technologies/hotspot/vmoptions.jsp
+
 rem See the unix startup file for the rationale of the following parameters,
 rem including some tuning recommendations
 set HEAP=-Xms256m -Xmx256m
@@ -85,6 +88,7 @@
 rem Setting this flag to true enables hardware-accelerated scaling.
 rem set DDRAW=%DDRAW% -Dsun.java2d.ddscale=true

+rem Server mode
 rem Collect the settings defined above
 set ARGS=%HEAP% %NEW% %SURVIVOR% %TENURING% %EVACUATION% %RMIGC% %PERM% %DDRAW%


Added a message to guide termination

Added a message to guide termination

--- bin/start-cluster.cmd
+++ bin/start-cluster.cmd
@@ -1,4 +1,5 @@

+@echo off
 aws configure
 aws s3api list-buckets --output text | find "BUCKETS"
 set /p bucket=S3 bucket name:
@@ -32,4 +33,6 @@
        Name="Configure daemons",Args=["--namenode-opts=-XX:GCTimeRatio=19"],Path=s3://elasticmapreduce/bootstrap-actions/configure-daemons ^
        Name="Patch the cluster's software and OS",Path=s3://spark4n6-public/bootstrap-actions/patchall.sh ^
        Name="Initialize the cluster",Path=s3://elasticmapreduce/bootstrap-actions/run-if,Args=["instance.isMaster=true",s3://spark4n6-public/bootstrap-actions/start.sh]
-
+@echo aws emr terminate-clusters --cluster-ids j-2WFXXXXXXX6ID
+@echo
+@echo Costs will accrue until this cluster is terminated.  Use the command above to terminate, or use the AWS console.


remove shuffle bat

remove shuffle bat

--- bin/cassandra-shuffle.bat
+++ bin/cassandra-shuffle.bat
@@ -1,51 +0,0 @@
-@REM
-@REM  Licensed to the Apache Software Foundation (ASF) under one or more
-@REM  contributor license agreements.  See the NOTICE file distributed with
-@REM  this work for additional information regarding copyright ownership.
-@REM  The ASF licenses this file to You under the Apache License, Version 2.0
-@REM  (the "License"); you may not use this file except in compliance with
-@REM  the License.  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.
-
-
-@echo off
-if "%OS%" == "Windows_NT" setlocal
-
-if NOT DEFINED CASSANDRA_HOME set CASSANDRA_HOME=%~dp0..
-if NOT DEFINED JAVA_HOME goto :err
-
-REM Ensure that any user defined CLASSPATH variables are not used on startup
-set CLASSPATH=
-
-REM For each jar in the CASSANDRA_HOME lib directory call append to build the CLASSPATH variable.
-for %%i in ("%CASSANDRA_HOME%\lib\*.jar") do call :append "%%i"
-goto okClasspath
-
-:append
-set CLASSPATH=%CLASSPATH%;%1
-goto :eof
-
-:okClasspath
-REM Include the build\classes\main directory so it works in development
-set CASSANDRA_CLASSPATH=%CLASSPATH%;"%CASSANDRA_HOME%\build\classes\main";"%CASSANDRA_HOME%\build\classes\thrift"
-goto runCli
-
-:runCli
-echo Starting Cassandra Client
-"%JAVA_HOME%\bin\java" -cp %CASSANDRA_CLASSPATH% org.apache.cassandra.tools.Shuffle %*
-goto finally
-
-:err
-echo The JAVA_HOME environment variable must be set to run this program!
-pause
-
-:finally
-
-ENDLOCAL


1871581: setup script does not work properly fixed name of include script

--- mmm-setup/src/scripts/windows/setup-eclipse.bat
+++ mmm-setup/src/scripts/windows/setup-eclipse.bat
@@ -1,7 +1,7 @@
 rem $Id$

 cd %~dp0
-call include.inc
+call include.bat
 if exists %ECLIPSE_WORKSPACE% (
   echo Setting up eclipse projects...
   cd %MMM_BASE%


Only build the necessary boost libs and disable iterator debugging for mysql connector cpp

--- build_deps.bat
+++ build_deps.bat
@@ -97,7 +97,7 @@
     cmd /c bootstrap.bat
 )

-cmd /c "b2.exe" --toolset=msvc-%MSVC_VERSION%.0 variant=debug,release link=shared runtime-link=shared threading=multi define=_SCL_SECURE_NO_WARNINGS=0
+cmd /c "b2.exe" --toolset=msvc-%MSVC_VERSION%.0 --with-program_options --with-system --with-thread --with-filesystem --with-log --with-python --with-test --with-date_time variant=debug,release link=shared runtime-link=shared threading=multi define=_SCL_SECURE_NO_WARNINGS=0 define=_ITERATOR_DEBUG_LEVEL=0

 if not exist %VENDOR_DIR%include\boost (
     xcopy "boost" "%VENDOR_DIR%include\boost" /s /i /y
@@ -269,7 +269,7 @@

 cd mysql-connector-cpp

-cmake -G"Visual Studio 11" -DBOOST_ROOT=%VENDOR_DIR% -DMYSQL_INCLUDE_DIR=%VENDOR_DIR%include -DMYSQL_LIB_DIR=%VENDOR_DIR%lib/Release .
+cmake -G"Visual Studio 11" -DDISABLE_ITERATOR_DEBUGGING=ON -DBOOST_ROOT=%VENDOR_DIR% -DMYSQL_INCLUDE_DIR=%VENDOR_DIR%include -DMYSQL_LIB_DIR=%VENDOR_DIR%lib/Release .
 cmake --build . --target mysqlcppconn --config Debug
 cmake --build . --target mysqlcppconn --config Release


Add eclipse project creation command

Add eclipse project creation command

error: pathspec 'build-eclipse-project.cmd' did not match any file(s) known to git

--- build-eclipse-project.cmd
+++ build-eclipse-project.cmd
@@ -0,0 +1 @@
+mvn eclipse:eclipse -DdownloadSources=true  -DdownloadJavadocs=true


added build script for auto-building KrisLibrary, Klampt, and python library

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

--- msvc/buildall.bat
+++ msvc/buildall.bat
@@ -0,0 +1,21 @@
+
+cd ..\Library\KrisLibrary\msvc
+msbuild KrisLibrary.sln /property:Configuration=Debug
+if %errorlevel% neq 0 exit /b %errorlevel%
+msbuild KrisLibrary.sln /property:Configuration=Release
+if %errorlevel% neq 0 exit /b %errorlevel%
+
+cd ..\..\..\msvc
+msbuild Klampt.sln /property:Configuration=Debug
+if %errorlevel% neq 0 exit /b %errorlevel%
+msbuild Klampt.sln /property:Configuration=Release
+if %errorlevel% neq 0 exit /b %errorlevel%
+
+set PATH=C:\Python27\;%PATH%
+set VS90COMNTOOLS=%VS100COMNTOOLS%
+cd ..\Python
+python setup.py install
+if %errorlevel% neq 0 exit /b %errorlevel%
+python setup.py bdist_wininst
+
+cd ..\msvc


update version header generation to comply with new format

major.minor.patch.build

--- build/generate-version-header.bat
+++ build/generate-version-header.bat
@@ -4,15 +4,15 @@
 set /p version=<temp.txt
 del temp.txt

-for /f "tokens=1,2 delims=." %%a in ("%version%") do set major=%%a&set rest=%%b
+for /f "tokens=1,2,3 delims=." %%a in ("%version%") do set major=%%a&set minor=%%b&set rest=%%c

-for /f "tokens=1,2,3 delims=-" %%a in ("%rest%") do set minor=%%a&set patch=%%b&set build=%%c
+for /f "tokens=1,2,3 delims=-" %%a in ("%rest%") do set patch=%%a&set build=%%b&set commit=%%c

 (
-echo #define VER_FILE_VERSION %major%, %minor%, %patch%
-echo #define VER_FILE_VERSION_STR "%major%.%minor%.%patch%"
-echo #define VER_PRODUCT_VERSION VER_FILE_VERSION
-echo #define VER_PRODUCT_VERSION_STR VER_FILE_VERSION_STR
-echo const char* const FULL_VERSION = "%major%.%minor%.%patch%-%build%";
+echo #define VER_FILE_VERSION %major%, %minor%, %patch%, %build%
+echo #define VER_FILE_VERSION_STR "%major%.%minor%.%patch%.%build%"
+echo #define VER_PRODUCT_VERSION %major%, %minor%, %patch%
+echo #define VER_PRODUCT_VERSION_STR "%major%.%minor%.%patch%"
+echo const char* const FULL_VERSION = "%major%.%minor%.%patch%.%build%-%commit%";
 echo const char* const VERSION = "%major%.%minor%.%patch%";
 ) > ../include/version.h


Build script: Showing in Command Prompt title that we are building Mesa3D and which ABI is actively built

--- buildscript/build.cmd
+++ buildscript/build.cmd
@@ -1,3 +1,4 @@
+@TITLE Building Mesa3D
 @cd "%~dp0"
 @cd ..\..\
 @for %%I in ("%cd%") do @set mesa=%%~sI
@@ -30,6 +31,7 @@
 @if %abi%==x64 set altabi=%longabi%
 @set minabi=32
 @if %abi%==x64 set minabi=64
+@TITLE Building Mesa3D %abi%
 @set vsenv="%ProgramFiles%
 @if NOT "%ProgramW6432%"=="" set vsenv=%vsenv% (x86)
 @set vsenv15=%vsenv%\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars%minabi%.bat"


* Fix for systems without zlib1.dll  * Thanks to plcstpierre for reporting the issue

--- build/win32/update_dlls_mingw.bat
+++ build/win32/update_dlls_mingw.bat
@@ -1,3 +1,5 @@
+ren .\binaries\mingw\zlib.dll zlib1.dll
+
 del .\..\..\*.dll
 del .\..\..\clients\FIFEdit\*.dll
 del .\..\..\clients\fo_remake\*.dll


bat file for jediterm-pty

bat file for jediterm-pty

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

--- jediterm-pty.bat
+++ jediterm-pty.bat
@@ -0,0 +1,3 @@
+java -cp "lib/pty4j-0.3.jar;lib/guava-14.0.1.jar;lib/jna.jar;lib/jna-platform.jar;lib/jsch-0.1.50.jar;lib/junit-4.10.jar;lib/jzlib-1.07.jar;lib/log4j-1.2.14.jar;lib/purejavacomm-0.0.17.jar;build/jediterm-pty-2.0.jar" com.jediterm.pty.PtyMain
+
+


Sync from master

Sync from master

Temporary sync solution until vnext is implemented.

--- src/update_sdk.cmd
+++ src/update_sdk.cmd
@@ -10,15 +10,7 @@

 cd /D "%~dp0\temp"

-git clone -b develop https://github.com/Azure/azure-iot-sdks.git --recursive
-
-cd "%~dp0\temp\azure-iot-sdks\"
-
-git checkout develop
-
-git reset --hard HEAD
-
-git pull origin develop
+git clone https://github.com/Azure/azure-iot-sdks.git --recursive

 cd "%~dp0\temp"


Use cleanmgr and remove windows update files on Windows 7

dism doesn't include the ability to cleanup components on Windows 7. Detect when we're on Windows 7 (2k8r2 as well) and do this the old school way

Signed-off-by: Tim Smith <764ef62106582a09ed09dfa0b6bff7c05fd7d1e4@chef.io>

--- script/clean.bat
+++ script/clean.bat
@@ -3,6 +3,21 @@
 @if defined PACKER_DEBUG (@echo on) else (@echo off)

 pushd "%TEMP%"
+
+# determine the version of windows since dism in windows 7 lacks cleanup-image
+# http://stackoverflow.com/questions/13212033/get-windows-version-in-a-batch-file
+for /f "tokens=4-5 delims=. " %%i in ('ver') do set VERSION=%%i.%%j
+
+if "%VERSION%" == "6.1" (
+    echo ==^> Running Disk Cleanup
+    C:\Windows\System32\cleanmgr.exe /sagerun:10
+
+    echo ==^> Cleaning up old Windows Update files
+    for /d %%i in ("%SystemRoot%\SoftwareDistribution\Download\*.*") do rmdir /q /s "%%~i"
+) else (
+    echo ==^> Running DISM to remove old components
+    Dism.exe /online /Cleanup-Image /StartComponentCleanup /ResetBase
+)

 echo ==^> Cleaning "%TEMP%" directories >&2

@@ -28,9 +43,6 @@

 for %%i in (VBoxGuestAdditions.iso windows.iso) do if exist "%USERPROFILE%\%%~i" del /f "%USERPROFILE%\%%~i"

-echo ==^> Removing Windows update files
-Dism.exe /online /Cleanup-Image /StartComponentCleanup /ResetBase
-
 :exit0

 @ping 127.0.0.1


Fix JVM_DEBUG in sbt.bat

Fix JVM_DEBUG in sbt.bat

JVM_DEBUG was broken due to a copy-pasta error in sbt.bat. This
commit corrects the value assignment to the variable and therefore
fixes the problem.

--- src/universal/bin/sbt.bat
+++ src/universal/bin/sbt.bat
@@ -64,8 +64,8 @@
 :args_loop
 if "%~1" == "" goto args_end

-if "%~1" == "-jvm-debug" set set JVM_DEBUG=true
-if "%~1" == "--jvm-debug" set set JVM_DEBUG=true
+if "%~1" == "-jvm-debug" set JVM_DEBUG=true
+if "%~1" == "--jvm-debug" set JVM_DEBUG=true

 if "%JVM_DEBUG%" == "true" (
   set /a JVM_DEBUG_PORT=5005 2>nul >nul


add DLLAutoReloader to build

add DLLAutoReloader to build

git-svn-id: 03a8048b5ee8463be5048a3801110fb50f378627@10235 d0ab736e-dc22-4aeb-8dc9-08def0aa14fd

--- buildscripts/buildJars.bat
+++ buildscripts/buildJars.bat
@@ -65,9 +65,9 @@
 call build.bat
 popd

-rem pushd plugins\DLLAutoReloader
-rem call build.bat
-rem popd
+pushd plugins\DLLAutoReloader
+call build.bat
+popd

 pushd plugins\Gaussian
 call build.bat


Fix a typo

Fix a typo

--- packages/windows/build-vc2010-zip-32.bat
+++ packages/windows/build-vc2010-zip-32.bat
@@ -1,4 +1,4 @@
-rmdir /S /Q build-vc2013-zip-32
+rmdir /S /Q build-vc2010-zip-32
 mkdir build-vc2010-zip-32
 cd build-vc2010-zip-32
 cmake ..\source -G "Visual Studio 10" > config.log


Add comment to poml.cmd.

Add comment to poml.cmd.

--- dist/poml.cmd
+++ dist/poml.cmd
@@ -2,11 +2,11 @@

 setlocal

-@rem -> find java
+@REM # Find java.exe
 for %%I in (java.exe) do set POML_JAVA=%%~$PATH:I
 if "%POML_JAVA%"=="" set POML_JAVA=java.exe

-@rem -> execute jar
+@REM # Execute jar
 echo [POML:INFO] Execute "poml.jar" using "%POML_JAVA%"
 set POML_ARG=%*
 if "%POML_ARG%"=="" (
@@ -14,3 +14,7 @@
 ) else (
   %POML_JAVA% -jar %~dp0\poml.jar %POML_ARG%
 )
+
+@REM # Not using exit (exit /b) command.
+@REM # Because ERRORLEVEL is set by java.exe.
+@REM # If java.exe is not found, Win(7) set 9009 to ERRORLEVEL.


bugfix

bugfix

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

 :: -tags "debug" 表示测试
-go install -tags "debug" -ldflags "-X util/version.Version "%VERSION% ./...
+go install -tags "debug" -ldflags "-X util.version.Version "%VERSION% ./...

 set GOPATH=%OLDGOPATH%


adding the version number

adding the version number

--- buildReleaseNuGetPackages.cmd
+++ buildReleaseNuGetPackages.cmd
@@ -2,7 +2,9 @@
 echo "Restore & Build API"
 cd ElectronNet.API
 dotnet restore
+dotnet pack /p:PackageVersion=0.0.1 --output %~dp0artifacts
 cd ..
 echo "Restore & Build API"
 cd ElectronNet.CLI
 dotnet restore
+dotnet pack /p:PackageVersion=0.0.1 --output %~dp0artifacts


docs/make.bat: Put each module on a separate page.

--- docs/make.bat
+++ docs/make.bat
@@ -85,7 +85,7 @@
 )

 if "%1" == "rst" (
-        %SPHINXAPIDOC% -f -T -M -o . .. ../setup.py ../tests
+        %SPHINXAPIDOC% -f -T -e -M -o . .. ../setup.py ../tests
 	if errorlevel 1 exit /b 1
 	echo.
 	echo.Build finished. The RST pages are in in the current directory.


docs/make.bat: Make sure the module summary (i.e. module docstring) is put before the API documentation.

--- docs/make.bat
+++ docs/make.bat
@@ -83,7 +83,7 @@
 )

 if "%1" == "rst" (
-        %SPHINXAPIDOC% -f -T -o . .. ../tests
+        %SPHINXAPIDOC% -f -T -M -o . .. ../tests
 	if errorlevel 1 exit /b 1
 	echo.
 	echo.Build finished. The RST pages are in in the current directory.


New build file.

New build file.

--- c/build_all/windows/build.cmd
+++ c/build_all/windows/build.cmd
@@ -19,6 +19,7 @@
 echo Build Root: %build-root%
 echo Repo Root: %repo_root%

+set cmake-root=%build-root%
 rem -----------------------------------------------------------------------------
 rem -- check prerequisites
 rem -----------------------------------------------------------------------------
@@ -50,6 +51,7 @@
 if "%1" equ "--skip-unittests" goto arg-skip-unittests
 if "%1" equ "--use-websockets" goto arg-use-websockets
 if "%1" equ "--make_nuget" goto arg-build-nuget
+if "%1" equ "--cmake-root" goto arg-cmake-root
 call :usage && exit /b 1

 :arg-build-clean
@@ -98,6 +100,12 @@
 set build-samples=no
 goto args-continue

+:arg-cmake-root
+shift
+if "%1" equ "" call :usage && exit /b 1
+set cmake-root=%1
+goto args-continue
+
 :args-continue
 shift
 goto args-loop
@@ -193,15 +201,15 @@
 	echo WebSockets support only available for x86 platform.
 )

-if EXIST %build-root%\cmake\%CMAKE_DIR% (
-    rmdir /s/q %build-root%\cmake\%CMAKE_DIR%
+if EXIST %cmake-root%\cmake\%CMAKE_DIR% (
+    rmdir /s/q %cmake-root%\cmake\%CMAKE_DIR%
     rem no error checking
 )

-echo CMAKE Output Path: %build-root%\cmake\%CMAKE_DIR%
-mkdir %build-root%\cmake\%CMAKE_DIR%
+echo CMAKE Output Path: %cmake-root%\cmake\%CMAKE_DIR%
+mkdir %cmake-root%\cmake\%CMAKE_DIR%
 rem no error checking
-pushd %build-root%\cmake\%CMAKE_DIR%
+pushd %cmake-root%\cmake\%CMAKE_DIR%

 if %MAKE_NUGET_PKG% == yes (
     echo ***Running CMAKE for Win32***
@@ -210,21 +218,21 @@
     popd

     echo ***Running CMAKE for Win64***
-    if EXIST %build-root%\cmake\iotsdk_win64 (
-        rmdir /s/q %build-root%\cmake\iotsdk_win64
+    if EXIST %cmake-root%\cmake\iotsdk_win64 (
+        rmdir /s/q %cmake-root%\cmake\iotsdk_win64
     )
-	mkdir %build-root%\cmake\iotsdk_win64
-	pushd %build-root%\cmake\iotsdk_win64
+	mkdir %cmake-root%\cmake\iotsdk_win64
+	pushd %cmake-root%\cmake\iotsdk_win64
 	cmake -Drun_longhaul_tests:BOOL=%CMAKE_run_longhaul_tests% -Drun_e2e_tests:BOOL=%CMAKE_run_e2e_tests% -Dskip_unittests:BOOL=%CMAKE_skip_unittests% -Duse_wsio:BOOL=%CMAKE_use_wsio% %build-root%  -G "Visual Studio 14 Win64"
 	if not %errorlevel%==0 exit /b %errorlevel%
     popd

     echo ***Running CMAKE for ARM***
-    if EXIST %build-root%\cmake\iotsdk_arm (
-        rmdir /s/q %build-root%\cmake\iotsdk_arm
+    if EXIST %cmake-root%\cmake\iotsdk_arm (
+        rmdir /s/q %cmake-root%\cmake\iotsdk_arm
     )
-	mkdir %build-root%\cmake\iotsdk_arm
-	pushd %build-root%\cmake\iotsdk_arm
+	mkdir %cmake-root%\cmake\iotsdk_arm
+	pushd %cmake-root%\cmake\iotsdk_arm
 	cmake -Drun_longhaul_tests:BOOL=%CMAKE_run_longhaul_tests% -Drun_e2e_tests:BOOL=%CMAKE_run_e2e_tests% -Dskip_unittests:BOOL=%CMAKE_skip_unittests% -Duse_wsio:BOOL=%CMAKE_use_wsio% %build-root%  -G "Visual Studio 14 ARM"
 	if not %errorlevel%==0 exit /b %errorlevel%

@@ -244,16 +252,16 @@

 if %MAKE_NUGET_PKG% == yes (
     echo ***Building all configurations***
-	msbuild /m %build-root%\cmake\iotsdk_win32\azure_iot_sdks.sln /p:Configuration=Release
-	msbuild /m %build-root%\cmake\iotsdk_win32\azure_iot_sdks.sln /p:Configuration=Debug
-	if not %errorlevel%==0 exit /b %errorlevel%
-
-	msbuild /m %build-root%\cmake\iotsdk_win64\azure_iot_sdks.sln /p:Configuration=Release
-	msbuild /m %build-root%\cmake\iotsdk_win64\azure_iot_sdks.sln /p:Configuration=Debug
-	if not %errorlevel%==0 exit /b %errorlevel%
-
-	msbuild /m %build-root%\cmake\iotsdk_arm\azure_iot_sdks.sln /p:Configuration=Release
-	msbuild /m %build-root%\cmake\iotsdk_arm\azure_iot_sdks.sln /p:Configuration=Debug
+	msbuild /m %cmake-root%\cmake\iotsdk_win32\azure_iot_sdks.sln /p:Configuration=Release
+	msbuild /m %cmake-root%\cmake\iotsdk_win32\azure_iot_sdks.sln /p:Configuration=Debug
+	if not %errorlevel%==0 exit /b %errorlevel%
+
+	msbuild /m %cmake-root%\cmake\iotsdk_win64\azure_iot_sdks.sln /p:Configuration=Release
+	msbuild /m %cmake-root%\cmake\iotsdk_win64\azure_iot_sdks.sln /p:Configuration=Debug
+	if not %errorlevel%==0 exit /b %errorlevel%
+
+	msbuild /m %cmake-root%\cmake\iotsdk_arm\azure_iot_sdks.sln /p:Configuration=Release
+	msbuild /m %cmake-root%\cmake\iotsdk_arm\azure_iot_sdks.sln /p:Configuration=Debug
 	if not %errorlevel%==0 exit /b %errorlevel%

 ) else (
@@ -292,6 +300,8 @@
 echo  --run-longhaul-tests  run long-haul tests
 echo  --use-websockets        Enables the support for AMQP over WebSockets.
 echo  --make_nuget ^<value^>  [no] generates the binaries to be used for nuget packaging (e.g. yes, no)
+echo  --cmake-root			Directory to place the cmake files used for building the project
+
 goto :eof


Fixed MyGet build script to exclude unit tests on MyGet build server.

--- Scripts/MyGet.bat
+++ Scripts/MyGet.bat
@@ -64,12 +64,19 @@
 	goto Error

   )
+) else (
+
+  echo Cannot run unit tests on MyGet build server because it does not have Windows Azure Storage Emulator.
+  goto SkipUnitTests
 )
+

 "%GallioEcho%" Projects\AzureMagic.Tests\bin\Release\AzureMagic.Tests.dll
 if not "%errorlevel%" == "0" goto Error
 echo.
 echo.
+
+:SkipUnitTests

 echo Building NuGet package...
 echo -------------------------


GERONIMO-5560 Add maxPermSize to avoid OOM exception when starting server via windows service, for trunk

git-svn-id: 0d16bf2c240b8111500ec482b35765e5042f5526@1303430 13f79535-47bb-0310-9956-ffa450edef68


backup-to-cloud-dev.cmd исправлена ошибка (пропущена инициализация переменной).

--- backup-to-cloud-dev.cmd
+++ backup-to-cloud-dev.cmd
@@ -1,9 +1,13 @@
+rem @echo off
+setlocal
+rem
+::       866
+for /f "tokens=2 delims=:" %%i in ('chcp') do (
+    set PrevCP=%%i)
 rem
-rem @echo off
-rem
-chcp 1251 >nul
+chcp 1251 > nul
 rem
-goto start
+goto Start
 --------------------------------------

@@ -23,42 +27,54 @@
     .
 --------------------------------------
    19/01/2015
-   23/01/2015
+   25/01/2015

 --------------------------------------

-"     !"
      !
     !
-:start
-rem    1
-set source=D:\1C\Base
+
+:Start
+rem "     1 "
+::     ,
+::    (  )
+set Source="D:\1C\Base"
 rem
-set backup=E:\backup-1C
+rem !!!      !!!
+set Backup=E:\YandexDisk\backup-1C
 rem    .
 set NumberArchives=1
 rem
-set password=123
+set Password=123
+rem
+set NumberStringsLog=90

 rem
+
+rem      ()
+set PathScript="%~dp0"
+rem
+set Error=0
+rem   (   ).
+set LogFile=%PathScript%backup.log

 rem     WinRar
 ::
 if exist "%PROGRAMFILES%\WinRAR\rar.exe" (set archive="%PROGRAMFILES%\WinRAR\rar.exe") else (if exist "%PROGRAMFILES(x86)%\WinRAR\rar.exe" (set archive="%PROGRAMFILES(x86)%\WinRAR\rar.exe") else (goto NoArchive))
-rem      ()
-set CurrentDisk="%~dp0"
-rem   (   ).
-set logfile=%CurrentDisk%\backup.log

-rem
-rem %date%   ( )
+rem
+rem
+if not exist %Source% (goto NoSourceDir)
+rem
+if not exist %Backup% (goto NoBackupDir)
 rem
-if exist %backup%\%date%.rar (goto ExistBackup)
-rem
-if not exist %source% (goto NoSourceDir)
-rem
-if not exist %backup% (goto NoBackupDir)
+rem %DATE%   ( )
+if exist %Backup%%DATE%.rar (goto ExistBackup)
+
+rem    WinRar
+::
+if exist "%PROGRAMFILES%\WinRAR\rar.exe" (set ArchiveProgram="%PROGRAMFILES%\WinRAR\rar.exe") else (if exist "%PROGRAMFILES(x86)%\WinRAR\rar.exe" (set ArchiveProgram="%PROGRAMFILES(x86)%\WinRAR\rar.exe") else (goto NoArchiveProgram))

 rem
 rem     rar.exe
@@ -77,78 +93,100 @@
 :: -hp    -
 :: -k     -   (  )
 :: --     -
-%archive% a -cfg- -ma -htb -m5 -rr10p -ac -ow -agDD.MM.YYYY -ep1 -hp%password% -k %CurrentDisk% %source% --
+%ArchiveProgram% a -cfg- -ma -htb -m5 -rr10p -ac -ow -agDD.MM.YYYY -ep1 -hp%Password% -k %PathScript% %Source% --

 rem
 rem %ErrorLevel%
 ::  rar.exe
 rem
 ::
-if %ErrorLevel%==0 (goto move) else (set result=" - %ErrorLevel%")
-goto log
+if %ErrorLevel%==0 (set Result="  "
+goto MoveArchive) else (set Result=" - %ErrorLevel%"
+goto Error)

-:move
+:MoveArchive
 rem
-rem %date%   ( )
+rem %DATE%   ( )
 rem
-move %CurrentDisk%\%date%.rar %backup%
+move %PathScript%\%DATE%.rar %Backup%
 rem
-if exist %backup%\%date%.rar (set result="  ") else (set result="  "
-goto :error)
-goto log
+if exist %Backup%\%DATE%.rar (set Result="  ") else (set Result="  "
+goto Error)
+goto Log

-:NoArchive
-set result="   "
-goto :error
+:NoArchiveProgram
+set Result="   "
+goto Error

 :NoSourceDir
-set result="    "
-goto :error
+set Result="    "
+goto Error

 :NoBackupDir
-set result="    "
-goto :error
+set Result="    "
+goto Error

 :ExistBackup
-set result="   "
-goto log
+set Result="    "
+goto Log

-:error
-set error=1
+:Error
+set Error=1

-:log
-rem  .
-rem %date%   ( )
-rem %time%   ( )
-echo %date% >> %logfile%
-echo %time% >> %logfile%
-echo %result% >> %logfile%
-echo ... >> %logfile%
-rem
-move %logfile% %backup%\backup.log /Y
+:Log
+rem
+rem %DATE%   ( )
+rem %TIME%   ( )
+rem %Result%
+rem %LogFile%
+rem %NumberStringsLog%
+::
+rem "" http://www.cyberforum.ru/cmd-bat/thread1299615.html
+set "Logging=echo %DATE% %TIME% %Result% >> "%LogFile%""
+if exist "%LogFile%" (
+ for /f %%i in ('"<"%LogFile%" find /c /v """') do (
+  if %%i lss %NumberStringsLog% (
+   %Logging%
+  ) else (
+   <"%LogFile%" more +1>.tmp
+   >"%LogFile%" type .tmp
+   del .tmp
+   %Logging%
+   )
+  )
+) else (
+ %Logging%
+ )

 rem
 ::
-if exist %CurrentDisk%\%date%.rar (del %CurrentDisk%\%date%.rar /Q)
+::  /a /y
+::
+copy /a /y %LogFile% %Backup%

 rem
 rem
 ::
 rem forfiles -
-:: /P %backup% -
+:: /P %Backup% -
+:: %DATE%   ( )
 :: /M *.rar -   rar
 :: /D -%NumberArchives% -
-:: /C "cmd /c del /q @path" -
-if exist %backup%\%date%.rar (forfiles /P %backup% /M *.rar /D -%NumberArchives% /C "cmd /c del /q @path")
+:: /C "cmd /c del /q @PATH" -
+if exist %Backup%%DATE%.rar (forfiles /P %Backup% /M *.rar /D -%NumberArchives% /C "cmd /c del /q @PATH")

-rem
-::
-::
 rem
 ::
 ::
-if %error%==1 (color 0c
-echo %result%
-pause
-) else (chcp 866 >nul
-exit)
+if %Error%==1 (color 0c
+echo %Result%
+pause)
+
+rem
+:: (
+::  )
+color 07
+chcp %PrevCP% >nul
+endlocal
+rem exit
+


Revert "Deletes data_transfer_script.bat"

This reverts commit 85e5e6a91b027f0124d4c2575a53a6f8a5582a09.

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

--- data_transfer_script.bat
+++ data_transfer_script.bat
@@ -0,0 +1,8 @@
+@echo off
+title Python Data Transfer
+echo Creating anaconda environment...
+call \Users\Jocelyn\Anaconda3\Scripts\activate.bat
+echo Environment creation sucessful.
+echo Starting python script runner.py...
+python \ucsd_ch\chamber\runner.py "\Users\Jocelyn\Desktop\Data Logger - Networked\Data" %*
+pause


HIVE-7030: Remove hive.hadoop.classpath from hiveserver2.cmd (Hari Sankar Sivarama Subramaniyan via Vaibhav Gumashta)

git-svn-id: c2303eb81cb646bce052f55f7f0d14f181a5956c@1593594 13f79535-47bb-0310-9956-ffa450edef68

--- bin/ext/hiveserver2.cmd
+++ bin/ext/hiveserver2.cmd
@@ -90,7 +90,7 @@
   ) else (
   @echo set HADOOP_CLASSPATH=%HADOOP_CLASSPATH%;%HIVE_LIB%\*
   )
-@echo %JAVA_HOME%\bin\java %JAVA_HEAP_MAX% %HADOOP_OPTS% -classpath %CLASSPATH%;%HIVE_HBASE_PATH% %CLASS% -hiveconf hive.hadoop.classpath=%HIVE_LIB%\* -hiveconf hive.metastore.uris=" " -hiveconf hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactory -hiveconf hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateUserAuthenticator  %HIVE_OPTS%
+@echo %JAVA_HOME%\bin\java %JAVA_HEAP_MAX% %HADOOP_OPTS% -classpath %CLASSPATH%;%HIVE_HBASE_PATH% %CLASS% -hiveconf hive.metastore.uris=" " -hiveconf hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactory -hiveconf hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateUserAuthenticator  %HIVE_OPTS%
 goto :EOF

 :AddToHiveHbasePath


Fix frontend test results uploader

Fix frontend test results uploader

Had old path.

--- scripts/upload-frontend-test-results.bat
+++ scripts/upload-frontend-test-results.bat
@@ -1,8 +1,8 @@
 @echo off
 cd C:\projects\spectre\src\Spectre.Angular2Client
 IF EXIST "C:\projects\spectre\src\Spectre.AngularClient\karma-tests.xml" (
-    powershell C:\projects\spectre\scripts\Upload-TestResult.ps1 -fileName C:\projects\spectre\src\Spectre.Angular2Client\karma-tests.xml
+    powershell C:\projects\spectre\scripts\Upload-TestResult.ps1 -fileName C:\projects\spectre\src\Spectre.AngularClient\karma-tests.xml
 )
 IF EXIST "C:\projects\spectre\src\Spectre.AngularClient\protractor-tests.xml" (
-    powershell C:\projects\spectre\scripts\Upload-TestResult.ps1 -fileName C:\projects\spectre\src\Spectre.Angular2Client\protractor-tests.xml
+    powershell C:\projects\spectre\scripts\Upload-TestResult.ps1 -fileName C:\projects\spectre\src\Spectre.AngularClient\protractor-tests.xml
 )


Update create-translation script to use gettext

--- build-scripts/create-translations.bat
+++ build-scripts/create-translations.bat
@@ -5,10 +5,11 @@
 echo.

 set TARGET_DIR="..\extracted"
+set msgfmt "..\build-tools\gettext\bin\msgfmt.exe"

 echo.
 echo Unknwon-Horizons
-cd "%TARGET_DIR%\extracted\unknown-horizons\unknown-horizons-master\development\"
-python compile_translation_win.py
+cd "%TARGET_DIR%\extracted\unknown-horizons\unknown-horizons-master\development"
+compile_translation_win.py

 dir "%TARGET_DIR%"


forgot to update path in windows task

forgot to update path in windows task

[#126616407]

Signed-off-by: Anand Gaitonde <4f0ff06b2390eeadb0769d298cbdb3dc6df4c73d@pivotal.io>

--- ci/cli/tasks/cats-windows.bat
+++ ci/cli/tasks/cats-windows.bat
@@ -9,7 +9,7 @@
 SET PATH=%CD%;%PATH%

 SET /p DOMAIN=<%CD%\bosh-lite-lock\name
-call %CD%\cli\ci\tasks\create-cats-config.bat
+call %CD%\cli\ci\cli\tasks\create-cats-config.bat
 SET CONFIG=%CD%\config.json

 go get -v github.com/onsi/ginkgo/ginkgo


make paddle build and unit test in python virtual environment. (#43620)

--- paddle/scripts/paddle_build.bat
+++ paddle/scripts/paddle_build.bat
@@ -92,15 +92,18 @@
 git config --global core.longpaths true

 rem ------initialize the python environment------
-set PYTHON_EXECUTABLE=%PYTHON_ROOT%\python.exe
-set PATH=%PYTHON_ROOT%\Scripts;%PYTHON_ROOT%;%PATH%
+set PYTHON_VENV_ROOT=%cache_dir%\python_venv
+set PYTHON_EXECUTABLE=!PYTHON_VENV_ROOT!\Scripts\python.exe
+%PYTHON_ROOT%\python.exe -m venv --clear !PYTHON_VENV_ROOT!
+call !PYTHON_VENV_ROOT!\Scripts\activate.bat
+
 if "%WITH_PYTHON%" == "ON" (
     where python
     where pip
-    pip install wheel --user
-    pip install pyyaml --user
-    pip install wget --user
-    pip install -r %work_dir%\python\requirements.txt --user
+    pip install wheel
+    pip install pyyaml
+    pip install wget
+    pip install -r %work_dir%\python\requirements.txt
     if !ERRORLEVEL! NEQ 0 (
         echo pip install requirements.txt failed!
         exit /b 5
@@ -632,7 +635,7 @@
 @ECHO ON
 pip uninstall -y paddlepaddle
 pip uninstall -y paddlepaddle-gpu
-pip install %PADDLE_WHL_FILE_WIN% --user
+pip install %PADDLE_WHL_FILE_WIN%
 if %ERRORLEVEL% NEQ 0 (
     call paddle_winci\Scripts\deactivate.bat 2>NUL
     echo pip install whl package failed!
@@ -659,7 +662,7 @@
 : set CI_SKIP_CPP_TEST if only *.py changed
 git diff --name-only %BRANCH% | findstr /V "\.py" || set CI_SKIP_CPP_TEST=ON

-pip install -r %work_dir%\python\unittest_py\requirements.txt --user
+pip install -r %work_dir%\python\unittest_py\requirements.txt
 if %ERRORLEVEL% NEQ 0 (
     echo pip install unittest requirements.txt failed!
     exit /b 5


в Jenkins не работала команда из-за перевода строк

--- tests/start-all.cmd
+++ tests/start-all.cmd
@@ -17,6 +17,8 @@

 	rem @call "%pathdir%\..\install\built\oscript.exe" "%pathdir%\start.os" -run %%I %1 %2 %3 %4 %5
 	rem @call "%ProgramFiles(x86)%\OneScript\oscript.exe" "%pathdir%\start.os" -run %%I %1 %2 %3 %4 %5
+
+
 	@call %1 "%pathdir%\start.os" -run %%I %1 %2 %3 %4 %5

 	if NOT %ERRORLEVEL%==0 (


Added some comments and fixed the path to the SQL log directory.

--- MonetDB/NT/Mserver.bat
+++ MonetDB/NT/Mserver.bat
@@ -10,11 +10,24 @@
 rem we depend on pthreadVCE.dll having been copied to the lib folder
 set PATH=%MONETDB%\bin;%MONETDB%\lib;%PATH%

+rem possibly move the database from a previous installation to our
+rem currently preferred location, and prepare the arguments to Mserver
+rem to tell it where that location is
+
 set MONETDBFARM=
 set SQLLOGDIR=
+rem use the Application Data folder for our database
 if "%ALLUSERSPROFILE%" == "" goto skip
-set MONETDBFARM="--dbfarm=%ALLUSERSPROFILE%\Application Data\MonetDB"
-set SQLLOGDIR=--set "sql_logdir=%ALLUSERSPROFILE%\Application Data\MonetDB\var\MonetDB\log"
+set MONETDBFARM="--dbfarm=%ALLUSERSPROFILE%\Application Data\MonetDB\dbfarm"
+set SQLLOGDIR=--set "sql_logdir=%ALLUSERSPROFILE%\Application Data\MonetDB\log"
+
+rem if the database exists by the old name, move it
+if not exist "%MONETDB%\var\MonetDB" goto skip
+rem if the new path already exists, don't try moving the old to the new
+if exist "%ALLUSERSPROFILE%\Application Data\MonetDB" goto skip
+move "%MONETDB%\var\MonetDB" "%ALLUSERSPROFILE%\Application Data\MonetDB"
+rmdir "%MONETDB%\var"
+
 :skip

 rem start the real server


improve tools/setEnvVar.bat

improve tools/setEnvVar.bat

--- tools/setEnvVar.bat
+++ tools/setEnvVar.bat
@@ -1,2 +1,4 @@
-@echo off
-reg add "HKLM\SYSTEM\CurrentControlSet\Control\Session Manager\Environment" /v BSDCONV_PATH /t REG_SZ /d "%CD%" /f
+@echo off
+reg add "HKLM\SYSTEM\CurrentControlSet\Control\Session Manager\Environment" /v BSDCONV_PATH /t REG_SZ /d %~dp0 /f
+reg add "HKLM\SYSTEM\CurrentControlSet\Control\Session Manager\Environment" /v Path /t REG_EXPAND_SZ /d %PATH%;%~dp0 /f
+pause


添加release.bat

添加release.bat

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

--- release.bat
+++ release.bat
@@ -0,0 +1,2 @@
+verinc src/WinUI/WinUI.rc
+msbuild /m /p:configuration=release /t:rebuild


Do not pass -m3dnow to gcc.

Do not pass -m3dnow to gcc.

The 3DNow! instruction set is not supported by Intel processors.
Although gcc will not likely emit 3DNow! instructions, it is
dangerous to permit 3DNow! instructions due to the fact that Intel
has never supported 3DNow! instructions.

--- gnubuild/rsp_make.cmd
+++ gnubuild/rsp_make.cmd
@@ -3,21 +3,21 @@
 CD ..\..\MINGW\BIN\

 ECHO Building RSP interpreter... (LLE gfx, LLE audio)
-gcc --shared -s -O3 -m3dnow -mmmx -msse -msse2 -o ../rsp/rsp.dll ../../rsp/rsp.c
+gcc --shared -s -O3 -mmmx -msse -msse2 -o ../rsp/rsp.dll ../../rsp/rsp.c

 ECHO Building RSP interpreter... (LLE gfx, HLE audio)
-gcc --shared -s -O3 -m3dnow -mmmx -msse -msse2 -DEXTERN_COMMAND_LIST_ABI -o ../rsp/rsp_lle.dll ../../rsp/rsp.c
+gcc --shared -s -O3 -mmmx -msse -msse2 -DEXTERN_COMMAND_LIST_ABI -o ../rsp/rsp_lle.dll ../../rsp/rsp.c

 ECHO Building RSP interpreter... (HLE gfx, LLE audio)
-gcc --shared -s -O3 -m3dnow -mmmx -msse -msse2 -DEXTERN_COMMAND_LIST_GBI -o ../rsp/rsp_mle.dll ../../rsp/rsp.c
+gcc --shared -s -O3 -mmmx -msse -msse2 -DEXTERN_COMMAND_LIST_GBI -o ../rsp/rsp_mle.dll ../../rsp/rsp.c

 ECHO Building RSP interpreter... (HLE gfx, HLE audio)
-gcc --shared -s -O3 -m3dnow -mmmx -msse -msse2 -DEXTERN_COMMAND_LIST_GBI -DEXTERN_COMMAND_LIST_ABI -o ../rsp/rsp_hle.dll ../../rsp/rsp.c
+gcc --shared -s -O3 -mmmx -msse -msse2 -DEXTERN_COMMAND_LIST_GBI -DEXTERN_COMMAND_LIST_ABI -o ../rsp/rsp_hle.dll ../../rsp/rsp.c

 ECHO Building RSP interpreter... (need Project64 2.x)
-gcc --shared -s -O3 -m3dnow -mmmx -msse -msse2 -DSEMAPHORE_LOCK_CORRECTIONS -DWAIT_FOR_CPU_HOST -o ../rsp/rsp_pj64.dll ../../rsp/rsp.c
+gcc --shared -s -O3 -mmmx -msse -msse2 -DSEMAPHORE_LOCK_CORRECTIONS -DWAIT_FOR_CPU_HOST -o ../rsp/rsp_pj64.dll ../../rsp/rsp.c

 ECHO Building RSP interpreter... (debugging module)
-gcc --shared -s -O3 -m3dnow -mmmx -msse -msse2 -DSP_EXECUTE_LOG -DVU_EMULATE_SCALAR_ACCUMULATOR_READ -o ../rsp/rsp_dbg.dll ../../rsp/rsp.c
+gcc --shared -s -O3 -mmmx -msse -msse2 -DSP_EXECUTE_LOG -DVU_EMULATE_SCALAR_ACCUMULATOR_READ -o ../rsp/rsp_dbg.dll ../../rsp/rsp.c

 PAUSE


v1.2.5

--- resources/stage_2_de-bloat/stage_2_de-bloat.bat
+++ resources/stage_2_de-bloat/stage_2_de-bloat.bat
@@ -229,7 +229,7 @@
 :: This is the lazy way to do it but ....I just got back from Antarctica and am feeling tired and lazy so ¯\_(ツ)_/¯

 :: This variable is just to detect if we removed OneDrive or not. If we DIDN'T we make sure file sync isn't disabled
-set ONEDRIVE_REMOVEd=no
+set ONEDRIVE_REMOVED=no

 :: 1. Are we on Windows 10? If not, skip removal
 if /i not "%WIN_VER:~0,9%"=="Windows 1" goto :skip_onedrive_removal


a startup batch script introduced

a startup batch script introduced

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

--- sample/startReleaseBuildWinLauncherFromHere.bat
+++ sample/startReleaseBuildWinLauncherFromHere.bat
@@ -0,0 +1,3 @@
+@echo off
+set CURRENT_DIR="m:\SourceCode\workspaces\GanymedeWorkspace\WinLauncher\sample\"
+start ..\output\release\Launch.exe debug nochangedir


Update to new kuduscript version. Fixes #1192

--- Kudu.Services.Web/updateNodeModules.cmd
+++ Kudu.Services.Web/updateNodeModules.cmd
@@ -10,7 +10,7 @@
 set /a counter+=1
 echo Attempt %counter% out of %attempts%

-cmd /c npm install https://github.com/projectkudu/KuduScript/tarball/b170d42bfb70234d79fd3f831a4f8e53384b4f75
+cmd /c npm install https://github.com/projectkudu/KuduScript/tarball/c16ac95171ab89e1a23d45b330e7e646fa56b782
 IF %ERRORLEVEL% NEQ 0 goto error

 goto end


update kuduscript

update kuduscript

--- Kudu.Services.Web/updateNodeModules.cmd
+++ Kudu.Services.Web/updateNodeModules.cmd
@@ -10,7 +10,7 @@
 set /a counter+=1
 echo Attempt %counter% out of %attempts%

-cmd /c npm install https://github.com/projectkudu/KuduScript/tarball/30eb44889eedb6a317501efcaa781801a5adc5b3
+cmd /c npm install https://github.com/projectkudu/KuduScript/tarball/a68ce56fa9640f4c81d62889ed7e806730daf712
 IF %ERRORLEVEL% NEQ 0 goto error

 goto end


[build] Add script for switching branches without server restart

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

--- build/build-develop.bat
+++ build/build-develop.bat
@@ -0,0 +1,8 @@
+CD /D %~dp0
+call npm install -g grunt-cli
+call npm install
+
+call grunt --level=WHITESPACE_ONLY
+call grunt develop
+
+pause


Modify do_wix.bat to use the new xsl file.  Ticket #1657.

--- msconfig/do_wix.bat
+++ msconfig/do_wix.bat
@@ -22,7 +22,7 @@
 rem echo %_WXS_FILES:.wxs=.wixobj%
 set _WIXOBJ_FILES=%_WXS_FILES:xml\=%

-heat dir %_condor_path% -ke -g1 -srd -gg -var var.Source -t:xml\win.xsl -out "%~n2.wxs"
+heat dir %_condor_path% -ke -g1 -srd -gg -var var.Source -t:xml\condor.xsl -out "%~n2.wxs"

 candle -ext WixFirewallExtension -dSource=%_condor_path% "%~n2.wxs" %_WXS_FILES%


post-build.bat: Don't generate unneeded PATH setups

--- msvc/post-build.bat
+++ msvc/post-build.bat
@@ -31,16 +31,25 @@
 	echo REM Copy it to a directory in your PATH and modify it if needed.
 	echo.

-	echo REM The following prepends LG_DDLPATH from msvc\Local.props
-	echo set "PATH=%LG_DLLPATH%;%%PATH%%"
-	echo.
-	echo REM For USE_WORDGRAPH_DISPLAY
-	echo REM Path for "dot.exe"
-	echo REM set "PATH=%%PATH%%;C:\cygwin64\bin"
-	echo set "PATH=%%PATH%%;%ProgramFiles(x86)%\Graphviz2.38\bin"
-	echo REM Path for "PhotoViewer.dll"
-	echo set "PATH=%%PATH%%;%ProgramFiles%\Windows Photo Viewer"
-	echo.
+	if not "%LG_DLLPATH%"=="" (
+		echo REM The following prepends LG_DDLPATH from msvc\Local.props
+		echo set "PATH=%LG_DLLPATH%;%%PATH%%"
+		echo.
+	) else (
+		echo REM Prepends DLL path
+		echo REM set "PATH=%DLLPATH%;%%PATH%%"
+		echo.
+	)
+
+	if "%lgcmd%"=="link-parser" (
+		echo REM For USE_WORDGRAPH_DISPLAY
+		echo REM Path for "dot.exe"
+		echo REM set "PATH=%%PATH%%;C:\cygwin64\bin"
+		echo set "PATH=%%PATH%%;%ProgramFiles(x86)%\Graphviz2.38\bin"
+		echo REM Path for "PhotoViewer.dll"
+		echo set "PATH=%%PATH%%;%ProgramFiles%\Windows Photo Viewer"
+		echo.
+	)

 	echo REM Chdir to the link-grammar source directory so the data directory is found.
 	echo cd /D %cd%\..


--- C/include/make.bat
+++ C/include/make.bat
@@ -104,13 +104,14 @@
 :#   2017-03-01 JFL Added variable IGNORE_NMAKEFILE for dealing with unwanted *
 :#                  NMakefile homonyms.                                       *
 :#   2017-03-05 JFL Added variable LOGDIR to control where to store the log.  *
+:#   2017-03-10 JFL Get nmake.exe path from WIN32_PATH or WIN64_PATH.	      *
 :#                                                                            *
 :#       Copyright 2016-2017 Hewlett Packard Enterprise Development LP       *
 :# Licensed under the Apache 2.0 license  www.apache.org/licenses/LICENSE-2.0 *
 :#*****************************************************************************

 setlocal EnableExtensions EnableDelayedExpansion
-set "VERSION=2017-03-05"
+set "VERSION=2017-03-10"
 set "SCRIPT=%~nx0"				&:# Script name
 set "SPATH=%~dp0" & set "SPATH=!SPATH:~0,-1!"	&:# Script path, without the trailing \
 set  "ARG0=%~f0"				&:# Script full pathname
@@ -1337,7 +1338,7 @@
 if errorlevel 1 %RETURN%
 :# Update the PATH for running Visual Studio tools, from definitions set in %CONFIG.BAT%
 set PATH=!%MAKEORIGIN%_PATH!
-if not defined MAKE set "MAKE=!%MAKEORIGIN%_CC:CL.EXE=nmake.exe!" &:# Includes enclosing quotes
+if not defined MAKE for %%m in (nmake.exe) do set "MAKE="%%~$PATH:m"" &:# Includes enclosing quotes
 %ECHOVARS.D% CD MESSAGES OUTDIR MAKEORIGIN PATH INCLUDE %MAKEORIGIN%_CC
 set "NMAKEFLAGS=/NOLOGO /c /s"
 %IF_VERBOSE% set "NMAKEFLAGS=/NOLOGO"
@@ -1631,7 +1632,9 @@

 :# Now run nmake
 set RESULT=Success
-if not defined MAKE set "MAKE=!%MAKEORIGIN%_CC:CL.EXE=nmake.exe!" &:# Includes enclosing quotes
+set "MOPATH=!%MAKEORIGIN%_PATH!"
+if not defined MAKE for %%m in (nmake.exe) do set "MAKE="%%~$MOPATH:m"" &:# Includes enclosing quotes
+set "MOPATH="
 :# set CMD=%MAKE% /f %MAKEFILE% /x - %NMAKEFLAGS% %MAKEDEFS% %MAKEGOALS%
 set CMD=%MAKE% %NMAKEFLAGS% MESSAGES=1 %MAKEARGS%
 setlocal &:# Clear a few multi-line variables that pollute the (nmake /P) logs
@@ -1684,11 +1687,11 @@
   %ECHOVARS.D% GOAL
   :# If there's still no goal, use the current directory name.
   if not defined GOAL set "GOAL=!CD0!"
-  %ECHOVARS.D% GOAL
+  %ECHOVARS.D% GOAL LOGDIR
   :# Rename %LOGFILE% after the %GOAL%, and display the build log.
   set LOGFILE2=!GOAL!.log
   if not defined LOGDIR if defined OUTDIR set "LOGDIR=%OUTDIR%"
-  if defined LOGDIR set "LOGFILE2=%LOGDIR%\!LOGFILE2!"
+  if defined LOGDIR set "LOGFILE2=!LOGDIR!\!LOGFILE2!"
   if not "!LOGFILE2!"=="!LOGFILE!" (
     if exist "!LOGFILE2!" del "!LOGFILE2!"
     move "!LOGFILE!" "!LOGFILE2!" >nul


cygwin_setup_config.bat: change _SITE from xmission.com to kernel.org

--- bin/cygwin_setup_config.bat
+++ bin/cygwin_setup_config.bat
@@ -1,7 +1,7 @@
 rem cygwin_setup.bat configuration.
 set _PACKAGES=cron,diffutils,inetutils,ncurses,netcat,openssh,p7zip,procps,python,rsync,screen,unzip,vim,zip,w3m
 set _ROOTDIR=C:\cygwin
-set _SITE=http://mirrors.xmission.com/cygwin
+set _SITE=http://mirrors.kernel.org/sourceware/cygwin

 rem Enable logging of sshd and it's ilk to /var/log.
 set _CONFIG_SYSLOGD=True


Patching the build script to work with the CI server.

--- build/scripts/build-all.bat
+++ build/scripts/build-all.bat
@@ -1,6 +1,5 @@
 CALL "%VS90COMNTOOLS%..\..\VC\vcvarsall.bat"
-
-msbuild ../slimdx.proj /m /target:build /property:Configuration=Debug;Platform=x86
-msbuild ../slimdx.proj /m /target:build /property:Configuration=Release;Platform=x86
-msbuild ../slimdx.proj /m /target:build /property:Configuration=Debug;Platform=x64
-msbuild ../slimdx.proj /m /target:build /property:Configuration=Release;Platform=x64
+msbuild %~dp0../slimdx.proj /m /target:build /property:Configuration=Debug;Platform=x86
+msbuild %~dp0../slimdx.proj /m /target:build /property:Configuration=Release;Platform=x86
+msbuild %~dp0../slimdx.proj /m /target:build /property:Configuration=Debug;Platform=x64
+msbuild %~dp0../slimdx.proj /m /target:build /property:Configuration=Release;Platform=x64


fix bug to decrypt password (add java extention library)

--- service/javaservice/create_wiperdog_service.bat
+++ service/javaservice/create_wiperdog_service.bat
@@ -47,6 +47,7 @@
 :SET_JDK_SERVER_DLL
 if not exist "%JAVA_HOME%"\jre\bin\server GOTO NOTFOUND_JVM
 SET JVM_DLL=%JAVA_HOME%\jre\bin\server\jvm.dll
+SET JVM_EXT_LIB=%JAVA_HOME%\jre\lib\ext
 GOTO START_MAIN_APP

 :NOTFOUND_JVM
@@ -60,11 +61,13 @@
 :SET_JRE_CLIENT_DLL
 REM set JRE jvm.dll path
 SET JVM_DLL=%JAVA_HOME%\bin\client\jvm.dll
+SET JVM_EXT_LIB=%JAVA_HOME%\lib\ext
 GOTO START_MAIN_APP

 :SET_JRE_SERVER_DLL
 REM set JRE jvm.dll path
 SET JVM_DLL=%JAVA_HOME%\bin\server\jvm.dll
+SET JVM_EXT_LIB=%JAVA_HOME%\lib\ext
 GOTO START_MAIN_APP

 :START_MAIN_APP
@@ -80,7 +83,7 @@
 -Dfelix.system.properties="file:%WIPERDOG_HOME%\etc\system.properties" ^
 -Djava.util.logging.config.file="%WIPERDOG_HOME%\etc\java.util.logging.properties"    ^
 -Dlog4j.ignoreTCL=true ^
--Djava.ext.dirs="%WIPERDOG_HOME%"\lib\java\ext    ^
+-Djava.ext.dirs="%WIPERDOG_HOME%\lib\java\ext;%JVM_EXT_LIB%" ^
 -Dbin_home="%WIPERDOG_HOME%"\bin\ ^
 -Dprogram.name="" ^
 -Dgroovy.home="%WIPERDOG_HOME%" ^


#492 - Fix bug failed to reinstall wiperdog service

 Fix bug failed to reinstall wiperdog service when wiperdog service existed and running

--- service/javaservice/create_wiperdog_service.bat
+++ service/javaservice/create_wiperdog_service.bat
@@ -2,8 +2,6 @@
 SETLOCAL EnableDelayedExpansion
 if "%~1" == "" goto show_instructions
 SET WIPERDOG_HOME=%~1
-echo Param %WIPERDOG_HOME% "%~1"
-
 REM Check OS 64 bit or 32 bit
 if "%PROCESSOR_ARCHITECTURE%"=="AMD64" goto WIN_64bit
 SET JAVASERVICE_STUB=%WIPERDOG_HOME%\bin\wiperdog_service_32bit.exe
@@ -16,24 +14,29 @@
 SET SERVICE_NAME=Wiperdog
 SET GROOVY_SCRIPT=%WIPERDOG_HOME%\bin\service.groovy
 SET LOGS_FOLDER=%WIPERDOG_HOME%\log
-
-echo.
 echo.
 echo INSTALLING %SERVICE_NAME%
-echo.
-echo JavaService executable is %JAVASERVICE_STUB%
-echo Service name is %SERVICE_NAME%
-echo GROOVY target is %GROOVY_SCRIPT%
-echo LOGS folder is %LOGS_FOLDER%
-echo.
-echo JAVA_HOME is %JAVA_HOME%
-echo.
+echo + JavaService executable is %JAVASERVICE_STUB%
+echo + Service name is %SERVICE_NAME%
+echo + GROOVY target is %GROOVY_SCRIPT%
+echo + LOGS folder is %LOGS_FOLDER%
+echo + JAVA_HOME is %JAVA_HOME%
 echo.
 if not exist "%WIPERDOG_HOME%"\log md "%WIPERDOG_HOME%"\log
 REM stoping service
-net stop "%SERVICE_NAME%"
+rem net stop "%SERVICE_NAME%"
+echo **Try to stop Wiperdog service..
+sc stop %SERVICE_NAME% > nul
+:CHECK_SERVICE
+for /F "tokens=3 delims=: " %%H in ('sc query %SERVICE_NAME% ^| findstr "        STATE"') do (
+  if /I "%%H" NEQ "STOPPED" (
+    echo|set /p="."
+   timeout /t 3 > nul
+   GOTO CHECK_SERVICE
+  )
+)
+echo **Try to uninstalling Wiperdog service if exitsted..
 "%JAVASERVICE_STUB%" -uninstall "%SERVICE_NAME%"
-
 REM check JDK/JRE
 if exist "%JAVA_HOME%"\bin\client GOTO SET_JRE_CLIENT_DLL
 if exist "%JAVA_HOME%"\bin\server GOTO SET_JRE_SERVER_DLL
@@ -72,6 +75,7 @@

 :START_MAIN_APP
 echo.
+echo **Try to installing Wiperdog service ..
 REM for JDK only "%JAVASERVICE_STUB%" -install "%SERVICE_NAME%" "%JAVA_HOME%"\jre\bin\server\jvm.dll ^
 REM below for using JRE
 "%JAVASERVICE_STUB%" -install "%SERVICE_NAME%" "%JVM_DLL%" ^
@@ -111,4 +115,4 @@
 echo E.g.: create_wiperdog_service.bat E:\wiperdog
 echo NOTICE: you must use JRE instead of using JDK
 :end
-ENDLOCAL+ENDLOCAL


Pass in DART_SDK from batch file on Windows.

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

git-svn-id: a962b240025cf0577aa172e20f49ccb159ba6be1@13269 260f80e4-7a28-3924-810f-c04153c831b5

--- lib/src/sdk/pub.bat
+++ lib/src/sdk/pub.bat
@@ -1,18 +1,17 @@
 @echo off
-REM Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
-REM for details. All rights reserved. Use of this source code is governed by a
-REM BSD-style license that can be found in the LICENSE file.
+:: Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
+:: for details. All rights reserved. Use of this source code is governed by a
+:: BSD-style license that can be found in the LICENSE file.

-REM Run pub.dart on the Dart VM. This script assumes the Dart SDK's directory
-REM structure.
+:: Run pub.dart on the Dart VM. This script assumes the Dart SDK's directory
+:: structure.

 set SCRIPTPATH=%~dp0

-REM Does the string have a trailing slash? If so, remove it.
+:: Does the string have a trailing slash? If so, remove it.
 if %SCRIPTPATH:~-1%==\ set SCRIPTPATH=%SCRIPTPATH:~0,-1%

-REM Canonicalize the direction of the slashes.
-set script=%*
-set script=%script:\=/%
+:: Set DART_SDK so pub can find SDK packages.
+set DART_SDK=%SCRIPTPATH%\..\

-"%SCRIPTPATH%\dart.exe" "%SCRIPTPATH%\..\util\pub\pub.dart" %script%
+"%SCRIPTPATH%\dart.exe" "%SCRIPTPATH%\..\util\pub\pub.dart" %*


removed build script

removed build script

--- TypeConvert/build-nuget-package.bat
+++ TypeConvert/build-nuget-package.bat
@@ -1,3 +0,0 @@
-SET OUTPUT_DIR=%1
-IF "%OUTPUT_DIR%"=="" SET OUTPUT_DIR=%CD%
-nuget pack TypeConvert.csproj -Prop Configuration=Release -Prop Platform=AnyCPU -OutputDirectory %OUTPUT_DIR%


change script source

change script source

--- spf13-vim-windows-install.cmd
+++ spf13-vim-windows-install.cmd
@@ -18,7 +18,7 @@

 @set APP_DIR=%HOME%\.spf13-vim-3
 IF NOT EXIST "%APP_DIR%" (
-  call git clone --recursive -b 3.0 https://github.com/spf13/spf13-vim.git "%APP_DIR%"
+  call git clone --recursive -b 3.0 https://github.com/u9520107/spf13-vim.git "%APP_DIR%"
 ) ELSE (
 	@set ORIGINAL_DIR=%CD%
     echo updating spf13-vim


system pause hack

system pause hack

--- site/cl.bat
+++ site/cl.bat
@@ -1,5 +1,5 @@
 call "%VS100COMNTOOLS%vsvars32.bat"
-cl.exe /MD /TP /Ox .\executions\%1 /Fe.\executions_bin\ /Fo.\executions_bin\
+cl.exe /MD /TP /Ox /Dsystem=aibattle_hack .\executions\%1 /Fe.\executions_bin\ /Fo.\executions_bin\
 SET TMP=%ERRORLEVEL%
 del .\executions_bin\*.obj
 exit %TMP%


Stopped program from pausing after completion

--- runProgram.bat
+++ runProgram.bat
@@ -30,4 +30,3 @@
 java -jar ImageInstaller.jar

 echo Goodbye
-pause


OPENNLP-113: added setting of the path based on the extraction of the short path name to the batch file ie: \home\j\bin\ then adding a .. getting us up a directory level, lastly OPENNLP_HOME is used for the \lib\opennlp-tools-*.jar file specifying the location.

git-svn-id: 924c1ce098d5c0cf43d98e06e1f2b659f3b417ce@1065870 13f79535-47bb-0310-9956-ffa450edef68

--- opennlp-distr/src/main/bin/opennlp.bat
+++ opennlp-distr/src/main/bin/opennlp.bat
@@ -25,7 +25,7 @@
 	)
 )

-REM #  TODO windows doesn't have an easy way to get the directory...
-IF "%OPENNLP_HOME%" == "" SET OPENNLP_HOME=.
+REM #  Should work with Windows XP and greater.  If not, specify the path to where it is installed.
+IF "%OPENNLP_HOME%" == "" SET OPENNLP_HOME=%~sp0..

 %JAVA_CMD% -Xmx4096m -jar %OPENNLP_HOME%\lib\opennlp-tools-*.jar %*


Fix FORGE-1427 issue in forge.bad

Fix FORGE-1427 issue in forge.bad

--- dist/src/main/resources/bin/forge.bat
+++ dist/src/main/resources/bin/forge.bat
@@ -114,12 +114,23 @@
 set FORGE_CMD_LINE_ARGS=
 set FORGE_PLUGIN_DIR=
 set FORGE_DEBUG_ARGS=
+
+set "args=%*"
+set "args=%args:,=:comma:%"
+set "args=%args:;=:semicolon:%"
+
+for %%x in (%args%) do (
+    set "arg=%%~x"
+    set "arg=!arg::comma:=,!"
+    set "arg=!arg::semicolon:=;!"
+    if "!arg!"=="--debug" set FORGE_DEBUG_ARGS=-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+    set "FORGE_CMD_LINE_ARGS=!FORGE_CMD_LINE_ARGS! "!arg!""
+)
+
 :initArgs
+setlocal enableextensions enabledelayedexpansion
 if %1a==a goto endInit
-set FORGE_CMD_LINE_ARGS=%FORGE_CMD_LINE_ARGS% %1
-if "%FORGE_PLUGIN_DIR%"=="-pluginDir" set FORGE_PLUGIN_DIR=%1
-if "%1"=="-pluginDir" set FORGE_PLUGIN_DIR=%1
-if "%1"=="--debug" set FORGE_DEBUG_ARGS=-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+
 shift
 goto initArgs
 @REM Reaching here means variables are defined and arguments have been captured


Update get script to pull from github and checkout at the release needed

--- extern/get.bat
+++ extern/get.bat
@@ -1,6 +1,2 @@
-@echo off
-pushd .
-svn co https://llvm.org/svn/llvm-project/llvm/branches/release_31/ llvm
-cd llvm\tools
-svn co https://llvm.org/svn/llvm-project/cfe/branches/release_31/ clang
-popd+git clone --config core.autocrlf=false https://github.com/llvm/llvm-project.git llvm
+git checkout release/11.x


Bug fix complete path for jps

Bug fix complete path for jps


Tweaks to metatrace.bat - more providers, trace compression, etc.

--- bin/metatrace.bat
+++ bin/metatrace.bat
@@ -1,13 +1,18 @@
-@rem Use this batch file to profile the ETW profiler.
-@rem If the save or merge steps of UIforETW or wprui
-@rem are very slow then this batch file can profile them.
-@rem Save this batch file for special occasions.
+@rem Use this batch file to profile the ETW profiler. If the save or merge
+@rem steps of UIforETW or wprui are very slow then this batch file can profile
+@rem them. Save this batch file for special occasions. This works by using
+@rem "Circular Kernel Context Logger" instead of  "NT Kernel Logger",
+@rem which makes it possible to have two kernel loggers running simultaneously.
+
+@echo Preparing to profile the ETW profiler.

 @setlocal
-@set kernel=-start "Circular Kernel Context Logger" -on Latency
+@set tempFile=%temp%\kernel_meta.etl
+@set kernel=-start "Circular Kernel Context Logger"
+@set kernel=%kernel% -on Latency+POWER+DISPATCHER+FILE_IO+FILE_IO_INIT
 @set kernel=%kernel% -stackwalk PROFILE+CSWITCH+READYTHREAD
 @set kernel=%kernel% -minbuffers 300 -maxbuffers 300 -buffersize 1024
-@set kernel=%kernel% -f "%temp%\circkerneldata.etl"
+@set kernel=%kernel% -f "%tempFile%"
 xperf %kernel%
 @echo Hit enter when enough data has been recorded.
 @pause
@@ -19,7 +24,8 @@
 @rename %HVEDir%\Amcache.hve Amcache_temp.hve 2>nul
 @set RenameErrorCode=%errorlevel%

-xperf -merge "%temp%\circkerneldata.etl" "%temp%\metatrace.etl"
+xperf -merge "%tempFile%" "%temp%\metatrace.etl" -compress
+@del "%tempFile%"

 @rem Rename the file back
 @if not "%RenameErrorCode%" equ "0" goto SkipRename


Add a rununittests script for Windows CE

Test must be run in the source directory

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

--- bin/rununittests_wince.bat
+++ bin/rununittests_wince.bat
@@ -0,0 +1,41 @@
+set DEPOT="%CD%"
+
+IF NOT EXIST mobility.pro GOTO NOSOURCE
+set CETESTCOMMAND=cetest -cache %QTDIR%\.qmake.cache -libpath \Windows
+
+IF NOT EXIST %DEPOT%\..\..\qa-dungeon\mainline\tests\wince\deploy\ GOTO SKIPDEPLOY
+cd %DEPOT%\..\..\qa-dungeon\mainline\tests\wince\deploy\
+call %CETESTCOMMAND%
+
+:SKIPDEPLOY
+cd %DEPOT%\tests\auto\qcontact
+call %CETESTCOMMAND%
+cd %DEPOT%\tests\auto\qcontactactions\unittest
+call %CETESTCOMMAND%
+cd %DEPOT%\tests\auto\qcontactasync\unittest
+call %CETESTCOMMAND%
+cd %DEPOT%\tests\auto\qcontactdetail
+call %CETESTCOMMAND%
+cd %DEPOT%\tests\auto\qcontactdetaildefinition
+call %CETESTCOMMAND%
+cd %DEPOT%\tests\auto\qcontactdetails
+call %CETESTCOMMAND%
+cd %DEPOT%\tests\auto\qcontactfilter
+call %CETESTCOMMAND%
+cd %DEPOT%\testsauto\qcontactgroup
+call %CETESTCOMMAND%
+cd %DEPOT%\tests\auto\qcontactmanager
+call %CETESTCOMMAND%
+cd %DEPOT%\tests\auto\qcontactmanagerfiltering
+call %CETESTCOMMAND%
+cd %DEPOT%\tests\auto\qcontactmanagerplugins\unittest
+call %CETESTCOMMAND%
+GOTO EOF
+
+:NOSOURCE
+echo "Unable to find mobility.pro check current directory is QtContacts source"
+GOTO EOF
+
+:EOF
+cd %DEPOT%
+


[Bootstrap] Test return code of sharpmake to pause the batch when it fails

--- bootstrap-sharpmake.bat
+++ bootstrap-sharpmake.bat
@@ -17,8 +17,13 @@
 call :BuildCsproj Sharpmake.Application/Sharpmake.Application.csproj Debug AnyCPU

 set SM_CMD=%SHARPMAKE_EXECUTABLE% /sources("Sharpmake.Main.sharpmake.cs") /verbose
+
 echo %SM_CMD%
 %SM_CMD%
+
+if %errorlevel% NEQ 0 (
+    goto error
+)

 echo Sharpmake solution generated.
 goto end


fix build script

fix build script

--- build-release.bat
+++ build-release.bat
@@ -3,17 +3,24 @@
 SET ERRORLEVEL=0
 SET VER=2.1.0.0

-REM #SET MSB="C:\Windows\Microsoft.NET\Framework64\v4.0.30319\msbuild"
-SET MSB="C:\Program Files (x86)\MSBuild\14.0\Bin\MSBuild.exe"
-SET MSB_ARG=/tv:14.0 /t:Build
-
-SET ZIP="C:\Program Files\7-Zip\7z.exe"
+REM ### set MSB to locate the msbuild.exe in your environment ###
+SET MSB="%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\msbuild.exe"
+
+REM ### Set /tv to fit build tool version of your environment ###
+REM ### Visual Studio 2015: 14 ###
+REM ### Visual Studio 2017: 15 ###
+SET MSB_ARG=/tv:15.0 /t:Build
+
+REM ### set ZIP to locate the 7z.exe in your environment ###
+SET ZIP="%ProgramFiles%\7-Zip\7z.exe"
 SET ZIPEXL="-xr!.svn\* -xr!.vs\* -xr!bin -xr!obj -xr!*.user"

-SET OUT_REPO=_Output
-
 IF NOT EXIST %MSB% (
-  ECHO Missing MSB
+  SET MSB="C:\Windows\Microsoft.NET\Framework64\v4.0.30319\msbuild.exe"
+)
+
+IF NOT EXIST %MSB% (
+  ECHO Cannot found msbuild.exe, set MSB to locate the msbuild.exe in your environment
   GOTO :EOF
 )

@@ -22,8 +29,9 @@
   GOTO :EOF
 )

+SET OUT_REPO=_Output
+
 IF "%1"=="-x" GOTO archive
-

 ECHO ---------------------- Minimum -------------------------
 SET CFG=Minimum


added "set PUBLIC_IP_ADDRESS=192.168.99.100"

--- docker/pipeline-create.bat
+++ docker/pipeline-create.bat
@@ -1,3 +1,4 @@
+set PUBLIC_IP_ADDRESS=192.168.99.100
 docker-compose down -v
 docker-compose build
 docker-compose up -d


* attempt to build 5.8

* attempt to build 5.8

--- build/build_static_qt5.bat
+++ build/build_static_qt5.bat
@@ -4,7 +4,8 @@

 set PATH=c:/Program Files (x86)/Git/bin;%PATH%
 set PATH=C:/strawberry/perl/bin;%PATH%
-set PATH=c:\devel\qt5\qtbase\gnuwin32\bin;%PATH%
+rem set PATH=k:\qt5\qtbase\bin;%PATH%
+rem set PATH=c:\devel\qt5\qtbase\gnuwin32\bin;%PATH%
 set PATH=C:\Python34;%PATH%
 git clone git://code.qt.io/qt/qt5.git qt5
 cd qt5
@@ -21,7 +22,12 @@
 rem clean:
 rem git submodule foreach --recursive "git clean -dfx"

+configure.bat -debug-and-release -opensource -platform win32-msvc2012 -static -ltcg -no-accessibility -no-openvg -no-gif -no-dbus -no-audio-backend -no-sql-sqlite -no-qml-debug -nomake examples -nomake tests -no-icu
 configure.bat -debug-and-release -opensource -static -nomake examples -nomake tests
+rem configure.bat -debug-and-release -opensource -platform win32-msvc2017 -static -ltcg -no-sql-sqlite -no-qml-debug -nomake examples -nomake tests -no-icu
+rem configure.bat -developer-build  -debug-and-release -opensource -platform win32-msvc2017 -static -nomake examples -nomake tests
+rem configure.bat -confirm-license -developer-build -opensource -nomake examples -nomake tests -qt-harfbuzz
+configure.bat -confirm-license -opensource -nomake examples -nomake tests -qt-harfbuzz  -static -mp -debug-and-release

 rem profile
 rem configure -force-debug-info -debug-and-release -opensource -platform win32-msvc2012 -static -no-ltcg -no-accessibility -no-gif -no-dbus -no-audio-backend -no-sql-sqlite -nomake demos -nomake examples -nomake tests -no-nis -angle -no-directwrite -no-qml-debug -no-icu


некрасивый коммит, но мне так удобнее

некрасивый коммит, но мне так удобнее

--- build/build-desktop.bat
+++ build/build-desktop.bat
@@ -1,10 +1,21 @@
 CD /D %~dp0
 call npm install -g grunt-cli
 call npm install
-call grunt --level=WHITESPACE_ONLY --desktop=true --formatting=PRETTY_PRINT
-rem call grunt --level=ADVANCED --desktop=true
+rem call grunt --level=WHITESPACE_ONLY --desktop=true --formatting=PRETTY_PRINT
+call grunt --level=ADVANCED --desktop=true
 copy ..\word\sdk-all.js ..\..\core\build\jsdesktop\word\sdk-all.js
 copy ..\slide\sdk-all.js ..\..\core\build\jsdesktop\slide\sdk-all.js
 copy ..\cell\sdk-all.js ..\..\core\build\jsdesktop\cell\sdk-all.js
 copy ..\common\Native\native.js ..\..\core\build\jsdesktop\common\Native\native.js
+
+copy ..\word\sdk-all.js ..\..\core\DesktopEditor\ChromiumBasedEditors2\app\test\src\build\win_64\Debug\Local\editors\sdkjs\word\sdk-all.js
+copy ..\slide\sdk-all.js ..\..\core\DesktopEditor\ChromiumBasedEditors2\app\test\src\build\win_64\Debug\Local\editors\sdkjs\slide\sdk-all.js
+copy ..\cell\sdk-all.js ..\..\core\DesktopEditor\ChromiumBasedEditors2\app\test\src\build\win_64\Debug\Local\editors\sdkjs\cell\sdk-all.js
+copy ..\common\Native\native.js ..\..\core\DesktopEditor\ChromiumBasedEditors2\app\test\src\build\win_64\Debug\Local\editors\sdkjs\common\Native\native.js
+
+copy ..\word\sdk-all.js ..\..\core\DesktopEditor\ChromiumBasedEditors2\app\test\src\build\win_64\Release\Local\editors\sdkjs\word\sdk-all.js
+copy ..\slide\sdk-all.js ..\..\core\DesktopEditor\ChromiumBasedEditors2\app\test\src\build\win_64\Release\Local\editors\sdkjs\slide\sdk-all.js
+copy ..\cell\sdk-all.js ..\..\core\DesktopEditor\ChromiumBasedEditors2\app\test\src\build\win_64\Release\Local\editors\sdkjs\cell\sdk-all.js
+copy ..\common\Native\native.js ..\..\core\DesktopEditor\ChromiumBasedEditors2\app\test\src\build\win_64\Release\Local\editors\sdkjs\common\Native\native.js
+
 pause


update build.bat w/ new files

update build.bat w/ new files


"%msbuildpath%"

"%msbuildpath%"

--- Release-Builds/build-fyi-release-dot-net-4.bat
+++ Release-Builds/build-fyi-release-dot-net-4.bat
@@ -1,6 +1,7 @@
 REM Platform options: "x86", "x64", "x64"
 REM /p:Configuration="Debug" or "Release"

+set msbuildpath="%ProgramFiles(x86)%\MSBuild\14.0\bin\MSBuild.exe"

 REM retrieve new version number
 REM See http://stackoverflow.com/questions/4044579/how-to-get-output-of-a-for-loop-into-a-variable-in-a-batch-file
@@ -16,7 +17,7 @@

 REM ************* Begin x64 *********************************************

-"C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" "%CD%\..\MajorsilenceReporting.sln" /toolsversion:4.0 /p:Configuration="Release";Platform="x64" /t:clean;rebuild /m:4
+"%msbuildpath%" "%CD%\..\MajorsilenceReporting.sln" /toolsversion:4.0 /p:Configuration="Release";Platform="x64" /t:clean;rebuild /m:4

 del .\build-output\majorsilence-reporting-build-dot-net-4-x64 /Q
 mkdir .\build-output\majorsilence-reporting-build-dot-net-4-x64
@@ -70,7 +71,7 @@

 REM ************* Begin x86 *********************************************

-"C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" "%CD%\..\MajorsilenceReporting.sln" /toolsversion:4.0 /p:Configuration="Release";Platform="x86" /t:clean;rebuild /m:4
+"%msbuildpath%" "%CD%\..\MajorsilenceReporting.sln" /toolsversion:4.0 /p:Configuration="Release";Platform="x86" /t:clean;rebuild /m:4

 del .\build-output\majorsilence-reporting-build-dot-net-4-x86 /Q
 mkdir .\build-output\majorsilence-reporting-build-dot-net-4-x86
@@ -194,10 +195,6 @@

 REM ************* End Ruby *********************************************

-
-
-REM ************* ILMerge RdlReader *********************************************
-
 del .\build-output\majorsilence-reporting-build-dot-net-4-viewer-x86 /Q
 mkdir .\build-output\majorsilence-reporting-build-dot-net-4-viewer-x86


fix dll filename (no lib)

fix dll filename (no lib)

--- recipes/deno-dom/bld.bat
+++ recipes/deno-dom/bld.bat
@@ -6,7 +6,7 @@
 MKDIR %LIBRARY_PREFIX%\lib
 dir target
 DIR target\release
-COPY target\release\libplugin.dll %LIBRARY_PREFIX%\lib\deno_dom.dll
+COPY target\release\plugin.dll %LIBRARY_PREFIX%\lib\deno_dom.dll

 MKDIR "%PREFIX%\etc\conda\activate.d"
 MKDIR "%PREFIX%\etc\conda\deactivate.d"


Create DecoraterBot-3.5.bat

Create DecoraterBot-3.5.bat

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

--- DecoraterBot-3.5.bat
+++ DecoraterBot-3.5.bat
@@ -0,0 +1,3 @@
+@echo off
+"%SystemDrive%\Python35\python.exe" "%~dp0DecoraterBot.py" 2>resources\Logs\unhandled_tracebacks.txt
+pause - stop


shoot & kill

shoot & kill

--- misc/nightly/docs.bat
+++ misc/nightly/docs.bat
@@ -5,22 +5,22 @@
 plugins\common\convert.exe addons\Archivers\LhArk.reg addons\Archivers\PkZip25.reg addons\Archivers\PkZip25Dos.reg addons\Archivers\Rar20.reg addons\Archivers\WinZipCL.reg %1\Addons\Archivers\
 plugins\common\convert.exe addons\Archivers\Lha32b.reg addons\Archivers\Lha32a.reg addons\Archivers\Arj.reg %1\Addons\Archivers\

-plugins\common\convert.exe "addons\Colors\Custom Highlighting\black_from_Fonarev.reg" "addons\Colors\Custom Highlighting\black_from_july.reg" "%1\Addons\Colors\Custom Highlighting\"
-plugins\common\convert.exe "addons\Colors\Custom Highlighting\black_from_Myodov.reg" "addons\Colors\Custom Highlighting\Colors_from_admin_essp_ru.reg" "%1\Addons\Colors\Custom Highlighting\"
-plugins\common\convert.exe "addons\Colors\Custom Highlighting\Colors_from_Gernichenko.reg" "addons\Colors\Custom Highlighting\Colors_from_Sadovoj.reg" "%1\Addons\Colors\Custom Highlighting\"
-plugins\common\convert.exe "addons\Colors\Custom Highlighting\Descript.ion" "addons\Colors\Custom Highlighting\dn_like.reg" "%1\Addons\Colors\Custom Highlighting\"
-plugins\common\convert.exe "addons\Colors\Custom Highlighting\FARColors242.reg" "addons\Colors\Custom Highlighting\GreenMile.reg" "addons\Colors\Custom Highlighting\hell.reg" "%1\Addons\Colors\Custom Highlighting\"
-plugins\common\convert.exe "addons\Colors\Custom Highlighting\import_colors.bat" "addons\Colors\Custom Highlighting\nc5pal2.reg" "%1\Addons\Colors\Custom Highlighting\"
-plugins\common\convert.exe "addons\Colors\Custom Highlighting\Rodion_Doroshkevich.reg" "addons\Colors\Custom Highlighting\VaxColors.reg" "%1\Addons\Colors\Custom Highlighting\"
+plugins\common\convert.exe "addons\Colors\Custom Highlighting\black_from_Fonarev.reg" "addons\Colors\Custom Highlighting\black_from_july.reg" "%1\Addons\Colors\Custom Highlighting"
+plugins\common\convert.exe "addons\Colors\Custom Highlighting\black_from_Myodov.reg" "addons\Colors\Custom Highlighting\Colors_from_admin_essp_ru.reg" "%1\Addons\Colors\Custom Highlighting"
+plugins\common\convert.exe "addons\Colors\Custom Highlighting\Colors_from_Gernichenko.reg" "addons\Colors\Custom Highlighting\Colors_from_Sadovoj.reg" "%1\Addons\Colors\Custom Highlighting"
+plugins\common\convert.exe "addons\Colors\Custom Highlighting\Descript.ion" "addons\Colors\Custom Highlighting\dn_like.reg" "%1\Addons\Colors\Custom Highlighting"
+plugins\common\convert.exe "addons\Colors\Custom Highlighting\FARColors242.reg" "addons\Colors\Custom Highlighting\GreenMile.reg" "addons\Colors\Custom Highlighting\hell.reg" "%1\Addons\Colors\Custom Highlighting"
+plugins\common\convert.exe "addons\Colors\Custom Highlighting\import_colors.bat" "addons\Colors\Custom Highlighting\nc5pal2.reg" "%1\Addons\Colors\Custom Highlighting"
+plugins\common\convert.exe "addons\Colors\Custom Highlighting\Rodion_Doroshkevich.reg" "addons\Colors\Custom Highlighting\VaxColors.reg" "%1\Addons\Colors\Custom Highlighting"

-plugins\common\convert.exe "addons\Colors\Default Highlighting\black_from_Fonarev.reg" "addons\Colors\Default Highlighting\black_from_july.reg" "%1\Addons\Colors\Default Highlighting\"
-plugins\common\convert.exe "addons\Colors\Default Highlighting\black_from_Myodov.reg" "addons\Colors\Default Highlighting\Colors_from_admin_essp_ru.reg" "%1\Addons\Colors\Default Highlighting\"
-plugins\common\convert.exe "addons\Colors\Default Highlighting\Colors_from_Gernichenko.reg" "addons\Colors\Default Highlighting\Colors_from_Sadovoj.reg" "%1\Addons\Colors\Default Highlighting\"
-plugins\common\convert.exe "addons\Colors\Default Highlighting\Descript.ion" "addons\Colors\Default Highlighting\dn_like.reg" "%1\Addons\Colors\Default Highlighting\"
-plugins\common\convert.exe "addons\Colors\Default Highlighting\FARColors242.reg" "addons\Colors\Default Highlighting\GreenMile.reg" "%1\Addons\Colors\Default Highlighting\"
-plugins\common\convert.exe "addons\Colors\Default Highlighting\hell.reg" "addons\Colors\Default Highlighting\import_colors.bat" "%1\Addons\Colors\Default Highlighting\"
-plugins\common\convert.exe "addons\Colors\Default Highlighting\nc5pal2.reg" "addons\Colors\Default Highlighting\Rodion_Doroshkevich.reg" "%1\Addons\Colors\Default Highlighting\"
-plugins\common\convert.exe "addons\Colors\Default Highlighting\VaxColors.reg" "%1\Addons\Colors\Default Highlighting\"
+plugins\common\convert.exe "addons\Colors\Default Highlighting\black_from_Fonarev.reg" "addons\Colors\Default Highlighting\black_from_july.reg" "%1\Addons\Colors\Default Highlighting"
+plugins\common\convert.exe "addons\Colors\Default Highlighting\black_from_Myodov.reg" "addons\Colors\Default Highlighting\Colors_from_admin_essp_ru.reg" "%1\Addons\Colors\Default Highlighting"
+plugins\common\convert.exe "addons\Colors\Default Highlighting\Colors_from_Gernichenko.reg" "addons\Colors\Default Highlighting\Colors_from_Sadovoj.reg" "%1\Addons\Colors\Default Highlighting"
+plugins\common\convert.exe "addons\Colors\Default Highlighting\Descript.ion" "addons\Colors\Default Highlighting\dn_like.reg" "%1\Addons\Colors\Default Highlighting"
+plugins\common\convert.exe "addons\Colors\Default Highlighting\FARColors242.reg" "addons\Colors\Default Highlighting\GreenMile.reg" "%1\Addons\Colors\Default Highlighting"
+plugins\common\convert.exe "addons\Colors\Default Highlighting\hell.reg" "addons\Colors\Default Highlighting\import_colors.bat" "%1\Addons\Colors\Default Highlighting"
+plugins\common\convert.exe "addons\Colors\Default Highlighting\nc5pal2.reg" "addons\Colors\Default Highlighting\Rodion_Doroshkevich.reg" "%1\Addons\Colors\Default Highlighting"
+plugins\common\convert.exe "addons\Colors\Default Highlighting\VaxColors.reg" "%1\Addons\Colors\Default Highlighting"

 plugins\common\convert.exe addons\Colors\Descript.ion addons\Colors\export_colors.bat addons\Colors\import_colors.bat %1\Addons\Colors\


Update configure.bat

Update configure.bat

--- ruby/win32/configure.bat
+++ ruby/win32/configure.bat
@@ -1,4 +1,4 @@
-@echo on
+@echo off
 @setlocal disabledelayedexpansion
 set witharg=


path fixes

path fixes

git-svn-id: 88f7df0341149fb5a53df8bd0fa6fd6589aa8338@40637 542498e7-56f8-f544-a0f2-a85913ac812a

--- installSDK.bat
+++ installSDK.bat
@@ -1,6 +1,6 @@
 SET V1_SDK_VERSION=8.0-SNAPSHOT
 SET MAVEN=.\apache-maven-2.2.1\bin\mvn.bat
-call %MAVEN% install:install-file -DgroupId=com.versionone -DartifactId=apiclient -Dversion=%V1_SDK_VERSION% -Dpackaging=jar -Dfile=VersionOne.APIClient.jar
-call %MAVEN% install:install-file -DgroupId=com.versionone -DartifactId=objectmodel -Dversion=%V1_SDK_VERSION% -Dpackaging=jar -Dfile=VersionOne.ObjectModel.jar
-call %MAVEN% install:install-file -DgroupId=com.versionone -DartifactId=apiclient -Dversion=%V1_SDK_VERSION% -Dpackaging=jar -Dclassifier=sources -Dfile=VersionOne.JavaSDK.Source-8.0.zip
-call %MAVEN% install:install-file -DgroupId=com.versionone -DartifactId=objectmodel -Dversion=%V1_SDK_VERSION% -Dpackaging=jar -Dclassifier=sources -Dfile=VersionOne.JavaSDK.Source-8.0.zip+call %MAVEN% install:install-file -DgroupId=com.versionone -DartifactId=apiclient -Dversion=%V1_SDK_VERSION% -Dpackaging=jar -Dfile=./Sdk/VersionOne.APIClient.jar
+call %MAVEN% install:install-file -DgroupId=com.versionone -DartifactId=objectmodel -Dversion=%V1_SDK_VERSION% -Dpackaging=jar -Dfile=./Sdk/VersionOne.ObjectModel.jar
+call %MAVEN% install:install-file -DgroupId=com.versionone -DartifactId=apiclient -Dversion=%V1_SDK_VERSION% -Dpackaging=jar -Dclassifier=sources -Dfile=./Sdk/VersionOne.JavaSDK.Source-8.0.zip
+call %MAVEN% install:install-file -DgroupId=com.versionone -DartifactId=objectmodel -Dversion=%V1_SDK_VERSION% -Dpackaging=jar -Dclassifier=sources -Dfile=./Sdk/VersionOne.JavaSDK.Source-8.0.zip


Fixed build.bat. Ant is called from ${base.dir} not compile/

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

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

 :build
 SETLOCAL
-set CLASSPATH=lib\ant-launcher.jar;%CLASSPATH%
+set CLASSPATH=compile\lib\ant-launcher.jar;%CLASSPATH%
 echo %CLASSPATH%
 cd ..
 "%JAVA_HOME%\bin\java" "-Dant.home=compile" "-Dant.library.dir=compile/lib"  -Xmx256000000 org.apache.tools.ant.launch.Launcher -buildfile compile/build.xml %1 %2 %3 %4 %5 %WHEN_NO_ARGS%


PROACTIVE-1123 (build.bat does not support more than 3 parameters)

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

--- compile/build.bat
+++ compile/build.bat
@@ -10,7 +10,7 @@
 set CLASSPATH=compile\lib\ant-launcher.jar;%CLASSPATH%
 echo %CLASSPATH%
 cd ..
-"%JAVA_HOME%\bin\java" "-Dant.home=compile" "-Dant.library.dir=compile/lib"  -Xmx512000000 org.apache.tools.ant.launch.Launcher -buildfile compile/build.xml %1 %2 %3 %4 %5 %WHEN_NO_ARGS%
+"%JAVA_HOME%\bin\java" "-Dant.home=compile" "-Dant.library.dir=compile/lib"  -Xmx512000000 org.apache.tools.ant.launch.Launcher -buildfile compile/build.xml %* %WHEN_NO_ARGS%
 ENDLOCAL
 goto end


Correct spelling in msys2_shell.cmd

Correct spelling in msys2_shell.cmd

Do this so the help docs are clearer.

--- filesystem/msys2_shell.cmd
+++ filesystem/msys2_shell.cmd
@@ -159,8 +159,8 @@
 echo                                      directory
 echo     -where DIRECTORY                 Use specified DIRECTORY as working
 echo                                      directory
-echo     -[use-]full-path                 Use full currnent PATH variable
-echo                                      instead of triming to minimal
+echo     -[use-]full-path                 Use full current PATH variable
+echo                                      instead of trimming to minimal
 echo     -no-start                        Do not use "start" command and
 echo                                      return bash resulting errorcode as
 echo                                      this batch file resulting errorcode


Updated bat file

Updated bat file

--- jenkinswsa.bat
+++ jenkinswsa.bat
@@ -5,6 +5,6 @@
 cd repo
 git rm -r .
 cp -R ../../BouncyBallGame/Builds/WSA/* ./
-git add .
+git add . -f
 git commit -m "New version!"
 git push


Added OPENSEARCHSERVER_DATA environment variable

--- pkg/shell/start.bat
+++ pkg/shell/start.bat
@@ -33,6 +33,8 @@

 :okExec

+set OPENSEARCHSERVER_DATA=%cd%\data
+
 cd %cd%\apache-tomcat-6.0.20
 call "%EXECUTABLE%"


Update bld.bat

Update bld.bat

--- conda/python-pkgtk/bld.bat
+++ conda/python-pkgtk/bld.bat
@@ -1,8 +1,8 @@
 echo ON

 if "%PY3K%" == "1" (
-  2to3 --output-dir=src/py3 -W -n src/py
-  rmdir src/py /s /q
+  2to3 --output-dir=src\py3 -W -n src\py
+  rmdir src\py /s /q
   move src\py3 src\py
   2to3 --output-dir=test3 -W -n test
   rmdir test /s /q


Updating the package push command

Updating the package push command

--- packaging/package.bat
+++ packaging/package.bat
@@ -33,5 +33,5 @@
 %nuget% pack %nuspec% -Verbosity detailed -OutputDirectory %nupackLocation% -Properties Configuration=%configuration%

 IF %deploy%==true (
-	%nuget% push %nupackLocation%\*.nupkg -s http://%deployLocation%/ -NonInteractive
+	%nuget% push %nupackLocation%\*.nupkg
 )


Implemented setting OJS service to restart twice on failure when installing it.


A few more fixes

A few more fixes

--- install/windows_post_run_1_2.bat
+++ install/windows_post_run_1_2.bat
@@ -1,18 +1,15 @@
 SETX PATH C:/Python27/;C:/Python27/Scripts/;C:/OpenCV2.2/bin/;%PATH%
 SETX PYTHONPATH C:/OpenCV2.2/Python2.7/Lib/site-packages;%PYTHONPATH%
-echo "Installing pyreadline"
 easy_install pyreadline
-echo "Installing PIL"
 easy_install PIL
-echo "Installing Cython"
 easy_install cython
-echo "Installing Nose"
 easy_install nose
-echo "Installing SimpleCV"
-easy_install simplecv
-SET DOWNLOAD_PATH = %1
+easy_install pip
+pip install simplecv 1.2
+echo "The Download path is:"
+%1
 mkdir C:\Python27\Lib\site-packages\freenect
 echo "Copying freenect setup files"
-xcopy %DOWNLOAD_PATH%\OpenKinect\precompiled\*.py C:\Python27\Lib\site-packages\freenect /y
-xcopy %DOWNLOAD_PATH%\OpenKinect\precompiled\*.dll C:\Python27\DLLs /y
-xcopy %DOWNLOAD_PATH%\OpenKinect\precompiled\*.pyd C:\Python27\DLLs /y
+xcopy %1\OpenKinect\precompiled\*.py C:\Python27\Lib\site-packages\freenect /y
+xcopy %1\OpenKinect\precompiled\*.dll C:\Python27\DLLs /y
+xcopy %1\OpenKinect\precompiled\*.pyd C:\Python27\DLLs /y


fixed job run.bat

fixed job run.bat

--- src/Jobs/run.bat
+++ src/Jobs/run.bat
@@ -1,6 +1,6 @@
 @echo off

-SET bindir=..\..\..\bin
+SET bindir=..\..\..\..\bin

 IF NOT EXIST %bindir% (
   SET bindir=%WEBROOT_PATH%\bin


Add makepasswd and nano to cygwinpackages

--- windows/floppy/common/install-cygwin-sshd.bat
+++ windows/floppy/common/install-cygwin-sshd.bat
@@ -9,7 +9,7 @@
 cd /D %SystemDrive%\windows\temp

 :: packages -- comma separated
-set PACKAGES=cygrunsrv,openssh,rsync
+set PACKAGES=cygrunsrv,makepasswd,nano,openssh,rsync

 %SystemDrive%\cygwin\cygwin-setup-x86_64.exe -a x86_64 -q -R %SystemDrive%\cygwin -P %PACKAGES% -s http://cygwin.mirrors.pair.com


Adding test for leg1 & leg2 ssh.

Adding test for leg1 & leg2 ssh.

git-svn-id: 8a910031c78bbe8a754298bb28800c1494820db3@1675 0604bb77-1110-461e-859e-28c50bf9b280

--- software/build/build.cmd
+++ software/build/build.cmd
@@ -24,8 +24,7 @@
     echo   all          -- Normal build of application
     echo   upgrade      -- Build and upgrade application
     echo   install      -- Builds, installs JBoss locally
-    echo   dev1         -- Builds, upgrades JBoss on DEV - leg 1
-    echo   dev2         -- Builds, upgrades JBoss on DEV - leg 2
+    echo   dev          -- Builds, upgrades JBoss on DEV
     echo   deploy       -- Hot deploy application
     echo   jsp          -- Hot deploy JSP files
     echo   stop         -- Stop war file
@@ -70,12 +69,8 @@
     )
     goto DONE
 )
-if "%1" == "dev1" (
-    ant -Dproperties.file=%DEVPROPFILE% -Djboss.server.hostname=%DEV_SERVER1% %TAG% %DEBUG% deploy:remote:upgrade
-    goto DONE
-)
-if "%1" == "dev2" (
-    ant -Dproperties.file=%DEVPROPFILE% -Djboss.server.hostname=%DEV_SERVER2% %TAG% %DEBUG% deploy:remote:upgrade
+if "%1" == "dev" (
+    ant -Dproperties.file=%DEVPROPFILE% %TAG% %DEBUG% deploy:remote:upgrade
     goto DONE
 )
 if "%1" == "cissh" (


Adding task for remote CI build.

Adding task for remote CI build.

git-svn-id: 662670505d3e46047b0e8288f464580163fc465a@891 e1e6a9b6-88fc-49c9-b504-51d68f5d0411

--- software/build/build.cmd
+++ software/build/build.cmd
@@ -7,6 +7,7 @@
 echo.
 setlocal
 set DEVPROPFILE=C:\NCI-Projects\ncireportwriter-properties\properties\dev-upgrade.properties
+set CIPROPFILE=C:\NCI-Projects\ncireportwriter-properties\properties\ci-upgrade.properties
 set QAPROPFILE=C:\NCI-Projects\ncireportwriter-properties\properties\qa-upgrade.properties
 set DATAQAPROPFILE=C:\NCI-Projects\ncireportwriter-properties\properties\data-qa-upgrade.properties
 if "%1" == ""  (
@@ -20,6 +21,7 @@
     echo   upgrade              -- Build and upgrade application
     echo   dev:wdbinstall       -- Builds, upgrades JBoss and installs database on DEV
     echo   dev                  -- Builds, upgrades JBoss on DEV
+    echo   ci                   -- Builds, upgrades JBoss on CI
     echo   qa:wdbinstall        -- Builds, upgrades JBoss and install database on QA
     echo   qa                   -- Builds, upgrades JBoss on QA
     echo   data-qa              -- Builds, upgrades JBoss on DATA-QA
@@ -52,6 +54,10 @@
 )
 if "%1" == "dev" (
     ant -Dproperties.file=%DEVPROPFILE% deploy:remote:upgrade
+    goto DONE
+)
+if "%1" == "ci" (
+    ant -Dproperties.file=%CIPROPFILE% deploy:remote:upgrade
     goto DONE
 )
 if not "%1" == "dev:wdbinstall" goto d1


"Run as admin" has been fixed.

"Run as admin" has been fixed.

--- Patchers_Auto_Update/IOS-Patcher/patch.bat
+++ Patchers_Auto_Update/IOS-Patcher/patch.bat
@@ -7,7 +7,7 @@
 set /a copyingsdcard=0
 set /a translationsserror=0
 :: Window size (Lines, columns)
-set mode=126,35
+set mode=126,36
 mode %mode%
 :: Coding page (in order to make IOS Patcher on Windows XP working, this command has been disabled)
 :: chcp 65001
@@ -17,8 +17,8 @@

 :: Window Title
 title IOS Patcher for RiiConnect24 v.%version%  Created by @Larsenv, @KcrPL
-set last_build=2017/08/18
-set at=21:55
+set last_build=2017/09/06
+set at=23:30
 :: ### Auto Update ###
 :: 1=Enable 0=Disable
 :: IOSPatcher_Update_Activate - If disabled, patcher will not even check for updates, default=1
@@ -37,8 +37,11 @@

 set /a versioncheck=0
 :: If program is opened as an admin the path will messed up
-if not exist patch.bat goto admin_error
-goto begin_main
+set /a patherror=0
+if "%cd%"=="%windir%\system32" set /a patherror=1
+if %patherror%==0 if not exist patch.bat set /a patherror=2
+
+	goto begin_main
 :not_windows_nt
 cls
 echo RiiConnect24 IOS Patcher - (C) Larsenv, (C) KcrPL. v%version%. (Compiled on %last_build% at %at%)
@@ -59,10 +62,19 @@
 mode %mode%
 cls
 echo RiiConnect24 IOS Patcher - (C) Larsenv, (C) KcrPL. v%version%. (Compiled on %last_build% at %at%)
-echo              `..````
-echo              yNNNNNNNNMNNmmmmdddhhhyyyysssooo+++/:--.`
-echo              ddmNNd:dNMMMMNMMMMMMMMMMMMMMMMMMMMMMMMMMs
-echo              hNNNNNNNNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMd
+if %patherror%==0 echo              `..````
+if %patherror%==0 echo              yNNNNNNNNMNNmmmmdddhhhyyyysssooo+++/:--.`
+if %patherror%==0 echo              ddmNNd:dNMMMMNMMMMMMMMMMMMMMMMMMMMMMMMMMs
+if %patherror%==0 echo              hNNNNNNNNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMd
+
+if %patherror%==1 echo :----------------------------------------------------------------:
+if %patherror%==1 echo : Warning: Please run this application without admin privilages. :
+if %patherror%==1 echo :----------------------------------------------------------------:
+
+if %patherror%==2 echo :------------------------------------------------------------------------------------------------------:
+if %patherror%==2 echo : Warning: patch.bat not found. You may be running this application from unknown and untrusted source. :
+if %patherror%==2 echo :------------------------------------------------------------------------------------------------------:
+
 echo             `mdmNNy dNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM+    RiiConnect your Wii.
 echo             .mmmmNs mNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM:
 echo             :mdmmN+`mNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM.
@@ -93,6 +105,9 @@
 echo                                   -odhhhhyddmmmmmNNmhs/:`
 echo                                     :syhdyyyyso+/-`
 pause>NUL
+
+if %patherror%==1 goto begin_main
+
 set /a errorwinxp=0
 timeout -0 /nobreak >NUL || set /a errorwinxp=1
 if %errorwinxp%==1 goto winxp_notice


Update Ultradefrag to 6.1.0

Update Ultradefrag to 6.1.0

--- scripts/compact.bat
+++ scripts/compact.bat
@@ -4,10 +4,10 @@
 msiexec /qb /i C:\Windows\Temp\7z920-x64.msi

 if not exist "C:\Windows\Temp\ultradefrag.zip" (
-	powershell -Command "(New-Object System.Net.WebClient).DownloadFile('http://downloads.sourceforge.net/ultradefrag/ultradefrag-portable-6.0.2.bin.amd64.zip', 'C:\Windows\Temp\ultradefrag.zip')" <NUL
+	powershell -Command "(New-Object System.Net.WebClient).DownloadFile('http://downloads.sourceforge.net/ultradefrag/ultradefrag-portable-6.1.0.bin.amd64.zip', 'C:\Windows\Temp\ultradefrag.zip')" <NUL
 )

-if not exist "C:\Windows\Temp\ultradefrag-portable-6.0.2.amd64\udefrag.exe" (
+if not exist "C:\Windows\Temp\ultradefrag-portable-6.1.0.amd64\udefrag.exe" (
 	cmd /c ""C:\Program Files\7-Zip\7z.exe" x C:\Windows\Temp\ultradefrag.zip -oC:\Windows\Temp"
 )

@@ -26,7 +26,7 @@
 mkdir C:\Windows\SoftwareDistribution\Download
 net start wuauserv

-cmd /c C:\Windows\Temp\ultradefrag-portable-6.0.2.amd64\udefrag.exe --optimize --repeat C:
+cmd /c C:\Windows\Temp\ultradefrag-portable-6.1.0.amd64\udefrag.exe --optimize --repeat C:

 cmd /c %SystemRoot%\System32\reg.exe ADD HKCU\Software\Sysinternals\SDelete /v EulaAccepted /t REG_DWORD /d 1 /f
 cmd /c C:\Windows\Temp\sdelete.exe -q -z C:


fixup windows build script

fixup windows build script

--- vcbuild.bat
+++ vcbuild.bat
@@ -1,7 +1,8 @@
 rd /q /s build
 del lib\\node_zipfile.node
+del lib\\libzip.dll
 npm install
-copy build\Release\libzip.dll lib
+@rem copy build\Release\libzip.dll lib
 rem test!
-set NODE_PATH=lib
+@rem set NODE_PATH=lib
 npm test


Store the parent directory at the beginning of vcbuild so that its safe to use after `call`s.

--- vcbuild.bat
+++ vcbuild.bat
@@ -4,6 +4,9 @@

 @rem Ensure environment properly setup
 if not defined SHIELDBATTERY_PATH goto env-error
+
+@rem Store %~dp0 because it can change after we call things
+set scriptroot=%~dp0

 @rem Process arguments.
 set config=Release
@@ -20,7 +23,6 @@

 echo Warning: ignoring invalid command line option `%1`.

-:arg-ok
 :arg-ok
 shift
 goto next-arg
@@ -55,10 +57,10 @@
 @rem Generate the VS project.
 SETLOCAL
   if defined VSCOMNTOOLS call "%VSCOMNTOOLS%\VCVarsQueryRegistry.bat"
-  call "%~dp0\deps\node\vcbuild.bat" ia32 noetw noperfctr nobuild nosign
-  if not exist "%~dp0\deps\node\config.gypi" goto create-msvs-files-failed
-  cd "%~dp0"
-  call "%~dp0\deps\node\tools\gyp\gyp.bat" --depth=. -f msvs --generator-output=. -G msvs_version=auto -Ideps\node\common.gypi -Ideps\node\config.gypi -Ioverrides.gypi -Dlibrary=static_library -Dtarget_arch=ia32 -Dcomponent=static_library shieldbattery.gyp
+  call "%scriptroot%\deps\node\vcbuild.bat" ia32 noetw noperfctr nobuild nosign
+  if not exist "%scriptroot%\deps\node\config.gypi" goto create-msvs-files-failed
+  cd "%scriptroot%"
+  call "%scriptroot%\deps\node\tools\gyp\gyp.bat" --depth=. -f msvs --generator-output=. -G msvs_version=auto -Ideps\node\common.gypi -Ideps\node\config.gypi -Ioverrides.gypi -Dlibrary=static_library -Dtarget_arch=ia32 -Dcomponent=static_library shieldbattery.gyp
   if errorlevel 1 goto create-msvs-files-failed
   if not exist shieldbattery.sln goto create-msvs-files-failed
   echo Shieldbattery project files generated.
@@ -80,24 +82,24 @@
 goto link-modules

 :create-msvs-files-failed
-echo Failed to create vc project files for shieldbattery.
+echo Failed to create VS project files for Shieldbattery.
 goto exit

 :link-modules
 @rem Link up the native modules inside the js directory
-cd "%~dp0\node-psi"
+cd "%scriptroot%\node-psi"
 call npm install
 call npm link
 if errorlevel 1 goto linking-failed
-cd "%~dp0\node-bw"
+cd "%scriptroot%\node-bw"
 call npm install
 call npm link
 if errorlevel 1 goto linking-failed
-cd "%~dp0\forge"
+cd "%scriptroot%\forge"
 call npm install
 call npm link
 if errorlevel 1 goto linking-failed
-cd "%~dp0\js"
+cd "%scriptroot%\js"
 call npm link shieldbattery-psi
 if errorlevel 1 goto linking-failed
 call npm link shieldbattery-bw
@@ -107,7 +109,7 @@
 call npm install
 if errorlevel 1 goto linking-failed
 rmdir "%SHIELDBATTERY_PATH%\js"
-mklink /D "%SHIELDBATTERY_PATH%\js" "%~dp0\js"
+mklink /D "%SHIELDBATTERY_PATH%\js" "%scriptroot%\js"
 echo JS modules linked.
 goto exit

@@ -127,5 +129,5 @@
 goto exit

 :exit
-cd "%~dp0"
+cd "%scriptroot%"
 goto :EOF


[Scripts] Add Oddworld script.

[Scripts] Add Oddworld script.

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

--- scripts/x86/nnt.bat
+++ scripts/x86/nnt.bat
@@ -0,0 +1 @@
+inject.exe --run "C:\Program Files (x86)\Steam\SteamApps\common\Oddworld New n Tasty\NNT.exe" --inject --steam-app-id 314660 --export Load --add-path --path-resolution --module cerberus.dll


Replace System.Collections.ArrayList with out own List implementation

`ArrayList` comes from the .NET framework, and if the framework is not
installed on the user's machine, or it unconfigured in any way, the
script will just bail out with a cryptic error.

See: https://github.com/resin-io/etcher/issues/870
Signed-off-by: Juan Cruz Viotti <4148f5869aa1bcd7efd85b513a5874967e585032@openmailbox.org>

--- scripts/win32.bat
+++ scripts/win32.bat
@@ -10,6 +10,26 @@

 ----- Begin wsf script --->
 <job><script language="VBScript">
+
+Class List
+	Private Dictionary
+
+	Private Sub Class_Initialize()
+		Set Dictionary = CreateObject("Scripting.Dictionary")
+	End Sub
+
+	Public Sub Add(element)
+		Dictionary.Add element, ""
+	End Sub
+
+	Public Function GetArray()
+		GetArray = Dictionary.Keys()
+	End Function
+
+	Public Function Count
+		Count = UBound(Dictionary.Keys()) + 1
+	End Function
+End Class

 Set WMIService = GetObject("winmgmts:\\.\root\cimv2")

@@ -35,7 +55,7 @@
 End Function

 Function GetLogicalDisks(ByVal DriveDevice)
-	Set GetLogicalDisks = CreateObject("System.Collections.ArrayList")
+	Set GetLogicalDisks = new List
 	Set DrivePartitionsColumn = WMIService.ExecQuery _
 		("ASSOCIATORS OF {Win32_DiskDrive.DeviceID=""" & _
 			DriveDevice & """} WHERE AssocClass = " & _
@@ -58,7 +78,7 @@

 Function GetTopLevelDrives()
 	OperatingSystemDevice = GetOperatingSystemDevice()
-	Set GetTopLevelDrives = CreateObject("System.Collections.ArrayList")
+	Set GetTopLevelDrives = new List
 	Set TopLevelDrivesColumn = WMIService.ExecQuery("SELECT * FROM Win32_DiskDrive")
 	For Each TopLevelDrive In TopLevelDrivesColumn
 		Set Summary = CreateObject("Scripting.Dictionary")
@@ -69,13 +89,13 @@
 		Summary.Add "Description", TopLevelDrive.Caption
 		Summary.Add "Size", TopLevelDrive.Size

-		Set Mountpoints = CreateObject("System.Collections.ArrayList")
+		Set Mountpoints = new List
 		IsRemovable = InStr(TopLevelDrive.MediaType, "Removable") = 1
 		IsProtected = False

 		Set LogicalDisks = GetLogicalDisks(DeviceID)

-		For Each LogicalDisk In LogicalDisks
+		For Each LogicalDisk In LogicalDisks.GetArray()
 			Mountpoints.Add(LogicalDisk.Item("Device"))

 			If LogicalDisk.Item("IsProtected") Then
@@ -95,7 +115,7 @@
 	Next
 End Function

-For Each TopLevelDrive In GetTopLevelDrives()
+For Each TopLevelDrive In GetTopLevelDrives().GetArray()
 	Wscript.Echo "device: """ & TopLevelDrive.Item("Device") & """"
 	Wscript.Echo "description: """ & TopLevelDrive.Item("Description") & """"
 	Wscript.Echo "size: " & TopLevelDrive.Item("Size")
@@ -107,8 +127,8 @@
 		Wscript.Echo "mountpoints: []"
 	Else
 		Wscript.Echo "mountpoints:"
-		For Each Mountpoint In TopLevelDrive.Item("Mountpoints")
-			Wscript.Echo "  - path: """ & Mountpoint & """"
+		For Each Mountpoint In TopLevelDrive.Item("Mountpoints").GetArray()
+			Wscript.Echo "	- path: """ & Mountpoint & """"
 		Next
 	End If


update

update

--- remote-coverage.bat
+++ remote-coverage.bat
@@ -7,6 +7,6 @@

 .\tools\OpenCover.4.6.519\tools\OpenCover.Console.exe -register:user "-filter:+[vCard*]*" "-target:.\tools\NUnit.ConsoleRunner.3.4.1\tools\nunit3-console.exe" "-targetargs: .\vCardLib.Tests\bin\Debug\vCardLib.Tests.dll"

-.\tools\ReportGenerator.2.4.5.0\ReportGenerator.exe "-reports:results.xml" "-targetdir:.\coverage"
+.\tools\ReportGenerator.2.4.5.0\tools\ReportGenerator.exe "-reports:results.xml" "-targetdir:.\coverage"

-.\tools\csmacnz.Coveralls.exe --opencover -i .\TestResult.xml
+.\tools\coveralls.net.0.7.0\tools\csmacnz.Coveralls.exe --opencover -i .\TestResult.xml


Delete appveyor_build.bat

Delete appveyor_build.bat

--- appveyor_build.bat
+++ appveyor_build.bat
@@ -1,51 +0,0 @@
-SETLOCAL
-
-CALL conda build toolchain -c statiskit -c conda-forge
-IF %errorlevel% neq 0 exit /b %errorlevel%
-CALL conda build boost_build -c statiskit -c conda-forge
-IF %errorlevel% neq 0 exit /b %errorlevel%
-CALL conda build libboost_python -c statiskit -c conda-forge
-if %errorlevel% neq 0 exit /b %errorlevel%
-CALL conda build python-scons -c statiskit
-IF %errorlevel% neq 0 exit /b %errorlevel%
-CALL conda build python-parse -c statiskit
-IF %errorlevel% neq 0 exit /b %errorlevel%
-
-IF NOT "%APPVEYOR_REPO_BRANCH%"=="master" GOTO DONE
-IF "%ANACONDA_USERNAME%"=="" GOTO DONE
-IF "%ANACONDA_PASSWORD%"=="" GOTO DONE
-
-CALL conda install -n root anaconda-client
-if %errorlevel% neq 0 exit /b %errorlevel%
-
-CALL anaconda login --username "%ANACONDA_USERNAME%" --password "%ANACONDA_PASSWORD%" --hostname "AppVeyor%APPVEYOR_BUILD_NUMBER%"
-IF %errorlevel% neq 0 exit /b %errorlevel%
-
-::FOR %%CONDA_RECIPE IN (toolchain, python-scons, python-parse) DO (
-::  ECHO %%CONDA_RECIPE
-
-FOR /f %%i in ('conda build toolchain --output') DO (set CONDA_FILE=%%i)
-CALL anaconda upload --user statiskit %CONDA_FILE% --force
-IF %errorlevel% neq 0 exit /b %errorlevel%
-
-FOR /f %%i in ('conda build boost_build --output') DO (set CONDA_FILE=%%i)
-CALL anaconda upload --user statiskit %CONDA_FILE% --force
-IF %errorlevel% neq 0 exit /b %errorlevel%
-
-FOR /f %%i in ('conda build libboost_python --output') DO (set CONDA_FILE=%%i)
-CALL anaconda upload --user statiskit %CONDA_FILE% --force
-IF %errorlevel% neq 0 exit /b %errorlevel%
-
-FOR /f %%i in ('conda build python-scons --output') DO (set CONDA_FILE=%%i)
-CALL anaconda upload --user statiskit %CONDA_FILE% --force
-IF %errorlevel% neq 0 exit /b %errorlevel%
-
-FOR /f %%i in ('conda build python-parse --output') DO (set CONDA_FILE=%%i)
-CALL anaconda upload --user statiskit %CONDA_FILE% --force
-IF %errorlevel% neq 0 exit /b %errorlevel%
-
-CALL anaconda logout
-GOTO DONE
-
-:DONE
-ECHO ~~~~~~~~~~~~~~~~~~~~~~ DONE %~f0 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~


remove an unnecessary file

remove an unnecessary file

--- make_sample_wav_file.bat
+++ make_sample_wav_file.bat
@@ -1,2 +0,0 @@
-gcc MakeSampleWavFile.cc
-a


Issue number:  20
Obtained from: mpoisot
Submitted by:  mpoisot
Reviewed by:

Modified Windows batch script to no longer show a console window when run via the Windows GUI interface.

CVS: ----------------------------------------------------------------------
CVS: Issue number:
CVS:   If this change addresses one or more issues,
CVS:   then enter the issue number(s) here.
CVS: Obtained from:
CVS:   If this change has been taken from another system,
CVS:   then name the system in this line, otherwise delete it.
CVS: Submitted by:
CVS:   If this code has been contributed to the project by someone else; i.e.,
CVS:   they sent us a patch or a set of diffs, then include their name/email
CVS:   address here. If this is your work then delete this line.
CVS: Reviewed by:
CVS:   If we are doing pre-commit code reviews and someone else has
CVS:   reviewed your changes, include their name(s) here.
CVS:   If you have not had it reviewed then delete this line.

--- scripts/cockpit.bat
+++ scripts/cockpit.bat
@@ -8,4 +8,4 @@
 set CP=%CP%;libs/commons-httpclient/commons-httpclient-3.0.1.jar
 set CP=%CP%;libs/misc/BareBonesBrowserLaunch.jar

-java -classpath %CP% org.jets3t.apps.cockpit.Cockpit
+start javaw -classpath %CP% org.jets3t.apps.cockpit.Cockpit


add another notepad "handler"

add another notepad "handler"

error: pathspec 'etc/postinstall/notepad-txtfile.bat' did not match any file(s) known to git

--- etc/postinstall/notepad-txtfile.bat
+++ etc/postinstall/notepad-txtfile.bat
@@ -0,0 +1,34 @@
+@echo off
+
+setlocal
+
+for %%f in ( "%~dp0..\..\GUI\notepad\Notepad3.exe" ) do set "np_path=%%~ff"
+
+set "np_root=HKEY_CURRENT_USER\Software\Classes"
+:: set "np_root=HKEY_CLASSES_ROOT"
+
+set "np_txtid=%np_root%\.txt\OpenWithProgids"
+
+set "np_appid=000000Notepad3"
+
+for %%p in ( install uninstall show ) do if /i "%~1" == "%%~p" goto :np_%%~p
+
+echo:Usage: %~n0 install^|uninstall^|show
+goto :EOF
+
+:np_install
+:: reg add "%np_txtid%" /v "%np_appid%" /t "REG_SZ" /d " " /f
+reg add "%np_txtid%" /v "%np_appid%" /t "REG_NONE" /d "" /f
+reg add "%np_root%\%np_appid%\shell\new\command" /ve /t REG_SZ /d "\"%np_path%\" /q \"%%1\"" /f
+reg add "%np_root%\%np_appid%\shell\open\command" /ve /t REG_SZ /d "\"%np_path%\" \"%%1\"" /f
+goto :EOF
+
+:np_uninstall
+reg delete "%np_txtid%" /v "%np_appid%" /f
+reg delete "%np_root%\%np_appid%" /f
+goto :EOF
+
+:np_show
+reg query "%np_txtid%" /s
+reg query "%np_root%\%np_appid%" /s
+goto :EOF


removed quotes on move arguments

removed quotes on move arguments

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


Create bld.bat

Create bld.bat

error: pathspec 'recipes/ycm-cmake-modules/bld.bat' did not match any file(s) known to git

--- recipes/ycm-cmake-modules/bld.bat
+++ recipes/ycm-cmake-modules/bld.bat
@@ -0,0 +1,22 @@
+mkdir build
+cd build
+
+cmake ^
+    -G "Ninja" ^
+    -DCMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% ^
+    -DCMAKE_BUILD_TYPE=Release ^
+    -DBUILD_TESTING=ON ^
+    %SRC_DIR%
+if errorlevel 1 exit 1
+
+:: Build.
+cmake --build . --config Release
+if errorlevel 1 exit 1
+
+:: Install.
+cmake --build . --config Release --target install
+if errorlevel 1 exit 1
+
+:: Test.
+ctest -C Release
+if errorlevel 1 exit 1


Added parameter handling to runtests-GitSharp.cmd.

--- runtests-GitSharp.cmd
+++ runtests-GitSharp.cmd
@@ -1 +1 @@
-tools\nant\nant.exe "-buildfile:GitSharp.build" "-t:net-3.5" "-D:build.config=debug" "-D:build.vcs.number.1=%BUILD_VCS_NUMBER%"+tools\nant\nant.exe -buildfile:GitSharp.build %1 -t:net-3.5 -D:build.config=debug -D:build.vcs.number.1=%BUILD_VCS_NUMBER%


Corrected nuget restore command call (copypasta fail)

--- build-appveyor.cmd
+++ build-appveyor.cmd
@@ -3,5 +3,5 @@
 ECHO APPVEYOR_BUILD_NUMBER : %APPVEYOR_BUILD_NUMBER%
 ECHO APPVEYOR_BUILD_VERSION : %APPVEYOR_BUILD_VERSION%

-CALL build\tools\NuGet.exe restore src\Our.Umbraco.AzureLogger.sln
+CALL build\tools\NuGet.exe restore src\Our.Umbraco.MigrationsViewer.sln
 CALL "%programfiles(x86)%\MSBuild\14.0\Bin\MsBuild.exe" build\Our.Umbraco.MigrationsViewer.proj


fix comment out using REM in the Windows build script

--- Makefile.bat
+++ Makefile.bat
@@ -1,6 +1,4 @@
-REM This batch script is an effort at porting the Unix Makefile for
-REM Windows. Therefore, it may not be updated as frequent as the Unix
-REM Makefile. (Please consider helping us keeping it up to date)
+REM This batch script is an effort at porting the Unix Makefile for Windows. Therefore, it may not be updated as frequent as the Unix Makefile. (Please consider helping us keeping it up to date)

 @ECHO OFF


make.bat: remove double quotes

make.bat: remove double quotes

Fixes issue 2974.

R=golang-dev, r, rsc
CC=golang-dev
http://codereview.appspot.com/5653052


添加自动编译运行批处理

添加自动编译运行批处理

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

--- src/make.bat
+++ src/make.bat
@@ -0,0 +1,20 @@
+:: javac -verbose
+
+@echo off
+
+::
+:: Compile
+::
+:: @javac -verbose Server.java
+@javac Server.java
+
+:
+:: Run
+:
+@java Server
+
+::
+:: Clear
+::
+@del *.class
+@echo on


Minor fixes.

Minor fixes.

--- scripts/normalize.bat
+++ scripts/normalize.bat
@@ -1,2 +1,5 @@
+@ECHO OFF
+
 bundle exec ruby ../tvshow_name_normalizer.rb normalize --path=%1
-pause
+
+PAUSE


main.bat - itch.io dx version

main.bat - itch.io dx version

--- projects/main.bat
+++ projects/main.bat
@@ -25,9 +25,10 @@
 	echo   A. Plugins
 	echo   B. Create project - static physx
 	echo   C. Push to itch.io
-	echo   D. Create project with app
-	echo ===============================
-	choice /C 123456789ABCD /N /M "Your choice:"
+	echo   D. Push to itch.io (DX11)
+	echo   E. Create project with app
+	echo ===============================
+	choice /C 123456789ABCDE /N /M "Your choice:"
 	echo.

 	if %errorlevel%==1 goto :EOF
@@ -42,7 +43,8 @@
 	if %errorlevel%==10 call :plugins
 	if %errorlevel%==11 call :create_project_static_physx
 	if %errorlevel%==12 call :push_to_itch_io
-	if %errorlevel%==13 call :create_project_with_app
+	if %errorlevel%==13 call :push_to_itch_io_dx
+	if %errorlevel%==14 call :create_project_with_app
 goto :begin

 :plugins
@@ -77,6 +79,13 @@
 	if not exist itch_io mkdir itch_io
 	copy tmp\vs2019\bin\RelWithDebInfo\studio.exe itch_io\
 	butler.exe push itch_io mikulasflorek/lumix-engine:win-64-gl
+	pause
+exit /B 0
+
+:push_to_itch_io_dx
+	if not exist itch_io mkdir itch_io
+	copy tmp\vs2019\bin\RelWithDebInfo\studio.exe itch_io\
+	butler.exe push itch_io mikulasflorek/lumix-engine:win-64-dx
 	pause
 exit /B 0


remove win JAVA_HOME lookup because it has problems with spaces in the PATH

It'd be nice to replace this with something that works better. I asked someone to try

    for /f "delims=;" %%P IN (%PATH%) do if exist %%P\java.exe set JAVA_HOME=%%P..\

but it didn't work. Now, it'll print an error message about setting JAVA_HOME, which will work. For reference, the conversation was http://donttreadonme.co.uk/mirah/2012/07/16.html#message_16

--- distbin/_mirahvars.bat
+++ distbin/_mirahvars.bat
@@ -13,9 +13,6 @@

 rem ----- Verify and Set Required Environment Variables -----------------------

-if not "%JAVA_HOME%" == "" goto gotJava
-
-for %%P in (%PATH%) do if exist %%P\java.exe set JAVA_HOME=%%P..\
 if not "%JAVA_HOME%" == "" goto gotJava

 echo You must set JAVA_HOME to point at your JRE/JDK installation