diff options
| -rw-r--r-- | CHANGES | 7 | ||||
| -rw-r--r-- | PACKAGE/lynx.iss | 9 | ||||
| -rw-r--r-- | PACKAGE/version.iss | 8 | ||||
| -rw-r--r-- | src/HTAlert.c | 6 |
4 files changed, 23 insertions, 7 deletions
diff --git a/CHANGES b/CHANGES index f146d2bc..945cad6c 100644 --- a/CHANGES +++ b/CHANGES @@ -1,9 +1,12 @@ --- $LynxId: CHANGES,v 1.630 2012/11/15 23:53:12 tom Exp $ +-- $LynxId: CHANGES,v 1.631 2012/11/16 10:17:38 tom Exp $ =============================================================================== Changes since Lynx 2.8 release =============================================================================== -2012-11-15 (2.8.8dev.15) +2012-11-16 (2.8.8dev.15) +* modify the Inno Setup files to show lynx's version numbers. Development + and prerelease versions are indicated in the numeric-only versions by + prefixing a "10" or "20" -TD * ask for filesize when downloading via ftp, to use this in the read-progress ETA -TD * fix special case when -dont_wrap_pre option is used, to restore space between diff --git a/PACKAGE/lynx.iss b/PACKAGE/lynx.iss index 583905aa..f764a9a2 100644 --- a/PACKAGE/lynx.iss +++ b/PACKAGE/lynx.iss @@ -1,4 +1,4 @@ -; $LynxId: lynx.iss,v 1.6 2012/02/13 22:17:17 tom Exp $ +; $LynxId: lynx.iss,v 1.9 2012/11/16 10:00:03 tom Exp $ ; vile:ts=2 sw=2 notabinsert ; ; This is the BASE script for different flavors of the installer for Lynx. @@ -82,8 +82,15 @@ [Setup] AppName={#MyAppName} +#emit 'AppVersion=' + LYNX_VERSION +#emit 'VersionInfoDescription=Setup for "' + MyAppName + '"' +#define LYNX_TARGET0 StringChange(LYNX_VERSION,LYNX_RELEASE + "rel.",LYNX_RELEASE + ".00") +#define LYNX_TARGET1 StringChange(LYNX_TARGET0,LYNX_TARGETS + "dev.",LYNX_RELEASE + ".10") +#define LYNX_TARGET2 StringChange(LYNX_TARGET1,LYNX_TARGETS + "pre.",LYNX_RELEASE + ".20") +#emit 'VersionInfoVersion=' + LYNX_TARGET2 AppVerName={#MyAppVerName} AppPublisher={#MyAppPublisher} +AppCopyright=© 1997-2011,2012, Thomas E. Dickey AppPublisherURL={#MyAppURL} AppSupportURL={#MyAppURL} AppUpdatesURL={#MyAppURL} diff --git a/PACKAGE/version.iss b/PACKAGE/version.iss index 28379484..2cc4a0af 100644 --- a/PACKAGE/version.iss +++ b/PACKAGE/version.iss @@ -1,9 +1,13 @@ ; version used for Inno Setup files. ; $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$ -#define LYNX_VERSION "2.8.8dev.14" +#define LYNX_VERSION "2.8.8dev.15" -#define MyAppName "Lynx" +; most-recent full release and target +#define LYNX_RELEASE "2.8.7" +#define LYNX_TARGETS "2.8.8" + +#define MyAppName "Lynx - web browser" #define MyAppPublisher "Thomas E Dickey" #define MyAppURL "http://lynx.isc.org" #define MyAppVerName "Lynx " + LYNX_VERSION diff --git a/src/HTAlert.c b/src/HTAlert.c index a3e36dd5..ab04e09c 100644 --- a/src/HTAlert.c +++ b/src/HTAlert.c @@ -1,5 +1,5 @@ /* - * $LynxId: HTAlert.c,v 1.96 2012/11/14 01:19:06 tom Exp $ + * $LynxId: HTAlert.c,v 1.97 2012/11/16 01:22:25 tom Exp $ * * Displaying messages and getting input for Lynx Browser * ========================================================== @@ -364,7 +364,9 @@ void HTReadProgress(off_t bytes, off_t total) #ifdef USE_READPROGRESS if (LYTransferRate == rateEtaBYTES - || LYTransferRate == rateEtaKB) { + || LYTransferRate == rateEtaKB + || LYTransferRate == rateEtaBYTES2 + || LYTransferRate == rateEtaKB2) { char tbuf[TIME_HMS_LENGTH]; if (now - last_active >= 5) |