Permalink
Browse files

Redesigned build system

  • Loading branch information...
eugener committed Aug 24, 2014
1 parent 86f36cc commit 91e6de89c6ca9c1200138001b092dc1b2951aa39
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry exported="true" kind="con" path="org.springsource.ide.eclipse.gradle.classpathcontainer"/>
<classpathentry kind="output" path="bin"/>
</classpath>
@@ -0,0 +1,42 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>controlsfx</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.springsource.ide.eclipse.gradle.core.nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
<filteredResources>
<filter>
<id>1408901131627</id>
<name></name>
<type>26</type>
<matcher>
<id>org.eclipse.ui.ide.orFilterMatcher</id>
<arguments>
<matcher>
<id>org.eclipse.ui.ide.multiFilter</id>
<arguments>1.0-projectRelativePath-equals-true-false-controlsfx-samples</arguments>
</matcher>
<matcher>
<id>org.eclipse.ui.ide.multiFilter</id>
<arguments>1.0-projectRelativePath-equals-true-false-controlsfx</arguments>
</matcher>
<matcher>
<id>org.eclipse.ui.ide.multiFilter</id>
<arguments>1.0-projectRelativePath-equals-true-false-fxsampler</arguments>
</matcher>
</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription>
@@ -0,0 +1,67 @@
subprojects {

apply plugin: 'java'
apply plugin: 'eclipse'
apply plugin: 'idea'
apply plugin: 'groovy'
apply plugin: 'osgi'
apply plugin: 'maven'
apply from : '../mavenPublish.gradle'

ext {
artifact_suffix = '-SNAPSHOT'
specification_title = 'Java 8u20'
specification_version = '8.20.7'
fxsampler_name = 'fxsampler'
fxsampler_version = '1.0.8' + artifact_suffix
fxsampler_mainClass = 'fxsampler.FXSampler'
}


group = 'org.controlsfx'
version = specification_version + artifact_suffix

sourceCompatibility = '1.8'
targetCompatibility = '1.8'

repositories {
mavenCentral()
}

dependencies {
testCompile 'junit:junit:[4,)'
}

test {
testLogging {
// Show that tests are run in the command-line output
events 'started', 'passed'
}
}

task wrapper(type: Wrapper) {
gradleVersion = '1.8'
}

compileJava {
options.encoding = "UTF-8"
}

task sourceJar(type: Jar) {
from sourceSets.main.java
from sourceSets.main.resources
classifier = 'sources'
}

task javadocJar(type: Jar) {
dependsOn javadoc
from javadoc.destinationDir
classifier = 'javadoc'
}

artifacts {
archives sourceJar
archives javadocJar
}

}

This file was deleted.

Oops, something went wrong.
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src/deploy/package"/>
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="src" path="src/main/resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry combineaccessrules="false" kind="src" path="/ControlsFX"/>
<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry exported="true" kind="con" path="org.springsource.ide.eclipse.gradle.classpathcontainer"/>
<classpathentry kind="output" path="bin"/>
</classpath>
@@ -14,5 +14,6 @@
<natures>
<nature>org.springsource.ide.eclipse.gradle.core.nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.jdt.groovy.core.groovyNature</nature>
</natures>
</projectDescription>
@@ -1,24 +1,10 @@
import org.apache.tools.ant.filters.*
apply plugin: 'eclipse'
apply plugin: 'idea'
apply plugin: 'java'
apply plugin: 'maven'
apply plugin: 'application'
apply from: '../javafx.plugin'

apply from: 'mavenPublish.gradle'
apply from: 'javafx.plugin'


Properties commons = new Properties()
commons.load(new FileInputStream("$rootDir/../controlsfx-build.properties"))

group = commons.controlsfx_group
version = commons.controlsfx_version

applicationName = 'FXSampler'
mainClassName = commons.fxsampler_mainClass
sourceCompatibility = '1.8'
targetCompatibility = '1.8'
mainClassName = fxsampler_mainClass

configurations {
jdk
@@ -31,8 +17,8 @@ sourceSets {
}

dependencies {
compile group+":fxsampler:"+commons.fxsampler_version
compile group+":controlsfx:"+commons.controlsfx_version
compile group + ':' + fxsampler_name +':' + fxsampler_version
compile group + ':controlsfx:' + version

try {
jdk files(jfxrtJar)
@@ -41,9 +27,6 @@ dependencies {
}
}

compileJava {
options.encoding = "UTF-8"
}

jar {
manifest {
@@ -52,21 +35,6 @@ jar {
from sourceSets.main.allJava
}

task sourceJar(type: Jar) {
from sourceSets.main.java
from sourceSets.main.resources
classifier = 'sources'
}

artifacts {
archives sourceJar
//archives javadocJar
}

task wrapper(type: Wrapper) {
gradleVersion = '1.8'
}

// enumerate the samples at build time
task enumerateSamples() {
doLast {
@@ -106,7 +74,7 @@ javafx {

appID 'HelloControlsFX'
appName 'Hello ControlsFX'
mainClass 'fxsampler.FXSampler'
mainClass fxsampler_mainClass

javaRuntime = '<NO RUNTIME>' // for now don't bundle a VM

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.
@@ -1,13 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src/main/docs"/>
<classpathentry kind="src" path="src/main/groovy"/>
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="src" path="src/main/resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
<accessrules>
<accessrule kind="accessible" pattern="**/*"/>
</accessrules>
</classpathentry>
<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry exported="true" kind="con" path="org.springsource.ide.eclipse.gradle.classpathcontainer"/>
<classpathentry exported="true" kind="con" path="GROOVY_DSL_SUPPORT"/>
<classpathentry kind="output" path="bin"/>
</classpath>
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>ControlsFX</name>
<name>controlsfx</name>
<comment></comment>
<projects>
</projects>
@@ -10,15 +10,10 @@
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.springsource.ide.eclipse.gradle.core.nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
<nature>org.eclipse.jdt.groovy.core.groovyNature</nature>
</natures>
</projectDescription>
Oops, something went wrong.

0 comments on commit 91e6de8

Please sign in to comment.