table edition

table edition

--- iCatalyst.bat
+++ iCatalyst.bat
@@ -87,13 +87,14 @@
 	set "ImageNum%%a=0"
 	set "TotalNum%%a=0"
 	set "TotalNumErr%%a=0"
+	set "TotalNumNOpt%%a=0"
 	set "TotalSize%%a=0"
 	set "STotalSize%%a=0"
 	set "ImageSize%%a=0"
 	set "SImageSize%%a=0"
 	set "change%%a=0"
 	set "perc%%a=0"
-	set "step%%a=10"
+	set "step%%a=1"
 )
 set "png="
 set "jpeg="
@@ -110,18 +111,15 @@
 set "countJPG=%tmppath%\countjpg"
 set "countGIF=%tmppath%\countgif"
 set "filelist=%tmppath%\filelist"
-::For Images with characters
+::For Images with characters		-	%filelisterr%
+::For Images are already optimized	-	%filelisterr%1
+::For Images are not supported		-	%filelisterr%2<num thread>
+::For Images are not found		-	%filelisterr%3<num thread>
 set "filelisterr=%tmppath%\filerr"
-::For Images are already optimized
-set "filelisterr1=%tmppath%\filerr1"
-::For Images are not supported
-set "filelisterr2=%tmppath%\filerr2"
-::For Images are not found
-set "filelisterr3=%tmppath%\filerr3"
 ::Table size
 set "TFN=29"
-::restrictions
-set "BYTECONV=1000000"
+::restrictions in bytes
+set "BYTECONV=1000000000"

 set "thread=" & set "updatecheck=" & set "outdir=" & set "nooutfolder="
 set "jpegtags=" & set "xtreme=" & set "advanced=" & set "pngtags=" & set "giftags="
@@ -313,24 +311,21 @@
 ::%2 - thread number
 :typelog
 if %thread% equ 1 exit /b
-if not defined typenum%1%2 set "typenum%1%2=1"
-call:typelogfile "%logfile%%1.%2" "typenum%1%2" %1
-::call:typelogfile "%logfile%%1.%2" "typenum%1%2" %%typenum%1%2%% %1
-exit /b
-
-::%1 - log file name (%logfile%)
-::%2 - variable name - counter displayed files
-::%3 - png | jpg | gif
-:typelogfile
-if not exist "%~1" exit /b
-set "tmpnum=!%~2!"
-for /f "usebackq skip=%tmpnum% tokens=1-5 delims=;" %%b in ("%~1") do (
+if not defined typenum%~1%~2 set "typenum%~1%~2=1"
+if not exist "%logfile%%1.%2" exit /b
+set "tmpskip=!typenum%~1%~2!"
+for /f "usebackq skip=%tmpskip% tokens=1-5 delims=;" %%b in ("%logfile%%1.%2") do (
 	if /i "%%d" equ "error" (
+		set /a "TotalNumErr%~1+=1"
 		call:printfileerr "%%~b" "%%~c"
-	) else (
-		call:printfileinfo "%%~b" %%c %%d %%e %%f %3
-	)
-	set /a "%~2+=1"
+	) else if %%~e equ 0 (
+		set /a "TotalNumNOpt%~1+=1"
+		>>"%filelisterr%1" echo.%%~fb
+	) else  (
+		call:stepcalc %~1 %%c %%d
+		call:printfileinfo "%%~b" %%c %%d %%e %%f %~1
+	)
+	set /a "typenum%~1%~2+=1"
 )
 exit /b

@@ -341,10 +336,6 @@
 ::%5 - percent change (%4*100/%2)
 ::%6 - png | jpg | gif
 :printfileinfo
-if "%~4" equ "0" (
-	>>"%filelisterr1%" echo.%~f1
-	exit /b
-)
 setlocal
 set "fn="
 call:cropfilename fn %1 %TFN%
@@ -359,7 +350,7 @@
 set "change=          !change!"
 set "percent=          %5%%"
 echo. !fn:~,%TFN%!^|%origsize:~-11%^|%optsize:~-11%^|%change:~-10%^|%percent:~-10%
-endlocal & call:calcstep %6 %2 %3
+endlocal
 exit /b

 ::%1 - file name
@@ -428,14 +419,6 @@
 endlocal & set /a "%~2=%}%"
 exit /b

-:echostd
-echo.%~1
-exit /b
-
-:echoerr
-1>&2 echo.%~1
-exit /b
-
 ::%1 - png | jpg | gif
 ::%2 - thread number
 ::%3 - input file
@@ -780,7 +763,6 @@
 ::%3 - thread number
 :savelog
 set /a "change=%~z1-%2"
-if %change% equ 0 call:saverrorlog %1 1
 set /a "perc=%change%*100/%2" 2>nul
 set /a "fract=%change%*100%%%2*100/%2" 2>nul
 set /a "perc=%perc%*100+%fract%"
@@ -799,7 +781,7 @@
 :saverrorlog
 if exist "%filework%" 1>nul 2>&1 del /f /q "%filework%"
 if "%~2" equ "" exit /b
->>"%filelisterr%%~2.%~3" echo.%~f1
+>>"%filelisterr%%~2%~3" echo.%~f1
 if %thread% equ 1 (call:printfileerr "%~f1" %~2)
 exit /b

@@ -818,70 +800,74 @@

 :end
 call:setvtime ftime
-set "fract=0"
-set "changePNG=0" & set "percPNG=0"
-set "changeJPG=0" & set "percJPG=0"
-set "changeGIF=0" & set "percGIF=0"
 if %jpeg% equ 0 if %png% equ 0 if %gif% equ 0 1>nul 2>&1 ping -n 1 -w 500 127.255.255.255 & goto:finmessage
-::set "TotalNumNOptJPG=0" & set "TotalNumNOptPNG=0" & set "TotalNumNOptGIF=0"
-::set "stepJPG=0" & set "stepPNG=0" & set "stepGIF=0"
-::if %thread% gtr 1 (
-::	for /f "tokens=1-5 delims=;" %%a in ('findstr /e /i /r /c:";ok" "%logfile%png*" ') do call:calcstep PNG %%b %%c
-::	for /f "tokens=1-5 delims=;" %%a in ('findstr /e /i /r /c:";ok" "%logfile%jpg*" ') do call:calcstep JPG %%b %%c
-::	for /f "tokens=1-5 delims=;" %%a in ('findstr /e /i /r /c:";ok" "%logfile%gif*" ') do call:calcstep GIF %%b %%c
-::)
-for /f "tokens=1" %%a in ('findstr /e /i /r /c:";error" "%logfile%png*" 2^>nul ^| find /i /c ";error" 2^>nul') do (
-	set /a "TotalNumErrPNG+=%%a" & set /a "TotalNumPNG-=%%a"
-)
-for /f "tokens=1" %%a in ('findstr /e /i /r /c:";error" "%logfile%jpg*" 2^>nul ^| find /i /c ";error" 2^>nul') do (
-	set /a "TotalNumErrJPG+=%%a" & set /a "TotalNumJPG-=%%a"
-)
-for /f "tokens=1" %%a in ('findstr /e /i /r /c:";error" "%logfile%gif*" 2^>nul ^| find /i /c ";error" 2^>nul') do (
-	set /a "TotalNumErrGIF+=%%a" & set /a "TotalNumGIF-=%%a"
-)
-for /f "tokens=1" %%a in ('findstr /e /i /r /c:";0;0.00;ok" "%logfile%png*" 2^>nul ^| find /i /c ";0;0.00;ok" 2^>nul') do (
-	set /a "TotalNumNOptPNG+=%%a"
-)
-for /f "tokens=1" %%a in ('findstr /e /i /r /c:";0;0.00;ok" "%logfile%jpg*" 2^>nul ^| find /i /c ";0;0.00;ok" 2^>nul') do (
-	set /a "TotalNumNOptJPG+=%%a"
-)
-for /f "tokens=1" %%a in ('findstr /e /i /r /c:";0;0.00;ok" "%logfile%gif*" 2^>nul ^| find /i /c ";0;0.00;ok" 2^>nul') do (
-	set /a "TotalNumNOptGIF+=%%a"
-)
+for %%b in ("%filelisterr%2" "%filelisterr%3") do (
+	for /f "tokens=1" %%a in ('findstr /e /i /c:".png" "%%~b*" 2^>nul ^| find /i /c ".png" 2^>nul') do (
+		set /a "TotalNumErrPNG+=%%a" & set /a "TotalNumPNG-=%%a"
+	)
+	for /f "tokens=1" %%a in ('findstr /e /i /c:".jpg" "%%~b*" 2^>nul ^| find /i /c ".jpg" 2^>nul') do (
+		set /a "TotalNumErrJPG+=%%a" & set /a "TotalNumJPG-=%%a"
+	)
+	for /f "tokens=1" %%a in ('findstr /e /i /c:".jpe" "%%~b*" 2^>nul ^| find /i /c ".jpe" 2^>nul') do (
+		set /a "TotalNumErrJPG+=%%a" & set /a "TotalNumJPG-=%%a"
+	)
+	for /f "tokens=1" %%a in ('findstr /e /i /c:".jpeg" "%%~b*" 2^>nul ^| find /i /c ".jpeg" 2^>nul') do (
+		set /a "TotalNumErrJPG+=%%a" & set /a "TotalNumJPG-=%%a"
+	)
+	for /f "tokens=1" %%a in ('findstr /e /i /c:".gif" "%%~b*" 2^>nul ^| find /i /c ".gif" 2^>nul') do (
+		set /a "TotalNumErrGIF+=%%a" & set /a "TotalNumGIF-=%%a"
+	)
+)
+set /a "TotalNumNOpt=TotalNumNOptPNG+TotalNumNOptJPG+TotalNumNOptGIF"
+if %TotalNumNOpt% gtr 0 (
+	echo.                         Images are already optimized
+	echo.-------------------------------------------------------------------------------
+	type %filelisterr%1
+	echo.-------------------------------------------------------------------------------
+)
+set /a "TotalNumErr=TotalNumErrPNG+TotalNumErrJPG+TotalNumErrGIF"
+if %TotalNumErr% gtr 0 (
+	set "isfirst="
+	for %%a in ("%filelisterr%2*") do (
+		if not defined isfirst (
+			echo.                           Images are not supported
+			echo.-------------------------------------------------------------------------------
+			set "isfirst=1"
+		)
+		type "%%~a"
+	)
+	if defined isfirst echo.-------------------------------------------------------------------------------
+	set "isfirst="
+	for %%a in ("%filelisterr%3*") do (
+		if not defined isfirst (
+			echo.                             Images are not found
+			echo.-------------------------------------------------------------------------------
+			set "isfirst=1"
+		)
+		type "%%~a"
+	)
+	if defined isfirst echo.-------------------------------------------------------------------------------
+)
+for %%a in ("%filelisterr%") do if %%~za gtr 0 (
+	echo.                            Images with characters
+	echo.-------------------------------------------------------------------------------
+	type "%%~a"
+	echo.-------------------------------------------------------------------------------
+)
+set "isfirst="
 call:fincalc PNG
 call:fincalc JPG
 call:fincalc GIF
-
-::set /a "STotalSizePNG+=%TotalSizePNG%/1024"
-::set /a "SImageSizePNG+=%ImageSizePNG%/1024"
-::set /a "changePNG=(%ImageSizePNG%-%TotalSizePNG%)" 2>nul
-::set /a "percPNG=%changePNG%*100/%TotalSizePNG%" 2>nul
-::set /a "fract=%changePNG%*100%%%TotalSizePNG%*100/%TotalSizePNG%" 2>nul
-::set /a "percPNG=%percPNG%*100+%fract%" 2>nul
-::::call:division changePNG 1024 100
-::call:division percPNG 100 100
-::set /a "changeJPG=(%ImageSizeJPG%-%TotalSizeJPG%)" 2>nul
-::set /a "percJPG=%changeJPG%*100/%TotalSizeJPG%" 2>nul
-::set /a "fract=%changeJPG%*100%%%TotalSizeJPG%*100/%TotalSizeJPG%" 2>nul
-::set /a "percJPG=%percJPG%*100+%fract%" 2>nul
-::::call:division changeJPG 1024 100
-::call:division percJPG 100 100
-::set /a "changeGIF=(%ImageSizeGIF%-%TotalSizeGIF%)" 2>nul
-::set /a "percGIF=%changeGIF%*100/%TotalSizeGIF%" 2>nul
-::set /a "fract=%changeGIF%*100%%%TotalSizeGIF%*100/%TotalSizeGIF%" 2>nul
-::set /a "percGIF=%percGIF%*100+%fract%" 2>nul
-::::call:division changeGIF 1024 100
-::call:division percGIF 100 100
-
 :finmessage
 call:totalmsg PNG %png%
 call:totalmsg JPG %jpeg%
 call:totalmsg GIF %gif%
+if defined isfirst echo.-------------------------------------------------------------------------------
+echo. Outdir: %outdir%
+echo.
 echo. Started  at - %stime%
 echo. Finished at - %ftime%
-echo.
 echo.-------------------------------------------------------------------------------
-1>&2 call:listerrfiles
 echo. Image optimization is completed.
 echo.-------------------------------------------------------------------------------
 if /i "%updatecheck%" equ "true" (
@@ -909,74 +895,53 @@
 set /a "perc%~1=!change%~1!*100/!STotalSize%~1!" 2>nul
 set /a "fract=!change%~1!*100%%!STotalSize%~1!*100/!STotalSize%~1!" 2>nul
 set /a "perc%~1=!perc%~1!*100+%fract%" 2>nul
-::call:division change%~1 1024 100
 call:division perc%~1 100 100
 exit /b

 ::%1 - JPG|PNG|GIF
 ::%2 - Total Size
 ::%3 - Image Size
-:calcstep
+:stepcalc
 set /a "TotalSize%~1+=%~2"
-set /a "ImageSize%~1+=%~2"
-if !TotalSize%~1! lss %BYTECONV% if !ImageSize%~1! lss %BYTECONV% exit /b
+set /a "ImageSize%~1+=%~3"
+if !ImageSize%~1! lss %BYTECONV% if !TotalSize%~1! lss %BYTECONV% exit /b
 set /a "STotalSize%~1+=!TotalSize%~1!/!step%~1!"
 set /a "SImageSize%~1+=!ImageSize%~1!/!step%~1!"
 set "TotalSize%~1=0"
 set "ImageSize%~1=0"
-if !STotalSize%~1! lss %BYTECONV% if !SImageSize%~1! lss %BYTECONV% exit /b
-set /a "step%~1*=10"
+if !SImageSize%~1! lss %BYTECONV% if !STotalSize%~1! lss %BYTECONV% exit /b
 set /a "STotalSize%~1/=10"
 set /a "SImageSize%~1/=10"
+set /a "step%~1*=10"
 exit /b

 :totalmsg
-set /a "tt=!TotalNum%~1!+!TotalNumErr%~1!"
-if "%tt%" equ "0" exit /b
-if "%~2" equ "0" (
-	set "opt=0"
-	set "tterr=%tt%"
-	set "nopt=0"
-) else (
-	set "nopt=!TotalNumNOpt%~1!"
-	set /a "opt=!TotalNum%~1!-!nopt!"
-	set "tterr=!TotalNumErr%~1!"
-)
-echo. Total Number of %1:	%tt%
-echo. Optimized %1:		%opt%
-if "%nopt%" neq "0" echo. Not optimized %1:	%nopt%
-if "%tterr%" neq "0" echo. Skipped %1:		%tterr%
+set /a "tt=!TotalNum%~1!-!TotalNumNOpt%~1!"
+if %tt% equ 0 exit /b
+if not defined isfirst (
+	echo.                                     Total
+	echo.-------------------------------------------------------------------------------
+	set "isfirst=1"
+)
 set "stepcur=!step%~1!"
 set "stepm=1"
+set "F1=%~1                                  "
+set "F5=           !perc%~1!"
 for %%a in (KB KB KB MB MB MB GB GB GB TB TB TB) do (
 	set /a "stepcur/=10"
-	set /a "stepm=stepm*10%%1000"
-	if !stepm! equ 0 set "stepm=1"
+	set /a "stepm=stepm*10"
+	if !stepm! equ 1000 set "stepm=1"
 	if !stepcur! equ 1 (
-		call:division change%~1 1 !stepm!
-		echo. Total %1:  		!change%~1! %%a, !perc%~1!%%
+		set /a "stepm=1000/!stepm!"
+		call:division STotalSize%~1 !stepm! !stepm!
+		call:division SImageSize%~1 !stepm! !stepm!
+		call:division change%~1 !stepm! !stepm!
+		set "F2=           !STotalSize%~1!"
+		set "F3=           !SImageSize%~1!"
+		set "F4=           !change%~1!"
+		echo. !F1:~,%TFN%!^|!F2:~-9!%%~a^|!F3:~-9!%%~a^|!F4:~-8!%%~a^|%F5:~-9%%%
+		exit /b
 ))
-echo.
-exit /b
-
-:listerrfiles
-set "iserr="
-for %%a in ("%filelisterr%") do if %%~za gtr 0 (
-	set "iserr=1"
-	echo.
-	echo. Image with characters:
-	type "%%~a"
-	echo.
-)
-set "iserr2="
-for /f "tokens=2* delims=:" %%a in ('findstr /e /i /r /c:";error" "%logfile%*" 2^>nul') do (
-	if not defined iserr (set "iserr=1" & echo.)
-	if not defined iserr2 (echo. Images with errors:& set "iserr2=1")
-	for /f "tokens=1-2 delims=;" %%c in ("%%~b") do echo. %%~c
-)
-if defined iserr2 echo.
-if defined iserr (echo.-------------------------------------------------------------------------------)
-set "iserr=" & set "iserr2="
 exit /b

 :readini


Update Appveyor CI

Update Appveyor CI

--- ci/install.bat
+++ ci/install.bat
@@ -1,4 +1,4 @@
-curl -sSf https://static.rust-lang.org/dist/rust-1.24.0-i686-pc-windows-msvc.exe -o rust.exe
+curl -sSf https://static.rust-lang.org/dist/rust-1.30.0-i686-pc-windows-msvc.exe -o rust.exe
 rust.exe /VERYSILENT /NORESTART /DIR="C:\Rust"
 set PATH=%PATH%;C:\Rust\bin


Fix error path

Fix error path

--- src/main/scripts/init.bat
+++ src/main/scripts/init.bat
@@ -32,9 +32,9 @@
 :: This variable indicates the location of the sources, if it has not
 :: defined before.
 if "%LOG4DB2_PATH%" EQU "" (
- set LOG4DB2_PATH=.
+ set LOG4DB2_PATH=%~dp0
 )

 if "%SRC_MAIN_CODE_PATH%" EQU "" (
- set SRC_MAIN_CODE_PATH=%LOG4DB2_PATH%\sql-pl
+ set SRC_MAIN_CODE_PATH=%LOG4DB2_PATH%sql-pl
 )


Adding Start CMD for 9.5 workspaces

Adding Start CMD for 9.5 workspaces

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

--- cmstartdev.cmd
+++ cmstartdev.cmd
@@ -0,0 +1,11 @@
+@echo off
+
+pushd "%~dp0"
+
+      call %1\setenv
+      set libDirTarget=%CM_WRITE%\data\cm-libs\win64
+      if not exist "%libDirTarget%" mkdir "%libDirTarget%"
+      xcopy /y "%CM_HOME%\partner\write\data\cm-libs\win64\*.cmlib" "%libDirTarget%"
+      _cm.exe /develop /multiple_instances /nocoloring %CM_CLASSPATH_ARGS%
+
+popd


fixed pdf building script

fixed pdf building script

--- buildPDF.cmd
+++ buildPDF.cmd
@@ -26,9 +26,11 @@

 popd

+
+
+:end
+
 REM Build the pdf
 pdflatex.exe resume.tex -halt-on-error

-:end
-
 REM KuduSync is after this!


flashall.bat: Write the empty ext4 filesystem image onto resin-rootB

Signed-off-by: Florin Sarbu <3a837a37a2ac9072a088641ec330e0e5d5b86f4e@resin.io>

--- layers/meta-resin-edison/recipes-core/edison-dfu/files/flashall.bat
+++ layers/meta-resin-edison/recipes-core/edison-dfu/files/flashall.bat
@@ -147,9 +147,12 @@
 call:flash-command --alt resin-data -D "%BASE_DIR%resin-data.img"
 if %errorlevel% neq 0 ( exit /b %errorlevel%)

-echo Flashing rootfs, ^(it can take up to 5 minutes... Please be patient^)
-call:flash-command --alt resin-rootA -D "%BASE_DIR%resin-image-edison.hostapp-ext4" -R
+echo Flashing rootfs (resin-rootA), ^(it can take up to 5 minutes... Please be patient^)
+call:flash-command --alt resin-rootA -D "%BASE_DIR%resin-image-edison.hostapp-ext4"
 if %errorlevel% neq 0 ( exit /b %errorlevel% )
+echo Flashing secondary rootfs partition (resin-rootB), ^(it can take up to 5 minutes... Please be patient^)
+call:flash-command --alt resin-rootB -D "%BASE_DIR%resin-rootB.img" -R
+if %errorlevel% neq 0 ( exit /b %errorlevel% )

 echo Rebooting
 echo U-boot ^& Kernel System Flash Success...


source archive completed

source archive completed

git-tfs-id: [https://tfs.codeplex.com/tfs/TFS05/]$/ZXingNet/trunk;C78744

--- build_deployment.cmd
+++ build_deployment.cmd
@@ -11,7 +11,7 @@
 SET FILENAME_SOURCE=%DEPLOYMENT_DIR%\ZXing.Net.Source.%VERSION%.zip
 SET ZIP_TOOL=%CD%\3rdparty\zip\7za.exe
 SET SVN_EXPORT_DIR=%DEPLOYMENT_DIR%\Source
-SET SVN_URL=https://zxingnet.svn.codeplex.com/svn/trunk/Source/lib
+SET SVN_URL=https://zxingnet.svn.codeplex.com/svn/trunk
 SET SVN_TOOL=%CD%\3rdparty\Subversion\svn.exe

 ECHO.
@@ -19,11 +19,20 @@
 ECHO %DEPLOYMENT_DIR%...
 ECHO.

+REM
+REM preparing deployment directory
+REM ***************************************************************************************
+
 IF NOT EXIST "%BUILD_DIR%" GOTO BUILD_DIR_NOT_FOUND
 IF NOT EXIST "%BINARY_DIR%" GOTO BINARY_DIR_NOT_FOUND

 MKDIR "%DEPLOYMENT_DIR%" >NUL: 2>&1
 DEL /F "%DEPLOYMENT_DIR%\%FILENAME_BINARY%" >NUL: 2>&1
+
+
+REM
+REM building archives for binaries
+REM ***************************************************************************************

 CD "%BINARY_DIR%"
 "%ZIP_TOOL%" a -tzip -mx9 -r "%FILENAME_BINARY%" net2.0 net4.0 unity sl4 sl5 wp7.0 wp7.1
@@ -31,20 +40,41 @@
 CD "%CURRENT_DIR%"

 ECHO.
+
+
+REM
+REM building nuget archive
+REM ***************************************************************************************
+
 CALL nuget-pack.cmd

 ECHO.

+
+REM
+REM building source archive
+REM ***************************************************************************************
+
+RMDIR /S /Q "%SVN_EXPORT_DIR%" >NUL: 2>&1
+
 MKDIR "%SVN_EXPORT_DIR%" >NUL: 2>&1
-RMDIR /S /Q "%SVN_EXPORT_DIR%"
+MKDIR "%SVN_EXPORT_DIR%\Source" >NUL: 2>&1
+MKDIR "%SVN_EXPORT_DIR%\Source\lib" >NUL: 2>&1
+MKDIR "%SVN_EXPORT_DIR%\Source\test" >NUL: 2>&1
+MKDIR "%SVN_EXPORT_DIR%\Source\test\src" >NUL: 2>&1
+MKDIR "%SVN_EXPORT_DIR%\Clients" >NUL: 2>&1

-"%SVN_TOOL%" export "%SVN_URL%" "%SVN_EXPORT_DIR%"
+"%SVN_TOOL%" export --force "%SVN_URL%/Source/lib" "%SVN_EXPORT_DIR%\Source\lib"
+"%SVN_TOOL%" export --force "%SVN_URL%/Source/test/src" "%SVN_EXPORT_DIR%\Source\test\src"
+"%SVN_TOOL%" export --force "%SVN_URL%/Clients" "%SVN_EXPORT_DIR%\Clients"
+"%SVN_TOOL%" export --force "%SVN_URL%/zxing.sln" "%SVN_EXPORT_DIR%"

 CD "%SVN_EXPORT_DIR%"
-"%ZIP_TOOL%" a -tzip -mx9 -r "%FILENAME_SOURCE%" *.*
+"%ZIP_TOOL%" a -tzip -mx9 -r "%FILENAME_SOURCE%" Source\lib\*.* Source\test\src\*.* Clients\*.* zxing.sln
 CD "%CURRENT_DIR%"

-RMDIR /S /Q "%SVN_EXPORT_DIR%"
+RMDIR /S /Q "%SVN_EXPORT_DIR%" >NUL: 2>&1
+

 GOTO END


--- ci/build-windows.bat
+++ ci/build-windows.bat
@@ -6,7 +6,7 @@
 set /p FinalVersion=<final-version\version

 mkdir cli-artifacts
-move fly-rc/fly_* cli-artifacts
+move fly-rc\fly_* cli-artifacts

 go get github.com/jteeuwen/go-bindata


bash added montage-cmd@dollarbox

bash added montage-cmd@dollarbox


GP-1050: Removing backslash from SUPPORT_DIR

--- Ghidra/RuntimeScripts/Windows/support/launch.bat
+++ Ghidra/RuntimeScripts/Windows/support/launch.bat
@@ -31,13 +31,15 @@
 set DOUBLE_CLICKED=n
 for /f "tokens=2" %%# in ("%cmdcmdline%") do if /i "%%#" equ "/c" set DOUBLE_CLICKED=y

-:: Sets SUPPORT_DIR to the directory that contains this file (ends with '\')
+:: Sets SUPPORT_DIR to the directory that contains this file (launch.bat).
+:: SUPPORT_DIR will not contain a trailing slash.
 ::
 :: '% ~' dereferences the value in param 0
 :: 'd' - drive
 :: 'p' - path (without filename)
+:: '~0,-1' - removes trailing \
 set "SUPPORT_DIR=%~dp0"
-
+set "SUPPORT_DIR=%SUPPORT_DIR:~0,-1%"
 ::
 :: Parse arguments
 ::
@@ -63,7 +65,7 @@
 ::
 :: Production Environment
 ::
-set "INSTALL_DIR=%SUPPORT_DIR%.."
+set "INSTALL_DIR=%SUPPORT_DIR%\.."
 set "CPATH=%INSTALL_DIR%\Ghidra\Framework\Utility\lib\Utility.jar"
 set "LS_CPATH=%SUPPORT_DIR%\LaunchSupport.jar"
 set "DEBUG_LOG4J=%SUPPORT_DIR%\debug.log4j.xml"


add debug version luajit build bat

add debug version luajit build bat

Signed-off-by: zqzjz0911 <ddfdd5fdebc89f7a0d0aba4c5c06c8f1e3f38030@gmail.com>

error: pathspec 'LuaJIT-2.1-20150622/src/msvcbuild_debug.bat' did not match any file(s) known to git

--- LuaJIT-2.1-20150622/src/msvcbuild_debug.bat
+++ LuaJIT-2.1-20150622/src/msvcbuild_debug.bat
@@ -0,0 +1,114 @@
+@rem Script to build LuaJIT with MSVC.
+@rem Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
+@rem
+@rem Either open a "Visual Studio .NET Command Prompt"
+@rem (Note that the Express Edition does not contain an x64 compiler)
+@rem -or-
+@rem Open a "Windows SDK Command Shell" and set the compiler environment:
+@rem     setenv /release /x86
+@rem   -or-
+@rem     setenv /release /x64
+@rem
+@rem Then cd to this directory and run this script.
+
+@if not defined INCLUDE goto :FAIL
+
+@setlocal
+@set LJCOMPILE=cl /nologo /MTd /Zi /c /Od /W3 /D_CRT_SECURE_NO_DEPRECATE
+@set LJLINK=link /nologo /debug
+@set LJMT=mt /nologo
+@set LJLIB=lib /nologo /nodefaultlib
+@set DASMDIR=..\dynasm
+@set DASM=%DASMDIR%\dynasm.lua
+@set LJDLLNAME=lua51.dll
+@set LJLIBNAME=lua51.lib
+@set ALL_LIB=lib_base.c lib_math.c lib_bit.c lib_string.c lib_table.c lib_io.c lib_os.c lib_package.c lib_debug.c lib_jit.c lib_ffi.c
+
+%LJCOMPILE% host\minilua.c
+@if errorlevel 1 goto :BAD
+%LJLINK% /out:minilua.exe minilua.obj
+@if errorlevel 1 goto :BAD
+if exist minilua.exe.manifest^
+  %LJMT% -manifest minilua.exe.manifest -outputresource:minilua.exe
+
+@set DASMFLAGS=-D WIN -D JIT -D FFI -D P64
+@set LJARCH=x64
+@minilua
+@if errorlevel 8 goto :X64
+@set DASMFLAGS=-D WIN -D JIT -D FFI
+@set LJARCH=x86
+@set LJCOMPILE=%LJCOMPILE% /arch:SSE2
+:X64
+minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h vm_x86.dasc
+@if errorlevel 1 goto :BAD
+
+%LJCOMPILE% /I "." /I %DASMDIR% host\buildvm*.c
+@if errorlevel 1 goto :BAD
+%LJLINK% /out:buildvm.exe buildvm*.obj
+@if errorlevel 1 goto :BAD
+if exist buildvm.exe.manifest^
+  %LJMT% -manifest buildvm.exe.manifest -outputresource:buildvm.exe
+
+buildvm -m peobj -o lj_vm.obj
+@if errorlevel 1 goto :BAD
+buildvm -m bcdef -o lj_bcdef.h %ALL_LIB%
+@if errorlevel 1 goto :BAD
+buildvm -m ffdef -o lj_ffdef.h %ALL_LIB%
+@if errorlevel 1 goto :BAD
+buildvm -m libdef -o lj_libdef.h %ALL_LIB%
+@if errorlevel 1 goto :BAD
+buildvm -m recdef -o lj_recdef.h %ALL_LIB%
+@if errorlevel 1 goto :BAD
+buildvm -m vmdef -o jit\vmdef.lua %ALL_LIB%
+@if errorlevel 1 goto :BAD
+buildvm -m folddef -o lj_folddef.h lj_opt_fold.c
+@if errorlevel 1 goto :BAD
+
+@if "%1" neq "debug" goto :NODEBUG
+@shift
+@set LJCOMPILE=%LJCOMPILE% /Zi
+@set LJLINK=%LJLINK% /debug
+:NODEBUG
+@if "%1"=="amalg" goto :AMALGDLL
+@if "%1"=="static" goto :STATIC
+%LJCOMPILE% /MD /DLUA_BUILD_AS_DLL lj_*.c lib_*.c
+@if errorlevel 1 goto :BAD
+%LJLINK% /DLL /out:%LJDLLNAME% lj_*.obj lib_*.obj
+@if errorlevel 1 goto :BAD
+@goto :MTDLL
+:STATIC
+%LJCOMPILE% lj_*.c lib_*.c
+@if errorlevel 1 goto :BAD
+%LJLIB% /OUT:%LJLIBNAME% lj_*.obj lib_*.obj
+@if errorlevel 1 goto :BAD
+@goto :MTDLL
+:AMALGDLL
+%LJCOMPILE% /MD /DLUA_BUILD_AS_DLL ljamalg.c
+@if errorlevel 1 goto :BAD
+%LJLINK% /DLL /out:%LJDLLNAME% ljamalg.obj lj_vm.obj
+@if errorlevel 1 goto :BAD
+:MTDLL
+if exist %LJDLLNAME%.manifest^
+  %LJMT% -manifest %LJDLLNAME%.manifest -outputresource:%LJDLLNAME%;2
+
+%LJCOMPILE% luajit.c
+@if errorlevel 1 goto :BAD
+%LJLINK% /out:luajit.exe luajit.obj %LJLIBNAME%
+@if errorlevel 1 goto :BAD
+if exist luajit.exe.manifest^
+  %LJMT% -manifest luajit.exe.manifest -outputresource:luajit.exe
+
+@del *.obj *.manifest minilua.exe buildvm.exe
+@echo.
+@echo === Successfully built LuaJIT for Windows/%LJARCH% ===
+
+@goto :END
+:BAD
+@echo.
+@echo *******************************************************
+@echo *** Build FAILED -- Please check the error messages ***
+@echo *******************************************************
+@goto :END
+:FAIL
+@echo You must open a "Visual Studio .NET Command Prompt" to run this script
+:END


qmake: unescaped backslashes are deprecated #2

--- configure.bat
+++ configure.bat
@@ -79,15 +79,19 @@
 goto bottom2

 :addinclude
-echo INCLUDEPATH += "%1" >> %QMAKE_CACHE%
-goto bottom2
+set QXT_INCPATH=%1
+set QXT_INCPATH=%QXT_INCPATH:\=/%
+echo INCLUDEPATH += %QXT_INCPATH% >> %QMAKE_CACHE%
+goto bottom2

 :addlibpath
-echo LIBS += -L"%1" >> %QMAKE_CACHE%
+set QXT_LIBPATH=%1
+set QXT_LIBPATH=%QXT_LIBPATH:\=/%
+echo LIBS += -L%QXT_LIBPATH% >> %QMAKE_CACHE%
 goto bottom2

 :addlib
-echo LIBS += -l"%1" >> %QMAKE_CACHE%
+echo LIBS += -l%1 >> %QMAKE_CACHE%
 goto bottom2

 :nomake


nicefy configure output

nicefy configure output

--- configure.bat
+++ configure.bat
@@ -347,6 +347,8 @@
 REM compile tests go here.
 call :compileTest LBT lbt
 echo End of compile tests
+echo.
+echo.

 if not exist "%BUILD_PATH%\features" mkdir %BUILD_PATH%\features
 echo "Generating Mobility Headers..."


Updated build script

Updated build script

Former-commit-id: 56f5ada296618e2f59a6f4947a6efbb0b2c57c99

--- MeTLMeeting/buildmetl.bat
+++ MeTLMeeting/buildmetl.bat
@@ -1,4 +1,4 @@
-@echo off
+rem @echo off
 echo **********************************
 echo * MeTL BuildScript
 echo **********************************
@@ -6,6 +6,7 @@
 SET build=%1
 SET revision=%2
 SET branchname=MeTLOverLib
+set buildconfig=""
 SHIFT & SHIFT

 IF "%revision%"=="" GOTO ERROR
@@ -15,7 +16,7 @@
 IF "%build%"=="staging" (
 	SET buildconfig="Debug"
 )
-IF NOT DEFINED %buildconfig% GOTO ERROR
+IF "%buildconfig%"=="" GOTO ERROR

 REM Default option is to publish
 SET buildtargets=Clean;Build;Publish


Changed to match new home of the docs

Changed to match new home of the docs

--- doc/make.bat
+++ doc/make.bat
@@ -3,7 +3,7 @@
 REM Command file for Sphinx documentation

 set SPHINXBUILD=sphinx-build
-set ALLSPHINXOPTS=-d ../../build/doc/doctrees %SPHINXOPTS% .
+set ALLSPHINXOPTS=-d ../build/doc/doctrees %SPHINXOPTS% .
 if NOT "%PAPER%" == "" (
 	set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS%
 )
@@ -27,41 +27,41 @@
 )

 if "%1" == "clean" (
-	for /d %%i in (..\..\build\doc\*) do rmdir /q /s %%i
-	del /q /s ..\..\build\doc\*
+	for /d %%i in (..\build\doc\*) do rmdir /q /s %%i
+	del /q /s ..\build\doc\*
 	goto end
 )

 if "%1" == "html" (
-	%SPHINXBUILD% -b html %ALLSPHINXOPTS% ../../build/doc/html
+	%SPHINXBUILD% -b html %ALLSPHINXOPTS% ../build/doc/html
 	echo.
-	echo.Build finished. The HTML pages are in ../../build/doc/html.
+	echo.Build finished. The HTML pages are in ../build/doc/html.
 	goto end
 )

 if "%1" == "dirhtml" (
-	%SPHINXBUILD% -b dirhtml %ALLSPHINXOPTS% ../../build/doc/dirhtml
+	%SPHINXBUILD% -b dirhtml %ALLSPHINXOPTS% ../build/doc/dirhtml
 	echo.
-	echo.Build finished. The HTML pages are in ../../build/doc/dirhtml.
+	echo.Build finished. The HTML pages are in ../build/doc/dirhtml.
 	goto end
 )

 if "%1" == "pickle" (
-	%SPHINXBUILD% -b pickle %ALLSPHINXOPTS% ../../build/doc/pickle
+	%SPHINXBUILD% -b pickle %ALLSPHINXOPTS% ../build/doc/pickle
 	echo.
 	echo.Build finished; now you can process the pickle files.
 	goto end
 )

 if "%1" == "json" (
-	%SPHINXBUILD% -b json %ALLSPHINXOPTS% ../../build/doc/json
+	%SPHINXBUILD% -b json %ALLSPHINXOPTS% ../build/doc/json
 	echo.
 	echo.Build finished; now you can process the JSON files.
 	goto end
 )

 if "%1" == "htmlhelp" (
-	%SPHINXBUILD% -b htmlhelp %ALLSPHINXOPTS% ../../build/doc/htmlhelp
+	%SPHINXBUILD% -b htmlhelp %ALLSPHINXOPTS% ../build/doc/htmlhelp
 	echo.
 	echo.Build finished; now you can run HTML Help Workshop with the ^
 .hhp project file in build/htmlhelp.


[PDR-5563] - added -Dswing.useSystemFontSettings=false to report-designer.bat this will keep java from changing the font settings to System

--- assemblies/winlinux/src/main/resources/resource/report-designer.bat
+++ assemblies/winlinux/src/main/resources/resource/report-designer.bat
@@ -15,4 +15,4 @@
 :callSetEnv
 call "%~dp0set-pentaho-env.bat"

-start "Pentaho Report Designer" "%_PENTAHO_JAVA%" -Xms1024m -Xmx2048m -XX:MaxPermSize=256m -jar "%~dp0launcher.jar" %*
+start "Pentaho Report Designer" "%_PENTAHO_JAVA%" -Dswing.useSystemFontSettings=false -Xms1024m -Xmx2048m -XX:MaxPermSize=256m -jar "%~dp0launcher.jar" %*


add delete temp

add delete temp

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

--- deleteTemp.bat
+++ deleteTemp.bat
@@ -0,0 +1,8 @@
+cd server
+rd /s/q temp
+mkdir temp
+rd /s/q work
+mkdir work
+rd /s/q logs
+mkdir logs
+pause


use SHA-256 file digests when signing code on Windows

--- package/win32/codesign.bat
+++ package/win32/codesign.bat
@@ -1,7 +1,7 @@

 set SIGN_TARGET=%1%

-"C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\signtool" sign /v /ac "cert\After_10-10-10_MSCV-VSClass3.cer" /s MY /n "RStudio, Inc." /t http://timestamp.VeriSign.com/scripts/timstamp.dll %SIGN_TARGET%
+"C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\signtool" sign /fd sha256 /v /ac "cert\After_10-10-10_MSCV-VSClass3.cer" /s MY /n "RStudio, Inc." /t http://timestamp.VeriSign.com/scripts/timstamp.dll %SIGN_TARGET%
 "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\signtool" verify /v /kp %SIGN_TARGET%


tests with version number deployment

tests with version number deployment

--- deploy_bin.bat
+++ deploy_bin.bat
@@ -1,10 +1,10 @@
-ren call with two parameters: OS BUILD_NO VCS_BUILD_NO
+ren call with two parameters: OS BUILD_NO VCS_BUILD_NO
 mkdir deploy
 cd deploy
 mkdir %1
 cd %1
-mkdir %2
-cd %2
+mkdir %3
+cd %3
 copy ..\..\..\CsLisp\bin\release\fuel.exe
 copy ..\..\..\CsLisp\bin\release\fuel.pdb
 copy ..\..\..\CsLisp\bin\release\fuel.exe.config


another part of differential diagnosis of tests not being run on appveyor Task #138 - set up continuous integration for windows port

--- tests/test-yacas.bat
+++ tests/test-yacas.bat
@@ -1,8 +1,4 @@
 @echo off
-
-echo "test driver is running"
-
-exit /b 0

 setlocal enabledelayedexpansion


docs/make.bat: Exclude test directory from being documented.

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

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


Delete make.bat

Delete make.bat

--- docs/make.bat
+++ docs/make.bat
@@ -1,36 +0,0 @@
-@ECHO OFF
-
-pushd %~dp0
-
-REM Command file for Sphinx documentation
-
-if "%SPHINXBUILD%" == "" (
-	set SPHINXBUILD=python -msphinx
-)
-set SOURCEDIR=.
-set BUILDDIR=_build
-set SPHINXPROJ=pybloxdocs
-
-if "%1" == "" goto help
-
-%SPHINXBUILD% >NUL 2>NUL
-if errorlevel 9009 (
-	echo.
-	echo.The Sphinx module was not found. Make sure you have Sphinx installed,
-	echo.then set the SPHINXBUILD environment variable to point to the full
-	echo.path of the 'sphinx-build' executable. Alternatively you may add the
-	echo.Sphinx directory to PATH.
-	echo.
-	echo.If you don't have Sphinx installed, grab it from
-	echo.http://sphinx-doc.org/
-	exit /b 1
-)
-
-%SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS%
-goto end
-
-:help
-%SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS%
-
-:end
-popd


environment variable JDK6 replaced with JAVA_HOME as in other projects

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

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


build: patch Windows container, fixing Node 10 (#216)

--- .kokoro/test.bat
+++ .kokoro/test.bat
@@ -17,7 +17,15 @@
 cd /d %~dp0
 cd ..

-call npm install -g npm@latest || goto :error
+@rem The image we're currently running has a broken version of Node.js enabled
+@rem by nvm (v10.15.3), which has no npm bin. This hack uses the functional
+@rem Node v8.9.1 to install npm@latest, it then uses this version of npm to
+@rem install npm for v10.15.3.
+call nvm use v8.9.1 || goto :error
+call node C:\Users\kbuilder\AppData\Roaming\nvm-ps\versions\v8.9.1\node_modules\npm-bootstrap\bin\npm-cli.js i npm -g || goto :error
+call nvm use v10.15.3 || goto :error
+call node C:\Users\kbuilder\AppData\Roaming\nvm-ps\versions\v8.9.1\node_modules\npm\bin\npm-cli.js i npm -g || goto :error
+
 call npm install || goto :error
 call npm run test || goto :error


build: update windows configuration to match new vm

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

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

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


chore: use latest npm on Windows (#425)

chore: use latest npm on Windows (#425)

--- .kokoro/test.bat
+++ .kokoro/test.bat
@@ -1,4 +1,4 @@
-@rem Copyright 2018 gRPC authors.
+@rem Copyright 2018 Google LLC. All rights reserved.
 @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.
@@ -17,8 +17,7 @@
 cd /d %~dp0
 cd ..

-call npm install -g npm@5 || goto :error
-
+call npm install -g npm@latest || goto :error
 call npm install || goto :error
 call npm run test || goto :error


minor optimization for sipparser

minor optimization for sipparser

--- pprof.bat
+++ pprof.bat
@@ -13,7 +13,8 @@
 if "%2" == "" (
 	go tool pprof .\test_temp\%1.test.exe .\test_temp\%1_cpu.prof
 ) else (
-	go tool pprof %2 %3=%4 .\test_temp\%1.test.exe .\test_temp\%1_cpu.prof
+	echo go tool pprof %2 -nodecount=%3 .\test_temp\%1.test.exe .\test_temp\%1_cpu.prof
+	go tool pprof %2 -nodecount=%3 .\test_temp\%1.test.exe .\test_temp\%1_cpu.prof
 )


use self-define CMakeLists.txt for evpp

use self-define CMakeLists.txt for evpp

Former-commit-id: cd4ae829ae322a725d24ebba65d617fd374d2384
Former-commit-id: 125a96d8b1cd4252a266a34ec6981c71f304f752

--- Dep/build_dep.bat
+++ Dep/build_dep.bat
@@ -69,13 +69,15 @@
 git clone -b master https://github.com/ArkGame/evpp.git

 cd evpp
-cd vsprojects
-"%VS140COMNTOOLS%..\IDE\Devenv" libevpp.sln /build "Debug|x64" /project libevpp.vcxproj
-"%VS140COMNTOOLS%..\IDE\Devenv" libevpp.sln /build "Release|x64" /project libevpp.vcxproj
-copy x64\Debug\*.lib ..\..\lib\Debug /Y
-copy x64\Release\*.lib ..\..\lib\Release /Y
+md build
+cd build
+cmake -G "Visual Studio 14 Win64" ..
+"%VS140COMNTOOLS%..\IDE\Devenv" safe-evpp.sln /build "Debug|x64" /project evpp/evpp_static.vcxproj
+"%VS140COMNTOOLS%..\IDE\Devenv" safe-evpp.sln /build "Release|x64" /project evpp/evpp_static.vcxproj
+copy lib\Debug\*.lib ..\..\lib\Debug /Y
+copy lib\Release\*.lib ..\..\lib\Release /Y

 cd ..\..\
 REM ####################################################################################################
 REM back to root dir
-cd ../+cd ..\


Copy true binaries.

Copy true binaries.

--- Examples/copy_binaries.cmd
+++ Examples/copy_binaries.cmd
@@ -3,15 +3,6 @@

 mkdir yc

-xcopy /Y ..\YaccConstructor\YaccConstructor\bin\Release\*.dll yc
-xcopy /Y ..\YaccConstructor\YaccConstructor\bin\Release\*.exe yc
-xcopy /Y ..\YaccConstructor\CYK\bin\Release\*.exe yc
-xcopy /Y ..\YaccConstructor\GLLGenerator\bin\Release\*.dll yc
-xcopy /Y ..\YaccConstructor\CYK\bin\Release\*.dll yc
-xcopy /Y ..\YaccConstructor\RNGLRCommon\bin\Release\*.dll yc
-xcopy /Y ..\YaccConstructor\RNGLRParser\bin\Release\*.dll yc
-xcopy /Y ..\YaccConstructor\RNGLRGenerator\bin\Release\*.dll yc
-xcopy /Y ..\YaccConstructor\Constraints\bin\Release\*.dll yc
-xcopy /Y ..\YaccConstructor\Utils.SourceText\bin\Release\*.dll yc
-xcopy /Y ..\YaccConstructor\FsYard\bin\Release\*.exe yc
-xcopy /Y ..\YaccConstructor\FsYard\bin\Release\*.targets yc
+xcopy /Y ..\Bin\Release\v45\*.dll yc
+xcopy /Y ..\Bin\Release\v45\*.exe yc
+xcopy /Y ..\Bin\Release\v45\*.targets yc


fix error check to ensure user does not try to defend their own IP address

--- defendAPR.bat
+++ defendAPR.bat
@@ -28,13 +28,13 @@

  :: Check if $1 is Local hosts IP
 FOR /F "tokens=2" %%i in ('ARP -A ^| FINDSTR \-\-\-') do (
-	SET ipaddr=%%i

+	IF "%1"=="%%i" (
+		ECHO Cannot protect your own IP Address -- Try using the Default Gateway or router's IP Address.
+		GOTO ERROR
+	)
 )
-IF "%1"=="%%i" (
-	ECHO Cannot protect your own IP Address -- Try using the Default Gateway or router's IP Address.
-	GOTO ERROR
-)
+

 ECHO INITIALIZING...
 ECHO.


Additional packages added.

Additional packages added.

--- windows/configureNewPc.bat
+++ windows/configureNewPc.bat
@@ -15,5 +15,12 @@

 choco install -y intellijidea-community

-choco install -y virtualbox
-choco install -y vagrant
+#choco install -y virtualbox
+#choco install -y vagrant
+
+choco install -y googledrive
+
+choco install -y putty.install
+choco install -y paint.net
+
+choco install -y slack


update dist-win32.bat

update dist-win32.bat

--- dist-win32.bat
+++ dist-win32.bat
@@ -15,14 +15,19 @@

 :: call electron-packager . --platform=%PLATFORM% --arch=%ARCH% --out %OUTPUT_DIR% --overwrite --asar.unpackDir dfu'

-copy installer.wxs %PACKAGE_DIR%
+copy QMK_Firmware_Flasher_32-bit.wxs %PACKAGE_DIR%
+copy QMK_Firmware_Flasher_64-bit.wxs %PACKAGE_DIR%

 copy build\windows.ico %PACKAGE_DIR%

 cd %PACKAGE_DIR%

-call candle installer.wxs
+call candle QMK_Firmware_Flasher_32-bit.wxs

-if errorlevel 0 call light installer.wixobj
+if errorlevel 0 call light QMK_Firmware_Flasher_32-bit.wixobj
+
+call candle QMK_Firmware_Flasher_64-bit.wxs
+
+if errorlevel 0 call light QMK_Firmware_Flasher_64-bit.wixobj

 cd %~dp0


CI: fix binary and lib names for the Windows builds.

--- ci/build-windows-gcc.bat
+++ ci/build-windows-gcc.bat
@@ -13,8 +13,8 @@
 mkdir %NAME%\include\
 mkdir %NAME%\include\aff3ct\

- copy bin\aff3ct*.exe  %NAME%\bin\aff3ct.exe
- copy lib\libaff3ct*.a %NAME%\lib\aff3ct.lib
+ copy bin\aff3ct*.exe  %NAME%\bin\
+ copy lib\libaff3ct*.a %NAME%\lib\
 xcopy ..\src\*         %NAME%\include\aff3ct\ /s /e > nul

 move %NAME% ..\


rewrite so tests work in new directory

rewrite so tests work in new directory

--- tests/run_with_luajit.bat
+++ tests/run_with_luajit.bat
@@ -1,7 +1,12 @@
 @echo off
+pushd %~dp0\..
 cls
-REM ..\luajit-2.0\src\luajit.exe -jv tests.lua > output.txt
+set LUA=..\luas\luajit\luajit.exe

-REM ..\luajit-2.0\src\luajit.exe -joff -jv -jp=a correctness_tests.lua > output.txt
-..\luajit-2.0\src\luajit.exe -jp=a correctness_tests.lua > output.txt
-REM ..\luajit-2.0\src\luajit.exe -jv correctness_tests.lua > output.txt
+%LUA% -jv tests\basic_tests.lua > tests\output.txt
+
+%LUA% -jv tests\correctness_tests.lua >> tests\output.txt 2>&1
+REM %LUA% -joff -jv -jp=a correctness_tests.lua >> tests\output.txt 2>&1
+REM %LUA% -jp=a correctness_tests.lua >> tests\output.txt 2>&1
+
+popd


Revert "overcome the global.json constraint with a hack"

This reverts commit c02346c72aafd1826b0397dbbce4ce04bf252f50.

--- kokoro/release/csharp/windows/build_nuget.bat
+++ kokoro/release/csharp/windows/build_nuget.bat
@@ -2,13 +2,4 @@
 cd /d %~dp0\..\..\..\..

 cd csharp
-
-@rem see what dotnet version is available
-dotnet --version
-
-@rem TODO(jtattermusch): Kokoro workers currently only have dotnet SDK 2.1.3
-@rem so we just overwrite the SDK requirement in global.json as the results
-@rem should be fully compatible.
-echo { "sdk": { "version": "2.1.3" } } >global.json
-
 call build_packages.bat


Added batch file to rebuild all platforms at once

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

--- MakeSharpDX_localbuild.cmd
+++ MakeSharpDX_localbuild.cmd
@@ -0,0 +1,8 @@
+@echo off
+setlocal
+set PATH=C:\Program Files (x86)\Git\bin\;%PATH%
+call "C:\Program Files (x86)\Microsoft Visual Studio 11.0\vc\vcvarsall.bat" x86
+msbuild /tv:4.0 /p:BuildSignedSharpDX=false /t:Build;BuildSamples /verbosity:quiet /clp:ErrorsOnly /fl /flp:logfile=BuildErrors.log;ErrorsOnly %* SharpDX.build
+if NOT ERRORLEVEL 0 {
+	pause
+}


raptor dies if the SYSTEMINCLUDE in the mmp points to a drive
that is different from the symbian build drive

This work around a bug in raptor (bug has been reported)

--- configure.bat
+++ configure.bat
@@ -339,7 +339,7 @@

 echo qmf_enabled = no >> %PROJECT_CONFIG%

-echo isEmpty($$QT_MOBILITY_INCLUDE):QT_MOBILITY_INCLUDE=$$QT_MOBILITY_PREFIX/include >> %PROJECT_CONFIG%
+echo !symbian:isEmpty($$QT_MOBILITY_INCLUDE):QT_MOBILITY_INCLUDE=$$QT_MOBILITY_PREFIX/include >> %PROJECT_CONFIG%
 echo isEmpty($$QT_MOBILITY_LIB):QT_MOBILITY_LIB=$$QT_MOBILITY_PREFIX/lib >> %PROJECT_CONFIG%
 echo isEmpty($$QT_MOBILITY_BIN):QT_MOBILITY_BIN=$$QT_MOBILITY_PREFIX/bin >> %PROJECT_CONFIG%
 echo isEmpty($$QT_MOBILITY_PLUGINS):QT_MOBILITY_PLUGINS=$$QT_MOBILITY_PREFIX/plugins >> %PROJECT_CONFIG%


Finish win shell script

Finish win shell script

--- start.cmd
+++ start.cmd
@@ -113,11 +113,11 @@
 echo Copyright ©Nikitakun (github.com/nibogd)
 echo.
 echo Usage:
-echo   ingress-ice.cmd [-r] [-h | /?]
+echo   ingress-ice.cmd [-r] [-h]
 echo.
 echo Options:
 echo   -r      Overwrite the configuration file with a new one.
-echo   -h /?   Print this help
+echo   -h      Print this help
 echo.
 echo Please visit http://ingress.divshot.io/ or http://github.com/nibgd/ingress-ice for additional help
 :eof


github pagesのnojekyllファイルの生成追加

github pagesのnojekyllファイルの生成追加

--- make_site.bat
+++ make_site.bat
@@ -11,5 +11,8 @@
 mkdir target
 call mvn site -Dgpg.skip=true > target/site.log 2>&1

+REM github-pages̑Ή
+echo "" > .\target\site\.nojekyll
+
 start target/site.log


fixup llvm install in script

fixup llvm install in script

--- .appveyor-install-tools.cmd
+++ .appveyor-install-tools.cmd
@@ -9,13 +9,12 @@
 :: Setup Compiler
 ::###########################################################################
 if NOT EXIST llvm-installer.exe (
-  appveyor DownloadFile http://llvm.org/pre-releases/win-snapshots/LLVM-5.0.0-r303050-win32.exe -FileName llvm-installer.exe
+  appveyor DownloadFile http://prereleases.llvm.org/win-snapshots/LLVM-5.0.0-r306282-win32.exe -FileName llvm-installer.exe
 )
-if "%CLANG_VERSION%"=="ToT" (
-    START /WAIT llvm-installer.exe /S /D=C:\"Program Files\LLVM"
-)
-if DEFINED CLANG_VERSION  @set PATH="C:\Program Files\LLVM\bin";%PATH%
-if DEFINED CLANG_VERSION  clang-cl -v
+
+START /WAIT llvm-installer.exe /S /D=C:\"Program Files\LLVM"
+@set PATH="C:\Program Files\LLVM\bin";%PATH%
+clang-cl -v

 if DEFINED MINGW_PATH rename "C:\Program Files\Git\usr\bin\sh.exe" "sh-ignored.exe"
 if DEFINED MINGW_PATH @set "PATH=%PATH:C:\Program Files (x86)\Git\bin=%"


OK, we do need the generator else we V2012

--- conda/bld.bat
+++ conda/bld.bat
@@ -1,20 +1,23 @@
-@echo off
-
 robocopy %RECIPE_DIR%\.. . /E /NFL

 mkdir build
 cd build

+rem Need to handle Python 3.x case at some point (Visual Studio 2010)
 if %ARCH%==32 (
-    set VS110COMNTOOLS=""
-    set VS120COMNTOOLS=""
+  if %PY_VER% LSS 3 (
+    set CMAKE_GENERATOR="Visual Studio 9 2008"
     set CMAKE_CONFIG="Release"
+  )
 )
 if %ARCH%==64 (
+  if %PY_VER% LSS 3 (
+    set CMAKE_GENERATOR="Visual Studio 9 2008 Win64"
     set CMAKE_CONFIG="Release"
+  )
 )

-cmake .. ^
+cmake .. -G"%CMAKE_GENERATOR%" ^
  -DBUILD_SHARED_LIBS=1 ^
  -DCMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX%


Create bld_py.bat

Create bld_py.bat

error: pathspec 'recipes/gz-math/bld_py.bat' did not match any file(s) known to git

--- recipes/gz-math/bld_py.bat
+++ recipes/gz-math/bld_py.bat
@@ -0,0 +1,23 @@
+cd src/python_pybind11
+rmdir /s /q build
+mkdir build
+cd build
+
+cmake -G "Ninja" ^
+    -DCMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% ^
+    -DCMAKE_BUILD_TYPE=Release ^
+    -DBUILD_SHARED_LIBS:BOOL=ON ^
+    -DCMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP=ON ^
+    -DUSE_SYSTEM_PATHS_FOR_PYTHON_INSTALLATION:BOOL=ON ^
+    -DPython3_EXECUTABLE:PATH=%PYTHON% ^
+    -DPYTHON_EXECUTABLE:PATH=%PYTHON% ^
+    ..
+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


use 7z

use 7z

--- recipes/openrefine/bld.bat
+++ recipes/openrefine/bld.bat
@@ -6,7 +6,7 @@
 CALL mvn package -DskipTests

 CD %SRC_DIR%\packaging\target\
-tar -xvf openrefine-win-%PKG_VERSION%.zip
+7z e openrefine-win-%PKG_VERSION%.zip
 if errorlevel 1 exit 1

 ROBOCOPY openrefine-%PKG_VERSION% %LIBRARY_PREFIX%\opt\openrefine /E


update configure.bat

update configure.bat

--- configure.bat
+++ configure.bat
@@ -143,8 +143,8 @@
   devenv lz4\visual\VS2017\lz4.sln /project liblz4 /rebuild "Release|x64"
 ) else (
   cd lz4\lib
-  qmake
-  %MAKE%
+  qmake -o makefile.liblz4
+  %MAKE% -f makefile.liblz4
   cd ..\..
 )
 cd ..


* configuration script output and pause

* configuration script output and pause

git-svn-id: 8286f1aa0849172a171b18e797a5983a17159a76@168 699b1267-f50e-4533-8e1b-323e5631ef88

--- configure.bat
+++ configure.bat
@@ -19,6 +19,7 @@

 :CONFIGURE_CONTOOLS
 rem generate __init__.bat in "%CONFIGURE_ROOT%/Scripts/Tools"
+echo "%CONFIGURE_ROOT%/Scripts/Tools/__init__.bat"
 (
   echo.@echo off
   echo.
@@ -48,6 +49,7 @@
 ) > "%CONFIGURE_ROOT%/Scripts/Tools/__init__.bat"

 rem generate __init__.bat in "%CONFIGURE_ROOT%/Scripts/Tools/scm/svn"
+echo "%CONFIGURE_ROOT%/Scripts/Tools/scm/svn/__init__.bat"
 (
   echo.@echo off
   echo.
@@ -58,6 +60,7 @@

 :CONFIGURE_SVNCMD
 rem generate __init__.bat in "%CONFIGURE_ROOT%/Tools"
+echo."%CONFIGURE_ROOT%/Tools/__init__.bat"
 (
   echo.@echo off
   echo.
@@ -87,6 +90,7 @@
 ) > "%CONFIGURE_ROOT%/Tools/__init__.bat"

 rem generate __init__.bat in "%CONFIGURE_ROOT%/Scripts"
+echo "%CONFIGURE_ROOT%/Scripts/__init__.bat"
 (
   echo.@echo off
   echo.
@@ -96,7 +100,7 @@
 :CONFIGURE_SVNCMD_END

 if exist "%CONFIGURE_ROOT%/svncmd.tag" goto DEPLOY_TOOLS_EXTERNAL
-exit /b 0
+goto END

 :DEPLOY_TOOLS_EXTERNAL
 rem initialize Tools "module"
@@ -104,7 +108,18 @@

 rem deploy Windows UCRT dependencies
 for %%i in (%WINDOWS_UCRT_X86_DEPLOY_DIR_LIST%) do (
-  call "%%CONTOOLS_ROOT%%/xcopy_dir.bat" "%%CONFIGURE_ROOT%%/ToolsExternal/deps/Windows Kits/10/Redist/ucrt/DLLs/x86" "%%CONFIGURE_ROOT%%/%%i" || goto :EOF
+  call :CMD "%%CONTOOLS_ROOT%%/xcopy_dir.bat" "%%CONFIGURE_ROOT%%/ToolsExternal/deps/Windows Kits/10/Redist/ucrt/DLLs/x86" "%%CONFIGURE_ROOT%%/%%i" || goto :EOF
 )

 exit /b 0
+
+:CMD
+echo.^>%*
+(%*)
+exit /b
+
+:END
+
+pause
+
+exit /b 0


Suggested update since it's not obvious how to install on windows.

It's far from obvious that ZULU_JAVA_HOME needs to be set.

I've added a suggested update to dataloader.bat instructions.

--- release/win/dataloader.bat
+++ release/win/dataloader.bat
@@ -24,8 +24,12 @@
     echo Data Loader requires Zulu OpenJDK 11. Checking if it is installed...
     for /F "delims=" %%a in ('powershell -Command "foreach($path in (Get-ChildItem Env:Path).value -split ';') { if($path -like '*zulu*') { $jdkDir = $path -split 'bin\\' }}; echo $jdkDir"') do Set "ZULU_JAVA_HOME=%%a"
     if "%ZULU_JAVA_HOME%"=="" (
-        echo Zulu OpenJDK is not installed. Download Zulu OpenJDK 11 for Windows here:
+        echo Zulu OpenJDK is not installed, or ZULU_JAVA_HOME not in path.
+        echo Download Zulu OpenJDK 11 for Windows here:
         echo    https://www.azul.com/downloads/zulu/zulu-windows/
+        echo After the installation, add Zulu OpenJDK 11 to your path:
+        echo    ZULU_JAVA_HOME="<full-path-to-zulu-base-dir>\<zulu-11>"
+        echo    eg. ZULU_JAVA_HOME="C:\Program Files\Zulu\zulu-11"
         PAUSE
         goto Exit
     )


fixed bidmat.cmd

fixed bidmat.cmd

--- bidmat.cmd
+++ bidmat.cmd
@@ -4,7 +4,7 @@
 :: Set as much memory as possible
 (SET JAVA_OPTS=-Xmx12G -Xms128M)
 :: Fix these if needed
-SET JCUDA_VERSION=0.5.5
+SET JCUDA_VERSION=0.6.5
 SET JCUDA_LIBDIR=%CD%\lib
 SET LIBDIR=%CD%\lib

@@ -13,6 +13,6 @@
 SET JCUDA_LIBS=%JCUDA_LIBDIR%\jcuda-%JCUDA_VERSION%.jar;%JCUDA_LIBDIR%\jcublas-%JCUDA_VERSION%.jar;%JCUDA_LIBDIR%\jcufft-%JCUDA_VERSION%.jar;%JCUDA_LIBDIR%\jcurand-%JCUDA_VERSION%.jar;%JCUDA_LIBDIR%\jcusparse-%JCUDA_VERSION%.jar

 SET ALL_LIBS=%LIBDIR%\IScala.jar;%BIDMAT_LIBS%;%JCUDA_LIBS%;%JAVA_HOME%\lib\tools.jar
-SET JAVA_NATIVE='-Djava.library.path='%LIBDIR%;%PATH%
+(SET JAVA_OPTS=-Djava.library.path="%LIBDIR%;%PATH%" %JAVA_OPTS%)

-%CD%\scripts\scala\scala.bat "%JAVA_NATIVE%" -toolcp "%ALL_LIBS%" -Yrepl-sync -i %LIBDIR%\bidmat_init.scala+%CD%\scripts\scala\scala.bat -toolcp "%ALL_LIBS%" -Yrepl-sync -i %LIBDIR%\bidmat_init.scala


Corrected a minor typo in the batch script.

--- selenium/NODE_SeleniumGrid.bat
+++ selenium/NODE_SeleniumGrid.bat
@@ -5,4 +5,4 @@
 ECHO Starting the NODE...
 ECHO.
 CD /Selenium
-java -jar selenium-server-standalone-3.7.1.jar -role node -nodeConfig NODE_Config.json+java -jar selenium-server-standalone-3.7.1.jar -role node -node Config NODE_Config.json


tag version bump

tag version bump


Create script that create folder platforms/Visual

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

--- projectCreator.bat
+++ projectCreator.bat
@@ -0,0 +1,8 @@
+echo off
+
+set platformsFolder=platforms
+set platformName=Visual
+
+set folder=%platformsFolder%\%platformName%
+
+if not exist %folder% (mkdir %folder%)


Update deployment source.

Update deployment source.

--- deploy.cmd
+++ deploy.cmd
@@ -21,8 +21,6 @@
 setlocal enabledelayedexpansion

 SET ARTIFACTS=%~dp0%..\artifacts
-
-SET DEPLOYMENT_SOURCE=C:\Users\BigFont\orchard

 IF NOT DEFINED DEPLOYMENT_SOURCE (
   SET DEPLOYMENT_SOURCE=%~dp0%.


Revert "get it working #5"

Revert "get it working #5"

This reverts commit fee12ab4925e9e8a34787677d4c577f38d2eeb84.

--- deploy.cmd
+++ deploy.cmd
@@ -105,6 +105,28 @@
   popd
 )

+:: 4. Install bower packages
+IF EXIST "%DEPLOYMENT_TARGET%\bower.json" (
+  pushd "%DEPLOYMENT_TARGET%"
+  call :ExecuteCmd !NPM_CMD! install bower
+  IF !ERRORLEVEL! NEQ 0 goto error
+  call :ExecuteCmd bower install
+  IF !ERRORLEVEL! NEQ 0 goto error
+  popd
+)
+
+:: 5. Run grunt
+IF EXIST "%DEPLOYMENT_TARGET%\bower.json" (
+  pushd "%DEPLOYMENT_TARGET%"
+  call :ExecuteCmd !NPM_CMD! install grunt-cli
+  IF !ERRORLEVEL! NEQ 0 goto error
+  call :ExecuteCmd grunt --no-color cssmin uglify
+  IF !ERRORLEVEL! NEQ 0 goto error
+  call :ExecuteCmd grunt --no-color --force
+  IF !ERRORLEVEL! NEQ 0 goto error
+  popd
+)
+
 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::

 :: Post deployment stub


Remove pauses.

Remove pauses.

--- deploy.cmd
+++ deploy.cmd
@@ -66,20 +66,17 @@
 :: ----------

 echo Handling .NET Web Application deployment.
-pause > nul

 :: 1. Restore NuGet packages
 IF /I "src\Orchard.sln" NEQ "" (

   echo Nuget
   echo %DEPLOYMENT_SOURCE%\src\Orchard.sln"
-  pause > nul

   call :ExecuteCmd nuget restore "%DEPLOYMENT_SOURCE%\src\Orchard.sln"
   IF !ERRORLEVEL! NEQ 0 goto error

   echo End Nuget
-  pause > nul

 )

@@ -117,7 +114,6 @@
 :error
 endlocal
 echo An error has occurred during web site deployment.
-pause > nul
 call :exitSetErrorLevel
 call :exitFromFunction 2>nul

@@ -130,5 +126,3 @@
 :end
 endlocal
 echo Finished successfully.
-
-pause > nul


moved bower-install task before build

moved bower-install task before build

--- deploy.cmd
+++ deploy.cmd
@@ -73,24 +73,9 @@
   IF !ERRORLEVEL! NEQ 0 goto error
 )

-:: 2. Build to the temporary path
+:: 2. Install npm packages, bower, grunt, and bower packages
 IF /I "%IN_PLACE_DEPLOYMENT%" NEQ "1" (
-  call :ExecuteCmd "%MSBUILD_PATH%" "%DEPLOYMENT_SOURCE%\Resume\Resume.csproj" /nologo /verbosity:m /t:Build /t:pipelinePreDeployCopyAllFilesToOneFolder /p:_PackageTempDir="%DEPLOYMENT_TEMP%";AutoParameterizationWebConfigConnectionStrings=false;Configuration=Release /p:SolutionDir="%DEPLOYMENT_SOURCE%\.\\" %SCM_BUILD_ARGS%
-) ELSE (
-  call :ExecuteCmd "%MSBUILD_PATH%" "%DEPLOYMENT_SOURCE%\Resume\Resume.csproj" /nologo /verbosity:m /t:Build /p:AutoParameterizationWebConfigConnectionStrings=false;Configuration=Release /p:SolutionDir="%DEPLOYMENT_SOURCE%\.\\" %SCM_BUILD_ARGS%
-)
-
-IF !ERRORLEVEL! NEQ 0 goto error
-
-:: 3. KuduSync
-IF /I "%IN_PLACE_DEPLOYMENT%" NEQ "1" (
-  call :ExecuteCmd "%KUDU_SYNC_CMD%" -v 50 -f "%DEPLOYMENT_TEMP%" -t "%DEPLOYMENT_TARGET%" -n "%NEXT_MANIFEST_PATH%" -p "%PREVIOUS_MANIFEST_PATH%" -i ".git;.hg;.deployment;deploy.cmd"
-  IF !ERRORLEVEL! NEQ 0 goto error
-)
-
-:: 4. Install npm packages, bower, grunt, and bower packages
-IF /I "%IN_PLACE_DEPLOYMENT%" NEQ "1" (
-	pushd "%DEPLOYMENT_TARGET%"
+	pushd "%DEPLOYMENT_SOURCE%\Resume"

 	echo Installing npm packages...
 	call :ExecuteCmd npm install
@@ -108,6 +93,21 @@
 	call :ExecuteCmd grunt bower-install
 	IF !ERRORLEVEL! NEQ 0 goto error
 	popd
+)
+
+:: 3. Build to the temporary path
+IF /I "%IN_PLACE_DEPLOYMENT%" NEQ "1" (
+  call :ExecuteCmd "%MSBUILD_PATH%" "%DEPLOYMENT_SOURCE%\Resume\Resume.csproj" /nologo /verbosity:m /t:Build /t:pipelinePreDeployCopyAllFilesToOneFolder /p:_PackageTempDir="%DEPLOYMENT_TEMP%";AutoParameterizationWebConfigConnectionStrings=false;Configuration=Release /p:SolutionDir="%DEPLOYMENT_SOURCE%\.\\" %SCM_BUILD_ARGS%
+) ELSE (
+  call :ExecuteCmd "%MSBUILD_PATH%" "%DEPLOYMENT_SOURCE%\Resume\Resume.csproj" /nologo /verbosity:m /t:Build /p:AutoParameterizationWebConfigConnectionStrings=false;Configuration=Release /p:SolutionDir="%DEPLOYMENT_SOURCE%\.\\" %SCM_BUILD_ARGS%
+)
+
+IF !ERRORLEVEL! NEQ 0 goto error
+
+:: 4. KuduSync
+IF /I "%IN_PLACE_DEPLOYMENT%" NEQ "1" (
+  call :ExecuteCmd "%KUDU_SYNC_CMD%" -v 50 -f "%DEPLOYMENT_TEMP%" -t "%DEPLOYMENT_TARGET%" -n "%NEXT_MANIFEST_PATH%" -p "%PREVIOUS_MANIFEST_PATH%" -i ".git;.hg;.deployment;deploy.cmd"
+  IF !ERRORLEVEL! NEQ 0 goto error
 )

 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::


Update

Update

--- iCatalyst.bat
+++ iCatalyst.bat
@@ -639,7 +639,7 @@
 	exit /b 1
 )
 if %png% equ 2 (
-	>"%pnglog%" 2>nul truepng -y -i0 -zw7 -zc7 -zm5-9 -zs0,1,3 -f0,5 -fs:2 %xtreme% -force -out "%filework%" "%~2"
+	>"%pnglog%" 2>nul truepng -y -i0 -zw7 -zc7 -zm5-9 -zs0,1,3 -f0,5 -fs:1 %xtreme% -force -out "%filework%" "%~2"
 	if errorlevel 1 (call:saverrorlog "%~f2" 2 %~1 PNG & goto:pngfwe)
 	for /f "tokens=2,4,6,8,10 delims=:	" %%a in ('findstr /r /i /b /c:"zc:..zm:..zs:" "%pnglog%"') do (
 		set "zc=%%a"


Create pyoctree_build.bat

Create pyoctree_build.bat

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

--- pyoctree_build.bat
+++ pyoctree_build.bat
@@ -0,0 +1,4 @@
+REM Test build
+python setup.py sdist bdist_wheel
+REM Upload to PyPi
+REM python setup.py sdist bdist_wheel upload


Adding first cut of profile-creator.bat file.

error: pathspec 'modules/distribution/src/core/bin/profile-creator.bat' did not match any file(s) known to git

--- modules/distribution/src/core/bin/profile-creator.bat
+++ modules/distribution/src/core/bin/profile-creator.bat
@@ -0,0 +1,210 @@
+@echo OFF
+
+REM ---------------------------------------------------------------------------
+REM        Copyright 2017 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.
+REM ---------------------------------------------------------------------------
+REM Profile creator tool for EI
+REM ---------------------------------------------------------------------------
+
+set DIR=%~dp0
+set DISTRIBUTION=wso2iot-@product.version@
+REM get the desired profile
+echo This tool will erase all the files which are not required for the selected profile.
+echo WSO2 IoT Server Supports following profiles.
+echo 	1.IoT Gateway Profile
+echo 	2.IoT Key Manager Profile
+echo 	3.IoT Device Backend Profile
+echo 	4.IoT Device Manager Profile
+echo 	5.Analytics Profile
+echo 	6.Broker profile
+echo 	7.For All Profiles
+
+set /p profileNumber= [Please enter the desired profile number to create the profile specific distribution]
+
+IF /I "%profileNumber%" EQU "1" goto Gateway
+IF /I "%profileNumber%" EQU "2" goto KeyManager
+IF /I "%profileNumber%" EQU "3" goto Backend
+IF /I "%profileNumber%" EQU "4" goto Manager
+IF /I "%profileNumber%" EQU "5" goto Analytics
+IF /I "%profileNumber%" EQU "5" goto Broker
+IF /I "%profileNumber%" EQU "5" goto All
+
+echo Invalid profile identifier.
+goto Exit
+
+:Gateway
+	echo Preparing the Gateway profile distribution.
+	set DEFAULT_BUNDLES=%DIR%..\wso2\components\http-gateway\configuration\org.eclipse.equinox.simpleconfigurator\bundles.info
+    call :Remove_BROKER
+    call :Remove_ANALYTICS
+    call :Remove_JARS
+    IF EXIST %DIR%\..\wso2\components\default @RD /S /Q  %DIR%\..\wso2\components\default
+    IF EXIST %DIR%\..\wso2\components\device-backend @RD /S /Q %DIR%\..\wso2\components\device-backend
+    IF EXIST %DIR%\..\wso2\components\device-key-manager @RD /S /Q %DIR%\..\wso2\components\device-key-manager
+    IF EXIST %DIR%\..\wso2\components\device-manager @RD /S /Q %DIR%\..\wso2\components\device-manager
+    IF EXIST %DIR%\..\samples @RD /S /Q %DIR%\..\samples
+    IF EXIST %DIR%\..\plugins @RD /S /Q %DIR%\..\plugins
+    IF EXIST %DIR%\profile-creator.sh del %DIR%\profile-creator.sh
+    IF EXIST %DIR%\profile-creator.bat del %DIR%\profile-creator.bat
+    for /R %DIR%\..\repository\resources\profiles\gateway %%f in (*.sh) do copy %%f %DIR%\..\bin\
+    copy /y %DIR%\..\repository\resources\profiles\gateway\carbon.xml %DIR%\..\conf\
+    IF EXIST %DIR%\..\repository\deployment\server\jaggeryapps del %DIR%\..\repository\deployment\server\jaggeryapps\*
+    IF EXIST %DIR%\..\repository\deployment\server\webapps del %DIR%\..\repository\deployment\server\webapps\*
+    IF EXIST %DIR%\..\repository\deployment\server\carbonapps del %DIR%\..\repository\deployment\server\carbonapps\*
+    IF EXIST %DIR%\..\repository\deployment\server\axis2services @RD /S /Q %DIR%\..\repository\deployment\server\axis2services\*
+    IF EXIST %DIR%\..\repository\deployment\server\devicetypes @RD /S /Q %DIR%\..\repository\deployment\server\devicetypes\*
+    IF EXIST %DIR%\..\conf\identity\sso-idp-config.xml del %DIR%\..\conf\identity\sso-idp-config.xml
+    echo Gateway profile created successfully.
+	goto Exit
+
+:KeyManager
+	echo Preparing the Gateway profile distribution.
+	set DEFAULT_BUNDLES=%DIR%..\wso2\components\http-gateway\configuration\org.eclipse.equinox.simpleconfigurator\bundles.info
+    call :Remove_BROKER
+    call :Remove_ANALYTICS
+    call :Remove_JARS
+    IF EXIST %DIR%\..\wso2\components\default @RD /S /Q  %DIR%\..\wso2\components\default
+    IF EXIST %DIR%\..\wso2\components\http-gateway @RD /S /Q %DIR%\..\wso2\components\http-gateway
+    IF EXIST %DIR%\..\wso2\components\device-backend @RD /S /Q %DIR%\..\wso2\components\device-backend
+    IF EXIST %DIR%\..\wso2\components\device-manager @RD /S /Q %DIR%\..\wso2\components\device-manager
+    IF EXIST %DIR%\..\samples @RD /S /Q %DIR%\..\samples
+    IF EXIST %DIR%\..\plugins @RD /S /Q %DIR%\..\plugins
+    IF EXIST %DIR%\profile-creator.sh del %DIR%\profile-creator.sh
+    IF EXIST %DIR%\profile-creator.bat del %DIR%\profile-creator.bat
+    for /R %DIR%\..\repository\resources\profiles\keymanager %%f in (*.sh) do copy %%f %DIR%\..\bin\
+    copy /y %DIR%\..\repository\resources\profiles\keymanager\carbon.xml %DIR%\..\conf\
+    copy /y %DIR%\..\repository\resources\profiles\keymanager\identity\application-authentication.xml %DIR%\..\conf\identity\
+    IF EXIST %DIR%\..\repository\deployment\server\jaggeryapps del %DIR%\..\repository\deployment\server\jaggeryapps\*
+    IF EXIST %DIR%\..\repository\deployment\server\carbonapps del %DIR%\..\repository\deployment\server\carbonapps\*
+    IF EXIST %DIR%\..\repository\deployment\server\axis2services @RD /S /Q %DIR%\..\repository\deployment\server\axis2services\*
+    IF EXIST %DIR%\..\repository\deployment\server\devicetypes @RD /S /Q %DIR%\..\repository\deployment\server\devicetypes\*
+    IF EXIST %DIR%\..\repository\deployment\server\synapse-configs\default\api @RD /S /Q %DIR%\..\repository\deployment\server\synapse-configs\default\api\*
+    IF EXIST %DIR%\..\repository\deployment\server\synapse-configs\default\sequences @RD /S /Q %DIR%\..\repository\deployment\server\synapse-configs\default\sequences\_*.xml
+    mkdir %DIR%\..\repository\deployment\server\tempwebapp
+    copy /y %DIR%\..\repository\deployment\server\webapps\oauth2.war %DIR%\..\repository\deployment\server\tempwebapp\
+    copy /y %DIR%\..\repository\deployment\server\webapps\client-registration#v0.11.war %DIR%\..\repository\deployment\server\tempwebapp\
+    copy /y %DIR%\..\repository\deployment\server\webapps\dynamic-client-web.war %DIR%\..\repository\deployment\server\tempwebapp\
+    copy /y %DIR%\..\repository\deployment\server\webapps\authenticationendpoint.war %DIR%\..\repository\deployment\server\tempwebapp\
+    IF EXIST %DIR%\..\repository\deployment\server\webapps del %DIR%\..\repository\deployment\server\webapps\*
+    echo Gateway profile created successfully.
+	goto Exit
+
+:Backend
+	echo Preparing the Gateway profile distribution.
+	set DEFAULT_BUNDLES=%DIR%..\wso2\components\device-backend\configuration\org.eclipse.equinox.simpleconfigurator\bundles.info
+    call :Remove_BROKER
+    call :Remove_ANALYTICS
+    call :Remove_JARS
+    IF EXIST %DIR%\..\wso2\components\default @RD /S /Q  %DIR%\..\wso2\components\default
+    IF EXIST %DIR%\..\wso2\components\http-gateway @RD /S /Q %DIR%\..\wso2\components\http-gateway
+    IF EXIST %DIR%\..\wso2\components\device-key-manager @RD /S /Q %DIR%\..\wso2\components\device-key-manager
+    IF EXIST %DIR%\..\wso2\components\device-manager @RD /S /Q %DIR%\..\wso2\components\device-manager
+    IF EXIST %DIR%\..\samples @RD /S /Q %DIR%\..\samples
+    IF EXIST %DIR%\..\plugins @RD /S /Q %DIR%\..\plugins
+    IF EXIST %DIR%\profile-creator.sh del %DIR%\profile-creator.sh
+    IF EXIST %DIR%\profile-creator.bat del %DIR%\profile-creator.bat
+    for /R %DIR%\..\repository\resources\profiles\backend %%f in (*.sh) do copy %%f %DIR%\..\bin\
+    copy /y %DIR%\..\repository\resources\profiles\backend\carbon.xml %DIR%\..\conf\
+    IF EXIST %DIR%\..\repository\deployment\server\synapse-configs\default\api @RD /S /Q %DIR%\..\repository\deployment\server\synapse-configs\default\api\*
+    IF EXIST %DIR%\..\repository\deployment\server\synapse-configs\default\sequences @RD /S /Q %DIR%\..\repository\deployment\server\synapse-configs\default\sequences\_*.xml
+    IF EXIST %DIR%\..\repository\deployment\server\jaggeryapps del %DIR%\..\repository\deployment\server\jaggeryapps\*
+    IF EXIST %DIR$%\..\repository\deployment\server\webapps\oauth2.war del %DIR$%\..\repository\deployment\server\webapps\oauth2.war
+    IF EXIST %DIR$%\..\repository\deployment\server\webapps\shindig.war del %DIR$%\..\repository\deployment\server\webapps\shindig.war
+    IF EXIST %DIR$%\..\repository\deployment\server\webapps\api#am#publisher#v0.11.war del %DIR$%\..\repository\deployment\server\webapps\api#am#publisher#v0.11.war
+    IF EXIST %DIR$%\..\repository\deployment\server\webapps\api#am#store#v0.11.war del %DIR$%\..\repository\deployment\server\webapps\api#am#store#v0.11.war
+    IF EXIST %DIR$%\..\repository\deployment\server\webapps\api#appm#oauth#v1.0.war del %DIR$%\..\repository\deployment\server\webapps\api#appm#oauth#v1.0.war
+    IF EXIST %DIR$%\..\repository\deployment\server\webapps\api#appm#publisher#v1.1.war del %DIR$%\..\repository\deployment\server\webapps\api#appm#publisher#v1.1.war
+    IF EXIST %DIR$%\..\repository\deployment\server\webapps\api#appm#store#v1.1.war del %DIR$%\..\repository\deployment\server\webapps\api#appm#store#v1.1.war
+    IF EXIST %DIR$%\..\repository\deployment\server\webapps\dynamic-client-web.war del %DIR$%\..\repository\deployment\server\webapps\dynamic-client-web.war
+    IF EXIST %DIR$%\..\repository\deployment\server\webapps\client-registration#v0.11.war del %DIR$%\..\repository\deployment\server\webapps\client-registration#v0.11.war
+    IF EXIST %DIR%\..\repository\deployment\server\carbonapps del %DIR%\..\repository\deployment\server\carbonapps\*
+    IF EXIST %DIR%\..\repository\deployment\server\axis2services @RD /S /Q %DIR%\..\repository\deployment\server\axis2services\*
+    IF EXIST %DIR%\..\repository\deployment\server\devicetypes @RD /S /Q %DIR%\..\repository\deployment\server\devicetypes\*
+    IF EXIST %DIR%\..\conf\identity\sso-idp-config.xml del %DIR%\..\conf\identity\sso-idp-config.xml
+    echo Backend profile created successfully.
+	goto Exit
+
+
+:Analytics
+    echo Preparing the Analytics profile.
+    set DEFAULT_BUNDLES=%DIR%..\wso2\components\analytics-default\configuration\org.eclipse.equinox.simpleconfigurator\bundles.info
+    call :Remove_IoT
+    call :Remove_BROKER
+    call :Remove_JARS
+    echo Analytics profile created successfully.
+    goto Exit
+
+:Broker
+    echo Preparing the Broker profile.
+    set DEFAULT_BUNDLES=%DIR%..\wso2\components\broker-default\configuration\org.eclipse.equinox.simpleconfigurator\bundles.info
+    call :Remove_IOT
+    call :Remove_ANALYTICS
+    call :Remove_JARS
+    echo Broker profile created successfully.
+    goto Exit
+
+
+
+:Remove_BROKER
+    echo Removing Broker profile
+    IF EXIST %DIR%\..\wso2\broker @RD /S /Q %DIR%\..\wso2\broker
+    IF EXIST %DIR%\..\wso2\components\broker-default @RD /S /Q %DIR%\..\wso2\components\broker-default
+    IF EXIST %DIR%\broker.bat del %DIR%\broker.bat
+    IF EXIST %DIR%\broker.sh del %DIR%\broker.sh
+    goto :eof
+
+:Remove_ANALYTICS
+    echo Removing Analytics profile
+    IF EXIST %DIR%\..\wso2\analytics @RD /S /Q %DIR%\..\wso2\analytics
+    IF EXIST %DIR%\..\wso2\components\analytics-default @RD /S /Q %DIR%\..\wso2\components\analytics-default
+    IF EXIST %DIR%\..\wso2\components\analytics-worker @RD /S /Q %DIR%\..\wso2\components\analytics-worker
+    IF EXIST %DIR%\analytics.bat del %DIR%\analytics.bat
+    IF EXIST %DIR%\analytics.sh del %DIR%\analytics.sh
+    goto :eof
+
+:Remove_IoT
+    echo Removing Integrator profile
+    IF EXIST %DIR%\..\conf @RD /S /Q %DIR%\..\conf
+    IF EXIST %DIR%\..\wso2\components\default @RD /S /Q %DIR%\..\wso2\components\default
+    IF EXIST %DIR%\..\wso2\components\device-manager @RD /S /Q %DIR%\..\wso2\components\device-manager
+    IF EXIST %DIR%\..\wso2\components\device-key-manager @RD /S /Q %DIR%\..\wso2\components\device-key-manager
+    IF EXIST %DIR%\..\wso2\components\device-backend @RD /S /Q %DIR%\..\wso2\components\device-backend
+    IF EXIST %DIR%\..\wso2\components\http-gateway @RD /S /Q %DIR%\..\wso2\components\http-gateway
+    IF EXIST %DIR%\..\samples @RD /S /Q %DIR% %DIR%\..\samples
+    IF EXIST %DIR%\..\modules @RD /S /Q %DIR% %DIR%\..\modules
+    IF EXIST %DIR%\..\dbscripts @RD /S /Q %DIR% %DIR%\..\dbscripts
+    IF EXIST %DIR%\..\plugins @RD /S /Q %DIR% %DIR%\..\plugins
+    IF EXIST %DIR%\..\repository @RD /S /Q %DIR% %DIR%\..\repository
+    IF EXIST %DIR%\..\tmp @RD /S /Q %DIR% %DIR%\..\tmp
+    IF EXIST %DIR%\..\resources @RD /S /Q %DIR% %DIR%\..\resources
+    IF EXIST %DIR%\profile-creator.bat del %DIR%\profile-creator.bat
+    IF EXIST %DIR%\profile-creator.sh del %DIR%\profile-creator.sh
+    IF EXIST %DIR%\iot-server.bat del %DIR%\iot-server.bat
+    IF EXIST %DIR%\iot-server.sh del %DIR%\iot-server.sh
+    goto :eof
+
+:Remove_JARS
+    echo Removing unnecessary jars
+    mkdir %DIR%\..\wso2\components\tmp_plugins
+
+    FOR /F "tokens=1,2* delims=, " %%i in (%DEFAULT_BUNDLES%) do copy %DIR%\..\wso2\components\plugins\%%i_%%j.jar %DIR%\..\wso2\components\tmp_plugins
+
+    @RD /S /Q %DIR%\..\wso2\components\plugins
+    rename %DIR%\..\wso2\components\tmp_plugins plugins
+    goto :eof
+
+
+:Exit
+    pause


Better bat script

Better bat script

--- tests/integration/browser_tests.bat
+++ tests/integration/browser_tests.bat
@@ -1,13 +1,15 @@
 @echo off
-REM FOR %%dir IN (jasmine_custom jasmine_requirejs jasmine_simple qunit_simple) DO ECHO %%dir
+node testem.js ci -l
 for /f %%a in ('dir /ad /b examples') do call :testem %%a

 exit /b

 rem test'em for one example
 :testem
-echo "Testing %1..."
+echo Testing %1...
 cd examples\%1
-node ..\..\testem.js ci
+node ..\..\testem.js ci > out.tap
+type out.tap | findstr /R /C:"# tests [0-9]*" /C:"# pass  [0-9]*"
+del out.tap
 cd ..\..
 exit /b


spaces -> tabs

spaces -> tabs

--- setup/pyd_set_env_vars.bat
+++ setup/pyd_set_env_vars.bat
@@ -1,10 +1,10 @@
 @echo off

 if "%~1"=="" (
-        echo python interpreter not specified, using ""python""
-        set PYD_PYTHON=python
+	echo python interpreter not specified, using ""python""
+	set PYD_PYTHON=python
 ) else (
-        set PYD_PYTHON=%~1
+	set PYD_PYTHON=%~1
 )

 "%PYD_PYTHON%" "%~dp0\pyd_get_env_set_text.py" > tmp_pyd_env_set.bat


Added quotes to external command calls

Added quotes to external command calls

The quotes are needed if the username has spaces, which can be common on
Windows environment.

--- spf13-vim-windows-install.cmd
+++ spf13-vim-windows-install.cmd
@@ -2,12 +2,12 @@
 @if not exist "%HOME%" @set HOME=%USERPROFILE%

 @set BASE_DIR=%HOME%\.spf13-vim-3
-call git clone --recursive -b 3.0 git://github.com/spf13/spf13-vim.git %BASE_DIR%
-call mkdir %BASE_DIR%\.vim\bundle
-call mklink /J %HOME%\.vim %BASE_DIR%\.vim
-call mklink %HOME%\.vimrc %BASE_DIR%\.vimrc
-call mklink %HOME%\_vimrc %BASE_DIR%\.vimrc
-call mklink %HOME%\.vimrc.bundles %BASE_DIR%\.vimrc.bundles
+call git clone --recursive -b 3.0 git://github.com/spf13/spf13-vim.git "%BASE_DIR%"
+call mkdir "%BASE_DIR%\.vim\bundle"
+call mklink /J "%HOME%\.vim" "%BASE_DIR%\.vim"
+call mklink "%HOME%\.vimrc" "%BASE_DIR%\.vimrc"
+call mklink "%HOME%\_vimrc" "%BASE_DIR%\.vimrc"
+call mklink "%HOME%\.vimrc.bundles" "%BASE_DIR%\.vimrc.bundles"

-call git clone http://github.com/gmarik/vundle.git %HOME%/.vim/bundle/vundle
+call git clone http://github.com/gmarik/vundle.git "%HOME%/.vim/bundle/vundle"
 call vim -u "$BASE_DIR/.vimrc.bundles" - +BundleInstall! +BundleClean +qall


The test names ending in -1, -2 etc magically started generating spaces after condor_imake processed them so thi it the first trial move.

error: pathspec 'src/condor_tests/job_dagman_splice-A.cmd' did not match any file(s) known to git

--- src/condor_tests/job_dagman_splice-A.cmd
+++ src/condor_tests/job_dagman_splice-A.cmd
@@ -0,0 +1,8 @@
+executable   = /bin/echo
+arguments    = OK
+universe     = vanilla
+output       = $(job).out
+error        = $(job).err
+log          = submit.log
+Notification = NEVER
+queue


point to settings

point to settings

--- hierarchy.bat
+++ hierarchy.bat
@@ -1,6 +1,6 @@
 set PYTHONPATH=.
-pypy MoDevETL\hierarchy.py --settings=public-hierarchy-settings.json
-pypy MoDevETL\hierarchy.py --settings=private-hierarchy-settings.json
-pypy MoDevETL\replicate_dependencies.py --settings=public_replicate_dependencies_settings.json
+pypy MoDevETL\hierarchy.py --settings=resources\settings\prod\hierarchy-private.json
+pypy MoDevETL\hierarchy.py --settings=resources\settings\prod\hierarchy-public.json
+rem pypy MoDevETL\replicate_dependencies.py --settings=resources\settings\replicate_dependencies_settings.json


Initial commit

Initial commit

--- commit.bat
+++ commit.bat
@@ -1,5 +1,5 @@
-echo %path%
+@rem commit.bat
 git add --all
 git commit -m "Initial commit"
 git push -u origin master
-pause+pause


Use copy for configuration file copy

Use copy for configuration file copy

--- Bin/DarunGrim3/CopySrc.bat
+++ Bin/DarunGrim3/CopySrc.bat
@@ -8,4 +8,4 @@
 xcopy /D /S /I /Y "..\..\Src\Diff Inspector\*.py" Src\
 xcopy /D /S /I /Y "..\..\Src\Bin Collector\Bin\*.pyd" Src\
 xcopy /D /S /I /Y SetupDist.py Src\
-xcopy /D /S /I /Y ..\..\Src\UI\Web\DarunGrim3Sample01.cfg Src\DarunGrim3.cfg
+copy ..\..\Src\UI\Web\DarunGrim3Sample01.cfg Src\DarunGrim3.cfg


added autoupload bat file

added autoupload bat file

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

--- git-upload.bat
+++ git-upload.bat
@@ -0,0 +1,4 @@
+@echo off
+cd C:\Users\einand\Dropbox\project\eclipse\tregmine-plugins\tregmine
+"c:\Program Files (x86)\Git\bin\git.exe" push
+pause


Delete create.bat

Delete create.bat

--- create.bat
+++ create.bat
@@ -1,33 +0,0 @@
-@echo off
-
-if "" == "%1" goto errorCreate
-
-if "" == "%2" goto errorCreate
-
-if "" == "%3" set PORTLET_FRAMEWORK=mvc
-if not "" == "%3" set PORTLET_FRAMEWORK=%3
-
-call ant -Dportlet.name=%1 -Dportlet.display.name=%2 -Dportlet.framework=%PORTLET_FRAMEWORK% create
-
-rem call ant deploy
-
-goto end
-
-:errorCreate
-	echo.
-	echo Usage: create.bat hello-world "Hello World"
-	echo.
-	echo The first hello-world is your portlet id. A new directory will be created based
-	echo on the portlet id.
-	echo.
-	echo The second "Hello World" is the portlet's display name. The quotation marks are
-	echo only needed because there is a space in the display name.
-	echo.
-	echo A third value can be passed to specify the portlet framework to use. Valid
-	echo values are "jsf", "icefaces", "liferay_faces_alloy", "mvc", "primefaces",
-	echo "richfaces", or "vaadin". The default value is "mvc". The quotation marks are
-	echo not needed.
-
-	goto end
-
-:end


Fixing bug in VSO nuget script (#153)

Fixing bug in VSO nuget script (#153)

--- Utilities/VSOBuildScripts/postBuildScript.cmd
+++ Utilities/VSOBuildScripts/postBuildScript.cmd
@@ -146,8 +146,8 @@
 robocopy /NJS /NJH /MT:16 /S /NP %WINSDK_OUTPUT_SRC% %WINSDK_OUTPUT_DEST%
 \\scratch2\scratch\jasonsa\tools\nuget pack %TFS_DropLocation%\Nuget\Microsoft.Xbox.Live.SDK.WinRT.UWP.nuspec -BasePath %TFS_DropLocation% -OutputDirectory %TFS_DropLocation% -Verbosity normal -version %NUGET_VERSION_NUMBER%
 \\scratch2\scratch\jasonsa\tools\nuget pack %TFS_DropLocation%\Nuget\Microsoft.Xbox.Live.SDK.WinRT.UWP.Native.Debug.nuspec -BasePath %TFS_DropLocation% -OutputDirectory %TFS_DropLocation% -Verbosity normal -version %NUGET_VERSION_NUMBER%
-\\scratch2\scratch\jasonsa\tools\nuget pack %TFS_DropLocation%\Nuget\Microsoft.Xbox.Live.SDK.WinRT.UWP.Netcore.Release.nuspec -BasePath %TFS_DropLocation% -OutputDirectory %TFS_DropLocation% -Verbosity normal -version %NUGET_VERSION_NUMBER%
-\\scratch2\scratch\jasonsa\tools\nuget pack %TFS_DropLocation%\Nuget\Microsoft.Xbox.Live.SDK.WinRT.UWP.Native.Debug.nuspec -BasePath %TFS_DropLocation% -OutputDirectory %TFS_DropLocation% -Verbosity normal -version %NUGET_VERSION_NUMBER%
+\\scratch2\scratch\jasonsa\tools\nuget pack %TFS_DropLocation%\Nuget\Microsoft.Xbox.Live.SDK.WinRT.UWP.Native.Release.nuspec -BasePath %TFS_DropLocation% -OutputDirectory %TFS_DropLocation% -Verbosity normal -version %NUGET_VERSION_NUMBER%
+\\scratch2\scratch\jasonsa\tools\nuget pack %TFS_DropLocation%\Nuget\Microsoft.Xbox.Live.SDK.WinRT.UWP.Netcore.Debug.nuspec -BasePath %TFS_DropLocation% -OutputDirectory %TFS_DropLocation% -Verbosity normal -version %NUGET_VERSION_NUMBER%
 \\scratch2\scratch\jasonsa\tools\nuget pack %TFS_DropLocation%\Nuget\Microsoft.Xbox.Live.SDK.WinRT.UWP.Netcore.Release.nuspec -BasePath %TFS_DropLocation% -OutputDirectory %TFS_DropLocation% -Verbosity normal -version %NUGET_VERSION_NUMBER%

 rmdir /s /q %WINSDK_OUTPUT_DEST%


testing multi arch Docker image

testing multi arch Docker image

--- go-quotes/build-multi-arch-docker-image.bat
+++ go-quotes/build-multi-arch-docker-image.bat
@@ -93,8 +93,8 @@
    - linux/amd64
    - windows/amd64:10.0.14393.1944

-docker run -d -p 8080:8080 --name quotes magnuslarsson/quotes:24-go
-
+Docker for Mac
+==============

 docker run -d -p 8080:8080 --name quotes magnuslarsson/quotes:24-go
 Unable to find image 'magnuslarsson/quotes:24-go' locally
@@ -107,4 +107,31 @@
 curl localhost:8080/api/quote
 {"hardwareArchitecture":"amd64","operatingSystem":"linux","ipAddress":"655a29c9fd09/172.17.0.2","quote":"In Go, the code does exactly what it says on the page.","language":"EN"}

-   +Docker for Windows - Windows Containers
+=======================================
+
+>docker run -d -p 8080:8080 --name quotes magnuslarsson/quotes:24-go
+Unable to find image 'magnuslarsson/quotes:24-go' locally
+24-go: Pulling from magnuslarsson/quotes
+Digest: sha256:7f05a93194d9e790ce2d4bce6576abe32e0ce560844476bf2373163af18d0d4a
+Status: Downloaded newer image for magnuslarsson/quotes:24-go
+6271c339b5a8d847eb3f4cfb55006900f81ae161b8654ee28e6971db883773c2
+
+~$ curl 192.168.1.224:8080/api/quote
+{"hardwareArchitecture":"amd64","operatingSystem":"windows","ipAddress":"6271c339b5a8/fe80::c8b:838f:ab07:6790%Ethernet172.24.237.142","quote":"In Go, the code does exactly what it says on the page.","language":"EN"}
+
+
+
+Docker for Windows - Linux Containers
+=====================================
+
+docker run -d -p 8080:8080 --name quotes magnuslarsson/quotes:24-go
+Unable to find image 'magnuslarsson/quotes:24-go' locally
+24-go: Pulling from magnuslarsson/quotes
+Digest: sha256:7f05a93194d9e790ce2d4bce6576abe32e0ce560844476bf2373163af18d0d4a
+Status: Downloaded newer image for magnuslarsson/quotes:24-go
+0fe5514a7d70e04581bf37e31109a779ddbd3623a91ba801a0a8f018242da31e
+
+$ curl localhost:8080/api/quote
+{"hardwareArchitecture":"amd64","operatingSystem":"linux","ipAddress":"0fe5514a7d70/172.17.0.2","quote":"I like a lot of the design decisions they made in the [Go] language. Basically, I like all of them.","language":"EN"}
+


Build Master:2017-03-03T21:37:58.659Z

Build Master:2017-03-03T21:37:58.659Z

--- deploy.cmd
+++ deploy.cmd
@@ -124,8 +124,9 @@
 :: Cleanup
 :: ----------
 echo."Removing %DEPLOYMENT_TARGET%\%DEPLOY_DIST_FOLDER%"
-del /f/s/q "%DEPLOYMENT_TARGET%\%DEPLOY_DIST_FOLDER%" > nul
-rmdir /s/q "%DEPLOYMENT_TARGET%\%DEPLOY_DIST_FOLDER%"
+del /f/s/q "%DEPLOYMENT_SOURCE%\%DEPLOY_DIST_FOLDER%" > nul
+rmdir /s/q "%DEPLOYMENT_SOURCE%\%DEPLOY_DIST_FOLDER%"
+IF !ERRORLEVEL! NEQ 0 goto error

 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 goto end


Remove site/default update script to deployment file.

--- deploy.cmd
+++ deploy.cmd
@@ -94,11 +94,11 @@
   IF !ERRORLEVEL! NEQ 0 goto error
 )

-if EXIST %HOME%\site\wwwroot\sites\default\.git (
-   pushd %HOME%\site\wwwroot\sites\default
-   git pull
-   popd
-)
+:: if EXIST %HOME%\site\wwwroot\sites\default\.git (
+::   pushd %HOME%\site\wwwroot\sites\default
+::   git pull
+::   popd
+::)

 :: 2. Select node version
 call :SelectNodeVersion


Try path relative to deployment target

Try path relative to deployment target

--- deploy.cmd
+++ deploy.cmd
@@ -109,7 +109,7 @@
 IF EXIST "%DEPLOYMENT_TARGET%\bower.json" (
   pushd "%DEPLOYMENT_TARGET%"
   call :ExecuteCmd !NPM_CMD! install bower
-  call :ExecuteCmd .\node_modules\bin\bower install
+  call :ExecuteCmd %DEPLOYMENT_TARGET%\node_modules\bin\bower install
   IF !ERRORLEVEL! NEQ 0 goto error
   popd
 )


Using global Yarn for deploy

Using global Yarn for deploy

--- deploy.cmd
+++ deploy.cmd
@@ -86,8 +86,10 @@
 :: 1. Build Webapp
 :: .a Install Yarn
 echo Prepare environment to build WebApp
-call :ExecuteCmd %NPM_CMD% install yarn --no-save
+call :ExecuteCmd %NPM_CMD% install -g yarn
 SET YARN_PATH=%DEPLOYMENT_SOURCE%\node_modules\.bin\yarn
+IF !ERRORLEVEL! NEQ 0 goto step1b
+:step1b
 :: .b Enter app dir
 pushd %DEPLOYMENT_SOURCE%\app
 :: .c Install Dependencies


edit deploycmd

edit deploycmd

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

 :: 2. Install npm packages
 IF EXIST "%DEPLOYMENT_TARGET%\package.json" (
-  ::  pushd "%DEPLOYMENT_TARGET%"
+  pushd "%DEPLOYMENT_TARGET%"
   call :ExecuteCmd !NPM_CMD! install
   IF !ERRORLEVEL! NEQ 0 goto error
-  :: popd
+  popd
 )

 :: 3. Execute Gulp


update plugins for es 1.5.0

update plugins for es 1.5.0

--- esidist_plugininstall.bat
+++ esidist_plugininstall.bat
@@ -3,6 +3,6 @@
 rem Licensed under the Apache License, Version 2.0

 rem Configure the plugins you want to install
-call esi_plugin.bat -i  elasticsearch/elasticsearch-analysis-phonetic/2.3.0
-call esi_plugin.bat -i  elasticsearch/elasticsearch-mapper-attachments/2.3.0
+call esi_plugin.bat -i  elasticsearch/elasticsearch-analysis-phonetic/2.5.0
+call esi_plugin.bat -i  elasticsearch/elasticsearch-mapper-attachments/2.5.0
 rem call esi_plugin.bat -url http://bit.ly/19RBF3b -install langdetect


Whitespaces where? Try changing line endings explicitly.

--- docs/make.bat
+++ docs/make.bat
@@ -1,263 +1,263 @@
-@ECHO OFF
-
-REM Command file for Sphinx documentation
-
-if "%SPHINXBUILD%" == "" (
-	set SPHINXBUILD=sphinx-build
-)
-set BUILDDIR=_build
-set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS% .
-set I18NSPHINXOPTS=%SPHINXOPTS% .
-if NOT "%PAPER%" == "" (
-	set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS%
-	set I18NSPHINXOPTS=-D latex_paper_size=%PAPER% %I18NSPHINXOPTS%
-)
-
-if "%1" == "" goto help
-
-if "%1" == "help" (
-	:help
-	echo.Please use `make ^<target^>` where ^<target^> is one of
-	echo.  html       to make standalone HTML files
-	echo.  dirhtml    to make HTML files named index.html in directories
-	echo.  singlehtml to make a single large HTML file
-	echo.  pickle     to make pickle files
-	echo.  json       to make JSON files
-	echo.  htmlhelp   to make HTML files and a HTML help project
-	echo.  qthelp     to make HTML files and a qthelp project
-	echo.  devhelp    to make HTML files and a Devhelp project
-	echo.  epub       to make an epub
-	echo.  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter
-	echo.  text       to make text files
-	echo.  man        to make manual pages
-	echo.  texinfo    to make Texinfo files
-	echo.  gettext    to make PO message catalogs
-	echo.  changes    to make an overview over all changed/added/deprecated items
-	echo.  xml        to make Docutils-native XML files
-	echo.  pseudoxml  to make pseudoxml-XML files for display purposes
-	echo.  linkcheck  to check all external links for integrity
-	echo.  doctest    to run all doctests embedded in the documentation if enabled
-	echo.  coverage   to run coverage check of the documentation if enabled
-	goto end
-)
-
-if "%1" == "clean" (
-	for /d %%i in (%BUILDDIR%\*) do rmdir /q /s %%i
-	del /q /s %BUILDDIR%\*
-	goto end
-)
-
-
-REM Check if sphinx-build is available and fallback to Python version if any
-%SPHINXBUILD% 2> nul
-if errorlevel 9009 goto sphinx_python
-goto sphinx_ok
-
-:sphinx_python
-
-set SPHINXBUILD=python -m sphinx.__init__
-%SPHINXBUILD% 2> nul
-if errorlevel 9009 (
-	echo.
-	echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
-	echo.installed, then set the SPHINXBUILD environment variable to point
-	echo.to the full path of the 'sphinx-build' executable. Alternatively you
-	echo.may add the Sphinx directory to PATH.
-	echo.
-	echo.If you don't have Sphinx installed, grab it from
-	echo.http://sphinx-doc.org/
-	exit /b 1
-)
-
-:sphinx_ok
-
-
-if "%1" == "html" (
-	%SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The HTML pages are in %BUILDDIR%/html.
-	goto end
-)
-
-if "%1" == "dirhtml" (
-	%SPHINXBUILD% -b dirhtml %ALLSPHINXOPTS% %BUILDDIR%/dirhtml
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The HTML pages are in %BUILDDIR%/dirhtml.
-	goto end
-)
-
-if "%1" == "singlehtml" (
-	%SPHINXBUILD% -b singlehtml %ALLSPHINXOPTS% %BUILDDIR%/singlehtml
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The HTML pages are in %BUILDDIR%/singlehtml.
-	goto end
-)
-
-if "%1" == "pickle" (
-	%SPHINXBUILD% -b pickle %ALLSPHINXOPTS% %BUILDDIR%/pickle
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished; now you can process the pickle files.
-	goto end
-)
-
-if "%1" == "json" (
-	%SPHINXBUILD% -b json %ALLSPHINXOPTS% %BUILDDIR%/json
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished; now you can process the JSON files.
-	goto end
-)
-
-if "%1" == "htmlhelp" (
-	%SPHINXBUILD% -b htmlhelp %ALLSPHINXOPTS% %BUILDDIR%/htmlhelp
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished; now you can run HTML Help Workshop with the ^
-.hhp project file in %BUILDDIR%/htmlhelp.
-	goto end
-)
-
-if "%1" == "qthelp" (
-	%SPHINXBUILD% -b qthelp %ALLSPHINXOPTS% %BUILDDIR%/qthelp
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished; now you can run "qcollectiongenerator" with the ^
-.qhcp project file in %BUILDDIR%/qthelp, like this:
-	echo.^> qcollectiongenerator %BUILDDIR%\qthelp\AldrynSearch.qhcp
-	echo.To view the help file:
-	echo.^> assistant -collectionFile %BUILDDIR%\qthelp\AldrynSearch.ghc
-	goto end
-)
-
-if "%1" == "devhelp" (
-	%SPHINXBUILD% -b devhelp %ALLSPHINXOPTS% %BUILDDIR%/devhelp
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished.
-	goto end
-)
-
-if "%1" == "epub" (
-	%SPHINXBUILD% -b epub %ALLSPHINXOPTS% %BUILDDIR%/epub
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The epub file is in %BUILDDIR%/epub.
-	goto end
-)
-
-if "%1" == "latex" (
-	%SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished; the LaTeX files are in %BUILDDIR%/latex.
-	goto end
-)
-
-if "%1" == "latexpdf" (
-	%SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
-	cd %BUILDDIR%/latex
-	make all-pdf
-	cd %~dp0
-	echo.
-	echo.Build finished; the PDF files are in %BUILDDIR%/latex.
-	goto end
-)
-
-if "%1" == "latexpdfja" (
-	%SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
-	cd %BUILDDIR%/latex
-	make all-pdf-ja
-	cd %~dp0
-	echo.
-	echo.Build finished; the PDF files are in %BUILDDIR%/latex.
-	goto end
-)
-
-if "%1" == "text" (
-	%SPHINXBUILD% -b text %ALLSPHINXOPTS% %BUILDDIR%/text
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The text files are in %BUILDDIR%/text.
-	goto end
-)
-
-if "%1" == "man" (
-	%SPHINXBUILD% -b man %ALLSPHINXOPTS% %BUILDDIR%/man
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The manual pages are in %BUILDDIR%/man.
-	goto end
-)
-
-if "%1" == "texinfo" (
-	%SPHINXBUILD% -b texinfo %ALLSPHINXOPTS% %BUILDDIR%/texinfo
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The Texinfo files are in %BUILDDIR%/texinfo.
-	goto end
-)
-
-if "%1" == "gettext" (
-	%SPHINXBUILD% -b gettext %I18NSPHINXOPTS% %BUILDDIR%/locale
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The message catalogs are in %BUILDDIR%/locale.
-	goto end
-)
-
-if "%1" == "changes" (
-	%SPHINXBUILD% -b changes %ALLSPHINXOPTS% %BUILDDIR%/changes
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.The overview file is in %BUILDDIR%/changes.
-	goto end
-)
-
-if "%1" == "linkcheck" (
-	%SPHINXBUILD% -b linkcheck %ALLSPHINXOPTS% %BUILDDIR%/linkcheck
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Link check complete; look for any errors in the above output ^
-or in %BUILDDIR%/linkcheck/output.txt.
-	goto end
-)
-
-if "%1" == "doctest" (
-	%SPHINXBUILD% -b doctest %ALLSPHINXOPTS% %BUILDDIR%/doctest
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Testing of doctests in the sources finished, look at the ^
-results in %BUILDDIR%/doctest/output.txt.
-	goto end
-)
-
-if "%1" == "coverage" (
-	%SPHINXBUILD% -b coverage %ALLSPHINXOPTS% %BUILDDIR%/coverage
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Testing of coverage in the sources finished, look at the ^
-results in %BUILDDIR%/coverage/python.txt.
-	goto end
-)
-
-if "%1" == "xml" (
-	%SPHINXBUILD% -b xml %ALLSPHINXOPTS% %BUILDDIR%/xml
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The XML files are in %BUILDDIR%/xml.
-	goto end
-)
-
-if "%1" == "pseudoxml" (
-	%SPHINXBUILD% -b pseudoxml %ALLSPHINXOPTS% %BUILDDIR%/pseudoxml
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The pseudo-XML files are in %BUILDDIR%/pseudoxml.
-	goto end
-)
-
-:end
+@ECHO OFF
+
+REM Command file for Sphinx documentation
+
+if "%SPHINXBUILD%" == "" (
+	set SPHINXBUILD=sphinx-build
+)
+set BUILDDIR=_build
+set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS% .
+set I18NSPHINXOPTS=%SPHINXOPTS% .
+if NOT "%PAPER%" == "" (
+	set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS%
+	set I18NSPHINXOPTS=-D latex_paper_size=%PAPER% %I18NSPHINXOPTS%
+)
+
+if "%1" == "" goto help
+
+if "%1" == "help" (
+	:help
+	echo.Please use `make ^<target^>` where ^<target^> is one of
+	echo.  html       to make standalone HTML files
+	echo.  dirhtml    to make HTML files named index.html in directories
+	echo.  singlehtml to make a single large HTML file
+	echo.  pickle     to make pickle files
+	echo.  json       to make JSON files
+	echo.  htmlhelp   to make HTML files and a HTML help project
+	echo.  qthelp     to make HTML files and a qthelp project
+	echo.  devhelp    to make HTML files and a Devhelp project
+	echo.  epub       to make an epub
+	echo.  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter
+	echo.  text       to make text files
+	echo.  man        to make manual pages
+	echo.  texinfo    to make Texinfo files
+	echo.  gettext    to make PO message catalogs
+	echo.  changes    to make an overview over all changed/added/deprecated items
+	echo.  xml        to make Docutils-native XML files
+	echo.  pseudoxml  to make pseudoxml-XML files for display purposes
+	echo.  linkcheck  to check all external links for integrity
+	echo.  doctest    to run all doctests embedded in the documentation if enabled
+	echo.  coverage   to run coverage check of the documentation if enabled
+	goto end
+)
+
+if "%1" == "clean" (
+	for /d %%i in (%BUILDDIR%\*) do rmdir /q /s %%i
+	del /q /s %BUILDDIR%\*
+	goto end
+)
+
+
+REM Check if sphinx-build is available and fallback to Python version if any
+%SPHINXBUILD% 2> nul
+if errorlevel 9009 goto sphinx_python
+goto sphinx_ok
+
+:sphinx_python
+
+set SPHINXBUILD=python -m sphinx.__init__
+%SPHINXBUILD% 2> nul
+if errorlevel 9009 (
+	echo.
+	echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
+	echo.installed, then set the SPHINXBUILD environment variable to point
+	echo.to the full path of the 'sphinx-build' executable. Alternatively you
+	echo.may add the Sphinx directory to PATH.
+	echo.
+	echo.If you don't have Sphinx installed, grab it from
+	echo.http://sphinx-doc.org/
+	exit /b 1
+)
+
+:sphinx_ok
+
+
+if "%1" == "html" (
+	%SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The HTML pages are in %BUILDDIR%/html.
+	goto end
+)
+
+if "%1" == "dirhtml" (
+	%SPHINXBUILD% -b dirhtml %ALLSPHINXOPTS% %BUILDDIR%/dirhtml
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The HTML pages are in %BUILDDIR%/dirhtml.
+	goto end
+)
+
+if "%1" == "singlehtml" (
+	%SPHINXBUILD% -b singlehtml %ALLSPHINXOPTS% %BUILDDIR%/singlehtml
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The HTML pages are in %BUILDDIR%/singlehtml.
+	goto end
+)
+
+if "%1" == "pickle" (
+	%SPHINXBUILD% -b pickle %ALLSPHINXOPTS% %BUILDDIR%/pickle
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished; now you can process the pickle files.
+	goto end
+)
+
+if "%1" == "json" (
+	%SPHINXBUILD% -b json %ALLSPHINXOPTS% %BUILDDIR%/json
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished; now you can process the JSON files.
+	goto end
+)
+
+if "%1" == "htmlhelp" (
+	%SPHINXBUILD% -b htmlhelp %ALLSPHINXOPTS% %BUILDDIR%/htmlhelp
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished; now you can run HTML Help Workshop with the ^
+.hhp project file in %BUILDDIR%/htmlhelp.
+	goto end
+)
+
+if "%1" == "qthelp" (
+	%SPHINXBUILD% -b qthelp %ALLSPHINXOPTS% %BUILDDIR%/qthelp
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished; now you can run "qcollectiongenerator" with the ^
+.qhcp project file in %BUILDDIR%/qthelp, like this:
+	echo.^> qcollectiongenerator %BUILDDIR%\qthelp\AldrynSearch.qhcp
+	echo.To view the help file:
+	echo.^> assistant -collectionFile %BUILDDIR%\qthelp\AldrynSearch.ghc
+	goto end
+)
+
+if "%1" == "devhelp" (
+	%SPHINXBUILD% -b devhelp %ALLSPHINXOPTS% %BUILDDIR%/devhelp
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished.
+	goto end
+)
+
+if "%1" == "epub" (
+	%SPHINXBUILD% -b epub %ALLSPHINXOPTS% %BUILDDIR%/epub
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The epub file is in %BUILDDIR%/epub.
+	goto end
+)
+
+if "%1" == "latex" (
+	%SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished; the LaTeX files are in %BUILDDIR%/latex.
+	goto end
+)
+
+if "%1" == "latexpdf" (
+	%SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
+	cd %BUILDDIR%/latex
+	make all-pdf
+	cd %~dp0
+	echo.
+	echo.Build finished; the PDF files are in %BUILDDIR%/latex.
+	goto end
+)
+
+if "%1" == "latexpdfja" (
+	%SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
+	cd %BUILDDIR%/latex
+	make all-pdf-ja
+	cd %~dp0
+	echo.
+	echo.Build finished; the PDF files are in %BUILDDIR%/latex.
+	goto end
+)
+
+if "%1" == "text" (
+	%SPHINXBUILD% -b text %ALLSPHINXOPTS% %BUILDDIR%/text
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The text files are in %BUILDDIR%/text.
+	goto end
+)
+
+if "%1" == "man" (
+	%SPHINXBUILD% -b man %ALLSPHINXOPTS% %BUILDDIR%/man
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The manual pages are in %BUILDDIR%/man.
+	goto end
+)
+
+if "%1" == "texinfo" (
+	%SPHINXBUILD% -b texinfo %ALLSPHINXOPTS% %BUILDDIR%/texinfo
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The Texinfo files are in %BUILDDIR%/texinfo.
+	goto end
+)
+
+if "%1" == "gettext" (
+	%SPHINXBUILD% -b gettext %I18NSPHINXOPTS% %BUILDDIR%/locale
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The message catalogs are in %BUILDDIR%/locale.
+	goto end
+)
+
+if "%1" == "changes" (
+	%SPHINXBUILD% -b changes %ALLSPHINXOPTS% %BUILDDIR%/changes
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.The overview file is in %BUILDDIR%/changes.
+	goto end
+)
+
+if "%1" == "linkcheck" (
+	%SPHINXBUILD% -b linkcheck %ALLSPHINXOPTS% %BUILDDIR%/linkcheck
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Link check complete; look for any errors in the above output ^
+or in %BUILDDIR%/linkcheck/output.txt.
+	goto end
+)
+
+if "%1" == "doctest" (
+	%SPHINXBUILD% -b doctest %ALLSPHINXOPTS% %BUILDDIR%/doctest
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Testing of doctests in the sources finished, look at the ^
+results in %BUILDDIR%/doctest/output.txt.
+	goto end
+)
+
+if "%1" == "coverage" (
+	%SPHINXBUILD% -b coverage %ALLSPHINXOPTS% %BUILDDIR%/coverage
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Testing of coverage in the sources finished, look at the ^
+results in %BUILDDIR%/coverage/python.txt.
+	goto end
+)
+
+if "%1" == "xml" (
+	%SPHINXBUILD% -b xml %ALLSPHINXOPTS% %BUILDDIR%/xml
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The XML files are in %BUILDDIR%/xml.
+	goto end
+)
+
+if "%1" == "pseudoxml" (
+	%SPHINXBUILD% -b pseudoxml %ALLSPHINXOPTS% %BUILDDIR%/pseudoxml
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The pseudo-XML files are in %BUILDDIR%/pseudoxml.
+	goto end
+)
+
+:end


add makeLink utility

add makeLink utility

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

--- makeLink.bat
+++ makeLink.bat
@@ -0,0 +1,10 @@
+
+
+REM replace node-opcua-crypto/pki modules with link to sibling modules
+set N=node-opcua-crypto
+rmdir node_modules\%N% /s /q
+mklink /j node_modules\%N% %~dp0..\%N%
+
+set N=node-opcua-pki
+rmdir node_modules\%N% /s /q
+mklink /j node_modules\%N% %~dp0..\%N%


use absolute path to ginkgo

use absolute path to ginkgo

--- ci/scripts/herd-cats-windows32.bat
+++ ci/scripts/herd-cats-windows32.bat
@@ -14,4 +14,4 @@

 cd %CATSPATH%
 SET CONFIG=%CATSPATH%\config.json
-ginkgo -r -v -slowSpecThreshold=300 -skip="admin buildpack"
+%GOPATH%\bin\ginkgo -r -v -slowSpecThreshold=300 -skip="admin buildpack"


Added a batch flle to run the app in windows.

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

--- lib/start.bat
+++ lib/start.bat
@@ -0,0 +1,3 @@
+java -Djava.library.path=./lib -jar Grimoire-Standalone.jar
+
+pause


Build Master:2017-03-03T19:39:21.948Z

Build Master:2017-03-03T19:39:21.948Z

--- deploy.cmd
+++ deploy.cmd
@@ -73,11 +73,17 @@
 )

 ::Initial install if node_modules doesn't exist.
-IF EXIST "%DEPLOYMENT_SOURCE%\package.json" IF NOT EXIST "%DEPLOYMENT_SOURCE%\node_modules" (
-    echo "NPM Install: %DEPLOYMENT_SOURCE%\package.json"
-    pushd "%DEPLOYMENT_SOURCE%"
-    npm install --production --progress=false --cache-min=432000
-    popd
+IF EXIST "%DEPLOYMENT_SOURCE%\package.json" (
+ echo "Main package.json exists."
+    IF NOT EXIST "%DEPLOYMENT_SOURCE%\node_modules" (
+        echo "NPM Install: %DEPLOYMENT_SOURCE%\package.json"
+        pushd "%DEPLOYMENT_SOURCE%"
+        npm install --production --progress=false --cache-min=432000
+        npm install --save json-loader --progress=false --cache-min=432000
+        popd
+    ) ELSE (
+        echo "Main node_modules exists"
+    )
 )

 @echo "Previous Commit: %PREVIOUS_SCM_COMMIT_ID%  Current Commit: %SCM_COMMIT_ID%"


no-op to test deploy

no-op to test deploy

--- deploy.cmd
+++ deploy.cmd
@@ -99,6 +99,7 @@
   popd
 )

+
 call !NODE_EXE! --version
 call !NODE_EXE! node_modules\jake\bin\cli.js prepareTempDirectory
 IF !ERRORLEVEL! NEQ 0 goto error


Correcting gulp task name

Correcting gulp task name

--- deploy.cmd
+++ deploy.cmd
@@ -107,7 +107,7 @@

 IF EXIST "gulpfile.js" (
 	pushd "%DEPLOYMENT_TARGET%"
-	call .\node_modules\.bin\gulp imagemin
+	call .\node_modules\.bin\gulp
 	IF !ERRORLEVEL! NEQ 0 goto error
 		popd
 )


azeae

azeae

--- deploy.cmd
+++ deploy.cmd
@@ -96,6 +96,7 @@
 :: 3. Install npm packages
 echo Install npm packages
 IF EXIST "%DEPLOYMENT_TARGET%\package.json" (
+  echo Found package.json
   pushd "%DEPLOYMENT_TARGET%"
   call !NPM_CMD! install
   IF !ERRORLEVEL! NEQ 0 goto error