diff options
| author | Thomas E. Dickey <dickey@invisible-island.net> | 2000-04-24 02:26:51 -0400 |
|---|---|---|
| committer | Thomas E. Dickey <dickey@invisible-island.net> | 2000-04-24 02:26:51 -0400 |
| commit | 4495b73b691d8f3037361f55f08fc37abc9f2b08 (patch) | |
| tree | 4d8ee4b90d42b92f718e563a4cd639e57ade524e | |
| parent | 88351188083a43680e5ca8eb51ce1870c60d1189 (diff) | |
| download | lynx-snapshots-4495b73b691d8f3037361f55f08fc37abc9f2b08.tar.gz | |
snapshot of project "lynx", label v2-8-3rel_1
| -rw-r--r-- | CHANGES | 7 | ||||
| -rw-r--r-- | LYMessages_en.h | 1 | ||||
| -rw-r--r-- | src/LYMain.c | 7 | ||||
| -rw-r--r-- | src/LYShowInfo.c | 41 | ||||
| -rw-r--r-- | src/LYShowInfo.h | 3 | ||||
| -rw-r--r-- | userdefs.h | 6 |
6 files changed, 52 insertions, 13 deletions
diff --git a/CHANGES b/CHANGES index 149e080a..20aa8f09 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,13 @@ Changes since Lynx 2.8 release =============================================================================== +2000-04-23 (2.8.3rel.1) +* replace LYNX_RELEASE variable in userdefs.h by functions LYVersionIsRelease() + and LYVersionStatus() in LYShowInfo.c -TD +* remove symbol LYNX_RELEASE_DATE, use same format for both development and + release dates -LP +* remove po/ChangeLog (noted by LP) + 2000-04-22 (2.8.3pre.8) * update option_help.html to describe the Visited Pages settings -TD * correct order of body_attr[] and button_attr[] in HTMLDTD.c -TD diff --git a/LYMessages_en.h b/LYMessages_en.h index 81431a8d..75051d6d 100644 --- a/LYMessages_en.h +++ b/LYMessages_en.h @@ -859,6 +859,7 @@ #define RUNTIME_OPT_SEGMENT gettext("for runtime options") #define COMPILE_OPT_SEGMENT gettext("compile time options") #define REL_VERSION gettext("latest release") +#define PRE_VERSION gettext("pre-release version") #define DEV_VERSION gettext("development version") #define AUTOCONF_CONFIG_CACHE \ gettext("The following data were derived during the automatic configuration/build\n\ diff --git a/src/LYMain.c b/src/LYMain.c index c51b31c2..8bcb1f19 100644 --- a/src/LYMain.c +++ b/src/LYMain.c @@ -29,6 +29,7 @@ #include <LYBookmark.h> #include <LYCookie.h> #include <LYPrettySrc.h> +#include <LYShowInfo.h> #ifdef VMS #include <HTFTP.h> @@ -3028,11 +3029,9 @@ static int version_fun ARGS1( SetOutputMode( O_TEXT ); printf("\n"); - printf(gettext("\n%s Version %s (%.*s)\n"), + printf(gettext("\n%s Version %s (%s)\n"), LYNX_NAME, LYNX_VERSION, - LYNX_DATE_LEN, - LYNX_RELEASE ? LYNX_RELEASE_DATE : &LYNX_DATE[LYNX_DATE_OFF] - ); + LYVersionDate()); #ifdef SYSTEM_NAME #ifndef __DATE__ #define __DATE__ "" diff --git a/src/LYShowInfo.c b/src/LYShowInfo.c index f465cfd7..7d176754 100644 --- a/src/LYShowInfo.c +++ b/src/LYShowInfo.c @@ -12,6 +12,7 @@ #include <GridText.h> #include <LYReadCFG.h> #include <LYCharSets.h> +#include <LYStrings.h> #include <LYLeaks.h> @@ -24,6 +25,37 @@ #define ADVANCED_INFO 1 /* to get more info in advanced mode */ /* + * LYNX_VERSION and LYNX_DATE are automatically generated by PRCS, the tool + * which we use to archive versions of Lynx. We use a convention for naming + * the successive versions: + * {release}{status}{patch} + * where + * {release} is the release that we are working on, e.g., 2.8.3 + * {status} is one of "dev", "pre" or "rel", and + * {patch} is a number assigned by PRCS. + */ +PUBLIC BOOL LYVersionIsRelease NOARGS +{ + return strstr(LYNX_VERSION, "rel") != 0; +} + +PUBLIC char *LYVersionStatus NOARGS +{ + if (LYVersionIsRelease()) + return REL_VERSION; + else if (strstr(LYNX_VERSION, "pre") != 0) + return PRE_VERSION; + return DEV_VERSION; +} + +PUBLIC char *LYVersionDate NOARGS +{ + static char temp[LYNX_DATE_LEN+1]; + LYstrncpy(temp, &LYNX_DATE[LYNX_DATE_OFF], LYNX_DATE_LEN); + return temp; +} + +/* * Showinfo prints a page of info about the current file and the link * that the cursor is on. */ @@ -80,12 +112,11 @@ PUBLIC int showinfo ARGS4( fprintf(fp0, "<title>%s</title>\n</head>\n<body>\n", SHOWINFO_TITLE); - fprintf(fp0, "<h1>%s %s (%.*s) (<a href=\"%s\">%s</a>)", + fprintf(fp0, "<h1>%s %s (%s) (<a href=\"%s\">%s</a>)", LYNX_NAME, LYNX_VERSION, - LYNX_DATE_LEN, - (LYNX_RELEASE ? LYNX_RELEASE_DATE : &LYNX_DATE[LYNX_DATE_OFF]), - (LYNX_RELEASE ? LYNX_WWW_HOME : LYNX_WWW_DIST), - (LYNX_RELEASE ? REL_VERSION : DEV_VERSION) ); + LYVersionDate(), + (LYVersionIsRelease() ? LYNX_WWW_HOME : LYNX_WWW_DIST), + LYVersionStatus()); fprintf(fp0, "</h1>\n"); /* don't forget to close <h1> */ diff --git a/src/LYShowInfo.h b/src/LYShowInfo.h index 65eb88e5..038492a9 100644 --- a/src/LYShowInfo.h +++ b/src/LYShowInfo.h @@ -5,6 +5,9 @@ #include <LYStructs.h> #endif /* LYSTRUCTS_H */ +extern BOOL LYVersionIsRelease NOPARAMS; +extern char *LYVersionStatus NOPARAMS; +extern char *LYVersionDate NOPARAMS; extern int showinfo PARAMS((document *doc, int size_of_file, document *newdoc, char *owner_address)); diff --git a/userdefs.h b/userdefs.h index 322f7010..c44fd31b 100644 --- a/userdefs.h +++ b/userdefs.h @@ -1339,15 +1339,13 @@ * the version definition with the Project Version on checkout. Just * ignore it. - kw */ /* $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$ */ -#define LYNX_VERSION "2.8.3pre.8" +#define LYNX_VERSION "2.8.3rel.1" #define LYNX_WWW_HOME "http://lynx.browser.org/" #define LYNX_WWW_DIST "http://lynx.isc.org/current/" -#define LYNX_RELEASE FALSE /* $Format: "#define LYNX_DATE \"$ProjectDate$\""$ */ -#define LYNX_DATE "Sat, 22 Apr 2000 18:16:38 -0700" +#define LYNX_DATE "Sun, 23 Apr 2000 18:44:03 -0700" #define LYNX_DATE_OFF 5 /* truncate the automatically-generated date */ #define LYNX_DATE_LEN 11 /* truncate the automatically-generated date */ -#define LYNX_RELEASE_DATE "1999" #define LINESIZE 1024 /* max length of line to read from file */ #define MAXHIST 1024 /* max links we remember in history */ |