diff --git a/specs/langkit.anod b/specs/langkit.anod deleted file mode 100644 index 9b7a657..0000000 --- a/specs/langkit.anod +++ /dev/null @@ -1,75 +0,0 @@ -from e3.anod.spec import Anod -from e3.anod.loader import spec - -import os - - -class Langkit(spec("common")): - @property - def version(self): - return "22.0.0" - - @property - def tarball(self): - return "langkit-%s.tar.gz" % self.version - - @property - def source_pkg_build(self): - return [ - self.HTTPSSourceBuilder( - name=self.tarball, - url="https://github.com/AdaCore/langkit/releases/download/v%s/langkit_support-%s.tar.gz" - % (self.version, self.version), - ) - ] - - @property - def build_source_list(self): - return [Anod.Source(name=self.tarball, publish=True, dest="")] - - @property - def build_deps(self): - return [ - Anod.Dependency("base_gcc", track=True), - Anod.Dependency("gprbuild", track=True), - Anod.Dependency("libgpr", track=True), - Anod.Dependency("gnatcoll", track=True), - Anod.Dependency("gnatcoll-bindings", track=True), - Anod.Dependency("xmlada", track=True), - ] - - @Anod.primitive() - def build(self): - for m in self.deps: - self.deps[m].setenv() - - gpr_file = os.path.join(self["SRC_DIR"], "langkit_support.gpr") - build_mode = "prod" - - for library_type in ["static"]: - self.shell( - "gprbuild", - "-p", - "-P", - gpr_file, - "-j" + str(self.jobs), - "--relocate-build-tree=" + library_type, - "-XBUILD_MODE=" + build_mode, - "-XLIBRARY_TYPE=" + library_type, - ) - - self.shell( - "gprinstall", - "-f", - "-p", - "-P", - gpr_file, - "--relocate-build-tree=" + library_type, - "--prefix=" + self["INSTALL_DIR"], - "-XBUILD_MODE=" + build_mode, - "-XLIBRARY_TYPE=" + library_type, - "--build-var=LIBRARY_TYPE", - "--build-name=" + library_type, - ) - - self.clean() diff --git a/specs/libadalang.anod b/specs/libadalang.anod index 6ba5d67..d328e3a 100644 --- a/specs/libadalang.anod +++ b/specs/libadalang.anod @@ -4,10 +4,10 @@ from e3.anod.loader import spec import os -class Langkit(spec("common")): +class Libadalang(spec("common")): @property def version(self): - return "22.0.0" + return "24.0.0" @property def tarball(self): @@ -33,9 +33,11 @@ class Langkit(spec("common")): Anod.Dependency("base_gcc", track=True), Anod.Dependency("gprbuild", track=True), Anod.Dependency("libgpr", track=True), + Anod.Dependency("adasat", track=True), + Anod.Dependency("libgpr2"), Anod.Dependency("gnatcoll", track=True), Anod.Dependency("gnatcoll-bindings", track=True), - Anod.Dependency("langkit", track=True), + Anod.Dependency("langkit_support", track=True), Anod.Dependency("xmlada", track=True), ] diff --git a/specs/libgpr2.anod b/specs/libgpr2.anod index 3542243..830326f 100644 --- a/specs/libgpr2.anod +++ b/specs/libgpr2.anod @@ -74,7 +74,6 @@ class LibGPR2(spec("common")): Anod.Dependency("gnatcoll", track=True), Anod.Dependency("gnatcoll-bindings", track=True), Anod.Dependency("langkit_support", track=True), - Anod.Dependency("libadalang", track=True), Anod.Dependency("gprconfig_kb", require="source_pkg", track=True), ]