CVS update by ben xemacs/modules/common ...
19 years, 2 months
CVS Monitor
CVS Monitor
User: ben
Date: 05/11/13 11:39:42
Modified: xemacs/modules/common Makefile.common
Log:
fix up clean targets to delete .elc's as necessary
dynodump/Makefile.in.in: Add targets distclean-noconfig, realclean-noconfig, extraclean-noconfig.
Do some refactoring for cleanliness.
Makefile.in.in: Add targets distclean-noconfig, realclean-noconfig, extraclean-noconfig.
*-noconfig targets are like the base targets they're based off of, but
don't delete Makefiles and certain other files needed to rebuild the
Makefiles as necessary. Refactor things to be more consistent.
Top-level `elcclean' is an alias for `realclean-noconfig' and is used
by target `beta'. `realclean-noconfig' (and, by extension, `realclean'
and `extraclean') remove the .elc files.
Makefile.in.in: Add targets distclean-noconfig, realclean-noconfig, extraclean-noconfig.
Do some refactoring for cleanliness.
Makefile.in.in: Add targets distclean-noconfig, realclean-noconfig, extraclean-noconfig.
Do some refactoring for cleanliness.
Makefile.in.in: Add targets distclean-noconfig, realclean-noconfig, extraclean-noconfig.
Do some refactoring for cleanliness.
Makefile.in.in: Add targets distclean-noconfig, realclean-noconfig, extraclean-noconfig.
Do some refactoring for cleanliness.
Makefile: Add targets distclean-noconfig, realclean-noconfig, extraclean-noconfig.
Do some refactoring for cleanliness.
common/Makefile.common: Add targets distclean-noconfig, realclean-noconfig, extraclean-noconfig.
Do some refactoring for cleanliness. Put in some magic cookies in
comments so this file gets read as a make file by XEmacs.
Revision Changes Path
1.50 +9 -0 XEmacs/xemacs/modules/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/modules/ChangeLog,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- ChangeLog 2005/11/02 03:33:10 1.49
+++ ChangeLog 2005/11/13 10:39:28 1.50
＠＠ -1,3 +1,12 ＠＠
+2005-11-13 Ben Wing <ben(a)xemacs.org>
+
+ * common/Makefile.common:
+ * common/Makefile.common (.PHONY):
+ * common/Makefile.common (install):
+ Add targets distclean-noconfig, realclean-noconfig, extraclean-noconfig.
+ Do some refactoring for cleanliness. Put in some magic cookies in
+ comments so this file gets read as a make file by XEmacs.
+
2005-11-02 Marcus Crestani <crestani(a)xemacs.org>
* canna/.cvsignore: New.
1.322 +6 -0 XEmacs/xemacs/man/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/man/ChangeLog,v
retrieving revision 1.321
retrieving revision 1.322
diff -u -p -r1.321 -r1.322
--- ChangeLog 2005/11/13 07:29:31 1.321
+++ ChangeLog 2005/11/13 10:39:29 1.322
＠＠ -1,5 +1,11 ＠＠
2005-11-13 Ben Wing <ben(a)xemacs.org>
+ * Makefile:
+ Add targets distclean-noconfig, realclean-noconfig, extraclean-noconfig.
+ Do some refactoring for cleanliness.
+
+2005-11-13 Ben Wing <ben(a)xemacs.org>
+
* internals/internals.texi (Top):
* internals/internals.texi (CVS Techniques):
* internals/internals.texi (Creating a Branch):
1.35 +8 -2 XEmacs/xemacs/man/Makefile
Index: Makefile
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/man/Makefile,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- Makefile 2005/01/31 20:08:47 1.34
+++ Makefile 2005/11/13 10:39:30 1.35
＠＠ -1,6 +1,7 ＠＠
# Makefile for man subdirectory in XEmacs
# Copyright (C) 1995 Board of Trustees, University of Illinois
# Copyright (C) 1994, 1995 Sun Microsystems.
+# Copyright (C) 2005 Ben Wing.
# This file is part of XEmacs.
＠＠ -335,14 +336,19 ＠＠ new-users-guide.pdf: $(new-users-guide-s
pdf: $(pdf_files)
.PHONY: mostlyclean clean distclean realclean extraclean
+.PHONY: distclean-noconfig realclean-noconfig extraclean-noconfig
mostlyclean:
$(RM) *.toc *.aux *.log *.op *.cp *.cps *.fn *.fns
$(RM) *.ky *.kys *.pg *.pgs *.tp *.tps *.vr *.vrs
clean: mostlyclean
$(RM) core *.dvi *.pdf
-distclean: clean
+distclean-noconfig: clean
+distclean: distclean-noconfig
+realclean-noconfig: distclean-noconfig
realclean: distclean
-extraclean: distclean
+extraclean-noconfig: realclean-noconfig
+ $(RM) *~ \#* */*~ */\#*
+extraclean: realclean
$(RM) *~ \#* */*~ */\#*
############################################################################
1.39 +6 -0 XEmacs/xemacs/netinstall/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/netinstall/ChangeLog,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- ChangeLog 2005/11/07 08:49:24 1.38
+++ ChangeLog 2005/11/13 10:39:31 1.39
＠＠ -1,3 +1,9 ＠＠
+2005-11-13 Ben Wing <ben(a)xemacs.org>
+
+ * Makefile.in.in:
+ Add targets distclean-noconfig, realclean-noconfig, extraclean-noconfig.
+ Do some refactoring for cleanliness.
+
2005-11-06 Stephen J. Turnbull <stephen(a)xemacs.org>
* ChangeLog: Nuke useless CVS keyword.
1.6 +14 -9 XEmacs/xemacs/netinstall/Makefile.in.in
Index: Makefile.in.in
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/netinstall/Makefile.in.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- Makefile.in.in 2001/12/20 05:49:40 1.5
+++ Makefile.in.in 2005/11/13 10:39:31 1.6
＠＠ -1,4 +1,5 ＠＠
## Copyright (c) 2000, Red Hat, Inc.
+## Copyright (C) 2005 Ben Wing.
##
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
＠＠ -199,18 +200,22 ＠＠ inilex.c : inilex.l iniparse.h
mv lex.yy.c inilex.c
.PHONY: mostlyclean clean distclean realclean extraclean
-
+.PHONY: distclean-noconfig realclean-noconfig extraclean-noconfig
mostlyclean:
- $(RM) *.o *.i *.ini core $(PROGS)
-
+ $(RM) *.o *.i *.ini core
clean: mostlyclean
-
-distclean: clean
- $(RM) GNUmakefile Makefile Makefile.in TAGS
-
+ $(RM) $(PROGS)
+distclean-noconfig: clean
+ $(RM) TAGS
+## This is used in making a distribution.
+## Do not use it on development directories!
+distclean: distclean-noconfig
+ $(RM) GNUmakefile Makefile Makefile.in
+realclean-noconfig: distclean-noconfig
realclean: distclean
-
-extraclean: distclean
+extraclean-noconfig: realclean-noconfig
+ $(RM) *~ \#*
+extraclean: realclean
$(RM) *~ \#*
choose.o: choose.cc win32.h dialog.h resource.h state.h ini.h concat.h \
1.198 +6 -0 XEmacs/xemacs/lib-src/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lib-src/ChangeLog,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -p -r1.197 -r1.198
--- ChangeLog 2005/10/26 15:13:33 1.197
+++ ChangeLog 2005/11/13 10:39:32 1.198
＠＠ -1,3 +1,9 ＠＠
+2005-11-13 Ben Wing <ben(a)xemacs.org>
+
+ * Makefile.in.in:
+ Add targets distclean-noconfig, realclean-noconfig, extraclean-noconfig.
+ Do some refactoring for cleanliness.
+
2005-10-26 Stephen J. Turnbull <stephen(a)xemacs.org>
* XEmacs 21.5.23 "daikon" is released.
1.48 +12 -4 XEmacs/xemacs/lib-src/Makefile.in.in
Index: Makefile.in.in
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lib-src/Makefile.in.in,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- Makefile.in.in 2005/04/08 23:10:36 1.47
+++ Makefile.in.in 2005/11/13 10:39:32 1.48
＠＠ -1,6 +1,7 ＠＠
## Makefile for lib-src subdirectory in XEmacs.
## Copyright (C) 1985, 1987, 1988, 1993, 1994 Free Software Foundation, Inc.
## Copyright (C) 1996, 1997 Sun Microsystems, Inc.
+## Copyright (C) 2005 Ben Wing.
## This file is part of XEmacs.
＠＠ -270,15 +271,22 ＠＠ uninstall:
cd ${archlibdir} && $(RM) ${PRIVATE_INSTALLABLES}
.PHONY: mostlyclean clean distclean realclean extraclean
+.PHONY: distclean-noconfig realclean-noconfig extraclean-noconfig
mostlyclean:
$(RM) *.o *.i core
clean: mostlyclean
$(RM) ${EXES} *.exe
-distclean: clean
- $(RM) DOC *.tab.c *.tab.h TAGS ellcc.h
- $(RM) GNUmakefile Makefile Makefile.in blessmail config.values
+distclean-noconfig: clean
+ $(RM) DOC *.tab.c *.tab.h TAGS ellcc.h blessmail config.values
+## This is used in making a distribution.
+## Do not use it on development directories!
+distclean: distclean-noconfig
+ $(RM) GNUmakefile Makefile Makefile.in
+realclean-noconfig: distclean-noconfig
realclean: distclean
-extraclean: distclean
+extraclean-noconfig: realclean-noconfig
+ $(RM) *~ \#*
+extraclean: realclean
$(RM) *~ \#*
## Test the contents of the directory.
1.73 +7 -0 XEmacs/xemacs/lwlib/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lwlib/ChangeLog,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- ChangeLog 2005/11/10 15:47:33 1.72
+++ ChangeLog 2005/11/13 10:39:34 1.73
＠＠ -1,3 +1,10 ＠＠
+2005-11-13 Ben Wing <ben(a)xemacs.org>
+
+ * Makefile.in.in:
+ Add targets distclean-noconfig, realclean-noconfig, extraclean-noconfig.
+ Do some refactoring for cleanliness.
+
+
2005-11-08 Marcus Crestani <crestani(a)xemacs.org>
* xlwgauge.c (GaugeInit):
1.19 +12 -3 XEmacs/xemacs/lwlib/Makefile.in.in
Index: Makefile.in.in
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lwlib/Makefile.in.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- Makefile.in.in 2004/09/20 19:19:16 1.18
+++ Makefile.in.in 2005/11/13 10:39:34 1.19
＠＠ -3,6 +3,7 ＠＠
## Copyright (C) 1995 Tinker Systems and INS Engineering Corp.
## Copyright (C) 1994, 1995 Board of Trustees, University of Illinois
## Copyright (C) 1996, 1997 Sun Microsystems, Inc.
+## Copyright (C) 2005 Ben Wing.
## This file is part of the Lucid Widget Library.
＠＠ -82,13 +83,21 ＠＠ liblw.a: $(objs)
＠-test -n "$(RANLIB)" && $(RANLIB) $＠
.PHONY: mostlyclean clean distclean realclean extraclean
+.PHONY: distclean-noconfig realclean-noconfig extraclean-noconfig
mostlyclean:
$(RM) liblw.a liblw_pure_*.a *.o *.i core
clean: mostlyclean
-distclean: clean
- $(RM) GNUmakefile Makefile Makefile.in config.h TAGS
+distclean-noconfig: clean
+ $(RM) config.h TAGS
+## This is used in making a distribution.
+## Do not use it on development directories!
+distclean: distclean-noconfig
+ $(RM) GNUmakefile Makefile Makefile.in
+realclean-noconfig: distclean-noconfig
realclean: distclean
-extraclean: distclean
+extraclean-noconfig: realclean-noconfig
+ $(RM) *~ \#*
+extraclean: realclean
$(RM) *~ \#*
CONFIG_H = ../src/config.h config.h
1.883 +6 -0 XEmacs/xemacs/src/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.882
retrieving revision 1.883
diff -u -p -r1.882 -r1.883
--- ChangeLog 2005/11/07 08:49:25 1.882
+++ ChangeLog 2005/11/13 10:39:35 1.883
＠＠ -1,3 +1,9 ＠＠
+2005-11-13 Ben Wing <ben(a)xemacs.org>
+
+ * Makefile.in.in (distclean-noconfig):
+ Add targets distclean-noconfig, realclean-noconfig, extraclean-noconfig.
+ Do some refactoring for cleanliness.
+
2005-11-07 Stephen J. Turnbull <stephen(a)xemacs.org>
* inline.c: Include modules headers regardless of HAVE_SHLIB.
1.120 +11 -4 XEmacs/xemacs/src/Makefile.in.in
Index: Makefile.in.in
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/Makefile.in.in,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -p -r1.119 -r1.120
--- Makefile.in.in 2005/10/21 15:48:42 1.119
+++ Makefile.in.in 2005/11/13 10:39:36 1.120
＠＠ -3,7 +3,7 ＠＠
## Copyright (C) 1994, 1995 Board of Trustees, University of Illinois
## Copyright (C) 1996, 1997 Sun Microsystems, Inc.
## Copyright (C) 1998, 1999 J. Kean Johnston.
-## Copyright (C) 2001, 2002, 2003 Ben Wing.
+## Copyright (C) 2001, 2002, 2003, 2005 Ben Wing.
## This file is part of XEmacs.
＠＠ -1005,6 +1005,7 ＠＠ covmacs: $(temacs_deps)
###################### Clean
.PHONY: mostlyclean clean distclean realclean versionclean extraclean
+.PHONY: distclean-noconfig realclean-noconfig extraclean-noconfig
mostlyclean:
$(RM) *.o *.i *.rtl *.ln core \
temacs puremacs quantmacs covmacs rtcmacs temacs.exe \
＠＠ -1020,11 +1021,17 ＠＠ clean: mostlyclean versionclean
$(SRCMODULES)/auto-autoloads.el* $(SRCMODULES)/custom-load.el*
## This is used in making a distribution.
## Do not use it on development directories!
-distclean: clean
+distclean-noconfig: clean
$(RM) config.h paths.h Emacs.ad.h $(LISP)/finder-inf.el* \
- GNUmakefile Makefile Makefile.in TAGS $(DUMP_TARGET) $(RAW_EXE) \
- xemacs.def xemacs.def.in
+ TAGS xemacs.def xemacs.def.in
+## This is used in making a distribution.
+## Do not use it on development directories!
+distclean: distclean-noconfig
+ $(RM) GNUmakefile Makefile Makefile.in
+realclean-noconfig: distclean-noconfig
realclean: distclean
+extraclean-noconfig: realclean-noconfig
+ $(RM) *~ \#* m/*~ m/\#* s/*~ s/\#*
extraclean: realclean
$(RM) *~ \#* m/*~ m/\#* s/*~ s/\#*
1.468 +27 -0 XEmacs/xemacs/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/ChangeLog,v
retrieving revision 1.467
retrieving revision 1.468
diff -u -p -r1.467 -r1.468
--- ChangeLog 2005/11/13 07:31:55 1.467
+++ ChangeLog 2005/11/13 10:39:39 1.468
＠＠ -1,5 +1,32 ＠＠
2005-11-13 Ben Wing <ben(a)xemacs.org>
+ * dynodump/Makefile.in.in:
+ * dynodump/Makefile.in.in (.PHONY):
+ Add targets distclean-noconfig, realclean-noconfig, extraclean-noconfig.
+ Do some refactoring for cleanliness.
+
+2005-11-13 Ben Wing <ben(a)xemacs.org>
+
+ * Makefile.in.in:
+ * Makefile.in.in (beta):
+ * Makefile.in.in (FRC.mostlyclean FRC.clean FRC.distclean FRC.realclean FRC.extraclean FRC.tags):
+ * Makefile.in.in (.PHONY):
+ * Makefile.in.in (top-mostlyclean):
+ * Makefile.in.in (mostlyclean):
+ * Makefile.in.in (top-clean):
+ * Makefile.in.in (clean):
+ * Makefile.in.in (distclean):
+ * Makefile.in.in (realclean):
+ Add targets distclean-noconfig, realclean-noconfig, extraclean-noconfig.
+ *-noconfig targets are like the base targets they're based off of, but
+ don't delete Makefiles and certain other files needed to rebuild the
+ Makefiles as necessary. Refactor things to be more consistent.
+ Top-level `elcclean' is an alias for `realclean-noconfig' and is used
+ by target `beta'. `realclean-noconfig' (and, by extension, `realclean'
+ and `extraclean') remove the .elc files.
+
+2005-11-13 Ben Wing <ben(a)xemacs.org>
+
* configure.ac (win32 native sound):
Dependent on operating system, not on window system.
1.27 +58 -24 XEmacs/xemacs/Makefile.in.in
Index: Makefile.in.in
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/Makefile.in.in,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- Makefile.in.in 2005/10/04 17:51:13 1.26
+++ Makefile.in.in 2005/11/13 10:39:39 1.27
＠＠ -1,4 +1,4 ＠＠
-## Copyright (C) 2003 Ben Wing.
+## Copyright (C) 2003, 2005 Ben Wing.
## DIST: This is the distribution Makefile for XEmacs. configure can
## DIST: make most of the changes to this file you might want, so try
＠＠ -217,9 +217,9 ＠＠ INSTALL_DATA = ＠INSTALL_DATA＠
## ============================= Targets ==============================
-## Subdirectories to make recursively. `lisp' is not included
-## because the compiled lisp files are part of the distribution
-## and you cannot remake them without installing XEmacs first.
+## Subdirectories to make recursively. `lisp' is not included currently;
+## rebuilding the compiled lisp files is done in the `src' make and requires
+## building XEmacs first.
MAKE_SUBDIR = ＠MAKE_SUBDIR＠
## Subdirectories that can be made recursively.
＠＠ -252,7 +252,7 ＠＠ all: Makefile ${GENERATED_HEADERS} ${MAK
.PHONY: ${SUBDIR} all beta
## Convenience target for XEmacs beta testers
-beta: clean all
+beta: elcclean all
## Convenience target for XEmacs maintainers
## This would run `make-xemacsdist' if I were really confident that everything
＠＠ -515,21 +515,27 ＠＠ mkdir: FRC.mkdir
## Some makes seem to remember that they've built something called FRC,
## so you can only use a given FRC once per makefile.
FRC FRC.src.paths.h FRC.mkdir FRC.dump-elcs FRC.info:
-FRC.mostlyclean FRC.clean FRC.distclean FRC.realclean FRC.tags:
+FRC.mostlyclean FRC.clean FRC.distclean FRC.realclean FRC.extraclean FRC.tags:
+FRC.distclean-noconfig FRC.realclean-noconfig FRC.extraclean-noconfig:
## ==================== Cleaning up and miscellanea ====================
-.PHONY: mostlyclean clean distclean realclean extraclean
+.PHONY: mostlyclean clean distclean realclean extraclean elcclean
+.PHONY: distclean-noconfig realclean-noconfig extraclean-noconfig
+.PHONY: top-mostlyclean top-clean top-distclean top-realclean top-extraclean
+.PHONY: top-distclean-noconfig top-realclean-noconfig top-extraclean-noconfig
## `mostlyclean'
## Like `clean', but may refrain from deleting a few files that people
## normally don't want to recompile. For example, the `mostlyclean'
## target for GCC does not delete `libgcc.a', because recompiling it
## is rarely necessary and takes a lot of time.
-mostlyclean: FRC.mostlyclean
- for d in $(SUBDIR); do (cd ./$$d && $(MAKE) $(RECURSIVE_MAKE_ARGS) $＠); done
+top-mostlyclean: FRC.mostlyclean
$(RM) core
+mostlyclean: top-mostlyclean
+ for d in $(SUBDIR); do (cd ./$$d && $(MAKE) $(RECURSIVE_MAKE_ARGS) $＠); done
+
## `clean'
## Delete all files from the current directory that are normally
## created by building the program. Don't delete the files that
＠＠ -542,28 +548,50 ＠＠ mostlyclean: FRC.mostlyclean
## Remove the generated load files here; they cause lots of problems
## when they don't work right. (beta can't depend on distclean, which
## removes necessary files generated by configure.)
-clean: FRC.clean
- for d in $(SUBDIR); do (cd ./$$d && $(MAKE) $(RECURSIVE_MAKE_ARGS) $＠); done
+top-clean: FRC.clean
$(RM) core lisp/auto-autoloads.el* lisp/custom-load.el*
$(RM) lisp/mule/auto-autoloads.el* lisp/mule/custom-load.el*
$(RM) modules/auto-autoloads.el* modules/custom-load.el*
+clean: top-mostlyclean top-clean
+ for d in $(SUBDIR); do (cd ./$$d && $(MAKE) $(RECURSIVE_MAKE_ARGS) $＠); done
+
+## `distclean-noconfig'
+## Like `distclean' but don't delete files created by `configure'.
+top-distclean-noconfig: FRC.distclean-noconfig
+ $(RM) TAGS .sbinit lock/* lisp/finder-inf.el*
+ $(RM) -r site-packages xemacs-packages mule-packages site-lisp
+
+distclean-noconfig: top-mostlyclean top-clean top-distclean-noconfig
+ for d in $(SUBDIR); do (cd ./$$d && $(MAKE) $(RECURSIVE_MAKE_ARGS) $＠); done
+
## `distclean'
## Delete all files from the current directory that are created by
## configuring or building the program. If you have unpacked the
## source and built the program without creating any other files,
## `make distclean' should leave only the files that were in the
## distribution.
-top_distclean=\
- $(RM) config.status config.log confdefs.h config-tmp-* build-install Installation ; \
- $(RM) TAGS .sbinit lock/* GNUmakefile Makefile Makefile.in ; \
- $(RM) lisp/finder-inf.el* Installation.el Installation.elc ; \
- $(RM) -r site-packages xemacs-packages mule-packages site-lisp
+top-distclean: FRC.distclean
+ $(RM) config.status config.log confdefs.h config-tmp-* build-install Installation
+ $(RM) GNUmakefile Makefile Makefile.in
+ $(RM) Installation.el Installation.elc
-distclean: FRC.distclean
+distclean: top-mostlyclean top-clean top-distclean-noconfig top-distclean
for d in $(SUBDIR); do (cd ./$$d && $(MAKE) $(RECURSIVE_MAKE_ARGS) $＠); done
- -${top_distclean}
+## `realclean-noconfig'
+## Delete everything that can be reconstructed by `make'. Don't delete
+## anything requiring reconfiguration.
+top-realclean-noconfig: FRC.realclean-noconfig
+ $(RM) *.elc lisp/*.elc lisp/mule/*.elc lisp/term/*.elc modules/*.elc
+
+realclean-noconfig: top-mostlyclean top-clean top-distclean-noconfig top-realclean-noconfig
+ for d in $(SUBDIR); do (cd ./$$d && $(MAKE) $(RECURSIVE_MAKE_ARGS) $＠); done
+
+top-realclean: FRC.realclean
+
+elcclean: realclean-noconfig
+
## `realclean'
## Delete everything from the current directory that can be
## reconstructed with this Makefile. This typically includes
＠＠ -575,19 +603,25 ＠＠ distclean: FRC.distclean
## Makefile. More generally, `make realclean' should not delete
## anything that needs to exist in order to run `configure' and then
## begin to build the program.
-realclean: FRC.realclean
+realclean: top-mostlyclean top-clean top-distclean-noconfig top-distclean top-realclean-noconfig top-realclean
for d in $(SUBDIR); do (cd ./$$d && $(MAKE) $(RECURSIVE_MAKE_ARGS) $＠); done
- -${top_distclean}
- $(RM) TAGS
+## `extraclean-noconfig'
+## Like `extraclean' but don't delete anything requiring reconfiguration.
+top-extraclean-noconfig: FRC.extraclean-noconfig
+ $(RM) *~ \#*
+
+extraclean-noconfig: top-mostlyclean top-clean top-distclean-noconfig top-realclean-noconfig top-extraclean-noconfig
+ for d in $(SUBDIR); do (cd ./$$d && $(MAKE) $(RECURSIVE_MAKE_ARGS) $＠); done
+
## This doesn't actually appear in the coding standards, but Karl
## says GCC supports it, and that's where the configuration part of
## the coding standards seem to come from. It's like distclean, but
## it deletes backup and autosave files too.
-extraclean:
+top-extraclean: FRC.extraclean
+
+extraclean: top-mostlyclean top-clean top-distclean-noconfig top-distclean top-realclean-noconfig top-realclean top-extraclean-noconfig top-extraclean
for d in $(SUBDIR); do (cd ./$$d && $(MAKE) $(RECURSIVE_MAKE_ARGS) $＠); done
- $(RM) *~ \#*
- -${top_distclean}
## Unlocking and relocking. The idea of these productions is to reduce
## hassles when installing an incremental tar of XEmacs. Do `make unlock'
1.13 +11 -2 XEmacs/xemacs/dynodump/Makefile.in.in
Index: Makefile.in.in
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/dynodump/Makefile.in.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- Makefile.in.in 2001/04/12 18:20:43 1.12
+++ Makefile.in.in 2005/11/13 10:39:40 1.13
＠＠ -1,6 +1,7 ＠＠
## Makefile for dynodump subdirectory in XEmacs
## Copyright (C) 1995 Board of Trustees, University of Illinois
## Copyright (C) 1996, 1997 Sun Microsystems, Inc.
+## Copyright (C) 2005 Ben Wing.
## This file is part of XEmacs.
＠＠ -75,12 +76,20 ＠＠ uninit.o: ${srcdir}/$(ARCH)/uninit.c
$(CC) -c $(ALL_CFLAGS) ${srcdir}/$(ARCH)/uninit.c
.PHONY: mostlyclean clean distclean realclean extraclean
+.PHONY: distclean-noconfig realclean-noconfig extraclean-noconfig
mostlyclean:
$(RM) *.o *.i core
clean: mostlyclean
$(RM) *.so *.so.1
-distclean: clean
- $(RM) GNUmakefile Makefile Makefile.in TAGS
+distclean-noconfig: clean
+ $(RM) TAGS
+## This is used in making a distribution.
+## Do not use it on development directories!
+distclean: distclean-noconfig
+ $(RM) GNUmakefile Makefile Makefile.in
+realclean-noconfig: distclean-noconfig
realclean: distclean
+extraclean-noconfig: realclean-noconfig
+ $(RM) *~ \#*
extraclean: realclean
$(RM) *~ \#*
1.11 +26 -8 XEmacs/xemacs/modules/common/Makefile.common
Index: Makefile.common
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/modules/common/Makefile.common,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- Makefile.common 2004/11/08 15:14:52 1.10
+++ Makefile.common 2005/11/13 10:39:41 1.11
＠＠ -1,5 +1,6 ＠＠
## Common Makefile section for modules in XEmacs.
## Copyright (C) 2002 Jerry James.
+## Copyright (C) 2005 Ben Wing.
## This file is part of XEmacs.
＠＠ -62,7 +63,7 ＠＠ LIBSTDCPP=＠LIBSTDCPP＠
IMPORT_LIB=../../src/xemacs-import.a
#endif
-.PHONY: clean distclean install
+.PHONY: install
all: $(OBJECT_TO_BUILD)
.c.o:
＠＠ -77,13 +78,30 ＠＠ $(MODNAME)_i.c: $(SRCS)
--mod-name=$(MODNAME) --mod-version=$(MODVER) \
--mod-title=$(MODTITLE) $(SRC_SRCS)
-clean:
- $(RM) $(MODNAME).ell $(OBJS) $(MODNAME)_i.* *~
+.PHONY: mostlyclean clean distclean realclean extraclean
+.PHONY: distclean-noconfig realclean-noconfig extraclean-noconfig
+mostlyclean:
+ $(RM) $(OBJS) $(MODNAME)_i.* core
+clean: mostlyclean
+ $(RM) $(MODNAME).ell
+distclean-noconfig: clean
+ $(RM) config.* TAGS
+## This is used in making a distribution.
+## Do not use it on development directories!
+distclean: distclean-noconfig
+ $(RM) GNUmakefile Makefile Makefile.in configure
+realclean-noconfig: distclean-noconfig
+realclean: distclean
+extraclean-noconfig: realclean-noconfig
+ $(RM) *~ \#*
+extraclean: realclean
+ $(RM) *~ \#*
-distclean: clean
- $(RM) Makefile config.* configure
-
-extraclean: distclean
-
install: $(OBJECT_TO_BUILD)
$(INSTALL_PROGRAM) $< $(INSTALLPATH)
+
+##
+## Local Variables:
+## mode: makefile
+## End:
+##
- 1 participants
- 0 comments
CVS update by ben xemacs/lisp, glyphs.el, files.el ...
19 years, 2 months
CVS Monitor
CVS Monitor
User: ben
Date: 05/11/13 08:39:31
Modified: xemacs/lisp ChangeLog derived.el frame.el toolbar.el
glyphs.el specifier.el hyper-apropos.el mouse.el
files.el
Log:
fix 'foo -> `foo', `foo.' -> `foo'.
derived.el, frame.el, toolbar.el, glyphs.el, hyper-apropos.el, mouse.el, files.el, specifier.el: Fix uses of `foo'; change 'foo -> `foo', and put punctuation outside
of quotes.
Add comments in specifier.el about needing better and new convenience
functions.
Revision Changes Path
1.692 +23 -0 XEmacs/xemacs/lisp/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/ChangeLog,v
retrieving revision 1.691
retrieving revision 1.692
diff -u -p -r1.691 -r1.692
--- ChangeLog 2005/11/02 03:26:51 1.691
+++ ChangeLog 2005/11/13 07:39:26 1.692
＠＠ -1,3 +1,26 ＠＠
+2005-11-13 Ben Wing <ben(a)xemacs.org>
+
+ * derived.el:
+ * frame.el (get-frame-for-buffer):
+ * toolbar.el (press-toolbar-button):
+ * toolbar.el (release-and-activate-toolbar-button):
+ * glyphs.el:
+ * glyphs.el (set-glyph-property):
+ * glyphs.el (set-glyph-image):
+ * glyphs.el (set-glyph-contrib-p):
+ * glyphs.el (set-glyph-baseline):
+ * hyper-apropos.el (hyper-apropos-map):
+ * mouse.el (mouse-track-down-hook):
+ * files.el (file-name-extension):
+ * specifier.el:
+ * specifier.el (map-specifier):
+ * specifier.el (set-specifier):
+ Fix uses of `foo'; change 'foo -> `foo', and put punctuation outside
+ of quotes.
+
+ Add comments in specifier.el about needing better and new convenience
+ functions.
+
2005-11-02 Marcus Crestani <crestani(a)xemacs.org>
* diagnose.el: Rename `show-lrecord-stats' to
1.11 +3 -3 XEmacs/xemacs/lisp/derived.el
Index: derived.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/derived.el,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- derived.el 2004/06/18 15:48:38 1.10
+++ derived.el 2005/11/13 07:39:27 1.11
＠＠ -59,11 +59,11 ＠＠
;; (define-key hypertext-mode-map [down-mouse-3] 'do-hyper-link)
;;
;; will create a function `hypertext-mode' with its own (sparse)
-;; keymap `hypertext-mode-map.' The command M-x hypertext-mode will
+;; keymap `hypertext-mode-map'. The command M-x hypertext-mode will
;; perform the following actions:
;;
;; - run the command (text-mode) to get its default setup
-;; - replace the current keymap with 'hypertext-mode-map,' which will
+;; - replace the current keymap with 'hypertext-mode-map', which will
;; inherit from 'text-mode-map'.
;; - replace the current syntax table with
;; 'hypertext-mode-syntax-table', which will borrow its defaults
＠＠ -77,7 +77,7 ＠＠
;; set the local variable `case-fold-search' to nil.
;;
;; The advantages of this system are threefold. First, text mode is
-;; untouched -- if you had added the new keystroke to `text-mode-map,'
+;; untouched -- if you had added the new keystroke to `text-mode-map',
;; possibly using hooks, you would have added it to all text buffers
;; -- here, it appears only in hypertext buffers, where it makes
;; sense. Second, it is possible to build even further, and make
1.25 +4 -4 XEmacs/xemacs/lisp/frame.el
Index: frame.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/frame.el,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- frame.el 2005/01/28 02:58:40 1.24
+++ frame.el 2005/11/13 07:39:28 1.25
＠＠ -1774,16 +1774,16 ＠＠ This is a subroutine of `get-frame-for-b
shrink-to-fit)
"Select and return a frame in which to display BUFFER.
Normally, the buffer will simply be displayed in the selected frame.
-But if the symbol naming the major-mode of the buffer has a 'frame-name
+But if the symbol naming the major-mode of the buffer has a `frame-name'
property (which should be a symbol), then the buffer will be displayed in
a frame of that name. If there is no frame of that name, then one is
created.
-If the major-mode doesn't have a 'frame-name property, then the frame
+If the major-mode doesn't have a `frame-name' property, then the frame
named by `get-frame-for-buffer-default-frame-name' will be used. If
that is nil (the default) then the currently selected frame will used.
-If the frame-name symbol has an 'instance-limit property (an integer)
+If the frame-name symbol has an `instance-limit' property (an integer)
then each time a buffer of the mode in question is displayed, a new frame
with that name will be created, until there are `instance-limit' of them.
If instance-limit is 0, then a new frame will be created each time.
＠＠ -1791,7 +1791,7 ＠＠ If instance-limit is 0, then a new frame
If a buffer is already displayed in a frame, then `instance-limit' is
ignored, and that frame is used.
-If the frame-name symbol has a 'frame-defaults property, then that is
+If the frame-name symbol has a `frame-defaults' property, then that is
prepended to the `default-frame-plist' when creating a frame for the
first time.
1.16 +2 -2 XEmacs/xemacs/lisp/toolbar.el
Index: toolbar.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/toolbar.el,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- toolbar.el 2002/03/13 08:52:09 1.15
+++ toolbar.el 2005/11/13 07:39:28 1.16
＠＠ -146,7 +146,7 ＠＠ or through the Options menu."
;;
(defun press-toolbar-button (event)
"Press a toolbar button. This only changes its appearance.
-Call function stored in `toolbar-blank-press-function,' if any, with EVENT as
+Call function stored in `toolbar-blank-press-function', if any, with EVENT as
an argument if press is over a blank area of the toolbar."
(interactive "_e")
(setq this-command last-command)
＠＠ -165,7 +165,7 ＠＠ an argument if press is over a blank are
(defun release-and-activate-toolbar-button (event)
"Release a toolbar button and activate its callback.
-Call function stored in `toolbar-blank-release-function,' if any, with EVENT
+Call function stored in `toolbar-blank-release-function', if any, with EVENT
as an argument if release is over a blank area of the toolbar."
(interactive "_e")
(or (button-release-event-p event)
1.9 +5 -5 XEmacs/xemacs/lisp/glyphs.el
Index: glyphs.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/glyphs.el,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- glyphs.el 2005/02/22 23:38:50 1.8
+++ glyphs.el 2005/11/13 07:39:28 1.9
＠＠ -584,7 +584,7 ＠＠ If PROPERTY is a built-in property, the
HOW-TO-ADD should be either nil or one of the symbols `prepend',
`append', `remove-tag-set-prepend', `remove-tag-set-append', `remove-locale',
- `remove-locale-type', or `remove-all.' See `copy-specifier' and
+ `remove-locale-type', or `remove-all'. See `copy-specifier' and
`add-spec-to-specifier' for a description of what each of
these means. Most of the time, you do not need to worry about
this argument; the default behavior usually is fine.
＠＠ -695,7 +695,7 ＠＠ If SPEC is an alist, LOCALE must be omit
specifier object, LOCALE can be a locale, a locale type, `all',
or nil; see `copy-specifier' for its semantics. Otherwise LOCALE
specifies the locale under which the specified instantiator(s)
- will be added, and defaults to `global.'
+ will be added, and defaults to `global'.
See `set-glyph-property' for more information."
; (interactive (glyph-interactive "image"))
＠＠ -733,7 +733,7 ＠＠ If SPEC is an alist, LOCALE must be omit
specifier object, LOCALE can be a locale, a locale type, `all',
or nil; see `copy-specifier' for its semantics. Otherwise LOCALE
specifies the locale under which the specified instantiator(s)
- will be added, and defaults to `global.'
+ will be added, and defaults to `global'.
See `set-glyph-property' for more information."
; (interactive (glyph-interactive "contrib-p"))
＠＠ -772,7 +772,7 ＠＠ If SPEC is an alist, LOCALE must be omit
specifier object, LOCALE can be a locale, a locale type, `all',
or nil; see `copy-specifier' for its semantics. Otherwise LOCALE
specifies the locale under which the specified instantiator(s)
- will be added, and defaults to `global.'
+ will be added, and defaults to `global'.
See `set-glyph-property' for more information."
; (interactive (glyph-interactive "baseline"))
＠＠ -1133,7 +1133,7 ＠＠ If unspecified in a particular domain, `
(set-glyph-image (symbol-value harg) value))))
;; It might or might not be garbage, but it's rude. Make these
-;; `compatible' instead of `obsolete.' -slb
+;; `compatible' instead of `obsolete'. -slb
(defun define-obsolete-pointer-glyph (old new)
(define-compatible-variable-alias old new)
(dontusethis-set-symbol-value-handler
1.15 +10 -4 XEmacs/xemacs/lisp/specifier.el
Index: specifier.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/specifier.el,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- specifier.el 2004/09/22 02:05:51 1.14
+++ specifier.el 2005/11/13 07:39:28 1.15
＠＠ -1,7 +1,7 ＠＠
;;; specifier.el --- Lisp interface to specifiers
;; Copyright (C) 1997 Free Software Foundation, Inc.
-;; Copyright (C) 1995, 1996, 2000, 2002 Ben Wing.
+;; Copyright (C) 1995, 1996, 2000, 2002, 2005 Ben Wing.
;; Author: Ben Wing <ben(a)xemacs.org>
;; Keywords: internal, dumped
＠＠ -55,7 +55,7 ＠＠ Optional DONT-CANONICALIZE, if non-nil,
If optional MS-LOCALE is a locale, MS-FUNC will be called for that locale.
If MS-LOCALE is a locale type, MS-FUNC will be mapped over all locales of that
-type. If MS-LOCALE is 'all or nil, MS-FUNC will be mapped over all locales in
+type. If MS-LOCALE is `all' or nil, MS-FUNC will be mapped over all locales in
MS-SPECIFIER.
Optional MS-TAG-SET and MS-EXACT-P are as in `specifier-spec-list'.
＠＠ -306,7 +306,7 ＠＠ otherwise return t."
VALUE may be any of the values accepted by `canonicalize-spec-list', including
-- an instantiator (either a Lisp object which will be returned when the
- specifier is instanced, or a Lisp object that can be instantiated to
+ specifier is instantiated, or a Lisp object that can be instantiated to
produce an opaque value: eg, a font name (string) can be used for a font
specifier, but an instance will be a font object)
-- a list of instantiators
＠＠ -330,7 +330,7 ＠＠ that function.
Note that a VALUE of `nil' is either illegal or will be treated as a value of
`nil'; it does not remove existing specifications. Use `remove-specifier' for
that. N.B. `remove-specifier' defaults to removing all specifications, not
-just the 'global one!
+just the `global' one!
Warning: this function is inherently heuristic, and should not be relied on to
properly resolve ambiguities, when specifier instantiators can be lists
＠＠ -410,6 +410,12 ＠＠ in such a way as to avoid any such ambig
(canonicalize-spec-list nval (specifier-type specifier))
how-to-add))))
value)
+
+;; #### Misnamed and wrong behavior. Should operate on INSTANTIATORS, not
+;; instances. Need to come up with clean and general functions for
+;; modifying a specifier. New `specifier-instantiator' may help.
+;; #### Also need `instantiator-to-instance', a convenient version of
+;; `specifier-instance-from-inst-list'.
(defun modify-specifier-instances (specifier func &optional args force default
locale tag-set)
1.16 +1 -1 XEmacs/xemacs/lisp/hyper-apropos.el
Index: hyper-apropos.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/hyper-apropos.el,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- hyper-apropos.el 2004/09/15 08:30:27 1.15
+++ hyper-apropos.el 2005/11/13 07:39:28 1.16
＠＠ -208,7 +208,7 ＠＠ you can get the full output by using \\[
(define-key map "e" 'hyper-apropos-eliminate-keyword)
map)
"Keybindings for the *Hyper Apropos* buffer.
-This map inherits from `hyper-apropos-help-map.'")
+This map inherits from `hyper-apropos-help-map'.")
(define-obsolete-variable-alias
'hypropos-map 'hyper-apropos-map)
1.32 +1 -1 XEmacs/xemacs/lisp/mouse.el
Index: mouse.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/mouse.el,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- mouse.el 2005/01/26 04:47:14 1.31
+++ mouse.el 2005/11/13 07:39:28 1.32
＠＠ -406,7 +406,7 ＠＠ If any function returns non-nil, the rem
called.
Note that most applications should take action when the mouse is
-released, not when it is pressed.'")
+released, not when it is pressed.")
(defvar mouse-track-drag-hook nil
"Function or functions called when the user drags the mouse.
1.75 +1 -1 XEmacs/xemacs/lisp/files.el
Index: files.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/files.el,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- files.el 2005/04/08 14:07:00 1.74
+++ files.el 2005/11/13 07:39:29 1.75
＠＠ -2478,7 +2478,7 ＠＠ The extension, in a file name, is the pa
"Return FILENAME's final \"extension\".
The extension, in a file name, is the part that follows the last `.'.
Return nil for extensionless file names such as `foo'.
-Return the empty string for file names such as `foo.'.
+Return the empty string for file names such as `foo'.
If PERIOD is non-nil, then the returned value includes the period
that delimits the extension, and if FILENAME has no extension,
- 1 participants
- 0 comments
CVS update by ben xemacs ...
19 years, 2 months
CVS Monitor
CVS Monitor
User: ben
Date: 05/11/13 08:31:57
Modified: xemacs ChangeLog configure.ac
Log:
fix inclusion of ntplay.o
configure.ac: Dependent on operating system, not on window system.
Revision Changes Path
1.467 +5 -0 XEmacs/xemacs/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/ChangeLog,v
retrieving revision 1.466
retrieving revision 1.467
diff -u -p -r1.466 -r1.467
--- ChangeLog 2005/11/07 08:49:17 1.466
+++ ChangeLog 2005/11/13 07:31:55 1.467
＠＠ -1,3 +1,8 ＠＠
+2005-11-13 Ben Wing <ben(a)xemacs.org>
+
+ * configure.ac (win32 native sound):
+ Dependent on operating system, not on window system.
+
2005-11-07 Stephen J. Turnbull <stephen(a)xemacs.org>
* configure.ac (AC_INIT): Use it correctly.
1.19 +4 -3 XEmacs/xemacs/configure.ac
Index: configure.ac
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.ac,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- configure.ac 2005/11/07 08:49:16 1.18
+++ configure.ac 2005/11/13 07:31:55 1.19
＠＠ -4821,13 +4821,14 ＠＠ if test "$enable_sound_native" != "no";
esac
fi
- dnl Win32 Native uses native sound
+ dnl Win32 uses native sound
if test -z "$sound_found"; then
- if test "$with_msw" = "yes"; then
+ case "$opsys" in cygwin* | mingw* )
sound_found=yes
with_native_sound_lib=
XE_ADD_OBJS(ntplay.o)
- fi
+ ;;
+ esac
fi
dnl Check for Linux/BSD native sound (also on recent Cygwins)
- 1 participants
- 0 comments
CVS update by ben xemacs/man/internals ...
19 years, 2 months
CVS Monitor
CVS Monitor
User: ben
Date: 05/11/13 08:29:36
Modified: xemacs/man/internals internals.texi
Log:
branch info in internals manual
internals/internals.texi: Add node on Creating a Branch. Update info concerning problems
with rtag on symlinks. (#### Is this still valid?)
Revision Changes Path
1.321 +9 -0 XEmacs/xemacs/man/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/man/ChangeLog,v
retrieving revision 1.320
retrieving revision 1.321
diff -u -p -r1.320 -r1.321
--- ChangeLog 2005/11/07 08:49:23 1.320
+++ ChangeLog 2005/11/13 07:29:31 1.321
＠＠ -1,3 +1,12 ＠＠
+2005-11-13 Ben Wing <ben(a)xemacs.org>
+
+ * internals/internals.texi (Top):
+ * internals/internals.texi (CVS Techniques):
+ * internals/internals.texi (Creating a Branch):
+ * internals/internals.texi (Merging a Branch into the Trunk):
+ Add node on Creating a Branch. Update info concerning problems
+ with rtag on symlinks. (#### Is this still valid?)
+
2005-10-26 Stephen J. Turnbull <stephen(a)xemacs.org>
* XEmacs 21.5.23 "daikon" is released.
1.70 +119 -7 XEmacs/xemacs/man/internals/internals.texi
Index: internals.texi
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/man/internals/internals.texi,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- internals.texi 2005/10/20 12:38:04 1.69
+++ internals.texi 2005/11/13 07:29:34 1.70
＠＠ -393,6 +393,7 ＠＠ Regression Testing XEmacs
CVS Techniques
+* Creating a Branch::
* Merging a Branch into the Trunk::
Low-Level Allocation
＠＠ -6532,13 +6533,121 ＠＠ XEmacs facilities. ＠xref{Regression Tes
＠cindex CVS techniques
＠menu
+* Creating a Branch::
* Merging a Branch into the Trunk::
＠end menu
-＠node Merging a Branch into the Trunk, , CVS Techniques, CVS Techniques
+＠node Creating a Branch, Merging a Branch into the Trunk, CVS Techniques, CVS Techniques
+＠section Creating a Branch
+＠cindex creating a branch
+＠cindex branch, creating
+
+This assumes that you have an existing workspace modified off of the
+main line, and you want to put it onto a branch.
+
+＠enumerate
+＠item
+Preliminary comment: ＠emph{All} commands are to be executed at the
+top level of your workspace, unless otherwise indicated (which will be
+rare, if ever). Don't ever forget this and screw up, or you will get a real
+mess.
+
+＠item
+First, make a backup copy of your entire repository using ＠code{cp -a}
+(in the directory above your repository!) before doing anything.
+
+＠item
+
+Now, rule #1: ＠strong{Never try to create a branch from a workspace
+with added or deleted files.} If you are lucky, the operation will
+simply fail. If you are less lucky, it will proceed, but make the
+adds and deletes on the main line, which you do not want at all.
+Therefore, you must undo all adds and deletes. To find out what is
+added and deleted, use something like ＠code{cvs -n update >&!
+cvs.out}, which does a "dry run". (You did make a backup copy first,
+right? What if you forgot the ＠samp{-n}, for example, and wasn't
+prepared for the sudden onslaught of merging action?) Take a look at
+the output file ＠file{cvs.out} and check very carefully for newly
+added files (marked with an ＠samp{A}) and newly removed files (marked
+with an ＠samp{R}). Double check that your newly added files are in
+your backup copy, then ＠code{rm} and ＠code{crw rm} each of them to
+undo the addition. For each removed file, do ＠code{crw add} to undo
+the removal.
+
+＠item
+create a branch point. (This is a tag marking the point at which
+your branch split from the main line. It is ＠strong{extremely}
+important to create such a branch point! The creation of the actual
+branch only creates a tag that marks the end of the branch, which will
+move as you check in changes to your branch. The CVS designers, in
+their infinite wisdom, didn't provide any automatic mechanism for
+tracking the branching point, so you need to do it manually.)
+
+＠example
+crw tag ben-mule-21-5-bp
+＠end example
+
+＠item
+Next, create the actual branch:
+
+＠example
+crw tag -b ben-mule-21-5
+＠end example
+
+Note that this doesn't actually do anything to your local workspace!
+It basically just creates another tag in the repository, identical to
+the branch point tag but internally marked as a "branch tag" rather
+than a regular tag.
+
+＠item
+Now, move your workspace onto the branch:
+
+＠example
+cvs update -r ben-mule-21-5
+＠end example
+
+For unknown reasons, this may generate conflicts for each file that
+you have modified locally. If so, you can fix this by touching the
+conflicting files (the conflicts are bogus if you followed the above
+procedure). Run the following command in the top-level directory:
+
+＠example
+cvs-mods | xargs touch --no-create
+＠end example
+
+＠item
+Now, carefully redo all adds and deletes; refer to the ＠file{cvs.out}
+file to remember what needs to be redone.
+
+＠item
+Now, check in the files on the branch:
+
+＠example
+crw commit -m "first commit of ben-mule-21-5 branch"
+＠end example
+＠end enumerate
+
+＠node Merging a Branch into the Trunk, , Creating a Branch, CVS Techniques
＠section Merging a Branch into the Trunk
＠cindex merging a branch into the trunk
+＠cindex branch, merging into the trunk
+
+Preliminary comment: Beware of the symlink problem with `cvs rtag':
+＠example
+cvs [rtag aborted]: received abort signal
+cvs [rtag aborted]: received abort signal
+lock.c:178: failed assertion `strncmp (repository, current_parsed_root->directory, strlen (current_parsed_root->directory)) == 0'
+lock.c:178: failed assertion `strncmp (repository, current_parsed_root->directory, strlen (current_parsed_root->directory)) == 0'
+＠end example
+
+It will fail with a message like this if the directory component of
+your root (CVSROOT environment variable or `-d' option) is a symbolic
+link, which is the case for the standard /pack/xemacscvs. You need to
+find the real directory name; one trick is to execute a command that
+attempts to write to the repository, using read-only access. This
+will output an error message showing the actual repository directory.
+
＠enumerate
＠item
If you haven't already done a merge, you will be merging from the branch
＠＠ -6547,12 +6656,15 ＠＠ should be marked by a tag, e.g. ＠samp{la
former case, create the last-sync tag, e.g.
＠example
-crw rtag -r ben-mule-21-5-bp last-sync-ben-mule-21-5 xemacs
+cvs -d :ext:xemacs＠＠cvs.xemacs.org:/mnt/home1/cvsroots/xemacscvs rtag -r ben-mule-21-5-bp last-sync-ben-mule-21-5 xemacs
＠end example
(You did create a branch point tag when you created the branch, didn't
you?)
+Note the way this command is specified, overriding the root to avoid
+the symlink problem, as described above.
+
＠item
Check everything in on your branch.
＠＠ -6560,7 +6672,7 ＠＠ Check everything in on your branch.
Tag your branch with a pre-sync tag, e.g.
＠example
-crw rtag -r ben-mule-21-5 ben-mule-21-5-pre-feb-20-2002-sync xemacs
+cvs -d :ext:xemacs＠＠cvs.xemacs.org:/mnt/home1/cvsroots/xemacscvs rtag -r ben-mule-21-5 ben-mule-21-5-pre-feb-20-2002-sync xemacs
＠end example
Note, you need to use rtag and specify a version with ＠samp{-r} (use
＠＠ -6572,8 +6684,8 ＠＠ Tag the trunk so you have a stable place
are asynchronously committing to the trunk, e.g.
＠example
-crw rtag -r HEAD main-branch-ben-mule-21-5-syncpoint-feb-20-2002 xemacs
-crw rtag -F -r main-branch-ben-mule-21-5-syncpoint-feb-20-2002 next-sync-ben-mule-21-5 xemacs
+cvs -d :ext:xemacs＠＠cvs.xemacs.org:/mnt/home1/cvsroots/xemacscvs rtag -r HEAD main-branch-ben-mule-21-5-syncpoint-feb-20-2002 xemacs
+cvs -d :ext:xemacs＠＠cvs.xemacs.org:/mnt/home1/cvsroots/xemacscvs rtag -F -r main-branch-ben-mule-21-5-syncpoint-feb-20-2002 next-sync-ben-mule-21-5 xemacs
＠end example
Use -F in the second case because the name might already exist, e.g. if
＠＠ -6605,14 +6717,14 ＠＠ Fix all merge conflicts. Get the sucker
Tag your branch with a post-sync tag, e.g.
＠example
-crw rtag -r ben-mule-21-5 ben-mule-21-5-post-feb-20-2002-sync xemacs
+cvs -d :ext:xemacs＠＠cvs.xemacs.org:/mnt/home1/cvsroots/xemacscvs rtag -r ben-mule-21-5 ben-mule-21-5-post-feb-20-2002-sync xemacs
＠end example
＠item
Update the last-sync tag, e.g.
＠example
-crw rtag -F -r next-sync-ben-mule-21-5 last-sync-ben-mule-21-5 xemacs
+cvs -d :ext:xemacs＠＠cvs.xemacs.org:/mnt/home1/cvsroots/xemacscvs rtag -F -r next-sync-ben-mule-21-5 last-sync-ben-mule-21-5 xemacs
＠end example
＠end enumerate
- 1 participants
- 0 comments
CVS update by viteno xemacs ...
19 years, 2 months
CVS Monitor
CVS Monitor
User: viteno
Date: 05/11/12 23:51:02
Modified: xemacs version.sh
Log:
Update xemacs_extra_name.
Revision Changes Path
1.1342 +1 -1 XEmacs/xemacs/version.sh
Index: version.sh
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/version.sh,v
retrieving revision 1.1341
retrieving revision 1.1342
diff -u -p -r1.1341 -r1.1342
--- version.sh 2005/11/11 22:51:37 1.1341
+++ version.sh 2005/11/12 22:51:02 1.1342
＠＠ -8,5 +8,5 ＠＠ emacs_kit_version=
infodock_major_version=4
infodock_minor_version=0
infodock_build_version=8
-xemacs_extra_name="(+CVS-20051111)"
+xemacs_extra_name="(+CVS-20051112)"
xemacs_release_date="2005-10-26"
- 1 participants
- 0 comments
CVS update by adrian packages/xemacs-packages/games, gamegrid.el ...
19 years, 2 months
CVS Monitor
CVS Monitor
User: adrian
Date: 05/11/12 01:29:56
Modified: packages/xemacs-packages/games ChangeLog Makefile
gamegrid.el tetris.el
Log:
packages: Emergency (:-) fixes for gamegrid and tetris
-------------------- ChangeLog entries follow: --------------------
xemacs-packages/games/ChangeLog addition:
2005-11-12 Adrian Aichner <adrian(a)xemacs.org>
* Makefile (MAINTAINER): Update email address.
* gamegrid.el: Ditto.
* tetris.el: Ditto.
* gamegrid.el (gamegrid-add-score): Fix loss of scores with
non-octal digits.
* tetris.el (tetris-score-file): Default to user-init-directory.
Revision Changes Path
1.17 +9 -7 XEmacs/packages/xemacs-packages/games/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/games/ChangeLog,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- ChangeLog 2005/11/07 21:44:41 1.16
+++ ChangeLog 2005/11/12 00:29:49 1.17
＠＠ -1,3 +1,12 ＠＠
+2005-11-12 Adrian Aichner <adrian(a)xemacs.org>
+
+ * Makefile (MAINTAINER): Update email address.
+ * gamegrid.el: Ditto.
+ * tetris.el: Ditto.
+ * gamegrid.el (gamegrid-add-score): Fix loss of scores with
+ non-octal digits.
+ * tetris.el (tetris-score-file): Default to user-init-directory.
+
2005-11-07 Norbert Koch <viteno(a)xemacs.org>
* Makefile (VERSION): XEmacs package 1.16 released.
＠＠ -5,13 +14,6 ＠＠
2005-11-06 Adrian Aichner <adrian(a)xemacs.org>
* Makefile (MAINTAINER): Update email address.
-
-2005-11-06 Adrian Aichner <adrian(a)xemacs.org>
-
- * gamegrid.el (gamegrid-add-score): Fix loss of scores with
- non-octal digits.
- * tetris.el (tetris-score-file): Default to (temp-directory), not
- "/tmp".
2003-10-31 Norbert Koch <viteno(a)xemacs.org>
1.25 +1 -1 XEmacs/packages/xemacs-packages/games/Makefile
Index: Makefile
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/games/Makefile,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- Makefile 2005/11/07 21:44:41 1.24
+++ Makefile 2005/11/12 00:29:49 1.25
＠＠ -21,7 +21,7 ＠＠
VERSION = 1.16
AUTHOR_VERSION = 1.04
-MAINTAINER = Glynn Clements <glynn.clements(a)virgin.net>
+MAINTAINER = Glynn Clements <glynn(a)gclements.plus.com>
PACKAGE = xemacs-base
PACKAGE = games
PKG_TYPE = regular
1.6 +9 -3 XEmacs/packages/xemacs-packages/games/gamegrid.el
Index: gamegrid.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/games/gamegrid.el,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- gamegrid.el 2003/06/14 18:48:26 1.5
+++ gamegrid.el 2005/11/12 00:29:49 1.6
＠＠ -2,7 +2,7 ＠＠
;; Copyright (C) 1998 Free Software Foundation, Inc.
-;; Author: Glynn Clements <glynn.clements(a)virgin.net>
+;; Author: Glynn Clements <glynn(a)gclements.plus.com>
;; Version: 1.03
;; Created: 1997-08-13
;; Keywords: games
＠＠ -429,8 +429,14 ＠＠ static char *noname[] = {
((boundp 'user-mail-address)
user-mail-address)
(t ""))))
- (sort-numeric-fields 1 (point-min) (point-max))
- (reverse-region (point-min) (point-max))
+ ;; Prefixing numbers 0's will make `sort-numeric-fields' sort with
+ ;; sort-numeric-base of 8.
+ ;; One workaround is to use `sort-regexp-fields-numerically',
+ ;; on the number, excluding leading 0's.
+ (sort-regexp-fields-numerically
+ nil
+ "^[0]*\\([1-9][0-9]+\\)\\>.+$" "\\1" (point-min) (point-max))
+ (reverse-region (point-min) (point-max))
(goto-line (1+ gamegrid-score-file-length))
(delete-region (point) (point-max))
(setq buffer-read-only t)
1.5 +3 -2 XEmacs/packages/xemacs-packages/games/tetris.el
Index: tetris.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/games/tetris.el,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- tetris.el 2003/06/14 18:48:27 1.4
+++ tetris.el 2005/11/12 00:29:49 1.5
＠＠ -2,7 +2,7 ＠＠
;; Copyright (C) 1998 Free Software Foundation, Inc.
-;; Author: Glynn Clements <glynn.clements(a)virgin.net>
+;; Author: Glynn Clements <glynn(a)gclements.plus.com>
;; Version: 2.03
;; Created: 1997-08-13
;; Keywords: games
＠＠ -136,7 +136,8 ＠＠ Element 0 is ignored")
(defvar tetris-score-y (+ tetris-next-y 6)
"Y position of score")
-(defvar tetris-score-file "/tmp/tetris-scores"
+(defvar tetris-score-file
+ (expand-file-name "tetris-scores" user-init-directory)
;; anybody with a well-connected server want to host this?
;(defvar tetris-score-file "/anonymous＠ftp.pgt.com:/pub/cgw/tetris-scores"
"File for holding high scores")
- 1 participants
- 0 comments
CVS update by viteno xemacs ...
19 years, 2 months
CVS Monitor
CVS Monitor
User: viteno
Date: 05/11/11 23:51:43
Modified: xemacs version.sh
Log:
Update xemacs_extra_name.
Revision Changes Path
1.1341 +1 -1 XEmacs/xemacs/version.sh
Index: version.sh
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/version.sh,v
retrieving revision 1.1340
retrieving revision 1.1341
diff -u -p -r1.1340 -r1.1341
--- version.sh 2005/11/10 22:51:04 1.1340
+++ version.sh 2005/11/11 22:51:37 1.1341
＠＠ -8,5 +8,5 ＠＠ emacs_kit_version=
infodock_major_version=4
infodock_minor_version=0
infodock_build_version=8
-xemacs_extra_name="(+CVS-20051110)"
+xemacs_extra_name="(+CVS-20051111)"
xemacs_release_date="2005-10-26"
- 1 participants
- 0 comments
CVS update by scop packages/unsupported/scop/vc ...
19 years, 2 months
CVS Monitor
CVS Monitor
User: scop
Date: 05/11/11 20:25:09
Modified: packages/unsupported/scop/vc ChangeLog vc-xemacs.el
Log:
Fix subst-char-in-string, thanks to Oscar Figueiredo.
Revision Changes Path
1.33 +5 -0 XEmacs/packages/unsupported/scop/vc/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/ChangeLog,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- ChangeLog 2005/11/10 16:44:51 1.32
+++ ChangeLog 2005/11/11 19:25:08 1.33
＠＠ -1,3 +1,8 ＠＠
+2005-11-10 Oscar Figueiredo <oscar(a)xemacs.org>
+
+ * vc-xemacs.el (subst-char-in-string): Do not use `replace-in-string'
+ because of the regexp semantic on its second parameter.
+
2005-11-10 Ville Skyttä <scop(a)xemacs.org>
* vc-xemacs.el: Update FSF's address.
1.3 +9 -3 XEmacs/packages/unsupported/scop/vc/vc-xemacs.el
Index: vc-xemacs.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/vc-xemacs.el,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- vc-xemacs.el 2005/11/10 16:44:51 1.2
+++ vc-xemacs.el 2005/11/11 19:25:08 1.3
＠＠ -56,10 +56,16 ＠＠
(defalias 'line-number-at-pos 'line-number))
(unless (fboundp 'subst-char-in-string)
- ;; Note: inplace is ignored for now
(defun subst-char-in-string (fromchar tochar string &optional inplace)
- (replace-in-string
- string (char-to-string fromchar) (char-to-string tochar))))
+ "Replace FROMCHAR with TOCHAR in STRING each time it occurs.
+Unless optional argument INPLACE is non-nil, return a new string."
+ (let ((i (length string))
+ (newstr (if inplace string (copy-sequence string))))
+ (while (> i 0)
+ (setq i (1- i))
+ (if (eq (aref newstr i) fromchar)
+ (aset newstr i tochar)))
+ newstr)))
(unless (fboundp 'replace-regexp-in-string)
;; Note: fixedcase, subexp, start ignored for now
- 1 participants
- 0 comments
CVS update by viteno xemacs ...
19 years, 2 months
CVS Monitor
CVS Monitor
User: viteno
Date: 05/11/10 23:51:05
Modified: xemacs version.sh
Log:
Update xemacs_extra_name.
Revision Changes Path
1.1340 +1 -1 XEmacs/xemacs/version.sh
Index: version.sh
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/version.sh,v
retrieving revision 1.1339
retrieving revision 1.1340
diff -u -p -r1.1339 -r1.1340
--- version.sh 2005/11/09 22:51:10 1.1339
+++ version.sh 2005/11/10 22:51:04 1.1340
＠＠ -8,5 +8,5 ＠＠ emacs_kit_version=
infodock_major_version=4
infodock_minor_version=0
infodock_build_version=8
-xemacs_extra_name="(+CVS-20051109)"
+xemacs_extra_name="(+CVS-20051110)"
xemacs_release_date="2005-10-26"
- 1 participants
- 0 comments
CVS update by scop packages/unsupported/scop/vc ...
19 years, 2 months
CVS Monitor
CVS Monitor
User: scop
Date: 05/11/10 17:44:52
Modified: packages/unsupported/scop/vc ChangeLog vc-xemacs.el
Log:
Update FSF's address.
Revision Changes Path
1.32 +4 -0 XEmacs/packages/unsupported/scop/vc/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/ChangeLog,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- ChangeLog 2005/11/02 19:03:11 1.31
+++ ChangeLog 2005/11/10 16:44:51 1.32
＠＠ -1,3 +1,7 ＠＠
+2005-11-10 Ville Skyttä <scop(a)xemacs.org>
+
+ * vc-xemacs.el: Update FSF's address.
+
2005-11-02 Ville Skyttä <scop(a)xemacs.org>
* vc.el, vc-cvs.el, vc-sccs.el: Sync with upstream.
1.2 +2 -2 XEmacs/packages/unsupported/scop/vc/vc-xemacs.el
Index: vc-xemacs.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/vc-xemacs.el,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- vc-xemacs.el 2004/08/15 10:58:29 1.1
+++ vc-xemacs.el 2005/11/10 16:44:51 1.2
＠＠ -14,8 +14,8 ＠＠
;; You should have received a copy of the GNU General Public License
;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Code:
- 1 participants
- 0 comments