Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Revert "Merge stdext and reverse deps into XAPI" #5407

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ jobs:
xs-opam: ${{ steps.dotenv.outputs.repository }}
dune-cache: true
opam-pin: false
opam-depext: false

- name: Install ocamlformat
run: opam install ocamlformat
Expand Down
8 changes: 2 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -241,9 +241,7 @@ 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-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
xapi-nbd varstored-guard xapi-log xapi-open-uri xapi-tracing xapi-expiry-alerts cohttp-posix
# docs
mkdir -p $(DESTDIR)$(DOCDIR)
cp -r $(XAPIDOC)/jekyll $(DESTDIR)$(DOCDIR)
Expand All @@ -263,9 +261,7 @@ 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-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
xapi-open-uri xapi-tracing xapi-expiry-alerts cohttp-posix

compile_flags.txt: Makefile
(ocamlc -config-var ocamlc_cflags;\
Expand Down
104 changes: 0 additions & 104 deletions dune-project
Original file line number Diff line number Diff line change
Expand Up @@ -253,107 +253,3 @@
(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)
)
)
9 changes: 9 additions & 0 deletions ocaml/forkexecd/.ocamlformat
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
profile=ocamlformat
indicate-multiline-delimiters=closing-on-separate-line
if-then-else=fit-or-vertical
dock-collection-brackets=true
break-struct=natural
break-separators=before
break-infix=fit-or-vertical
break-infix-before-func=false
sequence-blank-line=preserve-one
7 changes: 0 additions & 7 deletions ocaml/libs/xapi-inventory/.gitignore

This file was deleted.

36 changes: 0 additions & 36 deletions ocaml/libs/xapi-inventory/ChangeLog

This file was deleted.

Loading
Loading