Mercurial > hg > xemacs-beta

view netinstall/Makefile.in.in @ 4967:0d4c9d0f6a8d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rewrite dynarr code -------------------- ChangeLog entries follow: -------------------- src/ChangeLog addition: 2010-02-03 Ben Wing <ben@xemacs.org> * device-x.c (x_get_resource_prefix): * device-x.c (Fx_get_resource): * device-x.c (Fx_get_resource_prefix): * device-x.c (Fx_put_resource): * dialog-msw.c: * dialog-msw.c (handle_question_dialog_box): * dired-msw.c (mswindows_sort_files): * dired-msw.c (mswindows_get_files): * extents.c (extent_fragment_sort_by_priority): * extents.c (Fset_extent_parent): * file-coding.c (coding_reader): * file-coding.c (coding_writer): * file-coding.c (gzip_convert): * frame.c (generate_title_string): * gutter.c (calculate_gutter_size_from_display_lines): * indent.c (vmotion_1): * lread.c (read_bit_vector): * mule-coding.c (iso2022_decode): * rangetab.c: * rangetab.c (Fcopy_range_table): * rangetab.c (Fget_range_table): * rangetab.c (unified_range_table_copy_data): * redisplay-msw.c (mswindows_output_string): * redisplay-output.c (output_display_line): * redisplay-output.c (redisplay_move_cursor): * redisplay-output.c (redisplay_clear_bottom_of_window): * redisplay-tty.c (tty_output_ichar_dynarr): * redisplay-tty.c (set_foreground_to): * redisplay-tty.c (set_background_to): * redisplay-xlike-inc.c (XLIKE_output_string): * redisplay.c (redisplay_window_text_width_string): * redisplay.c (redisplay_text_width_string): * redisplay.c (create_text_block): * redisplay.c (SET_CURRENT_MODE_CHARS_PIXSIZE): * redisplay.c (generate_fstring_runes): * redisplay.c (regenerate_modeline): * redisplay.c (ensure_modeline_generated): * redisplay.c (real_current_modeline_height): * redisplay.c (create_string_text_block): * redisplay.c (regenerate_window): * redisplay.c (REGEN_INC_FIND_START_END): * redisplay.c (point_visible): * redisplay.c (redisplay_window): * redisplay.c (mark_glyph_block_dynarr): * redisplay.c (line_start_cache_start): * redisplay.c (start_with_line_at_pixpos): * redisplay.c (update_line_start_cache): * redisplay.c (glyph_to_pixel_translation): * redisplay.c (pixel_to_glyph_translation): * sysdep.c (qxe_readdir): * text.c (dfc_convert_to_external_format): * text.c (dfc_convert_to_internal_format): * toolbar-common.c (common_output_toolbar_button): * window.c (window_modeline_height): * window.c (Fwindow_last_line_visible_height): * window.c (window_displayed_height): * window.c (window_scroll): * window.c (get_current_pixel_pos): Use Dynarr_begin() in place of Dynarr_atp (foo, 0). * dynarr.c (Dynarr_realloc): * dynarr.c (Dynarr_lisp_realloc): * dynarr.c (Dynarr_resize): * dynarr.c (Dynarr_insert_many): * dynarr.c (Dynarr_delete_many): * dynarr.c (Dynarr_memory_usage): * dynarr.c (stack_like_malloc): * dynarr.c (stack_like_free): * lisp.h: * lisp.h (DECLARE_DYNARR_LISP_IMP): * lisp.h (XD_DYNARR_DESC): * lisp.h (Dynarr_pop): * gutter.c (output_gutter): * redisplay-output.c (sync_rune_structs): * redisplay-output.c (redisplay_output_window): Redo the dynarr code, add greater checks. Rename the `len', `largest' and `max' members to `len_', `largest_' and `max_' to try and catch existing places that might directly modify these values. Make new accessors Dynarr_largest() and Dynarr_max() and make them and existing Dynarr_length() be non-lvalues by adding '+ 0' to them; fix a couple of places in the redisplay code that tried to modify the length directly by setting Dynarr_length(). Use the accessors whenever possible even in the dynarr code itself. The accessors also verify that 0 <= len <= largest <= max. Rename settor function Dynarr_set_size() to Dynarr_set_length() and use it more consistently; also create lower-level Dynarr_set_length_1(). This latter function should be the only function that directly modifies the `len_' member of a Dynarr, and in the process makes sure that the `largest' value is kept correct. Consistently use ERROR_CHECK_STRUCTURES instead of ERROR_CHECK_TYPES for error-checking code. Reintroduce the temporarily disabled verification code on the positions of Dynarr_at(), Dynarr_atp() and Dynarr_atp_past_end(). Also create Dynarr_resize_if() in place of a repeated code fragment. Clean up all the functions that modify Dynarrs to use the new macros and functions and verify the correctness of the Dynarr both before and after the change. Note that there are two kinds of verification -- one for accessing and one for modifying. The difference is that the modify verification additionally checks to make sure that the Dynarr isn't locked. (This is used in redisplay to check for problems with reentrancy.) * lrecord.h: Move XD_DYNARR_DESC to lisp.h, grouping with the dynarr code.
author Ben Wing <ben@xemacs.org>
date Wed, 03 Feb 2010 20:51:18 -0600
parents 9aa33376bb5e
children
line wrap: on
line source

## Copyright (c) 2000, Red Hat, Inc.
## Copyright (C) 2005 Ben Wing.
##
##     This program 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 of the License, or
##     (at your option) any later version.
##
##     A copy of the GNU General Public License can be found at
##     http://www.gnu.org/
##
## Written by Christopher Faylor <cgf@redhat.com>
## Adapted for XEmacs by Andy Piper <andy@xemacs.org>
##
## Makefile for Cygwin installer

## For performance and consistency, no built-in rules
.SUFFIXES:
.SUFFIXES: .c .cc .h .o
## ==================== Things "configure" will edit ====================

@SET_MAKE@
SHELL = /bin/sh
RM = rm -f
pwd = /bin/pwd

CC=@CC@
CPP=@CPP@
CFLAGS=@CFLAGS@
CPPFLAGS=@CPPFLAGS@
LDFLAGS=@LDFLAGS@
ALLOCA=@ALLOCA@
LN_S=@LN_S@
version=@version@

## This will be the name of the generated binary and is set automatically
## by configure.
PROGNAME=@PROGNAME@
INSTALLABLES=setup
#ifdef USE_GNU_MAKE
vpath %.c @srcdir@
vpath %.cc @srcdir@
vpath %.h @srcdir@
vpath %.l @srcdir@
vpath %.y @srcdir@
vpath %.rc @srcdir@
#else
VPATH=@srcdir@
#endif

## ==================== Where To Install Things ====================

prefix=@prefix@
exec_prefix=@exec_prefix@
bindir=@bindir@
libdir=@libdir@
srcdir=@srcdir@
datarootdir=@datarootdir@
datadir=@datadir@
instvardir=@instvardir@
top_srcdir=@top_srcdir@
archlibdir=@archlibdir@
configuration=@configuration@
moduledir=@moduledir@
sitemoduledir=@sitemoduledir@
extra_includes=@extra_includes@
blddir=@blddir@

## ==================== Utility Programs for the Build =================

INSTALL = @install_pp@ @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
SHELL = @SHELL@
## ========================== Lists of Files ===========================

#define NO_SHORTNAMES
#define NOT_C_CODE
#include "../src/config.h"

program_transform_name = @program_transform_name@

CC		= @CC@
CC_FOR_TARGET	= $(CC)

## -O3 has problems so fix this locally
LOCALCFLAGS = $(CFLAGS) -O2 -DMINGW $(extra_includes)
CXXFLAGS	= $(LOCALCFLAGS) -fno-exceptions -nostdinc++ -fno-rtti

WINDRES		= windres
MINGW_INCLUDES	= -I. -I$(srcdir) 
MINGW_CXXFLAGS	= $(CXXFLAGS) -mno-cygwin $(MINGW_INCLUDES) -mwindows
MINGW_CFLAGS	= $(LOCALCFLAGS) -mno-cygwin $(MINGW_INCLUDES) -mwindows
MINGW_ZLIB_DIR	= /usr/local/lib

PROGS	= setup.exe
XEMACS=${blddir}/src/${PROGNAME}

CYGWIN_SIZE=0
WIN32_SIZE=0
KIT_VERSION=""

CONFIG_H = ../src/config.h

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

.SUFFIXES:
.NOEXPORT:

.PHONY: all install

all: Makefile $(PROGS)

setup.exe: $(OBJS)
	$(CXX) $(MINGW_CXXFLAGS) -o $@ $(OBJS) \
		-lole32 -lwsock32 -lnetapi32 -ladvapi32 \
		-luuid -lkernel32 -luser32 \
		-L$(MINGW_ZLIB_DIR) -lz -lmingw32
	@chmod a-x $@

setup-bin.ini:
	V=`grep '^\$$Revision.*' $(srcdir)/ChangeLog \
	| sed -e 's/\$$Revision:* *//' -e 's/ *$$.*//'` ;\
	$(XEMACS) -batch -vanilla \
		-eval '(setq package-net-cygwin32-binary-size $(CYGWIN_SIZE) \
			package-net-win32-binary-size $(WIN32_SIZE) \
			package-net-kit-version "$(KIT_VERSION)" \
			package-net-setup-version "'$$V'")' \
		-l ${srcdir}/../lisp/package-net.el \
		-f package-net-batch-generate-bin-ini

install:
	@echo; echo "Installing net setup."
	for file in ${INSTALLABLES} ; do \
	  (cd .. && $(INSTALL_PROGRAM) netinstall/$${file} ${bindir}/$${file}) ; \
	done

version.c : $(srcdir)/ChangeLog Makefile
	V=`grep '^\$$Revision.*' $(srcdir)/ChangeLog \
	| sed -e 's/\$$Revision:* *//' \
	  -e 's/ *$$.*//'` ;\
	echo "char *version = \"$$V\";" > version.tmp ;\
	echo "static char *id = \"\\n%%% setup-version $$V\\n\";" >> version.tmp
	mv version.tmp version.c

%.o: %.rc
	$(WINDRES) --include-dir $(srcdir) -o $@ $<

%.o: %.c
	$(CC) $(MINGW_CFLAGS) -c -o $@ $<

%.o: %.cc
	$(CC) $(MINGW_CXXFLAGS) -c -o $@ $<

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

inilex.c : inilex.l iniparse.h
	flex -8 $(srcdir)/inilex.l
	mv lex.yy.c inilex.c

.PHONY: mostlyclean clean distclean realclean extraclean
.PHONY: distclean-noconfig realclean-noconfig extraclean-noconfig
mostlyclean:
	-$(RM) *.o *.i *.ini core
clean: mostlyclean
	-$(RM) $(PROGS)
distclean-noconfig: clean
	-$(RM) TAGS
## This is used in making a distribution.
## Do not use it on development directories!
distclean: distclean-noconfig
	-$(RM) GNUmakefile Makefile Makefile.in
realclean-noconfig: distclean-noconfig
realclean: distclean
extraclean-noconfig: realclean-noconfig
	-$(RM) *~ \#*
extraclean: realclean
	-$(RM) *~ \#*

choose.o: choose.cc win32.h dialog.h resource.h state.h ini.h concat.h \
 msg.h log.h find.h reginfo.h
concat.o: concat.cc
desktop.o: desktop.cc win32.h resource.h ini.h msg.h state.h concat.h \
 mkdir.h dialog.h version.h port.h reginfo.h desktop.h
dialog.o: dialog.cc win32.h dialog.h msg.h log.h
diskfull.o: diskfull.cc win32.h diskfull.h
download.o: download.cc win32.h resource.h msg.h ini.h dialog.h \
 concat.h geturl.h state.h mkdir.h log.h
find.o: find.cc win32.h port.h
fromcwd.o: fromcwd.cc win32.h ini.h resource.h concat.h state.h \
 dialog.h msg.h find.h version.h port.h
geturl.o: geturl.cc win32.h dialog.h \
 geturl.h resource.h netio.h msg.h log.h
hash.o: hash.cc hash.h
ini.o: 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
inilex.o: inilex.c win32.h \
 ini.h \
 iniparse.h
iniparse.o: iniparse.c ini.h \
 iniparse.h \
 port.h
install.o: install.cc win32.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 desktop.h
init.o: init.cc win32.h resource.h dialog.h state.h msg.h log.h 
uninstall.o: uninstall.cc win32.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 desktop.h
localdir.o: localdir.cc win32.h dialog.h resource.h state.h msg.h \
 concat.h log.h
log.o: log.cc win32.h resource.h msg.h log.h dialog.h state.h concat.h \
 mkdir.h
main.o: main.cc win32.h resource.h dialog.h state.h msg.h netio.h \
 find.h log.h port.h
mkdir.o: mkdir.cc win32.h mkdir.h
mklink2.o: mklink2.c win32.h /usr/include/w32api/shlobj.h
msg.o: msg.cc win32.h dialog.h log.h
net.o: net.cc win32.h dialog.h resource.h state.h msg.h log.h
netio.o: 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
nio-file.o: nio-file.cc win32.h netio.h nio-file.h resource.h msg.h
nio-ftp.o: nio-ftp.cc win32.h resource.h state.h simpsock.h log.h \
 netio.h nio-ftp.h
nio-http.o: nio-http.cc win32.h resource.h state.h simpsock.h msg.h \
 netio.h nio-http.h
nio-ie5.o: nio-ie5.cc win32.h resource.h state.h dialog.h msg.h \
 netio.h nio-ie5.h
other.o: other.cc win32.h dialog.h resource.h state.h msg.h log.h
postinstall.o: postinstall.cc win32.h state.h dialog.h find.h concat.h \
 port.h
regedit.o: regedit.cc win32.h reginfo.h regedit.h msg.h resource.h \
 dialog.h
root.o: root.cc win32.h dialog.h resource.h state.h msg.h regedit.h \
 reginfo.h concat.h log.h
simpsock.o: simpsock.cc win32.h simpsock.h msg.h
site.o: site.cc win32.h dialog.h resource.h state.h geturl.h msg.h \
 concat.h regedit.h reginfo.h log.h port.h
source.o: source.cc win32.h dialog.h resource.h state.h msg.h log.h
splash.o: splash.cc win32.h dialog.h resource.h msg.h version.h
state.o: state.cc state.h
tar.o: tar.cc win32.h tar.h mkdir.h log.h port.h
version.o: version.c