diff options
| author | gefin <g.fink@gmx.net> | 2019-11-08 08:47:17 +0100 |
|---|---|---|
| committer | jkoan <jkoan@users.noreply.github.com> | 2019-11-08 08:47:17 +0100 |
| commit | f742fffc90e98c25be2cea100ab89f6f157eee9d (patch) | |
| tree | e54e1d6c2364071d23be068aed8e53600436a9f1 | |
| parent | 776fd64b47fbd6d6b945b7d2f9da14b3c03cce00 (diff) | |
| download | navit-f742fffc90e98c25be2cea100ab89f6f157eee9d.tar.gz | |
fix:tomtom:Make sure the tomtom_plugin and tomtom_minimal contain navit.xml (#875)
* Issue/823
Fix navit.xml (tomtom480.xml) and locales path
* Issue/823
Fix missing navit.xml (tomtom480.xml) and locale path
* add xslt support
* Update setup_common_requirements.sh
* Moving change performed in aa10e05a89f9bd26a4c5cf46a264b41fd9ec93b9 inside setup_tomtom_requirements.sh (and adding it to circleci process)
* Only running installation for xsltproc in circleci
* Update build_tomtom_minimal.sh
copy also the layout xml files to target
* copy also the layout xml to target
* Selecting specific xml prefixes during copy
* Fixing tomtom's xslt following split of xml config files at e70a28963ff9754d3257361fad93aebf59edee08
| -rw-r--r-- | .circleci/config.yml | 6 | ||||
| -rw-r--r-- | navit/xslt/tomtom.xslt | 8 | ||||
| -rw-r--r-- | scripts/build_tomtom_minimal.sh | 6 | ||||
| -rw-r--r-- | scripts/build_tomtom_plugin.sh | 5 | ||||
| -rw-r--r-- | scripts/setup_tomtom_requirements.sh | 2 |
5 files changed, 19 insertions, 8 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 986ffa2c2..d936b010b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -187,9 +187,10 @@ jobs: - checkout - run: if scripts/check_need_build.sh; then circleci step halt; fi - run: - name: Setup common requirements + name: Prepare the tomtom build environment command: | bash scripts/setup_common_requirements.sh + apt-get install -y xsltproc - run: name: Build for Tomtom (minimal) command: | @@ -208,9 +209,10 @@ jobs: - checkout - run: if scripts/check_need_build.sh; then circleci step halt; fi - run: - name: Setup common requirements + name: Prepare the tomtom build environment command: | bash scripts/setup_common_requirements.sh + apt-get install -y xsltproc - run: name: Build for Tomtom (plugin) command: | diff --git a/navit/xslt/tomtom.xslt b/navit/xslt/tomtom.xslt index dac69f3d3..0a93aac69 100644 --- a/navit/xslt/tomtom.xslt +++ b/navit/xslt/tomtom.xslt @@ -11,6 +11,7 @@ <xsl:template match="/"> <xsl:apply-templates select="config"/> + <xsl:apply-templates select="layout"/> </xsl:template> <xsl:template match="config"> @@ -52,6 +53,13 @@ </mapset> <xsl:copy-of select="layer"/> <xsl:copy-of select="layout"/> + <xsl:copy-of select="xi:include"/> + </xsl:copy> + </xsl:template> + + <xsl:template match="layout"> + <xsl:copy> + <xsl:copy-of select="@*|node()"/> </xsl:copy> </xsl:template> </xsl:transform> diff --git a/scripts/build_tomtom_minimal.sh b/scripts/build_tomtom_minimal.sh index ba6975e0f..7c8fe091f 100644 --- a/scripts/build_tomtom_minimal.sh +++ b/scripts/build_tomtom_minimal.sh @@ -57,11 +57,11 @@ cp $PREFIX/share/navit/icons/*48.png $OUT_PATH/navit/share/icons cp $PREFIX/share/navit/icons/*64.png $OUT_PATH/navit/share/icons cp $PREFIX/share/navit/icons/nav*.* $OUT_PATH/navit/share/icons cp $PREFIX/share/navit/icons/country*.png $OUT_PATH/navit/share/icons -cd .. -cp $PREFIX/share/navit/navit.xml ./tomtom480.xml +cp $PREFIX/share/navit/navit.xml $OUT_PATH/navit/share +cp $PREFIX/share/navit/navit_layout_*.xml $OUT_PATH/navit/share # locale -cp -r $PREFIX/share/locale $OUT_PATH/navit/share/locale +cp -r $PREFIX/share/locale $OUT_PATH/navit/share cd $OUT_PATH diff --git a/scripts/build_tomtom_plugin.sh b/scripts/build_tomtom_plugin.sh index 47fedb59a..3cb15ffe1 100644 --- a/scripts/build_tomtom_plugin.sh +++ b/scripts/build_tomtom_plugin.sh @@ -115,11 +115,12 @@ cp $PREFIX/share/navit/icons/*48.png $OUT_PATH/navit/share/icons cp $PREFIX/share/navit/icons/*64.png $OUT_PATH/navit/share/icons cp $PREFIX/share/navit/icons/nav*.* $OUT_PATH/navit/share/icons cp $PREFIX/share/navit/icons/country*.png $OUT_PATH/navit/share/icons -cp $PREFIX/share/navit/navit.xml ./tomtom480.xml +cp $PREFIX/share/navit/navit.xml $OUT_PATH/navit/share +cp $PREFIX/share/navit/navit_layout_*.xml $OUT_PATH/navit/share # locale -cp -r $PREFIX/share/locale $OUT_PATH/navit/share/locale +cp -r $PREFIX/share/locale $OUT_PATH/navit/share # espeak cp -r ~/share/espeak-data $OUT_PATH/navit/share/ diff --git a/scripts/setup_tomtom_requirements.sh b/scripts/setup_tomtom_requirements.sh index 4e8415daf..cfb4b5011 100644 --- a/scripts/setup_tomtom_requirements.sh +++ b/scripts/setup_tomtom_requirements.sh @@ -4,7 +4,7 @@ set -e # install additional packages to build TT evitonment and navit -apt-get install -y libglib2.0-dev git autogen autoconf libtool zip +apt-get install -y libglib2.0-dev git autogen autoconf libtool zip xsltproc dpkg --add-architecture i386 apt-get update apt-get install -y libc6:i386 libncurses5:i386 libstdc++6:i386 |