Skip to content

Commit

Permalink
Added wrapper. Some cleaning up. Fixed one bug with bundlor.
Browse files Browse the repository at this point in the history
  • Loading branch information
hd committed Jan 18, 2010
1 parent 6afb015 commit 4f679a1
Show file tree
Hide file tree
Showing 9 changed files with 296 additions and 95 deletions.
5 changes: 5 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -87,3 +87,8 @@ apply {
apply url: 'gradle/findbugs.gradle'
}

task wrapper(type: Wrapper) {
gradleVersion = '0.9-20100118091626+0100'
jarPath = 'gradle/wrapper'
}

2 changes: 1 addition & 1 deletion gradle/assemble.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ task initBundlor {
tasks.withType(Jar).allObjects {task ->
if (task.osgify) {
task.dependsOn initBundlor
task.doFirst {
task.doLast {
def bundlorPath = fileTree("${initBundlor.bundlorDir}/bundlor-${initBundlor.bundlorVersion}/dist") +
fileTree("${initBundlor.bundlorDir}/bundlor-${initBundlor.bundlorVersion}/lib")
Properties antBuildProps = new Properties()
Expand Down
62 changes: 1 addition & 61 deletions gradle/docs.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,3 @@
import org.codehaus.groovy.tools.javac.JavaStubCompilationUnit
import org.codehaus.groovy.control.CompilerConfiguration
import org.codehaus.groovy.control.Phases
import org.gradle.api.file.FileCollection.AntType

//task stubs(type: StubGenerator) {
// source = sourceSets.main.allSource
// classpath = sourceSets.main.compileClasspath
// destinationDir = "$buildDir/docs/stubs" as File
//}

task stubs {
destinationDir = "$buildDir/docs/stubs"
doFirst {
Expand Down Expand Up @@ -42,7 +31,7 @@ javadoc {
windowTitle = "Grails $version"
docTitle = "<h1>Grails</h1>"
encoding = "UTF-8"
ush
memberLevel = org.gradle.external.javadoc.JavadocMemberLevel.PACKAGE
author = true
version = true
use = true
Expand All @@ -51,10 +40,6 @@ javadoc {
// tags("todo:a:To do") todo fix the javadoc task to accept this option
}
verbose = false
// doFirst {
// source.files.each { println it }
// throw new StopExecutionException()
// }
}

task gdoc {
Expand All @@ -71,48 +56,3 @@ task gdoc {
}
}
}

//class StubGenerator extends DefaultTask {
// @org.gradle.api.tasks.OutputDirectory
// File destinationDir
//
// @org.gradle.api.tasks.InputFiles
// FileTree source
//
// @org.gradle.api.tasks.InputFiles
// FileCollection classpath
//
// CompilerConfiguration configuration = new CompilerConfiguration()
//
// @org.gradle.api.tasks.TaskAction
// void generate() {
// GroovyClassLoader gcl = createClassLoader();
//
// JavaStubCompilationUnit compilation = new JavaStubCompilationUnit(configuration, gcl, destinationDir);
// int count = 0;
//
// source.matching { include "**/*.groovy", "**/*.java" }.each {File file ->
// compilation.addSourceFile(file)
// if (file.getName().endsWith(".groovy")) {
// count++
// }
// }
//
// if (count > 0) {
// logger.info("Generating " + count + " Java stub" + (count > 1 ? "s" : "") + " to " + destinationDir);
// compilation.compile(Phases.CONVERSION);
// }
// else {
// logger.info("No sources found for stub generation");
// }
// }
//
// public GroovyClassLoader createClassLoader() {
// ClassLoader parent = ClassLoader.getSystemClassLoader();
// GroovyClassLoader gcl = new GroovyClassLoader(parent, configuration);
// classpath.each {File file ->
// gcl.addURL(file.toURI().toURL())
// }
// return gcl;
// }
//}
36 changes: 3 additions & 33 deletions gradle/unit-test.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// todo Unify test tasks into one multithreaded execution unit with a custom fork frequency
// todo Add test progress listener with dot notation.

repositories {
mavenCentral()
}
Expand Down Expand Up @@ -90,36 +93,3 @@ def createTestTask(def name, def includes, def excludes) {
task.dependsOn instrumentForCoverage
}


//gradle.addListener(new ProgressTestListener(logger: logger))
//
//class ProgressTestListener implements TestListener {
// Logger logger
//
// void suiteStarting(TestListener.Suite suite) {}
//
// /**
// * Called after a test suite is finished.
// * @param suite The suite whose tests have finished being executed.
// */
// void suiteFinished(TestListener.Suite suite) {
// }
//
// /**
// * Called before a test is started.
// * @param test The test which is about to be executed.
// */
// void testStarting(TestListener.Test test) { }
//
// /**
// * Called after a test is finished.
// * @param test The test which has finished executing.
// */
// void testFinished(TestListener.Test test, TestListener.Result result) {
//// logger.lifecycle("JJJJ")
// if (result.resultType == TestListener.ResultType.SUCCESS) {
// logger.progress(".")
// }
// }
//}
//
Binary file added gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
9 changes: 9 additions & 0 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#Mon Jan 18 09:35:53 CET 2010
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
distributionVersion=0.9-20100118091626+0100
zipStorePath=wrapper/dists
urlRoot=http\://snapshots.dist.codehaus.org/gradle
distributionName=gradle
distributionClassifier=bin
9 changes: 9 additions & 0 deletions gradle/wrapper/gradle-wrapper.properties~
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#Mon Jan 18 09:35:53 CET 2010
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
distributionVersion=0.9-20100118091626+0100
zipStorePath=wrapper/dists
urlRoot=http\://dist.codehaus.org/gradle
distributionName=gradle
distributionClassifier=bin
142 changes: 142 additions & 0 deletions gradlew
Original file line number Diff line number Diff line change
@@ -0,0 +1,142 @@
#!/bin/bash

##############################################################################
## ##
## Gradle wrapper script for UN*X ##
## ##
##############################################################################

# Uncomment those lines to set JVM options. GRADLE_OPTS and JAVA_OPTS can be used together.
# GRADLE_OPTS="$GRADLE_OPTS -Xmx512"
# JAVA_OPTS="$JAVA_OPTS -Xmx512"

GRADLE_APP_NAME=Gradle

warn ( ) {
echo "${PROGNAME}: $*"
}

die ( ) {
warn "$*"
exit 1
}


# OS specific support (must be 'true' or 'false').
cygwin=false
msys=false
darwin=false
case "`uname`" in
CYGWIN* )
cygwin=true
;;
Darwin* )
darwin=true
;;
MINGW* )
msys=true
;;
esac

# Attempt to set JAVA_HOME if it's not already set.
if [ -z "$JAVA_HOME" ] ; then
if $darwin ; then
[ -z "$JAVA_HOME" -a -d "/Library/Java/Home" ] && export JAVA_HOME="/Library/Java/Home"
[ -z "$JAVA_HOME" -a -d "/System/Library/Frameworks/JavaVM.framework/Home" ] && export JAVA_HOME="/System/Library/Frameworks/JavaVM.framework/Home"
else
javaExecutable="`which javac`"
[ -z "$javaExecutable" -o "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ] && die "JAVA_HOME not set and cannot find javac to deduce location, please set JAVA_HOME."
# readlink(1) is not available as standard on Solaris 10.
readLink=`which readlink`
[ `expr "$readLink" : '\([^ ]*\)'` = "no" ] && die "JAVA_HOME not set and readlink not available, please set JAVA_HOME."
javaExecutable="`readlink -f \"$javaExecutable\"`"
javaHome="`dirname \"$javaExecutable\"`"
javaHome=`expr "$javaHome" : '\(.*\)/bin'`
export JAVA_HOME="$javaHome"
fi
fi

# For Cygwin, ensure paths are in UNIX format before anything is touched.
if $cygwin ; then
[ -n "$JAVACMD" ] && JAVACMD=`cygpath --unix "$JAVACMD"`
[ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
fi

STARTER_MAIN_CLASS=org.gradle.wrapper.GradleWrapperMain
CLASSPATH=`dirname "$0"`/gradle/wrapper/gradle-wrapper.jar
WRAPPER_PROPERTIES=`dirname "$0"`/gradle/wrapper/gradle-wrapper.properties
# Determine the Java command to use to start the JVM.
if [ -z "$JAVACMD" ] ; then
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables
JAVACMD="$JAVA_HOME/jre/sh/java"
else
JAVACMD="$JAVA_HOME/bin/java"
fi
else
JAVACMD="java"
fi
fi
if [ ! -x "$JAVACMD" ] ; then
die "JAVA_HOME is not defined correctly, can not execute: $JAVACMD"
fi
if [ -z "$JAVA_HOME" ] ; then
warn "JAVA_HOME environment variable is not set"
fi

# For Darwin, add GRADLE_APP_NAME to the JAVA_OPTS as -Xdock:name
if $darwin; then
JAVA_OPTS="$JAVA_OPTS -Xdock:name=$GRADLE_APP_NAME"
# we may also want to set -Xdock:image
fi

# For Cygwin, switch paths to Windows format before running java
if $cygwin ; then
JAVA_HOME=`cygpath --path --mixed "$JAVA_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`

# We build the pattern for arguments to be converted via cygpath
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
SEP=""
for dir in $ROOTDIRSRAW ; do
ROOTDIRS="$ROOTDIRS$SEP$dir"
SEP="|"
done
OURCYGPATTERN="(^($ROOTDIRS))"
# Add a user-defined pattern to the cygpath arguments
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
fi
# Now convert the arguments - kludge to limit ourselves to /bin/sh
i=0
for arg in "$@" ; do
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option

if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
else
eval `echo args$i`="\"$arg\""
fi
i=$((i+1))
done
case $i in
(0) set -- ;;
(1) set -- "$args0" ;;
(2) set -- "$args0" "$args1" ;;
(3) set -- "$args0" "$args1" "$args2" ;;
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
esac
fi

"$JAVACMD" $JAVA_OPTS $GRADLE_OPTS \
-classpath "$CLASSPATH" \
-Dorg.gradle.wrapper.properties="$WRAPPER_PROPERTIES" \
$STARTER_MAIN_CLASS \
"$@"
Loading

0 comments on commit 4f679a1

Please sign in to comment.