Skip to content

Commit 859c52d

Browse files
committed
Update NativeImport 1.x bridge to libplctag core v2.7.2 (1.1.0)
Bundles core v2.7.2 in the 1.x (LibraryExtractor) packaging. The API is unchanged: every entry point used by NativeMethods exists in 2.7.2. Version is 1.1.0+core.2.7.2: a core minor bump means a NativeImport minor bump (see DEVELOPERS.md, libplctag.NativeImport versioning). - runtime/*: core v2.7.2 binaries (same files as main's runtimes/) - runtime/win_ARM removed: core no longer ships Windows ARM32 builds, so LibraryExtractor now throws "Appropriate native library is not embedded" on ARM32 Windows - UpdateCoreBinaries: use the current core release asset names and drop windows_Arm, mapped to the 1.x runtime/ folders Platform note for release notes: core v2.7.2's Linux binaries require glibc >= 2.38 (2.6.0 needed 2.34), and libatomic on x64/arm64. This drops Debian 12 / Raspberry Pi OS Bookworm / Ubuntu 22.04; 1.0.42+core.2.6.0 remains available for those.
1 parent fb140cb commit 859c52d

12 files changed

Lines changed: 29 additions & 34 deletions

File tree

‎build/Build.cs‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -143,16 +143,15 @@ class Build : NukeBuild
143143

144144
(string zipFileName, string[] unzipPath, AbsolutePath destination)[] releases =
145145
{
146-
($"libplctag_{LibplctagCoreVersion}_macos_x64.zip", ["libplctag.dylib"], runtimesFolder/"osx_x64"/"libplctag.dylib" ),
147-
($"libplctag_{LibplctagCoreVersion}_macos_aarch64.zip", ["libplctag.dylib"], runtimesFolder/"osx_ARM64"/"libplctag.dylib" ),
148-
($"libplctag_{LibplctagCoreVersion}_ubuntu_x64.zip", ["libplctag.so"], runtimesFolder/"linux_x64"/"libplctag.so" ),
149-
($"libplctag_{LibplctagCoreVersion}_ubuntu_x86.zip", ["libplctag.so"], runtimesFolder/"linux_x86"/"libplctag.so" ),
150-
($"libplctag_{LibplctagCoreVersion}_linux_arm7l.zip", ["libplctag.so"], runtimesFolder/"linux_ARM"/"libplctag.so" ),
151-
($"libplctag_{LibplctagCoreVersion}_linux_aarch64.zip", ["libplctag.so"], runtimesFolder/"linux_ARM64"/"libplctag.so" ),
152-
($"libplctag_{LibplctagCoreVersion}_windows_x64.zip", ["Release", "plctag.dll"], runtimesFolder/"win_x64"/"plctag.dll" ),
153-
($"libplctag_{LibplctagCoreVersion}_windows_x86.zip", ["Release", "plctag.dll"], runtimesFolder/"win_x86"/"plctag.dll" ),
154-
($"libplctag_{LibplctagCoreVersion}_windows_Arm.zip", ["Release", "plctag.dll"], runtimesFolder/"win_ARM"/"plctag.dll" ),
155-
($"libplctag_{LibplctagCoreVersion}_windows_Arm64.zip", ["Release", "plctag.dll"], runtimesFolder/"win_ARM64"/"plctag.dll" ),
146+
($"libplctag_{LibplctagCoreVersion}_macos_x64.zip", ["libplctag.dylib"], runtimesFolder/"osx_x64"/"libplctag.dylib" ),
147+
($"libplctag_{LibplctagCoreVersion}_macos_aarch64.zip", ["libplctag.dylib"], runtimesFolder/"osx_ARM64"/"libplctag.dylib" ),
148+
($"libplctag_{LibplctagCoreVersion}_ubuntu_x64.zip", ["libplctag.so"], runtimesFolder/"linux_x64"/"libplctag.so" ),
149+
($"libplctag_{LibplctagCoreVersion}_ubuntu_x86.zip", ["libplctag.so"], runtimesFolder/"linux_x86"/"libplctag.so" ),
150+
($"libplctag_{LibplctagCoreVersion}_ubuntu_armv7_hf.zip", ["libplctag.so"], runtimesFolder/"linux_ARM"/"libplctag.so" ),
151+
($"libplctag_{LibplctagCoreVersion}_ubuntu_arm64.zip", ["libplctag.so"], runtimesFolder/"linux_ARM64"/"libplctag.so" ),
152+
($"libplctag_{LibplctagCoreVersion}_windows_x64.zip", ["plctag.dll"], runtimesFolder/"win_x64"/"plctag.dll" ),
153+
($"libplctag_{LibplctagCoreVersion}_windows_x86.zip", ["plctag.dll"], runtimesFolder/"win_x86"/"plctag.dll" ),
154+
($"libplctag_{LibplctagCoreVersion}_windows_arm64.zip", ["plctag.dll"], runtimesFolder/"win_ARM64"/"plctag.dll" ),
156155
};
157156

158157
var downloadFolder = RootDirectory / "downloads";

‎src/libplctag.NativeImport/libplctag.NativeImport.csproj‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
<AssemblyName>libplctag.NativeImport</AssemblyName>
66
<RootNamespace>libplctag.NativeImport</RootNamespace>
77
<PackageId>libplctag.NativeImport</PackageId>
8-
<LibplctagCoreVersion>2.6.0</LibplctagCoreVersion>
9-
<Version>1.0.42+core.$(LibplctagCoreVersion)</Version>
8+
<LibplctagCoreVersion>2.7.2</LibplctagCoreVersion>
9+
<Version>1.1.0+core.$(LibplctagCoreVersion)</Version>
1010
<Authors>libplctag</Authors>
1111
<PackageLicenseExpression>MPL-2.0</PackageLicenseExpression>
1212
<PackageDescription>libplctag.NativeImport provides low-level (raw) access to the native libplctag library. This package does not provide an API which is friendly to app developers. Rather, it provides an API which handles platform and configuration issues, upon which a friendlier API can be built.</PackageDescription>
@@ -29,7 +29,6 @@
2929
<EmbeddedResource Include="runtime\win_x64\plctag.dll" />
3030
<EmbeddedResource Include="runtime\win_x86\plctag.dll" />
3131
<EmbeddedResource Include="runtime\win_ARM64\plctag.dll" />
32-
<EmbeddedResource Include="runtime\win_ARM\plctag.dll" />
3332
<None Include="$(PackageIconFullPath)" Pack="true" PackagePath="\" />
3433
<None Include="..\..\docs\libplctag.NativeImport.md" Pack="true" PackagePath="\README.md"/>
3534
</ItemGroup>
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:9f66cb0dfb2307e5d8d2f036366d742dc7b70d3350ecf73c312bd5d2394f5308
3-
size 292640
2+
oid sha256:65818a6dcfc8d53115a505284433ce0b93504fa856f86ec346b315493005f887
3+
size 341532
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:d86813e0de79eb8bca1fde7f37b159842b7d4129e3ebfeddad122be428382d64
3-
size 363064
2+
oid sha256:4a21fc45147e19cc96a4a0783ece154b355f95a9490e82d4bc7b25b5c23741de
3+
size 435000
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:9caca87eeed9d6365f3e074aa287af725da423592f52ffacd90ce0a1a4d78971
3-
size 375160
2+
oid sha256:50b646e37093094b80126ab7fff584223e42ca113b511751af32214b350db82e
3+
size 420296
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:3693373c37b57042a169ae6ef3ab846de40901a803aab914045d90d61be306d3
3-
size 415064
2+
oid sha256:4eb29f76ea84c88a49a6742fbb9a2180624ac4ccac7c057788e742f3a8506dfc
3+
size 399628
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:3902a52fd43a88a960ce6de872611fae471bea1f7b902bcd4ca7c7bb2c3ee9cf
3-
size 334256
2+
oid sha256:3c3d1ef49472ac3ee94f68bbab119e0666d610ea03cd57ebd6bbcb4463bb2dcf
3+
size 387104
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:3902a52fd43a88a960ce6de872611fae471bea1f7b902bcd4ca7c7bb2c3ee9cf
3-
size 334256
2+
oid sha256:cbcf4b6270348c01f8f06084535066b30e9b93ecf6f943e2ff45ff32ac123538
3+
size 371856

‎src/libplctag.NativeImport/runtime/win_ARM/plctag.dll‎

Lines changed: 0 additions & 3 deletions
This file was deleted.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:1e2923345792b3815d714568cf542e0a8ef023a3dc9890671f703a5b6242dfee
3-
size 276992
2+
oid sha256:e3dbb2ccc5580dab866187dbedf241e166d05da1b26326b8bf4cd160d715f03f
3+
size 1134080

0 commit comments

Comments
 (0)