[PATCH21.5] MS Visual Studio 2005 and XP visual themes

Sunday, 13 November 2005

        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&gt;

	* 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&gt;

	* 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&gt;

	* 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>

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

[PATCH21.5] MS Visual Studio 2005 and XP visual themes