Re: [Paparazzi-devel] minor build issue

[Felix Ruess]

thx!
both fixed in current master...
I accidentally missed the USE_NPS define when I resolved a merge
conflict, my bad.... sorry.

On Wed, Aug 17, 2011 at 5:25 PM, Oswald Berthold
<address@hidden> wrote:
>
> hi felix,
>
> yes, maps.xml looked like this:
>
> <!DOCTYPE maps SYSTEM "maps.dtd">\n
> <maps google_version="89"/>
>
> i'm on debian unstable. ah, i see, it seems to be some diverging shell
> alias definitions, assuming the '-e' is set per default in ubuntu.
>
> address@hidden:~ $ echo -e \\n
>
>
> address@hidden:~ $ echo \\n
> \n
> address@hidden:~ $
>
> ------------------------------------------------------------
>
> another issue i ran into: in order for "make AIRCRAFT=BOOZ2_A1 clean_ac sim"
> to finish i needed this (or ppm_arch.h needs to be changed).
>
> diff --git a/conf/autopilot/subsystems/rotorcraft/fdm_nps.makefile 
> b/conf/autopilot/subsystems/rotorcraft/fdm_nps.makefile
> index 70bc35c..f60ecde 100644
> --- a/conf/autopilot/subsystems/rotorcraft/fdm_nps.makefile
> +++ b/conf/autopilot/subsystems/rotorcraft/fdm_nps.makefile
> @@ -17,7 +17,7 @@ NPSDIR = $(SIMDIR)/nps
>
>  sim.ARCHDIR = $(ARCH)
>
> -sim.CFLAGS  += -DSITL -DNPS
> +sim.CFLAGS  += -DSITL -DNPS -DUSE_NPS
>  sim.CFLAGS  += `pkg-config glib-2.0 --cflags`
>  sim.LDFLAGS += `pkg-config glib-2.0 --libs` -lm -lpcre -lglibivy -lgsl 
> -lgslcblas
>  sim.CFLAGS  += -I$(NPSDIR) -I$(SRC_FIRMWARE) -I$(SRC_BOARD) -I../simulator 
> -I$(PAPARAZZI_HOME)/conf/simulator/nps
>
>
> bst, opt
>
> Felix Ruess <address@hidden> writes:
>
>> Hi again :-)
>>
>> that is strange... did your generated maps.xml contain the \n in "plaintext"?
>> It gets correctly converted to a new line on my ubnutu 11.04 system.
>> What system are you on?
>>
>> Cheers, Felix
>>
>> On Wed, Aug 17, 2011 at 4:16 PM, Oswald Berthold
>> <address@hidden> wrote:
>>>
>>> hi, was having trouble this '\n' in maps.xml
>>>
>>> BUILD /home/src/QK/paparazzi/paparazzi/var/include/messages.h
>>> Exception:
>>> Failure "/home/src/QK/paparazzi/paparazzi/conf/maps.xml: Unexpected PCData".
>>> make: *** [/home/src/QK/paparazzi/paparazzi/var/include/messages.h] Error 2
>>>
>>>
>>>
>>> diff --git a/data/maps/Makefile b/data/maps/Makefile
>>> index 6ceb046..9a676c7 100644
>>> --- a/data/maps/Makefile
>>> +++ b/data/maps/Makefile
>>> @@ -10,7 +10,8 @@ $(DATADIR)/maps.google.com: $(DATADIR) FORCE
>>>        wget -O $(@) http://maps.google.com/
>>>
>>>  $(PAPARAZZI_HOME)/conf/maps.xml: $(DATADIR)/maps.google.com
>>> -       $(Q)echo "<!DOCTYPE maps SYSTEM \"maps.dtd\">\n" > $(@)
>>> +       $(Q)echo "<!DOCTYPE maps SYSTEM \"maps.dtd\">" > $(@)
>>> +       $(Q)echo "" >> $(@)
>>>        $(Q)echo "<maps google_version=\""`grep -P 
>>> "http://khm[0-9]+.google.com/kh/v=[0-9]+.x26"; $(DATADIR)/maps.google.com | 
>>> sed -E s#.*http://khm[0-9]+.google.com/kh/v
>>>        $(Q)echo "" >> $(@)
>>>
>>>
>>> _______________________________________________
>>> Paparazzi-devel mailing list
>>> address@hidden
>>> https://lists.nongnu.org/mailman/listinfo/paparazzi-devel
>>>
>>
>> _______________________________________________
>> Paparazzi-devel mailing list
>> address@hidden
>> https://lists.nongnu.org/mailman/listinfo/paparazzi-devel
>
> --
> Sent from my fingertip ...
>
> _______________________________________________
> Paparazzi-devel mailing list
> address@hidden
> https://lists.nongnu.org/mailman/listinfo/paparazzi-devel
>