1. 07 Apr, 2012 2 commits
    • Juanma Barranquero's avatar
    • Eli Zaretskii's avatar
      Support building on MS-Windows with libxml2. · 9078ead6
      Eli Zaretskii authored
       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.
      9078ead6
  2. 11 Jan, 2012 1 commit
  3. 05 Jan, 2012 1 commit
  4. 12 Nov, 2011 1 commit
    • Eli Zaretskii's avatar
      Allow building temacs with a larger heap on MS-Windows. · 7ef3cbd5
      Eli Zaretskii authored
       src/makefile.w32-in (HEAPSIZE): New variable, allows to build temacs
       with user-defined heap size.  Bump the default size of the temacs
       heap to 27MB, to avoid memory warning when running temacs.
       ($(TEMACS)): Use HEAPSIZE instead of a hardcoded value.
      7ef3cbd5
  5. 05 Nov, 2011 2 commits
    • Christoph Scholtes's avatar
      1f05cd82
    • Eli Zaretskii's avatar
      Support MSVC build with newer versions of Visual Studio. · a6fc3b5c
      Eli Zaretskii authored
      Small portions of the changes by Fabrice Popineau <fabrice.popineau@supelec.fr>.
      
       src/makefile.w32-in (TAGS-gmake): Don't use $(patsubst ...), as
       Nmake barfs on that.  Use $(OBJ*_c) variables instead, defined on
       nt/gmake.defs.
       src/lisp.h (ENUM_BF): New macro, for enumerated types in bitfields,
       which are not supported by MSVC.
       (Lisp_Symbol, Lisp_Misc_Any, Lisp_Marker, Lisp_Misc_Overlay)
       (Lisp_Save_Value, Lisp_Free): Use ENUM_BF for enumerated types in
       bitfields.
       (Lisp_Object) [USE_LISP_UNION_TYPE]: Use ENUM_BF for enumerated
       types in bitfields.
       (DEFUN) [_MSC_VER]: Define in a different way for MSVC.
       src/w32fns.c [_MSC_VER]: DECLARE_HANDLE for any MSVC version.
       src/w32.c: Don't include w32api.h for MSVC.
       (init_environment) [_MSC_VER]: Call sys_access, not _access.
       src/s/ms-w32.h <sigset_t, ssize_t> [_MSC_VER]: Typedefs for MSVC.
       [_MSC_VER]: Include sys/timeb.h, sys/stat.h, and signal.h.
       (fstat, stat, utime) [_MSC_VER]: Redirect to their sys_* cousins.
       (malloc, free, realloc, calloc) [_MSC_VER]: Always redirect to the
       e_* cousins.
       (alloca) [_MSC_VER]: Define to _alloca.
       src/lisp.h (DECL_ALIGN) [_MSC_VER]: Define for MSVC.
       src/regex.c <re_char> [_MSC_VER]: A separate definition for MSVC.
       nt/makefile.w32-in (clean-other-dirs-nmake)
       (distclean-other-dirs-nmake, maintainer-clean-other-dirs-nmake):
       Update for current structure of doc/ subdirectories.
       nt/gmake.defs (OBJ0_c, OBJ1_c, OBJ2_c): New variables.
       nt/INSTALL: Update for newer versions of MSVC.
       lib/makefile.w32-in (FRC): New dummy target.
       (TAGS): Depend on FRC.
      
      Fixes: debbugs:9960
      a6fc3b5c
  6. 27 Aug, 2011 1 commit
  7. 15 Aug, 2011 1 commit
    • Eli Zaretskii's avatar
      Use uniprop tables instead of biditype.h and bidimirror.h. · 474a8465
      Eli Zaretskii authored
       src/bidi.c (bidi_initialize): Use uniprop_table instead of including
       biditype.h and bidimirror.h.
       src/biditype.h: File removed.
       src/bidimirror.h: File removed.
       src/deps.mk (bidi.o): Remove biditype.h and
       bidimirror.h.
       src/makefile.w32-in ($(BLD)/bidi.$(O)): Remove biditype.h and
       bidimirror.h.
       src/dispextern.h: Fix a typo in the comment to bidi_type_t.
       src/chartab.c: Improve commentary for the uniprop_table API.
      
       admin/unidata/bidimirror.awk: File removed.
       admin/unidata/biditype.awk: File removed.
       admin/unidata/makefile.w32-in (all): Remove src/biditype.h and
       src/bidimirror.h.
       (../../src/biditype.h, ../../src/bidimirror.h): Deleted.
       admin/unidata/Makefile.in (all): Remove src/biditype.h and
       src/bidimirror.h.
       (../../src/biditype.h, ../../src/bidimirror.h): Deleted.
      474a8465
  8. 16 Jul, 2011 1 commit
  9. 27 Jun, 2011 1 commit
  10. 21 Jun, 2011 1 commit
  11. 12 Jun, 2011 1 commit
  12. 31 May, 2011 1 commit
  13. 24 May, 2011 1 commit
  14. 18 May, 2011 1 commit
  15. 07 May, 2011 1 commit
    • Ben Key's avatar
      * nt/configure.bat: Renamed the fusercflags variable to escusercflags · 4d3fcc8e
      Ben Key authored
      so that the variable name better matches its purpose, to be identical
      to usercflags with the exception that all quotes are escaped by the \
      character.
      
      Renamed the fuserldflags variable to escuserldflags so that the
      variable name better matches its purpose, to be identical to
      userldflags with the exception that all quotes are escaped by the \
      character.
      
      A new ESC_USER_CFLAGS variable is written to config.settings.  This
      variable has the same value as the escusercflags variable.
      
      * nt/gmake.defs, nt/nmake.defs: Added the variable ESC_CFLAGS.  This
      variable is identical to the CFLAGS variable except that it includes
      the new ESC_USER_CFLAGS variable instead of USER_CFLAGS.
      
      * src/makefile.w32-in: The bootstrap-temacs rule now makes use of one
      of two shell specific rules, either bootstrap-temacs-CMD or
      bootstrap-temacs-SH.  The bootstrap-temacs-SH rule is identical to the
      previous implementation of the bootstrap-temacs rule.  The
      bootstrap-temacs-CMD rule is similar to the previous implementation of
      the bootstrap-temacs rule except that it makes use of the ESC_CFLAGS
      variable instead of the CFLAGS variable.
      
      
      These changes are required to extend my earlier fix to add support for
      --cflags and --ldflags options that include quotes so that it works
      whether make uses cmd or sh as the shell.
      4d3fcc8e
  16. 06 May, 2011 1 commit
  17. 05 May, 2011 1 commit
  18. 27 Apr, 2011 1 commit
  19. 25 Apr, 2011 1 commit
    • Ted Zlatanov's avatar
      Add GnuTLS support for W32 and certificate and hostname verification in GnuTLS. · e061a11b
      Ted Zlatanov authored
      * src/gnutls.c: Renamed global_initialized to
      gnutls_global_initialized.  Added internals for the
      :verify-hostname-error, :verify-error, and :verify-flags
      parameters of `gnutls-boot' and documented those parameters in the
      docstring.  Start callback support.
      (emacs_gnutls_handshake): Add Woe32 support. Retry handshake
      unless a fatal error occured. Call gnutls_alert_send_appropriate
      on error. Return error code.
      (emacs_gnutls_write): Call emacs_gnutls_handle_error.
      (emacs_gnutls_read): Likewise.
      (Fgnutls_boot): Return handshake error code.
      (emacs_gnutls_handle_error): New function.
      (wsaerror_to_errno): Likewise.
      
      * src/gnutls.h: Add GNUTLS_STAGE_CALLBACKS enum to denote we're in the
      callbacks stage.
      
      * src/w32.c (emacs_gnutls_pull): New function for GnuTLS on Woe32.
      (emacs_gnutls_push): Likewise.
      
      * src/w32.h (emacs_gnutls_pull): Add prototype.
      (emacs_gnutls_push): Likewise.
      e061a11b
  20. 24 Apr, 2011 2 commits
    • Eli Zaretskii's avatar
      Fallout from resurrecting doprnt. · 762b15be
      Eli Zaretskii authored
       src/doc.c (get_doc_string): Improve the format passed to `error'.
       src/doprnt.c (doprnt): Improve commentary.
       src/term.c (init_tty) [MSDOS]: Fix 1st argument to maybe_fatal.
       src/Makefile.in (TAGS): Depend on $(M_FILE) and $(S_FILE), and scan
       them with etags.
       src/makefile.w32-in (TAGS): Depend on $(CURDIR)/m/intel386.h and
       $(CURDIR)/s/ms-w32.h.
       (TAGS-gmake): Scan $(CURDIR)/m/intel386.h and $(CURDIR)/s/ms-w32.h.
      762b15be
    • Eli Zaretskii's avatar
      Fix a minor bug in src/makefile.w32-in. · f1052e5d
      Eli Zaretskii authored
       src/makefile.w32-in (globals.h): Add a dummy recipe, to make any
       changes in globals.h immediately force recompilation.
      f1052e5d
  21. 23 Apr, 2011 1 commit
    • Eli Zaretskii's avatar
      Fix doprnt so it could be used safely in `verror'. (Bug#8435) · e6c3da20
      Eli Zaretskii authored
       src/doprnt.c: Include limits.h.
       (SIZE_MAX): New macro.
       (doprnt): Return a size_t value.  2nd arg is now size_t.  Many
       local variables are now size_t instead of int or unsigned.
       Improve overflow protection.  Support `l' modifier for integer
       conversions.  Support %l conversion.  Don't assume an EMACS_INT
       argument for integer conversions and for %c.
       src/lisp.h (doprnt): Restore prototype.
       src/makefile.w32-in ($(BLD)/callint.$(O)): Depend on
       $(SRC)/character.h.
       src/Makefile.in (base_obj): Add back doprnt.o.
       src/deps.mk (doprnt.o): Add back prerequisites.
       (callint.o): Depend on character.h.
       src/eval.c (internal_lisp_condition_case): Include the handler
       representation in the error message.
       (verror): Call doprnt instead of vsnprintf.  Fix an off-by-one bug
       when breaking from the loop.
       src/xdisp.c (vmessage): Call doprnt instead of vsnprintf.
       src/callint.c (Fcall_interactively): When displaying error message
       about invalid control letter, pass the character's codepoint, not
       a pointer to its multibyte form.  Improve display of the character
       in octal and display also its hex code.
       src/character.c (char_string): Use %x to display the (unsigned)
       codepoint of an invalid character, to avoid displaying a bogus
       negative value.
       src/font.c (check_otf_features): Pass SDATA of SYMBOL_NAME to
       `error', not SYMBOL_NAME itself.
       src/coding.c (Fencode_sjis_char, Fencode_big5_char): Use %c for
       character arguments to `error'.
       src/charset.c (check_iso_charset_parameter): Fix incorrect argument
       to `error' in error message about FINAL_CHAR argument.  Make sure
       FINAL_CHAR is a character, and use %c when it is passed as
       argument to `error'.
      e6c3da20
  22. 19 Mar, 2011 1 commit
  23. 17 Mar, 2011 1 commit
  24. 13 Mar, 2011 1 commit
  25. 11 Mar, 2011 1 commit
    • Eli Zaretskii's avatar
      Fix MS-Windows build broken by 2011-03-11T07:24:21Z!eggert@cs.ucla.edu. · 7ef4b50c
      Eli Zaretskii authored
       src/term.c (encode_terminal_code): Now external again, used by
       w32console.c and msdos.c.
       src/termhooks.h (encode_terminal_code): Declare prototype.
       src/msdos.c (encode_terminal_code): Don't declare prototype.
       src/makefile.w32-in ($(BLD)/term.$(O), ($(BLD)/tparam.$(O)): Depend
       on $(SRC)/tparam.h, see 2011-03-11T07:24:21Z!eggert@cs.ucla.edu.
      7ef4b50c
  26. 21 Feb, 2011 1 commit
    • Eli Zaretskii's avatar
      Adapt MS-Windows build to import of filemode.c from gnulib. · 25c51af3
      Eli Zaretskii authored
       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.
      25c51af3
  27. 20 Feb, 2011 1 commit
    • Christoph Scholtes's avatar
      Fix the MS-Windows build due to import of md5 from gnulib. · 32159fc3
      Christoph Scholtes authored
       src/makefile.w32-in: Remove md5.$(O).
       ($(BLD)/md5.$(O)): Remove prerequisites, moved to
       lib/makefile.w32-in.
       ($(BLD)/fns.$(O)): Depend on $(EMACS_ROOT)/lib/md5.h and on stamp_BLD.
       lib/makefile.w32-in ($(BLD)/md5.$(O)): New recipe, moved from
       src/makefile.w32-in.
      32159fc3
  28. 09 Feb, 2011 1 commit
    • Eli Zaretskii's avatar
      Update the Windows build according to 2011-02-08T21:42:56Z!tromey@redhat.com... · d37f40ed
      Eli Zaretskii authored
      Update the Windows build according to 2011-02-08T21:42:56Z!tromey@redhat.com and 2011-02-09T17:04:43Z!schwab@linux-m68k.org.
      
       src/makefile.w32-in (GLOBAL_SOURCES, SOME_MACHINE_OBJECTS, obj): New
       macros.
       (globals.h, gl-stamp): New targets.
       (clean): Clean gl-stamp and globals.h.
       nt/makefile.w32-in (bootstrap-nmake, bootstrap-gmake): Make the
       "make-docfile" target in lib-src, before bootstrapping the src
       directory.  Needed since building in src needs to run make-docfile
       to produce globals.h.
      d37f40ed
  29. 04 Feb, 2011 2 commits
  30. 31 Jan, 2011 1 commit
    • Eli Zaretskii's avatar
      Fix the MS-Windows build broken by 2011-01-30T23:34:18Z!eggert@cs.ucla.edu and... · 70b0d280
      Eli Zaretskii authored
      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.
      70b0d280
  31. 29 Jan, 2011 1 commit
    • Eli Zaretskii's avatar
      Fix the MS-Windows build broken by 2011-01-17T19:01:01Z!eggert@cs.ucla.edu and... · f915f0f7
      Eli Zaretskii authored
      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.
      f915f0f7
  32. 25 Jan, 2011 1 commit
  33. 08 Jan, 2011 1 commit
    • Glenn Morris's avatar
      In Makefiles, -batch implies -q. · d0981f82
      Glenn Morris authored
      * 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.
      d0981f82
  34. 02 Jan, 2011 1 commit
  35. 13 Oct, 2010 1 commit
    • Juanma Barranquero's avatar
      src/makefile.w32-in: Simplify OBJ macros. · 5e371708
      Juanma Barranquero authored
      * makefile.w32-in (TLIB2): Rename from TLIBW32.
        (OBJ2): New macro.
        (WIN32OBJ, FONTOBJ): Remove.
        (OBJ1): Redistribute object files with OBJ2.
        (LIBS, $(TEMACS)): Use TLIB2.
        (make-buildobj-CMD, make-buildobj-SH): Use OBJ2.
        ($(TLIB2), TAGS, TAGS-LISP, TAGS-gmake): Depend on OBJ2.
      5e371708
  36. 03 Oct, 2010 1 commit