mirror of
https://github.com/corda/corda.git
synced 2025-01-03 19:54:13 +00:00
Have Makefile pull version from gradle.properties
This commit is contained in:
parent
36c3e26d2c
commit
644cf9167a
19
build.gradle
19
build.gradle
@ -11,6 +11,7 @@ buildscript {
|
|||||||
apply plugin: 'native-component'
|
apply plugin: 'native-component'
|
||||||
apply plugin: 'ivy-publish'
|
apply plugin: 'ivy-publish'
|
||||||
apply plugin: 'com.jfrog.artifactory'
|
apply plugin: 'com.jfrog.artifactory'
|
||||||
|
apply plugin: 'java'
|
||||||
|
|
||||||
artifactory {
|
artifactory {
|
||||||
contextUrl = "http://oss.jfrog.org"
|
contextUrl = "http://oss.jfrog.org"
|
||||||
@ -39,6 +40,24 @@ model {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
tasks.withType(JavaCompile) {
|
||||||
|
sourceCompatibility = "1.6"
|
||||||
|
targetCompatibility = "1.6"
|
||||||
|
|
||||||
|
options.encoding = "UTF-8"
|
||||||
|
}
|
||||||
|
|
||||||
|
sourceSets {
|
||||||
|
main {
|
||||||
|
java {
|
||||||
|
srcDir 'classpath'
|
||||||
|
}
|
||||||
|
resources {
|
||||||
|
srcDir 'classpath'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
publishing {
|
publishing {
|
||||||
repositories {
|
repositories {
|
||||||
ivy {
|
ivy {
|
||||||
|
3
makefile
3
makefile
@ -1,7 +1,7 @@
|
|||||||
MAKEFLAGS = -s
|
MAKEFLAGS = -s
|
||||||
|
|
||||||
name = avian
|
name = avian
|
||||||
version = 1.0.2
|
version := $(shell grep version gradle.properties | cut -d'=' -f2)
|
||||||
|
|
||||||
build-arch := $(shell uname -m \
|
build-arch := $(shell uname -m \
|
||||||
| sed 's/^i.86$$/i386/' \
|
| sed 's/^i.86$$/i386/' \
|
||||||
@ -1587,6 +1587,7 @@ $(classpath-build)/%.class: $(classpath-src)/%.java
|
|||||||
|
|
||||||
$(classpath-dep): $(classpath-sources) $(classpath-jar-dep)
|
$(classpath-dep): $(classpath-sources) $(classpath-jar-dep)
|
||||||
@echo "compiling classpath classes"
|
@echo "compiling classpath classes"
|
||||||
|
@echo $(boot-classpath)
|
||||||
@mkdir -p $(classpath-build)
|
@mkdir -p $(classpath-build)
|
||||||
classes="$(shell $(MAKE) -s --no-print-directory build=$(build) \
|
classes="$(shell $(MAKE) -s --no-print-directory build=$(build) \
|
||||||
$(classpath-classes))"; if [ -n "$${classes}" ]; then \
|
$(classpath-classes))"; if [ -n "$${classes}" ]; then \
|
||||||
|
Loading…
Reference in New Issue
Block a user