9:45 p.m.
>>>> "Alastair" == Alastair J Houghton
<ajhoughton(a)lineone.net> writes:
Applying this patch against latest CVS leads following result:
cd d:\tmp\21.2\xemacs\
patch --strip=2 < d:\tmp\xemacs-21.2.diff
Compilation started at Mon Jul 10 22:18:49 2000 +0200 (W. Europe Daylight Time)
patching file `lisp/select.el'
patching file `src/console.h'
Hunk #1 FAILED at 91.
1 out of 1 hunk FAILED -- saving rejects to src/console.h.rej
patching file `src/select-msw.c'
patching file `src/select-x.c'
patching file `src/select.c'
patching file `src/select.h'
Compilation exited abnormally with code 1 at Mon Jul 10 22:18:54
Building after
manually patching src/console.h
leads to following link error:
cd d:\tmp\21.2\xemacs\nt\
nmake /f xemacs.mak INSTALL_DIR="c:\XEmacs\XEmacs-$(XEMACS_VERSION_STRING)"
PACKAGE_PREFIX="c:\XEmacs" HAVE_XPM="1" HAVE_PNG="1"
HAVE_TIFF="1" HAVE_JPEG="1" HAVE_XFACE="1"
DEBUG_XEMACS="1" USE_PORTABLE_DUMPER="1" GUNG_HO="1"
MAKEINFO="d:\tmp\texinfo-4.0\makeinfo\makeinfo.exe"
COMPFACE_DIR="d:\tmp\libs4xemacs\compface"
JPEG_DIR="d:\tmp\libs4xemacs\jpeg-6b"
TIFF_DIR="d:\tmp\libs4xemacs\tiff-v3.4"
ZLIB_DIR="d:\tmp\libs4xemacs\zlib"
PNG_DIR="d:\tmp\libs4xemacs\libpng-1.0.2"
XPM_DIR="d:\tmp\libs4xemacs\xpm-3.4k" all
Compilation started at Mon Jul 10 22:32:58 2000
Microsoft (R) Program Maintenance Utility Version 6.00.8168.0
Copyright (C) Microsoft Corp 1988-1998. All rights reserved.
WARNING: Compiling without dependency information.
Creating ..\lib-src\config.values
--------------------------------------------------------------------
OS: Windows_NT
XEmacs 21.2-b34 \"Molpe\" configured for `i586-pc-win32'.
Building XEmacs in \"d:\\tmp\\21.2\\xemacs\\nt\".
Using compiler \"cl -nologo -W3 -Od -Zi -MDd\".
Installing XEmacs in \"c:\\XEmacs\\XEmacs-21.2-b34\".
Package path is
\"~\\.xemacs;;c:\\XEmacs\\site-packages;c:\\XEmacs\\xemacs-packages\".
Compiling in support for Microsoft Windows native GUI.
Compiling in support for XPM images.
Compiling in support for GIF images.
Compiling in support for PNG images.
Compiling in support for TIFF images.
Compiling in support for JPEG images.
Compiling in support for X-Face message headers.
Compiling in support for toolbars.
Compiling in support for dialogs.
Compiling in support for widgets.
Compiling in support for native sounds.
Compiling in fast dired implementation.
Using minimal tagbits.
Using indexed lrecord implementation.
Using portable dumper.
Using system malloc.
Using DLL version of C runtime library
Compiling in extra debug checks. XEmacs will be slow!
--------------------------------------------------------------------
copy config.h ..\src
1 file(s) copied.
copy Emacs.ad.h ..\src
1 file(s) copied.
copy paths.h ..\src
1 file(s) copied.
cd ..\lib-src
make-dump-id.c
cd ..\nt
cd ..\lib-src
etags.c
getopt.c
getopt1.c
regex.c
Generating Code...
cd ..\nt
cd ..\lib-src
hexl.c
cd ..\nt
cd ..\lib-src
i.c
cd ..\nt
cd ..\lib-src
make-docfile.c
cd ..\nt
cd ..\lib-src
mmencode.c
cd ..\nt
cd ..\lib-src
movemail.c
pop.c
getopt.c
getopt1.c
regex.c
Generating Code...
cd ..\nt
cd ..\lib-src
sorted-doc.c
cd ..\nt
cd ..\lib-src
wakeup.c
cd ..\nt
nmake -nologo -f minitar.mak ZLIB="d:\tmp\libs4xemacs\zlib"
NT="..\nt" LIB_SRC="..\lib-src"
cl -Fo..\lib-src\minitar.obj -c ..\nt\minitar.c -I d:\tmp\libs4xemacs\zlib
Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 12.00.8168 for 80x86
Copyright (C) Microsoft Corp 1984-1998. All rights reserved.
minitar.c
cl -o ..\lib-src\minitar.exe ..\lib-src\minitar.obj d:\tmp\libs4xemacs\zlib\zlib.lib
Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 12.00.8168 for 80x86
Copyright (C) Microsoft Corp 1984-1998. All rights reserved.
Microsoft (R) Incremental Linker Version 6.00.8447
Copyright (C) Microsoft Corp 1992-1998. All rights reserved.
/out:minitar.exe
/out:..\lib-src\minitar.exe
..\lib-src\minitar.obj
d:\tmp\libs4xemacs\zlib\zlib.lib
console-msw.c
<lines deleted by Adrian>
window.c
rc -Fo..\nt\obj\xemacs.res xemacs.rc
bscmake -nologo -o..\src\temacs.bsc ＠bscmake.tmp
nmake -nologo -f xemacs.mak OUTDIR=..\nt\obj ..\nt\obj\dump-id.obj
WARNING: Compiling without dependency information.
Creating ..\lib-src\config.values
cd ..\src
..\lib-src\make-dump-id.exe
cd ..\nt
dump-id.c
link.exe ＠C:\TEMP\nmb00336.
specifier.obj : error LNK2005: _Qappend already defined in select.obj
..\src\temacs.exe : fatal error LNK1169: one or more multiply defined symbols found
NMAKE : fatal error U1077: 'link.exe' : return code '0x491'
Stop.
Compilation exited abnormally with code 2 at Mon Jul 10 22:37:01
Do you have CVS access?
That would be a much better way to keep your sources in synch with others.
Does your diff program not support the -u switch?
Best regards,
Adrian
Alastair> Doh. Forgot to remove one of the type checks, which broke my
Alastair> new version of rtf-support.el. The only changes from the
Alastair> previous version of this patch is the removal of lines 141-150
Alastair> of select.el, which read
Alastair> (or (valid-simple-selection-p data)
Alastair> (and (vectorp data)
Alastair> (let ((valid t)
Alastair> (i (1- (length data))))
Alastair> (while (>= i 0)
Alastair> (or (valid-simple-selection-p (aref data i))
Alastair> (setq valid nil))
Alastair> (setq i (1- i)))
Alastair> valid))
Alastair> (signal 'error (list "invalid selection" data)))
Alastair> but no longer make sense because we support arbitrary types
Alastair> now, and the doc string update to better reflect what the
Alastair> function own-selection now does.
Alastair> Here's a new version of the patch.
Alastair> 2000-07-10 Alastair J. Houghton <ajhoughton(a)lineone.net>
Alastair> * select-msw.c (x_sym_p): New.
Alastair> * select-msw.c (symbol_to_ms_cf): New.
Alastair> * select-msw.c (ms_cf_to_symbol): New.
Alastair> New functions to deal with symbols & clipboard formats. Can also
Alastair> handle string names.
Alastair> * console.h (own_selection_method):
Alastair> * console.h (selection_exists_p_method):
Alastair> * select.c (own-selection-internal):
Alastair> * select.c (selection-exists-p):
Alastair> * select-x.c (x_own_selection):
Alastair> * select-x.c (x_selection_exists_p):
Alastair> * select-msw.c (mswindows_own_selection):
Alastair> * select-msw.c (mswindows_selection_exists_p):
Alastair> Added `data-type' parameter. Use it.
Alastair> * console.h (available_selection_types_method): New.
Alastair> * console.h (register_selection_data_type_method): New.
Alastair> * console.h (selection_data_type_name): New.
Alastair> * select-msw.c (mswindows_available_selection_types): New.
Alastair> * select-msw.c (mswindows_register_selection_data_type): New.
Alastair> * select-msw.c (mswindows_selection_data_type_name): New.
Alastair> * select.c (available-selection-types): New.
Alastair> * select.c (register-selection-data-type): New.
Alastair> * select.c (selection-data-type-name): New.
Alastair> New functions to deal with device-specific selection data formats.
Alastair> * select-msw.c (mswindows_own_selection):
Alastair> * select-msw.c (mswindows_get_foreign_selection):
Alastair> * select-msw.c (mswindows_selection_exists_p):
Alastair> Rewrote.
Alastair> * select-msw.c (console_create_select_mswindows): Added new methods.
Alastair> * select.c (selection-converter-out-alist): Renamed.
Alastair> * select.c (selection-converter-in-alist): New.
Alastair> * select.c (selection-appender-alist): New.
Alastair> Added new alists.
Alastair> * select.c (syms_of_select, vars_of_select):
Alastair> Added new symbols & variables.
Alastair> * select.c (get_local_selection): Split.
Alastair> * select.h, select.c (convert_selection): New.
Alastair> Created convert_selection() function based on get_local_selection().
Alastair> * select.h, select.c (QCF_*):
Alastair> New symbols representing mswindows clipboard formats.
Alastair> * select.h, select.c (Qreplace_all, Qreplace_existing, Qappend):
Alastair> New symbols representing `how-to-add' modes.
Alastair> * select.c: Removed spurious type checking - selections may now be of
Alastair> any type, not just strings.
Alastair> * select-x.c: Added some comments about maybe using new functionality.
Alastair> * select.el (own-selection):
Alastair> * select.el (selection-exists-p):
Alastair> Added `data-type' parameter.
Alastair> * select.c (own-selection-internal):
Alastair> * select-x.c (x_own_selection):
Alastair> * select-msw.c (mswindows_own_selection):
Alastair> * select.el (own-selection):
Alastair> * select.el (own-clipboard):
Alastair> Changed `append' parameter to `how-to-use' parameter.
Alastair> * select.el (own-selection): Removed icky append code.
Alastair> * select.el (own-selection, get-selection): Removed extra type
checking.
Alastair> * select.el (selection-appender-alist):
Alastair> * select.el (selection-converter-{in|out}-alist):
Alastair> Initialise.
Alastair> * select.el (select-append-to-*): New.
Alastair> * select.el (select-convert-from-*): New.
Alastair> New functions to append data and convert data from external type.
Alastair> --
Alastair> ____________________________________________________________
Alastair> Alastair Houghton ajhoughton(a)lineone.net