pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/devel/ocaml-ppx_core Updated package to version 114.01...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/ed4de6898bf7
branches:  trunk
changeset: 351265:ed4de6898bf7
user:      jaapb <jaapb%pkgsrc.org@localhost>
date:      Thu Aug 18 10:48:06 2016 +0000

description:
Updated package to version 114.01+04. This is an unreleased version based
on a GitHub tag; reason for this is that the latest released version,
113.33.03, does not compile with pkgsrc. The patches for this are already in
GitHub, hence this update.

Changes include:
* We currently reject code which contains attribute on constructor inside polymorphic variant types definition. The reason is that while there is a dedicated place for them in the AST, the surface 
syntax didn't allow one to write such attributes.
  This won't be true anymore once we switch to 4.03 as documentation comments present in these locations get turned into attributes.
* accept attributes on object types fields.
* Make all ppx rewriters context free. We currently have an API for context free extension expanders but other kind of transformations still require a full AST traversal, even though they are all 
local transformations.
  This features adds the necessary bits to make it possible to merge all the transformations in one pass. This both improve speed and semantic. Speed as we do less passes, and semantic as the 
resulting AST is completely independent of the order in which transformations are listed in jbuild files.
  Passes before this feature:
  $ ppx.exe -print-passes
  <builtin:freshen-and-collect-attributes>
  <bultin:context-free>
  type_conv
  custom_printf
  expect_test
  fail
  js_style
  pipebang
  <builtin:check-unused-attributes>
  <builtin:check-unused-extensions>
  After:
  <builtin:freshen-and-collect-attributes>
  <bultin:context-free>
  js_style
  <builtin:check-unused-attributes>
  <builtin:check-unused-extensions>
  The resulting driver is about twice faster, which might help compilation speed.

diffstat:

 devel/ocaml-ppx_core/Makefile               |  14 ++++++++------
 devel/ocaml-ppx_core/PLIST                  |  22 +++++++++++++++++++++-
 devel/ocaml-ppx_core/distinfo               |  12 ++++++------
 devel/ocaml-ppx_core/patches/patch-Makefile |  23 -----------------------
 devel/ocaml-ppx_core/patches/patch-_oasis   |  14 ++++++++++++++
 5 files changed, 49 insertions(+), 36 deletions(-)

diffs (173 lines):

diff -r 5880c993f72a -r ed4de6898bf7 devel/ocaml-ppx_core/Makefile
--- a/devel/ocaml-ppx_core/Makefile     Thu Aug 18 10:34:53 2016 +0000
+++ b/devel/ocaml-ppx_core/Makefile     Thu Aug 18 10:48:06 2016 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2016/06/20 18:48:10 jaapb Exp $
+# $NetBSD: Makefile,v 1.5 2016/08/18 10:48:06 jaapb Exp $
 
-VERSION=       113.33.01
+VERSION=       114.01+04
 GITHUB_PROJECT=        ppx_core
-GITHUB_TAG=    ${VERSION}+4.03
+GITHUB_TAG=    e5577ab
 DISTNAME=      ${GITHUB_PROJECT}-${VERSION}
 PKGNAME=       ocaml-${DISTNAME}
 CATEGORIES=    devel
@@ -13,16 +13,18 @@
 COMMENT=       Standard library for OCaml ppx rewriters
 LICENSE=       apache-2.0
 
-WRKSRC=                ${WRKDIR}/${GITHUB_PROJECT}-${VERSION}-4.03
+WRKSRC=                ${WRKDIR}/${GITHUB_PROJECT}-e5577ab345e2485cb6a7427f24b35840f5886490
 
 HAS_CONFIGURE= yes
 USE_LANGUAGES= # none
+OCAML_USE_OASIS_DYNRUN=        yes
 
-OCAML_USE_FINDLIB=     yes
+post-extract:
+       ${MV} ${WRKSRC}/META.ab ${WRKSRC}/src
 
+.include "../../devel/ocaml-js-build-tools/buildlink3.mk"
 .include "../../devel/ocaml-oasis/buildlink3.mk"
 .include "../../devel/ocaml-ppx_tools/buildlink3.mk"
 .include "../../devel/ocamlbuild/buildlink3.mk"
-.include "../../misc/ocaml-opam/buildlink3.mk"
 .include "../../mk/ocaml.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 5880c993f72a -r ed4de6898bf7 devel/ocaml-ppx_core/PLIST
--- a/devel/ocaml-ppx_core/PLIST        Thu Aug 18 10:34:53 2016 +0000
+++ b/devel/ocaml-ppx_core/PLIST        Thu Aug 18 10:48:06 2016 +0000
@@ -1,22 +1,30 @@
-@comment $NetBSD: PLIST,v 1.2 2016/06/20 18:48:10 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.3 2016/08/18 10:48:06 jaapb Exp $
+bin/gen
+bin/gen_ast_builder
+bin/gen_ast_pattern
 ${OCAML_SITELIB}/ppx_core/META
 ${OCAML_SITELIB}/ppx_core/ast_builder.annot
 ${OCAML_SITELIB}/ppx_core/ast_builder.cmt
 ${OCAML_SITELIB}/ppx_core/ast_builder.cmti
+${OCAML_SITELIB}/ppx_core/ast_builder.mli
 ${OCAML_SITELIB}/ppx_core/ast_builder_generated.annot
 ${OCAML_SITELIB}/ppx_core/ast_builder_generated.cmt
 ${OCAML_SITELIB}/ppx_core/ast_builder_intf.annot
 ${OCAML_SITELIB}/ppx_core/ast_builder_intf.cmt
+${OCAML_SITELIB}/ppx_core/ast_builder_intf.ml
 ${OCAML_SITELIB}/ppx_core/ast_pattern.annot
 ${OCAML_SITELIB}/ppx_core/ast_pattern.cmt
 ${OCAML_SITELIB}/ppx_core/ast_pattern.cmti
+${OCAML_SITELIB}/ppx_core/ast_pattern.mli
 ${OCAML_SITELIB}/ppx_core/ast_pattern0.annot
 ${OCAML_SITELIB}/ppx_core/ast_pattern0.cmt
+${OCAML_SITELIB}/ppx_core/ast_pattern0.ml
 ${OCAML_SITELIB}/ppx_core/ast_pattern_generated.annot
 ${OCAML_SITELIB}/ppx_core/ast_pattern_generated.cmt
 ${OCAML_SITELIB}/ppx_core/ast_traverse.annot
 ${OCAML_SITELIB}/ppx_core/ast_traverse.cmt
 ${OCAML_SITELIB}/ppx_core/ast_traverse.cmti
+${OCAML_SITELIB}/ppx_core/ast_traverse.mli
 ${OCAML_SITELIB}/ppx_core/ast_traverse_fold.annot
 ${OCAML_SITELIB}/ppx_core/ast_traverse_fold.cmt
 ${OCAML_SITELIB}/ppx_core/ast_traverse_fold.cmti
@@ -35,20 +43,30 @@
 ${OCAML_SITELIB}/ppx_core/attribute.annot
 ${OCAML_SITELIB}/ppx_core/attribute.cmt
 ${OCAML_SITELIB}/ppx_core/attribute.cmti
+${OCAML_SITELIB}/ppx_core/attribute.mli
 ${OCAML_SITELIB}/ppx_core/caller_id.annot
 ${OCAML_SITELIB}/ppx_core/caller_id.cmt
+${OCAML_SITELIB}/ppx_core/caller_id.ml
 ${OCAML_SITELIB}/ppx_core/common.annot
 ${OCAML_SITELIB}/ppx_core/common.cmt
 ${OCAML_SITELIB}/ppx_core/common.cmti
+${OCAML_SITELIB}/ppx_core/common.mli
+${OCAML_SITELIB}/ppx_core/context_free.annot
+${OCAML_SITELIB}/ppx_core/context_free.cmt
+${OCAML_SITELIB}/ppx_core/context_free.cmti
+${OCAML_SITELIB}/ppx_core/context_free.mli
 ${OCAML_SITELIB}/ppx_core/extension.annot
 ${OCAML_SITELIB}/ppx_core/extension.cmt
 ${OCAML_SITELIB}/ppx_core/extension.cmti
+${OCAML_SITELIB}/ppx_core/extension.mli
 ${OCAML_SITELIB}/ppx_core/file_path.annot
 ${OCAML_SITELIB}/ppx_core/file_path.cmt
 ${OCAML_SITELIB}/ppx_core/file_path.cmti
+${OCAML_SITELIB}/ppx_core/file_path.mli
 ${OCAML_SITELIB}/ppx_core/name.annot
 ${OCAML_SITELIB}/ppx_core/name.cmt
 ${OCAML_SITELIB}/ppx_core/name.cmti
+${OCAML_SITELIB}/ppx_core/name.mli
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_core/ppx_core.a
 ${OCAML_SITELIB}/ppx_core/ppx_core.cma
 ${OCAML_SITELIB}/ppx_core/ppx_core.cmi
@@ -58,5 +76,7 @@
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_core/ppx_core.cmxs
 ${OCAML_SITELIB}/ppx_core/spellcheck.annot
 ${OCAML_SITELIB}/ppx_core/spellcheck.cmt
+${OCAML_SITELIB}/ppx_core/spellcheck.ml
 ${OCAML_SITELIB}/ppx_core/std.annot
 ${OCAML_SITELIB}/ppx_core/std.cmt
+${OCAML_SITELIB}/ppx_core/std.ml
diff -r 5880c993f72a -r ed4de6898bf7 devel/ocaml-ppx_core/distinfo
--- a/devel/ocaml-ppx_core/distinfo     Thu Aug 18 10:34:53 2016 +0000
+++ b/devel/ocaml-ppx_core/distinfo     Thu Aug 18 10:48:06 2016 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2016/06/20 18:48:10 jaapb Exp $
+$NetBSD: distinfo,v 1.3 2016/08/18 10:48:06 jaapb Exp $
 
-SHA1 (ppx_core-113.33.01.tar.gz) = 5154aaabd1a62009fd8e98c246c46ca8411aad08
-RMD160 (ppx_core-113.33.01.tar.gz) = ce85219f8d0017a38573ae2389a4625004ee1b46
-SHA512 (ppx_core-113.33.01.tar.gz) = 7a7aec70e96912021b8d81f4561742c47b18b42dd8207eb59b580b150b0a8cf0ac1f7c2f78f5cd0dc249fda9b1548c9a51072686cfd193be882832c50dd8eab9
-Size (ppx_core-113.33.01.tar.gz) = 38685 bytes
-SHA1 (patch-Makefile) = 9992302efc5d05f8dc1f0fd0fa669feaa61787db
+SHA1 (ppx_core-114.01+04-e5577ab.tar.gz) = a3744f1351ac25587ac14419894ece499aee558d
+RMD160 (ppx_core-114.01+04-e5577ab.tar.gz) = 99ad2b219a86509b2ec4dc6115df82b9ee8a5ffc
+SHA512 (ppx_core-114.01+04-e5577ab.tar.gz) = 33047a8e2a48d88716fe343905048824fbd6ee7d038526b97e27a976447d90d0b260e4197126f83ab549fadbba04e26e196f5c8e9c00a4733d3e9e835dc36acc
+Size (ppx_core-114.01+04-e5577ab.tar.gz) = 42770 bytes
+SHA1 (patch-_oasis) = 6e892e36c7a7329c6f26dc3cc29e37e29cb169c3
diff -r 5880c993f72a -r ed4de6898bf7 devel/ocaml-ppx_core/patches/patch-Makefile
--- a/devel/ocaml-ppx_core/patches/patch-Makefile       Thu Aug 18 10:34:53 2016 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-$NetBSD: patch-Makefile,v 1.1 2016/06/20 18:48:10 jaapb Exp $
-
-Install in corrrect location
---- Makefile.orig      2016-04-18 10:14:21.000000000 +0000
-+++ Makefile
-@@ -2,7 +2,7 @@
- 
- SETUP := setup.exe
- NAME := ppx_core
--PREFIX = $(shell grep ^prefix= setup.data | cut -d\" -f 2)
-+#PREFIX = $(shell grep ^prefix= setup.data | cut -d\" -f 2)
- 
- # Default rule
- default: build
-@@ -30,7 +30,7 @@ $(NAME).install: js-utils/gen_install.ml
-       ocaml -I js-utils js-utils/gen_install.ml
- 
- install: $(NAME).install
--      opam-installer -i --prefix $(PREFIX) $(NAME).install
-+      opam-installer -i --prefix ${DESTDIR}$(PREFIX) --libdir ${OCAML_SITELIBDIR} $(NAME).install
- 
- uninstall: $(NAME).install
-       opam-installer -u --prefix $(PREFIX) $(NAME).install
diff -r 5880c993f72a -r ed4de6898bf7 devel/ocaml-ppx_core/patches/patch-_oasis
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/ocaml-ppx_core/patches/patch-_oasis Thu Aug 18 10:48:06 2016 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-_oasis,v 1.1 2016/08/18 10:48:06 jaapb Exp $
+
+Properly detect and generate META files
+--- _oasis.orig        2016-07-12 16:08:10.000000000 +0000
++++ _oasis
+@@ -17,7 +17,7 @@ BuildTools:            ocamlbuild
+ BetaFeatures:          section_object
+ AlphaFeatures:         ocamlbuild_more_args
+ XOCamlbuildPluginTags: package(js-build-tools.ocamlbuild_goodies)
+-FilesAB:               META.ab
++FilesAB:               src/META.ab
+ Description:
+   Part of the Jane Street's PPX rewriters collection.
+ 



Home | Main Index | Thread Index | Old Index