Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ocaml-cppo for openSUSE:Factory checked in at 2022-06-21 16:32:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ocaml-cppo (Old) and /work/SRC/openSUSE:Factory/.ocaml-cppo.new.1548 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ocaml-cppo" Tue Jun 21 16:32:55 2022 rev:11 rq:984128 version:1.6.9 Changes: -------- --- /work/SRC/openSUSE:Factory/ocaml-cppo/ocaml-cppo.changes 2021-09-29 20:19:46.091062750 +0200 +++ /work/SRC/openSUSE:Factory/.ocaml-cppo.new.1548/ocaml-cppo.changes 2022-06-21 16:33:06.499872443 +0200 @@ -1,0 +2,6 @@ +Mon Jun 13 13:13:13 UTC 2022 - [email protected] + +- Update to version 1.6.9 + See included Changes for details + +------------------------------------------------------------------- Old: ---- ocaml-cppo-1.6.8.tar.xz New: ---- ocaml-cppo-1.6.9.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ocaml-cppo.spec ++++++ --- /var/tmp/diff_new_pack.XroQr8/_old 2022-06-21 16:33:07.011873194 +0200 +++ /var/tmp/diff_new_pack.XroQr8/_new 2022-06-21 16:33:07.015873200 +0200 @@ -1,7 +1,7 @@ # # spec file for package ocaml-cppo # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # Copyright (c) 2015 LISA GmbH, Bingen, Germany. # # All modifications and additions to the file contributed by third parties @@ -18,17 +18,17 @@ Name: ocaml-cppo -Version: 1.6.8 +Version: 1.6.9 Release: 0 %{?ocaml_preserve_bytecode} Summary: The C preprocessor written in OCaml License: BSD-3-Clause Group: Development/Languages/OCaml URL: https://opam.ocaml.org/packages/cppo -Source: %{name}-%{version}.tar.xz +Source: %name-%version.tar.xz BuildRequires: ocaml BuildRequires: ocaml-dune -BuildRequires: ocaml-rpm-macros >= 20210911 +BuildRequires: ocaml-rpm-macros >= 20220409 BuildRequires: ocamlfind(str) BuildRequires: ocamlfind(unix) @@ -46,13 +46,13 @@ robustness of cppo across OCaml versions. %package devel -Summary: Development files for %{name} +Summary: Development files for %name Group: Development/Languages/OCaml -Requires: %{name} = %{version} +Requires: %name = %version %description devel -The %{name}-devel package contains libraries and signature files for -developing applications that use %{name}. +The %name-devel package contains libraries and signature files for +developing applications that use %name. %prep %autosetup -p1 @@ -69,10 +69,10 @@ %check %ocaml_dune_test -%files -f %{name}.files +%files -f %name.files %doc README.md -%{_bindir}/cppo +%_bindir/cppo -%files devel -f %{name}.files.devel +%files devel -f %name.files.devel %changelog ++++++ _service ++++++ --- /var/tmp/diff_new_pack.XroQr8/_old 2022-06-21 16:33:07.051873253 +0200 +++ /var/tmp/diff_new_pack.XroQr8/_new 2022-06-21 16:33:07.055873259 +0200 @@ -1,7 +1,7 @@ <services> <service name="tar_scm" mode="disabled"> <param name="filename">ocaml-cppo</param> - <param name="revision">94b2d0f21fcda5473773518a12afbcff45a52990</param> + <param name="revision">31c1365214d2381b12127c657156778e921357f8</param> <param name="scm">git</param> <param name="submodules">disable</param> <param name="url">https://github.com/ocaml-community/cppo.git</param> ++++++ ocaml-cppo-1.6.8.tar.xz -> ocaml-cppo-1.6.9.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-cppo-1.6.8/.github/workflows/build.yml new/ocaml-cppo-1.6.9/.github/workflows/build.yml --- old/ocaml-cppo-1.6.8/.github/workflows/build.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/ocaml-cppo-1.6.9/.github/workflows/build.yml 2022-05-20 01:43:16.000000000 +0200 @@ -0,0 +1,107 @@ +--- +name: Build +on: + push: + branches: + - master # forall push/merge in master + pull_request: + branches: + - "**" # forall submitted Pull Requests + +jobs: + build: + strategy: + fail-fast: false + matrix: + os: + - macos-latest + - ubuntu-latest + - windows-latest + ocaml-version: + - 4.02.x + - 4.03.x + - 4.04.x + - 4.05.x + - 4.06.x + - 4.07.x + - 4.08.x + - 4.09.x + - 4.10.x + - 4.11.x + - 4.12.x + - 4.13.x + + runs-on: ${{ matrix.os }} + + env: + SKIP_BUILD: | + dose + lilis + rotor + SKIP_TEST: | + 0install + bisect_ppx + cconv-ppx + decompress + extlib-compat + General + + steps: + - name: Prepare git + run: | + git config --global core.autocrlf false + git config --global init.defaultBranch master + + - name: Checkout code + uses: actions/checkout@v2 + + - name: Use OCaml ${{ matrix.ocaml-version }} + uses: ocaml/setup-ocaml@v2 + with: + ocaml-compiler: ${{ matrix.ocaml-version }} + + - name: Install dependencies + run: opam install --deps-only . + + - name: List installed packages + run: opam list + + - name: Build locally + run: opam exec -- make + + - name: Upload the build artifact + uses: actions/upload-artifact@v2 + with: + name: ${{ matrix.os }}-${{ matrix.ocaml-version }}-cppo.exe + path: _build/default/src/cppo_main.exe + + - name: Build, test, and install package + run: opam install -t . + + - name: Test dependants + if: > + (runner.os == 'Linux' && matrix.ocaml-version >= '4.04') || + (runner.os == 'macOS' && matrix.ocaml-version >= '4.13') + run: | + PACKAGES=`opam list -s --color=never --installable --depends-on cppo,cppo_ocamlbuild` + echo "Dependants:" $PACKAGES + for PACKAGE in $PACKAGES + do + echo $SKIP_BUILD | tr ' ' '\n' | grep ^$PACKAGE$ > /dev/null && + echo Skip $PACKAGE && continue + OPAMWITHTEST=true + echo $SKIP_TEST | tr ' ' '\n' | grep ^$PACKAGE$ > /dev/null && + OPAMWITHTEST=false + ([ $OPAMWITHTEST == false ] && + echo ::group::Build $PACKAGE) || + echo ::group::Build and test $PACKAGE + DEPS_FAILED=false + (opam depext $PACKAGE && + opam install --deps-only -t $PACKAGE) || DEPS_FAILED=true + [ $DEPS_FAILED == false ] && opam install $PACKAGE + echo ::endgroup:: + [ $DEPS_FAILED == false ] || echo Dependencies broken + done + + - name: Uninstall package + run: opam uninstall . diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-cppo-1.6.8/CODEOWNERS new/ocaml-cppo-1.6.9/CODEOWNERS --- old/ocaml-cppo-1.6.8/CODEOWNERS 2021-09-15 10:24:42.000000000 +0200 +++ new/ocaml-cppo-1.6.9/CODEOWNERS 2022-05-20 01:43:16.000000000 +0200 @@ -6,3 +6,5 @@ # # Interim maintainers who won't be very responsive :-( * @mjambon @pmetzger +*.opam @liyishuai +.github/workflows/ @liyishuai diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-cppo-1.6.8/Changes new/ocaml-cppo-1.6.9/Changes --- old/ocaml-cppo-1.6.8/Changes 2021-09-15 10:24:42.000000000 +0200 +++ new/ocaml-cppo-1.6.9/Changes 1970-01-01 01:00:00.000000000 +0100 @@ -1,85 +0,0 @@ -## v1.6.7 (2020-12-21) -- [compat] Treat ~ and - the same in semver in order to parse - OCaml 4.12.0 pre-release versions. -- [compat] Restore 4.02.3 compatibility. - -## v1.6.6 (2019-05-27) -- [pkg] port build system to dune from jbuilder. -- [pkg] upgrade opam metadata to 2.0 format. -- [pkg] remove topkg and use dune-release. -- [compat] Use `String.capitalize_ascii` to remove warning. - -## v1.6.5 (2018-09-12) -- [bug] Fix 'asr' operator (#61) - -## v1.6.4 (2018-02-26) -- [compat] Tests should now work with older versions of jbuilder. - -## v1.6.3 (2018-02-21) -- [compat] Fix tests. - -## v1.6.1 (2018-01-25) -- [compat] Emit line directives always containing the file name, - as mandated starting with ocaml 4.07. - -## v1.6.0 (2017-08-07) -- [pkg] BREAKING: cppo and cppo_ocamlbuild are now two distinct opam - packages. - -## v1.5.0 (2017-04-24) -- [+ui] Added the `CAPITALIZE()` function. - -## v1.4.0 (2016-08-19) -- [compat] Cppo is now safe-string ready. - -## v1.3.2 (2016-04-20) -- [pkg] Cppo can now be built on MSVC. - -## v1.3.1 (2015-09-20) -- [bug] Possible to have #endif between two matching parenthesis. - -## v1.3.0 (2015-09-13) -- [+ui] Removed the need for escaping commas and parenthesis in macros. -- [+ui] Blanks is now allowed in argument list in macro definitions. -- [+ui] #directive with wrong arguments is now giving a proper error. -- [bug] Fixed expansion of __FILE__ and __LINE__. - -## v1.1.2 (2014-11-10) -- [+ui] Ocamlbuild_cppo: added the ocamlbuild flag `cppo_V(NAME:VERSION)`, - equivalent to `-V NAME:VERSION` (for _tags file). - -## v1.1.1 (2014-11-10) -- [+ui] Ocamlbuild_cppo: added the ocamlbuild flag `cppo_V_OCAML`, - equivalent to `-V OCAML:VERSION` (for _tags file). - -## v1.1.0 (2014-11-04) -- [+ui] Added the `-V NAME:VERSION` option. -- [+ui] Support for tuples in comparisons: tuples can be constructed - and compared, e.g. `#if (2 + 2, 5) < (4, 5)`. - -## v1.0.1 (2014-10-20) -- [+ui] `#elif` and `#else` can now be used in the same #if-#else statement. -- [bug] Fixed the Ocamlbuild flag `cppo_n`. - -## v1.0.0 (2014-09-06) -- [bug] OCaml comments are now better parsed. For example, (* '"' *) works. - -## v0.9.4 (2014-06-10) -- [+ui] Added the ocamlbuild_cppo plugin for Ocamlbuild. To use it: - `-plugin(cppo_ocamlbuild)`. - -## v0.9.3 (2012-02-03) -- [pkg] New way of building the tar.gz archive. - -## v0.9.2 (2011-08-12) -- [+ui] Added two predefined macros STRINGIFY and CONCAT for making - string literals and for building identifiers respectively. - -## v0.9.1 (2011-07-20) -- [+ui] Added support for processing sections of files using external programs - (#ext/#endext, -x option) -- [doc] Moved and extended documentation into the README file. - -## v0.9.0 (2009-11-17) - -- initial public release diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-cppo-1.6.8/Changes.md new/ocaml-cppo-1.6.9/Changes.md --- old/ocaml-cppo-1.6.8/Changes.md 1970-01-01 01:00:00.000000000 +0100 +++ new/ocaml-cppo-1.6.9/Changes.md 2022-05-20 01:43:16.000000000 +0200 @@ -0,0 +1,92 @@ +## v1.6.9 (2022-05-19) +- [bug] Fix multiline string support (#81) + +## v1.6.8 (2021-09-17) +- [compat] Allow version strings without patch numbers, _e.g._ `8.13+beta1` + The patch number will be set to 0 upon empty, _i.e._ `(8, 13, 0)` + +## v1.6.7 (2020-12-21) +- [compat] Treat ~ and - the same in semver in order to parse + OCaml 4.12.0 pre-release versions. +- [compat] Restore 4.02.3 compatibility. + +## v1.6.6 (2019-05-27) +- [pkg] port build system to dune from jbuilder. +- [pkg] upgrade opam metadata to 2.0 format. +- [pkg] remove topkg and use dune-release. +- [compat] Use `String.capitalize_ascii` to remove warning. + +## v1.6.5 (2018-09-12) +- [bug] Fix 'asr' operator (#61) + +## v1.6.4 (2018-02-26) +- [compat] Tests should now work with older versions of jbuilder. + +## v1.6.3 (2018-02-21) +- [compat] Fix tests. + +## v1.6.1 (2018-01-25) +- [compat] Emit line directives always containing the file name, + as mandated starting with ocaml 4.07. + +## v1.6.0 (2017-08-07) +- [pkg] BREAKING: cppo and cppo_ocamlbuild are now two distinct opam + packages. + +## v1.5.0 (2017-04-24) +- [+ui] Added the `CAPITALIZE()` function. + +## v1.4.0 (2016-08-19) +- [compat] Cppo is now safe-string ready. + +## v1.3.2 (2016-04-20) +- [pkg] Cppo can now be built on MSVC. + +## v1.3.1 (2015-09-20) +- [bug] Possible to have #endif between two matching parenthesis. + +## v1.3.0 (2015-09-13) +- [+ui] Removed the need for escaping commas and parenthesis in macros. +- [+ui] Blanks is now allowed in argument list in macro definitions. +- [+ui] #directive with wrong arguments is now giving a proper error. +- [bug] Fixed expansion of __FILE__ and __LINE__. + +## v1.1.2 (2014-11-10) +- [+ui] Ocamlbuild_cppo: added the ocamlbuild flag `cppo_V(NAME:VERSION)`, + equivalent to `-V NAME:VERSION` (for _tags file). + +## v1.1.1 (2014-11-10) +- [+ui] Ocamlbuild_cppo: added the ocamlbuild flag `cppo_V_OCAML`, + equivalent to `-V OCAML:VERSION` (for _tags file). + +## v1.1.0 (2014-11-04) +- [+ui] Added the `-V NAME:VERSION` option. +- [+ui] Support for tuples in comparisons: tuples can be constructed + and compared, e.g. `#if (2 + 2, 5) < (4, 5)`. + +## v1.0.1 (2014-10-20) +- [+ui] `#elif` and `#else` can now be used in the same #if-#else statement. +- [bug] Fixed the Ocamlbuild flag `cppo_n`. + +## v1.0.0 (2014-09-06) +- [bug] OCaml comments are now better parsed. For example, (* '"' *) works. + +## v0.9.4 (2014-06-10) +- [+ui] Added the ocamlbuild_cppo plugin for Ocamlbuild. To use it: + `-plugin(cppo_ocamlbuild)`. + +## v0.9.3 (2012-02-03) +- [pkg] New way of building the tar.gz archive. + +## v0.9.2 (2011-08-12) +- [+ui] Added two predefined macros STRINGIFY and CONCAT for making + string literals and for building identifiers respectively. + +## v0.9.1 (2011-07-20) +- [+ui] Added support for processing sections of files using external programs + (#ext/#endext, -x option) +- [doc] Moved and extended documentation into the README file. + +## v0.9.0 (2009-11-17) + +- initial public release diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-cppo-1.6.8/LICENSE.md new/ocaml-cppo-1.6.9/LICENSE.md --- old/ocaml-cppo-1.6.8/LICENSE.md 2021-09-15 10:24:42.000000000 +0200 +++ new/ocaml-cppo-1.6.9/LICENSE.md 2022-05-20 01:43:16.000000000 +0200 @@ -9,13 +9,13 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -3. The name of the author may not be used to endorse or promote products +3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. -THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-cppo-1.6.8/README.md new/ocaml-cppo-1.6.9/README.md --- old/ocaml-cppo-1.6.8/README.md 2021-09-15 10:24:42.000000000 +0200 +++ new/ocaml-cppo-1.6.9/README.md 2022-05-20 01:43:16.000000000 +0200 @@ -1,4 +1,4 @@ -[](https://ci.appveyor.com/project/Chris00/cppo-pnjtx) +[](https://github.com/ocaml-community/cppo/actions?query=workflow:Build) Cppo: cpp for OCaml =================== @@ -13,6 +13,38 @@ * reasonably fast * simple to install and to maintain +Meta +---- + +* Author: Martin Jambon +* OCaml-community maintainers: + - Martin Jambon ([**@mjambon**](https://github.com/mjambon)) + - Yishuai Li ([**@liyishuai**](https://github.com/liyishuai)) +* License: [BSD 3-Clause "New" or "Revised" License](LICENSE.md) +* Compatible OCaml versions: 4.02.3 or later +* Additional dependencies: + - [Dune](https://dune.build) 1.10 or later + - [OCamlbuild](https://github.com/ocaml/ocamlbuild) and [Findlib](http://projects.camlcity.org/projects/findlib.html), for Ocamlbuild plugin + +Building and installation instructions +-------------------------------------- + +The easiest way to install the latest released version of cppo +is via [OPAM](https://opam.ocaml.org/doc/Install.html): + +```shell +opam install cppo +``` + +To instead build and install manually, do: + +``` shell +git clone https://github.com/ocaml-community/cppo.git +cd cppo +make +make install +``` + User guide ---------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-cppo-1.6.8/cppo.opam new/ocaml-cppo-1.6.9/cppo.opam --- old/ocaml-cppo-1.6.8/cppo.opam 2021-09-15 10:24:42.000000000 +0200 +++ new/ocaml-cppo-1.6.9/cppo.opam 2022-05-20 01:43:16.000000000 +0200 @@ -1,20 +1,19 @@ +# This file is generated by dune, edit dune-project instead opam-version: "2.0" -maintainer: "[email protected]" -authors: "Martin Jambon" -license: "BSD-3-Clause" -homepage: "https://github.com/ocaml-community/cppo"; -doc: "https://ocaml-community.github.io/cppo/"; -bug-reports: "https://github.com/ocaml-community/cppo/issues"; -depends: [ - "ocaml" {>= "4.02.3"} - "dune" {>= "1.0"} - "base-unix" -] build: [ ["dune" "subst"] {pinned} ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} + ["dune" "build" "-p" name "@doc"] {with-doc} +] +maintainer: [ + "Martin Jambon <[email protected]>" "Yishuai Li <[email protected]>" ] +authors: ["Martin Jambon"] +bug-reports: "https://github.com/ocaml-community/cppo/issues"; +homepage: "https://github.com/ocaml-community/cppo"; +doc: "https://ocaml-community.github.io/cppo"; +license: "BSD-3-Clause" dev-repo: "git+https://github.com/ocaml-community/cppo.git"; synopsis: "Code preprocessor like cpp for OCaml" description: """ @@ -28,3 +27,8 @@ * reasonably fast * simple to install and to maintain """ +depends: [ + "ocaml" {>= "4.02.3"} + "dune" {>= "1.10"} + "base-unix" +] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-cppo-1.6.8/cppo_ocamlbuild.opam new/ocaml-cppo-1.6.9/cppo_ocamlbuild.opam --- old/ocaml-cppo-1.6.8/cppo_ocamlbuild.opam 2021-09-15 10:24:42.000000000 +0200 +++ new/ocaml-cppo-1.6.9/cppo_ocamlbuild.opam 2022-05-20 01:43:16.000000000 +0200 @@ -1,21 +1,19 @@ +# This file is generated by dune, edit dune-project instead opam-version: "2.0" -maintainer: "[email protected]" -authors: "Martin Jambon" -license: "BSD-3-Clause" -homepage: "https://github.com/ocaml-community/cppo"; -doc: "https://ocaml-community.github.io/cppo/"; -bug-reports: "https://github.com/ocaml-community/cppo/issues"; -depends: [ - "ocaml" - "dune" {>= "1.0"} - "ocamlbuild" - "ocamlfind" -] build: [ ["dune" "subst"] {pinned} ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} + ["dune" "build" "-p" name "@doc"] {with-doc} +] +maintainer: [ + "Martin Jambon <[email protected]>" "Yishuai Li <[email protected]>" ] +authors: ["Martin Jambon"] +bug-reports: "https://github.com/ocaml-community/cppo/issues"; +homepage: "https://github.com/ocaml-community/cppo"; +doc: "https://ocaml-community.github.io/cppo"; +license: "BSD-3-Clause" dev-repo: "git+https://github.com/ocaml-community/cppo.git"; synopsis: "Plugin to use cppo with ocamlbuild" description: """ @@ -24,3 +22,9 @@ To use it, you can call ocamlbuild with the argument `-plugin-tag package(cppo_ocamlbuild)` (only since ocaml 4.01 and cppo >= 0.9.4). """ +depends: [ + "ocaml" + "dune" {>= "1.10"} + "ocamlbuild" + "ocamlfind" +] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-cppo-1.6.8/dune-project new/ocaml-cppo-1.6.9/dune-project --- old/ocaml-cppo-1.6.8/dune-project 2021-09-15 10:24:42.000000000 +0200 +++ new/ocaml-cppo-1.6.9/dune-project 2022-05-20 01:43:16.000000000 +0200 @@ -1,2 +1,44 @@ -(lang dune 1.0) +(lang dune 1.10) (name cppo) + +(generate_opam_files true) + +(source (github ocaml-community/cppo)) +(license BSD-3-Clause) +(authors "Martin Jambon") +(maintainers + "Martin Jambon <[email protected]>" + "Yishuai Li <[email protected]>") +(documentation "https://ocaml-community.github.io/cppo";) + +(package + (name cppo) + (depends + (ocaml (>= 4.02.3)) + (dune (>= 1.10)) + base-unix) + (synopsis "Code preprocessor like cpp for OCaml") + (description "Cppo is an equivalent of the C preprocessor for OCaml programs. +It allows the definition of simple macros and file inclusion. + +Cppo is: + +* more OCaml-friendly than cpp +* easy to learn without consulting a manual +* reasonably fast +* simple to install and to maintain +")) + +(package + (name cppo_ocamlbuild) + (depends + ocaml + (dune (>= 1.10)) + ocamlbuild + ocamlfind) + (synopsis "Plugin to use cppo with ocamlbuild") + (description "This ocamlbuild plugin lets you use cppo in ocamlbuild projects. + +To use it, you can call ocamlbuild with the argument `-plugin-tag +package(cppo_ocamlbuild)` (only since ocaml 4.01 and cppo >= 0.9.4). +")) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-cppo-1.6.8/src/cppo_lexer.mll new/ocaml-cppo-1.6.9/src/cppo_lexer.mll --- old/ocaml-cppo-1.6.8/src/cppo_lexer.mll 2021-09-15 10:24:42.000000000 +0200 +++ new/ocaml-cppo-1.6.9/src/cppo_lexer.mll 2022-05-20 01:43:16.000000000 +0200 @@ -522,13 +522,9 @@ | '\r'? '\n' { - if e.in_directive then - lexer_error lexbuf "Unterminated string literal" - else ( add e (lexeme lexbuf); new_line e; string e lexbuf - ) } | _ as c diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-cppo-1.6.8/test/dune new/ocaml-cppo-1.6.9/test/dune --- old/ocaml-cppo-1.6.8/test/dune 2021-09-15 10:24:42.000000000 +0200 +++ new/ocaml-cppo-1.6.9/test/dune 2022-05-20 01:43:16.000000000 +0200 @@ -72,6 +72,17 @@ %{targets} (run %{bin:cppo} -V X:123.05.2-alpha.1+foo-2.1 -V COQ:8.13+beta1 %{<})))) +(rule + (targets test.out) + (deps + (:< test.cppo) + incl.cppo + incl2.cppo) + (action + (with-stdout-to + %{targets} + (run %{bin:cppo} %{<})))) + (alias (name runtest) (package cppo) @@ -111,7 +122,8 @@ (alias (name runtest) (package cppo) - (deps version.out)) + (action + (diff version.ref version.out))) (alias (name runtest) @@ -122,9 +134,5 @@ (alias (name runtest) (package cppo) - (deps - (:< test.cppo) - incl.cppo - incl2.cppo) (action - (ignore-stdout (run %{bin:cppo} %{<})))) + (diff test.ref test.out))) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-cppo-1.6.8/test/test.cppo new/ocaml-cppo-1.6.9/test/test.cppo --- old/ocaml-cppo-1.6.8/test/test.cppo 2021-09-15 10:24:42.000000000 +0200 +++ new/ocaml-cppo-1.6.9/test/test.cppo 2022-05-20 01:43:16.000000000 +0200 @@ -37,8 +37,10 @@ #define test_multiline \ "abc\ + xyz def" \ (* 123 \ + 789 456 *) test_multiline @@ -73,7 +75,7 @@ ' (* lone single quote *) #define one 1 -one is not 1 +one = 1 #undef x #define x # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-cppo-1.6.8/test/test.ref new/ocaml-cppo-1.6.9/test/test.ref --- old/ocaml-cppo-1.6.8/test/test.ref 1970-01-01 01:00:00.000000000 +0100 +++ new/ocaml-cppo-1.6.9/test/test.ref 2022-05-20 01:43:16.000000000 +0200 @@ -0,0 +1,142 @@ +# 1 "test.cppo" +(* comment *) + +# 4 "test.cppo" +f(1) +# 6 "test.cppo" + 2+ 3.14 +# 8 "test.cppo" + 3+ 3.14 + +# 13 "test.cppo" +"g" is not defined + +# 18 "test.cppo" + b() + +# 20 "test.cppo" +debug("a") +debug("b") + + + + +# 33 "test.cppo" +success + +# 45 "test.cppo" + +"abc\ + xyz + def" +(* 123 \ + 789 + 456 *) + +# 48 "test.cppo" + "a" "b" + +# 51 "test.cppo" + aa ,bb 123 + +# 54 "test.cppo" + , ) ( + +# 56 "test.cppo" +blah #define xyz + +# 63 "test.cppo" + _ _ (* the 2 underscores should be space-separated *) + +# 67 "test.cppo" + + + (* there should be some space between the pluses *) + +# 69 "test.cppo" +(* (* nested comment with single single quote: ' *) "*)" *) + +# 72 "test.cppo" +obj + # define +# 73 "test.cppo" + + +# 75 "test.cppo" +' (* lone single quote *) + +# 78 "test.cppo" + 1 +# 78 "test.cppo" + = 1 + +# 82 "test.cppo" + # +# 82 "test.cppo" + is # + +# 98 "test.cppo" +good maths + + + + +# 117 "test.cppo" + +let g x = + printf "call %s\n%!" "g"; + let y = g x in + printf "return %s\n%!" "g"; + y +;; + + +# 124 "test.cppo" +class foo () = +object + +# 126 "test.cppo" + + val mutable field_1 : int option + method get_field_1 = field_1 + method set_field_1 x = field_1 <- Some x + +# 127 "test.cppo" + + val mutable field_2 : string option + method get_field_2 = field_2 + method set_field_2 x = field_2 <- Some x +# 128 "test.cppo" +end + +# 135 "test.cppo" + + (if !debug then + eprintf "[debug] %s %i: " "test.cppo" 135 ; + eprintf "test1 %i %i" x y; + eprintf "\n") +# 136 "test.cppo" + + (if !debug then + eprintf "[debug] %s %i: " "test.cppo" 136 ; + eprintf "test2 %i" x; + eprintf "\n") + +# 1 "incl.cppo" +included + +# 1 "incl2.cppo" +ok +# 139 "test.cppo" + +# 123456 + + +# 789 "test" +# 1 "incl.cppo" +included + +# 1 "incl2.cppo" +ok + + +# 793 "test" +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-cppo-1.6.8/test/version.ref new/ocaml-cppo-1.6.9/test/version.ref --- old/ocaml-cppo-1.6.8/test/version.ref 1970-01-01 01:00:00.000000000 +0100 +++ new/ocaml-cppo-1.6.9/test/version.ref 2022-05-20 01:43:16.000000000 +0200 @@ -0,0 +1,37 @@ + +# 5 "version.cppo" + Cape buffalos + + +# 10 "version.cppo" + onion rings + +# 16 "version.cppo" +major: +# 16 "version.cppo" + 123 +# 17 "version.cppo" +minor: +# 17 "version.cppo" + 05 +# 18 "version.cppo" +patch: +# 18 "version.cppo" + 2 + + +# 21 "version.cppo" + prerelease: +# 21 "version.cppo" + alpha.1 + + +# 27 "version.cppo" + build: +# 27 "version.cppo" + foo-2.1 + +# 32 "version.cppo" +Coq: +# 32 "version.cppo" + (8, 13, 0)
