1. 01 Aug, 2012 1 commit
    • Juanma Barranquero's avatar
      Adapt Windows port to recent changes in autogen/config.in. · 552a99b4
      Juanma Barranquero authored
      * lib-src/makefile.w32-in (CONFIG_H): Update dependencies.
      (CONF_POST_H): New macro.
      
      * lib/makefile.w32-in (CONFIG_H): Update dependencies.
      (CONF_POST_H): New macro.
      
      * nt/config.nt: Sync with autogen/config.in.
      Remove code moved to conf_post.h and include <conf_post.h>
      (NULL_DEVICE, SEPCHAR, SIGNAL_H_AHB, TIOCSIGSEND, USER_FULL_NAME)
      (USG5_4, WRETCODE, _longjmp, _setjmp, wait3): New macros.
      
      * src/makefile.w32-in (CONFIG_H): Update dependencies.
      (CONF_POST_H): New macro.
      
      * src/s/ms-w32.h (SEPCHAR, NULL_DEVICE): Remove; moved to nt/config.nt.
      552a99b4
  2. 29 Jul, 2012 2 commits
    • Eli Zaretskii's avatar
      Fix parallel builds on Windows in lib-src. · 8519232d
      Eli Zaretskii authored
       lib-src/makefile.w32-in ($(BLD)/profile.$(O)): Depend on stamp_BLD.
      8519232d
    • Paul Eggert's avatar
      Don't use the abbreviation "win" to refer to Windows (Bug#10421). · b46a6a83
      Paul Eggert authored
      * 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.
      b46a6a83
  3. 09 Jul, 2012 2 commits
    • Juanma Barranquero's avatar
      lib-src/makefile.w32-in: Rework dependencies. · 65e46515
      Juanma Barranquero authored
      ($(BLD)/test-distrib.exe): Use LIB_SRC, not SRC.
      (LIB_SRC, NT_INC, GNU_LIB, MS_W32_H, CONFIG_H, INTTYPES_H, NTLIB_H)
      (SYSTIME_H): New macros.
      (SRC): Redefine to point to src/, not current directory.
      ($(BLD)/ctags.$(O), $(BLD)/ebrowse.$(O), $(BLD)/emacsclient.$(O))
      ($(BLD)/etags.$(O), $(BLD)/hexl.$(O), $(BLD)/make-docfile.$(O))
      ($(BLD)/movemail.$(O), $(BLD)/ntlib.$(O), $(BLD)/pop.$(O))
      ($(BLD)/profile.$(O), $(BLD)/test-distrib.$(O)): Update dependencies.
      ($(BLD)/regex.$(O)): New dependency.
      65e46515
    • Juanma Barranquero's avatar
      lib-src/makefile.w32-in (ALL): Add profile.exe. · 31542918
      Juanma Barranquero authored
      (PROFILEOBJS): New macro.
      ($(BLD)/profile.exe): New target.
      (install): Copy profile.exe.
      ($(BLD)/alloca.$(O), $(BLD)/tcp.$(O)): Remove, obsolete.
      31542918
  4. 07 Jul, 2012 1 commit
    • Juanma Barranquero's avatar
      Update Windows port to gnulib changes in 2012-07-06T21:07:46Z!eggert@cs.ucla.edu. · 07adc2c6
      Juanma Barranquero authored
      * lib-src/makefile.w32-in ($(BLD)/ctags.$(O), $(BLD)/etags.$(O)):
      Update dependencies.
      
      * lib/makefile.w32-in (GNULIBOBJS): Add $(BLD)/c-ctype.$(O),
      $(BLD)/c-strcasecmp.$(O) and $(BLD)/c-strncasecmp.$(O).
      ($(BLD)/c-ctype.$(O), $(BLD)/c-strcasecmp.$(O))
      ($(BLD)/c-strncasecmp.$(O)): New dependencies.
      
      * src/makefile.w32-in (DISPEXTERN_H, $(BLD)/regex.$(O)):
      Update dependencies.
      
      * src/s/ms-w32.h [_MSC_VER]: Remove strcasecmp, strncasecmp.
      07adc2c6
  5. 30 Jun, 2012 1 commit
  6. 27 Jun, 2012 1 commit
    • Glenn Morris's avatar
      Remove paths.el · 1ba6038a
      Glenn Morris authored
      * lisp/info.el (Info-default-directory-list): Move here from paths.el.
      * lisp/paths.el: Remove file, which is now empty.
      * lisp/loadup.el: No longer load "paths".
      
      * src/lisp.mk (lisp): Remove paths.elc.
      
      * lib-src/makefile.w32-in (lisp2): Remove paths.el.
      
      * INSTALL: Remove references to paths.el.
      1ba6038a
  7. 26 Jun, 2012 1 commit
  8. 05 Jun, 2012 1 commit
  9. 29 May, 2012 1 commit
    • Eli Zaretskii's avatar
      Fix bug #11405 with MSVC build of emacsclientw. · 06523364
      Eli Zaretskii authored
       lib-src/makefile.w32-in ($(BLD)/emacsclientw.exe): Use $(MWINDOWS)
       instead of a literal -mwindows, which is not supported by MSVC.
       nt/nmake.defs (MWINDOWS): Define as "-subsystem:windows -entry:mainCRTStartup".
       Suggested by Fabrice Popineau <fabrice.popineau@supelec.fr>.
       nt/gmake.defs (MWINDOWS): Define as "-mwindows".
      06523364
  10. 22 May, 2012 1 commit
    • Paul Eggert's avatar
      Remove src/m/*. · 34374650
      Paul Eggert authored
      * configure.in: Remove all mention of src/m/*.
      (machine, machfile, M_FILE, config_machfile, and_machfile): Remove.
      All uses removed.
      (BITS_PER_CHAR, BITS_PER_SHORT, BITS_PER_INT, BITS_PER_LONG)
      (BITS_PER_LONG_LONG): Move to src/lisp.h.
      * lib/makefile.w32-in: Remove dependencies on
      $(EMACS_ROOT)/src/m/intel386.h.
      * make-dist: Don't make links to src/m.
      * admin/CPP-DEFINES: Do not mention src/m/*.h.
      (BITS_PER_EMACS_INT, BITS_PER_LONG, BITS_PER_CHAR)
      (BITS_PER_SHORT, BITS_PER_INT): Remove.
      * admin/MAINTAINERS: Remove src/m/.
      * lib-src/makefile.w32-in: Remove dependencies on
      $(EMACS_ROOT)/src/m/intel386.h.
      * msdos/mainmake.v2 (TAGS tags): Don't look at $(CURDIR)/src/m/intel386.h.
      * nt/config.nt: Do not include "m/intel386.h"; file was removed.
      (BITS_PER_CHAR, BITS_PER_SHORT, BITS_PER_INT, BITS_PER_LONG):
      Move to src/lisp.h.
      (EMACS_INT_MAX): New macro.
      This directory predates autoconf and is no longer needed nowadays.
      Move its few remaining bits of functionality to where they're needed.
      * src/m/README, src/m/alpha.h, src/m/amdx86-64.h, src/m/ia64.h, src/m/ibmrs6000.h:
      * src/m/ibms390x.h, src/m/intel386.h, src/m/m68k.h, src/m/macppc.h:
      * src/m/sparc.h, src/m/template.h: Remove.
      * src/Makefile.in (M_FILE): Remove.  All uses removed.
      * src/alloc.c (POINTERS_MIGHT_HIDE_IN_OBJECTS):
      * src/lisp.h (USE_LSB_TAG):
      * src/mem-limits.h (EXCEEDS_LISP_PTR):
      Use VAL_MAX, not VALBITS, in #if.
      * src/lisp.h (EMACS_INT_MAX): New macro, useful in #if.
      (EMACS_UINT): Define unconditionally now.
      (BITS_PER_CHAR, BITS_PER_SHORT, BITS_PER_INT, BITS_PER_LONG)
      (BITS_PER_EMACS_INT): New constants, replacing
      what used to be in config.h, but not useful in #if.
      (GCTYPEBITS, VALBITS): Define unconditionally, since m/* files don't
      define them any more.
      (VAL_MAX): New macro.
      (VALMASK): Use it.
      * src/puresize.h (PURESIZE_RATIO): Use EMACS_INT_MAX, not
      BITS_PER_EMACS_INT, in #if.
      * src/s/aix4-2.h (BROKEN_FIONREAD, BROKEN_SIGAIO, BROKEN_SIGPTY)
      (BROKEN_SIGPOLL): Move here from m/ibmrs6000.h, which was removed.
      * src/s/gnu-linux.h (ULIMIT_BREAK_VALUE) [__i386__]:
      * src/s/ms-w32.h (DATA_START):
      Move here from removed file m/intel386.h.
      * src/s/gnu.h (NLIST_STRUCT): Remove undef; 'configure' does this.
      * src/s/irix6-5.h (_LP64): Remove; lisp.h no longer needs this.
      34374650
  11. 07 Apr, 2012 3 commits
    • 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
    • Eli Zaretskii's avatar
      Build test-distrib on MS-Windows and run it during the build. · e4ecc6a2
      Eli Zaretskii authored
       lib-src/makefile.w32-in (ALL): Add $(BLD)/test-distrib.exe.
      e4ecc6a2
    • Eli Zaretskii's avatar
      Fix parallel build and bootstrap on MS-Windows. · d67a9a85
      Eli Zaretskii authored
       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.
      d67a9a85
  12. 19 Jan, 2012 1 commit
  13. 15 Jan, 2012 1 commit
  14. 11 Jan, 2012 1 commit
  15. 05 Jan, 2012 1 commit
  16. 27 Nov, 2011 1 commit
    • Eli Zaretskii's avatar
      Fix MS-Windows build with MSVC compiler. · 8c9afb46
      Eli Zaretskii authored
      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
      8c9afb46
  17. 07 Jul, 2011 1 commit
  18. 19 May, 2011 1 commit
    • Glenn Morris's avatar
      Remove the SOME_MACHINE_LISP distinction in src/Makefile.in. · 4a720484
      Glenn Morris authored
      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.
      4a720484
  19. 18 May, 2011 1 commit
    • Glenn Morris's avatar
      Remove lib-src/fakemail.c. · c136e5cd
      Glenn Morris authored
      * 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.
      c136e5cd
  20. 25 Apr, 2011 1 commit
  21. 11 Mar, 2011 1 commit
  22. 01 Mar, 2011 1 commit
  23. 22 Feb, 2011 2 commits
  24. 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
  25. 20 Feb, 2011 1 commit
  26. 15 Feb, 2011 1 commit
  27. 02 Feb, 2011 3 commits
  28. 01 Feb, 2011 1 commit
  29. 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
  30. 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
  31. 25 Jan, 2011 1 commit
  32. 15 Jan, 2011 1 commit
  33. 02 Jan, 2011 1 commit