gecko-dev/security/coreconf/import.pl
sandeep.konchady%sun.com 50fdf2b49f 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

222 lines
6.3 KiB
Perl
Executable File

#! /usr/local/bin/perl
#
# ***** BEGIN LICENSE BLOCK *****
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
#
# 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 security libraries.
#
# The Initial Developer of the Original Code is
# Netscape Communications Corporation.
# Portions created by the Initial Developer are Copyright (C) 1994-2000
# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 2 or later (the "GPL"), or
# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
# in which case the provisions of the GPL or the LGPL are applicable instead
# of those above. If you wish to allow use of your version of this file only
# under the terms of either the GPL or the LGPL, and not to allow others to
# use your version of this file under the terms of the MPL, indicate your
# decision by deleting the provisions above and replace them with the notice
# and other provisions required by the GPL or the LGPL. If you do not delete
# the provisions above, a recipient may use your version of this file under
# the terms of any one of the MPL, the GPL or the LGPL.
#
# ***** END LICENSE BLOCK *****
print STDERR "import.pl\n";
require('coreconf.pl');
$returncode =0;
#######-- read in variables on command line into %var
$var{UNZIP} = "unzip -o";
&parse_argv;
if (! ($var{IMPORTS} =~ /\w/)) {
print STDERR "nothing to import\n";
}
######-- Do the import!
foreach $import (split(/ /,$var{IMPORTS}) ) {
print STDERR "\n\nIMPORTING .... $import\n-----------------------------\n";
# if a specific version specified in IMPORT variable
# (if $import has a slash in it)
if ($import =~ /\//) {
# $component=everything before the first slash of $import
$import =~ m|^([^/]*)/|;
$component = $1;
$import =~ m|^(.*)/([^/]*)$|;
# $path=everything before the last slash of $import
$path = $1;
# $version=everything after the last slash of $import
$version = $2;
if ($var{VERSION} ne "current") {
$version = $var{VERSION};
}
}
else {
$component = $import;
$path = $import;
$version = $var{VERSION};
}
$releasejardir = "$var{RELEASE_TREE}/$path";
if ($version eq "current") {
print STDERR "Current version specified. Reading 'current' file ... \n";
open(CURRENT,"$releasejardir/current") || die "NO CURRENT FILE\n";
$version = <CURRENT>;
$version =~ s/(\r?\n)*$//; # remove any trailing [CR/]LF's
close(CURRENT);
print STDERR "Using version $version\n";
if ( $version eq "") {
die "Current version file empty. Stopping\n";
}
}
$releasejardir = "$releasejardir/$version";
if ( ! -d $releasejardir) {
die "$releasejardir doesn't exist (Invalid Version?)\n";
}
foreach $jarfile (split(/ /,$var{FILES})) {
($relpath,$distpath,$options) = split(/\|/, $var{$jarfile});
if ($var{'OVERRIDE_IMPORT_CHECK'} eq 'YES') {
$options =~ s/v//g;
}
if ( $relpath ne "") { $releasejarpathname = "$releasejardir/$relpath";}
else { $releasejarpathname = $releasejardir; }
# If a component doesn't have IDG versions, import the DBG ones
if( ! -e "$releasejarpathname/$jarfile" ) {
if( $relpath =~ /IDG\.OBJ$/ ) {
$relpath =~ s/IDG.OBJ/DBG.OBJ/;
$releasejarpathname = "$releasejardir/$relpath";
} elsif( $relpath =~ /IDG\.OBJD$/ ) {
$relpath =~ s/IDG.OBJD/DBG.OBJD/;
$releasejarpathname = "$releasejardir/$relpath";
}
}
if (-e "$releasejarpathname/$jarfile") {
print STDERR "\nWorking on jarfile: $jarfile\n";
if ($distpath =~ m|/$|) {
$distpathname = "$distpath$component";
}
else {
$distpathname = "$distpath";
}
#the block below is used to determine whether or not the xp headers have
#already been imported for this component
$doimport = 1;
if ($options =~ /v/) { # if we should check the imported version
print STDERR "Checking if version file exists $distpathname/version\n";
if (-e "$distpathname/version") {
open( VFILE, "<$distpathname/version") ||
die "Cannot open $distpathname/version for reading. Permissions?\n";
$importversion = <VFILE>;
close (VFILE);
$importversion =~ s/\r?\n$//; # Strip off any trailing CR/LF
if ($version eq $importversion) {
print STDERR "$distpathname version '$importversion' already imported. Skipping...\n";
$doimport =0;
}
}
}
if ($doimport == 1) {
if (! -d "$distpathname") {
&rec_mkdir("$distpathname");
}
# delete the stuff in there already.
# (this should really be recursive delete.)
if ($options =~ /v/) {
$remheader = "\nREMOVING files in '$distpathname/' :";
opendir(DIR,"$distpathname") ||
die ("Cannot read directory $distpathname\n");
@filelist = readdir(DIR);
closedir(DIR);
foreach $file ( @filelist ) {
if (! ($file =~ m!/.?.$!) ) {
if (! (-d $file)) {
$file =~ m!([^/]*)$!;
print STDERR "$remheader $1";
$remheader = " ";
unlink "$distpathname/$file";
}
}
}
}
print STDERR "\n\n";
print STDERR "\nExtracting jarfile '$jarfile' to local directory $distpathname/\n";
print STDERR "$var{UNZIP} $releasejarpathname/$jarfile -d $distpathname\n";
system("$var{UNZIP} $releasejarpathname/$jarfile -d $distpathname");
$r = $?;
if ($options =~ /v/) {
if ($r == 0) {
unlink ("$distpathname/version");
if (open(VFILE,">$distpathname/version")) {
print VFILE "$version\n";
close(VFILE);
}
}
else {
print STDERR "Could not create '$distpathname/version'. Permissions?\n";
$returncode ++;
}
}
} # if (doimport)
} # if (-e releasejarpathname/jarfile)
} # foreach jarfile)
} # foreach IMPORT
exit($returncode);