ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-06 05:04:20 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge remote branch 'oss/r0.5' into dev

Browse Source
This commit is contained in:
Joel Dice 2011-02-17 17:41:21 -07:00
commit 19c443254d
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classpath/avian/Assembler.java
View File

@ -74,7 +74,7 @@ public class Assembler {
e.writeTo(out);
}
write2(out, 0); // flags
write2(out, ACC_PUBLIC); // flags
write2(out, name + 1);
write2(out, super_ + 1);

22
makefile
View File

@ -86,11 +86,9 @@ ifneq ($(openjdk),)
openjdk-jar-dep = $(build)/openjdk-jar.dep
classpath-jar-dep = $(openjdk-jar-dep)
javahome = $(embed-prefix)/javahomeJar
javahome-files = lib/zi
javahome-files = lib/zi lib/currency.data
ifeq ($(platform),windows)
javahome-files += lib/tzmappings
else
javahome-files += lib/currency.data
endif
javahome-object = $(build)/javahome-jar.o
boot-javahome-object = $(build)/boot-javahome.o
@ -514,17 +512,23 @@ dynamic-library = $(build)/$(so-prefix)jvm$(so-suffix)
executable-dynamic = $(build)/$(name)-dynamic${exe-suffix}
ifneq ($(classpath),avian)
# Assembler, ConstantPool, and Stream are not technically needed for a
# working build, but we include them since our Subroutine test uses
# them to synthesize a class:
classpath-sources := \
$(classpath-src)/avian/Continuations.java \
$(classpath-src)/avian/Addendum.java \
$(classpath-src)/avian/Assembler.java \
$(classpath-src)/avian/Callback.java \
$(classpath-src)/avian/CallbackReceiver.java \
$(classpath-src)/avian/IncompatibleContinuationException.java \
$(classpath-src)/avian/SystemClassLoader.java \
$(classpath-src)/avian/Machine.java \
$(classpath-src)/avian/Addendum.java \
$(classpath-src)/avian/ClassAddendum.java \
$(classpath-src)/avian/MethodAddendum.java \
$(classpath-src)/avian/ConstantPool.java \
$(classpath-src)/avian/Continuations.java \
$(classpath-src)/avian/FieldAddendum.java \
$(classpath-src)/avian/IncompatibleContinuationException.java \
$(classpath-src)/avian/Machine.java \
$(classpath-src)/avian/MethodAddendum.java \
$(classpath-src)/avian/Stream.java \
$(classpath-src)/avian/SystemClassLoader.java \
$(classpath-src)/avian/VMClass.java \
$(classpath-src)/avian/VMField.java \
$(classpath-src)/avian/VMMethod.java \