Skip to content

Commit a80887a

Browse files
ericsinkericsink
committed
Merge branch 'master' of github.com:ericsink/SQLitePCL.raw
2 parents e81198c + 685942a commit a80887a

5 files changed

Lines changed: 24 additions & 5 deletions

File tree

‎gen_lib_nuspecs/Program.cs‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -411,15 +411,16 @@ XmlWriter f
411411
write_nuspec_file_entry_native_linux(lib, "armhf", "linux-arm", f);
412412
write_nuspec_file_entry_native_linux(lib, "armsf", "linux-armel", f);
413413
write_nuspec_file_entry_native_linux(lib, "arm64", "linux-arm64", f);
414+
write_nuspec_file_entry_native_linux(lib, "s390x", "linux-s390x", f);
415+
write_nuspec_file_entry_native_linux(lib, "riscv64", "linux-riscv64", f);
416+
write_nuspec_file_entry_native_linux(lib, "mips64", "linux-mips64", f);
417+
write_nuspec_file_entry_native_linux(lib, "ppc64le", "linux-ppc64le", f);
414418

415419
write_nuspec_file_entry_native_linux(lib, "musl-x64", "linux-musl-x64", f);
416420
write_nuspec_file_entry_native_linux(lib, "musl-armhf", "linux-musl-arm", f);
417421
write_nuspec_file_entry_native_linux(lib, "musl-arm64", "linux-musl-arm64", f);
418422
write_nuspec_file_entry_native_linux(lib, "musl-s390x", "linux-musl-s390x", f);
419-
420-
write_nuspec_file_entry_native_linux(lib, "mips64", "linux-mips64", f);
421-
write_nuspec_file_entry_native_linux(lib, "s390x", "linux-s390x", f);
422-
write_nuspec_file_entry_native_linux(lib, "ppc64le", "linux-ppc64le", f);
423+
write_nuspec_file_entry_native_linux(lib, "musl-riscv64", "linux-musl-riscv64", f);
423424

424425
write_nuspec_file_entry_native_wasm(lib, TFM.NET60, f);
425426
write_nuspec_file_entry_native_wasm(lib, TFM.NET70, f);
@@ -757,7 +758,8 @@ private static void gen_nuget_props(string dest, WhichLib lib)
757758
write_nuget_prop_item("linux-x64", lib, f);
758759
write_nuget_prop_item("linux-mips64", lib, f);
759760
write_nuget_prop_item("linux-s390x", lib, f);
760-
write_nuget_prop_item("linux-ppc64le", lib, f);
761+
write_nuget_prop_item("linux-ppc64le", lib, f);
762+
write_nuget_prop_item("linux-riscv64", lib, f);
761763
f.WriteEndElement(); // PropertyGroup
762764

763765
f.WriteEndElement(); // Project
@@ -806,6 +808,7 @@ private static void gen_nuget_targets(string dest, WhichLib lib)
806808
write_nuget_target_item("linux-x64", lib, f);
807809
write_nuget_target_item("linux-mips64", lib, f);
808810
write_nuget_target_item("linux-s390x", lib, f);
811+
write_nuget_target_item("linux-riscv64", lib, f);
809812
f.WriteEndElement(); // ItemGroup
810813

811814
f.WriteEndElement(); // Project

‎src/SQLitePCLRaw.lib.e_sqlcipher/SQLitePCLRaw.lib.e_sqlcipher.nuspec‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,12 @@
3535
<file src="$cb_bin_path$\e_sqlcipher\linux\musl-x64\libe_sqlcipher.so" target="runtimes\linux-musl-x64\native\libe_sqlcipher.so" />
3636
<file src="$cb_bin_path$\e_sqlcipher\linux\musl-armhf\libe_sqlcipher.so" target="runtimes\linux-musl-arm\native\libe_sqlcipher.so" />
3737
<file src="$cb_bin_path$\e_sqlcipher\linux\musl-arm64\libe_sqlcipher.so" target="runtimes\linux-musl-arm64\native\libe_sqlcipher.so" />
38+
<file src="$cb_bin_path$\e_sqlcipher\linux\musl-s390x\libe_sqlcipher.so" target="runtimes\linux-musl-s390x\native\libe_sqlcipher.so" />
39+
<file src="$cb_bin_path$\e_sqlcipher\linux\musl-riscv64\libe_sqlcipher.so" target="runtimes\linux-musl-riscv64\native\libe_sqlcipher.so" />
3840
<file src="$cb_bin_path$\e_sqlcipher\linux\mips64\libe_sqlcipher.so" target="runtimes\linux-mips64\native\libe_sqlcipher.so" />
3941
<file src="$cb_bin_path$\e_sqlcipher\linux\s390x\libe_sqlcipher.so" target="runtimes\linux-s390x\native\libe_sqlcipher.so" />
4042
<file src="$cb_bin_path$\e_sqlcipher\linux\ppc64le\libe_sqlcipher.so" target="runtimes\linux-ppc64le\native\libe_sqlcipher.so" />
43+
<file src="$cb_bin_path$\e_sqlcipher\linux\riscv64\libe_sqlcipher.so" target="runtimes\linux-riscv64\native\libe_sqlcipher.so" />
4144
<file src="$cb_bin_path$\e_sqlcipher\wasm\net6.0\e_sqlcipher.a" target="runtimes\browser-wasm\nativeassets\net6.0\e_sqlcipher.a" />
4245
<file src="$cb_bin_path$\e_sqlcipher\wasm\net7.0\e_sqlcipher.a" target="runtimes\browser-wasm\nativeassets\net7.0\e_sqlcipher.a" />
4346
<file src="$cb_bin_path$\e_sqlcipher\wasm\net8.0\e_sqlcipher.a" target="runtimes\browser-wasm\nativeassets\net8.0\e_sqlcipher.a" />

‎src/SQLitePCLRaw.lib.e_sqlcipher/net461/SQLitePCLRaw.lib.e_sqlcipher.targets‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,5 +66,10 @@
6666
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
6767
<Pack>false</Pack>
6868
</Content>
69+
<Content Include="$(MSBuildThisFileDirectory)..\..\runtimes\linux-riscv64\native\libe_sqlcipher.so">
70+
<Link>runtimes\linux-riscv64\native\libe_sqlcipher.so</Link>
71+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
72+
<Pack>false</Pack>
73+
</Content>
6974
</ItemGroup>
7075
</Project>

‎src/SQLitePCLRaw.lib.e_sqlite3/SQLitePCLRaw.lib.e_sqlite3.nuspec‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,11 @@
3535
<file src="$cb_bin_path$\e_sqlite3\linux\musl-x64\libe_sqlite3.so" target="runtimes\linux-musl-x64\native\libe_sqlite3.so" />
3636
<file src="$cb_bin_path$\e_sqlite3\linux\musl-armhf\libe_sqlite3.so" target="runtimes\linux-musl-arm\native\libe_sqlite3.so" />
3737
<file src="$cb_bin_path$\e_sqlite3\linux\musl-arm64\libe_sqlite3.so" target="runtimes\linux-musl-arm64\native\libe_sqlite3.so" />
38+
<file src="$cb_bin_path$\e_sqlite3\linux\musl-s390x\libe_sqlite3.so" target="runtimes\linux-musl-s390x\native\libe_sqlite3.so" />
39+
<file src="$cb_bin_path$\e_sqlite3\linux\musl-riscv64\libe_sqlite3.so" target="runtimes\linux-musl-riscv64\native\libe_sqlite3.so" />
3840
<file src="$cb_bin_path$\e_sqlite3\linux\mips64\libe_sqlite3.so" target="runtimes\linux-mips64\native\libe_sqlite3.so" />
3941
<file src="$cb_bin_path$\e_sqlite3\linux\s390x\libe_sqlite3.so" target="runtimes\linux-s390x\native\libe_sqlite3.so" />
42+
<file src="$cb_bin_path$\e_sqlite3\linux\riscv64\libe_sqlite3.so" target="runtimes\linux-riscv64\native\libe_sqlite3.so" />
4043
<file src="$cb_bin_path$\e_sqlite3\linux\ppc64le\libe_sqlite3.so" target="runtimes\linux-ppc64le\native\libe_sqlite3.so" />
4144
<file src="$cb_bin_path$\e_sqlite3\wasm\net6.0\e_sqlite3.a" target="runtimes\browser-wasm\nativeassets\net6.0\e_sqlite3.a" />
4245
<file src="$cb_bin_path$\e_sqlite3\wasm\net7.0\e_sqlite3.a" target="runtimes\browser-wasm\nativeassets\net7.0\e_sqlite3.a" />

‎src/SQLitePCLRaw.lib.e_sqlite3/net461/SQLitePCLRaw.lib.e_sqlite3.targets‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,5 +66,10 @@
6666
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
6767
<Pack>false</Pack>
6868
</Content>
69+
<Content Include="$(MSBuildThisFileDirectory)..\..\runtimes\linux-riscv64\native\libe_sqlite3.so">
70+
<Link>runtimes\linux-riscv64\native\libe_sqlite3.so</Link>
71+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
72+
<Pack>false</Pack>
73+
</Content>
6974
</ItemGroup>
7075
</Project>

0 commit comments

Comments
 (0)