2000-03-31 18:56:07 +00:00
|
|
|
#
|
2004-04-25 15:03:26 +00:00
|
|
|
# ***** 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.
|
|
|
|
|
#
|
2000-03-31 18:56:07 +00:00
|
|
|
# The Original Code is the Netscape security libraries.
|
2004-04-25 15:03:26 +00:00
|
|
|
#
|
|
|
|
|
# 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.
|
|
|
|
|
#
|
2000-03-31 18:56:07 +00:00
|
|
|
# Contributor(s):
|
|
|
|
|
#
|
2004-04-25 15:03:26 +00:00
|
|
|
# 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 *****
|
2000-03-31 18:56:07 +00:00
|
|
|
|
|
|
|
|
ifdef NS_USE_JDK
|
|
|
|
|
#######################################################################
|
|
|
|
|
# [1] Define preliminary JDK "Core Components" toolset options #
|
|
|
|
|
#######################################################################
|
|
|
|
|
|
|
|
|
|
# set default JDK java threading model
|
|
|
|
|
ifeq ($(JDK_THREADING_MODEL),)
|
|
|
|
|
JDK_THREADING_MODEL = native_threads
|
|
|
|
|
# no such thing as -native flag
|
|
|
|
|
JDK_THREADING_MODEL_OPT =
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
#######################################################################
|
|
|
|
|
# [2] Define platform-independent JDK "Core Components" options #
|
|
|
|
|
#######################################################################
|
|
|
|
|
|
|
|
|
|
# set default location of the java classes repository
|
|
|
|
|
ifeq ($(JAVA_DESTPATH),)
|
|
|
|
|
ifdef BUILD_OPT
|
|
|
|
|
JAVA_DESTPATH = $(SOURCE_CLASSES_DIR)
|
|
|
|
|
else
|
|
|
|
|
JAVA_DESTPATH = $(SOURCE_CLASSES_DBG_DIR)
|
|
|
|
|
endif
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
# set default location of the package under the java classes repository
|
|
|
|
|
# note that this overrides the default package value in ruleset.mk
|
|
|
|
|
ifeq ($(PACKAGE),)
|
|
|
|
|
PACKAGE = .
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
# set default location of the java source code repository
|
|
|
|
|
ifeq ($(JAVA_SOURCEPATH),)
|
|
|
|
|
JAVA_SOURCEPATH = .
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
# add JNI directory to default include search path
|
|
|
|
|
ifneq ($(JNI_GEN),)
|
|
|
|
|
ifdef NSBUILDROOT
|
|
|
|
|
INCLUDES += -I$(JNI_GEN_DIR) -I$(SOURCE_XP_DIR)
|
|
|
|
|
else
|
|
|
|
|
INCLUDES += -I$(JNI_GEN_DIR)
|
|
|
|
|
endif
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
#######################################################################
|
|
|
|
|
# [3] Define platform-dependent JDK "Core Components" options #
|
|
|
|
|
#######################################################################
|
|
|
|
|
|
|
|
|
|
# set [Microsoft Windows] platforms
|
|
|
|
|
ifeq ($(OS_ARCH), WINNT)
|
2005-11-03 00:11:59 +00:00
|
|
|
JAVA_CLASSES = $(JAVA_HOME)/jre/lib/rt.jar
|
2000-03-31 18:56:07 +00:00
|
|
|
|
|
|
|
|
ifeq ($(JRE_HOME),)
|
|
|
|
|
JRE_HOME = $(JAVA_HOME)
|
|
|
|
|
JRE_CLASSES = $(JAVA_CLASSES)
|
|
|
|
|
else
|
|
|
|
|
ifeq ($(JRE_CLASSES),)
|
2005-11-03 00:11:59 +00:00
|
|
|
JRE_CLASSES = $(JRE_HOME)/lib/rt.jar
|
2000-03-31 18:56:07 +00:00
|
|
|
endif
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
PATH_SEPARATOR = ;
|
|
|
|
|
|
|
|
|
|
# (2) specify "header" information
|
|
|
|
|
JAVA_ARCH = win32
|
|
|
|
|
|
|
|
|
|
INCLUDES += -I$(JAVA_HOME)/include
|
|
|
|
|
INCLUDES += -I$(JAVA_HOME)/include/$(JAVA_ARCH)
|
|
|
|
|
|
|
|
|
|
# currently, disable JIT option on this platform
|
|
|
|
|
JDK_JIT_OPT = -nojit
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
# set [Sun Solaris] platforms
|
2002-05-02 04:37:16 +00:00
|
|
|
ifeq ($(OS_ARCH), SunOS)
|
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
|
|
|
JAVA_CLASSES = $(JAVA_HOME)/jre/lib/rt.jar
|
2000-03-31 18:56:07 +00:00
|
|
|
|
|
|
|
|
ifeq ($(JRE_HOME),)
|
|
|
|
|
JRE_HOME = $(JAVA_HOME)
|
|
|
|
|
JRE_CLASSES = $(JAVA_CLASSES)
|
|
|
|
|
else
|
|
|
|
|
ifeq ($(JRE_CLASSES),)
|
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
|
|
|
JRE_CLASSES = $(JRE_HOME)/lib/rt.jar
|
2000-03-31 18:56:07 +00:00
|
|
|
endif
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
PATH_SEPARATOR = :
|
|
|
|
|
|
|
|
|
|
# (2) specify "header" information
|
|
|
|
|
JAVA_ARCH = solaris
|
|
|
|
|
|
|
|
|
|
INCLUDES += -I$(JAVA_HOME)/include
|
|
|
|
|
INCLUDES += -I$(JAVA_HOME)/include/$(JAVA_ARCH)
|
|
|
|
|
|
|
|
|
|
# currently, disable JIT option on this platform
|
|
|
|
|
JDK_JIT_OPT =
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
# set [Hewlett Packard HP-UX] platforms
|
2002-05-02 04:37:16 +00:00
|
|
|
ifeq ($(OS_ARCH), HP-UX)
|
2005-10-28 00:20:38 +00:00
|
|
|
JAVA_CLASSES = $(JAVA_HOME)/jre/lib/rt.jar
|
2000-03-31 18:56:07 +00:00
|
|
|
|
|
|
|
|
ifeq ($(JRE_HOME),)
|
|
|
|
|
JRE_HOME = $(JAVA_HOME)
|
|
|
|
|
JRE_CLASSES = $(JAVA_CLASSES)
|
|
|
|
|
else
|
|
|
|
|
ifeq ($(JRE_CLASSES),)
|
2005-10-28 00:20:38 +00:00
|
|
|
JRE_CLASSES = $(JRE_HOME)/lib/rt.jar
|
2000-03-31 18:56:07 +00:00
|
|
|
endif
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
PATH_SEPARATOR = :
|
|
|
|
|
|
|
|
|
|
# (2) specify "header" information
|
|
|
|
|
JAVA_ARCH = hp-ux
|
|
|
|
|
|
|
|
|
|
INCLUDES += -I$(JAVA_HOME)/include
|
|
|
|
|
INCLUDES += -I$(JAVA_HOME)/include/$(JAVA_ARCH)
|
|
|
|
|
|
|
|
|
|
# no JIT option available on this platform
|
|
|
|
|
JDK_JIT_OPT =
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
# set [Redhat Linux] platforms
|
2002-05-02 04:37:16 +00:00
|
|
|
ifeq ($(OS_ARCH), Linux)
|
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
|
|
|
JAVA_CLASSES = $(JAVA_HOME)/jre/lib/rt.jar
|
2000-03-31 18:56:07 +00:00
|
|
|
|
|
|
|
|
ifeq ($(JRE_HOME),)
|
|
|
|
|
JRE_HOME = $(JAVA_HOME)
|
|
|
|
|
JRE_CLASSES = $(JAVA_CLASSES)
|
|
|
|
|
else
|
|
|
|
|
ifeq ($(JRE_CLASSES),)
|
2005-10-28 00:20:38 +00:00
|
|
|
JRE_CLASSES = $(JRE_HOME)/lib/rt.jar
|
2000-03-31 18:56:07 +00:00
|
|
|
endif
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
PATH_SEPARATOR = :
|
|
|
|
|
|
|
|
|
|
# (2) specify "header" information
|
|
|
|
|
JAVA_ARCH = linux
|
|
|
|
|
|
|
|
|
|
INCLUDES += -I$(JAVA_HOME)/include
|
|
|
|
|
INCLUDES += -I$(JAVA_HOME)/include/$(JAVA_ARCH)
|
|
|
|
|
|
|
|
|
|
# no JIT option available on this platform
|
|
|
|
|
JDK_JIT_OPT =
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
# set [IBM AIX] platforms
|
2002-05-02 04:37:16 +00:00
|
|
|
ifeq ($(OS_ARCH), AIX)
|
2005-11-03 00:11:59 +00:00
|
|
|
JAVA_CLASSES = $(JAVA_HOME)/jre/lib/rt.jar
|
2000-03-31 18:56:07 +00:00
|
|
|
|
|
|
|
|
ifeq ($(JRE_HOME),)
|
|
|
|
|
JRE_HOME = $(JAVA_HOME)
|
|
|
|
|
JRE_CLASSES = $(JAVA_CLASSES)
|
|
|
|
|
else
|
|
|
|
|
ifeq ($(JRE_CLASSES),)
|
2005-11-03 00:11:59 +00:00
|
|
|
JRE_CLASSES = $(JRE_HOME)/lib/rt.jar
|
2000-03-31 18:56:07 +00:00
|
|
|
endif
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
PATH_SEPARATOR = :
|
|
|
|
|
|
|
|
|
|
# (2) specify "header" information
|
|
|
|
|
JAVA_ARCH = aix
|
|
|
|
|
|
|
|
|
|
INCLUDES += -I$(JAVA_HOME)/include
|
2001-02-23 23:29:34 +00:00
|
|
|
INCLUDES += -I$(JAVA_HOME)/include/$(JAVA_ARCH)
|
2000-03-31 18:56:07 +00:00
|
|
|
|
|
|
|
|
# no JIT option available on this platform
|
|
|
|
|
JDK_JIT_OPT =
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
# set [Digital UNIX] platforms
|
2002-05-02 04:37:16 +00:00
|
|
|
ifeq ($(OS_ARCH), OSF1)
|
2005-11-03 00:11:59 +00:00
|
|
|
JAVA_CLASSES = $(JAVA_HOME)/jre/lib/rt.jar
|
2000-03-31 18:56:07 +00:00
|
|
|
|
|
|
|
|
ifeq ($(JRE_HOME),)
|
|
|
|
|
JRE_HOME = $(JAVA_HOME)
|
|
|
|
|
JRE_CLASSES = $(JAVA_CLASSES)
|
|
|
|
|
else
|
|
|
|
|
ifeq ($(JRE_CLASSES),)
|
2005-11-03 00:11:59 +00:00
|
|
|
JRE_CLASSES = $(JRE_HOME)/lib/rt.jar
|
2000-03-31 18:56:07 +00:00
|
|
|
endif
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
PATH_SEPARATOR = :
|
|
|
|
|
|
|
|
|
|
# (2) specify "header" information
|
|
|
|
|
JAVA_ARCH = alpha
|
|
|
|
|
|
|
|
|
|
INCLUDES += -I$(JAVA_HOME)/include
|
|
|
|
|
INCLUDES += -I$(JAVA_HOME)/include/$(JAVA_ARCH)
|
|
|
|
|
|
|
|
|
|
# no JIT option available on this platform
|
|
|
|
|
JDK_JIT_OPT =
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
# set [Silicon Graphics IRIX] platforms
|
2002-05-02 04:37:16 +00:00
|
|
|
ifeq ($(OS_ARCH), IRIX)
|
2000-03-31 18:56:07 +00:00
|
|
|
JAVA_CLASSES = $(JAVA_HOME)/lib/dev.jar:$(JAVA_HOME)/lib/rt.jar
|
|
|
|
|
|
|
|
|
|
ifeq ($(JRE_HOME),)
|
|
|
|
|
JRE_HOME = $(JAVA_HOME)
|
|
|
|
|
JRE_CLASSES = $(JAVA_CLASSES)
|
|
|
|
|
else
|
|
|
|
|
ifeq ($(JRE_CLASSES),)
|
|
|
|
|
JRE_CLASSES = $(JRE_HOME)/lib/dev.jar:$(JRE_HOME)/lib/rt.jar
|
|
|
|
|
endif
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
PATH_SEPARATOR = :
|
|
|
|
|
|
|
|
|
|
# (2) specify "header" information
|
|
|
|
|
JAVA_ARCH = irix
|
|
|
|
|
|
|
|
|
|
INCLUDES += -I$(JAVA_HOME)/include
|
|
|
|
|
INCLUDES += -I$(JAVA_HOME)/include/$(JAVA_ARCH)
|
|
|
|
|
|
|
|
|
|
# no JIT option available on this platform
|
|
|
|
|
JDK_JIT_OPT =
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
#######################################################################
|
|
|
|
|
# [4] Define remaining JDK "Core Components" default toolset options #
|
|
|
|
|
#######################################################################
|
|
|
|
|
|
|
|
|
|
# set JDK optimization model
|
|
|
|
|
ifeq ($(BUILD_OPT),1)
|
|
|
|
|
JDK_OPTIMIZER_OPT = -O
|
|
|
|
|
else
|
|
|
|
|
JDK_OPTIMIZER_OPT = -g
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
# set minimal JDK debugging model
|
|
|
|
|
ifeq ($(JDK_DEBUG),1)
|
|
|
|
|
JDK_DEBUG_OPT = -debug
|
|
|
|
|
else
|
|
|
|
|
JDK_DEBUG_OPT =
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
# set default path to repository for JDK classes
|
|
|
|
|
ifeq ($(JDK_CLASS_REPOSITORY_OPT),)
|
|
|
|
|
JDK_CLASS_REPOSITORY_OPT = -d $(JAVA_DESTPATH)
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
# define a default JDK classpath
|
|
|
|
|
ifeq ($(JDK_CLASSPATH),)
|
2001-02-20 05:37:43 +00:00
|
|
|
JDK_CLASSPATH = '$(JAVA_DESTPATH)$(PATH_SEPARATOR)$(JAVA_SOURCEPATH)$(PATH_SEPARATOR)$(JAVA_CLASSES)'
|
2000-03-31 18:56:07 +00:00
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
# by default, override CLASSPATH environment variable using the JDK classpath option with $(JDK_CLASSPATH)
|
|
|
|
|
ifeq ($(JDK_CLASSPATH_OPT),)
|
|
|
|
|
JDK_CLASSPATH_OPT = -classpath $(JDK_CLASSPATH)
|
|
|
|
|
endif
|
|
|
|
|
|
2002-05-02 04:37:16 +00:00
|
|
|
ifeq ($(USE_64), 1)
|
|
|
|
|
JDK_USE_64 = -d64
|
|
|
|
|
endif
|
2000-03-31 18:56:07 +00:00
|
|
|
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#######################################################################
|
|
|
|
|
# [5] Define JDK "Core Components" toolset; #
|
|
|
|
|
# (always allow a user to override these values) #
|
|
|
|
|
#######################################################################
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# (1) appletviewer
|
|
|
|
|
#
|
|
|
|
|
|
|
|
|
|
ifeq ($(APPLETVIEWER),)
|
|
|
|
|
APPLETVIEWER_PROG = $(JAVA_HOME)/bin/appletviewer$(PROG_SUFFIX)
|
|
|
|
|
APPLETVIEWER_FLAGS = $(JDK_THREADING_MODEL_OPT)
|
|
|
|
|
APPLETVIEWER_FLAGS += $(JDK_DEBUG_OPT)
|
|
|
|
|
APPLETVIEWER_FLAGS += $(JDK_JIT_OPT)
|
|
|
|
|
APPLETVIEWER = $(APPLETVIEWER_PROG) $(APPLETVIEWER_FLAGS)
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# (2) jar
|
|
|
|
|
#
|
|
|
|
|
|
|
|
|
|
ifeq ($(JAR),)
|
|
|
|
|
JAR_PROG = $(JAVA_HOME)/bin/jar$(PROG_SUFFIX)
|
|
|
|
|
JAR_FLAGS = $(JDK_THREADING_MODEL_OPT)
|
|
|
|
|
JAR = $(JAR_PROG) $(JAR_FLAGS)
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# (3) java
|
|
|
|
|
#
|
|
|
|
|
|
|
|
|
|
ifeq ($(JAVA),)
|
|
|
|
|
JAVA_PROG = $(JAVA_HOME)/bin/java$(PROG_SUFFIX)
|
|
|
|
|
JAVA_FLAGS = $(JDK_THREADING_MODEL_OPT)
|
|
|
|
|
JAVA_FLAGS += $(JDK_DEBUG_OPT)
|
|
|
|
|
JAVA_FLAGS += $(JDK_CLASSPATH_OPT)
|
|
|
|
|
JAVA_FLAGS += $(JDK_JIT_OPT)
|
2002-05-02 04:37:16 +00:00
|
|
|
JAVA_FLAGS += $(JDK_USE_64)
|
2000-03-31 18:56:07 +00:00
|
|
|
JAVA = $(JAVA_PROG) $(JAVA_FLAGS)
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# (4) javac
|
|
|
|
|
#
|
|
|
|
|
|
|
|
|
|
ifeq ($(JAVAC),)
|
|
|
|
|
JAVAC_PROG = $(JAVA_HOME)/bin/javac$(PROG_SUFFIX)
|
|
|
|
|
JAVAC_FLAGS = $(JDK_THREADING_MODEL_OPT)
|
|
|
|
|
JAVAC_FLAGS += $(JDK_OPTIMIZER_OPT)
|
|
|
|
|
JAVAC_FLAGS += $(JDK_DEBUG_OPT)
|
|
|
|
|
JAVAC_FLAGS += $(JDK_CLASSPATH_OPT)
|
|
|
|
|
JAVAC_FLAGS += $(JDK_CLASS_REPOSITORY_OPT)
|
2002-05-02 04:37:16 +00:00
|
|
|
JAVAC_FLAGS += $(JDK_USE_64)
|
2000-03-31 18:56:07 +00:00
|
|
|
JAVAC = $(JAVAC_PROG) $(JAVAC_FLAGS)
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# (5) javadoc
|
|
|
|
|
#
|
|
|
|
|
|
|
|
|
|
ifeq ($(JAVADOC),)
|
|
|
|
|
JAVADOC_PROG = $(JAVA_HOME)/bin/javadoc$(PROG_SUFFIX)
|
|
|
|
|
JAVADOC_FLAGS = $(JDK_THREADING_MODEL_OPT)
|
|
|
|
|
JAVADOC_FLAGS += $(JDK_CLASSPATH_OPT)
|
|
|
|
|
JAVADOC = $(JAVADOC_PROG) $(JAVADOC_FLAGS)
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# (6) javah
|
|
|
|
|
#
|
|
|
|
|
|
|
|
|
|
ifeq ($(JAVAH),)
|
|
|
|
|
JAVAH_PROG = $(JAVA_HOME)/bin/javah$(PROG_SUFFIX)
|
|
|
|
|
JAVAH_FLAGS = $(JDK_THREADING_MODEL_OPT)
|
|
|
|
|
JAVAH_FLAGS += $(JDK_CLASSPATH_OPT)
|
|
|
|
|
JAVAH = $(JAVAH_PROG) $(JAVAH_FLAGS)
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# (7) javakey
|
|
|
|
|
#
|
|
|
|
|
|
|
|
|
|
ifeq ($(JAVAKEY),)
|
|
|
|
|
JAVAKEY_PROG = $(JAVA_HOME)/bin/javakey$(PROG_SUFFIX)
|
|
|
|
|
JAVAKEY_FLAGS = $(JDK_THREADING_MODEL_OPT)
|
|
|
|
|
JAVAKEY = $(JAVAKEY_PROG) $(JAVAKEY_FLAGS)
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# (8) javap
|
|
|
|
|
#
|
|
|
|
|
|
|
|
|
|
ifeq ($(JAVAP),)
|
|
|
|
|
JAVAP_PROG = $(JAVA_HOME)/bin/javap$(PROG_SUFFIX)
|
|
|
|
|
JAVAP_FLAGS = $(JDK_THREADING_MODEL_OPT)
|
|
|
|
|
JAVAP_FLAGS += $(JDK_CLASSPATH_OPT)
|
|
|
|
|
JAVAP = $(JAVAP_PROG) $(JAVAP_FLAGS)
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# (9) javat
|
|
|
|
|
#
|
|
|
|
|
|
|
|
|
|
ifeq ($(JAVAT),)
|
|
|
|
|
JAVAT_PROG = $(JAVA_HOME)/bin/javat$(PROG_SUFFIX)
|
|
|
|
|
JAVAT_FLAGS = $(JDK_THREADING_MODEL_OPT)
|
|
|
|
|
JAVAT = $(JAVAT_PROG) $(JAVAT_FLAGS)
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# (10) javaverify
|
|
|
|
|
#
|
|
|
|
|
|
|
|
|
|
ifeq ($(JAVAVERIFY),)
|
|
|
|
|
JAVAVERIFY_PROG = $(JAVA_HOME)/bin/javaverify$(PROG_SUFFIX)
|
|
|
|
|
JAVAVERIFY_FLAGS = $(JDK_THREADING_MODEL_OPT)
|
|
|
|
|
JAVAVERIFY = $(JAVAVERIFY_PROG) $(JAVAVERIFY_FLAGS)
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# (11) javaw
|
|
|
|
|
#
|
|
|
|
|
|
|
|
|
|
ifeq ($(JAVAW),)
|
|
|
|
|
jJAVAW_PROG = $(JAVA_HOME)/bin/javaw$(PROG_SUFFIX)
|
|
|
|
|
jJAVAW_FLAGS = $(JDK_THREADING_MODEL_OPT)
|
|
|
|
|
jJAVAW_FLAGS += $(JDK_DEBUG_OPT)
|
|
|
|
|
jJAVAW_FLAGS += $(JDK_CLASSPATH_OPT)
|
|
|
|
|
jJAVAW_FLAGS += $(JDK_JIT_OPT)
|
|
|
|
|
jJAVAW = $(JAVAW_PROG) $(JAVAW_FLAGS)
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# (12) jdb
|
|
|
|
|
#
|
|
|
|
|
|
|
|
|
|
ifeq ($(JDB),)
|
|
|
|
|
JDB_PROG = $(JAVA_HOME)/bin/jdb$(PROG_SUFFIX)
|
|
|
|
|
JDB_FLAGS = $(JDK_THREADING_MODEL_OPT)
|
|
|
|
|
JDB_FLAGS += $(JDK_DEBUG_OPT)
|
|
|
|
|
JDB_FLAGS += $(JDK_CLASSPATH_OPT)
|
|
|
|
|
JDB_FLAGS += $(JDK_JIT_OPT)
|
|
|
|
|
JDB = $(JDB_PROG) $(JDB_FLAGS)
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# (13) jre
|
|
|
|
|
#
|
|
|
|
|
|
|
|
|
|
ifeq ($(JRE),)
|
|
|
|
|
JRE_PROG = $(JAVA_HOME)/bin/jre$(PROG_SUFFIX)
|
|
|
|
|
JRE_FLAGS = $(JDK_THREADING_MODEL_OPT)
|
|
|
|
|
JRE_FLAGS += $(JDK_CLASSPATH_OPT)
|
|
|
|
|
JRE_FLAGS += $(JDK_JIT_OPT)
|
|
|
|
|
JRE = $(JRE_PROG) $(JRE_FLAGS)
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# (14) jrew
|
|
|
|
|
#
|
|
|
|
|
|
|
|
|
|
ifeq ($(JREW),)
|
|
|
|
|
JREW_PROG = $(JAVA_HOME)/bin/jrew$(PROG_SUFFIX)
|
|
|
|
|
JREW_FLAGS = $(JDK_THREADING_MODEL_OPT)
|
|
|
|
|
JREW_FLAGS += $(JDK_CLASSPATH_OPT)
|
|
|
|
|
JREW_FLAGS += $(JDK_JIT_OPT)
|
|
|
|
|
JREW = $(JREW_PROG) $(JREW_FLAGS)
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# (15) native2ascii
|
|
|
|
|
#
|
|
|
|
|
|
|
|
|
|
ifeq ($(NATIVE2ASCII),)
|
|
|
|
|
NATIVE2ASCII_PROG = $(JAVA_HOME)/bin/native2ascii$(PROG_SUFFIX)
|
|
|
|
|
NATIVE2ASCII_FLAGS = $(JDK_THREADING_MODEL_OPT)
|
|
|
|
|
NATIVE2ASCII = $(NATIVE2ASCII_PROG) $(NATIVE2ASCII_FLAGS)
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# (16) rmic
|
|
|
|
|
#
|
|
|
|
|
|
|
|
|
|
ifeq ($(RMIC),)
|
|
|
|
|
RMIC_PROG = $(JAVA_HOME)/bin/rmic$(PROG_SUFFIX)
|
|
|
|
|
RMIC_FLAGS = $(JDK_THREADING_MODEL_OPT)
|
|
|
|
|
RMIC_FLAGS += $(JDK_OPTIMIZER_OPT)
|
|
|
|
|
RMIC_FLAGS += $(JDK_CLASSPATH_OPT)
|
|
|
|
|
RMIC = $(RMIC_PROG) $(RMIC_FLAGS)
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# (17) rmiregistry
|
|
|
|
|
#
|
|
|
|
|
|
|
|
|
|
ifeq ($(RMIREGISTRY),)
|
|
|
|
|
RMIREGISTRY_PROG = $(JAVA_HOME)/bin/rmiregistry$(PROG_SUFFIX)
|
|
|
|
|
RMIREGISTRY_FLAGS = $(JDK_THREADING_MODEL_OPT)
|
|
|
|
|
RMIREGISTRY = $(RMIREGISTRY_PROG) $(RMIREGISTRY_FLAGS)
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# (18) serialver
|
|
|
|
|
#
|
|
|
|
|
|
|
|
|
|
ifeq ($(SERIALVER),)
|
|
|
|
|
SERIALVER_PROG = $(JAVA_HOME)/bin/serialver$(PROG_SUFFIX)
|
|
|
|
|
SERIALVER_FLAGS = $(JDK_THREADING_MODEL_OPT)
|
|
|
|
|
SERIALVER = $(SERIALVER_PROG) $(SERIALVER_FLAGS)
|
|
|
|
|
endif
|