[Navit-cvs-commit] SF.net SVN: navit:[2920] trunk/navit/navit/xpm

[<go...@us...>]

Revision: 2920
          http://navit.svn.sourceforge.net/navit/?rev=2920&view=rev
Author:   gotwo
Date:     2010-01-22 18:52:26 +0000 (Fri, 22 Jan 2010)

Log Message:
-----------
FIX: windows build process: enable png build

Modified Paths:
--------------
    trunk/navit/navit/xpm/Makefile.am
    trunk/navit/navit/xpm/navit_svg2png

Modified: trunk/navit/navit/xpm/Makefile.am
===================================================================
--- trunk/navit/navit/xpm/Makefile.am	2010-01-19 12:49:58 UTC (rev 2919)
+++ trunk/navit/navit/xpm/Makefile.am	2010-01-22 18:52:26 UTC (rev 2920)
@@ -180,18 +180,20 @@
 flag_svgs += country_WF.svgz country_WS.svgz country_YE.svgz country_YT.svgz country_ZA.svgz country_ZM.svgz country_ZW.svgz
 
 if USE_SVG
-   xpm_DATA += $(svgs) $(nav_svgs) $(flag_svgs)
+  xpm_DATA += $(svgs) $(nav_svgs) $(flag_svgs)
 endif
 
 if USE_SVG2PNG
-%.png:$(srcdir)/*.svgz
-	SRCDIR=$(srcdir) $(srcdir)/navit_svg2png "@SVG2PNG@" "$@"
-%.png:$(srcdir)/*.svg
-	SRCDIR=$(srcdir) $(srcdir)/navit_svg2png "@SVG2PNG@" "$@"
-pngs = $(addsuffix .png,$(basename $(svgs)))
-xsize=$(word 1,$(subst x, ,$(scale)))
-ysize=$(word $(words $(scale)),$(subst x, ,$(scale)))
-comma=,
+%.png: $(srcdir)/*.svgz
+	SRCDIR=$(abs_srcdir) BUILDDIR=$(abs_builddir) $(srcdir)/navit_svg2png "@SVG2PNG@" "$@"
+%.png: $(srcdir)/*.svg
+	SRCDIR=$(abs_srcdir) BUILDDIR=$(abs_builddir) $(srcdir)/navit_svg2png "@SVG2PNG@" "$@"
+
+pngs  = $(addsuffix .png,$(basename $(svgs)))
+xsize = $(word 1,$(subst x, ,$(scale)))
+ysize = $(word $(words $(scale)),$(subst x, ,$(scale)))
+comma =,
+
 if USE_SVG2PNG_SCALES
 pngs += $(foreach scale, $(subst $(comma), ,@SVG2PNG_SCALES@), $(addsuffix _$(xsize)_$(ysize).png,$(basename $(svgs))))
 endif

Modified: trunk/navit/navit/xpm/navit_svg2png
===================================================================
--- trunk/navit/navit/xpm/navit_svg2png	2010-01-19 12:49:58 UTC (rev 2919)
+++ trunk/navit/navit/xpm/navit_svg2png	2010-01-22 18:52:26 UTC (rev 2920)
@@ -1,4 +1,4 @@
-#! /bin/bash
+#!/bin/sh
 
 function svgtopng
 {
@@ -10,18 +10,21 @@
 		$svgtopng --width=$1 --height=$2 --output $4 $3
 		;;
 	*inkscape)
-		$svgtopng --without-gui --export-width=$1 --export-height=$2 --export-png=$4 $3
+		$svgtopng --without-gui --export-width=$1 --export-height=$2 --export-png=$BUILDDIR/$4 $3
 		;;
 	*convert)
 		$svgtopng $3 -resize $1x$2 $4
-		;; 
+		;;
 	esac
 }
 
-ulimit -t 5
+if test "$OSTYPE" != "cygwin" -a "$OSTYPE" != "msys"; then
+	ulimit -t 5
+fi
+
 svgtopng=$1
 png=$2
-if [[ "$png" = *_[1-9]*_[1-9]*.png ]]; 
+if [[ "$png" = *_[1-9]*_[1-9]*.png ]];
 then
         svg=${png%_*_*.png};
 	h=${png##*_}
@@ -35,10 +38,11 @@
 then
 	svg="$SRCDIR/$svg"
 fi
-if [ -f $png -a ! -f $svg.svg ]
-then
+if [ -f $png -a ! -f $svg.svg ]; then
+	# width and height seems to be defined as part of the file name
 	touch $png
 else
+	# use width and hight from the svg image
 	if [ -f $svg.svg ]
 	then
 		if [ -z "$w" ]


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.