October 2005 - xemacs-cvs＠xemacs.org - XEmacs Mailing List Archives

CVS update by ben xemacs/src, lrecord.h ... 20 years

CVS Monitor

User: ben Date: 05/10/14 03:22:09 Modified: xemacs/src ChangeLog config.h.in alloc.c dumper.c emacs.c lrecord.h mc-alloc.c mc-alloc.h symbols.c Log: add gc percentage threshold to mc-alloc config.h.in, alloc.c, dumper.c, emacs.c, lrecord.h, mc-alloc.c, mc-alloc.h, symbols.c: Rename MC_ALLOC_TYPE_STATS to ALLOC_TYPE_STATS, since (with refactoring) this is not really specific to mc-alloc. Generalize code to implement the GC % threshold for garbage collecting. Rename `lrecord-stats' to `object-memory-usage-stats' (defined when not mc-alloc, too). Rename `memory-usage' to `total-memory-usage' and add `object-memory-usage'. Bump gc_cons_threshold to 2,000,000 (suggestion by Stephen Turnbull). Avoid use of C++ reserved word `catch'. Change address for crash reporting to xemacs-beta(a)xemacs.org from crashes(a)xemacs.org. new -> new_ in emacs.c. Turn on _CRT_SECURE_NO_DEPRECATE under Visual C++ to avoid tons of warnings in VC8. Revision Changes Path 1.868 +46 -0 XEmacs/xemacs/src/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v retrieving revision 1.867 retrieving revision 1.868 diff -u -p -r1.867 -r1.868 --- ChangeLog 2005/10/10 03:16:22 1.867 +++ ChangeLog 2005/10/14 01:21:57 1.868 ＠＠ -1,3 +1,49 ＠＠ +2005-10-13 Ben Wing <ben(a)xemacs.org> + + * config.h.in: + * alloc.c: + * alloc.c (struct): + * alloc.c (alloc_lrecord): + * alloc.c (noseeum_alloc_lrecord): + * alloc.c (finalize_string): + * alloc.c (make_uninit_string): + * alloc.c (make_string_nocopy): + * alloc.c (garbage_collect_1): + * alloc.c (object_memory_usage_stats): + * alloc.c (HACK_O_MATIC): + * alloc.c (Fgarbage_collect): + * alloc.c (Ftotal_memory_usage): + * alloc.c (recompute_need_to_garbage_collect): + * alloc.c (common_init_alloc_early): + * alloc.c (syms_of_alloc): + * alloc.c (vars_of_alloc): + * dumper.c (pdump_load_finish): + * emacs.c: + * emacs.c (main_1): + * emacs.c (shut_down_emacs): + * lrecord.h: + * lrecord.h (MC_ALLOC_CALL_FINALIZER): + * mc-alloc.c (remove_cell): + * mc-alloc.h: + * symbols.c (init_symbols_once_early): + Rename MC_ALLOC_TYPE_STATS to ALLOC_TYPE_STATS, since + (with refactoring) this is not really specific to mc-alloc. + Generalize code to implement the GC % threshold for garbage + collecting. Rename `lrecord-stats' to `object-memory-usage-stats' + (defined when not mc-alloc, too). Rename `memory-usage' to + `total-memory-usage' and add `object-memory-usage'. Bump + gc_cons_threshold to 2,000,000 (suggestion by Stephen Turnbull). + + Avoid use of C++ reserved word `catch'. + + Change address for crash reporting to xemacs-beta(a)xemacs.org from + crashes(a)xemacs.org. + + new -> new_ in emacs.c. + + Turn on _CRT_SECURE_NO_DEPRECATE under Visual C++ to avoid tons of + warnings in VC8. + 2005-10-10 Andrey Slusar <anrays(a)gmail.com> * unexelf.c: define `Elfw(type)' for FreeBSD alpha and all _LP64 1.101 +18 -1 XEmacs/xemacs/src/config.h.in Index: config.h.in =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/config.h.in,v retrieving revision 1.100 retrieving revision 1.101 diff -u -p -r1.100 -r1.101 --- config.h.in 2005/04/08 23:11:20 1.100 +++ config.h.in 2005/10/14 01:21:59 1.101 ＠＠ -1,6 +1,6 ＠＠ /* XEmacs site configuration template file. -*- C -*- Copyright (C) 1986, 1991-1994, 1998, 1999 Free Software Foundation, Inc. - Copyright (C) 2000, 2001, 2002, 2004 Ben Wing. + Copyright (C) 2000, 2001, 2002, 2004, 2005 Ben Wing. This file is part of XEmacs. ＠＠ -815,6 +815,13 ＠＠ things are arranged in config.h.in. In #endif /* WIN32_NO_CONFIGURE */ +#ifdef _MSC_VER +/* Turn off tons of C4996 warnings in VC 8 about standard functions being + "deprecated" in favor of Microsoft-specific "secure" ones (!) + This must go *before* the inclusion of any system files. */ +#define _CRT_SECURE_NO_DEPRECATE +#endif + /* alloca twiddling. Because we might be #including alloca.h here, feature test macros such as _XOPEN_SOURCE must be defined above. ＠＠ -907,6 +914,16 ＠＠ extern "C" { #if defined (USE_SYSTEM_MALLOC) && !defined (SYSTEM_MALLOC) #define SYSTEM_MALLOC +#endif + +/* This enables type based information (updated during gc). The output + is used by show-memory-usage to print memory information for each + type. Since the new allocator does not distinguish between types + anymore, this functionality is additionally implemented and + consumes a lot of time. That is why this functionality can be + disabled; for the moment, we keep it enabled. */ +#if !defined (MC_ALLOC) || 1 +# define ALLOC_TYPE_STATS 1 #endif /* Define the return type of signal handlers if the s/xxx.h file 1.116 +143 -128 XEmacs/xemacs/src/alloc.c Index: alloc.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/alloc.c,v retrieving revision 1.115 retrieving revision 1.116 diff -u -p -r1.115 -r1.116 --- alloc.c 2005/10/04 16:47:10 1.115 +++ alloc.c 2005/10/14 01:21:59 1.116 ＠＠ -1,7 +1,7 ＠＠ /* Storage allocation and gc for XEmacs Lisp interpreter. Copyright (C) 1985-1998 Free Software Foundation, Inc. Copyright (C) 1995 Sun Microsystems, Inc. - Copyright (C) 1995, 1996, 2001, 2002, 2003, 2004 Ben Wing. + Copyright (C) 1995, 1996, 2001, 2002, 2003, 2004, 2005 Ben Wing. This file is part of XEmacs. ＠＠ -94,6 +94,8 ＠＠ static Fixnum debug_allocation_backtrace /* Number of bytes of consing done since the last gc */ static EMACS_INT consing_since_gc; EMACS_UINT total_consing; +EMACS_INT total_gc_usage; +int total_gc_usage_set; int need_to_garbage_collect; int need_to_check_c_alloca; ＠＠ -510,7 +512,7 ＠＠ allocate_lisp_storage (Bytecount size) } #endif /* not MC_ALLOC */ -#ifdef MC_ALLOC_TYPE_STATS +#if defined (MC_ALLOC) && defined (ALLOC_TYPE_STATS) static struct { int instances_in_use; ＠＠ -579,7 +581,7 ＠＠ dec_lrecord_stats (Bytecount size_includ DECREMENT_CONS_COUNTER (size); } -#endif /* not MC_ALLOC_TYPE_STATS */ +#endif /* not (MC_ALLOC && ALLOC_TYPE_STATS) */ #ifndef MC_ALLOC /* lcrecords are chained together through their "next" field. ＠＠ -605,9 +607,9 ＠＠ alloc_lrecord (Bytecount size, gc_checking_assert (LRECORD_FREE_P (lheader)); set_lheader_implementation (lheader, implementation); lheader->uid = lrecord_uid_counter++; -#ifdef MC_ALLOC_TYPE_STATS +#ifdef ALLOC_TYPE_STATS inc_lrecord_stats (size, lheader); -#endif /* not MC_ALLOC_TYPE_STATS */ +#endif /* ALLOC_TYPE_STATS */ INCREMENT_CONS_COUNTER (size, implementation->name); return lheader; } ＠＠ -627,9 +629,9 ＠＠ noseeum_alloc_lrecord (Bytecount size, gc_checking_assert (LRECORD_FREE_P (lheader)); set_lheader_implementation (lheader, implementation); lheader->uid = lrecord_uid_counter++; -#ifdef MC_ALLOC_TYPE_STATS +#ifdef ALLOC_TYPE_STATS inc_lrecord_stats (size, lheader); -#endif /* not MC_ALLOC_TYPE_STATS */ +#endif /* ALLOC_TYPE_STATS */ NOSEEUM_INCREMENT_CONS_COUNTER (size, implementation->name); return lheader; } ＠＠ -2492,9 +2494,9 ＠＠ finalize_string (void *header, int for_d { Lisp_String *s = (Lisp_String *) header; Bytecount size = s->size_; -#ifdef MC_ALLOC_TYPE_STATS +#ifdef ALLOC_TYPE_STATS dec_lrecord_string_data_stats (size); -#endif /* MC_ALLOC_TYPE_STATS */ +#endif /* ALLOC_TYPE_STATS */ if (BIG_STRING_SIZE_P (size)) xfree (s->data_, Ibyte *); } ＠＠ -2614,9 +2616,9 ＠＠ make_uninit_string (Bytecount length) #ifdef MC_ALLOC s = alloc_lrecord_type (Lisp_String, &lrecord_string); -#ifdef MC_ALLOC_TYPE_STATS +#ifdef ALLOC_TYPE_STATS inc_lrecord_string_data_stats (length); -#endif /* MC_ALLOC_TYPE_STATS */ +#endif /* ALLOC_TYPE_STATS */ #else /* not MC_ALLOC */ /* Allocate the string header */ ALLOCATE_FIXED_TYPE (string, Lisp_String, s); ＠＠ -3000,9 +3002,9 ＠＠ make_string_nocopy (const Ibyte *content #ifdef MC_ALLOC s = alloc_lrecord_type (Lisp_String, &lrecord_string); -#ifdef MC_ALLOC_TYPE_STATS +#ifdef ALLOC_TYPE_STATS inc_lrecord_string_data_stats (length); -#endif /* MC_ALLOC_TYPE_STATS */ +#endif /* ALLOC_TYPE_STATS */ mcpro (wrap_pointer_1 (s)); /* otherwise nocopy_strings get collected and static data is tried to be freed. */ ＠＠ -5525,13 +5527,13 ＠＠ garbage_collect_1 (void) } { - struct catchtag *catch; - for (catch = catchlist; catch; catch = catch->next) + struct catchtag *c; + for (c = catchlist; c; c = c->next) { - mark_object (catch->tag); - mark_object (catch->val); - mark_object (catch->actual_tag); - mark_object (catch->backtrace); + mark_object (c->tag); + mark_object (c->val); + mark_object (c->actual_tag); + mark_object (c->backtrace); } } ＠＠ -5667,10 +5669,10 ＠＠ garbage_collect_1 (void) return; } -#ifdef MC_ALLOC -#ifdef MC_ALLOC_TYPE_STATS +#ifdef ALLOC_TYPE_STATS + static Lisp_Object -gc_plist_hack (const Ascbyte *name, int value, Lisp_Object tail) +gc_plist_hack (const Ascbyte *name, EMACS_INT value, Lisp_Object tail) { /* C doesn't have local functions (or closures, or GC, or readable syntax, or portable numeric datatypes, or bit-vectors, or characters, or ＠＠ -5678,13 +5680,14 ＠＠ gc_plist_hack (const Ascbyte *name, int return cons3 (intern (name), make_int (value), tail); } -DEFUN("lrecord-stats", Flrecord_stats, 0, 0 ,"", /* -Return statistics about lrecords in a property list. -*/ - ()) +static Lisp_Object +object_memory_usage_stats (int set_total_gc_usage) { Lisp_Object pl = Qnil; int i; + EMACS_INT tgu_val = 0; + +#ifdef MC_ALLOC for (i = 0; i < (countof (lrecord_implementations_table) + MODULE_DEFINABLE_TYPE_COUNT); i++) ＠＠ -5709,6 +5712,7 ＠＠ Return statistics about lrecords in a pr pl = gc_plist_hack (buf, lrecord_stats[i].bytes_in_use, pl); + tgu_val += lrecord_stats[i].bytes_in_use_including_overhead; if (name[len-1] == 's') sprintf (buf, "%ses-used", name); ＠＠ -5723,85 +5727,18 ＠＠ Return statistics about lrecords in a pr lrecord_string_data_bytes_in_use, pl); pl = gc_plist_hack ("string-data-used", lrecord_string_data_instances_in_use, pl); - - return pl; -} -#endif /* not MC_ALLOC_TYPE_STATS */ + tgu_val += lrecord_string_data_bytes_in_use_including_overhead; -DEFUN ("garbage-collect", Fgarbage_collect, 0, 0, "", /* -Reclaim storage for Lisp objects no longer needed. -Return info on amount of space in use: - ((USED-CONSES . STORAGE-CONSES) (USED-SYMS . STORAGE-SYMS) - (USED-MARKERS . STORAGE-MARKERS) USED-STRING-CHARS USED-VECTOR-SLOTS - PLIST) - where `PLIST' is a list of alternating keyword/value pairs providing - more detailed information. -Garbage collection happens automatically if you cons more than -`gc-cons-threshold' bytes of Lisp data since previous garbage collection. -*/ - ()) -{ - garbage_collect_1 (); - -#ifdef MC_ALLOC_TYPE_STATS - /* The things we do for backwards-compatibility */ - return - list6 - (Fcons (make_int (lrecord_stats[lrecord_type_cons].instances_in_use), - make_int (lrecord_stats[lrecord_type_cons] - .bytes_in_use_including_overhead)), - Fcons (make_int (lrecord_stats[lrecord_type_symbol].instances_in_use), - make_int (lrecord_stats[lrecord_type_symbol] - .bytes_in_use_including_overhead)), - Fcons (make_int (lrecord_stats[lrecord_type_marker].instances_in_use), - make_int (lrecord_stats[lrecord_type_marker] - .bytes_in_use_including_overhead)), - make_int (lrecord_stats[lrecord_type_string] - .bytes_in_use_including_overhead), - make_int (lrecord_stats[lrecord_type_vector] - .bytes_in_use_including_overhead), - Flrecord_stats ()); -#else /* not MC_ALLOC_TYPE_STATS */ - return Qnil; -#endif /* not MC_ALLOC_TYPE_STATS */ -} #else /* not MC_ALLOC */ -/* Debugging aids. */ -static Lisp_Object -gc_plist_hack (const Ascbyte *name, int value, Lisp_Object tail) -{ - /* C doesn't have local functions (or closures, or GC, or readable syntax, - or portable numeric datatypes, or bit-vectors, or characters, or - arrays, or exceptions, or ...) */ - return cons3 (intern (name), make_int (value), tail); -} - #define HACK_O_MATIC(type, name, pl) do { \ - int s = 0; \ + EMACS_INT s = 0; \ struct type##_block *x = current_##type##_block; \ while (x) { s += sizeof (*x) + MALLOC_OVERHEAD; x = x->prev; } \ + tgu_val += s; \ (pl) = gc_plist_hack ((name), s, (pl)); \ } while (0) -DEFUN ("garbage-collect", Fgarbage_collect, 0, 0, "", /* -Reclaim storage for Lisp objects no longer needed. -Return info on amount of space in use: - ((USED-CONSES . FREE-CONSES) (USED-SYMS . FREE-SYMS) - (USED-MARKERS . FREE-MARKERS) USED-STRING-CHARS USED-VECTOR-SLOTS - PLIST) - where `PLIST' is a list of alternating keyword/value pairs providing - more detailed information. -Garbage collection happens automatically if you cons more than -`gc-cons-threshold' bytes of Lisp data since previous garbage collection. -*/ - ()) -{ - Lisp_Object pl = Qnil; - int i; - int gc_count_vector_total_size = 0; - garbage_collect_1 (); - for (i = 0; i < lrecord_type_count; i++) { if (lcrecord_stats[i].bytes_in_use != 0 ＠＠ -5811,13 +5748,10 ＠＠ Garbage collection happens automatically char buf [255]; const char *name = lrecord_implementations_table[i]->name; int len = strlen (name); - /* save this for the FSFmacs-compatible part of the summary */ - if (i == lrecord_type_vector) - gc_count_vector_total_size = - lcrecord_stats[i].bytes_in_use + lcrecord_stats[i].bytes_freed; sprintf (buf, "%s-storage", name); pl = gc_plist_hack (buf, lcrecord_stats[i].bytes_in_use, pl); + tgu_val += lcrecord_stats[i].bytes_in_use; /* Okay, simple pluralization check for `symbol-value-varalias' */ if (name[len-1] == 's') sprintf (buf, "%ses-freed", name); ＠＠ -5895,7 +5829,70 ＠＠ Garbage collection happens automatically pl = gc_plist_hack ("conses-free", gc_count_num_cons_freelist, pl); pl = gc_plist_hack ("conses-used", gc_count_num_cons_in_use, pl); +#undef HACK_O_MATIC + +#endif /* MC_ALLOC */ + + if (set_total_gc_usage) + { + total_gc_usage = tgu_val; + total_gc_usage_set = 1; + } + + return pl; +} + +DEFUN("object-memory-usage-stats", Fobject_memory_usage_stats, 0, 0 ,"", /* +Return statistics about memory usage of Lisp objects. +*/ + ()) +{ + return object_memory_usage_stats (0); +} + +#endif /* ALLOC_TYPE_STATS */ + +/* Debugging aids. */ + +DEFUN ("garbage-collect", Fgarbage_collect, 0, 0, "", /* +Reclaim storage for Lisp objects no longer needed. +Return info on amount of space in use: + ((USED-CONSES . FREE-CONSES) (USED-SYMS . FREE-SYMS) + (USED-MARKERS . FREE-MARKERS) USED-STRING-CHARS USED-VECTOR-SLOTS + PLIST) + where `PLIST' is a list of alternating keyword/value pairs providing + more detailed information. +Garbage collection happens automatically if you cons more than +`gc-cons-threshold' bytes of Lisp data since previous garbage collection. +*/ + ()) +{ + /* Record total usage for purposes of determining next GC */ + garbage_collect_1 (); + + /* This will get set to 1, and total_gc_usage computed, as part of the + call to object_memory_usage_stats() -- if ALLOC_TYPE_STATS is enabled. */ + total_gc_usage_set = 0; +#ifdef ALLOC_TYPE_STATS /* The things we do for backwards-compatibility */ +#ifdef MC_ALLOC + return + list6 + (Fcons (make_int (lrecord_stats[lrecord_type_cons].instances_in_use), + make_int (lrecord_stats[lrecord_type_cons] + .bytes_in_use_including_overhead)), + Fcons (make_int (lrecord_stats[lrecord_type_symbol].instances_in_use), + make_int (lrecord_stats[lrecord_type_symbol] + .bytes_in_use_including_overhead)), + Fcons (make_int (lrecord_stats[lrecord_type_marker].instances_in_use), + make_int (lrecord_stats[lrecord_type_marker] + .bytes_in_use_including_overhead)), + make_int (lrecord_stats[lrecord_type_string] + .bytes_in_use_including_overhead), + make_int (lrecord_stats[lrecord_type_vector] + .bytes_in_use_including_overhead), + object_memory_usage_stats (1)); +#else /* not MC_ALLOC */ return list6 (Fcons (make_int (gc_count_num_cons_in_use), make_int (gc_count_num_cons_freelist)), ＠＠ -5904,11 +5901,14 ＠＠ Garbage collection happens automatically Fcons (make_int (gc_count_num_marker_in_use), make_int (gc_count_num_marker_freelist)), make_int (gc_count_string_total_size), - make_int (gc_count_vector_total_size), - pl); -} -#undef HACK_O_MATIC + make_int (lcrecord_stats[lrecord_type_vector].bytes_in_use + + lcrecord_stats[lrecord_type_vector].bytes_freed), + object_memory_usage_stats (1)); #endif /* not MC_ALLOC */ +#else /* not ALLOC_TYPE_STATS */ + return Qnil; +#endif /* ALLOC_TYPE_STATS */ +} DEFUN ("consing-since-gc", Fconsing_since_gc, 0, 0, "", /* Return the number of bytes consed since the last garbage collection. ＠＠ -5934,15 +5934,30 ＠＠ The value is divided by 1024 to make sur } #endif -DEFUN ("memory-usage", Fmemory_usage, 0, 0, 0, /* +DEFUN ("total-memory-usage", Ftotal_memory_usage, 0, 0, 0, /* Return the total number of bytes used by the data segment in XEmacs. This may be helpful in debugging XEmacs's memory usage. +NOTE: This may or may not be accurate! It is hard to determine this +value in a system-independent fashion. On Windows, for example, the +returned number tends to be much greater than reality. */ ()) { return make_int (total_data_usage ()); } +#ifdef ALLOC_TYPE_STATS +DEFUN ("object-memory-usage", Fobject_memory_usage, 0, 0, 0, /* +Return total number of bytes used for object storage in XEmacs. +This may be helpful in debugging XEmacs's memory usage. +See also `consing-since-gc' and `object-memory-usage-stats'. +*/ + ()) +{ + return make_int (total_gc_usage + consing_since_gc); +} +#endif /* ALLOC_TYPE_STATS */ + void recompute_funcall_allocation_flag (void) { ＠＠ -5961,11 +5976,15 ＠＠ recompute_need_to_garbage_collect (void) else need_to_garbage_collect = (consing_since_gc > gc_cons_threshold -#if 0 /* #### implement this better */ && +#if 0 /* #### implement this better */ (100 * consing_since_gc) / total_data_usage () >= gc_cons_percentage -#endif /* 0 */ +#else + (!total_gc_usage_set || + (100 * consing_since_gc) / total_gc_usage >= + gc_cons_percentage) +#endif ); recompute_funcall_allocation_flag (); } ＠＠ -6216,13 +6235,12 ＠＠ common_init_alloc_early (void) funcall_alloca_count = 0; #if 1 - gc_cons_threshold = 500000; /* XEmacs change */ + gc_cons_threshold = 2000000; /* XEmacs change */ #else gc_cons_threshold = 15000; /* debugging */ #endif - gc_cons_percentage = 0; /* #### 20; Don't have an accurate measure of - memory usage on Windows; not verified on other - systems */ + gc_cons_percentage = 40; /* #### what is optimal? */ + total_gc_usage_set = 0; lrecord_uid_counter = 259; #ifndef MC_ALLOC debug_string_purity = 0; ＠＠ -6347,14 +6365,15 ＠＠ syms_of_alloc (void) DEFSUBR (Fmake_symbol); DEFSUBR (Fmake_marker); DEFSUBR (Fpurecopy); -#ifdef MC_ALLOC_TYPE_STATS - DEFSUBR (Flrecord_stats); -#endif /* MC_ALLOC_TYPE_STATS */ +#ifdef ALLOC_TYPE_STATS + DEFSUBR (Fobject_memory_usage_stats); + DEFSUBR (Fobject_memory_usage); +#endif /* ALLOC_TYPE_STATS */ DEFSUBR (Fgarbage_collect); #if 0 DEFSUBR (Fmemory_limit); #endif - DEFSUBR (Fmemory_usage); + DEFSUBR (Ftotal_memory_usage); DEFSUBR (Fconsing_since_gc); } ＠＠ -6386,26 +6405,22 ＠＠ effective way to check GCPRO problems, b will be unusable! You almost certainly won't have the patience to wait long enough to be able to set it back. -See also `consing-since-gc'. +See also `consing-since-gc' and `gc-cons-percentage'. */ ); DEFVAR_INT ("gc-cons-percentage", &gc_cons_percentage /* *Percentage of memory allocated between garbage collections. Garbage collection will happen if this percentage of the total amount of -memory used for data has been allocated since the last garbage collection. -However, it will not happen if less than `gc-cons-threshold' bytes have -been allocated -- this sets an absolute minimum in case very little data -has been allocated or the percentage is set very low. Set this to 0 to -have garbage collection always happen after `gc-cons-threshold' bytes have -been allocated, regardless of current memory usage. - -Garbage collection happens automatically when `eval' or `funcall' are -called. (Note that `funcall' is called implicitly as part of evaluation.) -By binding this temporarily to a large number, you can effectively -prevent garbage collection during a part of the program. +memory used for data (see `lisp-object-memory-usage') has been allocated +since the last garbage collection. However, it will not happen if less +than `gc-cons-threshold' bytes have been allocated -- this sets an absolute +minimum in case very little data has been allocated or the percentage is +set very low. Set this to 0 to have garbage collection always happen after +`gc-cons-threshold' bytes have been allocated, regardless of current memory +usage. -See also `consing-since-gc'. +See also `consing-since-gc' and `gc-cons-threshold'. */ ); #ifdef DEBUG_XEMACS 1.31 +2 -2 XEmacs/xemacs/src/dumper.c Index: dumper.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/dumper.c,v retrieving revision 1.30 retrieving revision 1.31 diff -u -p -r1.30 -r1.31 --- dumper.c 2005/06/23 11:48:47 1.30 +++ dumper.c 2005/10/14 01:22:00 1.31 ＠＠ -2164,7 +2164,7 ＠＠ pdump_load_finish (void) if (count == 2) { mc_addr = (Rawbyte *) mc_alloc (real_size); -#ifdef MC_ALLOC_TYPE_STATS +#ifdef ALLOC_TYPE_STATS inc_lrecord_stats (real_size, (const struct lrecord_header *) ((char *) rdata + delta)); ＠＠ -2173,7 +2173,7 ＠＠ pdump_load_finish (void) == lrecord_type_string) inc_lrecord_string_data_stats (((Lisp_String *) ((char *) rdata + delta))->size_); -#endif /* not MC_ALLOC_TYPE_STATS */ +#endif /* ALLOC_TYPE_STATS */ } else mc_addr = (Rawbyte *) xmalloc_and_zero (real_size); 1.159 +16 -16 XEmacs/xemacs/src/emacs.c Index: emacs.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/emacs.c,v retrieving revision 1.158 retrieving revision 1.159 diff -u -p -r1.158 -r1.159 --- emacs.c 2005/10/04 17:51:24 1.158 +++ emacs.c 2005/10/14 01:22:00 1.159 ＠＠ -919,9 +919,9 ＠＠ main_1 (int argc, Wexttext **argv, Wextt if (!restart) { init_mc_allocator (); -#ifdef MC_ALLOC_TYPE_STATS +#ifdef ALLOC_TYPE_STATS init_lrecord_stats (); -#endif /* not MC_ALLOC_TYPE_STATS */ +#endif /* ALLOC_TYPE_STATS */ } } #endif /* MC_ALLOC */ ＠＠ -1217,16 +1217,16 ＠＠ main_1 (int argc, Wexttext **argv, Wextt This requires inserting a new element into argv. */ if (dpy != 0 && skip_args - count_before == 1) { - Wexttext **new = xnew_array (Wexttext *, argc + 2); + Wexttext **new_ = xnew_array (Wexttext *, argc + 2); int j; for (j = 0; j < count_before + 1; j++) - new[j] = argv[j]; - new[count_before + 1] = WEXTSTRING ("-d"); - new[count_before + 2] = dpy; + new_[j] = argv[j]; + new_[count_before + 1] = WEXTSTRING ("-d"); + new_[count_before + 2] = dpy; for (j = count_before + 2; j <argc; j++) - new[j + 1] = argv[j]; - argv = new; + new_[j + 1] = argv[j]; + argv = new_; argc++; } /* Change --display to -d, when its arg is separate. */ ＠＠ -2913,7 +2913,7 ＠＠ DEFUN_NORETURN ("run-emacs-from-temacs", Do not call this. It will reinitialize your XEmacs. You'll be sorry. */ /* If this function is called from startup.el, it will be possible to run - temacs as an editor using 'temacs -batch -l loadup.el run-temacs', instead + temacs as an editor using `temacs -batch -l loadup.el run-temacs', instead of having to dump an emacs and then run that (when debugging emacs itself, this can be much faster)). [Actually, the speed difference isn't that much as long as your filesystem is local, and you don't end up with ＠＠ -3472,17 +3472,17 ＠＠ shut_down_emacs (int sig, Lisp_Object st "the crash anyway.\n\n" #ifdef INFODOCK "Please report this bug by selecting `Report-Bug' in the InfoDock menu, or\n" -"(last resort) by emailing `crashes(a)xemacs.org' -- note that this is for XEmacs\n" -"in general, not just Infodock." +"(last resort) by emailing `xemacs-beta(a)xemacs.org' -- note that this is for\n" +"XEmacs in general, not just Infodock." #else "Please report this bug by invoking M-x report-emacs-bug, or by selecting\n" "`Send Bug Report' from the Help menu. If that won't work, send ordinary\n" -"email to `crashes(a)xemacs.org'." +"email to `xemacs-beta(a)xemacs.org'." #endif -" *MAKE SURE* to include this entire output\n" -"from this crash, especially including the Lisp backtrace, as well as the\n" -"XEmacs configuration from M-x describe-installation (or equivalently, the\n" -"file `Installation' in the top of the build tree).\n" +" *MAKE SURE* to include this entire\n" +"output from this crash, especially including the Lisp backtrace, as well as\n" +"the XEmacs configuration from M-x describe-installation (or equivalently,\n" +"the file `Installation' in the top of the build tree).\n" #ifdef _MSC_VER "\n" "If you are fortunate enough to have some sort of debugging aid installed\n" 1.39 +2 -4 XEmacs/xemacs/src/lrecord.h Index: lrecord.h =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/lrecord.h,v retrieving revision 1.38 retrieving revision 1.39 diff -u -p -r1.38 -r1.39 --- lrecord.h 2005/05/15 16:38:13 1.38 +++ lrecord.h 2005/10/14 01:22:00 1.39 ＠＠ -376,18 +376,16 ＠＠ extern int gc_in_progress; #ifdef MC_ALLOC #include "mc-alloc.h" -#endif /* MC_ALLOC */ -#ifdef MC_ALLOC_TYPE_STATS +#ifdef ALLOC_TYPE_STATS void init_lrecord_stats (void); void inc_lrecord_string_data_stats (Bytecount size); void dec_lrecord_string_data_stats (Bytecount size); void inc_lrecord_stats (Bytecount size, const struct lrecord_header *h); void dec_lrecord_stats (Bytecount size_including_overhead, const struct lrecord_header *h); -#endif /* MC_ALLOC_TYPE_STATS */ +#endif /* ALLOC_TYPE_STATS */ -#ifdef MC_ALLOC /* Tell mc-alloc how to call a finalizer. */ #define MC_ALLOC_CALL_FINALIZER(ptr) \ { \ 1.5 +2 -2 XEmacs/xemacs/src/mc-alloc.c Index: mc-alloc.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/mc-alloc.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- mc-alloc.c 2005/09/14 14:24:30 1.4 +++ mc-alloc.c 2005/10/14 01:22:01 1.5 ＠＠ -1486,10 +1486,10 ＠＠ remove_cell (void *ptr, page_header *ph) #endif if (PH_ON_USED_LIST_P (ph)) { -#ifdef MC_ALLOC_TYPE_STATS +#ifdef ALLOC_TYPE_STATS dec_lrecord_stats (PH_CELL_SIZE (ph), (const struct lrecord_header *) ptr); -#endif /* MC_ALLOC_TYPE_STATS */ +#endif /* ALLOC_TYPE_STATS */ #ifdef ERROR_CHECK_GC assert (!LRECORD_FREE_P (ptr)); deadbeef_memory (ptr, PH_CELL_SIZE (ph)); 1.2 +0 -12 XEmacs/xemacs/src/mc-alloc.h Index: mc-alloc.h =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/mc-alloc.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- mc-alloc.h 2005/04/08 23:11:29 1.1 +++ mc-alloc.h 2005/10/14 01:22:01 1.2 ＠＠ -35,18 +35,6 ＠＠ Boston, MA 02111-1307, USA. */ # endif #endif /* MALLOC_OVERHEAD */ - -/* This enables type based information (updated during gc). The output - is used by show-memory-usage to print memory information for each - type. Since the new allocator does not distinguish between types - anymore, this functionality is additionally implemented and - consumes a lot of time. That is why it is kept conditioned on a - separate flag called MC_ALLOC_TYPE_STATS. */ -#if 1 -# define MC_ALLOC_TYPE_STATS 1 -#endif - - /*--- prototypes -------------------------------------------------------*/ BEGIN_C_DECLS 1.52 +2 -2 XEmacs/xemacs/src/symbols.c Index: symbols.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/symbols.c,v retrieving revision 1.51 retrieving revision 1.52 diff -u -p -r1.51 -r1.52 --- symbols.c 2005/09/29 11:41:22 1.51 +++ symbols.c 2005/10/14 01:22:01 1.52 ＠＠ -3331,10 +3331,10 ＠＠ init_symbols_once_early (void) mcpro (wrap_pointer_1 (tem)); tem->value = 0; tem->type = SYMVAL_UNBOUND_MARKER; -#ifdef MC_ALLOC_TYPE_STATS +#ifdef ALLOC_TYPE_STATS inc_lrecord_stats (sizeof (struct symbol_value_magic), (const struct lrecord_header *) tem); -#endif /* not MC_ALLOC_TYPE_STATS */ +#endif /* ALLOC_TYPE_STATS */ #else /* not MC_ALLOC */ const struct symbol_value_magic *tem = &guts_of_unbound_marker; #endif /* not MC_ALLOC */

1 participants
0 comments

CVS update by ben xemacs/lib-src ... 20 years

CVS Monitor

User: ben Date: 05/10/14 03:02:31 Modified: xemacs/lib-src ChangeLog i.c mmencode.c winclient.c Log: Include config.h in lib-src progs i.c, mmencode.c: Always include config.h first. winclient.c: Move include of windows.h after config.h. Revision Changes Path 1.196 +8 -0 XEmacs/xemacs/lib-src/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lib-src/ChangeLog,v retrieving revision 1.195 retrieving revision 1.196 diff -u -p -r1.195 -r1.196 --- ChangeLog 2005/09/19 00:36:05 1.195 +++ ChangeLog 2005/10/14 01:02:29 1.196 ＠＠ -1,3 +1,11 ＠＠ +2005-10-13 Ben Wing <ben(a)xemacs.org> + + * i.c: + * mmencode.c: + Always include config.h first. + * winclient.c: + Move include of windows.h after config.h. + 2005-09-18 Mike Alexander <mta(a)arbortext.com> * installexe.sh: Don't add an exe extention to a file that already 1.6 +4 -0 XEmacs/xemacs/lib-src/i.c Index: i.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lib-src/i.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- i.c 2004/12/07 00:20:51 1.5 +++ i.c 2005/10/14 01:02:30 1.6 ＠＠ -31,6 +31,10 ＠＠ does. It can be used also when xemacs s command ina script, especially when its standart output should be obtained programmatically. */ +#ifdef HAVE_CONFIG_H +# include <config.h> +#endif + #include <windows.h> #include <stdio.h> #include <string.h> 1.9 +3 -0 XEmacs/xemacs/lib-src/mmencode.c Index: mmencode.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lib-src/mmencode.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- mmencode.c 2001/08/13 04:45:48 1.8 +++ mmencode.c 2005/10/14 01:02:30 1.9 ＠＠ -13,6 +13,9 ＠＠ OF THIS MATERIAL FOR ANY PURPOSE. IT IS WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES. */ +#ifdef HAVE_CONFIG_H +# include <config.h> +#endif #define NEWLINE_CHAR '\n' #include <stdlib.h> #include <stdio.h> 1.4 +2 -1 XEmacs/xemacs/lib-src/winclient.c Index: winclient.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lib-src/winclient.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- winclient.c 2002/05/28 08:44:26 1.3 +++ winclient.c 2005/10/14 01:02:30 1.4 ＠＠ -22,10 +22,11 ＠＠ /* -- Includes -------------------------------------------------------------- */ -#include <windows.h> #ifdef HAVE_CONFIG_H # include <config.h> #endif +#include <windows.h> +#include <ddeml.h> #include <stdlib.h> #include <stdio.h> #include <ctype.h>

1 participants
0 comments

CVS update by ben xemacs ... 20 years

CVS Monitor

User: ben Date: 05/10/14 03:00:47 Modified: xemacs ChangeLog configure.ac Log: fix optimization handling in configure.ac configure.ac: Break lines. configure.ac: Rewrite optimization help to be accurate. Setting `--with-cflags-optimization=""' will now unilaterally turn off optimization; setting it to something non-null unilaterally turns it on. Revision Changes Path 1.461 +10 -0 XEmacs/xemacs/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/ChangeLog,v retrieving revision 1.460 retrieving revision 1.461 diff -u -p -r1.460 -r1.461 --- ChangeLog 2005/10/04 17:51:13 1.460 +++ ChangeLog 2005/10/14 01:00:44 1.461 ＠＠ -1,3 +1,13 ＠＠ +2005-10-13 Ben Wing <ben(a)xemacs.org> + + * configure.ac (XE_COMPLEX_ARG_ENABLE): + Break lines. + * configure.ac (TAB): + Rewrite optimization help to be accurate. Setting + `--with-cflags-optimization=""' will now unilaterally turn off + optimization; setting it to something non-null unilaterally turns it + on. + 2005-09-22 Stephen J. Turnbull <stephen(a)xemacs.org> * configure.ac (Canna): Configure as module if appropriate. 1.15 +14 -6 XEmacs/xemacs/configure.ac Index: configure.ac =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.ac,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -r1.14 -r1.15 --- configure.ac 2005/10/04 17:51:13 1.14 +++ configure.ac 2005/10/14 01:00:45 1.15 ＠＠ -757,16 +757,16 ＠＠ AC_ARG_WITH([compiler], [], []) AC_ARG_WITH([xemacs-compiler], - AC_HELP_STRING([--with-xemacs-compiler],[compiler to use to compile just the xemacs executable and C modules. + AC_HELP_STRING([--with-xemacs-compiler], + [compiler to use to compile just the xemacs executable and C modules. If you want to compile XEmacs as C++, use e.g. `--with-xemacs-compiler=g++'. This turns on a lot of additional error-checking.]), [], []) AC_ARG_WITH([cflags], - AC_HELP_STRING([--with-cflags],[Compiler flags (such as -O); setting this overrides - all default compiler flags except those that control - warnings.]), + AC_HELP_STRING([--with-cflags], + [Compiler flags. These flags will be placed after any flags inserted for warnings, debugging or optimization; setting this does not disable the insertion of those flags. Use configure settings such as `--with-optimization=no' or `enable-debug=no' to turn them off, or override them with `--with-cflags-optimization', `--with-cflags-debugging', or `with-cflags-warning'.]), [], []) AC_ARG_WITH([cflags-warning], ＠＠ -777,7 +777,7 ＠＠ AC_ARG_WITH([cflags-warning], AC_ARG_WITH([cflags-optimization], AC_HELP_STRING([--with-cflags-optimization=FLAGS], - [Override compiler flags used to control optimization. Only has an effect when optimization is enabled. Normally, don't set this, as XEmacs will already set the maximum safe optimization flags appropriate for the compiler being invoked.]), + [Override compiler flags used to control optimization. If blank, forces no optimization; if non-blank, forces optimization. Normally, don't set this; XEmacs automatically sets the maximum safe optimization flags appropriate for the compiler being invoked. If you just want to turn optimization on or off, use `with-optimization' instead.]), [], []) AC_ARG_WITH([cflags-debugging], ＠＠ -2074,7 +2074,15 ＠＠ dnl Calculate optimization flags. These dnl versions and on in release versions. if test -z "$with_optimization"; then - if test -z "$emacs_is_beta" -o "$cflags_optimization_specified" = "yes"; then + # If user set --with-cflags-optimization, use it to unilaterally + # determine whether optimization should be enabled. + if test "$cflags_optimization_specified" = "yes" ; then + if -z "$with_cflags_optimization" ; then + with_optimization=no + else + with_optimization=yes + fi + elif test -z "$emacs_is_beta" ; then with_optimization=yes else with_optimization=no

1 participants
0 comments

CVS update by ben xemacs-builds/ben, filter-scratch-wscompile, global-replace, wsconfig ... 20 years

CVS Monitor

User: ben Date: 05/10/14 02:53:52 Modified: xemacs-builds/ben bash-functions build config-inc cvs-update filter-scratch-wscompile generate-build-values global-replace gr runcc scratch-wscompile wscompile wsconfig wsdir Added: xemacs-builds/ben build-packages crw2 scratch-wscompile-packages Removed: xemacs-builds/ben info-build-config Log: rewrote generate-build-values in perl, to handle configure options for different versions; added support for building package directories and appropriately filtering the output; updated runcc for latest builds; new bash-functions for various sorts of finding/grepping; other changes Revision Changes Path 1.2 +168 -9 XEmacs/xemacs-builds/ben/bash-functions Index: bash-functions =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs-builds/ben/bash-functions,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- bash-functions 2004/11/13 23:01:07 1.1 +++ bash-functions 2005/10/14 00:53:42 1.2 ＠＠ -20,6 +20,8 ＠＠ else fi # echo "Fullpath is $fullpath" +# Find all files matching $1 (a shell-type wildcard) in the subdirectory +# tree under . function fin() { if [ -z "$1" ] ; then ＠＠ -29,6 +31,17 ＠＠ function fin() fi } +# Find all files matching $1 (a shell-type wildcard) in the curent +# directory, but no subdirs. +function nfin() +{ + if [ -z "$1" ] ; then + find . -name . -o -type d -prune -o -print + else + find . -name . -o -type d -prune -o -name "$1" -print + fi +} + function ov() { dir=`pwd` ＠＠ -41,6 +54,46 ＠＠ function ov() done } +# cddn -- cd to the directory that $1 (a file) is in. + +function cddn() +{ + cd "$dirname($1)" +} + +# cdwhich -- cd to the directory that a program is in. Looks through +# the path. + +function cdwhich() +{ + local cmd + local wh + local oldcmd + cmd=$1 + wh=$(which $cmd) + + while echo "$wh" | perl -ne 'exit !/: aliased to /' ; do + oldcmd=$cmd + cmd=`echo $wh | perl -pe 's/^.*: aliased to ([^ ]+).*$/$1/'` + if [ "$oldcmd" = "$cmd" ] ; then + wh=$(which -p "$cmd") + if [ -d "$wh" ] ; then + cd "$(dirname $wh)" + else + echo $wh + fi + else + wh=$(which $cmd) + fi + done + + if [ -f "$wh" ] ; then + cd "$(dirname $wh)" + else + echo $wh + fi +} + function dorec() { find . | xargs "$＠" ＠＠ -89,8 +142,61 ＠＠ function rg() -name "*.mo" -o \ -name "image.0*" -o \ -name "*.xpm" -o \ + -name ".\#*" -o \ + -type f -print0 | xargs -0 grep -P "$＠" | more +} + +# Print out non-binary files +function printtext() +{ + find . \ + -name "*.orig" -prune -o \ + -name CVS -prune -o \ + -name "temacs.bsc" -o \ + -name "*.elc" -o \ + -name "*.exe" -o \ + -name "*.obj" -o \ + -name "*.pdb" -o \ + -name "*.a" -o \ + -name "*.dll" -o \ + -name "*.ncb" -o \ + -name "*.mo" -o \ + -name "image.0*" -o \ + -name "*.xpm" -o \ + -name "*.sbr" -o \ + -name "*.o" -o \ + -name "*.jpg" -o \ + -name "*.png" -o \ + -name "*.gif" -o \ + -name "*.gz" -o \ + -name "*.Z" -o \ + -name "*.bz2" -o \ + -name "*.tgz" -o \ + -name "*.au" -o \ + -name "*.ico" -o \ + -name "*.bmp" -o \ + -type f -print +} + +# Like recursive grep, but look only in the current directory. +function nrg() +{ + find . -name . -o -type d -prune -o \ + -name "temacs.bsc" -o \ + -name "*~" -o \ + -name "*.elc" -o \ + -name "*.exe" -o \ + -name "*.obj" -o \ + -name "TAGS" -o \ + -name "*.pdb" -o \ + -name "*.a" -o \ + -name "*.dll" -o \ + -name "*.ncb" -o \ + -name "*.mo" -o \ + -name "image.0*" -o \ + -name "*.xpm" -o \ -name ".\#*" -o \ - -type f -print0 | xargs -0 egrep "$＠" | more + -type f -print0 | xargs -0 grep -P "$＠" | more } # For use in XEmacs src directory. Grep all important files. For me ＠＠ -112,6 +218,19 ＠＠ function gh() egrep "$＠" *.[hH] | more } +##### Global Search/Replace + +# `grx FIND-EXPR REPLACE-EXPR [FILES ...]'. For use in XEmacs src directory. +# Do a global search and replace over the source files in the XEmacs source +# directory, including all useful files. Include also the files in +# FILES. For me (under Cygwin), this is much faster than using `find'. +function grx() +{ + f1="$1"; f2="$2" + shift 2 + gr "$f1" "$f2" *.[chCH] s/*.[hH] m/*.[hH] *.in.in *.h.in ${1+"$＠"} +} + ##### Diffing alias diff='diff -u' ＠＠ -240,9 +359,30 ＠＠ function cldiff() cvs-merge-diff -from $val -to c "$＠" | more } +# `cdicom ARGS': Do a commit of a directory tree using cvs-commit, with the +# ARGS collected together as the log message. Before committing, do a +# `cvs-diff' to get the changes you made, and send them to a temp file, +# whose name is printed at the end of the commit output. + +function cdicom() +{ + tmp=$x/$$.txt + cvs-diff > $tmp + ccom -m "$*" + echo "output is $tmp" +} ##### Tar functions +function bzuntar() +{ + if [ -z "$1" ] ; then + tar xjf - + else + tar xjf $1 + fi +} + function zuntar() { if [ -z "$1" ] ; then ＠＠ -261,6 +401,15 ＠＠ function untar() fi } +function bztarls() +{ + if [ -z "$1" ] ; then + tar tjf - + else + tar tjf $1 + fi +} + function ztarls() { if [ -z "$1" ] ; then ＠＠ -315,14 +464,6 ＠＠ function nmgrep() done } -function cdicom() -{ - tmp=$x/$$.txt - cvs-diff > $tmp - ccom -m "$*" - echo "output is $tmp" -} - # now where is a real which, plus a `type' which does which plus # gives info about built-in commands/aliases/etc. ## function which() ＠＠ -532,6 +673,24 ＠＠ function rebunf() ws="$1" shift build --keep-going --no-filter $ws rebuild "$＠" +} + +# basic function to build a package workspace from scratch. arguments are +# workspace name. +function bup() +{ + ws="$1" + shift + build --packages --keep-going $ws scratch "$＠" +} + +# basic function to rebuild an existing package workspace. arguments are +# workspace name and configuration(s). +function rebup() +{ + ws="$1" + shift + build --packages --keep-going $ws rebuild "$＠" } # basic function to build a workspace from scratch for workspaces 1.4 +36 -5 XEmacs/xemacs-builds/ben/build Index: build =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs-builds/ben/build,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- build 2004/11/13 23:01:07 1.3 +++ build 2005/10/14 00:53:43 1.4 ＠＠ -25,6 +25,8 ＠＠ # All configuration information is contained in `config-inc'. +# --packages means build a package workspace. + # --no-mule-on-win indicates that in this workspace, Mule support doesn't # work on MS Windows. (Pre 21.5.) ＠＠ -56,6 +58,24 ＠＠ ## build --keep-going $ws rebuild "$＠" ## } ## +## # basic function to build a package workspace from scratch. arguments are +## # workspace name. +## function bup() +## { +## ws="$1" +## shift +## build --packages --keep-going $ws scratch "$＠" +## } +## +## # basic function to rebuild an existing package workspace. arguments are +## # workspace name and configuration(s). +## function rebup() +## { +## ws="$1" +## shift +## build --packages --keep-going $ws rebuild "$＠" +## } +## ## # basic function to build a workspace from scratch for workspaces ## # where the Mule support doesn't work under Windows. arguments are ## # workspace name and configuration(s). ＠＠ -80,6 +100,7 ＠＠ no_mule_on_win= filter="--filter" +packages= keep_going= ws_full_out= ws_filtered_out= ＠＠ -96,6 +117,8 ＠＠ while [ "$1" != "" ] && [ "$badoption" = no_mule_on_win=t elif [ "$1" = "--no-filter" -o "$1" = "-nf" ] ; then filter="" + elif [ "$1" = "--packages" ] ; then + packages="--packages" elif [ "$1" = "--keep-going" -o "$1" = "-k" ] ; then keep_going="--keep-going" elif [ "$1" = "--full-output-file" ] ; then ＠＠ -113,6 +136,10 ＠＠ while [ "$1" != "" ] && [ "$badoption" = fi done +if [ -n "$filter" ] && [ -n "$packages" ] ; then + filter="--filter=packages" +fi + workspace="$1" shift command="$1" ＠＠ -144,16 +171,20 ＠＠ fi function crazy() { args=`config_options "$2" "$4"` - dir=`generate-build-values "$3" $args` - build_full_out=$conf_outtop/$dir/$conf_fullout - build_filtered_out=$conf_outtop/$dir/$conf_filteredout + dir=`generate-build-values $packages "$3" $args` + build_full_out=$dir/$conf_fullout + build_filtered_out=$dir/$conf_filteredout if [ "$1" = "scratch" ] ; then - runcccmd=scratch-wscompile + if [ -n "$packages" ] ; then + runcccmd=scratch-wscompile-packages + else + runcccmd=scratch-wscompile + fi else runcccmd=wscompile fi - runcc $filter --output="$build_full_out" -- $runcccmd "$3" $keep_going $args | tee $build_filtered_out + runcc $filter --output="$build_full_out" -- $runcccmd $packages $keep_going "$3" $args | tee $build_filtered_out cat $build_full_out >> $ws_full_out cat $build_filtered_out >> $ws_filtered_out } 1.2 +12 -9 XEmacs/xemacs-builds/ben/config-inc Index: config-inc =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs-builds/ben/config-inc,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- config-inc 2004/11/13 23:01:08 1.1 +++ config-inc 2005/10/14 00:53:43 1.2 ＠＠ -1,5 +1,8 ＠＠ #!/bin/bash +# Sample config.inc file. This file gives the settings of the user's +# environment. + # This file gives specifics about the layout of the workspaces that # are to be compiled. The file is included in each of the other scripts. ＠＠ -75,26 +78,26 ＠＠ function config_options() b ) args="$mule" ;; bp ) args="$mule pdump" ;; # Maximal error catching, with KKCC - 0 | 0p ) args="$mule union cpp pdump kkcc optimized" ;; + 0 | 0p ) args="$mule union cpp pdump kkcc bignum optimized" ;; # Maximal error catching, sans union, which tends to screw things up - 0a ) args="$mule cpp pdump kkcc optimized" ;; + 0a ) args="$mule cpp pdump kkcc bignum optimized" ;; # Maximal error catching, sans union and pdump (recent pdump crashes # observed) - 0b ) args="$mule cpp kkcc optimized" ;; + 0b ) args="$mule cpp kkcc bignum optimized" ;; # Maximal difference with stuff still enabled - 1 ) args="optimized noerror nodebug sysmalloc" ;; - 1p ) args="optimized noerror nodebug sysmalloc pdump" ;; + 1 ) args="optimized bignum noerror nodebug sysmalloc" ;; + 1p ) args="optimized bignum noerror nodebug sysmalloc pdump" ;; 1n ) args="noerror nodebug sysmalloc" ;; # All window systems, Mule, turn off all graphical features 2 ) args="$mule nodebug nomenubars noscrollbars notoolbars nodialogs nowidgets nogif nojpeg nopng notiff noxface noxpm cpp" ;; 2p ) args="$mule nodebug nomenubars noscrollbars notoolbars nodialogs nowidgets nogif nojpeg nopng notiff noxface noxpm cpp pdump" ;; # No window systems, no Mule, all graphical features - 3 | 3p ) args="union pdump cpp noclash" ;; + 3 | 3p ) args="union pdump bignum cpp noclash" ;; # Build a nicely optimized one - 4 | 4p ) args="$mule noerror optimized pdump" ;; + 4 | 4p ) args="$mule noerror bignum optimized pdump" ;; # Turn off half of the graphical features, some window systems - 5 ) args="nox notty nomenubars notoolbars nowidgets nojpeg notiff noxpm" ;; - 5p ) args="nox notty nomenubars notoolbars nowidgets nojpeg notiff noxpm pdump" ;; + 5 ) args="bignum nox notty nomenubars notoolbars nowidgets nojpeg notiff noxpm" ;; + 5p ) args="bignum nox notty nomenubars notoolbars nowidgets nojpeg notiff noxpm pdump" ;; # Turn off the other half, other window systems 6 | 6p ) args="$mule union noerror nodebug cpp pdump nowin noscrollbars nodialogs nogif nopng noxface" ;; # Everything off 1.4 +13 -3 XEmacs/xemacs-builds/ben/cvs-update Index: cvs-update =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs-builds/ben/cvs-update,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- cvs-update 2004/11/13 23:01:09 1.3 +++ cvs-update 2005/10/14 00:53:43 1.4 ＠＠ -2,7 +2,7 ＠＠ ### cvs-update --- front end to `cvs update' -## Copyright (C) 2001, 2002, 2003, 2004 Ben Wing. +## Copyright (C) 2001, 2002, 2003, 2004, 2005 Ben Wing. ## Author: Ben Wing <ben(a)xemacs.org> ## Based on: Earlier version by Martin Buchholz <martin(a)xemacs.org> ＠＠ -97,6 +97,7 ＠＠ my ＠merged = (); my ＠warnings = (); my ＠updated = (); my ＠locally_modified = (); +my ＠locally_removed = (); my $print = grep (/^-p$/, ＠ARGV); my $current_merge; ＠＠ -148,6 +149,10 ＠＠ while (<CVS>) { push ＠added, $1; } + if (/^R (.*)$/) + { + push ＠locally_removed, $1; + } my ($code, $file) = split(' '); next unless defined ($code) and grep ($code eq $_, qw(U P M C)); next unless defined ($file) and -r $file; ＠＠ -157,9 +162,8 ＠＠ while (<CVS>) { print "Automatically resolving conflict in $file\n"; my $contents = &FileContents ($file); - # Resolve conflicts in the obvious way... if ($contents =~ - s/^<{7} \S+\n((?:.*\n)*?)={7}\n((?:.*\n)*?)>{7} \S+\n/$1$2/mg) + s/^<<<<<<< \S+\n((?:.|\n)*?\n)=======\n((?:.|\n)*?\n)>>>>>>> \S+\n/$1$2/mg) { open (FILE, "> $file") or die "$file: $!\n"; # the following was `sleep 1', but i still occasionally saw ＠＠ -229,6 +233,12 ＠＠ print "\n"; if (＠locally_modified) { print "\nThe following files have been locally modified:\n\n "; print (join "\n ", ＠locally_modified); + print "\n\n"; +} + +if (＠locally_removed) { + print "\nThe following files have been locally removed:\n\n "; + print (join "\n ", ＠locally_removed); print "\n\n"; } 1.3 +1 -3 XEmacs/xemacs-builds/ben/filter-scratch-wscompile Index: filter-scratch-wscompile =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs-builds/ben/filter-scratch-wscompile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- filter-scratch-wscompile 2004/11/13 23:01:09 1.2 +++ filter-scratch-wscompile 2005/10/14 00:53:43 1.3 ＠＠ -2,8 +2,6 ＠＠ # Reconfigure and build $1/ from scratch -. config-inc - dir=`generate-build-values $＠` -outfile=$conf_outtop/$dir/makeout.txt +outfile=$dir/makeout.txt runcc --filter --output=$outfile scratch-wscompile "$＠" 1.3 +162 -111 XEmacs/xemacs-builds/ben/generate-build-values Index: generate-build-values =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs-builds/ben/generate-build-values,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- generate-build-values 2004/11/13 23:01:10 1.2 +++ generate-build-values 2005/10/14 00:53:43 1.3 ＠＠ -1,115 +1,166 ＠＠ -#!/bin/bash +#!/usr/bin/perl -w -# Generate various values used for building (the name of the output -# directory, the options to be passed to configure, the flags to the C -# compiler) given the workspace name and the specified configuration -# characteristics. - -. config-inc - -if [ "$1" = "--opts" ]; then - doopts=t - shift -elif [ "$1" = "--cflags" ]; then - docflags=t - shift -elif [ "$1" = "--mflags" ]; then - domflags=t - shift -fi - -dir=$1 -opts= -cflags="-g" -cpp= -optimized= -mflags= - -shift - -badoption= - -if [ "$1" = "--keep-going" ] || [ "$1" = "-k" ] ; then - mflags="-k" - shift -fi - -while [ "$1" != "" ] && [ "$badoption" = "" ] ; do - if [ "$1" = "mule" ] ; then - opts="$opts --with-mule=yes" - elif [ "$1" = "cpp" ] ; then +# Author: Ben Wing <ben(a)xemacs.org> + +use strict; + +use Getopt::Long; + +(my $myName = $0) =~ s＠.*/＠＠; my $usage=" +Usage: $myName [--help|--opts|--cflags|--mflags|--keep-going|-k] WORKSPACE [CONFIG ...] + +Generate various values used for building (the name of the output +directory, the options to be passed to configure, the flags to the C +compiler) given the workspace name and the specified configuration +characteristics. + +--srcdir means generate the top-level source directory for WORKSPACE. +--configure means generate the options for `configure'. +--make means generate the options for `make'. +--packages means we are building the a package workspace. This just controls + the output of the build directory, which (currently) is just the + source directory. + +If none of the above, return the build directory given the workspace and +configuration options. + +--keep-going or -k sticks -k in mflags. + +Options to be passed to configure are appropriate for the version of +configure in the workspace given. + +Retrieves options from `config-inc', which must be in the path. +"; + +my ($srcdir, $configure, $make, $keep_going, $packages, $help); + +&GetOptions ("srcdir", \$srcdir, "configure", \$configure, "make", \$make, + "keep-going|k", \$keep_going, "packages", \$packages, + "help", \$help) || + die "$usage"; +die "$usage" if $help; + +my $conf_outtop = `bash -c '. config-inc; echo \$conf_outtop'`; +chomp $conf_outtop; +my $conf_wstop = `bash -c '. config-inc; echo \$conf_wstop'`; +chomp $conf_wstop; +my $conf_site_includes = `bash -c '. config-inc; echo \$conf_site_includes'`; +chomp $conf_site_includes; +my $conf_site_libraries = `bash -c '. config-inc; echo \$conf_site_libraries'`; +chomp $conf_site_libraries; +my $conf_package_path = `bash -c '. config-inc; echo \$conf_package_path'`; +chomp $conf_package_path; + +my %oldopts = ('mule' => '--with-mule=yes', # Database code includes incomplete prototypes with no args; this # screws to all hell with C++ - opts="$opts --compiler=gcc --xemacs-compiler=g++ --with-database=no" - cpp=t - elif [ "$1" = "union" ] ; then - opts="$opts --use-union-type=yes" - elif [ "$1" = "nodebug" ] ; then - opts="$opts --debug=no" - elif [ "$1" = "optimized" ] ; then - optimized=t - elif [ "$1" = "noerror" ] ; then - opts="$opts --error-checking=none" - elif [ "$1" = "pdump" ] ; then - opts="$opts --pdump=yes" - elif [ "$1" = "kkcc" ] ; then - opts="$opts --use-kkcc" - elif [ "$1" = "rel-alloc" ] ; then - opts="$opts --rel-alloc=yes" - elif [ "$1" = "nowin" ] ; then - opts="$opts --with-msw=no" - elif [ "$1" = "notty" ] ; then - opts="$opts --with-tty=no" - elif [ "$1" = "nox" ] ; then - opts="$opts --with-x=no" - elif [ "$1" = "noclash" ] ; then - opts="$opts --with-clash-detection=no" - elif [ "$1" = "sysmalloc" ] ; then - opts="$opts --with-system-malloc" - elif [ "$1" = "nomenubars" ] ; then - opts="$opts --with-menubars=no" - elif [ "$1" = "noscrollbars" ] ; then - opts="$opts --with-scrollbars=no" - elif [ "$1" = "notoolbars" ] ; then - opts="$opts --with-toolbars=no" - elif [ "$1" = "nodialogs" ] ; then - opts="$opts --with-dialogs=no" - elif [ "$1" = "nowidgets" ] ; then - opts="$opts --with-widgets=no" - elif [ "$1" = "nogif" ] ; then - opts="$opts --with-gif=no" - elif [ "$1" = "nojpeg" ] ; then - opts="$opts --with-jpeg=no" - elif [ "$1" = "nopng" ] ; then - opts="$opts --with-png=no" - elif [ "$1" = "notiff" ] ; then - opts="$opts --with-tiff=no" - elif [ "$1" = "noxface" ] ; then - opts="$opts --with-xface=no" - elif [ "$1" = "noxpm" ] ; then - opts="$opts --with-xpm=no" - else - badoption=t - echo "Unknown option: $1" - fi - if [ "$badoption" = "" ] ; then - dir="${dir}-$1" - shift - fi -done - -if [ "$optimized" != "" ] ; then - cflags="$cflags -O3" -fi - -if [ "$doopts" != "" ] ; then - echo $opts -elif [ "$docflags" != "" ] ; then - echo $cflags -elif [ "$domflags" != "" ] ; then - echo $mflags -else - [ -d "$conf_outtop/$dir" ] || mkdir $conf_outtop/$dir - echo $dir -fi + 'cpp' => '--compiler=gcc --xemacs-compiler=g++', + 'union' => '--use-union-type=yes', + 'nodebug' => '--debug=no', + 'optimized' => '', + 'noerror' => '--error-checking=none', + 'bignum' => '--use-number-lib=gmp', + 'nomodules' => '--with-modules=no', + 'pdump' => '--pdump=yes', + 'kkcc' => '--use-kkcc', + 'rel-alloc' => '--rel-alloc=yes', + 'nowin' => '--with-msw=no', + 'notty' => '--with-tty=no', + 'nox' => '--with-x=no', + 'noclash' => '--with-clash-detection=no', + 'sysmalloc' => '--with-system-malloc', + 'nomenubars' => '--with-menubars=no', + 'noscrollbars' => '--with-scrollbars=no', + 'notoolbars' => '--with-toolbars=no', + 'nodialogs' => '--with-dialogs=no', + 'nowidgets' => '--with-widgets=no', + 'nogif' => '--with-gif=no', + 'nojpeg' => '--with-jpeg=no', + 'nopng' => '--with-png=no', + 'notiff' => '--with-tiff=no', + 'noxface' => '--with-xface=no', + 'noxpm' => '--with-xpm=no'); +my %newopts = ('mule' => '--enable-mule', + # Database code includes incomplete prototypes with no args; this + # screws to all hell with C++ + 'cpp' => '--with-compiler=gcc --with-xemacs-compiler=g++', + 'union' => '--enable-union-type', + 'nodebug' => '--enable-debug=no', + 'optimized' => '--with-optimization', + 'noerror' => '--enable-error-checking=none', + 'bignum' => '--enable-bignum=gmp', + 'nomodules' => '--enable-modules=no', + 'pdump' => '--enable-pdump', + 'kkcc' => '--enable-kkcc', + 'rel-alloc' => '--with-rel-alloc', + 'nowin' => '--with-msw=no', + 'notty' => '--with-tty=no', + 'nox' => '--with-x=no', + 'noclash' => '--enable-clash-detection=no', + 'sysmalloc' => '--with-system-malloc', + 'nomenubars' => '--enable-menubars=no', + 'noscrollbars' => '--enable-scrollbars=no', + 'notoolbars' => '--enable-toolbars=no', + 'nodialogs' => '--enable-dialogs=no', + 'nowidgets' => '--enable-widgets=no', + 'nogif' => '--with-gif=no', + 'nojpeg' => '--with-jpeg=no', + 'nopng' => '--with-png=no', + 'notiff' => '--with-tiff=no', + 'noxface' => '--with-xface=no', + 'noxpm' => '--with-xpm=no'); + +my $dir=$ARGV[0]; shift; +my $ws=$dir; +my $opts = ""; + +if (!$packages) { # currently, no configuration options for building packages + # Retrieve the version file from the workspace. + my $version_sh = `cat '$conf_wstop/$ws/version.sh'`; + my ($majorv, $minorv, $betav) = + $version_sh =~ m{ emacs_major_version=([0-9]+) + .* + emacs_minor_version=([0-9]+) + .* + emacs_beta_version=([0-9]+) + }xs; + my $version = $majorv * 10000 + $minorv * 100 + $betav; + + my $old_opts = $version < 210521; + + my $opts = "--verbose --srcdir='$conf_wstop/$ws'"; + + if ($old_opts) { + $opts .= " --extra-verbose --debug --quick-build" . + " --site-includes='$conf_site_includes'" . + " --site-libraries='$conf_site_libraries'" . + " --package-path='$conf_package_path'"; + } else { + $opts .= " --enable-debug --enable-quick-build" . + " --with-site-includes='$conf_site_includes'" . + " --with-site-libraries='$conf_site_libraries'" . + " --with-package-path='$conf_package_path'"; + } + + my $cflags = $old_opts ? "-g" : ""; + + for my $x (＠ARGV) { + my $opt = $old_opts ? $oldopts{$x} : $newopts{$x}; + die "Unknown option: $x" if !defined ($opt); + $cflags .= " -O3" if $x eq 'optimized' && $old_opts; + $opts .= " $opt"; + $dir .= "-$x"; + } + + if ($old_opts) { + $opts .= " --cflags='$cflags'" if $cflags; + } else { + $opts .= " --with-cflags='$cflags'" if $cflags; + } +} + +if ($configure) { print $opts; } +elsif ($make) { print $keep_going ? "-k" : ""; } +elsif ($srcdir || $packages) { print "$conf_wstop/$ws"; } +else { print "$conf_outtop/$dir"; } 1.5 +13 -1 XEmacs/xemacs-builds/ben/global-replace Index: global-replace =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs-builds/ben/global-replace,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- global-replace 2002/03/12 05:28:57 1.4 +++ global-replace 2005/10/14 00:53:43 1.5 ＠＠ -79,7 +79,19 ＠＠ $Getopt::Long::ignorecase = 0; die $usage if $options{"help"} or ＠ARGV <= 1; my $code = shift; -die $usage if grep (-d || ! -w, ＠ARGV); +my ＠dirs = grep (-d, ＠ARGV); +if (＠dirs) +{ + print STDERR "Directories among list of files: ", join (' ', ＠dirs), "\n"; + die $usage; +} + +my ＠nonwrit = grep (!-w, ＠ARGV); +if (＠nonwrit) +{ + print STDERR "Non-writable files among list of files: ", join (' ', ＠nonwrit), "\n"; + die $usage; +} sub SafeOpen { open ((my $fh = new FileHandle), $_[0]); 1.2 +1 -1 XEmacs/xemacs-builds/ben/gr Index: gr =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs-builds/ben/gr,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- gr 2001/06/25 02:03:43 1.1 +++ gr 2005/10/14 00:53:43 1.2 ＠＠ -9,4 +9,4 ＠＠ from="$1" to="$2" shift 2 -echo ${1+"$＠"} | xargs global-replace "s/$from/$to/g" +echo ${1+"$＠"} | xargs global-replace "s/$from/$to/mg" 1.4 +264 -143 XEmacs/xemacs-builds/ben/runcc Index: runcc =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs-builds/ben/runcc,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- runcc 2004/11/13 23:01:11 1.3 +++ runcc 2005/10/14 00:53:44 1.4 ＠＠ -2,7 +2,7 ＠＠ ### runcc --- filter out compiler warning messages and output at end -## Copyright (C) 2001, 2002, 2003, 2004 Ben Wing. +## Copyright (C) 2001, 2002, 2003, 2004, 2005 Ben Wing. ## Author: Ben Wing <ben(a)xemacs.org> ## Maintainer: Ben Wing <ben(a)xemacs.org> ＠＠ -64,151 +64,176 ＠＠ filtering or warning extraction. # hash table of regexps matching output to be converted into a nicer # format: takes precedence over filtering regexps below -my %filter_replace = - ("^checking whether ln -s works\\.\\.\\." => "Configuring...\n", - "^gcc .* -o [tx]emacs " => "Linking...\n", - "^\\./[tx]emacs -nd -no-packages -batch -l .*/loadup.el dump" => "Dumping...\n", - "^\\./[tx]emacs -nd -no-packages -batch -l .*/update-elc.el" => - "Updating elcs before dumping...\n", - "^Updating autoloads for directory .*" => "Updating autoloads...\n", - "^Recompiling updated \\.els in directory tree `.*'..." => - "Updating elcs after dumping...\n", - "^(XEmacs: (fatal error: )?)?Static heap size adjusted, don't panic! I will restart the `make'" - => "Adjusting static heap...\n", - "^cd .*/man && make -k info\$" => "Building info files...\n", +my %filter_replace_core = + ("^checking whether ln -s works\\.\\.\\..*" => "BUILD: Configuring...\n", + "^gcc .* -o [tx]emacs .*" => "BUILD: Linking...\n", + "^\\./[tx]emacs(\\.exe)? -nd -no-packages -batch -l .*/loadup.el dump.*" => "BUILD: Dumping...\n", + "^\\./[tx]emacs(\\.exe)? -nd -no-packages -batch -l .*/update-elc.el.*" => + "BUILD: Updating elcs before dumping...\n", + "^Updating autoloads for directory .*" => "BUILD: Updating autoloads...\n", + "^Recompiling updated \\.els in directory tree `.*'....*" => + "BUILD: Updating elcs after dumping...\n", + "^(XEmacs: (fatal error: )?)?Static heap size adjusted, don't panic\! I will restart the `make'.*" + => "BUILD: Adjusting static heap...\n", + "^cd .*/man && make -k +info\$" => "BUILD: Building info files...\n", + "^cd \\./(.*) && make .*" => 'BUILD: Building in $1...\n', ); # regexps matching "normal output" to be filtered with --filter -my ＠filter = - ("^ *\$", "^gcc ", "^g\\+\\+ ", "^ *Loading ", "^ *Requiring", "^checking ", - "^ +Setting ", "^ +Compiling in", "^ +Using ", "^Processing ", - "^ +Defining ", "^ +Prepending ", "^ +Appending ", - "^ +xemacs will be linked with ", "^rm -f ", "^Compiling ", "^[Dd]one\$", - "^Making symbolic link to ", "^lwlib/config.h is unchanged\$", - "^make[[](1|2)]: (Entering|Leaving) directory ", - "^creating ", "^No autoloads found in ", "^Wrote ", - "^cd ./(.*) && make -k all\$", +my ＠filter_core = + ('^[ \t]*$', + '^[ \t]*gcc ', '^[ \t]*g\+\+ ', + '^[ \t]*Loading ', '^[ \t]*Requiring', + '^(configure: )?(checking|creating) ', + '^[ \t]*Setting ', '^[ \t]*Compiling ', '^[ \t]*Using ', '^Processing ', + '^[ \t]*Defining ', '^[ \t]*Prepending ', '^[ \t]*Appending ', + '^[ \t]*xemacs will be linked with ', + '^[ \t]*rm -f ', '^[Dd]one$', + '^Making symbolic link to ', '^lwlib/config.h is unchanged$', + '^make\[(1|2|3)]: (Entering|Leaving) directory ', + '^(config.status: )?(creating|executing) ', + '^No autoloads found in ', + '^Wrote ', + '^cd ./(.*) && make -k all$', # possibly dangerous? Filter out config assignment outputs - "^[A-Za-z_]+ = '.*'\$", + '^[A-Za-z_]+ = \'.*\'$', # misc lines to handle one by one # IMPORTANT: Make sure every regexp is anchored at beginning of line! # That makes it much less likely you will filter a legitimate problem. # Also make your regexps as specific as possible. - "^Running configure with options", - "^You appear to be using GCC version 3 or above", - "^Compilation Environment and Installation Defaults:", - "^ *Compiler version:", - "^ *- GCC specs file:", - "^ *- Compiler command:", - "^ *Compiler version for lib-src:", - "^ *- Compiler command for lib-src:", - "^ *libc version:", - "^for d in lib-src ", - "^for f in gnudoit gnuattach rcs-checkin ", - 'if test ! -r \$f; then ln -s .*/lib-src/\$f \$f;', - 'if test ! -f ../lib-src/DOC ; then', - '^[ \t]+; fi$', - "^ +core temacs.exe sheap-adjust.h", - "^ *temacs puremacs quantmacs covmacs", - "^ *sheap-adjust.h dump-id.c ./NEEDTODUMP SATISFIED", - "^ *../lib-src/\\*.po ../lib-src/\\*.mo", - "^ */[^ ]+/auto-autoloads.el\\* /[^ ]+/custom-load.el\\*", - "^ *GNUmakefile Makefile Makefile.in TAGS xemacs", - "^ *xemacs.def xemacs.def.in", - "^Extracting information from the machine- and system-dependent headers...", - "^X11 compilation variables:", - "^ +Using X11\\.", "^ +- Using raw Xlib to provide XIM support", - "^ +No module support\\.", - "^XEmacs .* configured for .*", - "^ +(Source code location|Installation prefix|Additional header files|Additional libraries|Operating system description file|Machine description file|Compiler|Relocating allocator for buffers|GNU version of malloc):", - "^(Compilation / Installation|Window System):\$", - "^ +- (X Windows (headers|libraries) location|Athena headers location|Athena library to link):", - "^ +- Drag'n'Drop prototype:", - "^ +Inhibiting IPv6 canonicalization at startup", - "^ +- Handling WM_COMMAND properly\\.\$", - "^(TTY|Images|Sound|Databases|Internationalization|Mail|Other Features):\$", - "^ +- Using PostgreSQL", - "^ +- User chose not to use GNU allocators", + '^Running configure with options', + '^You appear to be using GCC version 3 or above', + '^Compilation Environment and Installation Defaults:', + '^[ \t]*Compiler version:', + '^[ \t]*- GCC specs file:', + '^[ \t]*- Compiler command:', + '^[ \t]*Compiler version for lib-src:', + '^[ \t]*- Compiler command for lib-src:', + '^[ \t]*libc version:', + '^[ \t]*for d in lib-src ', + '^[ \t]*for f in gnudoit gnuattach rcs-checkin ', + '^[ \t]*if test ! -r \$f; then ln -s .*/lib-src/\$f \$f;', + '^[ \t]*if test ! -f ../lib-src/DOC ; then', + '^[ \t]*core temacs.exe sheap-adjust.h', + '^[ \t]*temacs puremacs quantmacs covmacs', + '^[ \t]*sheap-adjust.h dump-id.c ./NEEDTODUMP SATISFIED', + '^[ \t]*if (! )?test -f dump-size', + '^[ \t]*../lib-src/insert-data-in-exec temacs(\.exe)? xemacs.dmp', + '^[ \t]*ret=\$\? ;', + '^[ \t]*if test \${ret} -eq', + '^[ \t]*exit 1;', + '^[ \t]*chmod \+x xemacs ;', + '^[ \t]*(fi ;|else) \\\\$', + '^[ \t]*(; )?fi$', + '^[ \t]*dumped_data found at offset', + '^[ \t]*../lib-src/insert-data-in-exec -s xemacs.dmp > dump-size ;', + '^[ \t]*make -k +xemacs;', + '^[ \t]*../lib-src/\*.po ../lib-src/\*.mo', + '^[ \t]*/[^ ]+/auto-autoloads.el\* /[^ ]+/custom-load.el\*', + '^[ \t]*GNUmakefile Makefile Makefile.in TAGS xemacs', + '^[ \t]*xemacs.def xemacs.def.in', + '^Extracting information from the machine- and system-dependent headers...', + '^X11 compilation variables:', + '^[ \t]*Using X11\.', '^[ \t]*- Using raw Xlib to provide XIM support', + '^[ \t]*Xpm will be found in Motif', + '^[ \t]*No module support\.', + '^XEmacs .* configured for .*', + '^[ \t]*(Source code location|Installation prefix|Additional header files|Additional libraries|Operating system description file|Machine description file|Compiler|Relocating allocator for buffers|GNU version of malloc):', + '^(Compilation / Installation|Window System):$', + '^[ \t]*- (X Windows (headers|libraries) location|Athena headers location|Athena library to link):', + '^[ \t]*- Drag\'n\'Drop prototype:', + '^[ \t]*Inhibiting IPv6 canonicalization at startup', + '^[ \t]*- Handling WM_COMMAND properly\.$', + '^(TTY|Images|Sound|Databases|Internationalization|Mail|Other Features):$', + '^[ \t]*- Using PostgreSQL', + '^[ \t]*- User chose not to use GNU allocators', # be very careful suppressing lines that explicitly say "warning" or "error" - "^ +WARNING: -+\$", - "^ +WARNING: Compiling in support for runtime error checking.\$", - "^ +WARNING: XEmacs will run noticeably more slowly as a result.\$", - "^ +WARNING: Error checking is on by default for XEmacs beta releases.\$", - "^ +WARNING: This tends to trigger compiler bugs, especially when\$", - "^ +WARNING: combined with MULE and ERROR_CHECKING. Crashes have\$", - "^ +WARNING: been seen with various versions of GCC.*\$", - "^ +WARNING: .*with Visual C\\+\\+ as well.*\$", - "^ +WARNING: More recent versions may be safer, or not.\$", - "^ +WARNING: Use of the union type may cause crashes due to compiler bugs.\$", - "^ +WARNING: Compiling without XPM image support.\$", - "^ +WARNING: You should strongly consider installing XPM.\$", - "^ +WARNING: Otherwise toolbars and other graphics will look suboptimal.\$", - "^ +WARNING: Compiling without PNG image support.\$", - "^ +WARNING: You should strongly consider installing the PNG libraries.\$", - "^ +WARNING: Otherwise certain images and glyphs may not display.\$", - "^ +WARNING: \$a copy may be found in ftp://ftp.xemacs.org/pub/xemacs/aux\$\$", - "^configure: warning: Cannot currently build modules under Cygwin.\$", - "^Producing `.*' from `.*'\\.\$", - "^Resetting `.*'\\.\$", - "^Using (module)?-load-path", - "^found (bss|data)", "^writing .* header", - "^(padding|dumping) (\\.data|\\.bss|following)", - "^copying executable", "^writing rest of file", - "^-DINHIBIT_STRING_HEADER .*?/src/regex\\.c\$", - "^getopt.o getopt1.o regex.o", - "^ar cq liblw.a lwlib.o lwlib-utils.o", - "^mv EmacsShell-sub.o ", - "^windres --include-dir ", - "^Spawning make-docfile ...", - "^[ \t]+abbrev.c alloc.c ", - "^Using (module-)?load-path ", - "^Finding pointers to doc strings", - "^Dumping under the name xemacs", - "^found (bss|data)", "^writing .* header", - "^(padding|dumping) (\\.data|\\.bss|following)", - "^copying executable", "^writing rest of file", - "^\\.data and \\.bss reversed", - "^new data size is [0-9a-f]+, >= [0-9a-f]+\$", # a normal message! - "^warning: new data size is < approx", # #### should we fix the problem? - "^Testing for Lisp shadows ", - "^Building finder database ", - "^Removing old or spurious .elcs in directory tree `.*'", - "^\$No files need saving\$", - "^\$No changes need to be written\$", - "^ *\\./[tx]emacs -nd -no-packages -batch -l .*/make-docfile.el", - "^ *\\./[tx]emacs -no-packages -batch -no-autoloads -l update-elc-2.el", - "^ *\\./[tx]emacs -no-packages -batch -eval '\$setq finder-compile-keywords-quiet t\$'", - "^[ \t]+-l finder -f finder-compile-keywords", - "^[ \t]+-o ../lib-src/DOC", - "^[ \t]+-l update-elc-2.el -f batch-update-elc-2 lisp", - "^\\.\\./lib-src/make-dump-id\$", -# "^\\.\\./\\.\\./lib-src/ellcc ", - "^eldap.o eldap_i.o ../../src/xemacs-import.a ", - "^ellcc driver version .* for EMODULES version .*", - "^ELLMAKEDOC=.* \\.\\./\\.\\./lib-src/ellcc ", - "^--mod-name=", - "^--mod-title=", - "^dlltool -D", - "^.*/src/xemacs -no-packages -batch \\\\\$", - "^Static heap usage:", - "^make\\[1]: \\[xemacs\\] Error 1 \$ignored\$\$", - "^Generating custom-load.el", - "^Generating autoloads for", - "^Computing custom-loads for", - "^No custom-loads for", - "^make\\[1]: Nothing to be done for `.*'", - "^DOC file is up to date", - "^touch NEEDTODUMP\$", - "^Saving file .*/auto-autoloads.el...\$", - "^Info: resolving .* by linking to .*", + '^[ \t]*WARNING: -+$', + '^[ \t]*WARNING: Compiling in support for runtime error checking.$', + '^[ \t]*WARNING: XEmacs will run noticeably more slowly as a result.$', + '^[ \t]*WARNING: Error checking is on by default for XEmacs beta releases.$', + '^[ \t]*WARNING: This tends to trigger compiler bugs, especially when$', + '^[ \t]*WARNING: combined with MULE and ERROR_CHECKING. Crashes have$', + '^[ \t]*WARNING: been seen with various versions of GCC.*$', + '^[ \t]*WARNING: .*with Visual C\+\+ as well.*$', + '^[ \t]*WARNING: More recent versions may be safer, or not.$', + '^[ \t]*WARNING: Use of the union type may cause crashes due to compiler bugs.$', + '^[ \t]*WARNING: Compiling without XPM image support.$', + '^[ \t]*WARNING: You should strongly consider installing XPM.$', + '^[ \t]*WARNING: Otherwise toolbars and other graphics will look suboptimal.$', + '^[ \t]*WARNING: Compiling without PNG image support.$', + '^[ \t]*WARNING: You should strongly consider installing the PNG libraries.$', + '^[ \t]*WARNING: Otherwise certain images and glyphs may not display.$', + '^[ \t]*WARNING: $a copy may be found in ftp://ftp.xemacs.org/pub/xemacs/aux$$', + '^[ \t]*WARNING: The new algorithms are experimental. They are enabled by$', + '^[ \t]*WARNING: default for this release\. Use `--disable-kkcc\' to$', + '^[ \t]*WARNING: turn it off\.$', + '^[ \t]*WARNING: The new allocator is experimental. It is enabled by$', + '^[ \t]*WARNING: default for this release\. Use `--disable-mc-alloc\' to$', + '^configure: warning: Cannot currently build modules under Cygwin.$', + '^Producing `.*\' from `.*\'\.$', + '^Resetting `.*\'\.$', + '^Using (module)?-load-path', + '^found (bss|data)', '^writing .* header', + '^(padding|dumping) (\.data|\.bss|following)', + '^copying executable', '^writing rest of file', + '^-DINHIBIT_STRING_HEADER .*?/src/regex\.c$', + '^getopt.o getopt1.o regex.o', + '^ar cq liblw.a lwlib.o lwlib-utils.o', + '^mv EmacsShell-sub.o ', + '^windres --include-dir ', + '^Spawning make-docfile ...', + '^[ \t]*abbrev.c alloc.c ', + '^[ \t]*emacs-widget-accessors.c ui-byhand.c *; fi', + '^Using (module-)?load-path ', + '^Finding pointers to doc strings', + '^Dumping under the name xemacs', + '^Dump file too big for available space', + '^found (bss|data)', '^writing .* header', + '^(padding|dumping) (\.data|\.bss|following)', + '^copying executable', '^writing rest of file', + '^\.data and \.bss reversed', + '^new data size is [0-9a-f]+, >= [0-9a-f]+$', # a normal message! + '^warning: new data size is < approx', # #### should we fix the problem? + '^Testing for Lisp shadows ', + '^Building finder database ', + '^Removing old or spurious .elcs in directory tree `.*\'', + '^$No files need saving$', + '^$No changes need to be written$', + '^[ \t]*\./[tx]emacs(\.exe)?( -nd)? -no-packages -batch[ \t]*(-l .*/make-docfile.el|-no-autoloads -l update-elc-2.el|-eval "$setq finder-compile-keywords-quiet t$")', + '^[ \t]*-l finder -f finder-compile-keywords', + '^[ \t]*-o ../lib-src/DOC', + '^[ \t]*-l update-elc-2.el -f batch-update-elc-2 lisp', + '^\.\./lib-src/make-dump-id$', + '^\.\./\.\./lib-src/ellcc ', + '^eldap.o eldap_i.o ../../src/xemacs-import.a ', + '^postgresql.o postgresql_i.o ../../src/xemacs-import.a ', + '^ellcc driver version .* for EMODULES version .*', + '^ELLMAKEDOC=.* \.\./\.\./lib-src/ellcc ', + '^--mod-name=', + '^--mod-title=', + '^dlltool -D', + '^.*/src/xemacs -no-packages -batch \\\\$', + '^Static heap usage:', + '^make\[1]: \[xemacs] Error 1 $ignored$$', + '^Generating custom-load.el', + '^Generating autoloads for', + '^Computing custom-loads for', + '^No custom-loads for', + '^make\[1]: Nothing to be done for `.*\'', + '^DOC file is up to date', + '^touch NEEDTODUMP$', + '^Saving file .*/auto-autoloads.el...$', + '^Info: resolving .* by linking to .*', ); + # regexps matching warnings to be ignored by --note-warnings: # Normally, all lines with the string "warning" in them are considered # to be warnings -my ＠suppress_warnings = +my ＠suppress_warnings_core = ("/usr/(local/)?include/.*: warning: declaration of `.*' shadows global declaration", "new data size is < approx", "Compiling in support for runtime error checking", ＠＠ -218,12 +243,99 ＠＠ my ＠suppress_warnings = # Normally, all lines with the string "error" in them are considered # to be errors -my ＠suppress_errors = +my ＠suppress_errors_core = ("checking for perror", "checking for strerror", "Compiling in support for runtime error checking", ); +my %fcore; + +$fcore{"filter-replace"} = \%filter_replace_core; +$fcore{"filter"} = \＠filter_core; +$fcore{"suppress-warnings"} = \＠suppress_warnings_core; +$fcore{"suppress-errors"} = \＠suppress_errors_core; + +my %filter_replace_packages = + ('^\[ -d (xemacs-packages) \] && make( -k)? - --unix( -w?k?)? -C \1 autoloads$' + => 'BUILD: Updating autoloads... ', + '^\[ -d ([-0-9a-zA-Z_]+) \] && make( -k)? - --unix( -w?k?)? -C \1 autoloads' + => '$1 ', + '^\[ -d (xemacs-packages) \] && make( -k)? - --unix( -w?k?)? -C \1 bytecompile' + => '... Done.\n', + # We need the negative look-ahead assertion so that this rule doesn't + # match when the previous one should ... remember that hash tables are + # unordered. + '^\[ -d ((?!xemacs-packages)[-0-9a-zA-Z_]+) \] && make( -k)? - --unix( -w?k?)? -C \1 bytecompile' + => 'BUILD: Compiling in $1...\n', + ); + +my ＠filter_packages = + ('^[ \t]*$', + '^[ \t]*Loading ', + '^[ \t]*Requiring', + '^[ \t]*Compiling ', + '^[ \t]*Creating ', + # Often the "Done" appears directly before the next compile command, + # on the same line. Race condition in XEmacs, or just the result of + # stderr/stdout mixing? + '^(Done)?(.*?)/src/\.\./lib-src/i \2/src/xemacs\.exe -no-autoloads -vanilla ', + '^[ \t]*-l autoload -f batch-update-directory-custom-defines ', + '^[ \t]*-l autoload -f batch-update-directory-(autoloads|custom-defines) ', + '^[ \t]*-f Custom-make-dependencies \.$', + '^[ \t]*rm -f ', + '^[Dd]one[ \t]*$', +# '^Processing ', + '^Generating custom-load.el', + '^Generating autoloads for', + '^Updating autoloads for directory', + '^Computing custom-loads for', + '^No custom-loads for', + '^Computing custom defines for', + '^No custom defines found in', + '^No autoloads found in ', + '^Saving file .*/auto-autoloads.el...$', + 'Ignoring `eval:\' in the local variables list', + '^Wrote ', + '^Formatting: ', + '^Tagifying ', + '^(Splitting|Formatting) Info file', + '^Removing trailing whitespace from Info buffer', + '^Reading included file: ', + '^Converting \*scratch\* to Info format', + '^cd (.*) && makeinfo ', + '^cd (.*) && make -k all$', + '^$No files need saving$', + '^$No changes need to be written$', +# '^.*/src/xemacs -no-packages -batch \\\\$', + '^(Done)?make\[(1|2|3)]: (Entering|Leaving) directory ', + '^make\[(1|2|3)]: \[xemacs] Error 1 $ignored$$', + '^make\[(1|2|3)]: Nothing to be done for `.*\'', + '^make( -k)? - --unix( -w)? -C [-0-9a-zA-Z_]+ TARGET_BASE=\./ ', + '^[ \t]*pdepends.mk$', + '^\.\./iterate.rules:75: [-0-9a-zA-Z_]+/pdepends.mk: No such file or directory$', + '^make\[(1|2|3)]: Circular [-0-9a-zA-Z_/.]+ <- [-0-9a-zA-Z_/.]+ dependency dropped', + ); + +my ＠suppress_warnings_packages = + (); + +# regexps matching errors to be ignored by --note-warnings: +# Normally, all lines with the string "error" in them are considered +# to be errors + +my ＠suppress_errors_packages = + (); + +my %fpackages; + +$fpackages{"filter-replace"} = \%filter_replace_packages; +$fpackages{"filter"} = \＠filter_packages; +$fpackages{"suppress-warnings"} = \＠suppress_warnings_packages; +$fpackages{"suppress-errors"} = \＠suppress_errors_packages; + +my $filter = undef; + ###################################################################### # Main part of program # ###################################################################### ＠＠ -235,7 +347,7 ＠＠ my %options; $Getopt::Long::ignorecase = 0; &GetOptions ( \%options, - 'filter', + 'filter:s', 'append', 'note-warnings', 'output=s', ＠＠ -244,6 +356,13 ＠＠ $Getopt::Long::ignorecase = 0; die $usage if $options{"help"}; +if (defined ($options{"filter"})) { + $options{"filter"} = "core" if !$options{"filter"}; + if ($options{"filter"} eq "core") { $filter = \%fcore; } + elsif ($options{"filter"} eq "packages") { $filter = \%fpackages; } + else { die "Unrecognized filter type $options{\"filter\"}:\n$usage"; } +} + # ------------------ open full output file ------------------ if ($options{"output"}) { ＠＠ -272,33 +391,35 ＠＠ my ＠warnings = (); my ＠errors = (); while (<PROG>) { + s/\r\n/\n/; + chomp; my $line = $_; my ＠replace; if ($options{"output"}) { - print OUTPUT $line; + print OUTPUT "$line\n"; } if ($options{"filter"}) { - ＠replace = grep ($line =~m!$_!, keys %filter_replace); + ＠replace = grep ($line =~m＠$_＠, keys %{$filter->{"filter-replace"}}); if (＠replace) { - print $filter_replace{$replace[0]}; - } elsif (!grep ($line =~ m!$_!, ＠filter)) { - print $line; + eval '$line =~ s!' . $replace[0] . '!' . $filter->{"filter-replace"}->{$replace[0]} . '!'; + print "$line"; + $line = $_; + } elsif (!grep ($line =~ m＠$_＠, ＠{$filter->{"filter"}})) { + print "$line\n"; } } else { - print; - chomp; + print "$line\n"; } if ($options{"note-warnings"}) { - $line = $_; if (/warning/i) { - if (!grep ($line =~ m!$_!, ＠suppress_warnings)) { - push ＠warnings, $line; + if (!grep ($line =~ m!$_!, ＠{$filter->{"suppress-warnings"}})) { + push ＠warnings, "$line\n"; } } if (/error/i) { - push ＠errors, $_; + push ＠errors, "$line\n"; } } } 1.3 +8 -8 XEmacs/xemacs-builds/ben/scratch-wscompile Index: scratch-wscompile =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs-builds/ben/scratch-wscompile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- scratch-wscompile 2004/11/13 23:01:11 1.2 +++ scratch-wscompile 2005/10/14 00:53:44 1.3 ＠＠ -2,20 +2,20 ＠＠ # Reconfigure and build $1/ from scratch -. config-inc - dir=`generate-build-values $＠` -makeopts=`generate-build-values --mflags $＠` -echo "Building in $conf_outtop/$dir" -(cd $conf_outtop/$dir && test -f Makefile && make extraclean) +makeopts=`generate-build-values --make $＠` +echo "BEGIN BUILD:" +echo "BEGIN BUILD: Building in $dir" +echo "BEGIN BUILD:" +(cd $dir && test -f Makefile && make distclean) wsconfig $＠ -cd $conf_outtop/$dir +cd $dir if make $makeopts MAKE="make $makeopts"; then echo "SUCCESS:" -echo "SUCCESS: Done building in $conf_outtop/$dir" +echo "SUCCESS: Done building in $dir" echo "SUCCESS:" else echo "FAILURE:" -echo "FAILURE: Done building in $conf_outtop/$dir" +echo "FAILURE: Done building in $dir" echo "FAILURE:" fi 1.3 +5 -5 XEmacs/xemacs-builds/ben/wscompile Index: wscompile =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs-builds/ben/wscompile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- wscompile 2004/11/13 23:01:11 1.2 +++ wscompile 2005/10/14 00:53:44 1.3 ＠＠ -6,10 +6,10 ＠＠ # identical, and the workspace should have had `doconfig' run first on # it. -. config-inc - dir=`generate-build-values $＠` -makeopts=`generate-build-values --mflags $＠` -echo "Building in $conf_outtop/$dir" -cd "$conf_outtop/$dir" +makeopts=`generate-build-values --make $＠` +echo "CONTINUE BUILD:" +echo "CONTINUE BUILD: Building in $dir" +echo "CONTINUE BUILD:" +cd "$dir" make $makeopts MAKE="make $makeopts" 1.3 +8 -24 XEmacs/xemacs-builds/ben/wsconfig Index: wsconfig =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs-builds/ben/wsconfig,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- wsconfig 2004/11/13 23:01:11 1.2 +++ wsconfig 2005/10/14 00:53:44 1.3 ＠＠ -1,31 +1,15 ＠＠ -#!/bin/bash +#!/bin/sh # Configure a workspace -. config-inc +srcdir="`generate-build-values --srcdir $＠`" +blddir="`generate-build-values $＠`" +opts="`generate-build-values --configure $＠`" -cd $conf_outtop -srcdir=$conf_wstop/$1 -blddir=`generate-build-values $＠` -opts="`generate-build-values --opts $＠`" -cflags="`generate-build-values --cflags $＠`" +mkdir -p $blddir -[ -d ./$blddir ] || mkdir $blddir - cd $blddir -#### #### with-modules=no is temporary! -echo Running configure with options --verbose --extra-verbose \ - --with-modules=no \ - --srcdir=$srcdir --quick-build \ - --site-includes="'$conf_site_includes'" \ - --site-libraries="'$conf_site_libraries'" \ - --cflags="'$cflags'" $opts \ - --package-path="$conf_package_path" +echo "Running configure with options $opts" -$srcdir/configure --verbose --extra-verbose \ - --with-modules=no \ - --srcdir=$srcdir --quick-build \ - --site-includes="$conf_site_includes" \ - --site-libraries="$conf_site_libraries" \ - --package-path="$conf_package_path" \ - --cflags="$cflags" $opts +# --with-modules=no \ +eval $srcdir/configure $opts 1.3 +0 -2 XEmacs/xemacs-builds/ben/wsdir Index: wsdir =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs-builds/ben/wsdir,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- wsdir 2004/11/13 23:01:12 1.2 +++ wsdir 2005/10/14 00:53:44 1.3 ＠＠ -3,8 +3,6 ＠＠ # Output the build directory corresponding to a particular workspace # and build configuration -. config-inc - #### #### Not right! Needs to use the configurations in allcrazy, #### #### which should be renamed. build -> dobuild, allcrazy -> #### #### build. move the specific info in allcrazy into another 1.1 XEmacs/xemacs-builds/ben/build-packages Index: build-packages =================================================================== #!/bin/sh conf_outtop=/xemacs workspace=package-src cd "$conf_outtop/$workspace" if [ "$ws_full_out" = "" ] ; then ws_full_out="$conf_outtop/${workspace}-full.out" fi if [ "$ws_filtered_out" = "" ] ; then ws_filtered_out="$conf_outtop/${workspace}-filtered.out" fi if [ -f "$ws_full_out" ] ; then mv "$ws_full_out" "$ws_full_out"~ fi if [ -f "$ws_filtered_out" ] ; then mv "$ws_filtered_out" "$ws_filtered_out"~ fi build_full_out="$ws_full_out" build_filtered_out="$ws_filtered_out" runcc --filter=packages --output="$build_full_out" -- make -k | tee $build_filtered_out #cat $build_full_out >> $ws_full_out #cat $build_filtered_out >> $ws_filtered_out 1.1 XEmacs/xemacs-builds/ben/crw2 Index: crw2 =================================================================== #!/bin/sh exec env CVS_RSH=ssh cvs -w -z3 -d :ext:xemacs＠cvs.xemacs.org:/mnt/cvsroot/xemacscvs ${1+"$＠"} 1.1 XEmacs/xemacs-builds/ben/scratch-wscompile-packages Index: scratch-wscompile-packages =================================================================== #!/bin/bash # Reconfigure and build package dir $1/ from scratch dir=`generate-build-values $＠` makeopts=`generate-build-values --make $＠` echo "BEGIN BUILD:" echo "BEGIN BUILD: Building in $dir" echo "BEGIN BUILD:" (cd $dir && test -f Makefile && make distclean) cd $dir if make $makeopts MAKE="make $makeopts"; then echo "SUCCESS:" echo "SUCCESS: Done building in $dir" echo "SUCCESS:" else echo "FAILURE:" echo "FAILURE: Done building in $dir" echo "FAILURE:" fi

1 participants
0 comments

CVS update by viteno xemacs ... 20 years

CVS Monitor

User: viteno Date: 05/10/13 23:51:22 Modified: xemacs version.sh Log: Update xemacs_extra_name. Revision Changes Path 1.1311 +1 -1 XEmacs/xemacs/version.sh Index: version.sh =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/version.sh,v retrieving revision 1.1310 retrieving revision 1.1311 diff -u -p -r1.1310 -r1.1311 --- version.sh 2005/10/12 21:51:21 1.1310 +++ version.sh 2005/10/13 21:51:22 1.1311 ＠＠ -8,5 +8,5 ＠＠ emacs_kit_version= infodock_major_version=4 infodock_minor_version=0 infodock_build_version=8 -xemacs_extra_name="(+CVS-20051012)" +xemacs_extra_name="(+CVS-20051013)" xemacs_release_date="2005-02-18"

1 participants
0 comments

CVS update by viteno xemacs ... 20 years

CVS Monitor

User: viteno Date: 05/10/12 23:51:22 Modified: xemacs version.sh Log: Update xemacs_extra_name. Revision Changes Path 1.1310 +1 -1 XEmacs/xemacs/version.sh Index: version.sh =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/version.sh,v retrieving revision 1.1309 retrieving revision 1.1310 diff -u -p -r1.1309 -r1.1310 --- version.sh 2005/10/11 21:51:13 1.1309 +++ version.sh 2005/10/12 21:51:21 1.1310 ＠＠ -8,5 +8,5 ＠＠ emacs_kit_version= infodock_major_version=4 infodock_minor_version=0 infodock_build_version=8 -xemacs_extra_name="(+CVS-20051011)" +xemacs_extra_name="(+CVS-20051012)" xemacs_release_date="2005-02-18"

1 participants
0 comments

CVS update by viteno xemacs-builds/viteno ... 20 years

CVS Monitor

User: viteno Date: 05/10/12 10:35:13 Modified: xemacs-builds/viteno package-index setup-packages.ini Log: Package database backup: - apel-1.30 - bbdb-1.29 - gnus-1.86 - liece-1.15 - net-utils-1.48 - tramp-1.28 - xemacs-base-1.99 - xemacs-devel-1.72 Revision Changes Path 1.249 +48 -48 XEmacs/xemacs-builds/viteno/package-index Index: package-index =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs-builds/viteno/package-index,v retrieving revision 1.248 retrieving revision 1.249 diff -u -p -r1.248 -r1.249 --- package-index 2005/10/09 12:00:18 1.248 +++ package-index 2005/10/12 08:35:12 1.249 ＠＠ -646,18 +646,18 ＠＠ semantic-sas (package-get-update-base-entry (quote (liece (standards-version 1.1 - version "1.14" + version "1.15" author-version "1.4.9" - date "2005-05-10" - build-date "2005-05-10" + date "2005-10-12" + build-date "2005-10-12" maintainer "Daiki Ueno <ueno(a)unixuser.org>" distribution xemacs priority high category "standard" dump nil description "IRC (Internet Relay Chat) client for Emacs." - filename "liece-1.14-pkg.tar.gz" - md5sum "c8351a341a666ca8f0c172fd90de2d9f" + filename "liece-1.15-pkg.tar.gz" + md5sum "1c7014b1435af04a86b536eab9c9b87f" size 199310 provides (liece-xemacs gettext liece-clfns liece-handler liece-compat liece-version liece-vars liece-globals liece-inlines liece-filter liece-coding liece-dcc liece-menu liece-000 liece-200 liece-300 liece-400 liece-500 liece-nick liece-channel liece-commands liece-ctcp liece-q-el liece-message liece-handle liece-hilit liece-intl liece-mail liece-minibuf liece-misc liece-tcp liece-url liece-x-face liece-window liece) requires (apel mail-lib fsf-compat xemacs-base) ＠＠ -734,19 +734,19 ＠＠ semantic-sas (package-get-update-base-entry (quote (xemacs-base (standards-version 1.1 - version "1.98" + version "1.99" author-version "No-Upstream-Ver" - date "2005-07-24" - build-date "2005-07-24" + date "2005-10-12" + build-date "2005-10-12" maintainer "XEmacs Development Team <xemacs-beta(a)xemacs.org>" distribution xemacs priority high category "standard" dump nil description "Fundamental XEmacs support, you almost certainly need this." - filename "xemacs-base-1.98-pkg.tar.gz" - md5sum "219317e7f6d3bd4c2525feff2d0361f8" - size 513346 + filename "xemacs-base-1.99-pkg.tar.gz" + md5sum "81071fe657e122bbf657de2ca6baac38" + size 513421 provides (add-log advice-preload advice annotations assoc case-table chistory comint-xemacs comint compile debug ebuff-menu echistory edmacro ehelp electric enriched env facemenu ffap helper imenu iso-syntax macros novice outline passwd pp regexp-opt regi ring shell skeleton sort thing time-stamp timezone tq xbm-button xpm-button) requires () type regular ＠＠ -756,22 +756,22 ＠＠ semantic-sas (package-get-update-base-entry (quote (tramp (standards-version 1.1 - version "1.27" + version "1.28" author-version "2.0.51" - date "2005-10-09" - build-date "2005-10-09" + date "2005-10-12" + build-date "2005-10-12" maintainer "Kai Großjohann <kai.grossjohann(a)gmx.net>" distribution xemacs priority low category "standard" dump nil description "Remote shell-based file editing." - filename "tramp-1.27-pkg.tar.gz" - md5sum "494ee44ed5f7d38cfe05c218d5ab9536" - size 291354 + filename "tramp-1.28-pkg.tar.gz" + md5sum "5ac2f914804150d00cba64c717182c59" + size 291435 provides (tramp tramp-efs tramp-ftp tramp-smb tramp-util tramp-uu tramp-vc trampcache) - requires (tramp xemacs-base vc fsf-compat efs dired mail-lib gnus ediff) + requires (tramp xemacs-base vc efs dired mail-lib gnus ediff sh-script) type regular )) )) ＠＠ -2275,19 +2275,19 ＠＠ semantic-sas (package-get-update-base-entry (quote (bbdb (standards-version 1.1 - version "1.28" + version "1.29" author-version "2.34" - date "2005-07-27" - build-date "2005-07-27" + date "2005-10-12" + build-date "2005-10-12" maintainer "Ronan Waide <waider(a)waider.ie>" distribution xemacs priority medium category "standard" dump nil description "The Big Brother Data Base" - filename "bbdb-1.28-pkg.tar.gz" - md5sum "ba21bcbe57356aad29c695d2fe84facd" - size 379937 + filename "bbdb-1.29-pkg.tar.gz" + md5sum "c8314f305d41335ac91bf5a2ff10d635" + size 379982 provides (bbdb-com bbdb-ftp bbdb-gnus bbdb-gui bbdb-hooks bbdb-merge bbdb-mhe bbdb-migrate bbdb-print bbdb-reportmail bbdb-rmail bbdb-sc bbdb-snarf bbdb-srv bbdb-vm bbdb-w3 bbdb-whois bbdb-xemacs bbdb) requires (bbdb edit-utils gnus mh-e rmail supercite vm tm apel mail-lib xemacs-base w3 fsf-compat eterm sh-script net-utils os-utils ecrypto) type regular ＠＠ -2363,19 +2363,19 ＠＠ semantic-sas (package-get-update-base-entry (quote (gnus (standards-version 1.1 - version "1.85" + version "1.86" author-version "5.10.7" - date "2005-04-03" - build-date "2005-04-03" + date "2005-10-12" + build-date "2005-10-12" maintainer "Steve Youngs <steve(a)youngs.au.com>" distribution xemacs priority medium category "standard" dump nil description "The Gnus Newsreader and Mailreader." - filename "gnus-1.85-pkg.tar.gz" - md5sum "73c52306ef5a7a631d4f2b3f7251598c" - size 3392261 + filename "gnus-1.86-pkg.tar.gz" + md5sum "b4bcc03487fd45a55589385e8536e618" + size 3390583 provides (binhex canlock compface deuglify earcon flow-fill format-spec gnus-agent gnus-art gnus-async gnus-audio gnus-bcklg gnus-cache gnus-cite gnus-cus gnus-delay gnus-demon gnus-diary gnus-dired gnus-draft gnus-dup gnus-eform gnus-ems gnus-fun gnus-gl gnus-group gnus-int gnus-kill gnus-logic gnus-mh gnus-ml gnus-mlspl gnus-move gnus-msg gnus-nocem gnus-picon gnus-range gnus-registry gnus-salt gnus-score gnus-setup gnus-sieve gnus-soup gnus-spec gnus-srvr gnus-start gnus-sum gnus-topic gnus-undo gnus-util gnus-uu gnus-vm gnus-win gnus-xmas gnus ietf-drums imap mail-parse mail-prsvr mail-source mailcap message messagexmas messcompat mm-bodies mm-decode mm-encode mm-extern mm-partial mm-url mm-util mm-uu mm-view mml-sec mml-smime mml mml1991 mml2015 nnagent nnbabyl nndb nndiary nndir nndoc nndraft nneething nnfolder nngateway nnheader nnheaderxm nnimap nnkiboze nnlistserv nnmail nnmaildir nnmbox nnmh nnml nnnil nnoo nnrss nnslashdot nnsoup nnspool nntp nnultimate nnvi! rtual nnwarchive nnweb nnwfm parse-time qp rfc1843 rfc2045 rfc2047 rfc2231 score-mode smiley smime spam-report spam-stat spam time-date utf7 uudecode webmail yenc gnus-idna gpg-ring gpg hashcash vcard) requires (gnus mail-lib xemacs-base eterm sh-script net-utils os-utils dired mh-e sieve ps-print w3 pgg mailcrypt ecrypto sasl) type regular ＠＠ -2539,19 +2539,19 ＠＠ semantic-sas (package-get-update-base-entry (quote (net-utils (standards-version 1.1 - version "1.47" + version "1.48" author-version "N/A" - date "2005-10-06" - build-date "2005-10-06" + date "2005-10-12" + build-date "2005-10-12" maintainer "Steve Youngs <steve(a)youngs.au.com>" distribution xemacs priority low category "standard" dump nil description "Miscellaneous Networking Utilities." - filename "net-utils-1.47-pkg.tar.gz" - md5sum "4f8083dde740785750fa76e754afbfa1" - size 155082 + filename "net-utils-1.48-pkg.tar.gz" + md5sum "09cd58b37a72e17ff53c05ba1e67cf2f" + size 155120 provides (ilisp-browse-cltl2 xemacsbug feedmail metamail net-utils rcompile shadowfile webjump webster-www dig dns dns-mode xml google-query mozmail) ＠＠ -2651,19 +2651,19 ＠＠ semantic-sas (package-get-update-base-entry (quote (xemacs-devel (standards-version 1.1 - version "1.71" + version "1.72" author-version "No-Upstream-Ver" - date "2005-07-27" - build-date "2005-07-27" + date "2005-10-12" + build-date "2005-10-12" maintainer "XEmacs Development Team <xemacs-beta(a)xemacs.org>" distribution xemacs priority medium category "standard" dump nil description "Emacs Lisp developer support." - filename "xemacs-devel-1.71-pkg.tar.gz" - md5sum "d1890d996032420ea3391129f9401b5b" - size 243272 + filename "xemacs-devel-1.72-pkg.tar.gz" + md5sum "b11f75c8ab895518f9324c668cb5fd84" + size 243274 provides (checkdoc docref eldoc elp eval-expr find-func hide-copyleft ielm patcher pp trace patch-keywords) requires (xemacs-base ispell mail-lib gnus rmail tm apel sh-script net-utils eterm ecrypto) type single ＠＠ -2761,19 +2761,19 ＠＠ semantic-sas (package-get-update-base-entry (quote (apel (standards-version 1.1 - version "1.29" + version "1.30" author-version "10.2" - date "2005-06-27" - build-date "2005-06-27" + date "2005-10-12" + build-date "2005-10-12" maintainer "XEmacs Development Team <xemacs-beta(a)xemacs.org>" distribution xemacs priority high category "standard" dump nil description "A Portable Emacs Library. Used by XEmacs MIME support." - filename "apel-1.29-pkg.tar.gz" - md5sum "937021987555afb56e2891aaa8f72e32" - size 108638 + filename "apel-1.30-pkg.tar.gz" + md5sum "f18448c5477977434964d018b1d9313d" + size 108644 provides (atype emu-20 emu-e19 emu-x20 emu-xemacs emu file-detect filename install mule-caesar path-util richtext std11-parse std11 tinyrich) requires (fsf-compat xemacs-base) type regular 1.237 +16 -16 XEmacs/xemacs-builds/viteno/setup-packages.ini Index: setup-packages.ini =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs-builds/viteno/setup-packages.ini,v retrieving revision 1.236 retrieving revision 1.237 diff -u -p -r1.236 -r1.237 --- setup-packages.ini 2005/10/09 12:00:18 1.236 +++ setup-packages.ini 2005/10/12 08:35:13 1.237 ＠＠ -12,8 +12,8 ＠＠ version: 1.33 install: packages/efs-1.33-pkg.tar.gz 375842 ＠ apel -version: 1.29 -install: packages/apel-1.29-pkg.tar.gz 108638 +version: 1.30 +install: packages/apel-1.30-pkg.tar.gz 108644 ＠ Sun version: 1.16 ＠＠ -32,8 +32,8 ＠＠ version: 1.15 install: packages/tooltalk-1.15-pkg.tar.gz 9749 ＠ xemacs-devel -version: 1.71 -install: packages/xemacs-devel-1.71-pkg.tar.gz 243272 +version: 1.72 +install: packages/xemacs-devel-1.72-pkg.tar.gz 243274 ＠ sounds-au version: 1.12 ＠＠ -52,8 +52,8 ＠＠ version: 1.31 install: packages/w3-1.31-pkg.tar.gz 694094 ＠ net-utils -version: 1.47 -install: packages/net-utils-1.47-pkg.tar.gz 155082 +version: 1.48 +install: packages/net-utils-1.48-pkg.tar.gz 155120 ＠ eudc version: 1.39 ＠＠ -84,8 +84,8 ＠＠ version: 1.14 install: packages/rmail-1.14-pkg.tar.gz 96995 ＠ gnus -version: 1.85 -install: packages/gnus-1.85-pkg.tar.gz 3392261 +version: 1.86 +install: packages/gnus-1.86-pkg.tar.gz 3390583 ＠ tm version: 1.38 ＠＠ -100,8 +100,8 ＠＠ version: 1.16 install: packages/zenirc-1.16-pkg.tar.gz 277377 ＠ bbdb -version: 1.28 -install: packages/bbdb-1.28-pkg.tar.gz 379937 +version: 1.29 +install: packages/bbdb-1.29-pkg.tar.gz 379982 ＠ cookie version: 1.15 ＠＠ -344,12 +344,12 ＠＠ version: 1.89 install: packages/text-modes-1.89-pkg.tar.gz 440448 ＠ tramp -version: 1.27 -install: packages/tramp-1.27-pkg.tar.gz 291354 +version: 1.28 +install: packages/tramp-1.28-pkg.tar.gz 291435 ＠ xemacs-base -version: 1.98 -install: packages/xemacs-base-1.98-pkg.tar.gz 513346 +version: 1.99 +install: packages/xemacs-base-1.99-pkg.tar.gz 513421 ＠ ibuffer version: 1.09 ＠＠ -360,8 +360,8 ＠＠ version: 1.02 install: packages/mmm-mode-1.02-pkg.tar.gz 176072 ＠ liece -version: 1.14 -install: packages/liece-1.14-pkg.tar.gz 199310 +version: 1.15 +install: packages/liece-1.15-pkg.tar.gz 199310 ＠ xslide version: 1.09

1 participants
0 comments

CVS update by viteno packages/xemacs-packages/xemacs-devel ... 20 years

CVS Monitor

User: viteno Date: 05/10/12 10:14:49 Modified: packages/xemacs-packages/xemacs-devel ChangeLog Makefile Log: Increment VERSION in Makefile Revision Changes Path 1.103 +4 -0 XEmacs/packages/xemacs-packages/xemacs-devel/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xemacs-devel/ChangeLog,v retrieving revision 1.102 retrieving revision 1.103 diff -u -p -r1.102 -r1.103 --- ChangeLog 2005/07/27 06:08:22 1.102 +++ ChangeLog 2005/10/12 08:14:49 1.103 ＠＠ -1,3 +1,7 ＠＠ +2005-10-12 Norbert Koch <viteno(a)xemacs.org> + + * Makefile (VERSION): XEmacs package 1.72 released. + 2005-07-27 Norbert Koch <viteno(a)xemacs.org> * Makefile (VERSION): XEmacs package 1.71 released. 1.84 +1 -1 XEmacs/packages/xemacs-packages/xemacs-devel/Makefile Index: Makefile =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xemacs-devel/Makefile,v retrieving revision 1.83 retrieving revision 1.84 diff -u -p -r1.83 -r1.84 --- Makefile 2005/07/27 06:08:22 1.83 +++ Makefile 2005/10/12 08:14:49 1.84 ＠＠ -19,7 +19,7 ＠＠ # This XEmacs package contains independent single file lisp packages -VERSION = 1.71 +VERSION = 1.72 AUTHOR_VERSION = MAINTAINER = XEmacs Development Team <xemacs-beta(a)xemacs.org> PACKAGE = xemacs-devel

1 participants
0 comments

CVS update by viteno packages/xemacs-packages/xemacs-base ... 20 years

CVS Monitor

User: viteno Date: 05/10/12 10:14:20 Modified: packages/xemacs-packages/xemacs-base ChangeLog Makefile Log: Increment VERSION in Makefile Revision Changes Path 1.171 +4 -0 XEmacs/packages/xemacs-packages/xemacs-base/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xemacs-base/ChangeLog,v retrieving revision 1.170 retrieving revision 1.171 diff -u -p -r1.170 -r1.171 --- ChangeLog 2005/10/11 11:21:41 1.170 +++ ChangeLog 2005/10/12 08:14:19 1.171 ＠＠ -1,3 +1,7 ＠＠ +2005-10-12 Norbert Koch <viteno(a)xemacs.org> + + * Makefile (VERSION): XEmacs package 1.99 released. + 2005-10-11 Steve Youngs <steve(a)sxemacs.org> * timer-funcs.el (with-timeout): Use `unwind-protect' to ensure 1.103 +1 -1 XEmacs/packages/xemacs-packages/xemacs-base/Makefile Index: Makefile =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xemacs-base/Makefile,v retrieving revision 1.102 retrieving revision 1.103 diff -u -p -r1.102 -r1.103 --- Makefile 2005/07/24 09:03:06 1.102 +++ Makefile 2005/10/12 08:14:19 1.103 ＠＠ -17,7 +17,7 ＠＠ # the Free Software Foundation, Inc., 59 Temple Place - Suite 330, # Boston, MA 02111-1307, USA. -VERSION = 1.98 +VERSION = 1.99 AUTHOR_VERSION = MAINTAINER = XEmacs Development Team <xemacs-beta(a)xemacs.org> PACKAGE = xemacs-base

1 participants
0 comments

CVS update by viteno packages/xemacs-packages/tramp ... 20 years

CVS Monitor

User: viteno Date: 05/10/12 10:13:38 Modified: packages/xemacs-packages/tramp ChangeLog Makefile Log: Increment VERSION in Makefile Revision Changes Path 1.55 +4 -0 XEmacs/packages/xemacs-packages/tramp/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/tramp/ChangeLog,v retrieving revision 1.54 retrieving revision 1.55 diff -u -p -r1.54 -r1.55 --- ChangeLog 2005/10/11 12:42:12 1.54 +++ ChangeLog 2005/10/12 08:13:38 1.55 ＠＠ -1,3 +1,7 ＠＠ +2005-10-12 Norbert Koch <viteno(a)xemacs.org> + + * Makefile (VERSION): XEmacs package 1.28 released. + 2005-10-11 Steve Youngs <steve(a)sxemacs.org> * Makefile (REQUIRES): Remove fsf-compat, add sh-script (for 1.55 +1 -1 XEmacs/packages/xemacs-packages/tramp/Makefile Index: Makefile =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/tramp/Makefile,v retrieving revision 1.54 retrieving revision 1.55 diff -u -p -r1.54 -r1.55 --- Makefile 2005/10/11 12:42:13 1.54 +++ Makefile 2005/10/12 08:13:38 1.55 ＠＠ -17,7 +17,7 ＠＠ # the Free Software Foundation, Inc., 59 Temple Place - Suite 330, # Boston, MA 02111-1307, USA. -VERSION = 1.27 +VERSION = 1.28 AUTHOR_VERSION = 2.0.51 MAINTAINER = Kai Großjohann <kai.grossjohann(a)gmx.net> PACKAGE = tramp

1 participants
0 comments

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

xemacs-cvs October 2005