*** empty log message ***

This commit is contained in:
Antoine Drouin
2006-05-30 15:40:52 +00:00
parent 9d2c642073
commit 582a0ebd94
12 changed files with 126 additions and 158 deletions
+5 -2
View File
@@ -46,7 +46,7 @@ MAKE=make
all: static
static : lib tools configurator cockpit multimon tmtc logalizer sim_static wind static_h
static : lib tools configurator cockpit visu3d multimon tmtc logalizer sim_static wind static_h
conf: conf/conf.xml conf/control_panel.xml
@@ -66,7 +66,6 @@ ac3 : conf sim_static
lib:
cd $(LIB)/ocaml; $(MAKE)
cd $(LIB)/perl; $(MAKE)
tools: lib
cd $(TOOLS); make
@@ -167,8 +166,12 @@ install :
uninstall :
./Makefile.pl -uninstall -destdir $(DESTDIR)
DISTRO=etch
deb :
chmod u+x debian/rules
cp debian/control.$(DISTRO) debian/control
cp debian/changelog.$(DISTRO) debian/changelog
dpkg-buildpackage -rfakeroot
clean:
-84
View File
@@ -1,84 +0,0 @@
#!/usr/bin/perl -w
use strict;
use File::Basename;
use Getopt::Long;
use Data::Dumper;
use XML::DOM;
my $destdir="/usr";
my $install = undef;
my $uninstall = undef;
my @sections;
GetOptions("install" => \$install,
"uninstall" => \$uninstall,
"destdir=s" => \$destdir);
read_xml("./conf/install.xml");
foreach my $section (@sections) {
my ($inst_dir, $files) = @{$section};
do_install($inst_dir, $files) if ($install);
do_uninstall($inst_dir, $files) if ($uninstall);
}
sub do_install {
my ($dest_dir, $files) = @_;
`install -d $dest_dir`;# or warn "creation of directory $dest_dir failed";
foreach my $file (@{$files}) {
my ($path, $new_name) = @{$file};
print "installing file $path in $dest_dir ".($new_name?"as $new_name":"")."\n";
my $cmd = "install $path $dest_dir".($new_name?"/$new_name":"");
`$cmd`;# or warn "intall of $path failed";
}
}
sub do_uninstall {
my ($dest_dir, $files) = @_;
foreach my $file (@{$files}) {
my ($path, $new_name) = @{$file};
my $to_be_removed = $dest_dir."/".($new_name?"$new_name":basename($path));
print "removing $to_be_removed\n";
`rm -f $to_be_removed`;
}
}
sub read_xml {
my ($filename) = @_;
my $parser = XML::DOM::Parser->new();
my $doc = $parser->parsefile($filename);
my $cp = $doc->getElementsByTagName("install")->[0];
my $sections = $cp->getElementsByTagName("section");
foreach my $section (@{$sections}) {
my $section_name = $section->getAttribute('name');
my $dest_loc = $destdir."/".$section->getAttribute('dest');
my $files = $section->getElementsByTagName("file");
my $file_a = [];
foreach my $file (@{$files}) {
push @{$file_a}, [$file->getAttribute('name'), $file->getAttribute('new_name')];
}
my $dirs = $section->getElementsByTagName("directory");
foreach my $dir (@{$dirs}) {
my $dirname=$dir->getAttribute('name');
opendir(DIR,$dirname);
my @dir_files = grep { -f "$dirname/$_" } readdir(DIR);
foreach my $foo (@dir_files) { print "$foo\n"; }
map { s#^(.*)#$dirname/$1# } @dir_files;
closedir(DIR);
foreach my $file (@dir_files) {
push @{$file_a}, [$file, $file];
}
}
push @sections, [$dest_loc, $file_a];
}
}
sub read_fs_dir {
# my (
}
+1 -1
View File
@@ -24,7 +24,7 @@ PAPARAZZI_HOME=$(HOME)/paparazzi
endif
ac: ac_h sim_ac ap fbw
sim_ac : sim_sitl
ac_h :
+46 -4
View File
@@ -2,7 +2,7 @@
PREFIX=/usr
DESTDIR=$(PREFIX)/share/paparazzi
install: install_data install_conf install_libs install_bin
install: install_data install_conf install_libs install_bin install_demo install_tools install_airborne_sources
install_demo:
@@ -18,27 +18,69 @@ install_data:
install -t $(DESTDIR)/data/pictures data/pictures/*.gif
install -t $(DESTDIR)/data/pictures data/pictures/*.svg
install -t $(DESTDIR)/data/pictures data/pictures/*.jpg
install -d $(DESTDIR)/data/srtm
install -t $(DESTDIR)/data/srtm data/srtm/N43E001.hgt.bz2
install_conf:
install -d $(DESTDIR)/conf
install conf/conf.xml.example $(DESTDIR)/conf/conf.xml
install conf/control_panel.xml.example $(DESTDIR)/conf/control_panel.xml
install conf/control_panel.xml.example.sys $(DESTDIR)/conf/control_panel.xml
install conf/messages.xml $(DESTDIR)/conf/
install conf/messages.dtd $(DESTDIR)/conf/
install conf/gui.xml $(DESTDIR)/conf/
install conf/Makefile.install $(DESTDIR)/conf/
cp -a conf/airframes $(DESTDIR)/conf/
cp -a conf/autopilot $(DESTDIR)/conf/
cp -a conf/flight_plans $(DESTDIR)/conf/
cp -a conf/gps $(DESTDIR)/conf/
cp -a conf/radios $(DESTDIR)/conf/
cp -a conf/telemetry $(DESTDIR)/conf/
install_bin:
install -d $(PREFIX)/bin/
install sw/supervision/paparazzi.pl $(PREFIX)/bin/
install sw/supervision/paparazzi.pl $(PREFIX)/bin/paparazzi
install -d $(DESTDIR)/bin/
install sw/ground_segment/cockpit/map2d $(DESTDIR)/bin/
install sw/simulator/gaia $(DESTDIR)/bin/
install sw/simulator/simsitl.pl $(DESTDIR)/bin/
install sw/ground_segment/cockpit/cockpit.pl $(DESTDIR)/bin/
install sw/ground_segment/tmtc/server $(DESTDIR)/bin/
install -t $(DESTDIR)/bin/ sw/tools/*.out
install -t $(DESTDIR)/bin/ sw/tools/extract_makefile.ml
install -t $(DESTDIR)/bin/ sw/tools/gen_aircraft.ml
install -t $(DESTDIR)/bin/ sw/tools/gen_airframe.ml
install -t $(DESTDIR)/bin/ sw/tools/gen_calib.ml
install -t $(DESTDIR)/bin/ sw/tools/gen_control.ml
install -t $(DESTDIR)/bin/ sw/tools/gen_flight_plan.ml
install -t $(DESTDIR)/bin/ sw/tools/gen_messages.ml
install -t $(DESTDIR)/bin/ sw/tools/gen_periodic.ml
install -t $(DESTDIR)/bin/ sw/tools/gen_radio.ml
install -t $(DESTDIR)/bin/ sw/tools/gen_ubx.ml
install_libs:
install -d $(PREFIX)/lib/perl5/Paparazzi
install sw/lib/perl/Paparazzi/*.pm $(PREFIX)/lib/perl5/Paparazzi
install sw/supervision/Paparazzi/*.pm $(PREFIX)/lib/perl5/Paparazzi
install sw/ground_segment/cockpit/Paparazzi/*.pm $(PREFIX)/lib/perl5/Paparazzi
install sw/ground_segment/cockpit/Paparazzi/*.pm $(PREFIX)/lib/perl5/Paparazzi
install -d $(DESTDIR)/sw/lib/ocaml
install -t $(DESTDIR)/sw/lib/ocaml sw/lib/ocaml/*.cma
install -t $(DESTDIR)/sw/lib/ocaml sw/lib/ocaml/*.so
install -t $(DESTDIR)/sw/lib/ocaml sw/lib/ocaml/*.a
install -t $(DESTDIR)/sw/lib/ocaml sw/lib/ocaml/*.cmi
install -d $(DESTDIR)/sw/tools/
install sw/tools/gen_aircraft.ml -t $(DESTDIR)/sw/tools
install_tools:
install -t $(DESTDIR) Makefile*
install -t $(DESTDIR)/conf conf/Makefile*
install_airborne_sources:
install -d $(PREFIX)/sw/
cp -a sw/airborne $(DESTDIR)/sw
install_skel:
cp -a conf $(DESTDIR)/
cp -a data $(DESTDIR)/
cp -a var/Twin3 $(DESTDIR)/var/
+6
View File
@@ -50,6 +50,12 @@
//#define USE_AD0_6
/* ADCs */
/* AD0.6 ( on pin P0.4 ) is supply monitoring */
//#define ARM7_TMP_ADC
#define USE_AD0_6
#endif /* FBW */
#ifdef AP
-42
View File
@@ -1,42 +0,0 @@
<install>
<section name="binaries" dest="bin" comment="main program">
<file name="sw/supervision/paparazzi.pl"/>
</section>
<section name="p_binaries" dest="share/paparazzi/sw/ground_segment/cockpit" comment="programs">
<file name="sw/ground_segment/cockpit/map2d"/>
</section>
<section name="skeleton" dest="share/paparazzi/conf" comment="">
<file name="conf/messages.xml"/>
<file name="conf/messages.dtd"/>
<file name="conf/ubx.xml"/>
<file name="conf/ubx.dtd"/>
</section>
<section name="data" dest="share/paparazzi/data">
<directory name="data/pictures"/>
</section>
<section name="perl_lib" dest="lib/perl5/Paparazzi" comment="perl modules">
<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"/>
</section>
<section name="conf" dest="share/paparazzi/conf">
<file name="conf/Makefile.avr"/>
<file name="conf/Makefile.local"/>
<file name="conf/conf.xml.example" new_name="conf.xml"/>
<file name="conf/control_panel.xml.example" new_name="control_panel.xml"/>
<file name="conf/hosts_wavecard.xml"/>
<file name="conf/messages.xml"/>
<file name="conf/wavecard.xml"/>
</section>
</install>
+8
View File
@@ -1,3 +1,11 @@
paparazzi (1.0-3) unstable; urgency=low
* Initial Release.
-- Pascal Brisset <pascal.brisset@enac.fr> Fri, 19 Feb 2005 12:21:28 +0100
paparazzi (1.0-1) unstable; urgency=low
* Initial Release.
+23 -2
View File
@@ -5,8 +5,29 @@ Maintainer: Pascal Brisset <pascal.brisset@enac.fr>
Build-Depends: debhelper (>= 4.0.0)
Standards-Version: 3.6.1
Package: paparazzi
Package: paparazzi-base
Architecture: any
Suggests: mlview, lustre, paparazzi-avr, paparazzi-arm
Recommends: eagle, cvs, gs-common, tetex-extra, dia-gnome
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, libexpect-perl, libgnomecanvas2-dev, libcamlimages-ocaml-dev, libfile-ncopy-perl, libtext-csv-perl, make, gcc, patch, gnuplot, digikit, bzip2, liblablgtk2-gnome-ocaml-dev, boa, bleriot-fonts
Description: Paparazzi Meta Package : common support
Package: paparazzi-avr
Architecture: any
Depends: uisp, gcc-avr, avr-libc, binutils-avr,
Description: Paparazzi Meta Package. Atmel AVR support
Package: paparazzi-arm7
Architecture: any
Depends: lpc21isp, gcc-arm, binutils-arm, newlib-arm
Description: Paparazzi Meta Package. Philips ARM7 support
Package: paparazzi-bin
Architecture: i386
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, make, gcc, patch, boa, dia-gnome, tetex-extra
Description: Paparazzi Meta Package
Description: Paparazzi main package
+1 -1
View File
@@ -56,7 +56,7 @@ install: build
dh_installdirs
# Add here commands to install the package.
$(MAKE) install PREFIX=$(CURDIR)/debian/paparazzi/usr
$(MAKE) install PREFIX=$(CURDIR)/debian/paparazzi-bin/usr
# Build architecture-independent files here.
-21
View File
@@ -1,21 +0,0 @@
#all: IvyMsgs.pm
#OCAMLC = ocamlc -I ../../lib/ocaml
#CONF_DIR = ../../../conf
#GEN_MESSAGES = ./gen_messages.out
#MESSAGES_XML = $(CONF_DIR)/messages.xml
#$(GEN_MESSAGES) : gen_messages.ml
# $(OCAMLC) -o $@ lib.cma $<
#IvyMsgs.pm : $(MESSAGES_XML) $(GEN_MESSAGES)
# $(GEN_MESSAGES) $< > /tmp/x.pm
# mv /tmp/x.pm $@
clean:
rm -f *~
#IvyMsgs.pm gen_messages.out *.cmo *.cmi
+32
View File
@@ -99,8 +99,40 @@ sub build_gui {
# my $sessions_page = $notebook->add("sessions", -label => "Sessions", -underline => 0);
$self->{session_frame} = $session_frame;
check_paparazzi_home($mw);
}
sub check_paparazzi_home {
my ($mw) = @_;
if (Paparazzi::Environment::paparazzi_home() eq "/usr/share/paparazzi") {
my $button = $mw->messageBox(
-title => 'Welcome to Paparazzi',
-type => 'YesNo',
-message => "Paparazzi needs access to a writable directory to store your data and settings. Do you want Paparazzi to use a temporary system directory ?");
my $pph = "";
if ($button eq "Yes") {
$pph = `mktemp -d /tmp/paparazzi.XXXXXXXX`;
print "using dir $pph as paparazzi_home\n"
}
else {
$pph = $mw->chooseDirectory(-title => 'choose a directory',
-initialdir => '~/paparazzi'
);
# print "choosed $file_name\n";
if ($pph eq "") {
die("need a writable dir. Exiting");
}
}
my $pps = "/usr/share/paparazzi";
`cd $pps && make -f conf/Makefile.install DESTDIR=$pph install_skel\n`;
}
}
sub build_logo_page {
my ($self, $notebook) = @_;
+4 -1
View File
@@ -4,10 +4,13 @@ package Paparazzi;
my $paparazzi_lib;
BEGIN {
$paparazzi_lib = (defined $ENV{PAPARAZZI_SRC}) ?
$ENV{PAPARAZZI_SRC}."/sw/lib/perl" : "/usr/lib/paparazzi/";
$ENV{PAPARAZZI_SRC}."/sw/lib/perl:".$ENV{PAPARAZZI_SRC}."/sw/supervision" :
"/usr/lib/paparazzi/";
}
use lib ($paparazzi_lib);
#if (exists $ENV{PAPARAZZI_SRC} and defined $ENV{PAPARAZZI_SRC}) {
#use lib ($ENV{PAPARAZZI_SRC}."/sw/supervision");
#}
use Paparazzi::CpGui;
@ISA = qw(Paparazzi::CpGui);