Mercurial > hg > xemacs-beta

view netinstall/setup.mak @ 5124:623d57b7fbe8 ben-lisp-object

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
separate regular and disksave finalization, print method fixes. Create separate disksave method and make the finalize method only be for actual object finalization, not disksave finalization. Fix places where 0 was given in place of a printer -- print methods are mandatory, and internal objects formerly without a print method now must explicitly specify internal_object_printer(). Change the defn of CONSOLE_LIVE_P to avoid problems in some weird situations. -------------------- ChangeLog entries follow: -------------------- src/ChangeLog addition: 2010-01-20 Ben Wing <ben@xemacs.org> * alloc.c: * alloc.c (very_old_free_lcrecord): * alloc.c (disksave_object_finalization_1): * alloc.c (make_lcrecord_list): * alloc.c (alloc_managed_lcrecord): * alloc.c (free_managed_lcrecord): * alloc.c (sweep_lcrecords_1): * buffer.c: * bytecode.c: * bytecode.c (Fcompiled_function_p): * chartab.c: * console-impl.h: * console-impl.h (CONSOLE_TYPE_P): * console.c: * console.c (set_quit_events): * data.c: * data.c (Fmake_ephemeron): * database.c: * database.c (finalize_database): * database.c (Fclose_database): * device-msw.c: * device-msw.c (finalize_devmode): * device-msw.c (allocate_devmode): * device.c: * elhash.c: * elhash.c (finalize_hash_table): * eval.c: * eval.c (bind_multiple_value_limits): * event-stream.c: * event-stream.c (finalize_command_builder): * events.c: * events.c (mark_event): * extents.c: * extents.c (finalize_extent_info): * extents.c (uninit_buffer_extents): * faces.c: * file-coding.c: * file-coding.c (finalize_coding_system): * file-coding.h: * file-coding.h (struct coding_system_methods): * file-coding.h (struct detector): * floatfns.c: * floatfns.c (extract_float): * fns.c: * fns.c (Fidentity): * font-mgr.c (finalize_fc_pattern): * font-mgr.c (finalize_fc_config): * frame.c: * glyphs.c: * glyphs.c (finalize_image_instance): * glyphs.c (unmap_subwindow_instance_cache_mapper): * gui.c: * gui.c (gui_error): * keymap.c: * lisp.h (struct Lisp_Symbol): * lrecord.h: * lrecord.h (struct lrecord_implementation): * lrecord.h (MC_ALLOC_CALL_FINALIZER): * lrecord.h (MC_ALLOC_CALL_FINALIZER_FOR_DISKSAVE): * lrecord.h (DEFINE_DUMPABLE_LISP_OBJECT): * lrecord.h (DEFINE_DUMPABLE_GENERAL_LISP_OBJECT): * lrecord.h (DEFINE_DUMPABLE_SIZABLE_LISP_OBJECT): * lrecord.h (DEFINE_DUMPABLE_SIZABLE_GENERAL_LISP_OBJECT): * lrecord.h (DEFINE_DUMPABLE_FROB_BLOCK_LISP_OBJECT): * lrecord.h (DEFINE_DUMPABLE_FROB_BLOCK_GENERAL_LISP_OBJECT): * lrecord.h (DEFINE_DUMPABLE_FROB_BLOCK_SIZABLE_LISP_OBJECT): * lrecord.h (DEFINE_DUMPABLE_INTERNAL_LISP_OBJECT): * lrecord.h (DEFINE_DUMPABLE_SIZABLE_INTERNAL_LISP_OBJECT): * lrecord.h (DEFINE_NODUMP_LISP_OBJECT): * lrecord.h (DEFINE_NODUMP_GENERAL_LISP_OBJECT): * lrecord.h (DEFINE_NODUMP_SIZABLE_LISP_OBJECT): * lrecord.h (DEFINE_NODUMP_SIZABLE_GENERAL_LISP_OBJECT): * lrecord.h (DEFINE_NODUMP_FROB_BLOCK_LISP_OBJECT): * lrecord.h (DEFINE_NODUMP_FROB_BLOCK_GENERAL_LISP_OBJECT): * lrecord.h (DEFINE_NODUMP_FROB_BLOCK_SIZABLE_LISP_OBJECT): * lrecord.h (DEFINE_NODUMP_INTERNAL_LISP_OBJECT): * lrecord.h (DEFINE_NODUMP_SIZABLE_INTERNAL_LISP_OBJECT): * lrecord.h (MAKE_LISP_OBJECT): * lrecord.h (DEFINE_DUMPABLE_MODULE_LISP_OBJECT): * lrecord.h (DEFINE_DUMPABLE_MODULE_GENERAL_LISP_OBJECT): * lrecord.h (DEFINE_DUMPABLE_MODULE_SIZABLE_LISP_OBJECT): * lrecord.h (DEFINE_DUMPABLE_MODULE_SIZABLE_GENERAL_LISP_OBJECT): * lrecord.h (DEFINE_NODUMP_MODULE_LISP_OBJECT): * lrecord.h (DEFINE_NODUMP_MODULE_GENERAL_LISP_OBJECT): * lrecord.h (DEFINE_NODUMP_MODULE_SIZABLE_LISP_OBJECT): * lrecord.h (DEFINE_NODUMP_MODULE_SIZABLE_GENERAL_LISP_OBJECT): * lrecord.h (MAKE_MODULE_LISP_OBJECT): * lstream.c: * lstream.c (finalize_lstream): * lstream.c (disksave_lstream): * marker.c: * marker.c (finalize_marker): * mule-charset.c (make_charset): * number.c: * objects.c: * objects.c (finalize_color_instance): * objects.c (finalize_font_instance): * opaque.c: * opaque.c (make_opaque_ptr): * process-nt.c: * process-nt.c (nt_finalize_process_data): * process-nt.c (nt_deactivate_process): * process.c: * process.c (finalize_process): * procimpl.h (struct process_methods): * scrollbar.c: * scrollbar.c (free_scrollbar_instance): * specifier.c (finalize_specifier): * symbols.c: * toolbar.c: * toolbar.c (Ftoolbar_button_p): * tooltalk.c: * ui-gtk.c: * ui-gtk.c (emacs_gtk_object_finalizer): * ui-gtk.c (allocate_emacs_gtk_boxed_data): * window.c: * window.c (finalize_window): * window.c (mark_window_as_deleted): Separate out regular and disksave finalization. Instead of a FOR_DISKSAVE argument to the finalizer, create a separate object method `disksaver'. Make `finalizer' have only one argument. Go through and separate out all finalize methods into finalize and disksave. Delete lots of thereby redundant disksave checking. Delete places that signal an error if we attempt to disksave -- all of these objects are non-dumpable and we will get an error from pdump anyway if we attempt to dump them. After this is done, only one object remains that has a disksave method -- lstream. Change DEFINE_*_LISP_OBJECT_WITH_PROPS to DEFINE_*_GENERAL_LISP_OBJECT, which is used for specifying either property methods or disksave methods (or in the future, any other less-used methods). Remove the for_disksave argument to finalize_process_data. Don't provide a disksaver for processes because no one currently needs it. Clean up various places where objects didn't provide a print method. It was made mandatory in previous changes, and all methods now either provide their own print method or use internal_object_printer or external_object_printer. Change the definition of CONSOLE_LIVE_P to use the contype enum rather than looking into the conmeths structure -- in some weird situations with dead objects, the conmeths structure is NULL, and printing such objects from debug_print() will crash if we try to look into the conmeths structure.
author Ben Wing <ben@xemacs.org>
date Wed, 20 Jan 2010 07:05:57 -0600
parents 146d342ff859
children 308d34e9f07d
line wrap: on
line source

#   Makefile for Microsoft NMAKE
#   Copyright (C) 1995 Board of Trustees, University of Illinois.
#   Copyright (C) 1995, 1996, 2000 Ben Wing.
#   Copyright (C) 1995 Sun Microsystems, Inc.
#   Copyright (C) 1998 Free Software Foundation, Inc.
#
# This file is part of XEmacs.
#
# XEmacs is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the
# Free Software Foundation; either version 2, or (at your option) any
# later version.
#
# XEmacs is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
# for more details.
#
# You should have received a copy of the GNU General Public License
# along with XEmacs; see the file COPYING.  If not, write to
# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.
#
# Synched up with: Not in FSF.
#

TARGETOS=BOTH
APPVER=4.0

default: all

# APA: Since there seems to be no way to determine the directory where
# xemacs.mak is located (from within nmake) we just insist on the user
# to invoke nmake in the directory where xemacs.mak is.
!if !exist("$(MAKEDIR)\setup.mak")
!error Please run nmake from the directory of this makefile (xemacs\netinstall).
!endif

XEMACS=$(MAKEDIR)\..

# Define a variable for the 'del' command to use
DEL=-del

# Configuration from nt subdirectory if needed

!include "$(XEMACS)\nt\config.inc"

OUTDIR = obj

#
# Compiler command echo control. Define VERBOSECC=1 to get verbose compilation.
#
!if !defined(VERBOSECC)
VERBOSECC=0
!endif
!if $(VERBOSECC)
CCV=$(CC)
!else
CCV=@$(CC)
!endif

!if $(DEBUG_XEMACS)
cdebug=-Od -Gr -Zi -Zp8
!else
cdebug=-Oxsb2 -Oy- -G5rFs -Zi -Zp8
!endif

defines = -DWIN32_NATIVE -I$(ZLIBDIR) $(ZLIB_FLAGS)

#
# Object files
#
OBJS = 	\
	$(OUTDIR)\choose.obj \
	$(OUTDIR)\concat.obj \
	$(OUTDIR)\desktop.obj \
	$(OUTDIR)\dialog.obj \
	$(OUTDIR)\diskfull.obj \
	$(OUTDIR)\download.obj \
	$(OUTDIR)\find.obj \
	$(OUTDIR)\fromcwd.obj \
	$(OUTDIR)\geturl.obj \
	$(OUTDIR)\hash.obj \
	$(OUTDIR)\ini.obj \
	$(OUTDIR)\init.obj \
	$(OUTDIR)\inilex.obj \
	$(OUTDIR)\iniparse.obj \
	$(OUTDIR)\install.obj \
	$(OUTDIR)\localdir.obj \
	$(OUTDIR)\log.obj \
	$(OUTDIR)\main.obj \
	$(OUTDIR)\mkdir.obj \
	$(OUTDIR)\mklink2.obj \
	$(OUTDIR)\regedit.obj \
	$(OUTDIR)\msg.obj \
	$(OUTDIR)\net.obj \
	$(OUTDIR)\netio.obj \
	$(OUTDIR)\nio-ie5.obj \
	$(OUTDIR)\nio-file.obj \
	$(OUTDIR)\nio-ftp.obj \
	$(OUTDIR)\nio-http.obj \
	$(OUTDIR)\other.obj \
	$(OUTDIR)\postinstall.obj \
	$(OUTDIR)\root.obj \
	$(OUTDIR)\simpsock.obj \
	$(OUTDIR)\site.obj \
	$(OUTDIR)\source.obj \
	$(OUTDIR)\splash.obj \
	$(OUTDIR)\state.obj \
	$(OUTDIR)\tar.obj \
	$(OUTDIR)\uninstall.obj \
	$(OUTDIR)\version.obj

#
# Libraries
#
LIBS = libcmt.lib $(olelibsmt) \
	kernel32.lib shell32.lib \
	wsock32.lib netapi32.lib \
	wininet.lib $(zlib)

# Rules

.SUFFIXES:
.SUFFIXES:	.c .cc .obj .texi .info

# nmake rule
.cc{$(OUTDIR)}.obj:
	$(CC) /TP $(cflags) $(cdebug) $(cvarsmt) $(defines) -Fo$@ $<
.c{$(OUTDIR)}.obj:
	$(CC) $(cflags) $(cdebug) $(cvarsmt) $(defines) -Fo$@ $<

#
# Main target
#
all: setup.exe

#
# Link target. setargv.obj is provided in the compiler library directory.
#
setup.exe: $(OUTDIR) $(OBJS) res.res
	$(link) /OUT:$@ $(ldebug) $(guilflags) $(OBJS) res.res $(LIBS)

iniparse.c iniparse.h : iniparse.y
	bison -d -o iniparse.c $(srcdir)/iniparse.y

$(OUTDIR)\inilex.obj: iniparse.h

inilex.c : inilex.l iniparse.h
	flex -t $(srcdir)/inilex.l | sed "/^extern int isatty YY/d" > inilex.c

version.c : $(srcdir)/ChangeLog version.pl
	perl version.pl < ChangeLog > version.c

res.res: res.rc
	$(rc) $(rcvars) $(rcflags) /fo$@ $**

$(OUTDIR):
	-@mkdir $(OUTDIR)

install:: all

clean::
	$(DEL) $(OUTDIR)\*.obj *.pdb *.aps res.res lex.yy.c

distclean:: clean
	$(DEL) *~ setup.exe

# DO NOT DELETE

$(OUTDIR)/autoload.obj: autoload.c win32.h 
$(OUTDIR)/inilex.obj: inilex.c win32.h  ini.h iniparse.h
$(OUTDIR)/init.obj: win32.h  dialog.h resource.h \
	state.h ini.h concat.h msg.h log.h find.h reginfo.h
$(OUTDIR)/iniparse.obj: iniparse.c ini.h iniparse.h port.h
$(OUTDIR)/inilex.obj: inilex.c win32.h  ini.h iniparse.h
$(OUTDIR)/mklink2.obj: mklink2.c win32.h 
$(OUTDIR)/choose.obj: choose.cc win32.h  dialog.h resource.h \
	state.h ini.h concat.h msg.h log.h find.h reginfo.h
$(OUTDIR)/concat.obj: concat.cc win32.h
$(OUTDIR)/desktop.obj: desktop.cc win32.h  \
	resource.h ini.h msg.h state.h \
	concat.h mkdir.h dialog.h version.h reginfo.h regedit.h port.h
$(OUTDIR)/dialog.obj: dialog.cc win32.h  dialog.h msg.h log.h \
	win32.h
$(OUTDIR)/diskfull.obj: diskfull.cc  diskfull.h
$(OUTDIR)/download.obj: download.cc win32.h  resource.h msg.h \
	ini.h dialog.h concat.h geturl.h state.h mkdir.h log.h
$(OUTDIR)/find.obj: find.cc win32.h  port.h
$(OUTDIR)/fromcwd.obj: fromcwd.cc win32.h  \
	ini.h resource.h concat.h \
	state.h dialog.h msg.h find.h version.h port.h
$(OUTDIR)/geturl.obj: geturl.cc win32.h  dialog.h geturl.h \
	resource.h netio.h msg.h log.h
$(OUTDIR)/hash.obj: hash.cc win32.h hash.h
$(OUTDIR)/ini.obj: ini.cc win32.h  ini.h resource.h concat.h \
	state.h geturl.h dialog.h msg.h mkdir.h log.h reginfo.h version.h
$(OUTDIR)/install.obj: install.cc win32.h  \
	$(ZLIBDIR)/zlib.h $(ZLIBDIR)/zconf.h \
	resource.h ini.h dialog.h concat.h geturl.h mkdir.h state.h tar.h \
	diskfull.h msg.h regedit.h reginfo.h log.h hash.h port.h
$(OUTDIR)/localdir.obj: localdir.cc win32.h  dialog.h resource.h \
	state.h msg.h concat.h log.h
$(OUTDIR)/log.obj: log.cc win32.h  resource.h msg.h log.h dialog.h \
	state.h concat.h mkdir.h
$(OUTDIR)/main.obj: main.cc win32.h  resource.h dialog.h state.h \
	msg.h netio.h find.h log.h port.h
$(OUTDIR)/mkdir.obj: mkdir.cc win32.h  mkdir.h
$(OUTDIR)/msg.obj: msg.cc win32.h  dialog.h log.h
$(OUTDIR)/net.obj: net.cc win32.h  dialog.h resource.h state.h \
	msg.h log.h
$(OUTDIR)/netio.obj: netio.cc win32.h  resource.h state.h msg.h \
	netio.h nio-file.h nio-ie5.h nio-http.h nio-ftp.h dialog.h log.h port.h \
	win32.h
$(OUTDIR)/nio-file.obj: nio-file.cc  netio.h nio-file.h resource.h \
	msg.h
$(OUTDIR)/nio-ftp.obj: nio-ftp.cc win32.h  resource.h state.h \
	simpsock.h log.h netio.h nio-ftp.h
$(OUTDIR)/nio-http.obj: nio-http.cc win32.h  resource.h state.h \
	simpsock.h msg.h netio.h nio-http.h
$(OUTDIR)/nio-ie5.obj: nio-ie5.cc win32.h  resource.h state.h \
	dialog.h msg.h netio.h nio-ie5.h
$(OUTDIR)/other.obj: other.cc win32.h  dialog.h resource.h state.h \
	msg.h log.h
$(OUTDIR)/postinstall.obj: postinstall.cc win32.h  \
	state.h dialog.h find.h \
	concat.h regedit.h reginfo.h resource.h port.h
$(OUTDIR)/regedit.obj: regedit.cc win32.h  reginfo.h regedit.h \
	msg.h resource.h dialog.h
$(OUTDIR)/root.obj: root.cc win32.h  dialog.h resource.h state.h \
	msg.h regedit.h reginfo.h concat.h log.h
$(OUTDIR)/simpsock.obj: simpsock.cc win32.h  simpsock.h msg.h \
	win32.h
$(OUTDIR)/site.obj: site.cc  dialog.h resource.h state.h geturl.h \
	msg.h concat.h regedit.h reginfo.h log.h port.h
$(OUTDIR)/source.obj: source.cc win32.h  dialog.h resource.h \
	state.h msg.h log.h
$(OUTDIR)/splash.obj: splash.cc win32.h  dialog.h resource.h msg.h \
	version.h
$(OUTDIR)/state.obj: state.cc state.h
$(OUTDIR)/uninstall.obj: install.cc win32.h  \
	$(ZLIBDIR)/zlib.h $(ZLIBDIR)/zconf.h \
	resource.h ini.h dialog.h concat.h geturl.h mkdir.h state.h tar.h \
	diskfull.h msg.h regedit.h reginfo.h log.h hash.h port.h
$(OUTDIR)/tar.obj: tar.cc win32.h  \
	$(ZLIBDIR)/zlib.h $(ZLIBDIR)/zconf.h \
	tar.h mkdir.h log.h port.h

#
# Local Variables:
# mode: makefile
# End: