Menu
▾
▴
mpkg-commit — All cvs commit.
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(3) |
Nov
(26) |
Dec
(5) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Pascal B. <pb...@us...> - 2001-11-28 14:20:50
|
Update of /cvsroot/mpkg/mpkg/src
In directory usw-pr-cvs1:/tmp/cvs-serv17747/src
Modified Files:
deb.c dist.c mpkg.h pkg.c rpm.c
Log Message:
* src/rpm.c (make_rpm): Change dependancy description, with min
and max dependancy.
* src/deb.c (make_deb): Likewise.
(make_deb): Only show max number version dependency, when necessary.
* src/rpm.c (make_rpm): Likewise.
* src/rpm.c (make_rpm): Add tag `prefix' in specification file.
Index: deb.c
===================================================================
RCS file: /cvsroot/mpkg/mpkg/src/deb.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** deb.c 2001/10/26 08:43:58 1.3
--- deb.c 2001/11/28 14:20:46 1.4
***************
*** 168,173 ****
}
else
! fprintf (fp, " (>= %s, <= %s)", d->version[0],
! d->version[1]);
}
--- 168,178 ----
}
else
! {
! if (strcmp (d->version[1], "999.99.99p99") == 0)
! fprintf (fp, " (>= %s)", d->version[0]);
! else
! fprintf (fp, " (>= %s), %s (<= %s)", d->version[0],
! d->product, d->version[1]);
! }
}
Index: dist.c
===================================================================
RCS file: /cvsroot/mpkg/mpkg/src/dist.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** dist.c 2001/11/27 14:27:08 1.7
--- dist.c 2001/11/28 14:20:46 1.8
***************
*** 166,170 ****
/* Add a dependency to the distribution. */
void
! add_depend (dist_t * dist, /* I - Distribution */
char type, /* I - Type of dependency */
const char *line) /* I - Line from file */
--- 166,170 ----
/* Add a dependency to the distribution. */
void
! add_depend (dist_t *dist, /* I - Distribution */
char type, /* I - Type of dependency */
const char *line) /* I - Line from file */
***************
*** 195,201 ****
/*
! * Get the product name string...
*/
-
for (ptr = temp->product; *line && !isspace ((int) *line); line++)
if (ptr < (temp->product + sizeof (temp->product) - 1))
--- 195,200 ----
/*
! * Get the product name string.
*/
for (ptr = temp->product; *line && !isspace ((int) *line); line++)
if (ptr < (temp->product + sizeof (temp->product) - 1))
***************
*** 207,218 ****
LOGVERBOSE (printf (stderr, "Add dependency <%s>(%u).\n",
(char *)temp->product, (int)dist->num_depends));
! /*
! * Get the version strings, if any.
! */
for (i = 0; *line && i < 2; i++)
{
! /*
! * Handle <version, >version, etc.
! */
if (!isdigit ((int) *line))
{
--- 206,214 ----
LOGVERBOSE (printf (stderr, "Add dependency <%s>(%u).\n",
(char *)temp->product, (int)dist->num_depends));
!
! /* Get the version strings, if any. */
for (i = 0; *line && i < 2; i++)
{
! /* Handle <version, >version, etc. */
if (!isdigit ((int) *line))
{
***************
*** 226,236 ****
line++;
}
-
if (!*line)
break;
! /*
! * Grab the version string.
! */
for (ptr = temp->version[i]; *line && !isspace ((int) *line); line++)
if (ptr < (temp->version[i] + sizeof (temp->version[i]) - 1))
--- 222,229 ----
line++;
}
if (!*line)
break;
! /* Grab the version string. */
for (ptr = temp->version[i]; *line && !isspace ((int) *line); line++)
if (ptr < (temp->version[i] + sizeof (temp->version[i]) - 1))
***************
*** 240,246 ****
line++;
! /*
! * Get the version number, if any.
! */
for (lineptr = line; isdigit ((int) *lineptr); lineptr++)
;
--- 233,237 ----
line++;
! /* Get the version number, if any. */
for (lineptr = line; isdigit ((int) *lineptr); lineptr++)
;
***************
*** 258,264 ****
}
! /*
! * Handle assigning default values based on the number of version numbers...
! */
switch (i)
{
--- 249,253 ----
}
! /* Handle assigning default values based on the number of version numbers. */
switch (i)
{
Index: mpkg.h
===================================================================
RCS file: /cvsroot/mpkg/mpkg/src/mpkg.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** mpkg.h 2001/10/25 16:41:07 1.2
--- mpkg.h 2001/11/28 14:20:46 1.3
***************
*** 1,20 ****
! /*
! *
! * Definitions for Meta pkg (mpkg).
! *
! * Copyright 2001 by CubicSoft.
! * Copyright 1999-2001 by Easy Software Products.
! *
! * This program is free software; you can redistribute it and/or modify
! * it under the terms of the GNU General Public License as published by
! * the Free Software Foundation; either version 2, or (at your option)
! * any later version.
! *
! * This program is distributed in the hope that it will be useful,
! * but WITHOUT ANY WARRANTY; without even the implied warranty of
! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
! * GNU General Public License for more details.
! */
#ifndef MPKG_H
# define MPKG_H
--- 1,16 ----
! /* Definitions for Meta pkg (mpkg).
!
! Copyright 2001 by CubicSoft.
! Copyright 1999-2001 by Easy Software Products.
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details. */
#ifndef MPKG_H
# define MPKG_H
Index: pkg.c
===================================================================
RCS file: /cvsroot/mpkg/mpkg/src/pkg.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** pkg.c 2001/11/14 09:50:18 1.2
--- pkg.c 2001/11/28 14:20:46 1.3
***************
*** 48,56 ****
FILE *fp; /* Control file */
char name[1024]; /* Full product name */
! char filename[1024], /* Destination filename */
! preinstall[1024], /* Pre install script */
! postinstall[1024], /* Post install script */
! preremove[1024], /* Pre remove script */
! postremove[1024]; /* Post remove script */
char current[1024]; /* Current directory */
file_t *file; /* Current distribution file */
--- 48,56 ----
FILE *fp; /* Control file */
char name[1024]; /* Full product name */
! char filename[1024]; /* Destination filename */
! char preinstall[1024]; /* Pre install script */
! char postinstall[1024]; /* Post install script */
! char preremove[1024]; /* Pre remove script */
! char postremove[1024]; /* Post remove script */
char current[1024]; /* Current directory */
file_t *file; /* Current distribution file */
***************
*** 107,110 ****
--- 107,111 ----
fprintf (fp, "VERSION=%s\n", dist->version);
fprintf (fp, "VENDOR=%s\n", dist->vendor);
+ /* FIXME Add option to specify BASEDIR. */
fprintf (fp, "BASEDIR=%s\n", "/");
fprintf (fp, "PSTAMP=mpkg%04d%02d%02d%02d%02d%02d\n",
Index: rpm.c
===================================================================
RCS file: /cvsroot/mpkg/mpkg/src/rpm.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** rpm.c 2001/10/24 12:16:42 1.1.1.1
--- rpm.c 2001/11/28 14:20:46 1.2
***************
*** 104,107 ****
--- 104,110 ----
fprintf (fp, "Vendor: %s\n", dist->vendor);
fprintf (fp, "BuildRoot: %s/%s/buildroot\n", current, directory);
+ /* FIXME Add option to change prefix. */
+ fprintf (fp, "Prefix: /\n");
+
fputs ("Group: Applications\n", fp);
***************
*** 123,127 ****
}
else
! fprintf (fp, " >= %s, <= %s\n", d->version[0], d->version[1]);
}
--- 126,136 ----
}
else
! {
! if (strcmp (d->version[1], "999.99.99p99") == 0)
! fprintf (fp, " >= %s\n", d->version[0]);
! else
! fprintf (fp, " >= %s, %s <= %s\n", d->version[0], d->product,
! d->version[1]);
! }
}
***************
*** 373,381 ****
if (ret) /* FIXME Here there're an error. */ ;
}
-
- /*
- * Remove temporary files...
- */
if (!KeepFiles)
{
--- 382,387 ----
if (ret) /* FIXME Here there're an error. */ ;
}
+ /* Remove temporary files. */
if (!KeepFiles)
{
|
|
From: Pascal B. <pb...@us...> - 2001-11-27 14:30:49
|
Update of /cvsroot/mpkg/mpkg/lib In directory usw-pr-cvs1:/tmp/cvs-serv18422/lib Modified Files: Makefile.in Log Message: Regen. Index: Makefile.in =================================================================== RCS file: /cvsroot/mpkg/mpkg/lib/Makefile.in,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile.in 2001/11/27 09:29:35 1.2 --- Makefile.in 2001/11/27 14:30:45 1.3 *************** *** 119,123 **** install-exec-recursive installdirs-recursive install-recursive \ uninstall-recursive check-recursive installcheck-recursive ! DIST_COMMON = COPYING Makefile.am Makefile.in DIST_SUBDIRS = $(SUBDIRS) all: all-recursive --- 119,123 ---- install-exec-recursive installdirs-recursive install-recursive \ uninstall-recursive check-recursive installcheck-recursive ! DIST_COMMON = Makefile.am Makefile.in DIST_SUBDIRS = $(SUBDIRS) all: all-recursive |
|
From: Pascal B. <pb...@us...> - 2001-11-27 14:27:13
|
Update of /cvsroot/mpkg/mpkg In directory usw-pr-cvs1:/tmp/cvs-serv17716 Modified Files: ChangeLog Log Message: * dist.c (_get_line): Prefer this function to fgets, this one is better optimize, and provide better debugging informations. (get_line): Call _get_line. Index: ChangeLog =================================================================== RCS file: /cvsroot/mpkg/mpkg/ChangeLog,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** ChangeLog 2001/11/14 09:50:17 1.21 --- ChangeLog 2001/11/27 14:27:08 1.22 *************** *** 1,2 **** --- 1,17 ---- + 2001-11-27 Pascal Bart <pas...@ep...> + + * dist.c (_get_line): Prefer this function to fgets, this one is + better optimize, and provide better debugging informations. + (get_line): Call _get_line. + + 2001-11-27 Pascal Bart <pas...@ep...> + + * src/main.c (main): Don't show informations about GNU License, if + Verbose mode is active. + (info_version): Only show version number for verbose mode. + + * src/dist.c: Add verbose information level 4. This level show user + informations about config file parsing. + 2001-11-14 Pascal Bart <pas...@ep...> |
|
From: Pascal B. <pb...@us...> - 2001-11-27 14:27:12
|
Update of /cvsroot/mpkg/mpkg/src
In directory usw-pr-cvs1:/tmp/cvs-serv17716/src
Modified Files:
dist.c
Log Message:
* dist.c (_get_line): Prefer this function to fgets, this one is
better optimize, and provide better debugging informations.
(get_line): Call _get_line.
Index: dist.c
===================================================================
RCS file: /cvsroot/mpkg/mpkg/src/dist.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** dist.c 2001/11/27 12:45:40 1.6
--- dist.c 2001/11/27 14:27:08 1.7
***************
*** 78,81 ****
--- 78,83 ----
#endif
+ #include <stdio.h>
+
/* That's could be better to delete this in the future. I prefere
create a header. */
***************
*** 203,208 ****
line++;
! LOGVERBOSE (printf (stderr, "Add dependency <%s>(%d).\n", temp->product,
! dist->num_depends));
/*
* Get the version strings, if any.
--- 205,210 ----
line++;
! LOGVERBOSE (printf (stderr, "Add dependency <%s>(%u).\n",
! (char *)temp->product, (int)dist->num_depends));
/*
* Get the version strings, if any.
***************
*** 1037,1040 ****
--- 1039,1064 ----
}
+ /* fgets is bogus, this function prevent against errors. */
+ static inline char *
+ _get_line (FILE *fp, char *buffer, int size)
+ {
+ register char c = 0;
+ register int fd = fileno(fp);
+ char *tmp = buffer;
+
+ /* Prevent against multiple modification. */
+ fflush (fp);
+
+ for (; read (fd, &c, 1) > 0 && c != '\n'; )
+ *(buffer++) = c;
+
+ *(buffer++) = '\n';
+ *buffer = '\0';
+
+ if (c == '\n')
+ return tmp;
+ return NULL;
+ }
+
/* Get a line from a file, filtering for uname lines. */
static char * /* O - String read or NULL at EOF */
***************
*** 1056,1061 ****
const char *var; /* Variable value */
! while (fgets (buffer, size, fp) != NULL)
! {
/* Skip comment and blank lines. */
if (buffer[0] == '#' || buffer[0] == '\n')
--- 1080,1085 ----
const char *var; /* Variable value */
! while (_get_line (fp, buffer, size) != NULL)
! {
/* Skip comment and blank lines. */
if (buffer[0] == '#' || buffer[0] == '\n')
***************
*** 1067,1070 ****
--- 1091,1095 ----
/* Yes, do filtering based on the OS (+version). */
*skip &= ~SKIP_SYSTEM;
+ LOGVERBOSE (fprintf (stderr, "Filtering %%system.\n"));
if (strcmp (buffer + 8, "all\n") != 0)
***************
*** 1131,1134 ****
--- 1156,1160 ----
/* Yes, do filtering based on the distribution format. */
*skip &= ~SKIP_FORMAT;
+ LOGVERBOSE (fprintf (stderr, "Filtering %%format.\n"));
if (strcmp (buffer + 8, "all\n") != 0)
***************
*** 1187,1190 ****
--- 1213,1218 ----
}
+ LOGVERBOSE (fprintf (stderr, "Substitute %%ifdef | %%elseifdef.\n"));
+
if (buffer[1] == 'e')
bufptr = buffer + 11;
***************
*** 1253,1256 ****
--- 1281,1286 ----
}
+ LOGVERBOSE (fprintf (stderr, "Substitute %%if | %%elseif.\n"));
+
if (buffer[1] == 'e')
bufptr = buffer + 8;
***************
*** 1341,1344 ****
--- 1371,1376 ----
}
+ LOGVERBOSE (fprintf (stderr, "Substitute %%else.\n"));
+
if (*skip & SKIP_IFSAT)
*skip |= SKIP_IF;
***************
*** 1360,1363 ****
--- 1392,1396 ----
}
+ LOGVERBOSE (fprintf (stderr, "Substitute %%endif.\n"));
*skip &= ~(SKIP_IF | SKIP_IFACTIVE | SKIP_IFSAT);
}
***************
*** 1370,1374 ****
return (buffer);
}
! }
return (NULL);
--- 1403,1407 ----
return (buffer);
}
! } /* End while */
return (NULL);
|
|
From: Pascal B. <pb...@us...> - 2001-11-27 12:45:45
|
Update of /cvsroot/mpkg/mpkg/src
In directory usw-pr-cvs1:/tmp/cvs-serv26310/src
Modified Files:
dist.c
Log Message:
Put verbose level 4 for parsing informations.
Index: dist.c
===================================================================
RCS file: /cvsroot/mpkg/mpkg/src/dist.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** dist.c 2001/10/29 10:50:30 1.5
--- dist.c 2001/11/27 12:45:40 1.6
***************
*** 101,104 ****
--- 101,109 ----
#define SKIP_MASK 7 /* Bits to look at */
+ #define LOGVERBOSE(a) \
+ do \
+ if (Verbosity > 2) \
+ a; \
+ while (0);
/* Add a command to the distribution. */
***************
*** 146,149 ****
--- 151,156 ----
temp->command = strdup (command);
+ LOGVERBOSE (fprintf (stderr, "Add command <%s>\n", command));
+
if (temp->command == NULL)
{
***************
*** 151,155 ****
return;
}
-
dist->num_commands++;
}
--- 158,161 ----
***************
*** 167,175 ****
const char *lineptr; /* Temporary pointer into line */
-
- /*
- * Allocate memory for the dependency...
- */
-
if (dist->num_depends == 0)
temp = malloc (sizeof (depend_t));
--- 173,176 ----
***************
*** 188,197 ****
dist->num_depends++;
- /*
- * Initialize the dependency record...
- */
-
memset (temp, 0, sizeof (depend_t));
-
temp->type = type;
--- 189,193 ----
***************
*** 207,214 ****
line++;
/*
! * Get the version strings, if any...
*/
-
for (i = 0; *line && i < 2; i++)
{
--- 203,211 ----
line++;
+ LOGVERBOSE (printf (stderr, "Add dependency <%s>(%d).\n", temp->product,
+ dist->num_depends));
/*
! * Get the version strings, if any.
*/
for (i = 0; *line && i < 2; i++)
{
***************
*** 216,220 ****
* Handle <version, >version, etc.
*/
-
if (!isdigit ((int) *line))
{
--- 213,216 ----
***************
*** 233,239 ****
/*
! * Grab the version string...
*/
-
for (ptr = temp->version[i]; *line && !isspace ((int) *line); line++)
if (ptr < (temp->version[i] + sizeof (temp->version[i]) - 1))
--- 229,234 ----
/*
! * Grab the version string.
*/
for (ptr = temp->version[i]; *line && !isspace ((int) *line); line++)
if (ptr < (temp->version[i] + sizeof (temp->version[i]) - 1))
***************
*** 244,270 ****
/*
! * Get the version number, if any...
*/
!
! for (lineptr = line; isdigit ((int) *lineptr); lineptr++);
!
if (!*line || (!isspace ((int) *lineptr) && *lineptr))
! {
! /*
! * No version number specified, or the next number is a version
! * string...
! */
!
temp->vernumber[i] = get_vernumber (temp->version[i]);
- }
else
{
! /*
! * Grab the version number directly from the line...
! */
!
temp->vernumber[i] = atoi (line);
!
! for (line = lineptr; isspace ((int) *line); line++);
}
}
--- 239,256 ----
/*
! * Get the version number, if any.
*/
! for (lineptr = line; isdigit ((int) *lineptr); lineptr++)
! ;
if (!*line || (!isspace ((int) *lineptr) && *lineptr))
! /* No version number specified, or the next number is a version
! string. */
temp->vernumber[i] = get_vernumber (temp->version[i]);
else
{
! /* Grab the version number directly from the line. */
temp->vernumber[i] = atoi (line);
! for (line = lineptr; isspace ((int) *line); line++)
! ;
}
}
***************
*** 273,277 ****
* Handle assigning default values based on the number of version numbers...
*/
-
switch (i)
{
--- 259,262 ----
***************
*** 293,297 ****
file_t *file; /* New file */
-
if (dist->num_files == 0)
dist->files = (file_t *) malloc (sizeof (file_t));
--- 278,281 ----
***************
*** 337,351 ****
{
char *temp; /* Temporary pointer */
!
!
! /*
! * Get the system identification information...
! */
!
uname (platform);
! /*
! * Adjust the CPU type accordingly...
! */
#ifdef __sgi
--- 321,329 ----
{
char *temp; /* Temporary pointer */
!
! /* Get the system identification information. */
uname (platform);
! /* Adjust the CPU type accordingly. */
#ifdef __sgi
***************
*** 372,387 ****
#ifdef _AIX
! /*
! * AIX stores the major and minor version numbers separately;
! * combine them...
! */
sprintf (platform->release, "%d.%d", atoi (platform->version),
atoi (platform->release));
#else
! /*
! * Remove any extra junk from the release number - we just want the
! * major and minor numbers...
! */
while (!isdigit ((int) platform->release[0]) && platform->release[0])
--- 350,365 ----
#ifdef _AIX
! /*------------------------------------------------------------.
! | AIX stores the major and minor version numbers separately; |
! | combine them. |
! `------------------------------------------------------------*/
sprintf (platform->release, "%d.%d", atoi (platform->version),
atoi (platform->release));
#else
! /*------------------------------------------------------------------.
! | Remove any extra junk from the release number - we just want the |
! | major and minor numbers. |
! `------------------------------------------------------------------*/
while (!isdigit ((int) platform->release[0]) && platform->release[0])
***************
*** 399,406 ****
#endif /* _AIX */
! /*
! * Convert the operating system name to lowercase, and strip out
! * hyphens and underscores...
! */
for (temp = platform->sysname; *temp != '\0'; temp++)
--- 377,384 ----
#endif /* _AIX */
! /*----------------------------------------------------------------.
! | Convert the operating system name to lowercase, and strip out |
! | hyphens and underscores. |
! `----------------------------------------------------------------*/
for (temp = platform->sysname; *temp != '\0'; temp++)
***************
*** 413,420 ****
*temp = tolower (*temp);
! /*
! * SunOS 5.x is really Solaris 2.x, and OSF1 is really Digital UNIX a.k.a.
! * Compaq Tru64 UNIX...
! */
if (strcmp (platform->sysname, "sunos") == 0 && platform->release[0] >= '5')
--- 391,398 ----
*temp = tolower (*temp);
! /*-------------------------------------------------------------------------.
! | SunOS 5.x is really Solaris 2.x, and OSF1 is really Digital UNIX a.k.a. |
! | Compaq Tru64 UNIX. |
! `-------------------------------------------------------------------------*/
if (strcmp (platform->sysname, "sunos") == 0 && platform->release[0] >= '5')
***************
*** 439,443 ****
/* That's could very very to broke that function and to do an
! other one, because this one is very ugly, no modular.
-- Pascal. */
--- 417,421 ----
/* That's could very very to broke that function and to do an
! other one, because this one is very ugly, not modular.
-- Pascal. */
***************
*** 469,475 ****
--- 447,455 ----
/* Create a new, blank distribution. */
+ LOGVERBOSE (fprintf (stderr, "Alloc new distribution.\n"));
dist = (dist_t *) calloc (sizeof (dist_t), 1);
/* Open the main list file. */
+ LOGVERBOSE (fprintf (stderr, "Open file <%s>.\n", filename));
if ((listfiles[0] = fopen (filename, "r")) == NULL)
{
***************
*** 507,512 ****
if (strcmp (line, "%include") == 0)
{
! listlevel++;
!
if ((listfiles[listlevel] = fopen (temp, "r")) == NULL)
{
--- 487,492 ----
if (strcmp (line, "%include") == 0)
{
! LOGVERBOSE (fprintf (stderr, " Include file <%s>.\n", temp));
! listlevel++;
if ((listfiles[listlevel] = fopen (temp, "r")) == NULL)
{
***************
*** 544,547 ****
--- 524,529 ----
else if (strcmp (line, "%product") == 0)
{
+ LOGVERBOSE (fprintf (stderr, "Add product name <%s>.\n",
+ temp));
if (!dist->product[0])
strcpy (dist->product, temp);
***************
*** 552,555 ****
--- 534,539 ----
else if (strcmp (line, "%copyright") == 0)
{
+ LOGVERBOSE (fprintf (stderr, "Add copyright string <%s>.\n",
+ temp));
if (!dist->copyright[0])
strcpy (dist->copyright, temp);
***************
*** 560,563 ****
--- 544,549 ----
else if (strcmp (line, "%vendor") == 0)
{
+ LOGVERBOSE (fprintf (stderr, "Add vendor name <%s>.\n",
+ temp));
if (!dist->vendor[0])
strcpy (dist->vendor, temp);
***************
*** 568,571 ****
--- 554,559 ----
else if (strcmp (line, "%packager") == 0)
{
+ LOGVERBOSE (fprintf (stderr, "Add packager name <%s>.\n",
+ temp));
if (!dist->packager[0])
strcpy (dist->packager, temp);
***************
*** 576,579 ****
--- 564,569 ----
else if (strcmp (line, "%license") == 0)
{
+ LOGVERBOSE (fprintf (stderr, "Add license file path <%s>.\n",
+ temp));
if (!dist->license[0])
strcpy (dist->license, temp);
***************
*** 584,587 ****
--- 574,579 ----
else if (strcmp (line, "%readme") == 0)
{
+ LOGVERBOSE (fprintf (stderr, "Add readme file path <%s>.\n",
+ temp));
if (!dist->readme[0])
strcpy (dist->readme, temp);
***************
*** 594,597 ****
--- 586,591 ----
if (!dist->version[0])
{
+ LOGVERBOSE (fprintf (stderr, "Add version number <%s>.\n",
+ temp));
strcpy (dist->version, temp);
if ((temp = strchr (dist->version, ' ')) != NULL)
***************
*** 612,615 ****
--- 606,611 ----
else if (strcmp (line, "%release") == 0 && dist->relnumber == 0)
{
+ LOGVERBOSE (fprintf (stderr, "Add release number <%s>.\n",
+ temp));
dist->relnumber = atoi (temp);
dist->vernumber += dist->relnumber;
***************
*** 668,671 ****
--- 664,670 ----
else
{
+ LOGVERBOSE (fprintf (stderr, "Add file %c %o %s %s %s %s.\n",
+ type, mode, user, group, dst, src));
+
if (tolower (type) == 'd' || type == 'R')
src[0] = '\0';
***************
*** 794,809 ****
! /*
! * Sort the files...
! */
!
if (dist->num_files > 1)
qsort (dist->files, dist->num_files, sizeof (file_t),
(int (*)(const void *, const void *)) compare_files);
! /*
! * Remove duplicates...
! */
!
for (i = dist->num_files - 1, file = dist->files; i > 0; i--, file++)
if (strcmp (file[0].dst, file[1].dst) == 0)
--- 793,802 ----
! /* Sort the files. */
if (dist->num_files > 1)
qsort (dist->files, dist->num_files, sizeof (file_t),
(int (*)(const void *, const void *)) compare_files);
! /* Remove duplicates. */
for (i = dist->num_files - 1, file = dist->files; i > 0; i--, file++)
if (strcmp (file[0].dst, file[1].dst) == 0)
***************
*** 823,828 ****
char *string) /* I - String to add */
{
! char **temp, /* Temporary pointer to string array */
! buf[16384]; /* File import buffer */
--- 816,821 ----
char *string) /* I - String to add */
{
! char **temp; /* Temporary pointer to string array */
! char buf[16384]; /* File import buffer */
***************
*** 857,860 ****
--- 850,854 ----
temp += num_strings;
+ LOGVERBOSE (fprintf (stderr, "Add string <%s>.\n", string));
if ((*temp = strdup (string)) == NULL)
{
***************
*** 892,899 ****
if (*name == '$')
{
! /*
! * Insert a lone $...
! */
!
*buffer++ = *name++;
continue;
--- 886,890 ----
if (*name == '$')
{
! /* Insert a lone $. */
*buffer++ = *name++;
continue;
***************
*** 901,908 ****
else if (*name == '{')
{
! /*
! * Bracketed variable name...
! */
!
for (varptr = var, name++; *name != '}' && *name != '\0';)
*varptr++ = *name++;
--- 892,896 ----
else if (*name == '{')
{
! /* Bracketed variable name. */
for (varptr = var, name++; *name != '}' && *name != '\0';)
*varptr++ = *name++;
***************
*** 913,920 ****
else
{
! /*
! * Unbracketed variable name...
! */
!
for (varptr = var;
strchr ("/ \t-", *name) == NULL && *name != '\0';)
--- 901,905 ----
else
{
! /* Unbracketed variable name. */
for (varptr = var;
strchr ("/ \t-", *name) == NULL && *name != '\0';)
***************
*** 933,937 ****
*buffer++ = *name++;
}
-
*buffer = '\0';
}
--- 918,921 ----
***************
*** 945,949 ****
int i; /* Looping var */
-
for (i = 0; i < num_strings; i++)
free (strings[i]);
--- 929,932 ----
***************
*** 1403,1411 ****
const char *ptr; /* Pointer into string */
-
- /*
- * Loop through the version number string and construct a version number.
- */
memset (numbers, 0, sizeof (numbers));
--- 1386,1391 ----
const char *ptr; /* Pointer into string */
+ /* Loop through the version number string and construct a version number. */
memset (numbers, 0, sizeof (numbers));
***************
*** 1416,1423 ****
else
{
! /*
! * Add each mini version number (m.n.p) and patch/pre stuff...
! */
!
if (nnumbers < 4)
{
--- 1396,1400 ----
else
{
! /* Add each mini version number (m.n.p) and patch/pre stuff. */
if (nnumbers < 4)
{
***************
*** 1457,1464 ****
numbers[nnumbers] = temp;
! /*
! * Compute the version number as MMmmPPpp + offset
! */
!
return (((numbers[0] * 100 + numbers[1]) * 100 + numbers[2]) * 100 +
numbers[3] + offset);
--- 1434,1438 ----
numbers[nnumbers] = temp;
! /* Compute the version number as MMmmPPpp + offset */
return (((numbers[0] * 100 + numbers[1]) * 100 + numbers[2]) * 100 +
numbers[3] + offset);
***************
*** 1468,1472 ****
/* Pattern matching. */
! /* FIXME : Substitute this function to `fnmatch', which is standar on
GNU system, and it is presente in `deb' library. -- Pascal. */
--- 1442,1446 ----
/* Pattern matching. */
! /* FIXME : Substitute this function to `fnmatch', which is standard on
GNU system, and it is presente in `deb' library. -- Pascal. */
***************
*** 1475,1482 ****
const char *pat) /* I - Pattern to match against */
{
! /*
! * Range check the input...
! */
!
if (s == NULL || pat == NULL)
return (0);
--- 1449,1453 ----
const char *pat) /* I - Pattern to match against */
{
! /* Range check the input. */
if (s == NULL || pat == NULL)
return (0);
***************
*** 1491,1505 ****
if (*pat == '*')
{
! /*
! * Wildcard - 0 or more characters...
! */
!
pat++;
if (*pat == '\0')
! return (1); /* Last pattern char is *, so everything matches now... */
! /*
! * Test all remaining combinations until we get to the end of the string.
! */
while (*s != '\0')
--- 1462,1472 ----
if (*pat == '*')
{
! /* Wildcard - 0 or more characters. */
pat++;
if (*pat == '\0')
! return (1); /* Last pattern char is *, so everything matches now. */
! /* Test all remaining combinations until we get to the end of the
! string. */
while (*s != '\0')
***************
*** 1513,1520 ****
else if (*pat == '?')
{
! /*
! * Wildcard - 1 character...
! */
!
pat++;
s++;
--- 1480,1484 ----
else if (*pat == '?')
{
! /* Wildcard - 1 character. */
pat++;
s++;
***************
*** 1523,1530 ****
else if (*pat == '[')
{
! /*
! * Match a character from the input set [chars]...
! */
!
pat++;
while (*pat != ']' && *pat != '\0')
--- 1487,1491 ----
else if (*pat == '[')
{
! /* Match a character from the input set [chars]. */
pat++;
while (*pat != ']' && *pat != '\0')
***************
*** 1551,1565 ****
else if (*pat == '\\')
{
! /*
! * Handle quoted characters...
! */
!
pat++;
}
! /*
! * Stop if the pattern and string don't match...
! */
!
if (*pat++ != *s++)
return (0);
--- 1512,1520 ----
else if (*pat == '\\')
{
! /* Handle quoted characters. */
pat++;
}
! /* Stop if the pattern and string don't match. */
if (*pat++ != *s++)
return (0);
***************
*** 1570,1574 ****
* and 0 otherwise...
*/
-
return (*s == *pat);
}
--- 1525,1528 ----
|
|
From: Pascal B. <pb...@us...> - 2001-11-27 09:29:43
|
Update of /cvsroot/mpkg/mpkg/lib In directory usw-pr-cvs1:/tmp/cvs-serv9065/lib Modified Files: Makefile.in Log Message: Regen. Index: Makefile.in =================================================================== RCS file: /cvsroot/mpkg/mpkg/lib/Makefile.in,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** Makefile.in 2001/10/24 12:16:24 1.1.1.1 --- Makefile.in 2001/11/27 09:29:35 1.2 *************** *** 119,123 **** install-exec-recursive installdirs-recursive install-recursive \ uninstall-recursive check-recursive installcheck-recursive ! DIST_COMMON = Makefile.am Makefile.in DIST_SUBDIRS = $(SUBDIRS) all: all-recursive --- 119,123 ---- install-exec-recursive installdirs-recursive install-recursive \ uninstall-recursive check-recursive installcheck-recursive ! DIST_COMMON = COPYING Makefile.am Makefile.in DIST_SUBDIRS = $(SUBDIRS) all: all-recursive |
|
From: Pascal B. <pb...@us...> - 2001-11-14 09:50:21
|
Update of /cvsroot/mpkg/mpkg In directory usw-pr-cvs1:/tmp/cvs-serv3165 Modified Files: ChangeLog TODO Log Message: * src/pkg.c (make_pkg): Put BASEDIR in pkginfo generated file for Solaris. Index: ChangeLog =================================================================== RCS file: /cvsroot/mpkg/mpkg/ChangeLog,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** ChangeLog 2001/10/30 14:05:27 1.20 --- ChangeLog 2001/11/14 09:50:17 1.21 *************** *** 1,2 **** --- 1,7 ---- + 2001-11-14 Pascal Bart <pas...@ep...> + + * src/pkg.c (make_pkg): Put BASEDIR in pkginfo generated file for + Solaris. + 2001-10-30 Pascal Bart <pas...@ep...> Index: TODO =================================================================== RCS file: /cvsroot/mpkg/mpkg/TODO,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** TODO 2001/10/31 10:39:16 1.9 --- TODO 2001/11/14 09:50:17 1.10 *************** *** 49,50 **** --- 49,53 ---- ** On parsing error return line. ** Add tool with %if. [Now support operator `='] + + * Leave Package Administrator to choose the destination directory, to do this + we should introduce parameter %basedir. \ No newline at end of file |
|
From: Pascal B. <pb...@us...> - 2001-11-14 09:50:21
|
Update of /cvsroot/mpkg/mpkg/src
In directory usw-pr-cvs1:/tmp/cvs-serv3165/src
Modified Files:
pkg.c
Log Message:
* src/pkg.c (make_pkg): Put BASEDIR in pkginfo generated file for
Solaris.
Index: pkg.c
===================================================================
RCS file: /cvsroot/mpkg/mpkg/src/pkg.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** pkg.c 2001/10/24 12:16:42 1.1.1.1
--- pkg.c 2001/11/14 09:50:18 1.2
***************
*** 16,22 ****
* GNU General Public License for more details.
*
- * Contents:
- *
- * make_pkg() - Make an AT&T software distribution package.
*/
--- 16,19 ----
***************
*** 41,48 ****
#endif
- /*
- * 'make_pkg()' - Make an AT&T software distribution package.
- */
-
int /* O - 0 = success, 1 = fail */
make_pkg (const char *prodname, /* I - Product short name */
--- 38,41 ----
***************
*** 114,117 ****
--- 107,111 ----
fprintf (fp, "VERSION=%s\n", dist->version);
fprintf (fp, "VENDOR=%s\n", dist->vendor);
+ fprintf (fp, "BASEDIR=%s\n", "/");
fprintf (fp, "PSTAMP=mpkg%04d%02d%02d%02d%02d%02d\n",
curdate->tm_year + 1900, curdate->tm_mon + 1, curdate->tm_mday,
|
|
From: Pascal B. <pb...@us...> - 2001-10-31 10:39:18
|
Update of /cvsroot/mpkg/mpkg In directory usw-pr-cvs1:/tmp/cvs-serv18089 Modified Files: NEWS TODO Log Message: New informations Index: NEWS =================================================================== RCS file: /cvsroot/mpkg/mpkg/NEWS,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** NEWS 2001/10/31 10:20:59 1.6 --- NEWS 2001/10/31 10:39:16 1.7 *************** *** 12,15 **** --- 12,19 ---- * New mailing list was open for bug report (mpk...@li...). + * New mailing list was open for cvs commit (mpk...@li...). + + * Mpkg works on Cygwin. + Changes in version 1.0: Index: TODO =================================================================== RCS file: /cvsroot/mpkg/mpkg/TODO,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** TODO 2001/10/26 16:48:01 1.8 --- TODO 2001/10/31 10:39:16 1.9 *************** *** 37,43 **** ** See to use more package options (and informations) like BUILD_INFO, ... ! * Use libtool, and live ar and ranlib. * Document new option --output-dir. * Use flex/bison parser, to read configuration file. --- 37,46 ---- ** See to use more package options (and informations) like BUILD_INFO, ... ! * Use libtool, and leave ar and ranlib. * Document new option --output-dir. + ** --help [ok] + ** man + ** texinfo * Use flex/bison parser, to read configuration file. *************** *** 45,47 **** ** Support quote and double quote for variables like sh-shell. ** On parsing error return line. ! ** Add tool with %if. --- 48,50 ---- ** Support quote and double quote for variables like sh-shell. ** On parsing error return line. ! ** Add tool with %if. [Now support operator `='] |
|
From: Pascal B. <pb...@us...> - 2001-10-31 10:21:02
|
Update of /cvsroot/mpkg/mpkg In directory usw-pr-cvs1:/tmp/cvs-serv13167 Modified Files: NEWS Log Message: Index: NEWS =================================================================== RCS file: /cvsroot/mpkg/mpkg/NEWS,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 |
|
From: Pascal B. <pb...@us...> - 2001-10-31 10:16:16
|
Update of /cvsroot/mpkg/mpkg In directory usw-pr-cvs1:/tmp/cvs-serv11650 Modified Files: NEWS Log Message: Index: NEWS =================================================================== RCS file: /cvsroot/mpkg/mpkg/NEWS,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 |
