Skip to content

Commit

Permalink
Version 1.6
Browse files Browse the repository at this point in the history
Tested with OCaml up to 4.05.0
  • Loading branch information
pdonadeo committed Nov 19, 2017
1 parent 1c1672b commit 1775f0c
Show file tree
Hide file tree
Showing 10 changed files with 124 additions and 86 deletions.
4 changes: 2 additions & 2 deletions _oasis
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
OASISFormat: 0.4
OCamlVersion: >= 4.02.1
OCamlVersion: >= 4.02.1 && < 4.06.0
Name: ocaml-lua
Version: 1.5
Version: 1.6
Synopsis: Lua bindings
Authors: Paolo Donadeo
Maintainers: Paolo Donadeo <[email protected]>
Expand Down
46 changes: 23 additions & 23 deletions _tags
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# OASIS_START
# DO NOT EDIT (digest: c7560c1c332321c5f86fbfca11ba0369)
# DO NOT EDIT (digest: 3cb9a793696716ab7c4dd7b275e2c622)
# Ignore VCS directories, you can use the same kind of rule outside
# OASIS_START/STOP if you want to exclude directories that contains
# useless stuff for the build process
Expand All @@ -25,49 +25,49 @@ true: annot, bin_annot
"src/liblua_stubs.a": oasis_library_lua_cclib
"src/dlllua_stubs.so": oasis_library_lua_cclib
<src/lua.{cma,cmxa}>: use_liblua_stubs
<src/*.ml{,i,y}>: package(threads)
<src/*.ml{,i,y}>: package(unix)
"src/stub.c": package(threads)
"src/stub.c": package(unix)
"src/aux_stub.c": package(threads)
"src/aux_stub.c": package(unix)
<src/*.ml{,i,y}>: pkg_threads
<src/*.ml{,i,y}>: pkg_unix
"src/stub.c": pkg_threads
"src/stub.c": pkg_unix
"src/aux_stub.c": pkg_threads
"src/aux_stub.c": pkg_unix
# Executable atpanic
"tests/atpanic.native": oasis_executable_atpanic_cclib
"tests/atpanic.native": package(threads)
"tests/atpanic.native": package(unix)
"tests/atpanic.native": pkg_threads
"tests/atpanic.native": pkg_unix
"tests/atpanic.native": use_lua
"tests/atpanic.native": custom
# Executable cpcall
"tests/cpcall.native": oasis_executable_cpcall_cclib
"tests/cpcall.native": package(threads)
"tests/cpcall.native": package(unix)
"tests/cpcall.native": pkg_threads
"tests/cpcall.native": pkg_unix
"tests/cpcall.native": use_lua
"tests/cpcall.native": custom
# Executable fasta_threads
"tests/fasta_threads.native": oasis_executable_fasta_threads_cclib
"tests/fasta_threads.native": package(threads)
"tests/fasta_threads.native": package(unix)
"tests/fasta_threads.native": pkg_threads
"tests/fasta_threads.native": pkg_unix
"tests/fasta_threads.native": use_lua
<tests/*.ml{,i,y}>: package(threads)
<tests/*.ml{,i,y}>: package(unix)
<tests/*.ml{,i,y}>: pkg_threads
<tests/*.ml{,i,y}>: pkg_unix
<tests/*.ml{,i,y}>: use_lua
"tests/fasta_threads.native": custom
# Executable ci
"examples/ci/ci.native": oasis_executable_ci_cclib
"examples/ci/ci.native": package(threads)
"examples/ci/ci.native": package(unix)
"examples/ci/ci.native": pkg_threads
"examples/ci/ci.native": pkg_unix
"examples/ci/ci.native": use_lua
<examples/ci/*.ml{,i,y}>: package(threads)
<examples/ci/*.ml{,i,y}>: package(unix)
<examples/ci/*.ml{,i,y}>: pkg_threads
<examples/ci/*.ml{,i,y}>: pkg_unix
<examples/ci/*.ml{,i,y}>: use_lua
"examples/ci/ci.native": custom
# Executable dir
"examples/lua_book/dir.native": oasis_executable_dir_cclib
"examples/lua_book/dir.native": package(threads)
"examples/lua_book/dir.native": package(unix)
"examples/lua_book/dir.native": pkg_threads
"examples/lua_book/dir.native": pkg_unix
"examples/lua_book/dir.native": use_lua
<examples/lua_book/*.ml{,i,y}>: package(threads)
<examples/lua_book/*.ml{,i,y}>: package(unix)
<examples/lua_book/*.ml{,i,y}>: pkg_threads
<examples/lua_book/*.ml{,i,y}>: pkg_unix
<examples/lua_book/*.ml{,i,y}>: use_lua
"examples/lua_book/dir.native": custom
# OASIS_STOP
20 changes: 7 additions & 13 deletions myocamlbuild.ml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
(* OASIS_START *)
(* DO NOT EDIT (digest: 0103444a92d0fa168850b303ad820405) *)
(* DO NOT EDIT (digest: 02bbfb60b1b53cdb243ac87d952f689f) *)
module OASISGettext = struct
(* # 22 "src/oasis/OASISGettext.ml" *)

Expand Down Expand Up @@ -105,10 +105,7 @@ module OASISString = struct
ok := false;
incr str_idx
done;
if !what_idx = String.length what then
true
else
false
!what_idx = String.length what


let strip_starts_with ~what str =
Expand All @@ -131,10 +128,7 @@ module OASISString = struct
ok := false;
decr str_idx
done;
if !what_idx = -1 then
true
else
false
!what_idx = -1


let strip_ends_with ~what str =
Expand Down Expand Up @@ -440,7 +434,7 @@ module OASISExpr = struct
end


# 443 "myocamlbuild.ml"
# 437 "myocamlbuild.ml"
module BaseEnvLight = struct
(* # 22 "src/base/BaseEnvLight.ml" *)

Expand Down Expand Up @@ -520,7 +514,7 @@ module BaseEnvLight = struct
end


# 523 "myocamlbuild.ml"
# 517 "myocamlbuild.ml"
module MyOCamlbuildFindlib = struct
(* # 22 "src/plugins/ocamlbuild/MyOCamlbuildFindlib.ml" *)

Expand Down Expand Up @@ -881,7 +875,7 @@ module MyOCamlbuildBase = struct
end


# 884 "myocamlbuild.ml"
# 878 "myocamlbuild.ml"
open Ocamlbuild_plugin;;
let package_default =
{
Expand Down Expand Up @@ -941,6 +935,6 @@ let conf = {MyOCamlbuildFindlib.no_automatic_syntax = false}

let dispatch_default = MyOCamlbuildBase.dispatch_default conf package_default;;

# 945 "myocamlbuild.ml"
# 939 "myocamlbuild.ml"
(* OASIS_STOP *)
Ocamlbuild_plugin.dispatch dispatch_default;;
10 changes: 10 additions & 0 deletions opam/ocaml-lua.1.6/descr
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
Lua bindings
Lua is a powerful, light-weight programming language designed for
extending applications. It provides a good general purpose programming
language to replace DSL that don't really need to be specific.

This library provides bindings to Lua API which allows the application
to exchange data with Lua programs and also to extend Lua with OCaml
functions.

[Lua homepage](http://www.lua.org)
1 change: 1 addition & 0 deletions opam/ocaml-lua.1.6/findlib
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
lua
43 changes: 43 additions & 0 deletions opam/ocaml-lua.1.6/opam
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
opam-version: "1.2"
maintainer: "[email protected]"
authors: [
"Paolo Donadeo"
"Sylvain Le Gall"
]
homepage: "https://pdonadeo.github.io/ocaml-lua/"
bug-reports: "https://github.com/pdonadeo/ocaml-lua/issues"
dev-repo: "https://github.com/pdonadeo/ocaml-lua.git"
license: "MIT"
build: [
[
"./configure"
"--enable-docs"
"--prefix"
prefix
"--docdir"
"%{doc}%/ocaml-lua"
"--libdir"
"%{lib}%/ocaml-lua"
]
[make]
[make "doc"]
]
remove: [
["ocamlfind" "remove" "lua"]
["rm" "-R" "%{doc}%/ocaml-lua"]
]
depends: [
"ocamlfind"
"ocamlbuild" {build}
]
depexts: [
[["debian"] ["liblua5.1-0-dev"]]
[["ubuntu"] ["liblua5.1-0-dev"]]
[["fedora"] ["compat-lua-devel"]]
[["centos"] ["lua-devel"]]
[["osx" "homebrew"] ["lua51"]]
[["alpine"] ["lua-dev"]]
[["opensuse"] ["lua51-devel"]]
]
available: [ ocaml-version >= "4.02.1" & ocaml-version < "4.06.0" ]
install: [make "install"]
2 changes: 2 additions & 0 deletions opam/ocaml-lua.1.6/url
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
archive: "https://github.com/pdonadeo/ocaml-lua/archive/v1.5.tar.gz"
checksum: "8be2a64b979fc4f559f1c372c78fbd88"
Loading

0 comments on commit 1775f0c

Please sign in to comment.