From 4bac6ae2e725a1997674fd3369bf4ea032235d8b Mon Sep 17 00:00:00 2001
From: Joel Stålnacke <joel@saker.fi>
Date: Tue, 8 Oct 2024 19:59:10 +0300
Subject: Add a native "Hello World" to the project

After much trouble with MSBuild
---
 Djup/Djup.csproj                   | 16 ----------------
 Djup/Program.cs                    |  2 --
 lib/Djup.Native/.gitignore         |  2 --
 lib/Djup.Native/Djup.Native.csproj | 27 ---------------------------
 lib/Djup.Native/LibDjup.cs         | 12 ------------
 lib/Djup.Native/Program.cs         |  2 --
 lib/build.sh                       |  2 +-
 7 files changed, 1 insertion(+), 62 deletions(-)
 delete mode 100644 Djup/Djup.csproj
 delete mode 100644 Djup/Program.cs
 delete mode 100644 lib/Djup.Native/.gitignore
 delete mode 100644 lib/Djup.Native/Djup.Native.csproj
 delete mode 100644 lib/Djup.Native/LibDjup.cs
 delete mode 100644 lib/Djup.Native/Program.cs

diff --git a/Djup/Djup.csproj b/Djup/Djup.csproj
deleted file mode 100644
index 3c18b7c..0000000
--- a/Djup/Djup.csproj
+++ /dev/null
@@ -1,16 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <ItemGroup>
-    <ProjectReference Include="..\lib\Djup.Native\Djup.Native.csproj">
-      <!--<Private>false</Private>-->
-    </ProjectReference>
-  </ItemGroup>
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-
-</Project>
diff --git a/Djup/Program.cs b/Djup/Program.cs
deleted file mode 100644
index c66eb42..0000000
--- a/Djup/Program.cs
+++ /dev/null
@@ -1,2 +0,0 @@
-using Djup.Native;
-LibDjup.hello_world();
diff --git a/lib/Djup.Native/.gitignore b/lib/Djup.Native/.gitignore
deleted file mode 100644
index c6e49ef..0000000
--- a/lib/Djup.Native/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-obj/
-bin/
diff --git a/lib/Djup.Native/Djup.Native.csproj b/lib/Djup.Native/Djup.Native.csproj
deleted file mode 100644
index 7184efb..0000000
--- a/lib/Djup.Native/Djup.Native.csproj
+++ /dev/null
@@ -1,27 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <!--<OutputType>exe</OutputType>-->
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <ItemGroup Condition=" '$(Configuration)'=='Release' ">
-    <None Include="$(MSBuildThisFileDirectory)../build/runtimes/linux-x64/native/libdjup.so"> 
-      <TargetPath>runtimes/linux-x64/native/libdjup.so</TargetPath>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <PackagePath>runtimes/linux-x64/native/</PackagePath>
-      <Pack>true</Pack>
-    </None>
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Configuration)'=='Debug' ">
-    <Content Include="$(MSBuildThisFileDirectory)../build/**">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-  <!-- This fixes import errors (adding another library with native assets) -->
-  <!--<ItemGroup>-->
-  <!--  <PackageReference Include="SQLitePCLRaw.lib.e_sqlite3" Version="2.1.10" />-->
-  <!--</ItemGroup>-->
-</Project>
diff --git a/lib/Djup.Native/LibDjup.cs b/lib/Djup.Native/LibDjup.cs
deleted file mode 100644
index 5e6db83..0000000
--- a/lib/Djup.Native/LibDjup.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System.Runtime.InteropServices;
-
-namespace Djup.Native;
-
-public static partial class LibDjup
-{
-    const string LibraryName = "djup";
-    const string Prefix = "dp_";
-
-    [LibraryImport(LibraryName, EntryPoint = Prefix + nameof(hello_world))]
-    public static partial void hello_world();
-}
diff --git a/lib/Djup.Native/Program.cs b/lib/Djup.Native/Program.cs
deleted file mode 100644
index 2667048..0000000
--- a/lib/Djup.Native/Program.cs
+++ /dev/null
@@ -1,2 +0,0 @@
-/*using Djup.Native;*/
-/*LibDjup.hello_world();*/
diff --git a/lib/build.sh b/lib/build.sh
index ccdc117..13aaf8e 100755
--- a/lib/build.sh
+++ b/lib/build.sh
@@ -48,4 +48,4 @@ case "$runtime" in
 esac
 
 echo Building for runtime "$runtime ..."
-mkdir -p "$output/runtimes/$runtime/native" && $CC $CFLAGS $SOURCES -shared $LDFLAGS -o "$output/runtimes/$runtime/native/$sofile" && echo Done
+mkdir -p "$output/$runtime" && $CC $CFLAGS $SOURCES -shared $LDFLAGS -o "$output/$runtime/$sofile" && echo Done
-- 
cgit v1.2.3