Skip to content

Commit 8515508

Browse files
author
Jon Ludlam
authored
Merge pull request #31 from thomassa/prep0.8.0
Do autogeneration at build-time; prepare for 0.8.0 release
2 parents 66f6f3a + 66ef329 commit 8515508

File tree

9 files changed

+19
-7648
lines changed

9 files changed

+19
-7648
lines changed

‎CHANGES‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
0.8.0 (2016-06-23)
2+
* Port get_vhd_vsize from ocaml-vhd
3+
* Fix bad exit code
4+
* Enable debug logging from library code in sparse_dd
5+
* Fix infinite loop in retry code
6+
* Handle transient failures when opening VHD chain
7+
* Opam changes/updates
8+
* New CLI params for TLS version and ciphersuites
9+
(hence change of minor version number)
10+
* For Continuous Integration, move to xenserver-build-env
11+
* Remove Oasis autogenerated code: generate it at build time.
12+
113
0.7.8 (2015-09-11)
214
* add retry loop around reading BAT (@simonjbeaumont)
315
* support sparse raw files (@djs55)

‎Makefile‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ setup.data: setup.ml
1717
rm -f configure.cmo configure.cmi
1818
ocaml setup.ml -configure ${ENABLE_XENSERVER}
1919

20+
setup.ml: _oasis
21+
oasis setup
22+
2023
.PHONY: clean
2124
clean: setup.data
2225
rm -f configure.cmo configure.cmi

‎_oasis‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
OASISFormat: 0.4
22
Name: vhd-tool
3-
Version: 0.7.8
3+
Version: 0.8.0
44
Synopsis: .vhd file manipulation
5-
Authors: Jonathan Ludlam and David Scott
5+
Authors: Jonathan Ludlam, David Scott, Anil Madhavapeddy, Cheng Sun, Euan Harris, John Else, Mike McClurg, Phus Lu, Si Beaumont, Thomas Sanders
66
License: LGPL-2.1 with OCaml linking exception
77
Plugins: META (0.4)
88
BuildTools: ocamlbuild

‎_tags‎

Lines changed: 0 additions & 125 deletions
Original file line numberDiff line numberDiff line change
@@ -1,129 +1,4 @@
11
# OASIS_START
2-
# DO NOT EDIT (digest: 7b3ae22e92b5db658e74329702f2169f)
3-
# Ignore VCS directories, you can use the same kind of rule outside
4-
# OASIS_START/STOP if you want to exclude directories that contains
5-
# useless stuff for the build process
6-
true: annot, bin_annot
7-
<**/.svn>: -traverse
8-
<**/.svn>: not_hygienic
9-
".bzr": -traverse
10-
".bzr": not_hygienic
11-
".hg": -traverse
12-
".hg": not_hygienic
13-
".git": -traverse
14-
".git": not_hygienic
15-
"_darcs": -traverse
16-
"_darcs": not_hygienic
17-
# Executable vhd-tool
18-
<src/main.{native,byte}>: use_libvhd-tool_stubs
19-
<src/main.{native,byte}>: pkg_cmdliner
20-
<src/main.{native,byte}>: pkg_cohttp
21-
<src/main.{native,byte}>: pkg_cohttp.lwt
22-
<src/main.{native,byte}>: pkg_io-page.unix
23-
<src/main.{native,byte}>: pkg_lwt
24-
<src/main.{native,byte}>: pkg_lwt.preemptive
25-
<src/main.{native,byte}>: pkg_lwt.syntax
26-
<src/main.{native,byte}>: pkg_lwt.unix
27-
<src/main.{native,byte}>: pkg_nbd
28-
<src/main.{native,byte}>: pkg_nbd.lwt
29-
<src/main.{native,byte}>: pkg_re.str
30-
<src/main.{native,byte}>: pkg_sha
31-
<src/main.{native,byte}>: pkg_sha.sha1
32-
<src/main.{native,byte}>: pkg_tapctl
33-
<src/main.{native,byte}>: pkg_tar
34-
<src/main.{native,byte}>: pkg_threads
35-
<src/main.{native,byte}>: pkg_uri
36-
<src/main.{native,byte}>: pkg_vhd-format
37-
<src/main.{native,byte}>: pkg_vhd-format.lwt
38-
<src/main.{native,byte}>: custom
39-
# Executable sparse_dd
40-
<src/sparse_dd.{native,byte}>: use_libsparse_dd_stubs
41-
<src/sparse_dd.{native,byte}>: pkg_cmdliner
42-
<src/sparse_dd.{native,byte}>: pkg_cohttp
43-
<src/sparse_dd.{native,byte}>: pkg_cohttp.lwt
44-
<src/sparse_dd.{native,byte}>: pkg_io-page.unix
45-
<src/sparse_dd.{native,byte}>: pkg_lwt
46-
<src/sparse_dd.{native,byte}>: pkg_lwt.preemptive
47-
<src/sparse_dd.{native,byte}>: pkg_lwt.syntax
48-
<src/sparse_dd.{native,byte}>: pkg_lwt.unix
49-
<src/sparse_dd.{native,byte}>: pkg_nbd
50-
<src/sparse_dd.{native,byte}>: pkg_nbd.lwt
51-
<src/sparse_dd.{native,byte}>: pkg_re.str
52-
<src/sparse_dd.{native,byte}>: pkg_sha
53-
<src/sparse_dd.{native,byte}>: pkg_sha.sha1
54-
<src/sparse_dd.{native,byte}>: pkg_tapctl
55-
<src/sparse_dd.{native,byte}>: pkg_tar
56-
<src/sparse_dd.{native,byte}>: pkg_threads
57-
<src/sparse_dd.{native,byte}>: pkg_uri
58-
<src/sparse_dd.{native,byte}>: pkg_vhd-format
59-
<src/sparse_dd.{native,byte}>: pkg_vhd-format.lwt
60-
<src/sparse_dd.{native,byte}>: pkg_xcp
61-
<src/sparse_dd.{native,byte}>: pkg_xenstore
62-
<src/sparse_dd.{native,byte}>: pkg_xenstore.client
63-
<src/sparse_dd.{native,byte}>: pkg_xenstore.unix
64-
<src/sparse_dd.{native,byte}>: pkg_xenstore_transport
65-
<src/sparse_dd.{native,byte}>: pkg_xenstore_transport.unix
66-
<src/*.ml{,i,y}>: pkg_cmdliner
67-
<src/*.ml{,i,y}>: pkg_cohttp
68-
<src/*.ml{,i,y}>: pkg_cohttp.lwt
69-
<src/*.ml{,i,y}>: pkg_lwt.preemptive
70-
<src/*.ml{,i,y}>: pkg_lwt.syntax
71-
<src/*.ml{,i,y}>: pkg_nbd
72-
<src/*.ml{,i,y}>: pkg_nbd.lwt
73-
<src/*.ml{,i,y}>: pkg_re.str
74-
<src/*.ml{,i,y}>: pkg_sha
75-
<src/*.ml{,i,y}>: pkg_sha.sha1
76-
<src/*.ml{,i,y}>: pkg_tapctl
77-
<src/*.ml{,i,y}>: pkg_tar
78-
<src/*.ml{,i,y}>: pkg_uri
79-
<src/*.ml{,i,y}>: pkg_xcp
80-
<src/*.ml{,i,y}>: pkg_xenstore
81-
<src/*.ml{,i,y}>: pkg_xenstore.client
82-
<src/*.ml{,i,y}>: pkg_xenstore.unix
83-
<src/*.ml{,i,y}>: pkg_xenstore_transport
84-
<src/*.ml{,i,y}>: pkg_xenstore_transport.unix
85-
"src/sendfile64_stubs.c": pkg_cmdliner
86-
"src/sendfile64_stubs.c": pkg_cohttp
87-
"src/sendfile64_stubs.c": pkg_cohttp.lwt
88-
"src/sendfile64_stubs.c": pkg_io-page.unix
89-
"src/sendfile64_stubs.c": pkg_lwt
90-
"src/sendfile64_stubs.c": pkg_lwt.preemptive
91-
"src/sendfile64_stubs.c": pkg_lwt.syntax
92-
"src/sendfile64_stubs.c": pkg_lwt.unix
93-
"src/sendfile64_stubs.c": pkg_nbd
94-
"src/sendfile64_stubs.c": pkg_nbd.lwt
95-
"src/sendfile64_stubs.c": pkg_re.str
96-
"src/sendfile64_stubs.c": pkg_sha
97-
"src/sendfile64_stubs.c": pkg_sha.sha1
98-
"src/sendfile64_stubs.c": pkg_tapctl
99-
"src/sendfile64_stubs.c": pkg_tar
100-
"src/sendfile64_stubs.c": pkg_threads
101-
"src/sendfile64_stubs.c": pkg_uri
102-
"src/sendfile64_stubs.c": pkg_vhd-format
103-
"src/sendfile64_stubs.c": pkg_vhd-format.lwt
104-
"src/sendfile64_stubs.c": pkg_xcp
105-
"src/sendfile64_stubs.c": pkg_xenstore
106-
"src/sendfile64_stubs.c": pkg_xenstore.client
107-
"src/sendfile64_stubs.c": pkg_xenstore.unix
108-
"src/sendfile64_stubs.c": pkg_xenstore_transport
109-
"src/sendfile64_stubs.c": pkg_xenstore_transport.unix
110-
<src/sparse_dd.{native,byte}>: custom
111-
# Executable get_vhd_vsize
112-
<src/get_vhd_vsize.{native,byte}>: pkg_cstruct
113-
<src/get_vhd_vsize.{native,byte}>: pkg_io-page.unix
114-
<src/get_vhd_vsize.{native,byte}>: pkg_lwt
115-
<src/get_vhd_vsize.{native,byte}>: pkg_lwt.unix
116-
<src/get_vhd_vsize.{native,byte}>: pkg_threads
117-
<src/get_vhd_vsize.{native,byte}>: pkg_vhd-format
118-
<src/get_vhd_vsize.{native,byte}>: pkg_vhd-format.lwt
119-
<src/*.ml{,i,y}>: pkg_cstruct
120-
<src/*.ml{,i,y}>: pkg_io-page.unix
121-
<src/*.ml{,i,y}>: pkg_lwt
122-
<src/*.ml{,i,y}>: pkg_lwt.unix
123-
<src/*.ml{,i,y}>: pkg_threads
124-
<src/*.ml{,i,y}>: pkg_vhd-format
125-
<src/*.ml{,i,y}>: pkg_vhd-format.lwt
126-
<src/get_vhd_vsize.{native,byte}>: custom
1272
# OASIS_STOP
1283
<src/chunked.ml>: syntax_camlp4o, pkg_cstruct.syntax
1294
<src/input.ml>: syntax_camlp4o, pkg_lwt.syntax

0 commit comments

Comments
 (0)