Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/make/jprt.gmk	Thu May 12 10:30:11 2011 -0700
     1.2 +++ b/make/jprt.gmk	Sun May 15 23:57:15 2011 -0400
     1.3 @@ -1,5 +1,5 @@
     1.4  #
     1.5 -# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
     1.6 +# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
     1.7  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8  #
     1.9  # This code is free software; you can redistribute it and/or modify it
    1.10 @@ -33,6 +33,24 @@
    1.11    ZIPFLAGS=-q -y
    1.12  endif
    1.13  
    1.14 +jprt_build_productEmb:
    1.15 +	$(MAKE) JAVASE_EMBEDDED=true jprt_build_product
    1.16 +
    1.17 +jprt_build_debugEmb:
    1.18 +	$(MAKE) JAVASE_EMBEDDED=true jprt_build_debug
    1.19 +
    1.20 +jprt_build_fastdebugEmb:
    1.21 +	$(MAKE) JAVASE_EMBEDDED=true jprt_build_fastdebug
    1.22 +
    1.23 +jprt_build_productOpen:
    1.24 +	$(MAKE) OPENJDK=true jprt_build_product
    1.25 +
    1.26 +jprt_build_debugOpen:
    1.27 +	$(MAKE) OPENJDK=true jprt_build_debug
    1.28 +
    1.29 +jprt_build_fastdebugOpen:
    1.30 +	$(MAKE) OPENJDK=true jprt_build_fastdebug
    1.31 +
    1.32  jprt_build_product: all_product copy_product_jdk export_product_jdk
    1.33  	( $(CD) $(JDK_IMAGE_DIR) && \
    1.34  	  $(ZIPEXE) $(ZIPFLAGS) -r $(JPRT_ARCHIVE_BUNDLE) . )

     2.1 --- a/make/jprt.properties	Thu May 12 10:30:11 2011 -0700
     2.2 +++ b/make/jprt.properties	Sun May 15 23:57:15 2011 -0400
     2.3 @@ -202,16 +202,21 @@
     2.4      ${jprt.my.windows.i586}-{product|fastdebug|debug}, \
     2.5      ${jprt.my.windows.x64}-{product|fastdebug|debug}
     2.6  
     2.7 +jprt.build.targets.open= \
     2.8 +    ${jprt.my.solaris.i586}-{productOpen}, \
     2.9 +    ${jprt.my.solaris.x64}-{debugOpen}, \
    2.10 +    ${jprt.my.linux.x64}-{productOpen}
    2.11 +
    2.12  jprt.build.targets.embedded= \
    2.13 -    ${jprt.my.linux.i586}-{product|fastdebug|debug}, \
    2.14 -    ${jprt.my.linux.ppc}-{product|fastdebug}, \
    2.15 -    ${jprt.my.linux.ppcv2}-{product|fastdebug}, \
    2.16 -    ${jprt.my.linux.ppcsflt}-{product|fastdebug}, \
    2.17 -    ${jprt.my.linux.armvfp}-{product|fastdebug}, \
    2.18 -    ${jprt.my.linux.armsflt}-{product|fastdebug}
    2.19 +    ${jprt.my.linux.i586}-{productEmb|fastdebugEmb|debugEmb}, \
    2.20 +    ${jprt.my.linux.ppc}-{productEmb|fastdebugEmb}, \
    2.21 +    ${jprt.my.linux.ppcv2}-{productEmb|fastdebugEmb}, \
    2.22 +    ${jprt.my.linux.ppcsflt}-{productEmb|fastdebugEmb}, \
    2.23 +    ${jprt.my.linux.armvfp}-{productEmb|fastdebugEmb}, \
    2.24 +    ${jprt.my.linux.armsflt}-{productEmb|fastdebugEmb}
    2.25  
    2.26  jprt.build.targets.all=${jprt.build.targets.standard}, \
    2.27 -    ${jprt.build.targets.embedded}
    2.28 +    ${jprt.build.targets.embedded}, ${jprt.build.targets.open}
    2.29  
    2.30  jprt.build.targets.jdk7=${jprt.build.targets.all}
    2.31  jprt.build.targets.jdk7temp=${jprt.build.targets.all}
    2.32 @@ -453,6 +458,12 @@
    2.33      ${jprt.my.windows.x64}-product-c2-jbb_G1, \
    2.34      ${jprt.my.windows.x64}-product-c2-jbb_ParOldGC
    2.35  
    2.36 +# Some basic "smoke" tests for OpenJDK builds
    2.37 +jprt.test.targets.open = \
    2.38 +    ${jprt.my.solaris.x64}-{productOpen|debugOpen|fastdebugOpen}-c2-jvm98_tiered, \
    2.39 +    ${jprt.my.solaris.i586}-{productOpen|fastdebugOpen}-c2-jvm98_tiered, \
    2.40 +    ${jprt.my.linux.x64}-{productOpen|fastdebugOpen}-c2-jvm98_tiered
    2.41 +
    2.42  # Testing for actual embedded builds is different to standard
    2.43  jprt.my.linux.i586.test.targets.embedded = \
    2.44      linux_i586_2.6-product-c1-scimark
    2.45 @@ -461,6 +472,7 @@
    2.46  # Note: no PPC or ARM tests at this stage
    2.47  
    2.48  jprt.test.targets.standard = \
    2.49 +  ${jprt.my.linux.i586.test.targets.embedded}, \
    2.50    ${jprt.my.solaris.sparc.test.targets}, \
    2.51    ${jprt.my.solaris.sparcv9.test.targets}, \
    2.52    ${jprt.my.solaris.i586.test.targets}, \
    2.53 @@ -468,7 +480,8 @@
    2.54    ${jprt.my.linux.i586.test.targets}, \
    2.55    ${jprt.my.linux.x64.test.targets}, \
    2.56    ${jprt.my.windows.i586.test.targets}, \
    2.57 -  ${jprt.my.windows.x64.test.targets}
    2.58 +  ${jprt.my.windows.x64.test.targets}, \
    2.59 +  ${jprt.test.targets.open}
    2.60  
    2.61  jprt.test.targets.embedded= 		\
    2.62    ${jprt.my.linux.i586.test.targets.embedded}, \