Skip to content

Commit

Permalink
for compat with both .NET Core 2.0 and 2.1, put the linux-musl-x64 e_…
Browse files Browse the repository at this point in the history 
…sqlite3 bits in both linux-musl-x64 and alpine-x64
  • Loading branch information
@ericsink
ericsink committed May 2, 2018
1 parent f5bebde commit 968bcfa
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions gen_build.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3061,7 +3061,7 @@ private static void write_cppinterop_with_targets_file(XmlWriter f, List<config_

public const int MAJOR_VERSION = 1;
public const int MINOR_VERSION = 1;
public const int PATCH_VERSION = 10;
public const int PATCH_VERSION = 11;
public static string NUSPEC_VERSION_PRE = string.Format("{0}.{1}.{2}-pre{3}",
MAJOR_VERSION,
MINOR_VERSION,
Expand All @@ -3081,7 +3081,7 @@ private static void write_cppinterop_with_targets_file(XmlWriter f, List<config_
(int) ((DateTime.Now - new DateTime(2018,1,1)).TotalDays)
);

private const string NUSPEC_RELEASE_NOTES = "1.1.10: improve bundle_zetetic. update e_sqlite3 to 3.22.0 and turn on FTS5. fix bundled sqlcipher build for UWP. AssemblyVersion now being updated properly. attempt fix crash involving CLR finalizer. add e_sqlite3 builds for linux-arm64 and alpine-x64. change generic Windows builds to use win-foo instead of win7-foo. add support for SQLITE_DETERMINISTIC. added sqlite3_blob_open overload to support higher perf in certain cases. fix problem with Mac-but-not-Xamarin and targets file. 1.1.9: bug fixes for Xamarin.Mac. add a sqlcipher build for UWP. 1.1.8: SQLite builds for .NET Core ARM, linux and Windows IoT. Finalizers. Fix Xam.Mac issue with bundle_green. Fix edge case in one of the sqlite3_column_blob() overloads. New 'bundle_zetetic' for use with official SQLCipher builds from Zetetic. 1.1.7: Drop SQLite down to 3.18.2. 1.1.6: AssetTargetFallback fixes. update sqlite builds to 3.19.3. 1.1.5: bug fix path in lib.foo.linux targets file. 1.1.4: tweak use of nuget .targets files for compat with .NET Core. 1.1.3: add SQLITE_CHECKPOINT_TRUNCATE symbol definition. add new blob overloads to enable better performance in certain cases. chg winsqlite3 to use StdCall. fix targets files for better compat with VS 2017 nuget pack. add 32-bit linux build for e_sqlite3. update to latest libcrypto builds from couchbase folks. 1.1.2: ability to FreezeProvider(). update e_sqlite3 builds to 3.16.1. 1.1.1: add support for config_log. update e_sqlite3 builds to 3.15.2. fix possible memory corruption when using prepare_v2() with multiple statements. better errmsg from ugly.step(). add win8 dep groups in bundles. fix batteries_v2.Init() to be 'last call wins' like the v1 version is. chg raw.SetProvider() to avoid calling sqlite3_initialize() so that sqlite3_config() can be used. better support for Xamarin.Mac. 1.1.0: fix problem with winsqlite3 on UWP. remove iOS Classic support. add sqlite3_enable_load_extension. add sqlite3_config/initialize/shutdown. add Batteries_V2.Init(). 1.0.1: fix problem with bundle_e_sqlite3 on iOS. fix issues with .NET Core. add bundle_sqlcipher. 1.0.0 release: Contains minor breaking changes since 0.9.x. All package names now begin with SQLitePCLRaw. Now supports netstandard. Fixes for UWP and Android N. Change all unit tests to xunit. Support for winsqlite3.dll and custom SQLite builds.";
private const string NUSPEC_RELEASE_NOTES = "1.1.11: put a copy of alpine-x64/e_sqlite3 into linux-musl-x64, for .NET Core 2.1. 1.1.10: improve bundle_zetetic. update e_sqlite3 to 3.22.0 and turn on FTS5. fix bundled sqlcipher build for UWP. AssemblyVersion now being updated properly. attempt fix crash involving CLR finalizer. add e_sqlite3 builds for linux-arm64 and alpine-x64. change generic Windows builds to use win-foo instead of win7-foo. add support for SQLITE_DETERMINISTIC. added sqlite3_blob_open overload to support higher perf in certain cases. fix problem with Mac-but-not-Xamarin and targets file. 1.1.9: bug fixes for Xamarin.Mac. add a sqlcipher build for UWP. 1.1.8: SQLite builds for .NET Core ARM, linux and Windows IoT. Finalizers. Fix Xam.Mac issue with bundle_green. Fix edge case in one of the sqlite3_column_blob() overloads. New 'bundle_zetetic' for use with official SQLCipher builds from Zetetic. 1.1.7: Drop SQLite down to 3.18.2. 1.1.6: AssetTargetFallback fixes. update sqlite builds to 3.19.3. 1.1.5: bug fix path in lib.foo.linux targets file. 1.1.4: tweak use of nuget .targets files for compat with .NET Core. 1.1.3: add SQLITE_CHECKPOINT_TRUNCATE symbol definition. add new blob overloads to enable better performance in certain cases. chg winsqlite3 to use StdCall. fix targets files for better compat with VS 2017 nuget pack. add 32-bit linux build for e_sqlite3. update to latest libcrypto builds from couchbase folks. 1.1.2: ability to FreezeProvider(). update e_sqlite3 builds to 3.16.1. 1.1.1: add support for config_log. update e_sqlite3 builds to 3.15.2. fix possible memory corruption when using prepare_v2() with multiple statements. better errmsg from ugly.step(). add win8 dep groups in bundles. fix batteries_v2.Init() to be 'last call wins' like the v1 version is. chg raw.SetProvider() to avoid calling sqlite3_initialize() so that sqlite3_config() can be used. better support for Xamarin.Mac. 1.1.0: fix problem with winsqlite3 on UWP. remove iOS Classic support. add sqlite3_enable_load_extension. add sqlite3_config/initialize/shutdown. add Batteries_V2.Init(). 1.0.1: fix problem with bundle_e_sqlite3 on iOS. fix issues with .NET Core. add bundle_sqlcipher. 1.0.0 release: Contains minor breaking changes since 0.9.x. All package names now begin with SQLitePCLRaw. Now supports netstandard. Fixes for UWP and Android N. Change all unit tests to xunit. Support for winsqlite3.dll and custom SQLite builds.";

private static void add_dep_core(XmlWriter f)
{
Expand Down Expand Up @@ -3506,6 +3506,11 @@ private static void gen_nuspec_e_sqlite3(string top, string root, string plat)
f.WriteAttributeString("target", "runtimes\\linux-musl-x64\\native\\libe_sqlite3.so");
f.WriteEndElement(); // file

f.WriteStartElement("file");
f.WriteAttributeString("src", Path.Combine(root, "linux", "musl-x64", "libe_sqlite3.so"));
f.WriteAttributeString("target", "runtimes\\alpine-x64\\native\\libe_sqlite3.so");
f.WriteEndElement(); // file

f.WriteStartElement("file");
f.WriteAttributeString("src", Path.Combine(root, "linux", "arm64", "libe_sqlite3.so"));
f.WriteAttributeString("target", "runtimes\\linux-arm64\\native\\libe_sqlite3.so");
Expand Down

0 comments on commit 968bcfa

Please sign in to comment.