[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[Git][ocaml-team/js-of-ocaml][master] 2 commits: Build doc only on indep builds

Title: GitLab

Stéphane Glondu pushed to branch master at Debian OCaml Maintainers / js-of-ocaml

Commits:

  • b959ef97
    by Stephane Glondu at 2024-06-14T08:53:23+02:00 
    Build doc only on indep builds
  • 47f09aed
    by Stephane Glondu at 2024-06-14T08:53:23+02:00 
    Update changelog

3 changed files:

Changes:

  • debian/changelog
    1 
    +js-of-ocaml (5.8.2-2) UNRELEASED; urgency=medium
    2 
    +
    3 
    +  * Build doc only on indep builds
    4 
    +
    5 
    + -- Stéphane Glondu <glondu@debian.org>  Fri, 14 Jun 2024 08:45:11 +0200
    6 
    +
    1 7 
     js-of-ocaml (5.8.2-1) unstable; urgency=medium
    2 8
    3 9 
       * New upstream release

  • debian/control
    ... ... @@ -6,7 +6,6 @@ Uploaders: Stéphane Glondu <glondu@debian.org>
    6 6 
     Build-Depends:
    7 7 
      debhelper-compat (= 13),
    8 8 
      ocaml,
    9 
    - ocaml-odoc <!nodoc>,
    10 9 
      ocaml-dune (>= 2.5),
    11 10 
      ocaml-findlib,
    12 11 
      libfindlib-ocaml-dev,
    ... ... @@ -24,6 +23,8 @@ Build-Depends:
    24 23 
      libmenhir-ocaml-dev,
    25 24 
      rsync,
    26 25 
      dh-ocaml (>= 1.2.2)
    26 
    +Build-Depends-Indep:
    27 
    + ocaml-odoc <!nodoc>
    27 28 
     Standards-Version: 4.6.2
    28 29 
     Rules-Requires-Root: no
    29 30 
     Homepage: https://ocsigen.org/js_of_ocaml

  • debian/rules
    ... ... @@ -6,22 +6,22 @@ include /usr/share/ocaml/ocamlvars.mk
    6 6 
     %:
    7 7 
     	dh $@ --with ocaml --buildsystem ocaml_dune
    8 8
    9 
    -override_dh_auto_build:
    9 
    +execute_before_dh_auto_build:
    10 10 
     	rm -f compiler/tests-jsoo/dune         # makes the build fail on amd64
    11 11 
     	rm -f compiler/lib-runtime/tests/dune  # makes the build fail on bytecode architectures
    12 12 
     ifeq ($(OCAML_HAVE_OCAMLOPT),no)
    13 13 
     	sed -i 's/ native//' compiler/bin-js_of_ocaml/dune
    14 14 
     endif
    15 15 
     ifeq (,$(filter nodoc,$(DEB_BUILD_OPTIONS)))
    16 
    +ifneq (,$(filter libjs-of-ocaml-doc,$(shell dh_listpackages)))
    16 17 
     	$(MAKE) doc
    17 18 
     endif
    18 
    -	dh_auto_build
    19 
    +endif
    19 20
    20 21 
     override_dh_auto_test:
    21 22 
     # Needs ppx-expect, ppx-hash, node, Uchar.utf_decode...
    22 23
    23 
    -override_dh_install:
    24 
    -	dh_install
    24 
    +execute_after_dh_install-indep:
    25 25 
     	mkdir -p debian/libjs-of-ocaml-doc/usr/share/doc/libjs-of-ocaml-doc
    26 26 
     	rm -rf debian/libjs-of-ocaml-doc/usr/share/doc/libjs-of-ocaml-doc/api
    27 27 
     	rm -rf debian/libjs-of-ocaml-doc/usr/share/doc/libjs-of-ocaml-doc/manual

    • —
    View it on GitLab.
    You're receiving this email because of your account on salsa.debian.org. Manage all notifications · Help

    Reply to: