diff --git a/versions.txt b/VERSIONS.txt similarity index 100% rename from versions.txt rename to VERSIONS.txt diff --git a/cake/BuildExternals.cake b/cake/BuildExternals.cake index 955233a6..8976f23d 100644 --- a/cake/BuildExternals.cake +++ b/cake/BuildExternals.cake @@ -608,7 +608,7 @@ Task ("externals-linux") // WorkingDirectory = "native-builds/libHarfBuzzSharp_linux", // }); RunProcess ("make", new ProcessSettings { - Arguments = $"ARCH={arch} VERSION={GetVersion ("HarfBuzz", "file")}", + Arguments = $"ARCH={arch} SONAME_VERSION={GetVersion ("HarfBuzz", "soname")}", WorkingDirectory = "native-builds/libHarfBuzzSharp_linux", }); diff --git a/cake/Utils.cake b/cake/Utils.cake index 91348d96..a972c5ee 100644 --- a/cake/Utils.cake +++ b/cake/Utils.cake @@ -62,7 +62,7 @@ string GetMSBuildToolPath (string possible) string GetVersion (string lib, string type = "nuget") { try { - var contents = FileReadText ("./versions.txt"); + var contents = FileReadText ("./VERSIONS.txt"); var match = Regex.Match(contents, $@"^{lib}\s*{type}\s*(.*)$", RegexOptions.IgnoreCase | RegexOptions.Multiline); return match.Groups[1].Value.Trim(); } catch { diff --git a/native-builds/libHarfBuzzSharp_linux/Makefile b/native-builds/libHarfBuzzSharp_linux/Makefile index 3e14fc4f..f7a951ce 100644 --- a/native-builds/libHarfBuzzSharp_linux/Makefile +++ b/native-builds/libHarfBuzzSharp_linux/Makefile @@ -1,6 +1,5 @@ ARCH ?= x64 -VERSION ?= 1.0.0.0 -SUPPORT_GPU ?= 1 +SONAME_VERSION ?= 0.0.0 CC ?= gcc CXX ?= g++ LDFLAGS += @@ -8,16 +7,12 @@ LDFLAGS += noop = space = ${noop} ${noop} -version_parts = $(subst ., ,${VERSION}) -soname_version = $(word 2, ${version_parts}) -file_version = $(subst ${space},.,$(wordlist 1, 3, ${version_parts})) - src_root = ../../externals/harfbuzz/harfbuzz/src obj_root = obj bin_root = bin objarch_root = ${obj_root}/${ARCH} target_name = libHarfBuzzSharp.so -target = ${bin_root}/${ARCH}/${target_name}.${file_version} +target = ${bin_root}/${ARCH}/${target_name}.${SONAME_VERSION} library_dirs = include_dirs = \ @@ -105,7 +100,7 @@ ${target}: ${objs} ${defines} ${includes} ${arch_cflags} ${cflags_c} ${cflags_cc} \ -Wl,--start-group ${objarch_root}/*.o ${objarch_root}/**/*.o ${library_paths} -Wl,--end-group \ ${ldflags} -Wl,--gc-sections -Wl,--no-undefined \ - -Wl,-soname,libHarfBuzzSharp.so.${soname_version} + -Wl,-soname,libHarfBuzzSharp.so.${SONAME_VERSION} all: ${target}