qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-02-17 01:11:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

default sourcedir to "" rather than "./" and strip leading paths from the

Browse source 
tempname when preserving temps
This commit is contained in:
Bill Currie 2002-02-05 22:08:19 +00:00
parent 94d2f2bee4
commit 16298914f0
1 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
tools/qfcc/source/qfcc.c
View file

@ -811,7 +811,7 @@ DecodeArgs (int argc, char **argv)
options.save_temps = false; options.save_temps = false;
options.verbosity = 0; options.verbosity = 0;
sourcedir = "."; sourcedir = "";
progs_src = "progs.src"; progs_src = "progs.src";
while ((c = getopt_long (argc, argv, "s:" // source dir while ((c = getopt_long (argc, argv, "s:" // source dir
@ -1010,7 +1010,7 @@ main (int argc, char **argv)
DecodeArgs (argc, argv); DecodeArgs (argc, argv);
if (strcmp (sourcedir, ".")) { if (strcmp (sourcedir, "")) {
printf ("Source directory: %s\n", sourcedir); printf ("Source directory: %s\n", sourcedir);
} }
if (strcmp (progs_src, "progs.src")) { if (strcmp (progs_src, "progs.src")) {
@ -1021,7 +1021,10 @@ main (int argc, char **argv)
InitData (); InitData ();
if (*sourcedir)
snprintf (filename, sizeof (filename), "%s/%s", sourcedir, progs_src); snprintf (filename, sizeof (filename), "%s/%s", sourcedir, progs_src);
else
snprintf (filename, sizeof (filename), "%s", progs_src);
LoadFile (filename, (void *) &src); LoadFile (filename, (void *) &src);
if (!(src = Parse (src))) if (!(src = Parse (src)))
@ -1076,8 +1079,11 @@ main (int argc, char **argv)
// extern int yydebug; // extern int yydebug;
// yydebug = 1; // yydebug = 1;
if (*sourcedir)
snprintf (filename, sizeof (filename), "%s%c%s", sourcedir, snprintf (filename, sizeof (filename), "%s%c%s", sourcedir,
PATH_SEPARATOR, qfcc_com_token); PATH_SEPARATOR, qfcc_com_token);
else
snprintf (filename, sizeof (filename), "%s", qfcc_com_token);
if (options.verbosity >= 2) if (options.verbosity >= 2)
printf ("compiling %s\n", filename); printf ("compiling %s\n", filename);
@ -1088,11 +1094,20 @@ main (int argc, char **argv)
char *temp; char *temp;
temp = strrchr (basename, '.'); temp = strrchr (basename, '.');
if (temp) if (temp)
*temp = '\0'; // ignore the rest of the string *temp = '\0'; // ignore the rest of the string
snprintf (tempname, sizeof (tempname), "%s.p", basename); temp = strrchr (basename, '/');
if (!temp)
temp = basename;
else
temp++;
if (*sourcedir)
snprintf (tempname, sizeof (tempname), "%s%c%s", sourcedir,
PATH_SEPARATOR, temp);
else
snprintf (tempname, sizeof (tempname), "%s.p", temp);
free (basename); free (basename);
} else { } else {
temp1 = getenv ("TMPDIR"); temp1 = getenv ("TMPDIR");