From 2017f395a04437fbf4365c81e6fc0a56d25635e8 Mon Sep 17 00:00:00 2001 From: mgroeber9110 Date: Sat, 30 Dec 2023 14:38:15 +0100 Subject: [PATCH 1/6] Turn off build of "AB" (Auto Browsing) and "JSAB" products that cause spurious glue asserts (workaround #120) --- Installed/Appl/Breadbox/BbxBrow/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Installed/Appl/Breadbox/BbxBrow/Makefile b/Installed/Appl/Breadbox/BbxBrow/Makefile index 36ab99ba2..6bf495756 100644 --- a/Installed/Appl/Breadbox/BbxBrow/Makefile +++ b/Installed/Appl/Breadbox/BbxBrow/Makefile @@ -38,7 +38,7 @@ SRCS = $(JS) $(URLFRAME) $(URLTEXT) $(ASMTOOLS) $(INIT)\ $(COMMON) LOBJS = -PRODUCTS = AB JSAB +PRODUCTS = SYSMAKEFILE = geode.mk From 0d5ceaeb1a4a61f5aabe32fb5f0e46e9cb54c5c0 Mon Sep 17 00:00:00 2001 From: mgroeber9110 Date: Mon, 1 Jan 2024 17:53:15 +0100 Subject: [PATCH 2/6] Remove last remaining .rev file under Installed --- Installed/Appl/Breadbox/ftpc/ftpc.rev | 298 -------------------------- 1 file changed, 298 deletions(-) delete mode 100644 Installed/Appl/Breadbox/ftpc/ftpc.rev diff --git a/Installed/Appl/Breadbox/ftpc/ftpc.rev b/Installed/Appl/Breadbox/ftpc/ftpc.rev deleted file mode 100644 index a5af87d29..000000000 --- a/Installed/Appl/Breadbox/ftpc/ftpc.rev +++ /dev/null @@ -1,298 +0,0 @@ -R 0.0.1.22 <16:16:26 Jun 27, 2001> <> -R 0.0.1.21 <16:16:22 Jun 27, 2001> <> -R 0.0.1.20 <14:54:59 Nov 15, 1999> <> -R 0.0.1.19 <14:24:46 Nov 15, 1999> <> -R 0.0.1.18 <14:19:59 Nov 15, 1999> <> -R 0.0.1.17 <14:09:01 Nov 15, 1999> <> -R 0.0.1.16 <14:01:45 Nov 15, 1999> <> -R 0.0.1.15 <14:01:11 Nov 15, 1999> <> -R 0.0.1.14 <13:35:50 Nov 15, 1999> <> -R 0.0.1.13 <13:35:24 Nov 15, 1999> <> -R 0.0.1.12 <13:35:03 Nov 15, 1999> <> -R 0.0.1.11 <13:32:42 Nov 15, 1999> <> -R 0.0.1.10 <13:31:51 Nov 15, 1999> <> -R 0.0.1.9 <15:19:33 Nov 8, 1999> <> -R 0.0.1.8 <15:19:04 Nov 8, 1999> <> -R 0.0.1.7 <15:18:39 Nov 8, 1999> <> -R 0.0.1.6 <15:18:34 Nov 8, 1999> <> -R 0.0.1.5 <15:00:55 Nov 8, 1999> <> -R 0.0.1.4 <15:00:52 Nov 8, 1999> <> -R 0.0.1.3 <15:00:43 Nov 8, 1999> <> -R 0.0.1.2 <15:00:31 Nov 8, 1999> <> -R 0.0.1.1 <15:00:29 Nov 8, 1999> <> -R 0.0.1.0 <14.55:00 Nov 8, 1999> -P 1.0 -R 0.0.0.272 <8:35:37 Mar 19, 1999> <> -R 0.0.0.271 <8:34:29 Mar 19, 1999> <> -R 0.0.0.270 <8:33:44 Mar 19, 1999> <> -R 0.0.0.269 <8:33:28 Mar 19, 1999> <> -R 0.0.0.268 <8:33:05 Mar 19, 1999> <> -R 0.0.0.267 <8:31:29 Mar 19, 1999> <> -R 0.0.0.266 <8:28:59 Mar 19, 1999> <> -R 0.0.0.265 <8:27:18 Mar 19, 1999> <> -R 0.0.0.264 <8:27:07 Mar 19, 1999> <> -R 0.0.0.263 <8:26:26 Mar 19, 1999> <> -R 0.0.0.262 <8:26:16 Mar 19, 1999> <> -R 0.0.0.261 <8:25:27 Mar 19, 1999> <> -R 0.0.0.260 <8:25:02 Mar 19, 1999> <> -R 0.0.0.259 <8:24:52 Mar 19, 1999> <> -R 0.0.0.258 <8:23:58 Mar 19, 1999> <> -R 0.0.0.257 <8:23:30 Mar 19, 1999> <> -R 0.0.0.256 <8:10:39 Mar 19, 1999> <> -R 0.0.0.255 <8:03:52 Mar 19, 1999> <> -R 0.0.0.254 <7:52:25 Mar 19, 1999> <> -R 0.0.0.253 <7:51:46 Mar 19, 1999> <> -R 0.0.0.252 <7:46:58 Mar 19, 1999> <> -R 0.0.0.251 <7:46:31 Mar 19, 1999> <> -R 0.0.0.250 <7:34:21 Mar 19, 1999> <> -R 0.0.0.249 <7:34:04 Mar 19, 1999> <> -R 0.0.0.248 <7:29:34 Mar 19, 1999> <> -R 0.0.0.247 <7:22:57 Mar 19, 1999> <> -R 0.0.0.246 <7:09:12 Mar 19, 1999> <> -R 0.0.0.245 <7:04:10 Mar 19, 1999> <> -R 0.0.0.244 <6:58:21 Mar 19, 1999> <> -R 0.0.0.243 <6:58:07 Mar 19, 1999> <> -R 0.0.0.242 <6:57:29 Mar 19, 1999> <> -R 0.0.0.241 <6:57:11 Mar 19, 1999> <> -R 0.0.0.240 <6:52:14 Mar 19, 1999> <> -R 0.0.0.239 <6:39:48 Mar 19, 1999> <> -R 0.0.0.238 <6:39:24 Mar 19, 1999> <> -R 0.0.0.237 <6:31:50 Mar 19, 1999> <> -R 0.0.0.236 <6:31:29 Mar 19, 1999> <> -R 0.0.0.235 <6:23:07 Mar 19, 1999> <> -R 0.0.0.234 <6:18:01 Mar 19, 1999> <> -R 0.0.0.233 <6:06:41 Mar 19, 1999> <> -R 0.0.0.232 <6:03:02 Mar 19, 1999> <> -R 0.0.0.231 <5:57:40 Mar 19, 1999> <> -R 0.0.0.230 <5:57:21 Mar 19, 1999> <> -R 0.0.0.229 <5:43:56 Mar 19, 1999> <> -R 0.0.0.228 <5:43:46 Mar 19, 1999> <> -R 0.0.0.227 <5:43:07 Mar 19, 1999> <> -R 0.0.0.226 <5:42:13 Mar 19, 1999> <> -R 0.0.0.225 <5:06:16 Mar 19, 1999> <> -R 0.0.0.224 <5:06:00 Mar 19, 1999> <> -R 0.0.0.223 <5:03:02 Mar 19, 1999> <> -R 0.0.0.222 <5:02:19 Mar 19, 1999> <> -R 0.0.0.221 <3:18:28 Mar 19, 1999> <> -R 0.0.0.220 <3:18:27 Mar 19, 1999> <> -R 0.0.0.219 <3:18:03 Mar 19, 1999> <> -R 0.0.0.218 <2:35:36 Mar 19, 1999> <> -R 0.0.0.217 <2:34:42 Mar 19, 1999> <> -R 0.0.0.216 <2:26:39 Mar 19, 1999> <> -R 0.0.0.215 <2:16:55 Mar 19, 1999> <> -R 0.0.0.214 <2:16:31 Mar 19, 1999> <> -R 0.0.0.213 <1:21:20 Mar 19, 1999> <> -R 0.0.0.212 <1:14:30 Mar 19, 1999> <> -R 0.0.0.211 <0:34:17 Mar 19, 1999> <> -R 0.0.0.210 <0:08:07 Mar 19, 1999> <> -R 0.0.0.209 <13:02:44 Mar 16, 1999> <> -R 0.0.0.208 <12:42:02 Mar 16, 1999> <> -R 0.0.0.207 <12:41:48 Mar 16, 1999> <> -R 0.0.0.206 <12:20:41 Mar 16, 1999> <> -R 0.0.0.205 <12:20:37 Mar 16, 1999> <> -R 0.0.0.204 <12:19:44 Mar 16, 1999> <> -R 0.0.0.203 <12:18:01 Mar 16, 1999> <> -R 0.0.0.202 <12:17:01 Mar 16, 1999> <> -R 0.0.0.201 <12:16:29 Mar 16, 1999> <> -R 0.0.0.200 <12:15:57 Mar 16, 1999> <> -R 0.0.0.199 <12:15:49 Mar 16, 1999> <> -R 0.0.0.198 <12:14:59 Mar 16, 1999> <> -R 0.0.0.197 <12:14:03 Mar 16, 1999> <> -R 0.0.0.196 <11:50:55 Mar 16, 1999> <> -R 0.0.0.195 <11:49:43 Mar 16, 1999> <> -R 0.0.0.194 <11:44:15 Mar 16, 1999> <> -R 0.0.0.193 <11:38:49 Mar 16, 1999> <> -R 0.0.0.192 <11:38:45 Mar 16, 1999> <> -R 0.0.0.191 <11:30:44 Mar 16, 1999> <> -R 0.0.0.190 <11:24:59 Mar 16, 1999> <> -R 0.0.0.189 <10:42:09 Mar 18, 1999> <> -R 0.0.0.188 <10:42:05 Mar 18, 1999> <> -R 0.0.0.187 <8:39:10 Jan 28, 1999> <> -R 0.0.0.186 <7:43:33 Jan 28, 1999> <> -R 0.0.0.185 <7:43:22 Jan 28, 1999> <> -R 0.0.0.184 <7:42:39 Jan 28, 1999> <> -R 0.0.0.183 <7:40:41 Jan 28, 1999> <> -R 0.0.0.182 <17:34:39 Jan 19, 1999> <> -R 0.0.0.181 <16:58:00 Jan 14, 1999> <> -R 0.0.0.180 <16:56:44 Jan 14, 1999> <> -R 0.0.0.179 <16:54:45 Jan 14, 1999> <> -R 0.0.0.178 <16:51:04 Jan 14, 1999> <> -R 0.0.0.177 <16:09:38 Jan 14, 1999> <> -R 0.0.0.176 <16:07:46 Jan 14, 1999> <> -R 0.0.0.175 <16:07:29 Jan 14, 1999> <> -R 0.0.0.174 <22:15:31 Dec 30, 1998> <> -R 0.0.0.173 <21:22:50 Dec 30, 1998> <> -R 0.0.0.172 <21:20:04 Dec 30, 1998> <> -R 0.0.0.171 <20:58:11 Dec 30, 1998> <> -R 0.0.0.170 <23:19:35 Dec 29, 1998> <> -R 0.0.0.169 <23:14:43 Dec 29, 1998> <> -R 0.0.0.168 <22:55:59 Dec 29, 1998> <> -R 0.0.0.167 <22:49:09 Dec 29, 1998> <> -R 0.0.0.166 <22:47:41 Dec 29, 1998> <> -R 0.0.0.165 <17:10:27 Dec 3, 1998> <> -R 0.0.0.164 <21:06:19 Dec 2, 1998> <> -R 0.0.0.163 <20:48:52 Dec 2, 1998> <> -R 0.0.0.162 <20:09:57 Dec 2, 1998> <> -R 0.0.0.161 <23:22:34 Dec 1, 1998> <> -R 0.0.0.160 <23:11:04 Dec 1, 1998> <> -R 0.0.0.159 <23:04:53 Dec 1, 1998> <> -R 0.0.0.158 <22:55:49 Dec 1, 1998> <> -R 0.0.0.157 <21:53:04 Dec 1, 1998> <> -R 0.0.0.156 <21:34:17 Dec 1, 1998> <> -R 0.0.0.155 <21:32:57 Dec 1, 1998> <> -R 0.0.0.154 <21:21:24 Dec 1, 1998> <> -R 0.0.0.153 <21:08:56 Dec 1, 1998> <> -R 0.0.0.152 <20:40:38 Dec 1, 1998> <> -R 0.0.0.151 <17:19:31 Dec 1, 1998> <> -R 0.0.0.150 <16:48:42 Dec 1, 1998> <> -R 0.0.0.149 <19:06:45 Nov 30, 1998> <> -R 0.0.0.148 <18:42:53 Nov 30, 1998> <> -R 0.0.0.147 <18:42:40 Nov 30, 1998> <> -R 0.0.0.146 <18:42:29 Nov 30, 1998> <> -R 0.0.0.145 <1:26:49 Nov 30, 1998> <> -R 0.0.0.144 <1:25:09 Nov 30, 1998> <> -R 0.0.0.143 <1:14:05 Nov 30, 1998> <> -R 0.0.0.142 <0:50:50 Nov 30, 1998> <> -R 0.0.0.141 <0:39:17 Nov 30, 1998> <> -R 0.0.0.140 <0:20:57 Nov 30, 1998> <> -R 0.0.0.139 <0:10:05 Nov 30, 1998> <> -R 0.0.0.138 <23:40:31 Nov 29, 1998> <> -R 0.0.0.137 <23:01:24 Nov 29, 1998> <> -R 0.0.0.136 <23:00:11 Nov 29, 1998> <> -R 0.0.0.135 <22:53:19 Nov 29, 1998> <> -R 0.0.0.134 <0:44:10 Nov 29, 1998> <> -R 0.0.0.133 <0:13:45 Nov 29, 1998> <> -R 0.0.0.132 <19:44:21 Nov 28, 1998> <> -R 0.0.0.131 <18:08:12 Nov 27, 1998> <> -R 0.0.0.130 <0:09:05 Nov 6, 1998> <> -R 0.0.0.129 <23:58:28 Nov 5, 1998> <> -R 0.0.0.128 <23:34:27 Nov 5, 1998> <> -R 0.0.0.127 <23:19:20 Nov 4, 1998> <> -R 0.0.0.126 <22:55:29 Nov 4, 1998> <> -R 0.0.0.125 <22:31:09 Nov 4, 1998> <> -R 0.0.0.124 <21:58:53 Nov 4, 1998> <> -R 0.0.0.123 <21:57:47 Nov 4, 1998> <> -R 0.0.0.122 <21:56:10 Nov 4, 1998> <> -R 0.0.0.121 <21:51:57 Nov 4, 1998> <> -R 0.0.0.120 <21:46:28 Nov 4, 1998> <> -R 0.0.0.119 <21:45:51 Nov 4, 1998> <> -R 0.0.0.118 <21:45:32 Nov 4, 1998> <> -R 0.0.0.117 <21:01:43 Nov 4, 1998> <> -R 0.0.0.116 <20:45:21 Nov 4, 1998> <> -R 0.0.0.115 <12:09:28 Nov 4, 1998> <> -R 0.0.0.114 <12:09:07 Nov 4, 1998> <> -R 0.0.0.113 <12:06:58 Nov 4, 1998> <> -R 0.0.0.112 <12:03:35 Nov 4, 1998> <> -R 0.0.0.111 <12:02:59 Nov 4, 1998> <> -R 0.0.0.110 <0:23:12 Nov 2, 1998> <> -R 0.0.0.109 <0:22:30 Nov 2, 1998> <> -R 0.0.0.108 <0:21:46 Nov 2, 1998> <> -R 0.0.0.107 <0:19:13 Nov 2, 1998> <> -R 0.0.0.106 <0:15:59 Nov 2, 1998> <> -R 0.0.0.105 <0:15:47 Nov 2, 1998> <> -R 0.0.0.104 <14:58:38 Oct 30, 1998> <> -R 0.0.0.103 <14:40:58 Oct 30, 1998> <> -R 0.0.0.102 <13:55:22 Oct 30, 1998> <> -R 0.0.0.101 <12:59:17 Oct 30, 1998> <> -R 0.0.0.100 <12:30:54 Oct 30, 1998> <> -R 0.0.0.99 <12:09:16 Oct 30, 1998> <> -R 0.0.0.98 <12:07:43 Oct 30, 1998> <> -R 0.0.0.97 <12:05:58 Oct 30, 1998> <> -R 0.0.0.96 <11:37:34 Oct 30, 1998> <> -R 0.0.0.95 <11:36:36 Oct 30, 1998> <> -R 0.0.0.94 <11:15:45 Oct 30, 1998> <> -R 0.0.0.93 <11:14:22 Oct 30, 1998> <> -R 0.0.0.92 <11:06:43 Oct 30, 1998> <> -R 0.0.0.91 <11:06:40 Oct 30, 1998> <> -R 0.0.0.90 <11:05:07 Oct 30, 1998> <> -R 0.0.0.89 <11:02:45 Oct 30, 1998> <> -R 0.0.0.88 <11:00:44 Oct 30, 1998> <> -R 0.0.0.87 <10:57:11 Oct 30, 1998> <> -R 0.0.0.86 <10:54:11 Oct 30, 1998> <> -R 0.0.0.85 <10:51:38 Oct 30, 1998> <> -R 0.0.0.84 <10:41:11 Oct 30, 1998> <> -R 0.0.0.83 <10:39:58 Oct 30, 1998> <> -R 0.0.0.82 <10:39:30 Oct 30, 1998> <> -R 0.0.0.81 <2:41:36 Oct 30, 1998> <> -R 0.0.0.80 <2:39:49 Oct 30, 1998> <> -R 0.0.0.79 <2:31:29 Oct 30, 1998> <> -R 0.0.0.78 <2:29:59 Oct 30, 1998> <> -R 0.0.0.77 <2:29:27 Oct 30, 1998> <> -R 0.0.0.76 <2:08:57 Oct 30, 1998> <> -R 0.0.0.75 <2:02:40 Oct 30, 1998> <> -R 0.0.0.74 <1:43:10 Oct 30, 1998> <> -R 0.0.0.73 <1:31:06 Oct 30, 1998> <> -R 0.0.0.72 <1:09:04 Oct 30, 1998> <> -R 0.0.0.71 <0:35:20 Oct 30, 1998> <> -R 0.0.0.70 <0:29:44 Oct 30, 1998> <> -R 0.0.0.69 <0:15:55 Oct 30, 1998> <> -R 0.0.0.68 <22:31:17 Oct 29, 1998> <> -R 0.0.0.67 <22:30:00 Oct 29, 1998> <> -R 0.0.0.66 <22:21:35 Oct 29, 1998> <> -R 0.0.0.65 <22:20:05 Oct 29, 1998> <> -R 0.0.0.64 <21:06:44 Oct 29, 1998> <> -R 0.0.0.63 <21:02:50 Oct 29, 1998> <> -R 0.0.0.62 <20:53:42 Oct 29, 1998> <> -R 0.0.0.61 <20:52:47 Oct 29, 1998> <> -R 0.0.0.60 <20:41:53 Oct 29, 1998> <> -R 0.0.0.59 <20:33:45 Oct 29, 1998> <> -R 0.0.0.58 <20:26:57 Oct 29, 1998> <> -R 0.0.0.57 <17:06:06 Oct 29, 1998> <> -R 0.0.0.56 <17:03:30 Oct 29, 1998> <> -R 0.0.0.55 <1:19:05 Oct 29, 1998> <> -R 0.0.0.54 <1:18:27 Oct 29, 1998> <> -R 0.0.0.53 <22:37:30 Oct 28, 1998> <> -R 0.0.0.52 <22:27:54 Oct 28, 1998> <> -R 0.0.0.51 <22:26:00 Oct 28, 1998> <> -R 0.0.0.50 <22:24:38 Oct 28, 1998> <> -R 0.0.0.49 <22:20:38 Oct 28, 1998> <> -R 0.0.0.48 <22:19:05 Oct 28, 1998> <> -R 0.0.0.47 <22:15:43 Oct 28, 1998> <> -R 0.0.0.46 <21:01:07 Oct 27, 1998> <> -R 0.0.0.45 <11:32:17 Oct 27, 1998> <> -R 0.0.0.44 <11:30:11 Oct 27, 1998> <> -R 0.0.0.43 <10:28:54 Oct 27, 1998> <> -R 0.0.0.42 <0:29:16 Oct 27, 1998> <> -R 0.0.0.41 <21:39:47 Oct 22, 1998> <> -R 0.0.0.40 <21:35:28 Oct 22, 1998> <> -R 0.0.0.39 <18:55:42 Oct 22, 1998> <> -R 0.0.0.38 <18:52:55 Oct 22, 1998> <> -R 0.0.0.37 <18:49:49 Oct 22, 1998> <> -R 0.0.0.36 <18:48:08 Oct 22, 1998> <> -R 0.0.0.35 <16:03:14 Oct 21, 1998> <> -R 0.0.0.34 <18:11:12 Oct 19, 1998> <> -R 0.0.0.33 <17:45:32 Oct 19, 1998> <> -R 0.0.0.32 <17:26:02 Oct 19, 1998> <> -R 0.0.0.31 <22:50:37 Oct 16, 1998> <> -R 0.0.0.30 <22:49:39 Oct 16, 1998> <> -R 0.0.0.29 <22:48:22 Oct 16, 1998> <> -R 0.0.0.28 <22:46:03 Oct 16, 1998> <> -R 0.0.0.27 <22:44:18 Oct 16, 1998> <> -R 0.0.0.26 <22:41:41 Oct 16, 1998> <> -R 0.0.0.25 <18:04:47 Oct 8, 1998> <> -R 0.0.0.24 <17:31:37 Oct 8, 1998> <> -R 0.0.0.23 <16:51:31 Oct 8, 1998> <> -R 0.0.0.22 <16:49:33 Oct 8, 1998> <> -R 0.0.0.21 <16:17:04 Oct 8, 1998> <> -R 0.0.0.20 <16:16:50 Oct 8, 1998> <> -R 0.0.0.19 <16:13:49 Oct 8, 1998> <> -R 0.0.0.18 <16:13:35 Oct 8, 1998> <> -R 0.0.0.17 <19:10:05 Oct 4, 1998> <> -R 0.0.0.16 <19:09:54 Oct 4, 1998> <> -R 0.0.0.15 <18:51:47 Oct 4, 1998> <> -R 0.0.0.14 <18:50:40 Oct 4, 1998> <> -R 0.0.0.13 <18:49:12 Oct 4, 1998> <> -R 0.0.0.12 <20:25:41 Oct 3, 1998> <> -R 0.0.0.11 <16:49:56 Oct 3, 1998> <> -R 0.0.0.10 <16:43:39 Oct 3, 1998> <> -R 0.0.0.9 <16:42:46 Oct 3, 1998> <> -R 0.0.0.8 <16:41:50 Oct 3, 1998> <> -R 0.0.0.7 <16:41:05 Oct 3, 1998> <> -R 0.0.0.6 <16:40:12 Oct 3, 1998> <> -R 0.0.0.5 <10:54:03 Sep 24, 1998> <> -R 0.0.0.4 <10:53:28 Sep 24, 1998> <> -R 0.0.0.3 <10:51:10 Sep 24, 1998> <> -R 0.0.0.2 <17:35:00 Sep 23, 1998> <> -R 0.0.0.1 <16:24:39 Sep 23, 1998> <> -P 0.0 <15:50:52 Sep 23, 1998> <> -R 0.0.0.0 <15:50:52 Sep 23, 1998> <> From 08255d2905b7f2940d64564fe2776f67e211469b Mon Sep 17 00:00:00 2001 From: mgroeber9110 Date: Mon, 1 Jan 2024 21:07:31 +0100 Subject: [PATCH 3/6] Code cleanup: makedpnd now usse the "utils" implementation of fileargs instead of its own copy --- Installed/Tools/pmake/makedpnd/Makefile | 6 +- Tools/pmake/makedpnd/fileargs.c | 335 ------------------------ Tools/pmake/makedpnd/fileargs.h | 44 ---- Tools/pmake/makedpnd/local.mk | 10 +- 4 files changed, 9 insertions(+), 386 deletions(-) delete mode 100644 Tools/pmake/makedpnd/fileargs.c delete mode 100644 Tools/pmake/makedpnd/fileargs.h diff --git a/Installed/Tools/pmake/makedpnd/Makefile b/Installed/Tools/pmake/makedpnd/Makefile index 69a46bc2f..a75462119 100644 --- a/Installed/Tools/pmake/makedpnd/Makefile +++ b/Installed/Tools/pmake/makedpnd/Makefile @@ -43,14 +43,14 @@ DEFTARGET = linux DEFTARGET = win32 #endif -MISRCS = fileargs.c makedpnd.c +MISRCS = makedpnd.c win32SRCS = $(MISRCS) win32.md/ -win32OBJS = win32.md/fileargs.obj win32.md/makedpnd.obj +win32OBJS = win32.md/makedpnd.obj win32LIBS = linuxSRCS = $(MISRCS) linux.md/ -linuxOBJS = linux.md/fileargs.o linux.md/makedpnd.o +linuxOBJS = linux.md/makedpnd.o linuxLIBS = SUBDIRS = diff --git a/Tools/pmake/makedpnd/fileargs.c b/Tools/pmake/makedpnd/fileargs.c deleted file mode 100644 index bf549ad35..000000000 --- a/Tools/pmake/makedpnd/fileargs.c +++ /dev/null @@ -1,335 +0,0 @@ -/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - - Copyright (c) GeoWorks 1992 -- All Rights Reserved - -PROJECT: PC GEOS -MODULE: -FILE: fileargs.c - -AUTHOR: Josh Putnam, Jun 15, 1992 - -METHODS: - -Name Description ----- ----------- - -FUNCTIONS: - -Scope Name Description ------ ---- ----------- - -REVISION HISTORY: - Name Date Description - ---- ---- ----------- - JP 6/15/92 Initial version. - -DESCRIPTION: - routines so that tools can read their arguments from files - due to dos limitations on the length of command lines. - - $Id: fileargs.c,v 1.7 96/06/13 17:24:42 dbaumann Exp $ - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ - -#include - -#include -#include -#include - -#include -#include - -/* forward declarations */ -static char *LoadFileIntoMemory(FILE *); -static void LexArgs(char *argBuf, int *argcPtr, char ***argvPtr); - -#include - - - -/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - GetFileArgs -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -SYNOPSIS: - -CALLED BY: - -PASS: name of file to read args from, pointer to argc, ptr to argv - -RETURN: argc and argv go into contents of ptr. - -DESTROYED: - -PSEUDO CODE/STRATEGY: - -CHECKS: - -KNOWN BUGS/SIDE EFFECTS/IDEAS: - -REVISION HISTORY: - Name Date Description - ---- ---- ----------- - JP 6/15/92 Initial version. - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ - -void GetFileArgs (char *file,int *argcPtr,char ***argvPtr) -{ - FILE *argfile; - char *argBuf; - - if((argfile = fopen((file),"r")) == NULL){ - fprintf(stderr,"Fatal Error: can't open argfile %s\n",file); - exit(1); - }else{ - argBuf = LoadFileIntoMemory(argfile); - LexArgs(argBuf,argcPtr,argvPtr); - fclose(argfile); - } -} /* End of GetFileArgs. */ - - - - -/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - LoadFileIntoMemory -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -SYNOPSIS: return a dynamically allocated char * with a stream's contents. - -CALLED BY: main - -PASS: FILE * of file - -RETURN: char * - -DESTROYED: Nothing. - -PSEUDO CODE/STRATEGY: allocate (as needed)and stuff buffer - -CHECKS: - -KNOWN BUGS/SIDE EFFECTS/IDEAS: - -REVISION HISTORY: - Name Date Description - ---- ---- ----------- - JP 6/15/92 Initial version. - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ - - - - - -#define BUF_INC 256 - -static char *LoadFileIntoMemory (FILE *argfile) -{ - int bufInsp = 0, bufSize = BUF_INC; - int cc; - char *x = (char *)malloc(BUF_INC); - - - /* - * invariants: - * bufInsp == place to insert next char - * bufSize == size of allocated block - */ - for(;;){ - cc = fread(x+bufInsp,1,BUF_INC,argfile); /** fill buf, maintain bufInsp **/ - bufInsp += cc; - - if(bufInsp == bufSize){ /** grow buf, maintain bufSize.**/ - x = (char *)realloc(x,bufSize + BUF_INC); - bufSize += BUF_INC; - if(!x){ - fprintf(stderr,"Fatal Error: Virtual Memory Exhausted\n"); - exit(2); - } - - } - - - if(cc != BUF_INC){ - if(ferror(argfile)){ - fprintf(stderr,"error reading argument file\n"); - exit(-2); - }else{ - x[bufInsp] = '\0'; /** terminate string with a null **/ - assert(strlen(x) < bufSize); - return x; - } - } - } -} - - - - - -/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - CountUnwantedChars -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -SYNOPSIS: return the number of unwanted chars before the next token - e.g. for ' ','\t','\n' return 1. - - - IF IT BECOMES NECESSARY TO HACK "\\\N", WE JUST CHANGE - THIS ROUTINE TO RETURN 2. - -CALLED BY: LexArgs - -PASS: char * to arg buffer - -RETURN: count - -DESTROYED: Nothing. - -PSEUDO CODE/STRATEGY: - -CHECKS: - -KNOWN BUGS/SIDE EFFECTS/IDEAS: - -REVISION HISTORY: - Name Date Description - ---- ---- ----------- - JP 6/15/92 Initial version. - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ - -static int CountUnwantedChars(char *argBuf) -{ - int x = 0; - while(argBuf[x] && isspace(argBuf[x])) - x++; - return x; -} - - - - -/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - TerminateArg -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -SYNOPSIS: Slice the current token out of the buffer by adding a null - after it. - -CALLED BY: - -PASS: - -RETURN: If the token is the last token, return the index of the null - byte, else return the index of the byte after the null. - -DESTROYED/SPECIAL EFFECTS: - - A token delimiter byte in the arg buffer will get set to null. - -PSEUDO CODE/STRATEGY: - -CHECKS: - -KNOWN BUGS/SIDE EFFECTS/IDEAS: - -REVISION HISTORY: - Name Date Description - ---- ---- ----------- - JP 6/15/92 Initial version. - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ - -static int TerminateArg(char *argBuf) -{ - int x = 0, result; - - while(argBuf[x] && !isspace(argBuf[x])){ - x++; - } - result = (argBuf[x] == '\0')? x : (x+1); - argBuf[x] = '\0'; - - return result; -} - - -/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - LexArgs -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -SYNOPSIS: break up a string into little strings, - set argc and argv to the count of the args, and have - the ptrs in argv point to the args. - -CALLED BY: - -PASS: arg string (a char *), ptr to argc and ptr to argv - -RETURN: nothing - -DESTROYED: arg string - -PSEUDO CODE/STRATEGY: - -CHECKS: - -KNOWN BUGS/SIDE EFFECTS/IDEAS: - -REVISION HISTORY: - Name Date Description - ---- ---- ----------- - JP 6/15/92 Initial version. - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ -#define ARG_INC 5 -static void LexArgs(char *argBuf,int *argcPtr, char ***argvPtr) -{ - char **argv = (char **) calloc(ARG_INC,sizeof(char *)); - int argvSize = ARG_INC; - int curArg = 0; - - /* - * invariants: - * curArg is the insertion point of the next arg (starts at 1) - * skip over the command itself - * argvSize is the size of argv in (char *). - */ - - for(curArg = 1,argv[1] = argBuf;;curArg++){ - if(curArg == argvSize){ - argv = (char **) realloc((void *)argv, - (curArg + ARG_INC) * sizeof(char *)); - if(!argv){ - fprintf(stderr,"Fatal Error: Virtual Memory Exhausted\n"); - exit(2); - } - argvSize += ARG_INC; - } - - /* we don't use strtok to lex the args because we may need to */ - /* read escaped newlines as a single space later == need more control */ - - - argBuf += CountUnwantedChars(argBuf); - - /* check to see if at last arg */ - if(!*argBuf){ - argv[curArg] = NULL; - *argvPtr = argv; - *argcPtr = curArg; - return; - } - argv[curArg] = argBuf; - argBuf += TerminateArg(argBuf); - } -} - - - - - diff --git a/Tools/pmake/makedpnd/fileargs.h b/Tools/pmake/makedpnd/fileargs.h deleted file mode 100644 index 928cc3950..000000000 --- a/Tools/pmake/makedpnd/fileargs.h +++ /dev/null @@ -1,44 +0,0 @@ - -/*********************************************************************** - * - * Copyright (c) GeoWorks 1989 -- All Rights Reserved - * - * PROJECT: PCGEOS - * MODULE: Tools Library -- File Argument Parsing - * FILE: fileargs.h - * - * AUTHOR: Josh Putnam 6/15/92 - * - * REVISION HISTORY: - * Date Name Description - * ---- ---- ----------- - * 6/15/92 josh Initial version - * - * DESCRIPTION: - * Due to limitations of the PC environment, make will not be able to - * hundreds of characters to programs like goc and glue. - * - * The solution is to provide a way for tools to get their many - * arguments from temporary files. - * - * By calling GetFileArgs with a path, pointer to int (argc) and - * pointer to char ** (argv), the tool can get its arguments in - * the standard format. - * - * $Id: fileargs.h,v 1.2 92/09/02 18:27:18 josh Exp $ - * - ***********************************************************************/ -#ifndef _FILEARGS_H_ -#define _FILEARGS_H_ - - -/* in the arglist @file means we read our args from "file" */ -#define FILE_PREFIX "@" -#define FILE_PREFIX_LEN 1 - -#define HAS_ARGS_FILE(argv) (!strncmp(argv[1],FILE_PREFIX,FILE_PREFIX_LEN)) -#define ARGS_FILE(argv) (argv[1] + FILE_PREFIX_LEN) - -extern void GetFileArgs(char *path, int *argcPtr, char ***argvPtr); - -#endif diff --git a/Tools/pmake/makedpnd/local.mk b/Tools/pmake/makedpnd/local.mk index bc1118f00..9a89de7e2 100644 --- a/Tools/pmake/makedpnd/local.mk +++ b/Tools/pmake/makedpnd/local.mk @@ -7,14 +7,16 @@ #ifndef unix .SUFFIXES : .lib .a -win32LIBS = $(.TARGET:H)/compat.lib lst.lib \ +win32LIBS = $(.TARGET:H)/compat.lib $(.TARGET:H)/utils.lib lst.lib \ sprite.lib -linuxLIBS = $(.TARGET:H)/libcompat.a liblst.a \ +linuxLIBS = $(.TARGET:H)/libcompat.a $(.TARGET:H)/libutils.a liblst.a \ libsprite.a -.PATH.lib : ../../compat $(INSTALL_DIR:H)/compat \ +.PATH.lib : ../../compat $(INSTALL_DIR:H:H)/compat \ + ../../utils $(INSTALL_DIR:H:H)/utils \ ../../pmake/lib/sprite $(INSTALL_DIR:H:H)/pmake/lib/sprite \ ../../pmake/lib/lst $(INSTALL_DIR:H:H)/pmake/lib/lst -.PATH.a : ../../compat $(INSTALL_DIR:H)/compat \ +.PATH.a : ../../compat $(INSTALL_DIR:H:H)/compat \ + ../../utils $(INSTALL_DIR:H:H)/utils \ ../../pmake/lib/sprite $(INSTALL_DIR:H:H)/pmake/lib/sprite \ ../../pmake/lib/lst $(INSTALL_DIR:H:H)/pmake/lib/lst #endif From 65e1fb9496aeb66e5087614aa535b05eb818eb36 Mon Sep 17 00:00:00 2001 From: mgroeber9110 Date: Mon, 1 Jan 2024 21:09:10 +0100 Subject: [PATCH 4/6] Fix bug in tools implementation of sprintf() on win32 that occasionally makes it replace \n by \r\n as if it were in text mode. --- Tools/utils/printf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Tools/utils/printf.c b/Tools/utils/printf.c index 16b132ef6..97e69118f 100644 --- a/Tools/utils/printf.c +++ b/Tools/utils/printf.c @@ -675,9 +675,9 @@ i_vfprintf(FILE *stream, /* Where to output formatted results. */ * automatically. */ #if defined(__HIGHC__) || defined(_MSC_VER) || defined(__WATCOMC__) - if ((c == '\n') && (stream->_flag & _O_BINARY)) { + if (isstrm && (c == '\n') && (stream->_flag & _O_BINARY)) { #else - if ((c == '\n') && (stream->flags & _F_BIN)) { + if (isstrm && (c == '\n') && (stream->flags & _F_BIN)) { #endif i_putc('\r', stream); } From 93c62cb39463653045c656380a70ef552254686e Mon Sep 17 00:00:00 2001 From: mgroeber9110 Date: Mon, 1 Jan 2024 21:10:17 +0100 Subject: [PATCH 5/6] makedpnd: avoid duplication of GOC/C source files in dependencies.mk under win32 --- Include/Win32/geode.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Include/Win32/geode.mk b/Include/Win32/geode.mk index 3a307f46d..d46893fb5 100644 --- a/Include/Win32/geode.mk +++ b/Include/Win32/geode.mk @@ -593,7 +593,7 @@ $(DEPFILE) : $(SRCS) $(GPFILE) #endif ## -del $(.TARGET:X\\[*\\].*).BAK ## -copy $(.TARGET) $(.TARGET:X\\[*\\].*).BAK - $(MAKEDPND) $(ROOT_DIR) $(DEVEL_DIR) $(INSTALL_DIR) -o$(.TARGET:S|DEPENDENCIES.MK|dependencies.mk|) `$(PRODUCT_FLAGS) goc $(PRODUCT)` $(CMODULES) ENDCMODULES $(MODULES) ENDASMMODULES $(GOCDEPENDS) $(CDEPENDS) $(ASMDEPENDS) $(SRCS:M*.GOC) $(SRCS:M*.goc) $(SRCS:M*.C) $(SRCS:M*.c) $(UI_TO_RDFS) $(ASM_TO_OBJS) ENDFILES + $(MAKEDPND) $(ROOT_DIR) $(DEVEL_DIR) $(INSTALL_DIR) -o$(.TARGET:S|DEPENDENCIES.MK|dependencies.mk|) `$(PRODUCT_FLAGS) goc $(PRODUCT)` $(CMODULES) ENDCMODULES $(MODULES) ENDASMMODULES $(GOCDEPENDS) $(CDEPENDS) $(ASMDEPENDS) $(SRCS:M*.[gG][oO][cC]) $(SRCS:M*.[cC]) $(UI_TO_RDFS) $(ASM_TO_OBJS) ENDFILES #if exists($(.ALLSRC:M*.gp)) findlbdr $(.ALLSRC:M*.gp) $(.TARGET) $(GEODES) #elif exists($(.ALLSRC:M*.GP)) From 6cd136ae00e6602b9965d2298f5be4bea00c720b Mon Sep 17 00:00:00 2001 From: mgroeber9110 Date: Mon, 1 Jan 2024 21:10:51 +0100 Subject: [PATCH 6/6] TechDocs: typo fixes in pmake documentation --- TechDocs/Markdown/Tools/ttools.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/TechDocs/Markdown/Tools/ttools.md b/TechDocs/Markdown/Tools/ttools.md index b58e09847..a3df0ef0f 100644 --- a/TechDocs/Markdown/Tools/ttools.md +++ b/TechDocs/Markdown/Tools/ttools.md @@ -1633,7 +1633,7 @@ Any line may be continued over multiple lines by ending it with a backslash following line are compressed into a single space before the input line is examined by pmake. -#####10.13.4.1 Dependency Lines +##### 10.13.4.1 Dependency Lines In any system, there are dependencies between the files that make up the system. For instance, in a program made up of several C source files and one @@ -2465,7 +2465,7 @@ by the shell, where * means zero or more characters of any sort; that is one of "a", "b", "c" or "d" (there may be any number of characters between the brackets); [0-9] matches any single character that is between "0" and "9" (i.e. any digit. This form -may be freely mixed with the other bracket form), and `\' is +may be freely mixed with the other bracket form), and `\\' is used to escape any of the characters "*", "?", "[" or ":", leaving them as regular characters to match themselves in a word.