From 866fc806cae6cde4d4aa398db58852c4d358aad5 Mon Sep 17 00:00:00 2001 From: Omair Majid Date: May 16 2014 19:21:05 +0000 Subject: Include all sources in src.zip Don't filter resources to include in src.zip. Include all known (sub) packages in the src.zip. --- diff --git a/include-all-srcs.patch b/include-all-srcs.patch new file mode 100644 index 0000000..41b1ea2 --- /dev/null +++ b/include-all-srcs.patch @@ -0,0 +1,54 @@ +--- jdk8/jdk/make/CreateJars.gmk ++++ jdk8/jdk/make/CreateJars.gmk +@@ -569,38 +569,12 @@ + ########################################################################################## + + SRC_ZIP_INCLUDES = \ +- com/sun/corba \ +- com/sun/image/codec/jpeg \ +- com/sun/imageio \ +- com/sun/java_cup \ +- com/sun/javadoc \ +- com/sun/java/swing \ +- com/sun/jmx \ +- com/sun/naming \ +- com/sun/org/apache \ +- com/sun/security/auth \ +- com/sun/security/jgss \ +- com/sun/source \ ++ com \ + java \ +- javax/accessibility \ +- javax/annotation \ +- javax/imageio \ +- javax/lang \ +- javax/management \ +- javax/naming \ +- javax/print \ +- javax/rmi \ +- javax/script \ +- javax/security \ +- javax/sound \ +- javax/sql \ +- javax/swing \ +- javax/tools \ +- javax/xml \ +- org/ietf \ +- org/omg \ +- org/w3c/dom \ +- org/xml/sax \ ++ javax \ ++ jdk \ ++ org \ ++ sun \ + # + + SRC_ZIP_SRCS = $(JDK_TOPDIR)/src/share/classes $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes +@@ -632,7 +606,6 @@ + $(eval $(call SetupZipArchive,BUILD_SRC_ZIP, \ + SRC := $(SRC_ZIP_SRCS) $(IMAGES_OUTPUTDIR)/src, \ + INCLUDES := $(SRC_ZIP_INCLUDES) launcher, \ +- EXCLUDES := javax/swing/beaninfo, \ + SUFFIXES := .java .c .h, \ + ZIP := $(IMAGES_OUTPUTDIR)/src.zip, \ + EXTRA_DEPS := $(LAUNCHER_ZIP_SRC))) diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index b43ea1b..ea0b26e 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -201,6 +201,8 @@ Patch4: PStack-808293.patch Patch5: multiple-pkcs11-library-init.patch # Disable doclint for compatibility Patch6: disable-doclint-by-default.patch +# Include all sources in src.zip +Patch7: include-all-srcs.patch # # OpenJDK specific patches @@ -430,6 +432,7 @@ sh %{SOURCE12} %patch4 %patch5 %patch6 +%patch7 %patch99