changeset 1280:bfad80bc31ca

Create jrt-fs.jar
author erikj
date Tue, 11 Nov 2014 14:36:14 +0100
parents d985beb10173
children 797108a96da5
files make/Images.gmk make/JrtfsJar.gmk make/Main.gmk
diffstat 3 files changed, 55 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/make/Images.gmk	Sat Nov 08 19:03:48 2014 +0000
+++ b/make/Images.gmk	Tue Nov 11 14:36:14 2014 +0100
@@ -459,6 +459,16 @@
 JDK_TARGETS += $(COPY_SAMPLES)
 
 ################################################################################
+# jrt-fs.jar
+
+$(eval $(call SetupCopyFiles,COPY_JRTFS_JAR, \
+    SRC := $(IMAGES_OUTPUTDIR), \
+    DEST := $(JDK_IMAGE_DIR), \
+    FILES := $(IMAGES_OUTPUTDIR)/jrt-fs.jar))
+
+JDK_TARGETS += $(COPY_JRTFS_JAR)
+
+################################################################################
 
 $(JRE_TARGETS): $(TOOL_JRE_TARGETS)
 $(JDK_TARGETS): $(TOOL_JDK_TARGETS)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/make/JrtfsJar.gmk	Tue Nov 11 14:36:14 2014 +0100
@@ -0,0 +1,37 @@
+#
+# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+default: all
+
+include $(SPEC)
+include MakeBase.gmk
+include JavaCompilation.gmk
+
+$(eval $(call SetupArchive,JRTFS_JAR, , \
+    SRCS := $(BUILDTOOLS_OUTPUTDIR)/interim_jimage_classes, \
+    JAR := $(IMAGES_OUTPUTDIR)/jrt-fs.jar, \
+    MANIFEST := $(JDK_TOPDIR)/make/data/mainmanifest/manifest.mf))
+
+all: $(JRTFS_JAR)
--- a/make/Main.gmk	Sat Nov 08 19:03:48 2014 +0000
+++ b/make/Main.gmk	Tue Nov 11 14:36:14 2014 +0100
@@ -226,6 +226,9 @@
 strip-binaries:
 	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f StripBinaries.gmk)
 
+jrtfs-jar:
+	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f JrtfsJar.gmk)
+
 jimages:
 	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Images.gmk images)
 
@@ -236,7 +239,7 @@
 	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f MacBundles.gmk)
 
 ALL_TARGETS += source-tips bootcycle-images sec-bin zip-src strip-binaries \
-    jimages profiles mac-bundles
+    jrtfs-jar jimages profiles mac-bundles
 
 ################################################################################
 # Docs targets
@@ -376,7 +379,10 @@
 
   strip-binaries: libs launchers gendata copy
 
-  jimages: exploded-image zip-src strip-binaries source-tips demos samples
+  jrtfs-jar: buildtools-jdk
+
+  jimages: exploded-image zip-src strip-binaries source-tips demos samples \
+      jrtfs-jar
 
   profiles: exploded-image strip-binaries source-tips