默认打包编译CEF核心包

默认打包编译CEF核心包

--- Build.cmd
+++ Build.cmd
@@ -4,14 +4,8 @@
 SET DEVPATH64=C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE;
 SET DEVPATH86=C:\Program Files\Microsoft Visual Studio 10.0\Common7\IDE;
 SET PATH=%PATH%;%DEVPATH86%;%DEVPATH64%
-SET Action="Prep"
-CHOICE /C PBMCE /N /D P /T 3 /M "Build with CEF(B) Build with miniblink(M) Clean(C) Continue:"
-IF %ERRORLEVEL% LEQ 1 (SET Action="Prep" && GOTO Prep)
-IF %ERRORLEVEL% LEQ 2 (SET Action="BuildC" && GOTO Prep)
-IF %ERRORLEVEL% LEQ 3 (SET Action="BuildM" && GOTO Prep)
-IF %ERRORLEVEL% LEQ 4 (SET Action="Clean" && GOTO Clean)
-IF %ERRORLEVEL% LEQ 5 (SET Action="END" && GOTO END)

+Rem GOTO Clean

 :Prep
 Echo Packed Skin.zip
@@ -21,11 +15,7 @@
 popd popd
 Echo.

-
-IF %Action%=="Prep" GOTO END
-IF %Action%=="BuildC" GOTO BuildC
-IF %Action%=="BuildM" GOTO BuildM
-
+Rem GOTO BuildM

 :BuildC
 IF NOT EXIST "%CD%\Bin\libcef.dll" (
@@ -45,13 +35,12 @@
 (Echo #define USE_CEF)>"%CD%\Browser\config.h"
 IF EXIST .\Bin\Release\Browser RD /S /Q .\Bin\Release\Browser
 DEVENV Browser.sln /build "Release|Win32"
-myproj.csproj
 IF "%ERRORLEVEL%"=="1" GOTO Error
 Echo Package
 pushd "%CD%\Bin\"
 IF EXIST .\Bin\Release\Browser RD /S /Q .\Bin\Release\Browser
 IF EXIST Browser_CEF.zip DEL /F /Q /S Browser_CEF.zip
-7z.exe a Browser_CEF.zip Browser.exe ReadMe.txt locales plugins\pepflashplayer.dll cef.pak cef_100_percent.pak cef_extensions.pak d3dcompiler_43.dll d3dcompiler_47.dll icudtl.dat libcef.dll libEGL.dll libGLESv2.dll natives_blob.bin
+7z.exe a Browser_CEF.zip Browser.exe ReadMe.txt locales cef.pak cef_100_percent.pak cef_extensions.pak d3dcompiler_43.dll d3dcompiler_47.dll icudtl.dat libcef.dll libEGL.dll libGLESv2.dll natives_blob.bin
 popd popd
 GOTO End


Remove *.tlog build files.

Remove *.tlog build files.

--- delbin.bat
+++ delbin.bat
@@ -1 +1 @@
-del /S /Q *.a *.aps *.bsc *.dll *.dsw *.exe *.idb *.ilc *.ild *.ilf *.ilk *.ils *.lib *.map *.ncb *.obj *.o *.opt *.pdb *.plg *.res *.sbr *.tds *.exp >NUL:
+del /S /Q *.a *.aps *.bsc *.dll *.dsw *.exe *.idb *.ilc *.ild *.ilf *.ilk *.ils *.lib *.map *.ncb *.obj *.o *.opt *.pdb *.plg *.res *.sbr *.tds *.exp *.tlog >NUL:


Deployment changes

Deployment changes

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

 	:: 5. Run grunt


* Added build script for nuget package

* Added build script for nuget package

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

--- buildnugetpkg.cmd
+++ buildnugetpkg.cmd
@@ -0,0 +1 @@
+.nuget\nuget pack NPushover\NPushover.nuspec


Update

Update

--- Clean.bat
+++ Clean.bat
@@ -9,6 +9,7 @@
 del /f /q /s *.local
 del /f /q /s *.identcache
 del /f /q /s *.tvsconfig
+del /f /q /s *.stat

 del /f /q /s *.bpl
 del /f /q /s *.cbk
@@ -18,8 +19,15 @@
 del /f /q /s *.rsm
 del /f /q /s *.skincfg
 del /f /q /s *.log
+del /f /q /s *.xml
+del /f /q /s *.dof
+del /f /q /s *.mpb

 for /f "tokens=* delims=" %%i in ('dir /s /b /a:d __history') do (
+  rd /s /q "%%i"
+)
+
+for /f "tokens=* delims=" %%i in ('dir /s /b /a:d __recovery') do (
   rd /s /q "%%i"
 )


Ug, I hate batch

Ug, I hate batch

git-svn-id: 5f484f254f9c756c2181f5fb930a37c132fae949@539228 13f79535-47bb-0310-9956-ffa450edef68

--- gshell-assembly/src/main/scripts/gsh.bat
+++ gshell-assembly/src/main/scripts/gsh.bat
@@ -69,7 +69,7 @@

 :execute

-BOOTJAR=%GSHELL_HOME%\lib\boot\gshell-bootstrap.jar
+set BOOTJAR=%GSHELL_HOME%\lib\boot\gshell-bootstrap.jar

 rem Start the JVM
 "%JAVACMD%" %JAVA_OPTS% -jar "%BOOTJAR% %ARGS%


auto exit

auto exit

--- src/Ansibility/build.cmd
+++ src/Ansibility/build.cmd
@@ -5,3 +5,4 @@
 dotnet publish -c Debug -o out
 docker build -t student .
 docker run -d -p 8000:80 --name student student
+exit


Bugfix

Bugfix

Postfile as unified to "postfile.cmd"

--- e5r-install.cmd
+++ e5r-install.cmd
@@ -5,7 +5,7 @@
 set CDPATH=%CD%
 set SCRIPTNAME=%~n0
 set E5RPATH=%USERPROFILE%\.e5r
-set POSTSETUPFILE=%E5RPATH%\postsetup.cmd
+set POSTFILE=%E5RPATH%\postfile.cmd
 set PSCOMMONFILE=%E5RPATH%\lib\common.ps1
 set PSINSTALLFILE=%E5RPATH%\bin\%SCRIPTNAME%.ps1
 set PSCOMMONURL=%REPOSITORYURL%/scripts/common.ps1
@@ -29,9 +29,9 @@
         -File "%PSINSTALLFILE%" ^
         -Repository %REPOSITORYURL% %*

-    if exist %POSTSETUPFILE% (
-        CALL %POSTSETUPFILE%
-        DEL %POSTSETUPFILE%
+    if exist %POSTFILE% (
+        CALL %POSTFILE%
+        DEL %POSTFILE%
     )

 :gc


lul up

lul up

--- consoleTree.bat
+++ consoleTree.bat
@@ -2,7 +2,7 @@
 pause
 color 0a
 mode 1000
-
+// you may switch tree for numbers( matrix effect, etc)
 :a
 echo
 tree


Fix bld.bat

Fix bld.bat

--- recipes/sip/bld.bat
+++ recipes/sip/bld.bat
@@ -1,4 +1,4 @@
-%PYTHON% configure.py --bindir=%PREFIX%\Scripts
+%PYTHON% configure.py --sysroot=%PREFIX% --bindir=%LIBRARY_BIN%

 nmake
 nmake install


fixed hosts bat

fixed hosts bat

--- env/hosts.bat
+++ env/hosts.bat
@@ -1,7 +1 @@
-del .gap.hosts.tmp
-
-echo gradlew.bat environmentHosts -q > .gap.hosts.tmp
-
-powershell -command "Start-Process cmd -ArgumentList '/C cd %CD% && type .gap.hosts.tmp >> C:\Windows\System32\drivers\etc\hosts' -Verb runas"
-
-del .gap.hosts.tmp
+gradlew.bat environmentHosts -q > .gap.hosts.tmp & powershell -command "Start-Process cmd -ArgumentList '/C cd %CD% && type .gap.hosts.tmp >> C:\Windows\System32\drivers\etc\hosts' -Verb runas"


Log all in console.

Log all in console.

--- src/YardFrontend/gen.cmd
+++ src/YardFrontend/gen.cmd
@@ -1,4 +1,4 @@
 @echo off

 ..\..\Bin\Release\v40\YC.YaccConstructor.exe   -f FsYaccFrontend -i Parser.fsy ^
-    -g "RNGLRGenerator -o Parser.fs -module Yard.Frontends.YardFrontend.GrammarParser -pos Source.Position -token Source.t" > log.txt+    -g "RNGLRGenerator -o Parser.fs -module Yard.Frontends.YardFrontend.GrammarParser -pos Source.Position -token Source.t"


Added some command to help developers deploy with and without database install and upgrades.

SVN-Revision: 363

--- software/build/build.cmd
+++ software/build/build.cmd
@@ -10,12 +10,13 @@
     echo.
     echo   clean        -- Remove classes directory for clean build
     echo   all          -- Normal build of application
-    echo   install      -- Build and deploy application
-    echo   upgrade      -- Build and upgrade application
     echo   install      -- Builds, installs JBoss and database locally
     echo   upgradewdb   -- Builds, upgrades JBoss and database locally
-    echo   dev          -- Builds, upgrades JBoss and database on DEV
-    echo   qa           -- Builds, upgrades JBoss and database on QA
+    echo   upgrade      -- Build and upgrade application
+    echo   devwdb       -- Builds, upgrades JBoss and database on DEV
+    echo   dev          -- Builds, upgrades JBoss on DEV
+    echo   qawdb        -- Builds, upgrades JBoss and database on QA
+    echo   qa           -- Builds, upgrades JBoss on QA
     echo   deploy       -- Redeploy application
     goto DONE
 )
@@ -27,32 +28,36 @@
     ant build:all
     goto DONE
 )
+if "%1" == "install" (
+    ant deploy:local:install
+    goto DONE
+)
 if "%1" == "upgrade" (
     ant deploy:local:upgrade
     goto DONE
 )
-if "%1" == "installwdb" (
-    ant -Dupgrade.target=upgrade-with-dbinstall -Denable.install.debug=true deploy:local:upgrade
+if "%1" == "deploy" (
+    ant deploy:hot
     goto DONE
 )
 if "%1" == "upgradewdb" (
     ant -Dupgrade.target=upgrade-ncm:with-dbinstall -Denable.install.debug=true deploy:local:upgrade
     goto DONE
 )
-if "%1" == "dev" (
+if "%1" == "devwdb" (
     ant -Dproperties.file=C:\SVN-Projects\ncireportwriter-properties\properties\dev-upgrade.properties -Dupgrade.target=upgrade-ncm:with-dbinstall deploy:remote:upgrade
     goto DONE
 )
-if "%1" == "qa" (
+if "%1" == "dev" (
+    ant -Dproperties.file=C:\SVN-Projects\ncireportwriter-properties\properties\dev-upgrade.properties deploy:remote:upgrade
+    goto DONE
+)
+if "%1" == "qawdb" (
     ant -Dproperties.file=C:\SVN-Projects\ncireportwriter-properties\properties\qa-upgrade.properties -Dupgrade.target=upgrade-ncm:with-dbinstall deploy:remote:upgrade
     goto DONE
 )
-if "%1" == "deploy" (
-    ant deploy:hot
-    goto DONE
-)
-if "%1" == "install" (
-    ant deploy:local:install
+if "%1" == "qa" (
+    ant -Dproperties.file=C:\SVN-Projects\ncireportwriter-properties\properties\qa-upgrade.properties deploy:remote:upgrade
     goto DONE
 )
 if "%1" == "clean" (


Addition of install with DB task.

Addition of install with DB task.

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

--- software/build/build.cmd
+++ software/build/build.cmd
@@ -12,8 +12,9 @@
     echo   all          -- Normal build of application
     echo   install      -- Build and deploy application
     echo   upgrade      -- Build and upgrade application
-    echo   upgradewdb   -- Builds, upgrades JBoss and Database locally
-    echo   dev          -- Builds, upgrades JBoss and Database on DEV
+    echo   install      -- Builds, installs JBoss and database locally
+    echo   upgradewdb   -- Builds, upgrades JBoss and database locally
+    echo   dev          -- Builds, upgrades JBoss and database on DEV
     echo   deploy       -- Redeploy application
     goto DONE
 )
@@ -29,8 +30,16 @@
     ant deploy:local:upgrade
     goto DONE
 )
+if "%1" == "installwdb" (
+    ant -Dupgrade.target=upgrade-with-dbinstall -Denable.install.debug=true deploy:local:upgrade
+    goto DONE
+)
 if "%1" == "upgradewdb" (
-    ant -Dupgrade.target=upgrade-with-dbinstall -Denable.install.debug=true deploy:local:upgrade
+    ant -Dupgrade.target=upgrade-ncm:with-dbinstall -Denable.install.debug=true deploy:local:upgrade
+    goto DONE
+)
+if "%1" == "dev" (
+    ant -Dproperties.file=C:\SVN-Projects\ncireportwriter-properties\properties\dev-upgrade.properties -Dupgrade.target=upgrade-ncm:with-dbinstall deploy:remote:upgrade
     goto DONE
 )
 if "%1" == "deploy" (
@@ -48,10 +57,5 @@
     )
     goto DONE
 )
-if "%1" == "dev" (
-    ant -Dproperties.file=C:\SVN-Projects\ncireportwriter-properties\properties\dev-upgrade.properties -Dupgrade.target=upgrade-ncm:with-dbinstall deploy:remote:upgrade
-    goto DONE
-)
-
 :DONE
 endlocal


Remove python path settings from common_win.bat because it's not common.

PiperOrigin-RevId: 338040100

--- tensorflow_lite_support/tools/ci_build/common_win.bat
+++ tensorflow_lite_support/tools/ci_build/common_win.bat
@@ -19,17 +19,6 @@
 echo on

 @REM
-@REM Set Environment Variables
-@REM
-SET PY_EXE=C:\%PYTHON_DIRECTORY%\python.exe
-SET PIP_EXE=C:\%PYTHON_DIRECTORY%\Scripts\pip.exe
-SET PATH=C:\%PYTHON_DIRECTORY%;C:\%PYTHON_DIRECTORY%\Scripts;%PATH%
-
-%PIP_EXE% install flatbuffers==1.12 --upgrade --no-deps
-%PIP_EXE% install setuptools --upgrade
-%PIP_EXE% install numpy==1.16.0 --upgrade --no-deps
-
-@REM
 @REM Setup Bazel
 @REM
 :: Download Bazel from github and make sure its found in PATH.


Addition of a few more manpages.

Addition of a few more manpages.

--- man/papiman.bat
+++ man/papiman.bat
@@ -20,6 +20,7 @@
 perl manServer_papi.pl -o html man3/PAPI_get_virt_cyc.3
 perl manServer_papi.pl -o html man3/PAPI_get_virt_usec.3
 perl manServer_papi.pl -o html man3/PAPI_help.3
+perl manServer_papi.pl -o html man3/PAPI_label_event.3
 perl manServer_papi.pl -o html man3/PAPI_library_init.3
 perl manServer_papi.pl -o html man3/PAPI_list_events.3
 perl manServer_papi.pl -o html man3/PAPI_lock.3
@@ -43,6 +44,7 @@
 perl manServer_papi.pl -o html man3/PAPI_set_debug.3
 perl manServer_papi.pl -o html man3/PAPI_set_domain.3
 perl manServer_papi.pl -o html man3/PAPI_set_granularity.3
+perl manServer_papi.pl -o html man3/PAPI_set_multiplex.3
 perl manServer_papi.pl -o html man3/PAPI_set_opt.3
 perl manServer_papi.pl -o html man3/PAPI_shutdown.3
 perl manServer_papi.pl -o html man3/PAPI_sprofil.3
@@ -57,3 +59,8 @@
 perl manServer_papi.pl -o html man3/PAPI_unlock.3
 perl manServer_papi.pl -o html man3/PAPI_write.3
 perl manServer_papi.pl -o html man3/PAPIF.3
+perl manServer_papi.pl -o html man3/PAPIF_get_clockrate.3
+perl manServer_papi.pl -o html man3/PAPIF_get_domain.3
+perl manServer_papi.pl -o html man3/PAPIF_get_granularity.3
+perl manServer_papi.pl -o html man3/PAPIF_get_preload.3
+perl manServer_papi.pl -o html man3/PAPIF_set_event_domain.3


fix for PROACTIVE-422, previous fix contained a typo error

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

--- examples/migration/migrate.bat
+++ examples/migration/migrate.bat
@@ -8,9 +8,9 @@

 :usage
 echo  Migrate an ActiveObject from Node1 to Node2
-echo  migrate.sh <the url of the source node> <the url of the destination node>
-echo      ex : migrate.bat  rmi://$HOSTNAME/Node1 rmi://$HOSTNAME/Node2
-echo      ex : migrate.bat jini://$HOSTNAME/Node1 rmi://$HOSTNAME/Node2
+echo  migrate.bat the_url_of_the_source_node the_url_of_the_destination_node
+echo      ex : migrate.bat  rmi://%HOSTNAME%/Node1 rmi://%HOSTNAME%/Node2
+echo      ex : migrate.bat jini://%HOSTNAME%/Node1 rmi://%HOSTNAME%/Node2
 echo.
 echo.
 goto end


UIMA-1590 also removed source:jar from "deploy" because this is now the default.

git-svn-id: dd361d0afbe84f3eb97f7061549e905c2c5df34b@818944 13f79535-47bb-0310-9956-ffa450edef68

--- SandboxDistr/annotator-package/build/extractAndBuild.bat
+++ SandboxDistr/annotator-package/build/extractAndBuild.bat
@@ -22,28 +22,34 @@
 @echo on

 @if "%~1"=="" goto usage
+@if not "%4"=="" goto usage
 @if "%~1"=="trunk" goto trunk
-@set level=tags/%~1
-@set leveldir=%~1
+@set leveldir=sandbox-%~1-%~2
+@set svnloc=tags/sandbox-%1/%leveldir%
 @goto checkargs

 @:trunk
-@set level=trunk
 @set leveldir=trunk
+@set svnloc=trunk
 @goto checkargs

 @:checkargs
 @set jvmarg=
 @set mvnCommand=clean install
-@if not "%3"=="" goto usage
-@if "%~2"=="" goto execute
-@if "%~2"=="-notest" goto notest
+@if "%~3"=="" goto execute
+@if "%~3"=="-notest" goto notest
+@if "%~3"=="-deploy" goto deploy
 @goto usage

 @:usage
 @echo off
-echo Usage: extractAndBuild.bat level [-notest]
+echo Run this command in the same directory where all the base uima projects live.
+echo Running this command in a directory produces an extract as a subdirectory of that directory;
+echo   whose contents are then copied into this directory (required for the build)
+echo Usage: extractAndBuild.bat level release-candidate [-notest] [-deploy]
 echo            (-notest and -deploy cannot be used together)
+echo  Examples of the 1st 2 arguments, level release-candidate, are  trunk trunk   or  2.2.2  01
+echo  If trunk, use the word "trunk" for the 2nd argument, e.g. extractAndBuild.bat trunk trunk
 @echo on
 @goto exit

@@ -51,12 +57,18 @@
 @set jvmarg="-Dmaven.test.skip=true"
 @goto execute

+@:deploy
+@set jvmarg="-DsignArtifacts=true"
+@set mvnCommand=clean deploy
+@goto execute
+
 @:execute
-svn checkout -r HEAD http://svn.apache.org/repos/asf/incubator/uima/sandbox/%level%
-cd %leveldir%
+svn checkout -r HEAD http://svn.apache.org/repos/asf/incubator/uima/sandbox/%svnloc%
+xcopy %leveldir%\* . /E
+rmdir /S %leveldir%
 cd SandboxDistr
 call mvn %jvmarg%  -Duima.build.date="%date% %time%" %mvnCommand%
 cd annotator-package
-call mvn clean assembly:assembly
+call mvn -N clean assembly:assembly

 @:exit


Added automatic patch creation tool

Added automatic patch creation tool

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

--- .patches/createpatch.bat
+++ .patches/createpatch.bat
@@ -0,0 +1,5 @@
+setlocal enabledelayedexpansion
+set output=
+for /f %%G in ('git diff-tree --no-commit-id --name-only -r %1^^') do ( set output=!output! "%%G" )
+git archive -o ./patch-%1.zip HEAD %output%
+endlocal


RingLibSDL - update buildvc.bat - Add SDL2_Mixer Library

--- extensions/ringsdl/buildvc.bat
+++ extensions/ringsdl/buildvc.bat
@@ -1,7 +1,7 @@
 cls
 call "C:\Program Files\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x86
-cl /c /DEBUG ring_libsdl.c -I"..\..\libdepwin\sdl2vc\include" -I"..\..\libdepwin\sdl2_image\include" -I"..\..\libdepwin\sdl2_ttf\include" -I"..\..\include"
-link /DEBUG ring_libsdl.obj  ..\..\lib\ring.lib ..\..\libdepwin\sdl2vc\lib\x86\sdl2.lib ..\..\libdepwin\sdl2_image\lib\x86\sdl2_image.lib ..\..\libdepwin\sdl2_ttf\lib\x86\sdl2_ttf.lib ..\..\libdepwin\sdl2vc\lib\x86\sdl2main.lib /DLL /OUT:..\..\bin\ring_sdl.dll /SUBSYSTEM:WINDOWS,"5.01" /NODEFAULTLIB:msvcrt.lib
+cl /c /DEBUG ring_libsdl.c -I"..\..\libdepwin\sdl2vc\include" -I"..\..\libdepwin\sdl2_image\include" -I"..\..\libdepwin\sdl2_ttf\include" -I"..\..\libdepwin\sdl2_mixer\include" -I"..\..\include"
+link /DEBUG ring_libsdl.obj  ..\..\lib\ring.lib ..\..\libdepwin\sdl2vc\lib\x86\sdl2.lib ..\..\libdepwin\sdl2_image\lib\x86\sdl2_image.lib ..\..\libdepwin\sdl2_ttf\lib\x86\sdl2_ttf.lib ..\..\libdepwin\sdl2_mixer\lib\x86\sdl_mixer.lib ..\..\libdepwin\sdl2vc\lib\x86\sdl2main.lib /DLL /OUT:..\..\bin\ring_sdl.dll /SUBSYSTEM:WINDOWS,"5.01" /NODEFAULTLIB:msvcrt.lib
 del ring_libsdl.obj
 copy libsdl.ring ..\..\bin
 copy sdl.rh ..\..\bin


更新release.bat

更新release.bat

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


Updating deploy file to use net46 directory (#1722)

--- deploy.cmd
+++ deploy.cmd
@@ -100,7 +100,7 @@
 :: 2c. Publish WebJobs (AllReady.NotificationsWebJob)
 echo Publishing AllReady.NotificationsWebJob WebJob
 call :ExecuteCmd mkdir "%DEPLOYMENT_TEMP%\app_data\jobs\continuous\notificationsprocessor\"
-call :ExecuteCmd xcopy /S "%DEPLOYMENT_SOURCE%\AllReadyApp\AllReady.NotificationsWebJob\bin\debug\net451" "%DEPLOYMENT_TEMP%\app_data\jobs\continuous\notificationsprocessor\"
+call :ExecuteCmd xcopy /S "%DEPLOYMENT_SOURCE%\AllReadyApp\AllReady.NotificationsWebJob\bin\debug\net46" "%DEPLOYMENT_TEMP%\app_data\jobs\continuous\notificationsprocessor\"

 :: 3. KuduSync


Using MSBUILD path for NuGet

Using MSBUILD path for NuGet

--- deploy.cmd
+++ deploy.cmd
@@ -108,7 +108,7 @@
 call :ExecuteCmd "%MSBUILD_PATH%" web/deploy-config.proj /verbosity:m /nologo /p:Configuration=Release /t:CleanTransformConfig

 :: 2. Restore NuGet packages
-call :ExecuteCmd nuget.exe restore "%DEPLOYMENT_SOURCE%\web\Loconomics.sln" -MSBuildPath "%MSBUILD_PATH%"
+call :ExecuteCmd nuget.exe restore "%DEPLOYMENT_SOURCE%\web\Loconomics.sln" -MSBuildPath "%ProgramFiles(x86)%\MSBuild\14.0\Bin"

 :: 3. Build to the repository path
 call :ExecuteCmd "%MSBUILD_PATH%" "%DEPLOYMENT_SOURCE%\web\Loconomics.sln" /verbosity:m /nologo %SCM_BUILD_ARGS%


changed script

changed script

--- deploy.cmd
+++ deploy.cmd
@@ -15,12 +15,6 @@
   goto error
 )

-IF EXIST "%DEPLOYMENT_TARGET%\bower.json" (
-  pushd "%DEPLOYMENT_TARGET%\
-  call ..\node_modules\.bin\bower install
-  IF !ERRORLEVEL! NEQ 0 goto error
-  popd
-)
 :: Setup
 :: -----

@@ -111,6 +105,13 @@
   popd
 )

+IF EXIST "%DEPLOYMENT_TARGET%\bower.json" (
+  pushd "%DEPLOYMENT_TARGET%
+  call ./node_modules/.bin/bower install
+  IF !ERRORLEVEL! NEQ 0 goto error
+  popd
+)
+
 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 goto end


fixing repository

fixing repository

--- deploy.cmd
+++ deploy.cmd
@@ -15,8 +15,8 @@

 MKDIR %NEWHOME%\site\wwwroot\gopath\src\%FOLDER%

-xcopy %DEPLOYMENT_SOURCE%\site\repository %NEWHOME%\site\wwwroot\gopath\src\%FOLDER% /Y
-xcopy /r %DEPLOYMENT_SOURCE%\site\repository\Web.Config %NEWHOME%\site\wwwroot\Web.Config* /Y
+xcopy %DEPLOYMENT_SOURCE% %NEWHOME%\site\wwwroot\gopath\src\%FOLDER% /Y
+xcopy /r %DEPLOYMENT_SOURCE%\Web.Config %NEWHOME%\site\wwwroot\Web.Config* /Y

 rem SET GOPATH=%NEWHOME%\site\wwwroot\gopath
 rem SET GOROOT=%NEWHOME%\site\wwwroot\go


Fix path to bower

Fix path to bower

--- deploy.cmd
+++ deploy.cmd
@@ -105,14 +105,11 @@
   popd
 )

-node --version
-"%NODE_EXE%" --version
-
 :: 4. Install bower packages
 IF EXIST "%DEPLOYMENT_TARGET%\bower.json" (
   pushd "%DEPLOYMENT_TARGET%"
   call :ExecuteCmd !NPM_CMD! install bower
-  call :ExecuteCmd "%NODE_EXE%"  .\node_modules\.bin\bower install
+  call :ExecuteCmd "%NODE_EXE%" .\node_modules\bin\bower install
   IF !ERRORLEVEL! NEQ 0 goto error
   popd
 )


Explicity install react scripts during azure deploy

--- deploy.cmd
+++ deploy.cmd
@@ -1,5 +1,5 @@
 @if "%SCM_TRACE_LEVEL%" NEQ "4" @echo off
-
+
 :: ----------------------
 :: KUDU Deployment Script
 :: Version: 1.0.8
@@ -104,6 +104,7 @@
   IF !ERRORLEVEL! NEQ 0 goto error
   popd
   pushd "%DEPLOYMENT_TARGET%\client"
+  call :ExecuteCmd !NPM_CMD! install react-scripts
   call :ExecuteCmd !NPM_CMD! run build
   IF !ERRORLEVEL! NEQ 0 goto error
   popd


Remove deployment

Remove deployment

Greasemonkey can't access the filesystem any more, so have to manually deploy...

--- GeocacheHeight/build.bat
+++ GeocacheHeight/build.bat
@@ -1,18 +1,13 @@
 @echo off
 set BASENAME=Geocache_Height
 set BASEPATH=%HOMEPATH%\Documents\Dev\GitHub\userscripts\GeocacheHeight
-set DEPLOYPATH=%APPDATA%\Mozilla\Firefox\Profiles\6rhioilk.default\gm_scripts\%BASENAME%

 cd "%BASEPATH%"
 copy "src\%BASENAME%.meta.js" .
 copy /b "src\%BASENAME%.meta.js" + src\header.js + "src\formatHeight.js" + "src\%BASENAME%.js" + src\footer.js ".\%BASENAME%.user.js"
-copy %BASENAME%.meta.js %DEPLOYPATH%
-copy %BASENAME%.user.js %DEPLOYPATH%

 copy "src\%BASENAME%_feet.meta.js" .
 copy /b "src\%BASENAME%_feet.meta.js" + src\header.js + "src\formatHeight_feet.js" + "src\%BASENAME%.js" + src\footer.js ".\%BASENAME%_feet.user.js"
-copy %BASENAME%_feet.meta.js %DEPLOYPATH%_(feet)
-copy %BASENAME%_feet.user.js %DEPLOYPATH%_(feet)

 set BASENAME=
 set BASEPATH=


Add download link for Hugin

Add download link for Hugin

--- gear360pano.cmd
+++ gear360pano.cmd
@@ -252,6 +252,7 @@
 :NOHUGIN
 echo.
 echo Hugin is not installed or installed in non-standard directory
+echo Download and install Hugin from: http://hugin.sourceforge.net/
 echo Was looking in: %HUGINPATH%
 echo and: %HUGINPATH32%
 goto eof


Revert "Update run_with_env.cmd"

Revert "Update run_with_env.cmd"

This reverts commit 25eb1aab19c559d8d940e8cfd18188c2c8747682.

--- devtools/appveyor/run_with_env.cmd
+++ devtools/appveyor/run_with_env.cmd
@@ -37,11 +37,11 @@

 :: Extract the major and minor versions, and allow for the minor version to be
 :: more than 9.  This requires the version number to have two dots in it.
-SET MAJOR_PYTHON_VERSION=%CONDA_PY:~0,1%
-IF "%CONDA_PY:~3,1%" == "." (
-    SET MINOR_PYTHON_VERSION=%CONDA_PY:~2,1%
+SET MAJOR_PYTHON_VERSION=%PYTHON_VERSION:~0,1%
+IF "%PYTHON_VERSION:~3,1%" == "." (
+    SET MINOR_PYTHON_VERSION=%PYTHON_VERSION:~2,1%
 ) ELSE (
-    SET MINOR_PYTHON_VERSION=%CONDA_PY:~2,2%
+    SET MINOR_PYTHON_VERSION=%PYTHON_VERSION:~2,2%
 )

 :: Based on the Python version, determine what SDK version to use, and whether
@@ -67,7 +67,7 @@
     )
 )

-IF %ARCH% == 64 (
+IF %PYTHON_ARCH% == 64 (
     IF %SET_SDK_64% == Y (
         ECHO Configuring Windows SDK %WINDOWS_SDK_VERSION% for Python %MAJOR_PYTHON_VERSION% on a 64 bit architecture
         SET DISTUTILS_USE_SDK=1


fix bug of upload third party to bos (#36311)

--- paddle/scripts/paddle_build.bat
+++ paddle/scripts/paddle_build.bat
@@ -395,15 +395,15 @@
         echo Getting third party: extracting ...
         tar -xf %md5%.tar.gz
         if !ERRORLEVEL! EQU 0 (
-            echo Get third party from bos successfully
+            echo Get third party from bos successfully.
         ) else (
-            echo Get third party failed, reason: extract failed, will build locally
+            echo Get third party failed, reason: extract failed, will build locally.
         )
         del %md5%.tar.gz
     ) else (
-        echo Get third party failed, reason: download failed, will build locally
-    )
-    if not exist %THIRD_PARTY_PATH% ( set UPLOAD_TP_FILE=ON )
+        echo Get third party failed, reason: download failed, will build locally.
+    )
+    if not exist %THIRD_PARTY_PATH% set UPLOAD_TP_FILE=ON
     cd %work_dir%\%BUILD_DIR%
 ) else (
     echo Found reusable third_party cache in %THIRD_PARTY_PATH%, will reuse it.
@@ -540,18 +540,18 @@
         tar -zcf %md5%.tar.gz %md5%
         if !errorlevel! EQU 0 (
             echo Uploading third_party: uploading ...
-            %PYTHON_ROOT%\python.exe %BCE_FILE% %md5%.tar.gz paddle-windows/third_party/%sub_dir% 1>nul
+            %PYTHON_ROOT%\python.exe !BCE_FILE! %md5%.tar.gz paddle-windows/third_party/%sub_dir% 1>nul
             if !errorlevel! EQU 0 (
-                echo Upload third party to bos paddle-windows/third_party/%sub_dir% successfully
+                echo Upload third party %md5% to bos paddle-windows/third_party/%sub_dir% successfully.
             ) else (
-                echo Failed upload third party to bos, reason: upload failed
+                echo Failed upload third party to bos, reason: upload failed.
             )
         ) else (
-            echo Failed upload third party to bos, reason: compress failed
+            echo Failed upload third party to bos, reason: compress failed.
         )
         del %md5%.tar.gz
     ) else (
-        echo Failed upload third party to bos, reason: install bce failed
+        echo Failed upload third party to bos, reason: install bce failed.
     )
     cd %work_dir%\%BUILD_DIR%
 )


Update deploy.cmd

Update deploy.cmd

Comment wasn't ending the line.

--- deploy.cmd
+++ deploy.cmd
@@ -69,7 +69,8 @@
 IF NOT EXIST RUBY_INSTALLED (
     PATH="%path%";%RUBY_PATH%
     call %RUBY_DEVKIT_PATH%\devkitvars.bat
-    call gem install jekyll --source http://rubygems.org :: This is a work around.
+    :: This is a work around and needs to be addressed.
+    call gem install jekyll --source http://rubygems.org
 	IF !ERRORLEVEL! NEQ 0 goto error
 	SET RUBY_INSTALLED="true"
 )


updated the deployment script

updated the deployment script

--- deploy.cmd
+++ deploy.cmd
@@ -80,7 +80,7 @@
     path=%path%;%RUBY_PATH%
     call %RUBY_DEVKIT_PATH%\devkitvars.bat
     gem install jekyll
-
+
 echo "Set Ruby Instlled"

     SET RUBY_INSTALLED=true
@@ -88,7 +88,7 @@

 echo "Run Jekyll"

-jekyll build -s %DEPLOYMENT_TARGET% -d %DEPLOYMENT_TARGET%\_site
+jekyll build -s "%DEPLOYMENT_TARGET%" -d "%DEPLOYMENT_TARGET%\_site"

 echo "Jekyll complete"


Update deploy.cmd for rc1

Update deploy.cmd for rc1

--- deploy.cmd
+++ deploy.cmd
@@ -81,10 +81,10 @@

 :: 1. Set DNX Path
 set DNVM_CMD_PATH_FILE="%USERPROFILE%\.dnx\temp-set-envvars.cmd"
-set DNX_RUNTIME="%USERPROFILE%\.dnx\runtimes\dnx-CLR-win-x86.1.0.0-beta8"
+set DNX_RUNTIME="%USERPROFILE%\.dnx\runtimes\dnx-CLR-win-x86.1.0.0-rc1-update1"

 :: 2. Install DNX
-call :ExecuteCmd PowerShell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command "[System.Threading.Thread]::CurrentThread.CurrentCulture = ''; [System.Threading.Thread]::CurrentThread.CurrentUICulture = '';$CmdPathFile='%DNVM_CMD_PATH_FILE%';& '%SCM_DNVM_PS_PATH%' " install 1.0.0-beta8 -arch x86 -r CLR %SCM_DNVM_INSTALL_OPTIONS%
+call :ExecuteCmd PowerShell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command "[System.Threading.Thread]::CurrentThread.CurrentCulture = ''; [System.Threading.Thread]::CurrentThread.CurrentUICulture = '';$CmdPathFile='%DNVM_CMD_PATH_FILE%';& '%SCM_DNVM_PS_PATH%' " install 1.0.0-rc1-update1 -arch x86 -r CLR %SCM_DNVM_INSTALL_OPTIONS%
 IF !ERRORLEVEL! NEQ 0 goto error


Install gulp-cli

Install gulp-cli

--- deploy.cmd
+++ deploy.cmd
@@ -14,11 +14,6 @@
   echo Missing node.js executable, please install node.js, if already installed make sure it can be reached from current environment.
   goto error
 )
-
-
-echo Installing gulp-cli
-call npm install gulp-cli@2.x.x --global
-IF !ERRORLEVEL! NEQ 0 goto error

 :: Setup
 :: -----
@@ -65,6 +60,15 @@
 IF DEFINED MSBUILD_PATH goto MsbuildPathDefined
 SET MSBUILD_PATH=%ProgramFiles(x86)%\MSBuild\14.0\Bin\MSBuild.exe
 :MsbuildPathDefined
+
+:: Install required tools
+:: ----------------------
+
+echo Installing gulp-cli
+call npm install gulp-cli@2.x.x --global
+IF !ERRORLEVEL! NEQ 0 goto error
+
+
 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 :: Deployment
 :: ----------


add some checks in the build.cmd

add some checks in the build.cmd

git-svn-id: 756506b3b0ea8c31733a8f0a5bb416c7e269da3d@126 28bd50df-7adb-d945-0439-6e466c6a13cc

--- wdkbuild/build.cmd
+++ wdkbuild/build.cmd
@@ -6,14 +6,17 @@
 set WDKBASEDIR=C:\WinDDK\7600.16385.1
 set SDKDIR=C:\Program Files\Microsoft SDKs\Windows\v7.1

+IF NOT EXIST "%WDKBASEDIR%" ECHO:[ERROR] Specify your WDK dir&&PAUSE&&EXIT
+IF NOT EXIST "%SDKDIR%" ECHO:[ERROR] Specify your SDK dir&&PAUSE&&EXIT
+
 pushd ..
-call update_version.bat
+call "update_version.bat"
 popd

 rem x86
-set INCLUDE=%WDKBASEDIR%\inc\crt;%WDKBASEDIR%\inc\api;%WDKBASEDIR%\inc\api\crt\stl60;%WDKBASEDIR%\inc\ddk
-set LIB=%WDKBASEDIR%\lib\crt\i386;%WDKBASEDIR%\lib\win7\i386
-set PATH=%WDKBASEDIR%\bin\x86;%WDKBASEDIR%\bin\x86\x86;%PATH%
+set "INCLUDE=%WDKBASEDIR%\inc\crt;%WDKBASEDIR%\inc\api;%WDKBASEDIR%\inc\api\crt\stl60;%WDKBASEDIR%\inc\ddk"
+set "LIB=%WDKBASEDIR%\lib\crt\i386;%WDKBASEDIR%\lib\win7\i386"
+set "PATH=%WDKBASEDIR%\bin\x86;%WDKBASEDIR%\bin\x86\x86;%PATH%"
 set OUTDIR=..\Release
 set OBJDIR=%OUTDIR%\obj

@@ -21,8 +24,8 @@
 call "build_base.bat" x86

 rem x64
-set LIB=%WDKBASEDIR%\lib\crt\amd64;%WDKBASEDIR%\lib\win7\amd64
-set PATH=%WDKBASEDIR%\bin\x86;%WDKBASEDIR%\bin\x86\amd64;%PATH%
+set "LIB=%WDKBASEDIR%\lib\crt\amd64;%WDKBASEDIR%\lib\win7\amd64"
+set "PATH=%WDKBASEDIR%\bin\x86;%WDKBASEDIR%\bin\x86\amd64;%PATH%"
 set OUTDIR=..\Release_x64
 set OBJDIR=%OUTDIR%\obj

@@ -32,4 +35,4 @@
 :end
 TITLE Finished!
 endlocal
-goto :eof+exit /b


Use powershell for tools install

Use powershell for tools install

--- packer/vagrant/scripts/windows/vm-guest-tools.bat
+++ packer/vagrant/scripts/windows/vm-guest-tools.bat
@@ -14,12 +14,9 @@
     rd /S /Q "C:\Program Files (x86)\VMWare"
 )

-mkdir "C:\Windows\Temp\VMware"
-pushd "C:\Windows\Temp\VMware"
-cmd /c ""C:\Program Files\7-Zip\7z.exe" x "C:\Windows\Temp\windows.iso""
-start /wait .\setup.exe /S /v"/qn REBOOT=R\"
-popd
+powershell -Command "Start-Process 'C:\Program Files\7-Zip\7z.exe' -ArgumentList @('x', 'C:\Windows\Temp\windows.iso', '-oC:\Windows\Temp\VMware') -Wait"
+powershell -Command "Start-Process 'C:\Windows\Temp\VMware\setup64.exe' -ArgumentList @('/s', '/v/qn REBOOT=F') -Wait"

 rd /Q "C:\Windows\Temp\vmware-tools.tar"
 rd /Q "C:\Windows\Temp\windows.iso"
-::rd /S /Q "C:\Windows\Temp\VMware"
+rd /S /Q "C:\Windows\Temp\VMware"


Remove build.bat (incorporated into fake script).

--- build.bat
+++ build.bat
@@ -1 +0,0 @@
- tfx extension create --manifest-globs vss-extension.json


fixing nuget path issue, thanks nik

fixing nuget path issue, thanks nik

--- build.bat
+++ build.bat
@@ -9,7 +9,7 @@
 IF NOT %ERRORLEVEL% == 0 goto FAILED

 echo Creating NU package
-lib\nuget pack MassTransit.nuspec /OutputDirectory build_artifacts
+lib\nuget pack nugets\MassTransit.nuspec /OutputDirectory build_artifacts
 IF NOT %ERRORLEVEL% == 0 goto FAILED

 echo Create ZIP package


Rename SKIP_KRE_INSTALL to SKIP_DOTNET_INSTALL

--- build.cmd
+++ build.cmd
@@ -19,7 +19,7 @@
 .nuget\NuGet.exe install KoreBuild -ExcludeVersion -o packages -nocache -pre
 .nuget\NuGet.exe install Sake -version 0.2 -o packages -ExcludeVersion

-IF "%SKIP_KRE_INSTALL%"=="1" goto run
+IF "%SKIP_DOTNET_INSTALL%"=="1" goto run
 CALL packages\KoreBuild\build\dotnetsdk upgrade -runtime CLR -x86
 CALL packages\KoreBuild\build\dotnetsdk install default -runtime CoreCLR -x86


Remove old nupkg in build.cmd

Remove old nupkg in build.cmd

--- build.cmd
+++ build.cmd
@@ -1 +1,2 @@
+del *.nupkg
 nuget pack -Build -Symbols -Properties Configuration=Release Source\LandauMedia.Telemetry\LandauMedia.Telemetry.csproj


Delete build.cmd

Delete build.cmd

--- build.cmd
+++ build.cmd
@@ -1,3 +0,0 @@
-
-
-"C:\Program Files (x86)\MSBuild\14.0\Bin\MSBuild" build/binding.sln /clp:Verbosity=minimal


minor fix in build script

minor fix in build script

--- build.cmd
+++ build.cmd
@@ -1,2 +1 @@
 @%WINDIR%\Microsoft.Net\Framework\v4.0.30319\msbuild build.proj /m /clp:Verbosity=minimal
-pause


added messages to help debug current stage

--- build.cmd
+++ build.cmd
@@ -1,4 +1,6 @@
 @echo Off
+ECHO Starting build
+
 set config=%1
 if "%config%" == "" (
    set config=Release
@@ -13,26 +15,32 @@
   set nuget=nuget.exe
 )

+ECHO Running MSBUILD
 REM Build
 %WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild IsValid.sln /p:Configuration="%config%" /m /v:M /fl /flp:LogFile=msbuild.log;Verbosity=Normal /nr:false

 if not "%GallioEcho%" == "" (
+
+  ECHO Running unit tests
   REM Unit tests
   %GallioEcho% IsValid\IsValid.Tests\bin\%config%\IsValid.Tests.dll
   if not "%errorlevel%"=="0" goto failure
 )

 REM Package
+ECHO Building pacakges
 mkdir Build
 call %nuget% pack "IsValid\IsValid.csproj" -IncludeReferencedProjects -o Build -p Configuration=%config% %version%
 if not "%errorlevel%"=="0" goto failure

 :success
+ECHO successfully built project
 exit 0
 goto end

 :failure
+ECHO failed to build.
 exit -1
 goto end


tests/test-recipes/metadata/source_git_jinja2/bld.bat: Should be double equals.

--- tests/test-recipes/metadata/source_git_jinja2/bld.bat
+++ tests/test-recipes/metadata/source_git_jinja2/bld.bat
@@ -8,7 +8,7 @@
 echo "%gitdesc%"
 if not "%gitdesc%"=="1.8.1" exit 1
 echo "%PKG_VERSION%"
-if not "%PKG_VERSION%"="1.8.1" exit 1
+if not "%PKG_VERSION%"=="1.8.1" exit 1
 git status
 if errorlevel 1 exit 1
 git diff


Installer script adjusted

Installer script adjusted

--- installer/create_installer.bat
+++ installer/create_installer.bat
@@ -29,4 +29,4 @@

 ENDLOCAL

-"c:\Program Files (x86)\Inno Setup 5\compil32" /cc setup.iss+"c:\Program Files (x86)\Inno Setup 5\iscc" setup.iss


update

update

--- iCatalyst.bat
+++ iCatalyst.bat
@@ -838,17 +838,17 @@
 1>&2 echo  /png:#	Optimization settings PNG:
 1>&2 echo 	1 - Compression level - Xtreme
 1>&2 echo 	2 - Compression level - Advanced
-1>&2 echo 	0 - Skip PNG optimization (default)
+1>&2 echo 	0 - Skip (default)
 1>&2 echo.
 1>&2 echo  /jpg:#	Optimization settings JPEG:
 1>&2 echo 	1 - Encoding Process - Baseline
 1>&2 echo 	2 - Encoding Process - Progressive
 1>&2 echo 	3 - Optimization settings default
-1>&2 echo 	0 - Skip JPEG optimization (default)
+1>&2 echo 	0 - Skip (default)
 1>&2 echo.
 1>&2 echo  /gif:#	Optimization settings GIF:
 1>&2 echo 	1 - Optimization settings default
-1>&2 echo 	0 - Skip GIF optimization (default)
+1>&2 echo 	0 - Skip (default)
 1>&2 echo.
 1>&2 echo  "/outdir:#" Settings save optimized images:
 1>&2 echo 	true  - replace the original image on optimized
@@ -859,7 +859,7 @@
 1>&2 echo.
 1>&2 echo  Add folders \ Add files:
 1>&2 echo  - Specify the full path to the images and / or folders with images.
-1>&2 echo    For example: "C:\Images" "C:\Photos" "C:\logo.png"
+1>&2 echo    For example: "C:\Images" "C:\logo.png"
 1>&2 echo  - The full paths of images should not be special characters.
 1>&2 echo    For example: "&", "%%", "(", ")" etc.
 1>&2 echo  - The application automatically optimizes images in nested subfolders.


Add build time

Add build time

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

--- src/application.bat
+++ src/application.bat
@@ -0,0 +1 @@
+echo "Build : 10:00"


Update stage_1_tempclean.bat

Update stage_1_tempclean.bat

--- resources/stage_1_tempclean/stage_1_tempclean.bat
+++ resources/stage_1_tempclean/stage_1_tempclean.bat
@@ -33,7 +33,7 @@
 ::::::::::::::::::::::::
 :: STAGE 1: TEMPCLEAN :: // Begin jobs
 ::::::::::::::::::::::::
-call :log "%CUR_DATE% %TIME%   stage_1_tempclean jobs begin..."
+call :log "%CUR_DATE% %TIME%   stage_1_tempclean begin..."

 :: JOB: Clean Internet Explorer; Windows built-in method. Only works on Vista and up
@@ -129,7 +129,7 @@

 :: Stage complete
-call :log "%CUR_DATE% %TIME%   stage_1_tempclean jobs complete."
+call :log "%CUR_DATE% %TIME%   stage_1_tempclean complete."


added a script to restore .net packages for when it's used as a submodule dependency

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

--- RestorePackages.Core.bat
+++ RestorePackages.Core.bat
@@ -0,0 +1 @@
+dotnet restore "src/NEventStore.Core.2017.sln"


Removed timeout for windows start script on rdb and hdb

--- start_torq_demo.bat
+++ start_torq_demo.bat
@@ -23,9 +23,9 @@

 REM launch the tickerplant, rdb, hdb
 start "tickerplant" q code/processes/tickerplant.q database %TORQHOME%/hdb -proctype tickerplant -procname tickerplant1 -U config/passwords/accesslist.txt -localtime
-start "rdb" q torq.q -load code/processes/rdb.q -proctype rdb -procname rdb1 -U config/passwords/accesslist.txt -localtime -g 1 -T 30
-start "hdb1" q torq.q -load %KDBHDB% -proctype hdb -procname hdb1 -U config/passwords/accesslist.txt -localtime -g 1 -T 60 -w 4000
-start "hdb2" q torq.q -load %KDBHDB% -proctype hdb -procname hdb2 -U config/passwords/accesslist.txt -localtime -g 1 -T 60 -w 4000
+start "rdb" q torq.q -load code/processes/rdb.q -proctype rdb -procname rdb1 -U config/passwords/accesslist.txt -localtime -g 1
+start "hdb1" q torq.q -load %KDBHDB% -proctype hdb -procname hdb1 -U config/passwords/accesslist.txt -localtime -g 1 -w 4000
+start "hdb2" q torq.q -load %KDBHDB% -proctype hdb -procname hdb2 -U config/passwords/accesslist.txt -localtime -g 1 -w 4000

 REM launch the gateway
 start "gateway" q torq.q -load code/processes/gateway.q -proctype gateway -procname gateway1 -.servers.CONNECTIONS hdb rdb -U config/passwords/accesslist.txt -localtime -g 1 -w 4000


Temporarily turn off WITH_INFERENCE_API_TEST (#27170)

--- paddle/scripts/paddle_build.bat
+++ paddle/scripts/paddle_build.bat
@@ -111,6 +111,8 @@
 :CASE_wincheck_openblas
 set WITH_MKL=OFF
 set WITH_GPU=ON
+rem Temporarily turn off WITH_INFERENCE_API_TEST on GPU due to compile hang
+set WITH_INFERENCE_API_TEST=OFF
 call :cmake || goto cmake_error
 call :build || goto build_error
 call :test_whl_pacakage || goto test_whl_pacakage_error


job_filexfer_base-input4_van.cmd wants should_transfer_files = yes, so they're transferred even on the same filesystem, #2273

--- src/condor_tests/job_filexfer_base-input4_van.cmd
+++ src/condor_tests/job_filexfer_base-input4_van.cmd
@@ -7,5 +7,6 @@
 transfer_input_files = job_14675_dir/submit_filetrans_input14675a.txt,job_14675_dir/submit_filetrans_input14675b.txt,job_14675_dir/submit_filetrans_input14675c.txt
 Notification = NEVER
 arguments = --job=14675 --extrainput
+should_transfer_files = yes
 queue


GCC+Yasm bat-file

GCC+Yasm bat-file

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

--- gcc-tp.bat
+++ gcc-tp.bat
@@ -0,0 +1,5 @@
+@C:\TDM-GCC-64\bin\gcc.exe -c -o gcc-tp.obj gcc-tp.c
+@D:\UTILS\yasm.exe -f coff -m amd64 -o gcc-tp-func.obj gcc-tp-func.asm
+@C:\TDM-GCC-64\bin\gcc.exe gcc-tp.obj gcc-tp-func.obj -o gcc-tp.exe
+@C:\TDM-GCC-64\bin\strip.exe --strip-all gcc-tp.exe
+@D:\UTILS\upx.exe -q -9 gcc-tp.exe


Changed nuget update script for FW

Changed nuget update script for FW

--- src/restore_packages.cmd
+++ src/restore_packages.cmd
@@ -1,3 +1,3 @@
 .\.nuget\nuget restore -NonInteractive
-cd .\cqrs
+cd .\Jarvis.Framework
 call restore_packages.cmd


Fixing merge tool

Fixing merge tool

--- BuildMergedAssemblies.cmd
+++ BuildMergedAssemblies.cmd
@@ -1,6 +1,9 @@
-cd %~dp0\binaries
+cd %~dp0
+mkdir binaries
+mkdir merged
+cd binaries

-copy "..\src\SevenDigital.Messaging\bin\Release\*.dll" "." /Y
+copy "..\src\SevenDigital.Messaging.Base\bin\Release\*.dll" "." /Y

 ..\tools\ILMerge.exe /allowDup /targetplatform:v4 /out:..\merged\SevenDigital.Messaging.dll SevenDigital.Messaging.Base.dll Magnum.dll MassTransit.dll MassTransit.Transports.RabbitMq.dll RabbitMQ.Client.dll StructureMap.dll


test2

--- mpg-config.bat
+++ mpg-config.bat
@@ -1,5 +1,4 @@
 @echo off
-

 set COMPILER="Visual Studio 10 Win64"
 set COMPILER="Visual Studio 10"


Generate "smart defaults" for new non-nullable columns when generating DB change script

--- build/include/GenerateChangeScript.bat
+++ build/include/GenerateChangeScript.bat
@@ -9,9 +9,9 @@

 if not [%3] == [] (
     if [%4] == [] goto Help
-    call %sqlPackageDir%\SqlPackage.exe /Action:Script /SourceFile:DeploymentCockpit.Database.dacpac /TargetDatabaseName:%1 /TargetServerName:%2 /TargetUser:%3 /TargetPassword:%4 /OutputPath:ChangeScript.sql
+    call %sqlPackageDir%\SqlPackage.exe /Action:Script /p:GenerateSmartDefaults=True /SourceFile:DeploymentCockpit.Database.dacpac /TargetDatabaseName:%1 /TargetServerName:%2 /TargetUser:%3 /TargetPassword:%4 /OutputPath:ChangeScript.sql
 ) else (
-    call %sqlPackageDir%\SqlPackage.exe /Action:Script /SourceFile:DeploymentCockpit.Database.dacpac /TargetDatabaseName:%1 /TargetServerName:%2 /OutputPath:ChangeScript.sql
+    call %sqlPackageDir%\SqlPackage.exe /Action:Script /p:GenerateSmartDefaults=True /SourceFile:DeploymentCockpit.Database.dacpac /TargetDatabaseName:%1 /TargetServerName:%2 /OutputPath:ChangeScript.sql
 )

 set sqlPackageDir=


分词效果评估脚本

分词效果评估脚本

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

--- evaluation.bat
+++ evaluation.bat
@@ -0,0 +1,6 @@
+@echo off
+call mvn clean install dependency:copy-dependencies
+set JAVA_OPTS=-Xms1200m -Xmx1200m
+set CLASS_PATH=target/classes;target/dependency/slf4j-api-1.6.4.jar;target/dependency/logback-classic-0.9.28.jar;target/dependency/logback-core-0.9.28.jar
+set EXECUTOR=java %JAVA_OPTS% -cp %CLASS_PATH%
+call %EXECUTOR% org.apdplat.word.corpus.Evaluation


Fix for nuget_publish.bat script when old nuget packages are present

--- FastCGI/nuget_publish.bat
+++ FastCGI/nuget_publish.bat
@@ -1,2 +1,3 @@
+del FastCGI.*.nupkg
 nuget pack -Prop Configuration=Release
 nuget push FastCGI.*.nupkg


Add batch file for project creation

Add batch file for project creation

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

--- new-client.bat
+++ new-client.bat
@@ -0,0 +1,14 @@
+@echo off
+
+echo ===========================================================================
+echo  1. Create bower.json, package.json
+echo  2. Download gulpfile.js
+echo  3. Make directories
+echo.
+
+pause && npm init && bower init && ^
+npm install gulp gulp-sass gulp-jade gulp-shell gulp-coffee && ^
+curl -O https://raw.githubusercontent.com/PixxxeL/regular-gulpfile/master/gulpfile.js && ^
+mkdir jade html coffee js sass css img
+
+exit 0


made picky optional and included in arguments

--- set-env.bat
+++ set-env.bat
@@ -11,6 +11,7 @@
 IF /i "%1" == "create" GOTO create
 IF /i "%1" == "install" GOTO create
 IF /i "%1" == "update" GOTO update
+IF /i "%1" == "check-env-via-picky" GOTO picky
 IF %ERRORLEVEL% GEQ 1 GOTO create

 GOTO :EOF
@@ -18,10 +19,10 @@

 :: if it can't be activated, create it
 :create
-CALL conda create -n %env_name% --file conda_versions.txt
-:: don't CALL pip if conda runs into trouble
+CALL conda create -n %env_name% python=3.5 --file conda_versions.txt
+:: don't call pip if conda runs into trouble
 IF %ERRORLEVEL% GEQ 1 EXIT /B 2
-:: CALL pip if we have pip requirements
+:: call pip if we have pip requirements
 IF exist requirements.txt (
     CALL activate %env_name%
     CALL pip install -r requirements.txt
@@ -39,6 +40,8 @@
 CALL picky --update
 )

+:picky
 CALL picky
+GOTO :EOF

 GOTO :EOF


Update RingLibUV - document.bat

Update RingLibUV - document.bat

--- extensions/ringlibuv/document.bat
+++ extensions/ringlibuv/document.bat
@@ -1,2 +1,2 @@
 ring gendoc.ring
-copy ringlibsdlfuncsdoc.txt ..\docs\source\+copy ringlibuvfuncsdoc.txt ..\docs\source\


Update RingSQLite - buildvc.bat - use locatevc.bat

--- extensions/ringsqlite/buildvc.bat
+++ extensions/ringsqlite/buildvc.bat
@@ -1,5 +1,5 @@
 cls
-call "C:\Program Files\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x86
+call ../../src/locatevc.bat
 cl /c /DEBUG ring_vmsqlite.c sqlite3.c -I"..\..\include"
 link /DEBUG ring_vmsqlite.obj sqlite3.obj  ..\..\lib\ring.lib /DLL /OUT:..\..\bin\ring_sqlite.dll /SUBSYSTEM:CONSOLE,"5.01"
 del *.obj


GERONIMO-1344 - Fix issue where you get Java usage help when a trailing slash '/' is in GERONIMO_HOME environment variable (merged from 1.0 branch)

git-svn-id: d69ffe4ccc4861bf06065bd0072b85c931fba7ed@370077 13f79535-47bb-0310-9956-ffa450edef68

--- modules/scripts/src/resources/bin/geronimo.bat
+++ modules/scripts/src/resources/bin/geronimo.bat
@@ -105,11 +105,14 @@
 :okOsCheck
 setlocal

-if not "%GERONIMO_HOME%" == "" goto gotHome
+if not "%GERONIMO_HOME%" == "" goto resolveHome
+@REM %~dp0 is expanded pathname of the current script
+set GERONIMO_HOME=%~dp0..
+
+@REM resolve .. and remove any trailing slashes
+:resolveHome
 set CURRENT_DIR=%cd%
-@REM %~dp0 is expanded pathname of the current script
-cd %~dp0..
-@REM reference %cd% to resolve ..
+cd %GERONIMO_HOME%
 set GERONIMO_HOME=%cd%
 cd %CURRENT_DIR%


adding msvc setup script

adding msvc setup script

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

--- setup_msvc.bat
+++ setup_msvc.bat
@@ -0,0 +1,17 @@
+@ECHO OFF
+
+set VC_ROOT=%ProgramFiles%\Microsoft Visual Studio 14.0\VC\
+
+if exist "%VC_ROOT%bin\VCVARS32.BAT" (
+    call "%VC_ROOT%bin\VCVARS32.BAT"
+)
+
+conan install . --build=missing -s build_type=Debug -s compiler="Visual Studio" -s compiler.runtime="MDd"
+
+MKDIR build
+
+PUSHD build
+
+cmake -G "Visual Studio 14 Win64" ..
+
+POPD


+ We now grab the build id from BUILD-ID and stuff it in the version string

--- NTconfig/set_vars.bat
+++ NTconfig/set_vars.bat
@@ -1,100 +1,112 @@
-@echo off
-REM ======================================================================
-REM First set all the variables that contain common bits for our build
-REM environment.
-REM * * * * * * * * * * * * * PLEASE READ* * * * * * * * * * * * * * * *
-REM Microsoft Visual Studio will choke on variables that contain strings
-REM exceeding 255 chars, so be careful when editing this file! It's
-REM totally lame but there's nothing we can do about it.
-REM ======================================================================
-
-REM Set paths to Visual C++, the Platform SDKs, and Perl
-set VC_DIR=C:\Program Files\Microsoft Visual Studio\VC98\Bin
-set SDK_DIR=C:\Program Files\Microsoft Platform SDK
-set SDK_XP_DIR=C:\Program Files\Microsoft Platform SDK for Windows XP SP2
-set PERL_DIR=C:\Perl\bin
-set DBG_DIR=C:\Program Files\Debugging Tools for Windows
-
-rem Specify symbol image path
-set _NT_SYMBOL_PATH=C:\Windows\Symbols
-
-REM Where do the completed externals live?
-if A%EXTERN_DIR%==A  set EXTERN_DIR=%cd%\..\externals
-set EXT_INSTALL=%EXTERN_DIR%\install
-set EXT_TRIGGERS=%EXTERN_DIR%\triggers
-
-REM Specify which versions of the externals we're using. To add a
-REM new external, just add its version here, and add that to the
-REM EXTERNALS_NEEDED variable defined below.
-set EXT_GSOAP_VERSION=gsoap-2.7.6c-p2
-set EXT_OPENSSL_VERSION=openssl-0.9.8
-set EXT_POSTGRESQL_VERSION=postgresql-8.0.2
-set EXT_KERBEROS_VERSION=krb5-1.4.3
-set EXT_GLOBUS_VERSION=
-set EXT_PCRE_VERSION=pcre-5.0
-set EXT_DRMAA_VERSION=drmaa-1.5.1
-
-REM Now tell the build system what externals we need built.
-set EXTERNALS_NEEDED=%EXT_GSOAP_VERSION% %EXT_OPENSSL_VERSION% %EXT_KERBEROS_VERSION% %EXT_GLOBUS_VERSION% %EXT_PCRE_VERSION% %EXT_POSTGRESQL_VERSION% %EXT_DRMAA_VERSION%
-
-REM Put NTConfig in the PATH, since it's got lots of stuff we need
-REM like awk, gunzip, tar, bison, yacc...
-set PATH=%cd%;%SystemRoot%;%SystemRoot%\system32;%PERL_DIR%;%VC_DIR%;%SDK_DIR%;%SDK_XP_DIR%;%DBG_DIR%
-
-call vcvars32.bat
-if not defined INCLUDE ( echo . && echo *** Failed to run VCVARS32.BAT! Is Microsoft Visual Studio 6.0 installed? && exit /B 1 )
-call setenv /2000 /RETAIL
-if not defined MSSDK ( echo . && echo *** Failed to run SETENV.BAT! Is Microsoft Platform SDK installed? && exit /B 1 )
-
-REM Set up some stuff for BISON
-set BISON_SIMPLE=%cd%\bison.simple
-set BISON_HAIRY=%cd%\bison.hairy
-
-REM Tell the build system where we can find soapcpp2
-set SOAPCPP2=%EXT_INSTALL%\%EXT_GSOAP_VERSION%\soapcpp2.exe
-
-set CONDOR_INCLUDE=/I "..\src\h" /I "..\src\condor_includes" /I "..\src\condor_c++_util" /I "..\src\condor_daemon_client" /I "..\src\condor_daemon_core.V6" /I "..\src\condor_schedd.V6" /GR
-set CONDOR_LIB=Crypt32.lib mpr.lib psapi.lib mswsock.lib netapi32.lib imagehlp.lib advapi32.lib ws2_32.lib user32.lib oleaut32.lib ole32.lib
-set CONDOR_LIBPATH=
-
-REM Tell VC makefiles that we do not wish to use external dependency
-REM (.dep) files.
-set NO_EXTERNAL_DEPS=1
-
-REM ======================================================================
-REM Now set the individual variables specific to each external package.
-REM Some have been defined, but are not in use yet.
-REM ======================================================================
-
-REM ** GSOAP
-set CONDOR_GSOAP_INCLUDE=/I %EXT_INSTALL%\%EXT_GSOAP_VERSION%\src /DHAVE_BACKFILL=1 /DHAVE_BOINC=1 /DWITH_OPENSSL=1 /DCOMPILE_SOAP_SSL=1 /DHAVE_EXT_GSOAP=1
-set CONDOR_GSOAP_LIB=
-set CONDOR_GSOAP_LIBPATH=
-
-REM ** GLOBUS
-set CONDOR_GLOBUS_INCLUDE=
-set CONDOR_GLOBUS_LIB=
-set CONDOR_GLOBUS_LIBPATH=
-
-REM ** OPENSSL
-set CONDOR_OPENSSL_INCLUDE=/I %EXT_INSTALL%\%EXT_OPENSSL_VERSION%\inc32 /D HAVE_EXT_OPENSSL
-set CONDOR_OPENSSL_LIB=libeay32.lib ssleay32.lib
-set CONDOR_OPENSSL_LIBPATH=/LIBPATH:%EXT_INSTALL%\%EXT_OPENSSL_VERSION%\out32dll
-rem set CONDOR_OPENSSL_LIBPATH=/LIBPATH:%EXT_INSTALL%\%EXT_OPENSSL_VERSION%\out32dll /NODEFAULTLIB:LIBCMT.LIB
-
-REM ** POSTGRESQL
-set CONDOR_POSTGRESQL_INCLUDE=/I %EXT_INSTALL%\%EXT_POSTGRESQL_VERSION%\inc32 /D WANT_QUILL
-set CONDOR_POSTGRESQL_LIB=libpqdll.lib
-set CONDOR_POSTGRESQL_LIBPATH=/LIBPATH:%EXT_INSTALL%\%EXT_POSTGRESQL_VERSION%\out32dll
-
-REM ** KERBEROS
-set CONDOR_KERB_INCLUDE=/I %EXT_INSTALL%\%EXT_KERBEROS_VERSION%\include /D HAVE_EXT_KRB5
-set CONDOR_KERB_LIB=comerr32.lib gssapi32.lib k5sprt32.lib krb5_32.lib xpprof32.lib
-set CONDOR_KERB_LIBPATH=/LIBPATH:%EXT_INSTALL%\%EXT_KERBEROS_VERSION%\lib
-
-REM ** PCRE
-set CONDOR_PCRE_INCLUDE=/I %EXT_INSTALL%\%EXT_PCRE_VERSION%\include
-set CONDOR_PCRE_LIB=libpcre.lib
-set CONDOR_PCRE_LIBPATH=/LIBPATH:%EXT_INSTALL%\%EXT_PCRE_VERSION%\lib
-
-exit /B 0
+@echo off
+REM ======================================================================
+REM First set all the variables that contain common bits for our build
+REM environment.
+REM * * * * * * * * * * * * * PLEASE READ* * * * * * * * * * * * * * * *
+REM Microsoft Visual Studio will choke on variables that contain strings
+REM exceeding 255 chars, so be careful when editing this file! It's
+REM totally lame but there's nothing we can do about it.
+REM ======================================================================
+
+REM Set paths to Visual C++, the Platform SDKs, and Perl
+set VC_DIR=C:\Program Files\Microsoft Visual Studio\VC98\Bin
+set SDK_DIR=C:\Program Files\Microsoft Platform SDK
+set SDK_XP_DIR=C:\Program Files\Microsoft Platform SDK for Windows XP SP2
+set PERL_DIR=C:\Perl\bin
+set DBG_DIR=C:\Program Files\Debugging Tools for Windows
+
+rem Specify symbol image path
+set _NT_SYMBOL_PATH=C:\Windows\Symbols
+
+REM Where do the completed externals live?
+if A%EXTERN_DIR%==A  set EXTERN_DIR=%cd%\..\externals
+set EXT_INSTALL=%EXTERN_DIR%\install
+set EXT_TRIGGERS=%EXTERN_DIR%\triggers
+
+REM Specify which versions of the externals we're using. To add a
+REM new external, just add its version here, and add that to the
+REM EXTERNALS_NEEDED variable defined below.
+set EXT_GSOAP_VERSION=gsoap-2.7.6c-p2
+set EXT_OPENSSL_VERSION=openssl-0.9.8
+set EXT_POSTGRESQL_VERSION=postgresql-8.0.2
+set EXT_KERBEROS_VERSION=krb5-1.4.3
+set EXT_GLOBUS_VERSION=
+set EXT_PCRE_VERSION=pcre-5.0
+set EXT_DRMAA_VERSION=drmaa-1.5.1
+
+REM Now tell the build system what externals we need built.
+set EXTERNALS_NEEDED=%EXT_GSOAP_VERSION% %EXT_OPENSSL_VERSION% %EXT_KERBEROS_VERSION% %EXT_GLOBUS_VERSION% %EXT_PCRE_VERSION% %EXT_POSTGRESQL_VERSION% %EXT_DRMAA_VERSION%
+
+REM Put NTConfig in the PATH, since it's got lots of stuff we need
+REM like awk, gunzip, tar, bison, yacc...
+set PATH=%cd%;%SystemRoot%;%SystemRoot%\system32;%PERL_DIR%;%VC_DIR%;%SDK_DIR%;%SDK_XP_DIR%;%DBG_DIR%
+
+call vcvars32.bat
+if not defined INCLUDE ( echo . && echo *** Failed to run VCVARS32.BAT! Is Microsoft Visual Studio 6.0 installed? && exit /B 1 )
+call setenv /2000 /RETAIL
+if not defined MSSDK ( echo . && echo *** Failed to run SETENV.BAT! Is Microsoft Platform SDK installed? && exit /B 1 )
+
+REM Set up some stuff for BISON
+set BISON_SIMPLE=%cd%\bison.simple
+set BISON_HAIRY=%cd%\bison.hairy
+
+REM Tell the build system where we can find soapcpp2
+set SOAPCPP2=%EXT_INSTALL%\%EXT_GSOAP_VERSION%\soapcpp2.exe
+
+REM Determine the build id, if it is defined
+pushd ..
+set BID=none
+if exist BUILD-ID. (
+    echo Found BUILD-ID in %cd%
+    for /f %%i in ('more BUILD-ID') do set BID=%%i
+) else (
+    echo No build-id defined (i.e. the file %cd%\BUILD-ID is missing)
+)
+echo Using build-id: %BID%
+popd
+
+set CONDOR_INCLUDE=/I "..\src\h" /I "..\src\condor_includes" /I "..\src\condor_c++_util" /I "..\src\condor_daemon_client" /I "..\src\condor_daemon_core.V6" /I "..\src\condor_schedd.V6" /GR /D BUILDID=%BID%
+set CONDOR_LIB=Crypt32.lib mpr.lib psapi.lib mswsock.lib netapi32.lib imagehlp.lib advapi32.lib ws2_32.lib user32.lib oleaut32.lib ole32.lib
+set CONDOR_LIBPATH=
+
+REM Tell VC makefiles that we do not wish to use external dependency
+REM (.dep) files.
+set NO_EXTERNAL_DEPS=1
+
+REM ======================================================================
+REM Now set the individual variables specific to each external package.
+REM Some have been defined, but are not in use yet.
+REM ======================================================================
+
+REM ** GSOAP
+set CONDOR_GSOAP_INCLUDE=/I %EXT_INSTALL%\%EXT_GSOAP_VERSION%\src /DHAVE_BACKFILL=1 /DHAVE_BOINC=1 /DWITH_OPENSSL=1 /DCOMPILE_SOAP_SSL=1 /DHAVE_EXT_GSOAP=1
+set CONDOR_GSOAP_LIB=
+set CONDOR_GSOAP_LIBPATH=
+
+REM ** GLOBUS
+set CONDOR_GLOBUS_INCLUDE=
+set CONDOR_GLOBUS_LIB=
+set CONDOR_GLOBUS_LIBPATH=
+
+REM ** OPENSSL
+set CONDOR_OPENSSL_INCLUDE=/I %EXT_INSTALL%\%EXT_OPENSSL_VERSION%\inc32 /D HAVE_EXT_OPENSSL
+set CONDOR_OPENSSL_LIB=libeay32.lib ssleay32.lib
+set CONDOR_OPENSSL_LIBPATH=/LIBPATH:%EXT_INSTALL%\%EXT_OPENSSL_VERSION%\out32dll
+rem set CONDOR_OPENSSL_LIBPATH=/LIBPATH:%EXT_INSTALL%\%EXT_OPENSSL_VERSION%\out32dll /NODEFAULTLIB:LIBCMT.LIB
+
+REM ** POSTGRESQL
+set CONDOR_POSTGRESQL_INCLUDE=/I %EXT_INSTALL%\%EXT_POSTGRESQL_VERSION%\inc32 /D WANT_QUILL
+set CONDOR_POSTGRESQL_LIB=libpqdll.lib
+set CONDOR_POSTGRESQL_LIBPATH=/LIBPATH:%EXT_INSTALL%\%EXT_POSTGRESQL_VERSION%\out32dll
+
+REM ** KERBEROS
+set CONDOR_KERB_INCLUDE=/I %EXT_INSTALL%\%EXT_KERBEROS_VERSION%\include /D HAVE_EXT_KRB5
+set CONDOR_KERB_LIB=comerr32.lib gssapi32.lib k5sprt32.lib krb5_32.lib xpprof32.lib
+set CONDOR_KERB_LIBPATH=/LIBPATH:%EXT_INSTALL%\%EXT_KERBEROS_VERSION%\lib
+
+REM ** PCRE
+set CONDOR_PCRE_INCLUDE=/I %EXT_INSTALL%\%EXT_PCRE_VERSION%\include
+set CONDOR_PCRE_LIB=libpcre.lib
+set CONDOR_PCRE_LIBPATH=/LIBPATH:%EXT_INSTALL%\%EXT_PCRE_VERSION%\lib
+
+exit /B 0


Added signing info to build flags

Added signing info to build flags

--- ObjectModel/build.bat
+++ ObjectModel/build.bat
@@ -1,4 +1,4 @@
 mkdir ..\packages
 call NuGetRestorePackagesOnly.bat VersionOne.SDK.ObjectModel.csproj %1
 call NuGetUpdatePackages.bat packages.config
-msbuild VersionOne.SDK.ObjectModel.csproj /p:V1BuildToolsPath=%1 /p:NuGetExePath=%1\NuGet.exe /p:RequireRestoreConsent=false /p:Configuration=Release /p:Platform=AnyCPU /p:Major=12 /p:Minor=2  /p:Revision=0 /p:AssemblyInformationalVersion="12.2.1.3588 Summer 2012" /p:AssemblyCopyright="Copyright 2012, VersionOne, Inc. Licensed under modified BSD." /p:CompanyName="VersionOne, Inc" /p:AssemblyProduct="VersionOne.SDK.ObjectModel" /p:AssemblyTitle="VersionOne SDK Object Model" /p:AssemblyDescription="VersionOne SDK .NET Object Model Release Build"+msbuild VersionOne.SDK.ObjectModel.csproj /p:V1BuildToolsPath=%1 /p:NuGetExePath=%1\NuGet.exe /p:RequireRestoreConsent=false /p:Configuration=Release /p:Platform=AnyCPU /p:Major=12 /p:Minor=2  /p:Revision=0 /p:AssemblyInformationalVersion="12.2.1.3588 Summer 2012" /p:AssemblyCopyright="Copyright 2012, VersionOne, Inc. Licensed under modified BSD." /p:CompanyName="VersionOne, Inc" /p:AssemblyProduct="VersionOne.SDK.ObjectModel" /p:AssemblyTitle="VersionOne SDK Object Model" /p:AssemblyDescription="VersionOne SDK .NET Object Model Release Build" /p:SignAssembly=%SIGN_ASSEMBLY% /p:AssemblyOriginatorKeyFile=%SIGNING_KEY%


Added osgshaderterrain and osgparametric to runexamples.bat

git-svn-id: 23b6355f2bb369032457de4eb5f713ee134f73a8@4734 16af8721-9629-0410-8352-f15c8da7e697

--- runexamples.bat
+++ runexamples.bat
@@ -123,6 +123,12 @@
 echo osgshaders
 osgshaders

+echo osgshaderterrain
+osgshaderterrain
+
+echo osgparametric
+osgparametric
+
 echo osgviewer glsl_simple.osg
 osgviewer glsl_simple.osg


Fixed safemode batch add

Fixed safemode batch add

--- autoclean-startclean.bat
+++ autoclean-startclean.bat
@@ -133,9 +133,8 @@
 	reg export "HKLM\Software\Microsoft\Windows NT\CurrentVersion\Winlogon\Shell" %workingdir%\SavedShell.reg
 	echo Comand running: echo %workingdir%\autoclean-tron.bat %1 %2 %3 %4>C:\autoclean-trontemp.bat
 	echo %workingdir%\autoclean-tron.bat %1 %2 %3 %4>C:\autoclean-trontemp.bat
-	echo Command running: reg add "HKLM\Software\Microsoft\Windows NT\CurrentVersion\Winlogon\\" /t REG_DZ /v "explorer.exe,c:\autoclean-trontemp.bat"
-	reg add "HKLM\Software\Microsoft\Windows NT\CurrentVersion\Winlogon\\" /t REG_DZ /v "explorer.exe,c:\autoclean-trontemp.bat"
-
+	echo Command running: reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon" /v Shell /t REG_SZ /d "explorer.exe,c:\autoclean-trontemp.bat"
+	reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon" /v Shell /t REG_SZ /d "explorer.exe,c:\autoclean-trontemp.bat"
 	pause

 	echo Restarting...


Create UnitySVNCreateFolders.cmd

Create UnitySVNCreateFolders.cmd

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

--- UnitySVNCreateFolders.cmd
+++ UnitySVNCreateFolders.cmd
@@ -0,0 +1,98 @@
+REM
+REM A simple script in Windows Batch, to create the necessary folders for Unity project using Subversion.
+REM
+REM MUST be run in the root folder of the project.
+REM
+REM For more details see http://blog.ibuprogames.com/...
+REM
+@ECHO OFF
+
+echo Creating folders.
+pause
+
+md branches
+md tags
+md trunk
+
+cd trunk
+
+REM For graphic artists.
+md Art
+
+REM For audio engineers.
+md Audio
+
+REM Executable Versions. One folder for each platform.
+md Binaries
+md Binaries\Windows
+
+REM For designers.
+md Documentation
+
+REM Useful tools.
+md Tools
+
+REM Unity folder project.
+md Game
+
+cd Game
+
+md Assets
+md ProjectSettings
+
+cd Assets
+
+REM Music and sound effects.
+md Audio
+md Audio\Effects
+md Audio\Effects\Enviroment
+md Audio\Music
+
+REM Icons for editor.
+md Gizmos
+
+REM Postprocessing effects.
+md "Image Effects"
+
+REM 3D geometry.
+md Models
+
+REM External packages (e.g. asset store packages).
+md Packages
+
+REM Particle effects.
+md Particles
+
+REM Physical materials.
+md PhysicMaterials
+
+REM Configuration of each platform.
+md PlayerSettings
+md PlayerSettings\Windows
+
+REM Prefabs.
+md Prefabs
+
+REM Resources that are loaded at runtime.
+md Resources
+
+REM Scenes.
+md Scenes
+
+REM Code.
+md Scripts
+
+REM Shaders.
+md Shaders
+
+REM Streaming assets.
+md StreamingAssets
+
+REM Textures.
+md Textures
+
+cd ..\..\..
+
+echo Done!
+pause
+exit


Restructured the instances enumeration to output the same list as PySetup.bat. List the pip instance corresponding to py.exe instances. Use Scripts\pip.bat or Scripts\pip3.bat in the absence of Scripts\pip.exe.

--- Python/pip.bat
+++ Python/pip.bat
@@ -19,13 +19,16 @@
 :#   2020-10-28 JFL Added option -d to enabled debugging.                     #
 :#   2021-02-25 JFL Removed a dependency on my VMs host drive configuration.  #
 :#                  Use short names to compare instances reliably.            #
+:#   2021-03-02 JFL Restructured the instances enumeration like in PySetup.bat.
+:#   2021-03-04 JFL List the pip instance corresponding to py.exe instances.  #
+:#                  Use Scripts\pip[3].bat in the absence of Scripts\pip.exe. #
 :#                                                                            #
 :#          Copyright 2019 Hewlett Packard Enterprise Development LP         #
 :# Licensed under the Apache 2.0 license  www.apache.org/licenses/LICENSE-2.0 #
 :##############################################################################

 setlocal EnableExtensions DisableDelayedExpansion
-set "VERSION=2021-02-25"
+set "VERSION=2021-03-04"
 set "SCRIPT=%~nx0"		&:# Script name
 set "SNAME=%~n0"		&:# Script name, without its extension
 set "SPATH=%~dp0"		&:# Script path
@@ -39,12 +42,15 @@

 :debug.off
 set "DEBUG=0"
+set "ECHO.D=echo >NUL"
+set "ECHOVARS.D=echo >NUL"
 goto :debug.common
 :debug.on
 set "DEBUG=1"
+set "ECHO.D=echo"
+set "ECHOVARS.D=call :EchoVars"
 :debug.common
-set "ECHO.D=if %DEBUG%==1 echo"
-set "ECHOVARS.D=if %DEBUG%==1 call :EchoVars"
+set "FUNCTION=call %ECHO.D% call %%0 %%*&setlocal"
 exit /b

 :EchoVars	%1=VARNAME %2=VARNAME %3=VARNAME ...
@@ -91,7 +97,7 @@

 :# Get the default python.exe executable
 :GetPythonExe %1=VARNAME
-%ECHO.D% :GetPythonExe %1
+%ECHO.D% call :GetPythonExe %1
 call :GetOpenCommand Python.File %1
 if defined %~1 call call :GetArg0 %%1 %%%~1%%
 %ECHOVARS.D% %1
@@ -99,70 +105,127 @@

 :# Get a list of all python.exe executables
 :GetAllPythonExe %1=LISTNAME
-setlocal EnableDelayedExpansion
-set "SEARCHDRIVES=C:"		&:# List of drives where to search for python.exe.
-if not "%HOMEDRIVE%"=="C:" set "SEARCHDRIVES=%HOMEDRIVE% %SEARCHDRIVES%" &:# Prepend the home drive, if it's different.
-for /f "tokens=1" %%d in ('net use ^| findstr /C:"\\vmware-host\Shared Folders\\"') do ( :# And append VM host drives, if any.
-  if exist "%%d%ProgramFiles:~2%" set "SEARCHDRIVES=!SEARCHDRIVES! %%d"
-)
-%ECHOVARS.D% SEARCHDRIVES
-set "SHORT_LIST=" &:# List of instances found. Used to avoid reporting one twice.
+%FUNCTION% EnableDelayedExpansion
 set "LIST=" &:# List of instances found.
-:# List first the default instance
-call :GetPythonExe PYTHON
-if defined PYTHON (
-  for %%p in ("%PYTHON%") do call :lappend SHORT_LIST "%%~sp"
-  call :lappend LIST "%PYTHON%"
-)
-:# Then look for other instances in well known places
-for %%d in (%SEARCHDRIVES%) do (
+
+:# First list the default instance
+call :GetPythonExe DEFAULT
+set "SHORT_DEFAULT=" &:# Short version of the same, used to avoid reporting it twice.
+if defined DEFAULT for %%p in ("!DEFAULT!") do (
+  set "SHORT_DEFAULT=%%~sp"
+  call :lappend LIST "%%~fp"
+)
+
+:# Then list py.exe if it's not the default
+if defined DEFAULT for %%p in ("%DEFAULT%") do if not "%%~nxp"=="py.exe" (
+  for %%x in (py.exe) do set "PY=%%~$PATH:x"
+  if defined PY for %%p in ("!PY!") do (
+    call :lappend LIST "%%~fp"
+  )
+)
+
+:# Then list all instances that match the requested criteria
+call :GetAllPythonDirs ALL_DIRS
+for %%d in (%ALL_DIRS%) do (
+  for %%p in ("%%~d\python.exe") do (
+    if not "%%~sp"=="%SHORT_DEFAULT%" (
+      call :lappend LIST "%%~fp"
+    )
+  )
+)
+
+endlocal & set %~1=%LIST%
+%ECHOVARS.D% %~1
+exit /b
+
+:# Get a list of all python.exe installation directories in well known places
+:GetAllPythonDirs %1=LISTNAME
+%FUNCTION% EnableDelayedExpansion
+set "LISTNAME=%~1"
+set "DRIVES=C:"		&:# List of drives where to search for python.exe
+if not "%HOMEDRIVE%"=="C:" set "DRIVES=%HOMEDRIVE% %DRIVES%" &:# Prepend the home drive, if it's different
+for /f "tokens=1" %%d in ('net use ^| findstr /C:"\\vmware-host\Shared Folders\\"') do ( :# And append VM host drives, if any
+  if exist "%%d%ProgramFiles:~2%" set "DRIVES=!DRIVES! %%d"
+)
+%ECHOVARS.D% DRIVES
+set "LIST="
+if not defined ProgramFiles(x86) set "ProgramFiles(x86)=%ProgramFiles% (x86)" &:# For x86 VMs searching on amd64 hosts
+for %%d in (%DRIVES%) do (
   rem :# The default install dir is %LOCALAPPDATA%\Programs\Python\Python%VER% for the current user,
   rem :# Or %ProgramFiles%\Python%VER% or %ProgramFiles(x86)%\Python%VER% for all users.
   for %%p in ("" "%ProgramFiles:~2%" "%ProgramFiles(x86):~2%" "%LOCALAPPDATA:~2%\Programs") do (
     for %%y in ("Python" "Python\Python" "Microsoft Visual Studio\Shared\Python") do (
       for /d %%b in ("%%d%%~p\%%~y*") do (
-        %ECHO.D% :# Looking in %%b
+	%ECHO.D% :# Looking in %%~b
 	for %%x in ("%%~b\python.exe") do if exist "%%~x" (
-	  set "FOUND=" &:# Avoid duplications, for example with the default instance
-	  for %%s in (!SHORT_LIST!) do if not defined FOUND if /i "%%~sx"=="%%~s" set "FOUND=1"
-	  if not defined FOUND call :lappend SHORT_LIST "%%~sx" & call :lappend LIST "%%~fx"
+	  if defined LISTNAME (
+	    call :lappend LIST "%%~b"
+	  ) else (
+	    set "B=%%~b"
+	    echo !B!
+	  )
 	)
       )
     )
   )
 )
-endlocal & set %~1=%LIST%
-exit /b
-
-:# Get the corresponding pip.exe executable if it exists
-:GetPythonPipExe %1=PYTHON %2=VARNAME
-set "%~2="
-for %%p in ("%~dp1Scripts\pip.exe") do if exist %%p set "%~2=%%~p"
-exit /b
-
-:# Get a list of all pip.exe executables
-:GetAllPipExe %1=LISTNAME
-setlocal DisableDelayedExpansion
-call :GetAllPythonExe PLIST
-set "LIST="
-for %%e in (%PLIST%) do (
-  call :GetPythonPipExe %%e PIP
-  if defined PIP call call :lappend LIST "%%PIP%%"
-)
-endlocal & set %~1=%LIST%
-exit /b
-
-:# List pip.exe instances
-:list
-setlocal EnableDelayedExpansion
-call :GetAllPipExe LIST
+if defined LISTNAME (
+  set SET_RESULT=set %LISTNAME%=%LIST%
+  %ECHO.D% !SET_RESULT!
+) else (
+  set SET_RESULT=rem
+)
+endlocal & %SET_RESULT%
+exit /b
+
+:# Enumerate pip.exe instances
+:EnumPip %1=Optional instance to search; %2=Output variable name
+%FUNCTION% EnableDelayedExpansion
+call :GetAllPythonExe ALL_PYTHON
+set "WANT_INDEX=%~1"
+set "OUTVAR=%~2"
+set "FOUND="
 set "N=0"
-for %%e in (!LIST!) do (
-  echo #!N! %%~e
-  set /a "N+=1"
-)
-endlocal
-exit /b
+set ^"PY_VER_ARCH_CMD=import sys, os; print (sys.version.split()[0]+\" \"+os.environ[\"PROCESSOR_ARCHITECTURE\"])^"
+for %%e in (!ALL_PYTHON!) do (
+  set "PY_VER=" & set "PY_ARCH="
+  for /f "tokens=1,2" %%v in ('^"%%e -c "!PY_VER_ARCH_CMD!" 2^>NUL^"') do set "PY_VER=%%v" & set "PY_ARCH=%%w"
+  if defined PY_VER if defined PY_ARCH (
+    set "PY_DIR=%%~dpe" & set "PY_DIR=!PY_DIR:~0,-1!"
+    %ECHOVARS.D% PY_VER PY_ARCH PY_DIR
+    if exist "!PY_DIR!\py.exe" if not exist "!PY_DIR!\Scripts\pip.exe" (
+      :# Find the actual python instance that py.exe runs by default
+      for /f "delims=" %%p in ('^""!PY_DIR!\py.exe" -c "import sys; print (sys.executable)"^"') do (
+      	set "PY_DIR=%%~dpp" & set "PY_DIR=!PY_DIR:~0,-1!"
+      )
+    )
+    set "FOUNDX="
+    :# Python 2.7 installs a pip.bat script, but no pip.exe command
+    :# Python 3.5 installs a pip3.bat script, but no pip.exe or pip.bat
+    for %%p in (pip.exe pip.bat pip3.bat) do (
+      if not defined FOUNDX for %%p in ("!PY_DIR!\Scripts\%%p") do if exist %%p (
+      	set "FOUNDX=1"
+	set "INDEX_=!N!       "
+	set "PY_VER_=!PY_VER!       "
+	set "PY_ARCH_=!PY_ARCH!       "
+	if defined OUTVAR (
+	  if "!N!"=="!WANT_INDEX!" (
+	    set "FOUND=%%~p"
+	    goto :EnumPip.exit
+	  )
+	) else (
+	  echo #!INDEX_:~0,3! !PY_VER_:~0,8! !PY_ARCH_:~0,7! %%~p
+	)
+      )
+    )
+    set /a "N+=1"
+  )
+)
+:EnumPip.exit
+set "SET_VAR=rem"
+if defined OUTVAR set ^"SET_VAR=set "%OUTVAR%=%FOUND%"^"
+endlocal & %SET_VAR% & %ECHOVARS.D% %OUTVAR%
+exit /b 0

 :#----------------------------------------------------------------------------#
 :# Main routine
@@ -185,7 +248,7 @@

 :main
 set "EXEC="
-set "PYARGS="
+set "PIPARGS="
 if not defined PY# set "PY#=0"

 goto :get_arg
@@ -194,35 +257,27 @@
 :get_arg
 if [%1]==[] goto :go
 set "ARG=%~1"
-if "%ARG%"=="-?" call :usage & set "PYARGS=-h" & goto :go
-if "%ARG%"=="--" goto :next_pyarg &:# All remaining arguments are for pip.exe
+if "%ARG%"=="-?" call :usage & set "PIPARGS=-h" & goto :go
+if "%ARG%"=="--" goto :next_piparg &:# All remaining arguments are for pip.exe
 if "%ARG%"=="-#" set "PY#=%~2" & shift & goto :next_arg
 if "%ARG%"=="-d" call :debug.on & goto :next_arg
 if "%ARG:~0,1%"=="#" set "PY#=%ARG:~1%" & goto :next_arg
-if "%ARG%"=="-l" call :list & exit /b
-if "%ARG%"=="-V" (echo %SCRIPT% %VERSION%) & set "PYARGS=-V" & goto :go
+if "%ARG%"=="-l" call :EnumPip & exit /b
+if "%ARG%"=="-V" (echo %SCRIPT% %VERSION%) & set "PIPARGS=-V" & goto :go
 if "%ARG%"=="-X" set "EXEC=echo" & goto :next_arg
-:get_pyarg
+:get_piparg
 if [%1]==[] goto :go
-call :lappend PYARGS %1
-:next_pyarg
+call :lappend PIPARGS %1
+:next_piparg
 shift
-goto :get_pyarg
+goto :get_piparg

 :go

 :# Get the Nth Pip instance
-set "PIP="
-if %PY#%==0 ( :# Performance optimization for instance #0
-  call :GetPythonExe PYTHON
-  if defined PYTHON call call :GetPythonPipExe "%%PYTHON%%" PIP
-)
-if not defined PIP ( :# For %PY#% > 0, or if the above search for #0 failed
-  call :GetAllPipExe LIST
-  call :lindex LIST %PY#% PIP
-)
+call :EnumPip %PY#% PIP
 if not defined PIP (
   echo %SCRIPT%: Error: No pip command found
   exit /b 1
 )
-%EXEC% "%PIP%" %PYARGS%
+%EXEC% "%PIP%" %PIPARGS%


Add an install-win.bat script corresponding to the 'make install' target on Unix.

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

--- install-win.bat
+++ install-win.bat
@@ -0,0 +1,31 @@
+:: Installs from srtp windows build directory to directory specified on
+:: command line
+
+
+@if "%1"=="" (
+	echo "Usage: %~nx0 destdir"
+	exit /b 1
+) else (
+	set destdir=%1
+)
+
+@if not exist %destdir% (
+   echo %destdir% not found
+   exit /b 1
+)
+
+@for %%d in (include\srtp.h crypto\include\crypto.h Debug\srtp.lib Release\srtp.lib) do (
+	if not exist "%%d" (
+	   echo "%%d not found: are you in the right directory?"
+	   exit /b 1
+	)
+)
+
+mkdir %destdir%\include
+mkdir %destdir%\include\srtp
+mkdir %destdir%\lib
+
+copy include\*.h %destdir%\include\srtp
+copy crypto\include\*.h %destdir%\include\srtp
+copy Release\srtp.lib %destdir%\lib\srtp.lib
+copy Debug\srtp.lib %destdir%\lib\srtpd.lib


win32/check.cmd: use test_htable.

win32/check.cmd: use test_htable.

darcs-hash:20060926170507-65a35-8b59d28dbb043d097bac0a9e838c52e0ee6a88d1.gz

--- win32/check.cmd
+++ win32/check.cmd
@@ -54,8 +54,8 @@
 tests\test_nua\Debug\test_nua.exe
 @if errorlevel 1 ( echo test_nua: FAIL ) else echo test_nua: PASS

-tests\torture_htable\Debug\torture_htable.exe
-@if errorlevel 1 ( echo torture_htable: FAIL ) else echo torture_htable: PASS
+tests\test_htable\Debug\test_htable.exe
+@if errorlevel 1 ( echo test_htable: FAIL ) else echo test_htable: PASS

 tests\torture_rbtree\Debug\torture_rbtree.exe
 @if errorlevel 1 ( echo torture_rbtree: FAIL ) else echo torture_rbtree: PASS


Script to delete sym links in dev env

Script to delete sym links in dev env

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

--- Uninstall-RunMeAsAdministor.bat
+++ Uninstall-RunMeAsAdministor.bat
@@ -0,0 +1,90 @@
+
+@echo off
+ IF NOT EXIST "Uninstall-RunMeAsAdministor.bat" (
+ echo You must run this file from the directory in which it is located. Run Command Propmt as Administrator and navigate to this folder.
+ GOTO EXIT
+ )
+:NOWINDIR
+set /p UserInputPath= Enter the location of your DNN installation (eg. c:\DNN\):
+@set "var=%UserInputPath%"
+
+
+IF Not %var:~-1%==\ set var=%var%\
+ IF NOT EXIST %var% (
+	echo Path does now exist. Please try again.
+ GOTO NOWINDIR
+ )
+
+ echo %var%
+ echo removing symbolic links...
+
+ IF NOT EXIST %var%App_Code (
+	echo No App_Code folder
+	GOTO AFTERAPPCODE
+ )
+ cd App_Code
+ FOR /d %%G in (*) DO   rd %var%App_Code\%%G
+  FOR %%G in (*) DO   del %var%App_Code\%%G
+
+:AFTERAPPCODE
+REM SETUP DESKTOP MODULES
+cd ..\DesktopModules\
+
+rd %var%DesktopModules\AgapeConnect
+rd %var%DesktopModules\AgapeFR
+rd %var%DesktopModules\AgapeEurope
+rd %var%DesktopModules\AgapeUK
+
+REM SETUP FRANCE PORTAL SPECIFIC RADEDITOR CONFIG FILES
+cd ..\DesktopModules\Admin\RadEditorProvider\ConfigFile
+del %var%DesktopModules\Admin\RadEditorProvider\ConfigFile\ConfigFile.PortalId.0.xml
+cd ..\ToolsFile
+del %var%DesktopModules\Admin\RadEditorProvider\ToolsFile\ToolsFile.PortalId.0.xml
+cd ..\..\..
+
+REM SETUP APP_WebRefereces
+cd ..\App_WebReferences
+IF NOT EXIST %var%App_WebReferences (
+	echo No App_WebReferences folder
+	GOTO AFTERAPPWEBREF
+)
+FOR /d %%G in (*) DO  rd %var%App_WebReferences\%%G
+
+:AFTERAPPWEBREF
+REM SETUP PORTAL DIRECTORY
+cd ..\Portals\_default\Skins
+FOR /d %%G in (*) DO  rd %var%Portals\_default\Skins\%%G
+cd ..\Containers
+FOR /d %%G in (*) DO  rd %var%Portals\_default\Containers\%%G
+cd ..
+FOR %%G in (*) DO  del %var%Portals\_default\%%G
+
+cd ../0
+IF NOT EXIST %var%Portals\0 (
+	echo No \Portals\0 folder
+	GOTO AFTERPORTAL
+)
+FOR %%G in (*) DO  del %var%Portals\0\%%G
+FOR /d %%G in (*) DO  rd %var%Portals\0\%%G
+
+:AFTERPORTAL
+REM SETUP js Directory
+cd ../../js
+FOR %%G in (*) DO  del %var%js\%%G
+FOR /d %%G in (*) DO  rd %var%js\%%G
+
+
+REM SETUP bin Directory
+cd ../bin
+FOR %%G in (*) DO  del %var%bin\%%G
+FOR /d %%G in (*) DO  rd %var%bin\%%G
+cd ..
+
+REM SETUP the sso and Scripts Directory
+rd %var%sso
+rd %var%Scripts
+
+echo complete. Press any key to exit.
+pause > nul
+
+ :EXIT


* packages/win32-innosetup/tools/mk_htmlhelp.bat: Adding a copyright block
  at the top of file - just as the other tools in this dir.

git-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@852806 13f79535-47bb-0310-9956-ffa450edef68

--- packages/win32-innosetup/tools/mk_htmlhelp.bat
+++ packages/win32-innosetup/tools/mk_htmlhelp.bat
@@ -1,4 +1,21 @@
 @ECHO OFF
+REM #######################################################################
+REM FILE       mk_htmlhelp.bat
+REM PURPOSE    General Interface for making a Windows distribution
+REM ====================================================================
+REM Copyright (c) 2000-2005 CollabNet.  All rights reserved.
+REM
+REM This software is licensed as described in the file COPYING, which
+REM you should have received as part of this distribution.  The terms
+REM are also available at http://subversion.tigris.org/license-1.html.
+REM If newer versions of this license are posted there, you may use a
+REM newer version instead, at your option.
+REM
+REM This software consists of voluntary contributions made by many
+REM individuals.  For exact contribution history, see the revision
+REM history and logs, available at http://subversion.tigris.org/.
+REM ====================================================================
+
 SET BOOKNAME=book
 cd %BOOKNAME%
 SET XLSPARAMS=--param suppress.navigation 0 --param htmlhelp.hhc.binary 1


Fixed path separator in classpath variable

--- bin/voldemort-server.bat
+++ bin/voldemort-server.bat
@@ -34,7 +34,7 @@
 for %%j in ("%BASE_DIR%\dist\*.jar") do (call :append_classpath "%%j")
 for %%j in ("%BASE_DIR%\contrib\*\lib\*.jar") do (call :append_classpath "%%j")
 for %%j in ("%BASE_DIR%\lib\*.jar") do (call :append_classpath "%%j")
-set CLASSPATH=%CLASSPATH%:"%BASE_DIR%\dist\resources"
+set CLASSPATH=%CLASSPATH%;"%BASE_DIR%\dist\resources"
 goto :run

 :append_classpath


stack size changed to 0x8000

stack size changed to 0x8000

--- memorymaps/linker_memorymap_nyquist_template.cmd
+++ memorymaps/linker_memorymap_nyquist_template.cmd
@@ -47,7 +47,7 @@

 -c
 -heap  0xE0000
--stack 0x14000
+-stack 0x8000
 /*-stack 0x10000*/		/* works */ /* 64KB */
 /*-stack 0x8000	*/		/* works */ /* 32KB */
 /*-stack 0x4000	*/		/* works */ /* 16KB */


fixed java version parsing for windows batch file

to fix garbage collection logging

--- app/src/bin/crate.bat
+++ app/src/bin/crate.bat
@@ -4,10 +4,7 @@

 if NOT DEFINED JAVA_HOME goto err

-PATH %PATH%;%JAVA_HOME%\bin\
-for /f tokens^=2-5^ delims^=.-_^" %%j in ('java -fullversion 2^>^&1') do set "JAVA_VERSION=%%k%%l%%m"
-REM Convert to number so we can compare it later
-SET /a JAVA_VERSION=%JAVA_VERSION% + 0
+for /f tokens^=2-5^ delims^=.-_^" %%j in ('"%JAVA_HOME%\bin\java" -fullversion 2^>^&1') do set "JAVA_VERSION=%%j.%%k"

 set SCRIPT_DIR=%~dp0
 for %%I in ("%SCRIPT_DIR%..") do set CRATE_HOME=%%~dpfI
@@ -63,11 +60,12 @@
   IF DEFINED %CRATE_GC_LOG_FILES% (SET GC_LOG_FILES=!CRATE_GC_LOG_FILES!)

   SET LOGGC=!GC_LOG_DIR!\gc.log
+  ECHO %JAVA_VERSION%

-  IF %JAVA_VERSION% GEQ 90000 (
-    SET JAVA_OPTS=!JAVA_OPTS! -Xlog:gc*,gc+age=trace,safepoint:file=!LOGGC!:utctime,pid,tags:filecount=!GC_LOG_FILES!,filesize=!GC_LOG_SIZE!
+  IF "%JAVA_VERSION%" == "9.0" (
+    SET JAVA_OPTS=!JAVA_OPTS! -Xlog:gc*,gc+age=trace,safepoint:file=\"!LOGGC!\":utctime,pid,tags:filecount=!GC_LOG_FILES!,filesize=!GC_LOG_SIZE!
   )
-  IF %JAVA_VERSION% LSS 90000 (
+  IF "%JAVA_VERSION%" == "1.8" (
     SET JAVA_OPTS=!JAVA_OPTS! -Xloggc:!LOGGC!
     SET JAVA_OPTS=!JAVA_OPTS! -XX:+PrintGCDetails
     SET JAVA_OPTS=!JAVA_OPTS! -XX:+PrintGCDateStamps
@@ -109,7 +107,6 @@
 )
 set CRATE_PARAMS=-Cpath.home="%CRATE_HOME%"

-setlocal enabledelayedexpansion
 set params='%*'

 for /F "usebackq tokens=* delims= " %%A in (!params!) do (


create success.bat again

create success.bat again

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


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

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

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

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


Fixes #1414 Add file.encoding directive

Fixes #1414 Add file.encoding directive

--- shell/start.bat
+++ shell/start.bat
@@ -6,7 +6,7 @@
 cd %cd%

 set LANG=en_US.UTF-8
-set JAVA_OPTS=%JAVA_OPTS% -Dfile.encoding=UTF8"
+set JAVA_OPTS=%JAVA_OPTS% -Dfile.encoding=UTF8

 rem The directory containing the indexes
 set OPENSEARCHSERVER_DATA=%cd%\data


v0.9.1

--- api/api_release.bat
+++ api/api_release.bat
@@ -11,6 +11,4 @@

 ::DOCUMENTATE
 call typedoc --target ES5 --out %RELEASE_DIR% %TS_SRC_DIR% --mode file
-xcopy "assets" "%RELEASE_DIR%assets\" /e /Y
-
-pause+xcopy "assets" "%RELEASE_DIR%assets\" /e /Y


remove batch

remove batch

--- batch.bat
+++ batch.bat
@@ -1,5 +0,0 @@
-cd tools
-node r.js -o build.js
-cd ..
-call yuidoc --configfile yuidoc.json ./src
-copy fbui_small.png .\docs\fbui_small.png


Adding a build.bat file for windows.

Adding a build.bat file for windows.

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

--- build.bat
+++ build.bat
@@ -0,0 +1,13 @@
+@echo off
+
+IF EXIST build (
+  echo Build Folder Exists
+) ELSE (
+  mkdir build
+)
+
+cd build
+
+echo Running cmake
+
+cmake -G "Visual Studio 14 2015 Win64" ..


build: implemented build shell-script for Windows

--- build.bat
+++ build.bat
@@ -0,0 +1,25 @@
+@echo off
+
+SET ORG_PATH=github.com\coreos
+SET REPO_PATH=%ORG_PATH%\etcd
+
+SET GOPATH=%cd%\gopath
+
+:: Cleanup old builds
+IF EXIST "%GOPATH%\src\%REPO_PATH%" rmdir /s /q "%GOPATH%\src\%REPO_PATH%"
+IF EXIST "%GOPATH%\src\%ORG_PATH%" rmdir /s /q "%GOPATH%\src\%ORG_PATH%"
+IF EXIST "%cd%\bin" rmdir /s /q "%cd%\bin"
+
+md "%GOPATH%\src\%ORG_PATH%"
+
+mklink /d "%GOPATH%\src\%REPO_PATH%" "%cd%"
+FOR /f "usebackq tokens=*" %%a IN (`go env`) DO %%a
+
+(FOR /f "tokens=*" %%i IN ('git rev-parse --short HEAD') DO SET GIT_SHA=%%i) 2>NUL
+IF NOT DEFINED GIT_SHA SET GIT_SHA=GitNotFound
+
+:: Static compilation is useful when etcd is run in a container
+SET CGO_ENABLED=0
+go build -a -installsuffix cgo -ldflags "-s -X %REPO_PATH%\version.GitSHA %GIT_SHA%" -o bin\etcd.exe "%REPO_PATH%"
+:: TODO: Get the %GIT_SHA% argument to work. Useful for `etcd --version` style commands.
+go build -a -installsuffix cgo -ldflags "-s" -o bin\etcdctl.exe "%REPO_PATH%\etcdctl"


Fix command line build

Fix command line build

--- build.bat
+++ build.bat
@@ -10,6 +10,7 @@

 :: [Compiler options]
 :: /nologo: suppress copyright message
+:: /Gm-: Disable minimal rebuild
 :: /MDd: Runtime library: Multi-threaded Debug DLL
 :: /GR-: disable RTTI
 :: /EHs-c-: disable exceptions
@@ -23,20 +24,24 @@
 :: /wd4505:
 :: /Bt: display timings (undocumented)

-set slBasicCompile=/nologo /MDd /GR- /EHs-c- /fp:fast /fp:except- /Oi
-set slDefinitions=-D_DEBUG -DUNICODE -D_UNICODE -D_SCL_SECURE_NO_WARNINGS -D_HAS_EXCEPTIONS=0 -DNOMINMAX -DVC_EXTRALEAN -DSTRICT -DWIN32_LEAN_AND_MEAN -DNOGDI -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS
-set slInclude=/Isrc /Iexternal\glm /Iexternal\flatbuffers-1.3.0\include /Iexternal\protobuf-2.6.1\src /Iexternal\enet-1.3.13\include /Iexternal\imgui-1.47
+set slBasicCompile=/nologo /Gm- /MDd /GR- /EHs-c- /fp:fast /fp:except- /Oi
+set slDefinitions=-DSL_CL -D_DEBUG -DUNICODE -D_UNICODE -D_SCL_SECURE_NO_WARNINGS -D_HAS_EXCEPTIONS=0 -DNOMINMAX -DVC_EXTRALEAN -DSTRICT -DWIN32_LEAN_AND_MEAN -DNOGDI -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS
+set slInclude=/I..\..\src /I..\..\external\glm /I..\..\external\flatbuffers-1.3.0\include /I..\..\external\protobuf-2.6.1\src /I..\..\external\enet-1.3.13\include /I..\..\external\imgui-1.47
 set slCompile=%slBasicCompile% %slDefinitions% %slInclude% /Ob1 /WX /W4 /wd4100 /wd4505 /Z7 /Bt
 ::set slFxCompile=/Zi /E"main" /Od /Vn"g_%(Filename)" /WX /Fh"src/%(Filename).h" /nologo

 :: [Linker options]
 :: /time: display timings (undocumented)

-set slLink=/time /LIBPATH:build/lib enet.lib imgui.lib winmm.lib ws2_32.lib
+set slLink=/time /incremental:no /LIBPATH:../lib enet.lib imgui.lib winmm.lib ws2_32.lib
+
+:cook
+if exist build\bin\assets goto enet
+cook build\bin\assets

 :enet
-::if exist build\lib\enet.lib goto imgui
-echo [ENet]
+if exist build\lib\enet.lib goto imgui
+echo. && echo [ENet]
 pushd external\enet-1.3.13
 cl /c %slBasicCompile% /Fo..\..\build\enet\ /Iinclude *.c
 popd
@@ -45,8 +50,8 @@
 popd

 :imgui
-::if exist build\lib\imgui.lib goto starlight
-echo [ImGui]
+if exist build\lib\imgui.lib goto starlight
+echo. && echo [ImGui]
 pushd external\imgui-1.47
 cl /c %slBasicCompile% /Fo..\..\build\imgui\ /I. imgui.cpp imgui_demo.cpp imgui_draw.cpp examples\directx11_example\imgui_impl_dx11.cpp
 popd
@@ -55,12 +60,14 @@
 popd

 :starlight
-echo [starlight_ub]
-cl %slCompile% /Fobuild\bin\starlight.dll src/starlight_ub.cpp /LD /link %slLink% /PDB:starlight_%random%.pdb
+echo. && echo [starlight_ub]
+pushd build\bin
+cl %slCompile% /LD /Festarlight.dll ..\..\src\starlight_ub.cpp /link %slLink% /PDB:starlight_%random%.pdb

 :starlight_win32
-echo [starlight_win32_ub]
-fxc /Zi /E"main" /Od /Vn"g_SimplePixelShader" /WX /T ps_4_0 /Fh"src/SimplePixelShader.h" /nologo src/SimplePixelShader.hlsl
-fxc /Zi /E"main" /Od /Vn"g_SimpleVertexShader" /WX /T vs_4_0 /Fh"src/SimpleVertexShader.h" /nologo src/SimpleVertexShader.hlsl
-cl %slCompile% /Febuild\bin\ /Iexternal\imgui-1.47\examples\directx11_example src/starlight_win32_ub.cpp /link %slLink% d3dcompiler.lib d3d11.lib
+echo. && echo [starlight_win32_ub]
+fxc /Zi /E"main" /Od /Vn"g_SimplePixelShader" /WX /T ps_4_0 /Fh"..\..\src/SimplePixelShader.h" /nologo ..\..\src/SimplePixelShader.hlsl
+fxc /Zi /E"main" /Od /Vn"g_SimpleVertexShader" /WX /T vs_4_0 /Fh"..\..\src/SimpleVertexShader.h" /nologo ..\..\src/SimpleVertexShader.hlsl
+cl %slCompile% /Festarlight.exe /I..\..\external\imgui-1.47\examples\directx11_example ..\..\src\starlight_win32_ub.cpp /link %slLink% d3dcompiler.lib d3d11.lib
+popd
 popd


Delete build.bat

Delete build.bat

--- build.bat
+++ build.bat
@@ -1,13 +0,0 @@
-@echo Off
-set config=%1
-if "%config%" == "" (
-   set config=Release
-)
-
-set version=
-if not "%PackageVersion%" == "" (
-   set version=-Version %PackageVersion%
-)
-
-REM Build
-"%programfiles(x86)%\MSBuild\14.0\Bin\MSBuild.exe" Smooth.IoC.Dapper.Repository.UnitOfWork.sln /p:Configuration="%config%" /m /v:M /fl /flp:LogFile=msbuild.log;Verbosity=Normal /nr:false


Silenced build.cmd.

Silenced build.cmd.

--- build.cmd
+++ build.cmd
@@ -1,3 +1,4 @@
+@ECHO OFF
 call dmdenv 1.057-tango-0.99.9
 xfbuild -g -debug -unittest -version=Unittest +xtango +D.xf/LexerTest.deps +O.xf/LexerTest.objs +oLexerTest LexerTest.d
 xfbuild -g -debug -unittest -version=Unittest +xtango +D.xf/AstTest.deps +O.xf/AstTest.objs +oAstTest AstTest.d


Updated to latest version of FAKE

Updated to latest version of FAKE

--- build.cmd
+++ build.cmd
@@ -4,7 +4,7 @@
 cls

 "Source\.nuget\nuget.exe" "restore" "Source\Machine.Fakes.sln"
-"Source\.nuget\nuget.exe" "install" "FAKE.Core" "-OutputDirectory" "Source\packages" "-Version" "3.8.5" "-ExcludeVersion"
+"Source\.nuget\nuget.exe" "install" "FAKE.Core" "-OutputDirectory" "Source\packages" "-Version" "3.11.4" "-ExcludeVersion"

 SET TARGET="Default"
 IF NOT [%1]==[] (set TARGET="%1")


Update 'build.cmd' to pull Sake from v2 NuGet feed.

--- build.cmd
+++ build.cmd
@@ -17,7 +17,7 @@
 :restore
 IF EXIST packages\KoreBuild goto run
 .nuget\NuGet.exe install KoreBuild -ExcludeVersion -o packages -nocache -pre
-.nuget\NuGet.exe install Sake -version 0.2 -o packages -ExcludeVersion
+.nuget\NuGet.exe install Sake -ExcludeVersion -Source https://www.nuget.org/api/v2/ -Out packages

 IF "%SKIP_DNX_INSTALL%"=="1" goto run
 CALL packages\KoreBuild\build\dnvm upgrade -runtime CLR -arch x86


now removed gitversion

now removed gitversion

--- build.cmd
+++ build.cmd
@@ -1,10 +1,4 @@
 @echo Off
-
-WHERE mycommand
-IF NOT  "%ERRORLEVEL%" == "0" (
-  GitVersion /output buildserver
-)
-
 ECHO Starting build

 set config=%1


Check Visual Studio 2015 for build

Check Visual Studio 2015 for build

--- build.cmd
+++ build.cmd
@@ -1,7 +1,14 @@
 @echo off
 setlocal
+if "%VS140COMNTOOLS%"=="" GOTO VS12TOOLS
+call "%VS140COMNTOOLS%\VsDevCmd.bat"
+GOTO BUILD
+
+:VS12TOOLS
 if "%VS120COMNTOOLS%"=="" GOTO NOTOOLS
 call "%VS120COMNTOOLS%\VsDevCmd.bat"
+
+:BUILD
 set solutionPath=%1
 set configuration=%2
 set target=%3
@@ -9,12 +16,12 @@
 msbuild %solutionPath%  /p:Configuration=%configuration% /l:FileLogger,Microsoft.Build.Engine;logfile=PSScriptAnalyzer_Build.log;append=true
 GOTO END

-:NOTOOLS
-echo The Visual Studio 2013 tools are not installed
+:CLEAN
+msbuild .\PSScriptAnalyzer.sln  /p:Configuration=%configuration% /t:clean /l:FileLogger,Microsoft.Build.Engine;logfile=PSScriptAnalyzer_Build.log;append=true
 GOTO END

-:CLEAN
-msbuild .\PSScriptAnalyzer.sln  /p:Configuration=%configuration% /t:clean /l:FileLogger,Microsoft.Build.Engine;logfile=PSScriptAnalyzer_Build.log;append=true
+:NOTOOLS
+echo The Visual Studio 2013/2015 tools are not installed

 :END
 endlocal


Updating build.cmd to support 'generatelayout' when 'skiptests' is specified.

--- build.cmd
+++ build.cmd
@@ -139,6 +139,7 @@
 set __BuildPackages=1
 set __BuildNativeCoreLib=1
 set __RestoreOptData=1
+set __GenerateLayout=0
 set __CrossgenAltJit=

 @REM CMD has a nasty habit of eating "=" on the argument list, so passing:
@@ -224,6 +225,7 @@
 if /i "%1" == "skiptests"           (set __BuildTests=0&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
 if /i "%1" == "skipbuildpackages"   (set __BuildPackages=0&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
 if /i "%1" == "skiprestoreoptdata"  (set __RestoreOptData=0&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
+if /i "%1" == "generatelayout"      (set __GenerateLayout=1&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
 if /i "%1" == "usenmakemakefiles"   (set __NMakeMakefiles=1&set __ConfigureOnly=1&set __BuildNative=1&set __BuildNativeCoreLib=0&set __BuildCoreLib=0&set __BuildTests=0&set __BuildPackages=0&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
 if /i "%1" == "pgoinstrument"       (set __PgoInstrument=1&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
 if /i "%1" == "nopgooptimize"       (set __PgoOptimize=0&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
@@ -719,6 +721,23 @@

     if not !errorlevel! == 0 (
         REM buildtest.cmd has already emitted an error message and mentioned the build log file to examine.
+        exit /b 1
+    )
+) else if %__GenerateLayout% EQU 1 (
+    echo %__MsgPrefix%Generating layout for %__BuildOS%.%__BuildArch%.%__BuildType%
+
+    REM Construct the arguments to pass to the runtest build script.
+
+    rem arm64 builds currently use private toolset which has not been released yet
+    REM TODO, remove once the toolset is open.
+    if not "%__ToolsetDir%" == "" call :PrivateToolSet
+
+    set NEXTCMD=call %__ProjectDir%\test\runtest.cmd %__BuildArch% %__BuildType% GenerateLayoutOnly %__UnprocessedBuildArgs%
+    echo %__MsgPrefix%!NEXTCMD!
+    !NEXTCMD!
+
+    if not !errorlevel! == 0 (
+        REM runtest.cmd has already emitted an error message and mentioned the build log file to examine.
         exit /b 1
     )
 )


Fixed .NET 4.0 build relative to merging JSON serializer assembly.

--- build.cmd
+++ build.cmd
@@ -80,7 +80,7 @@
 echo Merging Json Serialization
 set FILES_TO_MERGE=
 set FILES_TO_MERGE=%FILES_TO_MERGE% "src\proj\EventStore.Serialization.Json\bin\%TARGET_CONFIG%\EventStore.Serialization.Json.dll"
-set FILES_TO_MERGE=%FILES_TO_MERGE% "src\proj\EventStore.Serialization.Json\bin\%TARGET_CONFIG%\Newtonsoft.Json.*.dll"
+set FILES_TO_MERGE=%FILES_TO_MERGE% "src\proj\EventStore.Serialization.Json\bin\%TARGET_CONFIG%\Newtonsoft.Json*.dll"
 (echo.|set /p =EventStore.*)>>exclude.txt
 bin\ilmerge-bin\ILMerge.exe /keyfile:src/EventStore.snk /internalize:"exclude.txt" /xmldocs /wildcards /targetplatform:%ILMERGE_VERSION% /out:output/bin/EventStore.Serialization.Json.dll %FILES_TO_MERGE%
 del exclude.txt


Syntax changes, added @ symbol

Syntax changes, added @ symbol

--- c.bat
+++ c.bat
@@ -1,2 +1,2 @@
-echo off
+@echo off
 copy %home%\.emacs.d\init.el %home%\Desktop\Code\Emacs\dotemacs\init.el


Add standalone bootstrap script

Add standalone bootstrap script

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

--- standalone_bootstrap.bat
+++ standalone_bootstrap.bat
@@ -0,0 +1,10 @@
+@echo off
+git clone https://github.com/AxioDL/boo.git
+pushd boo
+git submodule update --recursive --init
+popd
+
+git clone https://github.com/libAthena/athena.git
+pushd athena
+git submodule update --recursive --init
+popd


remove obsolete batch file

remove obsolete batch file

git-svn-id: 2bceadd671bcc8d4f7a34159d1bc3b98592acb3b@259 7ec92016-0320-0410-acc4-a06ded1c099a

--- make.mingw.bat
+++ make.mingw.bat
@@ -1 +0,0 @@
-mingw32-make -f Makefile.mingw


add build_exe to create.bat

add build_exe to create.bat

--- bat/create.bat
+++ bat/create.bat
@@ -34,9 +34,10 @@
 call build_utils.bat > build_utils.log 2>&1
 if errorlevel 3 (goto exit3)

-@REM Build exe
-@REM call build_exe.bat
-@REM if errorlevel 3 (goto exit3)
+REM Build exe
+echo ######                       Build KaM_Remake.exe                    ######
+call build_exe.bat > build_exe_bat.log 2>&1
+if errorlevel 3 (goto exit3)

 @REM Patch exe
 @REM call patch_exe.bat


Update startup script

Update startup script

--- start_node.bat
+++ start_node.bat
@@ -1,11 +1,13 @@
 REM Start Max patch
-start "" "C:\Program Files\Cycling '74\Max Runtime 6.1\maxRT.exe" C:\eim\EiMpatch\EmotionInMotion.maxproj
+START "" "C:\Program Files\Cycling '74\Max Runtime 6.1\maxRT.exe" C:\eim\EiMpatch\EmotionInMotion.maxproj
+
+TIMEOUT 15

 REM Set Node.js environment to production
-set NODE_ENV=production
+SET NODE_ENV=production

 REM Switch to EiM directory
-cd c:\eim
+CD c:\eim

 REM Start Node.js server
 C:\Users\EmotionInMotionV2\AppData\Roaming\npm\grunt default


Comment debug output

Comment debug output

git-svn-id: 5ccfe34f605a6c2f9041ff2965ab60012c62539a@1581489 13f79535-47bb-0310-9956-ffa450edef68

--- bin/jmeter.bat
+++ bin/jmeter.bat
@@ -39,7 +39,7 @@
     set ERRORLEVEL=2-NO_JAVA
     goto pause
 )
-@echo JAVAVER %JAVAVER%
+rem @echo JAVAVER %JAVAVER%
 for /f "delims=. tokens=1-3" %%v in ("%JAVAVER%") do (
     set current_minor=%%w
 )


the full package is missing, add a notice msg.


add copy.bat

add copy.bat

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

--- build/copy.bat
+++ build/copy.bat
@@ -0,0 +1,13 @@
+REM SET BUILD=Debug
+SET BUILD=Release
+
+COPY ..\src\ServiceStack.Redis\bin\%BUILD%\ServiceStack.Redis.* ..\NuGet\lib\net35
+
+COPY ..\src\ServiceStack.Redis\bin\%BUILD%\ServiceStack.* ..\..\ServiceStack\release\latest\ServiceStack.Redis
+
+COPY ..\src\ServiceStack.Redis\bin\%BUILD%\ServiceStack.* ..\..\ServiceStack\lib
+COPY ..\src\ServiceStack.Redis\bin\%BUILD%\ServiceStack.* ..\..\ServiceStack.Examples\lib
+COPY ..\src\ServiceStack.Redis\bin\%BUILD%\ServiceStack.Redis.* ..\..\ServiceStack.Contrib\lib
+COPY ..\src\ServiceStack.Redis\bin\%BUILD%\ServiceStack.Redis.* ..\..\ServiceStack.RedisWebServices\lib
+
+


Jekyll doesn't clean the site folder before builds. Annoying when I want to remove draft posts

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

--- buildclean.bat
+++ buildclean.bat
@@ -0,0 +1,2 @@
+rmdir /s /q _site
+jekyll build


delete file on setup

delete file on setup

--- integration-flows/build/script.bat
+++ integration-flows/build/script.bat
@@ -34,3 +34,5 @@
 @rem deploy policy
 @rem mqsicreatepolicy TESTNODE_John -t MQTTSubscribe -f ..\policy\BusEvents.policy -l BusEvents
 @rem mqsichangeproperties TESTNODE_John -e default -o ComIbmJVMManager -n jvmDebugPort -v 1818
+
+rm C:\Users\IBM_ADMIN\Desktop\VehiclePartReplacements\Today.csv


win: fix ccx, gmsh copying

win: fix ccx, gmsh copying

--- conda/win_dev/win_dev.bat
+++ conda/win_dev/win_dev.bat
@@ -23,8 +23,8 @@
 robocopy %conda_env%\ msvc*.* %copy_dir%\bin\ /XF *.pdb /MT:%NUMBER_OF_PROCESSORS% > nul
 robocopy %conda_env%\ ucrt*.* %copy_dir%\bin\ /XF *.pdb /MT:%NUMBER_OF_PROCESSORS% > nul
 REM Copy gmsh and calculix
-robocopy %conda_env%\Library\bin ccx.exe %copy_dir%\bin\ /MT:%NUMBER_OF_PROCESSORS% > nul
-robocopy %conda_env%\Library\bin gmsh.exe %copy_dir%\bin\ /MT:%NUMBER_OF_PROCESSORS% > nul
+robocopy %conda_env%\Library\bin %copy_dir%\bin\ ccx.exe /MT:%NUMBER_OF_PROCESSORS% > nul
+robocopy %conda_env%\Library\bin %copy_dir%\bin\ gmsh.exe /MT:%NUMBER_OF_PROCESSORS% > nul
 REM Copy Conda's QT5/plugins to FreeCAD/bin
 robocopy %conda_env%\Library\plugins %copy_dir%\bin\ /S /MT:%NUMBER_OF_PROCESSORS% > nul
 robocopy %conda_env%\Library\bin\ QtWebEngineProces* %copy_dir%\bin\ /MT:%NUMBER_OF_PROCESSORS% > nul


Workaround issue 150

Workaround issue 150

- The ngen step fails on some OS/.NET combinations (maybe all). Since the compilation is optional, just continue even if it fails. This likely won't be fixed without using an elevated powershell provisioner over winrm.

--- scripts/compile-dotnet-assemblies.bat
+++ scripts/compile-dotnet-assemblies.bat
@@ -8,7 +8,8 @@
   %windir%\microsoft.net\framework\v4.0.30319\ngen.exe executequeueditems
 )

-exit /b
+:: continue even if ngen fails
+exit /b 0

 :64BIT
 if exist "%windir%\microsoft.net\framework\v4.0.30319\ngen.exe" (
@@ -17,3 +18,6 @@
   %windir%\microsoft.net\framework\v4.0.30319\ngen.exe executequeueditems
   %windir%\microsoft.net\framework64\v4.0.30319\ngen.exe executequeueditems
 )
+
+:: continue even if ngen fails
+exit /b 0


mk-openssl.bat: disable DSO again

mk-openssl.bat: disable DSO again

Also:
- don't fail if engines are not built

--- mk-openssl.bat
+++ mk-openssl.bat
@@ -25,7 +25,7 @@
 if "%_CPU%" == "win64" set SHARED_RCFLAGS=-F pe-x86-64

 del /s *.o *.a *.exe >> nul 2>&1
-if "%_CPU%" == "win32" perl Configure mingw   shared no-unit-test no-ssl2 no-ssl3 no-rc5 no-idea        "--prefix=%CD:\=/%"
+if "%_CPU%" == "win32" perl Configure mingw   shared no-unit-test no-ssl2 no-ssl3 no-rc5 no-idea no-dso "--prefix=%CD:\=/%"
 :: Disable asm in 64-bit builds. It makes linking the static libs fail in LTO mode:
 ::   C:\Users\...\AppData\Local\Temp\ccUO3sBD.s: Assembler messages:
 ::   C:\Users\...\AppData\Local\Temp\ccUO3sBD.s:23710: Error: operand type mismatch for `div'
@@ -33,7 +33,7 @@
 ::   compilation terminated.
 ::   C:/mingw/bin/../lib/gcc/x86_64-w64-mingw32/5.2.0/../../../../x86_64-w64-mingw32/bin/ld.exe: lto-wrapper failed
 ::   collect2.exe: error: ld returned 1 exit status
-if "%_CPU%" == "win64" perl Configure mingw64 shared no-unit-test no-ssl2 no-ssl3 no-rc5 no-idea no-asm "--prefix=%CD:\=/%"
+if "%_CPU%" == "win64" perl Configure mingw64 shared no-unit-test no-ssl2 no-ssl3 no-rc5 no-idea no-dso no-asm "--prefix=%CD:\=/%"
 sh -c "mingw32-make depend"
 sh -c "mingw32-make"

@@ -48,7 +48,7 @@

 python ..\peclean.py apps\openssl.exe
 python ..\peclean.py apps\*.dll
-python ..\peclean.py engines\*.dll
+if exist engines\*.dll python ..\peclean.py engines\*.dll

 touch -c apps/openssl.exe    -r CHANGES
 touch -c apps/*.dll          -r CHANGES


update server script

update server script

--- resources/scripts/server.bat
+++ resources/scripts/server.bat
@@ -1,4 +1,5 @@
+
 SET PYTHONPATH=.
 SET TARGET_ENVIRONMENT=development
-CALL pypy server.py
-EXIT
+CALL .env\bin\activate
+CALL .env\bin\pypy.exe server.py


Added testscript.cmd on Windows workstation

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

--- testscript.cmd
+++ testscript.cmd
@@ -0,0 +1,2 @@
+@echo off
+echo Windows test script


old version; use bin/acq4.bat

old version; use bin/acq4.bat

--- tools/acq4.bat
+++ tools/acq4.bat
@@ -1,4 +0,0 @@
-setlocal
-set PATH=%ProgramFiles%\acq4\Python27\Lib\site-packages\PyQt4;%ProgramFiles%\acq4\Python27;%PATH%
-set PYTHONPATH=%ProgramFiles%\acq4\Python27\Lib\site-packages
-python -m acq4


Add test user in the runAs.cmd

Add test user in the runAs.cmd

--- runAs-tool-win32/cmd/runAs.cmd
+++ runAs-tool-win32/cmd/runAs.cmd
@@ -8,6 +8,11 @@
 	@EXIT -1
 )
 ENDLOCAL
+
+REM Create user for tests
+net user RunAsTestUser /delete>NUL
+net user /add /active:yes RunAsTestUser aaa>NUL
+net localgroup Administrators RunAsTestUser /ADD>NUL

 REM Define OS bitness
 SET "RUNAS_76200936_0AA1_4855_A204_05C3F3C54476_PATH_TO_BIN=%~dp0"


Update import_cert_local.bat

Update import_cert_local.bat

--- CMD/import_cert_local.bat
+++ CMD/import_cert_local.bat
@@ -3,7 +3,7 @@

 certutil -f -p [password] -dump "cert.p12"

-REM TODO: validate expiration above
+REM get just expiration: https://github.com/jgstew/tools/blob/master/CMD/cert_file_expiration.bat

 certutil -f -p [password] -importpfx "cert.p12"


Delete patch.bat

Delete patch.bat

--- patch.bat
+++ patch.bat
@@ -1,2 +0,0 @@
-@echo off
-python patch.py