1.1 --- a/Makefile Tue Dec 28 15:52:09 2010 -0800
1.2 +++ b/Makefile Wed Jan 05 17:24:58 2011 -0800
1.3 @@ -29,15 +29,6 @@
1.4 TOPDIR:=.
1.5 endif
1.6
1.7 -# Openjdk sources (only used if SKIP_OPENJDK_BUILD!=true)
1.8 -OPENJDK_SOURCETREE=$(TOPDIR)/openjdk
1.9 -OPENJDK_BUILDDIR:=$(shell \
1.10 - if [ -r $(OPENJDK_SOURCETREE)/Makefile ]; then \
1.11 - echo "$(OPENJDK_SOURCETREE)"; \
1.12 - else \
1.13 - echo "."; \
1.14 - fi)
1.15 -
1.16 ifndef JDK_TOPDIR
1.17 JDK_TOPDIR=$(TOPDIR)/jdk
1.18 endif
1.19 @@ -70,7 +61,7 @@
1.20 all::
1.21 @$(START_ECHO)
1.22
1.23 -all:: openjdk_check sanity
1.24 +all:: sanity
1.25
1.26 ifeq ($(SKIP_FASTDEBUG_BUILD), false)
1.27 all:: fastdebug_build
1.28 @@ -80,10 +71,6 @@
1.29 all:: debug_build
1.30 endif
1.31
1.32 -ifneq ($(SKIP_OPENJDK_BUILD), true)
1.33 - all:: openjdk_build
1.34 -endif
1.35 -
1.36 all:: all_product_build
1.37
1.38 all::
1.39 @@ -267,81 +254,6 @@
1.40 debug_build:: build_debug_image
1.41 fastdebug_build:: build_fastdebug_image
1.42
1.43 -# Check on whether we really can build the openjdk, need source etc.
1.44 -openjdk_check: FRC
1.45 -ifneq ($(SKIP_OPENJDK_BUILD), true)
1.46 - @$(ECHO) " "
1.47 - @$(ECHO) "================================================="
1.48 - @if [ ! -r $(OPENJDK_BUILDDIR)/Makefile ] ; then \
1.49 - $(ECHO) "ERROR: No openjdk source tree available at: $(OPENJDK_BUILDDIR)"; \
1.50 - exit 1; \
1.51 - else \
1.52 - $(ECHO) "OpenJDK will be built after JDK is built"; \
1.53 - $(ECHO) " OPENJDK_BUILDDIR=$(OPENJDK_BUILDDIR)"; \
1.54 - fi
1.55 - @$(ECHO) "================================================="
1.56 - @$(ECHO) " "
1.57 -endif
1.58 -
1.59 -# If we have bundle rules, we have a chance here to do a complete cycle
1.60 -# build, of production and open build.
1.61 -# FIXUP: We should create the openjdk source bundle and build that?
1.62 -# But how do we reliable create or get at a formal openjdk source tree?
1.63 -# The one we have needs to be trimmed of built bits and closed dirs.
1.64 -# The repositories might not be available.
1.65 -# The openjdk source bundle is probably not available.
1.66 -
1.67 -ifneq ($(SKIP_OPENJDK_BUILD), true)
1.68 - ifeq ($(BUILD_JDK), true)
1.69 - ifeq ($(BUNDLE_RULES_AVAILABLE), true)
1.70 -
1.71 -OPENJDK_OUTPUTDIR=$(ABS_OUTPUTDIR)/open-output
1.72 -OPENJDK_BUILD_NAME \
1.73 - = openjdk-$(JDK_MINOR_VERSION)-$(BUILD_NUMBER)-$(PLATFORM)-$(ARCH)-$(BUNDLE_DATE)
1.74 -OPENJDK_BUILD_BINARY_ZIP=$(ABS_BIN_BUNDLEDIR)/$(OPENJDK_BUILD_NAME).zip
1.75 -BUILT_IMAGE=$(ABS_OUTPUTDIR)/j2sdk-image
1.76 -ifeq ($(PLATFORM)$(ARCH_DATA_MODEL),solaris64)
1.77 - OPENJDK_BOOTDIR=$(BOOTDIR)
1.78 - OPENJDK_IMPORTJDK=$(JDK_IMPORT_PATH)
1.79 -else
1.80 - OPENJDK_BOOTDIR=$(BUILT_IMAGE)
1.81 - OPENJDK_IMPORTJDK=$(BUILT_IMAGE)
1.82 -endif
1.83 -
1.84 -openjdk_build:
1.85 - @$(START_ECHO)
1.86 - @$(ECHO) " "
1.87 - @$(ECHO) "================================================="
1.88 - @$(ECHO) "Starting openjdk build"
1.89 - @$(ECHO) " Using: ALT_JDK_DEVTOOLS_DIR=$(JDK_DEVTOOLS_DIR)"
1.90 - @$(ECHO) "================================================="
1.91 - @$(ECHO) " "
1.92 - $(RM) -r $(OPENJDK_OUTPUTDIR)
1.93 - $(MKDIR) -p $(OPENJDK_OUTPUTDIR)
1.94 - ($(CD) $(OPENJDK_BUILDDIR) && $(MAKE) \
1.95 - OPENJDK=true \
1.96 - GENERATE_DOCS=false \
1.97 - ALT_JDK_DEVTOOLS_DIR=$(JDK_DEVTOOLS_DIR) \
1.98 - ALT_OUTPUTDIR=$(OPENJDK_OUTPUTDIR) \
1.99 - ALT_BOOTDIR=$(OPENJDK_BOOTDIR) \
1.100 - ALT_JDK_IMPORT_PATH=$(OPENJDK_IMPORTJDK) \
1.101 - product_build )
1.102 - $(RM) $(OPENJDK_BUILD_BINARY_ZIP)
1.103 - ( $(CD) $(OPENJDK_OUTPUTDIR)/j2sdk-image && \
1.104 - $(ZIPEXE) -q -r $(OPENJDK_BUILD_BINARY_ZIP) .)
1.105 - $(RM) -r $(OPENJDK_OUTPUTDIR)
1.106 - @$(ECHO) " "
1.107 - @$(ECHO) "================================================="
1.108 - @$(ECHO) "Finished openjdk build"
1.109 - @$(ECHO) " Binary Bundle: $(OPENJDK_BUILD_BINARY_ZIP)"
1.110 - @$(ECHO) "================================================="
1.111 - @$(ECHO) " "
1.112 - @$(FINISH_ECHO)
1.113 -
1.114 - endif
1.115 - endif
1.116 -endif
1.117 -
1.118 clobber::
1.119 $(RM) -r $(OUTPUTDIR)/*
1.120 $(RM) -r $(OUTPUTDIR)/../$(PLATFORM)-$(ARCH)-debug/*
