Hello community,
here is the log from the commit of package ocaml-cppo for openSUSE:Factory
checked in at 2019-10-24 23:02:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ocaml-cppo (Old)
and /work/SRC/openSUSE:Factory/.ocaml-cppo.new.2990 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ocaml-cppo"
Thu Oct 24 23:02:47 2019 rev:6 rq:738555 version:1.6.6
Changes:
--------
--- /work/SRC/openSUSE:Factory/ocaml-cppo/ocaml-cppo.changes 2019-02-20
14:11:02.194945356 +0100
+++ /work/SRC/openSUSE:Factory/.ocaml-cppo.new.2990/ocaml-cppo.changes
2019-10-24 23:02:50.264079280 +0200
@@ -1,0 +2,11 @@
+Mon Sep 30 12:34:56 UTC 2019 - oher...@suse.de
+
+- use dune macros from ocaml-rpm-macros
+
+-------------------------------------------------------------------
+Mon Sep 23 16:35:39 UTC 2019 - oher...@suse.de
+
+- Update to 1.6.6
+ Fix build
+
+-------------------------------------------------------------------
Old:
----
ocaml-cppo-1.6.5.tar.xz
New:
----
ocaml-cppo-1.6.6.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ocaml-cppo.spec ++++++
--- /var/tmp/diff_new_pack.jBYPpW/_old 2019-10-24 23:02:51.100080256 +0200
+++ /var/tmp/diff_new_pack.jBYPpW/_new 2019-10-24 23:02:51.104080260 +0200
@@ -18,12 +18,8 @@
#
-# cppo may use opam-installer but opam requires cppo for its build.
-# So here we don't use opam-installer by default.
-# Build with "--with-opam" to use opam despite the circular dependency.
-%bcond_with opam
Name: ocaml-cppo
-Version: 1.6.5
+Version: 1.6.6
Release: 0
%{?ocaml_preserve_bytecode}
Summary: The C preprocessor written in OCaml
@@ -33,15 +29,11 @@
Source: %{name}-%{version}.tar.xz
BuildRequires: ocaml
BuildRequires: ocaml-dune
-BuildRequires: ocaml-ocamldoc
-BuildRequires: ocaml-rpm-macros >= 4.03
+BuildRequires: ocaml-rpm-macros >= 20191009
BuildRequires: ocamlfind(easy-format)
BuildRequires: ocamlfind(ocamlbuild)
BuildRequires: ocamlfind(str)
BuildRequires: ocamlfind(unix)
-%if %{with opam}
-BuildRequires: opam
-%endif
%description
Cppo is an equivalent of the C preprocessor targeted at the OCaml language and
@@ -66,53 +58,23 @@
developing applications that use %{name}.
%prep
-%setup -q
+%autosetup -p1
%build
-dune build @install --profile release
+%ocaml_dune_setup
+%ocaml_dune_build
%install
-%if %{with opam}
- install -d %{buildroot}%{_libdir}/ocaml
- dune install --prefix=%{buildroot}%{_prefix}
--libdir=%{buildroot}%{_libdir}/ocaml
- rm -r %{buildroot}%{_prefix}/doc
-%else
- # By hand, not funny
- cd _build/install/default
- install -d %{buildroot}%{_libdir}/ocaml/cppo{,_ocamlbuild}
- install -m0644 lib/cppo/* %{buildroot}%{_libdir}/ocaml/cppo/
- install -m0644 lib/cppo_ocamlbuild/*
%{buildroot}%{_libdir}/ocaml/cppo_ocamlbuild/
- install -d %{buildroot}%{_bindir}
- install -m0755 bin/cppo %{buildroot}%{_bindir}
-%endif
+%ocaml_dune_install
+%ocaml_create_file_list
-%files
-%defattr(-,root,root)
+%check
+%ocaml_dune_test
+
+%files -f %{name}.files
+%doc README.md
%{_bindir}/cppo
-%doc LICENSE.md README.md
-%dir %{_libdir}/ocaml
-%dir %{_libdir}/ocaml/*
-%if 0%{?ocaml_native_compiler}
-%{_libdir}/ocaml/*/*.cmxs
-%endif
-
-%files devel
-%defattr(-,root,root,-)
-%dir %{_libdir}/ocaml
-%dir %{_libdir}/ocaml/*
-%if 0%{?ocaml_native_compiler}
-%{_libdir}/ocaml/*/*.a
-%{_libdir}/ocaml/*/*.cmx
-%{_libdir}/ocaml/*/*.cmxa
-%endif
-%{_libdir}/ocaml/*/*.cma
-%{_libdir}/ocaml/*/*.cmi
-%{_libdir}/ocaml/*/*.cmt
-%{_libdir}/ocaml/*/*.cmti
-%{_libdir}/ocaml/*/*.ml
-%{_libdir}/ocaml/*/*.mli
-%{_libdir}/ocaml/*/dune-package
-%{_libdir}/ocaml/*/META
-%{_libdir}/ocaml/*/opam
+
+%files devel -f %{name}.files.devel
%changelog
++++++ _service ++++++
--- /var/tmp/diff_new_pack.jBYPpW/_old 2019-10-24 23:02:51.164080330 +0200
+++ /var/tmp/diff_new_pack.jBYPpW/_new 2019-10-24 23:02:51.164080330 +0200
@@ -1,9 +1,9 @@
<services>
<service name="tar_scm" mode="disabled">
- <param name="url">git://github.com/ocaml-community/cppo.git</param>
+ <param name="url">https://github.com/ocaml-community/cppo.git</param>
<param name="scm">git</param>
- <param name="versionformat">1.6.5</param>
- <param name="revision">v1.6.5</param>
+ <param name="versionformat">1.6.6</param>
+ <param name="revision">v1.6.6</param>
<param name="filename">ocaml-cppo</param>
</service>
<service name="recompress" mode="disabled">
++++++ ocaml-cppo-1.6.5.tar.xz -> ocaml-cppo-1.6.6.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-cppo-1.6.5/.travis.yml
new/ocaml-cppo-1.6.6/.travis.yml
--- old/ocaml-cppo-1.6.5/.travis.yml 1970-01-01 01:00:00.000000000 +0100
+++ new/ocaml-cppo-1.6.6/.travis.yml 2019-05-27 01:49:42.000000000 +0200
@@ -0,0 +1,16 @@
+language: c
+sudo: required
+install: wget
https://raw.githubusercontent.com/ocaml/ocaml-ci-scripts/master/.travis-opam.sh
+script: bash -ex .travis-opam.sh
+env:
+ global:
+ - PACKAGE=cppo
+ matrix:
+ - OCAML_VERSION=4.03
+ - OCAML_VERSION=4.04
+ - OCAML_VERSION=4.05
+ - OCAML_VERSION=4.06
+ - OCAML_VERSION=4.07
+os:
+ - linux
+ - osx
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-cppo-1.6.5/CODEOWNERS
new/ocaml-cppo-1.6.6/CODEOWNERS
--- old/ocaml-cppo-1.6.5/CODEOWNERS 1970-01-01 01:00:00.000000000 +0100
+++ new/ocaml-cppo-1.6.6/CODEOWNERS 2019-05-27 01:49:42.000000000 +0200
@@ -0,0 +1,8 @@
+# We're looking for one or more volunteers to take the lead of cppo,
+# with the help of ocaml-community.
+#
+# Call for volunteers: https://github.com/ocaml-community/meta/issues/27
+# About ocaml-community: https://github.com/ocaml-community/meta
+#
+# Interim maintainers who won't be very responsive :-(
+* @mjambon @pmetzger
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-cppo-1.6.5/Changes new/ocaml-cppo-1.6.6/Changes
--- old/ocaml-cppo-1.6.5/Changes 2018-09-12 23:21:36.000000000 +0200
+++ new/ocaml-cppo-1.6.6/Changes 2019-05-27 01:49:42.000000000 +0200
@@ -1,72 +1,80 @@
-2018-09-12: release 1.6.5
- [bug] Fix 'asr' operator (#61)
+## 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)
-2018-02-26: release 1.6.4
- [compat] Tests should now work with older versions of jbuilder.
+## v1.6.4 (2018-02-26)
+- [compat] Tests should now work with older versions of jbuilder.
-2018-02-21: release 1.6.3
- [compat] Fix tests.
+## v1.6.3 (2018-02-21)
+- [compat] Fix tests.
-2018-01-25: release 1.6.1
- [compat] Emit line directives always containing the file name,
+## v1.6.1 (2018-01-25)
+- [compat] Emit line directives always containing the file name,
as mandated starting with ocaml 4.07.
-2017-08-07: release 1.6.0
- [pkg] BREAKING: cppo and cppo_ocamlbuild are now two distinct opam
+## v1.6.0 (2017-08-07)
+- [pkg] BREAKING: cppo and cppo_ocamlbuild are now two distinct opam
packages.
-2017-04-24: release 1.5.0
- [+ui] Added the `CAPITALIZE()` function.
+## v1.5.0 (2017-04-24)
+- [+ui] Added the `CAPITALIZE()` function.
-2016-08-19: release 1.4.0
- [compat] Cppo is now safe-string ready.
+## v1.4.0 (2016-08-19)
+- [compat] Cppo is now safe-string ready.
-2016-04-20: release 1.3.2
- [pkg] Cppo can now be built on MSVC.
+## v1.3.2 (2016-04-20)
+- [pkg] Cppo can now be built on MSVC.
-2015-09-20: release 1.3.1
- [bug] Possible to have #endif between two matching parenthesis.
-
-2015-09-13: release 1.3.0
- [+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.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__.
-2014-11-10: release 1.1.2
- [+ui] Ocamlbuild_cppo: added the ocamlbuild flag `cppo_V(NAME:VERSION)`,
+## 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).
-2014-11-10: release 1.1.1
- [+ui] Ocamlbuild_cppo: added the ocamlbuild flag `cppo_V_OCAML`,
+## v1.1.1 (2014-11-10)
+- [+ui] Ocamlbuild_cppo: added the ocamlbuild flag `cppo_V_OCAML`,
equivalent to `-V OCAML:VERSION` (for _tags file).
-2014-11-04: release 1.1.0
- [+ui] Added the `-V NAME:VERSION` option.
- [+ui] Support for tuples in comparisons: tuples can be constructed
+## 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)`.
-2014-10-20: release 1.0.1
- [+ui] `#elif` and `#else` can now be used in the same #if-#else statement.
- [bug] Fixed the Ocamlbuild flag `cppo_n`.
+## 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`.
-2014-09-06: release 1.0.0
- [bug] OCaml comments are now better parsed. For example, (* '"' *) works.
+## v1.0.0 (2014-09-06)
+- [bug] OCaml comments are now better parsed. For example, (* '"' *) works.
-2014-06-10: release 0.9.4
- [+ui] Added the ocamlbuild_cppo plugin for Ocamlbuild. To use it:
+## v0.9.4 (2014-06-10)
+- [+ui] Added the ocamlbuild_cppo plugin for Ocamlbuild. To use it:
`-plugin(cppo_ocamlbuild)`.
-2012-02-03: release 0.9.3
- [pkg] New way of building the tar.gz archive.
+## v0.9.3 (2012-02-03)
+- [pkg] New way of building the tar.gz archive.
-2011-08-12: release 0.9.2
- [+ui] Added two predefined macros STRINGIFY and CONCAT for making
+## v0.9.2 (2011-08-12)
+- [+ui] Added two predefined macros STRINGIFY and CONCAT for making
string literals and for building identifiers respectively.
-2011-07-20: release 0.9.1
- [+ui] Added support for processing sections of files using external programs
+## 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.
+- [doc] Moved and extended documentation into the README file.
-2009-11-17: initial version 0.9.0
+## v0.9.0 (2009-11-17)
+
+- initial public release
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-cppo-1.6.5/Makefile
new/ocaml-cppo-1.6.6/Makefile
--- old/ocaml-cppo-1.6.5/Makefile 2018-09-12 23:21:36.000000000 +0200
+++ new/ocaml-cppo-1.6.6/Makefile 2019-05-27 01:49:42.000000000 +0200
@@ -1,18 +1,18 @@
all:
- @jbuilder build @install @DEFAULT
+ @dune build
test:
- @jbuilder runtest
+ @dune runtest
install:
- @jbuilder install
+ @dune install
uninstall:
- @jbuilder uninstall
+ @dune uninstall
check: test
.PHONY: clean all check test install uninstall
clean:
- jbuilder clean
+ dune clean
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-cppo-1.6.5/VERSION new/ocaml-cppo-1.6.6/VERSION
--- old/ocaml-cppo-1.6.5/VERSION 2018-09-12 23:21:36.000000000 +0200
+++ new/ocaml-cppo-1.6.6/VERSION 2019-05-27 01:49:42.000000000 +0200
@@ -1 +1 @@
-1.6.4
+1.6.6
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-cppo-1.6.5/appveyor.yml
new/ocaml-cppo-1.6.6/appveyor.yml
--- old/ocaml-cppo-1.6.5/appveyor.yml 2018-09-12 23:21:36.000000000 +0200
+++ new/ocaml-cppo-1.6.6/appveyor.yml 2019-05-27 01:49:42.000000000 +0200
@@ -10,5 +10,5 @@
build_script:
- cd "%APPVEYOR_BUILD_FOLDER%"
- - jbuilder subst
- - jbuilder build -p cppo
+ - dune subst
+ - dune build -p cppo
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-cppo-1.6.5/cppo.opam
new/ocaml-cppo-1.6.6/cppo.opam
--- old/ocaml-cppo-1.6.5/cppo.opam 2018-09-12 23:21:36.000000000 +0200
+++ new/ocaml-cppo-1.6.6/cppo.opam 2019-05-27 01:49:42.000000000 +0200
@@ -1,20 +1,30 @@
-opam-version: "1.2"
+opam-version: "2.0"
maintainer: "mar...@mjambon.com"
-authors: ["Martin Jambon"]
-homepage: "http://mjambon.com/cppo.html";
-dev-repo: "https://github.com/mjambon/cppo.git";
-bug-reports: "https://github.com/mjambon/cppo/issues";
+authors: "Martin Jambon"
license: "BSD-3-Clause"
-
-build: [
- ["jbuilder" "subst"] {pinned}
- ["jbuilder" "build" "-p" name "-j" jobs]
-]
-build-test: [
- ["jbuilder" "runtest" "-p" name]
-]
-
+homepage: "http://mjambon.com/cppo.html";
+doc: "https://ocaml-community.github.io/cppo/";
+bug-reports: "https://github.com/ocaml-community/cppo/issues";
depends: [
- "jbuilder" {build & >= "1.0+beta17"}
+ "ocaml" {>= "4.03"}
+ "dune" {build & >= "1.0"}
"base-unix"
]
+build: [
+ ["dune" "subst"] {pinned}
+ ["dune" "build" "-p" name "-j" jobs]
+ ["dune" "runtest" "-p" name "-j" jobs] {with-test}
+]
+dev-repo: "git+https://github.com/ocaml-community/cppo.git";
+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
+"""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-cppo-1.6.5/cppo_ocamlbuild.opam
new/ocaml-cppo-1.6.6/cppo_ocamlbuild.opam
--- old/ocaml-cppo-1.6.5/cppo_ocamlbuild.opam 2018-09-12 23:21:36.000000000
+0200
+++ new/ocaml-cppo-1.6.6/cppo_ocamlbuild.opam 2019-05-27 01:49:42.000000000
+0200
@@ -1,20 +1,25 @@
-opam-version: "1.2"
+opam-version: "2.0"
maintainer: "mar...@mjambon.com"
-authors: ["Martin Jambon"]
-homepage: "http://mjambon.com/cppo.html";
-dev-repo: "https://github.com/mjambon/cppo.git";
-bug-reports: "https://github.com/mjambon/cppo/issues";
+authors: "Martin Jambon"
license: "BSD-3-Clause"
-
-build: [
- ["jbuilder" "subst"] {pinned}
- ["jbuilder" "build" "-p" name "-j" jobs]
-]
-build-test: [
- ["jbuilder" "runtest" "-p" name]
-]
-
+homepage: "http://mjambon.com/cppo.html";
+doc: "https://ocaml-community.github.io/cppo/";
+bug-reports: "https://github.com/ocaml-community/cppo/issues";
depends: [
- "jbuilder" {build & >= "1.0+beta17"}
+ "ocaml"
+ "dune" {build & >= "1.0"}
"ocamlbuild"
]
+build: [
+ ["dune" "subst"] {pinned}
+ ["dune" "build" "-p" name "-j" jobs]
+ ["dune" "runtest" "-p" name "-j" jobs] {with-test}
+]
+dev-repo: "git+https://github.com/ocaml-community/cppo.git";
+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.5/dune-project
new/ocaml-cppo-1.6.6/dune-project
--- old/ocaml-cppo-1.6.5/dune-project 1970-01-01 01:00:00.000000000 +0100
+++ new/ocaml-cppo-1.6.6/dune-project 2019-05-27 01:49:42.000000000 +0200
@@ -0,0 +1,2 @@
+(lang dune 1.0)
+(name cppo)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-cppo-1.6.5/examples/dune
new/ocaml-cppo-1.6.6/examples/dune
--- old/ocaml-cppo-1.6.5/examples/dune 1970-01-01 01:00:00.000000000 +0100
+++ new/ocaml-cppo-1.6.6/examples/dune 2019-05-27 01:49:42.000000000 +0200
@@ -0,0 +1,32 @@
+(ocamllex lexer)
+
+(rule
+ (deps
+ (:< debug.ml))
+ (targets debug.out)
+ (action
+ (with-stdout-to
+ %{targets}
+ (run %{bin:cppo} %{<}))))
+
+(rule
+ (deps
+ (:< french.ml))
+ (targets french.out)
+ (action
+ (with-stdout-to
+ %{targets}
+ (run %{bin:cppo} %{<}))))
+
+(rule
+ (deps
+ (:< lexer.ml))
+ (targets lexer.out)
+ (action
+ (with-stdout-to
+ %{targets}
+ (run %{bin:cppo} %{<}))))
+
+(alias
+ (name DEFAULT)
+ (deps debug.out french.out lexer.out))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-cppo-1.6.5/examples/jbuild
new/ocaml-cppo-1.6.6/examples/jbuild
--- old/ocaml-cppo-1.6.5/examples/jbuild 2018-09-12 23:21:36.000000000
+0200
+++ new/ocaml-cppo-1.6.6/examples/jbuild 1970-01-01 01:00:00.000000000
+0100
@@ -1,22 +0,0 @@
-(jbuild_version 1)
-
-(ocamllex (lexer))
-
-(rule
- ((deps (debug.ml))
- (targets (debug.out))
- (action (with-stdout-to ${@} (run ${bin:cppo} ${<})))))
-
-(rule
- ((deps (french.ml))
- (targets (french.out))
- (action (with-stdout-to ${@} (run ${bin:cppo} ${<})))))
-
-(rule
- ((deps (lexer.ml))
- (targets (lexer.out))
- (action (with-stdout-to ${@} (run ${bin:cppo} ${<})))))
-
-(alias
- ((name DEFAULT)
- (deps (debug.out french.out lexer.out))))
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-cppo-1.6.5/ocamlbuild_plugin/dune
new/ocaml-cppo-1.6.6/ocamlbuild_plugin/dune
--- old/ocaml-cppo-1.6.5/ocamlbuild_plugin/dune 1970-01-01 01:00:00.000000000
+0100
+++ new/ocaml-cppo-1.6.6/ocamlbuild_plugin/dune 2019-05-27 01:49:42.000000000
+0200
@@ -0,0 +1,6 @@
+(library
+ (name cppo_ocamlbuild)
+ (public_name cppo_ocamlbuild)
+ (wrapped false)
+ (synopsis "Cppo ocamlbuild plugin")
+ (libraries ocamlbuild))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-cppo-1.6.5/ocamlbuild_plugin/jbuild
new/ocaml-cppo-1.6.6/ocamlbuild_plugin/jbuild
--- old/ocaml-cppo-1.6.5/ocamlbuild_plugin/jbuild 2018-09-12
23:21:36.000000000 +0200
+++ new/ocaml-cppo-1.6.6/ocamlbuild_plugin/jbuild 1970-01-01
01:00:00.000000000 +0100
@@ -1,8 +0,0 @@
-(jbuild_version 1)
-
-(library
- ((name cppo_ocamlbuild)
- (public_name cppo_ocamlbuild)
- (wrapped false)
- (synopsis "Cppo ocamlbuild plugin")
- (libraries (ocamlbuild))))
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-cppo-1.6.5/pkg/pkg.ml
new/ocaml-cppo-1.6.6/pkg/pkg.ml
--- old/ocaml-cppo-1.6.5/pkg/pkg.ml 2018-09-12 23:21:36.000000000 +0200
+++ new/ocaml-cppo-1.6.6/pkg/pkg.ml 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-#use "topfind"
-#require "topkg-jbuilder.auto"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-cppo-1.6.5/src/cppo_eval.ml
new/ocaml-cppo-1.6.6/src/cppo_eval.ml
--- old/ocaml-cppo-1.6.5/src/cppo_eval.ml 2018-09-12 23:21:36.000000000
+0200
+++ new/ocaml-cppo-1.6.6/src/cppo_eval.ml 2019-05-27 01:49:42.000000000
+0200
@@ -82,10 +82,11 @@
let buf = Buffer.create (String.length s) in
trim_and_compact buf s;
Buffer.contents buf
+
let trim_compact_and_capitalize_string s =
let buf = Buffer.create (String.length s) in
trim_and_compact buf s;
- String.capitalize (Buffer.contents buf)
+ String.capitalize_ascii (Buffer.contents buf)
let is_ident s =
let len = String.length s in
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-cppo-1.6.5/src/dune
new/ocaml-cppo-1.6.6/src/dune
--- old/ocaml-cppo-1.6.5/src/dune 1970-01-01 01:00:00.000000000 +0100
+++ new/ocaml-cppo-1.6.6/src/dune 2019-05-27 01:49:42.000000000 +0200
@@ -0,0 +1,16 @@
+(ocamllex cppo_lexer)
+
+(ocamlyacc cppo_parser)
+
+(rule
+ (targets cppo_version.ml)
+ (action
+ (with-stdout-to
+ %{targets}
+ (echo "let cppo_version = \"%{version:cppo}\""))))
+
+(executable
+ (name cppo_main)
+ (package cppo)
+ (public_name cppo)
+ (libraries unix str))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-cppo-1.6.5/src/jbuild
new/ocaml-cppo-1.6.6/src/jbuild
--- old/ocaml-cppo-1.6.5/src/jbuild 2018-09-12 23:21:36.000000000 +0200
+++ new/ocaml-cppo-1.6.6/src/jbuild 1970-01-01 01:00:00.000000000 +0100
@@ -1,16 +0,0 @@
-(jbuild_version 1)
-
-(ocamllex (cppo_lexer))
-(ocamlyacc (cppo_parser))
-
-(rule
- ((targets (cppo_version.ml))
- (action
- (with-stdout-to ${@}
- (echo "let cppo_version = \"${version:cppo}\"")))))
-
-(executable
- ((name cppo_main)
- (package cppo)
- (public_name cppo)
- (libraries (unix str))))
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-cppo-1.6.5/test/dune
new/ocaml-cppo-1.6.6/test/dune
--- old/ocaml-cppo-1.6.5/test/dune 1970-01-01 01:00:00.000000000 +0100
+++ new/ocaml-cppo-1.6.6/test/dune 2019-05-27 01:49:42.000000000 +0200
@@ -0,0 +1,130 @@
+(rule
+ (targets ext.out)
+ (deps
+ (:< ext.cppo)
+ source.sh)
+ (action
+ (with-stdout-to
+ %{targets}
+ (run %{bin:cppo} -x "rot13:tr '[a-z]' '[n-za-m]'" -x
+ "source:sh source.sh '%F' %B %E" %{<}))))
+
+(rule
+ (targets comments.out)
+ (deps
+ (:< comments.cppo))
+ (action
+ (with-stdout-to
+ %{targets}
+ (run %{bin:cppo} %{<}))))
+
+(rule
+ (targets cond.out)
+ (deps
+ (:< cond.cppo))
+ (action
+ (with-stdout-to
+ %{targets}
+ (run %{bin:cppo} %{<}))))
+
+(rule
+ (targets tuple.out)
+ (deps
+ (:< tuple.cppo))
+ (action
+ (with-stdout-to
+ %{targets}
+ (run %{bin:cppo} %{<}))))
+
+(rule
+ (targets loc.out)
+ (deps
+ (:< loc.cppo))
+ (action
+ (with-stdout-to
+ %{targets}
+ (run %{bin:cppo} %{<}))))
+
+(rule
+ (targets paren_arg.out)
+ (deps
+ (:< paren_arg.cppo))
+ (action
+ (with-stdout-to
+ %{targets}
+ (run %{bin:cppo} %{<}))))
+
+(rule
+ (targets unmatched.out)
+ (deps
+ (:< unmatched.cppo))
+ (action
+ (with-stdout-to
+ %{targets}
+ (run %{bin:cppo} %{<}))))
+
+(rule
+ (targets version.out)
+ (deps
+ (:< version.cppo))
+ (action
+ (with-stdout-to
+ %{targets}
+ (run %{bin:cppo} -V X:123.05.2-alpha.1+foo-2.1 %{<}))))
+
+(alias
+ (name runtest)
+ (package cppo)
+ (action
+ (diff ext.ref ext.out)))
+
+(alias
+ (name runtest)
+ (package cppo)
+ (action
+ (diff comments.ref comments.out)))
+
+(alias
+ (name runtest)
+ (package cppo)
+ (action
+ (diff cond.ref cond.out)))
+
+(alias
+ (name runtest)
+ (package cppo)
+ (action
+ (diff tuple.ref tuple.out)))
+
+(alias
+ (name runtest)
+ (package cppo)
+ (action
+ (diff loc.ref loc.out)))
+
+(alias
+ (name runtest)
+ (package cppo)
+ (action
+ (diff paren_arg.ref paren_arg.out)))
+
+(alias
+ (name runtest)
+ (package cppo)
+ (deps version.out))
+
+(alias
+ (name runtest)
+ (package cppo)
+ (action
+ (diff unmatched.ref unmatched.out)))
+
+(alias
+ (name runtest)
+ (package cppo)
+ (deps
+ (:< test.cppo)
+ incl.cppo
+ incl2.cppo)
+ (action
+ (ignore-stdout (run %{bin:cppo} %{<}))))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-cppo-1.6.5/test/jbuild
new/ocaml-cppo-1.6.6/test/jbuild
--- old/ocaml-cppo-1.6.5/test/jbuild 2018-09-12 23:21:36.000000000 +0200
+++ new/ocaml-cppo-1.6.6/test/jbuild 1970-01-01 01:00:00.000000000 +0100
@@ -1,95 +0,0 @@
-(jbuild_version 1)
-
-(rule
- ((targets (ext.out))
- (deps (ext.cppo source.sh))
- (action
- (with-stdout-to ${@} (run ${bin:cppo} -x "rot13:tr '[a-z]' '[n-za-m]'" -x
"source:sh source.sh '%F' %B %E" ${<})))))
-
-(rule
- ((targets (comments.out))
- (deps (comments.cppo))
- (action
- (with-stdout-to ${@} (run ${bin:cppo} ${<})))))
-
-(rule
- ((targets (cond.out))
- (deps (cond.cppo))
- (action
- (with-stdout-to ${@} (run ${bin:cppo} ${<})))))
-
-(rule
- ((targets (tuple.out))
- (deps (tuple.cppo))
- (action
- (with-stdout-to ${@} (run ${bin:cppo} ${<})))))
-
-(rule
- ((targets (loc.out))
- (deps (loc.cppo))
- (action
- (with-stdout-to ${@} (run ${bin:cppo} ${<})))))
-
-(rule
- ((targets (paren_arg.out))
- (deps (paren_arg.cppo))
- (action
- (with-stdout-to ${@} (run ${bin:cppo} ${<})))))
-
-(rule
- ((targets (unmatched.out))
- (deps (unmatched.cppo))
- (action
- (with-stdout-to ${@} (run ${bin:cppo} ${<})))))
-
-(rule
- ((targets (version.out))
- (deps (version.cppo))
- (action
- (with-stdout-to ${@} (run ${bin:cppo} -V X:123.05.2-alpha.1+foo-2.1
${<})))))
-
-(alias
- ((name runtest)
- (package cppo)
- (action (diff ext.ref ext.out))))
-
-(alias
- ((name runtest)
- (package cppo)
- (action (diff comments.ref comments.out))))
-
-(alias
- ((name runtest)
- (package cppo)
- (action (diff cond.ref cond.out))))
-
-(alias
- ((name runtest)
- (package cppo)
- (action (diff tuple.ref tuple.out))))
-
-(alias
- ((name runtest)
- (package cppo)
- (action (diff loc.ref loc.out))))
-
-(alias
- ((name runtest)
- (package cppo)
- (action (diff paren_arg.ref paren_arg.out))))
-
-(alias
- ((name runtest)
- (package cppo)
- (deps (version.out))))
-
-(alias
- ((name runtest)
- (package cppo)
- (action (diff unmatched.ref unmatched.out))))
-
-(alias
- ((name runtest)
- (package cppo)
- (deps (test.cppo incl.cppo incl2.cppo))
- (action (ignore-stdout (run ${bin:cppo} ${<})))))
