/hg/icedtea7: 2 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue Jul 7 13:50:38 UTC 2015
changeset 833edf800116 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=833edf800116
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Tue Jul 07 14:48:54 2015 +0100
PR1816: Split download/extraction rules for OpenJDK so they can run in parallel
2015-07-06 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR1816: Split download/extraction rules for OpenJDK
so they can run in parallel
* Makefile.am:
(.PHONY): Add new clean-download-* and
clean-extract-* targets.
(download): Depend on download-{corba,hotspot,
jaxp,jaxws,jdk,langtools}.
(clean-download): Depend on
clean-download-{hotspot,corba,jaxp,jaxws,jdk,langtools}.
(download-openjdk): Don't do Mercurial checkout here.
Do it as part of extract. Split corba, jaxp, jaxws,
jdk and langtools downloads into their own targets.
(download-corba): Split from download-openjdk.
(download-jaxp): Likewise.
(download-jaxws): Likewise.
(download-jdk): Likewise.
(download-langtools): Likewise.
(clean-download-openjdk): Don't depend on
clean-download-hotspot. Split corba, jaxp, jaxws,
jdk and langtools cleanup into their own targets.
(clean-download-corba): Split from clean-download-openjdk.
(clean-download-jaxp): Likewise.
(clean-download-jaxws): Likewise.
(clean-download-jdk): Likewise.
(clean-download-langtools): Likewise.
(download-hotspot): No need to depend on download-openjdk.
(extract): Depend on extract-{corba,jaxp,jaxws,jdk,langtools}.
(extract-openjdk): Add cloning of root repository here.
Split extraction of corba, jaxp, jaxws, jdk and langtools
into their own targets.
(clean-extract-openjdk): Depend on
clean-extract-{jdk,jaxp,jaxws,corba,langtools}.
(extract-corba): Split from extract-openjdk.
(clean-extract-corba): New target to just remove corba.
(extract-jaxp): Split from extract-openjdk.
(clean-extract-jaxp): New target to just remove jaxp.
(extract-jaxws): Split from extract-openjdk.
(clean-extract-jaxws): New target to just remove jaxws.
(extract-jdk): Split from extract-openjdk.
(clean-extract-jdk): New target to just remove jdk.
(extract-langtools): Split from extract-openlangtools.
(clean-extract-langtools): New target to just remove langtools.
(extract-hotspot): Handle Mercurial checkout.
(sanitise-openjdk): Depend on extract-{jdk,langtools,corba,jaxp,jaxws}.
(add-nss): Depend on extract-jdk.
* NEWS: Updated.
changeset de9d540d2cb8 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=de9d540d2cb8
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Tue Jul 07 14:50:13 2015 +0100
PR2341: Update README & INSTALL files
2015-07-06 Andrew John Hughes <gnu.andrew at member.fsf.org>
* INSTALL: Update list of detected
JDKs, specifying that bootstrap mode is
not specific to Classpath JDKs. Remove
dead --with-netbeans-home, --with-ant-home,
--with-xalan2-jar, --with-xalan2-serializer-jar,
--with-xerces2-jar, --enable-systemtap and
--with-gcj-home options. Document --with-jdk-home.
Move --enable-system-kerberos to be listed with other
system library options. Update XRender and SystemTap
documentation. Document the SunEC provider. Update
list of architectures supported by native HotSpot ports.
Mention ARM32 JIT.
* NEWS: Updated.
* README: Remove outdated notes about in-development
OpenJDK 7. Update list of architectures supported
by native HotSpot ports and mention ARM32 JIT.
Remove section about PulseAudio mixer (moved
to IcedTea-Sound).
* acinclude.m4:
(IT_CHECK_FOR_JDK): Match ICEDTEA7_VMS ordering
to ICEDTEA6_VMS ordering.
diffstat:
ChangeLog | 73 +++++++++++++++++++
INSTALL | 80 +++++++++-----------
Makefile.am | 219 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
NEWS | 2 +
README | 34 +++-----
acinclude.m4 | 10 +-
6 files changed, 325 insertions(+), 93 deletions(-)
diffs (truncated from 788 to 500 lines):
diff -r 4ef5eeb4a284 -r de9d540d2cb8 ChangeLog
--- a/ChangeLog Mon Jun 15 14:48:50 2015 +0100
+++ b/ChangeLog Tue Jul 07 14:50:13 2015 +0100
@@ -1,3 +1,76 @@
+2015-07-06 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * INSTALL: Update list of detected
+ JDKs, specifying that bootstrap mode is
+ not specific to Classpath JDKs. Remove
+ dead --with-netbeans-home, --with-ant-home,
+ --with-xalan2-jar, --with-xalan2-serializer-jar,
+ --with-xerces2-jar, --enable-systemtap and
+ --with-gcj-home options. Document --with-jdk-home.
+ Move --enable-system-kerberos to be listed with other
+ system library options. Update XRender and SystemTap
+ documentation. Document the SunEC provider. Update
+ list of architectures supported by native HotSpot ports.
+ Mention ARM32 JIT.
+ * NEWS: Updated.
+ * README: Remove outdated notes about in-development
+ OpenJDK 7. Update list of architectures supported
+ by native HotSpot ports and mention ARM32 JIT.
+ Remove section about PulseAudio mixer (moved
+ to IcedTea-Sound).
+ * acinclude.m4:
+ (IT_CHECK_FOR_JDK): Match ICEDTEA7_VMS ordering
+ to ICEDTEA6_VMS ordering.
+
+2015-07-06 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR1816: Split download/extraction rules for OpenJDK
+ so they can run in parallel
+ * Makefile.am:
+ (.PHONY): Add new clean-download-* and
+ clean-extract-* targets.
+ (download): Depend on download-{corba,hotspot,
+ jaxp,jaxws,jdk,langtools}.
+ (clean-download): Depend on
+ clean-download-{hotspot,corba,jaxp,jaxws,jdk,langtools}.
+ (download-openjdk): Don't do Mercurial checkout here.
+ Do it as part of extract. Split corba, jaxp, jaxws,
+ jdk and langtools downloads into their own targets.
+ (download-corba): Split from download-openjdk.
+ (download-jaxp): Likewise.
+ (download-jaxws): Likewise.
+ (download-jdk): Likewise.
+ (download-langtools): Likewise.
+ (clean-download-openjdk): Don't depend on
+ clean-download-hotspot. Split corba, jaxp, jaxws,
+ jdk and langtools cleanup into their own targets.
+ (clean-download-corba): Split from clean-download-openjdk.
+ (clean-download-jaxp): Likewise.
+ (clean-download-jaxws): Likewise.
+ (clean-download-jdk): Likewise.
+ (clean-download-langtools): Likewise.
+ (download-hotspot): No need to depend on download-openjdk.
+ (extract): Depend on extract-{corba,jaxp,jaxws,jdk,langtools}.
+ (extract-openjdk): Add cloning of root repository here.
+ Split extraction of corba, jaxp, jaxws, jdk and langtools
+ into their own targets.
+ (clean-extract-openjdk): Depend on
+ clean-extract-{jdk,jaxp,jaxws,corba,langtools}.
+ (extract-corba): Split from extract-openjdk.
+ (clean-extract-corba): New target to just remove corba.
+ (extract-jaxp): Split from extract-openjdk.
+ (clean-extract-jaxp): New target to just remove jaxp.
+ (extract-jaxws): Split from extract-openjdk.
+ (clean-extract-jaxws): New target to just remove jaxws.
+ (extract-jdk): Split from extract-openjdk.
+ (clean-extract-jdk): New target to just remove jdk.
+ (extract-langtools): Split from extract-openlangtools.
+ (clean-extract-langtools): New target to just remove langtools.
+ (extract-hotspot): Handle Mercurial checkout.
+ (sanitise-openjdk): Depend on extract-{jdk,langtools,corba,jaxp,jaxws}.
+ (add-nss): Depend on extract-jdk.
+ * NEWS: Updated.
+
2015-06-15 Andrew John Hughes <gnu.andrew at member.fsf.org>
* NEWS:
diff -r 4ef5eeb4a284 -r de9d540d2cb8 INSTALL
--- a/INSTALL Mon Jun 15 14:48:50 2015 +0100
+++ b/INSTALL Tue Jul 07 14:50:13 2015 +0100
@@ -8,8 +8,8 @@
The build requirements are as follows:
A bootstrap JDK, either:
- - GNU libgcj 4.4.0 (or equivalent class library based on GNU Classpath >= 0.95) for --enable-bootstrap mode (the default)
- - IcedTea6 or IcedTea7 for --disable-bootstrap mode
+ - GNU libgcj 4.4.0 (or equivalent class library based on GNU Classpath >= 0.95) (--enable-bootstrap mode only, the default)
+ - IcedTea6 or IcedTea7
CUPS
libX11 (libXp, libXtst, libXi, libXt, libXinerama)
Freetype2
@@ -50,6 +50,12 @@
make
The following locations are checked for a JDK:
+ * /usr/lib/jvm/icedtea-7
+ * /usr/lib/jvm/icedtea7
+ * /usr/lib/jvm/java-7-openjdk
+ * /usr/lib/jvm/java-1.7.0-openjdk.x86_64
+ * /usr/lib64/jvm/java-1.7.0-openjdk
+ * /usr/lib/jvm/java-1.7.0
* /usr/lib/jvm/icedtea-6
* /usr/lib/jvm/icedtea6
* /usr/lib/jvm/java-6-openjdk
@@ -113,19 +119,19 @@
fontconfig instead of trying to dynamically open it at runtime.
* --enable-system-pcsc: Build and link against the system installation of
libpcsclite instead of trying to dynamically open it at runtime.
+* --enable-system-kerberos: Link against the system Kerberos library and
+ query it at runtime to obtain the cache location, rather than using a
+ hardcoded value.
* --enable-compile-against-syscalls: Check for syscalls at compile-time not runtime.
* --with-gcj: Compile ecj to native code with gcj prior to building.
* --with-parallel-jobs: Run the specified number of parallel jobs when
building HotSpot and the JDK. If this option is passed without an
argument, the number of online processors plus one is used.
-* --with-netbeans-home: The location of NetBeans for use in the VisualVM build,
- defaults to /usr/share/netbeans.
-* --with-ant-home: The location of Ant, defaults to /usr/share/ant.
* --with-pkgversion=PKG: Include the specified distro package information in
the output of java -version.
-* --with-gcj-home: Perform a full bootstrap build using an installed
- copy of a GNU Classpath JDK such as gcj. If a directory is not specified,
- a check against the list presented above is performed.
+* --with-jdk-home: Perform a build using the installed JDK, such as gcj or IcedTea,
+ to bootstrap. If a directory is not specified, a check against the list presented
+ above is performed.
* --with-java: Specify the location of a 'java' binary. By default, the path
is checked for gij and java.
* --with-ecj: Specify the location of a 'ecj' binary. By default, the path
@@ -146,22 +152,6 @@
- /usr/share/java/eclipse-ecj.jar
- /usr/share/java/ecj.jar
- /usr/share/eclipse-ecj-3.{2,3,4,5}/lib/ecj.jar
-* --with-xalan2-jar: Specify the location of a xalan2 JAR file. By default, the
- following paths are checked:
- - /usr/share/java/xalan-j2.jar
- - /usr/share/java/xalan2.jar
- - /usr/share/xalan/lib/xalan.jar
-* --with-xalan2-serializer-jar: Specify the location of a xalan2 serializer JAR file.
- By default, the following paths are checked:
- - /usr/share/java/xalan-j2-serializer.jar
- - /usr/share/xalan-serializer/lib/serializer.jar
- - /usr/share/java/serializer.jar
-* --with-xerces2-jar: Specify the location of a xerces2 JAR file. By default, the
- following paths are checked:
- - /usr/share/java/xerces-j2.jar
- - /usr/share/java/xerces2.jar
- - /usr/share/xerces-2/lib/xercesImpl.jar
- - /usr/share/java/xercesImpl.jar
* --with-openjdk-src-zip: Specify the location of the OpenJDK tarball to avoid downloading.
* --with-hotspot-src-zip: Specify the location of the HotSpot tarball to avoid downloading.
* --with-corba-src-zip: Specify the location of the CORBA tarball to avoid downloading.
@@ -195,7 +185,6 @@
* --disable-langtools-tests: Disable the running of the langtools JTReg suite.
* --disable-jdk-tests: Disable the running of the jdk JTreg suite.
* --disable-xrender: Don't include the XRender pipeline.
-* --enable-systemtap: Include support for tracing using systemtap.
* --enable-nss: Enable the NSS security provider.
* --enable-cacao: Replace HotSpot with the CACAO VM.
* --enable-jamvm: Replace HotSpot with JamVM.
@@ -204,9 +193,6 @@
* --with-rhino: Include Javascript support using Rhino (location may optionally be specified).
* --with-additional-vms=vm-list: Additional VMs to build using the system described
below.
-* --enable-system-kerberos: Link against the system Kerberos library and
- query it at runtime to obtain the cache location, rather than using a
- hardcoded value.
* --enable-arm32-jit: Build the ARM32 JIT.
* --enable-sunec: Build the SunEC crypto provider against system NSS.
* --enable-native-debuginfo: Include debuginfo in native binaries.
@@ -232,10 +218,9 @@
IcedTea7 includes support for an Xrender-based rendering pipeline
developed by Clemens Eisserer (http://linuxhippy.blogspot.com/). This
-is compiled by default, and can be disabled using --disable-xrender.
-To actually use the pipeline, the sun.java2d.xrender property needs to
-be set to true, e.g. by passing the -Dsun.java2d.xrender=True option
-to java.
+is compiled by default. To actually use the pipeline, the
+sun.java2d.xrender property needs to be set to true, e.g. by passing
+the -Dsun.java2d.xrender=True option to java.
SystemTap
=========
@@ -243,16 +228,16 @@
IcedTea7 includes work to allow the existing DTrace probes included in
OpenJDK to be used with SystemTap. This requires version 0.9.5 or later (0.9.9
or later if you want Java method tracing). The tapset needs to know
-the final install location of the JDK, so the --with-abs-install-dir option
+the final install location of the JDK, so the --prefix option
should also be used to specify this. If not set, it defaults to the
in-tree location of openjdk.build/j2sdk-image and requires
manual changes to tapset/hotspot.stp to work from elsewhere. For
example, if you plan to install the resulting build in
/usr/lib/jvm/java-1.6.0-openjdk, then you should specify
---with-abs-install-dir=/usr/lib/jvm/java-1.6.0-openjdk.
+--prefix=/usr/lib/jvm/java-1.6.0-openjdk.
-NSS Security Provider
-=====================
+The NSS PKCS11 Security Provider and Elliptic Curve Cryptography
+================================================================
OpenJDK includes an NSS-based security provider in the form of
sun.security.pkcs11.SunPKCS11. However, as this needs to know the
@@ -263,12 +248,20 @@
this configuration will be turned on in lib/security/java.security.
This can also be done manually at a later date.
+The PKCS11 option was originally added as it was the only way that
+elliptic curve cryptography support could be provided. From OpenJDK 7
+onwards, there is another provider, SunEC. This also utilises NSS, but
+directly via its ECC functions rather than the PKCS11 interface.
+Specifying --enable-sunec will build this provider, linked against
+NSS. Version 3.16.1 or later of NSS is required so that the
+appropriate softokn ABI is available to the provider.
+
CACAO
=====
IcedTea7 can use CACAO as the virtual machine, as opposed to HotSpot.
One advantage of this is that CACAO has a JIT implementation for
-more platforms than HotSpot, including ppc, ppc64, arm and mips.
+more platforms than HotSpot, including ppc, arm and mips.
When --enable-cacao is specified, CACAO will be downloaded and built,
followed by the JDK portion of OpenJDK resulting in a CACAO+OpenJDK
image in openjdk.build/j2sdk-image. The --with-cacao-home
@@ -291,10 +284,10 @@
IcedTea7 includes a zero assembler port of HotSpot, which avoids
architecture-specific code as much as possible, allowing an
interpreter to be built and run on most platforms (albeit very
-slowly). As HotSpot only includes JITs for x86, x86_64 and SPARC, the
-zero assembler port is automatically enabled on all other
-architectures. On x86, x86_64 and SPARC, it may be built using
---enable-zero.
+slowly). As HotSpot only includes JITs for x86, x86_64, AArch64,
+ppc64, ppc64le and SPARC, the zero assembler port is automatically
+enabled on all other architectures. On HotSpot architectures, it may
+be built using --enable-zero.
To overcome the performance issues inherent in zero, a LLVM-based JIT
called Shark has been developed. This performs Just-In-Time compilation
@@ -302,9 +295,8 @@
--enable-shark to configure. Please note that Shark is still in
development and builds are still likely to fail at present.
-On ARM32, there is also a native JIT port built on top of Zero. This
-still has issues and is thus not enabled by default. To enable it,
-pass --enable-arm32-jit to configure.
+On ARM32, there is also a native JIT port built on top of Zero, which
+is built on this platform by default.
Support for Different Versions of HotSpot
=========================================
diff -r 4ef5eeb4a284 -r de9d540d2cb8 Makefile.am
--- a/Makefile.am Mon Jun 15 14:48:50 2015 +0100
+++ b/Makefile.am Tue Jul 07 14:50:13 2015 +0100
@@ -838,7 +838,10 @@
clean-add-tzdata-support-boot \
clean-check-crypto clean-check-crypto-debug clean-check-crypto-boot \
clean-add-archive clean-add-archive-debug clean-add-archive-boot clean-cryptocheck \
- clean-download-hotspot
+ clean-download-hotspot clean-download-corba clean-download-jaxp \
+ clean-download-jaxws clean-download-langtools clean-download-jdk clean-download-openjdk \
+ clean-extract-corba clean-extract-jaxp clean-extract-jaxws clean-extract-jdk \
+ clean-extract-langtools
env:
@echo 'unset JAVA_HOME'
@@ -870,22 +873,22 @@
# Download OpenJDK sources.
-stamps/download.stamp: stamps/download-openjdk.stamp \
- stamps/download-cacao.stamp stamps/download-jamvm.stamp stamps/download-hotspot.stamp
+stamps/download.stamp: stamps/download-openjdk.stamp stamps/download-corba.stamp \
+ stamps/download-jaxp.stamp stamps/download-jaxws.stamp stamps/download-jdk.stamp \
+ stamps/download-cacao.stamp stamps/download-jamvm.stamp stamps/download-hotspot.stamp \
+ stamps/download-langtools.stamp
mkdir -p stamps
touch $@
-clean-download: clean-download-openjdk clean-download-cacao clean-download-jamvm
+clean-download: clean-download-openjdk clean-download-cacao clean-download-jamvm \
+ clean-download-hotspot clean-download-corba clean-download-jaxp clean-download-jaxws \
+ clean-download-jdk clean-download-langtools
rm -f stamps/download.stamp
stamps/download-openjdk.stamp:
if OPENJDK_SRC_DIR_FOUND
else
if USE_HG
- $(HG) clone $(REV_ARG) $(ICEDTEA_HG_URL) openjdk;
- for repos in corba jaxp jaxws langtools jdk ; do \
- $(HG) clone $(REV_ARG) $(ICEDTEA_HG_URL)/$${repos} openjdk/$${repos}; \
- done
else
if USE_ALT_OPENJDK_SRC_ZIP
ln -sf $(ALT_OPENJDK_SRC_ZIP) $(OPENJDK_SRC_ZIP)
@@ -906,6 +909,16 @@
echo "ERROR: No up-to-date OpenJDK root zip available"; exit -1; \
fi ; \
fi ;
+endif
+endif
+ mkdir -p stamps
+ touch $@
+
+stamps/download-corba.stamp:
+if OPENJDK_SRC_DIR_FOUND
+else
+if USE_HG
+else
if USE_ALT_CORBA_SRC_ZIP
ln -sf $(ALT_CORBA_SRC_ZIP) $(CORBA_SRC_ZIP)
endif
@@ -925,6 +938,16 @@
echo "ERROR: No up-to-date OpenJDK CORBA zip available"; exit -1; \
fi ; \
fi ;
+endif
+endif
+ mkdir -p stamps
+ touch $@
+
+stamps/download-jaxp.stamp:
+if OPENJDK_SRC_DIR_FOUND
+else
+if USE_HG
+else
if USE_ALT_JAXP_SRC_ZIP
ln -sf $(ALT_JAXP_SRC_ZIP) $(JAXP_SRC_ZIP)
endif
@@ -944,6 +967,16 @@
echo "ERROR: No up-to-date JAXP root zip available"; exit -1; \
fi ; \
fi ;
+endif
+endif
+ mkdir -p stamps
+ touch $@
+
+stamps/download-jaxws.stamp:
+if OPENJDK_SRC_DIR_FOUND
+else
+if USE_HG
+else
if USE_ALT_JAXWS_SRC_ZIP
ln -sf $(ALT_JAXWS_SRC_ZIP) $(JAXWS_SRC_ZIP)
endif
@@ -963,6 +996,16 @@
echo "ERROR: No up-to-date OpenJDK JAXWS zip available"; exit -1; \
fi ; \
fi ;
+endif
+endif
+ mkdir -p stamps
+ touch $@
+
+stamps/download-jdk.stamp:
+if OPENJDK_SRC_DIR_FOUND
+else
+if USE_HG
+else
if USE_ALT_JDK_SRC_ZIP
ln -sf $(ALT_JDK_SRC_ZIP) $(JDK_SRC_ZIP)
endif
@@ -982,6 +1025,16 @@
echo "ERROR: No up-to-date OpenJDK JDK zip available"; exit -1; \
fi ; \
fi ;
+endif
+endif
+ mkdir -p stamps
+ touch $@
+
+stamps/download-langtools.stamp:
+if OPENJDK_SRC_DIR_FOUND
+else
+if USE_HG
+else
if USE_ALT_LANGTOOLS_SRC_ZIP
ln -sf $(ALT_LANGTOOLS_SRC_ZIP) $(LANGTOOLS_SRC_ZIP)
endif
@@ -1006,26 +1059,41 @@
mkdir -p stamps
touch $@
-clean-download-openjdk: clean-download-hotspot
+clean-download-openjdk:
if [ ! -z $(OPENJDK_SRC_ZIP) ] ; then \
rm -f $(OPENJDK_SRC_ZIP) ; \
fi
+ rm -f stamps/download-openjdk.stamp
+
+clean-download-corba:
if [ ! -z $(CORBA_SRC_ZIP) ] ; then \
rm -f $(CORBA_SRC_ZIP) ; \
fi
+ rm -f stamps/download-corba.stamp
+
+clean-download-jaxp:
if [ ! -z $(JAXP_SRC_ZIP) ] ; then \
rm -f $(JAXP_SRC_ZIP) ; \
fi
+ rm -f stamps/download-jaxp.stamp
+
+clean-download-jaxws:
if [ ! -z $(JAXWS_SRC_ZIP) ] ; then \
rm -f $(JAXWS_SRC_ZIP) ; \
fi
+ rm -f stamps/download-jaxws.stamp
+
+clean-download-jdk:
if [ ! -z $(JDK_SRC_ZIP) ] ; then \
rm -f $(JDK_SRC_ZIP) ; \
fi
+ rm -f stamps/download-jdk.stamp
+
+clean-download-langtools:
if [ ! -z $(LANGTOOLS_SRC_ZIP) ] ; then \
rm -f $(LANGTOOLS_SRC_ZIP) ; \
fi
- rm -f stamps/download-openjdk.stamp
+ rm -f stamps/download-langtools.stamp
stamps/download-cacao.stamp:
if BUILD_CACAO
@@ -1090,11 +1158,10 @@
rm -f $(JAMVM_SRC_ZIP)
rm -f stamps/download-jamvm.stamp
-stamps/download-hotspot.stamp: stamps/download-openjdk.stamp
+stamps/download-hotspot.stamp:
if OPENJDK_SRC_DIR_FOUND
else
if USE_HG
- $(HG) clone $(REV_ARG) $(HS_URL) openjdk/hotspot
else
if USE_ALT_HOTSPOT_SRC_ZIP
ln -sf $(ALT_HOTSPOT_SRC_ZIP) $(HOTSPOT_SRC_ZIP)
@@ -1135,8 +1202,9 @@
fi
rm -f stamps/download-hotspot.stamp
-stamps/extract.stamp: stamps/extract-openjdk.stamp \
- stamps/extract-cacao.stamp stamps/remove-intree-libraries.stamp \
+stamps/extract.stamp: stamps/extract-openjdk.stamp stamps/extract-corba.stamp \
+ stamps/extract-jaxp.stamp stamps/extract-jaxws.stamp stamps/extract-jdk.stamp \
+ stamps/extract-cacao.stamp stamps/remove-intree-libraries.stamp stamps/extract-langtools.stamp \
stamps/extract-jamvm.stamp stamps/extract-hotspot.stamp stamps/sanitise-openjdk.stamp
mkdir -p stamps
touch $@
@@ -1148,6 +1216,9 @@
if OPENJDK_SRC_DIR_FOUND
cp -pPR $(OPENJDK_SRC_DIR_LINK) $(OPENJDK_SRC_DIR) openjdk
else
+if USE_HG
+ $(HG) clone $(REV_ARG) $(ICEDTEA_HG_URL) openjdk;
+else
set -e ; \
if ! test -d openjdk ; then \
if [ ! -z $(OPENJDK_SRC_ZIP) ] ; then \
@@ -1161,6 +1232,24 @@
false; \
fi; \
fi;
+endif
+endif
+ touch $@
+
+clean-extract-openjdk: clean-overlay clean-versioning \
+ clean-patch-fsg clean-remove-intree-libraries \
+ clean-sanitise-openjdk clean-extract-hotspot \
+ clean-extract-jdk clean-extract-jaxp clean-extract-jaxws \
+ clean-extract-corba clean-extract-langtools
+ rm -rf openjdk
+ rm -f stamps/extract-openjdk.stamp
+
+stamps/extract-corba.stamp: stamps/extract-openjdk.stamp stamps/download-corba.stamp
+if OPENJDK_SRC_DIR_FOUND
+else
+if USE_HG
+ $(HG) clone $(REV_ARG) $(ICEDTEA_HG_URL)/corba openjdk/corba
+else
set -e ; \
if [ ! -z $(CORBA_SRC_ZIP) ] ; then \
if test -e ${CORBA_SRC_ZIP} ; \
@@ -1175,6 +1264,20 @@
fi ; \
fi ; \
fi
+endif
+endif
+ touch $@
+
More information about the distro-pkg-dev
mailing list