Skip to content

Commit

Permalink
Merge pull request #31 from thomassa/prep0.8.0
Browse files Browse the repository at this point in the history 
Do autogeneration at build-time; prepare for 0.8.0 release
  • Loading branch information
Jon Ludlam authored Jun 24, 2016
2 parents 66f6f3a + 66ef329 commit 8515508
Show file tree
Hide file tree
Showing 9 changed files with 19 additions and 7,648 deletions.
12 changes: 12 additions & 0 deletions CHANGES
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
0.8.0 (2016-06-23)
* Port get_vhd_vsize from ocaml-vhd
* Fix bad exit code
* Enable debug logging from library code in sparse_dd
* Fix infinite loop in retry code
* Handle transient failures when opening VHD chain
* Opam changes/updates
* New CLI params for TLS version and ciphersuites
(hence change of minor version number)
* For Continuous Integration, move to xenserver-build-env
* Remove Oasis autogenerated code: generate it at build time.

0.7.8 (2015-09-11)
* add retry loop around reading BAT (@simonjbeaumont)
* support sparse raw files (@djs55)
Expand Down
3 changes: 3 additions & 0 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ setup.data: setup.ml
rm -f configure.cmo configure.cmi
ocaml setup.ml -configure ${ENABLE_XENSERVER}

setup.ml: _oasis
oasis setup

.PHONY: clean
clean: setup.data
rm -f configure.cmo configure.cmi
Expand Down
4 changes: 2 additions & 2 deletions _oasis
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
OASISFormat: 0.4
Name: vhd-tool
Version: 0.7.8
Version: 0.8.0
Synopsis: .vhd file manipulation
Authors: Jonathan Ludlam and David Scott
Authors: Jonathan Ludlam, David Scott, Anil Madhavapeddy, Cheng Sun, Euan Harris, John Else, Mike McClurg, Phus Lu, Si Beaumont, Thomas Sanders
License: LGPL-2.1 with OCaml linking exception
Plugins: META (0.4)
BuildTools: ocamlbuild
Expand Down
125 changes: 0 additions & 125 deletions _tags
View file
Original file line number Diff line number Diff line change
@@ -1,129 +1,4 @@
# OASIS_START
# DO NOT EDIT (digest: 7b3ae22e92b5db658e74329702f2169f)
# 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
true: annot, bin_annot
<**/.svn>: -traverse
<**/.svn>: not_hygienic
".bzr": -traverse
".bzr": not_hygienic
".hg": -traverse
".hg": not_hygienic
".git": -traverse
".git": not_hygienic
"_darcs": -traverse
"_darcs": not_hygienic
# Executable vhd-tool
<src/main.{native,byte}>: use_libvhd-tool_stubs
<src/main.{native,byte}>: pkg_cmdliner
<src/main.{native,byte}>: pkg_cohttp
<src/main.{native,byte}>: pkg_cohttp.lwt
<src/main.{native,byte}>: pkg_io-page.unix
<src/main.{native,byte}>: pkg_lwt
<src/main.{native,byte}>: pkg_lwt.preemptive
<src/main.{native,byte}>: pkg_lwt.syntax
<src/main.{native,byte}>: pkg_lwt.unix
<src/main.{native,byte}>: pkg_nbd
<src/main.{native,byte}>: pkg_nbd.lwt
<src/main.{native,byte}>: pkg_re.str
<src/main.{native,byte}>: pkg_sha
<src/main.{native,byte}>: pkg_sha.sha1
<src/main.{native,byte}>: pkg_tapctl
<src/main.{native,byte}>: pkg_tar
<src/main.{native,byte}>: pkg_threads
<src/main.{native,byte}>: pkg_uri
<src/main.{native,byte}>: pkg_vhd-format
<src/main.{native,byte}>: pkg_vhd-format.lwt
<src/main.{native,byte}>: custom
# Executable sparse_dd
<src/sparse_dd.{native,byte}>: use_libsparse_dd_stubs
<src/sparse_dd.{native,byte}>: pkg_cmdliner
<src/sparse_dd.{native,byte}>: pkg_cohttp
<src/sparse_dd.{native,byte}>: pkg_cohttp.lwt
<src/sparse_dd.{native,byte}>: pkg_io-page.unix
<src/sparse_dd.{native,byte}>: pkg_lwt
<src/sparse_dd.{native,byte}>: pkg_lwt.preemptive
<src/sparse_dd.{native,byte}>: pkg_lwt.syntax
<src/sparse_dd.{native,byte}>: pkg_lwt.unix
<src/sparse_dd.{native,byte}>: pkg_nbd
<src/sparse_dd.{native,byte}>: pkg_nbd.lwt
<src/sparse_dd.{native,byte}>: pkg_re.str
<src/sparse_dd.{native,byte}>: pkg_sha
<src/sparse_dd.{native,byte}>: pkg_sha.sha1
<src/sparse_dd.{native,byte}>: pkg_tapctl
<src/sparse_dd.{native,byte}>: pkg_tar
<src/sparse_dd.{native,byte}>: pkg_threads
<src/sparse_dd.{native,byte}>: pkg_uri
<src/sparse_dd.{native,byte}>: pkg_vhd-format
<src/sparse_dd.{native,byte}>: pkg_vhd-format.lwt
<src/sparse_dd.{native,byte}>: pkg_xcp
<src/sparse_dd.{native,byte}>: pkg_xenstore
<src/sparse_dd.{native,byte}>: pkg_xenstore.client
<src/sparse_dd.{native,byte}>: pkg_xenstore.unix
<src/sparse_dd.{native,byte}>: pkg_xenstore_transport
<src/sparse_dd.{native,byte}>: pkg_xenstore_transport.unix
<src/*.ml{,i,y}>: pkg_cmdliner
<src/*.ml{,i,y}>: pkg_cohttp
<src/*.ml{,i,y}>: pkg_cohttp.lwt
<src/*.ml{,i,y}>: pkg_lwt.preemptive
<src/*.ml{,i,y}>: pkg_lwt.syntax
<src/*.ml{,i,y}>: pkg_nbd
<src/*.ml{,i,y}>: pkg_nbd.lwt
<src/*.ml{,i,y}>: pkg_re.str
<src/*.ml{,i,y}>: pkg_sha
<src/*.ml{,i,y}>: pkg_sha.sha1
<src/*.ml{,i,y}>: pkg_tapctl
<src/*.ml{,i,y}>: pkg_tar
<src/*.ml{,i,y}>: pkg_uri
<src/*.ml{,i,y}>: pkg_xcp
<src/*.ml{,i,y}>: pkg_xenstore
<src/*.ml{,i,y}>: pkg_xenstore.client
<src/*.ml{,i,y}>: pkg_xenstore.unix
<src/*.ml{,i,y}>: pkg_xenstore_transport
<src/*.ml{,i,y}>: pkg_xenstore_transport.unix
"src/sendfile64_stubs.c": pkg_cmdliner
"src/sendfile64_stubs.c": pkg_cohttp
"src/sendfile64_stubs.c": pkg_cohttp.lwt
"src/sendfile64_stubs.c": pkg_io-page.unix
"src/sendfile64_stubs.c": pkg_lwt
"src/sendfile64_stubs.c": pkg_lwt.preemptive
"src/sendfile64_stubs.c": pkg_lwt.syntax
"src/sendfile64_stubs.c": pkg_lwt.unix
"src/sendfile64_stubs.c": pkg_nbd
"src/sendfile64_stubs.c": pkg_nbd.lwt
"src/sendfile64_stubs.c": pkg_re.str
"src/sendfile64_stubs.c": pkg_sha
"src/sendfile64_stubs.c": pkg_sha.sha1
"src/sendfile64_stubs.c": pkg_tapctl
"src/sendfile64_stubs.c": pkg_tar
"src/sendfile64_stubs.c": pkg_threads
"src/sendfile64_stubs.c": pkg_uri
"src/sendfile64_stubs.c": pkg_vhd-format
"src/sendfile64_stubs.c": pkg_vhd-format.lwt
"src/sendfile64_stubs.c": pkg_xcp
"src/sendfile64_stubs.c": pkg_xenstore
"src/sendfile64_stubs.c": pkg_xenstore.client
"src/sendfile64_stubs.c": pkg_xenstore.unix
"src/sendfile64_stubs.c": pkg_xenstore_transport
"src/sendfile64_stubs.c": pkg_xenstore_transport.unix
<src/sparse_dd.{native,byte}>: custom
# Executable get_vhd_vsize
<src/get_vhd_vsize.{native,byte}>: pkg_cstruct
<src/get_vhd_vsize.{native,byte}>: pkg_io-page.unix
<src/get_vhd_vsize.{native,byte}>: pkg_lwt
<src/get_vhd_vsize.{native,byte}>: pkg_lwt.unix
<src/get_vhd_vsize.{native,byte}>: pkg_threads
<src/get_vhd_vsize.{native,byte}>: pkg_vhd-format
<src/get_vhd_vsize.{native,byte}>: pkg_vhd-format.lwt
<src/*.ml{,i,y}>: pkg_cstruct
<src/*.ml{,i,y}>: pkg_io-page.unix
<src/*.ml{,i,y}>: pkg_lwt
<src/*.ml{,i,y}>: pkg_lwt.unix
<src/*.ml{,i,y}>: pkg_threads
<src/*.ml{,i,y}>: pkg_vhd-format
<src/*.ml{,i,y}>: pkg_vhd-format.lwt
<src/get_vhd_vsize.{native,byte}>: custom
# OASIS_STOP
<src/chunked.ml>: syntax_camlp4o, pkg_cstruct.syntax
<src/input.ml>: syntax_camlp4o, pkg_lwt.syntax
Loading

0 comments on commit 8515508

Please sign in to comment.