--- /dev/null
+#******************************************************************************
+# @file Makefile.wat
+#******************************************************************************
+SRCDIR ?= $(CURDIR)
+VPATH := $(SRCDIR)
+
+SRC := cstr.c hashtab.c lib.c read.c report.c rule.c variable.c xmake.c
+
+all: xmake.exe
+
+xmake.exe: $(SRC)
+
+ wcl -I.\\include -fe=$@ $^
+
+clean:
+
+ for /r %%f in (*.obj) do ( if exist %%f ( del /q %%f ) )
+ if exist xmake.exe ( del /q xmake.exe )
#include <string.h>
#include <xmake/hashtab.h>
-
static struct hashtab_entry *find_entry (struct hashtab_entry *entries, unsigned long capacity, struct hashtab_name *key);
static int adjust_capacity (struct hashtab *table, unsigned long new_capacity) {
return -2;
}
- for (i = 0; i < new_capacity; i++) {
+ for (i = 0; i < new_capacity; ++i) {
struct hashtab_entry *entry = &new_entries[i];
new_count = 0;
- for (i = 0; i < old_capacity; i++) {
+ for (i = 0; i < old_capacity; ++i) {
struct hashtab_entry *entry = &old_entries[i], *dest;
dest->key = entry->key;
dest->value = entry->value;
- new_count++;
+ ++new_count;
}
}
-static unsigned long hash_string (const void *p, unsigned long length) {
+static unsigned int hash_string (const void *p, unsigned int length) {
- const unsigned char *str = (const unsigned char *) p;
- unsigned long i, result = 0;
+ unsigned char *str = (unsigned char *) p;
+ unsigned int i;
+
+ unsigned int result = 0;
for (i = 0; i < length; i++) {
- result = (str[i] << 24) + (result >> 19) + (result << 16) + (result >> 13) + (str[i] << 8) - result;
+ result = (((unsigned short) str[i]) << 4) + (result >> 9) + result + (result >> 3) + (((unsigned short) str[i]) << 2) - (result << 12);
}
return result;
struct hashtab_name *hashtab_alloc_name (const char *str) {
+ unsigned int bytes = strlen (str), hash = hash_string (str, bytes);
struct hashtab_name *name;
- unsigned long bytes = strlen (str), hash = hash_string (str, bytes);
if ((name = malloc (sizeof (*name))) == NULL) {
return NULL;
if (entry->key == NULL) {
- table->count++;
+ ++table->count;
if (entry->value == NULL) {
- table->used++;
+ ++table->used;
}
}
#ifndef _HASHTAB_H
#define _HASHTAB_H
+#include <stddef.h>
+
+#define hashtab_get haget
+#define hashtab_put haput
+#define hashtab_remove haremove
+
+
struct hashtab_name {
const char *chars;
- unsigned long bytes, hash;
+ unsigned int bytes, hash;
};
(void) arg;
- fprintf (stderr, "Usage: %s [options] [target] ...\n\n", program_name);
- fprintf (stderr, "Options:\n\n");
+ if (program_name) {
- fprintf (stderr, " -B Ignored.\n");
- fprintf (stderr, "\n");
-
- fprintf (stderr, " -C DIRECTORY Change to DIRECTORY before doing anything.\n");
- fprintf (stderr, " -I DIRECTORY Search DIRECTORY for included makefiles.\n");
- fprintf (stderr, "\n");
-
- fprintf (stderr, " -f FILE Read FILE as a makefile.\n");
- fprintf (stderr, " -s Don't echo recipes.\n");
- fprintf (stderr, "\n");
+ fprintf (stderr, "Usage: %s [options] [target] ...\n\n", program_name);
+ fprintf (stderr, "Options:\n\n");
+
+ fprintf (stderr, " -B Ignored.\n");
+ fprintf (stderr, "\n");
+
+ fprintf (stderr, " -C DIRECTORY Change to DIRECTORY before doing anything.\n");
+ fprintf (stderr, " -I DIRECTORY Search DIRECTORY for included makefiles.\n");
+ fprintf (stderr, "\n");
+
+ fprintf (stderr, " -f FILE Read FILE as a makefile.\n");
+ fprintf (stderr, " -s Don't echo recipes.\n");
+ fprintf (stderr, "\n");
+
+ fprintf (stderr, " --no-print-directory Don't print the current directory.\n");
+ fprintf (stderr, " --help Print this help information.\n");
+
+ fprintf (stderr, "\n");
- fprintf (stderr, " --no-print-directory Don't print the current directory.\n");
- fprintf (stderr, " --help Print this help information.\n");
+ }
- fprintf (stderr, "\n");
exit (EXIT_SUCCESS);
+ return 0; /* Needed by wcl */
}
return ((dwAttrib != -1LU) && (dwAttrib & FILE_ATTRIBUTE_DIRECTORY));
}
-#else
+#elif defined (unix) || defined (__unix) || defined (__unix__) || defined (__APPLE__)
# include <dirent.h>
# include <unistd.h>
return 0;
+}
+#elif defined (__WATCOMC__)
+# include <i86.h>
+
+static char cwd[68] = { 0 }, *old_path = 0;
+
+char *get_current_directory (void) {
+
+ char path[65] = { 0 };
+
+ struct SREGS sr = { 0 };
+ union REGS r = { 0 };
+
+ int drive_no = 0;
+
+ r.w.ax = 0x1900;
+ int86x (0x21, &r, &r, &sr);
+
+ drive_no = r.h.al;
+ memset (cwd, 0, 67);
+
+ cwd[0] = drive_no + 'A';
+ cwd[1] = ':';
+ cwd[2] = '\\';
+
+ r.w.ax = 0x4700;
+ r.h.dl = 0;
+
+ r.w.si = FP_OFF (path);
+ sr.ds = FP_SEG (path);
+
+ int86x (0x21, &r, &r, &sr);
+
+ if (*path) {
+ sprintf (cwd + 3, "%s\\", path);
+ }
+
+ return cwd;
+
+}
+
+int change_directory (const char *path) {
+
+ struct SREGS sr = { 0 };
+ union REGS r = { 0 };
+
+ char *temp;
+ unsigned long len;
+
+ if (old_path) {
+
+ if ((len = strlen (old_path)) > 3) {
+
+ while (old_path[len - 1] == '\\') {
+ old_path[--len] = '\0';
+ }
+
+ }
+
+ r.w.ax = 0x3b00;
+ r.w.dx = FP_OFF (old_path);
+
+ sr.ds = FP_SEG (old_path);
+ int86x (0x21, &r, &r, &sr);
+
+ free (old_path);
+
+ }
+
+ if (strlen (path) >= 2 && isalpha ((int) path[0]) && path[1] == ':') {
+
+ r.h.dl = path[0] - 'A';
+
+ r.w.ax = 0x0e00;
+ int86 (0x21, &r, &r);
+
+ }
+
+ old_path = xstrdup (get_current_directory ());
+
+ if ((len = strlen (temp = xstrdup (path))) > 3) {
+
+ while (temp[len - 1] == '\\') {
+ temp[--len] = '\0';
+ }
+
+ }
+
+ r.w.ax = 0x3b00;
+ r.w.dx = FP_OFF (temp);
+
+ sr.ds = FP_SEG (temp);
+ int86x (0x21, &r, &r, &sr);
+
+ free (temp);
+
+ if (r.w.cflag & 1) {
+ return 0;
+ }
+
+ return 1;
+
+}
+
+int directory_exists (const char *path) {
+
+ struct SREGS sr = { 0 };
+ union REGS r = { 0 };
+
+ char *temp = xstrdup (path);
+ unsigned len = strlen (temp);
+
+ if (len > 3) {
+
+ while (temp[len - 1] == '\\') {
+ temp[--len] = '\0';
+ }
+
+ }
+
+ r.w.ax = 0x4300;
+ r.w.dx = FP_OFF (temp);
+
+ sr.ds = FP_SEG (temp);
+ int86x (0x21, &r, &r, &sr);
+
+ free (temp);
+ return (!(r.w.cflag & 1) && (r.w.cx & 0x10));
+
}
#endif
fprintf (stderr, "%s: %s:%lu: *** failed to include '%s'. Stop.\n", program_name, src_filename, line_no, filename);
exit (EXIT_FAILURE);
+
+ return 1; /* Needed for wcl */
}
fprintf (stderr, "%s: %s:%lu: *** %s. Stop.\n", program_name, filename, line_no, input);
exit (EXIT_FAILURE);
+
+ return 0; /* Needed by wcl */
}
-#if !defined (__PDOS__) && !defined (__MSDOS__)
-# if defined (_WIN32) || defined (__WIN32__)
-# include <windows.h>
+#if defined (_WIN32) || defined (__WIN32__)
+# include <windows.h>
static char *internal_commands[] = {
"assoc",
return lbuf.start;
}
-# else
-# include <sys/wait.h>
-# include <errno.h>
-# include <unistd.h>
+#elif defined (unix) || defined (__unix) || defined (__unix__) || defined (__APPLE__)
+# include <sys/wait.h>
+# include <errno.h>
+# include <unistd.h>
static char *func_shell (const char *filename, unsigned long line_no, char *input) {
int pipefd[2], pid, status;
return lbuf.start;
}
-# endif
#endif
static struct builtin_function builtin_functions[] ={
{ "error", &func_error },
-#if !defined (__PDOS__) && !defined (__MSDOS__)
+#if defined (_WIN32) || defined (__WIN32__) || defined (unix) || defined (__unix) || defined (__unix__) || defined (__APPLE__)
{ "shell", &func_shell },
#endif
} else if (opt == VAR_SHELL) {
-#if defined (__PDOS__) || defined (__MSDOS__)
-
- fprintf (stderr, "%s: 'MACRO != value' isn't supported due to OS limitations. Stop.\n", program_name);
- exit (EXIT_FAILURE);
+#if defined (_WIN32) || defined (__WIN32__) || defined (unix) || defined (__unix) || defined (__unix__) || defined (__APPLE__)
-#else
-
char *temp = xstrdup (new_value);
free (new_value);
new_value = variable_expand_line (filename, line_no, func_shell (filename, line_no, temp));
free (temp);
+
+#else
+
+ fprintf (stderr, "%s: 'MACRO != value' isn't supported due to OS limitations. Stop.\n", program_name);
+ exit (EXIT_FAILURE);
#endif
struct xmake_state *state = 0;
const char *program_name = 0;
-#if defined (_WIN32) || defined (__WIN32__)
-const char *os_name = "Windows_NT";
-#elif defined (__PDOS__)
-const char *os_name = "PDOS";
+const char *os_name = "";
+
+#if defined (__PDOS__)
+os_name = "PDOS";
+#elif defined (_WIN32) || defined (__WIN32__)
+os_name = "Windows_NT";
#elif defined (__MSDOS__)
-const char *os_name = "MSDOS";
+os_name = "MSDOS";
#elif defined (__APPLE__)
-const char *os_name = "Apple";
+os_name = "Apple";
#elif defined (__linux__)
-const char *os_name = "Linux";
-#else
-const char *os_name = "Unix";
+os_name = "Linux";
+#elif defined (unix) || defined (__unix) || defined (__unix__)
+os_name = "Unix";
#endif
struct linebuf {
static int doing_inference_rule_commands = 0;
-#if !defined (__PDOS__) && !defined (__MSDOS__)
-# if defined (_WIN32) || defined (__WIN32__)
-# include <windows.h>
+#if defined (_WIN32) || defined (__WIN32__)
+# include <windows.h>
static void pipe_command (const char *filename, unsigned long line_no, char *input, int is_ignoring_errors, const char *name) {
DWORD dwExitCode;
}
}
-# else
-# include <sys/wait.h>
-# include <errno.h>
-# include <unistd.h>
+#elif defined (_WIN32) || defined (__WIN32__) || defined (unix) || defined (__unix) || defined (__unix__) || defined (__APPLE__)
+# include <sys/wait.h>
+# include <errno.h>
+# include <unistd.h>
static void pipe_command (const char *filename, unsigned long line_no, char *input, int is_ignoring_errors, const char *name) {
int pipefd[2], pid, status;
}
}
-# endif
#endif
static int rule_run_command (const char *filename, unsigned long line_no, const char *name, char *p, char *q) {
if (should_execute) {
-#if defined (__PDOS__) || defined (__MSDOS__)
-
+#if defined (_WIN32) || defined (__WIN32__) || defined (unix) || defined (__unix) || defined (__unix__) || defined (__APPLE__)
+ pipe_command (filename, line_no, s, is_ignoring_errors, name);
+#else
int status = system (s);
if (!is_ignoring_errors && status) {
fprintf (stderr, "%s: *** [%s:%lu: %s] Error %d\n", program_name, filename, line_no, name, status);
}
-
-#else
- pipe_command (filename, line_no, s, is_ignoring_errors, name);
#endif
}
int main (int argc, char **argv) {
+ char *cwd = 0;
int ret;
+
unsigned long i;
if (argc && *argv) {
if (state->nb_directories > 0) {
char *arg;
- size_t len = 0;
-
- char *cwd = get_current_directory ();
unsigned long i;
+ size_t len = 0;
+
+ cwd = xstrdup (get_current_directory ());
state->path = xmalloc (strlen (cwd) + 2);
+
+#if defined (_WIN32) || defined (__WIN32__) || defined (unix) || defined (__unix) || defined (__unix__) || defined (__APPLE__)
len = sprintf (state->path, "%s/", cwd);
+#else
+ len = sprintf (state->path, "%s", cwd);
+#endif
for (i = 0; i < state->nb_directories; i++) {
arg = state->directories[i];
-#if defined (_WIN32)
- if (strlen (arg) < 3 || !(isalpha ((int) arg[0]) && arg[1] == ':' && (arg[2] == '/' || arg[2] == '\\'))) {
-#else
+#if defined (unix) || defined (__unix) || defined (__unix__) || defined (__APPLE__)
if (arg[0] != '/') {
-#endif
-
+#else
+ if (strlen (arg) < 2 || !(isalpha ((int) arg[0]) && arg[1] == ':')) {
+#endif
state->path = xrealloc (state->path, len + strlen (arg) + 2);
+#if defined (_WIN32) || defined (__WIN32__) || defined (unix) || defined (__unix) || defined (__unix__) || defined (__APPLE__)
len += sprintf (state->path + len, "%s/", arg);
+#else
+ len += sprintf (state->path + len, "%s\\", arg);
+#endif
+
state->path[len] = '\0';
} else {
+ unsigned long len = strlen (arg);
free (state->path);
- state->path = xmalloc (strlen (arg) + 1);
+ state->path = xmalloc (len + 2);
+
+#if defined (_WIN32) || defined (__WIN32__) || defined (unix) || defined (__unix) || defined (__unix__) || defined (__APPLE__)
len = sprintf (state->path, "%s/", arg);
+#else
+ len = sprintf (state->path, "%s\\", arg);
+#endif
}
out:
if (state->nb_directories > 0 && !state->no_print) {
+
fprintf (stderr, "%s: Leaving directory '%s'\n", program_name, state->path);
+ if (cwd) { change_directory (cwd); }
+
}
return ret;
projects / xmake.git / commitdiff