summaryrefslogtreecommitdiff
path: root/variable.c
diff options
context:
space:
mode:
authorRoland McGrath <roland@redhat.com>1996-05-22 21:51:45 +0000
committerRoland McGrath <roland@redhat.com>1996-05-22 21:51:45 +0000
commite7a525c5d53029de18871890196b665c803e98d3 (patch)
tree1edeb907cbe04f4136523d71c10536764dfbe01b /variable.c
parentd369e0531ab0715a05ac72c86f3d2fddcb8c817c (diff)
downloadgunmake-e7a525c5d53029de18871890196b665c803e98d3.tar.gz
Wed May 15 10:14:14 CDT 1996 Rob Tulloh <tulloh@tivoli.com>
* dir.c: WIN32 does not support inode. For now, fully qualified pathname along with st_mtime will be keys for files. Fixed problem where vpath can be confused when files are added to a directory after the directory has already been read in. The code now attempts to reread the directory if it discovers that the datestamp on the directory has changed since it was cached by make. This problem only seems to occur on WIN32 right now so it is lumped under port #ifdef WIN32. * function.c: WIN32: call subproc library (CreateProcess()) instead of fork/exec. * job.c: WIN32: Added the code to do fork/exec/waitpid style processing on WIN32 systems via calls to subproc library. * main.c: WIN32: Several things added here. First, there is code for dealing with PATH and SHELL defaults. Make tries to figure out if the user has %PATH% set in the environment and sets it to %Path% if it is not set already. Make also looks to see if sh.exe is anywhere to be found. Code path through job.c will change based on existence of a working Bourne shell. The checking for default shell is done twice: once before makefiles are read in and again after. Fall back to MSDOS style execution mode if no sh.exe is found. Also added some debug support that allows user to pause make with -D switch and attach a debugger. This is especially useful for debugging recursive calls to make where problems appear only in the sub-make. * make.h: WIN32: A few macros and header files for WIN32 support. * misc.c: WIN32: Added a function end_of_token_w32() to assist in parsing code in read.c. * read.c: WIN32: Fixes similar to MSDOS which allow colon to appear in filenames. Use of colon in filenames would otherwise confuse make. * remake.c: WIN32: Added include of io.h to eliminate compiler warnings. Added some code to default LIBDIR if it is not set on WIN32. * variable.c: WIN32: Added support for detecting Path/PATH and converting them to semicolon separated lists for make's internal use. New function sync_Path_environment() which is called in job.c and function.c before creating a new process. Caller must set Path in environment since we don't have fork() to do this for us. * vpath.c: WIN32: Added detection for filenames containing forward or backward slashes. * NMakefile: WIN32: Visual C compatible makefile for use with nmake. Use this to build GNU make the first time on Windows NT or Windows 95. * README.WIN32: WIN32: Contains some helpful notes. * build_w32.bat: WIN32: If you don't like nmake, use this the first time you build GNU make on Windows NT or Windows 95. * config.h.WIN32: WIN32 version of config.h * subproc.bat: WIN32: A bat file used to build the subproc library from the top-level NMakefile. Needed because WIndows 95 (nmake) doesn't allow you to cd in a make rule. * w32/include/dirent.h * w32/compat/dirent.c: WIN32: opendir, readdir, closedir, etc. * w32/include/pathstuff.h: WIN32: used by files needed functions defined in pathstuff.c (prototypes). * w32/include/sub_proc.h: WIN32: prototypes for subproc.lib functions. * w32/include/w32err.h: WIN32: prototypes for w32err.c. * w32/pathstuff.c: WIN32: File and Path/Path conversion functions. * w32/subproc/build.bat: WIN32: build script for subproc library if you don't wish to use nmake. * w32/subproc/NMakefile: WIN32: Visual C compatible makefile for use with nmake. Used to build subproc library. * w32/subproc/misc.c: WIN32: subproc library support code * w32/subproc/proc.h: WIN32: subproc library support code * w32/subproc/sub_proc.c: WIN32: subproc library source code * w32/subproc/w32err.c: WIN32: subproc library support code
Diffstat (limited to 'variable.c')
-rw-r--r--variable.c48
1 files changed, 48 insertions, 0 deletions
diff --git a/variable.c b/variable.c
index 65b9ccc..3bdf65b 100644
--- a/variable.c
+++ b/variable.c
@@ -22,6 +22,9 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#include "job.h"
#include "commands.h"
#include "variable.h"
+#ifdef WIN32
+#include "pathstuff.h"
+#endif
/* Hash table of all global variable definitions. */
@@ -351,7 +354,11 @@ merge_variable_set_lists (setlist0, setlist1)
void
define_automatic_variables ()
{
+#ifdef WIN32
+ extern char* default_shell;
+#else
extern char default_shell[];
+#endif
register struct variable *v;
char buf[200];
@@ -539,11 +546,25 @@ target_environment (file)
&& v->origin != o_env && v->origin != o_env_override)
{
char *value = recursively_expand (v);
+#ifdef WIN32
+ if (strcmp(v->name, "Path") == 0 ||
+ strcmp(v->name, "PATH") == 0)
+ convert_Path_to_win32(value, ';');
+#endif
result[nvariables++] = concat (v->name, "=", value);
free (value);
}
else
+#ifdef WIN32
+ {
+ if (strcmp(v->name, "Path") == 0 ||
+ strcmp(v->name, "PATH") == 0)
+ convert_Path_to_win32(v->value, ';');
+ result[nvariables++] = concat (v->name, "=", v->value);
+ }
+#else
result[nvariables++] = concat (v->name, "=", v->value);
+#endif
}
}
result[nvariables] = (char *) xmalloc (100);
@@ -862,3 +883,30 @@ print_file_variables (file)
if (file->variables != 0)
print_variable_set (file->variables->set, "# ");
}
+
+#ifdef WIN32
+void
+sync_Path_environment(void)
+{
+ char* path = allocated_variable_expand("$(Path)");
+ static char* environ_path = NULL;
+
+ if (!path)
+ return;
+
+ /*
+ * If done this before, don't leak memory unnecessarily.
+ * Free the previous entry before allocating new one.
+ */
+ if (environ_path)
+ free(environ_path);
+
+ /*
+ * Create something WIN32 world can grok
+ */
+ convert_Path_to_win32(path, ';');
+ environ_path = concat("Path", "=", path);
+ putenv(environ_path);
+ free(path);
+}
+#endif