8056072: add jprt_optimized targets

Wed, 27 Aug 2014 17:09:18 +0400

author
iignatyev
date
Wed, 27 Aug 2014 17:09:18 +0400
changeset 7119
fe392af93c23
parent 7118
227a9e5e4b4a
child 7120
ddda5de93db5

8056072: add jprt_optimized targets
Reviewed-by: kvn, roland

make/Makefile file | annotate | diff | comparison | revisions
make/jprt.gmk file | annotate | diff | comparison | revisions
make/jprt.properties file | annotate | diff | comparison | revisions
     1.1 --- a/make/Makefile	Fri Sep 05 09:49:19 2014 +0200
     1.2 +++ b/make/Makefile	Wed Aug 27 17:09:18 2014 +0400
     1.3 @@ -686,6 +686,19 @@
     1.4  	   ($(CD) $(JDK_IMAGE_DIR)/debug && $(TAR) -xf -) ; \
     1.5  	fi
     1.6  
     1.7 +copy_optimized_jdk::
     1.8 +	$(RM) -r $(JDK_IMAGE_DIR)/optimized
     1.9 +	$(MKDIR) -p $(JDK_IMAGE_DIR)/optimized
    1.10 +	if [ -d $(JDK_IMPORT_PATH)/optimized ] ; then \
    1.11 +	  ($(CD) $(JDK_IMPORT_PATH)/optimized && \
    1.12 +	   $(TAR) -cf - $(JDK_DIRS)) | \
    1.13 +	   ($(CD) $(JDK_IMAGE_DIR)/optimized && $(TAR) -xf -) ; \
    1.14 +	else \
    1.15 +	  ($(CD) $(JDK_IMPORT_PATH) && \
    1.16 +	   $(TAR) -cf - $(JDK_DIRS)) | \
    1.17 +	   ($(CD) $(JDK_IMAGE_DIR)/optimized && $(TAR) -xf -) ; \
    1.18 +	fi
    1.19 +
    1.20  #
    1.21  # Check target
    1.22  #
     2.1 --- a/make/jprt.gmk	Fri Sep 05 09:49:19 2014 +0200
     2.2 +++ b/make/jprt.gmk	Wed Aug 27 17:09:18 2014 +0400
     2.3 @@ -42,6 +42,9 @@
     2.4  jprt_build_fastdebugEmb:
     2.5  	$(MAKE) JAVASE_EMBEDDED=true MINIMIZE_RAM_USAGE=true jprt_build_fastdebug
     2.6  
     2.7 +jprt_build_optimizedEmb:
     2.8 +	$(MAKE) JAVASE_EMBEDDED=true MINIMIZE_RAM_USAGE=true jprt_build_optimized
     2.9 +
    2.10  jprt_build_productOpen:
    2.11  	$(MAKE) OPENJDK=true jprt_build_product
    2.12  
    2.13 @@ -51,6 +54,9 @@
    2.14  jprt_build_fastdebugOpen:
    2.15  	$(MAKE) OPENJDK=true jprt_build_fastdebug
    2.16  
    2.17 +jprt_build_optimizedOpen:
    2.18 +	$(MAKE) OPENJDK=true jprt_build_optimized
    2.19 +
    2.20  jprt_build_product: all_product copy_product_jdk export_product_jdk
    2.21  	( $(CD) $(JDK_IMAGE_DIR) && \
    2.22  	  $(ZIPEXE) $(ZIPFLAGS) -r $(JPRT_ARCHIVE_BUNDLE) . )
    2.23 @@ -63,5 +69,9 @@
    2.24  	( $(CD) $(JDK_IMAGE_DIR)/debug && \
    2.25  	  $(ZIPEXE) $(ZIPFLAGS) -r $(JPRT_ARCHIVE_BUNDLE) . )
    2.26  
    2.27 -.PHONY: jprt_build_product jprt_build_fastdebug jprt_build_debug
    2.28 +jprt_build_optimized: all_optimized copy_optimized_jdk export_optimized_jdk
    2.29 +	( $(CD) $(JDK_IMAGE_DIR)/optimized && \
    2.30 +	  $(ZIPEXE) $(ZIPFLAGS) -r $(JPRT_ARCHIVE_BUNDLE) . )
    2.31  
    2.32 +.PHONY: jprt_build_product jprt_build_fastdebug jprt_build_debug jprt_build_optimized
    2.33 +
     3.1 --- a/make/jprt.properties	Fri Sep 05 09:49:19 2014 +0200
     3.2 +++ b/make/jprt.properties	Wed Aug 27 17:09:18 2014 +0400
     3.3 @@ -113,13 +113,13 @@
     3.4  # Standard list of jprt build targets for this source tree
     3.5  
     3.6  jprt.build.targets.standard= \
     3.7 -    ${jprt.my.solaris.sparcv9}-{product|fastdebug|optimized}, \
     3.8 +    ${jprt.my.solaris.sparcv9}-{product|fastdebug}, \
     3.9      ${jprt.my.solaris.x64}-{product|fastdebug}, \
    3.10      ${jprt.my.linux.i586}-{product|fastdebug}, \
    3.11 -    ${jprt.my.linux.x64}-{product|fastdebug|optimized}, \
    3.12 +    ${jprt.my.linux.x64}-{product|fastdebug}, \
    3.13      ${jprt.my.macosx.x64}-{product|fastdebug}, \
    3.14      ${jprt.my.windows.i586}-{product|fastdebug}, \
    3.15 -    ${jprt.my.windows.x64}-{product|fastdebug|optimized}, \
    3.16 +    ${jprt.my.windows.x64}-{product|fastdebug}, \
    3.17      ${jprt.my.linux.armvh}-{product|fastdebug}
    3.18  
    3.19  jprt.build.targets.open= \

mercurial