build fixes

build fixes

--- build.bat
+++ build.bat
@@ -1,4 +1,7 @@
 set /p versionNumber=
+
+del builds\Unquote-%versionNumber%.zip
+del builds\Unquote.%versionNumber%.nupkg

 REM preparing staging dirs

@@ -14,11 +17,15 @@

 "C:\Program Files (x86)\Microsoft F#\v4.0\fsc.exe" -o:staging\net40\Unquote.dll --noframework --define:TRACE --doc:staging\net40\Unquote.xml --optimize+ -r:C:\Windows\Microsoft.Net\assembly\GAC_MSIL\FSharp.Compiler\v4.0_4.0.0.0__b03f5f7f11d50a3a\FSharp.Compiler.dll -r:C:\Windows\Microsoft.Net\assembly\GAC_MSIL\FSharp.Compiler.Interactive.Settings\v4.0_4.0.0.0__b03f5f7f11d50a3a\FSharp.Compiler.Interactive.Settings.dll -r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\FSharp\2.0\Runtime\v4.0\FSharp.Core.dll" -r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\mscorlib.dll" -r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Core.dll" -r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.dll" -r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Numerics.dll" -r:"staging\net40\Utils.dll" --target:library --warn:3 --warnaserror:76 --LCID:1033 --utf8output --fullpaths --flaterrors --staticlink:Utils "C:\Users\Stephen\AppData\Local\Temp\.NETFramework,Version=v4.0.AssemblyAttributes.fs" Unquote\AssemblyInfo.fs Unquote\DynamicOperators.fs Unquote\Evaluation.fs Unquote\OperatorPrecedence.fs Unquote\ExtraReflection.fs Unquote\ExtraPatterns.fs Unquote\Decompilation.fs Unquote\Reduction.fs Unquote\Extensions.fs Unquote\Operators.fs Unquote\Assertions.fs

+del staging\net40\Utils.dll
+
 REM building for sl4

 "C:\Program Files (x86)\Microsoft F#\v4.0\fsc.exe" -o:staging\sl4\Utils.dll --noframework --define:TRACE --define:SILVERLIGHT --optimize+ -r:"C:\Program Files (x86)\Microsoft F#\Silverlight\Libraries\Client\v4.0\FSharp.Core.dll" -r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\Silverlight\v4.0\mscorlib.dll" -r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\Silverlight\v4.0\System.Core.dll" -r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\Silverlight\v4.0\System.dll" -r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\Silverlight\v4.0\System.Net.dll" -r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\Silverlight\v4.0\System.Windows.Browser.dll" -r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\Silverlight\v4.0\System.Windows.dll" -r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\Silverlight\v4.0\System.Xml.dll" --target:library --warn:3 --warnaserror:76 --LCID:1033 --utf8output --fullpaths --flaterrors "C:\Users\Stephen\AppData\Local\Temp\Silverlight,Version=v4.0.AssemblyAttributes.fs" Utils\AssemblyInfo.fs Utils\MiscUtils.fs Utils\RegexUtils.fs Utils\PrintfUtils.fs Utils\ListExtensions.fs

 "C:\Program Files (x86)\Microsoft F#\v4.0\fsc.exe" -o:staging\sl4\Unquote.dll --noframework --define:TRACE --define:SILVERLIGHT --doc:staging\sl4\Unquote.xml --optimize+ -r:"C:\Program Files (x86)\Microsoft F#\Silverlight\Libraries\Client\v4.0\FSharp.Core.dll" -r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\Silverlight\v4.0\mscorlib.dll" -r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\Silverlight\v4.0\System.Core.dll" -r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\Silverlight\v4.0\System.dll" -r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\Silverlight\v4.0\System.Net.dll" -r:"C:\Program Files (x86)\Microsoft SDKs\Silverlight\v4.0\Libraries\Client\System.Numerics.dll" -r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\Silverlight\v4.0\System.Windows.Browser.dll" -r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\Silverlight\v4.0\System.Windows.dll" -r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\Silverlight\v4.0\System.Xml.dll" -r:"staging\sl4\Utils.dll" --target:library --warn:3 --warnaserror:76 --vserrors --LCID:1033 --utf8output --fullpaths --flaterrors --staticlink:Utils "C:\Users\Stephen\AppData\Local\Temp\Silverlight,Version=v4.0.AssemblyAttributes.fs" Unquote\AssemblyInfo.fs Unquote\DynamicOperators.fs Unquote\Evaluation.fs Unquote\OperatorPrecedence.fs Unquote\ExtraReflection.fs Unquote\ExtraPatterns.fs Unquote\Decompilation.fs Unquote\Reduction.fs Unquote\Extensions.fs Unquote\Operators.fs Unquote\Assertions.fs
+
+del staging\sl4\Utils.dll

 REM zip builds for .NET 4.0...
 cd staging
@@ -48,4 +55,17 @@

 REM cleanup...

+del /q staging\net40\*.*
+del staging\net40
+del /q staging\sl4\*.*
+del staging\sl4
+del staging
+
+del /q nuget\lib\net40\*.*
+del nuget\lib\net40
+del /q nuget\lib\sl4\*.*
+del nuget\lib\sl4
+del nuget\lib
+del staging
+
 pause


Update 'build.cmd' alias parameter to use full name.

--- build.cmd
+++ build.cmd
@@ -30,7 +30,7 @@
 IF %BUILDCMD_DNX_VERSION%=="" (
 	CALL packages\KoreBuild\build\dnvm upgrade -runtime CLR -arch x86
 ) ELSE (
-	CALL packages\KoreBuild\build\dnvm install %BUILDCMD_DNX_VERSION% -runtime CLR -arch x86 -a default
+	CALL packages\KoreBuild\build\dnvm install %BUILDCMD_DNX_VERSION% -runtime CLR -arch x86 -alias default
 )
 CALL packages\KoreBuild\build\dnvm install default -runtime CoreCLR -arch x86


get appveyor build and tests working

get appveyor build and tests working

--- build.cmd
+++ build.cmd
@@ -40,5 +40,8 @@
 packages\Sake\tools\Sake.exe -I packages\KoreBuild\build -f makefile.shade %*

+:test
+cd test\SaanSoft.AspNet.Identity3.MongoDB.Tests
+dnvm test

 echo END CMD


Enable pinning build script

Enable pinning build script

--- build.cmd
+++ build.cmd
@@ -3,6 +3,8 @@

 SETLOCAL
 SET CACHED_NUGET=%LocalAppData%\NuGet\NuGet.exe
+SET BUILDCMD_KOREBUILD_VERSION=""
+SET BUILDCMD_DNX_VERSION=""

 IF EXIST %CACHED_NUGET% goto copynuget
 echo Downloading latest version of NuGet.exe...
@@ -16,13 +18,21 @@

 :restore
 IF EXIST packages\KoreBuild goto run
-.nuget\NuGet.exe install KoreBuild -ExcludeVersion -o packages -nocache -pre
+IF %BUILDCMD_KOREBUILD_VERSION%=="" (
+	.nuget\NuGet.exe install KoreBuild -ExcludeVersion -o packages -nocache -pre
+) ELSE (
+	.nuget\NuGet.exe install KoreBuild -version %BUILDCMD_KOREBUILD_VERSION% -ExcludeVersion -o packages -nocache -pre
+)
 .nuget\NuGet.exe install Sake -version 0.2 -o packages -ExcludeVersion

 IF "%SKIP_DNX_INSTALL%"=="1" goto run
-CALL packages\KoreBuild\build\dnvm upgrade -runtime CLR -arch x86
+IF %BUILDCMD_DNX_VERSION%=="" (
+	CALL packages\KoreBuild\build\dnvm upgrade -runtime CLR -arch x86
+) ELSE (
+	CALL packages\KoreBuild\build\dnvm install %BUILDCMD_DNX_VERSION% -runtime CLR -arch x86 -a default
+)
 CALL packages\KoreBuild\build\dnvm install default -runtime CoreCLR -arch x86

 :run
 CALL packages\KoreBuild\build\dnvm use default -runtime CLR -arch x86
-packages\Sake\tools\Sake.exe -I packages\KoreBuild\build -f makefile.shade %*
+packages\Sake\tools\Sake.exe -I packages\KoreBuild\build -f makefile.shade %*


Sync changes from netbuild

Sync changes from netbuild

--- build.cmd
+++ build.cmd
@@ -2,6 +2,7 @@
 setlocal enableDelayedExpansion

 set config=Release
+set listProjects=dir /a-d /b /s project.json ^| findstr /v /i /c:bin /c:obj

 goto parseOptions

@@ -9,7 +10,9 @@

 :buildSubdir

-for /f "delims=" %%p in ('call :listProjects %*') do call dnu pack "%%p" --configuration "%config%"
+pushd %1
+for /f "delims=" %%p in ('%listProjects%') do call dnu pack "%%p" --configuration "%config%"
+popd
 goto :EOF

 :checkInstalled
@@ -22,25 +25,19 @@
 )
 goto :EOF

-:listProjects
+:restore

 pushd %1
-for /f "delims=" %%p in ('dir /a-d /b /s project.json') do (
-    :: Exclude bin/ and obj/ directories
-    echo %%p | findstr /v /i /c:bin /c:obj
-)
+:: dnu is a batch script, so we need to `call` it
+for /f "delims=" %%p in ('%listProjects%') do call dnu restore "%%p"
 popd
-goto :EOF
-
-:restore
-
-:: dnu is a batch script, so we need to `call` it
-for /f "delims=" %%p in ('call :listProjects %*') do call dnu restore "%%p"
 goto :EOF

 :runTests

+pushd %1
 for /f "delims=" %%p in ('call :listProjects %*') do dnx -p "%%p" test
+popd
 goto :EOF

 :: Entry point


Extract install steps to install.cmd script

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

--- ProductionTools/AppVeyor/install.cmd
+++ ProductionTools/AppVeyor/install.cmd
@@ -0,0 +1,9 @@
+@set
+
+for /f %%i in ('git tag') do @set VERSION=%%i
+@echo Version=%VERSION%
+
+if not "%VERSION%"=="" set APPVEYOR_BUILD_VERSION=%VERSION:~1%.%APPVEYOR_BUILD_NUMBER%
+if %APPVEYOR_REPO_TAG%==true set APPVEYOR_BUILD_VERSION=%VERSION:~1%
+
+@echo APPVEYOR_BUILD_VERSION=%APPVEYOR_BUILD_VERSION%


bat script update revision: add tag for revision

--- bat/bat_update_revision.bat
+++ bat/bat_update_revision.bat
@@ -18,6 +18,9 @@
 git add ..\Installer\Revision.iss
 git commit -m "r%kam_revision%: update revision number"
 git push
+@REM create revision tag and push it to remote origin
+git tag -a r%kam_revision% -m "r%kam_revision%: update revision number"
+git push origin r%kam_revision%

 @echo !
 @echo !


remove unuse file

remove unuse file

--- KillServers.bat
+++ KillServers.bat
@@ -1,6 +0,0 @@
-@echo off
-
-taskkill /f /im NFPluginLoader*
-
-
-


script1

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

--- MirrorChanges.bat
+++ MirrorChanges.bat
@@ -0,0 +1,62 @@
+REM This script helps automate mirroring all changes from a "master" repository to a "mirror" repository.
+REM Changes should not be made in the mirror but all changes should flow to the mirror repository via the master repository.
+REM Inputs needed for the script are : 1. Remote URL for the master repository 2. Remote URL for the mirror repository
+
+IF "%1" == "" (
+  echo Master repository URL is not provided
+  GOTO :USAGE
+)
+
+IF "%2" == "" (
+  echo Mirror repository URL is not provided
+  GOTO :USAGE
+)
+
+SET masterRepoUrl=%1
+SET mirrorRepoURL=%2
+
+SET mirrorDirName=repoMirror
+
+echo Delete local mirror directory
+rd /S /Q %mirrorDirName%
+
+echo Clone master repository to mirror directory
+git clone --mirror %masterRepoUrl% %mirrorDirName%
+if %ERRORLEVEL% > 0 (
+  GOTO :ERROR
+)
+
+cd %mirrorDirName%
+
+echo Set remote push url to the mirror repository url
+git remote set-url --push origin %mirrorRepoURL%
+
+echo Fetch and prune refs from master repository
+git fetch -p origin
+if %ERRORLEVEL% > 0 (
+  GOTO :ERROR
+)
+
+echo Push to the mirror repository
+git push --mirror
+if %ERRORLEVEL% > 0 (
+  GOTO :ERROR
+)
+
+echo Delete local mirror directory
+cd ..
+rd /S /Q %mirrorDirName%
+
+:END
+exit /b %ERRORLEVEL%
+
+:ERROR
+echo Errors during script execution
+GOTO :END
+
+:USAGE
+echo MirrorChanges.bat MasterRepositoryURL MirrorRepositoryURL
+echo MasterRepositoryURL is the remote URL of the Git repository which contains the changes to be mirrored
+echo MirrorRepositoryURL is the remote UL of the Git repository which will mirror the changes in the master repository
+set ERRORLEVEL=1
+GOTO :END


deploy script.

deploy script.

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

--- Maven-Depoy.cmd
+++ Maven-Depoy.cmd
@@ -0,0 +1,47 @@
+::#!
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: {{{1 :::::::^::::
+:: Copyright © 2013 Martin Krischik
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: $Author$
+:: $Revision$
+:: $Date$
+:: $Id$
+:: $HeadURL$
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: }}}1 :::::::::::
+@ECHO OFF
+
+SETLOCAL
+    SET PATH=%PATH%;C:\opt\Git\bin
+    SET PATH=%PATH%;C:\opt\Scala\2.10.0\bin
+
+    CALL scala -language:postfixOps -save %~f0 %*
+ENDLOCAL
+
+GOTO :eof
+::!#
+
+import scala.sys.process._
+
+val M2_Home      = System.getenv ("M2_HOME")
+val Maven_Deploy = System.getenv ("MAVEN_DEPLOY")
+val Project_Name = System.getenv ("PROJECT_NAME")
+val Maven_Name   = Project_Name +" Maven Repository"
+val mvn          = if (System.getProperty ("os.name") contains "Windows")
+    {
+        "cmd" :: "/C" :: M2_Home + "\\bin\\mvn" :: Nil
+    }
+    else
+    {
+        "mvn" :: Nil
+    }
+
+mvn ::: "--fail-at-end" :: "install" :: Nil !;
+mvn :::
+    "--fail-at-end"				::
+    "--define" :: "repo.id="   + Project_Name	::
+    "--define" :: "repo.name=" + Maven_Name	::
+    "--define" :: "repo.url="  + Maven_Deploy	::
+    "deploy"   :: Nil !;
+
+// vim: set wrap tabstop=8 shiftwidth=4 softtabstop=4 noexpandtab :
+// vim: set textwidth=0 filetype=scala foldmethod=marker nospell :


Add a cmds file to help executing common commands

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

--- cmds.bat
+++ cmds.bat
@@ -0,0 +1,33 @@
+@echo off
+if "%1"=="" goto none
+goto %1
+
+
+:benchmark
+ghc --make Main -odir obj\o -hidir obj\o -O -o tagsoup_o.exe
+tagsoup_o.exe time
+tagsoup_o.exe timefile ketil.xml
+goto end
+
+
+:profile
+ghc --make Main -odir obj\p -hidir obj\p -O -o -prof -auto-all tagsoup_p.exe
+tagsoup_p.exe time +RTS -p
+ren tagsoup_p.prof tagsoup_p_time.prof
+tagsoup_p.exe timefile ketil.xml +RTS -p
+ren tagsoup_p.prof tagsoup_p_ketil.prof
+goto end
+
+
+:dump
+echo dump here
+goto end
+
+
+:none
+echo Enter command, try one of:
+echo benchmark, profile, dump
+goto end
+
+
+:end


Fixed PROACTIVE-858: There is no Windows launching script for the NAS example

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

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

--- examples/nas/nas_benchmarks.bat
+++ examples/nas/nas_benchmarks.bat
@@ -0,0 +1,58 @@
+@echo off
+echo.
+echo --- NAS Example ---------------------------------------------
+
+set DEFAULT_CLASS=S
+set DEFAULT_NP=1
+set DEFAULT_DESCRIPTOR=GCMA.xml
+
+goto doit
+
+:usage
+echo.
+echo Usage: $0 KERNEL [CLASS] [NP] [DESCRIPTOR]
+echo 	KERNEL        Select the kernel to launch: EP, MG, CG, FT or IS
+echo 	CLASS         Class of data size (from smallest to biggest): S, W, A, B, C, D. Default is %DEFAULT_CLASS%
+echo 	NP            Number of processes. Default is %DEFAULT_NP%
+echo 	DESCRIPTOR    GCM Application descriptor file. Default is %DEFAULT_DESCRIPTOR%
+goto end
+
+:doit
+SETLOCAL ENABLEDELAYEDEXPANSION
+
+if "%1"=="" goto usage
+
+call ..\init.bat
+
+
+if "%4"=="" (
+	set DESCRIPTOR=%DEFAULT_DESCRIPTOR%
+) else (
+	set DESCRIPTOR=%4
+)
+
+if "%3"=="" (
+	set NP=%DEFAULT_NP%
+) else (
+	set NP=%3
+)
+
+if "%2"=="" (
+	set CLASS=%DEFAULT_CLASS%
+) else (
+	set CLASS=%2
+)
+
+set ARGS=-kernel %1 -np %NP% -class %CLASS% -descriptor %DESCRIPTOR%
+
+set ARGS
+%JAVA_CMD% org.objectweb.proactive.benchmarks.NAS.Benchmark %ARGS%
+
+ENDLOCAL
+
+pause
+echo.
+echo ----------------------------------------------------------
+echo on
+
+:end


tea time

tea time

--- Labo/Socket/hput.bat
+++ Labo/Socket/hput.bat
@@ -9,9 +9,9 @@
 )
 IF NOT EXIST %X_HPUT_UUID%_content.tmp GOTO END
 IF "%5" == "" (
-	%~dp0hget.exe /C %X_HPUT_UUID%_content.tmp /O * %1
+	%~dp0hget.exe /BT 3600 /C %X_HPUT_UUID%_content.tmp /O * %1
 ) ELSE (
-	%~dp0hget.exe /PS %4 /PP %5 /C %X_HPUT_UUID%_content.tmp /O * %1
+	%~dp0hget.exe /BT 3600 /PS %4 /PP %5 /C %X_HPUT_UUID%_content.tmp /O * %1
 )
 DEL %X_HPUT_UUID%_content.tmp
 SET X_HPUT_UUID=


Bump build number

Bump build number

--- NightlyBuild.cmd
+++ NightlyBuild.cmd
@@ -19,8 +19,8 @@
 :main
 setlocal

-set BuildAssemblyVersion=1.0.0.24
-set BuildSemanticVersion=1.0.0-alpha-build0024
+set BuildAssemblyVersion=1.0.0.25
+set BuildSemanticVersion=1.0.0-alpha-build0025

 echo Building version %BuildSemanticVersion% NuGet packages.
 echo WARNING: Some source files will be modified during this build.


Bump version number

Bump version number

--- NightlyBuild.cmd
+++ NightlyBuild.cmd
@@ -19,8 +19,8 @@
 :main
 setlocal

-set BuildAssemblyVersion=1.0.0.26
-set BuildSemanticVersion=1.0.0-alpha-build0026
+set BuildAssemblyVersion=1.0.0.27
+set BuildSemanticVersion=1.0.0-alpha-build0027

 echo Building version %BuildSemanticVersion% NuGet packages.
 echo WARNING: Some source files will be modified during this build.


Try adding bld.dat.

Try adding bld.dat.

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

--- recipes/capytaine/bld.bat
+++ recipes/capytaine/bld.bat
@@ -0,0 +1,11 @@
+set CFG=%USERPROFILE%\pydistutils.cfg
+echo [config] > "%CFG%"
+echo compiler=mingw32 >> "%CFG%"
+echo [build] >> "%CFG%"
+echo compiler=mingw32 >> "%CFG%"
+echo [build_ext] >> "%CFG%"
+echo compiler=mingw32 >> "%CFG%"
+
+"%PYTHON%" setup.py install --single-version-externally-managed
+if errorlevel 1 exit 1
+


Updated certificate thumbprint

Updated certificate thumbprint

--- Setup/Publish.cmd
+++ Setup/Publish.cmd
@@ -14,7 +14,7 @@
 SET       SIGN_TOOL_1="%PROGRAMFILES(X86)%\Microsoft SDKs\ClickOnce\SignTool\signtool.exe"
 SET       SIGN_TOOL_2="%PROGRAMFILES(X86)%\Windows Kits\10\App Certification Kit\signtool.exe"
 SET       SIGN_TOOL_3="%PROGRAMFILES(X86)%\Windows Kits\10\bin\x86\signtool.exe"
-SET   SIGN_THUMBPRINT="df26e797ffaee47a40c1fab756e995d3763da968"
+SET   SIGN_THUMBPRINT="026184de8dbf52fdcbae75fd6b1a7d9ce4310e5d"
 SET SIGN_TIMESTAMPURL="http://timestamp.comodoca.com/rfc3161"

 SET        GIT_TOOL_1="%PROGRAMFILES%\Git\mingw64\bin\git.exe"


Introduce Tools/build.bat

Introduce Tools/build.bat

The per-driver buildAll.bat scripts are now nothing but
boilerplate and can be replaced with one shared build script.

This commit adds Tools/build.bat which is a drop-in replacement
for all buildAll.bat's. It handles regular builds, SDV builds,
can do Debug as well as Release, and /Build (incremental) as well
/Rebuild.

Subsequent commits will replace the contents of all copies of
buildAll.bat with only one line which calls Tools/build.bat.

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

--- Tools/build.bat
+++ Tools/build.bat
@@ -0,0 +1,189 @@
+@echo off
+setlocal enabledelayedexpansion
+
+rem ================================================================================
+rem Virtio-win master build script
+rem
+rem Usage: build.bat <project_or_solution_file_path> <target_os_versions> [<args>]
+rem
+rem where args can be one or more of
+rem   Debug, dbg, chk       .. to build Debug rather than the default release flavor
+rem   amd64, x64, 64        .. to build only 64-bit driver
+rem   x86, 32               .. to build only 32-bit driver
+rem   /Option               .. build command to pass to VS, for example /Rebuild
+rem   Win7, Win8, Win10..   .. target OS version
+rem
+rem By default the script performs an incremental build of both 32-bit and 64-bit
+rem release drivers for all supported target OSes.
+rem
+rem To do a Static Driver Verifier build, append _SDV to the target OS version, for
+rem example Win10_SDV.
+rem ================================================================================
+
+rem This is a list of supported build target specifications A_B where A is the
+rem VS project configuration name and B is the corresponding platform identifier
+rem used in log file names and intemediate directory names. Either of the two can
+rem be used in the <target_os_version> command line argument.
+set SUPPORTED_BUILD_SPECS=WinXP_wxp Win2k3_wnet Vista_wlh Win7_win7 Win8_win8 Win8.1_win81 Win10_win10
+
+set BUILD_TARGETS=%~2
+set BUILD_DIR=%~dp1
+set BUILD_FILE=%~nx1
+
+rem We do an incremental Release build for all specs and all archs by default
+set BUILD_FLAVOR=Release
+set BUILD_COMMAND=/Build
+set BUILD_SPEC=
+set BUILD_ARCH=
+set BUILD_FAILED=
+
+rem Parse arguments
+:argloop
+shift /2
+if "%2"=="" goto argend
+set ARG=%2
+if "%ARG:~0,1%"=="/" set BUILD_COMMAND=%ARG%& goto :argloop
+
+if /I "%ARG%"=="Debug" set BUILD_FLAVOR=Debug& goto :argloop
+if /I "%ARG%"=="dbg" set BUILD_FLAVOR=Debug& goto :argloop
+if /I "%ARG%"=="chk" set BUILD_FLAVOR=Debug& goto :argloop
+
+if /I "%ARG%"=="amd64" set BUILD_ARCH=amd64& goto :argloop
+if /I "%ARG%"=="64" set BUILD_ARCH=amd64& goto :argloop
+if /I "%ARG%"=="x64" set BUILD_ARCH=amd64& goto :argloop
+if /I "%ARG%"=="32" set BUILD_ARCH=x86& goto :argloop
+if /I "%ARG%"=="x86" set BUILD_ARCH=x86& goto :argloop
+
+rem Assume that this is target OS version and split off the tag
+call :split_target_tag "%ARG%"
+
+rem Verify that this target OS is supported and valid
+for %%N in (%SUPPORTED_BUILD_SPECS%) do (
+  set T=%%N
+  set CANDIDATE_SPEC=
+  set FOUND_MATCH=
+
+  for %%A in ("!T:_=" "!") do (
+    if /I %%A=="%TARGET%" set CANDIDATE_SPEC=!T!!TAG!
+    for %%B in (%BUILD_TARGETS%) do (
+      if /I %%B==%%~A!TAG! set FOUND_MATCH=1
+    )
+  )
+
+  if not "!FOUND_MATCH!"=="" if not "!CANDIDATE_SPEC!"=="" (
+    set BUILD_SPEC=!CANDIDATE_SPEC!
+    goto :argloop
+  )
+)
+
+rem Silently exit if the build target could not be matched
+goto :eof
+
+rem Figure out which targets we're building
+:argend
+if "%BUILD_SPEC%"=="" (
+  for %%B in (%BUILD_TARGETS%) do (
+    call :split_target_tag "%%B"
+    for %%N in (%SUPPORTED_BUILD_SPECS%) do (
+      set T=%%N
+      set BUILD_SPEC=
+      for %%A in ("!T:_=" "!") do (
+        if /I %%A=="!TARGET!" set BUILD_SPEC=!T!!TAG!
+      )
+      if not "!BUILD_SPEC!"=="" (
+        call :build_target !BUILD_SPEC!
+        if not "!BUILD_FAILED!"=="" goto :eof
+      )
+    )
+  )
+) else (
+  call :build_target %BUILD_SPEC%
+)
+goto :eof
+
+rem Figure out which archs we're building
+:build_target
+if "%BUILD_ARCH%"=="" (
+  call :build_arch %1 x86
+  if not "!BUILD_FAILED!"=="" goto :eof
+  call :build_arch %1 amd64
+) else (
+  call :build_arch %1 %BUILD_ARCH%
+)
+goto :eof
+
+rem Invoke Visual Studio
+:build_arch
+setlocal
+set BUILD_ARCH=%2
+set TAG=
+for /f "tokens=1 delims=_" %%T in ("%1") do (
+  set TARGET_PROJ_CONFIG=%%T
+)
+for /f "tokens=2 delims=_" %%T in ("%1") do (
+  set TARGET_PLATFORM=%%T
+)
+for /f "tokens=3 delims=_" %%T in ("%1") do (
+  set TAG=%%T
+)
+
+rem There is no 64-bit XP build
+if /I "%1"=="WinXP_wxp" if /I "%BUILD_ARCH%"=="amd64" goto :eof
+
+if /I "!TAG!"=="SDV" (
+  rem There is no 32-bit SDV build
+  if %BUILD_ARCH%==x86 goto :eof
+  rem Check the SDV build suppression variable
+  if not "%_BUILD_DISABLE_SDV%"=="" (
+    echo Skipping %TARGET_PROJ_CONFIG% SDV build because _BUILD_DISABLE_SDV is set
+    goto :eof
+  )
+)
+
+rem Compose build log file name
+if %BUILD_FLAVOR%=="Debug" (
+  set BUILD_LOG_FILE=buildchk
+) else (
+  set BUILD_LOG_FILE=buildfre
+)
+set BUILD_LOG_FILE=%BUILD_LOG_FILE%_%TARGET_PLATFORM%_%BUILD_ARCH%.log
+
+if %BUILD_ARCH%==amd64 set BUILD_ARCH=x64
+set TARGET_VS_CONFIG="%TARGET_PROJ_CONFIG% %BUILD_FLAVOR%|%BUILD_ARCH%"
+
+pushd %BUILD_DIR%
+call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x64
+
+if /I "!TAG!"=="SDV" (
+  echo Running SDV for %BUILD_FILE%, configuration %TARGET_VS_CONFIG%
+  call :runsdv "%TARGET_PROJ_CONFIG% %BUILD_FLAVOR%" %BUILD_ARCH%
+) else (
+  echo Building %BUILD_FILE%, configuration %TARGET_VS_CONFIG%, command %BUILD_COMMAND%
+  call %~dp0\callVisualStudio.bat 14 %BUILD_FILE% %BUILD_COMMAND% %TARGET_VS_CONFIG% /Out %BUILD_LOG_FILE%
+)
+popd
+endlocal
+
+IF ERRORLEVEL 1 (
+  set BUILD_FAILED=1
+)
+goto :eof
+
+:runsdv
+msbuild.exe %BUILD_FILE% /t:clean /p:Configuration="%~1" /P:Platform=%2
+msbuild.exe %BUILD_FILE% /t:sdv /p:inputs="/clean" /p:Configuration="%~1" /P:platform=%2
+msbuild.exe %BUILD_FILE% /p:Configuration="%~1" /P:Platform=%2 /P:RunCodeAnalysisOnce=True
+msbuild.exe %BUILD_FILE% /t:sdv /p:inputs="/devenv /check" /p:Configuration="%~1" /P:platform=%2
+msbuild.exe %BUILD_FILE% /t:dvl /p:Configuration="%~1" /P:platform=%2
+goto :eof
+
+:split_target_tag
+set TARGET=
+set TAG=
+for /f "tokens=1 delims=_" %%T in (%1) do (
+    set TARGET=%%T
+)
+for /f "tokens=2 delims=_" %%T in (%1) do (
+    set TAG=_%%T
+)
+goto :eof


Change line endings for `.cmd` file to CRLF

This is more compatible with users who don't transform all newlines to
CRLF on Windows.

--- tools/msvc-build-launcher.cmd
+++ tools/msvc-build-launcher.cmd
@@ -1,39 +1,39 @@
-@echo off
-
-REM Use old Windows SDK 6.1 so created .exe will be compatible with
-REM old Windows versions.
-REM Windows SDK 6.1 may be downloaded at:
-REM  http://www.microsoft.com/en-us/download/details.aspx?id=11310
-set PATH_OLD=%PATH%
-
-REM The SDK creates a false install of Visual Studio at one of these locations
-set PATH=C:\Program Files\Microsoft Visual Studio 9.0\VC\bin;%PATH%
-set PATH=C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin;%PATH%
-
-REM set up the environment to compile to x86
-call VCVARS32
-if "%ERRORLEVEL%"=="0" (
-  cl /D "GUI=0" /D "WIN32_LEAN_AND_MEAN" launcher.c /O2 /link /MACHINE:x86 /SUBSYSTEM:CONSOLE /out:setuptools/cli-32.exe
-  cl /D "GUI=1" /D "WIN32_LEAN_AND_MEAN" launcher.c /O2 /link /MACHINE:x86 /SUBSYSTEM:WINDOWS /out:setuptools/gui-32.exe
-) else (
-  echo Windows SDK 6.1 not found to build Windows 32-bit version
-)
-
-REM buildout (and possibly other implementations) currently depend on
-REM the 32-bit launcher scripts without the -32 in the filename, so copy them
-REM there for now.
-copy setuptools/cli-32.exe setuptools/cli.exe
-copy setuptools/gui-32.exe setuptools/gui.exe
-
-REM now for 64-bit
-REM Use the x86_amd64 profile, which is the 32-bit cross compiler for amd64
-call VCVARSx86_amd64
-if "%ERRORLEVEL%"=="0" (
-  cl /D "GUI=0" /D "WIN32_LEAN_AND_MEAN" launcher.c /O2 /link /MACHINE:x64 /SUBSYSTEM:CONSOLE /out:setuptools/cli-64.exe
-  cl /D "GUI=1" /D "WIN32_LEAN_AND_MEAN" launcher.c /O2 /link /MACHINE:x64 /SUBSYSTEM:WINDOWS /out:setuptools/gui-64.exe
-) else (
-  echo Windows SDK 6.1 not found to build Windows 64-bit version
-)
-
-set PATH=%PATH_OLD%
-
+@echo off
+
+REM Use old Windows SDK 6.1 so created .exe will be compatible with
+REM old Windows versions.
+REM Windows SDK 6.1 may be downloaded at:
+REM  http://www.microsoft.com/en-us/download/details.aspx?id=11310
+set PATH_OLD=%PATH%
+
+REM The SDK creates a false install of Visual Studio at one of these locations
+set PATH=C:\Program Files\Microsoft Visual Studio 9.0\VC\bin;%PATH%
+set PATH=C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin;%PATH%
+
+REM set up the environment to compile to x86
+call VCVARS32
+if "%ERRORLEVEL%"=="0" (
+  cl /D "GUI=0" /D "WIN32_LEAN_AND_MEAN" launcher.c /O2 /link /MACHINE:x86 /SUBSYSTEM:CONSOLE /out:setuptools/cli-32.exe
+  cl /D "GUI=1" /D "WIN32_LEAN_AND_MEAN" launcher.c /O2 /link /MACHINE:x86 /SUBSYSTEM:WINDOWS /out:setuptools/gui-32.exe
+) else (
+  echo Windows SDK 6.1 not found to build Windows 32-bit version
+)
+
+REM buildout (and possibly other implementations) currently depend on
+REM the 32-bit launcher scripts without the -32 in the filename, so copy them
+REM there for now.
+copy setuptools/cli-32.exe setuptools/cli.exe
+copy setuptools/gui-32.exe setuptools/gui.exe
+
+REM now for 64-bit
+REM Use the x86_amd64 profile, which is the 32-bit cross compiler for amd64
+call VCVARSx86_amd64
+if "%ERRORLEVEL%"=="0" (
+  cl /D "GUI=0" /D "WIN32_LEAN_AND_MEAN" launcher.c /O2 /link /MACHINE:x64 /SUBSYSTEM:CONSOLE /out:setuptools/cli-64.exe
+  cl /D "GUI=1" /D "WIN32_LEAN_AND_MEAN" launcher.c /O2 /link /MACHINE:x64 /SUBSYSTEM:WINDOWS /out:setuptools/gui-64.exe
+) else (
+  echo Windows SDK 6.1 not found to build Windows 64-bit version
+)
+
+set PATH=%PATH_OLD%
+


[Scripts] call svn_bak_modified.bat

[Scripts] call svn_bak_modified.bat

--- Scripts/isvn.bat
+++ Scripts/isvn.bat
@@ -21,7 +21,7 @@
 goto END

 :BACKUP
-call %GLADIATOR_HOME%/Scripts/svn/svn_back_modified.bat
+call %GLADIATOR_HOME%/Scripts/svn/svn_bak_modified.bat
 @echo off
 goto END


windows batch example

windows batch example

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

--- generate-chm.bat
+++ generate-chm.bat
@@ -0,0 +1,20 @@
+@echo off
+set HTMLHELP_PATH=..\_htmlhelp
+
+echo.
+echo API
+php apidoc api --overwrite --template=bootstrapchm vendor/yiisoft/yii2-dev ./_Docs
+
+echo.
+echo Guide
+php apidoc guide --overwrite --template=bootstrapchm vendor/yiisoft/yii2-dev/docs/guide ./_Docs
+
+echo.
+echo CHM
+php apidoc chm --overwrite --template=bootstrapchm ./_Docs vendor/yiisoft/yii2-dev/docs/guide
+
+echo.
+echo Generating CHM
+%HTMLHELP_PATH%\hhc.exe _Docs\_yii2-chm_project.hhp
+
+pause


Added bdist_array for windows

Added bdist_array for windows

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

--- bdist_array.cmd
+++ bdist_array.cmd
@@ -0,0 +1,42 @@
+@echo off
+setlocal EnableDelayedExpansion
+
+SET VERSIONS=2.7 3.5 3.6 3.7 3.8
+SET ROOT_DIR=%cd%
+
+for %%v in (%VERSIONS%) do (
+    echo Building for python==%%v
+    SET ENV_NAME=opencc-%%v
+
+    REM Clean up existing builds
+    cd %ROOT_DIR%
+    rmdir /S /Q build python\opencc\clib OpenCC.egg-info
+
+    REM Create and initialize new environment
+    cd %ROOT_DIR%
+    CALL conda create -y -n !ENV_NAME! python=%%v
+    if !ERRORLEVEL! NEQ 0 (EXIT !ERRORLEVEL!)
+    CALL conda activate !ENV_NAME!
+    if !ERRORLEVEL! NEQ 0 (EXIT !ERRORLEVEL!)
+
+    pip install --no-cache-dir setuptools wheel pytest
+    if !ERRORLEVEL! NEQ 0 (EXIT !ERRORLEVEL!)
+
+    REM Build install and test
+    cd %ROOT_DIR%
+    python setup.py build_ext install
+    if !ERRORLEVEL! NEQ 0 (EXIT !ERRORLEVEL!)
+    cd %ROOT_DIR%\python
+    pytest .
+    if !ERRORLEVEL! NEQ 0 (EXIT !ERRORLEVEL!)
+
+    REM Package and clean up
+    cd %ROOT_DIR%
+    del dist\*.egg
+    python setup.py bdist_wheel
+    if !ERRORLEVEL! NEQ 0 (EXIT !ERRORLEVEL!)
+    rmdir /S /Q build python\opencc\clib OpenCC.egg-info
+    CALL conda deactivate
+
+    echo Finished building for python==%%v
+)


Don't need to delete cab anymore

Don't need to delete cab anymore

--- Installer/BuildInstaller.bat
+++ Installer/BuildInstaller.bat
@@ -2,4 +2,4 @@
 heat dir ../Release -gg -srd -cg 3RVXComponents -dr INSTALLFOLDER -out 3RVXComponents.wxs
 candle ./3RVX.wxs ./3RVXComponents.wxs
 light -b ../Release -ext WixUIExtension ./3RVX.wixobj ./3RVXComponents.wixobj -o 3RVX.msi
-del 3RVX.wixobj 3RVX.wixpdb 3RVXComponents.wxs 3RVXComponents.wixobj cab1.cab+del 3RVX.wixobj 3RVX.wixpdb 3RVXComponents.wxs 3RVXComponents.wixobj


Correctly copy po folder in Windows install

--- Tools/copyR.cmd
+++ Tools/copyR.cmd
@@ -61,11 +61,11 @@

     if exist %SOURCEDIR%\library\%%G\R    ( XCOPY %SOURCEDIR%\library\%%G\R    /Q /E /I R >nul )
     if exist %SOURCEDIR%\library\%%G\Meta ( XCOPY %SOURCEDIR%\library\%%G\Meta /Q /E /I Meta >nul )
+    if exist %SOURCEDIR%\library\%%G\po   ( XCOPY %SOURCEDIR%\library\%%G\po   /Q /E /I po >nul )

     if exist %SOURCEDIR%\library\%%G\afm  ( XCOPY %SOURCEDIR%\library\%%G\afm  /Q /E /I R >nul )
     if exist %SOURCEDIR%\library\%%G\enc  ( XCOPY %SOURCEDIR%\library\%%G\enc  /Q /E /I R >nul )
     if exist %SOURCEDIR%\library\%%G\icc  ( XCOPY %SOURCEDIR%\library\%%G\icc  /Q /E /I R >nul )
-    if exist %SOURCEDIR%\library\%%G\po   ( XCOPY %SOURCEDIR%\library\%%G\po   /Q /E /I R >nul )

     rem for issue https://github.com/jasp-stats/jasp-test-release/issues/416#issuecomment-591899068
     if "%%G"=="viridisLite"               ( XCOPY %SOURCEDIR%\library\%%G\data /Q /E /I data >nul )


Fix missing java.library.path

Fix missing java.library.path

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

--- plugins/DataBrowser/build.bat
+++ plugins/DataBrowser/build.bat
@@ -1,7 +1,7 @@
 rmdir classes
 md classes
 xcopy /E /Y src classes\
-"%JDK6%\bin\java" -cp src;classes;../../../3rdpartypublic/classext/clojure.jar;../../../3rdpartypublic/classext/clojure-contrib.jar;../../../3rdpartypublic/classext/ij.jar;../../../3rdpartypublic/classext/bsh-2.0b4.jar;../../mmstudio/MMJ_.jar;../../MMCoreJ_wrap/MMCoreJ.jar;../../acqEngine/MMAcqEngine.jar -Dclojure.compile.path=classes -server clojure.lang.Compile org.micromanager.browser.plugin
+"%JDK6%\bin\java" -cp src;classes;../../../3rdpartypublic/classext/clojure.jar;../../../3rdpartypublic/classext/clojure-contrib.jar;../../../3rdpartypublic/classext/ij.jar;../../../3rdpartypublic/classext/bsh-2.0b4.jar;../../mmstudio/MMJ_.jar;../../MMCoreJ_wrap/MMCoreJ.jar;../../acqEngine/MMAcqEngine.jar -Djava.library.path=../../bin_Win32 -Dclojure.compile.path=classes -server clojure.lang.Compile org.micromanager.browser.plugin
 "%JDK6%\bin\jar" cvf DataBrowser.jar -C classes\ .
 copy /Y DataBrowser.jar "\Program Files\ImageJ\mmplugins\"
 copy /Y DataBrowser.jar ..\..\Install_AllPlatforms\micro-manager\mmplugins\


Delete .build.cmd

Delete .build.cmd

--- .build.cmd
+++ .build.cmd
@@ -1,21 +0,0 @@
-@echo off
-:: To build extensions for 64 bit Python 3, we need to configure environment
-:: variables to use the MSVC 2010 C++ compilers from GRMSDKX_EN_DVD.iso of:
-:: MS Windows SDK for Windows 7 and .NET Framework 4
-::
-:: More details at:
-:: https://github.com/cython/cython/wiki/CythonExtensionsOnWindows
-
-IF "%DISTUTILS_USE_SDK%"=="1" (
-    ECHO Configuring environment to build with MSVC on a 64bit architecture
-    ECHO Using Windows SDK 7.1
-    "C:\Program Files\Microsoft SDKs\Windows\v7.1\Setup\WindowsSdkVer.exe" -q -version:v7.1
-    CALL "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64 /release
-    SET MSSdk=1
-    REM Need the following to allow tox to see the SDK compiler
-    SET TOX_TESTENV_PASSENV=DISTUTILS_USE_SDK MSSdk INCLUDE LIB
-) ELSE (
-    ECHO Using default MSVC build environment
-)
-
-CALL %*


python 2.7 builder

python 2.7 builder

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

--- scripts/winbuild_py27.bat
+++ scripts/winbuild_py27.bat
@@ -0,0 +1,2 @@
+SET PATH=C:\MinGW\bin;C:\Python27;C:\Python27\Scripts;%PATH%
+python setup.py build -c mingw32 bdist_wininst


script corrected

script corrected

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

--- scripts/windows/nbody.bat
+++ scripts/windows/nbody.bat
@@ -1,17 +1,28 @@
 @echo off
 echo.
 echo --- N-body with ProActive ---------------------------------
-IF NOT DEFINED PROACTIVE set PROACTIVE=..\..\.
-SETLOCAL
+goto doit

-call %PROACTIVE%\scripts\windows\init.bat
-
-IF %1 == "displayft"
+:usage
+echo.
+goto end
+
+
+:doit
+IF NOT DEFINED PROACTIVE set PROACTIVE=..\..\.
+
+SETLOCAL
+call %PROACTIVE%\scripts\windows\init.bat
+if "%1" == "-displayft" goto ft
+if "%1" == "" goto noft
+
+:ft
 set XMLDESCRIPTOR=%PROACTIVE%\descriptors\FaultTolerantWorkers.xml
-else
+
+:noft
 set XMLDESCRIPTOR=%PROACTIVE%\descriptors\Workers.xml
-
-%JAVA_CMD% org.objectweb.proactive.examples.nbody.Start %XMLDESCRIPTOR% %1 %2 %3
+
+%JAVA_CMD% org.objectweb.proactive.examples.nbody.common.Start %XMLDESCRIPTOR% %1 %2 %3

 ENDLOCAL


Remove extra file

Remove extra file

--- bin/ee.bat
+++ bin/ee.bat
@@ -1,2 +0,0 @@
-@ECHO OFF
-php "%~dp0../php/boot-fs.php" %*


[fix] CI: leveldown patch for Windows release was incorrect

--- release/arch/windows/build.bat
+++ release/arch/windows/build.bat
@@ -64,9 +64,6 @@

 call npm cache clean
 call npm install
-echo "Patch de leveldown..."
-move %cd%\node_modules\leveldown\package.json %cd%\node_modules\leveldown\package.json.back /s /e /Y
-move %cd%\release\resources\leveldown-fix.json %cd%\node_modules\leveldown\package.json /s /e /Y
 REM call npm test
 echo "Ajout du module 1/1 (duniter-ui)..."
 call npm install duniter-ui@1.7.x --save --production
@@ -96,6 +93,9 @@
 copy %cd%\lib\binding\Release\node-webkit-%NW_RELEASE%-win32-x64\naclb.node %cd%\lib\binding\Release\node-v%ADDON_VERSION%-win32-x64\naclb.node /Y
 cd ../leveldown
 call npm install --build-from-source
+echo "Patch de leveldown..."
+move package.json package.json.back
+move %cd%\..\..\release\resources\leveldown-fix.json package.json
 call node-pre-gyp --runtime=node-webkit --target=%NW_VERSION% --msvs_version=2015 configure
 call node-pre-gyp --runtime=node-webkit --target=%NW_VERSION% --msvs_version=2015 build
 mkdir %cd%\lib


fix for GRAILS-418

fix for GRAILS-418

git-svn-id: 29aad96320b2a07b98332cd568fc1316025c072f@1780 1cfb16fd-6d17-0410-8ff1-b7e8e1e2867d

--- ant/bin/ant.bat
+++ ant/bin/ant.bat
@@ -72,7 +72,7 @@

 :noAntHome
 echo ANT_HOME is set incorrectly or ant could not be located. Please set ANT_HOME.
-goto end
+goto ende

 :checkJava
 set _JAVACMD=%JAVACMD%
@@ -92,15 +92,15 @@
 if "%_USE_CLASSPATH%"=="no" goto runAntNoClasspath
 if not "%CLASSPATH%"=="" goto runAntWithClasspath
 "%_JAVACMD%" %ANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%ANT_HOME%" org.apache.tools.ant.launch.Launcher %ANT_ARGS% %ANT_CMD_LINE_ARGS%
-goto end
+goto ende

 :runAntNoClasspath
 "%_JAVACMD%" %ANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%ANT_HOME%" org.apache.tools.ant.launch.Launcher %ANT_ARGS% %ANT_CMD_LINE_ARGS%
-goto end
+goto ende

 :runAntWithClasspath
 "%_JAVACMD%" %ANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%ANT_HOME%" org.apache.tools.ant.launch.Launcher %ANT_ARGS% -cp "%CLASSPATH%" %ANT_CMD_LINE_ARGS%
-goto end
+goto ende

 :runAntWithJikes
 if "%_USE_CLASSPATH%"=="no" goto runAntWithJikesNoClasspath
@@ -108,13 +108,13 @@

 :runAntWithJikesNoClasspath
 "%_JAVACMD%" %ANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%ANT_HOME%" "-Djikes.class.path=%JIKESPATH%" org.apache.tools.ant.launch.Launcher %ANT_ARGS% %ANT_CMD_LINE_ARGS%
-goto end
+goto ende

 :runAntWithJikesAndClasspath
 "%_JAVACMD%" %ANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%ANT_HOME%" "-Djikes.class.path=%JIKESPATH%" org.apache.tools.ant.launch.Launcher %ANT_ARGS%  -cp "%CLASSPATH%" %ANT_CMD_LINE_ARGS%
-goto end
+goto ende

-:end
+:ende
 set _JAVACMD=
 set ANT_CMD_LINE_ARGS=


Update build script to allow specifying a level.  To build from trunk, specify
trunk as build level.

git-svn-id: 67f5ad311a3d1220c16f120748b212c18fe1c257@501065 13f79535-47bb-0310-9956-ffa450edef68

--- uimaj-distr/src/main/build/extractAndBuild.bat
+++ uimaj-distr/src/main/build/extractAndBuild.bat
@@ -21,14 +21,26 @@

 @echo on

-@set jvmarg=""
-@if "%~1"=="" goto execute
-@if "%~1"=="-notest" goto notest
+@if "%~1"=="" goto usage
+@if "%~1"=="trunk" goto trunk
+@set level=tags/%~1
+@set leveldir=%~1
+@goto checktest
+
+@:trunk
+@set level=trunk
+@set leveldir=trunk
+@goto checktest
+
+@:checktest
+@set jvmarg=
+@if "%~2"=="" goto execute
+@if "%~2"=="-notest" goto notest
 @goto usage

 @:usage
 @echo off
-echo Usage: extractAndBuild.bat [-notest]
+echo Usage: extractAndBuild.bat <level> [-notest]
 @echo on
 @goto exit

@@ -36,10 +48,10 @@
 @set jvmarg="-Dmaven.test.skip=true"
 @goto execute

-
 @:execute
-svn checkout http://svn.apache.org/repos/asf/incubator/uima/uimaj/trunk
-cd trunk\uimaj
+svn checkout -r HEAD http://svn.apache.org/repos/asf/incubator/uima/uimaj/%level%
+cd %leveldir%
+cd uimaj
 call mvn %jvmarg%  -Duima.build.date="%date% %time%" install
 cd ..
 cd uimaj-distr


Don't package LICENSE as content This causes the LICENSE file to be added to consumers projects when the pacakge is refrenced

--- build-nupkg.cmd
+++ build-nupkg.cmd
@@ -1,10 +1,8 @@
 tools\nuget.exe update -self

 if not exist JWT\bin\Release\nupkg mkdir JWT\bin\Release\nupkg
-if not exist JWT\bin\Release\nupkg\content mkdir JWT\bin\Release\nupkg\content
 if not exist JWT\bin\Release\nupkg\lib\4.0 mkdir JWT\bin\Release\nupkg\lib\4.0

 copy JWT\bin\Release\jose-jwt.dll JWT\bin\Release\nupkg\lib\4.0\
-copy LICENSE JWT\bin\Release\nupkg\content

 tools\nuget.exe pack jose-jwt.nuspec -BasePath JWT\bin\Release\nupkg


#99 : Bug fix

#99 : Bug fix

--- build/build.bat
+++ build/build.bat
@@ -3,11 +3,13 @@
 if defined APPVEYOR (
   echo For AppVeyor
   set MSBUILD="msbuild.exe"
+  set WKHTMLTOPDF=""
+  set PDFTK=""
   set SEVENZIP="7z.exe"
-)
-
-if not defined APPVEYOR (
-  set CURRENTPATH=%cd%
+  set LCOUNTER=""
+)
+
+if not defined APPVEYOR (
   set MSBUILD="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\msbuild.exe"
   set WKHTMLTOPDF="C:\Program Files\wkhtmltopdf\bin\wkhtmltopdf.exe"
   set PDFTK="C:\Program Files (x86)\PDFtk Server\bin\pdftk.exe"


Update windows CI script to point to catch file calling directory

--- ci/test-win.bat
+++ ci/test-win.bat
@@ -1,5 +1,5 @@
-echo Running Windows build and testscript  %cd%/matlab/CIBuildAndTest.m
-call "C:\Program Files\MATLAB\R2015b\bin\matlab.exe" -wait -nodisplay -nosplash -nodesktop -r "try, run('%cd%\matlab\CIBuildAndTest.m'), catch ex, disp(['Exception during CIBuildAndTest.m: ' ex.message]), exit(1), end, exit(0);"
+echo Running Windows build and testscript  %cd%\matlab\CIBuildAndTest.m
+call "C:\Program Files\MATLAB\R2015b\bin\matlab.exe" -wait -nodisplay -nosplash -nodesktop -r "try, run('%~dp0%\matlab\CIBuildAndTest.m'), catch ex, disp(['Exception during CIBuildAndTest.m: ' ex.message]), exit(1), end, exit(0);"

 if not "%ERRORLEVEL%" == "0" (
     echo Exit Code = %ERRORLEVEL%


Updated version creating script to include commit hash

--- make_version.bat
+++ make_version.bat
@@ -1,4 +1,3 @@
-@echo off
 type version
 set /p Build=<version
 set /a Build+=1
@@ -6,5 +5,7 @@
 For /f "tokens=1-3 delims=/ " %%a in ('date /t') do (set mydate=%%a)
 For /f "tokens=1-2 delims=/:" %%a in ("%TIME%") do (set mytime=%%a%%b)
 >>version echo %mydate%_%mytime%
-COPY %~dp0\client\debug\PipeChatClient.exe %~dp0\%Build%_%mydate%_%mytime%_client.exe
-COPY %~dp0\server\debug\PipeChatServer.exe %~dp0\%Build%_%mydate%_%mytime%_server.exe+for /f %%v in ('git rev-parse --short HEAD') do set hash=%%v
+>>version echo %hash%
+COPY %~dp0\client\debug\PipeChatClient.exe "%~dp0\%Build%_%mydate%_%mytime%_%hash%_client.exe"
+COPY %~dp0\server\debug\PipeChatServer.exe "%~dp0\%Build%_%mydate%_%mytime%_%hash%_server.exe"


Update make_windows.bat

Update make_windows.bat

--- make_windows.bat
+++ make_windows.bat
@@ -1,2 +1,2 @@
-nexe src/electron.js -r public\ -r src\ -r package.json -r node_sqlite3_win64.rename  -r node_sqlite3_macos64.rename  -o app.exe
-copy .\app.exe ..\nexe\app.exe /Y
+pkg . --output vjs.exe
+copy .\vjs.exe ..\nexe\vjs.exe /Y


added addition sass compiler to tools to handle windows users

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

--- tools/sass-dev.bat
+++ tools/sass-dev.bat
@@ -0,0 +1 @@
+sass --watch ../www/css/sass:../www/css/dev --style expanded --no-cache --line-numbers


add export all symbols to cmake

add export all symbols to cmake

--- recipes/dftatom/bld.bat
+++ recipes/dftatom/bld.bat
@@ -4,6 +4,7 @@
 cmake -G "NMake Makefiles" ^
       -D CMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% ^
       -D CMAKE_PREFIX_PATH=%LIBRARY_PREFIX% ^
+      -D CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=TRUE ^
       -D CMAKE_BUILD_TYPE=Release ^
       ..


typos

typos

--- bin/create-mariadb-light-win32.bat
+++ bin/create-mariadb-light-win32.bat
@@ -71,7 +71,7 @@
 del /q /f "%MYSQL_DIR%\bin\myisamlog.exe"
 del /q /f "%MYSQL_DIR%\bin\myisampack.exe"
 :: keep mysql.exe
-del /q /f "%MYSQL_DIR%\bin\mysqld-embedded.exe"
+del /q /f "%MYSQL_DIR%\bin\mysqld_embedded.exe"
 :: keep mysql_install_db.exe
 del /q /f "%MYSQL_DIR%\bin\mysql_plugin.exe"
 del /q /f "%MYSQL_DIR%\bin\mysql_tzinfo_to_sql.exe"
@@ -98,7 +98,7 @@
 del /q /f "%MYSQL_DIR%\bin\mysql_convert_table_format.pl"
 del /q /f "%MYSQL_DIR%\bin\mysql_secure_installation.pl"
 del /q /f "%MYSQL_DIR%\bin\mysqld_multi.pl"
-del /q /f "%MYSQL_DIR%\bin\mysqlddumpslow.pl"
+del /q /f "%MYSQL_DIR%\bin\mysqldumpslow.pl"
 del /q /f "%MYSQL_DIR%\bin\mysqlhotcopy.pl"

 :: ############# process the /data folder


clean.cmd

clean.cmd

--- bootstrap/peterkir/win32/clean.cmd
+++ bootstrap/peterkir/win32/clean.cmd
@@ -20,7 +20,7 @@

 SET DOWNLOAD=^
 	%DL%\org.eclipse.oomph.setup.installer.product-*^
-	%DL%\setupJavaSD.cmd^
+	%DL%\setupJavaSDK.cmd^
 	master_latest

 SET EXECUTABLE=^


Misc: Adjust local build script to use AnyCPU builds

--- buildRelease.cmd
+++ buildRelease.cmd
@@ -7,7 +7,7 @@

 build\nuget.exe restore
 REM build solution
-build\msbuild.bat . /p:Configuration=Release /p:Platform=x86
+build\msbuild.bat . /p:Configuration=Release /p:Platform="Any CPU"

 REM copy web overlays
 robocopy .\webOverlay .\build\Release\Files\Web /E


update build_script

update build_script

--- build_script.bat
+++ build_script.bat
@@ -4,7 +4,7 @@
 goto custom_python:

 :default_value_python:
-set pythonexe="c:\Python34_x64\python"
+set pythonexe="c:\Python35_x64\python"
 :custom_python:
 %pythonexe% -u setup.py build_script
 if %errorlevel% neq 0 exit /b %errorlevel%


update script

update script

--- build_script.bat
+++ build_script.bat
@@ -1,10 +1,13 @@
+@echo off
 if "%1"=="" goto default_value_python:
 set pythonexe="%1"
 %pythonexe% setup.py write_version
 goto custom_python:

 :default_value_python:
-set pythonexe="c:\Python36_x64\python"
+set pythonexe="c:\Python363_x64\python"
+if not exist %pythonexe% set pythonexe="c:\Python36_x64\python"
 :custom_python:
+@echo [python] %pythonexe%
 %pythonexe% -u setup.py build_script
 if %errorlevel% neq 0 exit /b %errorlevel%


commit info in release

commit info in release

--- push-release.bat
+++ push-release.bat
@@ -6,6 +6,7 @@
 echo PLATFORM %PLATFORM%
 echo APPVEYOR_BUILD_VERSION %APPVEYOR_BUILD_VERSION%
 echo APPVEYOR_REPO_COMMIT %APPVEYOR_REPO_COMMIT%
+echo APPVEYOR_REPO_COMMIT_MESSAGE  %APPVEYOR_REPO_COMMIT_MESSAGE%

 7z a %HERE%%CONFIGURATION%.zip %HERE%\src\bin\%CONFIGURATION%\*

@@ -13,8 +14,8 @@
                          --user pchalamet ^
                          --repo full-build ^
 						 --tag %APPVEYOR_BUILD_VERSION% ^
-						 --name "full-build %APPVEYOR_BUILD_VERSION%" ^
-                         --description "%APPVEYOR_PROJECT_NAME%-net45-anycpu %CONFIGURATION% %APPVEYOR_BUILD_VERSION%" ^
+						 --name "%APPVEYOR_PROJECT_NAME% %CONFIGURATION% %PLATFORM% %APPVEYOR_BUILD_VERSION%" ^
+                         --description "%APPVEYOR_REPO_COMMIT% %APPVEYOR_REPO_COMMIT_MESSAGE%" ^
                          --pre-release || goto :ko

 %HERE%tools/github-release.exe upload ^


Don't quote javacmd when setting it for -javahome option.

git-svn-id: e7d6bde23f017c9ff4efd468d79d66def666766b@1353 eae3c2d3-9b19-0410-a86e-396b6ccb6ab3

--- findbugs/bin/findbugs.bat
+++ findbugs/bin/findbugs.bat
@@ -8,8 +8,14 @@
 :: ----------------------------------------------------------------------
 set appjar=findbugsGUI.jar
 set jvmargs=-Xmx256m -Xss2m
+set javacmd=java
 set debugArg=
 set args=
+
+:: Honor JAVA_HOME environment variable if it is set
+if "%JAVA_HOME%"=="" goto nojavahome
+set javacmd=%JAVA_HOME%\bin\java
+:nojavahome

 goto loop

@@ -40,8 +46,11 @@
 if "%firstArg%"=="-jvmArgs" set jvmargs=%secondArg%
 if "%firstArg%"=="-jvmArgs" goto shift2

-if "%firstArg%"=="-debug" set debugArg="-Dfindbugs.debug=true"
+if "%firstArg%"=="-debug" set debugArg=-Dfindbugs.debug=true
 if "%firstArg%"=="-debug" goto shift1
+
+if "%firstArg%"=="-javahome" set javacmd=%secondArg%\bin\java
+if "%firstArg%"=="-javahome" goto shift2

 if "%firstArg%"=="-help" goto help

@@ -63,7 +72,7 @@
 :: echo appjar is %appjar%
 :: echo args is %args%
 :: echo jvmargs is %jvmargs%
-java %debugArg% "-Dfindbugs.home=%FINDBUGS_HOME%" %jvmargs% -jar "%FINDBUGS_HOME%\lib\%appjar%" %args%
+"%javacmd%" "%debugArg%" "-Dfindbugs.home=%FINDBUGS_HOME%" %jvmargs% -jar "%FINDBUGS_HOME%\lib\%appjar%" %args%
 goto end

 :: ----------------------------------------------------------------------
@@ -75,6 +84,7 @@
 echo    -gui            Use the Graphical UI (default behavior)
 echo    -textui         Use the Text UI
 echo    -jvmArgs args   Pass args to JVM
+echo    -javahome dir   Specify location of JRE
 echo    -help           Display this message
 echo    -debug          Enable debug tracing in FindBugs
 echo All other options are passed to the FindBugs application


fixed classpath for build.bat to match build.sh

git-svn-id: 7267684f36935cb3df12efc1f4c0216d758271d4@74722 13f79535-47bb-0310-9956-ffa450edef68

--- build/build.bat
+++ build/build.bat
@@ -15,8 +15,8 @@

 set CLASSPATH=%CLASSPATH%;.\lib\ant-1.3.jar;.\lib\ant-1.3-optional.jar
 set CLASSPATH=%CLASSPATH%;.\lib\xerces-1.3.0.jar
-set CLASSPATH=%CLASSPATH%;.\lib\Fop.class
-set CLASSPATH=%CLASSPATH%;.\lib\Xslt.class
+set CLASSPATH=%CLASSPATH%;.\lib\werken.xpath.jar
+set CLASSPATH=%CLASSPATH%;.\lib\antlr-runtime.jar

 %JAVA_HOME%\bin\java.exe org.apache.tools.ant.Main -buildfile %BUILDFILE% %1 %2 %3 %4 %5 %6 %7 %8 %9


config.bat added

config.bat added

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

--- config.bat
+++ config.bat
@@ -0,0 +1,52 @@
+@echo off
+set WS=F:\1-WORKSPACE
+set SVN_CLIENT=C:\Program Files\TortoiseSVN
+
+rem PARA KARMA
+setx FIREFOX_BIN "c:\Program Files (x86)\Mozilla Firefox\firefox.exe"
+setx CHROME_BIN "C:\Program Files (x86)\Google\Chrome\Application\chrome.exe"
+setx IE_BIN "c:\Program Files\Internet Explorer\iexplore.exe"
+
+rem GENERALES de java
+setx JDK_HOME "%WS%\Java\1.7.0.51"
+setx JAVA_HOME "%%JDK_HOME%%"
+setx ANT_HOME "%WS%\ant\1.9.2"
+setx MAVEN_HOME "%WS%\Maven\3.2.3"
+set PATH_TEMP="%%JAVA_HOME%%\bin;%%ANT_HOME%%\bin;%%MAVEN_HOME%%\bin"
+
+rem NODE
+set NODE_PATH=%WS%\NodeJs
+setx NODE_PATH "%WS%\NodeJs"
+setx NODE_MODULES "%%NODE_PATH%%\node_modules"
+rem setx PHANTOM_HOME %WS%\PhantomJs
+call %NODE_PATH%\npm c set prefix %NODE_PATH% -g
+call %NODE_PATH%\npm c set cache %NODE_PATH%\npm-cache -g
+set PATH_TEMP="%PATH_TEMP%;%%NODE_PATH%%"
+
+rem ANDROID
+setx ANDROID_HOME "%WS%"\android
+set PATH_TEMP="%PATH_TEMP%;%%ANDROID_HOME%%\tools"
+
+rem RUBY
+setx RUBY_PATH %WS%\Ruby\2.0.0p451
+set PATH_TEMP="%PATH_TEMP%;%%RUBY_PATH%%\bin"
+
+rem OTHERS:
+rem setx WEBIDE_JDK "%JDK_HOME%"
+
+setx GRAPHICSMAGICK %WS%\GraphicsMagick\1.3.19-Q16
+set PATH_TEMP="%PATH_TEMP%;%%GRAPHICSMAGICK%%"
+
+setx GIT_HOME %WS%\Git\msysgit\cmd
+set PATH_TEMP="%PATH_TEMP%;%%GIT_HOME%%"
+
+rem set PHP_HOME=f:\1-WORKSPACE\Servers\WAMP\bin\php\php5.4.12
+rem setx PHP_HOME "%PHP_HOME%"
+
+setx PATH "%PATH_TEMP%;%WS%\Lib;%SVN_CLIENT%\bin;"
+
+rem antes usaba esto:
+rem just the user variable
+rem for /F "tokens=2* delims= " %%f IN ('reg query "HKCU\Environment" /v Path ^| findstr /i path') do set OLD_SYSTEM_PATH=%%g
+rem setx.exe PATH "%OLD_SYSTEM_PATH%;%%NODE_PATH%%;%%NODE_MODULES%%;"
+


Deployment

Deployment

--- buildDocker.cmd
+++ buildDocker.cmd
@@ -17,6 +17,7 @@
     docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
     docker build -t bitunified/led-config-web-steps .
     docker push bitunified/led-config-web-steps
+    ssh root@192.168.16.4 'docker stop $(docker ps -a -q); docker pull bitunified/led-config-web-steps; docker run -i -p 8080:8080 bitunified/led-config-web-steps'
 else
     echo "No password"
 fi


example import script

example import script

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

--- dbexampledata/import_zips.bat
+++ dbexampledata/import_zips.bat
@@ -0,0 +1,3 @@
+REM Note: When you mongoimport the data, you will probably see a few duplicate key errors; this is to be expected, and will not prevent the mongoimport from working. There is also an issue with some versions of MongoDB 3.0 where it claims that 0 documents were mongoimported, when in fact there were 29,467 documents imported. You can verify this for yourself by going into the shell and counting the documents in the "test.zips" collection.
+
+mongoimport -d test -c zips --drop zips.json


added dependencies to build script

added dependencies to build script

--- buildapplet.bat
+++ buildapplet.bat
@@ -81,6 +81,13 @@
 copy %JYTHON_HOME%\Lib\posixpath.py %BUILD_DIR%\.
 copy %JYTHON_HOME%\Lib\bisect.py %BUILD_DIR%\.
 copy %JYTHON_HOME%\Lib\urllib.py %BUILD_DIR%\.
+copy %JYTHON_HOME%\Lib\codecs.py %BUILD_DIR%\.
+copy %JYTHON_HOME%\Lib\gzip.py %BUILD_DIR%\.
+copy %JYTHON_HOME%\Lib\zlib.py %BUILD_DIR%\.
+copy %JYTHON_HOME%\Lib\StringIO.py %BUILD_DIR%\.
+copy %JYTHON_HOME%\Lib\copy.py %BUILD_DIR%\.
+copy %JYTHON_HOME%\Lib\BaseHTTPServer.py %BUILD_DIR%\.
+copy %JYTHON_HOME%\Lib\SocketServer.py %BUILD_DIR%\.

 xcopy /S /I %JYTHON_HOME%\Lib\xml %BUILD_DIR%\xml
 xcopy /S /I %JYTHON_HOME%\Lib\encodings %BUILD_DIR%\encodings
@@ -99,5 +106,3 @@
 %JAVA_HOME%\bin\jarsigner.exe %APPNAME%.jar %APPNAME%

 cd ..
-
-pause


added batch for creating a new key

added batch for creating a new key

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

--- keys/generate_new_key.bat
+++ keys/generate_new_key.bat
@@ -0,0 +1,13 @@
+@ECHO OFF
+IF EXIST "C:\Program Files\Microsoft SDKs\Windows\v7.0\Bin\sn.exe" GOTO FOUND
+goto USEPATH
+
+:FOUND
+"C:\Program Files\Microsoft SDKs\Windows\v7.0\Bin\sn.exe" -k %~dp0\Google.ProtocolBuffers.snk
+GOTO EXIT
+
+:USEPATH
+sn.exe -k %~dp0\Google.ProtocolBuffers.snk
+GOTO EXIT
+
+:EXIT


added new helper batch script for Windows binary releases

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

--- scripts/batch_create_all_msvc_binary_buids.bat
+++ scripts/batch_create_all_msvc_binary_buids.bat
@@ -0,0 +1,88 @@
+@echo off
+set MRPT_BASE_DIR=mrpt-0.9.5
+
+set msvc9_DIR=d:\Program Files (x86)\Microsoft Visual Studio 9.0
+set msvc10_DIR=c:\Program Files (x86)\Microsoft Visual Studio 10.0
+set CMAKE_DIR=C:\Program Files (x86)\CMake 2.8\bin
+set LIBUSBDIR=D:\code\libusb-win32-bin-1.2.2.0
+
+REM msvc9 ========================
+set COMP=msvc9
+set ARCHN=32
+set KINECT=0
+call :subGen
+set KINECT=1
+call :subGen
+
+
+set COMP=msvc9
+set ARCHN=64
+set KINECT=0
+call :subGen
+set KINECT=1
+call :subGen
+
+REM msvc10 ========================
+set COMP=msvc10
+set ARCHN=32
+set KINECT=0
+call :subGen
+set KINECT=1
+call :subGen
+
+set COMP=msvc10
+set ARCHN=64
+set KINECT=0
+call :subGen
+set KINECT=1
+call :subGen
+
+goto End
+
+
+
+REM ===== Subroutine: Generate project dir ============
+:subGen
+
+if %COMP%==msvc9 set MSVC_DIR=%msvc9_DIR%
+if %COMP%==msvc10 set MSVC_DIR=%msvc10_DIR%
+if %COMP%==msvc9 set CMAKE_GEN=Visual Studio 9 2008
+if %COMP%==msvc10 set CMAKE_GEN=Visual Studio 10
+if %ARCHN%==64 set CMAKE_GEN=%CMAKE_GEN% Win64
+set ARCH=x%ARCHN%
+set DIR=%MRPT_BASE_DIR%-%COMP%-%ARCH%
+if %KINECT%==1 set DIR=%DIR%-kinect
+if %ARCHN%==32 set ARCH_NAME=x86
+if %ARCHN%==64 set ARCH_NAME=amd64
+set FFMPEGDIR=D:/code/ffmpeg-git-5501afa-win%ARCHN%-dev
+set WXDIR=D:/wxWidgets-2.9.2-win%ARCHN%-%COMP%
+if %ARCHN%==32 set WXLIBDIR=%WXDIR%/lib/vc_dll
+if %ARCHN%==64 set WXLIBDIR=%WXDIR%/lib/vc_amd64_dll
+
+mkdir %DIR%
+cd %DIR%
+set ALL_PARAMS=-DDISABLE_SWISSRANGER_3DCAM_LIBS=ON -DOpenCV_DIR=d:/code/opencv-%COMP%-%ARCH% -DMRPT_HAS_FFMPEG_WIN32=ON -DFFMPEG_WIN32_ROOT_DIR=%FFMPEGDIR% -DwxWidgets_ROOT_DIR=%WXDIR% -DwxWidgets_LIB_DIR=%WXLIBDIR%
+
+if %KINECT%==1 set ALL_PARAMS=%ALL_PARAMS% -DBUILD_KINECT=ON -DBUILD_KINECT_USE_FREENECT=ON -DLIBUSB_1_INCLUDE_DIR=%LIBUSBDIR%/include -DLIBUSB_1_LIBRARY=%LIBUSBDIR%/lib/msvc_%ARCH_NAME%/libusb.lib
+
+REM Create Project:
+echo on
+cmake ../%MRPT_BASE_DIR% -G "%CMAKE_GEN%" %ALL_PARAMS%
+
+REM and insist to make sure wxWidgets and other vars have been fixed:
+cmake . %ALL_PARAMS%
+echo off
+
+REM Create compilation script:
+echo SET PATH=C:\Windows\system32;C:\Windows;C:\Program Files\TortoiseSVN\bin;D:\code\opencv-%COMP%\bin\Release;D:\code\opencv-%COMP%\bin\Debug;%WXLIBDIR%;%FFMPEGDIR%;%LIBUSBDIR%\bin\%ARCH_NAME%;%CMAKE_DIR%;%CD%\bin\Release;%CD%\bin\Debug >> AUTOBUILD.bat
+echo call "%MSVC_DIR%\VC\vcvarsall.bat" %ARCH_NAME% >> AUTOBUILD.bat
+echo call ..\%MRPT_BASE_DIR%\scripts\automated_build_msvc_binary_package.bat ..\%MRPT_BASE_DIR%\ >> AUTOBUILD.bat
+
+cd ..
+
+REM End of Subroutine
+GOTO :EOF
+
+
+REM =========== The END ===========
+:End


correct new server repo paths

correct new server repo paths

--- misc/setup/windows/addStandardModules.bat
+++ misc/setup/windows/addStandardModules.bat
@@ -1,8 +1,8 @@
-git submodule add git+ssh://git@intern.far.in.tum.de:Ubitrack/utCore.git modules/utcore
-git submodule add git+ssh://git@intern.far.in.tum.de:Ubitrack/utVision.git modules/utvision
-git submodule add git+ssh://git@intern.far.in.tum.de:Ubitrack/utComponents.git modules/utcomponents
-git submodule add git+ssh://git@intern.far.in.tum.de:Ubitrack/utVisionComponents.git modules/utvisioncomponents
-git submodule add git+ssh://git@intern.far.in.tum.de:Ubitrack/utDataflow.git modules/utdataflow
-git submodule add git+ssh://git@intern.far.in.tum.de:Ubitrack/utFacade.git modules/utfacade
-git submodule add git+ssh://git@intern.far.in.tum.de:Ubitrack/utVisualization.git modules/utvisualization
-git submodule add git+ssh://git@intern.far.in.tum.de:UbitrackContrib/DirectShowDriver.git modules/mswindows+git submodule add git@intern.far.in.tum.de:Ubitrack/utCore.git modules/utcore
+git submodule add git@intern.far.in.tum.de:Ubitrack/utVision.git modules/utvision
+git submodule add git@intern.far.in.tum.de:Ubitrack/utComponents.git modules/utcomponents
+git submodule add git@intern.far.in.tum.de:Ubitrack/utVisionComponents.git modules/utvisioncomponents
+git submodule add git@intern.far.in.tum.de:Ubitrack/utDataflow.git modules/utdataflow
+git submodule add git@intern.far.in.tum.de:Ubitrack/utFacade.git modules/utfacade
+git submodule add git@intern.far.in.tum.de:Ubitrack/utVisualization.git modules/utvisualization
+git submodule add git@intern.far.in.tum.de:UbitrackContrib/DirectShowDriver.git modules/mswindows


Added Compile And Copy batch file, this will compile trans and move it into the bin folder


Needed to adjust schema path in script

Needed to adjust schema path in script

--- start_blockserver_cmd.bat
+++ start_blockserver_cmd.bat
@@ -19,4 +19,4 @@

 set MYDIRVC=%MYDIRBLOCK%..\..\ConfigVersionControl\master

-%PYTHONW% %MYDIRBLOCK%BlockServer\block_server.py -od %MYDIRBLOCK%..\..\..\iocstartup -sd .\schema\ -cd %ICPCONFIGROOT% -pv %GWBLOCK_PVLIST% -f ISIS
+%PYTHONW% %MYDIRBLOCK%BlockServer\block_server.py -od %MYDIRBLOCK%..\..\..\iocstartup -sd %MYDIRBLOCK%\schema\ -cd %ICPCONFIGROOT% -pv %GWBLOCK_PVLIST% -f ISIS


God, batch programming sucks so hard.

God, batch programming sucks so hard.

--- cmd/SetupEnv.cmd
+++ cmd/SetupEnv.cmd
@@ -9,9 +9,10 @@
 SET SETUPENV=YES

 REM Because I'm tired of forgetting this
-DOSKEY ls=dir
-DOSKEY man=help
-DOSKEY which=where
+DOSKEY clear=cls
+DOSKEY ls=dir $*
+DOSKEY man=help $*
+DOSKEY which=where $*

 REM Add alias for Sublime Text
 SET SUBLREGPATH=HKLM\Software\Microsoft\Windows\CurrentVersion\Uninstall\Sublime Text 2_is1
@@ -19,8 +20,8 @@
 REG QUERY "%SUBLREGPATH%" /v InstallLocation > NUL 2>&1
 IF NOT ERRORLEVEL 1 (
     FOR /F "tokens=2*" %%a IN ('REG QUERY "%SUBLREGPATH%" /v InstallLocation ^| FINDSTR /R "[a-z]:\\.*\\$"') DO @SET SUBLDIRPATH=%%b
-    DOSKEY subl="%SUBLDIRPATH%%SUBLBINNAME%" $*
 ) ELSE (
     IF DEFINED VERBOSE ECHO Couldn't locate Sublime Text install; not adding 'subl' alias.
 )
+IF DEFINED SUBLDIRPATH DOSKEY subl="%SUBLDIRPATH%%SUBLBINNAME%" $*
 FOR /F "delims==" %%i IN ('SET SUBL') DO @SET %%i=


Suppress anoying Terminate batch job prompt when hitting CTRL+C. Note however that it leaves the file named yes in the bin directory

git-svn-id: 79cef5a5a257cc9dbe40a45ac190115b4780e2d0@922223 13f79535-47bb-0310-9956-ffa450edef68

--- bin/catalina.bat
+++ bin/catalina.bat
@@ -77,6 +77,17 @@
 rem
 rem $Id$
 rem ---------------------------------------------------------------------------
+
+rem Suppress Terminate batch job on CTRL+C
+if not ""%1"" == ""run"" goto mainEntry
+if exist "%~dp0run" goto mainEntry
+echo Y >"%~dp0run"
+echo Y >"%~dp0yes"
+call "%~dpnx0" %* <"%~dp0yes"
+rem Not actually needed
+exit /B 1
+:mainEntry
+del /Q "%~dp0run" >NUL 2>&1

 rem Guess CATALINA_HOME if not defined
 set "CURRENT_DIR=%cd%"


build-support/factor.cmd: cleanups recommended by mnestic

--- build-support/factor.cmd
+++ build-support/factor.cmd
@@ -1,51 +1,41 @@
 @echo off
+setlocal
+
+if "%1"=="/?" (
+    goto usage
+) else if "%1"=="" (
+    set _bootimage_version=latest
+) else if "%1"=="latest" (
+    set _bootimage_version=latest
+) else if "%1"=="clean" (
+    set _bootimage_version=clean
+) else goto usage
+
 if not exist Nmakefile goto wrongdir

 call cl 2>&1 | find "x86" >nul
-if not errorlevel 1 goto cl32
-
-call cl 2>&1 | find "x64" >nul
-if not errorlevel 1 goto cl64
-
-goto nocl
-
-:cl32
-echo x86-32 cl.exe detected.
-set _target="x86-32"
-set _bootimage="boot.winnt-x86.32.image"
-goto platformdefined
-
-:cl64
-echo x86-64 cl.exe detected.
-set _target="x86-64"
-set _bootimage="boot.winnt-x86.64.image"
-goto platformdefined
-
-:nocl
-echo Unable to detect cl.exe target platform.
-echo Make sure you're running within the Visual Studio or Windows SDK environment.
-goto cleanup
-
-:platformdefined
-
-if "%1"=="/?" goto usage
-
-if "%1"=="" (
-    set _bootimage_version="latest"
-    set _git_branch=master
-)
-if "%1"=="latest" (
-    set _bootimage_version="latest"
-    set _git_branch=master
-)
-if "%1"=="clean" (
-    set _bootimage_version="clean"
-    set _git_branch=clean-winnt-%_target%
+if not errorlevel 1 (
+    echo x86-32 cl.exe detected.
+    set _target=x86-32
+    set _bootimage=boot.winnt-x86.32.image
+) else (
+    call cl 2>&1 | find "x64" >nul
+    if not errorlevel 1 (
+        echo x86-64 cl.exe detected.
+        set _target=x86-64
+        set _bootimage=boot.winnt-x86.64.image
+    ) else goto nocl
 )

-if not defined _bootimage_version goto usage
+if %_bootimage_version%==clean (
+    set _git_branch=clean-winnt-%_target%
+    set _bootimage_path=clean/winnt-%_target%
+) else (
+    set _git_branch=master
+    set _bootimage_path=latest
+)

-echo Updating working copy...
+echo Updating working copy from %_git_branch%...
 call git pull http://factorcode.org/git/factor.git %_git_branch%
 if errorlevel 1 goto fail

@@ -56,27 +46,32 @@
 if errorlevel 1 goto fail

 echo Fetching %_bootimage_version% boot image...
-cscript /nologo build-support\http-get.vbs http://factorcode.org/images/%_bootimage_version%/%_bootimage% %_bootimage%
+cscript /nologo build-support\http-get.vbs http://factorcode.org/images/%_bootimage_path%/%_bootimage% %_bootimage%
 if errorlevel 1 goto fail

 echo Bootstrapping...
 .\factor.com -i=%_bootimage%
 if errorlevel 1 goto fail

-echo Copying fresh factor.image to factor.image.fresh
+echo Copying fresh factor.image to factor.image.fresh.
 copy factor.image factor.image.fresh
 if errorlevel 1 goto fail

 echo Build complete.
-goto cleanup
+goto :EOF

 :fail
 echo Build failed.
-goto cleanup
+goto :EOF

 :wrongdir
 echo build-support\factor.cmd must be run from the root of the Factor source tree.
-goto cleanup
+goto :EOF
+
+:nocl
+echo Unable to detect cl.exe target platform.
+echo Make sure you're running within the Visual Studio or Windows SDK environment.
+goto :EOF

 :usage
 echo Usage: build-support\factor.cmd [latest/clean]
@@ -88,10 +83,5 @@
 echo     If clean is specified, then the working copy is updated to the
 echo     upstream "clean-winnt-*" branch corresponding to the current
 echo     platform and the corresponding boot image is downloaded.
-goto cleanup
+goto :EOF

-:cleanup
-set _target=
-set _bootimage=
-set _bootimage_version=
-set _git_branch=


second fix for the building script

second fix for the building script

--- build_setup_help_on_windows.bat
+++ build_setup_help_on_windows.bat
@@ -1,8 +1,5 @@
-rem we remove everything from dist
-echo off
-del /Q dist\*.*
-
-rem unittests with python 3.4
+echo on
+IF EXIST dist del /Q dist\*.*

 IF NOT EXIST c:\Python34 GOTO checkinstall64:

@@ -28,7 +25,7 @@

 :nextb:
 IF EXIST c:\Python34_64vir\install GOTO fullsetupb:
-c:\Python34\Scripts\virtualenv c:\Python34_64vir\install --system-site-packages
+c:\Python34_x64\Scripts\virtualenv c:\Python34_64vir\install --system-site-packages
 if %errorlevel% neq 0 exit /b %errorlevel%

 :fullsetupb:
@@ -37,25 +34,24 @@
 if %errorlevel% neq 0 exit /b %errorlevel%
 echo #######################################################

-:utpy34:
-IF NOT EXIST c:\Python34 GOTO utpy33_64:
-set pythonexe="c:\Python34\python"
+:utpy34_64:
+set pythonexe="c:\Python34_x64\python"
 %pythonexe% -u setup.py clean_space
 if %errorlevel% neq 0 exit /b %errorlevel%
 %pythonexe% -u setup.py unittests
 if %errorlevel% neq 0 exit /b %errorlevel%
 echo #######################################################

-:utpy33_64:
-IF NOT EXIST c:\Python33_x64 GOTO utpy33:
+:setup33_64:
+IF NOT EXIST c:\Python33_x64 GOTO setup33:
 set pythonexe="c:\Python33_x64\python"
 %pythonexe% clean_pyd.py
 %pythonexe% setup.py build bdist_wininst --plat-name=win-amd64
 if %errorlevel% neq 0 exit /b %errorlevel%
 echo #######################################################

-:utpy33:
-IF NOT EXIST c:\Python33 GOTO utpy34_64:
+:setup33:
+IF NOT EXIST c:\Python33 GOTO setup34_64:
 set pythonexe="c:\Python33\python"
 %pythonexe% clean_pyd.py
 %pythonexe% setup.py sdist --formats=gztar,zip --verbose
@@ -64,7 +60,7 @@
 if %errorlevel% neq 0 exit /b %errorlevel%
 echo #######################################################

-:utpy34_64:
+:setup34_64:
 set pythonexe="c:\Python34_x64\python"
 %pythonexe% clean_pyd.py
 %pythonexe% setup.py build bdist_wininst --plat-name=win-amd64


Update diydoge.bat

Update diydoge.bat

--- bin/diydoge.bat
+++ bin/diydoge.bat
@@ -21,37 +21,31 @@
 %curl_cmd% -3sSLO "https://github.com/thegoddambatman/diy-dogecoin-digger/raw/master/bin/pooler-cpuminer-2.3.3-win32.zip"
 %curl_cmd% -3sSLO "https://github.com/thegoddambatman/diy-dogecoin-digger/raw/master/conf/p2p.conf"

-REM Even though we test for 64-bit, it just matters for file paths.
-REM We're not actually using 64-bit for anything. TODO.
+:unzip_the_things
+REM This can get confusing, since x86 indicates we are actually on a 64-bit machine.
+REM It'll be important when we actually support the 64-bit CPU miner.
+if exist "%ProgramFiles%\7-zip\7z.exe" goto :unzip_cpuminer
+if exist "%ProgramFiles(x86)%\7-zip\7z.exe" goto :unzip_cpuminer_64
+goto :install_7bit

-if exist "%ProgramFiles(x86)%" goto :64bit
-echo [*] 32-bit system detected...
-if exist "%ProgramFiles%\7-zip\7z.exe" goto :unzip_cpuminer
-echo [*] Installing 7-Bit....
-
+:install_7bit
+echo [*] Fetching 7-Zip...
 %curl_cmd% -3sSLO "https://github.com/thegoddambatman/diy-dogecoin-digger/raw/master/bin/7z920.msi"
 7z920.msi /quiet /passive
+
+if exist "%ProgramFiles%\7-zip\7z.exe" goto :unzip_cpuminer
+if exist "%ProgramFiles(x86)%\7-zip\7z.exe" goto :unzip_cpuminer_64
+goto :missing_7zip_installer

 :unzip_cpuminer
 echo [*] Unzipping cpuminer...
 "%ProgramFiles%\7-zip\7z.exe" e -y pooler-cpuminer-2.3.3-win32.zip
 goto :start_miner

-:64bit
-
-echo [*] 64-bit detected...
-
-:test_for_7z_64
-if exist "%ProgramFiles%\7-zip\7z.exe" goto :unzip_cpuminer_64
-if exist "%ProgramFiles(x86)%\7-zip\7z.exe" goto :unzip_cpuminer_64
-
-echo [*] Installing 7-Bit....
-%curl_cmd% -3sSLO "https://github.com/thegoddambatman/diy-dogecoin-digger/raw/master/bin/7z920.msi"
-7z920.msi /quiet /passive
-
 :unzip_cpuminer_64
 echo [*] Unzipping cpuminer...
 "%ProgramFiles(x86)%\7-zip\7z.exe" e -y pooler-cpuminer-2.3.3-win32.zip
+goto :start_miner

 :start_miner
 echo [*] All right, let's get mining!
@@ -59,6 +53,12 @@
 goto :end

 :missing_curl_installer
-echo [*] Missing curl installer. Did you download it?
+echo [*] Missing curl installer. Try getting it yourself, from:
 echo [*] https://raw.githubusercontent.com/thegoddambatman/diy-dogecoin-digger/master/bin/curl-7.35.0-win32-local-fix1.msi
 :end
+
+:missing_7zip_installer
+echo [*] 7-Zip installation failed. Try installing it yourself, from:
+echo [*] https://github.com/thegoddambatman/diy-dogecoin-digger/raw/master/bin/7z920.msi
+goto :end
+


Windows add a batch file that can repair a broken Vmware installation

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

--- windows/repair.cmd
+++ windows/repair.cmd
@@ -0,0 +1 @@
+.\VMware-workstation-full-16.2.1-18811642.exe /s /v "EULAS_AGREED=1 REINSTALLMODE=vomus /qn"


Added nuget package creation script.

Added nuget package creation script.

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

--- createNuget.bat
+++ createNuget.bat
@@ -0,0 +1,161 @@
+@echo off
+
+echo Started creating ortc nuget package...
+
+set failure=0
+set powershell_path=%SYSTEMROOT%\System32\WindowsPowerShell\v1.0\powershell.exe
+set PROGFILES=%ProgramFiles%
+if not "%ProgramFiles(x86)%" == "" set PROGFILES=%ProgramFiles(x86)%
+set MSVCDIR="%PROGFILES%\Microsoft Visual Studio 14.0"
+set nuget=bin\nuget.exe
+set SOLUTIONPATH=winrt\projects\ortc-lib-sdk-win.vs2015.sln
+set nugetBasePath=winrt\nuget
+set nugetPath=%nugetBasePath%\package
+set nugetSpec=%nugetPath%\org.ortc.nuspec
+
+
+if NOT EXIST %nuget% (
+	echo Nuget donwload started
+	call:downloadNuget
+	if "%failure%" neq "0" goto:eof
+)
+
+if NOT EXIST %MSVCDIR% (
+    set MSVCDIR="%PROGFILES%\Microsoft Visual Studio 12.0"
+)
+
+if NOT EXIST %MSVCDIR% (
+    call:failure 1 "Microsoft Visual Studio 12.0 or 14.0 is not installed."
+	goto:eof
+)
+
+::call:buildProjects x86
+::if "%failure%" neq "0" goto:eof
+
+::call:buildProjects x64
+::if "%failure%" neq "0" goto:eof
+
+::call:buildProjects ARM
+::if "%failure%" neq "0" goto:eof
+
+call:preparePackage
+if "%failure%" neq "0" goto:eof
+
+call:makeNuget
+
+goto:eof
+
+:downloadNuget
+%powershell_path% "Start-BitsTransfer https://dist.nuget.org/win-x86-commandline/latest/nuget.exe -Destination bin\nuget.exe"
+
+if ERRORLEVEL 1 call:failure %errorlevel% "Could not download nuget.exe"
+goto:eof
+
+:buildProjects
+call %MSVCDIR%\VC\vcvarsall.bat %1
+if ERRORLEVEL 1 call:failure %errorlevel% "Could not setup %1 compiler"
+
+MSBuild %SOLUTIONPATH% /t:api\org_ortc\org_ortc /property:Configuration=Release /property:Platform=%1
+if %errorlevel% neq 0 call:failure %errorlevel% "Building org.ortc projects has failed"
+
+goto:eof
+
+:preparePackage
+
+set nugetTargetPath=%nugetBasePath%\org.ortc.targets
+set nugetSpecPath=%nugetBasePath%\org.ortc.nuspec
+
+set nugetBuildPath=%nugetPath%\build
+set nugetBuildNativePath=%nugetBuildPath%\native
+set nugetBuildNetCorePath=%nugetBuildPath%\netcore45
+set nugetBuildNetCorex86Path=%nugetBuildNetCorePath%\x86
+set nugetBuildNetCorex64Path=%nugetBuildNetCorePath%\x64
+set nugetBuildNetCoreARMPath=%nugetBuildNetCorePath%\arm
+
+set nugetLibPath=%nugetPath%\lib
+set nugetLibNetCorePath=%nugetLibPath%\netcore45
+set nugetLibUAPPath=%nugetLibPath%\uap10.0
+
+set nugetRuntimesPath=%nugetPath%\runtimes
+set nugetRuntimesx86Path=%nugetRuntimesPath%\win10-x86\native
+set nugetRuntimesx64Path=%nugetRuntimesPath%\win10-x64\native
+set nugetRuntimesARMPath=%nugetRuntimesPath%\win10-arm\native
+
+set sourcex86Path=winrt\Build\x86\Release\org.ortc
+set sourcex86DllPath=%sourcex86Path%\org.ortc.dll
+set sourcex86WinmdPath=%sourcex86Path%\org.ortc.winmd
+set sourcex86PdbPath=%sourcex86Path%\org.ortc.pdb
+
+set sourcex64Path=winrt\Build\x64\Release\org.ortc
+set sourcex64DllPath=%sourcex64Path%\org.ortc.dll
+set sourcex64WinmdPath=%sourcex64Path%\org.ortc.winmd
+set sourcex64PdbPath=%sourcex64Path%\org.ortc.pdb
+
+set sourcexARMPath=winrt\Build\ARM\Release\org.ortc
+set sourcexARMDllPath=%sourcexARMPath%\org.ortc.dll
+set sourcexARMWinmdPath=%sourcexARMPath%\org.ortc.winmd
+set sourcexARMPdbPath=%sourcexARMPath%\org.ortc.pdb
+
+
+call:createFolder %nugetPath%
+if "%failure%" neq "0" goto:eof
+
+call::copyFiles %sourcexARMDllPath% %nugetRuntimesARMPath%
+if "%failure%" neq "0" goto:eof
+
+call::copyFiles %sourcex64DllPath% %nugetRuntimesx64Path%
+if "%failure%" neq "0" goto:eof
+
+call::copyFiles %sourcex86DllPath% %nugetRuntimesx86Path%
+if "%failure%" neq "0" goto:eof
+
+call::copyFiles %sourcex86WinmdPath% %nugetLibUAPPath%
+if "%failure%" neq "0" goto:eof
+
+call::copyFiles %nugetTargetPath% %nugetBuildNativePath%
+if "%failure%" neq "0" goto:eof
+
+call:copyFiles %nugetSpecPath% %nugetPath%
+if "%failure%" neq "0" goto:eof
+
+goto:eof
+
+:makeNuget
+
+%nuget% pack %nugetSpec% -OutputDirectory %nugetBasePath%\Output
+if ERRORLEVEL 1 call:failure %errorlevel% "Failed creating the org.ortc nuget package"
+
+goto:eof
+:copyFiles
+if EXIST %1 (
+	call:createFolder %2
+	echo Copying %1 to %2
+	copy %1 %2
+	if ERRORLEVEL 1 call:failure %errorlevel% "Could not copy a %1"
+) else (
+	call:failure 1 "Could not copy a %1"
+)
+goto:eof
+
+:createFolder
+if NOT EXIST %1 (
+	mkdir %1
+	if ERRORLEVEL 1 call:failure %errorlevel% "Could not make a directory %1"
+)
+goto:eof
+:failure
+echo.
+
+echo ERROR: %~2
+
+echo.
+echo FAILURE: Could not create a nuget package.
+
+set failure=%~1
+
+goto:eof
+
+:done
+echo.
+echo Success: ORTC nuget package is created.
+echo.


cury-batch: add the batch file

cury-batch: add the batch file

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

--- curly-batch.bat
+++ curly-batch.bat
@@ -0,0 +1,9 @@
+REM custom settings for windows shell
+
+REM set some macros/aliases
+DOSKEY ls=dir /B $*
+DOSKEY l=dir /B $*
+DOSKEY edit="C:\Program Files (x86)\Notepad++\notepad++.exe" $*
+DOSKEY s=cd ..
+DOSKEY cp=copy $*
+DOSKEY vi=vim $*


Don't try to remove directories that don't exist

--- build/Build.bat
+++ build/Build.bat
@@ -91,14 +91,15 @@

 ReplaceIISExpressPortNumber.exe ..\src\Umbraco.Web.UI\Umbraco.Web.UI.csproj %RELEASE%

-ECHO.
-ECHO Removing the belle build folder and bower_components folder to make sure everything is clean as a whistle
-RD ..\src\Umbraco.Web.UI.Client\build /Q /S
-RD ..\src\Umbraco.Web.UI.Client\bower_components /Q /S
+IF EXIST ..\src\Umbraco.Web.UI.Client\bower_components (
+	ECHO.
+	ECHO Removing the bower_components folder to make sure everything is clean as a whistle
+	RD ..\src\Umbraco.Web.UI.Client\bower_components /Q /S
+)

 ECHO.
 ECHO Removing existing built files to make sure everything is clean as a whistle
-RMDIR /Q /S _BuildOutput
+RMDIR /Q /S _BuildOutput 2>NUL
 DEL /F /Q UmbracoCms.*.zip 2>NUL
 DEL /F /Q UmbracoExamine.*.zip 2>NUL
 DEL /F /Q UmbracoCms.*.nupkg 2>NUL


Update install.cmd

Update install.cmd

--- Content/install.cmd
+++ Content/install.cmd
@@ -6,4 +6,4 @@
     rm -f wp-cli.phar
 )

-curl -O https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar
+curl -sS https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar


PR: MNG-1317

PR: MNG-1317

Use ~dp0 since ~dps0 is broken, and add double
quotes since the path now can contain spaces.

git-svn-id: 2c527eb49caa05e19d6b2be874bf74fa9d7ea670@382797 13f79535-47bb-0310-9956-ffa450edef68

--- maven-core/src/bin/m2.bat
+++ maven-core/src/bin/m2.bat
@@ -20,5 +20,5 @@
 echo THE m2 COMMMAND IS DEPRECATED - PLEASE RUN mvn INSTEAD
 echo.

-%~dps0\mvn %*
+"%~dp0\mvn" %*


produce statically linked executables

produce statically linked executables

--- build_pvpgn.bat
+++ build_pvpgn.bat
@@ -264,6 +264,14 @@
 if exist "%PVPGN_BUILD%CMakeCache.txt" del %PVPGN_BUILD%CMakeCache.txt

 if [%CHOICE_INTERFACE%]==[1] ( set _with_gui=false) else ( set _with_gui=true)
+
+:: make .exe statically linked
+if "%PARAM_BUILDTYPE%"=="Debug" (
+	set CMAKE_MT_FLAG=CMAKE_CXX_FLAGS_DEBUG="/MTd"
+) else (
+	set CMAKE_MT_FLAG=CMAKE_CXX_FLAGS_RELEASE="/MT"
+)
+set CMAKE_VARS=%CMAKE_VARS% -D %CMAKE_MT_FLAG%

 :: configure and generate solution
 call %EXEC_TOOL% cmake.exe -Wno-dev -G "%GENERATOR%" -D ZLIB_INCLUDE_DIR=%ZLIB_PATH% -D ZLIB_LIBRARY=%ZLIB_PATH%zdll.lib %CMAKE_VARS% -D CMAKE_CONFIGURATION_TYPES="Debug;Release" -D CMAKE_SUPPRESS_REGENERATION=true -D WITH_WIN32_GUI=%_with_gui% -H%PVPGN_SOURCE% -B%PVPGN_BUILD% %_cmake_log%
@@ -379,7 +387,6 @@
 if not exist "%PVPGN_RELEASE%files" mkdir "%PVPGN_RELEASE%files"
 @copy /Y "%PVPGN_SOURCE%files" "%PVPGN_RELEASE%files"
 @del "%PVPGN_RELEASE%files\CMakeLists.txt"
-@del "%PVPGN_RELEASE%files\Makefile.am"

 :: copy i18n and lua files with subdirectories
 @xcopy /E /R /K /Y "%PVPGN_SOURCE%conf\i18n" "%PVPGN_RELEASE%conf\i18n\"


Try recommended fix for the nuget restore on the csproj

Kudus to the team for the help

--- deploy.cmd
+++ deploy.cmd
@@ -93,7 +93,7 @@
 :: 3. Run DNU Restore, Nuget restore for specific projects
 call %DNX_RUNTIME%\bin\dnu restore "%DEPLOYMENT_SOURCE%" %SCM_DNU_RESTORE_OPTIONS%
 IF !ERRORLEVEL! NEQ 0 goto error
-call :ExecuteCmd nuget restore "%DEPLOYMENT_SOURCE%\NotificationsProcessor\NotificationsProcessor.csproj"
+call :ExecuteCmd nuget restore "%DEPLOYMENT_SOURCE%\NotificationsProcessor\packages.config" -SolutionDirectory "%DEPLOYMENT_SOURCE%"
 IF !ERRORLEVEL! NEQ 0 goto error

 :: 4. Run Our Custom build steps:


update deploy.cmd

update deploy.cmd

--- deploy.cmd
+++ deploy.cmd
@@ -101,6 +101,7 @@
 IF EXIST "%DEPLOYMENT_TARGET%\package.json" (
   pushd "%DEPLOYMENT_TARGET%"
   call :ExecuteCmd !NPM_CMD! install --production
+  call :ExecuteCmd !NPM_CMD! install typescript
   IF !ERRORLEVEL! NEQ 0 goto error
   popd
 )


update rake

update rake

--- deploy.cmd
+++ deploy.cmd
@@ -98,7 +98,6 @@

   PUSHD "%DEPLOYMENT_TARGET%"

-  %JRUBY_EXE% -S gem uninstall rake
   %JRUBY_EXE% -S "%JRUBY_BUNDLER_CMD%" install --without development:test --path vendor/bundle --binstubs vendor/bundle/bin -j4 --deployment
   IF !ERRORLEVEL! NEQ 0 goto error

@@ -108,6 +107,7 @@
 PUSHD "%DEPLOYMENT_TARGET%"
 SET RAILS_ENV=production
 echo Precompiling assets in %cd%
+%JRUBY_EXE% -S "%JRUBY_BUNDLER_CMD%" update rake
 %JRUBY_EXE% -S rake assets:precompile
 POPD


remove trailing whitespace

remove trailing whitespace

--- generators/server/templates/npmw.cmd
+++ generators/server/templates/npmw.cmd
@@ -17,7 +17,7 @@
 )

 if not exist %NPM_EXE% (
-  call %INSTALL_NPM_COMMAND%
+  call %INSTALL_NPM_COMMAND%
 )

 if exist %NODE_EXE% (


Stopped reporting of files deleted by piping to NUL:.


Adding shared extensions to distribution command file

--- win32/makedist.cmd
+++ win32/makedist.cmd
@@ -10,6 +10,8 @@
 copy \php4\php4ts.dll php4
 copy \php4\php4isapi.dll php4
 copy \php4\php_gtk.dll php4
+copy \php4\php_gtk_libglade.dll php4
+copy \php4\php_gtk_sqpane.dll php4
 copy \php\php4\php.ini-dist winnt\php.ini
 copy %SystemRoot%\system32\gtk-1.3.dll winnt\system32
 copy %SystemRoot%\system32\gdk-1.3.dll winnt\system32


Added gateway tool to install SharpBattleNet into server selection of various games.

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

--- Tools/InstallGateways.bat
+++ Tools/InstallGateways.bat
@@ -0,0 +1,345 @@
+@echo off
+:: Universal Battle.net Gateway Installer v1.0
+:: https://github.com/HarpyWar/battle.net-gateway-installer
+::
+:: (c) 2012, HarpyWar (http://harpywar.com)
+
+
+:: -- CONFIGURATION START --
+
+
+	:: server connection
+	::
+	set title=Your Server Name
+	set address=localhost
+	set timezone=1
+
+
+	:: games to setup in the registry (true or false)
+	::
+	set starcraft=true
+	set warcraft3=true
+	set diablo2=false
+
+
+:: --  CONFIGURATION END  --
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+set HKCU=HKEY_CURRENT_USER\Software
+
+set starcraft_title=Starcraft
+set starcraft_path=%HKCU%\Battle.net\Configuration
+set starcraft_key=Battle.net Gateways
+
+set warcraft3_title=Warcraft 3
+set warcraft3_path=%HKCU%\Blizzard Entertainment\Warcraft III
+set warcraft3_key=%starcraft_key%
+
+set diablo2_title=Diablo 2
+set diablo2_path=%starcraft_path%
+set diablo2_key=Diablo II Battle.net Gateways
+set diablo2_bnetip=%HKCU%\Blizzard Entertainment\Diablo II
+
+
+TITLE Universal Battle.net Gateway Installer
+color 9f
+echo  - - - - - - - - - - - - - - - - - - - - -
+echo.
+echo   UNIVERSAL BATTLE.NET GATEWAY INSTALLER
+echo.
+echo  - - - - - - - - - - - - - - - - - - - - -
+echo.
+echo.
+echo       Title: %title%
+echo     Address: %address%
+echo    Timezone: %timezone%
+echo.
+
+if %starcraft%==true call :addserver "starcraft_path" "starcraft_key" "starcraft_title"
+if %warcraft3%==true call :addserver "warcraft3_path" "warcraft3_key" "warcraft3_title"
+if %diablo2%==true (
+	call :addserver "diablo2_path" "diablo2_key" "diablo2_title"
+	call :updatebnetip "diablo2_bnetip" "diablo2_title"
+)
+
+
+echo.
+echo.
+echo.
+
+pause
+goto :eof
+
+
+
+
+:: add server to registry in the game serverlist
+:addserver <registryPath> <registryKey> <gameTitle>
+    setlocal EnableDelayedExpansion
+
+	set reg_path=!%~1!
+	set reg_key=!%~2!
+	set game_title=!%~3!
+
+	echo.
+	echo [%game_title%]
+
+	:: -- STEP 1 -- (read parameter from registry)
+
+	set /a line_count=0
+
+	:: search parameter in the registry and get cmd output result with a line delimeter "*"
+	set cmd=REG QUERY "%reg_path%" /v "%reg_key%"
+	FOR /F "delims=" %%i IN ('%cmd%') DO if ("!out!"=="") (set out=%%i) else (set /a line_count+=1 & set out=!out!*%%i)
+
+	:: if parameter found in the registry then append serverlist
+	if %line_count% == 2 (
+		for /F "tokens=1,2,3 delims=*" %%a in ("%out%") do set multistr=%%b
+		rem echo !multistr!
+
+		:: get start position
+		call :strlen start "reg_key"
+		:: spaces
+		set /a start+=8
+
+		:: get row type (REG_MULTI_SZ or REG_BINARY)
+		call :substr _type !start! 10 "multistr"
+		if "!_type!"=="REG_BINARY" (
+			set /a start+=10
+		) else (
+			set /a start+=12
+		)
+
+		:: spaces
+		set /a start+=4
+		rem echo !start!
+
+		:: get all result text length
+		call :strlen len "multistr"
+		set /a len-=!start!
+		rem echo !len!
+
+		:: get multistring data
+		call :substr _substr !start! !len! "multistr"
+		set serverlist=!_substr!
+
+
+		:: if serverslist in binary format then convert it to ascii
+		if "!_type!"=="REG_BINARY" (
+			rem echo BINARY data detected!
+			:: convert hex to string
+			call :hex2ascii serverlist
+
+			:: remove \0\0 at the end
+			set serverlist=!serverlist:~0,-4!
+
+			:: delete binary key from the registry
+			rem set cmd=REG DELETE "%reg_path%" /v "%reg_key%" /f
+			rem for /f "delims=" %%i in ('!cmd!') do set out=%%i
+		)
+	) else (
+		set serverlist=1001\000
+	)
+
+	rem echo !serverlist!
+
+	:: -- STEP 2 -- (add parameter into registry)
+
+	set isfound=0
+	:: find server in the serverlist
+	for /f "delims=" %%i in ('echo "!serverlist!" ^| find "%address%"') do set isfound=%%i
+
+	:: if server not found then add it
+	if %isfound% equ 0 (
+		set serverlist=!serverlist!\0%address%\0%timezone%\0%title%
+
+		:: select this server
+		rem echo !serverlist!
+		call :servercount count "serverlist"
+		call :selectserver !count! "serverlist"
+		rem echo !serverlist!
+
+		set cmd=REG ADD "%reg_path%" /v "%reg_key%" /f /t REG_MULTI_SZ /d "!serverlist!"
+		for /f "delims=" %%i in ('!cmd!') do set out=%%i
+		rem echo !out!
+		echo   Server was added
+	) else (
+		echo   Server is already exists
+	)
+
+	endlocal
+	exit /b
+
+
+:: update bnetip key (needed for diablo 2)
+:updatebnetip <registryPath>
+    setlocal EnableDelayedExpansion
+
+	set reg_path=!%~1!
+	set reg_key=BNETIP
+	set game_title=!%~2!
+
+	set cmd=REG ADD "%reg_path%" /v "%reg_key%" /f /t REG_SZ /d "%address%"
+	for /f "delims=" %%i in ('!cmd!') do set out=%%i
+	rem echo %out%
+	echo   Gateway selected
+
+	endlocal
+	exit /b
+
+
+:: return length of string
+:strlen <resultVar> <stringVar>
+(
+    setlocal EnableDelayedExpansion
+    set "s=!%~2!#"
+    set "len=0"
+    for %%P in (4096 2048 1024 512 256 128 64 32 16 8 4 2 1) do (
+        if "!s:~%%P,1!" NEQ "" (
+            set /a "len+=%%P"
+            set "s=!s:~%%P!"
+        )
+    )
+)
+(
+    endlocal
+    set "%~1=%len%"
+    exit /b
+)
+
+:: return text substring from start to length
+:substr <resultVar> <start> <length> <text>
+(
+    setlocal EnableDelayedExpansion
+	set _str=!%~4!
+	set _substr=!_str:~%2,%3!
+)
+(
+    endlocal
+	set "%~1=%_substr%"
+	exit /b 0
+)
+
+:: return servers count from the serverlist
+:servercount <resultVar> <serverList>
+(
+    setlocal EnableDelayedExpansion
+	set _str=!%~2!
+
+	set char=\0
+	set count=0
+
+	:loop
+		if !_str:~0^,2! equ !char! (
+			set /a count+=1
+		)
+		if "!_str:~1!" neq "" (
+			set _str=!_str:~1!
+			goto :loop
+		)
+	set /a count -= 1
+	set /a count /= 3
+)
+(
+    endlocal
+	set "%~1=%count%"
+	exit /b 0
+)
+
+:: update current server in the serverlist header
+:selectserver <serverNum> <serverList>
+(
+    setlocal EnableDelayedExpansion
+
+	set servernum=%1
+	set serverlist=!%~2!
+
+	:: trim left
+	set str=!serverlist!
+	for /f "tokens=* delims= " %%a in ("!str!") do set str=%%a
+
+	:: remove header
+	set str=!str:~8!
+	rem echo !str!
+
+	:: add new header
+	call :strlen len servernum
+	:: add 0 before selected number if there is only one digit
+	if !len! lss 2 set servernum=0!servernum!
+	rem echo !len!
+
+	set _serverlist=1001\0!servernum!!str!
+)
+(
+    endlocal
+	set "%~2=%_serverlist%"
+	exit /b 0
+)
+
+:hex2ascii <serverList>
+	set count=0
+	set hex=!%~1!
+	set newline=\0
+
+	:_nextchar
+
+	:: get 2 hex chars
+	call :substr val !count! 2 hex
+
+	if "!val!" neq "" (
+		rem echo.
+		rem echo %val%
+
+		if "!val!" equ "00" (
+			set char=%newline%
+		) else (
+			set /a decimal=0x!val!
+			rem echo !decimal!
+
+			cmd /c exit /b !decimal!
+			set char=!=ExitCodeAscii!
+		)
+
+
+		set ascii=!ascii!!char!
+		rem echo !ascii!
+
+		set /a count+=2
+		goto :_nextchar
+	)
+
+	rem echo !ascii!
+
+	set "%~1=%ascii%"
+	exit /b 0


job #1 - Adding batch file for running branch builds.

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

--- utilities/build/run_branch_build_git.bat
+++ utilities/build/run_branch_build_git.bat
@@ -0,0 +1,73 @@
+@echo off
+
+rem
+rem  This script runs a branch build.
+rem
+rem  Since it is the starting point for the build chain, it must be manually put into
+rem  place for the build server to run.
+rem
+
+set BRANCH=1_skb_build_test
+
+
+set BUILD_ROOT=C:\builds
+set GIT_REPO_ROOT="/git/xtuml"
+set PT_HOME=\utilities\bp_build_tools\bridgepoint
+set PT_HOME_DRIVE=c:
+set XTUMLGEN_HOME=c:\utilities\bp_build_tools\bridgepoint
+set MGLS_DLL=c:\utilities\mgls\Mgls.dll
+set MGLS_PKGINFO_FILE=c:\utilities\mgls\mgc.pkginfo
+set MGLS_LICENSE_FILE=1717@wv-lic-01.wv.mentorg.com;1717@wv-lic-02.wv.mentorg.com
+echo BUILD_ROOT=%BUILD_ROOT%
+echo BRANCH=%BRANCH%
+echo GIT_REPO_ROOT=%GIT_REPO_ROOT%
+echo PT_HOME=%PT_HOME%
+echo PT_HOME_DRIVE=%PT_HOME_DRIVE%
+echo XTUMLGEN_HOME=%XTUMLGEN_HOME%
+echo MGLS_DLL=%MGLS_DLL%
+echo MGLS_PKGINFO_FILE=%MGLS_PKGINFO_FILE%
+echo MGLS_LICENSE_FILE=%MGLS_LICENSE_FILE%
+
+C:
+chdir %BUILD_ROOT%
+pushd .
+
+path c:\cygwin\bin;%Path%
+
+echo "Initializing git repositories..."
+dos2unix -q init_git_repositories.sh
+bash init_git_repositories.sh "%BRANCH%" "%GIT_REPO_ROOT%" "yes" > cfg_output.log
+echo "Done."
+
+echo "Initializing the eclipse bases and build tools from SVN..."
+cp -f %GIT_REPO_ROOT%/internal/utilities/build/init_svn_tools.sh .
+dos2unix -q init_svn_tools.sh
+bash init_svn_tools.sh "%BRANCH%" "nonrelease" >> cfg_output.log
+echo "Done."
+
+echo "Setting Windows permissions on tool directories..."
+icacls "c:\\utilities\\bp_build_tools\\" /grant everyone:F /t /c
+icacls "c:\\utilities\\mgls\\" /grant everyone:F /t /c
+icacls "c:\\MIMIC\\" /grant everyone:F /t /c
+echo "Done."
+
+echo "Configuring build process..."
+cp -f %GIT_REPO_ROOT%/internal/utilities/build/configure_build_process.sh .
+dos2unix -q configure_build_process.sh
+bash configure_build_process.sh %BRANCH% %GIT_REPO_ROOT% nonrelease >> cfg_output.log
+echo "Done."
+
+echo "Processing the build..."
+chdir %BRANCH%
+bash process_build.sh %BRANCH% %GIT_REPO_ROOT% nonrelease > build_output.log
+echo "Done."
+
+rem Clean up build files
+popd
+move configure_build_process.sh %BRANCH%
+move init_svn_tools.sh %BRANCH%
+move %BRANCH%\build_output.log %BRANCH%\log
+
+chdir %BUILD_ROOT%
+
+echo "End of run_nightly_build_git.bat"


Need to cd into recipe dir

Need to cd into recipe dir

--- conda.recipe/bld.bat
+++ conda.recipe/bld.bat
@@ -1 +1,2 @@
+cd %RECIPE_DIR%\..
 %PYTHON% setup.py install


auto build script update

auto build script update

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

--- update.bat
+++ update.bat
@@ -0,0 +1,20 @@
+ECHO OFF
+E:
+cd \angular-material\material
+git fetch upstream
+git checkout master
+git merge upstream/master
+call gulp karma
+rmdir ..\angular-material-midnight-dist\docs /S /Q
+del   ..\angular-material-midnight-dist\*.js /S /Q
+del   ..\angular-material-midnight-dist\*.css /S /Q
+xcopy .\dist\*.* ..\angular-material-midnight-dist\*.* /S /E /R /Y
+mkdir ..\angular-material-midnight-dist
+cd ..\angular-material-midnight-dist
+del commitlabel.log /Q
+call committime.bat
+git add *
+git commit -F commitlabel.log
+git push
+cd \angular-material\material
+echo DONE!


vscode.bat

vscode.bat

add that to settings.json

`"terminal.integrated.shell.windows": "cmd.exe",
"terminal.integrated.shellArgs.windows": [
    "/K",
    "%CMDER_ROOT%/vscode.bat",
]`

for using cmder inside vscode

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

--- vscode.bat
+++ vscode.bat
@@ -0,0 +1,9 @@
+@echo off
+IF [%1] == [] (
+    REM -- manually opened console (Ctrl + Shift + `) --
+    CALL "%~dp0\vendor\init.bat"
+) ELSE (
+    REM -- task --
+    CALL cmd %*
+    exit
+)


Only keep ssh.py in the Windows installer

--- pkg/windows/build_pkg.bat
+++ pkg/windows/build_pkg.bat
@@ -302,6 +302,8 @@
     del /Q "%BinDir%\Lib\site-packages\salt\modules\solaris*" 1>nul
 If Exist "%BinDir%\Lib\site-packages\salt\modules\solr.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\solr.*" 1>nul
+If Exist "%BinDir%\Lib\site-packages\salt\modules\ssh_*"^
+    del /Q "%BinDir%\Lib\site-packages\salt\modules\ssh_*" 1>nul
 If Exist "%BinDir%\Lib\site-packages\salt\modules\supervisord.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\modules\supervisord.*" 1>nul
 If Exist "%BinDir%\Lib\site-packages\salt\modules\sysbench.py"^
@@ -436,6 +438,8 @@
     del /Q "%BinDir%\Lib\site-packages\salt\states\smartos.*" 1>nul
 If Exist "%BinDir%\Lib\site-packages\salt\states\snapper.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\states\snapper.*" 1>nul
+If Exist "%BinDir%\Lib\site-packages\salt\states\ssh_*"^
+    del /Q "%BinDir%\Lib\site-packages\salt\states\ssh_*" 1>nul
 If Exist "%BinDir%\Lib\site-packages\salt\states\supervisord.py"^
     del /Q "%BinDir%\Lib\site-packages\salt\states\supervisord.*" 1>nul
 If Exist "%BinDir%\Lib\site-packages\salt\states\sysrc.py"^


Comment out deploy scripts for east asia

--- deploy.cmd
+++ deploy.cmd
@@ -1,4 +1,4 @@
 @echo off
-msbuild AzureSpeed.sln /p:VisualStudioVersion=14.0 /p:DeployOnBuild=true /p:PublishProfile=azurespeedeastasia.pubxml /p:Configuration=Release
+REM msbuild AzureSpeed.sln /p:VisualStudioVersion=14.0 /p:DeployOnBuild=true /p:PublishProfile=azurespeedeastasia.pubxml /p:Configuration=Release
 msbuild AzureSpeed.sln /p:VisualStudioVersion=14.0 /p:DeployOnBuild=true /p:PublishProfile=azurespeedwestus.pubxml /p:Configuration=Release
 msbuild AzureSpeed.sln /p:VisualStudioVersion=14.0 /p:DeployOnBuild=true /p:PublishProfile=azurespeedchinaeast.pubxml /p:Configuration=Release


install bower globally #2

install bower globally #2

--- deploy.cmd
+++ deploy.cmd
@@ -108,7 +108,7 @@
 :: 4. Install bower packages
 IF EXIST "%DEPLOYMENT_TARGET%\bower.json" (
   pushd "%DEPLOYMENT_TARGET%"
-  call :ExecuteCmd !NPM_CMD! install bower -g
+  call :ExecuteCmd !NPM_CMD! install -g bower
   IF !ERRORLEVEL! NEQ 0 goto error
   call :ExecuteCmd bower install
   IF !ERRORLEVEL! NEQ 0 goto error


kwkwk

kwkwk

--- deploy.cmd
+++ deploy.cmd
@@ -85,11 +85,12 @@
 :: 3. Build Test Project to the temporary path
 echo Building test project
 %MSBUILD_PATH% "%DEPLOYMENT_SOURCE%\TeamSauce.Test\TeamSauce.Test.csproj" /nologo /verbosity:m /t:Build /p:AutoParameterizationWebConfigConnectionStrings=false;Configuration=Release /p:SolutionDir="%DEPLOYMENT_SOURCE%\.\\" %SCM_BUILD_ARGS%
-
+dir "%DEPLOYMENT_SOURCE%\TeamSauce.Test\bin
 IF !ERRORLEVEL! NEQ 0 goto error

 :: 4. Running Tests
 echo Running Tests
+dir "%DEPLOYMENT_SOURCE%\TeamSauce.Test\bin\Release
 %DEPLOYMENT_SOURCE%\packages\NUnit.Runners.2.6.3\tools\nunit-console.exe "%DEPLOYMENT_SOURCE%\TeamSauce.Test\bin\Release\TeamSauce.Test.dll"
 echo Done runnning tests.


Delete deploy.cmd

Delete deploy.cmd

--- deploy.cmd
+++ deploy.cmd
@@ -1,138 +0,0 @@
-@if "%SCM_TRACE_LEVEL%" NEQ "4" @echo off
-
-:: ----------------------
-:: KUDU Deployment Script
-:: Version: 0.1.11
-:: ----------------------
-
-:: Prerequisites
-:: -------------
-
-:: Verify node.js installed
-where node 2>nul >nul
-IF %ERRORLEVEL% NEQ 0 (
-  echo Missing node.js executable, please install node.js, if already installed make sure it can be reached from current environment.
-  goto error
-)
-
-:: Setup
-:: -----
-
-setlocal enabledelayedexpansion
-
-SET ARTIFACTS=%~dp0%..\artifacts
-
-IF NOT DEFINED DEPLOYMENT_SOURCE (
-  SET DEPLOYMENT_SOURCE=%~dp0%.
-)
-
-IF NOT DEFINED DEPLOYMENT_TARGET (
-  SET DEPLOYMENT_TARGET=%ARTIFACTS%\wwwroot
-)
-
-IF NOT DEFINED NEXT_MANIFEST_PATH (
-  SET NEXT_MANIFEST_PATH=%ARTIFACTS%\manifest
-
-  IF NOT DEFINED PREVIOUS_MANIFEST_PATH (
-    SET PREVIOUS_MANIFEST_PATH=%ARTIFACTS%\manifest
-  )
-)
-
-IF NOT DEFINED KUDU_SYNC_CMD (
-  :: Install kudu sync
-  echo Installing Kudu Sync
-  call npm install kudusync -g --silent
-  IF !ERRORLEVEL! NEQ 0 goto error
-
-  :: Locally just running "kuduSync" would also work
-  SET KUDU_SYNC_CMD=%appdata%\npm\kuduSync.cmd
-)
-goto Deployment
-
-:: Utility Functions
-:: -----------------
-
-:SelectNodeVersion
-
-IF DEFINED KUDU_SELECT_NODE_VERSION_CMD (
-  :: The following are done only on Windows Azure Websites environment
-  call %KUDU_SELECT_NODE_VERSION_CMD% "%DEPLOYMENT_SOURCE%\BackOffice" "%DEPLOYMENT_TARGET%" "%DEPLOYMENT_TEMP%"
-  IF !ERRORLEVEL! NEQ 0 goto error
-
-  IF EXIST "%DEPLOYMENT_TEMP%\__nodeVersion.tmp" (
-    SET /p NODE_EXE=<"%DEPLOYMENT_TEMP%\__nodeVersion.tmp"
-    IF !ERRORLEVEL! NEQ 0 goto error
-  )
-
-  IF EXIST "%DEPLOYMENT_TEMP%\__npmVersion.tmp" (
-    SET /p NPM_JS_PATH=<"%DEPLOYMENT_TEMP%\__npmVersion.tmp"
-    IF !ERRORLEVEL! NEQ 0 goto error
-  )
-
-  IF NOT DEFINED NODE_EXE (
-    SET NODE_EXE=node
-  )
-
-  SET NPM_CMD="!NODE_EXE!" "!NPM_JS_PATH!"
-) ELSE (
-  SET NPM_CMD=npm
-  SET NODE_EXE=node
-)
-
-goto :EOF
-
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-:: Deployment
-:: ----------
-
-:Deployment
-echo Handling node.js deployment.
-
-:: 1. KuduSync
-IF /I "%IN_PLACE_DEPLOYMENT%" NEQ "1" (
-  call :ExecuteCmd "%KUDU_SYNC_CMD%" -v 50 -f "%DEPLOYMENT_SOURCE%\BackOffice" -t "%DEPLOYMENT_TARGET%" -n "%NEXT_MANIFEST_PATH%" -p "%PREVIOUS_MANIFEST_PATH%" -i ".git;.hg;.deployment;deploy.cmd"
-  IF !ERRORLEVEL! NEQ 0 goto error
-)
-
-:: 2. Select node version
-call :SelectNodeVersion
-
-:: 3. Install npm packages
-IF EXIST "%DEPLOYMENT_TARGET%\package.json" (
-  pushd "%DEPLOYMENT_TARGET%"
-  call :ExecuteCmd !NPM_CMD! install --production
-  IF !ERRORLEVEL! NEQ 0 goto error
-  popd
-)
-
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-
-:: Post deployment stub
-IF DEFINED POST_DEPLOYMENT_ACTION call "%POST_DEPLOYMENT_ACTION%"
-IF !ERRORLEVEL! NEQ 0 goto error
-
-goto end
-
-:: Execute command routine that will echo out when error
-:ExecuteCmd
-setlocal
-set _CMD_=%*
-call %_CMD_%
-if "%ERRORLEVEL%" NEQ "0" echo Failed exitCode=%ERRORLEVEL%, command=%_CMD_%
-exit /b %ERRORLEVEL%
-
-:error
-endlocal
-echo An error has occurred during web site deployment.
-call :exitSetErrorLevel
-call :exitFromFunction 2>nul
-
-:exitSetErrorLevel
-exit /b 1
-
-:exitFromFunction
-()
-
-:end
-endlocal
-echo Finished successfully.


how do I cmd

how do I cmd


Update upload.bat

Update upload.bat

--- conda/upload.bat
+++ conda/upload.bat
@@ -55,8 +55,24 @@
 rmdir toolchain /s /q

 for %%x in (%UPLOAD_TARGETS%) do (
-  set UPLOAD_TARGET=%%x
-  for /f %%i in ('conda build '%UPLOAD_TARGET%' -c '%ANACONDA_CHANNEL%' '%ANACONDA_UPLOAD_FLAGS%' --output') do (set UPLOAD_FILE=%%i)
+  <nul set /p "for /f %%i in ('conda build " > _upload.bat
+  more _upload.bat
+  <nul set /p %%x >> _upload.bat
+  more _upload.bat
+  <nul set /p " -c " >> _upload.bat
+  more _upload.bat
+  <nul set /p %ANACONDA_CHANNEL% >> _upload.bat
+  more _upload.bat
+  <nul set /p " " >> _upload.bat
+  more _upload.bat
+  <nul set /p %ANACONDA_FLAGS% >> _upload.bat
+  echo --output >> _upload.bat
+  more _upload.bat
+  echo anaconda upload --user %ANACONDA_CHANNEL% %UPLOAD_FILE% >> _upload.bat
+  more _upload.bat
+  echo "if %errorlevel% neq 0 echo \"upload failed\""
+  more _upload.bat
+  del _upload.bat
 )

 anaconda logout


Removed static reference to local file

Removed static reference to local file

--- Setup/postbuild.bat
+++ Setup/postbuild.bat
@@ -1,2 +1,2 @@
-C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -ExecutionPolicy Bypass -NoProfile -NonInteractive -File C:\GitHub\XESmartTarget\Setup\SignMsi.ps1 -InputFile %1 -OutputFile %2
+C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -ExecutionPolicy Bypass -NoProfile -NonInteractive -File %~dp0\SignMsi.ps1 -InputFile %1 -OutputFile %2


Added gitbash.bat for Windows users

Added gitbash.bat for Windows users

Usage: python -m gradefast ... --shell gitbash.bat

which will use the version of bash bundled with Git to interpret the commands.


Define nominmax on windows

Define nominmax on windows

--- recipes/SOCI/bld_soci.bat
+++ recipes/SOCI/bld_soci.bat
@@ -1,12 +1,12 @@
 cmake                                        ^
     -G "Ninja"                               ^
-    -D SOCI_CXX11=ON                         ^
-    -D WITH_BOOST=OFF                        ^
-    -D CMAKE_BUILD_TYPE=Release              ^
-    -D CMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% ^
+    -DSOCI_CXX11=ON                         ^
+    -DWITH_BOOST=OFF                        ^
+    -DCMAKE_BUILD_TYPE=Release              ^
+    -DCMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% ^
     -DSOCI_LIBDIR=lib                        ^
     -DSOCI_STATIC=OFF                        ^
-    -DNOMINMAX                               ^
+    -DCMAKE_CXX_FLAGS=-DNOMINMAX             ^
     %SRC_DIR%
 if errorlevel 1 exit 1


Simplification of test for 64 bit environments in demo.cmd

--- demo.cmd
+++ demo.cmd
@@ -59,17 +59,7 @@
 if not exist "%DEMO_BIN_PATH%" md "%DEMO_BIN_PATH%"
 copy /y "%BIN_PATH%" "%DEMO_BIN_PATH%"

-REM See http://support.microsoft.com/kb/556009
-
-Set RegQry=HKLM\Hardware\Description\System\CentralProcessor\0
-
-REG.exe Query %RegQry% > checkOS.txt
-
-Find /i "x86" < CheckOS.txt > StringCheck.txt
-
-If %ERRORLEVEL% == 0 (
-	REM 32 bit SQLite will already be copied in
-) ELSE (
+If %PROCESSOR_ARCHITECTURE% NEQ "x86" (
 	copy /y "%LIB_PATH_x64%\System.Data.SQLite.DLL" "%DEMO_BIN_PATH%"
 )


ビルドバッチ修正。

ビルドバッチ修正。

* 最初に Voiceroid/bin/Release を削除する。（クリーンなパッケージングのため）
* NuGet.exe がパスの通る場所にあれば実施する。

refs #6

--- _build.bat
+++ _build.bat
@@ -10,10 +10,26 @@
 if errorlevel 1 goto ON_ERROR

 pushd "%~dp0"
+
+REM ---- For clean packaging
+del /S /Q VoiceroidUtil/bin/Release >nul 2>&1
+
+REM ---- NuGet (if installed)
+where nuget >nul 2>&1
+if errorlevel 1 (
+    echo Nuget is not installed.
+) else (
+    nuget update -self
+    nuget restore VoiceroidUtil.sln
+    if errorlevel 1 goto ON_ERROR_POPD
+)
+
+REM ---- Build solution
 MSBuild VoiceroidUtil.sln /p:Configuration=Debug
 if errorlevel 1 goto ON_ERROR_POPD
 MSBuild VoiceroidUtil.sln /p:Configuration=Release
 if errorlevel 1 goto ON_ERROR_POPD
+
 popd

 exit /b 0