Mercurial > dive4elements > river
changeset 6164:bfec80563325
Fix location of features.xml
Woops
| author | Andre Heinecke <aheinecke@intevation.de> |
|---|---|
| date | Mon, 03 Jun 2013 11:30:18 +0200 |
| parents | 233113b02cab |
| children | 5e2b162c0047 |
| files | contrib/make_flys_release/make_release.sh |
| diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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@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@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/