From 3ea8ce6b949e63d0cfadf5024f95c6384373ebf5 Mon Sep 17 00:00:00 2001 From: Pascal Brisset Date: Wed, 23 Feb 2005 18:53:15 +0000 Subject: [PATCH] "make" works without any variable setting --- Makefile | 25 +++++++++++++++++-------- conf/install.xml | 16 ++++++++++++---- debian/control | 2 +- sw/configurator/main.ml | 2 ++ sw/ground_segment/tmtc/listen.ml | 2 +- sw/supervision/Paparazzi/CpGui.pm | 2 +- sw/supervision/paparazzi.pl | 2 +- 7 files changed, 35 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index fc1b8e3912..6de7d98b1e 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,8 @@ # the Free Software Foundation, 59 Temple Place - Suite 330, # Boston, MA 02111-1307, USA. +PAPARAZZI_SRC=$(shell pwd) + include conf/Makefile.local LIB=sw/lib @@ -33,7 +35,14 @@ LOGALIZER=sw/logalizer SIMULATOR=sw/simulator MAKE=make -static : lib tools configurator cockpit tmtc visu3d logalizer sim_static wind +all: static ac1 ac2 + +static : lib tools configurator cockpit tmtc visu3d logalizer sim_static wind static_h + +ac1 : + make AIRCRAFT=Thon1 sim_ac +ac2 : + make AIRCRAFT=Thon2 sim_ac configure : configurator PAPARAZZI_DIR=`pwd` $(CONFIGURATOR)/configurator @@ -55,7 +64,7 @@ sim_static : cd $(SIMULATOR); $(MAKE) sim_sitl : - cd $(SIMULATOR); $(MAKE) sim_sitl + cd $(SIMULATOR); $(MAKE) sim_sitl PAPARAZZI_HOME=$(PAPARAZZI_SRC) PAPARAZZI_SRC=$(PAPARAZZI_SRC) AIRCRAFT=$(AIRCRAFT) fbw fly_by_wire: cd $(FBW); $(MAKE) all @@ -92,12 +101,14 @@ receive: tmtc $(TMTC)/receive static_h : - make -f Makefile.gen + PAPARAZZI_HOME=`pwd` PAPARAZZI_SRC=`pwd` make -f Makefile.gen ac_h : - $(TOOLS)/gen_aircraft.out $(AIRCRAFT) + PAPARAZZI_HOME=`pwd` PAPARAZZI_SRC=`pwd` $(TOOLS)/gen_aircraft.out $(AIRCRAFT) -ac: static_h ac_h ap fbw sim_sitl +sim_ac: ac_h sim_sitl +hard_ac: ac_h ap fbw +ac: sim_ac hard_ac clean_ac : rm -fr $(PAPARAZZI_HOME)/var/$(AIRCRAFT) @@ -105,9 +116,7 @@ clean_ac : run_sitl : $(PAPARAZZI_HOME)/var/$(AIRCRAFT)/sim/simsitl.out -t1: ac - -install : static t1 +install : all ./Makefile.pl -install -destdir $(DESTDIR) uninstall : diff --git a/conf/install.xml b/conf/install.xml index 630a53866c..3f010dafb0 100644 --- a/conf/install.xml +++ b/conf/install.xml @@ -30,9 +30,9 @@ --> - - - + + + @@ -49,6 +49,14 @@ + + + + + + + +
@@ -212,7 +220,7 @@
- +
diff --git a/debian/control b/debian/control index c99c36f21a..14c41867b0 100644 --- a/debian/control +++ b/debian/control @@ -7,6 +7,6 @@ Standards-Version: 3.6.1 Package: paparazzi Architecture: any -Depends: ivy-c-dev, ivy-c, ivy-perl, libsubject-perl, zinc-perl, zinc-tk, ivy-ocaml, xml-light-ocaml, libxml-dom-perl, libpcre3-dev, liblablgtk2-ocaml-dev, gcc-avr, avr-libc, binutils-avr, libexpect-perl, libgnomecanvas2-dev, libcamlimages-ocaml-dev, uisp, libfile-ncopy-perl, libtext-csv-perl +Depends: ivy-c-dev, ivy-c, ivy-perl, libsubject-perl, zinc-perl, zinc-tk, ivy-ocaml, xml-light-ocaml, libxml-dom-perl, libpcre3-dev, liblablgtk2-ocaml-dev, gcc-avr, avr-libc, binutils-avr, libexpect-perl, libgnomecanvas2-dev, libcamlimages-ocaml-dev, uisp, libfile-ncopy-perl, libtext-csv-perl, digikit Description: Paparazzi Meta Package diff --git a/sw/configurator/main.ml b/sw/configurator/main.ml index f4060894ba..2b6349fa29 100644 --- a/sw/configurator/main.ml +++ b/sw/configurator/main.ml @@ -38,11 +38,13 @@ let _ = Hardware.create_sheet sheets; Radio.create_sheet sheets; Airframe.create_sheet sheets; +(*** Flightplan.create_sheet sheets; Upload.create_sheet sheets; Simulator.create_sheet sheets; Monitor.create_sheet sheets; Logalizer.create_sheet sheets; +***) let quit_button = Button.create ~relief:`Sunken ~text:"Quit" ~command:exit sheets and (n, _) = Grid.size sheets in diff --git a/sw/ground_segment/tmtc/listen.ml b/sw/ground_segment/tmtc/listen.ml index 901ec2cc58..d7cdd4a7f6 100644 --- a/sw/ground_segment/tmtc/listen.ml +++ b/sw/ground_segment/tmtc/listen.ml @@ -53,7 +53,7 @@ let _ = end; true in - ignore (Glib.Io.add_watch `IN cb (Glib.Io.channel_of_descr fd)) in + ignore (Glib.Io.add_watch [`IN] cb (Glib.Io.channel_of_descr fd)) in let handle_pprz_message = fun (msg_id, values) -> let msg = Tele_Pprz.message_of_id msg_id in diff --git a/sw/supervision/Paparazzi/CpGui.pm b/sw/supervision/Paparazzi/CpGui.pm index 0b2a0ae6f3..ffe58fdc2d 100755 --- a/sw/supervision/Paparazzi/CpGui.pm +++ b/sw/supervision/Paparazzi/CpGui.pm @@ -112,7 +112,7 @@ sub build_compile_page { @pl = qw/-side top -expand yes -pady 2 -anchor w/; my $mode_txt = 'Mode : '. (defined $paparazzi_src ? "Source tree" : "System install"); my $mode_label = $ground_frame->Label(-text => $mode_txt)->pack(@pl); - my $paparazzi_src_txt = 'location : '.$paparazzi_src; + my $paparazzi_src_txt = 'location : '. (defined $paparazzi_src ? $paparazzi_src : "/usr/share/paparazzi"); my $paparazzi_src_label = $ground_frame->Label(-text => $paparazzi_src_txt)->pack(@pl); my $make_button = $ground_frame->Button( -text => "Compile", diff --git a/sw/supervision/paparazzi.pl b/sw/supervision/paparazzi.pl index 2c3bb08d04..0deb351ed6 100755 --- a/sw/supervision/paparazzi.pl +++ b/sw/supervision/paparazzi.pl @@ -7,7 +7,7 @@ BEGIN { $ENV{PAPARAZZI_SRC}."/sw/lib/perl" : "/usr/lib/paparazzi/"; } use lib ($paparazzi_lib); -use lib ($ENV{PAPARAZZI_SRC}."/sw/supervision"); +# use lib ($ENV{PAPARAZZI_SRC}."/sw/supervision"); use Paparazzi::CpGui; @ISA = qw(Paparazzi::CpGui);