Mercurial > jdk8-mips64-public / file comparison
comparison: common/autoconf/spec.gmk.in
common/autoconf/spec.gmk.in
- changeset 668
- 52d1b385a4ed
- parent 656
- e2057191f6da
- child 670
- 3b8ffb80db0f
equal
deleted
inserted
replaced
| 666:01f631f89fa3 | 668:52d1b385a4ed |
|---|---|
| 223 # layout for the jdk and the jre inside the IMAGES_OUTPUTDIR subdir. | 223 # layout for the jdk and the jre inside the IMAGES_OUTPUTDIR subdir. |
| 224 # Then it will copy the contents of the jdk into the installation | 224 # Then it will copy the contents of the jdk into the installation |
| 225 # directory. | 225 # directory. |
| 226 | 226 |
| 227 BUILD_OUTPUT:=@BUILD_OUTPUT@ | 227 BUILD_OUTPUT:=@BUILD_OUTPUT@ |
| 228 # Colon left out to be able to override IMAGES_OUTPUTDIR for bootcycle-images | |
| 228 LANGTOOLS_OUTPUTDIR=$(BUILD_OUTPUT)/langtools | 229 LANGTOOLS_OUTPUTDIR=$(BUILD_OUTPUT)/langtools |
| 229 CORBA_OUTPUTDIR=$(BUILD_OUTPUT)/corba | 230 CORBA_OUTPUTDIR=$(BUILD_OUTPUT)/corba |
| 230 JAXP_OUTPUTDIR=$(BUILD_OUTPUT)/jaxp | 231 JAXP_OUTPUTDIR=$(BUILD_OUTPUT)/jaxp |
| 231 JAXWS_OUTPUTDIR=$(BUILD_OUTPUT)/jaxws | 232 JAXWS_OUTPUTDIR=$(BUILD_OUTPUT)/jaxws |
| 232 HOTSPOT_OUTPUTDIR=$(BUILD_OUTPUT)/hotspot | 233 HOTSPOT_OUTPUTDIR=$(BUILD_OUTPUT)/hotspot |
| 641 # Images directory definitions | 642 # Images directory definitions |
| 642 JDK_IMAGE_SUBDIR:=j2sdk-image | 643 JDK_IMAGE_SUBDIR:=j2sdk-image |
| 643 JRE_IMAGE_SUBDIR:=j2re-image | 644 JRE_IMAGE_SUBDIR:=j2re-image |
| 644 JDK_OVERLAY_IMAGE_SUBDIR:=j2sdk-overlay-image | 645 JDK_OVERLAY_IMAGE_SUBDIR:=j2sdk-overlay-image |
| 645 JRE_OVERLAY_IMAGE_SUBDIR:=j2re-overlay-image | 646 JRE_OVERLAY_IMAGE_SUBDIR:=j2re-overlay-image |
| 646 JDK_IMAGE_DIR:=$(IMAGES_OUTPUTDIR)/$(JDK_IMAGE_SUBDIR) | 647 # Colon left out to be able to override output dir for bootcycle-images |
| 647 JRE_IMAGE_DIR:=$(IMAGES_OUTPUTDIR)/$(JRE_IMAGE_SUBDIR) | 648 JDK_IMAGE_DIR=$(IMAGES_OUTPUTDIR)/$(JDK_IMAGE_SUBDIR) |
| 648 JDK_OVERLAY_IMAGE_DIR:=$(IMAGES_OUTPUTDIR)/$(JDK_OVERLAY_IMAGE_SUBDIR) | 649 JRE_IMAGE_DIR=$(IMAGES_OUTPUTDIR)/$(JRE_IMAGE_SUBDIR) |
| 649 JRE_OVERLAY_IMAGE_DIR:=$(IMAGES_OUTPUTDIR)/$(JRE_OVERLAY_IMAGE_SUBDIR) | 650 JDK_OVERLAY_IMAGE_DIR=$(IMAGES_OUTPUTDIR)/$(JDK_OVERLAY_IMAGE_SUBDIR) |
| 651 JRE_OVERLAY_IMAGE_DIR=$(IMAGES_OUTPUTDIR)/$(JRE_OVERLAY_IMAGE_SUBDIR) | |
| 650 | 652 |
| 651 # Macosx bundles directory definitions | 653 # Macosx bundles directory definitions |
| 652 JDK_BUNDLE_SUBDIR:=j2sdk-bundle/jdk$(JDK_VERSION).jdk/Contents | 654 JDK_BUNDLE_SUBDIR=j2sdk-bundle/jdk$(JDK_VERSION).jdk/Contents |
| 653 JRE_BUNDLE_SUBDIR:=j2re-bundle/jre$(JDK_VERSION).jre/Contents | 655 JRE_BUNDLE_SUBDIR=j2re-bundle/jre$(JDK_VERSION).jre/Contents |
| 654 JDK_BUNDLE_DIR:=$(IMAGES_OUTPUTDIR)/$(JDK_BUNDLE_SUBDIR) | 656 JDK_BUNDLE_DIR=$(IMAGES_OUTPUTDIR)/$(JDK_BUNDLE_SUBDIR) |
| 655 JRE_BUNDLE_DIR:=$(IMAGES_OUTPUTDIR)/$(JRE_BUNDLE_SUBDIR) | 657 JRE_BUNDLE_DIR=$(IMAGES_OUTPUTDIR)/$(JRE_BUNDLE_SUBDIR) |
| 656 | 658 |
| 657 # Include the custom-spec.gmk file if it exists | 659 # Include the custom-spec.gmk file if it exists |
| 658 -include $(dir @SPEC@)/custom-spec.gmk | 660 -include $(dir @SPEC@)/custom-spec.gmk |
