Commit de32572e authored by Andrew Innes's avatar Andrew Innes
Browse files

Add support for `bootstrap' and related targets.

parent e2b1c424
......@@ -24,87 +24,233 @@
all:
#lisp=$(MAKEDIR:\=/)
lisp=.
# You can specify a different executable on the make command line,
# e.g. "make EMACS=../src/emacs ...".
EMACS = ..\src\$(BLD)\emacs
EMACS = ..\bin\emacs.exe
# Command line flags for Emacs. This must include --multibyte,
# otherwise some files will not compile.
EMACSOPT = --no-init-file --no-site-file --multibyte -batch
EMACSOPT = -batch --no-init-file --no-site-file --multibyte
lisptagsfiles1 = $(lisp)/*.el
lisptagsfiles2 = $(lisp)/*/*.el
ETAGS = ..\lib-src\$(BLD)\etags
# Files which should not be compiled. All file names must be relative
# to the `lisp' directory.
# Files which should not be compiled.
# - emacs-lisp/cl-specs.el: only contains `def-edebug-spec's so there's
# no point compiling it, although it doesn't hurt.
DONTCOMPILE = bindings.el mail/blessmail.el play/bruce.el cus-load.el \
cus-start.el forms-d2.el forms-pass.el \
international/latin-1.el international/latin-2.el \
international/latin-3.el international/latin-4.el \
international/latin-5.el \
loaddefs.el loadup.el international/mule-conf.el patcomp.el \
paths.el mail/sc.el subdirs.el version.el \
generic-x.el international/latin-8.el international/latin-9.el \
emacs-lisp/cl-specs.el finder-inf.el term/internal.el
DONTCOMPILE = \
$(lisp)/bindings.el \
$(lisp)/cus-load.el \
$(lisp)/cus-start.el \
$(lisp)/emacs-lisp/cl-specs.el \
$(lisp)/eshell/esh-maint.el \
$(lisp)/eshell/esh-group.el \
$(lisp)/finder-inf.el \
$(lisp)/forms-d2.el \
$(lisp)/forms-pass.el \
$(lisp)/generic-x.el \
$(lisp)/international/latin-1.el \
$(lisp)/international/latin-2.el \
$(lisp)/international/latin-3.el \
$(lisp)/international/latin-4.el \
$(lisp)/international/latin-5.el \
$(lisp)/international/latin-8.el \
$(lisp)/international/latin-9.el \
$(lisp)/international/mule-conf.el \
$(lisp)/loaddefs.el \
$(lisp)/loadup.el \
$(lisp)/mail/blessmail.el \
$(lisp)/mail/sc.el \
$(lisp)/patcomp.el \
$(lisp)/paths.el \
$(lisp)/play/bruce.el \
$(lisp)/subdirs.el \
$(lisp)/term/internal.el \
$(lisp)/version.el
# Files to compile before others during a bootstrap. This is done
# to speed up the bootstrap process.
COMPILE_FIRST = \
$(lisp)/emacs-lisp/byte-opt.el \
$(lisp)/emacs-lisp/bytecomp.el \
$(lisp)/subr.el
# The actual Emacs command run in the targets below.
emacs = $(EMACS) $(EMACSOPT)
# Common command to find subdirectories
# setwins=subdirs=`find $$wd -type d -print`; \
# for file in $$subdirs; do \
# case $$file in */Old | */RCS | */CVS | */CVS/* | */=* ) ;; \
# *) wins="$$wins $$file" ;; \
# esac; \
# done
# Have to define the list of subdirs manually
WINS=\
calendar \
emacs-lisp \
emulation \
eshell \
gnus \
international \
language \
mail \
net \
play \
progmodes \
term \
textmodes
doit:
cus-load.el:
touch $@
custom-deps: cus-load.el doit
@echo Directories: $(WINS)
$(emacs) -l cus-dep --eval "(setq find-file-hooks nil)" -f custom-make-dependencies $(lisp) $(WINS)
finder-inf.el:
echo (provide 'finder-inf)>> $@
finder-data: finder-inf.el doit
@echo Directories: $(WINS)
$(emacs) -l finder -f finder-compile-keywords-make-dist $(lisp) $(WINS)
loaddefs.el:
echo ;;; loaddefs.el --- automatically extracted autoloads> $@
echo ;;; Code:>> $@
echo >> $@
echo ;;; Local Variables:>> $@
echo ;;; version-control: never>> $@
echo ;;; no-byte-compile: t>> $@
echo ;;; no-update-autoloads: t>> $@
echo ;;; End:>> $@
echo ;;; loaddefs.el ends here>> $@
autoloads: loaddefs.el doit
@echo Directories: $(WINS)
$(emacs) -l autoload --eval "(setq find-file-hooks nil generated-autoload-file \"$(lisp)/loaddefs.el\")" -f batch-update-autoloads $(lisp) $(WINS)
subdirs.el:
$(MAKE) $(MFLAGS) -f makefile.nt update-subdirs
update-subdirs: doit
@set QWINS=
@for %d in ($(WINS)) do if not (%d)==(term) set QWINS=%QWINS% "%d"
echo ;; In load-path, after this directory should come> subdirs.el
echo ;; certain of its subdirectories. Here we specify them.>> subdirs.el
echo (normal-top-level-add-to-load-path '(%QWINS%))>> subdirs.el
updates: update-subdirs autoloads finder-data custom-deps
TAGS: $(lisptagsfiles1) $(lisptagsfiles2)
$(ETAGS) $(lisptagsfiles1) $(lisptagsfiles2)
TAGS-LISP: $(lispsource)$(lisptagsfiles1) $(lispsource)$(lisptagsfiles2)
$(ETAGS) -o TAGS-LISP $(lispsource)$(lisptagsfiles1) $(lispsource)$(lisptagsfiles2)
.el.elc:
-$(emacs) -f batch-byte-compile $<
$(DONTCOMPILE:.el=.elc):
-$(DEL) $@
# Compile all Lisp files, except those from DONTCOMPILE. This
# compiles files unconditionally. All .elc files are made writable
# before compilation in case we checked out read-only (CVS option -r).
# Files MUST be compiled one by one. If we compile several files in a
# row we can't make sure that the compilation environment is clean.
# We also set the load-path of the Emacs used for compilation to the
# current directory and its subdirectories, to make sure require's and
# load's in the files being compiled find the right files.
compile-files: subdirs.el doit
-for %f in ($(lisp) $(WINS)) do for %g in (%f\*.elc) do @attrib -r %g
for %f in ($(COMPILE_FIRST)) do $(emacs) -f batch-byte-compile %f
for %f in ($(lisp) $(WINS)) do for %g in (%f/*.el) do $(emacs) -f batch-byte-compile %f/%g
# Backup compiled Lisp files in elc.tar.gz. If that file already
# exists, make a backup of it.
backup-compiled-files:
-mv $(lisp)/elc.tar.gz $(lisp)/elc.tar.gz~
-tar czf $(lisp)/elc.tar.gz $(lisp)/*.elc $(lisp)/*/*.elc
# Compile Lisp files, but save old compiled files first.
compile: backup-compiled-files compile-files
# Recompile all Lisp files which are newer than their .elc files.
# Note that this doesn't create .elc files. It only recompiles if an
# .elc is present.
recompile:
recompile: doit
$(emacs) -f batch-byte-recompile-directory .
# Prepare a bootstrap in the lisp subdirectory. Build loaddefs.el,
# because it's not sure it's up-to-date, and if it's not, that might
# lead to errors during the bootstrap because something fails to
# autoload as expected. Remove compiled Lisp files so that
# bootstrap-emacs will be built from sources only.
bootstrap-clean:
if exist $(EMACS) $(MAKE) $(MFLAGS) -f makefile.nt autoloads
-for %f in ($(lisp) $(WINS)) do for %g in (%f\*.elc) do @$(DEL) %g
# Generate/update files for the bootstrap process.
bootstrap: autoloads compile-files custom-deps
#
# Assuming INSTALL_DIR is defined, copy the elisp files to it
# Windows 95 makes this harder than it should be.
#
install:
- mkdir $(INSTALL_DIR)\lisp
- $(DEL) .\same-dir.tst
- $(DEL) $(INSTALL_DIR)\lisp\same-dir.tst
echo SameDirTest > $(INSTALL_DIR)\lisp\same-dir.tst
- mkdir $(INSTALL_DIR)\lisp
- $(DEL) .\same-dir.tst
- $(DEL) $(INSTALL_DIR)\lisp\same-dir.tst
echo SameDirTest > $(INSTALL_DIR)\lisp\same-dir.tst
!ifdef COPY_LISP_SOURCE
if not exist .\same-dir.tst $(CP_DIR) . $(INSTALL_DIR)\lisp
if not exist .\same-dir.tst $(CP_DIR) . $(INSTALL_DIR)\lisp
!else
if not exist .\same-dir.tst $(CP_DIR) *.elc $(INSTALL_DIR)\lisp
if not exist .\same-dir.tst $(CP) cus-load.el $(INSTALL_DIR)\lisp
if not exist .\same-dir.tst $(CP) forms*.el $(INSTALL_DIR)\lisp
if not exist .\same-dir.tst $(CP) patcomp.el $(INSTALL_DIR)\lisp
if not exist .\same-dir.tst $(CP) subdirs.el $(INSTALL_DIR)\lisp
if not exist .\same-dir.tst $(CP) version.el $(INSTALL_DIR)\lisp
if not exist .\same-dir.tst $(CP) mail\blessmail.el $(INSTALL_DIR)\lisp\mail
if not exist .\same-dir.tst $(CP) mail\sc.el $(INSTALL_DIR)\lisp\mail
if not exist .\same-dir.tst $(CP) play\bruce.el $(INSTALL_DIR)\lisp\play
if not exist .\same-dir.tst $(CP) international\latin-*.el $(INSTALL_DIR)\lisp\international
if not exist .\same-dir.tst $(CP) international\mule-conf.el $(INSTALL_DIR)\lisp\international
- $(DEL) $(INSTALL_DIR)\lisp\same-dir.tst
if not exist .\same-dir.tst $(CP_DIR) *.elc $(INSTALL_DIR)\lisp
if not exist .\same-dir.tst $(CP) cus-load.el $(INSTALL_DIR)\lisp
if not exist .\same-dir.tst $(CP) forms*.el $(INSTALL_DIR)\lisp
if not exist .\same-dir.tst $(CP) patcomp.el $(INSTALL_DIR)\lisp
if not exist .\same-dir.tst $(CP) subdirs.el $(INSTALL_DIR)\lisp
if not exist .\same-dir.tst $(CP) version.el $(INSTALL_DIR)\lisp
if not exist .\same-dir.tst $(CP) mail\blessmail.el $(INSTALL_DIR)\lisp\mail
if not exist .\same-dir.tst $(CP) mail\sc.el $(INSTALL_DIR)\lisp\mail
if not exist .\same-dir.tst $(CP) play\bruce.el $(INSTALL_DIR)\lisp\play
if not exist .\same-dir.tst $(CP) international\latin-*.el $(INSTALL_DIR)\lisp\international
if not exist .\same-dir.tst $(CP) international\mule-conf.el $(INSTALL_DIR)\lisp\international
- $(DEL) $(INSTALL_DIR)\lisp\same-dir.tst
!endif
#
# Maintenance
#
clean:; - $(DEL) *~ term\*~
- $(DEL) *.orig *.rej *.crlf
- $(DEL) emacs-lisp\*.orig emacs-lisp\*.rej emacs-lisp\*.crlf
- $(DEL) emulation\*.orig emulation\*.rej emulation\*.crlf
- $(DEL) gnus\*.orig gnus\*.rej gnus\*.crlf
- $(DEL) international\*.orig international\*.rej international\*.crlf
- $(DEL) language\*.orig language\*.rej language\*.crlf
- $(DEL) mail\*.orig mail\*.rej mail\*.crlf
- $(DEL) play\*.orig play\*.rej play\*.crlf
- $(DEL) progmodes\*.orig progmodes\*.rej progmodes\*.crlf
- $(DEL) term\*.orig term\*.rej term\*.crlf
- $(DEL) textmodes\*.orig textmodes\*.rej textmodes\*.crlf
- $(DEL_TREE) deleted
clean:
- $(DEL) *~ term\*~
- $(DEL) *.orig *.rej *.crlf
- $(DEL) emacs-lisp\*.orig emacs-lisp\*.rej emacs-lisp\*.crlf
- $(DEL) emulation\*.orig emulation\*.rej emulation\*.crlf
- $(DEL) gnus\*.orig gnus\*.rej gnus\*.crlf
- $(DEL) international\*.orig international\*.rej international\*.crlf
- $(DEL) language\*.orig language\*.rej language\*.crlf
- $(DEL) mail\*.orig mail\*.rej mail\*.crlf
- $(DEL) play\*.orig play\*.rej play\*.crlf
- $(DEL) progmodes\*.orig progmodes\*.rej progmodes\*.crlf
- $(DEL) term\*.orig term\*.rej term\*.crlf
- $(DEL) textmodes\*.orig textmodes\*.rej textmodes\*.crlf
- $(DEL_TREE) deleted
......@@ -82,7 +82,7 @@ $(BLD)\runemacs.exe: $(BLD)\runemacs.obj $(TRES)
#
# Build emacs
#
BUILD_CMD = $(MAKE) -f makefile.nt all
BUILD_CMD = $(MAKE) $(MFLAGS) -f makefile.nt all
all: $(BLD) $(ALL)
cd ..\lib-src
$(BUILD_CMD)
......@@ -94,34 +94,33 @@ all: $(BLD) $(ALL)
if exist makefile.nt $(BUILD_CMD)
cd ..\nt
BOOTSTRAP_CMD = $(MAKE) $(MFLAGS) -f makefile.nt bootstrap
bootstrap: $(BLD) $(ALL)
cd ..\src
$(BOOTSTRAP_CMD)
$(BOOTCLEAN_CMD)
cd ..\lisp
$(BOOTSTRAP_CMD)
cd ..\nt
BOOTCLEAN_CMD = $(MAKE) $(MFLAGS) -f makefile.nt bootstrap-clean
bootstrap-clean:
cd ..\src
$(BOOTCLEAN_CMD)
cd ..\lisp
$(BOOTCLEAN_CMD)
$(INSTALL_DIR):
- mkdir $(INSTALL_DIR)
$(INSTALL_DIR)\bin:
- mkdir $(INSTALL_DIR)\bin
$(INSTALL_DIR)\bin\emacs.bat: emacs.bat.in
echo @echo off > $@
echo REM !!! Warning: This file automatically generated !!! >> emacs.bat
echo set emacs_dir=$(INSTALL_DIR)>> $@
type emacs.bat.in >> $@
$(INSTALL_DIR)\bin\debug.bat: debug.bat.in
echo @echo off > $@
echo REM !!! Warning: This file automatically generated !!! >> debug.bat
echo set emacs_dir=$(INSTALL_DIR)>> $@
type debug.bat.in >> $@
batch_files: $(INSTALL_DIR) \
$(INSTALL_DIR)\bin \
$(INSTALL_DIR)\bin\emacs.bat \
$(INSTALL_DIR)\bin\debug.bat
#
# Build and install emacs in INSTALL_DIR
#
INSTALL_CMD = $(MAKE) -f makefile.nt install
install: all $(INSTALL_DIR) batch_files
install: all $(INSTALL_DIR)
cd ..\lib-src
$(INSTALL_CMD)
cd ..\src
......@@ -150,7 +149,7 @@ install: all $(INSTALL_DIR) batch_files
# This installs executables from ..\bin into the installation directory
# without building anything.
#
fast_install: batch_files
fast_install:
- mkdir $(INSTALL_DIR)\data
$(CP) ..\lib-src\DOC $(INSTALL_DIR)\etc
- mkdir $(INSTALL_DIR)\bin
......@@ -189,17 +188,15 @@ real_install:
# Maintenance
#
CLEAN_CMD = $(MAKE) -f makefile.nt clean
clean:; - $(DEL) *~ *.pdb
clean:
- $(DEL) *~ *.pdb
- $(DEL) *.orig
- $(DEL) *.rej
- $(DEL) *.crlf
- $(DEL_TREE) deleted
- $(DEL_TREE) obj
- $(DEL_TREE) obj-spd
- $(DEL_TREE) ..\bin
- $(DEL) ..\etc\DOC ..\etc\DOC-X
- $(DEL) emacs.bat
- $(DEL) debug.bat
cd ..\lib-src
$(CLEAN_CMD)
cd ..\src
......@@ -209,3 +206,6 @@ clean:; - $(DEL) *~ *.pdb
cd ..\leim
if exist makefile.nt $(CLEAN_CMD)
cd ..\nt
realclean: clean
- $(DEL_TREE) ..\bin
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment