November 2005 - XEmacs-Patches - XEmacs Mailing List Archives

[PATCH21.5] MS Visual Studio 2005 and XP visual themes 18 years, 5 months

Jonathan Harris

Small fixes for building under MS Visual Studio 20050 (mainly embedding xemacs.exe.manifest in the executable) and turns on Visual Themes. Patch and new files attached. Unfortunately make-docfile is still crashing for me. Not tested under older versions of Visual Studio. src/ChangeLog: 2005-11-13 Jonathan Harris <jonathan(a)xemacs.org> * dumper.c (pdump): Don't try to close pdump_fd twice. * s/windowsnt.h: Suppress warnings about deprecated POSIX APIs under VS 2005. lib-src/ChangeLog: 2005-11-13 Jonathan Harris <jonathan(a)xemacs.org> * lib-src\make-docfile.c (main): Don't open text files in binary mode on WIN32_NATIVE. nt/ChangeLog: 2005-11-13 Jonathan Harris <jonathan(a)xemacs.org> * README: Document MS Visual Studio 2005. * xemacs.rc: * xemacs.mak: Fixes for VS 2005 - embed manifest in executable. Turn on Visual Themes on WinXP and later. Add --no-validate and --force flags to makeinfo. * xemacs.ico: * file.ico: Updated and added WinXP-style icons with drop-shadow. Index: lib-src/make-docfile.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lib-src/make-docfile.c,v retrieving revision 1.17 diff -u -r1.17 make-docfile.c --- lib-src/make-docfile.c 2005/02/22 08:05:58 1.17 +++ lib-src/make-docfile.c 2005/11/13 21:08:18 ＠＠ -168,7 +168,6 ＠＠ /* Don't put CRs in the DOC file. */ #ifdef WIN32_NATIVE - _fmode = O_BINARY; _setmode (fileno (stdout), O_BINARY); #endif /* WIN32_NATIVE */ Index: nt/README =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/nt/README,v retrieving revision 1.27 diff -u -r1.27 README --- nt/README 2005/09/26 08:13:00 1.27 +++ nt/README 2005/11/13 21:08:18 ＠＠ -20,24 +20,24 ＠＠ * Required tools and sources ============================ -1. You will need Visual C++ V6.0, Visual Studio .NET or later to compile - everything. +1. You will need Visual Visual Studio .NET or later to compile everything. - Note that Visual C++ assumes that the environment variables INCLUDE and - LIB are set to specify the location of the includes and libraries. + Note that Visual Studio assumes that the environment variables INCLUDE + and LIB are set to specify the location of the includes and libraries. Your PATH environment variable also needs to include the Visual Studio vc\bin and sharedide\bin directories. - Visual C++ V6.0 installs a batch file called vcvars32.bat in - c:\Program Files\Microsoft Visual Studio\VC98\bin\ (or wherever you - installed it) that you can run before building to set up all of these - environment variables. Alternatively, you can choose at setup time to - have these environment variables automatically set up in the registry, - which is generally a good idea. + Visual Studio .NET & 2005 installs a batch file called vcvars32.bat in + C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\Tools or + C:\Program Files\Microsoft Visual Studio 8\Common7\Tools (or wherever + you installed it) that you can run before building to set up all of + these environment variables. Alternatively, you can choose at setup + time to have these environment variables automatically set up in the + registry, which is generally a good idea. - Visual Studio .NET calls this batch file vsvars32.bat and installs it in - $Installdir\Common7\Tools, but doesn't offer at install time to - automatically set these environment variables up in the registry. + If you're building with a Microsoft Platform SDK (rather than the SDK + that comes with the full version of Visual Studio) then also run + C:\Program Files\Microsoft Platform SDK\setenv.cmd. 2. Grab the latest XEmacs source from Index: nt/xemacs.mak =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/nt/xemacs.mak,v retrieving revision 1.118 diff -u -r1.118 xemacs.mak --- nt/xemacs.mak 2005/11/10 15:45:13 1.118 +++ nt/xemacs.mak 2005/11/13 21:08:20 ＠＠ -424,6 +424,10 ＠＠ XEMACS_VERSION_STRING=$(XEMACS_VERSION_STRING).$(emacs_beta_version) !endif !endif +XEMACS_RC_VERSION=$(XEMACS_VERSION_STRING:-=.) +XEMACS_RC_ASSVERSION=$(XEMACS_VERSION_STRING:-b=.).0 +XEMACS_RC_FILEVERSION=$(XEMACS_RC_ASSVERSION:.=,) + PROGRAM_DEFINES= \ -DPATH_VERSION=\"$(XEMACS_VERSION_STRING)\" \ -DPATH_PROGNAME=\"xemacs\" \ ＠＠ -1330,10 +1334,6 ＠＠ cd $(BLDSRC) $(BLDLIB_SRC)\make-dump-id.exe -$(OUTDIR)\temacs.res: $(NT)\xemacs.rc - cd $(NT) - rc -Fo$＠ xemacs.rc - ## (2) Link the XEmacs executable !if $(USE_PORTABLE_DUMPER) ＠＠ -1387,22 +1387,25 ＠＠ ## (5) Dump -!if $(USE_PORTABLE_DUMPER) -$(DUMP_TARGET): $(NT)\xemacs.rc -!endif - # This rule dumps xemacs and then possibly spawns sub-make if PURESPACE # requirements have changed. -$(DUMP_TARGET): $(DOC) $(RAW_EXE) $(BLDSRC)\NEEDTODUMP +$(DUMP_TARGET): $(DOC) $(RAW_EXE) $(BLDSRC)\NEEDTODUMP $(NT)\xemacs.rc $(TEMACS_BATCH) -l $(LISP)\loadup.el dump + ＠type $(NT)\xemacs.manifest1.txt> $(OUTDIR)\xemacs.exe.manifest + ＠echo "$(XEMACS_RC_ASSVERSION)">> $(OUTDIR)\xemacs.exe.manifest + ＠type $(NT)\xemacs.manifest2.txt>> $(OUTDIR)\xemacs.exe.manifest +!if $(MSC_VER) >= 1400 + ＠findstr /c:depend /c:assemblyIdentity $(RAW_EXE).manifest>> $(OUTDIR)\xemacs.exe.manifest +!endif + ＠type $(NT)\xemacs.manifest3.txt>> $(OUTDIR)\xemacs.exe.manifest !if $(USE_PORTABLE_DUMPER) cd $(BLDSRC) - rc -d INCLUDE_DUMP -Fo $(OUTDIR)\xemacs.res $(NT)\xemacs.rc + rc -d INCLUDE_DUMP -Fo $(OUTDIR)\xemacs.res -dXEMACS_RC_VERSION=\"$(XEMACS_RC_VERSION)\" -dXEMACS_RC_FILEVERSION=$(XEMACS_RC_FILEVERSION) $(NT)\xemacs.rc # Make the resource section read/write since almost all of it is the dump # data which needs to be writable. This avoids having to copy it. link.exe ＠<< - $(XEMACS_LFLAGS) -section:.rsrc,rw -out:$(BLDSRC)\xemacs.exe $(TEMACS_OBJS) $(OUTDIR)\xemacs.res $(TEMACS_LIBS) $(OUTDIR)\dump-id.obj + $(XEMACS_LFLAGS) -manifest:no -section:.rsrc,rw -out:$(BLDSRC)\xemacs.exe $(TEMACS_OBJS) $(OUTDIR)\xemacs.res $(TEMACS_LIBS) $(OUTDIR)\dump-id.obj << -$(DEL) $(BLDSRC)\xemacs.dmp !endif ＠＠ -1431,7 +1434,10 ＠＠ ###################### Building the info files !if !defined(MAKEINFO) -MAKEINFO=$(XEMACS_BATCH_PACKAGES) -l texinfmt -f batch-texinfo-format +MAKEINFO=$(XEMACS_BATCH_PACKAGES) +MAKEINFOFLAGS=-l texinfmt -f batch-texinfo-format +!else +MAKEINFOFLAGS=--no-validate --force !endif MANDIR = $(SRCROOT)\man ＠＠ -1455,7 +1461,7 ＠＠ {$(MANDIR)}.texi{$(INFODIR)}.info: cd $(MANDIR) - $(MAKEINFO) $(**F) + $(MAKEINFO) $(MAKEINFOFLAGS) $(**F) XEMACS_SRCS = \ $(MANDIR)\xemacs\abbrevs.texi \ ＠＠ -1586,19 +1592,19 ＠＠ $(INFODIR)\xemacs.info: $(XEMACS_SRCS) cd $(MANDIR)\xemacs - $(MAKEINFO) xemacs.texi + $(MAKEINFO) $(MAKEINFOFLAGS) xemacs.texi $(INFODIR)\lispref.info: $(LISPREF_SRCS) cd $(MANDIR)\lispref - $(MAKEINFO) lispref.texi + $(MAKEINFO) $(MAKEINFOFLAGS) lispref.texi $(INFODIR)\internals.info: $(INTERNALS_SRCS) cd $(MANDIR)\internals - $(MAKEINFO) internals.texi + $(MAKEINFO) $(MAKEINFOFLAGS) internals.texi $(INFODIR)\new-users-guide.info: $(NEW_USERS_GUIDE_SRCS) cd $(MANDIR)\new-users-guide - $(MAKEINFO) new-users-guide.texi + $(MAKEINFO) $(MAKEINFOFLAGS) new-users-guide.texi info: makeinfo-test $(INFO_FILES) ＠＠ -1681,15 +1687,19 ＠＠ mostlyclean: -$(DEL) $(BLDROOT)\Installation + -$(DEL) $(NT)\*.obj -$(DEL) $(OUTDIR)\*.lib -$(DEL) $(OUTDIR)\*.obj -$(DEL) $(OUTDIR)\*.pdb -$(DEL) $(OUTDIR)\*.idb -$(DEL) $(OUTDIR)\*.ilk + -$(DEL) $(OUTDIR)\*.manifest -$(DEL) $(OUTDIR)\*.res -$(DEL) $(OUTDIR)\*.sbr + -$(DEL) $(OUTDIR)\*.tmp -$(DEL) $(BLDSRC)\*.exe -$(DEL) $(BLDSRC)\*.dmp + -$(DEL) $(BLDSRC)\*.manifest -$(DEL) $(BLDSRC)\*.map -$(DEL) $(BLDSRC)\*.pdb -$(DEL) $(BLDSRC)\*.idb Index: nt/xemacs.rc =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/nt/xemacs.rc,v retrieving revision 1.3 diff -u -r1.3 xemacs.rc --- nt/xemacs.rc 2001/04/12 18:23:01 1.3 +++ nt/xemacs.rc 2005/11/13 21:08:20 ＠＠ -1,7 +1,40 ＠＠ +#include <winuser.rh> +#include <winver.h> + #ifdef INCLUDE_DUMP -101 DUMP "xemacs.dmp" +101 DUMP "xemacs.dmp" #endif XEmacs ICON PRELOAD "xemacs.ico" XEmacsFile ICON "File.ico" -XEmacsLisp ICON "Lisp.ico" + +CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "obj\\xemacs.exe.manifest" + +VS_VERSION_INFO VERSIONINFO + FILEVERSION XEMACS_RC_FILEVERSION + PRODUCTVERSION XEMACS_RC_FILEVERSION + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK +#ifdef _DEBUG + FILEFLAGS VS_FF_DEBUG +#else + FILEFLAGS 0x0L +#endif + FILEOS VOS__WINDOWS32 + FILETYPE VFT_APP + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "CompanyName", "xemacs.org" + VALUE "FileDescription", "XEmacs" + VALUE "FileVersion", XEMACS_RC_VERSION + VALUE "InternalName", "XEmacs" + VALUE "LegalCopyright", "GNU General Public License" + VALUE "OriginalFilename", "xemacs.exe" + VALUE "ProductName", "XEmacs" + VALUE "ProductVersion", XEMACS_RC_VERSION + END + END +END Index: src/dumper.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/dumper.c,v retrieving revision 1.31 diff -u -r1.31 dumper.c --- src/dumper.c 2005/10/14 01:22:00 1.31 +++ src/dumper.c 2005/11/13 21:08:21 ＠＠ -2103,8 +2103,7 ＠＠ #endif /* not MC_ALLOC */ pdump_dump_root_lisp_objects (); - retry_fclose (pdump_out); - retry_close (pdump_fd); + retry_fclose (pdump_out); /* closes pdump_fd too */ free (pdump_buf); Index: src/s/windowsnt.h =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/s/windowsnt.h,v retrieving revision 1.33 diff -u -r1.33 windowsnt.h --- src/s/windowsnt.h 2005/01/24 23:34:34 1.33 +++ src/s/windowsnt.h 2005/11/13 21:08:26 ＠＠ -165,6 +165,12 ＠＠ 3. Think again. Undo still works. */ #if (_MSC_VER >= 800) +/* The POSIX name for this item is deprecated... + Unfortunately also turns off other deprecation warnings. + _CRT_NONSTDC_NO_DEPRECATE is preferable, but doesn't appear to work. */ +#define _CRT_NONSTDC_NO_DEPRECATE +#pragma warning ( disable : 4996 ) + /* unnamed type definition in parentheses (Martin added a pedantically correct definition of ALIGNOF, which generates temporary anonymous structures, and MSVC complains) */ </assembly> <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> <assemblyIdentity version= processorArchitecture="X86" name="xemacs" type="win32" /> <description>xemacs.XEmacs.exe</description> <dependency> <dependentAssembly> <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="X86" publicKeyToken="6595b64144ccf1df" language="*" /> </dependentAssembly> </dependency>

6 participants
9 comments

[COMMIT] branch info in internals manual 18 years, 5 months

Ben Wing

NOTE: This patch has been committed. man/ChangeLog addition: 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?) build source patch: Diff command: bash -ci "cvs-diff --show-c-function -no-changelog " Files affected: man/internals/internals.texi Index: man/internals/internals.texi =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/man/internals/internals.texi,v retrieving revision 1.69 diff -u -p -r1.69 internals.texi --- man/internals/internals.texi 2005/10/20 12:38:04 1.69 +++ man/internals/internals.texi 2005/11/13 07:27:23 ＠＠ -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

2 participants
1 comments

[PATCH] [NOT COMMITTED] display-table-fixing (please comment) 18 years, 5 months

Ben Wing

Hello. As you might have guessed, I've been going through an old build workspace and cleaning out the stuff in it. The one controversial thing is the change to display tables. This is logically a good thing, but it breaks some code that assumes that the result of `make-display-table' is always a vector of 256 and hence it can call `aset' on the return value. This occurs maybe 3 or 4 times in the packages and I've fixed them up to check for the existence of `put-display-table' and use it preferentially. But before I commit something like this that causes breakage, I'd like some comments, hopefully of the "go ahead and commit" variety :) ben lisp/ChangeLog addition: 2005-11-13 Ben Wing <ben(a)xemacs.org> * disp-table.el: * disp-table.el (describe-display-table): * disp-table.el (make-display-table): * disp-table.el (display-table-p): New. * disp-table.el (frob-display-table): * disp-table.el (put-display-table-range): New. * disp-table.el (put-display-table): New. * disp-table.el (get-display-table): New. * disp-table.el (standard-display-default-1): * disp-table.el (standard-display-ascii): * disp-table.el (standard-display-g1): * disp-table.el (standard-display-graphic): * disp-table.el (standard-display-underline): * disp-table.el (standard-display-european): * font.el: * font.el (font-caps-display-table): Make display tables be char tables, not vectors of 256. Create new functions `put-display-table', `get-display-table', `put-display-table-range' for accessing/modifying a display table in an abstract fashion. Rewrite font.el to use them. NOTE: This will break code that assumes it can `aset' display tables. build source patch: Diff command: bash -ci "cvs-diff --show-c-function -no-changelog " Files affected: lisp/font.el lisp/disp-table.el cvs server: Diffing lisp Index: lisp/disp-table.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/disp-table.el,v retrieving revision 1.2 diff -u -p -r1.2 disp-table.el --- lisp/disp-table.el 1997/12/06 22:26:09 1.2 +++ lisp/disp-table.el 2005/11/13 10:58:32 ＠＠ -2,8 +2,8 ＠＠ ;; Copyright (C) 1987, 1994, 1997 Free Software Foundation, Inc. ;; Copyright (C) 1995 Sun Microsystems. +;; Copyright (C) 2005 Ben Wing. -;; Author: Howard Gayle ;; Maintainer: XEmacs Development Team ;; Keywords: i18n, internal ＠＠ -28,15 +28,13 ＠＠ ;;; Commentary: -;; #### Need lots of work. make-display-table depends on a value -;; that is a define in the C code. Maybe we should just move the -;; function into C. +;; #### Needs work. -;; #### display-tables-as-vectors is really evil and a big pain in -;; the ass. - ;; Rewritten for XEmacs July 1995, Ben Wing. - +;; November 1998?, display tables generalized to char/range tables, Hrvoje +;; Niksic. +;; February 2005, rewrite this file to handle generalized display tables, +;; Ben Wing. ;;; Code: ＠＠ -45,39 +43,54 ＠＠ (with-displaying-help-buffer (lambda () (princ "\nCharacter display glyph sequences:\n") - (save-excursion - (let ((vector (make-vector 256 nil)) - (i 0)) - (while (< i 256) - (aset vector i (aref dt i)) - (incf i)) - ;; FSF calls `describe-vector' here, but it is so incredibly - ;; lame a function for that name that I cannot bring myself - ;; to porting it. Here is what `describe-vector' does: - (terpri) - (let ((old (aref vector 0)) - (oldpos 0) - (i 1) - str) - (while (<= i 256) - (when (or (= i 256) - (not (equal old (aref vector i)))) - (if (eq oldpos (1- i)) - (princ (format "%s\t\t%s\n" - (single-key-description (int-char oldpos)) - old)) - (setq str (format "%s - %s" - (single-key-description (int-char oldpos)) - (single-key-description (int-char (1- i))))) - (princ str) - (princ (make-string (max (- 2 (/ (length str) - tab-width)) 1) ?\t)) - (princ old) - (terpri)) - (or (= i 256) - (setq old (aref vector i) - oldpos i))) - (incf i)))))))) + (flet ((describe-display-table-entry + (entry stream) + ;; #### Write better version + (princ entry stream)) + (describe-display-table-range + (first last entry) + (if (eq first last) + (princ (format "%s\t\t" + (single-key-description (int-char first)))) + (let ((str (format "%s - %s" + (single-key-description (int-char first)) + (single-key-description (int-char last))))) + (princ str) + (princ (make-string (max (- 2 (/ (length str) + tab-width)) 1) ?\t)))) + (describe-display-table-entry entry standard-output) + (terpri))) + (cond ((vectorp dt) + (save-excursion + (let ((vector (make-vector 256 nil)) + (i 0)) + (while (< i 256) + (aset vector i (aref dt i)) + (incf i)) + ;; FSF calls `describe-vector' here, but it is so incredibly + ;; lame a function for that name that I cannot bring myself + ;; to port it. Here is what `describe-vector' does: + (terpri) + (let ((old (aref vector 0)) + (oldpos 0) + (i 1)) + (while (<= i 256) + (when (or (= i 256) + (not (equal old (aref vector i)))) + (describe-display-table-range oldpos (1- i) old) + (or (= i 256) + (setq old (aref vector i) + oldpos i))) + (incf i)))))) + ((char-table-p dt) + (describe-char-table dt 'map-char-table + 'describe-display-table-entry + standard-output)) + ((range-table-p dt) + (map-range-table + #'(lambda (beg end value) + (describe-display-table-range beg end value)) + dt))))))) ;;;###autoload (defun describe-current-display-table (&optional domain) ＠＠ -91,19 +104,39 ＠＠ ;;;###autoload (defun make-display-table () - "Return a new, empty display table." - (make-vector 256 nil)) + "Return a new, empty display table. +Modify a display table using `put-display-table'. Look up in display tables +using `get-display-table'. The exact format of display tables and their +specs is described in `current-display-table'." + ;; #### This should do something smarter. + ;; #### Should use range table but there are bugs in range table and + ;; perhaps in callers not expecting this. + ;(make-range-table 'start-closed-end-closed) + ;(make-vector 256 nil) + ;; #### Should be type `display-table' + (make-char-table 'generic)) + +(defun display-table-p (object) + "Return t if OBJECT is a display table. +See `make-display-table'." + (or (and (vectorp object) (= (length object) 256)) + (and (char-table-p object) (memq (char-table-type object) + '(char generic display))) + (range-table-p object))) ;; #### we need a generic frob-specifier function. ;; #### this also needs to be redone like frob-face-property. ;; Let me say one more time how much dynamic scoping sucks. + +;; #### Need more thinking about basic primitives for modifying a specifier. +;; cf `modify-specifier-instances'. -(defun frob-display-table (fdt-function fdt-locale) +(defun frob-display-table (fdt-function fdt-locale &optional tag-set) (or fdt-locale (setq fdt-locale 'global)) - (or (specifier-spec-list current-display-table fdt-locale) + (or (specifier-spec-list current-display-table fdt-locale tag-set) (add-spec-to-specifier current-display-table (make-display-table) - fdt-locale)) + fdt-locale tag-set)) (add-spec-list-to-specifier current-display-table (list (cons fdt-locale ＠＠ -112,11 +145,62 ＠＠ (funcall fdt-function (cdr fdt-x)) fdt-x) (cdar (specifier-spec-list current-display-table - fdt-locale))))))) + fdt-locale tag-set))))))) +(defun put-display-table-range (l h spec display-table) + "Display characters in range L .. H, inclusive, in DISPLAY-TABLE using SPEC. +Display tables are described in `current-display-table'." + (check-argument-type 'display-table-p display-table) + (cond ((vectorp display-table) + (while (<= l h) + (aset display-table l spec) + (setq l (1+ l)))) + ((char-table-p display-table) + (while (<= l h) + (put-char-table l spec display-table) + (setq l (1+ l)))) + ((range-table-p display-table) + (put-range-table l h spec display-table)))) + +(defun put-display-table (ch spec display-table) + "Display character spec CH in DISPLAY-TABLE using SPEC. +CH can be a character, a charset, or t for all characters. +Display tables are described in `current-display-table'." + (cond ((eq ch t) + (cond ((vectorp display-table) + (put-display-table-range 0 (1- (length display-table)) spec + display-table)) + ((range-table-p display-table) + ; major hack + (put-display-table-range 0 (string-to-int "3FFFFFFF" 16) + spec display-table)) + ((char-table-p display-table) + (put-char-table t spec display-table)))) + ((charsetp ch) + (cond ((vectorp display-table) + ;; #### fix + nil) + ((range-table-p display-table) + ;; #### fix + nil) + ((char-table-p display-table) + (put-char-table ch spec display-table)))) + (t (put-display-table-range ch ch spec display-table)))) + +(defun get-display-table (char display-table) + "Return SPEC of CHAR in DISPLAY-TABLE. +See `current-display-table'." + (check-argument-type 'display-table-p display-table) + (cond ((vectorp display-table) + (aref display-table char)) + ((char-table-p display-table) + (get-char-table char display-table)) + ((range-table-p display-table) + (get-range-table char display-table)))) + (defun standard-display-8bit-1 (dt l h) (while (<= l h) - (aset dt l (char-to-string l)) + (put-display-table l (char-to-string l) dt) (setq l (1+ l)))) ;;;###autoload ＠＠ -129,7 +213,7 ＠＠ (defun standard-display-default-1 (dt l h) (while (<= l h) - (aset dt l nil) + (put-display-table l nil dt) (setq l (1+ l)))) ;;;###autoload ＠＠ -145,36 +229,30 ＠＠ "Display character C using printable string S." (frob-display-table (lambda (x) - (aset x c s)) + (put-display-table c s x)) locale)) - -;;; #### should frob in a 'tty locale. - ;;;###autoload (defun standard-display-g1 (c sc &optional locale) "Display character C as character SC in the g1 character set. -This function assumes that your terminal uses the SO/SI characters; -it is meaningless for an X frame." +This only has an effect on TTY devices and assumes that your terminal uses +the SO/SI characters." (frob-display-table (lambda (x) - (aset x c (concat "\016" (char-to-string sc) "\017"))) - locale)) - - -;;; #### should frob in a 'tty locale. + (put-display-table c (concat "\016" (char-to-string sc) "\017") x)) + locale + 'tty)) ;;;###autoload (defun standard-display-graphic (c gc &optional locale) "Display character C as character GC in graphics character set. -This function assumes VT100-compatible escapes; it is meaningless for an -X frame." +This only has an effect on TTY devices and assumes VT100-compatible escapes." (frob-display-table (lambda (x) - (aset x c (concat "\e(0" (char-to-string gc) "\e(B"))) - locale)) + (put-display-table c (concat "\e(0" (char-to-string gc) "\e(B") x)) + locale + 'tty)) -;;; #### should frob in a 'tty locale. ;;; #### the FSF equivalent of this makes this character be displayed ;;; in the 'underline face. There's no current way to do this with ;;; XEmacs display tables. ＠＠ -184,8 +262,9 ＠＠ X frame." "Display character C as character UC plus underlining." (frob-display-table (lambda (x) - (aset x c (concat "\e[4m" (char-to-string uc) "\e[m"))) - locale)) + (put-display-table c (concat "\e[4m" (char-to-string uc) "\e[m") x)) + locale + 'tty)) ;;;###autoload (defun standard-display-european (arg &optional locale) ＠＠ -198,7 +277,7 ＠＠ With prefix argument, enable European ch (lambda (x) (if (or (<= (prefix-numeric-value arg) 0) (and (null arg) - (equal (aref x 160) (char-to-string 160)))) + (equal (get-display-table 160 x) (char-to-string 160)))) (standard-display-default-1 x 160 255) (standard-display-8bit-1 x 160 255))) locale)) Index: lisp/font.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/font.el,v retrieving revision 1.17 diff -u -p -r1.17 font.el --- lisp/font.el 2005/03/25 15:58:03 1.17 +++ lisp/font.el 2005/11/13 10:58:32 ＠＠ -2,7 +2,7 ＠＠ ;; Copyright (c) 1995, 1996 by William M. Perry (wmperry(a)cs.indiana.edu) ;; Copyright (c) 1996, 1997 Free Software Foundation, Inc. -;; Copyright (C) 2002, 2004 Ben Wing. +;; Copyright (C) 2002, 2004, 2005 Ben Wing. ;; Author: wmperry ;; Maintainer: XEmacs Development Team ＠＠ -245,16 +245,16 ＠＠ for use in the 'weight' field of an X fo (i 0)) ;; Standard ASCII characters (while (< i 26) - (aset table (+ i ?a) (+ i ?A)) + (put-display-table (+ i ?a) (+ i ?A) table) (setq i (1+ i))) ;; Now ISO translations (setq i 224) (while (< i 247) ;; Agrave - Ouml - (aset table i (- i 32)) + (put-display-table i (- i 32) table) (setq i (1+ i))) (setq i 248) (while (< i 255) ;; Oslash - Thorn - (aset table i (- i 32)) + (put-display-table i (- i 32) table) (setq i (1+ i))) table)) cvs server: Diffing lisp/mule cvs server: Diffing lisp/term

1 participants
0 comments

[COMMIT] create describe-char-table 18 years, 5 months

Ben Wing

NOTE: This patch has been committed. lisp/ChangeLog addition: 2005-11-13 Ben Wing <ben(a)xemacs.org> * syntax.el: * syntax.el (describe-syntax-table): Removed. * syntax.el (describe-char-table): New. Convert describe-syntax-table to more general describe-char-table. (Will also be used by display tables.) Create new describe-syntax-table, compatible with old function, that uses describe-char-table. 2005-11-13 Ben Wing <ben(a)xemacs.org> * diagnose.el (show-memory-usage): Conditionalize `sort-numeric-fields' on when-fboundp. build source patch: Diff command: bash -ci "cvs-diff --show-c-function -no-changelog " Files affected: lisp/syntax.el Index: lisp/syntax.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/syntax.el,v retrieving revision 1.4 diff -u -p -r1.4 syntax.el --- lisp/syntax.el 2001/05/04 22:42:15 1.4 +++ lisp/syntax.el 2005/11/13 10:56:52 ＠＠ -2,6 +2,7 ＠＠ ;; Copyright (C) 1993, 1997 Free Software Foundation, Inc. ;; Copyright (C) 1995 Sun Microsystems. +;; Copyright (C) 2005 Ben Wing. ;; This file is part of XEmacs. ＠＠ -238,7 +239,11 ＠＠ This is similar to `map-char-table', but ; spec (aref o ?a) (aref n ?a)))))))) -(defun describe-syntax-table (table stream) +(defun describe-char-table (table mapper describe-value stream) +"Describe char-table TABLE, outputting to STREAM. +MAPPER maps over the table and should be `map-char-table' or +`map-syntax-table'. DESCRIBE-VALUE is a function of two arguments, +VALUE and STREAM, and should output a description of VALUE." (let (first-char last-char prev-val ＠＠ -272,7 +277,7 ＠＠ This is similar to `map-char-table', but (text-char-description first) (text-char-description last)) stream)))) - (describe-syntax-code value stream)) + (funcall describe-value value stream)) #'(lambda (first last value stream) (let* ((tem (text-char-description first)) (pos (length tem)) ＠＠ -290,8 +295,8 ＠＠ This is similar to `map-char-table', but (while (progn (write-char ?\ stream) (setq pos (1+ pos)) (< pos 16)))) - (describe-syntax-code value stream))))) - (map-syntax-table + (funcall describe-value value stream))))) + (funcall mapper #'(lambda (range value) (cond ((not first-char) ＠＠ -320,6 +325,10 ＠＠ This is similar to `map-char-table', but table) (if first-char (funcall describe-one first-char last-char prev-val stream)))) + +(defun describe-syntax-table (table stream) + "Output a description of TABLE (a syntax table) to STREAM." + (describe-char-table table 'map-syntax-table 'describe-syntax-code stream)) (defun describe-syntax-code (code stream) (let ((match (and (consp code) (cdr code)))

1 participants
0 comments

[COMMIT] fix compile warnings 18 years, 5 months

Ben Wing

NOTE: This patch has been committed. lisp/ChangeLog addition: 2005-11-13 Ben Wing <ben(a)xemacs.org> * diagnose.el (show-memory-usage): Conditionalize `sort-numeric-fields' on when-fboundp. build source patch: Diff command: bash -ci "cvs-diff --show-c-function -no-changelog " Files affected: lisp/diagnose.el Index: lisp/diagnose.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/diagnose.el,v retrieving revision 1.5 diff -u -p -r1.5 diagnose.el --- lisp/diagnose.el 2005/11/02 03:26:52 1.5 +++ lisp/diagnose.el 2005/11/13 10:55:22 ＠＠ -96,26 +96,28 ＠＠ (incf grandtotal (show-foo-stats 'charset (charset-list) #'charset-memory-usage)) + (when-fboundp 'sort-numeric-fields + (sort-numeric-fields -1 + (save-excursion + (goto-char begin) + (forward-line 2) + (point)) + (save-excursion + (forward-line -2) + (point)))) + (princ "\n")) + (setq begin (point)) + (incf grandtotal + (show-foo-stats 'buffer (buffer-list) #'buffer-memory-usage)) + (when-fboundp 'sort-numeric-fields (sort-numeric-fields -1 (save-excursion (goto-char begin) - (forward-line 2) + (forward-line 3) (point)) (save-excursion (forward-line -2) - (point))) - (princ "\n")) - (setq begin (point)) - (incf grandtotal - (show-foo-stats 'buffer (buffer-list) #'buffer-memory-usage)) - (sort-numeric-fields -1 - (save-excursion - (goto-char begin) - (forward-line 3) - (point)) - (save-excursion - (forward-line -2) - (point))) + (point)))) (princ "\n") (setq begin (point)) (incf grandtotal

1 participants
0 comments

[COMMIT] don't bomb out when fun has no documentation 18 years, 5 months

Ben Wing

NOTE: This patch has been committed. lisp/ChangeLog addition: 2005-11-13 Ben Wing <ben(a)xemacs.org> * help.el (function-arglist): Don't bomb out when fun has no documentation. build source patch: Diff command: bash -ci "cvs-diff --show-c-function -no-changelog " Files affected: lisp/help.el Index: lisp/help.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/help.el,v retrieving revision 1.45 diff -u -p -r1.45 help.el --- lisp/help.el 2005/10/10 02:45:32 1.45 +++ lisp/help.el 2005/11/13 10:52:06 ＠＠ -1186,7 +1186,8 ＠＠ arguments in the standard Lisp style." (nth 1 fndef)) ((subrp fndef) (let* ((doc (documentation function)) - (args (and (string-match + (args (and doc + (string-match "[\n\t ]*\narguments: ?(\$.*\$)\n?\\'" doc) (match-string 1 doc))))

1 participants
0 comments

[COMMIT] use `princ' not `prin1' for formatted debug msgs 18 years, 5 months

Ben Wing

NOTE: This patch has been committed. lisp/ChangeLog addition: 2005-11-13 Ben Wing <ben(a)xemacs.org> * simple.el (log-warning-minimum-level): * simple.el (display-warning-minimum-level): `foo.' -> `foo'. * simple.el (debug-print-1): princ() a formatted debug string, not prin1(), or it just looks stupid. build source patch: Diff command: bash -ci "cvs-diff --show-c-function -no-changelog " Files affected: lisp/simple.el Index: lisp/simple.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/simple.el,v retrieving revision 1.53 diff -u -p -r1.53 simple.el --- lisp/simple.el 2005/10/18 20:49:43 1.53 +++ lisp/simple.el 2005/11/13 10:50:15 ＠＠ -4387,7 +4387,7 ＠＠ You can also control which warnings are basis. See `display-warning-suppressed-classes' and `log-warning-suppressed-classes'. -For a description of the meaning of the levels, see `display-warning.'" +For a description of the meaning of the levels, see `display-warning'." :type '(choice (const emergency) (const critical) (const error) (const warning) (const alert) (const notice) (const info) (const debug)) ＠＠ -4410,7 +4410,7 ＠＠ You can also control which warnings are basis. See `display-warning-suppressed-classes' and `log-warning-suppressed-classes'. -For a description of the meaning of the levels, see `display-warning.'" +For a description of the meaning of the levels, see `display-warning'." :type '(choice (const emergency) (const critical) (const error) (const warning) (const alert) (const notice) (const info) (const debug)) ＠＠ -4676,7 +4676,7 ＠＠ individually in a numbered list." (error nil)))) (if fmt (progn - (prin1 (apply #'format args)) + (princ (apply #'format args)) (terpri)) (princ "--> ") (let ((i 1))

1 participants
0 comments

[PATCH] use `princ' not `prin1' for formatted debug msgs 18 years, 5 months

Ben Wing

lisp/ChangeLog addition: 2005-11-13 Ben Wing <ben(a)xemacs.org> * simple.el (log-warning-minimum-level): * simple.el (display-warning-minimum-level): `foo.' -> `foo'. * simple.el (debug-print-1): princ() a formatted debug string, not prin1(), or it just looks stupid. build source patch: Diff command: bash -ci "cvs-diff --show-c-function -no-changelog " Files affected: lisp/simple.el Index: lisp/simple.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/simple.el,v retrieving revision 1.53 diff -u -p -r1.53 simple.el --- lisp/simple.el 2005/10/18 20:49:43 1.53 +++ lisp/simple.el 2005/11/13 10:50:15 ＠＠ -4387,7 +4387,7 ＠＠ You can also control which warnings are basis. See `display-warning-suppressed-classes' and `log-warning-suppressed-classes'. -For a description of the meaning of the levels, see `display-warning.'" +For a description of the meaning of the levels, see `display-warning'." :type '(choice (const emergency) (const critical) (const error) (const warning) (const alert) (const notice) (const info) (const debug)) ＠＠ -4410,7 +4410,7 ＠＠ You can also control which warnings are basis. See `display-warning-suppressed-classes' and `log-warning-suppressed-classes'. -For a description of the meaning of the levels, see `display-warning.'" +For a description of the meaning of the levels, see `display-warning'." :type '(choice (const emergency) (const critical) (const error) (const warning) (const alert) (const notice) (const info) (const debug)) ＠＠ -4676,7 +4676,7 ＠＠ individually in a numbered list." (error nil)))) (if fmt (progn - (prin1 (apply #'format args)) + (princ (apply #'format args)) (terpri)) (princ "--> ") (let ((i 1))

1 participants
0 comments

[COMMIT] further error-checking, etc. 18 years, 5 months

Ben Wing

NOTE: This patch has been committed. src/ChangeLog addition: 2005-11-13 Ben Wing <ben(a)xemacs.org> * alloc.c: * alloc.c (alloc_lrecord): * alloc.c (noseeum_alloc_lrecord): * alloc.c (make_uninit_string): * alloc.c (Fmake_string): * alloc.c (make_string_nocopy): * lrecord.h: * lrecord.h (struct lrecord_header): * lrecord.h (set_lheader_implementation): Move around the handling of setting of lheader->uid so it's in set_lheader_implementation() -- that way, even non-MC-ALLOC builds get useful uid's in their bare lrecords. Redo related code for strings so the non-ascii count that is stored in the uid isn't hosed. * events.c: * events.c (deinitialize_event): * events.c (zero_event): Save and restore the uid around event zeroing/deadbeefing. * lisp.h: Set the correct value of MAX_STRING_ASCII_BEGIN under MC_ALLOC. * lisp.h (ZEROP): * lisp.h (XINT): * lisp.h (CHECK_INT): * lisp.h (CONCHECK_INT): * lisp.h (NATNUMP): * lisp.h (CHECK_NATNUM): * lisp.h (CONCHECK_NATNUM): * lisp.h (XCHAR): * lisp.h (XCHAR_OR_INT): * lisp.h (CHAR_INTP): rearrange the basic code handling ints and chars. basic int stuff goes first, followed by basic char stuff, followed in turn by stuff that mixes ints and chars. this is required since some basic defn's have become inline functions. XCHAR and CHARP have additional error-checking in that they check to make sure that the value in question is not just a character but a valid character (i.e. its numeric value is valid). * print.c: * print.c (debug_p4): debug_p4 now has a useful UID in all cases and uses it; but it also prints the raw header address (previously, you just got one of them). * text.h: some basic char defn's that belonged in lisp.h have been moved there. valid_ichar_p() is moved too since the inline functions need it. build source patch: Diff command: bash -ci "cvs-diff --show-c-function -no-changelog " Files affected: src/text.h src/print.c src/lrecord.h src/lisp.h src/events.c src/alloc.c cvs server: Diffing src Index: src/alloc.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/alloc.c,v retrieving revision 1.118 diff -u -p -r1.118 alloc.c --- src/alloc.c 2005/10/25 08:32:46 1.118 +++ src/alloc.c 2005/11/13 10:40:31 ＠＠ -185,7 +185,7 ＠＠ int garbage_collection_messages; EMACS_INT gc_generation_number[1]; /* This is just for use by the printer, to allow things to print uniquely */ -static int lrecord_uid_counter; +int lrecord_uid_counter; /* Nonzero when calling certain hooks or doing other things where a GC would be bad */ ＠＠ -606,7 +606,6 ＠＠ alloc_lrecord (Bytecount size, lheader = (struct lrecord_header *) mc_alloc (size); gc_checking_assert (LRECORD_FREE_P (lheader)); set_lheader_implementation (lheader, implementation); - lheader->uid = lrecord_uid_counter++; #ifdef ALLOC_TYPE_STATS inc_lrecord_stats (size, lheader); #endif /* ALLOC_TYPE_STATS */ ＠＠ -628,7 +627,6 ＠＠ noseeum_alloc_lrecord (Bytecount size, lheader = (struct lrecord_header *) mc_alloc (size); gc_checking_assert (LRECORD_FREE_P (lheader)); set_lheader_implementation (lheader, implementation); - lheader->uid = lrecord_uid_counter++; #ifdef ALLOC_TYPE_STATS inc_lrecord_stats (size, lheader); #endif /* ALLOC_TYPE_STATS */ ＠＠ -2484,6 +2482,10 ＠＠ make_uninit_string (Bytecount length) set_lheader_implementation (&s->u.lheader, &lrecord_string); #endif /* not MC_ALLOC */ + /* The above allocations set the UID field, which overlaps with the + ascii-length field, to some non-zero value. We need to zero it. */ + XSET_STRING_ASCII_BEGIN (wrap_string (s), 0); + set_lispstringp_data (s, BIG_STRING_FULLSIZE_P (fullsize) ? allocate_big_string_chars (length + 1) : allocate_string_chars_struct (wrap_string (s), ＠＠ -2712,16 +2714,6 ＠＠ LENGTH must be a non-negative integer. EMACS_INT i; Ibyte *ptr = XSTRING_DATA (val); -#ifdef MC_ALLOC - /* Need this for the new allocator: strings are using the uid - field for ascii_begin. The uid field is set for debugging, - but the string code assumes here that ascii_begin is always - zero, when not touched. This assumption is not true with - the new allocator, so ascii_begin has to be set to zero - here. */ - XSET_STRING_ASCII_BEGIN (val, 0); -#endif /* not MC_ALLOC */ - for (i = XINT (length); i; i--) { Ibyte *init_ptr = init_str; ＠＠ -2872,6 +2864,8 ＠＠ make_string_nocopy (const Ibyte *content set_lheader_implementation (&s->u.lheader, &lrecord_string); SET_C_READONLY_RECORD_HEADER (&s->u.lheader); #endif /* not MC_ALLOC */ + /* Don't need to XSET_STRING_ASCII_BEGIN() here because it happens in + init_string_ascii_begin(). */ s->plist = Qnil; set_lispstringp_data (s, (Ibyte *) contents); set_lispstringp_length (s, length); Index: src/events.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/events.c,v retrieving revision 1.69 diff -u -p -r1.69 events.c --- src/events.c 2005/10/25 11:16:23 1.69 +++ src/events.c 2005/11/13 10:40:31 ＠＠ -1,7 +1,7 ＠＠ /* Events: printing them, converting them to and from characters. Copyright (C) 1991, 1992, 1993, 1994 Free Software Foundation, Inc. Copyright (C) 1994, 1995 Board of Trustees, University of Illinois. - Copyright (C) 2001, 2002 Ben Wing. + Copyright (C) 2001, 2002, 2005 Ben Wing. This file is part of XEmacs. ＠＠ -86,11 +86,14 ＠＠ static void deinitialize_event (Lisp_Object ev) { Lisp_Event *event = XEVENT (ev); - int i; + /* Preserve the old UID for this event, for tracking it */ + unsigned int old_uid = event->lheader.uid; + for (i = 0; i < (int) (sizeof (Lisp_Event) / sizeof (int)); i++) ((int *) event) [i] = 0xdeadbeef; /* -559038737 base 10 */ set_lheader_implementation (&event->lheader, &lrecord_event); + event->lheader.uid = old_uid; set_event_type (event, dead_event); SET_EVENT_CHANNEL (event, Qnil); XSET_EVENT_NEXT (ev, Qnil); ＠＠ -100,8 +103,12 ＠＠ deinitialize_event (Lisp_Object ev) void zero_event (Lisp_Event *e) { + /* Preserve the old UID for this event, for tracking it */ + unsigned int old_uid = e->lheader.uid; + xzero (*e); set_lheader_implementation (&e->lheader, &lrecord_event); + e->lheader.uid = old_uid; set_event_type (e, empty_event); SET_EVENT_CHANNEL (e, Qnil); SET_EVENT_NEXT (e, Qnil); Index: src/lisp.h =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/lisp.h,v retrieving revision 1.132 diff -u -p -r1.132 lisp.h --- src/lisp.h 2005/10/24 10:07:38 1.132 +++ src/lisp.h 2005/11/13 10:40:33 ＠＠ -2314,7 +2314,11 ＠＠ struct Lisp_String }; typedef struct Lisp_String Lisp_String; +#ifdef MC_ALLOC +#define MAX_STRING_ASCII_BEGIN ((1 << 22) - 1) +#else #define MAX_STRING_ASCII_BEGIN ((1 << 21) - 1) +#endif DECLARE_MODULE_API_LRECORD (string, Lisp_String); #define XSTRING(x) XRECORD (x, string, Lisp_String) ＠＠ -2559,89 +2563,146 ＠＠ DECLARE_MODULE_API_LRECORD (marker, Lisp #define marker_next(m) ((m)->next) #define marker_prev(m) ((m)->prev) -/*------------------------------- char ---------------------------------*/ +/*-------------------basic int (no connection to char)------------------*/ -#define CHARP(x) (XTYPE (x) == Lisp_Type_Char) +#define ZEROP(x) EQ (x, Qzero) #ifdef ERROR_CHECK_TYPES +#define XINT(x) XINT_1 (x, __FILE__, __LINE__) + DECLARE_INLINE_HEADER ( -Ichar -XCHAR_1 (Lisp_Object obj, const Ascbyte *file, int line) +EMACS_INT +XINT_1 (Lisp_Object obj, const Ascbyte *file, int line) ) { - assert_at_line (CHARP (obj), file, line); - return XCHARVAL (obj); + assert_at_line (INTP (obj), file, line); + return XREALINT (obj); } -#define XCHAR(x) XCHAR_1 (x, __FILE__, __LINE__) - #else /* no error checking */ -#define XCHAR(x) ((Ichar) XCHARVAL (x)) +#define XINT(obj) XREALINT (obj) #endif /* no error checking */ -#define CHECK_CHAR(x) CHECK_NONRECORD (x, Lisp_Type_Char, Qcharacterp) -#define CONCHECK_CHAR(x) CONCHECK_NONRECORD (x, Lisp_Type_Char, Qcharacterp) +#define CHECK_INT(x) do { \ + if (!INTP (x)) \ + dead_wrong_type_argument (Qintegerp, x); \ +} while (0) +#define CONCHECK_INT(x) do { \ + if (!INTP (x)) \ + x = wrong_type_argument (Qintegerp, x); \ +} while (0) -/*------------------------------ float ---------------------------------*/ +#define NATNUMP(x) (INTP (x) && XINT (x) >= 0) -/* Note: the 'unused_next_' field exists only to ensure that the - `next' pointer fits within the structure, for the purposes of the - free list. This makes a difference in the unlikely case of - sizeof(double) being smaller than sizeof(void *). */ +#define CHECK_NATNUM(x) do { \ + if (!NATNUMP (x)) \ + dead_wrong_type_argument (Qnatnump, x); \ +} while (0) -struct Lisp_Float -{ - struct lrecord_header lheader; - union { double d; struct Lisp_Float *unused_next_; } data; -}; -typedef struct Lisp_Float Lisp_Float; +#define CONCHECK_NATNUM(x) do { \ + if (!NATNUMP (x)) \ + x = wrong_type_argument (Qnatnump, x); \ +} while (0) -DECLARE_LRECORD (float, Lisp_Float); -#define XFLOAT(x) XRECORD (x, float, Lisp_Float) -#define wrap_float(p) wrap_record (p, float) -#define FLOATP(x) RECORDP (x, float) -#define CHECK_FLOAT(x) CHECK_RECORD (x, float) -#define CONCHECK_FLOAT(x) CONCHECK_RECORD (x, float) +/*------------------------------- char ---------------------------------*/ -#define float_data(f) ((f)->data.d) -#define XFLOAT_DATA(x) float_data (XFLOAT (x)) +/* NOTE: There are basic functions for converting between a character and + the string representation of a character in text.h, as well as lots of + other character-related stuff. There are other functions/macros for + working with Ichars in charset.h, for retrieving the charset of an + Ichar, the length of an Ichar when converted to text, etc. +*/ -#define XFLOATINT(n) extract_float (n) +#ifdef MULE -#define CHECK_INT_OR_FLOAT(x) do { \ - if (!INT_OR_FLOATP (x)) \ - dead_wrong_type_argument (Qnumberp, x); \ -} while (0) +MODULE_API int non_ascii_valid_ichar_p (Ichar ch); -#define CONCHECK_INT_OR_FLOAT(x) do { \ - if (!INT_OR_FLOATP (x)) \ - x = wrong_type_argument (Qnumberp, x); \ -} while (0) +/* Return whether the given Ichar is valid. + */ -# define INT_OR_FLOATP(x) (INTP (x) || FLOATP (x)) +DECLARE_INLINE_HEADER ( +int +valid_ichar_p (Ichar ch) +) +{ + return (! (ch & ~0xFF)) || non_ascii_valid_ichar_p (ch); +} -/*-------------------------------- int ---------------------------------*/ +#else /* not MULE */ -#define ZEROP(x) EQ (x, Qzero) +/* This works when CH is negative, and correctly returns non-zero only when CH + is in the range [0, 255], inclusive. */ +#define valid_ichar_p(ch) (! (ch & ~0xFF)) +#endif /* not MULE */ + #ifdef ERROR_CHECK_TYPES -#define XCHAR_OR_INT(x) XCHAR_OR_INT_1 (x, __FILE__, __LINE__) -#define XINT(x) XINT_1 (x, __FILE__, __LINE__) +DECLARE_INLINE_HEADER ( +int +CHARP_1 (Lisp_Object obj, const Ascbyte *file, int line) +) +{ + if (XTYPE (obj) != Lisp_Type_Char) + return 0; + assert_at_line (valid_ichar_p (XCHARVAL (obj)), file, line); + return 1; +} + +#define CHARP(x) CHARP_1 (x, __FILE__, __LINE__) DECLARE_INLINE_HEADER ( -EMACS_INT -XINT_1 (Lisp_Object obj, const Ascbyte *file, int line) +Ichar +XCHAR_1 (Lisp_Object obj, const Ascbyte *file, int line) ) { - assert_at_line (INTP (obj), file, line); - return XREALINT (obj); + Ichar ch; + assert_at_line (CHARP (obj), file, line); + ch = XCHARVAL (obj); + assert_at_line (valid_ichar_p (ch), file, line); + return ch; } +#define XCHAR(x) XCHAR_1 (x, __FILE__, __LINE__) + +#else /* not ERROR_CHECK_TYPES */ + +#define CHARP(x) (XTYPE (x) == Lisp_Type_Char) +#define XCHAR(x) ((Ichar) XCHARVAL (x)) + +#endif /* (else) not ERROR_CHECK_TYPES */ + +#define CONCHECK_CHAR(x) do { \ + if (!CHARP (x)) \ + x = wrong_type_argument (Qcharacterp, x); \ + } while (0) + +#define CHECK_CHAR(x) do { \ + if (!CHARP (x)) \ + dead_wrong_type_argument (Qcharacterp, x); \ + } while (0) + + +DECLARE_INLINE_HEADER ( +Lisp_Object +make_char (Ichar val) +) +{ + type_checking_assert (valid_ichar_p (val)); + /* This is defined in lisp-union.h or lisp-disunion.h */ + return make_char_1 (val); +} + +/*------------------------- int-char connection ------------------------*/ + +#ifdef ERROR_CHECK_TYPES + +#define XCHAR_OR_INT(x) XCHAR_OR_INT_1 (x, __FILE__, __LINE__) + DECLARE_INLINE_HEADER ( EMACS_INT XCHAR_OR_INT_1 (Lisp_Object obj, const Ascbyte *file, int line) ＠＠ -2653,31 +2714,39 ＠＠ XCHAR_OR_INT_1 (Lisp_Object obj, const A #else /* no error checking */ -#define XINT(obj) XREALINT (obj) #define XCHAR_OR_INT(obj) (CHARP (obj) ? XCHAR (obj) : XINT (obj)) #endif /* no error checking */ -#define CHECK_INT(x) do { \ - if (!INTP (x)) \ - dead_wrong_type_argument (Qintegerp, x); \ -} while (0) +/* True of X is an integer whose value is the valid integral equivalent of a + character. */ -#define CONCHECK_INT(x) do { \ - if (!INTP (x)) \ - x = wrong_type_argument (Qintegerp, x); \ -} while (0) +#define CHAR_INTP(x) (INTP (x) && valid_ichar_p (XINT (x))) -#define NATNUMP(x) (INTP (x) && XINT (x) >= 0) +/* True of X is a character or an integral value that can be converted into a + character. */ +#define CHAR_OR_CHAR_INTP(x) (CHARP (x) || CHAR_INTP (x)) -#define CHECK_NATNUM(x) do { \ - if (!NATNUMP (x)) \ - dead_wrong_type_argument (Qnatnump, x); \ -} while (0) +DECLARE_INLINE_HEADER ( +Ichar +XCHAR_OR_CHAR_INT (Lisp_Object obj) +) +{ + return CHARP (obj) ? XCHAR (obj) : XINT (obj); +} -#define CONCHECK_NATNUM(x) do { \ - if (!NATNUMP (x)) \ - x = wrong_type_argument (Qnatnump, x); \ +/* Signal an error if CH is not a valid character or integer Lisp_Object. + If CH is an integer Lisp_Object, convert it to a character Lisp_Object, + but merely by repackaging, without performing tests for char validity. + */ + +#define CHECK_CHAR_COERCE_INT(x) do { \ + if (CHARP (x)) \ + ; \ + else if (CHAR_INTP (x)) \ + x = make_char (XINT (x)); \ + else \ + x = wrong_type_argument (Qcharacterp, x); \ } while (0) /* next three always continuable because they coerce their arguments. */ ＠＠ -2710,6 +2779,43 ＠＠ XCHAR_OR_INT_1 (Lisp_Object obj, const A x = wrong_type_argument (Qinteger_char_or_marker_p, x); \ } while (0) +/*------------------------------ float ---------------------------------*/ + +/* Note: the 'unused_next_' field exists only to ensure that the + `next' pointer fits within the structure, for the purposes of the + free list. This makes a difference in the unlikely case of + sizeof(double) being smaller than sizeof(void *). */ + +struct Lisp_Float +{ + struct lrecord_header lheader; + union { double d; struct Lisp_Float *unused_next_; } data; +}; +typedef struct Lisp_Float Lisp_Float; + +DECLARE_LRECORD (float, Lisp_Float); +#define XFLOAT(x) XRECORD (x, float, Lisp_Float) +#define wrap_float(p) wrap_record (p, float) +#define FLOATP(x) RECORDP (x, float) +#define CHECK_FLOAT(x) CHECK_RECORD (x, float) +#define CONCHECK_FLOAT(x) CONCHECK_RECORD (x, float) + +#define float_data(f) ((f)->data.d) +#define XFLOAT_DATA(x) float_data (XFLOAT (x)) + +#define XFLOATINT(n) extract_float (n) + +#define CHECK_INT_OR_FLOAT(x) do { \ + if (!INT_OR_FLOATP (x)) \ + dead_wrong_type_argument (Qnumberp, x); \ +} while (0) + +#define CONCHECK_INT_OR_FLOAT(x) do { \ + if (!INT_OR_FLOATP (x)) \ + x = wrong_type_argument (Qnumberp, x); \ +} while (0) + +# define INT_OR_FLOATP(x) (INTP (x) || FLOATP (x)) /*--------------------------- readonly objects -------------------------*/ Index: src/lrecord.h =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/lrecord.h,v retrieving revision 1.42 diff -u -p -r1.42 lrecord.h --- src/lrecord.h 2005/10/26 13:01:42 1.42 +++ src/lrecord.h 2005/11/13 10:40:34 ＠＠ -120,9 +120,9 ＠＠ struct lrecord_header debugging. */ unsigned int free :1; - /* The `uid' field is just for debugging/printing convenience. - Having this slot doesn't hurt us much spacewise, since the - bits are unused anyway. */ + /* The `uid' field is just for debugging/printing convenience. Having + this slot doesn't hurt us spacewise, since the bits are unused + anyway. (The bits are used for strings, though.) */ unsigned int uid :22; #else /* not MC_ALLOC */ ＠＠ -140,13 +140,17 ＠＠ struct lrecord_header /* 1 if the object is readonly from lisp */ unsigned int lisp_readonly :1; - unsigned int unused :21; + /* The `uid' field is just for debugging/printing convenience. Having + this slot doesn't hurt us spacewise, since the bits are unused + anyway. (The bits are used for strings, though.) */ + unsigned int uid :21; #endif /* not MC_ALLOC */ }; struct lrecord_implementation; int lrecord_type_index (const struct lrecord_implementation *implementation); +extern int lrecord_uid_counter; #ifdef MC_ALLOC #define set_lheader_implementation(header,imp) do { \ ＠＠ -154,6 +158,7 ＠＠ int lrecord_type_index (const struct lre SLI_header->type = (imp)->lrecord_type_index; \ SLI_header->lisp_readonly = 0; \ SLI_header->free = 0; \ + SLI_header->uid = lrecord_uid_counter++; \ } while (0) #else /* not MC_ALLOC */ #define set_lheader_implementation(header,imp) do { \ ＠＠ -162,6 +167,7 ＠＠ int lrecord_type_index (const struct lre SLI_header->mark = 0; \ SLI_header->c_readonly = 0; \ SLI_header->lisp_readonly = 0; \ + SLI_header->uid = lrecord_uid_counter++; \ } while (0) #endif /* not MC_ALLOC */ Index: src/print.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/print.c,v retrieving revision 1.56 diff -u -p -r1.56 print.c --- src/print.c 2005/10/25 08:32:48 1.56 +++ src/print.c 2005/11/13 10:40:34 ＠＠ -1,6 +1,6 ＠＠ /* Lisp object printing and output streams. Copyright (C) 1985, 1986, 1988, 1992-1995 Free Software Foundation, Inc. - Copyright (C) 1995, 1996, 2000, 2001, 2002, 2003 Ben Wing. + Copyright (C) 1995, 1996, 2000, 2001, 2002, 2003, 2005 Ben Wing. This file is part of XEmacs. ＠＠ -2211,14 +2211,16 ＠＠ debug_p4 (Lisp_Object obj) (EMACS_INT) header); else #ifdef MC_ALLOC - debug_out ("#<%s 0x%lx>", + debug_out ("#<%s addr=0x%lx uid=0x%lx>", LHEADER_IMPLEMENTATION (header)->name, + (EMACS_INT) header, (EMACS_INT) ((struct lrecord_header *) header)->uid); #else /* not MC_ALLOC */ - debug_out ("#<%s 0x%lx>", + debug_out ("#<%s addr=0x%lx uid=0x%lx>", LHEADER_IMPLEMENTATION (header)->name, + (EMACS_INT) header, LHEADER_IMPLEMENTATION (header)->basic_p ? - (EMACS_INT) header : + ((struct lrecord_header *) header)->uid : ((struct old_lcrecord_header *) header)->uid); #endif /* not MC_ALLOC */ } Index: src/text.h =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/text.h,v retrieving revision 1.28 diff -u -p -r1.28 text.h --- src/text.h 2005/01/28 02:36:27 1.28 +++ src/text.h 2005/11/13 10:40:35 ＠＠ -1,7 +1,7 ＠＠ /* Header file for text manipulation primitives and macros. Copyright (C) 1985-1995 Free Software Foundation, Inc. Copyright (C) 1995 Sun Microsystems, Inc. - Copyright (C) 2000, 2001, 2002, 2003, 2004 Ben Wing. + Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Ben Wing. This file is part of XEmacs. ＠＠ -1005,73 +1005,6 ＠＠ itext_copy_ichar (const Ibyte *src, Ibyt #define itext_ichar_n(ptr, offset) \ itext_ichar (itext_n_addr (ptr, offset)) - - -/* ---------------------------- */ -/* Working with Ichars */ -/* ---------------------------- */ - -/* NOTE: There are other functions/macros for working with Ichars in - charset.h, for retrieving the charset of an Ichar, the length of an - Ichar when converted to text, etc. -*/ - -#ifdef MULE - -MODULE_API int non_ascii_valid_ichar_p (Ichar ch); - -/* Return whether the given Ichar is valid. - */ - -DECLARE_INLINE_HEADER ( -int -valid_ichar_p (Ichar ch) -) -{ - return (! (ch & ~0xFF)) || non_ascii_valid_ichar_p (ch); -} - -#else /* not MULE */ - -#define valid_ichar_p(ch) (! (ch & ~0xFF)) - -#endif /* not MULE */ - -DECLARE_INLINE_HEADER ( -Lisp_Object -make_char (Ichar val) -) -{ - type_checking_assert (valid_ichar_p (val)); - return make_char_1 (val); -} - -#define CHAR_INTP(x) (INTP (x) && valid_ichar_p (XINT (x))) - -#define CHAR_OR_CHAR_INTP(x) (CHARP (x) || CHAR_INTP (x)) - -DECLARE_INLINE_HEADER ( -Ichar -XCHAR_OR_CHAR_INT (Lisp_Object obj) -) -{ - return CHARP (obj) ? XCHAR (obj) : XINT (obj); -} - -/* Signal an error if CH is not a valid character or integer Lisp_Object. - If CH is an integer Lisp_Object, convert it to a character Lisp_Object, - but merely by repackaging, without performing tests for char validity. - */ - -#define CHECK_CHAR_COERCE_INT(x) do { \ - if (CHARP (x)) \ - ; \ - else if (CHAR_INTP (x)) \ - x = make_char (XINT (x)); \ - else \ - x = wrong_type_argument (Qcharacterp, x); \ -} while (0) - /************************************************************************/ cvs server: Diffing src/m cvs server: Diffing src/s

1 participants
0 comments

[COMMIT] fix up clean targets to delete .elc's as necessary 18 years, 5 months

Ben Wing

NOTE: This patch has been committed. ChangeLog addition: 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. src/ChangeLog addition: 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. lwlib/ChangeLog addition: 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. lib-src/ChangeLog addition: 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. netinstall/ChangeLog addition: 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. man/ChangeLog addition: 2005-11-13 Ben Wing <ben(a)xemacs.org> * Makefile: Add targets distclean-noconfig, realclean-noconfig, extraclean-noconfig. Do some refactoring for cleanliness. modules/ChangeLog addition: 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. build source patch: Diff command: bash -ci "cvs-diff --show-c-function -no-changelog " Files affected: modules/common/Makefile.common man/Makefile dynodump/Makefile.in.in netinstall/Makefile.in.in lib-src/Makefile.in.in lwlib/Makefile.in.in src/Makefile.in.in Makefile.in.in Index: Makefile.in.in =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/Makefile.in.in,v retrieving revision 1.26 diff -u -p -r1.26 Makefile.in.in --- Makefile.in.in 2005/10/04 17:51:13 1.26 +++ Makefile.in.in 2005/11/13 10:33:33 ＠＠ -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' Index: src/Makefile.in.in =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/Makefile.in.in,v retrieving revision 1.119 diff -u -p -r1.119 Makefile.in.in --- src/Makefile.in.in 2005/10/21 15:48:42 1.119 +++ src/Makefile.in.in 2005/11/13 10:33:35 ＠＠ -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/\#* Index: lwlib/Makefile.in.in =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lwlib/Makefile.in.in,v retrieving revision 1.18 diff -u -p -r1.18 Makefile.in.in --- lwlib/Makefile.in.in 2004/09/20 19:19:16 1.18 +++ lwlib/Makefile.in.in 2005/11/13 10:33:37 ＠＠ -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 Index: lib-src/Makefile.in.in =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lib-src/Makefile.in.in,v retrieving revision 1.47 diff -u -p -r1.47 Makefile.in.in --- lib-src/Makefile.in.in 2005/04/08 23:10:36 1.47 +++ lib-src/Makefile.in.in 2005/11/13 10:33:38 ＠＠ -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. Index: netinstall/Makefile.in.in =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/netinstall/Makefile.in.in,v retrieving revision 1.5 diff -u -p -r1.5 Makefile.in.in --- netinstall/Makefile.in.in 2001/12/20 05:49:40 1.5 +++ netinstall/Makefile.in.in 2005/11/13 10:33:40 ＠＠ -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 \ Index: dynodump/Makefile.in.in =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/dynodump/Makefile.in.in,v retrieving revision 1.12 diff -u -p -r1.12 Makefile.in.in --- dynodump/Makefile.in.in 2001/04/12 18:20:43 1.12 +++ dynodump/Makefile.in.in 2005/11/13 10:33:41 ＠＠ -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) *~ \#* Index: man/Makefile =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/man/Makefile,v retrieving revision 1.34 diff -u -p -r1.34 Makefile --- man/Makefile 2005/01/31 20:08:47 1.34 +++ man/Makefile 2005/11/13 10:33:43 ＠＠ -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) *~ \#* */*~ */\#* ############################################################################ Index: modules/common/Makefile.common =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/modules/common/Makefile.common,v retrieving revision 1.10 diff -u -p -r1.10 Makefile.common --- modules/common/Makefile.common 2004/11/08 15:14:52 1.10 +++ modules/common/Makefile.common 2005/11/13 10:33:44 ＠＠ -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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

XEmacs-Patches November 2005