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

760 Commits

Author SHA1 Message Date
Eli Zaretskii
d37f40ed38 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.
2011-02-09 22:50:17 +02:00
Eli Zaretskii
a5d733f5d7 Adapt to addition of ignore-value.h in 2011-02-03T19:29:35Z!eggert@cs.ucla.edu.
src/makefile.w32-in (IGNORE_VALUE_H): New variable.
 ($(BLD)/sysdep.$(O)): Depend on $(IGNORE_VALUE_H).
 nt/config.nt (inline) [__GNUC__]: Define (for gnulib).
2011-02-04 11:17:36 +02:00
Eli Zaretskii
d95f875e4c Commit changes in nt/ChangeLog for 2011-01-31T19:36:08Z!eliz@gnu.org. 2011-01-31 22:04:42 +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
1e338cfca8 Fix the bootstrap on MS-Windows.
makefile.w32-in (bootstrap-nmake, bootstrap-gmake): Fix the bootstrap.
2011-01-29 15:41:34 +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
95df8112a0 Refill some long/short copyright headers. 2011-01-26 00:36:39 -08:00
Glenn Morris
73b0cd5003 Convert consecutive FSF copyright years to ranges. 2011-01-24 20:08:28 -08:00
Glenn Morris
06d8ace515 Merge from emacs-23.
Note setting of CANNOT_DUMP on ia64 hpux is still to be merged manually.
2011-01-24 19:47:47 -08:00
Glenn Morris
43f90d65a2 * nt/iconcs/README: Add 2010, 2011 to FSF copyright years. 2011-01-22 16:53:08 -08:00
Glenn Morris
e9bffc61f2 Refill some copyright headers. 2011-01-15 18:21:30 -08:00
Glenn Morris
0d9f702fd0 Nuke arch-tags. 2011-01-15 15:16:57 -08:00
Glenn Morris
d0d4361dba Add 2011 to remaining FSF/AIST copyright years. 2011-01-15 14:10:37 -08:00
Chong Yidong
9f19b8ddfe Bump version to 23.2.92.
Regenerate AUTHORS, configure, and ldefs-boot.el.
2011-01-14 22:50:47 -05:00
Stefan Monnier
77ab81d054 Merge from emacs-23 2011-01-14 12:18:41 -05:00
Eli Zaretskii
1e574bf0ea Use __builtin_unwind_init in MinGW builds of w32 port.
config.nt (HAVE___BUILTIN_UNWIND_INIT) [GCC >= 2.8]: Define.
2011-01-07 12:16:20 +02:00
Glenn Morris
5df4f04cd3 Add 2011 to FSF/AIST copyright years. 2011-01-02 15:50:46 -08:00
Eli Zaretskii
3d4cad2cc9 Fix merge of fix for bug #7716.
nt/INSTALL:
 nt/README.W32: `image-library-alist' was renamed to `dynamic-library-alist'.
2011-01-02 23:58:13 +02:00
Chong Yidong
7c420169ba Merge changes from emacs-23 branch 2011-01-02 15:31:19 -05:00
Eli Zaretskii
ca6e909ce3 nt/configure.bat (end): Unset environment variables used by this batch file. 2010-12-31 15:12:11 +02:00
Eli Zaretskii
5be1c984b7 Fix bug #7716 with PNG image support libraries on Windows.
src/image.c <Qlibpng_version>: New variable.
 (syms_of_image): Intern and staticpro it.  Set its value to the
 version of PNG library we were compiled with.
 (my_png_error, png_load): Avoid GCC warnings about direct access
 to png_ptr->jmpbuf.
 lisp/term/w32-win.el (image-library-alist): Set up correctly for
 libpng versions both before and after 1.4.0.
 admin/nt/README.W32: Update the information about PNG support libraries.
 nt/INSTALL: Update the information about PNG support libraries.
2010-12-31 14:38:06 +02:00
Chong Yidong
1f10e75066 Bump version to 23.2.91.
Regenerate configure and ldefs-boot.el.
2010-12-10 12:46:40 -05:00
Eli Zaretskii
628e219faf Fix compilation on Windows following 2010-11-23T18:47:23Z!dann@ics.uci.edu.
config.nt (EXTERNALLY_VISIBLE): Define.
2010-11-23 22:21:16 +02:00
Stefan Monnier
4a47c27573 Merge from emacs-23 2010-11-17 22:54:14 -05:00
Eli Zaretskii
d226db8cfe Document non-support for MSVC versions later than 8.0. 2010-11-10 15:39:17 +02: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
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
Juanma Barranquero
2e288d54f0 Rename image-library-alist' to dynamic-library-alist'.
* etc/NEWS: Mention `dynamic-library-alist'.

* lisp/image.el (image-library-alist): Declare as obsolete alias.
  (image-type-available-p): Use `dynamic-library-alist'.

* lisp/term/w32-win.el (dynamic-library-alist):
  Use instead of `image-library-alist'.

* nt/INSTALL: Refer to `dynamic-library-alist'.

* src/image.c (Vimage_library_alist)
  (syms_of_image) <image-library-alist>: Move to src/emacs.c and rename.
  (lookup_image_type): Use Vdynamic_library_alist.
  (Finit_image_library): Doc fix.

* src/emacs.c (Vdynamic_library_alist)
  (syms_of_emacs) <dynamic-library-alist>: Move from src/image.c and rename.
  Doc fix.

* src/lisp.h (Vdynamic_library_alist): Declare extern.
2010-10-13 16:50:06 +02:00
Juanma Barranquero
6072fed48b nt/INSTALL: Add note about problematic characters passed to configure. 2010-10-06 12:55:03 +02:00
Eli Zaretskii
1dc253e89b nt/ChangeLog: Fix last entry. 2010-10-01 13:52:23 +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
Eli Zaretskii
19d5deefe5 Fix bug #7102.
gmake.defs: Add a comment with a single quote to fix fontification.
2010-10-01 10:16:39 +02:00
Eli Zaretskii
252b4f5cf6 nt/configure.bat: Fix condition for copying paths.h into ../src/epaths.h. 2010-09-29 15:58:11 +02:00
Juanma Barranquero
0597ab06f6 nt/*.c: Use const char*; remove unused code.
* addpm.c (entry, add_registry, main):
* addsection.c (file_data, open_input_file, open_output_file)
  (find_section, PTR_TO_OFFSET, copy_executable_and_add_section)
  (COPY_CHUNK):
* cmdproxy.c (vfprintf, fprintf, printf, fail, warn, skip_space)
  (skip_nonspace, get_next_token, search_dir, make_absolute)
  (spawn, main):
* preprep.c (file_data, open_input_file, open_output_file)
  (open_inout_file, find_section, PTR_TO_OFFSET, COPY_CHUNK, main):
  Use const char*.

* cmdproxy.c (stdin): Don't define, not used.
  (main): Don't assign remlen after last use.
2010-09-28 02:55:08 +02:00
Juanma Barranquero
0521215472 Fix bug#6820: Don't accept backslashes or quotes on compiler options.
* nt/configure.bat: Err out when the argument of --cflags contains
  invalid characters (check implemented only for GCC).
2010-09-23 01:14:00 +02:00
Juanma Barranquero
8f978ca0d5 nt/configure.bat: Add comment about USER_(C|LD)FLAGS. 2010-09-22 19:26:02 +02:00
Juanma Barranquero
ee705a5c54 nt/configure.bat: Cosmetic changes. 2010-09-22 03:30:05 +02:00
Juanma Barranquero
926cd98cf1 nt/addpm.c (add_registry): Create App Paths of type REG_EXPAND_SZ. 2010-08-19 18:38:41 +02:00
Jason Rumney
856a6b7709 (add_registry): Set path for runemacs.exe to use. 2010-08-12 22:28:43 +08:00
Chong Yidong
7815fe1985 Merge changes from emacs-23 branch 2010-08-08 17:12:29 -04:00
Juanma Barranquero
7561000b5c nt/config.nt (TIME_WITH_SYS_TIME): Remove #undef, unused (bug#6754). 2010-08-03 01:20:48 +02:00
Óscar Fuentes
c5958e82b7 nt/cmdproxy.c (main): Use _snprintf instead of wsprintf (bug#6647). 2010-08-02 21:35:28 +02:00
Dan Nicolaescu
76fd1ee9bd Clean up unexec.c, remove references to unused code.
* nt/config.nt: Remove code referring to NO_REMAP, unused.

* src/unexec.c (make_hdr): Remove references to NO_REMAP, COFF,
SEGMENT_MASK, SECTION_ALIGNMENT, ADJUST_EXEC_HEADER.
* src/s/usg5-4.h (COFF):
* src/s/template.h:
* src/s/msdos.h (COFF, NO_REMAP):
* src/s/ms-w32.h (NO_REMAP):
* src/s/hpux10-20.h (NO_REMAP):
* src/m/sparc.h (SEGMENT_MASK):
* src/m/m68k.h (NO_REMAP):
* src/m/intel386.h (SEGMENT_MASK):
* src/m/arm.h (NO_REMAP):
* src/m/alpha.h (COFF):
* src/m/template.h: Remove references to unused defines.
2010-07-28 20:25:08 -07:00
Christoph Scholtes
f8e0614ccb Build binary distros on Windows using emacs-VERSION as root dir name.
* nt/makefile.w32-in: Copy README.W32 to installation directory
  during `make install'.  Remove README.W32 with `distclean' (in
  case Emacs was installed in place).  Use temporary directory to
  create distribution zip files in `dist' target.
* nt/zipdist.bat: Simplify code using temporary directory.
2010-07-25 05:53:37 +02:00
Christoph Scholtes
d24076a601 Added README.W32 to distclean. Updated Changelog. 2010-07-24 21:07:15 -06:00
Juanma Barranquero
361358ea12 Make building under stricter warning flags somewhat cleaner.
Flags used: -Wold-style-declaration -Wunused-function -Wstrict-prototypes

* lib-src/emacsclient.c (getcwd, w32_getenv):
* lib-src/ntlib.h (getlogin, getuid, getegid, getgid): Fix prototypes.

* nt/runemacs.c (set_user_model_id): Fix prototype.

* src/callproc.c (relocate_fd): Set inside #ifndef WINDOWSNT.
* src/dired.c (opendir, readdir): Fix prototypes.
* src/editfns.c (w32_get_internal_run_time): Fix prototypes.
* src/keyboard.c (input_available_signal): Declare inside #ifdef SIGIO.
* src/ndir.h (opendir, readdir, seekdir, closedir): Fix prototypes.
  (telldir): Remove declaration.
* src/ralloc.c (real_morecore, __morecore): Fix prototypes.
* src/sound.c (alsa_sound_perror): Declare inside #ifdef HAVE_ALSA.
* src/syssignal.h (strsignal): Fix prototype.
* src/term.c (tparam): Fix prototype.
  (term_get_fkeys_address, term_get_fkeys_kboard, term_get_fkeys_1)
  (term_get_fkeys): Set inside "#ifndef DOS_NT".
* src/vm-limit.c (check_memory_limits): Fix prototypes of real_morecore
  and __morecore.
* src/w32gui.h (XParseGeometry): Fix prototype.
* src/w32heap.h (get_data_start, get_data_end, init_heap): Fix prototypes.
* src/w32term.c (my_set_focus): Declare inside #if 0.
* src/w32term.h (x_window_to_frame, x_display_info_for_name, w32_term_init)
  (w32_fill_rect, w32_clear_window, init_crit, delete_crit, signal_quit)
  (drain_message_queue, get_next_msg, post_msg, parse_button)
  (ClipboardSequence_Proc): Fix prototypes.
  (wait_for_sync): Remove declaration.
2010-07-25 02:20:51 +02:00
Christoph Scholtes
7f86df5f42 Added ChangeLog entry for copying of README.W32. 2010-07-24 16:10:01 -06:00
Christoph Scholtes
5904117d3c Fixed whitespace. 2010-07-24 16:07:04 -06:00
Christoph Scholtes
e0d6af9cc6 Code cleanup. Added ChangeLog entry. 2010-07-24 16:04:10 -06:00
Christoph Scholtes
4ad28e2787 Refactoring of make dist target 2010-07-24 15:35:36 -06:00