Bugsplat bug #358401: created a separate .rc file for each DLL. The
authorwtc%netscape.com
Fri, 15 Oct 1999 00:51:41 +0000
changeset 876 99549a1c9b91470b215b10d94b28263ebe6bf5e7
parent 875 7d99540f63b49485025366f8af89708b5e0c086c
child 877 98a436450374c23d03d8d39ce6d69b144bf2fcae
push idunknown
push userunknown
push dateunknown
bugs358401
Bugsplat bug #358401: created a separate .rc file for each DLL. The product name is "Netscape Portable Runtime" and the file descriptions are "NSPR Library", "PLDS Library", "PLC Library", and "PRSTRMS Library". A debug build is indicated in the file description. The copyright years changed to 1996-1999. Modified files: rules.mk, lib/ds/Makefile, lib/ds/Makefile.in, lib/libc/src/Makefile, lib/libc/src/Makefile.in, lib/prstreams/Makefile, lib/prstreams/Makefile.in, prinit.h, nspr.rc Added files: plds.rc, plc.rc, prstrms.rc Removed file: resource.h
config/rules.mk
lib/ds/Makefile
lib/ds/Makefile.in
lib/ds/plds.rc
lib/libc/src/Makefile
lib/libc/src/Makefile.in
lib/libc/src/plc.rc
lib/prstreams/Makefile
lib/prstreams/Makefile.in
lib/prstreams/prstrms.rc
pr/include/prinit.h
pr/src/nspr.rc
pr/src/resource.h
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -345,21 +345,18 @@ endif	# AIX 4.1
 endif   # USE_AUTOCONF
 
 ifeq ($(OS_ARCH), WINNT)
 $(RES): $(RESNAME)
 	@$(MAKE_OBJDIR)
 ifeq ($(OS_TARGET),OS2)
 	$(RC) -DOS2 -r $(RESNAME) $(RES)
 else
-ifeq ($(OS_TARGET),WINNT)
-	$(RC) -dWINNT -Fo$(RES) $(RESNAME)
-else
-	$(RC) -Fo$(RES) $(RESNAME)
-endif
+# The resource compiler does not understand the -U option.
+	$(RC) $(filter-out -U%,$(DEFINES)) $(INCLUDES) -Fo$(RES) $(RESNAME)
 endif
 	@echo $(RES) finished
 endif
 
 $(OBJDIR)/%.$(OBJ_SUFFIX): %.cpp
 	@$(MAKE_OBJDIR)
 ifeq ($(OS_ARCH), WINNT)
 ifndef XP_OS2_EMX
--- a/lib/ds/Makefile
+++ b/lib/ds/Makefile
@@ -49,18 +49,18 @@ ifeq (,$(filter-out WIN16 OS2,$(OS_TARGE
 # OS_CFLAGS = $(OS_EXE_CFLAGS)
 ifdef XP_OS2_EMX
 EXTRA_LIBS = -L$(DIST)/lib -lnspr$(MOD_VERSION)
 else
 EXTRA_LIBS = $(DIST)/lib/nspr$(MOD_VERSION).$(LIB_SUFFIX)
 endif
 else
 DLLBASE=/BASE:0x30000000
-RES=$(OBJDIR)/ds.res
-RESNAME=$(MOD_DEPTH)/pr/src/nspr.rc
+RES=$(OBJDIR)/plds.res
+RESNAME=plds.rc
 OS_LIBS = user32.lib
 ifeq ($(OS_TARGET),WIN95)
 EXTRA_LIBS = $(DIST)/lib/nspr$(MOD_VERSION).lib
 else
 EXTRA_LIBS = $(DIST)/lib/libnspr$(MOD_VERSION).lib
 endif
 
 ifdef MOZ_DEBUG
--- a/lib/ds/Makefile.in
+++ b/lib/ds/Makefile.in
@@ -59,18 +59,18 @@ ifeq (,$(filter-out WIN16 OS2,$(OS_TARGE
 # OS_CFLAGS = $(OS_EXE_CFLAGS)
 ifdef XP_OS2_EMX
 EXTRA_LIBS = -L$(DIST)/lib -lnspr$(MOD_VERSION)
 else
 EXTRA_LIBS = $(DIST)/lib/nspr$(MOD_VERSION).$(LIB_SUFFIX)
 endif
 else
 DLLBASE=/BASE:0x30000000
-RES=$(OBJDIR)/ds.res
-RESNAME=$(MOD_DEPTH)/pr/src/nspr.rc
+RES=$(OBJDIR)/plds.res
+RESNAME=plds.rc
 OS_LIBS = user32.lib
 ifeq ($(OS_TARGET),WIN95)
 EXTRA_LIBS = $(DIST)/lib/nspr$(MOD_VERSION).lib
 else
 EXTRA_LIBS = $(DIST)/lib/libnspr$(MOD_VERSION).lib
 endif
 
 ifdef MOZ_DEBUG
new file mode 100644
--- /dev/null
+++ b/lib/ds/plds.rc
@@ -0,0 +1,79 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/*
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.1 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ * 
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ * 
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1999 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "prinit.h"
+#include <winver.h>
+
+#define MY_LIBNAME "plds"
+#define MY_FILEDESCRIPTION "PLDS Library"
+
+#ifdef _DEBUG
+#define MY_DEBUG_STR " (debug)"
+#define MY_FILEFLAGS_1 VS_FF_DEBUG
+#else
+#define MY_DEBUG_STR ""
+#define MY_FILEFLAGS_1 0x0L
+#endif
+#if PR_BETA
+#define MY_FILEFLAGS_2 MY_FILEFLAGS_1|VS_FF_PRERELEASE
+#else
+#define MY_FILEFLAGS_2 MY_FILEFLAGS_1
+#endif
+
+#ifdef WINNT
+#define MY_FILEOS VOS_NT_WINDOWS32
+#define MY_INTERNAL_NAME "lib" MY_LIBNAME PR_VMAJOR_STR
+#else
+#define MY_FILEOS VOS__WINDOWS32
+#define MY_INTERNAL_NAME MY_LIBNAME PR_VMAJOR_STR
+#endif
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version-information resource
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION PR_VMAJOR,PR_VMINOR,PR_VPATCH,0
+ PRODUCTVERSION PR_VMAJOR,PR_VMINOR,PR_VPATCH,0
+ FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+ FILEFLAGS MY_FILEFLAGS_2
+ FILEOS MY_FILEOS
+ FILETYPE VFT_DLL
+ FILESUBTYPE 0x0L // not used
+
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904B0" // Lang=US English, CharSet=Unicode
+        BEGIN
+            VALUE "CompanyName", "Netscape Communications Corporation\0"
+            VALUE "FileDescription", MY_FILEDESCRIPTION MY_DEBUG_STR "\0"
+            VALUE "FileVersion", PR_VERSION "\0"
+            VALUE "InternalName", MY_INTERNAL_NAME "\0"
+            VALUE "LegalCopyright", "Copyright \251 1996-1999 Netscape Communications Corporation\0"
+            VALUE "OriginalFilename", MY_INTERNAL_NAME ".dll\0"
+            VALUE "ProductName", "Netscape Portable Runtime\0"
+            VALUE "ProductVersion", PR_VERSION "\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
--- a/lib/libc/src/Makefile
+++ b/lib/libc/src/Makefile
@@ -57,17 +57,17 @@ ifeq (,$(filter-out WIN16 OS2,$(OS_TARGE
 ifdef XP_OS2_EMX
 EXTRA_LIBS = -L$(DIST)/lib -lnspr$(MOD_VERSION)
 else
 EXTRA_LIBS = $(DIST)/lib/nspr$(MOD_VERSION).lib
 endif
 else
 DLLBASE=/BASE:0x30000000
 RES=$(OBJDIR)/plc.res
-RESNAME=$(MOD_DEPTH)/pr/src/nspr.rc
+RESNAME=plc.rc
 ifeq ($(OS_TARGET),WIN95)
 EXTRA_LIBS = $(DIST)/lib/nspr$(MOD_VERSION).lib
 else
 EXTRA_LIBS = $(DIST)/lib/libnspr$(MOD_VERSION).lib
 endif
 
 ifdef MOZ_DEBUG
 ifdef GLOWCODE
--- a/lib/libc/src/Makefile.in
+++ b/lib/libc/src/Makefile.in
@@ -65,17 +65,17 @@ ifeq (,$(filter-out WIN16 OS2,$(OS_TARGE
 ifdef XP_OS2_EMX
 EXTRA_LIBS = -L$(DIST)/lib -lnspr$(MOD_VERSION)
 else
 EXTRA_LIBS = $(DIST)/lib/nspr$(MOD_VERSION).lib
 endif
 else
 DLLBASE=/BASE:0x30000000
 RES=$(OBJDIR)/plc.res
-RESNAME=$(MOD_DEPTH)/pr/src/nspr.rc
+RESNAME=plc.rc
 ifeq ($(OS_TARGET),WIN95)
 EXTRA_LIBS = $(DIST)/lib/nspr$(MOD_VERSION).lib
 else
 EXTRA_LIBS = $(DIST)/lib/libnspr$(MOD_VERSION).lib
 endif
 
 ifdef MOZ_DEBUG
 ifdef GLOWCODE
new file mode 100644
--- /dev/null
+++ b/lib/libc/src/plc.rc
@@ -0,0 +1,79 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/*
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.1 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ * 
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ * 
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1999 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "prinit.h"
+#include <winver.h>
+
+#define MY_LIBNAME "plc"
+#define MY_FILEDESCRIPTION "PLC Library"
+
+#ifdef _DEBUG
+#define MY_DEBUG_STR " (debug)"
+#define MY_FILEFLAGS_1 VS_FF_DEBUG
+#else
+#define MY_DEBUG_STR ""
+#define MY_FILEFLAGS_1 0x0L
+#endif
+#if PR_BETA
+#define MY_FILEFLAGS_2 MY_FILEFLAGS_1|VS_FF_PRERELEASE
+#else
+#define MY_FILEFLAGS_2 MY_FILEFLAGS_1
+#endif
+
+#ifdef WINNT
+#define MY_FILEOS VOS_NT_WINDOWS32
+#define MY_INTERNAL_NAME "lib" MY_LIBNAME PR_VMAJOR_STR
+#else
+#define MY_FILEOS VOS__WINDOWS32
+#define MY_INTERNAL_NAME MY_LIBNAME PR_VMAJOR_STR
+#endif
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version-information resource
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION PR_VMAJOR,PR_VMINOR,PR_VPATCH,0
+ PRODUCTVERSION PR_VMAJOR,PR_VMINOR,PR_VPATCH,0
+ FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+ FILEFLAGS MY_FILEFLAGS_2
+ FILEOS MY_FILEOS
+ FILETYPE VFT_DLL
+ FILESUBTYPE 0x0L // not used
+
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904B0" // Lang=US English, CharSet=Unicode
+        BEGIN
+            VALUE "CompanyName", "Netscape Communications Corporation\0"
+            VALUE "FileDescription", MY_FILEDESCRIPTION MY_DEBUG_STR "\0"
+            VALUE "FileVersion", PR_VERSION "\0"
+            VALUE "InternalName", MY_INTERNAL_NAME "\0"
+            VALUE "LegalCopyright", "Copyright \251 1996-1999 Netscape Communications Corporation\0"
+            VALUE "OriginalFilename", MY_INTERNAL_NAME ".dll\0"
+            VALUE "ProductName", "Netscape Portable Runtime\0"
+            VALUE "ProductVersion", PR_VERSION "\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
--- a/lib/prstreams/Makefile
+++ b/lib/prstreams/Makefile
@@ -63,17 +63,17 @@ CXXSRCS = \
 OBJS = $(addprefix $(OBJDIR)/,$(CSRCS:.c=.$(OBJ_SUFFIX)) $(CXXSRCS:.cpp=.$(OBJ_SUFFIX)))
 
 ifeq ($(OS_ARCH), WINNT)
     ifeq (,$(filter-out WIN16 OS2,$(OS_TARGET)))
         EXTRA_LIBS = $(DIST)/lib/nspr$(MOD_VERSION).lib
     else
         DLLBASE=/BASE:0x30000000
         RES=$(OBJDIR)/prstrms.res
-        RESNAME=$(MOD_DEPTH)/pr/src/nspr.rc
+        RESNAME=prstrms.rc
         OS_LIBS = user32.lib
         ifeq ($(OS_TARGET), WIN95)
             EXTRA_LIBS = $(DIST)/lib/nspr$(MOD_VERSION).lib
         else
             EXTRA_LIBS = $(DIST)/lib/libnspr$(MOD_VERSION).lib
         endif
     endif
 else
--- a/lib/prstreams/Makefile.in
+++ b/lib/prstreams/Makefile.in
@@ -61,17 +61,17 @@ CXXSRCS = \
 OBJS = $(addprefix $(OBJDIR)/,$(CSRCS:.c=.$(OBJ_SUFFIX)) $(CXXSRCS:.cpp=.$(OBJ_SUFFIX)))
 
 ifeq ($(OS_ARCH), WINNT)
     ifeq (,$(filter-out WIN16 OS2,$(OS_TARGET)))
         EXTRA_LIBS = $(DIST)/lib/nspr$(MOD_VERSION).lib
     else
         DLLBASE=/BASE:0x30000000
         RES=$(OBJDIR)/prstrms.res
-        RESNAME=$(MOD_DEPTH)/pr/src/nspr.rc
+        RESNAME=prstrms.rc
         OS_LIBS = user32.lib
         ifeq ($(OS_TARGET), WIN95)
             EXTRA_LIBS = $(DIST)/lib/nspr$(MOD_VERSION).lib
         else
             EXTRA_LIBS = $(DIST)/lib/libnspr$(MOD_VERSION).lib
         endif
     endif
 else
new file mode 100644
--- /dev/null
+++ b/lib/prstreams/prstrms.rc
@@ -0,0 +1,79 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/*
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.1 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ * 
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ * 
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1999 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "prinit.h"
+#include <winver.h>
+
+#define MY_LIBNAME "prstrms"
+#define MY_FILEDESCRIPTION "PRSTRMS Library"
+
+#ifdef _DEBUG
+#define MY_DEBUG_STR " (debug)"
+#define MY_FILEFLAGS_1 VS_FF_DEBUG
+#else
+#define MY_DEBUG_STR ""
+#define MY_FILEFLAGS_1 0x0L
+#endif
+#if PR_BETA
+#define MY_FILEFLAGS_2 MY_FILEFLAGS_1|VS_FF_PRERELEASE
+#else
+#define MY_FILEFLAGS_2 MY_FILEFLAGS_1
+#endif
+
+#ifdef WINNT
+#define MY_FILEOS VOS_NT_WINDOWS32
+#define MY_INTERNAL_NAME "lib" MY_LIBNAME PR_VMAJOR_STR
+#else
+#define MY_FILEOS VOS__WINDOWS32
+#define MY_INTERNAL_NAME MY_LIBNAME PR_VMAJOR_STR
+#endif
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version-information resource
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION PR_VMAJOR,PR_VMINOR,PR_VPATCH,0
+ PRODUCTVERSION PR_VMAJOR,PR_VMINOR,PR_VPATCH,0
+ FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+ FILEFLAGS MY_FILEFLAGS_2
+ FILEOS MY_FILEOS
+ FILETYPE VFT_DLL
+ FILESUBTYPE 0x0L // not used
+
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904B0" // Lang=US English, CharSet=Unicode
+        BEGIN
+            VALUE "CompanyName", "Netscape Communications Corporation\0"
+            VALUE "FileDescription", MY_FILEDESCRIPTION MY_DEBUG_STR "\0"
+            VALUE "FileVersion", PR_VERSION "\0"
+            VALUE "InternalName", MY_INTERNAL_NAME "\0"
+            VALUE "LegalCopyright", "Copyright \251 1996-1999 Netscape Communications Corporation\0"
+            VALUE "OriginalFilename", MY_INTERNAL_NAME ".dll\0"
+            VALUE "ProductName", "Netscape Portable Runtime\0"
+            VALUE "ProductVersion", PR_VERSION "\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
--- a/pr/include/prinit.h
+++ b/pr/include/prinit.h
@@ -41,16 +41,17 @@ PR_BEGIN_EXTERN_C
 ** used to build your component is anywhere close to being compatible with
 ** what is in the underlying library.
 **
 ** The format of the version string is
 **     "<major version>.<minor version> <build date>"
 */
 #define PR_VERSION  "3.5"
 #define PR_VMAJOR   3
+#define PR_VMAJOR_STR "3"
 #define PR_VMINOR   5
 #define PR_VPATCH   0
 #define PR_BETA     PR_FALSE
 
 /*
 ** PRVersionCheck
 **
 ** The basic signature of the function that is called to provide version
--- a/pr/src/nspr.rc
+++ b/pr/src/nspr.rc
@@ -11,122 +11,69 @@
  * NPL.
  * 
  * The Initial Developer of this code under the NPL is Netscape
  * Communications Corporation.  Portions created by Netscape are
  * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
  * Reserved.
  */
 
-#include "resource.h"
+#include "prinit.h"
+#include <winver.h>
+
+#define MY_LIBNAME "nspr"
+#define MY_FILEDESCRIPTION "NSPR Library"
 
-#define APSTUDIO_READONLY_SYMBOLS
+#ifdef _DEBUG
+#define MY_DEBUG_STR " (debug)"
+#define MY_FILEFLAGS_1 VS_FF_DEBUG
+#else
+#define MY_DEBUG_STR ""
+#define MY_FILEFLAGS_1 0x0L
+#endif
+#if PR_BETA
+#define MY_FILEFLAGS_2 MY_FILEFLAGS_1|VS_FF_PRERELEASE
+#else
+#define MY_FILEFLAGS_2 MY_FILEFLAGS_1
+#endif
+
+#ifdef WINNT
+#define MY_FILEOS VOS_NT_WINDOWS32
+#define MY_INTERNAL_NAME "lib" MY_LIBNAME PR_VMAJOR_STR
+#else
+#define MY_FILEOS VOS__WINDOWS32
+#define MY_INTERNAL_NAME MY_LIBNAME PR_VMAJOR_STR
+#endif
+
 /////////////////////////////////////////////////////////////////////////////
 //
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#ifndef WIN16
-#if !defined(__MINGW32__)
-#include "afxres.h"
-#endif
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifndef _MAC
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
+// Version-information resource
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,5,0,0
- PRODUCTVERSION 3,5,0,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-
-// end win16
-#endif
+ FILEVERSION PR_VMAJOR,PR_VMINOR,PR_VPATCH,0
+ PRODUCTVERSION PR_VMAJOR,PR_VMINOR,PR_VPATCH,0
+ FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+ FILEFLAGS MY_FILEFLAGS_2
+ FILEOS MY_FILEOS
+ FILETYPE VFT_DLL
+ FILESUBTYPE 0x0L // not used
 
 BEGIN
     BLOCK "StringFileInfo"
     BEGIN
-        BLOCK "040904b0"
+        BLOCK "040904B0" // Lang=US English, CharSet=Unicode
         BEGIN
             VALUE "CompanyName", "Netscape Communications Corporation\0"
-            VALUE "FileDescription", "Netscape Portable Run Time\0"
-            VALUE "FileVersion", "3.5\0"
-#ifdef WINNT
-            VALUE "InternalName", "libnspr3\0"
-            VALUE "OriginalFilename", "libnspr3.dll\0"
-#else
-            VALUE "InternalName", "nspr3\0"
-            VALUE "OriginalFilename", "nspr3.dll\0"
-#endif
-            VALUE "LegalCopyright", "Copyright  1996\0"
-            VALUE "ProductName", "Netscape Communication Corporation NSPR20\0"
-            VALUE "ProductVersion", "3.5\0"
+            VALUE "FileDescription", MY_FILEDESCRIPTION MY_DEBUG_STR "\0"
+            VALUE "FileVersion", PR_VERSION "\0"
+            VALUE "InternalName", MY_INTERNAL_NAME "\0"
+            VALUE "LegalCopyright", "Copyright \251 1996-1999 Netscape Communications Corporation\0"
+            VALUE "OriginalFilename", MY_INTERNAL_NAME ".dll\0"
+            VALUE "ProductName", "Netscape Portable Runtime\0"
+            VALUE "ProductVersion", PR_VERSION "\0"
         END
     END
     BLOCK "VarFileInfo"
     BEGIN
         VALUE "Translation", 0x409, 1200
     END
 END
-
-#endif    // !_MAC
-
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "#include ""afxres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-
deleted file mode 100644
--- a/pr/src/resource.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public License
- * Version 1.1 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- * 
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- * 
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-//{{NO_DEPENDENCIES}}
-// Microsoft Developer Studio generated include file.
-// Used by nspr.rc
-//
-
-// Next default values for new objects
-// 
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        101
-#define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1000
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif