4:51 p.m.
Ar an chéad lá de mí Bealtaine, scríobh Adrian Aichner:
Doesn't help.
I build on Windows XP using xemacs.mak, not configure && make.
This does (should be applied from with src/, I don’t have patcher to hand on
the XP machine). I intend committing a version of it tomorrow.
diff -u sysfile.h~ sysfile.h
--- sysfile.h~ Sat Apr 29 18:15:32 2006
+++ sysfile.h Fri May 05 16:36:07 2006
＠＠ -467,6 +467,7 ＠＠
#define SEPCHAR ';'
#define DEFAULT_DIRECTORY_SEP '\\'
+#ifdef emacs
DECLARE_INLINE_HEADER (Ibyte sysfile_get_directory_sep (void))
{
if (!CHARP (Vdirectory_sep_char)
＠＠ -484,6 +485,12 ＠＠
}
#define DIRECTORY_SEP sysfile_get_directory_sep()
+#else /* emacs */
+
+#define DIRECTORY_SEP DEFAULT_DIRECTORY_SEP
+
+#endif /* emacs */
+
#else /* not WIN32_NATIVE */
#define SEPCHAR ':'
＠＠ -499,6 +506,8 ＠＠
#define IS_DEVICE_SEP(c) ((c) == DEVICE_SEP)
+#ifdef emacs
+
DECLARE_INLINE_HEADER (int IS_DIRECTORY_SEP (Ichar c))
{
return (c == '/' || c == '\\');
＠＠ -508,6 +517,20 ＠＠
{
return (c == '/' || c == '\\' || c == ':');
}
+
+#else /* emacs */
+
+DECLARE_INLINE_HEADER (int IS_DIRECTORY_SEP (int c))
+{
+ return (c == '/' || c == '\\');
+}
+
+DECLARE_INLINE_HEADER (int IS_ANY_SEP (int c))
+{
+ return (c == '/' || c == '\\' || c == ':');
+}
+
+#endif
#else /* not WIN32_ANY */
diff -u symbols.c~ symbols.c
--- symbols.c~ Sat Apr 29 18:15:30 2006
+++ symbols.c Fri May 05 16:30:02 2006
＠＠ -729,7 +729,7 ＠＠
if (!SUBRP (subr))
wrong_type_argument (Qsubrp, subr);
name = XSUBR (subr)->name;
- return make_string (name, strlen (name));
+ return make_string ((const Ibyte *)name, strlen (name));
}
DEFUN ("setplist", Fsetplist, 2, 2, 0, /*
However, the build fails later with this:
NMAKE: fatal error U1095: expanded command line 'echo link -nologo -debug -opt:noref
-incremental:no -base:0x1000000 -stack:0x800000 -entry:mainCRTStartup -subsystem:windows
-heap:0x00100000 -nodefaultlib setargv.obj -pdb:C:\xemacs-21.5\src\temacs.pdb
-map:C:\xemacs-21.5\src\temacs.map -out:C:\xemacs-21.5\src\temacs.exe
C:\xemacs-21.5\nt\obj\console-msw.obj C:\xemacs-21.5\nt\obj\device-msw.obj
C:\xemacs-21.5\nt\obj\event-msw.obj C:\xemacs-21.5\nt\obj\frame-msw.obj
C:\xemacs-21.5\nt\obj\glyphs-msw.obj C:\xemacs-21.5\nt\obj\gui-msw.obj
C:\xemacs-21.5\nt\obj\objects-msw.obj C:\xemacs-21.5\nt\obj\redisplay-msw.obj
C:\xemacs-21.5\nt\obj\select-msw.obj C:\xemacs-21.5\nt\obj\dired-msw.obj
C:\xemacs-21.5\nt\obj\menubar.obj C:\xemacs-21.5\nt\obj\menubar-msw.obj
C:\xemacs-21.5\nt\obj\scrollbar.obj C:\xemacs-21.5\nt\obj\scrollbar-msw.obj
C:\xemacs-21.5\nt\obj\toolbar.obj C:\xemacs-21.5\nt\obj\toolbar-msw.obj
C:\xemacs-21.5\nt\obj\dialog.obj C:\xemacs-21.5\nt\obj\dialog-m!
sw.obj C:\xemacs-21.5\nt\obj\dgif_lib.obj C:\xemacs-21.5\nt\obj\gif_io.obj
C:\xemacs-21.5\nt\obj\mule-ccl.obj C:\xemacs-21.5\nt\obj\mule-charset.obj
C:\xemacs-21.5\nt\obj\mule-coding.obj C:\xemacs-21.5\nt\obj\debug.obj
C:\xemacs-21.5\nt\obj\tests.obj C:\xemacs-21.5\nt\obj\dumper.obj
C:\xemacs-21.5\nt\obj\abbrev.obj C:\xemacs-21.5\nt\obj\alloc.obj
C:\xemacs-21.5\nt\obj\alloca.obj C:\xemacs-21.5\nt\obj\blocktype.obj
C:\xemacs-21.5\nt\obj\buffer.obj C:\xemacs-21.5\nt\obj\bytecode.obj
C:\xemacs-21.5\nt\obj\callint.obj C:\xemacs-21.5\nt\obj\casefiddle.obj
C:\xemacs-21.5\nt\obj\casetab.obj C:\xemacs-21.5\nt\obj\chartab.obj
C:\xemacs-21.5\nt\obj\cmdloop.obj C:\xemacs-21.5\nt\obj\cmds.obj
C:\xemacs-21.5\nt\obj\console-stream.obj C:\xemacs-21.5\nt\obj\console.obj
C:\xemacs-21.5\nt\obj\data.obj C:\xemacs-21.5\nt\obj\device.obj
C:\xemacs-21.5\nt\obj\dired.obj C:\xemacs-21.5\nt\obj\doc.obj
C:\xemacs-21.5\nt\obj\doprnt.obj C:\xemacs-21.5\nt\obj\dragdrop.obj C:\xema!
cs-21.5\nt\obj\dynarr.obj C:\xemacs-21.5\nt\obj\editfns.obj !
C:\xemac
s-21.5\nt\obj\elhash.obj C:\xemacs-21.5\nt\obj\emacs.obj
C:\xemacs-21.5\nt\obj\emodules.obj C:\xemacs-21.5\nt\obj\eval.obj
C:\xemacs-21.5\nt\obj\event-stream.obj C:\xemacs-21.5\nt\obj\events.obj
C:\xemacs-21.5\nt\obj\extents.obj C:\xemacs-21.5\nt\obj\faces.obj
C:\xemacs-21.5\nt\obj\file-coding.obj C:\xemacs-21.5\nt\obj\fileio.obj
C:\xemacs-21.5\nt\obj\filemode.obj C:\xemacs-21.5\nt\obj\floatfns.obj
C:\xemacs-21.5\nt\obj\fns.obj C:\xemacs-21.5\nt\obj\font-lock.obj
C:\xemacs-21.5\nt\obj\frame.obj C:\xemacs-21.5\nt\obj\gc.obj
C:\xemacs-21.5\nt\obj\general.obj C:\xemacs-21.5\nt\obj\getloadavg.obj
C:\xemacs-21.5\nt\obj\glyphs.obj C:\xemacs-21.5\nt\obj\glyphs-eimage.obj
C:\xemacs-21.5\nt\obj\glyphs-shared.obj C:\xemacs-21.5\nt\obj\glyphs-widget.obj
C:\xemacs-21.5\nt\obj\gui.obj C:\xemacs-21.5\nt\obj\gutter.obj
C:\xemacs-21.5\nt\obj\hash.obj C:\xemacs-21.5\nt\obj\indent.obj
C:\xemacs-21.5\nt\obj\imgproc.obj C:\xemacs-21.5\nt\obj\insdel.obj C:\xemacs-21.5!
\nt\obj\intl.obj C:\xemacs-21.5\nt\obj\intl-win32.obj
C:\xemacs-21.5\nt\obj\intl-encap-win32.obj
C:\xemacs-21.5\nt\obj\intl-auto-encap-win32.obj C:\xemacs-21.5\nt\obj\keymap.obj
C:\xemacs-21.5\nt\obj\libinterface.obj C:\xemacs-21.5\nt\obj\line-number.obj
C:\xemacs-21.5\nt\obj\lread.obj C:\xemacs-21.5\nt\obj\lstream.obj
C:\xemacs-21.5\nt\obj\macros.obj C:\xemacs-21.5\nt\obj\marker.obj
C:\xemacs-21.5\nt\obj\md5.obj C:\xemacs-21.5\nt\obj\minibuf.obj
C:\xemacs-21.5\nt\obj\nt.obj C:\xemacs-21.5\nt\obj\ntplay.obj
C:\xemacs-21.5\nt\obj\objects.obj C:\xemacs-21.5\nt\obj\opaque.obj
C:\xemacs-21.5\nt\obj\print.obj C:\xemacs-21.5\nt\obj\process.obj
C:\xemacs-21.5\nt\obj\process-nt.obj C:\xemacs-21.5\nt\obj\profile.obj
C:\xemacs-21.5\nt\obj\rangetab.obj C:\xemacs-21.5\nt\obj\realpath.obj
C:\xemacs-21.5\nt\obj\redisplay-output.obj C:\xemacs-21.5\nt\obj\redisplay.obj
C:\xemacs-21.5\nt\obj\regex.obj C:\xemacs-21.5\nt\obj\search.obj
C:\xemacs-21.5\nt\obj\select.!
obj C:\xemacs-21.5\nt\obj\signal.obj C:\xemacs-21.5\nt\obj\s!
ound.obj
C:\xemacs-21.5\nt\obj\specifier.obj C:\xemacs-21.5\nt\obj\strftime.obj
C:\xemacs-21.5\nt\obj\symbols.obj C:\xemacs-21.5\nt\obj\syntax.obj
C:\xemacs-21.5\nt\obj\sysdep.obj C:\xemacs-21.5\nt\obj\text.obj
C:\xemacs-21.5\nt\obj\tparam.obj C:\xemacs-21.5\nt\obj\undo.obj
C:\xemacs-21.5\nt\obj\unicode.obj C:\xemacs-21.5\nt\obj\widget.obj
C:\xemacs-21.5\nt\obj\window.obj C:\xemacs-21.5\nt\obj\win32.obj
C:\xemacs-21.5\nt\obj\dump-id.obj comctl32.lib "c:\src\xpm-3.4k\lib\Xpm.lib"
"c:\src\libpng-1.2.8\libpng.lib" "c:\src\zlib-1.2.3\zlib.lib"
"c:\src\tiff-3.7.3\libtiff\libtiff.lib"
"c:\src\jpeg-6b\libjpeg.lib""c:\src\compface-1.5.1\libcompface.lib"
"c:\src\zlib-1.2.3\zlib.lib" oldnames.lib kernel32.lib user32.lib gdi32.lib
comdlg32.lib advapi32.lib shell32.lib wsock32.lib netapi32.lib winmm.lib winspool.lib
ole32.lib mpr.lib uuid.lib imm32.lib msvcrtd.lib' too long
--
Aidan Kehoe, http://www.parhasard.net/
6:58 p.m.
New subject: [Failure] XEmacs 21.5-b26 "endive" (+CVS-20060430) i586-pc-win32
On 5/5/06, Aidan Kehoe <kehoea(a)parhasard.net> wrote:
Ar an chéad lá de mí Bealtaine, scríobh Adrian Aichner:
> Doesn't help.
>
> I build on Windows XP using xemacs.mak, not configure && make.
This does (should be applied from with src/, I don't have patcher to hand on
the XP machine). I intend committing a version of it tomorrow.
Thank you, Aidan. That patch enables me to build on both Cygwin and
XEmacs native.
- Vin
9:13 a.m.
New subject: [COMMIT] Fix the win32 build following my lib-src/DOC format changes
NOTE: This patch has been committed.
APPROVE COMMIT
SUPERSEDES 17499.29798.163809.910007(a)parhasard.net
src/ChangeLog addition:
2006-05-06 Aidan Kehoe <kehoea(a)parhasard.net>
* lisp.h (struct Lisp_Subr):
Document that prompt, doc, and name should not be char *.
* symbols.c (Fsubr_name):
Cast name to const Ibyte * before returning it.
* sysfile.h:
Make versions of DIRECTORY_SEP, IS_DIRECTORY_SEP and IS_ANY_SEP
available to make-docfile and other non-emacs processes on win32.
XEmacs Trunk source patch:
Diff command: cvs -q diff -u
Files affected: src/sysfile.h src/symbols.c src/lisp.h
Index: src/lisp.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/lisp.h,v
retrieving revision 1.141
diff -u -u -r1.141 lisp.h
--- src/lisp.h 2006/03/30 23:10:38 1.141
+++ src/lisp.h 2006/05/06 08:04:00
＠＠ -2676,6 +2676,8 ＠＠
struct lrecord_header lheader;
short min_args;
short max_args;
+ /* #### We should make these const Ascbyte * or const Ibyte *, not const
+ char *. */
const char *prompt;
const char *doc;
const char *name;
Index: src/symbols.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/symbols.c,v
retrieving revision 1.56
diff -u -u -r1.56 symbols.c
--- src/symbols.c 2006/04/29 16:15:30 1.56
+++ src/symbols.c 2006/05/06 08:04:01
＠＠ -729,7 +729,7 ＠＠
if (!SUBRP (subr))
wrong_type_argument (Qsubrp, subr);
name = XSUBR (subr)->name;
- return make_string (name, strlen (name));
+ return make_string ((const Ibyte *)name, strlen (name));
}
DEFUN ("setplist", Fsetplist, 2, 2, 0, /*
Index: src/sysfile.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/sysfile.h,v
retrieving revision 1.22
diff -u -u -r1.22 sysfile.h
--- src/sysfile.h 2006/04/29 16:15:31 1.22
+++ src/sysfile.h 2006/05/06 08:04:02
＠＠ -467,6 +467,7 ＠＠
#define SEPCHAR ';'
#define DEFAULT_DIRECTORY_SEP '\\'
+#ifdef emacs
DECLARE_INLINE_HEADER (Ibyte sysfile_get_directory_sep (void))
{
if (!CHARP (Vdirectory_sep_char)
＠＠ -484,6 +485,13 ＠＠
}
#define DIRECTORY_SEP sysfile_get_directory_sep()
+#else /* emacs */
+
+/* The above Lisp variables are not available to make-docfile, etc. */
+#define DIRECTORY_SEP DEFAULT_DIRECTORY_SEP
+
+#endif /* emacs */
+
#else /* not WIN32_NATIVE */
#define SEPCHAR ':'
＠＠ -499,6 +507,8 ＠＠
#define IS_DEVICE_SEP(c) ((c) == DEVICE_SEP)
+#ifdef emacs
+
DECLARE_INLINE_HEADER (int IS_DIRECTORY_SEP (Ichar c))
{
return (c == '/' || c == '\\');
＠＠ -508,6 +518,22 ＠＠
{
return (c == '/' || c == '\\' || c == ':');
}
+
+#else /* emacs */
+
+/* The Ichar typedef is not available to make-docfile, etc. */
+
+DECLARE_INLINE_HEADER (int IS_DIRECTORY_SEP (int c))
+{
+ return (c == '/' || c == '\\');
+}
+
+DECLARE_INLINE_HEADER (int IS_ANY_SEP (int c))
+{
+ return (c == '/' || c == '\\' || c == ':');
+}
+
+#endif
#else /* not WIN32_ANY */
--
Aidan Kehoe, http://www.parhasard.net/
6558
days inactive
6559
days old
2 comments
2 participants
participants (2)
-
Aidan Kehoe -
Vin Shelton