Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
195,391 Commits 3,986 Branches 0 Tags
Commit Graph

302 Commits

Author SHA1 Message Date
christophe.ravel.bugs%sun.com
c5fb468eb1 Bug 400094: JSS should link conditionally with libnssutil 
r=glen.beasley


git-svn-id: svn://10.0.0.236/trunk@238317 18797224-902f-48f8-a5cc-f745e15eee43
 2007-10-29 22:10:53 +00:00
nelson%bolyard.com
192f4cb29d Bug 389781. Don't attempt to set OPT_CODE_SIZE = 1 for mozilla builds. 
Mozilla makefiles will set them itself.  patch by wtc@google.com, r=nelson


git-svn-id: svn://10.0.0.236/trunk@238045 18797224-902f-48f8-a5cc-f745e15eee43
 2007-10-23 21:55:00 +00:00
julien.pierre.boogz%sun.com
a8626f2c53 Fix for bug 286642 . Move utility functions to new libnssutil shared library. r=nelson 
git-svn-id: svn://10.0.0.236/trunk@237631 18797224-902f-48f8-a5cc-f745e15eee43
 2007-10-12 01:44:51 +00:00
julien.pierre.boogz%sun.com
2f0d933156 Fix for bug 330721 . Remove OS/2 VACPP compiler support from NSS . Patch contributed by Peter Weilbacher . r=julien.pierre 
git-svn-id: svn://10.0.0.236/trunk@235515 18797224-902f-48f8-a5cc-f745e15eee43
 2007-09-11 22:40:40 +00:00
nelson%bolyard.com
ccde481820 Bug 392722 - nsinstall chokes on double slashes in path 
patch by benjamin@smedbergs.us  r=nelson


git-svn-id: svn://10.0.0.236/trunk@233536 18797224-902f-48f8-a5cc-f745e15eee43
 2007-09-01 03:33:56 +00:00
christophe.ravel.bugs%sun.com
01014185ad Bug 389781 NSS should be built size-optimized on Linux, Windows, and Mac 
r=julien.pierre.boogz


git-svn-id: svn://10.0.0.236/trunk@232117 18797224-902f-48f8-a5cc-f745e15eee43
 2007-08-15 15:30:08 +00:00
alexei.volkov.bugs%sun.com
163780ae7b 389904: avoid multiple decoding/encoding while creating and using PKIX_PL_X500Name. r=nelson 
git-svn-id: svn://10.0.0.236/trunk@231829 18797224-902f-48f8-a5cc-f745e15eee43
 2007-08-10 19:22:42 +00:00
nelson%bolyard.com
9a610cec69 Bug 391651 - Add file for Vista. 
Patch by Robert Longson <longsonr@gmail.com>   r=nelson


git-svn-id: svn://10.0.0.236/trunk@231812 18797224-902f-48f8-a5cc-f745e15eee43
 2007-08-10 17:28:45 +00:00
slavomir.katuscak%sun.com
cf708ac818 Bug 363828 - Adding TCOV support. r=wtc, sr=julien 
git-svn-id: svn://10.0.0.236/trunk@228228 18797224-902f-48f8-a5cc-f745e15eee43
 2007-06-18 12:29:33 +00:00
neil.williams%sun.com
1a24ea511f Bug 82268, Builds use wrong version of perl 
r=Christophe,nelson


git-svn-id: svn://10.0.0.236/trunk@226155 18797224-902f-48f8-a5cc-f745e15eee43
 2007-05-09 00:09:38 +00:00
neil.williams%sun.com
5402b58bfe Back out previous patch 
git-svn-id: svn://10.0.0.236/trunk@226102 18797224-902f-48f8-a5cc-f745e15eee43
 2007-05-08 01:31:24 +00:00
neil.williams%sun.com
cdd3b0108c Bug 82268, Builds use wrong version of perl 
r=Christophe, Nelson


git-svn-id: svn://10.0.0.236/trunk@226084 18797224-902f-48f8-a5cc-f745e15eee43
 2007-05-07 21:36:04 +00:00
nelson%bolyard.com
bc8e3dc393 Bug 370062 – nss build changes for OpenBSD, r=nelson,wtc 
patches contributed by Martynas Venckus <martynas@openbsd.org>


git-svn-id: svn://10.0.0.236/trunk@225986 18797224-902f-48f8-a5cc-f745e15eee43
 2007-05-06 08:08:36 +00:00
nelson%bolyard.com
874bd204fc Bug 371685 – allow unsupported critical extensions in special builds. 
r=rrelyea,wtc


git-svn-id: svn://10.0.0.236/trunk@225562 18797224-902f-48f8-a5cc-f745e15eee43
 2007-05-04 05:15:43 +00:00
wtchang%redhat.com
acb65e245d Bug 317323: Set NSPR31_LIB_PREFIX to empty explicitly for WIN95 and WINCE 
builds.  r=nelsonb
Modified files: WIN954.0.mk WINCE3.0.mk


git-svn-id: svn://10.0.0.236/trunk@220769 18797224-902f-48f8-a5cc-f745e15eee43
 2007-02-22 23:13:58 +00:00
wtchang%redhat.com
84b798c461 Bug 232600: use the same linker flags for programs as for DLLs when doing 
optimized builds with MOZ_DEBUG_SYMBOLS=1. r=nelsonb


git-svn-id: svn://10.0.0.236/trunk@218285 18797224-902f-48f8-a5cc-f745e15eee43
 2007-01-14 02:54:49 +00:00
nelson%bolyard.com
f0de83a6bb Bug 232600. Define MOZ_DEBUG_SYMBOLS in environment to create .pdb files 
and install them in $DIST.   r=rrelyea,wtchang


git-svn-id: svn://10.0.0.236/trunk@217883 18797224-902f-48f8-a5cc-f745e15eee43
 2007-01-06 05:48:54 +00:00
wtchang%redhat.com
513e436274 Bugzilla Bug 351246: Load memory into Highmem on OS/2. The patch is 
contributed by Peter Weilbacher <mozilla@Weilbacher.org>. r=wtc,kaply


git-svn-id: svn://10.0.0.236/trunk@217853 18797224-902f-48f8-a5cc-f745e15eee43
 2007-01-05 22:10:04 +00:00
nelson%bolyard.com
faa99150f6 Bug 256046. Don't prefix with $(JAVA_DESTPATH)/ if it's undefined. 
r=Glen.beasley,neil.williams


git-svn-id: svn://10.0.0.236/trunk@217684 18797224-902f-48f8-a5cc-f745e15eee43
 2007-01-03 13:07:47 +00:00
wtchang%redhat.com
17276e586e Bugzilla Bug 361077: removed commented-out code. r=christophe.ravel 
git-svn-id: svn://10.0.0.236/trunk@216675 18797224-902f-48f8-a5cc-f745e15eee43
 2006-12-07 18:31:49 +00:00
wtchang%redhat.com
6bd11fe950 Bugzilla Bug 361077: fixed the bug that HP-UXB.11.*.mk test USE_PTHREADS 
before it is set.  Since we always use pthreads now, we can unconditionally
add -D_POSIX_C_SOURCE=199506L to OS_CFLAGS in HP-UXB.11.mk.
r=christophe.ravel
Modified Files:
	HP-UXB.11.00.mk HP-UXB.11.11.mk HP-UXB.11.20.mk
	HP-UXB.11.22.mk HP-UXB.11.23.mk HP-UXB.11.mk


git-svn-id: svn://10.0.0.236/trunk@216673 18797224-902f-48f8-a5cc-f745e15eee43
 2006-12-07 18:28:40 +00:00
wtchang%redhat.com
0c3b792433 Bugzilla Bug 345482: changed abspath to core_abspath to avoid conflict with 
the built-in abspath function of GNU make 3.81.  The patch is contributed
by Benjamin Smedberg <benjamin@smedbergs.us>. r=wtc,christophe.ravel
Modified Files:
	coreconf/rules.mk nss/cmd/shlibsign/Makefile
	nss/lib/freebl/Makefile nss/lib/pk11wrap/Makefile


git-svn-id: svn://10.0.0.236/trunk@216626 18797224-902f-48f8-a5cc-f745e15eee43
 2006-12-07 01:57:18 +00:00
wtchang%redhat.com
e821436a2f Bugzilla Bug 361076: removed code that handled multiple NSPR threading 
implementations.  We only use the pthreads-based implementation now.
r=christophe.ravel.


git-svn-id: svn://10.0.0.236/trunk@215412 18797224-902f-48f8-a5cc-f745e15eee43
 2006-11-17 21:57:14 +00:00
nelson%bolyard.com
781cba6bae Bug 353475. When building NSS with MSVC 2005, use the "mt" command to 
embed the manifest files into the executables and DLLs.
Patch contributed by Allan Beaufour <allan@beaufour.dk>, r=nelson,wtchang


git-svn-id: svn://10.0.0.236/trunk@212951 18797224-902f-48f8-a5cc-f745e15eee43
 2006-10-01 06:48:25 +00:00
wtchang%redhat.com
2497818b9e Bugzilla Bug 325148: worked around the change of backslash-newline behavior 
inside single-quoted strings in GNU make 3.81.  The patch is contributed by
Pawel Chmielowski <prefiks@aviary.pl>. r=benjamin.smedberg,wtc.


git-svn-id: svn://10.0.0.236/trunk@207494 18797224-902f-48f8-a5cc-f745e15eee43
 2006-08-15 21:35:25 +00:00
wtchang%redhat.com
fb9a9278b8 Bugzilla Bug 316369: support building JSS on Mac OS X. The patch is 
contributed by Nathin Kinder <nkinder@redhat.com>. r=wtc.
Modified files: coreconf/jdk.mk jss/lib/config.mk


git-svn-id: svn://10.0.0.236/trunk@206633 18797224-902f-48f8-a5cc-f745e15eee43
 2006-08-05 01:27:41 +00:00
julien.pierre.bugs%sun.com
a47393a1e0 Fix for bug 335748 . Add NSS_ENABLE_ECC and NSS_ECC_MORE_THAN_SUITE_B build macros. r=nelson, rrelyea 
git-svn-id: svn://10.0.0.236/trunk@200940 18797224-902f-48f8-a5cc-f745e15eee43
 2006-06-26 21:16:54 +00:00
wtchang%redhat.com
e0522cdabf Bugzilla Bug 337887: use the -mnop-fun-dllimport flag so that we can use 
a pointer to a function declared with the dllimport attribute as a constant
address.  We need to use such function pointers to initialize a const
structure in nss/lib/ssl/sslsock.c.  The patch is contributed by Chris
Seawood <cls@seawood.org>.  r=wtc.


git-svn-id: svn://10.0.0.236/trunk@197863 18797224-902f-48f8-a5cc-f745e15eee43
 2006-05-17 16:37:59 +00:00
wtchang%redhat.com
b55ecb3aaa Bugzilla bug 335275: compile with the GCC flag 
-Werror-implicit-function-declaration. r=nelsonb.
Modified files: Linux.mk SunOS5.mk


git-svn-id: svn://10.0.0.236/trunk@195291 18797224-902f-48f8-a5cc-f745e15eee43
 2006-04-24 20:07:15 +00:00
julien.pierre.bugs%sun.com
62e48e70c6 Fix for bug 315793 . Wan-Teh's feedback for PWD 
git-svn-id: svn://10.0.0.236/trunk@193791 18797224-902f-48f8-a5cc-f745e15eee43
 2006-04-07 04:10:28 +00:00
julien.pierre.bugs%sun.com
28b2ef9bc1 Fix for bug 315793 . Make shlibsign run in the OBJDIR rather than the source directory . r=nelson 
git-svn-id: svn://10.0.0.236/trunk@193671 18797224-902f-48f8-a5cc-f745e15eee43
 2006-04-06 06:22:02 +00:00
wtchang%redhat.com
3378584fd9 Bugzilla bug 327855: OS2 GCC build should define XP_OS2_EMX for NSPR 
headers.  Removed a duplicate XP_OS2 definition. r=Peter Weilbacher and
Julien Pierre.


git-svn-id: svn://10.0.0.236/trunk@191426 18797224-902f-48f8-a5cc-f745e15eee43
 2006-02-28 21:34:29 +00:00
nkwan%redhat.com
36590fe2e3 integrated patch 'build fix' from bugzilla #328246 
git-svn-id: svn://10.0.0.236/trunk@191178 18797224-902f-48f8-a5cc-f745e15eee43
 2006-02-24 19:40:34 +00:00
wtchang%redhat.com
0c4dffbc43 Bugzilla bug 322578: support ppc<->x86 cross builds for Mac OS X. The 
patch is contributed by Mark Mentovai <mark@moxienet.com>.  r=wtc.


git-svn-id: svn://10.0.0.236/trunk@190897 18797224-902f-48f8-a5cc-f745e15eee43
 2006-02-22 22:26:34 +00:00
wtchang%redhat.com
c5e5443a41 Bugzilla Bug 323977: use the "mapfile" (ld version script) on FreeBSD. 
Build the freebl shared libraries with the -Bsymbolic flag for GNU ld.
r=nelsonb.  Thanks to Glenn Randers-Pehrson <glennrp@imagemagick.org> for
reporting this bug and verifying these changes.
Modified files: coreconf/FreeBSD.mk nss/lib/freebl/Makefile


git-svn-id: svn://10.0.0.236/trunk@187948 18797224-902f-48f8-a5cc-f745e15eee43
 2006-01-21 02:33:33 +00:00
wtchang%redhat.com
cd65cc6117 Bugzilla Bug 317858: gcc on Linux/ppc doesn't recognize the -z defs linker 
flag, so we need to use -Wl to pass it to the linker. r=caillon.


git-svn-id: svn://10.0.0.236/trunk@187560 18797224-902f-48f8-a5cc-f745e15eee43
 2006-01-13 17:24:13 +00:00
wtchang%redhat.com
4d24de3e78 Bugzilla Bug 321865: added coreconf files for Solaris 11. The patch is 
contributed by Alfred Peng <alfred.peng@sun.com>. r=wtc.
Added files: SunOS5.11.mk SunOS5.11_i86pc.mk


git-svn-id: svn://10.0.0.236/trunk@186882 18797224-902f-48f8-a5cc-f745e15eee43
 2006-01-03 23:02:11 +00:00
wtchang%redhat.com
a89d821aaf Bugzilla Bug 312202: use the _32 tag in 32-bit HP-UX IPF builds. Use the 
$ORIGIN linker keyword when building shared libraries and executable
programs on HP-UX IPF. r=nelsonb.
Modified Files: coreconf/HP-UX.mk nss/cmd/platlibs.mk


git-svn-id: svn://10.0.0.236/trunk@184652 18797224-902f-48f8-a5cc-f745e15eee43
 2005-11-15 18:19:18 +00:00
julien.pierre.bugs%sun.com
651cc930d0 Remove dead files. r=wtchang 
git-svn-id: svn://10.0.0.236/trunk@184124 18797224-902f-48f8-a5cc-f745e15eee43
 2005-11-04 01:02:50 +00:00
sandeep.konchady%sun.com
1e92e6a0f1 Bugzilla id: 314583, removed linking of JVM to JSS library and replaced 
reference to classes.zip with rt.jar.


git-svn-id: svn://10.0.0.236/trunk@184067 18797224-902f-48f8-a5cc-f745e15eee43
 2005-11-03 00:11:59 +00:00
wtchang%redhat.com
cbb6a46b79 Bugzilla bug 314089: On HP-UX, use rt.jar instead of classes.zip; for JDK 
1.4 or later use the "server" JVM.  Fixed an error in the pathname of
rt.jar for Linux. r=sandeep.konchady.


git-svn-id: svn://10.0.0.236/trunk@183155 18797224-902f-48f8-a5cc-f745e15eee43
 2005-10-28 00:20:38 +00:00
wtchang%redhat.com
276ae9d9af Bugzilla Bug 302212: set DARWIN_SDK_DSOFLAGS and pass -F arguments to ld 
when GCC <= 3.  Contributed by Mark Mentovai <mark@moxienet.com>. r=wtc.


git-svn-id: svn://10.0.0.236/trunk@183151 18797224-902f-48f8-a5cc-f745e15eee43
 2005-10-28 00:06:56 +00:00
wtchang%redhat.com
2355b53c16 Bugzilla Bug 302212: allow Mac OS X x86 builds to target SDKs. The patch 
is contributed by Mark Mentovai <mark@moxienet.com>. r=wtc,joshmoz.


git-svn-id: svn://10.0.0.236/trunk@183059 18797224-902f-48f8-a5cc-f745e15eee43
 2005-10-26 17:00:07 +00:00
wtchang%redhat.com
b6b7ec26c8 Bugzilla bug 312774: support building with IBM JDK on Linux. Added -L 
linker flags for IBM JDK's pathnames.  The patch is contributed by Rich
Megginson of Red Hat. r=wtc,glen.beasley.


git-svn-id: svn://10.0.0.236/trunk@182498 18797224-902f-48f8-a5cc-f745e15eee43
 2005-10-18 22:36:19 +00:00
wtchang%redhat.com
8b8849194e Bugzilla Bug 312202: checked in HP-UX IPF (Itanium) porting changes 
contributed by Grace Lu of HP.  Use the .so suffix for shared libraries
on HP-UX IPF.  Support building on HP-UX B.11.23. r=wtc.
Modified Files:
	coreconf/HP-UX.mk nss/lib/nss/nssinit.c
Added Files:
	coreconf/HP-UXB.11.23.mk


git-svn-id: svn://10.0.0.236/trunk@182112 18797224-902f-48f8-a5cc-f745e15eee43
 2005-10-12 19:04:13 +00:00
wtchang%redhat.com
d65b05d417 Bugzilla Bug 311074: cvs removed the unused nfspwd.pl script (which only 
worked on the old Netscape intranet). r=relyea.
Modified Files: OS2.mk command.mk rules.mk
Removed Files: nsinstall/nfspwd nsinstall/nfspwd.pl


git-svn-id: svn://10.0.0.236/trunk@181946 18797224-902f-48f8-a5cc-f745e15eee43
 2005-10-10 23:46:13 +00:00
wtchang%redhat.com
1a675ae297 Bugzilla Bug 311074: removed the unused nfspwd Perl script from TARGETS, 
which caused "gmake clean" to break on a read-only source tree.  The patch
is contributed by Benjamin Smedberg <benjamin@smedbergs.us>. r=wtc.


git-svn-id: svn://10.0.0.236/trunk@181688 18797224-902f-48f8-a5cc-f745e15eee43
 2005-10-05 22:25:37 +00:00
wtchang%redhat.com
194e48269d Bugzilla Bug 310336: support building on Windows Server 2003. 
r=Sandeep.Konchady.


git-svn-id: svn://10.0.0.236/trunk@181185 18797224-902f-48f8-a5cc-f745e15eee43
 2005-09-28 23:14:44 +00:00
wtchang%redhat.com
22ec122467 Bugzilla Bug 303508: enhanced the makefile rule for $(MAPFILE). Added 
the new variable MAPFILE_SOURCE instead of the hardcoded
$(LIBRARY_NAME).def to represent the "source" mapfile, and use $< to
refer to the "source" mapfile (prerequisite of the target) in
PROCESS_MAP_FILE. r=nelsonb.
Modified Files:
	AIX.mk BSD_OS.mk Darwin.mk FreeBSD.mk HP-UX.mk IRIX.mk
	Linux.mk Linux2.1.mk Linux2.2.mk Linux2.4.mk Linux2.5.mk
	Linux2.6.mk NCR3.0.mk NEC4.2.mk NetBSD.mk OS2.mk OSF1.mk
	OpenUNIX.mk OpenVMS.mk ReliantUNIX.mk SCO_SV3.2.mk SunOS5.mk
	UNIXWARE2.1.mk WIN16.mk WIN32.mk WINCE.mk rules.mk ruleset.mk


git-svn-id: svn://10.0.0.236/trunk@180406 18797224-902f-48f8-a5cc-f745e15eee43
 2005-09-16 17:09:23 +00:00
sandeep.konchady%sun.com
9cf264b0d1 Modified import.pl, jdk.mk and release.pl under coreconf and all.pl under 
jss test directory for bug #302550.  Attached below is the diff of the
changes done to these files.

Index: coreconf/import.pl
===================================================================
RCS file: /cvsroot/mozilla/security/coreconf/import.pl,v
retrieving revision 1.2
diff -u -r1.2 import.pl
--- coreconf/import.pl  25 Apr 2004 15:02:17 -0000      1.2
+++ coreconf/import.pl  15 Sep 2005 18:37:51 -0000
@@ -46,7 +46,6 @@

 #######-- read in variables on command line into %var

-$var{ZIP} = "zip";
 $var{UNZIP} = "unzip -o";

 &parse_argv;
Index: coreconf/jdk.mk
===================================================================
RCS file: /cvsroot/mozilla/security/coreconf/jdk.mk,v
retrieving revision 1.14
diff -u -r1.14 jdk.mk
--- coreconf/jdk.mk     25 Apr 2004 15:02:17 -0000      1.14
+++ coreconf/jdk.mk     15 Sep 2005 18:37:52 -0000
@@ -123,14 +123,14 @@

 # set [Sun Solaris] platforms
 ifeq ($(OS_ARCH), SunOS)
-       JAVA_CLASSES = $(JAVA_HOME)/lib/classes.zip
+       JAVA_CLASSES = $(JAVA_HOME)/jre/lib/rt.jar

        ifeq ($(JRE_HOME),)
                JRE_HOME = $(JAVA_HOME)
                JRE_CLASSES = $(JAVA_CLASSES)
        else
                ifeq ($(JRE_CLASSES),)
-                       JRE_CLASSES = $(JRE_HOME)/lib/classes.zip
+                       JRE_CLASSES = $(JRE_HOME)/lib/rt.jar
                endif
        endif

@@ -144,9 +144,13 @@

        # (3) specify "linker" information
 ifeq ($(USE_64), 1)
-       JAVA_CPU = $(shell uname -p)v9
+       ifeq ($(CPU_ARCH), x86_64)
+               JAVA_CPU = amd64
+       else
+               JAVA_CPU := $(shell uname -p)v9
+       endif
 else
-       JAVA_CPU = $(shell uname -p)
+       JAVA_CPU := $(shell uname -p)
 endif

 ifeq ($(JDK_VERSION), 1.1)
@@ -163,8 +167,6 @@
 ifneq ($(JDK_VERSION), 1.1)
 ifeq ($(USE_64), 1)
        JAVA_LIBS += -L$(JAVA_HOME)/$(JAVA_LIBDIR)/server
-else
-       JAVA_LIBS += -L$(JAVA_HOME)/$(JAVA_LIBDIR)/classic
 endif
        JAVA_LIBS += -L$(JAVA_HOME)/$(JAVA_LIBDIR)
        JAVA_LIBS += -ljvm -ljava
@@ -220,14 +222,14 @@

 # set [Redhat Linux] platforms
 ifeq ($(OS_ARCH), Linux)
-       JAVA_CLASSES = $(JAVA_HOME)/lib/classes.zip
+       JAVA_CLASSES = $(JAVA_HOME)/jre/lib/rt.jar

        ifeq ($(JRE_HOME),)
                JRE_HOME = $(JAVA_HOME)
                JRE_CLASSES = $(JAVA_CLASSES)
        else
                ifeq ($(JRE_CLASSES),)
-                       JRE_CLASSES = $(JRE_HOME)/lib/classes.zip
+                       JRE_CLASSES = $(JRE_HOME)/jre/lib/rt.jar
                endif
        endif

@@ -241,16 +243,21 @@

        # (3) specify "linker" information
        JAVA_CPU = i386
-
+       ifeq ($(CPU_ARCH),x86_64)
+               ifeq ($(USE_64), 1)
+                       JAVA_CPU = amd64
+               else
+                       JAVA_CPU = i386
+               endif
+       endif
        JAVA_LIBDIR = jre/lib/$(JAVA_CPU)

        JAVA_CLIBS =

         ifeq ($(JDK_VERSION), 1.4)
-           JAVA_LIBS += -L$(JAVA_HOME)/$(JAVA_LIBDIR)/server -ljvm
-        else
-           JAVA_LIBS += -L$(JAVA_HOME)/$(JAVA_LIBDIR)/classic -ljvm
+               JAVA_LIBS += -L$(JAVA_HOME)/$(JAVA_LIBDIR)/server -ljvm
        endif
+
        JAVA_LIBS += -L$(JAVA_HOME)/$(JAVA_LIBDIR) -ljava
        JAVA_LIBS += $(JAVA_CLIBS)

Index: coreconf/release.pl
===================================================================
RCS file: /cvsroot/mozilla/security/coreconf/release.pl,v
retrieving revision 1.3
diff -u -r1.3 release.pl
--- coreconf/release.pl 25 Apr 2004 15:02:17 -0000      1.3
+++ coreconf/release.pl 15 Sep 2005 18:37:52 -0000
@@ -41,7 +41,14 @@

 #######-- read in variables on command line into %var

-$var{ZIP} = "zip";
+$use_jar = 1;
+$ZIP     = "$ENV{JAVA_HOME}/bin/jar";
+
+if ( $ENV{JAVA_HOME} eq "" ) {
+    $ZIP      = "zip";
+    $use_jar  = 0;
+}
+

 &parse_argv;

@@ -56,11 +63,15 @@

     ($jardir,$jaropts) = split(/\|/,$jarinfo);

-    $zipoptions = "-T";
-    if ($jaropts =~ /a/) {
-       if ($var{OS_ARCH} eq 'WINNT') {
-           $zipoptions .= ' -ll';
-       }
+    if ( $use_jar ) {
+        $zipoptions = "-cvf";
+    } else {
+        $zipoptions = "-T -r";
+        if ($jaropts =~ /a/) {
+            if ($var{OS_ARCH} eq 'WINNT') {
+                $zipoptions .= ' -ll';
+            }
+        }
     }

 # just in case the directory ends in a /, remove it
@@ -117,8 +128,8 @@
        }
        closedir(DIR);

-       print STDERR "zip $zipoptions -r $jarfile $filelist\n";
-       system("zip $zipoptions -r $jarfile $filelist");
+       print STDERR "$ZIP $zipoptions $jarfile $filelist\n";
+       system("$ZIP $zipoptions $jarfile $filelist");
        rmdir("META-INF");
            for $i (1 .. $dirdepth) {
            chdir("..");
Index: jss/org/mozilla/jss/tests/all.pl
===================================================================
RCS file: /cvsroot/mozilla/security/jss/org/mozilla/jss/tests/all.pl,v
retrieving revision 1.22
diff -u -r1.22 all.pl
--- jss/org/mozilla/jss/tests/all.pl    6 Sep 2005 17:57:40 -0000       1.22
+++ jss/org/mozilla/jss/tests/all.pl    15 Sep 2005 18:37:54 -0000
@@ -136,12 +136,26 @@
         exit(1);
     }

+    #
+    # Use 64-bit Java on AMD64.
+    #
+
     $java = "$ENV{JAVA_HOME}/jre/bin/java$exe_suffix";
+    my $java_64bit = 0;
+    if ($osname eq "SunOS") {
+       if ($ENV{USE_64}) {
+           my $cpu = `/usr/bin/isainfo -n`;
+           if ($cpu == "amd64") {
+               $java = "$ENV{JAVA_HOME}/jre/bin/amd64/java$exe_suffix";
+               $java_64bit = 1;
+           }
+       }
+    }
     (-f $java) or die "'$java' does not exist\n";
     $java = $java . $ENV{NATIVE_FLAG};

-    if ($ENV{USE_64}) {
-        $java = $java . " -d64";
+    if ($ENV{USE_64} && !$java_64bit) {
+       $java = $java . " -d64";
     }

     $pwfile = "passwords";


git-svn-id: svn://10.0.0.236/trunk@180343 18797224-902f-48f8-a5cc-f745e15eee43
 2005-09-16 00:33:23 +00:00