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