commit 478f35413065bf1f6b32a2bafcbe654099c1e6d1 Author: iwakeh iwakeh@torproject.org Date: Mon Dec 4 11:14:21 2017 +0000

Create ant task for running connbidirect module.

Move the sources and test sources. Delete old script and build.xml. Create task connbidirect. --- build.xml | 7 ++++++- modules/connbidirect/.gitignore | 3 --- modules/connbidirect/build.xml | 13 ------------- shared/bin/10-run-connbidirect-stats.sh | 5 ----- .../main/java/org/torproject/metrics/connbidirect/Main.java | 0 .../java/org/torproject/metrics/connbidirect/MainTest.java | 0 6 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/build.xml b/build.xml index 7f2abe9..0ed97ba 100644 --- a/build.xml +++ b/build.xml @@ -86,6 +86,11 @@ <antcall target="run-java" /> </target>

+ <target name="connbidirect" > + <property name="module.name" value="connbidirect" /> + <antcall target="run-java" /> + </target> + <target name="run-rserver"> <exec executable="R" dir="${Rsources}/rserver" @@ -103,7 +108,7 @@ <target name="run-java"> <echo message="Running java module ${module.name} ... " /> <available file="${dist}/${jarfile}" property="have.jar"/> - <fail unless="have.jar" message="Please run 'ant jar'."/> + <fail unless="have.jar" message="Please run 'ant jar' first."/> <condition property="mainclass" value="${module.main}" else="org.torproject.metrics.${module.name}.Main" > diff --git a/modules/connbidirect/.gitignore b/modules/connbidirect/.gitignore deleted file mode 100644 index b359b59..0000000 --- a/modules/connbidirect/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -classes/ -stats/ - diff --git a/modules/connbidirect/build.xml b/modules/connbidirect/build.xml deleted file mode 100644 index 4c9c1f4..0000000 --- a/modules/connbidirect/build.xml +++ /dev/null @@ -1,13 +0,0 @@ -<project default="run" name="connbidirect" basedir="."> - - <property name="mainclass" value="org.torproject.metrics.connbidirect.Main"/> - - <include file="../../shared/build-base.xml" as="basetask"/> - <target name="clean" depends="basetask.clean"/> - <target name="compile" depends="basetask.compile"/> - <target name="testcompile" depends="basetask.testcompile"/> - <target name="test" depends="basetask.test"/> - <target name="run" depends="basetask.run"/> - -</project> - diff --git a/shared/bin/10-run-connbidirect-stats.sh b/shared/bin/10-run-connbidirect-stats.sh deleted file mode 100755 index d59c315..0000000 --- a/shared/bin/10-run-connbidirect-stats.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -cd modules/connbidirect/ -ant | grep "[java]" -cd ../../ - diff --git a/modules/connbidirect/src/main/java/org/torproject/metrics/connbidirect/Main.java b/src/main/java/org/torproject/metrics/connbidirect/Main.java similarity index 100% rename from modules/connbidirect/src/main/java/org/torproject/metrics/connbidirect/Main.java rename to src/main/java/org/torproject/metrics/connbidirect/Main.java diff --git a/modules/connbidirect/src/test/java/org/torproject/metrics/connbidirect/MainTest.java b/src/test/java/org/torproject/metrics/connbidirect/MainTest.java similarity index 100% rename from modules/connbidirect/src/test/java/org/torproject/metrics/connbidirect/MainTest.java rename to src/test/java/org/torproject/metrics/connbidirect/MainTest.java