Merge pull request #5378 from edwintorok/private/edvint/merge-stdext2

.github/workflows/format.yml

@@ -35,6 +35,7 @@ jobs:
             xs-opam: ${{ steps.dotenv.outputs.repository }}
           dune-cache: true
           opam-pin: false
+          opam-depext: false
 
       - name: Install ocamlformat
         run: opam install ocamlformat

Makefile

@@ -241,7 +241,9 @@ install: build doc sdk doc-json
 		gzip http-lib pciutil sexpr stunnel uuid xml-light2 zstd xapi-compression safe-resources \
 		message-switch message-switch-async message-switch-cli message-switch-core message-switch-lwt \
 		message-switch-unix xapi-idl forkexec xapi-forkexecd xapi-storage xapi-storage-script xapi-storage-cli \
-		xapi-nbd varstored-guard xapi-log xapi-open-uri xapi-tracing xapi-expiry-alerts cohttp-posix
+		xapi-nbd varstored-guard xapi-log xapi-open-uri xapi-tracing xapi-expiry-alerts cohttp-posix \
+		xapi-rrd xapi-inventory \
+		xapi-stdext-date xapi-stdext-encodings xapi-stdext-pervasives xapi-stdext-std xapi-stdext-threads xapi-stdext-unix xapi-stdext-zerocheck xapi-stdext
 # docs
 	mkdir -p $(DESTDIR)$(DOCDIR)
 	cp -r $(XAPIDOC)/jekyll $(DESTDIR)$(DOCDIR)
@@ -261,7 +263,9 @@ uninstall:
 		gzip http-lib pciutil sexpr stunnel uuid xml-light2 zstd xapi-compression safe-resources \
 		message-switch message-switch-async message-switch-cli message-switch-core message-switch-lwt \
 		message-switch-unix xapi-idl forkexec xapi-forkexecd xapi-storage xapi-storage-script xapi-log \
-		xapi-open-uri xapi-tracing xapi-expiry-alerts cohttp-posix
+		xapi-open-uri xapi-tracing xapi-expiry-alerts cohttp-posix \
+		xapi-rrd xapi-inventory \
+		xapi-stdext-date xapi-stdext-encodings xapi-stdext-pervasives xapi-stdext-std xapi-stdext-threads xapi-stdext-unix xapi-stdext-zerocheck xapi-stdext
 
 compile_flags.txt: Makefile
 	(ocamlc -config-var ocamlc_cflags;\

dune-project

@@ -253,3 +253,107 @@
 (package
   (name cohttp-posix)
 )
+
+(package
+  (name xapi-rrd)
+)
+
+(package
+  (name xapi-inventory)
+)
+
+(package
+  (name xapi-stdext)
+  (synopsis "Xapi's standard library extension")
+  (description "Dummy package that enables the usage of dune-release")
+  (depends
+    (xapi-stdext-date (= :version))
+    (xapi-stdext-encodings (= :version))
+    (xapi-stdext-pervasives (= :version))
+    (xapi-stdext-std (= :version))
+    (xapi-stdext-threads (= :version))
+    (xapi-stdext-unix (= :version))
+    (xapi-stdext-zerocheck (= :version))
+  )
+)
+
+(package
+  (name xapi-stdext-date)
+  (synopsis "Xapi's standard library extension, Dates")
+  (depends
+    (ocaml (>= 4.12))
+    (alcotest :with-test)
+    astring
+    base-unix
+    ptime
+    (odoc :with-doc)
+  )
+)
+
+(package
+  (name xapi-stdext-encodings)
+  (synopsis "Xapi's standard library extension, Encodings")
+  (depends
+    (ocaml (>= 4.13.0))
+    (alcotest (and (>= 0.6.0) :with-test))
+    (odoc :with-doc)
+    (bechamel :with-test)
+    (bechamel-notty :with-test)
+    (notty :with-test)
+  )
+)
+
+(package
+  (name xapi-stdext-pervasives)
+  (synopsis "Xapi's standard library extension, Pervasives")
+  (depends
+    (ocaml (>= 4.08))
+    logs
+    (odoc :with-doc)
+    xapi-backtrace
+  )
+)
+
+(package
+  (name xapi-stdext-std)
+  (synopsis "Xapi's standard library extension, Stdlib")
+  (depends
+    (ocaml (>= 4.08.0))
+    (alcotest :with-test)
+    (odoc :with-doc)
+  )
+)
+
+(package
+  (name xapi-stdext-threads)
+  (synopsis "Xapi's standard library extension, Threads")
+  (depends
+    ocaml
+    base-threads
+    base-unix
+    (odoc :with-doc)
+    (xapi-stdext-pervasives (= :version))
+  )
+)
+
+(package
+  (name xapi-stdext-unix)
+  (synopsis "Xapi's standard library extension, Unix")
+  (depends
+    (ocaml (>= 4.12.0))
+    base-unix
+    (fd-send-recv (>= 2.0.0))
+    (odoc :with-doc)
+    xapi-backtrace
+    (xapi-stdext-pervasives (= :version))
+  )
+)
+
+(package
+  (name xapi-stdext-zerocheck)
+  (synopsis "Xapi's standard library extension, Zerocheck")
+  (depends
+    ocaml
+    (odoc :with-doc)
+  )
+)

ocaml/libs/xapi-inventory/.gitignore

@@ -0,0 +1,7 @@
+_build/
+*.install
+.merlin
+
+*.orig
+*.rej
+xcp_inventory_config.ml

ocaml/libs/xapi-inventory/ChangeLog

@@ -0,0 +1,36 @@
+## v1.2.3 (17 Jun 2022):
+* maintenance: Decrease direct usages of Threadext
+* Add license to opam metadata
+
+## v1.2.2 (28 Jul 2021):
+* maintenance: clean up opam metadata
+* maintenance: change default filename to /etc/xensource-inventory
+* maintenance: use dune instead of jbuilder
+* maintenance: fix travis
+
+## v1.2.1 (3 Dec 2018):
+- Removed conflict between xcp-inventory and xapi-inventory.
+- Ported build to dune and deprecated the old package xcp-inventory.
+
+## v1.2.0 (9 Jan 2018):
+* inventory: preserve old ~limit:2 semantic
+
+## v1.1.0 (14 Dec 2017):
+* Reindentation and file mode change.
+* Replace xapi-stdext with xapi-stdext-subpackages and astring.
+* CA-276606: Ported build from _oasis to jbuilder.
+* Sync opam file with xs-opam
+
+## v1.0.2 (03 Febr 2017):
+* fix Makfile to make installation via Opam work
+* add Git meta data files .gitarchive-info and .gitattributes
+
+## v1.0.1 (22 Jun 2016):
+* Update to Stdext 2.0.0
+
+## v0.9.1 (3 Jun 2014):
+* second public release
+* Update to cohttp-0.11.2 interface
+
+## v0.9.0 (5 Jun 2013):
+* first public release