Severin Gehwolf 2bb223c
# HG changeset patch
Severin Gehwolf 2bb223c
# User omajid
Severin Gehwolf 2bb223c
# Date 1401638044 14400
Severin Gehwolf 2bb223c
#      Sun Jun 01 11:54:04 2014 -0400
Severin Gehwolf 2bb223c
# Node ID fd78f7e83f3f1ce7d363b681b97583138218afcb
Severin Gehwolf 2bb223c
# Parent  8d0af21b5b9789f97b05edacc221a63f851d13b8
Severin Gehwolf 2bb223c
8044235: src.zip should include all sources
Severin Gehwolf 2bb223c
Reviewed-by: andrew, dholmes
Severin Gehwolf 2bb223c
Severin Gehwolf 2bb223c
diff --git a/make/CreateJars.gmk b/make/CreateJars.gmk
Severin Gehwolf 2bb223c
--- openjdk/jdk/make/CreateJars.gmk
Severin Gehwolf 2bb223c
+++ openjdk/jdk/make/CreateJars.gmk
Severin Gehwolf 2bb223c
@@ -584,40 +584,53 @@
Severin Gehwolf 2bb223c
 
866fc80
 ##########################################################################################
866fc80
 
Severin Gehwolf 2bb223c
-SRC_ZIP_INCLUDES = \
866fc80
-    com/sun/corba \
866fc80
-    com/sun/image/codec/jpeg \
866fc80
-    com/sun/imageio \
866fc80
-    com/sun/java_cup \
866fc80
-    com/sun/javadoc \
866fc80
-    com/sun/java/swing \
866fc80
-    com/sun/jmx \
866fc80
-    com/sun/naming \
866fc80
-    com/sun/org/apache \
866fc80
-    com/sun/security/auth \
866fc80
-    com/sun/security/jgss \
866fc80
-    com/sun/source \
Severin Gehwolf 2bb223c
-    java \
866fc80
-    javax/accessibility \
866fc80
-    javax/annotation \
866fc80
-    javax/imageio \
866fc80
-    javax/lang \
866fc80
-    javax/management \
866fc80
-    javax/naming \
866fc80
-    javax/print \
866fc80
-    javax/rmi \
866fc80
-    javax/script \
866fc80
-    javax/security \
866fc80
-    javax/sound \
866fc80
-    javax/sql \
866fc80
-    javax/swing \
866fc80
-    javax/tools \
866fc80
-    javax/xml \
866fc80
-    org/ietf \
866fc80
-    org/omg \
866fc80
-    org/w3c/dom \
866fc80
-    org/xml/sax \
Severin Gehwolf 2bb223c
-    #
Severin Gehwolf 2bb223c
+ifdef OPENJDK
Severin Gehwolf 2bb223c
+    SRC_ZIP_INCLUDES = \
Severin Gehwolf 2bb223c
+        com \
Severin Gehwolf 2bb223c
+        java \
Severin Gehwolf 2bb223c
+        javax \
Severin Gehwolf 2bb223c
+        jdk \
Severin Gehwolf 2bb223c
+        org \
Severin Gehwolf 2bb223c
+        sun \
Severin Gehwolf 2bb223c
+        #
Severin Gehwolf 2bb223c
+    SRC_ZIP_EXCLUDES =
Severin Gehwolf 2bb223c
+else
Severin Gehwolf 2bb223c
+    SRC_ZIP_INCLUDES = \
Severin Gehwolf 2bb223c
+        com/sun/corba \
Severin Gehwolf 2bb223c
+        com/sun/image/codec/jpeg \
Severin Gehwolf 2bb223c
+        com/sun/imageio \
Severin Gehwolf 2bb223c
+        com/sun/java_cup \
Severin Gehwolf 2bb223c
+        com/sun/javadoc \
Severin Gehwolf 2bb223c
+        com/sun/java/swing \
Severin Gehwolf 2bb223c
+        com/sun/jmx \
Severin Gehwolf 2bb223c
+        com/sun/naming \
Severin Gehwolf 2bb223c
+        com/sun/org/apache \
Severin Gehwolf 2bb223c
+        com/sun/security/auth \
Severin Gehwolf 2bb223c
+        com/sun/security/jgss \
Severin Gehwolf 2bb223c
+        com/sun/source \
Severin Gehwolf 2bb223c
+        java \
Severin Gehwolf 2bb223c
+        javax/accessibility \
Severin Gehwolf 2bb223c
+        javax/annotation \
Severin Gehwolf 2bb223c
+        javax/imageio \
Severin Gehwolf 2bb223c
+        javax/lang \
Severin Gehwolf 2bb223c
+        javax/management \
Severin Gehwolf 2bb223c
+        javax/naming \
Severin Gehwolf 2bb223c
+        javax/print \
Severin Gehwolf 2bb223c
+        javax/rmi \
Severin Gehwolf 2bb223c
+        javax/script \
Severin Gehwolf 2bb223c
+        javax/security \
Severin Gehwolf 2bb223c
+        javax/sound \
Severin Gehwolf 2bb223c
+        javax/sql \
Severin Gehwolf 2bb223c
+        javax/swing \
Severin Gehwolf 2bb223c
+        javax/tools \
Severin Gehwolf 2bb223c
+        javax/xml \
Severin Gehwolf 2bb223c
+        org/ietf \
Severin Gehwolf 2bb223c
+        org/omg \
Severin Gehwolf 2bb223c
+        org/w3c/dom \
Severin Gehwolf 2bb223c
+        org/xml/sax \
Severin Gehwolf 2bb223c
+        #
Severin Gehwolf 2bb223c
+    SRC_ZIP_EXCLUDES = javax/swing/beaninfo
Severin Gehwolf 2bb223c
+endif
866fc80
 
866fc80
 SRC_ZIP_SRCS = $(JDK_TOPDIR)/src/share/classes $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes
Severin Gehwolf 2bb223c
 SRC_ZIP_SRCS += $(JDK_OUTPUTDIR)/gensrc
Severin Gehwolf 2bb223c
@@ -648,7 +661,7 @@
866fc80
 $(eval $(call SetupZipArchive,BUILD_SRC_ZIP, \
866fc80
     SRC := $(SRC_ZIP_SRCS) $(IMAGES_OUTPUTDIR)/src, \
866fc80
     INCLUDES := $(SRC_ZIP_INCLUDES) launcher, \
866fc80
-    EXCLUDES := javax/swing/beaninfo, \
Severin Gehwolf 2bb223c
+    EXCLUDES := $(SRC_ZIP_EXCLUDES), \
866fc80
     SUFFIXES := .java .c .h, \
866fc80
     ZIP := $(IMAGES_OUTPUTDIR)/src.zip, \
866fc80
     EXTRA_DEPS := $(LAUNCHER_ZIP_SRC)))