Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-09 22:49:53 +08:00
Code Issues Actions 29 Packages Projects Releases Wiki Activity

[maps] hopefully finally fix google maps version download

Browse Source 
seems like #865 didn't work with sed version on OSX after all...
So just use gnu sed on osx and the documented gnu sed -r option instead of -E

Also add a check if the extraced google version is actually a valid integer number..
This commit is contained in:
Felix Ruess
2014-11-04 21:46:05 +01:00
parent aa02276c22
commit 317dd81760
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/Makefile
+16 -9
View File
@@ -6,10 +6,13 @@ Q=@
UNAME = $(shell uname -s)
ifeq ("$(UNAME)","Darwin")
MKTEMP = gmktemp
SED = gsed
else
MKTEMP = mktemp
SED = sed
endif
all: $(PAPARAZZI_HOME)/conf/maps.xml
clean:
@@ -28,16 +31,20 @@ $(DATADIR)/maps.google.com: $(DATADIR) FORCE
exit 1)
$(PAPARAZZI_HOME)/conf/maps.xml: $(DATADIR)/maps.google.com
$(eval GOOGLE_VERSION := $(shell tr -s '[[:space:]]' '\n' < $(DATADIR)/maps.google.com | grep -E "http[s]?://khm[s]?[0-9]+.google.com/kh/v=[0-9]+.x26" | sed -e 's/.*http[s]\?:\/\/khm[s]\?[0-9]\+\.google\.com\/kh\/v=\([0-9]\+\)\\x26.*/\1/'))
$(eval GOOGLE_VERSION := $(shell tr -s '[[:space:]]' '\n' < $(DATADIR)/maps.google.com | grep -E "http[s]?://khm[s]?[0-9]+.google.com/kh/v=[0-9]+.x26" | $(SED) -r 's#.*http[s]?://khm[s]?[0-9]+.google.com/kh/v=##;s#.x26.*##'))
$(eval $@_TMP := $(shell $(MKTEMP)))
@echo "Updated google maps version to $(GOOGLE_VERSION)"
@echo "-----------------------------------------------"
$(Q)echo "<!DOCTYPE maps SYSTEM \"maps.dtd\">" > $($@_TMP)
$(Q)echo "" >> $($@_TMP)
$(Q)echo "<maps google_version=\"$(GOOGLE_VERSION)\"/>" >> $($@_TMP)
$(Q)echo "" >> $($@_TMP)
$(Q)mv $($@_TMP) $@
$(Q)chmod a+r $@
$(Q)if [ "$(GOOGLE_VERSION)" -eq "$(GOOGLE_VERSION)" ] 2>/dev/null ; then \
echo "Updated google maps version to $(GOOGLE_VERSION)" ; \
echo "-----------------------------------------------" ; \
echo "<!DOCTYPE maps SYSTEM \"maps.dtd\">" > $($@_TMP) ; \
echo "" >> $($@_TMP) ; \
echo "<maps google_version=\"$(GOOGLE_VERSION)\"/>" >> $($@_TMP) ; \
echo "" >> $($@_TMP) ; \
mv $($@_TMP) $@ ; \
chmod a+r $@ ; \
else \
echo "Extracted google maps version was not a valid number: $(GOOGLE_VERSION)" ; \
fi
FORCE:
.PHONY: all clean