Fix various nits on Windows
These are things I needed to do to get the build to succeed. I'll
commit on Saturday or so if nobody objects.
DISCLAIMER: I'm a Windows and ESPECIALLY PERL dummy. Review appreciated.
nt/ChangeLog:
2008-01-24 Mike Sperber <mike(a)xemacs.org>
* config.inc.samp: Fix URL for optional libraries.
* xemacs.mak (PATH_PREFIX): Set PATH_PREFIX to the value of INSTALL_DIR.
* xemacs.mak (PATH_DEFINES): Fix setting of PATH_DEFINES.
* xemacs.mak (DEBUG_FLAG_COMPILE_DEBUG): Comment out -RTC1: it
even crashes with VC 8.
* xemacs.mak: Comment out echo line that leads to
command-line-too-long error on some Windowses.
src/ChangeLog:
2008-01-24 Mike Sperber <mike(a)xemacs.org>
* make-src-depend (PrintDeps): Fix Perl error.
Also included: updates to .hgignore.
--
Cheers =8-} Mike
Friede, Völkerverständigung und überhaupt blabla
diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
＠＠ -45,3 +45,9 ＠＠ info/.*\.info(-[0-9]+)?$
^src/xemacs\.dmp$
^src/Emacs\.ad\.h$
^etc/bundled-packages/.*\.tar\.gz$
+^lib-src/(etags|hexl|i|make-docfile|make-dump-id|minitar|mmencode|movemail|sorted-doc|wakeup|winclient)\.(exe|exe\.manifest|pdb)$
+\.obj$
+^nt/obj
+^nt/config.inc
+^src/REBUILD_AUTOLOADS$
+^src/(temacs|xemacs)\.(exe|exe\.manifest|pdb|map|bsc)$
diff --git a/nt/config.inc.samp b/nt/config.inc.samp
--- a/nt/config.inc.samp
+++ b/nt/config.inc.samp
＠＠ -31,7 +31,7 ＠＠ GTK_DIR=
############################################################################
# Directory under which the optional libraries are placed. To make your
-# life easy, just grab http://ftp.xemacs.org/aux/optional-libs.exe
+# life easy, just grab http://www.xemacs.org/Download/win32/optional-libs.exe
# (a self-installing .ZIP) and unzip them into an appropriate directory
# (by default, c:\src). This gets you precompiled versions of all of
# the libraries below.
diff --git a/nt/xemacs.mak b/nt/xemacs.mak
--- a/nt/xemacs.mak
+++ b/nt/xemacs.mak
＠＠ -458,10 +458,10 ＠＠ PATH_LATE_PACKAGE_DIRECTORIES="$(PACKAGE
!if $(INFODOCK)
PATH_PREFIX=../..
!else
-PATH_PREFIX=..
+PATH_PREFIX="$(INSTALL_DIR)"
!endif
-PATH_DEFINES=-DPATH_PREFIX=\"$(PATH_PREFIX)\"
+PATH_DEFINES=-DPATH_PREFIX=\"$(PATH_PREFIX:\=\\)\"
!if $(SEPARATE_BUILD)
PATH_DEFINES=$(PATH_DEFINES) -DPATH_LOADSEARCH=\"$(LISP:\=\\)\"
-DPATH_DATA=\"$(ETC:\=\\)\" -DPATH_INFO=\"$(INFO:\=\\)\"
＠＠ -691,8 +691,8 ＠＠ CCV=＠$(CC)
# giving it.
DEBUG_FLAG_LINK_DEBUG=-debug -opt:noref
# This turns on additional run-time checking
-# For some reason it causes spawning of make-docfile to crash in VC 7
-DEBUG_FLAG_COMPILE_DEBUG=-RTC1
+# For some reason it causes spawning of make-docfile to crash in VC 7 and VC 8
+# DEBUG_FLAG_COMPILE_DEBUG=-RTC1
! else
DEBUG_FLAG_LINK_DEBUG=-debug:full
DEBUG_FLAG_COMPILE_DEBUG=
＠＠ -1366,7 +1366,8 ＠＠ TEMACS_DUMP_DEP = $(OUTDIR)\temacs.res
!endif
$(RAW_EXE): $(TEMACS_OBJS) $(LASTFILE) $(TEMACS_DUMP_DEP)
- ＠echo link $(TEMACS_LFLAGS) -out:$＠ $(TEMACS_OBJS) $(TEMACS_DUMP_DEP) $(TEMACS_LIBS)
+# Command line too long for some Windows installation:
+# ＠echo link $(TEMACS_LFLAGS) -out:$＠ $(TEMACS_OBJS) $(TEMACS_DUMP_DEP) $(TEMACS_LIBS)
link.exe ＠<<
$(TEMACS_LFLAGS) -out:$＠ $(TEMACS_OBJS) $(TEMACS_DUMP_DEP) $(TEMACS_LIBS)
<<
diff --git a/src/make-src-depend b/src/make-src-depend
--- a/src/make-src-depend
+++ b/src/make-src-depend
＠＠ -115,7 +115,7 ＠＠ sub PrintDeps {
my $file = shift;
my $ofile = $file; $ofile =~ s/c$/o/; print "$ofile: ";
if (exists $uses{$file}{'lisp.h'}) {
- delete ＠{%{$uses{$file}}}{＠LISP_H};
+ delete $uses{$file}{＠LISP_H};
$uses{$file}{'$(LISP_H)'} = 1;
}
# Note: If both config.h and lisp.h are dependencies, config.h got deleted
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches