[Pkg-ocaml-maint-commits] [ocaml-fileutils] 02/08: New upstream version 0.5.2
Stéphane Glondu
glondu at moszumanska.debian.org
Sun Jul 16 11:44:58 UTC 2017
This is an automated email from the git hooks/post-receive script.
glondu pushed a commit to branch master
in repository ocaml-fileutils.
commit 2615c533f9e38f85bf8ab0a1cb42ecf36852f541
Author: Stephane Glondu <steph at glondu.net>
Date: Sun Jul 16 13:35:07 2017 +0200
New upstream version 0.5.2
---
CHANGELOG.txt | 14 ++++++++++
Makefile | 1 +
_oasis | 12 ++++-----
myocamlbuild.ml | 23 +++++++---------
setup.ml | 81 +++++++++++++++++++++++++------------------------------
src/FileUtilRM.ml | 2 +-
src/META | 6 ++---
website/Makefile | 2 +-
8 files changed, 72 insertions(+), 69 deletions(-)
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index ea59383..44dee63 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,17 @@
+v0.5.2:
+ * Minor release:
+ - Test file existence with Unix.LargeFile.lstat in FileUtilRM.
+ (Closes: #1749)
+
+ -- Sylvain Le Gall Tue, 23 May 2017 22:09:38 +0200
+
+v0.5.1:
+ * Minor release:
+ - Fix non POSIX behavior of cp with links when "recurse:false".
+ (Closes: #1649)
+
+ -- Sylvain Le Gall Wed, 02 Nov 2016 00:19:58 +0100
+
v0.5.0:
* Major release to account all the API changes:
* Rebuild the exception/reporting framework:
diff --git a/Makefile b/Makefile
index 8d64ee0..4f70058 100644
--- a/Makefile
+++ b/Makefile
@@ -110,6 +110,7 @@ doc-dev-dist: doc fix-perms
# Deploy/release the software.
deploy: doc
+ mkdir dist || true
./doc-dist.sh --version $(shell oasis query version)
admin-gallu-deploy --verbose \
--forge_upload --forge_group ocaml-fileutils --forge_user gildor-admin \
diff --git a/_oasis b/_oasis
index 31b2e7d..1976c47 100644
--- a/_oasis
+++ b/_oasis
@@ -1,12 +1,12 @@
-OASISFormat: 0.3
+OASISFormat: 0.4
Name: ocaml-fileutils
-Version: 0.5.1
+Version: 0.5.2
Authors: Sylvain Le Gall
Copyrights: (C) 2003-2014 Sylvain Le Gall
License: LGPL-2.1 with OCaml linking exception
LicenseFile: LICENSE
BuildTools: ocamlbuild
-Plugins: DevFiles (0.3), StdFiles (0.3), META (0.3)
+Plugins: DevFiles (0.4), StdFiles (0.4), META (0.4)
Synopsis: Functions to manipulate real file (POSIX like) and filename.
Library "fileutils"
@@ -52,7 +52,7 @@ Library "fileutils-str"
Document "api-fileutils"
Title: API reference for fileutils
- Type: ocamlbuild (0.3)
+ Type: ocamlbuild (0.4)
InstallDir: $htmldir/api
BuildTools+: ocamldoc
XOCamlbuildPath: src/
@@ -79,11 +79,11 @@ Executable test
Install: false
Test "bench-find"
- Type: custom (0.3)
+ Type: custom (0.4)
Command: $BenchFind
Run: false
Test main
- Type: custom (0.2)
+ Type: custom (0.4)
Command: $test
WorkingDirectory: test
diff --git a/myocamlbuild.ml b/myocamlbuild.ml
index 08e0459..0285223 100644
--- a/myocamlbuild.ml
+++ b/myocamlbuild.ml
@@ -1,5 +1,5 @@
(* OASIS_START *)
-(* DO NOT EDIT (digest: 85e0f9044fef08a257c01ad71dd88489) *)
+(* DO NOT EDIT (digest: 2ff2fa208b8292955ad39dda4ee05185) *)
module OASISGettext = struct
(* # 22 "src/oasis/OASISGettext.ml" *)
@@ -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 =
@@ -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 =
@@ -440,7 +434,7 @@ module OASISExpr = struct
end
-# 443 "myocamlbuild.ml"
+# 437 "myocamlbuild.ml"
module BaseEnvLight = struct
(* # 22 "src/base/BaseEnvLight.ml" *)
@@ -520,7 +514,7 @@ module BaseEnvLight = struct
end
-# 523 "myocamlbuild.ml"
+# 517 "myocamlbuild.ml"
module MyOCamlbuildFindlib = struct
(* # 22 "src/plugins/ocamlbuild/MyOCamlbuildFindlib.ml" *)
@@ -746,6 +740,9 @@ module MyOCamlbuildBase = struct
(* # 110 "src/plugins/ocamlbuild/MyOCamlbuildBase.ml" *)
+ let env_filename = Pathname.basename BaseEnvLight.default_filename
+
+
let dispatch_combine lst =
fun e ->
List.iter
@@ -878,7 +875,7 @@ module MyOCamlbuildBase = struct
end
-# 881 "myocamlbuild.ml"
+# 878 "myocamlbuild.ml"
open Ocamlbuild_plugin;;
let package_default =
{
@@ -894,6 +891,6 @@ let conf = {MyOCamlbuildFindlib.no_automatic_syntax = false}
let dispatch_default = MyOCamlbuildBase.dispatch_default conf package_default;;
-# 898 "myocamlbuild.ml"
+# 895 "myocamlbuild.ml"
(* OASIS_STOP *)
Ocamlbuild_plugin.dispatch dispatch_default;;
diff --git a/setup.ml b/setup.ml
index 23ac85b..6ee86ef 100644
--- a/setup.ml
+++ b/setup.ml
@@ -22,9 +22,9 @@
(* setup.ml generated for the first time by OASIS v0.2.0 *)
(* OASIS_START *)
-(* DO NOT EDIT (digest: ca3711bf819dc4b0d2beb68f31d67fe2) *)
+(* DO NOT EDIT (digest: 3ebd9340cfb58b7468d8fd0f06e55bde) *)
(*
- Regenerated by OASIS v0.4.7
+ Regenerated by OASIS v0.4.11~HEAD
Visit http://oasis.forge.ocamlcore.org for more information and
documentation about functions used in this file.
*)
@@ -133,10 +133,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 =
@@ -159,10 +156,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 =
@@ -679,6 +673,7 @@ module OASISContext = struct
ignore_unknown_fields: bool;
printf: level -> string -> unit;
srcfs: source OASISFileSystem.fs;
+ load_oasis_plugin: string -> bool;
}
@@ -703,6 +698,7 @@ module OASISContext = struct
ignore_unknown_fields = false;
printf = printf;
srcfs = new OASISFileSystem.host_fs(Sys.getcwd ());
+ load_oasis_plugin = (fun _ -> false);
}
@@ -3181,7 +3177,7 @@ module OASISFileUtil = struct
end
-# 3163 "setup.ml"
+# 3159 "setup.ml"
module BaseEnvLight = struct
(* # 22 "src/base/BaseEnvLight.ml" *)
@@ -3261,7 +3257,7 @@ module BaseEnvLight = struct
end
-# 3243 "setup.ml"
+# 3239 "setup.ml"
module BaseContext = struct
(* # 22 "src/base/BaseContext.ml" *)
@@ -5684,7 +5680,7 @@ module BaseCompat = struct
end
-# 5666 "setup.ml"
+# 5662 "setup.ml"
module InternalConfigurePlugin = struct
(* # 22 "src/plugins/internal/InternalConfigurePlugin.ml" *)
@@ -6035,17 +6031,14 @@ module InternalInstallPlugin = struct
let install =
- let in_destdir =
+ let in_destdir fn =
try
- let destdir =
- destdir ()
- in
- (* Practically speaking destdir is prepended
- * at the beginning of the target filename
- *)
- fun fn -> destdir^fn
+ (* Practically speaking destdir is prepended at the beginning of the
+ target filename
+ *)
+ (destdir ())^fn
with PropList.Not_set _ ->
- fun fn -> fn
+ fn
in
let install_file ~ctxt ?(prepend_destdir=true) ?tgt_fn src_file envdir =
@@ -6490,7 +6483,7 @@ module InternalInstallPlugin = struct
end
-# 6472 "setup.ml"
+# 6465 "setup.ml"
module OCamlbuildCommon = struct
(* # 22 "src/plugins/ocamlbuild/OCamlbuildCommon.ml" *)
@@ -6847,11 +6840,10 @@ module OCamlbuildDocPlugin = struct
run_ocamlbuild ~ctxt (index_html :: run.extra_args) argv;
List.iter
(fun glb ->
- BaseBuilt.register
- ~ctxt
- BaseBuilt.BDoc
- cs.cs_name
- [OASISFileUtil.glob ~ctxt (Filename.concat tgt_dir glb)])
+ match OASISFileUtil.glob ~ctxt (Filename.concat tgt_dir glb) with
+ | (_ :: _) as filenames ->
+ BaseBuilt.register ~ctxt BaseBuilt.BDoc cs.cs_name [filenames]
+ | [] -> ())
["*.html"; "*.css"]
@@ -6863,7 +6855,7 @@ module OCamlbuildDocPlugin = struct
end
-# 6845 "setup.ml"
+# 6837 "setup.ml"
module CustomPlugin = struct
(* # 22 "src/plugins/custom/CustomPlugin.ml" *)
@@ -6995,7 +6987,7 @@ module CustomPlugin = struct
end
-# 6977 "setup.ml"
+# 6969 "setup.ml"
open OASISTypes;;
let setup_t =
@@ -7078,9 +7070,9 @@ let setup_t =
distclean_doc = [];
package =
{
- oasis_version = "0.3";
+ oasis_version = "0.4";
ocaml_version = None;
- version = "0.5.1";
+ version = "0.5.2";
license =
OASISLicense.DEP5License
(OASISLicense.DEP5Unit
@@ -7432,7 +7424,7 @@ let setup_t =
cs_plugin_data = []
},
{
- doc_type = (`Doc, "ocamlbuild", Some "0.3");
+ doc_type = (`Doc, "ocamlbuild", Some "0.4");
doc_custom =
{
pre_command = [(OASISExpr.EBool true, None)];
@@ -7761,7 +7753,7 @@ let setup_t =
cs_plugin_data = []
},
{
- test_type = (`Test, "custom", Some "0.3");
+ test_type = (`Test, "custom", Some "0.4");
test_command =
[(OASISExpr.EBool true, ("$BenchFind", []))];
test_custom =
@@ -7784,7 +7776,7 @@ let setup_t =
cs_plugin_data = []
},
{
- test_type = (`Test, "custom", Some "0.2");
+ test_type = (`Test, "custom", Some "0.4");
test_command = [(OASISExpr.EBool true, ("$test", []))];
test_custom =
{
@@ -7836,17 +7828,16 @@ let setup_t =
};
plugins =
[
- (`Extra, "DevFiles", Some "0.3");
- (`Extra, "StdFiles", Some "0.3");
- (`Extra, "META", Some "0.3")
+ (`Extra, "DevFiles", Some "0.4");
+ (`Extra, "StdFiles", Some "0.4");
+ (`Extra, "META", Some "0.4")
];
schema_data = PropList.Data.create ();
plugin_data = []
};
- oasis_fn = Some "_oasis";
- oasis_version = "0.4.7";
- oasis_digest =
- Some "\011\159#J\143\145\006\247\218\192=\154\012\132\020\136";
+ oasis_fn = None;
+ oasis_version = "0.4.11~HEAD";
+ oasis_digest = None;
oasis_exec = None;
oasis_setup_args = [];
setup_update = false
@@ -7854,9 +7845,9 @@ let setup_t =
let setup () = BaseSetup.setup setup_t;;
-# 7837 "setup.ml"
-let setup_t = BaseCompat.Compat_0_3.adapt_setup_t setup_t
-open BaseCompat.Compat_0_3
+# 7828 "setup.ml"
+let setup_t = BaseCompat.Compat_0_4.adapt_setup_t setup_t
+open BaseCompat.Compat_0_4
(* OASIS_STOP *)
let () = setup ();;
diff --git a/src/FileUtilRM.ml b/src/FileUtilRM.ml
index 4f292a8..0bc7e1d 100644
--- a/src/FileUtilRM.ml
+++ b/src/FileUtilRM.ml
@@ -64,7 +64,7 @@ let rm
(fun fn ->
let exists =
try
- let _st: Unix.stats = Unix.lstat fn in
+ let _st: Unix.LargeFile.stats = Unix.LargeFile.lstat fn in
true
with Unix.Unix_error(Unix.ENOENT, _, _) ->
false
diff --git a/src/META b/src/META
index a8813f2..dd8ded3 100644
--- a/src/META
+++ b/src/META
@@ -1,6 +1,6 @@
# OASIS_START
-# DO NOT EDIT (digest: f17ba16c32d067718ddf51fed6bdad61)
-version = "0.5.1"
+# DO NOT EDIT (digest: 2980041ae6b330235ad5dc97a9a5f896)
+version = "0.5.2"
description = "Functions to manipulate real file (POSIX like) and filename."
requires = "unix"
archive(byte) = "fileutils.cma"
@@ -9,7 +9,7 @@ archive(native) = "fileutils.cmxa"
archive(native, plugin) = "fileutils.cmxs"
exists_if = "fileutils.cma"
package "str" (
- version = "0.5.1"
+ version = "0.5.2"
description = "Functions to manipulate real file (POSIX like) and filename."
requires = "fileutils str"
archive(byte) = "fileutils-str.cma"
diff --git a/website/Makefile b/website/Makefile
index aed7057..3f6a5ae 100644
--- a/website/Makefile
+++ b/website/Makefile
@@ -38,7 +38,7 @@ ONLINE := $(shell (ping -c 1 forge.ocamlcore.org > /dev/null 2>&1 && echo true)
FORGE_PAGE = "http://forge.ocamlcore.org/frs/?group_id=128"
# Dev documetation link.
-DEV_DOC_URL = "http://deci.ovh.le-gall.net:8080/job/ocaml-fileutils/label=wheezy64/lastSuccessfulBuild/artifact/dist/ocaml-fileutils-doc-dev.tar.gz"
+DEV_DOC_URL = "file:///$(shell pwd)/dist/ocaml-fileutils-doc-dev.tar.gz"
default: all
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml-fileutils.git
More information about the Pkg-ocaml-maint-commits
mailing list