Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | nmakehlp: Add "-V<num>" option, in order to be able to detect partial version numbers. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | core-8-4-branch |
| Files: | files | file ages | folders |
| SHA1: |
e20eafd1718502c7764a88e496a70d4b |
| User & Date: | jan.nijtmans 2012-08-17 07:15:31 |
Context
|
2012-08-17
| ||
| 07:16 | nmakehlp: Add "-V<num>" option, in order to be able to detect partial version numbers. check-in: 3f8069f0b4 user: jan.nijtmans tags: core-8-4-branch | |
| 07:15 | nmakehlp: Add "-V<num>" option, in order to be able to detect partial version numbers. check-in: e20eafd171 user: jan.nijtmans tags: core-8-4-branch | |
|
2012-08-06
| ||
| 06:54 | Reference to correct Bug #number check-in: 2516170e7c user: jan.nijtmans tags: core-8-4-branch | |
Changes
Changes to win/nmakehlp.c.
| ︙ | ︙ | |||
43 44 45 46 47 48 49 | /* protos */ static int CheckForCompilerFeature(const char *option); static int CheckForLinkerFeature(const char *option); static int IsIn(const char *string, const char *substring); static int SubstituteFile(const char *substs, const char *filename); static int QualifyPath(const char *path); | | | 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 |
/* protos */
static int CheckForCompilerFeature(const char *option);
static int CheckForLinkerFeature(const char *option);
static int IsIn(const char *string, const char *substring);
static int SubstituteFile(const char *substs, const char *filename);
static int QualifyPath(const char *path);
static const char *GetVersionFromFile(const char *filename, const char *match, int numdots);
static DWORD WINAPI ReadFromPipe(LPVOID args);
/* globals */
#define CHUNK 25
#define STATICBUFFERSIZE 1000
typedef struct {
|
| ︙ | ︙ | |||
149 150 151 152 153 154 155 | "Extract a version from a file:\n" "eg: pkgIndex.tcl \"package ifneeded http\"", argv[0]); WriteFile(GetStdHandle(STD_ERROR_HANDLE), msg, chars, &dwWritten, NULL); return 0; } | | | 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 |
"Extract a version from a file:\n"
"eg: pkgIndex.tcl \"package ifneeded http\"",
argv[0]);
WriteFile(GetStdHandle(STD_ERROR_HANDLE), msg, chars,
&dwWritten, NULL);
return 0;
}
printf("%s\n", GetVersionFromFile(argv[2], argv[3], *(argv[1]+2) - '0'));
return 0;
case 'Q':
if (argc != 3) {
chars = snprintf(msg, sizeof(msg) - 1,
"usage: %s -Q path\n"
"Emit the fully qualified path\n"
"exitcodes: 0 == no, 1 == yes, 2 == error\n", argv[0]);
|
| ︙ | ︙ | |||
475 476 477 478 479 480 481 |
* following the match where a version is anything acceptable to
* package provide or package ifneeded.
*/
static const char *
GetVersionFromFile(
const char *filename,
| | > | 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 |
* following the match where a version is anything acceptable to
* package provide or package ifneeded.
*/
static const char *
GetVersionFromFile(
const char *filename,
const char *match,
int numdots)
{
size_t cbBuffer = 100;
static char szBuffer[100];
char *szResult = NULL;
FILE *fp = fopen(filename, "rt");
if (fp != NULL) {
|
| ︙ | ︙ | |||
505 506 507 508 509 510 511 | } /* * Find ending whitespace. */ q = p; | | > | 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 |
}
/*
* Find ending whitespace.
*/
q = p;
while (*q && (strchr("0123456789.ab", *q)) && ((!strchr(".ab", *q)
&& (!strchr("ab", q[-1])) || --numdots))) {
++q;
}
memcpy(szBuffer, p, q - p);
szBuffer[q-p] = 0;
szResult = szBuffer;
break;
|
| ︙ | ︙ |