1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-28 00:01:33 -08:00
Commit graph

189 commits

Author SHA1 Message Date
Eli Zaretskii
9078ead6ce Support building on MS-Windows with libxml2.
src/makefile.w32-in (OBJ2): Add xml.$(O).
 (GLOBAL_SOURCES): Add xml.c.
 ($(BLD)/xml.$(O)): New dependency list.
 src/xml.c (DEF_XML2_FN, LOAD_XML2_FN) [WINDOWSNT]: New macros.
 (fn_htmlReadMemory, fn_xmlReadMemory, fn_xmlDocGetRootElement)
 (fn_xmlFreeDoc, fn_xmlCleanupParser, fn_xmlCheckVersion)
 [!WINDOWSNT]: New macros.
 (init_libxml2_functions, libxml2_loaded_p): New functions.
 (parse_region): Call fn_xmlCheckVersion instead of using the macro
 LIBXML_TEST_VERSION.  Call libxml2 functions via the fn_* macros.
 (xml_cleanup_parser): New function, export for fn_xmlCleanupParser.
 Calls xmlCleanupParser only if libxml2 was loaded (or statically
 linked in).
 (Flibxml_parse_html_region, Flibxml_parse_xml_region): Call
 init_libxml2_functions before calling libxml2 functions.
 (syms_of_xml) <Qlibxml2_dll>: DEFSYM it.
 src/emacs.c: Don't include libxml/parser.h.
 (shut_down_emacs): Call xml_cleanup_parser, instead of calling
 xmlCleanupParser directly.
 src/ lisp.h [HAVE_LIBXML2]: Add prototype for xml_cleanup_parser.

 nt/configure.bat: Support building with libxml2.
 nt/INSTALL:
 nt/README.W32: Add information about libxml2.

 lisp/term/w32-win.el (dynamic-library-alist): Add libxml2 DLLs.

 lib-src/makefile.w32-in (obj): Add xml.o.
2012-04-07 16:57:36 +03:00
Eli Zaretskii
e4ecc6a217 Build test-distrib on MS-Windows and run it during the build.
lib-src/makefile.w32-in (ALL): Add $(BLD)/test-distrib.exe.
2012-04-07 13:36:54 +03:00
Eli Zaretskii
d67a9a85f5 Fix parallel build and bootstrap on MS-Windows.
nt/makefile.w32-in: (all): Don't depend on stamp_BLD and on maybe-bootstrap.
 (all-other-dirs-$(MAKETYPE)): Depend on maybe-bootstrap.
 (bootstrap-gmake): Invoke the "clean" and build targets in 2
 separate commands, so they run in that order even under "make -j".
 lib/makefile.w32-in (gnulib, all): Don't depend on stamp_BLD.
 lib-src/makefile.w32-in (ALL): Now the list of executables, not of phony
 targets.
 (.PHONY): Only make-docfile is its prerequisite now.
 (make-docfile): Don't depend on stamp_BLD.  Add a comment about
 the need in this target.
 (ctags, etags, ebrowse, hexl, movemail, emacsclient)
 (test-distrib): Phony targets removed.
 ($(BLD)/test-distrib.exe): Run test-distrib as part of the recipe.
 (all): Don't depend on stamp_BLD.
2012-04-07 13:19:22 +03:00
Glenn Morris
acaf905b11 Add 2012 to FSF copyright years for Emacs files 2012-01-05 01:46:05 -08:00
Eli Zaretskii
8c9afb4694 Fix MS-Windows build with MSVC compiler.
Parts of the changes by Fabrice Popineau  <fabrice.popineau@supelec.fr>.

 lib-src/makefile.w32-in (LOCAL_FLAGS): Add $(EMACS_EXTRA_C_FLAGS).
 lib-src/emacsclient.c (main) <environ>: Remove declaration, already
 pulled in by unistd.h on Posix hosts and stdlib.h on MS-Windows.
 nt/inc/stdint.h (uint32_t, uint64_t) [_WIN64]: New typedefs.
 (UINT64_MAX) [_WIN64]: Fix definition.
 (uintmax_t, intmax_t): Fix definitions.
 nt/inc/inttypes.h (strtoumax, strtoimax) [!__MINGW32__]: Provide
 correct definitions.
 nt/config.nt (HAVE_DECL_STRTOLL): Define.
 (va_copy) [_WIN64]: Provide a better definition.
 src/s/ms-w32.h (utimbuf) [_MSC_VER]: Don't define.
 (snprintf) [_MSC_VER]: Redirect to _snprintf.
 (strtoll) [_MSC_VER]: Redirect to _strtoi64.
 (malloc, free, realloc, calloc): Redirect to e_* only when
 compiling Emacs.
 src/lisp.h (GCTYPEBITS): Move before first use.
 (ALIGN_GCTYPEBITS) [_MSC_VER]: Define.
 (DECL_ALIGN) [_MSC_VER]: Use it, as MSVC doesn't like bit ops in
 this macro definition.
 (tzname): Redirect to _tzname for all values of _MSC_VER.

Fixes: debbugs:9960
2011-11-27 20:52:53 +02:00
Paul Eggert
0e926e561c Assume freestanding C89 headers, string.h, stdlib.h. 2011-07-06 18:32:56 -07:00
Glenn Morris
4a72048482 Remove the SOME_MACHINE_LISP distinction in src/Makefile.in.
See discussion in http://debbugs.gnu.org/8302

* configure.in (NS_SUPPORT, MOUSE_SUPPORT, TOOLTIP_SUPPORT)
(WINDOW_SUPPORT): Remove output variables that are no longer used.

* lib-src/makefile.w32-in (echolisp): Remove rule that is no longer needed.
(clean): No more echolisp.tmp.

* .bzrignore: Remove lib-src/echolisp.tmp.

* lisp/emacs-lisp/autoload.el (batch-update-autoloads):
Set autoload-excludes by parsing lisp/loadup.el rather than Makefiles.

* lisp/loadup.el: Update commentary.

* msdos/sed1x.inp (TOOLTIP_SUPPORT, WINDOW_SUPPORT):
* msdos/sed1v2.inp (MSDOS_SUPPORT, NS_SUPPORT, MOUSE_SUPPORT)
(TOOLTIP_SUPPORT, WINDOW_SUPPORT): No need to edit these any more.

* src/Makefile.in (MSDOS_SUPPORT_REAL, MSDOS_SUPPORT, NS_SUPPORT)
(REAL_MOUSE_SUPPORT, GPM_MOUSE_SUPPORT, MOUSE_SUPPORT, TOOLTIP_SUPPORT)
(BASE_WINDOW_SUPPORT, X_WINDOW_SUPPORT, WINDOW_SUPPORT): Remove.
(lisp): Set the order to that of loadup.el.
(shortlisp): Make it a copy of $lisp.
(SOME_MACHINE_LISP): Remove.
($(etc)/DOC): Depend just on $lisp, not $SOME_MACHINE_LISP too.
Use just $shortlisp, not $SOME_MACHINE_LISP too.
2011-05-18 23:04:16 -07:00
Glenn Morris
c136e5cdf2 Remove lib-src/fakemail.c.
* lib-src/fakemail.c: Remove file.

* lib-src/Makefile.in (UTILITIES): Remove fakemail${EXEEXT}.
(fakemail${EXEEXT}): Remove rule.

* lib-src/makefile.w32-in ($(BLD)/fakemail.exe, fakemail)
($(BLD)/fakemail.$(O)): Remove.

* lisp/mail/sendmail.el (sendmail-program): Fall back to just "sendmail".

* lisp/mail/feedmail.el: Update commentary.

* doc/emacs/ack.texi (Acknowledgments): Remove fakemail.c.

* etc/NEWS: Mention this.

* INSTALL: Remove fakemail.
2011-05-17 20:39:45 -07:00
Ted Zlatanov
418401a53f Add GnuTLS support for W32.
* lib-src/makefile.w32-in (obj): Added gnutls.o.
2011-04-24 20:28:55 -05:00
Eli Zaretskii
b97decf246 MS-Windows part of 2011-02-21T23:22:34Z!eggert@cs.ucla.edu, addition of min-max.h.
lib-src/makefile.w32-in ($(BLD)/ebrowse.$(O), $(BLD)/pop.$(O)): Depend
 on ../lib/min-max.h.
2011-02-22 19:51:38 +02:00
Juanma Barranquero
602a5739d4 lib-src/makefile.w32-in (obj): Remove filemode.o. 2011-02-22 01:49:54 +01:00
Eli Zaretskii
25c51af3a9 Adapt MS-Windows build to import of filemode.c from gnulib.
nt/inc/sys/stat.h (S_ISUID, S_ISGID, S_ISVTX, S_IRGRP, S_IROTH)
 (S_IWGRP, S_IWOTH, S_IXGRP, S_IXOTH, S_ISSOCK, S_ISLNK, S_ISCTG)
 (S_ISDOOR, S_ISMPB, S_ISMPC, S_ISNWK, S_ISPORT, S_ISWHT)
 (S_TYPEISMQ, S_TYPEISSEM, S_TYPEISSHM, S_TYPEISTMO): Define.
 (lstat): Define to stat.
 lib/makefile.w32-in ($(BLD)/filemode.$(O)): Move from
 src/makefile.w32-in and adapt.  Depend on stamp_BLD.
 (GNULIBOBJS): Add $(BLD)/filemode.$(O).
 src/makefile.w32-in ($(BLD)/filemode.$(O)): Move recipe to
 lib/makefilw.w32-in.
 ($(BLD)/dired.$(O)): Depend on $(EMACS_ROOT)/lib/filemode.h.
 (GLOBAL_SOURCES): Remove filemode.c.
 (OBJ1): Remove $(BLD)/filemode.$(O).
 lib-src/makefile.w32-in ($(BLD)/ctags.$(O), $(BLD)/emacsclient.$(O))
 ($(BLD)/etags.$(O), $(BLD)/movemail.$(O), $(BLD)/ntlib.$(O)):
 Depend on $(EMACS_ROOT)/nt/inc/sys/stat.h.
2011-02-21 22:00:19 +02:00
Juanma Barranquero
50a4e25afa lib-src/makefile.w32-in (obj): Remove md5.o. 2011-02-20 23:17:39 +01:00
Eli Zaretskii
83cc577291 lib-src/makefile.w32-in (obj): Remove strftime.o, it's not in src/. 2011-02-02 21:50:21 +02:00
Eli Zaretskii
d9f1f55ed7 Make "etags --version" on Windows produce the same as on Posix platforms.
makefile.w32-in (ETAGS_CFLAGS, CTAGS_CFLAGS): Add
 ``-DEMACS_NAME="\"GNU Emacs\""''.
2011-02-02 18:28:24 +02:00
Eli Zaretskii
70b0d280eb Fix the MS-Windows build broken by 2011-01-30T23:34:18Z!eggert@cs.ucla.edu and 2011-01-31T08:15:13Z!eggert@cs.ucla.edu.
lib/makefile.w32-in (GNULIBOBJS): Add $(BLD)/strftime.$(O) and
 $(BLD)/time_r.$(O).
 ($(BLD)/dtoastr.$(O)): Depend on $(EMACS_ROOT)/src/s/ms-w32.h and
 $(EMACS_ROOT)/src/m/intel386.h.
 ($(BLD)/strftime.$(O)): 
 ($(BLD)/time_r.$(O)): Define prerequisites.
 src/makefile.w32-in (OBJ2): Remove strftime.$(O).
 ($(BLD)/strftime.$(O)): Remove prerequisites.
 lib-src/makefile.w32-in (VERSION): Don't define, defined on nt/config.nt.
 (ECLIENT_CFLAGS): Remove -DVERSION.
 ($(BLD)/emacsclient.$(O)): Don't depend on makefile.w32-in.
 nt/config.nt (VERSION): Uncomment definition.
 (restrict): Define.
 nt/inc/stdbool.h: New file.
 admin/admin.el (set-version): Remove lib-src/makefile.w32-in.  Add
 nt/config.nt.
2011-01-31 21:36:08 +02:00
Eli Zaretskii
f915f0f7c8 Fix the MS-Windows build broken by 2011-01-17T19:01:01Z!eggert@cs.ucla.edu and emacs-23/2010-05-21T19:51:48Z!acm@muc.de.
lib/makefile.w32-in:
 lib/getopt_.h: New files.
 src/s/ms-w32.h (HAVE_MKTIME): Remove.
 src/makefile.w32-in (LOCAL_FLAGS): Add -I../lib.
 (GNULIB): New variable.
 (LIBS): Add $(GNULIB).
 $(TEMACS): Depend on $(GNULIB).
 <top-level>: Fix font-lock disrupted by a lone `"'.
 src/makefile.w32-in (LOCAL_FLAGS): Add -I../lib.
 (GETOPTOBJS, GETOPTDEPS): Remove targets.
 (MOVEMAILOBJS): Replace $(GETOPTOBJS) with ../lib/$(BLD)/libgnu.$(A).
 ($(BLD)/movemail.exe): Depend on ../lib/getopt.h.
 (ECLIENTOBJS, ETAGSOBJ, CTAGSOBJ, EBROWSEOBJ): Replace getopt.o
 and getopt1.o with ../lib/$(BLD)/libgnu.$(A).
 (clean): Don't remove getopt.h.
 (getopt.h, $(BLD)/getopt.$(O), $(BLD)/getopt1.$(O)): Remove targets.
 ($(BLD)/ctags.$(O), $(BLD)/etags.$(O)): Replace getopt.h with
 $(EMACS_ROOT)/lib/getopt.h.
 nt/makefile.w32-in (all-other-dirs-nmake, all-other-dirs-gmake)
 (bootstrap-nmake, bootstrap-gmake, bootstrap-clean-nmake)
 (bootstrap-clean-gmake, clean-other-dirs-nmake)
 (clean-other-dirs-gmake, cleanall-other-dirs-nmake)
 (cleanall-other-dirs-gmake, distclean-other-dirs-nmake)
 (distclean-other-dirs-gmake, maintainer-clean-other-dirs-nmake)
 (maintainer-clean-other-dirs-gmake): Recurse into ../lib as well.
 nt/configure.bat: Create lib/makefile.
 nt/config.nt (HAVE_MKTIME, BROKEN_MKTIME): Remove.
 (HAVE_ATTRIBUTE_ALIGNED, HAVE_C99_STRTOLD, HAVE_DECL_GETENV)
 (HAVE_DECL_LOCALTIME_R, HAVE_WCHAR_T, PACKAGE, VERSION, inline)
 (_GL_UNUSED, _UNUSED_PARAMETER_): Add definitions, for gnulib.
2011-01-29 14:36:11 +02:00
Glenn Morris
73b0cd5003 Convert consecutive FSF copyright years to ranges. 2011-01-24 20:08:28 -08:00
Stefan Monnier
77ab81d054 Merge from emacs-23 2011-01-14 12:18:41 -05:00
Glenn Morris
5df4f04cd3 Add 2011 to FSF/AIST copyright years. 2011-01-02 15:50:46 -08:00
Chong Yidong
1f10e75066 Bump version to 23.2.91.
Regenerate configure and ldefs-boot.el.
2010-12-10 12:46:40 -05:00
Chong Yidong
0f161c71c9 Bump version to 23.2.90.
Regenerate AUTHORS, configure, and ldefs-boot.el.
2010-11-08 21:53:18 -05:00
Glenn Morris
6a5c21753e Move ns-win.el's rather wacky menu adjustments to menu-bar.el.
* lisp/term/ns-win.el: Do not require easymenu.
(menu-bar-edit-menu) <copy, paste, paste-from-menu, separator-undo>:
<spell>: Move adjustments to menu-bar.el.
* lisp/menu-bar.el (menu-bar-edit-menu) <copy, paste, paste-from-menu>:
<separator-undo, spell>: Move ns-win's adjustments here.
* lisp/loadup.el [ns]: Do not load easymenu.

* src/Makefile.in (SOME_MACHINE_LISP): Remove easymenu.elc.
* lib-src/makefile.w32-in (OTHER_PLATFORM_SUPPORT): Remove easymenu.elc.
2010-10-24 17:48:26 -07:00
Glenn Morris
17284e3024 Replace digest-doc and sorted-doc C programs with Lisp commands.
* lib-src/digest-doc.c, lib-src/sorted-doc.c: Remove files.
* lib-src/Makefile.in (UTILITIES): Remove digest-doc and sorted-doc.
(digest-doc${EXEEXT}, sorted-doc${EXEEXT}): Remove rules.
* lib-src/makefile.w32-in (ALL): Remove digest-doc and sorted-doc.
($(BLD)/sorted-doc.exe, $(BLD)/digest-doc.exe, sorted-doc, digest-doc)
($(BLD)/digest-doc.$(O), $(BLD)/sorted-doc.$(O)): Remove rules.
(install): Don't install digest-doc.exe or sorted-doc.exe.

* lisp/help-fns.el (doc-file-to-man, doc-file-to-info): New commands.

* doc/lispref/help.texi (Documentation Basics): Remove mentions of
digest-doc and sorted-doc.

* INSTALL, nt/README, nt/README.W32: Do not mention digest-doc and sorted-doc.

* etc/NEWS: Mention this change.
2010-10-22 19:46:06 -07:00
Glenn Morris
3fb78d1f33 Remove lib-src/b2m.c and b2m.pl.
Emacs does not use Babyl files since 23.1, and you can use M-x unrmail.

* msdos/mainmake.v2 (install): Remove b2m.

* lisp/emacs-lisp/authors.el (authors-valid-file-names): Add b2m.c.

* lib-src/b2m.c, lib-src/b2m.pl: Remove files.
* lib-src/Makefile.in (INSTALLABLES): Remove b2m.
* lib-src/makefile.w32-in ($(BLD)/b2m.$(O)): Remove.

* doc/emacs/ack.texi (Acknowledgments): No more b2m.c.

* admin/quick-install-emacs (PUBLIC_LIBSRC_BINARIES): Remove b2m.

* INSTALL, make-dist: Remove references to b2m.
* Makefile.in (MAN_PAGES): Remove b2m.1.
2010-10-08 18:15:15 -07:00
Juanma Barranquero
54b65f7b40 Rework tags targets in Windows makefiles to protect against old/stupid makes.
* lib-src/makefile.w32-in (tags): Remove target.
* src/makefile.w32-in (tags): Rename target to full-tags.
2010-10-02 14:12:17 +02: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
a69edb8adf lib-src/makefile.w32-in (../src/config.h): Remove target, it is stale. 2010-09-29 17:07:34 +02:00
Eli Zaretskii
f09e4c6bcd MS-Windows follow-up for 2010-07-12T05:25:46Z!handa@etlken.
makefile.w32-in (lisp2): Change hebrew.el to hebrew.elc.
2010-07-12 12:22:20 +03:00
Eli Zaretskii
994a7c3beb Fix bug #6603.
makefile.w32-in (obj): Add menu.o, bidi.o, w32uniscrobe.o, and unexw32.o.
2010-07-11 09:39:00 +03: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
Chong Yidong
19ae0deb1c Bump version to 23.2.50. 2010-05-08 00:46:44 -04:00
Chong Yidong
61a808e819 Bump version to 23.2. 2010-05-07 23:28:26 -04:00
Chong Yidong
bab1431e6c * makefile.w32-in (OTHER_PLATFORM_SUPPORT): Use parenthesis for macros for nmake compatibility. 2010-05-05 15:54:04 -04:00
Chong Yidong
8838172bf0 Bump version to 23.1.97. 2010-05-03 21:31:59 -04:00
Chong Yidong
958631c4cc Bump version to 23.1.96. 2010-04-19 21:29:37 -04:00
Christoph
42d3cab7ad * lib-src/makefile.w32-in: Use parenthesis for macros for nmake compatibility. 2010-04-07 15:43:04 +02:00
Chong Yidong
d86d8ea85a Bump version to 23.1.95. 2010-04-02 20:42:10 -04:00
Chong Yidong
66da5719da Bump version to 23.1.94 and regenerate ldefs-boot.el. 2010-03-10 23:03:11 -05:00
Chong Yidong
288f9fc069 Bump version to 24.0.50. 2010-03-10 10:17:13 -05:00
Chong Yidong
5d752593a5 Bump version to 23.1.93; regenerate AUTHORS. 2010-02-26 22:09:45 -05:00
Chong Yidong
e1c6f91c71 Bump version to 23.1.92. 2010-01-29 21:09:50 -05:00
Glenn Morris
114f9c9679 Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
Chong Yidong
829f35a5bb Bump version to 23.1.91. Regenerate AUTHORS and ldefs-boot.el. 2009-12-30 21:14:46 -05:00
Chong Yidong
03dcfe0121 * lib-src/makefile.w32-in, doc/lispintro/makefile.w32-in: Use
parenthesis for macros for nmake compatibility.
2009-12-09 20:15:56 +00:00
Chong Yidong
a3ff15d6fc Bump version to 23.1.90. 2009-12-09 02:06:16 +00:00
Glenn Morris
9fc3db2b6b (echolisp): New rule.
(clean): Delete echolisp.tmp.
2009-10-15 06:04:11 +00:00
Eli Zaretskii
614bd9cfdd (OTHER_PLATFORM_SUPPORT): Add term/internal.elc, term/pc-win.elc,
emacs-lisp/easymenu.elc, and term/ns-win.elc, to be consistent with
src/Makefile.in.
2009-09-27 08:27:57 +00:00
Eli Zaretskii
f2d6b71469 (WINNT_SUPPORT): Add common-win.elc, like src/Makefile.in did. 2009-07-03 13:42:29 +00:00
Chong Yidong
d7ae78c031 Bump version to 23.1.50. 2009-06-21 04:46:07 +00:00