Have Makefile pull version from gradle.properties

This commit is contained in:
Seth Goings 2014-07-23 16:36:19 -06:00
parent 36c3e26d2c
commit 644cf9167a
2 changed files with 21 additions and 1 deletions

View File

@ -11,6 +11,7 @@ buildscript {
apply plugin: 'native-component'
apply plugin: 'ivy-publish'
apply plugin: 'com.jfrog.artifactory'
apply plugin: 'java'
artifactory {
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 {
repositories {
ivy {

View File

@ -1,7 +1,7 @@
MAKEFLAGS = -s
name = avian
version = 1.0.2
version := $(shell grep version gradle.properties | cut -d'=' -f2)
build-arch := $(shell uname -m \
| sed 's/^i.86$$/i386/' \
@ -1587,6 +1587,7 @@ $(classpath-build)/%.class: $(classpath-src)/%.java
$(classpath-dep): $(classpath-sources) $(classpath-jar-dep)
@echo "compiling classpath classes"
@echo $(boot-classpath)
@mkdir -p $(classpath-build)
classes="$(shell $(MAKE) -s --no-print-directory build=$(build) \
$(classpath-classes))"; if [ -n "$${classes}" ]; then \