make/Makefile

changeset 4
59fd8224ba2d
parent 1
0961a4a21176
child 10
7f2466f8cc70
equal deleted inserted replaced
3:018781e80410 4:59fd8224ba2d
67 ifeq ($(VARIANT), OPT) 67 ifeq ($(VARIANT), OPT)
68 ANT_OPTIONS += -Djavac.debug=false 68 ANT_OPTIONS += -Djavac.debug=false
69 endif 69 endif
70 endif 70 endif
71 71
72 # Note: j2se/make/common/Defs.gmk uses LANGUAGE_VERSION (-source NN) 72 # Note: jdk/make/common/Defs.gmk uses LANGUAGE_VERSION (-source NN)
73 # and the somewhat misnamed CLASS_VERSION (-target NN) 73 # and the somewhat misnamed CLASS_VERSION (-target NN)
74 ifdef TARGET_CLASS_VERSION 74 ifdef TARGET_CLASS_VERSION
75 ANT_OPTIONS += -Djavac.target=$(TARGET_CLASS_VERSION) 75 ANT_OPTIONS += -Djavac.target=$(TARGET_CLASS_VERSION)
76 else 76 else
77 ifdef JAVAC_TARGET_ARG 77 ifdef JAVAC_TARGET_ARG
88 ANT_OPTIONS += -Dbuild.dir=$(ALT_OUTPUTDIR)/build 88 ANT_OPTIONS += -Dbuild.dir=$(ALT_OUTPUTDIR)/build
89 ANT_OPTIONS += -Ddist.dir=$(ALT_OUTPUTDIR)/dist 89 ANT_OPTIONS += -Ddist.dir=$(ALT_OUTPUTDIR)/dist
90 else 90 else
91 OUTPUTDIR = .. 91 OUTPUTDIR = ..
92 endif 92 endif
93 ABS_OUTPUTDIR = $(call FullPath,$(OUTPUTDIR))
94 93
95 ifdef ALT_LANGTOOLS_DIST 94 ifdef ALT_LANGTOOLS_DIST
96 ANT_OPTIONS += -Dbootstrap.dir=$(ALT_LANGTOOLS_DIST)/bootstrap 95 ANT_OPTIONS += -Dbootstrap.dir=$(ALT_LANGTOOLS_DIST)/bootstrap
97 endif 96 endif
98 97
125 $(ANT_TARGETS): 124 $(ANT_TARGETS):
126 $(ANT_JAVA_HOME) $(ANT) -version 125 $(ANT_JAVA_HOME) $(ANT) -version
127 $(ANT_JAVA_HOME) $(ANT) $(ANT_OPTIONS) $@ 126 $(ANT_JAVA_HOME) $(ANT) $(ANT_OPTIONS) $@
128 127
129 # Targets for Sun's internal JPRT build system 128 # Targets for Sun's internal JPRT build system
129 JPRT_ARCHIVE_BUNDLE=$(OUTPUTDIR)/jprt.zip
130 jprt_build_product jprt_build_debug jprt_build_fastdebug: all 130 jprt_build_product jprt_build_debug jprt_build_fastdebug: all
131 $(RM) $(JPRT_ARCHIVE_BUNDLE)
132 ( cd $(OUTPUTDIR)/dist && \
133 zip -q -r $(JPRT_ARCHIVE_BUNDLE) . )
131 134
132 # Declare these phony (not filenames) 135 # Declare these phony (not filenames)
133 .PHONY: $(ANT_TARGETS) all clobber \ 136 .PHONY: $(ANT_TARGETS) all clobber \
134 jprt_build_product jprt_build_debug jprt_build_fastdebug 137 jprt_build_product jprt_build_debug jprt_build_fastdebug

mercurial