[Dive4elements-commits] [PATCH] Fix location of features.xml

[Wald Commits]

# HG changeset patch
# User Andre Heinecke <aheinecke at intevation.de>
# Date 1370251818 -7200
# Node ID bfec805633252706a7fd4053992df93a75a333d4
# Parent  233113b02cab5568d192095ef6b893814b3cf354
Fix location of features.xml

    Woops

diff -r 233113b02cab -r bfec80563325 contrib/make_flys_release/make_release.sh
--- a/contrib/make_flys_release/make_release.sh	Mon Jun 03 11:25:56 2013 +0200
+++ b/contrib/make_flys_release/make_release.sh	Mon Jun 03 11:30:18 2013 +0200
@@ -199,6 +199,10 @@
 sed -i -e "s@/tmp/flys-client.log@${LOG_DIR}/client-${VERSION}.log at g" \
     $FLYS_SOURCE_DIR/river/gwt-client/src/main/webapp/WEB-INF/log4j.properties
 
+if [ -r "$FEATURES_XML" ]; then
+    cp "$FEATURES_XML" $FLYS_SOURCE_DIR/river/gwt-client/src/main/webapp/WEB-INF/features.xml
+fi
+
 # XXX: Are they really used at runtime?
 find $FLYS_SOURCE_DIR/river/ -name \*.properties -o -name \*.xsl |  \
     xargs sed -i "s at https://flys-intern.intevation.de@${WIKI_URL}@g";
@@ -344,10 +348,6 @@
 $SCRIPT_DIR/h2/createArtifacts.sh $WORK_DIR/artifactsdb/artifacts-h2.sql
 $SCRIPT_DIR/h2/createDatacage.sh $WORK_DIR/datacagedb/datacage.sql
 
-if [ -r "$FEATURES_XML" ]; then
-    cp "$FEATURES_XML" $WORK_DIR/server/conf/features.xml
-fi
-
 mv $WORK_DIR/artifactsdb $WORK_DIR/server/
 mv $WORK_DIR/datacagedb $WORK_DIR/server/