зеркало из https://github.com/mozilla/gecko-dev.git
50fdf2b49f
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"; |
||
|---|---|---|
| .. | ||
| coreconf | ||
| dbm | ||
| jss | ||
| manager | ||
| nss | ||
| svrcore | ||
| Makefile.in | ||