comparison nt/xemacs.mak @ 1346:01c57eb70ae9

[xemacs-hg @ 2003-03-09 02:27:27 by ben] To: xemacs-patches@xemacs.org i.c: Sleep between calls to check for I/O, since these calls are non-blocking. behavior.el: Allow other keywords for forward compatibility. cl-macs.el: Rewrite to eliminate byte-compiler warning when `return' is used without `finally'. cmdloop.el: Avoid truncated error messages for `end-of-file' and the like. cmdloop.el: Avoid char-int error after syncing. files.el: Eliminate byte-compile warnings. printer.el: Fix line-width calculations. #### This used to work. Someone's changes (perhaps by Michael Sperber?) seem to have messed something up. simple.el: Use new clear-left-side functions to avoid messages ending up on the same line as other output. xemacs.mak: Add override for info/ as well when separate source/build dirs. xemacs.mak: Order sections in main build process and add comments. Add additional dependencies to try and prevent later steps from happening when failures in earlier steps have occurred. Makefile.in.in: Order sections in main build process and add comments. Add additional dependencies to try and prevent later steps from happening when failures in earlier steps have occurred. alloc.c: Don't arbitrarily clear Vconfigure_info_directory since it messes up separate build/source dirs. console.c, console.h, device-msw.c, device.c: Add accidentally omitted msprinter console and data descriptions. print.c, console-msw.c: Add clear-left-side functionality to help keep stdio/stderr output from separate sources on separate lines. Generalize the different kinds of debugging output. Add dpa(). profile.c: Add better docs on Unix/Windows differences. regex.c: Fix problems with rel-alloc compilation caused by previous patch. emacs.c: Seg fault rather than abort on Cygwin, since gdb doesn't trap aborts properly. console-gtk-impl.h, console-gtk.h, console-msw.h, console-x-impl.h, console-x.h, dialog-gtk.c, dialog-x.c, event-msw.c, frame-gtk.c, frame-x.c, frameslots.h, glyphs-gtk.c, glyphs-x.c, gui-gtk.c, gui-x.c, inline.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, scrollbar-gtk.c, scrollbar-x.c, ui-gtk.c: Delete popup-data object. Delete menubar_data field from frames, since its usage is frame-specific. Delete menubar-msw.h, gui-x.h, gui-gtk.h. Clean up handling of lwlib callback data GCPRO'ing and add missing GCPRO recomputation in widget code.
author ben
date Sun, 09 Mar 2003 02:27:46 +0000
parents 1b0339b048ce
children 49cfb333a12a
comparison
equal deleted inserted replaced
1345:3b27da507d56 1346:01c57eb70ae9
84 LISP=$(SRCROOT)\lisp 84 LISP=$(SRCROOT)\lisp
85 LIB_SRC=$(SRCROOT)\lib-src 85 LIB_SRC=$(SRCROOT)\lib-src
86 NT=$(SRCROOT)\nt 86 NT=$(SRCROOT)\nt
87 SRC=$(SRCROOT)\src 87 SRC=$(SRCROOT)\src
88 ETC=$(SRCROOT)\etc 88 ETC=$(SRCROOT)\etc
89 INFO=$(SRCROOT)\info
89 90
90 BLDLIB_SRC=$(BLDROOT)\lib-src 91 BLDLIB_SRC=$(BLDROOT)\lib-src
91 BLDNT=$(BLDROOT)\nt 92 BLDNT=$(BLDROOT)\nt
92 OUTDIR=$(BLDNT)\obj 93 OUTDIR=$(BLDNT)\obj
93 BLDSRC=$(BLDROOT)\src 94 BLDSRC=$(BLDROOT)\src
353 !endif 354 !endif
354 355
355 PATH_DEFINES=-DPATH_PREFIX=\"$(PATH_PREFIX)\" 356 PATH_DEFINES=-DPATH_PREFIX=\"$(PATH_PREFIX)\"
356 357
357 !if $(SEPARATE_BUILD) 358 !if $(SEPARATE_BUILD)
358 PATH_DEFINES=-DPATH_LOADSEARCH=\"$(LISP:\=\\)\" -DPATH_DATA=\"$(ETC:\=\\)\" 359 PATH_DEFINES=$(PATH_DEFINES) -DPATH_LOADSEARCH=\"$(LISP:\=\\)\" -DPATH_DATA=\"$(ETC:\=\\)\" -DPATH_INFO=\"$(INFO:\=\\)\"
359 !endif 360 !endif
360 361
361 ########################### Determine system configuration. 362 ########################### Determine system configuration.
362 363
363 !if !defined(OS) 364 !if !defined(OS)
1291 run_temacs_args = $(temacs_loadup_args) run-temacs 1292 run_temacs_args = $(temacs_loadup_args) run-temacs
1292 dump_temacs = $(TEMACS_BATCH) $(dump_temacs_args) 1293 dump_temacs = $(TEMACS_BATCH) $(dump_temacs_args)
1293 1294
1294 ########################### Build rules 1295 ########################### Build rules
1295 1296
1296 # use this rule to build the complete system 1297 ## Use this rule to build the complete system. We need both update-elc
1297 all: installation $(OUTDIR)\nul $(LASTFILE) \ 1298 ## and update-elc-2 due to the sideways dependency of NEEDTODUMP. See
1298 $(LIB_SRC_TOOLS) update-elc $(DUMP_TARGET) \ 1299 ## src/Makefile.in.in for a more detailed discussion of this.
1299 update-elc-2 $(LISP)/finder-inf.el load-shadows info 1300
1301 all: installation $(OUTDIR)\nul $(LIB_SRC_TOOLS) \
1302 update-elc update-elc-2 \
1303 $(LISP)/finder-inf.el load-shadows info
1300 1304
1301 $(TEMACS_BROWSE): $(TEMACS_OBJS) 1305 $(TEMACS_BROWSE): $(TEMACS_OBJS)
1302 @dir /b/s $(OUTDIR)\*.sbr > $(OUTDIR)\bscmake.tmp 1306 @dir /b/s $(OUTDIR)\*.sbr > $(OUTDIR)\bscmake.tmp
1303 bscmake -nologo -o$(TEMACS_BROWSE) @$(OUTDIR)\bscmake.tmp 1307 bscmake -nologo -o$(TEMACS_BROWSE) @$(OUTDIR)\bscmake.tmp
1304 -$(DEL) $(OUTDIR)\bscmake.tmp 1308 -$(DEL) $(OUTDIR)\bscmake.tmp
1305 1309
1306 # dump-id.c file that contains the dump id 1310 ## (1) Compile all dependencies of the XEmacs executable
1307 1311
1308 $(OUTDIR)\dump-id.obj : $(BLDSRC)\dump-id.c 1312 $(OUTDIR)\dump-id.obj : $(BLDSRC)\dump-id.c
1309 $(CCV) $(TEMACS_CPP_FLAGS) $(BLDSRC)\$(@B).c -Fo$@ $(BROWSERFLAGS) 1313 $(CCV) $(TEMACS_CPP_FLAGS) $(BLDSRC)\$(@B).c -Fo$@ $(BROWSERFLAGS)
1310 1314
1311 $(BLDSRC)\dump-id.c : $(BLDLIB_SRC)/make-dump-id.exe $(TEMACS_OBJS) 1315 $(BLDSRC)\dump-id.c : $(BLDLIB_SRC)/make-dump-id.exe $(TEMACS_OBJS)
1313 $(BLDLIB_SRC)\make-dump-id.exe 1317 $(BLDLIB_SRC)\make-dump-id.exe
1314 1318
1315 $(OUTDIR)\temacs.res: $(NT)\xemacs.rc 1319 $(OUTDIR)\temacs.res: $(NT)\xemacs.rc
1316 cd $(NT) 1320 cd $(NT)
1317 rc -Fo$@ xemacs.rc 1321 rc -Fo$@ xemacs.rc
1322
1323 ## (2) Link the XEmacs executable
1318 1324
1319 !if $(USE_PORTABLE_DUMPER) 1325 !if $(USE_PORTABLE_DUMPER)
1320 TEMACS_DUMP_DEP = $(OUTDIR)\dump-id.obj 1326 TEMACS_DUMP_DEP = $(OUTDIR)\dump-id.obj
1321 !else 1327 !else
1322 TEMACS_DUMP_DEP = $(OUTDIR)\temacs.res 1328 TEMACS_DUMP_DEP = $(OUTDIR)\temacs.res
1329 1335
1330 !if $(DEBUG_XEMACS) 1336 !if $(DEBUG_XEMACS)
1331 $(RAW_EXE): $(TEMACS_BROWSE) 1337 $(RAW_EXE): $(TEMACS_BROWSE)
1332 !endif 1338 !endif
1333 1339
1334 # Rebuild docfile target 1340 ## (3) Update the .elc's needed for dumping
1341
1342 update-elc: $(RAW_EXE)
1343 $(TEMACS_BATCH) -l $(LISP)\update-elc.el
1344
1345 ## This file is touched by update-elc.el when redumping is necessary.
1346 $(BLDSRC)\NEEDTODUMP:
1347 @echo >$(BLDSRC)\NEEDTODUMP
1348
1349 ## (4) Build the DOC file
1335 1350
1336 DOC=$(BLDLIB_SRC)\DOC 1351 DOC=$(BLDLIB_SRC)\DOC
1337 1352
1338 docfile :: 1353 docfile ::
1339 if exist $(DOC) $(DEL) $(DOC) 1354 if exist $(DOC) $(DEL) $(DOC)
1353 $(TEMACS_BATCH) -l $(LISP)\make-docfile.el -- -o $(DOC) -i $(SRCROOT)\site-packages @<< 1368 $(TEMACS_BATCH) -l $(LISP)\make-docfile.el -- -o $(DOC) -i $(SRCROOT)\site-packages @<<
1354 $(**) 1369 $(**)
1355 << 1370 <<
1356 !endif 1371 !endif
1357 1372
1358 update-elc: $(RAW_EXE) 1373 ## (5) Dump
1359 $(TEMACS_BATCH) -l $(LISP)\update-elc.el
1360
1361 ## This file is touched by update-elc.el when redumping is necessary.
1362 $(BLDSRC)\NEEDTODUMP:
1363 @echo >$(BLDSRC)\NEEDTODUMP
1364 1374
1365 !if $(USE_PORTABLE_DUMPER) 1375 !if $(USE_PORTABLE_DUMPER)
1366 $(DUMP_TARGET): $(NT)\xemacs.rc 1376 $(DUMP_TARGET): $(NT)\xemacs.rc
1367 !endif 1377 !endif
1368 1378
1380 $(TEMACS_LFLAGS) -section:.rsrc,rw -out:$(BLDSRC)\xemacs.exe $(TEMACS_OBJS) $(OUTDIR)\xemacs.res $(TEMACS_LIBS) $(OUTDIR)\dump-id.obj 1390 $(TEMACS_LFLAGS) -section:.rsrc,rw -out:$(BLDSRC)\xemacs.exe $(TEMACS_OBJS) $(OUTDIR)\xemacs.res $(TEMACS_LIBS) $(OUTDIR)\dump-id.obj
1381 << 1391 <<
1382 -$(DEL) $(BLDSRC)\xemacs.dmp 1392 -$(DEL) $(BLDSRC)\xemacs.dmp
1383 !endif 1393 !endif
1384 1394
1385 ## Update out-of-date .elcs, other than needed for dumping. 1395 ## (6) Update the remaining .elc's, post-dumping
1386 update-elc-2: 1396
1397 update-elc-2: $(DUMP_TARGET)
1387 $(XEMACS_BATCH) -no-autoloads -l update-elc-2.el -f batch-update-elc-2 $(LISP) 1398 $(XEMACS_BATCH) -no-autoloads -l update-elc-2.el -f batch-update-elc-2 $(LISP)
1388 1399
1389 $(LISP)/finder-inf.el: 1400 ## (7) Other random stuff
1401
1402 $(LISP)/finder-inf.el: update-elc-2
1390 !if !$(QUICK_BUILD) 1403 !if !$(QUICK_BUILD)
1391 @echo Building finder database ... 1404 @echo Building finder database ...
1392 $(XEMACS_BATCH) -eval "(setq finder-compile-keywords-quiet t)" \ 1405 $(XEMACS_BATCH) -eval "(setq finder-compile-keywords-quiet t)" \
1393 -l finder -f finder-compile-keywords 1406 -l finder -f finder-compile-keywords
1394 @echo Building finder database ...(done) 1407 @echo Building finder database ...(done)
1395 !endif 1408 !endif
1396 1409
1397 load-shadows: 1410 load-shadows: update-elc-2
1398 !if !$(QUICK_BUILD) 1411 !if !$(QUICK_BUILD)
1399 @echo Testing for Lisp shadows ... 1412 @echo Testing for Lisp shadows ...
1400 @$(XEMACS_BATCH) -f list-load-path-shadows 1413 @$(XEMACS_BATCH) -f list-load-path-shadows
1401 !endif 1414 !endif
1402 1415