diff --git a/build/cmake/pub-bins.bat b/build/cmake/pub-bins.bat index 3a936b2..1c26d7d 100644 --- a/build/cmake/pub-bins.bat +++ b/build/cmake/pub-bins.bat @@ -2,16 +2,12 @@ @set TMPWV=win32 @set TMPSRC=../.. @set TMPNAME=tidy - @set TMPFIL=%TMPSRC%\version.txt @if NOT EXIST %TMPFIL% goto NOFIL @set /p TMPVER=<%TMPFIL% @set DOPAUSE=pause -@echo Version %TMPVER% -if "%1x" == "NOPAUSEx" ( - set DOPAUSE=echo No pause requested... -) +@echo Version %TMPVER% @set TMPBIN=F:\Projects\tidy-bins @set TMPBINS=%TMPBIN%\binaries @@ -22,17 +18,30 @@ if "%1x" == "NOPAUSEx" ( @echo This is a NEW installation in %TMPDD% :GOTDST +@if "%1x" == "NOPAUSEx" ( +@set DOPAUSE=echo No pause requested... +) + +@echo Will publish... +@set TMPCNT=0 @set TMPFIL1=%TMPNAME%-%TMPVER%-%TMPWV%.exe @set TMPFIL2=%TMPNAME%-%TMPVER%-%TMPWV%.msi @set TMPFIL3=%TMPNAME%-%TMPVER%-%TMPWV%.zip -@if NOT EXIST %TMPFIL1% goto NOFIL1 -@if NOT EXIST %TMPFIL2% goto NOFIL2 -@if NOT EXIST %TMPFIL3% goto NOFIL3 -@echo. -@echo Will publish... +@if EXIST %TMPFIL1% ( @echo %TMPFIL1% +@set /A TMPCNT+=1 +) +@if EXIST %TMPFIL2% ( @echo %TMPFIL2% +@set /A TMPCNT+=1 +) +@if EXIST %TMPFIL3% ( @echo %TMPFIL3% +@set /A TMPCNT+=1 +) +@if "%TMPCNT%x" == "0x" goto NOPUB +@echo. +@echo Will publish %TMPCNT% files to %TMPDD% @echo. @echo *** CONTINUE?% @%DOPAUSE% @@ -42,18 +51,25 @@ if "%1x" == "NOPAUSEx" ( @if NOT EXIST %TMPDD%\nul goto NODST ) +@if EXIST %TMPFIL1% ( @set TMPSRC=%TMPFIL1% @set TMPDST=%TMPDD%\%TMPFIL1% @call :CHKCOPY +) + +@if EXIST %TMPFIL2% ( @set TMPSRC=%TMPFIL2% @set TMPDST=%TMPDD%\%TMPFIL2% @call :CHKCOPY +) + +@if EXIST %TMPFIL3% ( @set TMPSRC=%TMPFIL3% @set TMPDST=%TMPDD%\%TMPFIL3% @call :CHKCOPY - +) @echo. -@echo Maybe time to run 'gentidyyml %TMPBIN%' +@echo If done all bins, WIN32, WIN64, linux, ... maybe time to run 'gentidyyml %TMPBIN%' @echo. @goto END @@ -85,26 +101,20 @@ copy %TMPSRC% %TMPDST% @echo. @goto :EOF + + :NODST @echo Error: Unable to create %TMPDD% @goto END +:NOPUB +@echo Appears no files to PUBLISH! :NOFIL1 @echo Can NOT locate %TMPFIL1%! *** FIX ME *** -@goto CHKBB - :NOFIL2 @echo Can NOT locate %TMPFIL2%! *** FIX ME *** -@goto CHKBB - :NOFIL3 @echo Can NOT locate %TMPFIL3%! *** FIX ME *** -@goto CHKBB - -:CHKBB -@echo. -@echo Have you run build-bins.bat? -@echo. @goto END diff --git a/build/win64/pub-bins.bat b/build/win64/pub-bins.bat index c7ae09c..babde5a 100644 --- a/build/win64/pub-bins.bat +++ b/build/win64/pub-bins.bat @@ -1,4 +1,5 @@ @setlocal +@set TMPWV=win64 @set TMPSRC=../.. @set TMPNAME=tidy @set TMPFIL=%TMPSRC%\version.txt @@ -21,17 +22,26 @@ @set DOPAUSE=echo No pause requested... ) -@set TMPFIL1=%TMPNAME%-%TMPVER%-win64.exe -@set TMPFIL2=%TMPNAME%-%TMPVER%-win64.msi -@set TMPFIL3=%TMPNAME%-%TMPVER%-win64.zip -@if NOT EXIST %TMPFIL1% goto NOFIL1 -@if NOT EXIST %TMPFIL2% goto NOFIL2 -@if NOT EXIST %TMPFIL3% goto NOFIL3 -@echo. @echo Will publish... +@set TMPCNT=0 +@set TMPFIL1=%TMPNAME%-%TMPVER%-%TMPWV%.exe +@set TMPFIL2=%TMPNAME%-%TMPVER%-%TMPWV%.msi +@set TMPFIL3=%TMPNAME%-%TMPVER%-%TMPWV%.zip +@if EXIST %TMPFIL1% ( @echo %TMPFIL1% +@set /A TMPCNT+=1 +) +@if EXIST %TMPFIL2% ( @echo %TMPFIL2% +@set /A TMPCNT+=1 +) +@if EXIST %TMPFIL3% ( @echo %TMPFIL3% +@set /A TMPCNT+=1 +) +@if "%TMPCNT%x" == "0x" goto NOPUB +@echo. +@echo Will publish %TMPCNT% files to %TMPDD% @echo. @echo *** CONTINUE?% @%DOPAUSE% @@ -41,18 +51,25 @@ @if NOT EXIST %TMPDD%\nul goto NODST ) +@if EXIST %TMPFIL1% ( @set TMPSRC=%TMPFIL1% @set TMPDST=%TMPDD%\%TMPFIL1% @call :CHKCOPY +) + +@if EXIST %TMPFIL2% ( @set TMPSRC=%TMPFIL2% @set TMPDST=%TMPDD%\%TMPFIL2% @call :CHKCOPY +) + +@if EXIST %TMPFIL3% ( @set TMPSRC=%TMPFIL3% @set TMPDST=%TMPDD%\%TMPFIL3% @call :CHKCOPY - +) @echo. -@echo Maybe time to run 'gentidyyml %TMPBIN%' +@echo If done all bins, WIN32, WIN64, linux, ... maybe time to run 'gentidyyml %TMPBIN%' @echo. @goto END @@ -88,16 +105,14 @@ copy %TMPSRC% %TMPDST% :NODST @echo Error: Unable to create %TMPDD% +@goto END - +:NOPUB +@echo Appears no files to PUBLISH! :NOFIL1 @echo Can NOT locate %TMPFIL1%! *** FIX ME *** -@goto END - :NOFIL2 @echo Can NOT locate %TMPFIL2%! *** FIX ME *** -@goto END - :NOFIL3 @echo Can NOT locate %TMPFIL3%! *** FIX ME *** @goto END diff --git a/verhist.log b/verhist.log index 561bb53..3f8f349 100644 --- a/verhist.log +++ b/verhist.log @@ -1,4 +1,10 @@ -# Version history at 2015/09/06 18:36:46 +# Version history at 2015/10/01 13:45:03 +5.1.14 fa43957b6d Geoff McLane Sun Sep 27 17:38:08 2015 +0200 +5.1.13 7cf9fc2906 Geoff McLane Fri Sep 25 13:00:06 2015 +0200 +5.1.12 f4113a8643 Geoff McLane Mon Sep 21 12:34:29 2015 +0200 +5.1.11 b2118fa09a Geoff McLane Sat Sep 19 14:59:58 2015 +0200 +5.1.10 d541405a2a Geoff McLane Wed Sep 16 13:17:50 2015 +0200 +5.1.9 1c187f8179 Geoff McLane Thu Sep 10 15:02:38 2015 +0200 5.1.8 87e0e11b49 Geoff McLane Fri Sep 4 15:03:08 2015 +0200 5.1.7 fd056e353b Geoff McLane Sat Aug 22 14:04:38 2015 +0200 5.1.6 5380eb0413 Geoff McLane Sat Aug 22 14:00:56 2015 +0200