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) \ |
|
49 -bootclasspath "$(BOOT_RTJAR)$(PATH_SEP)$(BOOT_TOOLSJAR)" \ |
|
50 $(DISABLE_CORBA_WARNINGS), \ |
49 SERVER_DIR := $(SJAVAC_SERVER_DIR), \ |
51 SERVER_DIR := $(SJAVAC_SERVER_DIR), \ |
50 SERVER_JVM := $(SJAVAC_SERVER_JAVA))) |
52 SERVER_JVM := $(SJAVAC_SERVER_JAVA))) |
51 |
53 |
52 # The "generate new bytecode" uses the new compiler to generate bytecode |
54 # 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 |
55 # for the new jdk that is being built. The code compiled by this setup |
181 com/sun/tools/corba/se/idl/ResourceBundleUtil.java \ |
183 com/sun/tools/corba/se/idl/ResourceBundleUtil.java \ |
182 com/sun/corba/se/impl/presentation/rmi/jndi.properties, \ |
184 com/sun/corba/se/impl/presentation/rmi/jndi.properties, \ |
183 COPY := .prp LogStrings.properties, \ |
185 COPY := .prp LogStrings.properties, \ |
184 BIN := $(CORBA_OUTPUTDIR)/classes)) |
186 BIN := $(CORBA_OUTPUTDIR)/classes)) |
185 |
187 |
|
188 $(eval $(call SetupJavaCompilation,BUILD_BOOTSTRAP_CORBA, \ |
|
189 SETUP := GENERATE_OLDBYTECODE, \ |
|
190 SRC := $(BUILD_CORBA_SRC), \ |
|
191 EXCLUDES := $(BUILD_CORBA_EXCLUDES), \ |
|
192 EXCLUDE_FILES := $(BUILD_CORBA_EXCLUDE_FILES), \ |
|
193 COPY := $(BUILD_CORBA_COPY), \ |
|
194 BIN := $(CORBA_OUTPUTDIR)/btclasses/corba_classes, \ |
|
195 JAR := $(CORBA_OUTPUTDIR)/btjars/btcorba.jar)) |
|
196 |
186 # Separate src.zip call to include sources that were excluded in the build to |
197 # Separate src.zip call to include sources that were excluded in the build to |
187 # mimic behavior in old build system. |
198 # mimic behavior in old build system. |
188 $(eval $(call SetupZipArchive,ARCHIVE_BUILD_CORBA, \ |
199 $(eval $(call SetupZipArchive,ARCHIVE_BUILD_CORBA, \ |
189 SRC := $(CORBA_TOPDIR)/src/share/classes $(CORBA_OUTPUTDIR)/gensrc $(CORBA_OUTPUTDIR)/logwrappers, \ |
200 SRC := $(CORBA_TOPDIR)/src/share/classes $(CORBA_OUTPUTDIR)/gensrc $(CORBA_OUTPUTDIR)/logwrappers, \ |
190 ZIP := $(CORBA_OUTPUTDIR)/dist/lib/src.zip)) |
201 ZIP := $(CORBA_OUTPUTDIR)/dist/lib/src.zip)) |
239 # The created bin.zip now contains the corba specific binaries: orb.idl, ir.idl |
250 # The created bin.zip now contains the corba specific binaries: orb.idl, ir.idl |
240 |
251 |
241 all: $(CORBA_OUTPUTDIR)/btjars/stripproperties.jar \ |
252 all: $(CORBA_OUTPUTDIR)/btjars/stripproperties.jar \ |
242 $(CORBA_OUTPUTDIR)/btjars/idlj.jar \ |
253 $(CORBA_OUTPUTDIR)/btjars/idlj.jar \ |
243 $(CORBA_OUTPUTDIR)/btjars/logutil.jar \ |
254 $(CORBA_OUTPUTDIR)/btjars/logutil.jar \ |
|
255 $(CORBA_OUTPUTDIR)/btjars/btcorba.jar \ |
244 $(CORBA_OUTPUTDIR)/dist/lib/classes.jar \ |
256 $(CORBA_OUTPUTDIR)/dist/lib/classes.jar \ |
245 $(CORBA_OUTPUTDIR)/dist/lib/src.zip \ |
257 $(CORBA_OUTPUTDIR)/dist/lib/src.zip \ |
246 $(CORBA_OUTPUTDIR)/dist/lib/bin.zip |
258 $(CORBA_OUTPUTDIR)/dist/lib/bin.zip |
247 endif |
259 endif |
248 endif |
260 endif |