Commits

ysulsky committed 3abba1d

variantslib minor fixes

Comments (0)

Files changed (6)

 glob:base/variantslib/_oasis
 glob:base/variantslib/_tags
 glob:base/variantslib/configure
+glob:base/variantslib/lib/META
 glob:base/variantslib/myocamlbuild.ml
 glob:base/variantslib/sample/generated_test.ml
 glob:base/variantslib/sample/generated_test.mli

base/variantslib/.hgignore.in

 myocamlbuild.ml
 setup.data
 setup.ml
+lib/META

base/variantslib/lib/META

-# OASIS_START
-# DO NOT EDIT (digest: 135bc73a313e25da7bf0a993e410995b)
-version = "107.01"
-description = "OCaml variants as first class values."
-archive(byte) = "variantslib.cma"
-archive(byte, plugin) = "variantslib.cma"
-archive(native) = "variantslib.cmxa"
-archive(native, plugin) = "variantslib.cmxs"
-exists_if = "variantslib.cma"
-package "syntax" (
- version = "107.01"
- description = "Syntax extension for Variantslib"
- requires = "camlp4 type_conv variantslib"
- archive(syntax, preprocessor) = "pa_variants_conv.cma"
- archive(syntax, toploop) = "pa_variants_conv.cma"
- exists_if = "pa_variants_conv.cma"
-)
-# OASIS_STOP
-

base/variantslib/oasis.sh

 #!/usr/bin/env bash
-set -e -u -o -pipefail
+set -e -u -o pipefail
 
 source ../../build-common.sh
 

base/variantslib/preprocess.sh

-#!/usr/bin/env bash
-set -e -u
-[[ "$#" != 1 ]] && { echo "usage: $0  FILE_TO_PREPROCESS" >&2; exit 1; }
-[[ -e "$(hg root)/lib/pa_variants_conv/pa_variants_conv.cmo" ]] \
-&& [[ -e "$(hg root)/lib/pa_type_conv/pa_type_conv.cmo" ]] \
-|| {
-   echo "pa_type_conv.cmo & pa_variants_conv.cmo need to be built for this script to run" >&2;
-   exit 1
-}
-"$(jomake --ocaml-path)/bin/camlp4o" -printer 'Camlp4OCamlPrinter' -I "$(hg root)/lib/pa_type_conv" -I "$(hg root)/lib/pa_variants_conv" pa_type_conv.cmo pa_variants_conv.cmo $1

base/variantslib/release.sexp

-((language_defs
-  ((ml ((comment_style (multi_line "(*" "*)"))))))
- (env
-  ((project_name   Variantslib)
-   (copyright_year 2011)
-   (additional_header)
-   (additional_copyright)))
- (header_template_file ../header.template)
- (actions
-  ((header ml **.ml{,i})
-   (keep {myocamlbuild.ml,setup.ml})
-  (drop {**/,}{.hgignore.in,OMakefile})
-  (drop {release.sexp}))))