s434730/RandomSec
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix classpath generation on Linux

Browse Source
This commit is contained in:
Antonin Delpeuch 2018-09-10 09:20:27 +01:00
parent 72639fdd71
commit b0e3de821b
3 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -21,7 +21,6 @@ broker/core/module/MOD-INF/classes/
broker/core/WEB-INF/lib/ broker/core/WEB-INF/lib/
broker/core/data/ broker/core/data/
broker/core/test-output/ broker/core/test-output/
server/classpath.txt
tmp/ tmp/
/test-output /test-output
test-out/ test-out/

26
refine
View File

@ -496,7 +496,7 @@ windows_dist() {
MVN_PARAMS="-Dlaunch4j.dir=${REFINE_TOOLS_DIR}/${LAUNCH4J_DIR}" MVN_PARAMS="-Dlaunch4j.dir=${REFINE_TOOLS_DIR}/${LAUNCH4J_DIR}"
# TODO update this for Maven # TODO update this for Maven
mvn windows $MVN windows
} }
linux_dist() { linux_dist() {
@ -505,7 +505,7 @@ linux_dist() {
get_revision get_revision
# TODO update this for Maven # TODO update this for Maven
mvn linux $MVN linux
} }
mac_dist() { mac_dist() {
@ -580,7 +580,7 @@ mac_dist() {
} }
test() { test() {
mvn test $MVN test
} }
ui_test() { ui_test() {
@ -622,11 +622,11 @@ ui_test() {
} }
server_test() { server_test() {
mvn test -pl main $MVN test -pl main
} }
extensions_test() { extensions_test() {
mvn test -pl extensions $MVN test -pl extensions
} }
run() { run() {
@ -641,13 +641,17 @@ run() {
if [ ! -d $REFINE_CLASSES_DIR ] ; then if [ ! -d $REFINE_CLASSES_DIR ] ; then
IS_JAR=`ls $REFINE_LIB_DIR | grep openrefine` IS_JAR=`ls $REFINE_LIB_DIR | grep openrefine`
if [ -z "$IS_JAR" ] ; then if [ -z "$IS_JAR" ] ; then
mvn process-resources compile dependency:build-classpath mvn_prepare
echo mvn process-resources compile dependency:build-classpath
$MVN process-resources compile dependency:build-classpath
echo "" echo ""
fi fi
fi fi
if [ ! -e "server/classpath.txt" ] ; then if [ ! -e "server/target/classpath.txt" ] ; then
mvn compile dependency:build-classpath mvn_prepare
echo mvn compile dependency:build-classpath
$MVN compile dependency:build-classpath
fi fi
if [ -d $REFINE_CLASSES_DIR ] ; then if [ -d $REFINE_CLASSES_DIR ] ; then
@ -682,7 +686,7 @@ run() {
add_option "-Drefine.autosave=$REFINE_AUTOSAVE_PERIOD" add_option "-Drefine.autosave=$REFINE_AUTOSAVE_PERIOD"
fi fi
LIB_PATHS=`cat server/classpath.txt` LIB_PATHS=`cat server/target/classpath.txt`
CLASSPATH="$REFINE_CLASSES_DIR${SEP}$LIB_PATHS" CLASSPATH="$REFINE_CLASSES_DIR${SEP}$LIB_PATHS"
RUN_CMD="$JAVA -cp $CLASSPATH $OPTS com.google.refine.Refine" RUN_CMD="$JAVA -cp $CLASSPATH $OPTS com.google.refine.Refine"
@ -705,7 +709,7 @@ broker_build() {
build_prepare build_prepare
get_revision get_revision
# TODO migrate to Maven # TODO migrate to Maven
mvn prepare_broker $MVN prepare_broker
} }
broker_run() { broker_run() {
@ -762,7 +766,7 @@ broker_appengine_build() {
fi fi
# TODO migrate this to Maven # TODO migrate this to Maven
mvn prepare_broker_appengine $MVN prepare_broker_appengine
} }
broker_appengine_upload() { broker_appengine_upload() {

2
server/pom.xml
View File

@ -112,7 +112,7 @@
<artifactId>maven-dependency-plugin</artifactId> <artifactId>maven-dependency-plugin</artifactId>
<version>3.1.1</version> <version>3.1.1</version>
<configuration> <configuration>
<outputFile>classpath.txt</outputFile> <outputFile>target/classpath.txt</outputFile>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>