[paparazzi-commits] [paparazzi/paparazzi] 2275a4: [ocaml] can build pprz lib with ocamlbuild

[GitHub]

  Branch: refs/heads/ocamlbuild
  Home:   https://github.com/paparazzi/paparazzi
  Commit: 2275a4e3f52b4aa794bc443dbeb15e71c7970c70
      
https://github.com/paparazzi/paparazzi/commit/2275a4e3f52b4aa794bc443dbeb15e71c7970c70
  Author: Felix Ruess <address@hidden>
  Date:   2015-03-23 (Mon, 23 Mar 2015)

  Changed paths:
    M .gitignore
    A sw/lib/ocaml/.gitignore
    A sw/lib/ocaml/_tags
    A sw/lib/ocaml/lib-pprz.mllib
    A sw/lib/ocaml/libgtkdrag_stub.clib
    A sw/lib/ocaml/libpprz_stub.clib
    A sw/lib/ocaml/myocamlbuild.ml
    A sw/lib/ocaml/xlib-pprz.mllib

  Log Message:
  -----------
  [ocaml] can build pprz lib with ocamlbuild

ocamlbuild -use-findlib lib-pprz.cma xlib-pprz.cma


  Commit: 3b83b497e577cadba4a329a6126a942355247986
      
https://github.com/paparazzi/paparazzi/commit/3b83b497e577cadba4a329a6126a942355247986
  Author: Felix Ruess <address@hidden>
  Date:   2015-03-23 (Mon, 23 Mar 2015)

  Changed paths:
    M sw/lib/ocaml/Makefile

  Log Message:
  -----------
  [ocaml] actually call ocamlbuild instead of old rules


  Commit: 2df3257e81aea617bc9db6e98de268e793f446ee
      
https://github.com/paparazzi/paparazzi/commit/2df3257e81aea617bc9db6e98de268e793f446ee
  Author: Felix Ruess <address@hidden>
  Date:   2015-03-23 (Mon, 23 Mar 2015)

  Changed paths:
    M sw/ground_segment/cockpit/Makefile
    M sw/ground_segment/joystick/Makefile
    M sw/ground_segment/tmtc/Makefile
    M sw/logalizer/Makefile
    M sw/simulator/Makefile
    M sw/supervision/Makefile
    M sw/tools/Makefile
    M sw/tools/generators/Makefile

  Log Message:
  -----------
  [build] don't include LIBPPRZDIR in depend rules


  Commit: cd43c24e856aa0a573d01792449a9ff2b1721b1e
      
https://github.com/paparazzi/paparazzi/commit/cd43c24e856aa0a573d01792449a9ff2b1721b1e
  Author: Felix Ruess <address@hidden>
  Date:   2015-03-23 (Mon, 23 Mar 2015)

  Changed paths:
    M sw/Makefile.ocaml
    M sw/lib/ocaml/META.pprz.template

  Log Message:
  -----------
  [ocaml] libpprz is in _build dir for now


  Commit: 31a7b03c378956034fe93ca8465e4a05f7c60de1
      
https://github.com/paparazzi/paparazzi/commit/31a7b03c378956034fe93ca8465e4a05f7c60de1
  Author: Felix Ruess <address@hidden>
  Date:   2015-03-23 (Mon, 23 Mar 2015)

  Changed paths:
    M sw/lib/ocaml/Makefile

  Log Message:
  -----------
  [ocaml] call ocamlbuild -clean on clean target


  Commit: 7356e60c741eb549f7f62610cce7ec483496df6f
      
https://github.com/paparazzi/paparazzi/commit/7356e60c741eb549f7f62610cce7ec483496df6f
  Author: Felix Ruess <address@hidden>
  Date:   2015-03-23 (Mon, 23 Mar 2015)

  Changed paths:
    M sw/lib/ocaml/.gitignore
    M sw/lib/ocaml/Makefile
    M sw/lib/ocaml/_tags

  Log Message:
  -----------
  [ocaml] build xml_get via ocamlbuild


  Commit: bf734a4cabcb9afc54a3c9166ce3be3c18308a4a
      
https://github.com/paparazzi/paparazzi/commit/bf734a4cabcb9afc54a3c9166ce3be3c18308a4a
  Author: Felix Ruess <address@hidden>
  Date:   2015-03-23 (Mon, 23 Mar 2015)

  Changed paths:
    M sw/lib/ocaml/Makefile

  Log Message:
  -----------
  [ocaml] cleanup Makefile


  Commit: 94720e2c445722e6a84fe243a632e52225da8242
      
https://github.com/paparazzi/paparazzi/commit/94720e2c445722e6a84fe243a632e52225da8242
  Author: Felix Ruess <address@hidden>
  Date:   2015-03-23 (Mon, 23 Mar 2015)

  Changed paths:
    M sw/Makefile.ocaml
    M sw/lib/ocaml/.gitignore
    R sw/lib/ocaml/META.pprz.template
    A sw/lib/ocaml/META.template
    M sw/lib/ocaml/Makefile
    R sw/lib/ocaml/_tags
    A sw/lib/ocaml/_tags.template

  Log Message:
  -----------
  [ocaml] build libs in var/build/ocaml

and
- add an install target
- use a template file for _tags so we can replace LABLGTK2GNOMECANVAS with 
actual package name


  Commit: 32ed3eb069ab8a90ddb045e3d81732f9ff357cf9
      
https://github.com/paparazzi/paparazzi/commit/32ed3eb069ab8a90ddb045e3d81732f9ff357cf9
  Author: Felix Ruess <address@hidden>
  Date:   2015-03-23 (Mon, 23 Mar 2015)

  Changed paths:
    M sw/lib/ocaml/Makefile
    M sw/lib/ocaml/_tags.template

  Log Message:
  -----------
  [ocaml] insert proper define for netclient version


  Commit: bac9f10507ff5254453eb3eb222be9c8267b426c
      
https://github.com/paparazzi/paparazzi/commit/bac9f10507ff5254453eb3eb222be9c8267b426c
  Author: Felix Ruess <address@hidden>
  Date:   2015-03-23 (Mon, 23 Mar 2015)

  Changed paths:
    M sw/lib/ocaml/Makefile
    M sw/lib/ocaml/myocamlbuild.ml

  Log Message:
  -----------
  [ocaml] add static target

which builds the bytecode version, but with static linking (custom mode)


  Commit: c2be1a3cd27b5ee247504b450deee6f4de3fd3de
      
https://github.com/paparazzi/paparazzi/commit/c2be1a3cd27b5ee247504b450deee6f4de3fd3de
  Author: Felix Ruess <address@hidden>
  Date:   2015-03-23 (Mon, 23 Mar 2015)

  Changed paths:
    M sw/lib/ocaml/Makefile

  Log Message:
  -----------
  [ocaml] try to work around ocamlbuild build-dir fuckups

Oh, this is so great...
Due to a bug in older ocamlbuild versions the build-dir can NOT be absolute 
(WTF???)
see http://caml.inria.fr/mantis/view.php?id=5503

But don't you think for a second that "simply" making sure the build-dir 
argument is always relative will just work:
Seems that the build-dir path can't contain '..' either!! HA! GOTCHA!

So some GNU make dark magic to the rescue to provide a sensible default for 
PAPARAZZI_HOME (with absolute path),
regardless from which working directory the makefile is called...

Puh! Let's just hope that now finally works in all cases... wasted enough hours 
of my life on this..


  Commit: f196237acb8d0b13cc21caf57a659ed5d46beb6b
      
https://github.com/paparazzi/paparazzi/commit/f196237acb8d0b13cc21caf57a659ed5d46beb6b
  Author: Felix Ruess <address@hidden>
  Date:   2015-03-23 (Mon, 23 Mar 2015)

  Changed paths:
    M sw/lib/ocaml/Makefile

  Log Message:
  -----------
  [ocaml] make it work with BSD sed


  Commit: e1d5d905ae660f98a1b9d1845ae3db075aacf963
      
https://github.com/paparazzi/paparazzi/commit/e1d5d905ae660f98a1b9d1845ae3db075aacf963
  Author: Piotr Esden-Tempski <address@hidden>
  Date:   2015-03-23 (Mon, 23 Mar 2015)

  Changed paths:
    M sw/lib/ocaml/myocamlbuild.ml

  Log Message:
  -----------
  [ocaml] Use pkg-config for gtk cflags.

Instead of hardcoding the gtk include paths for the pprz lib c stub we
now run pkg-config to get them. It probably could be more efficient
and/or safer if we did some more checks.


  Commit: d96a9a4135851a88cd18ac9eacd5db3b67971742
      
https://github.com/paparazzi/paparazzi/commit/d96a9a4135851a88cd18ac9eacd5db3b67971742
  Author: Felix Ruess <address@hidden>
  Date:   2015-03-23 (Mon, 23 Mar 2015)

  Changed paths:
    M sw/lib/ocaml/Makefile

  Log Message:
  -----------
  [ocaml] clean build artefacts from old system to make branch switching easier


  Commit: ac3a08aba59469878e5238478d6f96a9aaa6bf62
      
https://github.com/paparazzi/paparazzi/commit/ac3a08aba59469878e5238478d6f96a9aaa6bf62
  Author: Felix Ruess <address@hidden>
  Date:   2015-03-23 (Mon, 23 Mar 2015)

  Changed paths:
    A sw/tools/generators/.gitignore
    M sw/tools/generators/Makefile
    A sw/tools/generators/_tags

  Log Message:
  -----------
  [generators] use ocamlbuild


  Commit: f0c57d2c07c2857f77134e7339c81bb8b030e211
      
https://github.com/paparazzi/paparazzi/commit/f0c57d2c07c2857f77134e7339c81bb8b030e211
  Author: Felix Ruess <address@hidden>
  Date:   2015-03-23 (Mon, 23 Mar 2015)

  Changed paths:
    M sw/tools/generators/Makefile

  Log Message:
  -----------
  [generators] add dllpath for pprz package for bytecode targets for now


  Commit: bca52cc86ae13db4afbdd6bc7628e333ab63beab
      
https://github.com/paparazzi/paparazzi/commit/bca52cc86ae13db4afbdd6bc7628e333ab63beab
  Author: Felix Ruess <address@hidden>
  Date:   2015-03-23 (Mon, 23 Mar 2015)

  Changed paths:
    M sw/ground_segment/tmtc/Makefile

  Log Message:
  -----------
  [tmtc] remove multimon from some targets


  Commit: c893e1a78079c652900551415b0281a750b31f43
      
https://github.com/paparazzi/paparazzi/commit/c893e1a78079c652900551415b0281a750b31f43
  Author: Piotr Esden-Tempski <address@hidden>
  Date:   2015-03-23 (Mon, 23 Mar 2015)

  Changed paths:
    M conf/Makefile.sim

  Log Message:
  -----------
  [ocaml] [sim] Switched to dynamic linking on OS X.

An interesting lesson here is that ocamlc assumes that all .so files are
shared libraries. It does not do the same for .dylib files. This is why
we have to compile a dylib and save it away as a .so so that ocamlc is
able to do the right thing.


  Commit: 68d14502338c79b76b418a7119db25b9727870b9
      
https://github.com/paparazzi/paparazzi/commit/68d14502338c79b76b418a7119db25b9727870b9
  Author: Gautier Hattenberger <address@hidden>
  Date:   2015-03-23 (Mon, 23 Mar 2015)

  Changed paths:
    M Makefile
    M conf/messages.xml
    M sw/ground_segment/cockpit/Makefile
    R sw/ground_segment/multimon/Makefile
    R sw/ground_segment/multimon/README
    R sw/ground_segment/multimon/demod.ml
    R sw/ground_segment/multimon/demod_afsk12.c
    R sw/ground_segment/multimon/demod_afsk48p.c
    R sw/ground_segment/multimon/demod_display.c
    R sw/ground_segment/multimon/demodml.c
    R sw/ground_segment/multimon/filter-i386.h
    R sw/ground_segment/multimon/filter.h
    R sw/ground_segment/multimon/gen.h
    R sw/ground_segment/multimon/gen_hdlc.c
    R sw/ground_segment/multimon/hdlc.c
    R sw/ground_segment/multimon/hdlc.ml
    R sw/ground_segment/multimon/hdlc.mli
    R sw/ground_segment/multimon/mkcostab.c
    R sw/ground_segment/multimon/ml_hdlc.c
    R sw/ground_segment/multimon/multimon.h
    R sw/ground_segment/multimon/pprz.c
    R sw/ground_segment/multimon/pprz.h
    R sw/ground_segment/multimon/pprzlib.c
    R sw/ground_segment/multimon/pprzlib.h
    R sw/ground_segment/multimon/test.ml
    R sw/ground_segment/multimon/test_gen_hdlc.ml
    R sw/ground_segment/multimon/unixinput.c
    R sw/ground_segment/multimon/xdisplay.c
    M sw/ground_segment/tmtc/Makefile
    R sw/ground_segment/tmtc/dia.ml
    R sw/ground_segment/tmtc/diadec.ml
    M sw/ground_segment/tmtc/link.ml
    R sw/ground_segment/tmtc/stereo_demod.ml

  Log Message:
  -----------
  [ground_segment] remove multimon (telemetry over audio)


Compare: 
https://github.com/paparazzi/paparazzi/compare/8de767c1e1c3...68d14502338c