Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-27 00:37:37 +08:00
Code Issues Actions 28 Packages Projects Releases Wiki Activity

"make" works without any variable setting

Browse Source
This commit is contained in:
Pascal Brisset
2005-02-23 18:53:15 +00:00
parent 532e76d492
commit 3ea8ce6b94
7 changed files with 35 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+17 -8
View File
@@ -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 :
conf/install.xml
+12 -4
View File
@@ -30,9 +30,9 @@
<directory name="sw/lib/perl/Paparazzi"/>
<directory name="sw/ground_segment/cockpit/Paparazzi"/>
-->
<file name="sw/lib/perl/Paparazzi/CpPgmMgr.pm"/>
<file name="sw/lib/perl/Paparazzi/CpSessionMgr.pm"/>
<file name="sw/lib/perl/Paparazzi/CpGui.pm"/>
<file name="sw/supervision/Paparazzi/CpPgmMgr.pm"/>
<file name="sw/supervision/Paparazzi/CpSessionMgr.pm"/>
<file name="sw/supervision/Paparazzi/CpGui.pm"/>
<file name="sw/lib/perl/Paparazzi/Environment.pm"/>
<file name="sw/lib/perl/Paparazzi/IvyProtocol.pm"/>
<file name="sw/lib/perl/Paparazzi/Utils.pm"/>
@@ -49,6 +49,14 @@
<file name="sw/ground_segment/cockpit/Paparazzi/Scale.pm"/>
<file name="sw/ground_segment/cockpit/Paparazzi/Strip.pm"/>
<file name="sw/ground_segment/cockpit/Paparazzi/StripPanel.pm"/>
<file name="sw/ground_segment/cockpit/Paparazzi/ND.pm"/>
<file name="sw/ground_segment/cockpit/Paparazzi/NDPage.pm"/>
<file name="sw/ground_segment/cockpit/Paparazzi/SatPage.pm"/>
<file name="sw/ground_segment/cockpit/Paparazzi/EnginePage.pm"/>
<file name="sw/ground_segment/cockpit/Paparazzi/APPage.pm"/>
<file name="sw/ground_segment/cockpit/Paparazzi/IRPage.pm"/>
<file name="sw/ground_segment/cockpit/Paparazzi/HistoryView.pm"/>
<file name="sw/ground_segment/cockpit/Paparazzi/Geometry.pm"/>
</section>
<section name="conf" dest="share/paparazzi/conf">
@@ -212,7 +220,7 @@
</section>
<section name="var_log" dest="share/paparazzi/var/logs">
<file name="var/logs/04_12_29__15_11_08.log"/>
<!-- <file name="var/logs/04_12_29__15_11_08.log"/> -->
</section>
<section name="var_Thon1_sim" dest="share/paparazzi/var/Thon1/sim">
debian/control
Vendored
+1 -1
View File
@@ -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
sw/configurator/main.ml
+2
View File
@@ -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
sw/ground_segment/tmtc/listen.ml
+1 -1
View File
@@ -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
sw/supervision/Paparazzi/CpGui.pm
+1 -1
View File
@@ -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",
sw/supervision/paparazzi.pl
+1 -1
View File
@@ -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);