1 # |
1 # |
2 # Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved. |
2 # Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved. |
3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 # |
4 # |
5 # This code is free software; you can redistribute it and/or modify it |
5 # This code is free software; you can redistribute it and/or modify it |
6 # under the terms of the GNU General Public License version 2 only, as |
6 # under the terms of the GNU General Public License version 2 only, as |
7 # published by the Free Software Foundation. Oracle designates this |
7 # published by the Free Software Foundation. Oracle designates this |
43 # boot jdk to generate tools that need to be run with the boot jdk. |
43 # boot jdk to generate tools that need to be run with the boot jdk. |
44 # Thus we force the target bytecode to the boot jdk bytecode. |
44 # Thus we force the target bytecode to the boot jdk bytecode. |
45 $(eval $(call SetupJavaCompiler,GENERATE_OLDBYTECODE,\ |
45 $(eval $(call SetupJavaCompiler,GENERATE_OLDBYTECODE,\ |
46 JVM:=$(JAVA),\ |
46 JVM:=$(JAVA),\ |
47 JAVAC:=$(NEW_JAVAC),\ |
47 JAVAC:=$(NEW_JAVAC),\ |
48 FLAGS:=$(BOOT_JDK_SOURCETARGET) -bootclasspath $(BOOT_RTJAR) $(DISABLE_CORBA_WARNINGS),\ |
48 FLAGS := $(BOOT_JDK_SOURCETARGET) -bootclasspath $(BOOT_RTJAR)$(PATH_SEP)$(BOOT_TOOLSJAR) \ |
|
49 $(DISABLE_CORBA_WARNINGS), \ |
49 SERVER_DIR:=$(SJAVAC_SERVER_DIR),\ |
50 SERVER_DIR:=$(SJAVAC_SERVER_DIR),\ |
50 SERVER_JVM:=$(SJAVAC_SERVER_JAVA))) |
51 SERVER_JVM:=$(SJAVAC_SERVER_JAVA))) |
51 |
52 |
52 # The "generate new bytecode" uses the new compiler to generate bytecode |
53 # The "generate new bytecode" uses the new compiler to generate bytecode |
53 # for the new jdk that is being built. The code compiled by this setup |
54 # for the new jdk that is being built. The code compiled by this setup |
179 com/sun/tools/corba/se/idl/ResourceBundleUtil.java\ |
180 com/sun/tools/corba/se/idl/ResourceBundleUtil.java\ |
180 com/sun/corba/se/impl/presentation/rmi/jndi.properties,\ |
181 com/sun/corba/se/impl/presentation/rmi/jndi.properties,\ |
181 COPY:=.prp LogStrings.properties,\ |
182 COPY:=.prp LogStrings.properties,\ |
182 BIN:=$(CORBA_OUTPUTDIR)/classes)) |
183 BIN:=$(CORBA_OUTPUTDIR)/classes)) |
183 |
184 |
|
185 $(eval $(call SetupJavaCompilation,BUILD_BOOTSTRAP_CORBA, \ |
|
186 SETUP := GENERATE_OLDBYTECODE, \ |
|
187 SRC := $(BUILD_CORBA_SRC), \ |
|
188 EXCLUDES := $(BUILD_CORBA_EXCLUDES), \ |
|
189 EXCLUDE_FILES := $(BUILD_CORBA_EXCLUDE_FILES), \ |
|
190 COPY := $(BUILD_CORBA_COPY), \ |
|
191 BIN := $(CORBA_OUTPUTDIR)/btclasses/corba_classes, \ |
|
192 JAR := $(CORBA_OUTPUTDIR)/btjars/btcorba.jar)) |
|
193 |
184 # Separate src.zip call to include sources that were excluded in the build to |
194 # Separate src.zip call to include sources that were excluded in the build to |
185 # mimic behavior in old build system. |
195 # mimic behavior in old build system. |
186 $(eval $(call SetupZipArchive,ARCHIVE_BUILD_CORBA,\ |
196 $(eval $(call SetupZipArchive,ARCHIVE_BUILD_CORBA,\ |
187 SRC:=$(CORBA_TOPDIR)/src/share/classes $(CORBA_OUTPUTDIR)/gensrc $(CORBA_OUTPUTDIR)/logwrappers,\ |
197 SRC:=$(CORBA_TOPDIR)/src/share/classes $(CORBA_OUTPUTDIR)/gensrc $(CORBA_OUTPUTDIR)/logwrappers,\ |
188 ZIP:=$(CORBA_OUTPUTDIR)/dist/lib/src.zip)) |
198 ZIP:=$(CORBA_OUTPUTDIR)/dist/lib/src.zip)) |
237 # The created bin.zip now contains the corba specific binaries: orb.idl, ir.idl |
247 # The created bin.zip now contains the corba specific binaries: orb.idl, ir.idl |
238 |
248 |
239 all: $(CORBA_OUTPUTDIR)/btjars/stripproperties.jar \ |
249 all: $(CORBA_OUTPUTDIR)/btjars/stripproperties.jar \ |
240 $(CORBA_OUTPUTDIR)/btjars/idlj.jar \ |
250 $(CORBA_OUTPUTDIR)/btjars/idlj.jar \ |
241 $(CORBA_OUTPUTDIR)/btjars/logutil.jar \ |
251 $(CORBA_OUTPUTDIR)/btjars/logutil.jar \ |
|
252 $(CORBA_OUTPUTDIR)/btjars/btcorba.jar \ |
242 $(CORBA_OUTPUTDIR)/dist/lib/classes.jar \ |
253 $(CORBA_OUTPUTDIR)/dist/lib/classes.jar \ |
243 $(CORBA_OUTPUTDIR)/dist/lib/src.zip \ |
254 $(CORBA_OUTPUTDIR)/dist/lib/src.zip \ |
244 $(CORBA_OUTPUTDIR)/dist/lib/bin.zip |
255 $(CORBA_OUTPUTDIR)/dist/lib/bin.zip |
245 endif |
256 endif |
246 endif |
257 endif |