diff --git a/Makefile b/Makefile
index 544e6b6f20..1f50689c5d 100644
--- a/Makefile
+++ b/Makefile
@@ -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:
diff --git a/Makefile.pl b/Makefile.pl
deleted file mode 100755
index e67c0bd32b..0000000000
--- a/Makefile.pl
+++ /dev/null
@@ -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 (
-
-
-
-}
diff --git a/Makefile.sys b/Makefile.sys
index 900d1a89ff..edcd2fd22d 100644
--- a/Makefile.sys
+++ b/Makefile.sys
@@ -24,7 +24,7 @@ PAPARAZZI_HOME=$(HOME)/paparazzi
endif
ac: ac_h sim_ac ap fbw
-
+
sim_ac : sim_sitl
ac_h :
diff --git a/conf/Makefile.install b/conf/Makefile.install
index c0f6742ed5..e73246442e 100644
--- a/conf/Makefile.install
+++ b/conf/Makefile.install
@@ -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
\ No newline at end of file
+ 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/
diff --git a/conf/autopilot/classix.h b/conf/autopilot/classix.h
index 9b89e936b4..889220c63f 100644
--- a/conf/autopilot/classix.h
+++ b/conf/autopilot/classix.h
@@ -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
diff --git a/conf/install.xml b/conf/install.xml
deleted file mode 100644
index 74df957e19..0000000000
--- a/conf/install.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/debian/changelog b/debian/changelog
index 7a2af5d8e3..51fc1f8133 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+paparazzi (1.0-3) unstable; urgency=low
+
+ * Initial Release.
+
+ -- Pascal Brisset Fri, 19 Feb 2005 12:21:28 +0100
+
+
+
paparazzi (1.0-1) unstable; urgency=low
* Initial Release.
diff --git a/debian/control b/debian/control
index 66ddfe05f1..1be73a1121 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,29 @@ Maintainer: Pascal Brisset
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
diff --git a/debian/rules b/debian/rules
index 1e7d9107ee..a4805d493e 100644
--- a/debian/rules
+++ b/debian/rules
@@ -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.
diff --git a/sw/lib/perl/Makefile b/sw/lib/perl/Makefile
deleted file mode 100644
index a0cbee8405..0000000000
--- a/sw/lib/perl/Makefile
+++ /dev/null
@@ -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
diff --git a/sw/supervision/Paparazzi/CpGui.pm b/sw/supervision/Paparazzi/CpGui.pm
index c926bd2317..615f7e146f 100755
--- a/sw/supervision/Paparazzi/CpGui.pm
+++ b/sw/supervision/Paparazzi/CpGui.pm
@@ -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) = @_;
diff --git a/sw/supervision/paparazzi.pl b/sw/supervision/paparazzi.pl
index 2b2c3d7669..d2cc1995ac 100755
--- a/sw/supervision/paparazzi.pl
+++ b/sw/supervision/paparazzi.pl
@@ -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);