mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность
151 215 коммитов 40 Ветки 136 Теги 1,1 GiB
Граф коммитов

265 Коммитов

Автор SHA1 Сообщение Дата
wtchang%redhat.com 36c9d7bd15 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
 2005-11-15 18:19:18 +00:00
julien.pierre.bugs%sun.com 97b61a9ea6 Remove dead files. r=wtchang 2005-11-04 01:02:50 +00:00
sandeep.konchady%sun.com bf76f2aab1 Bugzilla id: 314583, removed linking of JVM to JSS library and replaced 
reference to classes.zip with rt.jar.
 2005-11-03 00:11:59 +00:00
wtchang%redhat.com e955d37c8b 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.
 2005-10-28 00:20:38 +00:00
wtchang%redhat.com 151cfa866e 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.
 2005-10-28 00:06:56 +00:00
wtchang%redhat.com d0fa45f6e1 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.
 2005-10-26 17:00:07 +00:00
wtchang%redhat.com 26fa27cb5e 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.
 2005-10-18 22:36:19 +00:00
wtchang%redhat.com e43c3ce2ce 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
 2005-10-12 19:04:13 +00:00
wtchang%redhat.com f71abec372 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
 2005-10-10 23:46:13 +00:00
wtchang%redhat.com 106649493f 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.
 2005-10-05 22:25:37 +00:00
wtchang%redhat.com c641f2799f Bugzilla Bug 310336: support building on Windows Server 2003. 
r=Sandeep.Konchady.
 2005-09-28 23:14:44 +00:00
wtchang%redhat.com ef4eb9a0e4 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
 2005-09-16 17:09:23 +00:00
sandeep.konchady%sun.com 4bb21db05f 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";
 2005-09-16 00:33:23 +00:00
saul.edwards%sun.com 046c62d43f Bug 303508: Add freebl shared libs that do 64-bit integer math. Bug 274984: softoken fails to load freebl in setuid programs. freebl becomes a shared library on all platforms. r=nelson 
Modified Files:
	coreconf/HP-UXB.11.mk coreconf/SunOS5.mk
	nss/cmd/shlibsign/Makefile nss/cmd/shlibsign/manifest.mn
	nss/lib/freebl/Makefile nss/lib/freebl/arcfour.c
	nss/lib/freebl/blapi.h nss/lib/freebl/config.mk
	nss/lib/freebl/ldvector.c nss/lib/freebl/loader.c
	nss/lib/freebl/loader.h nss/lib/freebl/manifest.mn
Added Files:
	nss/lib/freebl/freebl.def
 2005-09-07 02:47:16 +00:00
wtchang%redhat.com 51ef3c3c86 Bugzilla Bug 303507: changed GCC's default OPTIMIZER back to -O2. 
r=saul.edwards.
 2005-09-02 00:59:00 +00:00
julien.pierre.bugs%sun.com 2ffa7acc60 Fix for 297802 . r=wtchang . Add $(OS_LIBS) to MKSHLIB rules. 
Add -z defs linker option for Solaris and Linux .
Also add -z ignore on Solaris .
 2005-08-26 02:17:05 +00:00
wtchang%redhat.com 94441eaca9 Bugzilla bug 302212: backed out the previous checkin. The corresponding 
Mozilla patch hasn't been checked in yet.
 2005-08-25 23:23:40 +00:00
saul.edwards%sun.com ca3db23c1b Addendum to 303507 - set default OPTIMIZER for Linux and Solaris gcc builds 
to -O3, consolidate flags to Linux.mk.
 2005-08-24 23:58:36 +00:00
wtchang%redhat.com fcf4d7234a Bugzilla bug 302670: backed out the use of system zlib because some Linux 
distributions are using zlib 1.1.4, which causes our signtool tests to
fail intermittently.  Don't know why.
 2005-08-20 01:05:44 +00:00
wtchang%redhat.com e06cb45930 Bugzilla Bug 266123: support 64-bit PowerPC builds for Linux distributions 
(such as Red Hat and Fedora) whose GCC generates 32-bit code by default.
r=cls.
 2005-08-18 17:48:26 +00:00
wtchang%redhat.com 972d589547 Bugzilla Bug 302670: enable NSS to use system zlib and do that on Linux. 
r=nelsonb.
Modified Files:
	coreconf/Linux.mk nss/cmd/Makefile nss/cmd/manifest.mn
	nss/cmd/platlibs.mk
 2005-08-16 01:08:59 +00:00
wtchang%redhat.com cf5e252283 Bugzilla Bug 302212: enable Mac OS X x86 builds to target SDKs. The patch 
is contributed by Mark Mentovai <mark@moxienet.com>. r=wtc.
 2005-08-15 22:44:22 +00:00
wtchang%redhat.com bd99a181d7 Bugzilla Bug 266123: added ppc64 support. The patch is contributed by 
Markus Rothe <markus@unixforces.net>. r=wtc.
 2005-08-09 22:31:24 +00:00
wtchang%redhat.com 5e18c64463 Bugzilla Bug 288647: enable building NSS with an NSPR binary distribution. 
Introduced NSPR_INCLUDE_DIR and NSPR_LIB_DIR make variables. Portions of
the patch were contributed by Chris Seawood <cls@seawood.org>. r=relyea.
Modified Files:
	coreconf/OS2.mk coreconf/OpenVMS.mk coreconf/location.mk
	nss/cmd/platlibs.mk nss/cmd/shlibsign/Makefile
	nss/cmd/shlibsign/sign.cmd nss/cmd/shlibsign/sign.sh
	nss/lib/ckfw/builtins/Makefile
	nss/lib/fortcrypt/swfort/pkcs11/Makefile nss/lib/nss/config.mk
	nss/lib/smime/config.mk nss/lib/softoken/config.mk
	nss/lib/ssl/config.mk
 2005-07-21 23:48:30 +00:00
wtchang%redhat.com a4a7cc85d3 Bugzilla Bug 294122: support building with MSYS (a set of Unix utilities 
for Windows compiled with MinGW).  The patch is contributed by Howard Chu
<hyc@symas.com>. r=wtc,cls.
Modified Files: arch.mk rules.mk
 2005-07-07 16:50:47 +00:00
julien.pierre.bugs%sun.com 721d20caed Fix for 297849 . Allow x86 build on Linux x86_64 machine. r=wtchang 2005-07-05 22:48:38 +00:00
wtchang%redhat.com 02fa2849ed Bugzilla Bug 298532: use -fPIC explicitly (which is the default). The 
patch is contributed by Mark Mentovai <mark@moxienet.com>. r=wtc.
 2005-07-01 00:40:07 +00:00
wtchang%redhat.com cfc57b80b1 Bugzilla Bug 298532: updated for Mac 10.4u ("universal") SDK, which adds 
support for Intel CPUs.  The patch is contributed by Mark Mentovai
<mark@moxienet.com>. r=wtc.
 2005-06-28 21:21:05 +00:00
wtchang%redhat.com cca45cda33 Bugzilla Bug 297826: add the -Zmap flag to create .map files for DLLs. The 
patch is contributed by Peter Weilbacher <mozilla@Weilbacher.org>.
Reviewed by Julien Pierre and Michael Kaply.
 2005-06-23 18:46:17 +00:00
relyea%netscape.com f2e042b4ff Mozilla Tiger build changes. Currently the mozilla branch is broken 
without these changes.

Bug 292530 r=wtc (according to dougt).
Code builds agains NSS tip, verified by relyea
Patch created by Josh Aas
 2005-06-01 21:00:22 +00:00
wtchang%redhat.com 350ca73f9f Bugzilla Bug 294333: enable building on Windows Me with Cygwin. Thanks 
to Jacek Piskozub <piskozub@iopan.gda.pl> for reporting the bug and
verifying the fix.  r=cls,nelsonb.
 2005-05-17 21:26:14 +00:00
julien.pierre.bugs%sun.com 02be6067f4 Fix for 290120. r=wtchang 2005-04-15 00:36:28 +00:00
julien.pierre.bugs%sun.com dafc64356a Back out fix for 290121 temporarily (until Christophe upgrades build tools) 2005-04-14 04:41:49 +00:00
julien.pierre.bugs%sun.com a25dbaca79 Fix for bug 290120 - compile source files with absolute pathnames on AIX. r=wtchang 2005-04-13 20:58:06 +00:00
wtchang%redhat.com a8d86e332d Bugzilla Bug 193164: do not use nfspwd.pl, which only works on the old 
Netscape corporate network. r=cmp@mozilla.org.
 2005-02-05 01:35:47 +00:00
gerv%gerv.net d6d819dccf Bug 236613: change to MPL/LGPL/GPL tri-license. 2005-02-02 22:28:27 +00:00
wtchang%redhat.com 564f4ed5c5 Bugzilla Bug 279542: removed -L/lib. It's not necessary, and produced 
incorrect executables on an s390 system (don't know why).
r=caillon@redhat.com.
 2005-02-01 23:39:18 +00:00
wtchang%redhat.com b60a112bc9 Bugzilla Bug 279621: added a note explaining what HCL is. 2005-01-27 19:14:15 +00:00
wchang0222%aol.com 6138988a6b Bugzilla bug 267839: use $< and $@ in makefile rules where appropriate. 
r=relyea.
 2004-12-22 00:06:42 +00:00
wchang0222%aol.com 60e13508c3 Bugzilla bug 93206: allow $(CC) to contain multiple words. coreconf itself 
doesn't set CC to be multiple words, but higher-level modules such as PSM
may pass CC to NSS on the gmake command line and $(CC) may contain multiple
words.  r=cls,jpierre.
 2004-11-09 06:24:18 +00:00
wchang0222%aol.com b9d3c2a831 Bugzilla bug 240784: removed the temporary workaround added in rev. 1.55. 2004-11-06 00:17:20 +00:00
wchang0222%aol.com 9cdd7dd3cb Removed a comment and the commented-out code it described. 2004-11-05 02:42:21 +00:00
wchang0222%aol.com 9c7779751f Combined two lines into one. 2004-11-05 02:38:30 +00:00
wchang0222%aol.com cc7f62e55a Although we do use the native compilers by default on most platforms, it 
is more correct to say "default compiler" than "native compiler" here.
 2004-11-05 02:37:42 +00:00
wchang0222%aol.com 5d9394cbf3 ALL_TRASH should be defined with = rather than := because some of its 
constituents (e.g., TARGETS) may be redefined after coreconf/config.mk has
been included (e.g., in a local config.mk file).  We do not want to expand
these constituents right when ALL_TRASH is defined.
 2004-11-05 02:35:43 +00:00
wchang0222%aol.com 36adca51ff Use the $< variable in the rule to build a program from a single object. 2004-11-05 01:45:49 +00:00
wchang0222%aol.com 56ba8ca864 Need to pass $(CFLAGS) to $(MKPROG) when building a program from a single 
object file.  This rule should be similar to the rule for building
$(PROGRAM).
 2004-11-04 15:55:05 +00:00
wchang0222%aol.com 5bddd4073a Bugzilla bug 240784: checked in a temporary workaround for the fix for 
bug 240784 that breaks OS/2 tinderbox.  The problem seems to be that OS/2
file system is case insensitive, so nsinstall won't change the file name
of an existing DLL in mozilla/dist/$(OBJDIR)/lib, but gmake is case
sensitive, and gmake can't find a rule to build softokn3.chk from because
the softokn3 DLL in mozilla/dist/$(OBJDIR)/lib doesn't have the right name.
 2004-10-20 17:24:53 +00:00
julien.pierre.bugs%sun.com 5896c71a2f Fix for 259003 - port NSS to Solaris AMD64 . r=wtc 2004-10-11 02:15:42 +00:00
wchang0222%aol.com 371548241e Bugzilla bug 244231: white space changes to conform to NSS's coding style. 
Modified Files:
	WIN954.0.mk WINCE3.0.mk WINNT3.51.mk WINNT4.0.mk WINNT5.0.mk
	WINNT5.1.mk
 2004-08-27 00:33:40 +00:00