[PATCH] Add extra config files for modules and zoom scales and give option to use custom files for release
Wald Commits
scm-commit at wald.intevation.org
Thu Mar 6 18:45:45 CET 2014
# HG changeset patch
# User Tom Gottfried <tom at intevation.de>
# Date 1394127940 -3600
# Node ID 5bb3f5d41d489e194f50a017b7d312c366b5bbbf
# Parent 472ff9ea57086088bf648220bdaafbaa961296c6
Add extra config files for modules and zoom scales and give option to use custom files for release.
diff -r 472ff9ea5708 -r 5bb3f5d41d48 artifacts/doc/conf/conf.xml
--- a/artifacts/doc/conf/conf.xml Thu Mar 06 18:19:01 2014 +0100
+++ b/artifacts/doc/conf/conf.xml Thu Mar 06 18:45:40 2014 +0100
@@ -10,6 +10,8 @@
<!ENTITY generators SYSTEM "generators.xml">
<!ENTITY longitudinal-defaults SYSTEM "longitudinal-diagram-defaults.xml">
<!ENTITY sqrelation-defaults SYSTEM "sqrelation-diagram-defaults.xml">
+ <!ENTITY zoom-scales SYSTEM "zoom-scales.xml">
+ <!ENTITY modules SYSTEM "modules.xml">
]>
<artifact-database>
<export-secret>YOUR_SECRET</export-secret>
@@ -279,89 +281,7 @@
<artifact name="staticsqrelation" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="${artifacts.config.dir}/artifacts/sqrelation.xml" />
</artifacts>
- <modules>
- <module name="winfo" selected="true">
- <river name="Donau"/>
- <river name="Elbe"/>
- <river name="Fulda (Sommer)"/>
- <river name="Fulda (Winter)"/>
- <river name="Havel"/>
- <river name="Main"/>
- <river name="Main (Wehrarm Volkach)"/>
- <river name="Mosel"/>
- <river name="Neckar"/>
- <river name="Oder"/>
- <river name="Rhein"/>
- <river name="Saale"/>
- <river name="Saale-Thüringen"/>
- <river name="Saar"/>
- <river name="Saar (Wiltinger Bogen)"/>
- <river name="Werra (Sommer)"/>
- <river name="Werra (Winter)"/>
- <river name="Weser"/>
- </module>
- <module name="minfo">
- <river name="Elbe"/>
- <river name="Oder"/>
- <river name="Rhein"/>
- </module>
- <module name="new_map">
- <river name="Donau"/>
- <river name="Elbe"/>
- <river name="Fulda (Sommer)"/>
- <river name="Fulda (Winter)"/>
- <river name="Havel"/>
- <river name="Main"/>
- <river name="Main (Wehrarm Volkach)"/>
- <river name="Mosel"/>
- <river name="Neckar"/>
- <river name="Oder"/>
- <river name="Rhein"/>
- <river name="Saale"/>
- <river name="Saale-Thüringen"/>
- <river name="Saar"/>
- <river name="Saar (Wiltinger Bogen)"/>
- <river name="Werra (Sommer)"/>
- <river name="Werra (Winter)"/>
- <river name="Weser"/>
- </module>
- <module name="new_chart">
- <river name="Donau"/>
- <river name="Elbe"/>
- <river name="Fulda (Sommer)"/>
- <river name="Fulda (Winter)"/>
- <river name="Havel"/>
- <river name="Main"/>
- <river name="Main (Wehrarm Volkach)"/>
- <river name="Mosel"/>
- <river name="Neckar"/>
- <river name="Oder"/>
- <river name="Rhein"/>
- <river name="Saale"/>
- <river name="Saale-Thüringen"/>
- <river name="Saar"/>
- <river name="Saar (Wiltinger Bogen)"/>
- <river name="Werra (Sommer)"/>
- <river name="Werra (Winter)"/>
- <river name="Weser"/>
- </module>
- <module name="fixanalysis">
- <river name="Donau"/>
- <river name="Elbe"/>
- <river name="Fulda (Sommer)"/>
- <river name="Havel"/>
- <river name="Main"/>
- <river name="Mosel"/>
- <river name="Neckar"/>
- <river name="Oder"/>
- <river name="Rhein"/>
- <river name="Saale"/>
- <river name="Saar"/>
- <river name="Saar (Wiltinger Bogen)"/>
- <river name="Werra (Sommer)"/>
- <river name="Weser"/>
- </module>
- </modules>
+ &modules;
<hooks>
<hook
@@ -406,14 +326,7 @@
</flys>
<options>
- <zoom-scales>
- <zoom-scale river="Elbe" range="50" radius="1" />
- <zoom-scale river="Elbe" range="100" radius="5" />
- <zoom-scale river="Elbe" range="500" radius="10" />
- <zoom-scale river="Rhein" range="50" radius="1" />
- <zoom-scale river="Rhein" range="100" radius="5" />
- <zoom-scale river="Rhein" range="500" radius="10" />
- </zoom-scales>
+ &zoom-scales;
<dgm-path>/path/to/rivers/</dgm-path>
diff -r 472ff9ea5708 -r 5bb3f5d41d48 artifacts/doc/conf/modules.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/artifacts/doc/conf/modules.xml Thu Mar 06 18:45:40 2014 +0100
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<modules>
+ <module name="winfo" selected="true">
+ <river name="Beispielfluss"/>
+ </module>
+ <module name="minfo">
+ <river name="Beispielfluss"/>
+ </module>
+ <module name="new_map">
+ <river name="Beispielfluss"/>
+ </module>
+ <module name="new_chart">
+ <river name="Beispielfluss"/>
+ </module>
+ <module name="fixanalysis">
+ <river name="Beispielfluss"/>
+ </module>
+</modules>
+
diff -r 472ff9ea5708 -r 5bb3f5d41d48 artifacts/doc/conf/zoom-scales.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/artifacts/doc/conf/zoom-scales.xml Thu Mar 06 18:45:40 2014 +0100
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<zoom-scales>
+ <zoom-scale river="Beispielfluss" range="50" radius="1" />
+ <zoom-scale river="Beispielfluss" range="100" radius="5" />
+ <zoom-scale river="Beispielfluss" range="500" radius="10" />
+</zoom-scales>
diff -r 472ff9ea5708 -r 5bb3f5d41d48 contrib/make_flys_release/make_release.sh
--- a/contrib/make_flys_release/make_release.sh Thu Mar 06 18:19:01 2014 +0100
+++ b/contrib/make_flys_release/make_release.sh Thu Mar 06 18:45:40 2014 +0100
@@ -239,6 +239,14 @@
cp "$METADATA_XML" $FLYS_SOURCE_DIR/river/artifacts/doc/conf/meta-data.xml
fi
+if [ -r "$MODULES_XML" ]; then
+ cp "$MODULES_XML" $FLYS_SOURCE_DIR/river/artifacts/doc/conf/modules.xml
+fi
+
+if [ -r "$ZOOMSCALES_XML" ]; then
+ cp "$ZOOMSCALES_XML" $FLYS_SOURCE_DIR/river/artifacts/doc/conf/zoom-scales.xml
+fi
+
if [ ! -f $FLYS_SOURCE_DIR/OpenLayers-2.11.tar.gz ]; then
echo "INFO: download OpenLayers-2.11 for client"
cd $FLYS_SOURCE_DIR
More information about the Dive4elements-commits
mailing list