From 40598e575115d443471435ed1ecc464821d5ab4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edwin=20T=C3=B6r=C3=B6k?= Date: Wed, 7 Feb 2024 16:51:42 +0000 Subject: [PATCH 1/2] CA-388625: fix build of the Xen-API Java SDK MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This partially reverts commit 29f844cc6: the Java SDK defines a 'latest' API function, but 'API_2_20' enum was undefined. This fixes the Java build (we may need a different solution on API versioning of SDK languages though). Fixes: 29f844cc6 ("CA-387698: datamodel: eliminate next_release") Signed-off-by: Edwin Török --- ocaml/idl/datamodel_types.ml | 7 +++++++ ocaml/idl/schematest.ml | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ocaml/idl/datamodel_types.ml b/ocaml/idl/datamodel_types.ml index 346e5bd41cf..2feaf559c32 100644 --- a/ocaml/idl/datamodel_types.ml +++ b/ocaml/idl/datamodel_types.ml @@ -334,6 +334,13 @@ let release_order_full = ; branding= "Citrix Hypervisor 8.2 Hotfix 2" ; release_date= Some "November 2020" } + ; { + code_name= Some "nile-preview" + ; version_major= 2 + ; version_minor= 20 + ; branding= "XenServer 8 Preview" + ; release_date= Some "August 2023" + } ] (* When you add a new release, use the version number of the latest release, "Unreleased" for the branding, and Some "" for the release date, until the actual values are finalised. *) diff --git a/ocaml/idl/schematest.ml b/ocaml/idl/schematest.ml index 9e716508844..133e21a1e9c 100644 --- a/ocaml/idl/schematest.ml +++ b/ocaml/idl/schematest.ml @@ -3,7 +3,7 @@ let hash x = Digest.string x |> Digest.to_hex (* BEWARE: if this changes, check that schema has been bumped accordingly in ocaml/idl/datamodel_common.ml, usually schema_minor_vsn *) -let last_known_schema_hash = "2de13a69470d10b12910322f8a6bce85" +let last_known_schema_hash = "a99342e7a24557948df221c8da46ae71" let current_schema_hash : string = let open Datamodel_types in From 34f68c7ad4e7e03f19c90deaaac448c3a011af73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edwin=20T=C3=B6r=C3=B6k?= Date: Wed, 7 Feb 2024 16:52:58 +0000 Subject: [PATCH 2/2] build: add sdk-build-java Makefile target MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Edwin Török --- Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile b/Makefile index 58127ceef2f..bcfc5b9eb78 100644 --- a/Makefile +++ b/Makefile @@ -117,6 +117,10 @@ sdksanity: sdk sed -i 's/FriendlyErrorNames.ResourceManager/null/g' ./_build/install/default/xapi/sdk/csharp/src/Failure.cs cd _build/install/default/xapi/sdk/csharp/src && dotnet add package Newtonsoft.Json && dotnet build -f netstandard2.0 +.PHONY: sdk-build-java + +sdk-build-java: sdk + cd _build/install/default/xapi/sdk/java && mvn -f xen-api/pom.xml -B clean package install -Drevision=0.0 python: $(MAKE) -C scripts/examples/python build