Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8044235: src.zip should include all sources
authoromajid
Sun, 01 Jun 2014 11:54:04 -0400
changeset 24690 4438986fde26
parent 24689 84f69ef153cc
child 24691 f96e172a6ce8
8044235: src.zip should include all sources Reviewed-by: andrew, dholmes
jdk/make/CreateJars.gmk file | annotate | diff | comparison | revisions 
--- a/jdk/make/CreateJars.gmk	Fri May 30 16:45:30 2014 -0700
+++ b/jdk/make/CreateJars.gmk	Sun Jun 01 11:54:04 2014 -0400
@@ -552,40 +552,53 @@
 
 ##########################################################################################
 
-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 \
-    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 \
-    #
+ifdef OPENJDK
+    SRC_ZIP_INCLUDES = \
+        com \
+        java \
+        javax \
+        jdk \
+        org \
+        sun \
+        #
+    SRC_ZIP_EXCLUDES =
+else
+    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 \
+        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 \
+        #
+    SRC_ZIP_EXCLUDES = javax/swing/beaninfo
+endif
 
 SRC_ZIP_SRCS = $(JDK_TOPDIR)/src/share/classes $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes
 SRC_ZIP_SRCS += $(JDK_OUTPUTDIR)/gensrc
@@ -616,7 +629,7 @@
 $(eval $(call SetupZipArchive,BUILD_SRC_ZIP, \
     SRC := $(SRC_ZIP_SRCS) $(IMAGES_OUTPUTDIR)/src, \
     INCLUDES := $(SRC_ZIP_INCLUDES) launcher, \
-    EXCLUDES := javax/swing/beaninfo, \
+    EXCLUDES := $(SRC_ZIP_EXCLUDES), \
     SUFFIXES := .java .c .h, \
     ZIP := $(IMAGES_OUTPUTDIR)/src.zip, \
     EXTRA_DEPS := $(LAUNCHER_ZIP_SRC)))
jdk-sandbox