changeset in /hg/icedtea: 2008-01-09 Joshua Sumali <jsumali at re...
Joshua Sumali
jsumali at redhat.com
Wed Jan 9 11:31:22 PST 2008
changeset bb4e2512ea29 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=bb4e2512ea29
description:
2008-01-09 Joshua Sumali <jsumali at redhat.com>
* Makefile.am: Added building of NetX as our drop-in replacement for
javaws. Since upstream NetX is dormant, we will be hosting and modifying
the NetX source in this repository, particularly in the new tools
directory. The old tools directory which was used in building the
bootstrap/jdk1.7.0 tools.jar during the build has been renamed to
hotspot-tools.
* Makefile.in: Regenerated.
* configure.ac: Added check for fastjar, required for NetX when building
with ecj.
* configure: Regenerated.
* README: Updated.
* patches/icedtea-jnlp-launcher.patch: New File.
* tools/default.jnlp: New File.
* tools/javax/jnlp/BasicService.java: Likewise.
* tools/javax/jnlp/ClipboardService.java: Likewise.
* tools/javax/jnlp/DownloadService.java: Likewise.
* tools/javax/jnlp/DownloadServiceListener.java: Likewise.
* tools/javax/jnlp/ExtensionInstallerService.java: Likewise.
* tools/javax/jnlp/FileContents.java: Likewise.
* tools/javax/jnlp/FileOpenService.java: Likewise.
* tools/javax/jnlp/FileSaveService.java: Likewise.
* tools/javax/jnlp/JNLPRandomAccessFile.java: Likewise.
* tools/javax/jnlp/PersistenceService.java: Likewise.
* tools/javax/jnlp/PrintService.java: Likewise.
* tools/javax/jnlp/ServiceManager.java: Likewise.
* tools/javax/jnlp/ServiceManagerStub.java: Likewise.
* tools/javax/jnlp/UnavailableServiceException.java: Likewise.
* tools/nanoxml/XMLElement.java: Likewise.
* tools/nanoxml/XMLParseException.java: Likewise.
* tools/netx/jnlp/AppletDesc.java: Likewise.
* tools/netx/jnlp/ApplicationDesc.java: Likewise.
* tools/netx/jnlp/ComponentDesc.java: Likewise.
* tools/netx/jnlp/DefaultLaunchHandler.java: Likewise.
* tools/netx/jnlp/ExtensionDesc.java: Likewise.
* tools/netx/jnlp/IconDesc.java: Likewise.
* tools/netx/jnlp/InformationDesc.java: Likewise.
* tools/netx/jnlp/InstallerDesc.java: Likewise.
* tools/netx/jnlp/JARDesc.java: Likewise.
* tools/netx/jnlp/JNLPFile.java: Likewise.
* tools/netx/jnlp/JREDesc.java: Likewise.
* tools/netx/jnlp/LaunchException.java: Likewise.
* tools/netx/jnlp/LaunchHandler.java: Likewise.
* tools/netx/jnlp/Launcher.java: Likewise.
* tools/netx/jnlp/PackageDesc.java: Likewise.
* tools/netx/jnlp/ParseException.java: Likewise.
* tools/netx/jnlp/Parser.java: Likewise.
* tools/netx/jnlp/PropertyDesc.java: Likewise.
* tools/netx/jnlp/ResourcesDesc.java: Likewise.
* tools/netx/jnlp/SecurityDesc.java: Likewise.
* tools/netx/jnlp/Version.java: Likewise.
* tools/netx/jnlp/cache/CacheEntry.java: Likewise.
* tools/netx/jnlp/cache/CacheUtil.java: Likewise.
* tools/netx/jnlp/cache/DefaultDownloadIndicator.java: Likewise.
* tools/netx/jnlp/cache/DownloadIndicator.java: Likewise.
* tools/netx/jnlp/cache/Resource.java: Likewise.
* tools/netx/jnlp/cache/ResourceTracker.java: Likewise.
* tools/netx/jnlp/cache/UpdatePolicy.java: Likewise.
* tools/netx/jnlp/cache/package.html: Likewise.
* tools/netx/jnlp/event/ApplicationEvent.java: Likewise.
* tools/netx/jnlp/event/ApplicationListener.java: Likewise.
* tools/netx/jnlp/event/DownloadEvent.java: Likewise.
* tools/netx/jnlp/event/DownloadListener.java: Likewise.
* tools/netx/jnlp/event/package.html: Likewise.
* tools/netx/jnlp/package.html: Likewise.
* tools/netx/jnlp/resources/Manifest.mf: Likewise.
* tools/netx/jnlp/resources/Messages.properties: Likewise.
* tools/netx/jnlp/resources/default.jnlp: Likewise.
* tools/netx/jnlp/resources/install.png: Likewise.
* tools/netx/jnlp/resources/netx-icon.png: Likewise.
* tools/netx/jnlp/runtime/AppThreadGroup.java: Likewise.
* tools/netx/jnlp/runtime/AppletAudioClip.java: Likewise.
* tools/netx/jnlp/runtime/AppletEnvironment.java: Likewise.
* tools/netx/jnlp/runtime/AppletInstance.java: Likewise.
* tools/netx/jnlp/runtime/ApplicationInstance.java: Likewise.
* tools/netx/jnlp/runtime/Boot.java: Likewise.
* tools/netx/jnlp/runtime/Boot13.java: Likewise.
* tools/netx/jnlp/runtime/InstallDialog.java: Likewise.
* tools/netx/jnlp/runtime/JNLPClassLoader.java: Likewise.
* tools/netx/jnlp/runtime/JNLPPolicy.java: Likewise.
* tools/netx/jnlp/runtime/JNLPRuntime.java: Likewise.
* tools/netx/jnlp/runtime/JNLPSecurityManager.java: Likewise.
* tools/netx/jnlp/runtime/package.html: Likewise.
* tools/netx/jnlp/services/ServiceUtil.java: Likewise.
* tools/netx/jnlp/services/XBasicService.java: Likewise.
* tools/netx/jnlp/services/XDownloadService.java: Likewise.
* tools/netx/jnlp/services/XExtensionInstallerService.java: Likewise.
* tools/netx/jnlp/services/XFileContents.java: Likewise.
* tools/netx/jnlp/services/XPersistenceService.java: Likewise.
* tools/netx/jnlp/services/XServiceManagerStub.java: Likewise.
* tools/netx/jnlp/services/package.html: Likewise.
* tools/netx/jnlp/tools/JarRunner.java: Likewise.
* tools/netx/jnlp/tools/JarSigner.java: Likewise.
* tools/netx/jnlp/tools/JarSignerResources.java: Likewise.
* tools/netx/jnlp/tools/KeyStoreUtil.java: Likewise.
* tools/netx/jnlp/util/PropertiesFile.java: Likewise.
* tools/netx/jnlp/util/Reflect.java: Likewise.
* tools/netx/jnlp/util/WeakList.java: Likewise.
diffstat:
90 files changed, 14654 insertions(+), 105 deletions(-)
ChangeLog | 100 +
Makefile.am | 137 -
Makefile.in | 136 -
README | 14
configure | 115 +
configure.ac | 1
patches/icedtea-jnlp-launcher.patch | 23
tools/default.jnlp | 20
tools/javax/jnlp/BasicService.java | 13
tools/javax/jnlp/ClipboardService.java | 11
tools/javax/jnlp/DownloadService.java | 25
tools/javax/jnlp/DownloadServiceListener.java | 13
tools/javax/jnlp/ExtensionInstallerService.java | 22
tools/javax/jnlp/FileContents.java | 18
tools/javax/jnlp/FileOpenService.java | 11
tools/javax/jnlp/FileSaveService.java | 11
tools/javax/jnlp/JNLPRandomAccessFile.java | 46
tools/javax/jnlp/PersistenceService.java | 18
tools/javax/jnlp/PrintService.java | 13
tools/javax/jnlp/ServiceManager.java | 54
tools/javax/jnlp/ServiceManagerStub.java | 11
tools/javax/jnlp/UnavailableServiceException.java | 16
tools/nanoxml/XMLElement.java | 1205 ++++++++++++++
tools/nanoxml/XMLParseException.java | 130 +
tools/netx/jnlp/AppletDesc.java | 125 +
tools/netx/jnlp/ApplicationDesc.java | 76
tools/netx/jnlp/ComponentDesc.java | 43
tools/netx/jnlp/DefaultLaunchHandler.java | 116 +
tools/netx/jnlp/ExtensionDesc.java | 145 +
tools/netx/jnlp/IconDesc.java | 135 +
tools/netx/jnlp/InformationDesc.java | 241 ++
tools/netx/jnlp/InstallerDesc.java | 54
tools/netx/jnlp/JARDesc.java | 131 +
tools/netx/jnlp/JNLPFile.java | 506 +++++
tools/netx/jnlp/JREDesc.java | 123 +
tools/netx/jnlp/LaunchException.java | 191 ++
tools/netx/jnlp/LaunchHandler.java | 69
tools/netx/jnlp/Launcher.java | 547 ++++++
tools/netx/jnlp/PackageDesc.java | 105 +
tools/netx/jnlp/ParseException.java | 94 +
tools/netx/jnlp/Parser.java | 1101 ++++++++++++
tools/netx/jnlp/PropertyDesc.java | 66
tools/netx/jnlp/ResourcesDesc.java | 231 ++
tools/netx/jnlp/SecurityDesc.java | 173 ++
tools/netx/jnlp/Version.java | 354 ++++
tools/netx/jnlp/cache/CacheEntry.java | 173 ++
tools/netx/jnlp/cache/CacheUtil.java | 390 ++++
tools/netx/jnlp/cache/DefaultDownloadIndicator.java | 317 +++
tools/netx/jnlp/cache/DownloadIndicator.java | 91 +
tools/netx/jnlp/cache/Resource.java | 258 ++
tools/netx/jnlp/cache/ResourceTracker.java | 925 ++++++++++
tools/netx/jnlp/cache/UpdatePolicy.java | 89 +
tools/netx/jnlp/cache/package.html | 28
tools/netx/jnlp/event/ApplicationEvent.java | 56
tools/netx/jnlp/event/ApplicationListener.java | 38
tools/netx/jnlp/event/DownloadEvent.java | 71
tools/netx/jnlp/event/DownloadListener.java | 51
tools/netx/jnlp/event/package.html | 28
tools/netx/jnlp/package.html | 30
tools/netx/jnlp/resources/Manifest.mf | 6
tools/netx/jnlp/resources/Messages.properties | 132 +
tools/netx/jnlp/resources/default.jnlp | 20
tools/netx/jnlp/runtime/AppThreadGroup.java | 68
tools/netx/jnlp/runtime/AppletAudioClip.java | 109 +
tools/netx/jnlp/runtime/AppletEnvironment.java | 314 +++
tools/netx/jnlp/runtime/AppletInstance.java | 122 +
tools/netx/jnlp/runtime/ApplicationInstance.java | 239 ++
tools/netx/jnlp/runtime/Boot.java | 355 ++++
tools/netx/jnlp/runtime/Boot13.java | 103 +
tools/netx/jnlp/runtime/InstallDialog.java | 168 +
tools/netx/jnlp/runtime/JNLPClassLoader.java | 756 ++++++++
tools/netx/jnlp/runtime/JNLPPolicy.java | 89 +
tools/netx/jnlp/runtime/JNLPRuntime.java | 466 +++++
tools/netx/jnlp/runtime/JNLPSecurityManager.java | 348 ++++
tools/netx/jnlp/runtime/package.html | 29
tools/netx/jnlp/services/ServiceUtil.java | 162 +
tools/netx/jnlp/services/XBasicService.java | 173 ++
tools/netx/jnlp/services/XDownloadService.java | 180 ++
tools/netx/jnlp/services/XExtensionInstallerService.java | 122 +
tools/netx/jnlp/services/XFileContents.java | 121 +
tools/netx/jnlp/services/XPersistenceService.java | 175 ++
tools/netx/jnlp/services/XServiceManagerStub.java | 95 +
tools/netx/jnlp/services/package.html | 29
tools/netx/jnlp/tools/JarRunner.java | 15
tools/netx/jnlp/tools/JarSigner.java | 325 +++
tools/netx/jnlp/tools/JarSignerResources.java | 212 ++
tools/netx/jnlp/tools/KeyStoreUtil.java | 69
tools/netx/jnlp/util/PropertiesFile.java | 147 +
tools/netx/jnlp/util/Reflect.java | 148 +
tools/netx/jnlp/util/WeakList.java | 128 +
diffs (truncated from 15401 to 500 lines):
diff -r 70dd57d5cd8d -r bb4e2512ea29 ChangeLog
--- a/ChangeLog Mon Jan 07 14:30:54 2008 -0500
+++ b/ChangeLog Wed Jan 09 14:22:14 2008 -0500
@@ -1,3 +1,103 @@ 2008-01-07 Lillian Angel <langel at redha
+2008-01-09 Joshua Sumali <jsumali at redhat.com>
+
+ * Makefile.am: Added building of NetX as our drop-in replacement for
+ javaws. Since upstream NetX is dormant, we will be hosting and modifying
+ the NetX source in this repository, particularly in the new tools
+ directory. The old tools directory which was used in building the
+ bootstrap/jdk1.7.0 tools.jar during the build has been renamed to
+ hotspot-tools.
+ * Makefile.in: Regenerated.
+ * configure.ac: Added check for fastjar, required for NetX when building
+ with ecj.
+ * configure: Regenerated.
+ * README: Updated.
+ * patches/icedtea-jnlp-launcher.patch: New File.
+ * tools/default.jnlp: New File.
+ * tools/javax/jnlp/BasicService.java: Likewise.
+ * tools/javax/jnlp/ClipboardService.java: Likewise.
+ * tools/javax/jnlp/DownloadService.java: Likewise.
+ * tools/javax/jnlp/DownloadServiceListener.java: Likewise.
+ * tools/javax/jnlp/ExtensionInstallerService.java: Likewise.
+ * tools/javax/jnlp/FileContents.java: Likewise.
+ * tools/javax/jnlp/FileOpenService.java: Likewise.
+ * tools/javax/jnlp/FileSaveService.java: Likewise.
+ * tools/javax/jnlp/JNLPRandomAccessFile.java: Likewise.
+ * tools/javax/jnlp/PersistenceService.java: Likewise.
+ * tools/javax/jnlp/PrintService.java: Likewise.
+ * tools/javax/jnlp/ServiceManager.java: Likewise.
+ * tools/javax/jnlp/ServiceManagerStub.java: Likewise.
+ * tools/javax/jnlp/UnavailableServiceException.java: Likewise.
+ * tools/nanoxml/XMLElement.java: Likewise.
+ * tools/nanoxml/XMLParseException.java: Likewise.
+ * tools/netx/jnlp/AppletDesc.java: Likewise.
+ * tools/netx/jnlp/ApplicationDesc.java: Likewise.
+ * tools/netx/jnlp/ComponentDesc.java: Likewise.
+ * tools/netx/jnlp/DefaultLaunchHandler.java: Likewise.
+ * tools/netx/jnlp/ExtensionDesc.java: Likewise.
+ * tools/netx/jnlp/IconDesc.java: Likewise.
+ * tools/netx/jnlp/InformationDesc.java: Likewise.
+ * tools/netx/jnlp/InstallerDesc.java: Likewise.
+ * tools/netx/jnlp/JARDesc.java: Likewise.
+ * tools/netx/jnlp/JNLPFile.java: Likewise.
+ * tools/netx/jnlp/JREDesc.java: Likewise.
+ * tools/netx/jnlp/LaunchException.java: Likewise.
+ * tools/netx/jnlp/LaunchHandler.java: Likewise.
+ * tools/netx/jnlp/Launcher.java: Likewise.
+ * tools/netx/jnlp/PackageDesc.java: Likewise.
+ * tools/netx/jnlp/ParseException.java: Likewise.
+ * tools/netx/jnlp/Parser.java: Likewise.
+ * tools/netx/jnlp/PropertyDesc.java: Likewise.
+ * tools/netx/jnlp/ResourcesDesc.java: Likewise.
+ * tools/netx/jnlp/SecurityDesc.java: Likewise.
+ * tools/netx/jnlp/Version.java: Likewise.
+ * tools/netx/jnlp/cache/CacheEntry.java: Likewise.
+ * tools/netx/jnlp/cache/CacheUtil.java: Likewise.
+ * tools/netx/jnlp/cache/DefaultDownloadIndicator.java: Likewise.
+ * tools/netx/jnlp/cache/DownloadIndicator.java: Likewise.
+ * tools/netx/jnlp/cache/Resource.java: Likewise.
+ * tools/netx/jnlp/cache/ResourceTracker.java: Likewise.
+ * tools/netx/jnlp/cache/UpdatePolicy.java: Likewise.
+ * tools/netx/jnlp/cache/package.html: Likewise.
+ * tools/netx/jnlp/event/ApplicationEvent.java: Likewise.
+ * tools/netx/jnlp/event/ApplicationListener.java: Likewise.
+ * tools/netx/jnlp/event/DownloadEvent.java: Likewise.
+ * tools/netx/jnlp/event/DownloadListener.java: Likewise.
+ * tools/netx/jnlp/event/package.html: Likewise.
+ * tools/netx/jnlp/package.html: Likewise.
+ * tools/netx/jnlp/resources/Manifest.mf: Likewise.
+ * tools/netx/jnlp/resources/Messages.properties: Likewise.
+ * tools/netx/jnlp/resources/default.jnlp: Likewise.
+ * tools/netx/jnlp/resources/install.png: Likewise.
+ * tools/netx/jnlp/resources/netx-icon.png: Likewise.
+ * tools/netx/jnlp/runtime/AppThreadGroup.java: Likewise.
+ * tools/netx/jnlp/runtime/AppletAudioClip.java: Likewise.
+ * tools/netx/jnlp/runtime/AppletEnvironment.java: Likewise.
+ * tools/netx/jnlp/runtime/AppletInstance.java: Likewise.
+ * tools/netx/jnlp/runtime/ApplicationInstance.java: Likewise.
+ * tools/netx/jnlp/runtime/Boot.java: Likewise.
+ * tools/netx/jnlp/runtime/Boot13.java: Likewise.
+ * tools/netx/jnlp/runtime/InstallDialog.java: Likewise.
+ * tools/netx/jnlp/runtime/JNLPClassLoader.java: Likewise.
+ * tools/netx/jnlp/runtime/JNLPPolicy.java: Likewise.
+ * tools/netx/jnlp/runtime/JNLPRuntime.java: Likewise.
+ * tools/netx/jnlp/runtime/JNLPSecurityManager.java: Likewise.
+ * tools/netx/jnlp/runtime/package.html: Likewise.
+ * tools/netx/jnlp/services/ServiceUtil.java: Likewise.
+ * tools/netx/jnlp/services/XBasicService.java: Likewise.
+ * tools/netx/jnlp/services/XDownloadService.java: Likewise.
+ * tools/netx/jnlp/services/XExtensionInstallerService.java: Likewise.
+ * tools/netx/jnlp/services/XFileContents.java: Likewise.
+ * tools/netx/jnlp/services/XPersistenceService.java: Likewise.
+ * tools/netx/jnlp/services/XServiceManagerStub.java: Likewise.
+ * tools/netx/jnlp/services/package.html: Likewise.
+ * tools/netx/jnlp/tools/JarRunner.java: Likewise.
+ * tools/netx/jnlp/tools/JarSigner.java: Likewise.
+ * tools/netx/jnlp/tools/JarSignerResources.java: Likewise.
+ * tools/netx/jnlp/tools/KeyStoreUtil.java: Likewise.
+ * tools/netx/jnlp/util/PropertiesFile.java: Likewise.
+ * tools/netx/jnlp/util/Reflect.java: Likewise.
+ * tools/netx/jnlp/util/WeakList.java: Likewise.
+
2008-01-07 Lillian Angel <langel at redhat.com>
* AUTHORS: Added Dalibor Topic.
diff -r 70dd57d5cd8d -r bb4e2512ea29 Makefile.am
--- a/Makefile.am Mon Jan 07 14:30:54 2008 -0500
+++ b/Makefile.am Wed Jan 09 14:22:14 2008 -0500
@@ -12,7 +12,7 @@ distclean-local: clean-copy
rm -rf lib
rm -rf openjdk-ecj
rm -rf openjdk
- rm -rf tools
+ rm -rf hotspot-tools
rm -f gcjwebplugin.so
install:
@@ -24,7 +24,7 @@ install:
clean-bootstrap-directory-symlink-ecj icedtea icedtea-debug \
clean-icedtea icedtea-against-icedtea clean-icedtea-ecj clean-plugs \
clean-tools-jar clean-tools clean-shared-objects \
- clean-copy clean-rt clean-gcjwebplugin
+ clean-copy clean-rt clean-gcjwebplugin clean-tools
EXTRA_DIST = rt generated $(ICEDTEA_PATCHES) $(ICEDTEA_ECJ_PATCH) \
gcjwebplugin.cc patches/icedtea-speed.patch tools-copy contrib ports
@@ -213,6 +213,7 @@ ICEDTEA_PATCHES = \
patches/icedtea-lcms-leak.patch \
patches/icedtea-c1-unimplemented.patch \
patches/icedtea-timerqueue.patch \
+ patches/icedtea-jnlp-launcher.patch \
$(FAST_BUILD_PATCH) \
$(DISTRIBUTION_PATCHES)
@@ -409,34 +410,40 @@ endif
# If you change anything here in the icedtea target, please make sure
# you change it in the icedtea-debug target as well.
-icedtea: stamps/tools.stamp stamps/plugs.stamp \
- stamps/ports.stamp stamps/patch.stamp gcjwebplugin.so
+icedtea: stamps/hotspot-tools.stamp stamps/plugs.stamp \
+ stamps/ports.stamp stamps/patch.stamp gcjwebplugin.so \
+ stamps/tools.stamp
$(MAKE) \
$(ICEDTEA_ENV) \
-C openjdk/
if test "$(ENABLE_PLUGIN)" == "yes" ; \
- then \
+ then \
cp -af gcjwebplugin.so \
$(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) ; \
cp -af gcjwebplugin.so \
$(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) ; \
fi
+ $(FASTJAR) uf $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/tools.jar \
+ -C lib/tools .
@echo "IcedTea is served:" $(BUILD_OUTPUT_DIR)
icedtea-debug: stamps/bootstrap-directory-symlink.stamp \
- stamps/tools.stamp stamps/plugs.stamp \
- stamps/ports.stamp stamps/patch.stamp gcjwebplugin.so
+ stamps/hotspot-tools.stamp stamps/plugs.stamp \
+ stamps/ports.stamp stamps/patch.stamp gcjwebplugin.so \
+ stamps/tools.stamp
$(MAKE) \
$(ICEDTEA_ENV) \
-C openjdk/ \
debug_build
if test "$(ENABLE_PLUGIN)" == "yes" ; \
- then \
+ then \
cp -af gcjwebplugin.so \
$(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) ; \
cp -af gcjwebplugin.so \
$(BUILD_OUTPUT_DIR)-debug/j2re-image/lib/$(INSTALL_ARCH_DIR) ; \
fi
+ $(FASTJAR) uf $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/tools.jar \
+ -C lib/tools .
@echo "IcedTea (debug build) is served:" \
$(BUILD_OUTPUT_DIR)-debug
@@ -452,7 +459,7 @@ icedtea-against-icedtea: \
# OpenJDK ecj Targets
# ===================
-stamps/icedtea-ecj.stamp: stamps/tools.stamp stamps/plugs.stamp \
+stamps/icedtea-ecj.stamp: stamps/hotspot-tools.stamp stamps/plugs.stamp \
stamps/ports-ecj.stamp stamps/patch-ecj.stamp
$(MAKE) \
$(ICEDTEA_ENV_ECJ) \
@@ -482,9 +489,9 @@ stamps/plugs.stamp: $(SHARED_OBJECT_FILE
mkdir -p stamps
touch stamps/plugs.stamp
-stamps/tools.stamp: bootstrap/jdk1.7.0/jre/lib/tools.jar
- mkdir -p stamps
- touch stamps/tools.stamp
+stamps/hotspot-tools.stamp: bootstrap/jdk1.7.0/jre/lib/tools.jar
+ mkdir -p stamps
+ touch stamps/hotspot-tools.stamp
clean-plugs: clean-plugs clean-shared-objects \
clean-copy clean-rt
@@ -492,7 +499,7 @@ clean-plugs: clean-plugs clean-shared-ob
rm -f bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
clean-tools-jar: clean-tools-jar clean-tools
- rm -f stamps/tools.stamp
+ rm -f stamps/hotspot-tools.stamp
rm -rf tools/
rm -f bootstrap/jdk1.7.0/jre/lib/tools.jar
@@ -554,62 +561,62 @@ OPENJDK_SOURCEPATH_DIRS = \
$(SHARE):$(SOLARIS):$(LANGTOOLS):$(JAXP):$(CORBA):$(JAXWS)
# tools.jar class files.
-stamps/tools-copy-source-files.stamp: stamps/patch.stamp
+stamps/hotspot-tools-copy-source-files.stamp: stamps/patch.stamp
for copy_dir in `cat tools-copy/tools-jdk-copy-files.txt` ; \
- do \
- mkdir -p tools/$$copy_dir ; \
+ do \
+ mkdir -p hotspot-tools/$$copy_dir ; \
cp -arf openjdk/jdk/src/share/classes/$$copy_dir/* \
- tools/$$copy_dir ; \
- done
+ hotspot-tools/$$copy_dir ; \
+ done
for copy_dir in `cat tools-copy/tools-langtools-copy-files.txt` ; \
do \
- mkdir -p tools/$$copy_dir ; \
+ mkdir -p hotspot-tools/$$copy_dir ; \
cp -arf openjdk/langtools/src/share/classes/$$copy_dir/* \
- tools/$$copy_dir ; \
- done
-
+ hotspot-tools/$$copy_dir ; \
+ done
+
for copy_dir in `cat tools-copy/tools-corba-copy-files.txt` ; \
do \
- mkdir -p tools/$$copy_dir ; \
+ mkdir -p hotspot-tools/$$copy_dir ; \
cp -arf openjdk/corba/src/share/classes/$$copy_dir/* \
- tools/$$copy_dir ; \
- done
-
+ hotspot-tools/$$copy_dir ; \
+ done
+
for copy_dir in `cat tools-copy/tools-jaxws-copy-files.txt` ; \
do \
- mkdir -p tools/$$copy_dir ; \
+ mkdir -p hotspot-tools/$$copy_dir ; \
cp -arf openjdk/jaxws/src/share/classes/$$copy_dir/* \
- tools/$$copy_dir ; \
+ hotspot-tools/$$copy_dir ; \
done
mkdir -p stamps
- touch stamps/tools-copy-source-files.stamp
-
-tools-source-files.txt: stamps/clone.stamp \
- stamps/tools-copy-source-files.stamp
- find tools -name '*.java' | sort > $@
- mkdir -p lib/tools
-
-stamps/tools-class-files.stamp: tools-source-files.txt
- $(JAVAC) $(MEMORY_LIMIT) -g -d lib/tools -bootclasspath '' -source 1.6 \
- -sourcepath 'rt:tools:$(OPENJDK_SOURCEPATH_DIRS):generated' \
+ touch stamps/hotspot-tools-copy-source-files.stamp
+
+hotspot-tools-source-files.txt: stamps/clone.stamp \
+ stamps/hotspot-tools-copy-source-files.stamp
+ find hotspot-tools -name '*.java' | sort > $@
+ mkdir -p lib/hotspot-tools
+
+stamps/hotspot-tools-class-files.stamp: hotspot-tools-source-files.txt
+ $(JAVAC) $(MEMORY_LIMIT) -g -d lib/hotspot-tools -bootclasspath '' -source 1.6 \
+ -sourcepath 'rt:hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):generated' \
@$<
mkdir -p stamps
- touch stamps/tools-class-files.stamp
-
-clean-tools:
- rm -rf lib/tools
- rm -f stamps/tools-class-files.stamp
- rm -f tools-source-files.txt
- rm -f stamps/tools-copy-source-files.stamp
+ touch stamps/hotspot-tools-class-files.stamp
+
+clean-hotspot-tools:
+ rm -rf lib/hotspot-tools
+ rm -f stamps/hotspot-tools-class-files.stamp
+ rm -f hotspot-tools-source-files.txt
+ rm -f stamps/hotspot-tools-copy-source-files.stamp
# tools.jar
-bootstrap/jdk1.7.0/jre/lib/tools.jar: stamps/tools-class-files.stamp
+bootstrap/jdk1.7.0/jre/lib/tools.jar: stamps/hotspot-tools-class-files.stamp
mkdir -p bootstrap/jdk1.7.0/jre/lib/
- $(JAR) cf $@ -C lib/tools com -C lib/tools sun \
- -C lib/tools org -C lib/tools gnu -C lib/tools java \
- -C lib/tools javax
+ $(JAR) cf $@ -C lib/hotspot-tools com -C lib/hotspot-tools sun \
+ -C lib/hotspot-tools org -C lib/hotspot-tools gnu -C lib/hotspot-tools java \
+ -C lib/hotspot-tools javax
if test -d bootstrap/ecj ; \
then \
mkdir -p bootstrap/ecj/lib/; \
@@ -658,6 +665,30 @@ clean-gcjwebplugin:
clean-gcjwebplugin:
rm -f gcjwebplugin.so
+#extra tools
+stamps/tools.stamp: stamps/tools-class-files.stamp
+ touch stamps/tools.stamp
+
+tools-source-files.txt: stamps/clone.stamp
+ find tools -name '*.java' | sort > $@
+
+stamps/tools-class-files.stamp: tools-source-files.txt \
+ stamps/rt-class-files.stamp
+ mkdir -p lib/tools
+ $(JAVAC) $(MEMORY_LIMIT) -g -d lib/tools \
+ -source 1.6 \
+ -sourcepath tools \
+ @$<
+ cp tools/default.jnlp lib/tools
+ cp -r tools/netx/jnlp/resources lib/tools/netx/jnlp
+ mkdir -p stamps
+ touch stamps/tools-class-files.stamp
+
+clean-tools:
+ rm -rf lib/tools
+ rm -rf stamps/tools-class-files.stamp
+ rm -rf tools-source-files.txt
+
# All Stamped Targets
# ===================
@@ -689,9 +720,11 @@ plugs: stamps/plugs.stamp
rt-class-files: stamps/rt-class-files.stamp
-tools-class-files: stamps/tools-class-files.stamp
-
-tools-copy-source-files: stamps/tools-copy-source-files.stamp
+hotspot-tools-class-files: stamps/hotspot-tools-class-files.stamp
+
+hotspot-tools-copy-source-files: stamps/hotspot-tools-copy-source-files.stamp
+
+hotspot-tools: stamps/hotspot-tools.stamp
tools: stamps/tools.stamp
diff -r 70dd57d5cd8d -r bb4e2512ea29 Makefile.in
--- a/Makefile.in Mon Jan 07 14:30:54 2008 -0500
+++ b/Makefile.in Wed Jan 09 14:22:14 2008 -0500
@@ -86,6 +86,7 @@ EGREP = @EGREP@
EGREP = @EGREP@
ENABLE_PLUGIN = @ENABLE_PLUGIN@
EXEEXT = @EXEEXT@
+FASTJAR = @FASTJAR@
FIND = @FIND@
FREETYPE2_INC_DIR = @FREETYPE2_INC_DIR@
GAWK = @GAWK@
@@ -311,6 +312,7 @@ ICEDTEA_PATCHES = \
patches/icedtea-lcms-leak.patch \
patches/icedtea-c1-unimplemented.patch \
patches/icedtea-timerqueue.patch \
+ patches/icedtea-jnlp-launcher.patch \
$(FAST_BUILD_PATCH) \
$(DISTRIBUTION_PATCHES)
@@ -637,7 +639,7 @@ distclean-local: clean-copy
rm -rf lib
rm -rf openjdk-ecj
rm -rf openjdk
- rm -rf tools
+ rm -rf hotspot-tools
rm -f gcjwebplugin.so
install:
@@ -649,7 +651,7 @@ install:
clean-bootstrap-directory-symlink-ecj icedtea icedtea-debug \
clean-icedtea icedtea-against-icedtea clean-icedtea-ecj clean-plugs \
clean-tools-jar clean-tools clean-shared-objects \
- clean-copy clean-rt clean-gcjwebplugin
+ clean-copy clean-rt clean-gcjwebplugin clean-tools
env:
@echo 'unset JAVA_HOME'
@@ -889,34 +891,40 @@ clean-bootstrap-directory-symlink-ecj:
# If you change anything here in the icedtea target, please make sure
# you change it in the icedtea-debug target as well.
-icedtea: stamps/tools.stamp stamps/plugs.stamp \
- stamps/ports.stamp stamps/patch.stamp gcjwebplugin.so
+icedtea: stamps/hotspot-tools.stamp stamps/plugs.stamp \
+ stamps/ports.stamp stamps/patch.stamp gcjwebplugin.so \
+ stamps/tools.stamp
$(MAKE) \
$(ICEDTEA_ENV) \
-C openjdk/
if test "$(ENABLE_PLUGIN)" == "yes" ; \
- then \
+ then \
cp -af gcjwebplugin.so \
$(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) ; \
cp -af gcjwebplugin.so \
$(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) ; \
fi
+ $(FASTJAR) uf $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/tools.jar \
+ -C lib/tools .
@echo "IcedTea is served:" $(BUILD_OUTPUT_DIR)
icedtea-debug: stamps/bootstrap-directory-symlink.stamp \
- stamps/tools.stamp stamps/plugs.stamp \
- stamps/ports.stamp stamps/patch.stamp gcjwebplugin.so
+ stamps/hotspot-tools.stamp stamps/plugs.stamp \
+ stamps/ports.stamp stamps/patch.stamp gcjwebplugin.so \
+ stamps/tools.stamp
$(MAKE) \
$(ICEDTEA_ENV) \
-C openjdk/ \
debug_build
if test "$(ENABLE_PLUGIN)" == "yes" ; \
- then \
+ then \
cp -af gcjwebplugin.so \
$(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) ; \
cp -af gcjwebplugin.so \
$(BUILD_OUTPUT_DIR)-debug/j2re-image/lib/$(INSTALL_ARCH_DIR) ; \
fi
+ $(FASTJAR) uf $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/tools.jar \
+ -C lib/tools .
@echo "IcedTea (debug build) is served:" \
$(BUILD_OUTPUT_DIR)-debug
@@ -932,7 +940,7 @@ icedtea-against-icedtea: \
# OpenJDK ecj Targets
# ===================
-stamps/icedtea-ecj.stamp: stamps/tools.stamp stamps/plugs.stamp \
+stamps/icedtea-ecj.stamp: stamps/hotspot-tools.stamp stamps/plugs.stamp \
stamps/ports-ecj.stamp stamps/patch-ecj.stamp
$(MAKE) \
$(ICEDTEA_ENV_ECJ) \
@@ -962,9 +970,9 @@ stamps/plugs.stamp: $(SHARED_OBJECT_FILE
mkdir -p stamps
touch stamps/plugs.stamp
-stamps/tools.stamp: bootstrap/jdk1.7.0/jre/lib/tools.jar
- mkdir -p stamps
- touch stamps/tools.stamp
+stamps/hotspot-tools.stamp: bootstrap/jdk1.7.0/jre/lib/tools.jar
+ mkdir -p stamps
+ touch stamps/hotspot-tools.stamp
clean-plugs: clean-plugs clean-shared-objects \
clean-copy clean-rt
@@ -972,7 +980,7 @@ clean-plugs: clean-plugs clean-shared-ob
rm -f bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
clean-tools-jar: clean-tools-jar clean-tools
- rm -f stamps/tools.stamp
+ rm -f stamps/hotspot-tools.stamp
rm -rf tools/
rm -f bootstrap/jdk1.7.0/jre/lib/tools.jar
@@ -1006,62 +1014,62 @@ clean-copy:
done
# tools.jar class files.
-stamps/tools-copy-source-files.stamp: stamps/patch.stamp
+stamps/hotspot-tools-copy-source-files.stamp: stamps/patch.stamp
for copy_dir in `cat tools-copy/tools-jdk-copy-files.txt` ; \
- do \
- mkdir -p tools/$$copy_dir ; \
+ do \
+ mkdir -p hotspot-tools/$$copy_dir ; \
cp -arf openjdk/jdk/src/share/classes/$$copy_dir/* \
- tools/$$copy_dir ; \
- done
+ hotspot-tools/$$copy_dir ; \
+ done
for copy_dir in `cat tools-copy/tools-langtools-copy-files.txt` ; \
do \
- mkdir -p tools/$$copy_dir ; \
+ mkdir -p hotspot-tools/$$copy_dir ; \
cp -arf openjdk/langtools/src/share/classes/$$copy_dir/* \
- tools/$$copy_dir ; \
+ hotspot-tools/$$copy_dir ; \
done
More information about the distro-pkg-dev
mailing list