Mercurial > jdk8-mips64-public / changeset

     1.1 --- a/common/autoconf/generated-configure.sh	Mon Feb 04 10:53:38 2013 +0100
     1.2 +++ b/common/autoconf/generated-configure.sh	Mon Feb 04 11:02:03 2013 +0100
     1.3 @@ -3723,7 +3723,7 @@
     1.4  #CUSTOM_AUTOCONF_INCLUDE
     1.5  
     1.6  # Do not change or remove the following line, it is needed for consistency checks:
     1.7 -DATE_WHEN_GENERATED=1359376859
     1.8 +DATE_WHEN_GENERATED=1359971740
     1.9  
    1.10  ###############################################################################
    1.11  #
    1.12 @@ -10778,7 +10778,8 @@
    1.13    as_fn_error $? "Milestone must have a value" "$LINENO" 5
    1.14  elif test "x$with_milestone" != x; then
    1.15      MILESTONE="$with_milestone"
    1.16 -else
    1.17 +fi
    1.18 +if test "x$MILESTONE" = x; then
    1.19    MILESTONE=internal
    1.20  fi
    1.21  
    1.22 @@ -29247,6 +29248,12 @@
    1.23  fi
    1.24  
    1.25  
    1.26 +# AC_PATH_XTRA creates X_LIBS and sometimes adds -R flags. When cross compiling
    1.27 +# this doesn't make sense so we remove it.
    1.28 +if test "x$COMPILE_TYPE" = xcross; then
    1.29 +  X_LIBS=`$ECHO $X_LIBS | $SED 's/-R \{0,1\}[^ ]*//g'`
    1.30 +fi
    1.31 +
    1.32  if test "x$no_x" = xyes && test "x$X11_NOT_NEEDED" != xyes; then
    1.33  
    1.34      # Print a helpful message on how to acquire the necessary build dependency.

     2.1 --- a/common/makefiles/Jprt.gmk	Mon Feb 04 10:53:38 2013 +0100
     2.2 +++ b/common/makefiles/Jprt.gmk	Mon Feb 04 11:02:03 2013 +0100
     2.3 @@ -179,27 +179,52 @@
     2.4  $(JPRT_ARCHIVE_BUNDLE): bundles
     2.5  	$(MKDIR) -p $(@D)
     2.6  	$(RM) $@
     2.7 -	$(CP) $(BUILD_OUTPUT)/bundles/j2sdk-image.zip $@
     2.8 +	$(CP) $(BUILD_OUTPUT)/bundles/$(JDK_IMAGE_SUBDIR).zip $@
     2.9  
    2.10 -# This target must be called in the context of a SPEC file
    2.11 -bundles: all
    2.12 +ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_BITS),solaris-64)
    2.13 +  SRC_JDK_IMAGE_DIR := $(JDK_OVERLAY_IMAGE_DIR)
    2.14 +  SRC_JRE_IMAGE_DIR := $(JRE_OVERLAY_IMAGE_DIR)
    2.15 +else
    2.16 +  SRC_JDK_IMAGE_DIR := $(JDK_IMAGE_DIR)
    2.17 +  SRC_JRE_IMAGE_DIR := $(JRE_IMAGE_DIR)
    2.18 +endif
    2.19 +SRC_JDK_BUNDLE_DIR := $(JDK_BUNDLE_DIR)
    2.20 +SRC_JRE_BUNDLE_DIR := $(JRE_BUNDLE_DIR)
    2.21 +
    2.22 +# Bundle up the images
    2.23 +bundles: all bundles-only
    2.24 +bundles-only: start-make
    2.25  	@$(call TargetEnter)
    2.26  	$(MKDIR) -p $(BUILD_OUTPUT)/bundles
    2.27 -ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_BITS),solaris-64)
    2.28 -	$(CD) $(JDK_OVERLAY_IMAGE_DIR) && $(ZIP) -q -r $(BUILD_OUTPUT)/bundles/j2sdk-image.zip .
    2.29 -	$(CD) $(JRE_OVERLAY_IMAGE_DIR) && $(ZIP) -q -r $(BUILD_OUTPUT)/bundles/j2re-image.zip .
    2.30 -else
    2.31 -	$(CD) $(JDK_IMAGE_DIR) && $(ZIP) -q -r $(BUILD_OUTPUT)/bundles/j2sdk-image.zip .
    2.32 -	$(CD) $(JRE_IMAGE_DIR) && $(ZIP) -q -r $(BUILD_OUTPUT)/bundles/j2re-image.zip .
    2.33 +	$(CD) $(SRC_JDK_IMAGE_DIR) && $(ZIP) -q -r $(BUILD_OUTPUT)/bundles/$(JDK_IMAGE_SUBDIR).zip .
    2.34 +	$(CD) $(SRC_JRE_IMAGE_DIR) && $(ZIP) -q -r $(BUILD_OUTPUT)/bundles/$(JRE_IMAGE_SUBDIR).zip .
    2.35  	if [ -d  $(BUILD_OUTPUT)/install/bundles ] ; then \
    2.36             $(CD) $(BUILD_OUTPUT)/install/bundles && $(ZIP) -q -r $(JPRT_ARCHIVE_INSTALL_BUNDLE) . ; \
    2.37          fi
    2.38 +	@$(call TargetExit)
    2.39 +
    2.40 +# Copy images to one unified location regardless of platform etc.
    2.41 +final-images: all final-images-only
    2.42 +final-images-only: start-make
    2.43 +	@$(call TargetEnter)
    2.44 +	$(RM) -r $(BUILD_OUTPUT)/final-images
    2.45 +	$(MKDIR) -p $(BUILD_OUTPUT)/final-images/$(JDK_IMAGE_SUBDIR)
    2.46 +	$(MKDIR) -p $(BUILD_OUTPUT)/final-images/$(JRE_IMAGE_SUBDIR)
    2.47 +	$(CP) -R -P $(SRC_JDK_IMAGE_DIR)/* $(BUILD_OUTPUT)/final-images/$(JDK_IMAGE_SUBDIR)/
    2.48 +	$(CP) -R -P $(SRC_JRE_IMAGE_DIR)/* $(BUILD_OUTPUT)/final-images/$(JRE_IMAGE_SUBDIR)/
    2.49 +ifeq ($(OPENJDK_TARGET_OS),macosx)
    2.50 +	$(MKDIR) -p $(BUILD_OUTPUT)/final-images/$(JDK_BUNDLE_SUBDIR)
    2.51 +	$(MKDIR) -p $(BUILD_OUTPUT)/final-images/$(JRE_BUNDLE_SUBDIR)
    2.52 +	$(CP) -R -P $(SRC_JDK_BUNDLE_DIR)/* $(BUILD_OUTPUT)/final-images/$(JDK_BUNDLE_SUBDIR)/
    2.53 +	$(CP) -R -P $(SRC_JRE_BUNDLE_DIR)/* $(BUILD_OUTPUT)/final-images/$(JRE_BUNDLE_SUBDIR)/
    2.54  endif
    2.55  	@$(call TargetExit)
    2.56  
    2.57 +
    2.58  # Keep track of phony targets
    2.59  PHONY_LIST += jprt_build_product jprt_build_fastdebug jprt_build_debug \
    2.60 -              jprt_build_generic bundles jprt_bundle
    2.61 +              jprt_build_generic bundles jprt_bundle \
    2.62 +              final-images final-images-only
    2.63  
    2.64  ###########################################################################
    2.65  # Phony targets