Permalink
Browse files

the root project is no longer a groovy project, custom assemble task …

…written, still need to reinstate creation of javadoc/groovydoc pages, maven deployment etc.
  • Loading branch information...
1 parent 6cf34e3 commit c2c3421c42c11e73bc373db39126068c6009adca @graemerocher graemerocher committed Feb 23, 2011
Showing with 23 additions and 21 deletions.
  1. +18 −16 build.gradle
  2. +5 −5 gradle/assemble.gradle
View
@@ -7,8 +7,6 @@ buildscript {
}
}
-apply plugin: 'groovy'
-apply plugin: 'eclipse'
grailsVersion = '1.4.0.BUILD-SNAPSHOT'
antVersion = "1.7.1"
@@ -19,9 +17,9 @@ version = grailsVersion
subprojects { project ->
apply plugin: 'groovy'
- apply plugin: 'eclipse'
apply plugin: 'maven'
- apply plugin: 'idea'
+ apply plugin: 'eclipse'
+ apply plugin: 'idea'
sourceCompatibility = "1.5"
targetCompatibility = "1.5"
@@ -37,6 +35,16 @@ subprojects { project ->
"Implementation-Vendor": 'grails.org')
+ configure([compileGroovy, compileTestGroovy]) {
+ groovyOptions.fork(memoryInitialSize: '128M', memoryMaximumSize: '1G')
+ groovyOptions.encoding = "UTF-8"
+ }
+
+ configure([compileJava, compileTestJava]) {
+ options.deprecation = true
+ options.debug = true
+ }
+
repositories {
mavenCentral()
@@ -164,25 +172,19 @@ subprojects { project ->
}
-configure([compileGroovy, compileTestGroovy]) {
- groovyOptions.fork(memoryInitialSize: '128M', memoryMaximumSize: '1G')
- groovyOptions.encoding = "UTF-8"
-}
-
-configure([compileJava, compileTestJava]) {
- options.deprecation = true
- options.debug = true
-}
apply {
- from 'gradle/docs.gradle'
+// from 'gradle/docs.gradle'
from 'gradle/assemble.gradle'
}
-clean {
+task clean << {
// add additional dirs
- delete(docs.destinationDir, libs.destinationDir)
+// delete(docs.destinationDir, libs.destinationDir)
+ delete(libs.destinationDir)
+ delete(buildDir)
}
task install(dependsOn:[populateDependencies])
+task assemble(dependsOn:zipDist)
View
@@ -29,7 +29,7 @@ task populateDependencies {
doFirst dependencyCache
}
-task libs(dependsOn: getTasksByName("jar", true)) {
+task libs(dependsOn: getTasksByName("assemble", true)) {
doFirst dependencyCache
destinationDir = 'dist'
@@ -93,9 +93,9 @@ distSpec = copySpec {
include "gradlew"
fileMode = 0755
}
- from(docs.destinationDir) {
+/* from(docs.destinationDir) {
into "grails-$grailsVersion/doc"
- }
+ }*/
exclude "**/CVS/**"
from(project.files(pluginsFromSvn.dir) { builtBy 'pluginsFromSvn' }) {
into "grails-$grailsVersion/plugins"
@@ -130,7 +130,7 @@ task zipDist(type: Zip,dependsOn:libs) {
doFirst dependencyCache
}
-task zipDoc(type: Zip) {
+/*task zipDoc(type: Zip) {
appendix = 'docs'
from docs.destinationDir
-}
+}*/

0 comments on commit c2c3421

Please sign in to comment.