[PATCH] Portable dumper fixes for NT
Just brought the PD up to life under NT. I see a strange glitch though.
When I dump XEmacs traditional way, zmacs-regions is set to t. When
I do it portable, it is set to nil, both when I run it vanilla.
Is this the way it works on other platforms?
PDUMP is incompatible with USE_UNION_TYPE, right?
Why can't we put xemacs.dmp into the same directory where the [tx]emacs
executable resides? It is loaded from the current directory, so manifold
they are already on my system, even after just an hour of tweaking...
Big K
ChangeLog for nt/
2000-01-13 Kirill 'Big K' Katsnelson <kkm(a)dtmx.com>
* xemacs.mak: Added USE_PORTABLE_DUMPER make command line macro.
(temacs:) Added dependency for lastfile.lib so that 'make temacs'
builds it first.
ChangeLog for src/
2000-01-13 Kirill 'Big K' Katsnelson <kkm(a)dtmx.com>
* symsinit.h: Added prototype for reinit_vars_of_frame_mswindows.
* event-msw.c (vars_of_event_mswindows): Fixed a mistyped
pdump_wire'd variable.
* emacs.c: (main_1): Conditionalized calls to
reinit_vars_of_scrollbar_x and reinit_vars_of_module.
Index: nt/xemacs.mak
===================================================================
RCS file: /var/cvsroot/xemacs/nt/xemacs.mak,v
retrieving revision 1.1.1.1
diff --unified=2 -r1.1.1.1 xemacs.mak
--- nt/xemacs.mak 2000/01/12 07:54:39 1.1.1.1
+++ nt/xemacs.mak 2000/01/14 01:03:33
＠＠ -139,4 +139,7 ＠＠
GUNG_HO=0
!endif
+!if !defined(USE_PORTABLE_DUMPER)
+USE_PORTABLE_DUMPER=0
+!endif
#
＠＠ -345,4 +348,8 ＠＠
!endif
+!if $(USE_PORTABLE_DUMPER)
+DUMPER_DEFINES=-DPDUMP
+!endif
+
# Hard-coded paths
＠＠ -360,5 +367,5 ＠＠
DEFINES=$(X_DEFINES) $(MSW_DEFINES) $(MULE_DEFINES) \
- $(TAGBITS_DEFINES) $(LRECORD_DEFINES) $(UNION_DEFINES) \
+ $(TAGBITS_DEFINES) $(LRECORD_DEFINES) $(UNION_DEFINES) $(DUMPER_DEFINES)\
-DWIN32 -D_WIN32 -DWIN32_LEAN_AND_MEAN -DWINDOWSNT -Demacs \
-DHAVE_CONFIG_H $(PROGRAM_DEFINES) $(PATH_DEFINES)
＠＠ -1153,4 +1160,5 ＠＠
cd $(TEMACS_DIR)
set EMACSBOOTSTRAPLOADPATH=$(LISP);$(PACKAGE_PATH)
+ set EMACSBOOTSTRAPMODULEPATH=$(MODULES)
-1 $(TEMACS) -batch -l $(TEMACS_DIR)\..\lisp\loadup.el dump
cd $(NT)
＠＠ -1164,5 +1172,5 ＠＠
$(LISP)/auto-autoloads.el $(LISP)/custom-load.el info
-temacs: $(TEMACS)
+temacs: $(LASTFILE) $(TEMACS)
# use this rule to install the system
＠＠ -1321,4 +1329,7 ＠＠
!if $(USE_UNION_TYPE)
Using union type for Lisp object storage.
+!endif
+!if $(USE_PORTABLE_DUMPER)
+ Using portable dumper.
!endif
!if $(DEBUG_XEMACS)
Index: src/emacs.c
===================================================================
RCS file: /var/cvsroot/xemacs/src/emacs.c,v
retrieving revision 1.1.1.1
diff --unified=2 -r1.1.1.1 emacs.c
--- src/emacs.c 2000/01/12 07:54:45 1.1.1.1
+++ src/emacs.c 2000/01/14 00:59:55
＠＠ -1712,10 +1712,11 ＠＠
reinit_vars_of_lstream ();
reinit_vars_of_minibuf ();
+#ifdef HAVE_SHLIB
reinit_vars_of_module ();
+#endif
reinit_vars_of_objects ();
reinit_vars_of_print ();
reinit_vars_of_redisplay ();
reinit_vars_of_search ();
- reinit_vars_of_scrollbar_x ();
reinit_vars_of_undo ();
reinit_vars_of_window ();
＠＠ -1729,4 +1730,7 ＠＠
#ifdef HAVE_MENUBARS
reinit_vars_of_menubar_x ();
+#endif
+#ifdef HAVE_SCROLLBARS
+ reinit_vars_of_scrollbar_x ();
#endif
reinit_vars_of_xselect ();
Index: src/event-msw.c
===================================================================
RCS file: /var/cvsroot/xemacs/src/event-msw.c,v
retrieving revision 1.1.1.1
diff --unified=2 -r1.1.1.1 event-msw.c
--- src/event-msw.c 2000/01/12 07:54:46 1.1.1.1
+++ src/event-msw.c 2000/01/14 04:04:43
＠＠ -3005,5 +3005,5 ＠＠
staticpro (&mswindows_s_dispatch_event_queue);
mswindows_s_dispatch_event_queue_tail = Qnil;
- pdump_wire (&mswindows_u_dispatch_event_queue_tail);
+ pdump_wire (&mswindows_s_dispatch_event_queue_tail);
mswindows_error_caught_in_modal_loop = Qnil;
Index: src/symsinit.h
===================================================================
RCS file: /var/cvsroot/xemacs/src/symsinit.h,v
retrieving revision 1.1.1.1
diff --unified=2 -r1.1.1.1 symsinit.h
--- src/symsinit.h 2000/01/12 07:54:56 1.1.1.1
+++ src/symsinit.h 2000/01/14 04:38:18
＠＠ -294,4 +294,5 ＠＠
void vars_of_frame_tty (void);
void vars_of_frame_mswindows (void);
+void reinit_vars_of_frame_mswindows (void);
void vars_of_frame_x (void);
void vars_of_frame (void);