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

allow building with Java 7

Browse Source
This commit is contained in:
Joel Dice 2015-08-06 17:23:14 -06:00
parent 66712a8cff
commit 549810deba
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@ -1,9 +1,6 @@
language: cpp language: cpp
cache: apt cache: apt
jdk:
- oraclejdk8
os: os:
- linux - linux
- osx - osx

16
makefile
View File

@ -3,6 +3,10 @@ MAKEFLAGS = -s
name = avian name = avian
version := $(shell grep version gradle.properties | cut -d'=' -f2) version := $(shell grep version gradle.properties | cut -d'=' -f2)
java-version := $(shell $(JAVA_HOME)/bin/java -version 2>&1 \
| head -n 1 \
| sed 's/.*version "1.\([^.]*\).*/\1/')
build-arch := $(shell uname -m \ build-arch := $(shell uname -m \
| sed 's/^i.86$$/i386/' \ | sed 's/^i.86$$/i386/' \
| sed 's/^x86pc$$/i386/' \ | sed 's/^x86pc$$/i386/' \
@ -1478,6 +1482,7 @@ ifneq ($(classpath),avian)
$(classpath-src)/java/lang/invoke/MethodHandles.java \ $(classpath-src)/java/lang/invoke/MethodHandles.java \
$(classpath-src)/java/lang/invoke/MethodType.java \ $(classpath-src)/java/lang/invoke/MethodType.java \
$(classpath-src)/java/lang/invoke/LambdaMetafactory.java \ $(classpath-src)/java/lang/invoke/LambdaMetafactory.java \
$(classpath-src)/java/lang/invoke/LambdaConversionException.java \
$(classpath-src)/java/lang/invoke/CallSite.java $(classpath-src)/java/lang/invoke/CallSite.java
ifeq ($(openjdk),) ifeq ($(openjdk),)
@ -1514,7 +1519,10 @@ vm-classes = \
avian/resource/*.class avian/resource/*.class
test-support-sources = $(shell find $(test)/avian/ -name '*.java') test-support-sources = $(shell find $(test)/avian/ -name '*.java')
test-sources = $(wildcard $(test)/*.java) test-sources := $(wildcard $(test)/*.java)
ifeq (7,$(java-version))
test-sources := $(subst $(test)/InvokeDynamic.java,,$(test-sources))
endif
test-cpp-sources = $(wildcard $(test)/*.cpp) test-cpp-sources = $(wildcard $(test)/*.cpp)
test-sources += $(test-support-sources) test-sources += $(test-support-sources)
test-support-classes = $(call java-classes, $(test-support-sources),$(test),$(test-build)) test-support-classes = $(call java-classes, $(test-support-sources),$(test),$(test-build))
@ -1694,7 +1702,7 @@ $(classpath-dep): $(classpath-sources) $(classpath-jar-dep)
classes="$(shell $(MAKE) -s --no-print-directory build=$(build) \ classes="$(shell $(MAKE) -s --no-print-directory build=$(build) \
$(classpath-classes) arch=$(build-arch) platform=$(bootimage-platform))"; \ $(classpath-classes) arch=$(build-arch) platform=$(bootimage-platform))"; \
if [ -n "$${classes}" ]; then \ if [ -n "$${classes}" ]; then \
$(javac) -source 1.8 -target 1.8 \ $(javac) -source 1.$(java-version) -target 1.$(java-version) \
-d $(classpath-build) -bootclasspath $(boot-classpath) \ -d $(classpath-build) -bootclasspath $(boot-classpath) \
$${classes}; fi $${classes}; fi
@touch $(@) @touch $(@)
@ -1770,7 +1778,7 @@ $(test-dep): $(test-sources) $(test-library)
@mkdir -p $(test-build) @mkdir -p $(test-build)
files="$(shell $(MAKE) -s --no-print-directory build=$(build) $(test-classes))"; \ files="$(shell $(MAKE) -s --no-print-directory build=$(build) $(test-classes))"; \
if test -n "$${files}"; then \ if test -n "$${files}"; then \
$(javac) -source 1.8 -target 1.8 \ $(javac) -source 1.$(java-version) -target 1.$(java-version) \
-classpath $(test-build) -d $(test-build) -bootclasspath $(boot-classpath) $${files}; \ -classpath $(test-build) -d $(test-build) -bootclasspath $(boot-classpath) $${files}; \
fi fi
$(javac) -source 1.2 -target 1.1 -XDjsrlimit=0 -d $(test-build) \ $(javac) -source 1.2 -target 1.1 -XDjsrlimit=0 -d $(test-build) \
@ -1782,7 +1790,7 @@ $(test-extra-dep): $(test-extra-sources)
@mkdir -p $(test-build) @mkdir -p $(test-build)
files="$(shell $(MAKE) -s --no-print-directory build=$(build) $(test-extra-classes))"; \ files="$(shell $(MAKE) -s --no-print-directory build=$(build) $(test-extra-classes))"; \
if test -n "$${files}"; then \ if test -n "$${files}"; then \
$(javac) -source 1.8 -target 1.8 \ $(javac) -source 1.$(java-version) -target 1.$(java-version) \
-d $(test-build) -bootclasspath $(boot-classpath) $${files}; \ -d $(test-build) -bootclasspath $(boot-classpath) $${files}; \
fi fi
@touch $(@) @touch $(@)