Some more updates for SBT.
Project: http://git-wip-us.apache.org/repos/asf/incubator-wave/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-wave/commit/09370f4f Tree: http://git-wip-us.apache.org/repos/asf/incubator-wave/tree/09370f4f Diff: http://git-wip-us.apache.org/repos/asf/incubator-wave/diff/09370f4f Branch: refs/heads/feature/WAVE-426-add-sbt Commit: 09370f4f85d706ca5e7acb5aba4ed66c65f83ba9 Parents: c87f76a Author: Yuri Zelikov <[email protected]> Authored: Fri May 22 16:25:19 2015 +0300 Committer: Yuri Zelikov <[email protected]> Committed: Fri May 22 16:25:19 2015 +0300 ---------------------------------------------------------------------- .gitignore | 3 ++- build-classpath.xml | 45 +++++++++++++++++++++++++++++++++++++++++++++ build.sbt | 12 +++++++++++- build.xml | 23 ----------------------- 4 files changed, 58 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/09370f4f/.gitignore ---------------------------------------------------------------------- diff --git a/.gitignore b/.gitignore index 05d35c1..bc2e910 100755 --- a/.gitignore +++ b/.gitignore @@ -34,4 +34,5 @@ war/WEB-INF *.iml *.eml .settings/ - +project/ +target/ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/09370f4f/build-classpath.xml ---------------------------------------------------------------------- diff --git a/build-classpath.xml b/build-classpath.xml new file mode 100644 index 0000000..9a76dd4 --- /dev/null +++ b/build-classpath.xml @@ -0,0 +1,45 @@ +<!-- + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + * Author: [email protected] (Alex North) + --> +<project name="classpath"> + <!-- Classpath of external dependencies --> + <path id="libpath"> + <fileset dir="${lib.runtime}"> + <include name="*.jar"/> + </fileset> + <fileset dir="${lib.codegen}"> + <include name="*.jar"/> + </fileset> + <fileset dir="${lib.test}"> + <include name="*.jar"/> + </fileset> + <!-- PST --> + <fileset dir="${dist.dir}"> + <include name="pst.jar"/> + </fileset> + </path> + + <!-- Classpath for testing only --> + <path id="test.libpath"> + <fileset dir="${lib.test}"> + <include name="*.jar"/> + </fileset> + </path> +</project> http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/09370f4f/build.sbt ---------------------------------------------------------------------- diff --git a/build.sbt b/build.sbt index ec298bc..ab925bb 100644 --- a/build.sbt +++ b/build.sbt @@ -31,7 +31,9 @@ unmanagedSourceDirectories in Compile += baseDirectory.value / "gen" / "messages unmanagedJars in Compile := (baseDirectory.value / "third_party" / "runtime" ** "*.jar").classpath -unmanagedJars in Test := (baseDirectory.value / "third_party" / "test" ** "*.jar").classpath +unmanagedJars in Compile ++= (baseDirectory.value / "third_party" / "test" ** "*.jar").classpath + +//unmanagedJars in Test := (baseDirectory.value / "third_party" / "test" ** "*.jar").classpath libraryDependencies += "com.google.gwt" % "gwt-user" % "2.7.0" @@ -39,6 +41,14 @@ libraryDependencies += "com.google.gwt" % "gwt-dev" % "2.7.0" libraryDependencies += "com.google.gwt" % "gwt-codeserver" % "2.7.0" +libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % "test" + +mainClass in (Compile, run) := Some("org.waveprotocol.box.server.ServerMain") + +mainClass in (Compile, packageBin) := Some("org.waveprotocol.box.server.ServerMain") +javaOptions in run += "-Djava.security.auth.login.config=jaas.config" +javaOptions in run += "-Dorg.eclipse.jetty.LEVEL=DEBUG" +fork in run := true http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/09370f4f/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index 1e721d4..0bcebee 100644 --- a/build.xml +++ b/build.xml @@ -393,29 +393,6 @@ </uptodate> </target> - <target name="compile-gwt-demo" depends="compile, compile-gwt-dev-dep" - description="GWT compile to a 'demo' production JavaScript with remote logging enabled." - unless="skip.compile-gwt-dev"> - <java failonerror="true" fork="true" classname="com.google.gwt.dev.Compiler"> - <classpath> - <pathelement location="${src.dir}"/> - <pathelement location="${gen.dir}/messages"/> - <path refid="libpath"/> - <path refid="test.libpath"/> - </classpath> - <jvmarg value="-Xmx1024M"/> - <!-- Human-readable JS. --> - <arg line="-style PRETTY"/> - <!-- Assertions on. --> - <arg line="-ea"/> - <arg line="${gwt.args}"/> - <arg value="org.waveprotocol.box.webclient.WebClientDemo"/> - </java> - <!-- Only one GWT compile output is valid at any one time. --> - <delete file="${dep}/compile-gwt"/> - <touch file="${dep}/compile-gwt-dev"/> - </target> - <target name="compile-gwt-dev" depends="compile, compile-gwt-dev-dep" description="GWT compile of a restricted set of permutations suitable for development." unless="skip.compile-gwt-dev">
