[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[paparazzi-commits] [paparazzi/paparazzi] f662d2: [ocaml][tools] don't u
|
From: |
GitHub |
|
Subject: |
[paparazzi-commits] [paparazzi/paparazzi] f662d2: [ocaml][tools] don't use custom runtime for ocaml, ... |
|
Date: |
Fri, 29 Mar 2013 12:28:05 -0700 |
Branch: refs/heads/master
Home: https://github.com/paparazzi/paparazzi
Commit: f662d2e81821f81309dc6d5ed13d4064cbbb1605
https://github.com/paparazzi/paparazzi/commit/f662d2e81821f81309dc6d5ed13d4064cbbb1605
Author: Felix Ruess <address@hidden>
Date: 2013-02-23 (Sat, 23 Feb 2013)
Changed paths:
M sw/tools/Makefile
Log Message:
-----------
[ocaml][tools] don't use custom runtime for ocaml, instead load shared
libraries in ocamlrun
since the ivy-ocaml lib currently can't be found with ocamlfind and libpprz is
not installed system-wide,
specify the paths directly with -dllpath
Commit: cf7121934f3209b0a4ebf7a4c0d6bf1ab2589bee
https://github.com/paparazzi/paparazzi/commit/cf7121934f3209b0a4ebf7a4c0d6bf1ab2589bee
Author: Felix Ruess <address@hidden>
Date: 2013-02-23 (Sat, 23 Feb 2013)
Changed paths:
M sw/lib/ocaml/Makefile
Log Message:
-----------
verbose option for building ocaml lib
Commit: 69ddd2cabdef1b80852174d9f29804f30a9bf68d
https://github.com/paparazzi/paparazzi/commit/69ddd2cabdef1b80852174d9f29804f30a9bf68d
Author: Gautier Hattenberger <address@hidden>
Date: 2013-02-23 (Sat, 23 Feb 2013)
Changed paths:
M sw/ground_segment/cockpit/Makefile
M sw/ground_segment/tmtc/Makefile
M sw/lib/ocaml/Makefile
M sw/tools/Makefile
Log Message:
-----------
[makefile] cleaning makefiles from -custom param for ocaml
Commit: b81ae249174199517d1058051a1b01b57f276d8b
https://github.com/paparazzi/paparazzi/commit/b81ae249174199517d1058051a1b01b57f276d8b
Author: Gautier Hattenberger <address@hidden>
Date: 2013-02-23 (Sat, 23 Feb 2013)
Changed paths:
M sw/ground_segment/joystick/Makefile
M sw/lib/ocaml/Makefile
M sw/logalizer/Makefile
M sw/simulator/Makefile
M sw/supervision/Makefile
Log Message:
-----------
[makefile] most of the ocaml tools are compiling with shared lib
some issues with mixed static/shared lib
Commit: 446231949b8cbf0916381c054796e762ca866b4f
https://github.com/paparazzi/paparazzi/commit/446231949b8cbf0916381c054796e762ca866b4f
Author: Gautier Hattenberger <address@hidden>
Date: 2013-02-23 (Sat, 23 Feb 2013)
Changed paths:
M Makefile
M sw/ground_segment/cockpit/Makefile
M sw/ground_segment/joystick/Makefile
M sw/ground_segment/multimon/Makefile
M sw/lib/ocaml/Makefile
M sw/simulator/Makefile
Log Message:
-----------
[makefile] more makefile cleaning and dynamic loading
Commit: 737d7d3c8b72d2165b23cd275b51750afcb079ef
https://github.com/paparazzi/paparazzi/commit/737d7d3c8b72d2165b23cd275b51750afcb079ef
Author: Gautier Hattenberger <address@hidden>
Date: 2013-02-23 (Sat, 23 Feb 2013)
Changed paths:
M conf/Makefile.avr
M conf/gps/Makefile
M data/maps/Makefile
M doc/ccc07/Makefile
M doc/pprz_algebra/Makefile
M doc/pprz_geodetic/Makefile
A sw/Makefile.ocaml
M sw/airborne/Makefile
M sw/airborne/arch/lpc21/lpcusb/examples/Makefile
M sw/airborne/arch/lpc21/test/bootloader/Makefile
M sw/airborne/booz/test/Makefile
M sw/airborne/firmwares/non_ap/led_flasher/Makefile
M sw/airborne/firmwares/vor/Makefile
M sw/airborne/fms/Makefile
M sw/airborne/fms/libeknav/Makefile
M sw/airborne/math/Makefile
M sw/airborne/test/Makefile
M sw/ground_segment/cockpit/Makefile
M sw/ground_segment/joystick/Makefile
M sw/ground_segment/lpc21iap/Makefile
M sw/ground_segment/misc/Makefile
M sw/ground_segment/tmtc/GSM/Makefile
M sw/ground_segment/tmtc/Makefile
M sw/in_progress/button/Makefile
M sw/in_progress/fdm/Makefile
M sw/in_progress/inertial/C/Makefile
M sw/in_progress/ir_calibration/Makefile
M sw/in_progress/ir_usb_i2c/Makefile
M sw/in_progress/log_parser/Makefile
M sw/in_progress/motor_bench/Makefile
M sw/in_progress/satcom/Makefile
M sw/in_progress/turbine/Makefile
M sw/in_progress/wind_tunnel/Makefile
M sw/lib/ocaml/Makefile
M sw/logalizer/Makefile
M sw/logalizer/matlab/Makefile
M sw/simulator/Makefile
M sw/simulator/old_booz/tests/Makefile
M sw/simulator/scilab/q3d/Makefile
M sw/simulator/scilab/q3d/fonts/Makefile
M sw/simulator/scilab/q3d/povray/Makefile
M sw/simulator/scilab/q6d/povray/Makefile
M sw/supervision/Makefile
M sw/tools/Makefile
M sw/tools/wiki_gen/Makefile
M tests/Makefile
Log Message:
-----------
[makefile] silence clean target and add missing Makefile
Commit: bea674efd3d2dc762dee0954af0bad70af115ebd
https://github.com/paparazzi/paparazzi/commit/bea674efd3d2dc762dee0954af0bad70af115ebd
Author: Gautier Hattenberger <address@hidden>
Date: 2013-02-23 (Sat, 23 Feb 2013)
Changed paths:
M sw/ground_segment/multimon/Makefile
Log Message:
-----------
[makefile] fix multimon makefile
Commit: d1bae05ca0bd082ecdc1dc41d4fa8e8c19f2aed7
https://github.com/paparazzi/paparazzi/commit/d1bae05ca0bd082ecdc1dc41d4fa8e8c19f2aed7
Author: Gautier Hattenberger <address@hidden>
Date: 2013-02-23 (Sat, 23 Feb 2013)
Changed paths:
M sw/ground_segment/tmtc/Makefile
Log Message:
-----------
[makefile] multimon dll path
Commit: 00018d3297a8a60d59d9fa1b04426d8b52f4d1eb
https://github.com/paparazzi/paparazzi/commit/00018d3297a8a60d59d9fa1b04426d8b52f4d1eb
Author: Gautier Hattenberger <address@hidden>
Date: 2013-02-23 (Sat, 23 Feb 2013)
Changed paths:
M conf/Makefile.sim
M sw/Makefile.ocaml
M sw/airborne/Makefile
M sw/ground_segment/cockpit/Makefile
M sw/ground_segment/joystick/Makefile
M sw/ground_segment/tmtc/Makefile
M sw/lib/ocaml/Makefile
M sw/simulator/Makefile
M sw/tools/Makefile
Log Message:
-----------
[makefile] seems to work fine now
Commit: 8c7429e5559d1992f068225803d0938f16d70677
https://github.com/paparazzi/paparazzi/commit/8c7429e5559d1992f068225803d0938f16d70677
Author: Felix Ruess <address@hidden>
Date: 2013-02-23 (Sat, 23 Feb 2013)
Changed paths:
M sw/ground_segment/multimon/Makefile
Log Message:
-----------
[makefile] deduplication in mutimon makefile
Commit: 1811919fac75467e4e1ea1c93cb578d168b0acf0
https://github.com/paparazzi/paparazzi/commit/1811919fac75467e4e1ea1c93cb578d168b0acf0
Author: Felix Ruess <address@hidden>
Date: 2013-02-23 (Sat, 23 Feb 2013)
Changed paths:
M sw/ground_segment/joystick/Makefile
Log Message:
-----------
[makefile] make joystick compile on 64bit
Commit: 388a72a079fe218f6e0202966a22922b47a82712
https://github.com/paparazzi/paparazzi/commit/388a72a079fe218f6e0202966a22922b47a82712
Author: Felix Ruess <address@hidden>
Date: 2013-02-23 (Sat, 23 Feb 2013)
Changed paths:
M sw/ground_segment/joystick/Makefile
Log Message:
-----------
[makefile] minor fixes/cleanup for joystick
Commit: 847468e6ad09d9644f31e34d8dd109d21e2dae88
https://github.com/paparazzi/paparazzi/commit/847468e6ad09d9644f31e34d8dd109d21e2dae88
Author: Gautier Hattenberger <address@hidden>
Date: 2013-02-23 (Sat, 23 Feb 2013)
Changed paths:
M sw/ground_segment/tmtc/Makefile
M sw/lib/ocaml/Makefile
M sw/tools/Makefile
Log Message:
-----------
[makefile] finaly make tools independant of ivy package
Commit: bdb608c3aed20424e19bda64f2ff9726870fe05a
https://github.com/paparazzi/paparazzi/commit/bdb608c3aed20424e19bda64f2ff9726870fe05a
Author: Felix Ruess <address@hidden>
Date: 2013-02-23 (Sat, 23 Feb 2013)
Changed paths:
M conf/Makefile.sim
M sw/Makefile.ocaml
M sw/simulator/Makefile
Log Message:
-----------
[makefile] fPIC for sim...
Commit: 09126005491c2f83b5e7bc977281967dc4d0f31c
https://github.com/paparazzi/paparazzi/commit/09126005491c2f83b5e7bc977281967dc4d0f31c
Author: Felix Ruess <address@hidden>
Date: 2013-02-23 (Sat, 23 Feb 2013)
Changed paths:
M sw/ground_segment/cockpit/Makefile
M sw/ground_segment/joystick/Makefile
M sw/ground_segment/tmtc/Makefile
M sw/lib/ocaml/Makefile
M sw/logalizer/Makefile
M sw/supervision/Makefile
M sw/tools/Makefile
Log Message:
-----------
[makefile] improvements to ocaml lib building
- quiet building of glade stuff
- remove some temporary glade files
Commit: e838519192c6364b90400731f4bd9722ca437beb
https://github.com/paparazzi/paparazzi/commit/e838519192c6364b90400731f4bd9722ca437beb
Author: Felix Ruess <address@hidden>
Date: 2013-02-23 (Sat, 23 Feb 2013)
Changed paths:
M sw/logalizer/Makefile
Log Message:
-----------
[makefile] fix realtime plotter: link glibivy instead of ivy in logalizer
Commit: 390d02ab49666b43a7e96a291f5f2089a8013666
https://github.com/paparazzi/paparazzi/commit/390d02ab49666b43a7e96a291f5f2089a8013666
Author: Gautier Hattenberger <address@hidden>
Date: 2013-02-25 (Mon, 25 Feb 2013)
Changed paths:
M conf/Makefile.sim
M sw/Makefile.ocaml
M sw/ground_segment/cockpit/Makefile
M sw/ground_segment/joystick/Makefile
M sw/ground_segment/tmtc/Makefile
A sw/lib/ocaml/META.pprz
M sw/lib/ocaml/Makefile
M sw/logalizer/Makefile
M sw/simulator/Makefile
M sw/supervision/Makefile
M sw/tools/Makefile
Log Message:
-----------
[makefile] use pprzlib has a proper ocaml package
Commit: 2f2a0fafcd167bf988e9cfc915eabb412f47d556
https://github.com/paparazzi/paparazzi/commit/2f2a0fafcd167bf988e9cfc915eabb412f47d556
Author: Felix Ruess <address@hidden>
Date: 2013-03-19 (Tue, 19 Mar 2013)
Changed paths:
M sw/Makefile.ocaml
Log Message:
-----------
[makefile] add LIBPPRZDIR to OCAMLPATH instead of replace
Commit: bcb56b8ea5186ac39d91d05c0d24b16338b93081
https://github.com/paparazzi/paparazzi/commit/bcb56b8ea5186ac39d91d05c0d24b16338b93081
Author: Felix Ruess <address@hidden>
Date: 2013-03-19 (Tue, 19 Mar 2013)
Changed paths:
M sw/ground_segment/cockpit/Makefile
Log Message:
-----------
[makefile] ocaml: -threads is sufficient
no need to add the threads package explicitly or add gtkThread.cm[ox]
Commit: 57fdb9292171a1ae25a057a4b2219ba160877d33
https://github.com/paparazzi/paparazzi/commit/57fdb9292171a1ae25a057a4b2219ba160877d33
Author: Felix Ruess <address@hidden>
Date: 2013-03-19 (Tue, 19 Mar 2013)
Changed paths:
M sw/ground_segment/cockpit/Makefile
M sw/ground_segment/tmtc/Makefile
Log Message:
-----------
[makefile] fix ocaml native compilation
there is no -dllpath option for ocamlopt
Commit: 346fc0c416551d79f78b29cbf49cc96f3ef7ebc4
https://github.com/paparazzi/paparazzi/commit/346fc0c416551d79f78b29cbf49cc96f3ef7ebc4
Author: Felix Ruess <address@hidden>
Date: 2013-03-19 (Tue, 19 Mar 2013)
Changed paths:
M conf/Makefile.sim
M sw/Makefile.ocaml
M sw/ground_segment/cockpit/Makefile
M sw/ground_segment/joystick/Makefile
M sw/ground_segment/tmtc/Makefile
M sw/lib/ocaml/Makefile
M sw/logalizer/Makefile
M sw/simulator/Makefile
M sw/supervision/Makefile
M sw/tools/Makefile
Log Message:
-----------
[makefile] set OCAMLC and OCAMLOPT to use ocamlfind
Commit: 5e1f491b459372a5f800e7dff87eab57cf23c5d3
https://github.com/paparazzi/paparazzi/commit/5e1f491b459372a5f800e7dff87eab57cf23c5d3
Author: Felix Ruess <address@hidden>
Date: 2013-03-21 (Thu, 21 Mar 2013)
Changed paths:
M sw/ground_segment/cockpit/Makefile
M sw/ground_segment/joystick/Makefile
M sw/ground_segment/tmtc/Makefile
M sw/lib/ocaml/Makefile
M sw/logalizer/Makefile
M sw/simulator/Makefile
M sw/supervision/Makefile
M sw/tools/Makefile
Log Message:
-----------
[makefile] no explicit dependencies on libpprz
Commit: 9d44b45da521926fd95cbf5fa655532032e2a893
https://github.com/paparazzi/paparazzi/commit/9d44b45da521926fd95cbf5fa655532032e2a893
Author: Felix Ruess <address@hidden>
Date: 2013-03-21 (Thu, 21 Mar 2013)
Changed paths:
M Makefile
Log Message:
-----------
[makefile] rename target lib to libpprz for clarity
Commit: 7325f9fec8744d16371c83c63292c095d87e8a80
https://github.com/paparazzi/paparazzi/commit/7325f9fec8744d16371c83c63292c095d87e8a80
Author: Felix Ruess <address@hidden>
Date: 2013-03-21 (Thu, 21 Mar 2013)
Changed paths:
M sw/ground_segment/misc/davis2ivy.c
Log Message:
-----------
[misc] davis2ivy: suppress unused var warning
Commit: 77cd732702114aad2803e566997502fcfc14740d
https://github.com/paparazzi/paparazzi/commit/77cd732702114aad2803e566997502fcfc14740d
Author: Felix Ruess <address@hidden>
Date: 2013-03-21 (Thu, 21 Mar 2013)
Changed paths:
M Makefile
M Makefile.ac
M data/maps/Makefile
M sw/in_progress/button/Makefile
M sw/lib/ocaml/Makefile
M sw/logalizer/Makefile
M sw/supervision/Makefile
Log Message:
-----------
[makefile] use mktemp to create unique temp files
This assumes that mktemp is available, but should provide a better solution for
issue #229.
Also create a variable holding the tempfile name which is unique to each target.
This should prevent problems with parallel builds, since these variables are
global.
Commit: 0f70beafc47f990a48ac5768b3793d6278094911
https://github.com/paparazzi/paparazzi/commit/0f70beafc47f990a48ac5768b3793d6278094911
Author: Felix Ruess <address@hidden>
Date: 2013-03-21 (Thu, 21 Mar 2013)
Changed paths:
M sw/lib/ocaml/Makefile
Log Message:
-----------
[makefile] libpprz: remove double cmi target
Commit: fc82e6bb15c17734c983cecbb9cf8a9f720e089d
https://github.com/paparazzi/paparazzi/commit/fc82e6bb15c17734c983cecbb9cf8a9f720e089d
Author: Stephen Dwyer <address@hidden>
Date: 2013-03-26 (Tue, 26 Mar 2013)
Changed paths:
M sw/ground_segment/joystick/Makefile
Log Message:
-----------
[joystick] need to statically link on OS X for the SDL joystick functionality
unfortunately
Commit: cf14957de89eb466460f81ebb73e3428767d693e
https://github.com/paparazzi/paparazzi/commit/cf14957de89eb466460f81ebb73e3428767d693e
Author: Stephen Dwyer <address@hidden>
Date: 2013-03-26 (Tue, 26 Mar 2013)
Changed paths:
M sw/simulator/Makefile
Log Message:
-----------
[sim] need to include path to caml/*.h files for compiling c files on OS X
Commit: e06a57717a86cb73415a68512f0e2245a024a6e1
https://github.com/paparazzi/paparazzi/commit/e06a57717a86cb73415a68512f0e2245a024a6e1
Author: Stephen Dwyer <address@hidden>
Date: 2013-03-26 (Tue, 26 Mar 2013)
Changed paths:
M Makefile
M Makefile.ac
M data/maps/Makefile
M sw/in_progress/button/Makefile
M sw/lib/ocaml/Makefile
M sw/logalizer/Makefile
M sw/supervision/Makefile
Log Message:
-----------
[makefile] on os x the default mktemp doesn't behave the same (older
version), need to use gmktemp from the coreutils macport
Commit: 3ee0791efda313a10e7f22be6769f7aaaea04162
https://github.com/paparazzi/paparazzi/commit/3ee0791efda313a10e7f22be6769f7aaaea04162
Author: Stephen Dwyer <address@hidden>
Date: 2013-03-27 (Wed, 27 Mar 2013)
Changed paths:
R sw/lib/ocaml/META.pprz
A sw/lib/ocaml/META.pprz.deb
A sw/lib/ocaml/META.pprz.osx
M sw/lib/ocaml/Makefile
M sw/supervision/Makefile
Log Message:
-----------
[makefile] deal with difference in naming of lablgtk2 pkgs between debian and
os x
Commit: f33617510c75de18e3c0966e2df678b6e128fa08
https://github.com/paparazzi/paparazzi/commit/f33617510c75de18e3c0966e2df678b6e128fa08
Author: Felix Ruess <address@hidden>
Date: 2013-03-29 (Fri, 29 Mar 2013)
Changed paths:
M .gitignore
Log Message:
-----------
add META.pprz to gitignore
Commit: cbda7ee819f42268dac7e3c5d33858b3161d718b
https://github.com/paparazzi/paparazzi/commit/cbda7ee819f42268dac7e3c5d33858b3161d718b
Author: Felix Ruess <address@hidden>
Date: 2013-03-29 (Fri, 29 Mar 2013)
Changed paths:
M sw/lib/ocaml/Makefile
Log Message:
-----------
[makefile] minor improvements for lib/ocaml
- separate targets for byte and native libs
- replace copyMETA target with META.pprz so it doesn't get copied every time
Commit: de13525fd3ff417d1830fc06b69ddce7b8e8ea0f
https://github.com/paparazzi/paparazzi/commit/de13525fd3ff417d1830fc06b69ddce7b8e8ea0f
Author: Felix Ruess <address@hidden>
Date: 2013-03-29 (Fri, 29 Mar 2013)
Changed paths:
M .gitignore
M Makefile
M Makefile.ac
M conf/Makefile.avr
M conf/Makefile.sim
M conf/gps/Makefile
M data/maps/Makefile
M doc/ccc07/Makefile
M doc/pprz_algebra/Makefile
M doc/pprz_geodetic/Makefile
A sw/Makefile.ocaml
M sw/airborne/Makefile
M sw/airborne/arch/lpc21/lpcusb/examples/Makefile
M sw/airborne/arch/lpc21/test/bootloader/Makefile
M sw/airborne/booz/test/Makefile
M sw/airborne/firmwares/non_ap/led_flasher/Makefile
M sw/airborne/firmwares/vor/Makefile
M sw/airborne/fms/Makefile
M sw/airborne/fms/libeknav/Makefile
M sw/airborne/math/Makefile
M sw/airborne/test/Makefile
M sw/ground_segment/cockpit/Makefile
M sw/ground_segment/joystick/Makefile
M sw/ground_segment/lpc21iap/Makefile
M sw/ground_segment/misc/Makefile
M sw/ground_segment/misc/davis2ivy.c
M sw/ground_segment/multimon/Makefile
M sw/ground_segment/tmtc/GSM/Makefile
M sw/ground_segment/tmtc/Makefile
M sw/in_progress/button/Makefile
M sw/in_progress/fdm/Makefile
M sw/in_progress/inertial/C/Makefile
M sw/in_progress/ir_calibration/Makefile
M sw/in_progress/ir_usb_i2c/Makefile
M sw/in_progress/log_parser/Makefile
M sw/in_progress/motor_bench/Makefile
M sw/in_progress/satcom/Makefile
M sw/in_progress/turbine/Makefile
M sw/in_progress/wind_tunnel/Makefile
A sw/lib/ocaml/META.pprz.deb
A sw/lib/ocaml/META.pprz.osx
M sw/lib/ocaml/Makefile
M sw/logalizer/Makefile
M sw/logalizer/matlab/Makefile
M sw/simulator/Makefile
M sw/simulator/old_booz/tests/Makefile
M sw/simulator/scilab/q3d/Makefile
M sw/simulator/scilab/q3d/fonts/Makefile
M sw/simulator/scilab/q3d/povray/Makefile
M sw/simulator/scilab/q6d/povray/Makefile
M sw/supervision/Makefile
M sw/tools/Makefile
M sw/tools/wiki_gen/Makefile
M tests/Makefile
Log Message:
-----------
Merge branch 'ocamlfind_no_custom'
- Use findlib (ocamlfind) for ocaml packages.
- Create META file for pprz ocaml lib.
- Link dynamically instead of statically (no -custom), which also results in
faster build times.
- Use mktemp to properly create temporary files.
- More makefile cleanup...
closes #274
Compare:
https://github.com/paparazzi/paparazzi/compare/250bf7ff52f0...de13525fd3ff
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [paparazzi-commits] [paparazzi/paparazzi] f662d2: [ocaml][tools] don't use custom runtime for ocaml, ...,
GitHub <=