From 7fbb924893d85c50691f368d63b4de76e46c7d20 Mon Sep 17 00:00:00 2001 From: Eike Cochu <eike@cochu.com> Date: Thu, 28 Jan 2016 14:24:34 +0100 Subject: [PATCH] added build.sh to build all projects using maven --- build.sh | 40 +++++++++ jgibblda/pom.xml | 6 +- ma-impl.sublime-workspace | 53 +----------- vipra-cmd/.classpath | 10 --- .../org.eclipse.wst.common.component | 1 + vipra-cmd/build.xml | 84 ------------------- vipra-cmd/pom.xml | 5 ++ 7 files changed, 52 insertions(+), 147 deletions(-) create mode 100755 build.sh delete mode 100644 vipra-cmd/build.xml diff --git a/build.sh b/build.sh new file mode 100755 index 00000000..120cd36f --- /dev/null +++ b/build.sh @@ -0,0 +1,40 @@ +#!/bin/sh + +LOG="build.log" +rm -f $LOG + +JAVA=$(which java) +if [ $? -ne 0 ]; then + echo "java not found" + exit 1 +fi + +MVN=$(which mvn) +if [ $? -ne 0 ]; then + echo "maven not found" + exit 1 +fi +echo using $MVN | tee $LOG + +echo "" >> $LOG +echo "-------------------------------" >> $LOG +echo "compiling vipra-util" | tee -a $LOG +echo "-------------------------------" >> $LOG +$MVN -f ./vipra-util/pom.xml clean compile install >> $LOG 2>&1 +if [ $? -ne 0 ]; then + echo "error" + exit 1 +fi + +echo "" >> $LOG +echo "-------------------------------" >> $LOG +echo "compiling jgibblda" | tee -a $LOG +echo "-------------------------------" >> $LOG +$MVN -f ./jgibblda/pom.xml clean compile install >> $LOG 2>&1 +if [ $? -ne 0 ]; then + echo "error" + exit 1 +fi + +echo "complete" +exit $? diff --git a/jgibblda/pom.xml b/jgibblda/pom.xml index ba0e1587..6abee2d3 100644 --- a/jgibblda/pom.xml +++ b/jgibblda/pom.xml @@ -1,8 +1,8 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>JGibbLDA</groupId> - <artifactId>JGibbLDA</artifactId> + <groupId>jgibblda</groupId> + <artifactId>jgibblda</artifactId> <version>0.0.1-SNAPSHOT</version> <properties> @@ -16,7 +16,7 @@ <dependency> <groupId>args4j</groupId> <artifactId>args4j</artifactId> - <version>2.0.6</version> + <version>2.32</version> </dependency> <!-- Logging --> diff --git a/ma-impl.sublime-workspace b/ma-impl.sublime-workspace index 29c324ca..e9091f7b 100644 --- a/ma-impl.sublime-workspace +++ b/ma-impl.sublime-workspace @@ -279,14 +279,6 @@ }, "buffers": [ - { - "file": "Vagrantfile", - "settings": - { - "buffer_size": 572, - "line_ending": "Unix" - } - } ], "build_system": "", "build_system_choices": @@ -466,20 +458,13 @@ "expanded_folders": [ "/home/eike/repos/master/ma-impl", + "/home/eike/repos/master/ma-impl/vipra-ui", "/home/eike/repos/master/ma-impl/vipra-ui/app", - "/home/eike/repos/master/ma-impl/vipra-ui/app/components", - "/home/eike/repos/master/ma-impl/vipra-ui/app/routes", - "/home/eike/repos/master/ma-impl/vipra-ui/app/routes/articles", - "/home/eike/repos/master/ma-impl/vipra-ui/app/routes/topics", - "/home/eike/repos/master/ma-impl/vipra-ui/app/routes/words", - "/home/eike/repos/master/ma-impl/vipra-ui/app/templates", - "/home/eike/repos/master/ma-impl/vipra-ui/app/templates/articles", - "/home/eike/repos/master/ma-impl/vipra-ui/app/templates/components", - "/home/eike/repos/master/ma-impl/vipra-ui/app/templates/topics", - "/home/eike/repos/master/ma-impl/vipra-ui/app/templates/words" + "/home/eike/repos/master/ma-impl/vipra-ui/app/adapters" ], "file_history": [ + "/home/eike/repos/master/ma-impl/Vagrantfile", "/home/eike/repos/master/ma-impl/vipra-ui/app/routes/topics/index.js", "/home/eike/repos/master/ma-impl/vipra-ui/app/routes/words/index.js", "/home/eike/repos/master/ma-impl/vipra-ui/app/routes/articles/index.js", @@ -537,7 +522,6 @@ "/home/eike/repos/master/ma-impl/vm/data/test-2.json", "/home/eike/.local/share/vipra/jgibb/jgibb", "/home/eike/repos/master/ma-doc/thesis/thesis.tex", - "/home/eike/repos/master/ma-impl/Vagrantfile", "/home/eike/repos/master/ma-impl/vm/bootstrap.sh", "/home/eike/repos/master/ma-impl/vm/webapps/ROOT/index.html", "/home/eike/repos/master/ma-impl/vipra-ui/app/routes/topics/show/edit.js", @@ -931,39 +915,8 @@ "groups": [ { - "selected": 0, "sheets": [ - { - "buffer": 0, - "file": "Vagrantfile", - "semi_transient": true, - "settings": - { - "buffer_size": 572, - "regions": - { - }, - "selection": - [ - [ - 437, - 437 - ] - ], - "settings": - { - "syntax": "Packages/Text/Plain text.tmLanguage", - "tab_size": 2, - "translate_tabs_to_spaces": true - }, - "translation.x": 0.0, - "translation.y": 0.0, - "zoom_level": 1.0 - }, - "stack_index": 0, - "type": "text" - } ] } ], diff --git a/vipra-cmd/.classpath b/vipra-cmd/.classpath index b0ed5811..4b6b2766 100644 --- a/vipra-cmd/.classpath +++ b/vipra-cmd/.classpath @@ -17,16 +17,6 @@ <attribute name="org.eclipse.jst.component.nondependency" value=""/> </attributes> </classpathentry> - <classpathentry combineaccessrules="false" kind="src" path="/vipra-util"> - <attributes> - <attribute name="org.eclipse.jst.component.nondependency" value=""/> - </attributes> - </classpathentry> - <classpathentry combineaccessrules="false" kind="src" path="/JGibbLDA"> - <attributes> - <attribute name="org.eclipse.jst.component.nondependency" value=""/> - </attributes> - </classpathentry> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"> <attributes> <attribute name="maven.pomderived" value="true"/> diff --git a/vipra-cmd/.settings/org.eclipse.wst.common.component b/vipra-cmd/.settings/org.eclipse.wst.common.component index ec7635d9..01821d03 100644 --- a/vipra-cmd/.settings/org.eclipse.wst.common.component +++ b/vipra-cmd/.settings/org.eclipse.wst.common.component @@ -2,5 +2,6 @@ <wb-module deploy-name="vipra-cmd"> <wb-resource deploy-path="/" source-path="/src/main/java"/> <wb-resource deploy-path="/" source-path="/src/main/resources"/> + <wb-resource deploy-path="/" source-path="/src/test/java"/> </wb-module> </project-modules> diff --git a/vipra-cmd/build.xml b/vipra-cmd/build.xml deleted file mode 100644 index 8ff573bc..00000000 --- a/vipra-cmd/build.xml +++ /dev/null @@ -1,84 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<project default="create_run_jar" name="Create Runnable Jar for Project vipra-cmd"> - <!--this file was created by Eclipse Runnable JAR Export Wizard--> - <!--ANT 1.7 is required --> - <!--define folder properties--> - <property name="dir.buildfile" value="." /> - <property name="dir.jarfile" value="${dir.buildfile}/bin" /> - <target name="create_run_jar"> - <jar destfile="${dir.jarfile}/vipra-cmd.jar" filesetmanifest="mergewithoutmain" duplicate="preserve"> - <manifest> - <attribute name="Main-Class" value="de.vipra.cmd.Main" /> - <attribute name="Class-Path" value="." /> - </manifest> - <fileset dir="${dir.buildfile}/target/classes" /> - <fileset dir="/home/eike/repos/master/ma-impl/vipra-util/target/classes" /> - <fileset dir="/home/eike/repos/master/ma-impl/jgibblda/target/classes" /> - <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/commons-io/commons-io/2.4/commons-io-2.4.jar" /> - <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/org/slf4j/slf4j-api/1.7.14/slf4j-api-1.7.14.jar" /> - <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/org/mongodb/mongodb-driver/3.2.0/mongodb-driver-3.2.0.jar" /> - <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/org/mongodb/bson/3.2.0/bson-3.2.0.jar" /> - <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/org/mongodb/mongodb-driver-core/3.2.0/mongodb-driver-core-3.2.0.jar" /> - <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/org/mongodb/morphia/morphia/1.0.1/morphia-1.0.1.jar" /> - <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/org/mongodb/mongo-java-driver/3.0.2/mongo-java-driver-3.0.2.jar" /> - <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/com/thoughtworks/proxytoys/proxytoys/1.0/proxytoys-1.0.jar" /> - <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/cglib/cglib-nodep/2.2.2/cglib-nodep-2.2.2.jar" /> - <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/org/mongodb/morphia/morphia-logging-slf4j/1.0.1/morphia-logging-slf4j-1.0.1.jar" /> - <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/com/fasterxml/jackson/core/jackson-databind/2.7.0/jackson-databind-2.7.0.jar" /> - <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/com/fasterxml/jackson/core/jackson-core/2.7.0/jackson-core-2.7.0.jar" /> - <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/com/fasterxml/jackson/core/jackson-annotations/2.7.0/jackson-annotations-2.7.0.jar" /> - <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/args4j/args4j/2.0.6/args4j-2.0.6.jar" /> - <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/org/apache/logging/log4j/log4j-api/2.4.1/log4j-api-2.4.1.jar" /> - <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/org/apache/logging/log4j/log4j-core/2.4.1/log4j-core-2.4.1.jar" /> - <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/org/apache/logging/log4j/log4j-slf4j-impl/2.4.1/log4j-slf4j-impl-2.4.1.jar" /> - <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/org/slf4j/slf4j-api/1.7.12/slf4j-api-1.7.12.jar" /> - <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/commons-cli/commons-cli/1.3.1/commons-cli-1.3.1.jar" /> - <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/com/googlecode/json-simple/json-simple/1.1.1/json-simple-1.1.1.jar" /> - <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/junit/junit/4.10/junit-4.10.jar" /> - <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar" /> - <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/org/elasticsearch/elasticsearch/2.1.0/elasticsearch-2.1.0.jar" /> - <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/org/apache/lucene/lucene-core/5.3.1/lucene-core-5.3.1.jar" /> - <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/org/apache/lucene/lucene-backward-codecs/5.3.1/lucene-backward-codecs-5.3.1.jar" /> - <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/org/apache/lucene/lucene-analyzers-common/5.3.1/lucene-analyzers-common-5.3.1.jar" /> - <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/org/apache/lucene/lucene-queries/5.3.1/lucene-queries-5.3.1.jar" /> - <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/org/apache/lucene/lucene-memory/5.3.1/lucene-memory-5.3.1.jar" /> - <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/org/apache/lucene/lucene-highlighter/5.3.1/lucene-highlighter-5.3.1.jar" /> - <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/org/apache/lucene/lucene-queryparser/5.3.1/lucene-queryparser-5.3.1.jar" /> - <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/org/apache/lucene/lucene-sandbox/5.3.1/lucene-sandbox-5.3.1.jar" /> - <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/org/apache/lucene/lucene-suggest/5.3.1/lucene-suggest-5.3.1.jar" /> - <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/org/apache/lucene/lucene-misc/5.3.1/lucene-misc-5.3.1.jar" /> - <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/org/apache/lucene/lucene-join/5.3.1/lucene-join-5.3.1.jar" /> - <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/org/apache/lucene/lucene-grouping/5.3.1/lucene-grouping-5.3.1.jar" /> - <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/org/apache/lucene/lucene-spatial/5.3.1/lucene-spatial-5.3.1.jar" /> - <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/org/apache/lucene/lucene-spatial3d/5.3.1/lucene-spatial3d-5.3.1.jar" /> - <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/com/spatial4j/spatial4j/0.4.1/spatial4j-0.4.1.jar" /> - <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/com/google/guava/guava/18.0/guava-18.0.jar" /> - <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/com/carrotsearch/hppc/0.7.1/hppc-0.7.1.jar" /> - <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/joda-time/joda-time/2.8.2/joda-time-2.8.2.jar" /> - <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/org/joda/joda-convert/1.2/joda-convert-1.2.jar" /> - <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/com/fasterxml/jackson/core/jackson-core/2.6.2/jackson-core-2.6.2.jar" /> - <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/com/fasterxml/jackson/dataformat/jackson-dataformat-smile/2.6.2/jackson-dataformat-smile-2.6.2.jar" /> - <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/com/fasterxml/jackson/dataformat/jackson-dataformat-yaml/2.6.2/jackson-dataformat-yaml-2.6.2.jar" /> - <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/org/yaml/snakeyaml/1.15/snakeyaml-1.15.jar" /> - <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/com/fasterxml/jackson/dataformat/jackson-dataformat-cbor/2.6.2/jackson-dataformat-cbor-2.6.2.jar" /> - <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/io/netty/netty/3.10.5.Final/netty-3.10.5.Final.jar" /> - <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/com/ning/compress-lzf/1.0.2/compress-lzf-1.0.2.jar" /> - <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/com/tdunning/t-digest/3.0/t-digest-3.0.jar" /> - <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/org/hdrhistogram/HdrHistogram/2.1.6/HdrHistogram-2.1.6.jar" /> - <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/com/twitter/jsr166e/1.1.0/jsr166e-1.1.0.jar" /> - <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/edu/stanford/nlp/stanford-corenlp/3.5.2/stanford-corenlp-3.5.2.jar" /> - <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/com/io7m/xom/xom/1.2.10/xom-1.2.10.jar" /> - <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/xml-apis/xml-apis/1.3.03/xml-apis-1.3.03.jar" /> - <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/xerces/xercesImpl/2.8.0/xercesImpl-2.8.0.jar" /> - <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/xalan/xalan/2.7.0/xalan-2.7.0.jar" /> - <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/de/jollyday/jollyday/0.4.7/jollyday-0.4.7.jar" /> - <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/javax/xml/bind/jaxb-api/2.2.7/jaxb-api-2.2.7.jar" /> - <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/com/googlecode/efficient-java-matrix-library/ejml/0.23/ejml-0.23.jar" /> - <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/javax/json/javax.json-api/1.0/javax.json-api-1.0.jar" /> - <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/edu/stanford/nlp/stanford-corenlp/3.5.2/stanford-corenlp-3.5.2-models.jar" /> - <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/org/apache/logging/log4j/log4j-api/2.5/log4j-api-2.5.jar" /> - <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/org/apache/logging/log4j/log4j-core/2.5/log4j-core-2.5.jar" /> - <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/org/apache/logging/log4j/log4j-slf4j-impl/2.5/log4j-slf4j-impl-2.5.jar" /> - </jar> - </target> -</project> diff --git a/vipra-cmd/pom.xml b/vipra-cmd/pom.xml index bcba557b..21fa1c43 100644 --- a/vipra-cmd/pom.xml +++ b/vipra-cmd/pom.xml @@ -86,5 +86,10 @@ <artifactId>util</artifactId> <version>0.0.1-SNAPSHOT</version> </dependency> + <dependency> + <groupId>jgibblda</groupId> + <artifactId>jgibblda</artifactId> + <version>0.0.1-SNAPSHOT</version> + </dependency> </dependencies> </project> -- GitLab