commit ocaml-cppo for openSUSE:Factory
Hello community, here is the log from the commit of package ocaml-cppo for openSUSE:Factory checked in at 2020-03-09 14:13:50 Comparing /work/SRC/openSUSE:Factory/ocaml-cppo (Old) and /work/SRC/openSUSE:Factory/.ocaml-cppo.new.26092 (New) Package is "ocaml-cppo" Mon Mar 9 14:13:50 2020 rev:8 rq:778548 version:1.6.6 Changes: --- /work/SRC/openSUSE:Factory/ocaml-cppo/ocaml-cppo.changes2019-11-12 16:11:39.819768108 +0100 +++ /work/SRC/openSUSE:Factory/.ocaml-cppo.new.26092/ocaml-cppo.changes 2020-03-09 14:13:50.910524966 +0100 @@ -1,0 +2,6 @@ +Thu Feb 20 20:20:20 UTC 2020 - oher...@suse.de + +- Require current ocaml-rpm-macros +- Remove cppo_ocamlbuild in preparation of ocamlbuild removal + +--- Other differences: -- ++ ocaml-cppo.spec ++ --- /var/tmp/diff_new_pack.P2KBml/_old 2020-03-09 14:13:51.318525235 +0100 +++ /var/tmp/diff_new_pack.P2KBml/_new 2020-03-09 14:13:51.322525237 +0100 @@ -29,8 +29,7 @@ Source: %{name}-%{version}.tar.xz BuildRequires: ocaml BuildRequires: ocaml-dune -BuildRequires: ocaml-rpm-macros >= 20191101 -BuildRequires: ocamlfind(ocamlbuild) +BuildRequires: ocaml-rpm-macros >= 20200220 BuildRequires: ocamlfind(str) BuildRequires: ocamlfind(unix) @@ -60,7 +59,7 @@ %autosetup -p1 %build -dune_release_pkgs='cppo,cppo_ocamlbuild' +dune_release_pkgs='cppo' %ocaml_dune_setup %ocaml_dune_build
commit ocaml-cppo for openSUSE:Factory
Hello community, here is the log from the commit of package ocaml-cppo for openSUSE:Factory checked in at 2019-11-12 16:11:39 Comparing /work/SRC/openSUSE:Factory/ocaml-cppo (Old) and /work/SRC/openSUSE:Factory/.ocaml-cppo.new.2990 (New) Package is "ocaml-cppo" Tue Nov 12 16:11:39 2019 rev:7 rq:746694 version:1.6.6 Changes: --- /work/SRC/openSUSE:Factory/ocaml-cppo/ocaml-cppo.changes2019-10-24 23:02:50.264079280 +0200 +++ /work/SRC/openSUSE:Factory/.ocaml-cppo.new.2990/ocaml-cppo.changes 2019-11-12 16:11:39.819768108 +0100 @@ -1,0 +2,5 @@ +Fri Nov 1 12:34:56 UTC 2019 - oher...@suse.de + +- Require current dune macros + +--- Other differences: -- ++ ocaml-cppo.spec ++ --- /var/tmp/diff_new_pack.4AJ5qO/_old 2019-11-12 16:11:40.503768843 +0100 +++ /var/tmp/diff_new_pack.4AJ5qO/_new 2019-11-12 16:11:40.507768847 +0100 @@ -14,7 +14,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -29,8 +29,7 @@ Source: %{name}-%{version}.tar.xz BuildRequires: ocaml BuildRequires: ocaml-dune -BuildRequires: ocaml-rpm-macros >= 20191009 -BuildRequires: ocamlfind(easy-format) +BuildRequires: ocaml-rpm-macros >= 20191101 BuildRequires: ocamlfind(ocamlbuild) BuildRequires: ocamlfind(str) BuildRequires: ocamlfind(unix) @@ -61,6 +60,7 @@ %autosetup -p1 %build +dune_release_pkgs='cppo,cppo_ocamlbuild' %ocaml_dune_setup %ocaml_dune_build
commit ocaml-cppo for openSUSE:Factory
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.changes2019-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 @@ -git://github.com/ocaml-community/cppo.git +https://github.com/ocaml-community/cppo.git git -1.6.5 -v1.6.5 +1.6.6 +v1.6.6 ocaml-cppo ++ 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.yml1970-01-01 01:00:00.0 +0100 +++ new/ocaml-cppo-1.6.6/.travis.yml2019-05-27 01:49:42.0 +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
commit ocaml-cppo for openSUSE:Factory
Hello community, here is the log from the commit of package ocaml-cppo for openSUSE:Factory checked in at 2019-02-20 14:11:00 Comparing /work/SRC/openSUSE:Factory/ocaml-cppo (Old) and /work/SRC/openSUSE:Factory/.ocaml-cppo.new.28833 (New) Package is "ocaml-cppo" Wed Feb 20 14:11:00 2019 rev:5 rq:677298 version:1.6.5 Changes: --- /work/SRC/openSUSE:Factory/ocaml-cppo/ocaml-cppo.changes2017-08-18 15:01:30.918555342 +0200 +++ /work/SRC/openSUSE:Factory/.ocaml-cppo.new.28833/ocaml-cppo.changes 2019-02-20 14:11:02.194945356 +0100 @@ -1,0 +2,36 @@ +Tue Feb 19 03:21:22 UTC 2019 - a...@onthewings.net + +- Update install files for ocaml-dune 1.7.1. + +--- +Fri Feb 8 01:35:59 UTC 2019 - a...@onthewings.net + +- Remove ocaml-cppo-1.6.1-install-args.patch and directly call dune + in the install section. + +--- +Tue Feb 5 18:39:39 UTC 2019 - a...@onthewings.net + +- Update to 1.6.5: + * Fix tests. + * Fix 'asr' operator. +- Update build command for latest version of dune. +- Update upstream url (migrated to ocaml-community GitHub account). + +--- +Mon Jun 11 09:28:49 UTC 2018 - a...@onthewings.net + +- Package the .ml and .dune files produced by latest dune. + +--- +Wed Jan 31 21:45:59 UTC 2018 - antoine.belv...@opensuse.org + +- Update to 1.6.1: + * Emit line directives always containing the file name, as +mandated starting with ocaml 4.07. +- Update to 1.6.0: + * BREAKING: cppo and cppo_ocamlbuild are now two distinct opam +packages. +- Build with dune instead of oasis. + +--- Old: ocaml-cppo-1.5.0.tar.xz New: ocaml-cppo-1.6.5.tar.xz Other differences: -- ++ ocaml-cppo.spec ++ --- /var/tmp/diff_new_pack.P99hgF/_old 2019-02-20 14:11:02.718945181 +0100 +++ /var/tmp/diff_new_pack.P99hgF/_new 2019-02-20 14:11:02.722945179 +0100 @@ -1,7 +1,8 @@ # # spec file for package ocaml-cppo # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 The openSUSE Project. # Copyright (c) 2015 LISA GmbH, Bingen, Germany. # # All modifications and additions to the file contributed by third parties @@ -17,24 +18,30 @@ # +# 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.5.0 +Version:1.6.5 Release:0 %{?ocaml_preserve_bytecode} Summary:The C preprocessor written in OCaml License:BSD-3-Clause Group: Development/Languages/OCaml -Url:https://github.com/mjambon/cppo +Url:https://github.com/ocaml-community/cppo Source: %{name}-%{version}.tar.xz BuildRequires: ocaml -BuildRequires: ocaml-oasis +BuildRequires: ocaml-dune BuildRequires: ocaml-ocamldoc BuildRequires: ocaml-rpm-macros >= 4.03 BuildRequires: ocamlfind(easy-format) BuildRequires: ocamlfind(ocamlbuild) BuildRequires: ocamlfind(str) BuildRequires: ocamlfind(unix) -BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if %{with opam} +BuildRequires: opam +%endif %description Cppo is an equivalent of the C preprocessor targeted at the OCaml language and @@ -62,60 +69,27 @@ %setup -q %build -echo 'let cppo_version = "%{version}"' > cppo_version.ml -# obs service changes every ^Version line ... -sh -c "sed 's/^Version.*/Version: %{version}/' | tee _oasis" <<_EOF_ -OASISFormat: 0.4 -Name:cppo -Version: 0 -Synopsis:The C preprocessor written in OCaml -Authors: Martin Jambon -LicenseFile: LICENSE -License: %{license} -Plugins: META(`oasis version`) -BuildTools: ocamlbuild - -Library ocamlbuild_cppo - Path: ocamlbuild_plugin - Modules: Ocamlbuild_cppo - Install: true - BuildDepends: ocamlbuild - -Document ocamlbuild_cppo - Title:API reference for ocamlbuild_cppo - Type: ocamlbuild - BuildTools+: ocamldoc - InstallDir: \$htmldir - Install: true - XOCamlbuildPath: . - XOCamlbuildLibraries: ocamlbuild_cppo - -Executable cppo - Path: . - MainIs: cppo_main.ml - CompiledObject: best - BuildDepends: unix, str - -Test cppo - Type: Custom (0.0.1) - Command: ln -sfvbn \$cppo cppo ; make -C test all - Run: true -_EOF_ -%oasis_setup -%ocaml_oasis_configure --enable-docs --enable-tests
commit ocaml-cppo for openSUSE:Factory
Hello community, here is the log from the commit of package ocaml-cppo for openSUSE:Factory checked in at 2017-08-18 15:01:26 Comparing /work/SRC/openSUSE:Factory/ocaml-cppo (Old) and /work/SRC/openSUSE:Factory/.ocaml-cppo.new (New) Package is "ocaml-cppo" Fri Aug 18 15:01:26 2017 rev:4 rq:512520 version:1.5.0 Changes: --- /work/SRC/openSUSE:Factory/ocaml-cppo/ocaml-cppo.changes2017-06-08 15:02:48.740638817 +0200 +++ /work/SRC/openSUSE:Factory/.ocaml-cppo.new/ocaml-cppo.changes 2017-08-18 15:01:30.918555342 +0200 @@ -1,0 +2,20 @@ +Tue Jul 25 13:04:54 UTC 2017 - oher...@suse.de + +- Use Group: Development/Languages/OCaml + +--- +Mon Jul 17 20:24:18 UTC 2017 - oher...@suse.de + +- Update Url + +--- +Mon Jul 17 12:48:58 UTC 2017 - oher...@suse.de + +- Wrap specfile conditionals to fix quilt setup + +--- +Mon Jul 17 10:48:58 UTC 2017 - oher...@suse.de + +- Remove autodeps for pre openSUSE 12.1 releases + +--- Other differences: -- ++ ocaml-cppo.spec ++ --- /var/tmp/diff_new_pack.yYGDMj/_old 2017-08-18 15:01:32.134384187 +0200 +++ /var/tmp/diff_new_pack.yYGDMj/_new 2017-08-18 15:01:32.158380810 +0200 @@ -20,11 +20,11 @@ Name: ocaml-cppo Version:1.5.0 Release:0 -%{ocaml_preserve_bytecode} +%{?ocaml_preserve_bytecode} Summary:The C preprocessor written in OCaml License:BSD-3-Clause -Group: Development/Libraries/Other -Url:http://mjambon.com/cppo.html +Group: Development/Languages/OCaml +Url:https://github.com/mjambon/cppo Source: %{name}-%{version}.tar.xz BuildRequires: ocaml BuildRequires: ocaml-oasis @@ -35,13 +35,6 @@ BuildRequires: ocamlfind(str) BuildRequires: ocamlfind(unix) BuildRoot: %{_tmppath}/%{name}-%{version}-build -# ocaml autodep start for pkg: ocaml-cppo -# hardcoded rpm dependency for pre 12.1 to compensate for lack of ocaml() provides/requires -%if 0%{?suse_version} < 1210 -Requires: ocaml-ocamlbuild -Requires: ocaml-runtime -%endif -# ocaml autodep end for pkg: ocaml-cppo %description Cppo is an equivalent of the C preprocessor targeted at the OCaml language and @@ -58,7 +51,7 @@ %packagedevel Summary:Development files for %{name} -Group: Development/Libraries/Other +Group: Development/Languages/OCaml Requires: %{name} = %{version} %descriptiondevel @@ -125,7 +118,7 @@ %{_bindir}/* %dir %{_libdir}/ocaml %dir %{_libdir}/ocaml/* -%if %{ocaml_native_compiler} +%if 0%{?ocaml_native_compiler} %{_libdir}/ocaml/*/*.cmxs %endif @@ -134,7 +127,7 @@ %{oasis_docdir_html} %dir %{_libdir}/ocaml %dir %{_libdir}/ocaml/* -%if %{ocaml_native_compiler} +%if 0%{?ocaml_native_compiler} %{_libdir}/ocaml/*/*.a %{_libdir}/ocaml/*/*.cmx %{_libdir}/ocaml/*/*.cmxa
commit ocaml-cppo for openSUSE:Factory
Hello community, here is the log from the commit of package ocaml-cppo for openSUSE:Factory checked in at 2017-06-08 15:02:47 Comparing /work/SRC/openSUSE:Factory/ocaml-cppo (Old) and /work/SRC/openSUSE:Factory/.ocaml-cppo.new (New) Package is "ocaml-cppo" Thu Jun 8 15:02:47 2017 rev:3 rq:501574 version:1.5.0 Changes: --- /work/SRC/openSUSE:Factory/ocaml-cppo/ocaml-cppo.changes2017-05-27 13:19:04.397497211 +0200 +++ /work/SRC/openSUSE:Factory/.ocaml-cppo.new/ocaml-cppo.changes 2017-06-08 15:02:48.740638817 +0200 @@ -1,0 +2,5 @@ +Wed May 31 07:07:33 UTC 2017 - o...@aepfle.de + +- Replace tabs with spaces in generated _oasis file + +--- Other differences: -- ++ ocaml-cppo.spec ++ --- /var/tmp/diff_new_pack.iCl2Nj/_old 2017-06-08 15:02:49.648510689 +0200 +++ /var/tmp/diff_new_pack.iCl2Nj/_new 2017-06-08 15:02:49.652510124 +0200 @@ -78,7 +78,7 @@ Synopsis:The C preprocessor written in OCaml Authors: Martin Jambon LicenseFile: LICENSE -License: BSD-3-Clause +License: %{license} Plugins: META(`oasis version`) BuildTools: ocamlbuild
commit ocaml-cppo for openSUSE:Factory
Hello community, here is the log from the commit of package ocaml-cppo for openSUSE:Factory checked in at 2017-05-27 13:18:03 Comparing /work/SRC/openSUSE:Factory/ocaml-cppo (Old) and /work/SRC/openSUSE:Factory/.ocaml-cppo.new (New) Package is "ocaml-cppo" Sat May 27 13:18:03 2017 rev:2 rq:498037 version:1.5.0 Changes: --- /work/SRC/openSUSE:Factory/ocaml-cppo/ocaml-cppo.changes2016-10-19 13:01:08.0 +0200 +++ /work/SRC/openSUSE:Factory/.ocaml-cppo.new/ocaml-cppo.changes 2017-05-27 13:19:04.397497211 +0200 @@ -1,0 +2,5 @@ +Wed May 17 14:40:14 UTC 2017 - oher...@suse.de + +- Update to version 1.5.0 + +--- Old: ocaml-cppo-1.3.2.tar.xz New: ocaml-cppo-1.5.0.tar.xz Other differences: -- ++ ocaml-cppo.spec ++ --- /var/tmp/diff_new_pack.DgyVeY/_old 2017-05-27 13:19:05.557333241 +0200 +++ /var/tmp/diff_new_pack.DgyVeY/_new 2017-05-27 13:19:05.557333241 +0200 @@ -1,7 +1,7 @@ # # spec file for package ocaml-cppo # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2015 LISA GmbH, Bingen, Germany. # # All modifications and additions to the file contributed by third parties @@ -16,14 +16,15 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: ocaml-cppo -Version: 1.3.2 +Version:1.5.0 Release: 0 %{ocaml_preserve_bytecode} -License: BSD-3-Clause Summary: The C preprocessor written in OCaml -Url: http://mjambon.com/cppo.html +License:BSD-3-Clause Group: Development/Libraries/Other +Url:http://mjambon.com/cppo.html Source:%{name}-%{version}.tar.xz BuildRequires: ocaml BuildRequires: ocaml-oasis @@ -37,7 +38,8 @@ # ocaml autodep start for pkg: ocaml-cppo # hardcoded rpm dependency for pre 12.1 to compensate for lack of ocaml() provides/requires %if 0%{?suse_version} < 1210 -Requires: ocaml-ocamlbuild ocaml-runtime +Requires: ocaml-ocamlbuild +Requires: ocaml-runtime %endif # ocaml autodep end for pkg: ocaml-cppo @@ -72,7 +74,7 @@ sh -c "sed 's/^Version.*/Version: %{version}/' | tee _oasis" <<_EOF_ OASISFormat: 0.4 Name:cppo -Version: %{version} +Version: 0 Synopsis:The C preprocessor written in OCaml Authors: Martin Jambon LicenseFile: LICENSE @@ -145,3 +147,4 @@ %{_libdir}/ocaml/*/*.mli %{_libdir}/ocaml/*/META +%changelog ++ _service ++ --- /var/tmp/diff_new_pack.DgyVeY/_old 2017-05-27 13:19:05.593328152 +0200 +++ /var/tmp/diff_new_pack.DgyVeY/_new 2017-05-27 13:19:05.593328152 +0200 @@ -2,8 +2,8 @@ git://github.com/mjambon/cppo.git git -1.3.2 -v1.3.2 +1.5.0 +v1.5.0 ocaml-cppo ++ ocaml-cppo-1.3.2.tar.xz -> ocaml-cppo-1.5.0.tar.xz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-cppo-1.3.2/Makefile new/ocaml-cppo-1.5.0/Makefile --- old/ocaml-cppo-1.3.2/Makefile 2016-06-20 22:00:25.0 +0200 +++ new/ocaml-cppo-1.5.0/Makefile 2017-04-24 22:34:11.0 +0200 @@ -1,4 +1,4 @@ -VERSION = 1.3.2 +VERSION = 1.5.0 ifeq "$(shell ocamlc -config |grep os_type)" "os_type: Win32" EXE=.exe @@ -45,6 +45,7 @@ endif OCAMLBUILD_INSTALL = ocamlbuild_plugin/_build/ocamlbuild_cppo.cmi \ + ocamlbuild_plugin/_build/ocamlbuild_cppo.cmx \ $(addprefix ocamlbuild_plugin/_build/,$(OCAMLBUILD_IMPL)) @@ -61,14 +62,14 @@ OCAMLBUILD_ML = ocamlbuild_cppo.ml all: $(ML) - ocamlc -o cppo$(EXE) -dtypes unix.cma str.cma $(ML) + ocamlfind ocamlc -o cppo$(EXE) -dtypes -linkpkg -package "unix str bytes" $(ML) opt: $(ML) - ocamlopt -o cppo$(EXE) -dtypes unix.cmxa str.cmxa $(ML) + ocamlfind ocamlopt -o cppo$(EXE) -dtypes -linkpkg -package "unix str bytes" $(ML) # For debugging; not installed. toplib: $(ML) - ocamlc -a -o cppo.cma -dtypes unix.cma str.cma $(ML) + ocamlfind ocamlc -a -o cppo.cma -dtypes -linkpkg -package "unix str bytes" $(ML) ocamlbuild: cd ocamlbuild_plugin && ocamlbuild -use-ocamlfind $(OCAMLBUILD_IMPL) @@ -83,6 +84,11 @@ ocamlfind install -patch-version ${VERSION} "cppo_ocamlbuild" \ META $(OCAMLBUILD_INSTALL) +uninstall-lib: + ocamlfind remove cppo_ocamlbuild + +reinstall-lib: uninstall-lib install-lib + cppo_version.ml: Makefile echo 'let cppo_version = "$(VERSION)"' > cppo_version.ml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-cppo-1.3.2/README.md