Bug 190538: use the cross-platform syntax of the *.def files (copied from

NSS) so that they can be used on platforms other than Solaris, and use the
*.def files on OS/2.
Modified Files: rules.mk lib/ds/Makefile.in plds.def
lib/libc/src/Makefile.in plc.def pr/src/Makefile.in nspr.def
Tag: NSPRPUB_PRE_4_2_CLIENT_BRANCH

7 files changed, 181 insertions, 48 deletions

diff --git a/config/rules.mk b/config/rules.mk
index 29f6d663..f5d6be8f 100644
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -366,22 +366,20 @@ endif
 	@echo $(RES) finished
 endif
 
-ifeq ($(OS_ARCH),SunOS)
 $(MAPFILE): $(LIBRARY_NAME).def
 	@$(MAKE_OBJDIR)
+ifeq ($(OS_ARCH),SunOS)
 	grep -v ';-' $< | \
 	sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@
 endif
-
 ifeq ($(OS_ARCH),OS2)
-$(MAPFILE): $(LIBRARY)
-	rm -f $@
 	echo LIBRARY $(LIBRARY_NAME)$(LIBRARY_VERSION) INITINSTANCE TERMINSTANCE > $@
 	echo PROTMODE >> $@
 	echo CODE    LOADONCALL MOVEABLE DISCARDABLE >> $@
 	echo DATA    PRELOAD MOVEABLE MULTIPLE NONSHARED >> $@
 	echo EXPORTS >> $@
-	$(FILTER) $(LIBRARY) >> $@
+	grep -v ';+' $< | grep -v ';-' | \
+	sed -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,,' >> $@
 endif
 
 $(OBJDIR)/%.$(OBJ_SUFFIX): %.cpp
diff --git a/lib/ds/Makefile.in b/lib/ds/Makefile.in
index 3a1cf40e..4e7234fd 100644
--- a/lib/ds/Makefile.in
+++ b/lib/ds/Makefile.in
@@ -96,7 +96,7 @@ endif
 endif
 
 ifeq ($(OS_ARCH),OS2)
-MAPFILE = $(OBJDIR)/plds.def
+MAPFILE = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).def
 GARBAGE += $(MAPFILE)
 MKSHLIB += $(MAPFILE)
 endif
diff --git a/lib/ds/plds.def b/lib/ds/plds.def
index f062b58b..9e0b505a 100644
--- a/lib/ds/plds.def
+++ b/lib/ds/plds.def
@@ -1,6 +1,51 @@
-# nm -n -C -p libplds4.so | awk '/[^ ]* T PL_/ {print $3}'
-NSPR_4.0 {
-    global:
+;+#
+;+# The contents of this file are subject to the Mozilla Public
+;+# License Version 1.1 (the "License"); you may not use this file
+;+# except in compliance with the License. You may obtain a copy of
+;+# the License at http://www.mozilla.org/MPL/
+;+#
+;+# Software distributed under the License is distributed on an "AS
+;+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+;+# implied. See the License for the specific language governing
+;+# rights and limitations under the License.
+;+#
+;+# The Original Code is the Netscape Portable Runtime (NSPR).
+;+#
+;+# The Initial Developer of the Original Code is Netscape
+;+# Communications Corporation.  Portions created by Netscape are
+;+# Copyright (C) 2002-2003 Netscape Communications Corporation.  All
+;+# Rights Reserved.
+;+#
+;+# Contributor(s):
+;+#
+;+# Alternatively, the contents of this file may be used under the
+;+# terms of the GNU General Public License Version 2 or later (the
+;+# "GPL"), in which case the provisions of the GPL are applicable
+;+# instead of those above.  If you wish to allow use of your
+;+# version of this file only under the terms of the GPL and not to
+;+# allow others to use your version of this file under the MPL,
+;+# indicate your decision by deleting the provisions above and
+;+# replace them with the notice and other provisions required by
+;+# the GPL.  If you do not delete the provisions above, a recipient
+;+# may use your version of this file under either the MPL or the
+;+# GPL.
+;+#
+;+# OK, this file is meant to support SUN, LINUX, AIX, OS/2 and WINDOWS
+;+#   1. For all unix platforms, the string ";-"  means "remove this line"
+;+#   2. For all unix platforms, the string " DATA " will be removed from any 
+;+#     line on which it occurs.
+;+#   3. Lines containing ";+" will have ";+" removed on SUN and LINUX.
+;+#      On AIX, lines containing ";+" will be removed.
+;+#   4. For all unix platforms, the string ";;" will thave the ";;" removed.
+;+#   5. For all unix platforms, after the above processing has taken place,
+;+#    all characters after the first ";" on the line will be removed.
+;+#    And for AIX, the first ";" will also be removed.
+;+#  This file is passed directly to windows. Since ';' is a comment, all UNIX
+;+#   directives are hidden behind ";", ";+", and ";-"
+;+NSPR_4.0 {
+;+    global:
+LIBRARY plds4 ;-
+EXPORTS ;-
 PL_ArenaAllocate;
 PL_ArenaFinish;
 PL_ArenaGrow;
@@ -23,11 +68,11 @@ PL_HashTableRemove;
 PL_InitArenaPool;
 PL_NewHashTable;
 libVersionPoint;
-    local: *;
-};
-
-NSPR_4.1 {
-    global:
+;+    local: *;
+;+};
+;+
+;+NSPR_4.1 {
+;+    global:
 PL_HashTableLookupConst;
 PL_HashTableRawLookupConst;
-} NSPR_4.0;
+;+} NSPR_4.0;
diff --git a/lib/libc/src/Makefile.in b/lib/libc/src/Makefile.in
index d3502ecf..17a4dfa1 100644
--- a/lib/libc/src/Makefile.in
+++ b/lib/libc/src/Makefile.in
@@ -106,7 +106,7 @@ endif
 endif
 
 ifeq ($(OS_ARCH),OS2)
-MAPFILE = $(OBJDIR)/plc.def
+MAPFILE = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).def
 GARBAGE += $(MAPFILE)
 MKSHLIB += $(MAPFILE)
 endif
diff --git a/lib/libc/src/plc.def b/lib/libc/src/plc.def
index ad962e23..39eba5b7 100644
--- a/lib/libc/src/plc.def
+++ b/lib/libc/src/plc.def
@@ -1,6 +1,51 @@
-# nm -n -C -p libplc4.so | awk '/[^ ]* T PL_/ {print $3}'
-NSPR_4.0 {
-    global:
+;+#
+;+# The contents of this file are subject to the Mozilla Public
+;+# License Version 1.1 (the "License"); you may not use this file
+;+# except in compliance with the License. You may obtain a copy of
+;+# the License at http://www.mozilla.org/MPL/
+;+#
+;+# Software distributed under the License is distributed on an "AS
+;+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+;+# implied. See the License for the specific language governing
+;+# rights and limitations under the License.
+;+#
+;+# The Original Code is the Netscape Portable Runtime (NSPR).
+;+#
+;+# The Initial Developer of the Original Code is Netscape
+;+# Communications Corporation.  Portions created by Netscape are
+;+# Copyright (C) 2002-2003 Netscape Communications Corporation.  All
+;+# Rights Reserved.
+;+#
+;+# Contributor(s):
+;+#
+;+# Alternatively, the contents of this file may be used under the
+;+# terms of the GNU General Public License Version 2 or later (the
+;+# "GPL"), in which case the provisions of the GPL are applicable
+;+# instead of those above.  If you wish to allow use of your
+;+# version of this file only under the terms of the GPL and not to
+;+# allow others to use your version of this file under the MPL,
+;+# indicate your decision by deleting the provisions above and
+;+# replace them with the notice and other provisions required by
+;+# the GPL.  If you do not delete the provisions above, a recipient
+;+# may use your version of this file under either the MPL or the
+;+# GPL.
+;+#
+;+# OK, this file is meant to support SUN, LINUX, AIX, OS/2 and WINDOWS
+;+#   1. For all unix platforms, the string ";-"  means "remove this line"
+;+#   2. For all unix platforms, the string " DATA " will be removed from any 
+;+#     line on which it occurs.
+;+#   3. Lines containing ";+" will have ";+" removed on SUN and LINUX.
+;+#      On AIX, lines containing ";+" will be removed.
+;+#   4. For all unix platforms, the string ";;" will thave the ";;" removed.
+;+#   5. For all unix platforms, after the above processing has taken place,
+;+#    all characters after the first ";" on the line will be removed.
+;+#    And for AIX, the first ";" will also be removed.
+;+#  This file is passed directly to windows. Since ';' is a comment, all UNIX
+;+#   directives are hidden behind ";", ";+", and ";-"
+;+NSPR_4.0 {
+;+    global:
+LIBRARY plc4 ;-
+EXPORTS ;-
 PL_Base64Decode;
 PL_Base64Encode;
 PL_CreateOptState;
@@ -40,10 +85,10 @@ PL_strrchr;
 PL_strrstr;
 PL_strstr;
 libVersionPoint;
-    local: *;
-};
-
-NSPR_4.2 {
-    global:
+;+    local: *;
+;+};
+;+
+;+NSPR_4.2 {
+;+    global:
 PL_strtok_r;
-} NSPR_4.0;
+;+} NSPR_4.0;
diff --git a/pr/src/Makefile.in b/pr/src/Makefile.in
index fa472fdd..fdf10cf1 100644
--- a/pr/src/Makefile.in
+++ b/pr/src/Makefile.in
@@ -142,7 +142,7 @@ endif
 endif
 
 ifeq ($(OS_ARCH),OS2)
-MAPFILE = $(OBJDIR)/nspr.def
+MAPFILE = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).def
 GARBAGE += $(MAPFILE)
 MKSHLIB += $(MAPFILE)
 endif
diff --git a/pr/src/nspr.def b/pr/src/nspr.def
index ba798d6a..ac6921d0 100644
--- a/pr/src/nspr.def
+++ b/pr/src/nspr.def
@@ -1,6 +1,51 @@
-# nm -n -C -p libnspr4.so | awk '/[^ ]* T PR_/ {print $3}'
-NSPR_4.0 {
-	global:
+;+#
+;+# The contents of this file are subject to the Mozilla Public
+;+# License Version 1.1 (the "License"); you may not use this file
+;+# except in compliance with the License. You may obtain a copy of
+;+# the License at http://www.mozilla.org/MPL/
+;+#
+;+# Software distributed under the License is distributed on an "AS
+;+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+;+# implied. See the License for the specific language governing
+;+# rights and limitations under the License.
+;+#
+;+# The Original Code is the Netscape Portable Runtime (NSPR).
+;+#
+;+# The Initial Developer of the Original Code is Netscape
+;+# Communications Corporation.  Portions created by Netscape are
+;+# Copyright (C) 2002-2003 Netscape Communications Corporation.  All
+;+# Rights Reserved.
+;+#
+;+# Contributor(s):
+;+#
+;+# Alternatively, the contents of this file may be used under the
+;+# terms of the GNU General Public License Version 2 or later (the
+;+# "GPL"), in which case the provisions of the GPL are applicable
+;+# instead of those above.  If you wish to allow use of your
+;+# version of this file only under the terms of the GPL and not to
+;+# allow others to use your version of this file under the MPL,
+;+# indicate your decision by deleting the provisions above and
+;+# replace them with the notice and other provisions required by
+;+# the GPL.  If you do not delete the provisions above, a recipient
+;+# may use your version of this file under either the MPL or the
+;+# GPL.
+;+#
+;+# OK, this file is meant to support SUN, LINUX, AIX, OS/2 and WINDOWS
+;+#   1. For all unix platforms, the string ";-"  means "remove this line"
+;+#   2. For all unix platforms, the string " DATA " will be removed from any 
+;+#     line on which it occurs.
+;+#   3. Lines containing ";+" will have ";+" removed on SUN and LINUX.
+;+#      On AIX, lines containing ";+" will be removed.
+;+#   4. For all unix platforms, the string ";;" will thave the ";;" removed.
+;+#   5. For all unix platforms, after the above processing has taken place,
+;+#    all characters after the first ";" on the line will be removed.
+;+#    And for AIX, the first ";" will also be removed.
+;+#  This file is passed directly to windows. Since ';' is a comment, all UNIX
+;+#   directives are hidden behind ";", ";+", and ";-"
+;+NSPR_4.0 {
+;+	global:
+LIBRARY nspr4 ;-
+EXPORTS ;-
 		LL_MaxInt;
 		LL_MinInt;
 		LL_Zero;
@@ -365,19 +410,19 @@ NSPR_4.0 {
 		PRP_NewNakedCondVar;
 		PRP_TryLock;
 		libVersionPoint;
-	local: *;
-};
-
-NSPRprivate {
-	global:
+;+	local: *;
+;+};
+;+
+;+NSPRprivate {
+;+	global:
 		GetExecutionEnvironment;
 		PT_FPrintStats;
 		SetExecutionEnvironment;
-	local: *;
-};
-
-NSPR_4.1 {
-	global:
+;+	local: *;
+;+};
+;+
+;+NSPR_4.1 {
+;+	global:
 		PR_ConnectContinue;
 		PR_CreateIOLayer;
 		PR_EmulateAcceptRead;
@@ -388,16 +433,16 @@ NSPR_4.1 {
 		PR_GetNumberOfProcessors;
 		PR_ImportPipe;
 		PR_SetEnv;
-} NSPR_4.0;
-
-NSPR_4.3 {
-	global:
+;+} NSPR_4.0;
+;+
+;+NSPR_4.3 {
+;+	global:
 		LL_MaxUint;
 		PR_CallOnceWithArg;
 		PR_GetLibraryFilePathname;
-} NSPR_4.1;
-
-NSPR_4.4 {
-	global:
+;+} NSPR_4.1;
+;+
+;+NSPR_4.4 {
+;+	global:
 		PR_GetPathSeparator;
-} NSPR_4.3;
+;+} NSPR_4.3;