Adding profileSetup.bat file with CRLF

Adding profileSetup.bat file with CRLF

error: pathspec 'modules/distribution/product/src/main/startup-scripts/profileSetup.bat' did not match any file(s) known to git

--- modules/distribution/product/src/main/startup-scripts/profileSetup.bat
+++ modules/distribution/product/src/main/startup-scripts/profileSetup.bat
@@ -0,0 +1,292 @@
+@echo off
+rem ----------------------------------------------------------------------------
+rem  Copyright 2018 WSO2, Inc. http://www.wso2.org
+rem
+rem  Licensed under the Apache License, Version 2.0 (the "License");
+rem  you may not use this file except in compliance with the License.
+rem  You may obtain a copy of the License at
+rem
+rem      http://www.apache.org/licenses/LICENSE-2.0
+rem
+rem  Unless required by applicable law or agreed to in writing, software
+rem  distributed under the License is distributed on an "AS IS" BASIS,
+rem  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+rem  See the License for the specific language governing permissions and
+rem  limitations under the License.
+
+set usertLocation=%cd%
+set pathToApiManagerXML=..\repository\conf\api-manager.xml
+set pathToAxis2XML=..\repository\conf\axis2\axis2.xml
+set pathToRegistry=..\repository\conf\registry.xml
+set pathToInboundEndpoints=..\repository\deployment\server\synapse-configs\default\inbound-endpoints
+set pathToWebapps=..\repository\deployment\server\webapps
+set pathToJaggeryapps=..\repository\deployment\server\jaggeryapps
+set pathToSynapseConfigs=..\repository\deployment\server\synapse-configs\default
+cd /d %~dp0
+
+rem ----- Process the input commands (two args only)-------------------------------------------
+if ""%1""==""-Dprofile"" (
+	if ""%2""==""api-key-manager"" 	goto keyManager
+	if ""%2""==""api-publisher"" 	goto publisher
+	if ""%2""==""api-store"" 		goto store
+	if ""%2""==""traffic-manager"" 	goto trafficManager
+	if ""%2""==""gateway-worker"" 	goto gatewayWorker
+)
+echo Profile is not specifed properly, please try again
+goto end
+
+:keyManager
+echo Starting to optimize API Manager for the Key Manager profile
+call :disableDataPublisher
+call :disableJMSConnectionDetails
+call :disablePolicyDeployer
+call :disableTransportSenderWS
+call :disableTransportSenderWSS
+call :removeWebSocketInboundEndpoint
+call :removeSecureWebSocketInboundEndpoint
+call :removeSynapseConfigs
+rem ---removing webbapps which are not required for this profile--------
+for /f %%i in ('dir %pathToWebapps% /A:-D /b ^| findstr /v "client-registration#v.*war authenticationendpoint.war oauth2.war throttle#data#v.*war api#identity#consent-mgt#v.*war"') do (
+	del /f %pathToWebapps%\%%i
+	call :Timestamp value
+	echo %value% INFO - Removed the %%i file from %pathToWebapps%
+	setlocal enableDelayedExpansion
+	set folderName=%%i
+	set folderName=!folderName:.war=!
+	if exist %pathToWebapps%\!folderName!\ (
+		rmdir /s /q %pathToWebapps%\!folderName!
+		call :Timestamp value
+		echo %value% INFO - Removed the !folderName! directory from %pathToWebapps%
+	)
+	endlocal
+)
+rem ---removing jaggeryapps which are not required for this profile--------
+for /f %%i in ('dir "%pathToJaggeryapps%" /A:D /b') do (
+	rmdir /s /q %pathToJaggeryapps%\%%i
+	call :Timestamp value
+	echo %value% INFO - Removed the %%i directory from %pathToJaggeryapps%
+)
+goto finishOptimization
+
+:publisher
+echo Starting to optimize API Manager for the API Publisher profile
+call :disableDataPublisher
+call :disableJMSConnectionDetails
+call :disableTransportSenderWS
+call :disableTransportSenderWSS
+call :removeWebSocketInboundEndpoint
+call :removeSecureWebSocketInboundEndpoint
+rem ---removing webbapps which are not required for this profile--------
+for /f %%i in ('dir %pathToWebapps% /A:-D /b ^| findstr /v "api#am#publisher#v.*war"') do (
+	del /f %pathToWebapps%\%%i
+	call :Timestamp value
+	echo %value% INFO - Removed the %%i file from %pathToWebapps%
+	setlocal enableDelayedExpansion
+	set folderName=%%i
+	set folderName=!folderName:.war=!
+	if exist %pathToWebapps%\!folderName!\ (
+		rmdir /s /q %pathToWebapps%\!folderName!
+		call :Timestamp value
+		echo %value% INFO - Removed the !folderName! directory from %pathToWebapps%
+	)
+	endlocal
+)
+rem ---removing jaggeryapps which are not required for this profile--------
+for /f %%i in ('dir "%pathToJaggeryapps%" /A:D /b ^| findstr /v "publisher admin"') do (
+	rmdir /s /q %pathToJaggeryapps%\%%i
+	call :Timestamp value
+	echo %value% INFO - Removed the %%i directory from %pathToJaggeryapps%
+)
+goto finishOptimization
+
+:store
+echo Starting to optimize API Manager for the Developer Portal (API Store) profile
+call :disableDataPublisher
+call :disableJMSConnectionDetails
+call :disablePolicyDeployer
+call :disableTransportSenderWS
+call :disableTransportSenderWSS
+call :removeWebSocketInboundEndpoint
+call :removeSecureWebSocketInboundEndpoint
+rem ---removing webbapps which are not required for this profile--------
+for /f %%i in ('dir %pathToWebapps% /A:-D /b ^| findstr /v "api#am#store#v.*war"') do (
+	del /f %pathToWebapps%\%%i
+	call :Timestamp value
+	echo %value% INFO - Removed the %%i file from %pathToWebapps%
+	setlocal enableDelayedExpansion
+	set folderName=%%i
+	set folderName=!folderName:.war=!
+	if exist %pathToWebapps%\!folderName!\ (
+		rmdir /s /q %pathToWebapps%\!folderName!
+		call :Timestamp value
+		echo %value% INFO - Removed the !folderName! directory from %pathToWebapps%
+	)
+	endlocal
+)
+rem ---removing jaggeryapps which are not required for this profile--------
+for /f %%i in ('dir "%pathToJaggeryapps%" /A:D /b ^| findstr /v "store"') do (
+	rmdir /s /q %pathToJaggeryapps%\%%i
+	call :Timestamp value
+	echo %value% INFO - Removed the %%i directory from %pathToJaggeryapps%
+)
+goto finishOptimization
+
+:trafficManager
+echo Starting to optimize API Manager for the Traffic Manager profile
+call :disableTransportSenderWS
+call :disableTransportSenderWSS
+call :removeWebSocketInboundEndpoint
+call :removeSecureWebSocketInboundEndpoint
+call :disableIndexingConfiguration
+call :removeSynapseConfigs
+rem ---removing webbapps which are not required for this profile--------
+for /f %%i in ('dir %pathToWebapps% /A:-D /b') do (
+	del /f %pathToWebapps%\%%i
+	call :Timestamp value
+	echo %value% INFO - Removed the %%i file from %pathToWebapps%
+	setlocal enableDelayedExpansion
+	set folderName=%%i
+	set folderName=!folderName:.war=!
+	if exist %pathToWebapps%\!folderName!\ (
+		rmdir /s /q %pathToWebapps%\!folderName!
+		call :Timestamp value
+		echo %value% INFO - Removed the !folderName! directory from %pathToWebapps%
+	)
+	endlocal
+)
+rem ---removing jaggeryapps which are not required for this profile--------
+for /f %%i in ('dir "%pathToJaggeryapps%" /A:D /b') do (
+	rmdir /s /q %pathToJaggeryapps%\%%i
+	call :Timestamp value
+	echo %value% INFO - Removed the %%i directory from %pathToJaggeryapps%
+)
+goto finishOptimization
+
+:gatewayWorker
+echo Starting to optimize API Manager for the Gateway worker profile
+call :disablePolicyDeployer
+call :disableIndexingConfiguration
+rem ---removing webbapps which are not required for this profile--------
+for /f %%i in ('dir %pathToWebapps% /A:-D /b ^| findstr /v "am#sample#pizzashack#v.*war"') do (
+	del /f %pathToWebapps%\%%i
+	call :Timestamp value
+	echo %value% INFO - Removed the %%i file from %pathToWebapps%
+	setlocal enableDelayedExpansion
+	set folderName=%%i
+	set folderName=!folderName:.war=!
+	if exist %pathToWebapps%\!folderName!\ (
+		rmdir /s /q %pathToWebapps%\!folderName!
+		call :Timestamp value
+		echo %value% INFO - Removed the !folderName! directory from %pathToWebapps%
+	)
+	endlocal
+)
+rem ---removing jaggeryapps which are not required for this profile--------
+for /f %%i in ('dir "%pathToJaggeryapps%" /A:D /b') do (
+	rmdir /s /q %pathToJaggeryapps%\%%i
+	call :Timestamp value
+	echo %value% INFO - Removed the %%i directory from %pathToJaggeryapps%
+)
+goto finishOptimization
+
+:disableDataPublisher
+for /f %%i in ('powershell -Command "$xml = [xml] (Get-Content %pathToApiManagerXML%); $xml.APIManager.ThrottlingConfigurations.DataPublisher.Enabled;"') do (
+	if %%i==true (
+		powershell -Command "$xml = [xml] (Get-Content %pathToApiManagerXML%); $xml.APIManager.ThrottlingConfigurations.DataPublisher.Enabled='false'; $xml.Save('%pathToApiManagerXML%');"
+		call :Timestamp value
+		echo %value% INFO - Disabled the ^<DataPublisher^> from api-manager.xml file
+	)
+)
+EXIT /B 0
+
+:disableJMSConnectionDetails
+for /f %%i in ('powershell -Command "$xml = [xml] (Get-Content %pathToApiManagerXML%); $xml.APIManager.ThrottlingConfigurations.JMSConnectionDetails.Enabled;"') do (
+	if %%i==true (
+		powershell -Command "$xml = [xml] (Get-Content %pathToApiManagerXML%); $xml.APIManager.ThrottlingConfigurations.JMSConnectionDetails.Enabled='false'; $xml.Save('%pathToApiManagerXML%');"
+		call :Timestamp value
+		echo %value% INFO - Disabled the ^<JMSConnectionDetails^> from api-manager.xml file
+	)
+)
+EXIT /B 0
+
+:disablePolicyDeployer
+for /f %%i in ('powershell -Command "$xml = [xml] (Get-Content %pathToApiManagerXML%); $xml.APIManager.ThrottlingConfigurations.PolicyDeployer.Enabled;"') do (
+	if %%i==true (
+		powershell -Command "$xml = [xml] (Get-Content %pathToApiManagerXML%); $xml.APIManager.ThrottlingConfigurations.PolicyDeployer.Enabled='false'; $xml.Save('%pathToApiManagerXML%');"
+		call :Timestamp value
+		echo %value% INFO - Disabled the ^<PolicyDeployer^> from api-manager.xml file
+	)
+)
+EXIT /B 0
+
+:disableTransportSenderWS
+for /f %%i in ('powershell -Command "& {$xml = [xml] (Get-Content %pathToAxis2XML%); $xml.selectSingleNode('//transportSender[@name=\"ws\"]'); }" ') do (
+	powershell -Command "& { $xml = [xml] (Get-Content %pathToAxis2XML%); $xml.selectNodes('//transportSender[@name=\"ws\"]') | ForEach-Object { $node = $_; $comment = $xml.CreateComment($node.OuterXml); $node=$node.ParentNode.ReplaceChild($comment, $node);}; $xml.Save('%pathToAxis2XML%');}"
+	call :Timestamp value
+	echo %value% INFO - Disabled the ^<transportSender name="ws" class="org.wso2.carbon.websocket.transport.WebsocketTransportSender"^> from axis2.xml file
+	goto skipLoop1
+)
+:skipLoop1
+EXIT /B 0
+
+:disableTransportSenderWSS
+for /f %%i in ('powershell -Command "& {$xml = [xml] (Get-Content %pathToAxis2XML%); $xml.SelectSingleNode('//transportSender[@name=\"wss\"]'); }" ') do (
+	powershell -Command "& { $xml = [xml] (Get-Content %pathToAxis2XML%); $xml.selectNodes('//transportSender[@name=\"wss\"]') | ForEach-Object { $node = $_; $comment = $xml.CreateComment($node.OuterXml); $node=$node.ParentNode.ReplaceChild($comment, $node);}; $xml.Save('%pathToAxis2XML%');}"
+	call :Timestamp value
+	echo %value% INFO - Disabled the ^<transportSender name="wss" class="org.wso2.carbon.websocket.transport.WebsocketTransportSender"^> from axis2.xml file
+	goto skipLoop2
+	)
+:skipLoop2
+EXIT /B 0
+
+:disableIndexingConfiguration
+for /f %%i in ('powershell -Command "$xml = [xml] (Get-Content %pathToRegistry%); $xml.wso2registry.indexingConfiguration.startIndexing;"') do (
+	if %%i==true (
+		powershell -Command "$xml = [xml] (Get-Content %pathToRegistry%); $xml.wso2registry.indexingConfiguration.startIndexing='false'; $xml.Save('%pathToRegistry%');"
+		call :Timestamp value
+		echo %value% INFO - Disabled the ^<indexingConfiguration^> from registry.xml file
+	)
+)
+EXIT /B 0
+
+:removeWebSocketInboundEndpoint
+if exist %pathToInboundEndpoints%\WebSocketInboundEndpoint.xml (
+	del /f %pathToInboundEndpoints%\WebSocketInboundEndpoint.xml
+	call :Timestamp value
+	echo %value% INFO - Removed the WebSocketInboundEndpoint.xml file from %pathToInboundEndpoints%
+)
+EXIT /B 0
+
+:removeSecureWebSocketInboundEndpoint
+if exist %pathToInboundEndpoints%\SecureWebSocketInboundEndpoint.xml (
+	del /f %pathToInboundEndpoints%\SecureWebSocketInboundEndpoint.xml
+	call :Timestamp value
+	echo %value% INFO - Removed the SecureWebSocketInboundEndpoint.xml file from %pathToInboundEndpoints%
+)
+EXIT /B 0
+
+:removeSynapseConfigs
+rem ----removing directories if exists ----
+for /f %%i in ('dir "%pathToSynapseConfigs%" /A:D /b') do (
+	rmdir /s /q %pathToSynapseConfigs%\%%i
+	call :Timestamp value
+	echo %value% INFO - Removed the %%i directory from %pathToSynapseConfigs%
+)
+rem ----removing the files if exists ------
+for /f %%i in ('dir "%pathToSynapseConfigs%" /A:-D /b ^| find /v "synapse.xml"') do (
+	del /f %pathToSynapseConfigs%\%%i
+	call :Timestamp value
+	echo %value% INFO - Removed the %%i file from %pathToSynapseConfigs%
+)
+EXIT /B 0
+
+:Timestamp
+set "%~1=[%date:~10,14%-%date:~4,2%-%date:~7,2% %time%]"
+EXIT /B 0
+
+:finishOptimization
+echo Finished the optimizations
+goto end
+
+:end
+cd /d %usertLocation%


another update on startApp.bat because of classpath building (hopefully the last)

--- src/templates/bin/startApp.bat
+++ src/templates/bin/startApp.bat
@@ -188,7 +188,7 @@
 set JAVA_OPTS=%JAVA_OPTS% -Dprogram.name="%PROGNAME%"

 @rem Execute App
-"%JAVA_EXE%" %JAVA_OPTS% -classpath "%CLASSPATH%" griffon.application.SingleFrameApplication %CMD_LINE_ARGS%
+"%JAVA_EXE%" %JAVA_OPTS% -classpath "%CP%" griffon.application.SingleFrameApplication %CMD_LINE_ARGS%

 :end
 @rem End local scope for the variables with windows NT shell


reenable the pause to give the opportunity to compile the solution

--- CreateTestresults.cmd
+++ CreateTestresults.cmd
@@ -1,7 +1,7 @@
 @pushd %~dp0

 ECHO Remember to build the solution first!
-REM pause
+pause

 Cd "%~dp0\TestHarness\packages\NUnit.Runners.*\tools"
 "nunit-console.exe" "%~dp0\TestHarness\nunit\bin\Debug\nunitHarness.dll" /result="%~dp0\results-example-nunit.xml"


Tweaking build script for weird pythons.

--- xb.bat
+++ xb.bat
@@ -1,7 +1,6 @@
 @ECHO OFF
 REM Copyright 2015 Ben Vanik. All Rights Reserved.

-TITLE xenia
 SET DIR=%~dp0

 SET XENIA_SLN=build\xenia\xenia.sln
@@ -508,7 +507,7 @@
   ENDLOCAL & SET _RESULT=1
   GOTO :eof
 )
-CMD /c python -c "import sys; sys.exit(1 if sys.version_info[:2] != (2, 7) else 0)"
+CMD /c python -c "import sys; sys.exit(1 if not sys.version_info[:2] == (2, 7) else 0)"
 IF %ERRORLEVEL% NEQ 0 (
   ENDLOCAL & SET _RESULT=1
   GOTO :eof


Update extensions/ringopengl/opengl42/buildvc.bat

--- extensions/ringopengl/opengl42/buildvc.bat
+++ extensions/ringopengl/opengl42/buildvc.bat
@@ -1,5 +1,5 @@
 cls
 call ../../../src/locatevc.bat
-cl /c /DEBUG ring_opengl42.c -I "..\..\..\libdepwin\glew\include" -I "..\..\..\libdepwin\freeglut\include" -I"..\..\..\include"
-link /DEBUG ring_opengl42.obj  ..\..\..\lib\ring.lib ..\..\..\libdepwin\glew\lib\release\win32\glew32.lib ..\..\..\libdepwin\freeglut\lib\freeglut.lib /DLL /OUT:..\..\..\bin\ring_opengl42.dll /SUBSYSTEM:CONSOLE,"5.01"
+cl /c /DEBUG ring_opengl42.c -I "..\..\..\extensions\libdepwin\glew\include" -I "..\..\..\extensions\libdepwin\freeglut\include" -I"..\..\..\include"
+link /DEBUG ring_opengl42.obj  ..\..\..\lib\ring.lib ..\..\..\extensions\libdepwin\glew\lib\release\win32\glew32.lib ..\..\..\extensions\libdepwin\freeglut\lib\freeglut.lib /DLL /OUT:..\..\..\bin\ring_opengl42.dll /SUBSYSTEM:CONSOLE,"5.01"
 del ring_opengl42.obj


all.bat: report error code back to the gobuilder

not sure that it will work, but.

R=golang-dev, bradfitz
CC=golang-dev
http://codereview.appspot.com/5649051

--- src/all.bat
+++ src/all.bat
@@ -16,3 +16,4 @@
 ..\bin\tool\dist banner

 :end
+exit %GOBUILDFAIL%


Update RunTests.bat

Update RunTests.bat

--- src/RunTests.bat
+++ src/RunTests.bat
@@ -4,4 +4,3 @@
 set report="%cd%\..\..\Tools\NUnit2Report.Console"
 %nunit%\nunit-console.exe WhiteSharp\bin\Debug\%name%.dll /out:Results\%name%.txt
 %report%\NUnit2Report.Console.exe --todir Results --out %name%.html --fileset=TestResult.xml --lang en
-pause


add two delete sentences into git.bat

add two delete sentences into git.bat

--- git.bat
+++ git.bat
@@ -1,5 +1,7 @@
 git reset .
 git add -A
+git reset *.iml
+git reset */*.iml
+git reset .idea/.name
 git reset .idea/*
-git reset */*.iml
 git reset */target/*


Added osgshaderterrain and osgparametric to runexamples.bat

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


updated SVG creation script

updated SVG creation script

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

--- sample/diag.cmd
+++ sample/diag.cmd
@@ -0,0 +1,13 @@
+@if "%1"=="" echo need input file & exit /b
+
+@echo %~n1.png ...
+@"c:\Program Files (x86)\Graphviz2.36\bin\dot" -Tpng  -O %1
+@move /Y %1.png %~n1.png > nul
+
+@echo %~n1-small.png ...
+@"c:\Program Files (x86)\Graphviz2.36\bin\dot" -Tpng -Gdpi=72  -O %1
+@move /Y %1.png %~n1-small.png > nul
+
+@echo %~n1.pdf ...
+@"c:\Program Files (x86)\Graphviz2.36\bin\dot" -Tpdf  -O -s12 %1
+@move /Y %1.pdf %~n1.pdf > nul


exit batch file on error

exit batch file on error

--- appveyor-test.cmd
+++ appveyor-test.cmd
@@ -2,6 +2,8 @@
 call setenv /x64
 coverage erase
 coverage run -p -m nose.core -v tvtk/tests
+if %errorlevel% neq 0 exit /b %errorlevel%
 coverage run -p -m nose.core -v mayavi
+if %errorlevel% neq 0 exit /b %errorlevel%
 coverage combine
 coverage report


Intel-6200 and Intel-6300 CLIs

Intel-6200 and Intel-6300 CLIs

git-svn-id: c15d90c68879a78f23c010891b142a02cbc7d74d@117 e6edf6fb-f266-4316-afb4-e53d95876a76

--- Vendor_CLI/install.bat
+++ Vendor_CLI/install.bat
@@ -43,6 +43,7 @@
 echo WFA_CLI_STA_DEVICE="C:\WFA\CLIs\Intel" > C:\WFA\WFAEndpoint\sigma_settings.txt
 echo DEVICE=6300>> C:\WFA\WFA_Endpoint\sigma_settings.txt
 echo VERSION=%INTEL_CLI_VER% >> C:\WFA\WfaEndpoint\sigma_settings.txt
+C:\WFA\CLIs\Intel\RegEditSigma.msi
 goto :EOF

 :Intel-6200
@@ -57,6 +58,7 @@
 echo WFA_CLI_STA_DEVICE="C:\WFA\CLIs\Intel" > C:\WFA\WFAEndpoint\sigma_settings.txt
 echo DEVICE=6200>> C:\WFA\WFA_Endpoint\sigma_settings.txt
 echo VERSION=%INTEL_CLI_VER% >> C:\WFA\WfaEndpoint\sigma_settings.txt
+C:\WFA\CLIs\Intel\RegEditSigma.msi
 goto :EOF


added a tree function, upon loading, so I can see which folders are available... I wonder how the execution would benefit from running a 'dir' as well.

--- sublime.bat
+++ sublime.bat
@@ -1,5 +1,6 @@
 @ECHO off
-SET /P gitdir=Enter file directory: &
+tree C:\Users\testbuy\Documents\GitHub &
+SET /P gitdir=Enter desired github directory: &
 START "" "C:\Program files\Sublime text 3\sublime_text.exe" &
 pushd C:\Users\testbuy\Documents\GitHub\%gitdir% &
 git pull &


Bug fix: %RETURN% incorrectly returned empty variables. Added registry access routines.

--- Batch/Library.bat
+++ Batch/Library.bat
@@ -153,6 +153,8 @@
 :#                  Added a backspace entity.                                 #
 :#   2015-12-01 JFL Rewrote :extensions.get and :extensions.show.             #
 :#                  Fixed a bug in the %FUNCTION% macro.                      #
+:#   2016-09-01 JFL Bug fix: %RETURN% incorrectly returned empty variables.   #
+:#                  Added registry access routines.			      #
 :#                                                                            #
 :#          Copyright 2016 Hewlett Packard Enterprise Development LP         #
 :# Licensed under the Apache 2.0 license  www.apache.org/licenses/LICENSE-2.0 #
@@ -435,6 +437,10 @@
 :#                                                                            #
 :#                  %IF_DEBUG%      Execute a command in debug mode only      #
 :#                  %IF_VERBOSE%    Execute a command in verbose mode only    #
+:#                                                                            #
+:#                  %FUNCTION0%	    Weak functions with no local variables.   #
+:#                  %RETURN0%       Return from a %FUNCTION0% and trace it    #
+:#                  %RETURN#%       Idem, with comments after the return      #
 :#                                                                            #
 :#  Variables       %>DEBUGOUT%     Debug output redirect. Either "" or ">&2".#
 :#                  %LOGFILE%       Log file name. Inherited. Default=NUL.    #
@@ -494,6 +500,7 @@
 :#                  delayed expansion enabled. This fixes issues with CR & LF.#
 :#                  Added a backspace entity.                                 #
 :#   2015-12-01 JFL Bug fix: %FUNCTION% with no arg did change the exp. mode. #
+:#   2016-09-01 JFL Bug fix: %RETURN% incorrectly returned empty variables.   #
 :#                                                                            #
 :#----------------------------------------------------------------------------#

@@ -538,13 +545,15 @@
   set "DEBUG.SETARGS=" %\n%
   for %%v in (%!%DEBUG.RETVARS%!%) do ( %\n%
     set "DEBUG.VALUE=%'!%%%v%'!%" %# We must remove problematic characters in that value #% %\n%
-    set "DEBUG.VALUE=%'!%DEBUG.VALUE:%%=%%DEBUG.percnt%%%'!%"	%# Remove percent #% %\n%
-    for %%e in (sp tab cr lf quot) do for %%c in ("%'!%DEBUG.%%e%'!%") do ( %# Remove named character entities #% %\n%
-      set "DEBUG.VALUE=%'!%DEBUG.VALUE:%%~c=%%DEBUG.%%e%%%'!%" %\n%
+    if defined DEBUG.VALUE ( %# Else the following lines will generate phantom characters #% %\n%
+      set "DEBUG.VALUE=%'!%DEBUG.VALUE:%%=%%DEBUG.percnt%%%'!%"	%# Encode percent #% %\n%
+      for %%e in (sp tab cr lf quot) do for %%c in ("%'!%DEBUG.%%e%'!%") do ( %# Encode named character entities #% %\n%
+	set "DEBUG.VALUE=%'!%DEBUG.VALUE:%%~c=%%DEBUG.%%e%%%'!%" %\n%
+      ) %\n%
+      set "DEBUG.VALUE=%'!%DEBUG.VALUE:^^=%%DEBUG.hat%%%'!%"	%# Encode carets #% %\n%
+      call set "DEBUG.VALUE=%%DEBUG.VALUE:%!%=^^^^%%" 		%# Encode exclamation points #% %\n%
+      set "DEBUG.VALUE=%'!%DEBUG.VALUE:^^^^=%%DEBUG.excl%%%'!%"	%# Encode exclamation points #% %\n%
     ) %\n%
-    set "DEBUG.VALUE=%'!%DEBUG.VALUE:^^=%%DEBUG.hat%%%'!%"	%# Remove carets #% %\n%
-    call set "DEBUG.VALUE=%%DEBUG.VALUE:%!%=^^^^%%" 		%# Remove exclamation points #% %\n%
-    set "DEBUG.VALUE=%'!%DEBUG.VALUE:^^^^=%%DEBUG.excl%%%'!%"	%# Remove exclamation points #% %\n%
     set DEBUG.SETARGS=%!%DEBUG.SETARGS%!% "%%v=%'!%DEBUG.VALUE%'!%" %\n%
   ) %\n%
   if %!%DEBUG%!%==1 ( %# Build the debug message and display it #% %\n%
@@ -661,7 +670,7 @@
 :# Macro for displaying comments on the return log line
 set RETURN#=set "RETURN#ERR=%'!%ERRORLEVEL%'!%" %&% %MACRO% ( %\n%
   set RETVAL=%!%MACRO.ARGS:~1%!%%\n%
-  call :Debug.Return %!%RETURN#ERR%!% %\n%
+  call :Debug.Return0 %!%RETURN#ERR%!% %\n%
   %ON_MACRO_EXIT% set "INDENT=%'!%INDENT%'!%" %/ON_MACRO_EXIT% %&% set "RETURN#ERR=" %&% exit /b %\n%
 ) %/MACRO%
 set "EXEC.ARGS= %EXEC.ARGS%"
@@ -2774,6 +2783,181 @@

 :#----------------------------------------------------------------------------#
 :#                                                                            #
+:#  Function        GetKeys						      #
+:#                                                                            #
+:#  Description     Get sub-keys of a Registry key                            #
+:#                                                                            #
+:#  Arguments       [-c]	  Case sensitive. Default: Insensitive        #
+:#                  [-f PATTERN]  Pattern to search for. Default: *           #
+:#                  KEY           Parent key name                             #
+:#                  [OUTVAR]      Output list name. Default: KEYS             #
+:#                                                                            #
+:#  Notes 	                                                              #
+:#                                                                            #
+:#  History                                                                   #
+:#                                                                            #
+:#----------------------------------------------------------------------------#
+
+:# List registry sub-keys. Args: [-c] [-f PATTERN] KEY [OUTVAR]
+:GetKeys
+%FUNCTION% enableextensions enabledelayedexpansion
+set "PATTERN=*"
+set "OPTS=/k"
+set "KEY="
+set "OUTVAR="
+:get_keys_args
+if "%~1"=="" goto got_keys_args
+if "%~1"=="-c" shift & set "OPTS=%OPTS% /c" & goto get_keys_args
+if "%~1"=="-f" shift & set "PATTERN=%~1" & shift & goto get_keys_args
+if not defined KEY set "KEY=%~1" & shift & goto get_keys_args
+if not defined OUTVAR set "OUTVAR=%~1" & shift & goto get_keys_args
+:got_keys_args
+if not defined OUTVAR set "OUTVAR=KEYS"
+set "%OUTVAR%="
+%ECHOVARS.D% KEY OUTVAR
+%UPVAR% %OUTVAR%
+set "BEFORE="
+if "%FULLPATH%"=="1" set "BEFORE=%KEY%\"
+:# Use reg.exe to get the key information
+set CMD=reg query "%KEY%" /f !PATTERN! !OPTS!
+%ECHO.D% %CMD%
+:# For each line in CMD output...
+set "SEPARATOR="
+%FOREACHLINE% %%l in ('%CMD%') do (
+  set "LINE=%%l"
+  set "HEAD=!LINE:~0,2!"
+  if "!HEAD!"=="HK" (
+    set "NAME=%%~nxl"
+    if "!NAME!"=="(Default)" set "NAME="
+    set "NAME=!BEFORE!!NAME!"
+    call :CondQuote NAME
+    set %OUTVAR%=!%OUTVAR%!!SEPARATOR!!NAME!
+    set "SEPARATOR= "
+  )
+)
+%RETURN%
+
+:#----------------------------------------------------------------------------#
+
+:# List registry values. Args: [-/] [-c] [-f PATTERN] KEY [OUTVAR]
+:GetValues
+%FUNCTION% enableextensions enabledelayedexpansion
+set "DETAILS=0"
+set "PATTERN=*"
+set "OPTS=/v"
+set "KEY="
+set "OUTVAR="
+:get_values_args
+if "%~1"=="" goto got_values_args
+if "%~1"=="-/" shift & set "DETAILS=1" & goto get_values_args
+if "%~1"=="-c" shift & set "OPTS=%OPTS% /c" & goto get_values_args
+if "%~1"=="-f" shift & set "PATTERN=%~1" & shift & goto get_values_args
+if not defined KEY set "KEY=%~1" & shift & goto get_values_args
+if not defined OUTVAR set "OUTVAR=%~1" & shift & goto get_values_args
+:got_values_args
+if not defined OUTVAR set "OUTVAR=VALUES"
+set "%OUTVAR%="
+%ECHOVARS.D% KEY OUTVAR
+%UPVAR% %OUTVAR%
+set BEFORE=
+if "%FULLPATH%"=="1" set "BEFORE=%KEY%\"
+:# Use reg.exe to get the key information
+set CMD=reg query "%KEY%" /f !PATTERN! !OPTS!
+%ECHO.D% %CMD%
+:# For each line in CMD output...
+set "SEPARATOR="
+%FOREACHLINE% %%i in ('%CMD%') do (
+  set "LINE=%%i"
+  %ECHOVARS.D% LINE
+  :# Values are indented by 4 spaces.
+  set "HEAD=!LINE:~0,4!"
+  set "LINE=!LINE:~4!"
+  :# But extra lines of multi-lined values are indented by >20 spaces.
+  set "HEAD2=!LINE:~0,4!"
+  if "!HEAD!"=="    " if not "!HEAD2!"=="    " (
+    :# Some versions of reg.exe use 4 spaces as field separator; others use a TAB.
+    :# Change the 4-spaces around the REG_XX type word to a TAB.
+    set "TOKENS=!LINE:    =	!"
+    %ECHOVARS.D% TOKENS
+    :# Extract the value name as the first item before the first TAB.
+    :# Names can contain spaces, but assume they don't contain TABs.
+    for /f "tokens=1,2* delims=	" %%j in ("!TOKENS!") do (
+      set "NAME=%%j"
+      if "!NAME!"=="(Default)" set "NAME="
+      set "TYPE=%%k"
+      set "VALUE=%%l"
+      %ECHOVARS.D% NAME TYPE VALUE
+      if %DETAILS%==0 (
+	set "NAME=!BEFORE!!NAME!"
+	call :CondQuote NAME
+	set %OUTVAR%=!%OUTVAR%!!SEPARATOR!!NAME!
+	set "SEPARATOR= "
+      ) else (
+      	echo !NAME!/!TYPE!/!VALUE!
+      )
+    )
+  )
+)
+%RETURN%
+
+:#----------------------------------------------------------------------------#
+
+:# Get a registry value content. Args: KEY NAME [VALUEVAR [TYPEVAR]]
+:GetValue
+%FUNCTION% enableextensions enabledelayedexpansion
+set "KEY="
+set "NAME="
+set "VALUEVAR="
+set "TYPEVAR="
+:get_value_args
+if "%~1"=="" goto got_value_args
+if not defined KEY set "KEY=%~1" & shift & goto get_value_args
+if not defined NAME set "NAME=%~1" & shift & goto get_value_args
+if not defined VALUEVAR set "VALUEVAR=%~1" & shift & goto get_value_args
+if not defined TYPEVAR set "TYPEVAR=%~1" & shift & goto get_value_args
+:got_value_args
+if not defined VALUEVAR set "VALUEVAR=VALUE"
+set "%VALUEVAR%="
+:# Returning the type is optional. Do not define a default for TYPEVAR.
+%ECHOVARS.D% KEY NAME VALUEVAR TYPEVAR
+%UPVAR% %VALUEVAR%
+if defined TYPEVAR %UPVAR% %TYPEVAR%
+if "%NAME%"=="" (
+  set CMD=reg query "%KEY%" /ve
+) else (
+  set CMD=reg query "%KEY%" /v "%NAME%"
+)
+%ECHO.D% %CMD%
+:# For each line in CMD output...
+%FOREACHLINE% %%i in ('%CMD%') do (
+  set "LINE=%%i"
+  %ECHOVARS.D% LINE
+  :# Values are indented by 4 spaces.
+  set "HEAD=!LINE:~0,4!"
+  set "LINE=!LINE:~4!"
+  :# But extra lines of multi-lined values are indented by >20 spaces.
+  set "HEAD2=!LINE:~0,4!"
+  if "!HEAD!"=="    " if not "!HEAD2!"=="    " (
+    :# Some versions of reg.exe use 4 spaces as field separator; others use a TAB.
+    :# Change the 4-spaces around the REG_XX type word to a TAB.
+    set "TOKENS=!LINE:    =	!"
+    %ECHOVARS.D% TOKENS
+    :# Extract the value name as the first item before the first TAB.
+    :# Names can contain spaces, but assume they don't contain TABs.
+    for /f "tokens=1,2* delims=	" %%j in ("!TOKENS!") do (
+      set "NAME=%%j"
+      set "TYPE=%%k"
+      set "VALUE=%%l"
+      %ECHOVARS.D% NAME TYPE VALUE
+    )
+  )
+)
+set %VALUEVAR%=!VALUE!
+if defined TYPEVAR set %TYPEVAR%=%TYPE%
+%RETURN%
+
+:#----------------------------------------------------------------------------#
+:#                                                                            #
 :#  Function        Test*                                                     #
 :#                                                                            #
 :#  Description     Misc test routines for testing the debug library itself   #
@@ -3057,6 +3241,31 @@
 :DDX
 setlocal DisableDelayedExpansion
 goto :eof
+
+:#----------------------------------------------------------------------------#
+:# Test %FUNCTION0% / %RETURN0%
+
+:Func0
+%FUNCTION0%
+%ECHO% This is function 0
+call :Func1
+%RETURN0%
+
+:Func1
+%FUNCTION0%
+%ECHO% This is function 1
+%RETURN0%
+
+:Func#0
+%FUNCTION0%
+%ECHO% This is function #0
+call :Func#1
+%RETURN#% Returning from function #0
+
+:Func#1
+%FUNCTION0%
+%ECHO% This is function #1
+%RETURN0% Returning from function #1

 :#----------------------------------------------------------------------------#
 :#                                                                            #


Added parallel increase to watch builds.

--- CommandPrompt.bat
+++ CommandPrompt.bat
@@ -6,11 +6,11 @@
 @doskey mvcw=dotnet watch run -p Infrastructure\Host\Mvc\Mvc.csproj
 @doskey mvc=dotnet run -p Infrastructure\Host\Mvc\Mvc.csproj
 @doskey bc=dotnet clean build.proj
-@doskey btw=dotnet watch msbuild build.proj /p:RunTests=true /p:FilterTestFqn=$1 $2 $3 $4 $5 $6 $7 $8 $9
-@doskey bt=dotnet msbuild build.proj /p:RunTests=true /p:FilterTestFqn=$1 $2 $3 $4 $5 $6 $7 $8 $9
-@doskey bw=dotnet watch msbuild build.proj /p:RunTests=true /p:NoCoverage=true $*
-@doskey ba=dotnet msbuild build.proj /p:RunTests=true /m:12 $*
-@doskey b=dotnet msbuild build.proj /p:RunTests=true /p:NoCoverage=true /m:12 $*
+@doskey btw=dotnet watch msbuild build.proj /p:RunTests=true /m:16 /p:FilterTestFqn=$1 $2 $3 $4 $5 $6 $7 $8 $9
+@doskey bt=dotnet msbuild build.proj /p:RunTests=true /m:16 /p:FilterTestFqn=$1 $2 $3 $4 $5 $6 $7 $8 $9
+@doskey bw=dotnet watch msbuild build.proj /p:RunTests=true /p:NoCoverage=true /m:16 $*
+@doskey ba=dotnet msbuild build.proj /p:RunTests=true /m:16 $*
+@doskey b=dotnet msbuild build.proj /p:RunTests=true /p:NoCoverage=true /m:16 $*
 @doskey br=dotnet restore build.proj $*
 @echo.
 @echo Aliases:


Error Fix

Error Fix

1) Macro used instead of echo

--- dos/utilities.bat
+++ dos/utilities.bat
@@ -93,7 +93,7 @@
 		setlocal EnableDelayedExpansion

 			set "name=!name:%PUBLIC_LABEL_PREFIX%=!"
-			echo !name!
+			!cprintln! !name!

 		endlocal


Revert "print detailed debug info when creating DB"

This reverts commit 976cb30fbeae2de2a39cdd0ff8ff73f152dd7f15.

--- bin/create-db.bat
+++ bin/create-db.bat
@@ -4,7 +4,7 @@
 echo [INFO] please confirm has modified es/web/pom.xml--^>profile--^>development---^>connection.admin.url/connection.username/password
 cd %~dp0
 cd ../web
-call mvn db:create -e -X
+call mvn db:create

 cd ../bin
 pause


Added test script which runs all the demos in the OSG to make sure they
run ok.  User has to verify they are correct visually.

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

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

--- Make/osgtests.bat
+++ Make/osgtests.bat
@@ -0,0 +1,27 @@
+sgv cow.osg
+sgv -stereo cessna.osg
+sgv Town.osg
+
+osghangglide
+
+osgbillboard lz.rgb
+
+osgcube
+
+osghud glider.osg
+
+osgimpostor Town.osg
+
+osgreflect cow.osg
+
+osgscribe cow.osg
+
+osgstereoimage dog_left_eye.jpg dog_right_eye.jpg
+
+osgtext
+
+osgtexture reflect.rgb lz.rgb
+
+osgversion
+
+osgviews cow.osg


Updated publish script to use InnoSetup 6

--- Setup/Publish.cmd
+++ Setup/Publish.cmd
@@ -9,7 +9,7 @@
 SET   COMPILE_TOOL_16="%PROGRAMFILES(X86)%\Microsoft Visual Studio\2019\Community\Common7\IDE\devenv.exe"
 SET   COMPILE_TOOL_15="%PROGRAMFILES(X86)%\Microsoft Visual Studio\2017\Community\Common7\IDE\devenv.exe"

-SET        SETUP_TOOL="%PROGRAMFILES(x86)%\Inno Setup 5\iscc.exe"
+SET        SETUP_TOOL="%PROGRAMFILES(X86)%\Inno Setup 6\iscc.exe"

 SET       SIGN_TOOL_1="%PROGRAMFILES(X86)%\Microsoft SDKs\ClickOnce\SignTool\signtool.exe"
 SET       SIGN_TOOL_2="%PROGRAMFILES(X86)%\Windows Kits\10\App Certification Kit\signtool.exe"


delete use reg to set Environment

delete use reg to set Environment

--- SetEnvironment.bat
+++ SetEnvironment.bat
@@ -5,65 +5,65 @@
 ::HKEY_CURRENT_USER\Environment

-set regOgrepath=HKEY_CURRENT_USER\Environment
+REM set regOgrepath=HKEY_CURRENT_USER\Environment

-::BINĿ¼
-set regBINName=NFBIN_HOME
-set regBINValue=D:\NoahGameFrame\trunk\_Out\Client\Bin
-reg add "%regOgrepath%" /v "%regBINName%" /d "%regBINValue%" /f
+REM ::BINĿ¼
+REM set regBINName=NFBIN_HOME
+REM set regBINValue=D:\NoahGameFrame\trunk\_Out\Client\Bin
+REM reg add "%regOgrepath%" /v "%regBINName%" /d "%regBINValue%" /f

-::SERVER_BINĿ¼
-set regSERVERBINName=NFBIN_SERVER
-set regSERVERBINValue=D:\NoahGameFrame\trunk\_Out\Server
-reg add "%regOgrepath%" /v "%regSERVERBINName%" /d "%regSERVERBINValue%" /f
+REM ::SERVER_BINĿ¼
+REM set regSERVERBINName=NFBIN_SERVER
+REM set regSERVERBINValue=D:\NoahGameFrame\trunk\_Out\Server
+REM reg add "%regOgrepath%" /v "%regSERVERBINName%" /d "%regSERVERBINValue%" /f

-::COMM_BINĿ¼
-set regCOMMBINName=NFBIN_COMM
-set regCOMMBINValue=D:\NoahGameFrame\trunk\_Out\Comm
-reg add "%regOgrepath%" /v "%regCOMMBINName%" /d "%regCOMMBINValue%" /f
+REM ::COMM_BINĿ¼
+REM set regCOMMBINName=NFBIN_COMM
+REM set regCOMMBINValue=D:\NoahGameFrame\trunk\_Out\Comm
+REM reg add "%regOgrepath%" /v "%regCOMMBINName%" /d "%regCOMMBINValue%" /f

-::NF_HOMEĿ¼
-set regNF_HOMEName=NF_HOME
-set regNF_HOMEValue=D:\NoahGameFrame\trunk\\
-reg add "%regOgrepath%" /v "%regNF_HOMEName%" /d "%regNF_HOMEValue%" /f
+REM ::NF_HOMEĿ¼
+REM set regNF_HOMEName=NF_HOME
+REM set regNF_HOMEValue=D:\NoahGameFrame\trunk\\
+REM reg add "%regOgrepath%" /v "%regNF_HOMEName%" /d "%regNF_HOMEValue%" /f

-::APP_LIBĿ¼
-set regAPP_LIBName=APP_DEPLIB
-set regAPP_LIBVALUE=D:\NoahGameFrame\trunk\Dependencies\lib\\
-reg add "%regOgrepath%" /v "%regAPP_LIBName%" /d "%regAPP_LIBVALUE%" /f
+REM ::APP_LIBĿ¼
+REM set regAPP_LIBName=APP_DEPLIB
+REM set regAPP_LIBVALUE=D:\NoahGameFrame\trunk\Dependencies\lib\\
+REM reg add "%regOgrepath%" /v "%regAPP_LIBName%" /d "%regAPP_LIBVALUE%" /f

-::NF_NOSQL_NETĿ¼
-set regNF_HOMEName=NF_NOSQL_NET
-set regNF_HOMEValue=D:\NoahGameFrame\trunk\Dependencies\redis-cplusplus-client\msvc\anet_win32\\
-reg add "%regOgrepath%" /v "%regNF_HOMEName%" /d "%regNF_HOMEValue%" /f
+REM ::NF_NOSQL_NETĿ¼
+REM set regNF_HOMEName=NF_NOSQL_NET
+REM set regNF_HOMEValue=D:\NoahGameFrame\trunk\Dependencies\redis-cplusplus-client\msvc\anet_win32\\
+REM reg add "%regOgrepath%" /v "%regNF_HOMEName%" /d "%regNF_HOMEValue%" /f

-::BOOST
-set regBOOSTName=BOOST_HOME
-set regBOOSTValue=D:\NoahGameFrame\trunk\Dependencies\boost_1_53_0\\
-reg add "%regOgrepath%" /v "%regBOOSTName%" /d "%regBOOSTValue%" /f
+REM ::BOOST
+REM set regBOOSTName=BOOST_HOME
+REM set regBOOSTValue=D:\NoahGameFrame\trunk\Dependencies\boost_1_53_0\\
+REM reg add "%regOgrepath%" /v "%regBOOSTName%" /d "%regBOOSTValue%" /f

-::BOOSTLIB
-set regBOOSTLIBName=BOOST_LIB
-set regBOOSTLIBValue=D:\NoahGameFrame\trunk\Dependencies\boost_1_53_0\stage\lib\x64\vs11_0
-reg add "%regOgrepath%" /v "%regBOOSTLIBName%" /d "%regBOOSTLIBValue%" /f
+REM ::BOOSTLIB
+REM set regBOOSTLIBName=BOOST_LIB
+REM set regBOOSTLIBValue=D:\NoahGameFrame\trunk\Dependencies\boost_1_53_0\stage\lib\x64\vs11_0
+REM reg add "%regOgrepath%" /v "%regBOOSTLIBName%" /d "%regBOOSTLIBValue%" /f

-::Dependencies
-set regDEPName=NF_DEP
-set regDEPNameValue=D:\NoahGameFrame\trunk\Dependencies\\
-reg add "%regOgrepath%" /v "%regDEPName%" /d "%regDEPNameValue%" /f
+REM ::Dependencies
+REM set regDEPName=NF_DEP
+REM set regDEPNameValue=D:\NoahGameFrame\trunk\Dependencies\\
+REM reg add "%regOgrepath%" /v "%regDEPName%" /d "%regDEPNameValue%" /f

-::GLOGĿ¼
-set regGLOGName=GLOG_HOME
-set regGLOGValue=D:\NoahGameFrame\trunk\Dependencies\glog-0.3.3\src\windows\\
-reg add "%regOgrepath%" /v "%regGLOGName%" /d "%regGLOGValue%" /f
+REM ::GLOGĿ¼
+REM set regGLOGName=GLOG_HOME
+REM set regGLOGValue=D:\NoahGameFrame\trunk\Dependencies\glog-0.3.3\src\windows\\
+REM reg add "%regOgrepath%" /v "%regGLOGName%" /d "%regGLOGValue%" /f

-::TheronĿ¼
-set regTHERONName=THERON_HOME
-set regTHERONValue=D:\NoahGameFrame\trunk\Dependencies\Theron-6.00.01\Include\\
-reg add "%regOgrepath%" /v "%regTHERONName%" /d "%regTHERONValue%" /f
+REM ::TheronĿ¼
+REM set regTHERONName=THERON_HOME
+REM set regTHERONValue=D:\NoahGameFrame\trunk\Dependencies\Theron-6.00.01\Include\\
+REM reg add "%regOgrepath%" /v "%regTHERONName%" /d "%regTHERONValue%" /f

-echo Set Environment end
+REM echo Set Environment end

 rem ====================================================================================
 echo Start to extract boost_1_53_0


Adjustments for paths with spaces

Adjustments for paths with spaces

--- msconfig/set_vars.bat
+++ msconfig/set_vars.bat
@@ -42,7 +42,7 @@
 set DOTNET_DIR=%ROOT_DRIVE%\Windows\Microsoft.NET\Framework\v3.5

 REM For some reason this is not defined whilst in NMI
-if A%VS90COMNTOOLS%==A set VS90COMNTOOLS=%VS_DIR%\Common7\Tools
+if "A%VS90COMNTOOLS%"=="A" set VS90COMNTOOLS=%VC_DIR%\Common7\Tools

 REM Specify symbol image path for debugging
 if A%_NT_SYMBOL_PATH%==A set _NT_SYMBOL_PATH=SRV*%ROOT_DRIVE%\Symbols*http://msdl.microsoft.com/download/symbols
@@ -54,7 +54,7 @@
 set NEED_MANIFESTS_IN_EXTERNALS=True

 REM Where do the completed externals live?
-if A%EXTERN_DIR%==A set EXTERN_DIR=%cd%\..\externals
+if "A%EXTERN_DIR%"=="A" set EXTERN_DIR="%cd%\..\externals"
 set EXT_INSTALL=%EXTERN_DIR%\install
 set EXT_TRIGGERS=%EXTERN_DIR%\triggers


Setup correct path to ps file.

Setup correct path to ps file.

--- appveyor/setup_fftw_dlls.cmd
+++ appveyor/setup_fftw_dlls.cmd
@@ -1,4 +1,4 @@
 @ECHO OFF
 "%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Setup\WindowsSdkVer.exe" -q -version:%WINDOWS_SDK_VERSION%
 "%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Bin\SetEnv.cmd"
-call powershell setup_fftw_dlls.ps1
+call powershell -File appveyor\setup_fftw_dlls.ps1


changed artifact name

changed artifact name

--- admin/j14pack.bat
+++ admin/j14pack.bat
@@ -73,5 +73,5 @@
 jlink --add-modules java.se --output jre%version%
 jpackage --name "Jailer" --input . --main-jar jailer.jar --type msi --icon jailer.ico --win-menu --win-menu-group Jailer --vendor Wisser --app-version %version% --win-upgrade-uuid d636b4ee-6f10-451e-bf57-c89656780e22 --add-launcher "Jailer Data Browser"=databrowserlauncher.properties --runtime-image jre%version%

-move *.msi C:\Users\ralfw\tmp\"Jailer-%version%-with-java-JRE.msi"
+move *.msi C:\Users\ralfw\tmp\"Jailer-%version%.msi"
 move *.msi c:\tmp\"Jailer-%version%.msi"


conversion and transformation script

conversion and transformation script

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

--- imagemagick/opcodes_tables.bat
+++ imagemagick/opcodes_tables.bat
@@ -0,0 +1,14 @@
+gswin32c.exe -dNOPAUSE -dBATCH -sDEVICE=pngalpha -r400 -sOutputFile=opcodes_tables%%02d.png opcodes_tables.pdf
+convert opcodes_tables02.png -trim Java_onepage.png
+
+convert ( ( opcodes_tables03.png -gravity West -background white -splice 1x0  -background black -splice 1x0 -trim  +repage -chop 0x1 ) ( opcodes_tables04.png -gravity East -background white -splice 1x0  -background black -splice 1x0 -trim  +repage -chop 0x1 ) +append ) Java.png
+convert Java.png -trim Java.png
+
+convert opcodes_tables05.png -trim DotNet_onepage.png
+
+convert ( ( opcodes_tables06.png -gravity West -background white -splice 1x0  -background black -splice 1x0 -trim  +repage -chop 0x1 ) ( opcodes_tables07.png -gravity East -background white -splice 1x0  -background black -splice 1x0 -trim  +repage -chop 0x1 ) +append ) DotNet.png
+convert DotNet.png -trim DotNet.png
+
+convert opcodes_tables08.png -trim Android_onepage.png
+convert opcodes_tables09.png -trim x86_onepage.png
+convert opcodes_tables10.png -trim x64_onepage.png


add more comments to example campaign

add more comments to example campaign

--- campaigns/001-iw10-std/run.cmd
+++ campaigns/001-iw10-std/run.cmd
@@ -16,14 +16,17 @@
 exec 003-restore-sysctls koppa

 # start netperf as receiver at TCP port
-# 8000 and background process
-exec xxx-netperf-sink beta 8000
+# 8000 and background process. This applet
+# probably copy a local python helper program
+# to node beta.
+# xxx- prefixed applets are not implemented yet
+exec xxx-netperf-sink beta mode:background port:8000

 # limit rate at forwarding radio to 10000 byte/sec
 exec xxx-netem koppa rate:10000

 # set IW at sender to 20
-exec xxx-set-iw alpha 20
+exec xxx-conf-iw alpha 20
 # send 10000 byte from to beta (at node alpha)
 # do not background, wait in foreground, process
 # will block here until all bytes are transmitted
@@ -36,6 +39,7 @@
 # simple return the data writen with the previous backgrounded
 # "exec xxx-netperf-sink beta 8000" call. The data file
 # is copied here, the file at beta is removed (cleaned)
-exec xxx-netperf-sink beta data
+exec xxx-netperf-sink beta stop-backgrouding
+exec xxx-netperf-sink beta fetch-data


Add cppad bld.bat

Add cppad bld.bat

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

--- recipes/cppad/bld.bat
+++ recipes/cppad/bld.bat
@@ -0,0 +1,20 @@
+mkdir build
+cd build
+
+cmake ^
+    -G "NMake Makefiles" ^
+    -DCMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% ^
+    -DCMAKE_PREFIX_PATH=%LIBRARY_PREFIX% ^
+    -DCMAKE_BUILD_TYPE=Release ^
+    -DCMAKE_INSTALL_LIBDIR=lib ^
+    -DBUILD_SHARED_LIBS=ON ^
+    %SRC_DIR%
+if errorlevel 1 exit 1
+
+:: Build.
+cmake --build . --config Release
+if errorlevel 1 exit 1
+
+:: Install.
+cmake --build . --config Release --target install
+if errorlevel 1 exit 1


Added documentation build script

Added documentation build script

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

--- build_docs.cmd
+++ build_docs.cmd
@@ -0,0 +1,5 @@
+call git submodule update --init --recursive Docs
+call git submodule foreach git pull origin master
+xcopy Docs\content Docs\docs-common\content /s /e /Y
+cd Docs\docs-common
+call hugo server


Disable Python virtualenv on Jenkins

Disable Python virtualenv on Jenkins

--- ci/jenkins.cmd
+++ ci/jenkins.cmd
@@ -27,5 +27,6 @@
 PATH

 RMDIR /S /Q %TEST_OUT%
-CALL %BASEDIR%\test-setup
-CALL %BASEDIR%\test-run %*
+REM CALL %BASEDIR%\test-setup
+REM CALL %BASEDIR%\test-run %*
+behave %*


update forbidden link to md5sum.exe

update forbidden link to md5sum.exe

--- module/config.inc.bat
+++ module/config.inc.bat
@@ -22,17 +22,17 @@
 set URL_TOOL_WGET=https://eternallybored.org/misc/wget/1.19.4/32/wget.exe

 :: http://www.etree.org/md5com.html
-set URL_TOOL_MD5SUM=http://www.etree.org/cgi-bin/counter.cgi/software/md5sum.exe
+set URL_TOOL_MD5SUM=https://web.archive.org/web/20170430031141/http://www.etree.org:80/cgi-bin/counter.cgi/software/md5sum.exe

 :: https://fossies.org/windows/misc/unz600xn.exe/
 set URL_TOOL_UNZIP=https://fossies.org/windows/misc/unz600xn.exe/unzip.exe

 :: https://github.com/Microsoft/vswhere
-set URL_TOOL_VSWHERE=https://github.com/Microsoft/vswhere/releases/download/2.3.2/vswhere.exe
+set URL_TOOL_VSWHERE=https://github.com/Microsoft/vswhere/releases/download/2.5.2/vswhere.exe

 :: https://cmake.org
-set CMAKE_VERSION=cmake-3.10.2-win32-x86
-set URL_TOOL_CMAKE=https://cmake.org/files/v3.10/%CMAKE_VERSION%.zip
+set CMAKE_VERSION=cmake-3.12.4-win32-x86
+set URL_TOOL_CMAKE=https://cmake.org/files/v3.12/%CMAKE_VERSION%.zip

 :: ----------- build_pvpgn VARIABLES ------------


Further verbosity for the Windows builds

--- msconfig/set_vars.bat
+++ msconfig/set_vars.bat
@@ -1,4 +1,5 @@
 REM @echo off
+@echo on
 REM ======================================================================
 REM
 REM  Copyright (C) 1990-2007, Condor Team, Computer Sciences Department,
@@ -88,9 +89,9 @@
 echo ----------------------- WIN ENV DUMP ----------------------

 call vcvarsall.bat x86
-if not defined INCLUDE ( echo . && echo *** Failed to run vcvarsall.bat! Is Microsoft Visual Studio installed? && exit /B 1 )
+if not defined INCLUDE ( echo. && echo *** Failed to run vcvarsall.bat! Is Microsoft Visual Studio installed? && exit /B 1 )
 call setenv /2000 /RETAIL
-if not defined MSSDK ( echo . && echo *** Failed to run setenv.cmd! Are the Microsoft Platform SDK installed? && exit /B 1 )
+if not defined MSSDK ( echo. && echo *** Failed to run setenv.cmd! Are the Microsoft Platform SDK installed? && exit /B 1 )

 REM Add msconfig back to the start of the path, since the above
 REM bump us out of place.
@@ -119,7 +120,7 @@
 REM /D_CONST_RETURN
 set CONDOR_DEFINE=%CONDOR_NOWARN% /DHAVE_BACKFILL /DHAVE_BOINC /DHAVE_SNPRINTF /DHAVE_JOB_HOOKS /DHAVE_HIBERNATE /DBUILDID=%BID%
 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 powrprof.lib
+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 powrprof.lib iphlpapi.lib
 set CONDOR_LIBPATH=

 REM ======================================================================


update the PERL_DIR so V7_2-branch can build again

--- msconfig/set_vars.bat
+++ msconfig/set_vars.bat
@@ -35,7 +35,7 @@
 set VS_DIR=%ROOT_DRIVE%\Program Files\Microsoft Visual Studio 9.0
 set VC_DIR=%VS_DIR%\VC
 set VC_BIN=%VC_DIR%\bin
-set PERL_DIR=%ROOT_DRIVE%\Perl\bin
+set PERL_DIR=%SystemDrive%\Perl\bin;%SystemDrive%\Perl64\bin;%SystemDrive%\prereq\ActivePerl-5.10.1\bin
 set SDK_DIR=%ProgramFiles%\Microsoft Platform SDK
 set DBG_DIR=%ProgramFiles%\Debugging Tools for Windows (x86)
 set DOTNET_DIR=%ROOT_DRIVE%\Windows\Microsoft.NET\Framework\v3.5


Temporay fix the path We have to consider the installed one later

--- shell-integration.bat
+++ shell-integration.bat
@@ -8,8 +8,8 @@
 )

 set cur_path=%~dp0
-set ico_path=%cur_path%data\icons\gitc.ico
-set gitc_path=%cur_path%gitc
+set ico_path=%cur_path%gitc\data\icons\gitc.ico
+set gitc_path=%cur_path%gitc.py

 reg add "HKEY_CLASSES_ROOT\*\shell\gitc" /f /ve /t REG_SZ /d gitc
 reg add "HKEY_CLASSES_ROOT\*\shell\gitc" /f /v Icon /t REG_SZ /d "%ico_path%"


add set_opt.bat for test on Windows

add set_opt.bat for test on Windows

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

--- test/set_opt.bat
+++ test/set_opt.bat
@@ -0,0 +1,2 @@
+@echo off
+set OPT=/EHsc -I../xbyak /W4 -D_CRT_SECURE_NO_WARNINGS /nologo


Added windows startup script.

Added windows startup script.

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

--- backend/start.bat
+++ backend/start.bat
@@ -0,0 +1,16 @@
+@echo off
+set path=%path%;C:\erl5.10.3\bin;C:\erl5.10.3\erts-5.10.3\bin
+
+if "%1" == "" (
+    goto fail
+)
+(
+   if not "%2" == "" (
+       goto fail
+   )
+   erl -config mud -pa ebin edit deps\bear\ebin  deps\cowboy\ebin  deps\eredis\ebin  deps\folsom\ebin  deps\goldrush\ebin  deps\hive\ebin  deps\ibrowse\ebin  deps\jesse\ebin  deps\jsonx\ebin  deps\lager\ebin  deps\meck\ebin  deps\poolboy\ebin  deps\ranch\ebin -boot start_sasl -sname mud_dev -s mud start %*
+   goto :eof
+)
+
+:fail
+echo USAGE: start.bat path/to/game/resources/


Create build.bat

Create build.bat

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

--- src/modules/hellomodulesmultiimage/build.bat
+++ src/modules/hellomodulesmultiimage/build.bat
@@ -0,0 +1,26 @@
+mkdir -p out
+mkdir -p mods
+
+javac -d out \
+    src/kata/modules/hmod/HelloModules.java \
+    src/module-info.java
+
+jar -cfe mods/hmod.jar kata.modules.hmod.HelloModules -C out .
+
+$JAVA_HOME/bin/jlink \
+--module-path mods/:$JAVA9_MACOS_HOME/jmods \
+--add-modules hmod \
+--launcher hmod=hmod \
+--output hmod-image-java9-macos
+
+$JAVA_HOME/bin/jlink \
+--module-path mods/:$JAVA9_WIN64_HOME/jmods \
+--add-modules hmod \
+--launcher hmod=hmod \
+--output hmod-image-java9-win64
+
+$JAVA_HOME/bin/jlink \
+--module-path mods/:$JAVA9_LINUX_HOME/jmods \
+--add-modules hmod \
+--launcher hmod=hmod \
+--output hmod-image-java9-linux


Create appveyor_build.bat

Create appveyor_build.bat

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

--- appveyor_build.bat
+++ appveyor_build.bat
@@ -0,0 +1,23 @@
+conda build toolchain -c statiskit
+conda create -n _appveyor toolchain --use-local
+activate _appveyor
+conda build libboost-python -c statiskit
+conda build python-scons -c statiskit
+conda build python-parse -c statiskit
+
+IF NOT "%APPVEYOR_REPO_BRANCH%"=="master" GOTO DONE
+IF "%ANACONDA_USERNAME%"=="" GOTO DONE
+IF "%ANACONDA_PASSWORD%"=="" GOTO DONE
+
+conda install anaconda-client;
+anaconda login --username "%ANACONDA_USERNAME%" --password "%ANACONDA_PASSWORD%"
+
+FOR %%CONDA_RECIPE IN (toolchain, python-scons, python-parse) DO (
+  FOR /f %%i in ('conda build %CONDA_RECIPE% --output') DO (set CONDA_FILE=%%i)
+  anaconda upload --user statiskit %CONDA_FILE% --force;
+)
+
+GOTO DONE
+
+:DONE
+ECHO ~~~~~~~~~~~~~~~~~~~~~~ DONE %~f0 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~


MINIFICPP-1930 fix 32 bit win build

MINIFICPP-1930 fix 32 bit win build

Signed-off-by: Ferenc Gerlits <935a9a037c0eb96fabee8eebe1d7089d664f797c@gmail.com>
This closes #1408

--- win_build_vs.bat
+++ win_build_vs.bat
@@ -112,7 +112,8 @@
 ) else (
     set "buildcmd=msbuild /m nifi-minifi-cpp.sln /property:Configuration=%cmake_build_type% /property:Platform=%build_platform% && copy bin\%cmake_build_type%\minifi.exe minifi_main\"
 )
-cmake -G %generator% -DINSTALLER_MERGE_MODULES=%installer_merge_modules% -DTEST_CUSTOM_WEL_PROVIDER=%test_custom_wel_provider% -DENABLE_SQL=%build_SQL% -DUSE_REAL_ODBC_TEST_DRIVER=%real_odbc% ^
+echo on
+cmake -G %generator% -A %build_platform% -DINSTALLER_MERGE_MODULES=%installer_merge_modules% -DTEST_CUSTOM_WEL_PROVIDER=%test_custom_wel_provider% -DENABLE_SQL=%build_SQL% -DUSE_REAL_ODBC_TEST_DRIVER=%real_odbc% ^
         -DCMAKE_BUILD_TYPE_INIT=%cmake_build_type% -DCMAKE_BUILD_TYPE=%cmake_build_type% -DWIN32=WIN32 -DENABLE_LIBRDKAFKA=%build_kafka% -DENABLE_JNI=%build_jni% -DOPENSSL_OFF=OFF ^
         -DENABLE_COAP=%build_coap% -DENABLE_AWS=%build_AWS% -DENABLE_PDH=%build_PDH% -DENABLE_AZURE=%build_azure% -DENABLE_SFTP=%build_SFTP% -DENABLE_SPLUNK=%build_SPLUNK% -DENABLE_GCP=%build_GCP% ^
         -DENABLE_NANOFI=%build_nanofi% -DENABLE_OPENCV=%build_opencv% -DENABLE_PROMETHEUS=%build_prometheus% -DENABLE_ELASTICSEARCH=%build_ELASTIC% -DUSE_SHARED_LIBS=OFF -DDISABLE_CONTROLLER=ON  ^


Added some prompts to the TC build script to remember important steps

--- Build.tc.cmd
+++ Build.tc.cmd
@@ -4,6 +4,9 @@
 SET ARG1=%~1
 SET ARG2=%~2
 SET ARG3=%~3
+
+SET /P NA1=Have you pulled down the latest source for each repo?
+SET /P NA2=Have your updated the version.txt file in each repo?

 IF NOT "%ARG1%" == "" SET BUILD_CONFIG=%ARG1:~-1%
 IF "%ARG1%" == "" SET /P BUILD_CONFIG=Please select the build configuration to use (r = Release, d = Debug [Default]):


Fixed unintentional overwrite of local SerializedSchema.bin file during rolldown.

--- Build/Scripts/UpdateDependencies.bat
+++ Build/Scripts/UpdateDependencies.bat
@@ -92,6 +92,7 @@
 FOR /R "%sourceschema%" %%x IN (GSFSchema.*) DO REN "%%x" "openMIC.*"
 FOR /R "%sourceschema%" %%x IN (GSFSchema-InitialDataSet.*) DO REN "%%x" "openMIC-InitialDataSet.*"
 FOR /R "%sourceschema%" %%x IN (GSFSchema-SampleDataSet.*) DO REN "%%x" "openMIC-SampleDataSet.*"
+DEL /F "%sourceschema%\SerializedSchema.bin"
 MOVE /Y "%sourceschema%\*.*" "%targetschema%\"
 MOVE /Y "%sourceschema%\MySQL\*.*" "%targetschema%\MySQL\"
 MOVE /Y "%sourceschema%\Oracle\*.*" "%targetschema%\Oracle\"


Changed -bat file

Changed -bat file

--- rtpsgen/scripts/rtpsgen.bat
+++ rtpsgen/scripts/rtpsgen.bat
@@ -27,4 +27,4 @@
    )
 )

-%java_exec% -jar %dir%\rtpsgen.jar %args%
+%java_exec% -jar "%dir%\rtpsgen.jar" %args%


Use correct environment file in batch CLI

--- src/main/bin/dita.bat
+++ src/main/bin/dita.bat
@@ -112,7 +112,7 @@

 :checkJava
 rem Set environment variables
-call "%DITA_HOME%\resources\env.sh"
+call "%DITA_HOME%\resources\env.bat"

 set _JAVACMD=%JAVACMD%


Remove echo so the API key doesn't appear on screen.

--- common/platform-dotnet/push-packages.cmd
+++ common/platform-dotnet/push-packages.cmd
@@ -1,3 +1,5 @@
+@ECHO OFF
+
 if "%NUGET_API_KEY%" == "" goto NO_KEY
 if "%1" == "" goto MISSING_INPUT_FOLDER


Move mkdir up sequence

Move mkdir up sequence

--- autoclean-prep.bat
+++ autoclean-prep.bat
@@ -55,6 +55,7 @@
 	echo,

 	set workingdir=c:%HOMEPATH%\Desktop\techtemp
+	mkdir %workingdir%
 	echo cd %workingdir%
 	cd %workingdir%

@@ -74,11 +75,6 @@
             set FormattedDate=!FormattedDate:~-0,4!-!FormattedDate:~-4,2!-!FormattedDate:~-2,2!
         )
     )
-
-	echo mkdir %HOMEPATH%\Desktop\techtemp
-	mkdir %HOMEPATH%\Desktop\techtemp
-	rem echo cd %HOMEPATH%\Desktop\techtemp
-	rem cd %HOMEPATH%\Desktop\techtemp

 	:clientname
 	echo,


Fixed usage of buildkite-agent in windows.bat

--- tests/windows-running-a-script/windows.bat
+++ tests/windows-running-a-script/windows.bat
@@ -8,11 +8,11 @@

 ECHO --- Settings Data

-call buildkite-agent build-data set foo bar
+call buildkite-agent meta-data set foo bar

 ECHO --- Joke

-call buildkite-agent build-data get foo > __value.tmp
+call buildkite-agent meta-data get foo > __value.tmp
 SET /p VALUE=<__value.tmp
 DEL __value.tmp


Improve run_test for Windows

Improve run_test for Windows

--- recipes/thermofun/run_test.bat
+++ recipes/thermofun/run_test.bat
@@ -1,6 +1,22 @@
+echo on
+
 cd test
 mkdir build
 cd build
-cmake .. -GNinja -DCMAKE_PREFIX_PATH=%LIBRARY_PREFIX% -DCMAKE_BUILD_TYPE=Release
-ninja
-test.exe
+
+cmake .. ^
+    -GNinja ^
+    -DCMAKE_PREFIX_PATH=%LIBRARY_PREFIX% ^
+    -DCMAKE_BUILD_TYPE=Release ^
+    -DCMAKE_VERBOSE_MAKEFILE=ON || goto :error
+
+ninja || goto :error
+
+test.exe || goto :error
+
+exit /B 0
+
+
+:error
+echo ERROR!
+echo Command exit status: %ERRORLEVEL%


:setitle

:setitle

--- 2.5/iCatalyst.bat
+++ 2.5/iCatalyst.bat
@@ -473,7 +473,7 @@
 if %gif% gtr 0 (
 	set /a "perc=%ImageNumGIF%*100/%TotalNumGIF%"
 	set /a "tmpn=%jpeg%+%png%"
-	if %tmpn% gtr 0 (set "titlestr=%titlestr%^|")
+	if !tmpn! gtr 0 (set "titlestr=%titlestr%^|")
 	set "titlestr=!titlestr!GIF %giftitle%: !perc!%%"
 )
 title [%titlestr%] %name% %version%


Delete DebugLauncher.bat

Delete DebugLauncher.bat

--- DebugLauncher.bat
+++ DebugLauncher.bat
@@ -1,3 +0,0 @@
-@echo off
-python2 "%~dp0main.py" %*
-pause


Add example launch script for Windows

Add example launch script for Windows

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

--- FolderWatcher.bat
+++ FolderWatcher.bat
@@ -0,0 +1,5 @@
+:: Edit the list of directories below!
+
+cd %~dp0
+java -jar FolderWatcher.jar "C:\Users\Joe\Desktop" "C:\Users\Joe"
+


Adjusting the Windows install script (install.bat) to pass all options to the installer.

--- dist/win/scripts/install.bat
+++ dist/win/scripts/install.bat
@@ -1,2 +1,2 @@
 @echo off
-python seattleinstaller.py
+python seattleinstaller.py %*


add cp command

add cp command

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


Delete start-ssh-pageant.cmd

Delete start-ssh-pageant.cmd

--- start-ssh-pageant.cmd
+++ start-ssh-pageant.cmd
@@ -1,63 +0,0 @@
-@REM Do not use "echo off" to not affect any child calls.
-
-@REM The goal of this script is to simplify launching `ssh-pageant` at
-@REM logon, typically by dropping a shortcut into the Startup folder, so
-@REM that Pageant (the PuTTY authentication agent) will always be
-@REM accessible. No attempt is made to load SSH keys, since this is
-@REM normally handled directly by Pageant, and no interactive shell
-@REM will be launched.
-@REM
-@REM The `ssh-pageant` utility is launched with the `-r` (reuse socket)
-@REM option, to ensure that only a single running incarnation (per user)
-@REM will be required... instead of launching a separate process for
-@REM every interactive Git Bash session. A side effect of this selection
-@REM is that the SSH_AUTH_SOCK environment variable *must* be set prior
-@REM to running this script, with the value specifying a unix-style socket
-@REM path, and needs to be consistent for all git-related processes. The
-@REM easiest way to do this is to set a persistent USER environment
-@REM variable, which (under Windows 7) can be done via Control Panel
-@REM under System / Advanced System Settings. A typical value would look
-@REM similar to:
-@REM
-@REM    SSH_AUTH_SOCK=/tmp/.ssh-pageant-USERNAME
-@REM
-
-@REM Enable extensions, the `verify` call is a trick from the setlocal help
-@VERIFY other 2>nul
-@SETLOCAL EnableDelayedExpansion
-@IF ERRORLEVEL 1 (
-    @ECHO Unable to enable extensions
-    @GOTO failure
-)
-
-@REM Ensure that SSH_AUTH_SOCK is set
-@if "x" == "x%SSH_AUTH_SOCK%" @(
-    @ECHO The SSH_AUTH_SOCK environment variable must be set prior to running this script. >&2
-    @ECHO This is typically configured as a persistent USER variable, using a MSYS2 path for >&2
-    @ECHO the ssh-pageant authentication socket as the value. Something similar to: >&2
-    @ECHO. >&2
-    @ECHO    SSH_AUTH_SOCK=/tmp/.ssh-pageant-%USERNAME% >&2
-    @GOTO failure
-)
-
-@REM Start ssh-pageant if needed by git
-@FOR %%i IN ("git.exe") DO @SET GIT=%%~$PATH:i
-@IF EXIST "%GIT%" @(
-    @REM Get the ssh-pageant executable
-    @FOR %%i IN ("ssh-pageant.exe") DO @SET SSH_PAGEANT=%%~$PATH:i
-    @IF NOT EXIST "%SSH_PAGEANT%" @(
-        @FOR %%s IN ("%GIT%") DO @SET GIT_DIR=%%~dps
-        @FOR %%s IN ("!GIT_DIR!") DO @SET GIT_DIR=!GIT_DIR:~0,-1!
-        @FOR %%s IN ("!GIT_DIR!") DO @SET GIT_ROOT=%%~dps
-        @FOR %%s IN ("!GIT_ROOT!") DO @SET GIT_ROOT=!GIT_ROOT:~0,-1!
-        @FOR /D %%s in ("!GIT_ROOT!\usr\bin\ssh-pageant.exe") DO @SET SSH_PAGEANT=%%~s
-        @IF NOT EXIST "!SSH_PAGEANT!" @GOTO ssh-pageant-done
-    )
-)
-
-@REM Time to make the donuts!
-@ECHO Starting ssh-pageant...
-@FOR /f "usebackq tokens=1 delims=;" %%o in (`"%SSH_PAGEANT%" -qra %SSH_AUTH_SOCK%`) DO @ECHO %%o
-
-:ssh-pageant-done
-:failure


Fix for GRAILS-2719: increased default max heap size for Grails to 512Mb on Windows, which brings it into line with the *nix version.

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

--- bin/startGrails.bat
+++ bin/startGrails.bat
@@ -131,7 +131,7 @@
 set JAVA_EXE=%JAVA_HOME%\bin\java.exe
 set TOOLS_JAR=%JAVA_HOME%\lib\tools.jar

-if "%JAVA_OPTS%" == "" set JAVA_OPTS="-Xmx128m"
+if "%JAVA_OPTS%" == "" set JAVA_OPTS="-Xmx512m"
 set JAVA_OPTS=%JAVA_OPTS% -Dprogram.name="%PROGNAME%"
 set JAVA_OPTS=%JAVA_OPTS% -Dgrails.home="%GRAILS_HOME%"
 set JAVA_OPTS=%JAVA_OPTS% -Dbase.dir="."


live is boring without art - http://www.jamesjean.com/ [skip ci]

--- startfiles/status.bat
+++ startfiles/status.bat
@@ -1,4 +1,7 @@
-@echo off
+@ECHO OFF
+REM change console charset "codepage" to UTF-8
+CHCP 65001
+

 :: +-------------------------------------------------------------------------
 :: |
@@ -10,30 +13,44 @@
 TITLE WPN-XM Serverpack - Daemon Status Monitor

 :LOOP-START
+CLS
+echo.
+echo    WPN-XM Server Stack - Status Monitor
+echo.

-cls
-
-echo Nginx
+echo   ┌──────────────────────────────┐
+echo   │            Nginx             │
+echo   └──────────────────────────────┘
 tasklist /FI "imagename eq nginx.exe"
 echo.

-echo PHP
+echo   ┌──────────────────────────────┐
+echo   │             PHP              │
+echo   └──────────────────────────────┘
 tasklist /FI "imagename eq php-cgi.exe"
 echo.

-echo MariaDb
+echo   ┌──────────────────────────────┐
+echo   │           MariaDb            │
+echo   └──────────────────────────────┘
 tasklist /FI "imagename eq mysqld.exe"
 echo.

-echo MongoDb
+echo   ┌──────────────────────────────┐
+echo   │           MongoDb            │
+echo   └──────────────────────────────┘
 tasklist /FI "imagename eq mongod.exe"
 echo.

-echo Memcached
+echo   ┌──────────────────────────────┐
+echo   │           Memcached          │
+echo   └──────────────────────────────┘
 tasklist /FI "imagename eq memcached.exe"
 echo.

-echo Postgres
+echo   ┌──────────────────────────────┐
+echo   │           Postgres           │
+echo   └──────────────────────────────┘
 tasklist /FI "imagename eq postgres.exe"
 echo.


Update bld.bat

Update bld.bat

--- libboost-python/bld.bat
+++ libboost-python/bld.bat
@@ -3,11 +3,11 @@
 ECHO .\bootstrap.bat
 CALL .\bootstrap.bat
 IF errorlevel 1 exit 1
-ECHO .\bootstrap.bat mingw
-CALL .\bootstrap.bat mingw
+ECHO .\bootstrap.bat gcc
+CALL .\bootstrap.bat gcc
 ECHO type bootstrap.log
 CALL type bootstrap.log
-CALL .\bootstrap.bat mingw
+CALL .\bootstrap.bat gcc
 IF errorlevel 1 exit 1
 :: ECHO .\b2.exe install toolset=gcc --prefix=%SRC_DIR%\b2_for_mingw
 :: CALL .\b2.exe install toolset=gcc --prefix=%SRC_DIR%\b2_for_mingw


Enable functional tests to run for chef client in jenkins for windows

--- jenkins/verify-chef.bat
+++ jenkins/verify-chef.bat
@@ -45,4 +45,11 @@

 REM ; Test against the appbundle'd Chef
 cd c:\opscode\%PROJECT_NAME%\embedded\apps\chef
+
+IF "%PIPELINE_NAME%" == "chef-13" (
+REM ; Running unit and functional tests
+call bundle exec rspec -r rspec_junit_formatter -f RspecJunitFormatter -o %WORKSPACE%\test.xml -f documentation spec/unit spec/functional
+) ELSE (
+REM ; Running unit tests
 call bundle exec rspec -r rspec_junit_formatter -f RspecJunitFormatter -o %WORKSPACE%\test.xml -f documentation spec/unit
+)


fixed setup script call

fixed setup script call

--- build-ue4-game.bat
+++ build-ue4-game.bat
@@ -52,7 +52,7 @@
 	git submodule update --init --recursive

 	echo Adding dependencies...
-	%ENGINE_DIRECTORY%/Setup.bat
+	Setup.bat
 )

 %ENGINE_DIRECTORY%/Engine/Build/BatchFiles/RunUAT.bat BuildCookRun -project=%PROJECT% -build -%PLATFORM% -clientconfig=%CLIENT_CONFIG% -distribution -cook -stage -package -obbinapk -archive -archivedirectory=%ARCHIVE_DIRECTORY%


cleanup

cleanup

--- vendor/init.bat
+++ vendor/init.bat
@@ -357,5 +357,4 @@

 set initialConfig=

-
 exit /b


Optimize comments of using arguments in user-profile.cmd

--- vendor/init.bat
+++ vendor/init.bat
@@ -320,17 +320,15 @@
 echo :: you can add your plugins to the cmder path like so
 echo :: set "PATH=%%CMDER_ROOT%%\vendor\whatever;%%PATH%%"
 echo.
-echo :: Pass custom arguments to init.bat, and you can parse them like so:
-echo :: If found...
-echo :: echo %* | find /i "/noautorun">nul
+echo :: arguments in this batch are passed from init.bat, you can parse them like so:
+echo.
+echo :: echo %* | find /i "/customOption">nul
 echo :: if "%ERRORLEVEL%" == "0" (
-echo ::   call vsCode
-echo :: )
-echo.
-echo :: If NOT found...
-echo :: echo %* | find /i "/noautorun">nul
-echo :: if "%ERRORLEVEL%" == "1" (
-echo ::   call vsCode
+echo ::   echo found /customOption.
+echo ::   do something.
+echo :: ) else (
+echo ::   echo not found /customOption.
+echo ::   do something.
 echo :: )
 echo.
 echo @echo off


ci scripts update 2

ci scripts update 2

--- ci/appveyor/run.bat
+++ ci/appveyor/run.bat
@@ -1,7 +1,7 @@
 echo on
 setlocal EnableDelayedExpansion

-"APPVEYOR_BUILD_FOLDER\ci\appveyor\setup_rust.bash" || goto :error
+"%APPVEYOR_BUILD_FOLDER%\ci\appveyor\setup_rust.bash" || goto :error

 set CPP_TO_RUST_QUIET=1
 set RUST_BACKTRACE=1


Updating SDK version

Updating SDK version

--- Utilities/VSOBuildScripts/setBuildVersion.cmd
+++ Utilities/VSOBuildScripts/setBuildVersion.cmd
@@ -1,3 +1,3 @@
 set SDK_RELEASE_YEAR=2018
-set SDK_RELEASE_MONTH=04
+set SDK_RELEASE_MONTH=06
 set XDKVER=170300


generate vs2017 project files

generate vs2017 project files

--- NaoTHSoccer/Make/generate-vs2013.bat
+++ NaoTHSoccer/Make/generate-vs2013.bat
@@ -1,5 +1,5 @@
 echo "remove old database"
 del "../build/*.sdf"
-echo "create VS 2013 project files for SoccerNaoTH"
-premake5 --Test vs2013
+echo "create VS 2017 project files for SoccerNaoTH"
+premake5 --Test vs2017
 pause


DEV-56 | Finding vbox now working, remove setpath cause its not nessesary, no restart when no need

--- scripts/setup_vagrant_and_virtualbox.bat
+++ scripts/setup_vagrant_and_virtualbox.bat
@@ -40,6 +40,7 @@
 setlocal EnableDelayedExpansion
 set vagrantV=0.0
 set vboxV=0.0
+set restart="false"

 set LF=^

@@ -50,6 +51,7 @@

 for /F "skip=1 tokens=1" %%a in ('wmic product where "Name like 'vagrant'" get Version') do (
 	set "item=%%a"
+	call :removeCR
 	if !vagrantV! EQU 0.0 (
 			if not "!item!"=="" set vagrantV=!item!
 		)
@@ -74,10 +76,10 @@

 :findVBox
 echo.
-echo ...............Findding virtualbox..............
+echo ..............Findding virtualbox.............
 echo.

-for /F "skip=1 tokens=1" %%b in ('wmic product where "Name like 'vbox'" get Version') do (
+for /F "skip=1 tokens=1" %%b in ('wmic product where "Name like 'Oracle VM VirtualBox%%'" get Version') do (
 	set "item=%%b"
 	call :removeCR
 	if !vboxV! EQU 0.0 (
@@ -89,6 +91,7 @@
 IF %vboxV% EQU 0.0 GOTO vboxNotfound

 set vboxVs=%vboxV:.=%
+

 if %vboxVs% LSS 4312 (
 		echo Vagrant found with version %vboxV% that is not valid, process next step
@@ -114,6 +117,8 @@
 echo Virtual Box is installing
 START /wait /b C:\vbox.exe

+set restart="true"
+
 GOTO mainProcess

 echo ...........................................................
@@ -130,30 +135,30 @@

 echo Vagrant is installing
 start /wait /b C:\vgrant.msi
+
+set restart="true"
+
 GOTO findVBox

 :mainProcess
-echo ...........................................................

-echo Check Environment Variable
-
-set pathToInsert=%ProgramFiles%\Oracle\VirtualBox
-setx path "%pathToInsert%;%PATH%"
-
-echo ...........................................................
+echo.

 :: delete temp file
 IF EXIST c:\vgrant.msi del c:\vgrant.msi
 IF EXIST c:\vbox.exe  del c:\vbox.exe

-setlocal
-:PROMPT
+if %restart% EQU "false" GOTO END
+
+
 SET /P AREYOUSURE=Do you want to restart your computer now. It will apply changes and config (y/N)?
+
+
 IF /I "%AREYOUSURE%" NEQ "Y" GOTO END
-	shutdown.exe /r
+
+shutdown.exe /r
+
 :END
-endlocal
-

 pause


Fixes https://issues.apache.org/jira/browse/APLO-10 : Support installing/running from folder pathnames with spaces

git-svn-id: 2e7d1941c9591a1d82c6889778b1870c4945235f@1131143 13f79535-47bb-0310-9956-ffa450edef68

--- apollo-cli/src/main/resources/org/apache/activemq/apollo/cli/commands/bin/apollo-broker.cmd
+++ apollo-cli/src/main/resources/org/apache/activemq/apollo/cli/commands/bin/apollo-broker.cmd
@@ -22,7 +22,7 @@

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

-%APOLLO_HOME%\bin\apollo %*
+"%APOLLO_HOME%\bin\apollo" %*

 :END
 endlocal


One click desktop jar.

One click desktop jar.

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

--- BuildDesktop.bat
+++ BuildDesktop.bat
@@ -0,0 +1,3 @@
+@echo off
+cls
+gradlew desktop:dist


ignore another test in cookiecutter

ignore another test in cookiecutter

--- recipes/cookiecutter/run_test.bat
+++ recipes/cookiecutter/run_test.bat
@@ -1,4 +1,4 @@
 pip install -r requirements.txt
 cd "%SRC_DIR%"
-py.test --cov=cookiecutter -k "not _hg_ and not mercurial"
+py.test --cov=cookiecutter -k "not _hg_ and not mercurial and not test_make_sure_path_exists"
 if errorlevel 1 exit 1


documentation

documentation

--- open_ipython_notebook.bat
+++ open_ipython_notebook.bat
@@ -12,4 +12,4 @@

 :nextn:
 set path=%path%;%pythonexe%;%pythonexe%\Scripts
-ipython3 notebook --notebook-dir=_doc\notebooks+ipython3 notebook --notebook-dir=_doc\notebooks --matplotlib=inline


Removing dev dependencies on Windows

Removing dev dependencies on Windows

--- tools/windows/scripts/prepareRepoClone.cmd
+++ tools/windows/scripts/prepareRepoClone.cmd
@@ -122,6 +122,30 @@
 rd /s/q webSiteManagement
 rd /s/q scheduler

+popd
+
+echo Removing dev dependencies from azure module
+pushd %TEMP_REPO%\node_modules\azure\node_modules
+rd /s/q mocha
+rd /s/q jshint
+rd /s/q sinon
+rd /s/q should
+rd /s/q nock
+rd /s/q grunt
+rd /s/q grunt-jsdoc
+rd /s/q grunt-devserver
+popd
+
+echo Removing dev dependencies for xplat module
+pushd %TEMP_REPO%\node_modules
+rd /s/q mocha
+rd /s/q jshint
+rd /s/q sinon
+rd /s/q should
+rd /s/q nock
+rd /s/q winston-memory
+rd /s/q event-stream
+rd /s/q cucumber
 popd

 echo Removing unncessary files from the enlistment for the CLI to function...
@@ -147,6 +171,8 @@
 echo.
 popd

+
+
 echo Creating the wbin (Windows binaries) folder that will be added to the path...
 mkdir %TEMP_REPO%\wbin
 copy .\scripts\azure.cmd %TEMP_REPO%\wbin\


Adding explicit csound64.lib (#793).

Adding explicit csound64.lib (#793).

--- msvc/build_csoundqt.bat
+++ msvc/build_csoundqt.bat
@@ -7,6 +7,7 @@
     CSOUND_API_INCLUDE_DIR=%~dp0/"../include" ^
     CSOUND_INTERFACES_INCLUDE_DIR=%~dp0/"../interfaces" ^
     CSOUND_LIBRARY_DIR=%~dp0csound-vs\\Release ^
+    CSOUND_LIBRARY=%~dp0csound-vs/Release/csound64.lib ^
     LIBS+=%~dp0/deps/lib/libsndfile-1.lib ^
     INCLUDEPATH+="%~dp0deps\include"
 nmake.exe


chore: bump to reportgenerator dep to 4.3.6


Removed unused file.

Removed unused file.

--- Medium/nuget.bat
+++ Medium/nuget.bat
@@ -1 +0,0 @@
-dotnet pack --configuration release


wrong gameid

wrong gameid

--- extract_diff_test.bat
+++ extract_diff_test.bat
@@ -1,5 +1,5 @@
 @echo off
-set GAMEID=eql
+set GAMEID=test
 set ASSETPATH="E:\Games\Planetside 2 Test\Resources\Assets"

 for /f "delims=" %%a in ('external\date.exe +%%Y%%m%%d_%%H%%M%%S') do @set timestamp=%%a


compilation multithread

compilation multithread

--- devenv-vs2015.bat
+++ devenv-vs2015.bat
@@ -7,7 +7,7 @@
 ::    - double cliquer sur myenv.bat
 ::    - cd build
 ::    - cmake -G "Visual Studio 14 2015 Win64" ..
-::    - cmake --build . --config Release
+::    - cmake --build . --config Release -- -j6
 ::    - ctest -C Release
 :: Incredibuild (http://www.incredibuild.com/webhelp/#BuildConsole.html)
 ::    - BuildConsole Waves.sln /rebuild /cfg="Release|x64"


Simplify Makevars.win wrangling.

Simplify Makevars.win wrangling.

--- recipes/r-changeforest/bld.bat
+++ recipes/r-changeforest/bld.bat
@@ -1,6 +1,16 @@
+echo "export CXX_STD=CXX11" > tempfile
+IF %ERRORLEVEL% NEQ 0 exit 1
+echo "export PKG_CXXFLAGS=\$(CXX_VISIBILITY)" >> tempfile
+IF %ERRORLEVEL% NEQ 0 exit 1
+echo "PATH=\"\$(subst C:\,/c/,\$(RTOOLS40_HOME))/mingw\$(WIN)/bin:\$(PATH)\"" >> tempfile
+IF %ERRORLEVEL% NEQ 0 exit 1
+cat changeforest-r/src/Makevars.win >> tempfile
+IF %ERRORLEVEL% NEQ 0 exit 1
+mv tempfile changeforest-r/src/Makevars.win
+IF %ERRORLEVEL% NEQ 0 exit 1
+
 sed -i 's/gnu/msvc/' changeforest-r/src/Makevars.win
-sed -i '1s/^/export CXX_STD=CXX11\n/' changeforest-r/src/Makevars.win
-sed -i '1s/^/export PKG_CXXFLAGS=$(CXX_VISIBILITY)\n/' changeforest-r/src/Makevars.win
-sed -i 's/cargo build/PATH="$(subst C:\,/c/,$(RTOOLS40_HOME))/mingw$(WIN)/bin:$(PATH)" cargo build/' changeforest-r/src/Makevars.win
+IF %ERRORLEVEL% NEQ 0 exit 1
+
 "%R%" CMD INSTALL --build changeforest-r
 IF %ERRORLEVEL% NEQ 0 exit 1


Try 9.5.0

Try 9.5.0

--- release/arch/windows/build.bat
+++ release/arch/windows/build.bat
@@ -1,7 +1,7 @@

 set ADDON_VERSION=59
-set NW_VERSION=0.26.5
-set NODEJS_VERSION=9.1.0
+set NW_VERSION=0.28.1
+set NODEJS_VERSION=9.5.0

 set NW_RELEASE=v%NW_VERSION%
 set NW=nwjs-%NW_RELEASE%-win-x64


Updated synful.bat with vagrant command

Updated synful.bat with vagrant command

--- synful.bat
+++ synful.bat
@@ -10,7 +10,9 @@
             composer install --no-scripts --no-dev
         ) else if "%1"=="update" (
             composer update
-        ) else goto run
+        ) else if "%1"=="vagrant" (
+            vagrant up
+        ) goto run
     ) else (
         :run
         cd public


evolved test

evolved test

--- campaigns/001-netperf-data-exchange/run.cmd
+++ campaigns/001-netperf-data-exchange/run.cmd
@@ -5,6 +5,11 @@
 exec 001-alive beta
 exec 001-alive koppa

+# clean tmp data as well
+# /tmp/net-applet-shuffler/*
+exec 002-kill beta netperf-server tcpdump netperf
+exec 002-kill beta netperf-server tcpdump netperf
+exec 002-kill beta netperf-server tcpdump netperf

 # save syscall, no-op when already done
 exec 003-save-sysctls alpha
@@ -19,8 +24,19 @@

 #tcpdump
-exec xxx-capture-pcap beta background ofile="stream1.pcap" filter="port 8000"
-exec xxx-capture-pcap beta background ofile="stream2.pcap" filter="port 8001"
+exec xxx-capture-pcap beta mode:background ofile="stream1.pcap" filter="port
+8000"
+exec xxx-capture-pcap beta mode:background ofile="stream2.pcap" filter="port
+8001"
+
+exec xxx-capture-pcap beta mode:background id=1 filter=port 80
+exec xxx-capture-pcap beta mode:background id=2 filter=port 81
+[...]
+exec xxx-capture-pcap beta stop id=2
+
+
+
+exec xxx-capture-pcap beta fetch ofile="stream2.pcap"

 # xxx- prefixed applets are not implemented yet


CHANGE ~ add optional FILE argument(s) for `critique`

--- dbin/critique.cmd
+++ dbin/critique.cmd
@@ -59,10 +59,14 @@

 ##

-# $repo_dir = (Get-Item $MyInvocation.MyCommand.Path).directory.parent
+# $repo_dir = ( Get-Item $MyInvocation.MyCommand.Path ).directory.parent
 $repo_dir = [System.IO.FileInfo]::new(${__0}).directory.parent

-$repo_files = @( Get-ChildItem $repo_dir.fullname -file -recurse -force )
+$repo_files = @(
+    $args |
+        foreach-object { Get-ChildItem $_ -ea Silent }
+)
+if ( $repo_files.count -lt 1 ) { $repo_files = @( Get-ChildItem $repo_dir.fullname -file -recurse -force ) }

 $project_file_exclusions = @(
     $([regex]::Escape($repo_dir.fullname)+'\\.git\\.*$')
@@ -77,7 +81,7 @@

 $files_exist = ($files.Count -gt 0)

-if (-not $files_exist) { throw "no files found to critique"}
+if (-not $files_exist) { throw "no files found to critique" }

 $lint_module_name = 'PSScriptAnalyzer'
 $lint_module_version = '1.3.0'
@@ -87,7 +91,7 @@
 }
 $have_delinter = Get-Module $lint_module_name

-if (-not $have_delinter) { throw "unable to find/load '$lint_module_name' for critique"}
+if (-not $have_delinter) { throw "unable to find/load '$lint_module_name' for critique" }

 function abbrev_message {
     param([string]$message,[int]$size=$host.ui.RawUI.windowsize.width-1)


More changes to get VC2008 to build Condor in NMI

--- msconfig/set_vars.bat
+++ msconfig/set_vars.bat
@@ -33,12 +33,16 @@
 set ROOT_DRIVE=%SystemDrive%

 REM Set paths to Visual C++, the Platform SDKs, and Perl
-set VC_DIR=%ROOT_DRIVE%\Program Files\Microsoft Visual Studio 9.0\VC
-set VC_BIN=%ROOT_DRIVE%\Program Files\Microsoft Visual Studio 9.0\VC\bin
+set VS_DIR=%ROOT_DRIVE%\Program Files\Microsoft Visual Studio 9.0
+set VC_DIR=%VS_DIR%\VC
+set VC_BIN=%VC_DIR%\bin
+set PERL_DIR=%ROOT_DRIVE%\Perl\bin
+set SDK_DIR=%ProgramFiles%\Microsoft Platform SDK
+set DBG_DIR=%ProgramFiles%\Debugging Tools for Windows
 set DOTNET_DIR=%ROOT_DRIVE%\Windows\Microsoft.NET\Framework\v3.5
-set SDK_DIR=%ROOT_DRIVE%\Program Files\Microsoft Platform SDK
-set PERL_DIR=%ROOT_DRIVE%\Perl\bin
-set DBG_DIR=%ROOT_DRIVE%\Program Files\Debugging Tools for Windows
+
+REM For some reason this is not defined whilst in NMI
+if A%VS90COMNTOOLS%==A set VS90COMNTOOLS=%VS_DIR%\Common7\Tools

 REM Specify symbol image path for debugging
 if A%_NT_SYMBOL_PATH%==A set _NT_SYMBOL_PATH=SRV*%ROOT_DRIVE%\Symbols*http://msdl.microsoft.com/download/symbols
@@ -69,7 +73,7 @@

 REM Put msconfig 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%;%VC_BIN%;%SDK_DIR%;%DOTNET_DIR%;%DBG_DIR%
+set PATH=%cd%;%SystemRoot%;%SystemRoot%\system32;%PERL_DIR%;%VS_DIR%;%VC_DIR%;%VC_BIN%;%SDK_DIR%;%DOTNET_DIR%;%DBG_DIR%

 REM ======================================================================
 REM ====== THIS SHOULD BE REMOVED WHEN Win2K IS NO LONGER SUPPORTED ======


add comment

add comment

--- setup_vs_project_variables.bat
+++ setup_vs_project_variables.bat
@@ -4,6 +4,5 @@

 set BOOST_DIR=c:\libraries\boost\boost_1_52_0
 set FREEIMAGELIB_DIR=c:\libraries\FreeImage\%FreeImage_VERSION%
-set AIMP_PLUGINS_DIR=c:\AIMP\AIMP3.55.1312_RC2\Plugins
 ::set AIMP_PLUGINS_DIR=%ProgramFiles%\AIMP3\Plugins
 set AIMP_PLUGINS_DIR=c:\AIMP\AIMP3.55.1320\Plugins


add MAN page in script html5 to bootstrap3 generation

--- docs/build/html5-bootstrap3.bat
+++ docs/build/html5-bootstrap3.bat
@@ -50,3 +50,10 @@
 ECHO BUILDING GETTING STARTED ...

 "%ASCIIDOC_BIN%" -b bootstrap -a linkcss -a navbar=fixed -a totop -a theme=%ASCIIDOC_THEME% getting-started.asciidoc
+
+REM --
+REM -- MAN page
+REM --
+ECHO BUILDING MAN PAGE ...
+
+"%ASCIIDOC_BIN%" -b bootstrap -a linkcss -a navbar=fixed -a totop -a theme=%ASCIIDOC_THEME% -d article phpreflect.1.asciidoc


Try batch fix

Try batch fix

--- ci/appveyor/deploy.cmd
+++ ci/appveyor/deploy.cmd
@@ -1,7 +1,7 @@
 @echo on
 IF "%APPVEYOR_REPO_TAG%" == "true" (

-:: Create shared library archive for Bintray only ig Python 3.6
+REM Create shared library archive for Bintray only ig Python 3.6
 IF "%PYTHON_VERSION%" == "3.6" (
     cd %APPVEYOR_BUILD_FOLDER%\build\out

@@ -10,29 +10,31 @@
     ) ELSE (
         set OSQP_DEPLOY_DIR="osqp-0.2.0.dev0-windows64"
     )
-    :: Create directories
+    REM Create directories
     mkdir %OSQP_DEPLOY_DIR%
     mkdir %OSQP_DEPLOY_DIR%\lib
     mkdir %OSQP_DEPLOY_DIR%\include

-    :: Copy License
+    REM Copy License
     xcopy ..\..\LICENSE %OSQP_DEPLOY_DIR%

-    :: Copy includes
+    REM Copy includes
     xcopy ..\..\include\* %OSQP_DEPLOY_DIR%\include

-    :: Copy shared library
+    REM Copy shared library
     xcopy libosqp.dll %OSQP_DEPLOY_DIR%\lib

-    :: Compress package
-    7z a -ttar %OSQP_DEPLOY_DIR%.tar %OSQP_DEPLOY_DIR%\
+    REM Compress package
+    7z a -ttar %OSQP_DEPLOY_DIR%.tar %OSQP_DEPLOY_DIR%
     7z a -tgzip %OSQP_DEPLOY_DIR%.tar.gz %OSQP_DEPLOY_DIR%.tar

-    :: Deploy to Bintray
+    REM Deploy to Bintray
     curl -T %OSQP_DEPLOY_DIR%.tar.gz -ubstellato:%BINTRAY_API_KEY% -H "X-Bintray-Package:OSQP" -H "X-Bintray-Version:0.2.0.dev0" https://api.bintray.com/content/bstellato/generic/OSQP/0.2.0.dev0/
+    if errorlevel 1 exit /b 1

-    :: Publish
+    REM Publish
     curl -X POST -ubstellato:%BINTRAY_API_KEY% https://api.bintray.com/content/bstellato/generic/OSQP/0.2.0.dev0/publish
+    if errorlevel 1 exit /b 1
 )

@@ -50,10 +52,12 @@
 python setup.py bdist_wheel
 IF "%TEST_PYPI%" == "true" (
     twine upload --repository testpypi --config-file ..\..\ci\pypirc -p %PYPI_PASSWORD% dist/*
+    if errorlevel 1 exit /b 1
 ) ELSE (
     twine upload --repository pypi --config-file ..\..\ci\pypirc -p %PYPI_PASSWORD% dist/*
+    if errorlevel 1 exit /b 1
 )

-:: Close parenthesis for deploying only if it is a tagged commit
+REM Close parenthesis for deploying only if it is a tagged commit
 )
 @echo off


Updates from Overleaf

Updates from Overleaf

--- Compile.bat
+++ Compile.bat
@@ -1,115 +0,0 @@
-@echo off
-
-chcp 65001 >nul
-
-call :setESC
-
-set THESIS=main
-
-set flag=%1
-if %flag%x == x (
-	set flag=thesis
-)
-
-if %flag%x == thesisx (
-	call :cleanall
-	call :thesis
-	if ERRORLEVEL 1 (
-		echo.
-		echo %ESC%[31mError! Please check the %ESC%[7m'%THESIS%.log'%ESC%[0;31m for more details . . .%ESC%[0m
-		pause
-	) else (
-		call :clean
-		echo %ESC%[32mFinished!%ESC%[0m
-		pause
-	)
-	goto :EOF
-)
-
-if %flag%x == cleanx (
-	call :clean
-	goto :EOF
-)
-
-if %flag%x == cleanallx (
-	call :cleanall
-	goto :EOF
-)
-
-if %flag%x == wordcountx (
-	call :wordcount
-	goto :EOF
-)
-
-:help
-	echo %ESC%[33mThis is the compile batch script for SJTUThesis.
-	echo Usage:
-	echo     compile.bat [option]
-	echo options:
-	echo   thesis    Compile the thesis (default)
-	echo   clean     Clean all work files
-	echo   cleanall  Clean all work files and main.pdf
-	echo   wordcount Count words in main.pdf
-	echo   help      Print this help message%ESC%[0m
-goto :EOF
-
-:thesis
-	echo %ESC%[33mCompile . . .%ESC%[0m
-	latexmk -quiet -file-line-error -halt-on-error -interaction=nonstopmode %THESIS% 2>nul
-goto :EOF
-
-:clean
-	echo %ESC%[33mClean files . . .%ESC%[0m
-	latexmk -quiet -c %THESIS% 2>nul
-goto :EOF
-
-:cleanall
-	echo %ESC%[33mClean files . . .%ESC%[0m
-	latexmk -quiet -C %THESIS% 2>nul
-	if exist %THESIS%.pdf (
-		echo %ESC%[31mClose the file: %ESC%[7m'%THESIS%.pdf'%ESC%[0;31m!%ESC%[0m
-		pause
-		call :cleanall
-	)
-goto :EOF
-
-:wordcount
-	set found=0
-	setlocal enabledelayedexpansion
-
-	findstr "\\documentclass\[[^\[]*english" %THESIS%.tex > nul
-	if %errorlevel% equ 0 (
-		for /f "delims=" %%i in ('texcount %THESIS%.tex -inc -char-only  2^>nul') do (
-			if !found! equ 1 (
-				echo %ESC%[33m英文字符数			:%ESC%[36m!%%i!%ESC%[0m
-				goto :total
-			)
-			echo %%i | findstr "total" > nul && set found=1
-		)
-	) else (
-		for /f "delims=" %%i in ('texcount %THESIS%.tex -inc -ch-only  2^>nul') do (
-			if !found! equ 1 (
-				echo %ESC%[33m纯中文字数			:%ESC%[36m!%%i!%ESC%[0m
-				goto :total
-			)
-			echo %%i | findstr "total" > nul && set found=1
-		)
-	)
-
-:total
-	set found=0
-	for /f "delims=" %%i in ('texcount %THESIS%.tex -inc -chinese 2^>nul') do (
-		if !found! equ 1 (
-			echo %ESC%[33m总字数（英文单词 + 中文字）	:%ESC%[36m!%%i!%ESC%[0m
-			goto :EOF
-		)
-		echo %%i | findstr "total" > nul && set found=1
-	)
-goto :EOF
-
-:setESC
-for /F "tokens=1,2 delims=#" %%a in ('"prompt #$H#$E# & echo on & for %%b in (1) do rem"') do (
-	set ESC=%%b
-	exit /B 0
-)
-exit /B 0


[bouqueau] may be called from another directory

--- generate_installer.bat
+++ generate_installer.bat
@@ -1,4 +1,6 @@
 @echo off
+set OLDDIR=%CD%
+cd /d %~dp0
 REM ============================================
 echo *** Generating a Windows GPAC installer ***
 REM ============================================
@@ -65,4 +67,5 @@
 echo  *** ABORTING: CHECK ERROR MESSAGES ABOVE ***
 set VarRevisionSVN=
 set VarRevisionBuild=
+cd /d %OLDDIR%
 exit/b


add Reference

add Reference

--- src/FEZ/move_window/runner.bat
+++ src/FEZ/move_window/runner.bat
@@ -3,10 +3,12 @@
 #概要
 # FEZ Clientのウィンドウ位置を移動するためのツール
 #実行には管理者権限が必要
-#ref
+#
+#Reference
 #◆SetWindowPos
 # https://msdn.microsoft.com/ja-jp/library/cc411206.aspx
-#
+#◆Make it easier to wrap powershell scripts in batch files
+# https://connect.microsoft.com/PowerShell/feedback/details/724524/make-it-easier-to-wrap-powershell-scripts-in-batch-files
 #####################################################################
 Add-Type @"
   using System;


changed offset for 3.3.2

changed offset for 3.3.2

--- src/reader/reader.bat
+++ src/reader/reader.bat
@@ -1,5 +1,5 @@
 @echo off
-echo "Tiawps sessionkey reader Build 11159 3.3.x"
+echo "Tiawps sessionkey reader Build 11403 3.3.2"
 cd %~dp0
-tiawps_reader.exe 13181888 1288
+tiawps_reader.exe 13186064 1288
 PAUSE


Update bld.bat

Update bld.bat

--- conda/libboost/bld.bat
+++ conda/libboost/bld.bat
@@ -10,8 +10,7 @@
     set LIB_VER=140
 )

-call bootstrap.bat ^
-    --with-libraries=python
+call bootstrap.bat
 if errorlevel 1 exit 1

 CALL b2 install toolset=msvc-%MSVC_VER% ^
@@ -20,7 +19,6 @@
         threading=multi ^
         link=shared ^
         -j%CPU_COUNT% ^
-        --with-python ^
         --build-dir=buildboost ^
         --prefix=%LIBRARY_PREFIX%
 IF errorlevel 1 exit 1
@@ -30,6 +28,6 @@
 IF errorlevel 1 exit 1

 dir  %LIBRARY_LIB%
-ECHO %LIBRARY_LIB%\boost_python-vc90-mt-1_61.dll "%LIBRARY_BIN%"
-move %LIBRARY_LIB%\boost_python-vc90-mt-1_61.dll "%LIBRARY_BIN%"
+ECHO %LIBRARY_LIB%\boost_*-vc90-mt-1_61.dll "%LIBRARY_BIN%"
+move %LIBRARY_LIB%\boost_*-vc90-mt-1_61.dll "%LIBRARY_BIN%"
 IF errorlevel 1 exit 1


add usage message to the publish script

add usage message to the publish script

--- 2PublishNugetPackage.bat
+++ 2PublishNugetPackage.bat
@@ -1,2 +1,11 @@
+@if [%1]==[] goto usage
+
 .nuget\nuget push %1 REDACTED-nuget-publish-key -s http://nuget.build.d2l/nuget/stable
-pause
+goto :done
+
+:usage
+@echo Usage: %0 ^<nupkg_file_path^>
+
+:done
+@echo.
+@pause


Update engageOriginal.cmd

Update engageOriginal.cmd

--- bootstrap/peterkir/win32/engageOriginal.cmd
+++ bootstrap/peterkir/win32/engageOriginal.cmd
@@ -103,9 +103,9 @@
 ECHO -Declipse.p2.mirrors=true         >> %IDEFIX_INI%

 :: filtering user displayed catalogs/products/versions
-ECHO -Doomph.setup.product.catalog.filter=io.klib.products >> %IDEFIX_INI%
-ECHO -Doomph.setup.product.filter=idefix.base              >> %IDEFIX_INI%
-ECHO -Doomph.setup.product.version.filter=Mars             >> %IDEFIX_INI%
+ECHO -Doomph.setup.product.catalog.filter=(io\.klib\.products)>> %OOMPH_INI%
+ECHO -Doomph.setup.product.filter=(idefix\.base)>> %OOMPH_INI%
+ECHO -Doomph.setup.product.version.filter=(Mars)>> %OOMPH_INI%

 ECHO -Doomph.setup.jre.choice=false                                 >> %IDEFIX_INI%
 ECHO -Doomph.installer.update.url=%BINTRAY_BUILD_ROOT%/p2/installer >> %IDEFIX_INI%


[install] Add

[install] Add

Add new line

--- install-components.bat
+++ install-components.bat
@@ -25,4 +25,4 @@

 DEL "vs_buildtools.exe"

-PAUSE+PAUSE


Abstract script only run on master, which is a linux box. So, no need for bat script.

git-svn-id: 06aac1f7aa6783202dd435920b98a457d633d0b0@1070 a9e16012-fd73-49ee-95cb-036de7809213

--- jenkins/jenkinsabs.bat
+++ jenkins/jenkinsabs.bat
@@ -1,34 +0,0 @@
-@ECHO off
-rem rem rem rem rem rem rem rem rem rem rem rem rem rem rem rem rem
-rem
-rem Purpose: This starts jenkinsabs through cygwin on windows.
-rem
-rem $Id$
-rem
-rem rem rem rem rem rem rem rem rem rem rem rem rem rem rem rem rem
-
-ECHO jenkinsabs: windows batch script starting up in %CD% with arguments, %*.
-ECHO jenkinsabs.bat starting up in %CD% with arguments, %*. >> jenkinsabs.log
-
-REM Find cygwinbasedir
-set CYGWINBASEDIR=C:\cygwin64
-if exist %CYGWINBASEDIR% goto cygwinbasedir64
-  set CYGWINBASEDIR=C:\cygwin
-:cygwinbasedir64
-
-%CYGWINBASEDIR%\bin\cygpath %CD% >temp.txt
-set /p CYGWINPROJDIR= < temp.txt
-del temp.txt
-rem ECHO CYGWINPROJDIR= %CYGWINPROJDIR%.
-rem ECHO 2= %2
-set JENKINSABSERROR=0
-@ECHO on
-%CYGWINBASEDIR%\bin\bash --login %CYGWINPROJDIR%/bilder/jenkins/jenkinsabs %*
-@ECHO off
-if ERRORLEVEL 1 set JENKINSABSERROR=1
-
-ECHO   jenkinsabs: windows batch script completed with error = %JENKINSABSERROR%.
-ECHO jenkinsabs.bat completed with error = %JENKINSABSERROR%. >> jenkinsabs.log
-
-EXIT /B %JENKINSABSERROR%
-


Fix script.

Fix script.

--- npmpublish.cmd
+++ npmpublish.cmd
@@ -42,7 +42,7 @@
 call npm install . -g
 IF %ERRORLEVEL% NEQ 0 goto error

-echp Publishing KuduSync
+echo Publishing KuduSync
 call npm publish
 IF %ERRORLEVEL% NEQ 0 goto error


Update to nuget-push.cmd for new version.

--- nuget-push.cmd
+++ nuget-push.cmd
@@ -1,2 +1,2 @@
-.nuget\nuget push Yort.Ntp.Portable.1.0.7.nupkg
+.nuget\nuget push Yort.Ntp.Portable.1.0.8.nupkg
 pause


GOCI tracker app: adding windows batch file

--- goci-curation/goci-tracker-app/src/main/bin/goci-tracker.bat
+++ goci-curation/goci-tracker-app/src/main/bin/goci-tracker.bat
@@ -3,10 +3,10 @@

 set base=%~dp0..
 set current=dir
-set java="%JAVA_HOME%\bin\java"
+set java="%JAVA_HOME%/bin/java"

-for %%F in ("%base%\lib\*") do (set jars=!jars!;%%F)
+for %%F in ("%base%/lib/*") do (set jars=!jars!;%%F)

-set classpath="%base%\config%jars%"
+set classpath="%base%/config%jars%"

 %java% %args% -classpath %classpath% uk.ac.ebi.fgpt.goci.GOCITrackerDriver %*


Delete RunUnitTestMetrics.bat

Delete RunUnitTestMetrics.bat

--- RunUnitTestMetrics.bat
+++ RunUnitTestMetrics.bat
@@ -1 +0,0 @@
-.\packages\OpenCover.4.6.519\tools\OpenCover.Console.exe -register:user -target:"J:\Microsoft Visual Studio 14.0\Common7\IDE\MSTest.exe" -targetargs:"/noresults /noisolation /testcontainer:"".\MtgApiManager.Lib.Test\bin\Debug\MtgApiManager.Lib.Test.dll" -filter:"+[MtgApiManager.Lib]*  -[MtgApiManager.Lib]MtgApiManager.Lib.Properties.*" -excludebyattribute:*.ExcludeFromCodeCoverage* -hideskipped:All -output:.\MtgApiManager.Lib_coverage.xml


In future, use the Windows-mode 7zip self-extractor not the default console-mode one

--- SDK/Win32/buildsdk.bat
+++ SDK/Win32/buildsdk.bat
@@ -83,7 +83,7 @@
 move %BUILD_DIR%\sdk %SDKNAME%
 del /Q/F %SDKNAME%.7z
 rem create self-extracting 7zip archive
-7z a -r -y -sfx %SDKNAME%.exe %SDKNAME%
+7z a -r -y -sfx7z.sfx %SDKNAME%.exe %SDKNAME%

 echo Done! Test %SDKNAME%.exe and then release
 goto end


tsan: fix windows build script

tsan: fix windows build script

add missing source files
+ add -std=c++11 as it is now required to build compiler-rt

git-svn-id: c199f293c43da69278bea8e88f92242bf3aa95f7@229393 91177308-0d34-0410-b5e6-96231b3b80d8

--- lib/tsan/go/build.bat
+++ lib/tsan/go/build.bat
@@ -1,4 +1,4 @@
-type tsan_go.cc ..\rtl\tsan_interface_atomic.cc ..\rtl\tsan_clock.cc ..\rtl\tsan_flags.cc ..\rtl\tsan_md5.cc ..\rtl\tsan_mutex.cc ..\rtl\tsan_report.cc ..\rtl\tsan_rtl.cc ..\rtl\tsan_rtl_mutex.cc ..\rtl\tsan_rtl_report.cc ..\rtl\tsan_rtl_thread.cc ..\rtl\tsan_stat.cc ..\rtl\tsan_suppressions.cc ..\rtl\tsan_sync.cc ..\rtl\tsan_stack_trace.cc ..\..\sanitizer_common\sanitizer_allocator.cc ..\..\sanitizer_common\sanitizer_common.cc ..\..\sanitizer_common\sanitizer_flags.cc ..\..\sanitizer_common\sanitizer_stacktrace.cc ..\..\sanitizer_common\sanitizer_libc.cc ..\..\sanitizer_common\sanitizer_printf.cc ..\..\sanitizer_common\sanitizer_suppressions.cc ..\..\sanitizer_common\sanitizer_thread_registry.cc ..\rtl\tsan_platform_windows.cc ..\..\sanitizer_common\sanitizer_win.cc ..\..\sanitizer_common\sanitizer_deadlock_detector1.cc ..\..\sanitizer_common\sanitizer_stackdepot.cc ..\..\sanitizer_common\sanitizer_persistent_allocator.cc > gotsan.cc
+type tsan_go.cc ..\rtl\tsan_interface_atomic.cc ..\rtl\tsan_clock.cc ..\rtl\tsan_flags.cc ..\rtl\tsan_md5.cc ..\rtl\tsan_mutex.cc ..\rtl\tsan_report.cc ..\rtl\tsan_rtl.cc ..\rtl\tsan_rtl_mutex.cc ..\rtl\tsan_rtl_report.cc ..\rtl\tsan_rtl_thread.cc ..\rtl\tsan_stat.cc ..\rtl\tsan_suppressions.cc ..\rtl\tsan_sync.cc ..\rtl\tsan_stack_trace.cc ..\..\sanitizer_common\sanitizer_allocator.cc ..\..\sanitizer_common\sanitizer_common.cc ..\..\sanitizer_common\sanitizer_flags.cc ..\..\sanitizer_common\sanitizer_stacktrace.cc ..\..\sanitizer_common\sanitizer_libc.cc ..\..\sanitizer_common\sanitizer_printf.cc ..\..\sanitizer_common\sanitizer_suppressions.cc ..\..\sanitizer_common\sanitizer_thread_registry.cc ..\rtl\tsan_platform_windows.cc ..\..\sanitizer_common\sanitizer_win.cc ..\..\sanitizer_common\sanitizer_deadlock_detector1.cc ..\..\sanitizer_common\sanitizer_stackdepot.cc ..\..\sanitizer_common\sanitizer_persistent_allocator.cc ..\..\sanitizer_common\sanitizer_flag_parser.cc ..\..\sanitizer_common\sanitizer_symbolizer.cc > gotsan.cc

-gcc -c -o race_windows_amd64.syso gotsan.cc -I..\rtl -I..\.. -I..\..\sanitizer_common -I..\..\..\include -m64 -Wall -fno-exceptions -fno-rtti -DSANITIZER_GO -Wno-error=attributes -Wno-attributes -Wno-format -DSANITIZER_DEBUG=0 -O3 -fomit-frame-pointer
+gcc -c -o race_windows_amd64.syso gotsan.cc -I..\rtl -I..\.. -I..\..\sanitizer_common -I..\..\..\include -m64 -Wall -fno-exceptions -fno-rtti -DSANITIZER_GO -Wno-error=attributes -Wno-attributes -Wno-format -DSANITIZER_DEBUG=0 -O3 -fomit-frame-pointer -std=c++11


Turn ECHO off in Bat files

Turn ECHO off in Bat files

By executing `@echo off`, the window won't output the commands written in the .bat file.

--- bco2obj.bat
+++ bco2obj.bat
@@ -1,2 +1,3 @@
+@echo off
 python "%~dp0mkdd-collision-reader.py" %1
-pause+pause


Rename nHibernate => NHibernate in createnugetpackages

--- src/CreateNuGetPackages.cmd
+++ src/CreateNuGetPackages.cmd
@@ -3,14 +3,14 @@
 if [%1]==[] goto usage

 setlocal
-    set project=PPWCode.Vernacular.nHibernate.I
+    set project=PPWCode.Vernacular.NHibernate.I
 	set package_project=
 	if [%1]==[Debug] set package_project=1
 	if [%1]==[Release] set package_project=1
 	if defined package_project (
 		echo Packiging %project% ...
 		nuget restore -NoCache
-		nuget pack .\PPWCode.Vernacular.nHibernate.I\%project%.csproj -Build -Properties "Configuration=%1"
+		nuget pack .\PPWCode.Vernacular.NHibernate.I\%project%.csproj -Build -Properties "Configuration=%1"
 	)

 	set publish_package=
@@ -23,14 +23,14 @@
 		)
 	)

-	set project=PPWCode.Vernacular.nHibernate.I.Test
+	set project=PPWCode.Vernacular.NHibernate.I.Test
 	set package_project=
 	if [%1]==[Debug] set package_project=1
 	if [%1]==[Release] set package_project=1
 	if defined package_project (
 		echo Packiging %project% ...
 		nuget restore -NoCache
-		nuget pack .\PPWCode.Vernacular.nHibernate.I.Test\%project%.csproj -Build -Properties "Configuration=%1"
+		nuget pack .\PPWCode.Vernacular.NHibernate.I.Test\%project%.csproj -Build -Properties "Configuration=%1"
 	)

 	set publish_package=


Added script for starting production server

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

--- production.cmd
+++ production.cmd
@@ -0,0 +1 @@
+pm2 start Compiled/src/server.js


don't copy 64-bit tcltk for now

don't copy 64-bit tcltk for now

--- src/cpp/tools/install-r-devel.cmd
+++ src/cpp/tools/install-r-devel.cmd
@@ -121,7 +121,7 @@
 REM plus some other libraries. Note that the R64 directory should
 REM have been populated by the RTools installation.
 xcopy /E /Y C:\R %R_HOME%\trunk\
-xcopy /E /Y C:\R64 %R_HOME%\trunk\
+REM xcopy /E /Y C:\R64 %R_HOME%\trunk\

 REM Ensure the temporary directory exists.
 if not exist "%TMPDIR%" (


Initial

Initial

git-svn-id: 1a57124bbb9aca193a920d0ffd753d488afb922b@1313 5946f024-35f4-0310-b1b3-9a3be3380cfb

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

--- examples/exrun.bat
+++ examples/exrun.bat
@@ -0,0 +1,7 @@
+@echo off
+set PROG=%1
+if not exist %PROG% set PROG=debug\%1
+shift
+
+set PATH=..\lib;%PATH%
+%PROG% %*


Use proper flags to git describe command in test

--- tests/test-recipes/metadata/source_git/bld.bat
+++ tests/test-recipes/metadata/source_git/bld.bat
@@ -1,5 +1,5 @@
 if not exist .git exit 1
-git describe
+git describe --tags --dirty
 if errorlevel 1 exit 1
 for /f "delims=" %%i in ('git describe') do set gitdesc=%%i
 if errorlevel 1 exit 1


add https:// to CF_API in windows integration test

Linux already had this and it is required for integration tests to pass.

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

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


build: win: don't look for symlink ps script

Signed-off-by: Ruslan Kuprieiev <f6538312ce47017d734b1357aabc970ebf896e32@gmail.com>

--- scripts/build_windows.cmd
+++ scripts/build_windows.cmd
@@ -21,9 +21,6 @@
 echo ====== Building dvc binary... ======
 call pyinstaller --onefile --additional-hooks-dir scripts\hooks dvc/__main__.py --name dvc --specpath build

-echo ====== Copying additional files... ======
-copy scripts\innosetup\addSymLinkPermissions.ps1 dist\ || goto :error
-
 echo ====== Building dvc installer... ======
 set PYTHONPATH=%cd%
 call python scripts\innosetup\config_gen.py || goto :error


ref #333: use sha256 as digest algorithm when signing the MSI

--- pdfsam-basic/src/msi/Build.cmd
+++ pdfsam-basic/src/msi/Build.cmd
@@ -33,7 +33,7 @@
 del /Q exitDlg.wixobj
 del /Q harvestedFiles.wixobj

-IF EXIST "${project.build.directory}/pdfsam-%PDFSAM_VERSION%.msi" "signtool.exe" sign /t http://timestamp.verisign.com/scripts/timstamp.dll /a /d "PDFsam Basic" "${project.build.directory}/pdfsam-%PDFSAM_VERSION%.msi"
+IF EXIST "${project.build.directory}/pdfsam-%PDFSAM_VERSION%.msi" "signtool.exe" sign /fd sha256 /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp /a /d "PDFsam Basic" "${project.build.directory}/pdfsam-%PDFSAM_VERSION%.msi"
 if %ERRORLEVEL% NEQ 0 goto error
 ECHO "MSI signed"
 POPD


use x64 paths.

use x64 paths.

--- setup_environment.bat
+++ setup_environment.bat
@@ -1,20 +1,22 @@
 :: setup paths of all tools used in plugin build process.

 rem call "c:\Program Files\Microsoft Visual Studio 9.0\VC\bin\vcvars32.bat"
-call "c:\Program Files\Microsoft Visual Studio 10.0\VC\bin\vcvars32.bat"
+call "c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\vcvars32.bat"

 :: java runtime is used by yui_compressor and google closure compiler in MINIMIZE_CLIENT_SRC task.
-set JAVA_HOME=%JAVA_HOME%
+rem set JAVA_HOME=%JAVA_HOME%
+set PATH=%PATH%;%JAVA_HOME%\bin

 set SUBWCREV_TOOL_DIR=c:\Program Files\TortoiseSVN\bin
-set INNO_SETUP_HOME=c:\Program Files\Inno Setup 5
+set INNO_SETUP_HOME=c:\Program Files (x86)\Inno Setup 5
 set PATH=%SUBWCREV_TOOL_DIR%;%INNO_SETUP_HOME%;%PATH%

 :: following variables are used for source indexing and storing debug symbols to symbol server.
-set PERL_DIR=c:\perl
-set DEBUG_TOOL_DIR=c:\Program Files\Debugging Tools for Windows (x86)
+set PERL_DIR=c:\Perl\ActivePerl\5.16.1.1601
+::c:\Program Files\Debugging Tools for Windows (x86)
+set DEBUG_TOOL_DIR=c:\Program Files (x86)\Windows Kits\8.0\Debuggers\x86
 set SRCSRV_HOME=%DEBUG_TOOL_DIR%\srcsrv
-set SVN_CLIENT_DIR=c:\Program Files\Subversion\bin
+set SVN_CLIENT_DIR=c:\Program Files (x86)\Subversion\bin
 set PATH=%DEBUG_TOOL_DIR%;%SRCSRV_HOME%;%PERL_DIR%\bin;%SVN_CLIENT_DIR%\bin;%PATH%
 set SYMBOL_STORE=C:\Symbols


Fix CONDA_ENV_PATH in win

Fix CONDA_ENV_PATH in win

--- bin/activate.bat
+++ bin/activate.bat
@@ -48,7 +48,7 @@

 set CONDA_DEFAULT_ENV=%CONDA_NEW_ENV%
 set CONDA_NEW_ENV=
-set CONDA_ENV_PATH=%ANACONDA_ENVS%\%CONDA_DEFAULT_ENV%
+set "CONDA_ENV_PATH=%ANACONDA_ENVS%\%CONDA_DEFAULT_ENV%"
 echo Activating environment "%CONDA_DEFAULT_ENV%"...
 set "PATH=%ANACONDA_ENVS%\%CONDA_DEFAULT_ENV%;%ANACONDA_ENVS%\%CONDA_DEFAULT_ENV%\Scripts;%PATH%"
 set CONDA_OLD_PROMPT=%PROMPT%