Permalink
Browse files

get build working properly

  • Loading branch information...
1 parent 86a1181 commit e4556458b4a970a3980bf020173b3a316bef6677 @purplefox purplefox committed Jul 31, 2012
View
@@ -75,13 +75,6 @@ defaultTasks = ['preflight']
task preflight(dependsOn: subprojects.collectDeps) {
group = null
description = null
- /* this is an issue for IDEs
- assert System.getenv("JRUBY_HOME") != null
- assert System.getenv("JYTHON_HOME") != null
-
- System.setProperty 'jruby.home', System.getenv("JRUBY_HOME")
- System.setProperty 'jython.home', System.getenv("JYTHON_HOME")
- */
}
task test(dependsOn: [subprojects.test]) {
@@ -103,10 +96,6 @@ task assemble(type: Copy, dependsOn: ['preflight', subprojects.assemble]) {
group = 'vert.x'
description 'Build the parent and all of the vert.x subprojects'
- ['temp', 'logs'].each { dir->
- mkdir("$rootDir/build/$rootProject.name-$version/$dir")
- }
-
destinationDir file("build/$rootProject.name-$version")
outputs.dir destinationDir
into('bin') {
@@ -169,7 +158,7 @@ task javadocs(type: Javadoc, dependsOn: subprojects.javadoc) {
source = subprojects.sourceSets.main.java
classpath = files(subprojects.configurations.compile)
- destinationDir file("build/$rootProject.name-$version/docs/java/api")
+ destinationDir file("build/$rootProject.name-$version/api-docs/java/api")
inputs.files classpath
outputs.dir destinationDir
}
@@ -178,14 +167,14 @@ task nonJavadocs(type: Copy) {
group = null // hide the task
description = null // hide the task
- destinationDir file("build/$rootProject.name-$version/docs")
+ destinationDir file("build/$rootProject.name-$version/api-docs")
inputs.files subprojects.docsDir
outputs.dir destinationDir
doFirst {
['groovy/api', 'javascript/api', 'python/api', 'ruby/api'].each { dir->
- mkdir("$rootDir/build/$rootProject.name-$version/docs/$dir")
+ mkdir("$rootDir/build/$rootProject.name-$version/api-docs/$dir")
}
}
View
@@ -18,7 +18,7 @@ gradleVersion=1.0
vertxBuildToolsVersion=0.1-SNAPSHOT
# vert.x version
-version=1.2.2.final
+version=1.2.3.final
title=vert.x
group=org.vert-x
View
@@ -65,7 +65,7 @@ cd "`dirname \"$PRG\"`/.."
APP_HOME="`pwd -P`"
cd "$SAVED"
-CLASSPATH=$APP_HOME/lib/*
+CLASSPATH=$APP_HOME/lib/*:$APP_HOME/conf:$JYTHON_HOME/jython.jar::$JRUBY_HOME/lib/jruby.jar
# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
@@ -164,5 +164,4 @@ function splitJvmOpts() {
}
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $VERTX_OPTS
-
-exec "$JAVACMD" "${JVM_OPTS[@]}" -Dvertx.install=$APP_HOME -Djava.util.logging.config.file=$APP_HOME/conf/logging.properties -Djruby.home=$JRUBY_HOME -Djython.home=$JYTHON_HOME -classpath "$CLASSPATH" org.vertx.java.deploy.impl.cli.Starter "$@"
+exec "$JAVACMD" "${JVM_OPTS[@]}" -Dvertx.install=$APP_HOME -Djava.util.logging.config.file=$APP_HOME/conf/logging.properties -Djruby.home=$JRUBY_HOME -classpath "$CLASSPATH" org.vertx.java.deploy.impl.cli.Starter "$@"
@@ -69,7 +69,7 @@ set CMD_LINE_ARGS=%$
:execute
@rem Setup the command line
-set CLASSPATH=%APP_HOME%\lib\*
+set CLASSPATH=%APP_HOME%\lib\*;%APP_HOME%\conf;%JYTHON_HOME%\jython.jar;%JRUBY_HOME%\lib\jruby.jar
@rem Execute vertx
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %VERTX_OPTS% -Dvertx.install=%APP_HOME% -Djruby.home=%JRUBY_HOME% -Djython.home=%JYTHON_HOME% -classpath "%CLASSPATH%" org.vertx.java.deploy.impl.cli.Starter %CMD_LINE_ARGS%
@@ -71,7 +71,8 @@ $APP_HOME/vertx-lang/vertx-lang-jruby/build/deps/compile/*:$APP_HOME/vertx-lang/
$APP_HOME/vertx-lang/vertx-lang-rhino/build/deps/compile/*:\
$APP_HOME/vertx-lang/vertx-lang-groovy/build/libs/*:$APP_HOME/vertx-lang/vertx-lang-java/build/libs/*:\
$APP_HOME/vertx-lang/vertx-lang-jruby/build/libs/*:$APP_HOME/vertx-lang/vertx-lang-jython/build/libs/*:\
-$APP_HOME/vertx-lang/vertx-lang-rhino/build/libs/*
+$APP_HOME/vertx-lang/vertx-lang-rhino/build/libs/*:\
+$APP_HOME/src/dist/conf
echo $APP_HOME
@@ -172,4 +173,4 @@ function splitJvmOpts() {
}
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $VERTX_OPTS
-exec "$JAVACMD" "${JVM_OPTS[@]}" -Dvertx.install=$APP_HOME -Djava.util.logging.config.file=$APP_HOME/src/dist/conf/logging.properties -Djruby.home=$JRUBY_HOME -Djython.home=$JYTHON_HOME -classpath "$CLASSPATH" org.vertx.java.deploy.impl.cli.Starter "$@"
+exec "$JAVACMD" "${JVM_OPTS[@]}" -Dvertx.install=$APP_HOME -Djava.util.logging.config.file=$APP_HOME/src/dist/conf/logging.properties -Djruby.home=$JRUBY_HOME -classpath "$CLASSPATH" org.vertx.java.deploy.impl.cli.Starter "$@"
@@ -49,10 +49,6 @@ public boolean isFactoryFor(String main) {
}
public Verticle createVerticle(String main, ClassLoader cl) throws Exception {
- if (System.getProperty("jython.home") == null) {
- throw new IllegalStateException("In order to deploy Python applications you must set JYTHON_HOME to point " +
- "at your Jython installation");
- }
Verticle app = new JythonVerticle(main, cl);
return app;
}
@@ -33,7 +33,6 @@ test {
systemProperty 'vertx.test.timeout', 15
systemProperty 'vertx.mods', "$projectDir/src/test/mod-test"
systemProperty 'jruby.home', System.getenv('JRUBY_HOME')
- systemProperty 'jython.home', System.getenv('JYTHON_HOME')
jvmArgs '-server', '-Xms128m', '-Xmx1024m', '-XX:MaxPermSize=128m', '-XX:NewRatio=2'

0 comments on commit e455645

Please sign in to comment.