Try and get things building on Windows.

davidgiven · davidgiven · commit dacf4f852f06 · 2025-04-17T02:00:38.000+02:00
diff --git a/Makefile b/Makefile
@@ -46,7 +46,7 @@ CFLAGS += -DWIN32
 endif
 
 HOSTCFLAGS = $(CFLAGS)
-ACKCFLAGS = -O -v -v -v
+ACKCFLAGS = -O
 
 LDFLAGS ?= -g
 
diff --git a/build/_sandbox.py b/build/_sandbox.py
@@ -26,7 +26,7 @@ def main():
                 print("link", sf)
             os.makedirs(dirname(sf), exist_ok=True)
             try:
-                os.link(abspath(f), sf)
+                os.symlink(abspath(f), sf)
             except PermissionError:
                 shutil.copy(f, sf)
 
@@ -38,6 +38,11 @@ def main():
             df = dirname(f)
             if df:
                 os.makedirs(df, exist_ok=True)
+
+            try:
+                os.remove(f)
+            except FileNotFoundError:
+                pass
             os.rename(sf, f)
 
 
diff --git a/build/ab.py b/build/ab.py
@@ -22,6 +22,8 @@
 import os
 from collections import namedtuple
 
+SANDBOX_ARG_COUNT = 500
+
 COMPRESS_MK_FILE = True
 
 verbose = False
diff --git a/build/c.py b/build/c.py
@@ -444,7 +444,7 @@ def programimpl(
     simplerule(
         replaces=self,
         ins=cfiles + libs,
-        outs=[f"={self.localname}$(EXT)"],
+        outs=[f"={self.localname}{toolchain.EXE}"],
         deps=deps,
         label=label,
         commands=commands,
diff --git a/build/toolchain.py b/build/toolchain.py
@@ -1,5 +1,10 @@
+import platform
+
+_is_windows = (platform.system() == "Windows")
+
 class Toolchain:
     PREFIX = ""
+    EXE = ".exe" if _is_windows else ""
 
 
 class HostToolchain(Toolchain):
diff --git a/lang/basic/src/build.py b/lang/basic/src/build.py
@@ -48,4 +48,4 @@
 )
 
 
-export(name="all", items={"$(PLATDEP)/em_bem": ".+em_bem"})
+export(name="all", items={"$(PLATDEP)/em_bem$(EXT)": ".+em_bem"})
diff --git a/lang/cem/cemcom.ansi/build.py b/lang/cem/cemcom.ansi/build.py
@@ -116,4 +116,4 @@
     ],
 )
 
-export(name="all", items={"$(PLATDEP)/em_cemcom.ansi": ".+cemcom"})
+export(name="all", items={"$(PLATDEP)/em_cemcom.ansi$(EXT)": ".+cemcom"})
diff --git a/lang/cem/cpp.ansi/build.py b/lang/cem/cpp.ansi/build.py
@@ -83,4 +83,4 @@
     ],
 )
 
-export(name="all", items={"$(PLATDEP)/cpp.ansi": ".+cpp.ansi"})
+export(name="all", items={"$(PLATDEP)/cpp.ansi$(EXT)": ".+cpp.ansi"})
diff --git a/lang/m2/comp/build.py b/lang/m2/comp/build.py
@@ -76,7 +76,7 @@
 export(
     name="all",
     items={
-        "$(PLATDEP)/em_m2": ".+em_m2",
+        "$(PLATDEP)/em_m2$(EXT)": ".+em_m2",
         "$(INSDIR)/share/man/man6/em_m2.6": "./em_m2.6",
     },
 )
diff --git a/lang/pc/comp/build.py b/lang/pc/comp/build.py
@@ -109,4 +109,4 @@
     ],
 )
 
-export(name="all", items={"$(PLATDEP)/em_pc": ".+em_pc"})
+export(name="all", items={"$(PLATDEP)/em_pc$(EXT)": ".+em_pc"})
diff --git a/modules/src/system/syssystem.c b/modules/src/system/syssystem.c
@@ -56,18 +56,40 @@ static char* append_escaped(char* buffer, const char* word)
 	return buffer;
 }
 
+#if defined WIN32
+static char* append_exename(char* buffer, const char* word)
+{
+	for (;;)
+	{
+		char c = *word++;
+		if (!c)
+			break;
+		if (c == '/')
+			c = '\\';
+		if (needs_escaping(c))
+			*buffer++ = ESCAPECHAR;
+		*buffer++ = c;
+	}
+	strcpy(buffer, ".exe");
+	buffer += 4;
+	return buffer;
+}
+#else
+#define append_exename append_escaped
+#endif
+
 int sys_system(const char* prog, const char* const* arglist)
 {
 	/* Calculate the maximum length of the command line. */
 
-	int len = strlen(prog) * 2 + 1;
+	int len = strlen(prog) * 2 + 4;
 	for (const char* const* arg = arglist+1; *arg; arg++)
 		len += strlen(*arg) * 2 + 1;
 
 	/* Now actually build the command line. */
 
 	char* cmdline = malloc(len + 1);
-	char* p = append_escaped(cmdline, prog);
+	char* p = append_exename(cmdline, prog);
 
 	for (const char* const* arg = arglist+1; *arg; arg++)
 	{
diff --git a/plat/cpm/build.py b/plat/cpm/build.py
@@ -19,9 +19,9 @@
 export(
     name="tools",
     items={
-        "$(PLATDEP)/cpm/as": ".+as",
-        "$(PLATDEP)/cpm/ncg": ".+ncg",
-        "$(PLATDEP)/cpm/top": ".+top",
+        "$(PLATDEP)/cpm/as$(EXT)": ".+as",
+        "$(PLATDEP)/cpm/ncg$(EXT)": ".+ncg",
+        "$(PLATDEP)/cpm/top$(EXT)": ".+top",
         "$(PLATIND)/descr/cpm": "./descr",
     },
 )
diff --git a/plat/linux386/build.py b/plat/linux386/build.py
@@ -15,8 +15,8 @@
 export(
     name="tools",
     items={
-        "$(PLATDEP)/linux386/as": ".+as",
-        "$(PLATDEP)/linux386/ncg": ".+ncg",
+        "$(PLATDEP)/linux386/as$(EXT)": ".+as",
+        "$(PLATDEP)/linux386/ncg$(EXT)": ".+ncg",
         "$(PLATIND)/descr/linux386": "./descr",
     },
 )
diff --git a/plat/linux68k/build.py b/plat/linux68k/build.py
@@ -19,8 +19,8 @@
 export(
     name="tools",
     items={
-        "$(PLATDEP)/linux68k/as": ".+as",
-        "$(PLATDEP)/linux68k/ncg": ".+ncg",
+        "$(PLATDEP)/linux68k/as$(EXT)": ".+as",
+        "$(PLATDEP)/linux68k/ncg$(EXT)": ".+ncg",
         "$(PLATIND)/descr/linux68k": "./descr",
     },
 )
diff --git a/plat/linuxmips/build.py b/plat/linuxmips/build.py
@@ -17,9 +17,9 @@
 export(
     name="tools",
     items={
-        "$(PLATDEP)/linuxmips/as": ".+as",
-        "$(PLATDEP)/linuxmips/mcg": ".+mcg",
-        "$(PLATDEP)/linuxmips/top": ".+top",
+        "$(PLATDEP)/linuxmips/as$(EXT)": ".+as",
+        "$(PLATDEP)/linuxmips/mcg$(EXT)": ".+mcg",
+        "$(PLATDEP)/linuxmips/top$(EXT)": ".+top",
         "$(PLATIND)/descr/linuxmips": "./descr",
     },
 )
diff --git a/plat/linuxppc/build.py b/plat/linuxppc/build.py
@@ -17,9 +17,9 @@
 export(
     name="tools",
     items={
-        "$(PLATDEP)/linuxppc/as": ".+as",
-        "$(PLATDEP)/linuxppc/ncg": ".+ncg",
-        "$(PLATDEP)/linuxppc/top": ".+top",
+        "$(PLATDEP)/linuxppc/as$(EXT)": ".+as",
+        "$(PLATDEP)/linuxppc/ncg$(EXT)": ".+ncg",
+        "$(PLATDEP)/linuxppc/top$(EXT)": ".+top",
         "$(PLATIND)/descr/linuxppc": "./descr",
     },
 )
diff --git a/plat/minix68k/build.py b/plat/minix68k/build.py
@@ -19,9 +19,9 @@
 export(
     name="tools",
     items={
-        "$(PLATDEP)/minix68k/as": ".+as",
-        "$(PLATDEP)/minix68k/ncg": ".+ncg",
-        "$(PLATDEP)/minix68k/cv": "./cv",
+        "$(PLATDEP)/minix68k/as$(EXT)": ".+as",
+        "$(PLATDEP)/minix68k/ncg$(EXT)": ".+ncg",
+        "$(PLATDEP)/minix68k/cv$(EXT)": "./cv",
         "$(PLATIND)/descr/minix68k": "./descr",
     },
 )
diff --git a/plat/msdos386/build.py b/plat/msdos386/build.py
@@ -32,8 +32,8 @@
 export(
     name="tools",
     items={
-        "$(PLATDEP)/msdos386/as": ".+as",
-        "$(PLATDEP)/msdos386/ncg": ".+ncg",
+        "$(PLATDEP)/msdos386/as$(EXT)": ".+as",
+        "$(PLATDEP)/msdos386/ncg$(EXT)": ".+ncg",
         "$(PLATIND)/descr/msdos386": "./descr",
     },
 )
diff --git a/plat/msdos86/build.py b/plat/msdos86/build.py
@@ -15,8 +15,8 @@
 export(
     name="tools",
     items={
-        "$(PLATDEP)/msdos86/as": ".+as",
-        "$(PLATDEP)/msdos86/ncg": ".+ncg",
+        "$(PLATDEP)/msdos86/as$(EXT)": ".+as",
+        "$(PLATDEP)/msdos86/ncg$(EXT)": ".+ncg",
         "$(PLATIND)/descr/msdos86": "./descr",
     },
 )
diff --git a/plat/osx/cvmach/build.py b/plat/osx/cvmach/build.py
@@ -10,4 +10,4 @@
     ],
 )
 
-export(name="all", items={"$(PLATDEP)/cvmach": ".+cvmach"})
+export(name="all", items={"$(PLATDEP)/cvmach$(EXT)": ".+cvmach"})
diff --git a/plat/osx386/build.py b/plat/osx386/build.py
@@ -15,8 +15,8 @@
 export(
     name="tools",
     items={
-        "$(PLATDEP)/osx386/as": ".+as",
-        "$(PLATDEP)/osx386/ncg": ".+ncg",
+        "$(PLATDEP)/osx386/as$(EXT)": ".+as",
+        "$(PLATDEP)/osx386/ncg$(EXT)": ".+ncg",
         "$(PLATIND)/descr/osx386": "./descr",
     },
 )
diff --git a/plat/osxppc/build.py b/plat/osxppc/build.py
@@ -17,9 +17,9 @@
 export(
     name="tools",
     items={
-        "$(PLATDEP)/osxppc/as": ".+as",
-        "$(PLATDEP)/osxppc/ncg": ".+ncg",
-        "$(PLATDEP)/osxppc/top": ".+top",
+        "$(PLATDEP)/osxppc/as$(EXT)": ".+as",
+        "$(PLATDEP)/osxppc/ncg$(EXT)": ".+ncg",
+        "$(PLATDEP)/osxppc/top$(EXT)": ".+top",
         "$(PLATIND)/descr/osxppc": "./descr",
     },
 )
diff --git a/plat/pc86/build.py b/plat/pc86/build.py
@@ -15,8 +15,8 @@
 export(
     name="tools",
     items={
-        "$(PLATDEP)/pc86/as": ".+as",
-        "$(PLATDEP)/pc86/ncg": ".+ncg",
+        "$(PLATDEP)/pc86/as$(EXT)": ".+as",
+        "$(PLATDEP)/pc86/ncg$(EXT)": ".+ncg",
         "$(PLATIND)/descr/pc86": "./descr",
     },
 )
diff --git a/plat/pdpv7/build.py b/plat/pdpv7/build.py
@@ -17,9 +17,9 @@
 export(
     name="tools",
     items={
-        "$(PLATDEP)/pdpv7/as": ".+as",
-        "$(PLATDEP)/pdpv7/cg": ".+cg",
-        "$(PLATDEP)/pdpv7/top": ".+top",
+        "$(PLATDEP)/pdpv7/as$(EXT)": ".+as",
+        "$(PLATDEP)/pdpv7/cg$(EXT)": ".+cg",
+        "$(PLATDEP)/pdpv7/top$(EXT)": ".+top",
         "$(PLATDEP)/pdpv7/cv": "./cv",
         "$(PLATIND)/descr/pdpv7": "./descr",
     },
diff --git a/plat/rpi/build.py b/plat/rpi/build.py
@@ -15,8 +15,8 @@
 export(
     name="tools",
     items={
-        "$(PLATDEP)/rpi/as": ".+as",
-        "$(PLATDEP)/rpi/ncg": ".+ncg",
+        "$(PLATDEP)/rpi/as$(EXT)": ".+as",
+        "$(PLATDEP)/rpi/ncg$(EXT)": ".+ncg",
         "$(PLATIND)/descr/rpi": "./descr",
     },
 )
diff --git a/util/ack/build.py b/util/ack/build.py
@@ -48,7 +48,7 @@
 export(
     name="all",
     items={
-        "$(INSDIR)/bin/ack": ".+ack",
+        "$(INSDIR)/bin/ack$(EXT)": ".+ack",
         "$(INSDIR)/share/man/man1/ack.1": "./ack.1.X",
         "$(PLATIND)/descr/fe": "lib/descr/fe",
     },
diff --git a/util/amisc/build.py b/util/amisc/build.py
@@ -11,7 +11,7 @@ def simpleprogram(name):
         deps=["h", "modules/src/object", "modules/src/system"],
     )
 
-    i[f"$(INSDIR)/bin/{name}"] = p
+    i[f"$(INSDIR)/bin/{name}$(EXT)"] = p
     i[f"$(INSDIR)/share/man/man1/{name}.1"] = f"./{name}.1"
 
 
diff --git a/util/arch/build.py b/util/arch/build.py
@@ -17,7 +17,7 @@
 export(
     name="all",
     items={
-        "$(INSDIR)/bin/aal": ".+aal",
+        "$(INSDIR)/bin/aal$(EXT)": ".+aal",
         "$(INSDIR)/share/man/man1/aal.1": "./aal.1",
     },
 )
diff --git a/util/ass/build.py b/util/ass/build.py
@@ -49,7 +49,7 @@
 export(
     name="all",
     items={
-        "$(PLATDEP)/em_ass": ".+ass",
+        "$(PLATDEP)/em_ass$(EXT)": ".+ass",
         "$(INSDIR)/share/man/man6/em_ass.6": "./em_ass.6",
     },
 )
diff --git a/util/ego/build.py b/util/ego/build.py
@@ -24,7 +24,7 @@ def build_ego_helper(name, srcs=[], deps=[]):
         + deps,
         cflags=["-DDEBUG", "-DVERBOSE", "-DNOTCOMPACT"],
     )
-    exports[f"$(PLATDEP)/ego/{name}"] = f".+{name}"
+    exports[f"$(PLATDEP)/ego/{name}$(EXT)"] = f".+{name}"
 
 
 def build_descr(name):
@@ -78,6 +78,6 @@ def build_descr(name):
 
 export(
     name="all",
-    items={"$(PLATDEP)/em_ego": ".+em_ego", "$(PLATDEP)/ego/ra": "./ra"}
+    items={"$(PLATDEP)/em_ego$(EXT)": ".+em_ego", "$(PLATDEP)/ego/ra$(EXT)": "./ra"}
     | exports,
 )
diff --git a/util/led/build.py b/util/led/build.py
@@ -17,7 +17,7 @@
 export(
     name="all",
     items={
-        "$(PLATDEP)/em_led": ".+led",
+        "$(PLATDEP)/em_led$(EXT)": ".+led",
         "$(INSDIR)/share/man/man6/led.6": "./led.6",
     },
 )
diff --git a/util/misc/build.py b/util/misc/build.py
@@ -34,7 +34,7 @@
 export(
     name="all",
     items={
-        "$(PLATDEP)/em_encode": ".+em_encode",
-        "$(PLATDEP)/em_decode": ".+em_decode",
+        "$(PLATDEP)/em_encode$(EXT)": ".+em_encode",
+        "$(PLATDEP)/em_decode$(EXT)": ".+em_decode",
     },
 )
diff --git a/util/opt/build.py b/util/opt/build.py
@@ -83,8 +83,8 @@ def build_variant(name, cflags):
 export(
     name="all",
     items={
-        "$(PLATDEP)/em_opt": ".+em_opt",
-        "$(PLATDEP)/em_opt2": ".+em_opt2",
+        "$(PLATDEP)/em_opt$(EXT)": ".+em_opt",
+        "$(PLATDEP)/em_opt2$(EXT)": ".+em_opt2",
         "$(INSDIR)/share/man/man6/em_opt.6": "./em_opt.6",
     },
 )

Original file line number	Diff line number	Diff line change
`@@ -48,4 +48,4 @@`
`48`	`48`	`)`
`49`	`49`
`50`	`50`
`51`		`-export(name="all", items={"$(PLATDEP)/em_bem": ".+em_bem"})`
	`51`	`+export(name="all", items={"$(PLATDEP)/em_bem$(EXT)": ".+em_bem"})`
Original file line number	Diff line number	Diff line change
`@@ -116,4 +116,4 @@`
`116`	`116`	`],`
`117`	`117`	`)`
`118`	`118`
`119`		`-export(name="all", items={"$(PLATDEP)/em_cemcom.ansi": ".+cemcom"})`
	`119`	`+export(name="all", items={"$(PLATDEP)/em_cemcom.ansi$(EXT)": ".+cemcom"})`
Original file line number	Diff line number	Diff line change
`@@ -83,4 +83,4 @@`
`83`	`83`	`],`
`84`	`84`	`)`
`85`	`85`
`86`		`-export(name="all", items={"$(PLATDEP)/cpp.ansi": ".+cpp.ansi"})`
	`86`	`+export(name="all", items={"$(PLATDEP)/cpp.ansi$(EXT)": ".+cpp.ansi"})`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@`
`76`	`76`	`export(`
`77`	`77`	`name="all",`
`78`	`78`	`items={`
`79`		`- "$(PLATDEP)/em_m2": ".+em_m2",`
	`79`	`+ "$(PLATDEP)/em_m2$(EXT)": ".+em_m2",`
`80`	`80`	`"$(INSDIR)/share/man/man6/em_m2.6": "./em_m2.6",`
`81`	`81`	`},`
`82`	`82`	`)`
Original file line number	Diff line number	Diff line change
`@@ -109,4 +109,4 @@`
`109`	`109`	`],`
`110`	`110`	`)`
`111`	`111`
`112`		`-export(name="all", items={"$(PLATDEP)/em_pc": ".+em_pc"})`
	`112`	`+export(name="all", items={"$(PLATDEP)/em_pc$(EXT)": ".+em_pc"})`