annotate nt/make-nt-depend @ 1314:15a91d7ae2d1

[xemacs-hg @ 2003-02-20 08:16:21 by ben] check in makefile fixes et al Makefile.in.in: Major surgery. Move all stuff related to building anything in the src/ directory into src/. Simplify the dependencies -- everything in src/ is dependent on the single entry `src' in MAKE_SUBDIRS. Remove weirdo targets like `all-elc[s]', dump-elc[s], etc. mule/mule-msw-init.el: Removed. Delete this file. mule/mule-win32-init.el: New file, with stuff from mule-msw-init.el -- not just for MS Windows native, boys and girls! bytecomp.el: Change code inserted to catch trying to load a Mule-only .elc file in a non-Mule XEmacs. Formerly you got the rather cryptic "The required feature `mule' cannot be provided". Now you get "Loading this file requires Mule support". finder.el: Remove dependency on which directory this function is invoked from. update-elc.el: Don't mess around with ../src/BYTECOMPILE_CHANGE. Now that Makefile.in.in and xemacs.mak are in sync, both of them use NEEDTODUMP and the other one isn't used. dumped-lisp.el: Rewrite in terms of `list' and `nconc' instead of assemble-list, so we can have arbitrary forms, not just `when-feature'. very-early-lisp.el: Nuke this file. finder-inf.el, packages.el, update-elc.el, update-elc-2.el, loadup.el, make-docfile.el: Eliminate references to very-early-lisp. msw-glyphs.el: Comment clarification. xemacs.mak: Add macros DO_TEMACS, DO_XEMACS, and a few others; this macro section is now completely in sync with src/Makefile.in.in. Copy check-features, load-shadows, and rebuilding finder-inf.el from src/Makefile.in.in. The main build/dump/recompile process is now synchronized with src/Makefile.in.in. Change `WARNING' to `NOTE' and `error checking' to `error-checking' TO avoid tripping faux warnings and errors in the VC++ IDE. Makefile.in.in: Major surgery. Move all stuff related to building anything in the src/ directory from top-level Makefile.in.in to here. Simplify the dependencies. Rearrange into logical subsections. Synchronize the main compile/dump/build-elcs section with xemacs.mak, which is already clean and in good working order. Remove weirdo targets like `all-elc[s]', dump-elc[s], etc. Add additional levels of macros \(e.g. DO_TEMACS, DO_XEMACS, TEMACS_BATCH, XEMACS_BATCH, XEMACS_BATCH_PACKAGES) to factor out duplicated stuff. Clean up handling of "HEAP_IN_DATA" (Cygwin) so it doesn't need to ignore the return value from dumping. Add .NO_PARALLEL since various aspects of building and dumping must be serialized but do not always have dependencies between them (this is impossible in some cases). Everything related to src/ now gets built in one pass in this directory by just running `make' (except the Makefiles themselves and config.h, paths.h, Emacs.ad.h, and other generated .h files). console.c: Update list of possibly valid console types. emacs.c: Rationalize the specifying and handling of the type of the first frame. This was originally prompted by a workspace in which I got GTK to compile under C++ and in the process fixed it so it could coexist with X in the same build -- hence, a combined TTY/X/MS-Windows/GTK build is now possible under Cygwin. (However, you can't simultaneously *display* more than one kind of device connection -- but getting that to work is not that difficult. Perhaps a project for a bored grad student. I (ben) would do it but don't see the use.) To make sense of this, I added new switches that can be used to specifically indicate the window system: -x [aka --use-x], -tty \[aka --use-tty], -msw [aka --use-ms-windows], -gtk [aka --use-gtk], and -gnome [aka --use-gnome, same as --use-gtk]. -nw continues as an alias for -tty. When none have been given, XEmacs checks for other parameters implying particular device types (-t -> tty, -display -> x [or should it have same treatment as DISPLAY below?]), and has ad-hoc logic afterwards: if env var DISPLAY is set, use x (or gtk? perhaps should check whether gnome is running), else MS Windows if it exsits, else TTY if it exists, else stream, and you must be running in batch mode. This also fixes an existing bug whereby compiling with no x, no mswin, no tty, when running non- interactively (e.g. to dump) I get "sorry, must have TTY support". emacs.c: Turn on Vstack_trace_on_error so that errors are debuggable even when occurring extremely early in reinitialization. emacs.c: Try to make sure that the user can see message output under Windows (i.e. it doesn't just disappear right away) regardless of when it occurs, e.g. in the middle of creating the first frame. emacs.c: Define new function `emacs-run-status', indicating whether XEmacs is noninteractive or interactive, whether raw, post-dump/pdump-load or run-temacs, whether we are dumping, whether pdump is in effect. event-stream.c: It's "mommas are fat", not "momas are fat". Fix other typo. event-stream.c: Conditionalize in_menu_callback check on HAVE_MENUBARS, because it won't exist on w/o menubar support, lisp.h: More hackery on RETURN_NOT_REACHED. Cygwin v3.2 DOES complain here if RETURN_NOT_REACHED() is blank, as it is for GCC 2.5+. So make it blank only for GCC 2.5 through 2.999999999999999. Declare Vstack_trace_on_error. profile.c: Need to include "profile.h" to fix warnings. sheap.c: Don't fatal() when need to rerun Make, just stderr_out() and exit(0). That way we can distinguish between a dumping failing expectedly (due to lack of stack space, triggering another dump) and unexpectedly, in which case, we want to stop building. (or go on, if -K is given) syntax.c, syntax.h: Use ints where they belong, and enum syntaxcode's where they belong, and fix warnings thereby. syntax.h: Fix crash caused by an edge condition in the syntax-cache macros. text.h: Spacing fixes. xmotif.h: New file, to get around shadowing warnings. EmacsManager.c, event-Xt.c, glyphs-x.c, gui-x.c, input-method-motif.c, xmmanagerp.h, xmprimitivep.h: Include xmotif.h. alloc.c: Conditionalize in_malloc on ERROR_CHECK_MALLOC. config.h.in, file-coding.h, fileio.c, getloadavg.c, select-x.c, signal.c, sysdep.c, sysfile.h, systime.h, text.c, unicode.c: Eliminate HAVE_WIN32_CODING_SYSTEMS, use WIN32_ANY instead. Replace defined (WIN32_NATIVE) || defined (CYGWIN) with WIN32_ANY. lisp.h: More futile attempts to walk and chew gum at the same time when dealing with subr's that don't return.
author ben
date Thu, 20 Feb 2003 08:16:21 +0000
parents 184461bc8de4
children 4542b72c005e
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
796
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
1 : #-*- Perl -*-
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
2
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
3 # Generate dependency info in a form acceptable to nmake
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
4 #
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
5 # Copyright (C) 2000, 2002 Jonathan Harris.
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
6 #
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
7 # This file is part of XEmacs.
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
8 #
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
9 # XEmacs is free software; you can redistribute it and/or modify it
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
10 # under the terms of the GNU General Public License as published by the
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
11 # Free Software Foundation; either version 2, or (at your option) any
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
12 # later version.
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
13 #
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
14 # XEmacs is distributed in the hope that it will be useful, but WITHOUT
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
15 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
16 # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
17 # for more details.
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
18 #
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
19 # You should have received a copy of the GNU General Public License
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
20 # along with XEmacs; see the file COPYING. If not, write to
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
21 # the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
22 # Boston, MA 02111-1307, USA.
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
23 #
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
24 # Author: Jonathan Harris <jonathan@xemacs.org>
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
25 #
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
26 # Synched up with: Not in FSF.
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
27
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
28 use Getopt::Long;
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
29
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
30 my $optsok = GetOptions ('src=s' => \$src,
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
31 'config=s' => \$config,
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
32 'obj=s' => \$obj);
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
33
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
34 die "Generates nmake dependencies for the XEmacs src directory.
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
35
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
36 Usage: $0 --src SRCDIR --config CONFIGDIR --obj OBJDIR
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
37
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
38 SRCDIR Location of XEmacs sources
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
39 CONFIGDIR Location of config.inc
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
40 OBJDIR Location for compiler-generated object files
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
41
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
42 Expects output from src/make-src-depend on stdin.
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
43 The dependencies are written to stdout.
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
44 " if (@ARGV || !$optsok
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
45 || !defined ($src) || !defined ($config) || !defined ($obj));
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
46
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
47 while (<>)
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
48 {
1111
184461bc8de4 [xemacs-hg @ 2002-11-18 06:52:23 by ben]
ben
parents: 796
diff changeset
49 # must hack away CRLF junk. wouldn't it be nice if perl handled this
184461bc8de4 [xemacs-hg @ 2002-11-18 06:52:23 by ben]
ben
parents: 796
diff changeset
50 # right?? really can't be that hard!!!
184461bc8de4 [xemacs-hg @ 2002-11-18 06:52:23 by ben]
ben
parents: 796
diff changeset
51 s/\r\n/\n/g;
184461bc8de4 [xemacs-hg @ 2002-11-18 06:52:23 by ben]
ben
parents: 796
diff changeset
52
796
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
53 # rewrite references to generating script
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
54 s/make-src-depend/make-nt-depend/;
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
55
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
56 # rewrite '#if defined(...)' into nmake syntax
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
57 s/^#if defined(.+)/!if defined$1/;
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
58
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
59 # rewrite '#else' and '#endif' into nmake syntax
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
60 s/^#e/!e/;
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
61
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
62 # add src path to source filenames
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
63 # allow for source filename being used in variable assignment
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
64 s/([\s=])([\w\d\.\-]+\.[ch])/$1$src\\$2/g;
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
65
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
66 # add obj path to object filenames
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
67 # rewrite .o to .obj
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
68 # add dependency on config.inc to all objects (this might be too broad)
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
69 s/^(.+)\.o:(.+)/$obj\\$1.obj:$2 $config\\config.inc/;
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
70
1111
184461bc8de4 [xemacs-hg @ 2002-11-18 06:52:23 by ben]
ben
parents: 796
diff changeset
71 print;
796
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
72 }