1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-20 10:23:57 +00:00
Commit Graph

157 Commits

Author SHA1 Message Date
Paul Eggert
b46a6a83b3 Don't use the abbreviation "win" to refer to Windows (Bug#10421).
* lisp/org/ob-lilypond.el (ly-w32-ly-path): Rename from ly-win32-ly-path.
(ly-w32-pdf-path): Rename from ly-win32-pdf-path.
(ly-w32-midi-path): Rename from ly-win32-midi-path.
(ly-determine-ly-path, ly-determine-pdf-path, ly-determine-midi-path):
Check for "windows-nt", not "win32", in system-type.
* src/regex.c (MAX_BUF_SIZE): Remove some incorrect and
long-ago-commented-out code that talks about "WIN32".
* src/w32heap.h (OS_WINDOWS_95): Rename from OS_WIN95.
All uses changed.
2012-07-29 01:18:29 -07:00
Eli Zaretskii
20329d736f More fixes in lisp/ for parallel builds on MS-Windows.
lisp/makefile.w32-in (custom-deps, finder-data, updates, compile)
 (compile-always, compile-first)
 ($(lisp)/calendar/cal-loaddefs.el)
 ($(lisp)/calendar/diary-loaddefs.el)
 ($(lisp)/calendar/hol-loaddefs.el, $(lisp)/mh-e/mh-loaddefs.el)
 ($(lisp)/net/tramp-loaddefs.el, bootstrap)
 ($(lisp)/progmodes/cc-mode.elc): Depend on $(lisp)subdirs.el,
 instead of on update-subdirs.
 (bootstrap-clean): Delete $(lisp)/subdirs.el.
2012-07-28 14:21:43 +03:00
Eli Zaretskii
f8b91036c9 Fix parallel bootstrap in lisp/ on MS-Windows.
lisp/makefile.w32-in ($(lisp)/calendar/cal-loaddefs.el)
 ($(lisp)/calendar/diary-loaddefs.el)
 ($(lisp)/calendar/hol-loaddefs.el, $(lisp)/mh-e/mh-loaddefs.el)
 ($(lisp)/net/tramp-loaddefs.el): Depend on update-subdirs.  Fixes
 failures in parallel bootstrap because subdirs.el is being
 rewritten while the autoload files are built at the same time,
 which needs to load subdirs.el.
2012-07-26 20:10:21 +03:00
Eli Zaretskii
cc06e7e710 Fix parallel bootstrap on MS-Windows in lib/ and lisp/.
lib/makefile.w32-in ($(GNULIBOBJS)): Depend on stamp_BLD.  This
 replaces separate dependency for each object file, which required
 the same object file to be mentioned twice, causing failures in
 parallel builds.
 lisp/makefile.w32-in (compile, compile-always): Depend on
 update-subdirs, not on subdirs.el.  Otherwise, several different
 sub-targets of 'bootstrap' running in parallel could
 simultaneously write to subdirs.el, producing a garbled file.
2012-06-26 19:57:54 +03:00
Juanma Barranquero
711b11e1e3 lisp/makefile.w32-in (COMPILE_FIRST): Synch with changes in 2012-06-22T21:24:54Z!monnier@iro.umontreal.ca. 2012-06-23 18:58:13 +02:00
Juanma Barranquero
b6974efa3b lisp/makefile.w32-in (COMPILE_FIRST): Synch with changes in 2008-06-22T13:57:28Z!monnier@iro.umontreal.ca. 2012-06-15 23:47:39 +02:00
Juanma Barranquero
333775629a lisp/makefile.w32-in (COMPILE_FIRST): Remove subr.el.
Suggested by Stefan Monnier while discussing bug#11657.
2012-06-15 01:53:41 +02:00
Eli Zaretskii
8a26b487f2 Fix parallel bootstrap build in lisp/ on MS-Windows.
Fix parallel builds: make sure loaddefs.el is not being written
 while Lisp files are compiled.
 lisp/makefile.w32-in (compile): Don't depend on 'mh-autoloads'.
 (compile-CMD, compile-SH): Depend on 'autoloads'.
 (bootstrap): Don't depend on 'autoloads' and 'mh-autoloads'.
2012-06-09 14:53:31 +03:00
Eli Zaretskii
1e48e2823f Fix "lisp nesting exceeds max-lisp-eval-depth" errors on MS-Windows.
This happens during bootstrap; see bug#11649.

 lisp/makefile.w32-in (BIG_STACK_DEPTH): Enlarge to 2200.
2012-06-09 12:15:13 +03:00
Glenn Morris
ff0c3cfb2f * update-subdirs: Move to build-aux/.
* make-dist:
* Makefile.in (install-arch-indep):
* lisp/Makefile.in (update-subdirs):
* lisp/makefile.w32-in (update-subdirs-SH):
Update for this change.
2012-05-21 16:40:55 -04:00
Eli Zaretskii
e5a69fd00a Fix parallel "make install" on MS-Windows.
nt/makefile.w32-in (install-bin): Don't copy addpm.exe here.  Use
 $(DIRNAME)_same-dir.tst instead of same-dir.tst, to avoid stepping
 on other (parallel) Make job's toes.
 (install-other-dirs-nmake, install-other-dirs-gmake): Depend on `all'.
 (install-shortcuts): Depend on $(INSTALL_DIR)/bin.  Copy addpm.exe
 here.
 (maybe-copy-distfiles-CMD, maybe-copy-distfiles-SH, dist): Depend
 on create-tmp-dist-dir.
 nt/nmake.defs (DIRNAME): New variable.
 (IFNOTSAMEDIR): Use $(DIRNAME)_same-dir.tst instead of
 same-dir.tst.
 nt/gmake.defs (DIRNAME): New variable.
 (IFNOTSAMEDIR): Use $(DIRNAME)_same-dir.tst instead of
 same-dir.tst, to avoid conflicts between several (parallel) Make
 jobs.
 lisp/makefile.w32-in (install): Use $(DIRNAME)_same-dir.tst instead
 of same-dir.tst, to avoid stepping on other (parallel) Make job's
 toes.
 leim/makefile.w32-in (install): Use $(DIRNAME)_same-dir.tst instead
 of same-dir.tst, to avoid stepping on other (parallel) Make job's
 toes.
2012-03-25 20:17:46 +02:00
Glenn Morris
acaf905b11 Add 2012 to FSF copyright years for Emacs files 2012-01-05 01:46:05 -08:00
Juanma Barranquero
e152e577f0 update-subdirs: Don't set no-byte-compile twice (bug#10260).
lisp/makefile.w32-in (update-subdirs-CMD): Use a Local Variables section.
2011-12-10 13:49:33 +01:00
Eli Zaretskii
35eae26441 A better default for $(EMACS) in lisp/makefile.w32-in.
lisp/makefile.w32-in (EMACS): Default to ../src/$(BLD)/emacs.exe.
2011-04-02 11:55:47 +03:00
Juanma Barranquero
ebe0c9b6b0 lisp/makefile.w32-in (COMPILE_FIRST): Remove pcase. 2011-03-30 16:01:28 +02:00
Stefan Monnier
2663659f1f * lisp/makefile.w32-in (COMPILE_FIRST): Fix up last change.
* lisp/ldefs-boot.el: Revert to upstream's version.
2011-03-14 22:49:15 -04:00
Stefan Monnier
2ec42da9f0 Try and fix w32 build; misc cleanup.
* lisp/subr.el (apply-partially): Move from subr.el; don't use lexical-let.
(eval-after-load): Obey lexical-binding.
* lisp/simple.el (apply-partially): Move to subr.el.
* lisp/makefile.w32-in: Match changes in Makefile.in.
(BIG_STACK_DEPTH, BIG_STACK_OPTS, BYTE_COMPILE_FLAGS): New vars.
(.el.elc, compile-CMD, compile-SH, compile-always-CMD)
(compile-always-SH, compile-calc-CMD, compile-calc-SH): Use them.
(COMPILE_FIRST): Add pcase, macroexp, and cconv.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Silence warning about
calling CL's `compiler-macroexpand'.
* lisp/emacs-lisp/bytecomp.el (byte-compile-preprocess): New function.
(byte-compile-initial-macro-environment)
(byte-compile-toplevel-file-form, byte-compile, byte-compile-sexp): Use it.
(byte-compile-eval, byte-compile-eval-before-compile): Obey lexical-binding.
(byte-compile--for-effect): Rename from `for-effect'.
(display-call-tree): Use case.
* lisp/emacs-lisp/byte-opt.el (for-effect): Don't declare as dynamic.
(byte-optimize-form-code-walker, byte-optimize-form):
Revert to old arg name.
* lisp/Makefile.in (BYTE_COMPILE_FLAGS): New var.
(compile-onefile, .el.elc, compile-calc, recompile): Use it.
2011-03-11 22:32:43 -05:00
Juanma Barranquero
35f52ed60d lisp/makefile.w32-in (TRAMP_SRC): Remove tramp-imap.el. 2011-02-14 01:23:11 +01:00
Glenn Morris
73b0cd5003 Convert consecutive FSF copyright years to ranges. 2011-01-24 20:08:28 -08:00
Glenn Morris
e7a4241753 Add --no-site-lisp to more Makefiles.
* leim/makefile.w32-in (RUN_EMACS):
* leim/Makefile.in (RUN-EMACS): Add --no-site-lisp.

* lib-src/Makefile.in (EMACSOPT): Add --no-site-lisp.

* lisp/makefile.w32-in (EMACSOPT): Add --no-site-lisp.
2011-01-07 18:53:50 -08:00
Glenn Morris
d0981f8286 In Makefiles, -batch implies -q.
* leim/makefile.w32-in (RUN_EMACS):
* leim/Makefile.in (RUN-EMACS): -batch implies --no-init-file.

* lisp/makefile.w32-in (EMACSOPT): -batch implies --no-init-file.

* src/makefile.w32-in ($(EMACS)):
* src/Makefile.in (emacs$(EXEEXT)): -batch implies -q.
2011-01-07 18:41:14 -08:00
Eli Zaretskii
73077a9af5 Support TAGS targets in the w32 build.
nt/makefile.w32-in (frc, TAGS, TAGS-gmake, TAGS-nmake): New targets.
 emacs-src.tags: New file.
 src/makefile.w32-in (TAGS, frc, TAGS-LISP, ../nt/TAGS, tags)
 (TAGS-gmake, TAGS-nmake, TAGS-LISP-gmake, TAGS-LISP-nmake)
 (nt-TAGS-gmake, nt-TAGS-nmake): New targets.
 lisp/makefile.w32-in (DEST, TAGS, TAGS-LISP, TAGS-nmake)
 (TAGS-LISP-nmake, TAGS-gmake, TAGS-LISP-gmake, TAGS-SH)
 (TAGS-LISP-SH, TAGS-CMD, TAGS-LISP-CMD): New targets.
 lib-src/makefile.w32-in (tags, TAGS): New targets.
2010-10-01 13:45:16 +02:00
Juanma Barranquero
5d921df2ed Port tramp-related Makefile changes of 2010-09-08T14:42:54Z!michael.albinus@gmx.de, 2010-09-13T15:17:01Z!michael.albinus@gmx.de to Windows.
* makefile.w32-in (LOADDEFS): Add $(lisp)/net/tramp-loaddefs.el.
  (TRAMP_SRC): New macro.
  ($(lisp)/net/tramp-loaddefs.el): New target.
2010-09-13 18:33:56 +02:00
Chong Yidong
198a7a97ff Make obsolete --unibyte argument do nothing (Bug#6886).
* src/emacs.c (main): Remove --unibyte handling (Bug#6886).

* lisp/startup.el (command-line-1): Issue warning for ignored arguments
--unibyte, etc (Bug#6886).

* doc/lispref/nonascii.texi (Text Representations):
* doc/lispref/loading.texi (Loading Non-ASCII):
* doc/lispref/compile.texi (Byte Compilation): Don't mention obsolete
--unibyte command-line argument.
2010-08-22 17:15:20 -04:00
Juanma Barranquero
5fee75d49a Fix Windows makefiles to adapt to lisp/vc reorganization.
* lib-src/makefile.w32-in (lisp2): Fix references to vc/vc-hooks.elc
  and vc/ediff-hook.elc.

* lisp/makefile.w32-in (WINS_BASIC): Include new directory vc.
2010-06-11 23:26:13 +02:00
Glenn Morris
114f9c9679 Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
Eli Zaretskii
38c1ba62af Rename cvs-update to bzr-update in lisp/ Makefiles.
Makefile.in (bzr-update): Renamed from cvs-update.
 (cvs-update): New target for backward compatibility.

 makefile.w32-in (bzr-update): Renamed from cvs-update.
(cvs-update): New target for backward compatibility.
2010-01-02 12:42:11 +02:00
Chong Yidong
82d3343cd8 * makefile.w32-in: Ensure that Lisp files in CEDET subdirectories
are compiled.
2009-12-11 16:48:02 +00:00
Tassilo Horn
1f35fda94f * makefile.w32-in: Don't refer cc-subword.elc but subword.elc.
* Makefile.in: Don't refer cc-subword.elc but subword.elc.
2009-11-20 14:05:18 +00:00
Glenn Morris
5288ec68cd (autoloads, $(lisp)/calendar/cal-loaddefs.el)
($(lisp)/calendar/diary-loaddefs.el, $(lisp)/calendar/hol-loaddefs.el)
($(lisp)/mh-e/mh-loaddefs.el): Pass $(MAKE) as second argument to
w32-batch-update-autoloads.
2009-10-15 06:10:10 +00:00
Juanma Barranquero
872a1ea427 * makefile.w32-in (WINS_UPDATES): Fix typo in previous change. 2009-10-07 17:10:19 +00:00
Juanma Barranquero
8c4afe20df * makefile.w32-in (WINS_UPDATES): New macro.
(custom-deps, finder-data, autoloads): Use it.
2009-10-07 09:31:32 +00:00
Eli Zaretskii
de87fb719d (WINS_BASIC): Fix last change. 2009-10-02 19:53:53 +00:00
Eli Zaretskii
8f885d01d2 (AUTOGENEL): Add loaddefs.el files in cedet subdirectories. 2009-10-02 18:56:05 +00:00
Eli Zaretskii
573709fd61 (WINS_BASIC): Add eieio. 2009-10-02 18:48:23 +00:00
Eli Zaretskii
b4a74f3033 (WINS_CEDET_SUBDIRS): List of subdirectories of cedet.
(bootstrap-clean-CMD, bootstrap-clean-SH): Remove *.elc files in subdirs
of cedet as well.
2009-10-02 18:46:37 +00:00
Eli Zaretskii
a5b7b0eb47 (update-subdirs-CMD): Add cedet to $(WINS_SUBDIR). 2009-10-02 15:46:46 +00:00
Eli Zaretskii
d2bda74fc9 (WINS_BASIC): Remove cedet.
(WINS_CEDET): Add cedet.
(update-subdirs-SH): Use $(WINS_SUBDIR), not $(WINS).
2009-10-02 12:19:24 +00:00
Juanma Barranquero
79711e3670 * makefile.w32-in (WINS_CEDET, WINS_BASIC, WINS_SUBDIR): New macros.
(WINS_ALMOST): Set from WINS_BASIC and WINS_CEDET.
  (update-subdirs-CMD): Use WINS_SUBDIR, not WINS_ALMOST.
2009-09-29 00:55:01 +00:00
Eli Zaretskii
4ab5d55036 (WINS_ALMOST): Fix last change. 2009-09-26 18:43:22 +00:00
Eli Zaretskii
416ac2f17e (WINS_ALMOST): Add cedet (with its subdirectories) and eieio. 2009-09-26 09:41:02 +00:00
Glenn Morris
ae940284fa Add 2009 to copyright years. 2009-01-05 03:18:22 +00:00
Eli Zaretskii
6c4d5dd3eb (MH_E_DIR): New variable.
($(MH_E_DIR)/mh-alias.elc $(MH_E_DIR)/mh-comp.elc)
($(MH_E_DIR)/mh-folder.elc $(MH_E_DIR)/mh-funcs.elc)
($(MH_E_DIR)/mh-identity.elc $(MH_E_DIR)/mh-inc.elc)
($(MH_E_DIR)/mh-junk.elc $(MH_E_DIR)/mh-letter.elc)
($(MH_E_DIR)/mh-limit.elc $(MH_E_DIR)/mh-mime.elc)
($(MH_E_DIR)/mh-print.elc $(MH_E_DIR)/mh-scan.elc)
($(MH_E_DIR)/mh-search.elc $(MH_E_DIR)/mh-seq.elc)
($(MH_E_DIR)/mh-show.elc $(MH_E_DIR)/mh-speed.elc)
($(MH_E_DIR)/mh-thread.elc $(MH_E_DIR)/mh-tool-bar.elc)
($(MH_E_DIR)/mh-utils.elc $(MH_E_DIR)/mh-xface.elc)
($(MH_E_DIR)/mh-e.elc $(MH_E_DIR)/mh-limit.elc): New dependencies.
2008-12-27 12:03:46 +00:00
Eli Zaretskii
0b8e2d21df (compile-first): New target.
(recompile): Depend on compile-first.
2008-11-22 12:46:03 +00:00
Eli Zaretskii
1ed6e04d06 ($(lisp)/progmodes/cc-mode.elc): Remove.
($(lisp)/progmodes/cc-align.elc, $(lisp)/progmodes/cc-cmds.elc)
($(lisp)/progmodes/cc-compat.elc, $(lisp)/progmodes/cc-defs.elc)
($(lisp)/progmodes/cc-engine.elc)
($(lisp)/progmodes/cc-fonts.elc, $(lisp)/progmodes/cc-langs.elc)
($(lisp)/progmodes/cc-mode.elc, $(lisp)/progmodes/cc-styles.elc)
($(lisp)/progmodes/cc-subword.elc)
($(lisp)/progmodes/cc-vars.elc): New dependencies.
2008-09-26 10:28:46 +00:00
Eli Zaretskii
d2373df5d7 ($(lisp)/cus-load.el): Don't use `touch'. Instead, generate an empty
cus-load.el with `echo', and include "Local Variables" section to prevent
the empty file from being compiled.
(cus-load.el-SH, cus-load.el-CMD): New SHELLTYPE-specific targets that
generate an empty cus-load.el.
2008-06-20 15:48:08 +00:00
Eli Zaretskii
6eb5ddb8e5 (distclean): Depend on `clean'.
(clean): Delete calc/calc-loaddefs.el~ and eshell/esh-groups.el~.
(AUTOGENEL): Add $(lisp)/nxml/subdirs.el.
2008-06-20 15:43:29 +00:00
Juanma Barranquero
329b266147 * makefile.w32-in (bootstrap-clean-CMD, bootstrap-clean-SH):
Don't copy ldefs-boot.el over loaddefs.el.
  (bootstrap-clean): Remove loaddefs.el and don't depend on it.
  (loaddefs.el-SH, loaddefs.el-CMD): Don't add autoloads and defvars
  to loaddefs.el; they are not needed now.  Add coding cookie.
2008-06-20 15:18:30 +00:00
Glenn Morris
eb3fa2cfcf Switch to recommended form of GPLv3 permissions notice. 2008-05-06 08:06:51 +00:00
Juanma Barranquero
f01d54ca92 (AUTOGENEL): Add calc-loaddefs.el. 2008-04-10 09:53:56 +00:00