Merge pull request #6 from NEKERAFA/develop

Develop

.github/workflows/ClingoSharp.CI.yml

@@ -16,12 +16,12 @@ on:
 
 jobs:
   build:
-
     runs-on: windows-latest
-
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v1
+        uses: actions/checkout@v2
+        with:
+          persist-credentials: false
       - name: Checkout submodules
         run: |
           git submodule init
@@ -30,14 +30,47 @@ jobs:
         uses: actions/setup-dotnet@v1
         with:
           dotnet-version: 3.1.100
+      - name: Building dependecies
+        run: cmd.exe "/c .\build-win32.bat"
       - name: Build
         run: dotnet build --configuration Release
       - name: Test
         run: |
           dotnet test --configuration Debug /p:CollectCoverage=true /p:CoverletOutput=results/ /p:CoverletOutputFormat=lcov
-          powershell -Command "(gc 'tests\ClingoSharp.Tests\results\coverage.info') -replace [regex]::escape('D:\a\ClingoSharp\ClingoSharp\'), [regex]::escape('') | Out-File -encoding ASCII coverage.info"
+          (Get-Content '.\tests\results\coverage.info') -replace [Regex]::Escape('D:\a\ClingoSharp\ClingoSharp\'), [Regex]::Escape('') | Out-File -encoding ASCII coverage.info
+      - name: Building documentation
+        run: |
+          choco install docfx -y
+          docfx '.\docfx.json'
+          if ($lastexitcode -ne 0){
+            throw [System.Exception] "docfx build failed with exit code $lastexitcode."
+          }
       - name: Reporting coverage result
         uses: coverallsapp/github-action@master
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           path-to-lcov: .\coverage.info
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v1
+        with:
+          name: site
+          path: _site
+
+  deploy:
+    needs: [build]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          persist-credentials: false
+      - name: Download Artifacts # The built project is downloaded into the 'site' folder.
+        uses: actions/download-artifact@v1
+        with:
+          name: site
+      - name: Deploy
+        uses: JamesIves/github-pages-deploy-action@releases/v3
+        with:
+          ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }}
+          BRANCH: gh-pages
+          FOLDER: "site" # The deployment folder should match the name of the artifact. Even though our project builds into the 'build' folder the artifact name of 'site' must be placed here.

.gitignore

@@ -1,3 +1,11 @@
+###############
+#    folder   #
+###############
+DROP/
+TEMP/
+_site/
+*.vs
+
 # Created by https://www.gitignore.io/api/csharp
 # Edit at https://www.gitignore.io/?templates=csharp
 
@@ -25,6 +33,7 @@ mono_crash.*
 [Dd]ebugPublic/
 [Rr]elease/
 [Rr]eleases/
+[Pp]ackages/
 x64/
 x86/
 [Aa][Rr][Mm]/
@@ -33,7 +42,6 @@ bld/
 [Bb]in/
 [Oo]bj/
 [Ll]og/
-[Bb]uild/
 
 # Visual Studio 2015/2017 cache/options directory
 .vs/

ClingoSharp.sln

@@ -1,43 +1,59 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
-VisualStudioVersion = 16.0.29613.14
+VisualStudioVersion = 16.0.29806.167
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClingoSharpApp", "source\ClingoSharpApp\ClingoSharpApp.csproj", "{1A137938-8A13-48AB-A4C5-360EE31F7A37}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClingoSharp", "src\ClingoSharp\ClingoSharp.csproj", "{AD231050-B939-48E7-8D5B-5D313C44B8B8}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Library", "Library", "{441EC391-37C0-41FF-B472-618505E2AA7B}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Library", "Library", "{9F79E55B-82B5-450C-AA07-6559196F8B31}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClingoSharp", "source\ClingoSharp\ClingoSharp.csproj", "{CA41D45B-D389-4681-A36D-D9E7AF2E0217}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Examples", "Examples", "{498A4F49-6B6C-4A39-932D-9F7F41DCE625}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClingoSharp.Tests", "tests\ClingoSharp.Tests\ClingoSharp.Tests.csproj", "{0289A89E-85B0-471C-AB80-E5580C36F6D6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClingoSharp.Application", "examples\ClingoSharp.Application.csproj", "{6CC66EE6-4846-4B62-9E85-3822BE02A729}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClingoSharp.Test", "tests\ClingoSharp.Test.csproj", "{E26B31EE-8CF9-43E7-A8F7-E7D7EF283A73}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClingoSharp.NativeWrapper", "src\ClingoSharp.NativeWrapper\ClingoSharp.NativeWrapper.csproj", "{F85762B3-1F18-404A-9778-8066F74E486A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClingoSharp.CoreServices", "src\ClingoSharp.CoreServices\ClingoSharp.CoreServices.csproj", "{FD343390-4193-4981-B985-4FA0767B77A1}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{1A137938-8A13-48AB-A4C5-360EE31F7A37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1A137938-8A13-48AB-A4C5-360EE31F7A37}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1A137938-8A13-48AB-A4C5-360EE31F7A37}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1A137938-8A13-48AB-A4C5-360EE31F7A37}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CA41D45B-D389-4681-A36D-D9E7AF2E0217}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CA41D45B-D389-4681-A36D-D9E7AF2E0217}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CA41D45B-D389-4681-A36D-D9E7AF2E0217}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CA41D45B-D389-4681-A36D-D9E7AF2E0217}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0289A89E-85B0-471C-AB80-E5580C36F6D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0289A89E-85B0-471C-AB80-E5580C36F6D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0289A89E-85B0-471C-AB80-E5580C36F6D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0289A89E-85B0-471C-AB80-E5580C36F6D6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AD231050-B939-48E7-8D5B-5D313C44B8B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AD231050-B939-48E7-8D5B-5D313C44B8B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AD231050-B939-48E7-8D5B-5D313C44B8B8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AD231050-B939-48E7-8D5B-5D313C44B8B8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6CC66EE6-4846-4B62-9E85-3822BE02A729}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6CC66EE6-4846-4B62-9E85-3822BE02A729}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6CC66EE6-4846-4B62-9E85-3822BE02A729}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6CC66EE6-4846-4B62-9E85-3822BE02A729}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E26B31EE-8CF9-43E7-A8F7-E7D7EF283A73}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E26B31EE-8CF9-43E7-A8F7-E7D7EF283A73}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E26B31EE-8CF9-43E7-A8F7-E7D7EF283A73}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E26B31EE-8CF9-43E7-A8F7-E7D7EF283A73}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F85762B3-1F18-404A-9778-8066F74E486A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F85762B3-1F18-404A-9778-8066F74E486A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F85762B3-1F18-404A-9778-8066F74E486A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F85762B3-1F18-404A-9778-8066F74E486A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FD343390-4193-4981-B985-4FA0767B77A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FD343390-4193-4981-B985-4FA0767B77A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FD343390-4193-4981-B985-4FA0767B77A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FD343390-4193-4981-B985-4FA0767B77A1}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{CA41D45B-D389-4681-A36D-D9E7AF2E0217} = {441EC391-37C0-41FF-B472-618505E2AA7B}
-		{0289A89E-85B0-471C-AB80-E5580C36F6D6} = {441EC391-37C0-41FF-B472-618505E2AA7B}
+		{AD231050-B939-48E7-8D5B-5D313C44B8B8} = {9F79E55B-82B5-450C-AA07-6559196F8B31}
+		{6CC66EE6-4846-4B62-9E85-3822BE02A729} = {498A4F49-6B6C-4A39-932D-9F7F41DCE625}
+		{F85762B3-1F18-404A-9778-8066F74E486A} = {9F79E55B-82B5-450C-AA07-6559196F8B31}
+		{FD343390-4193-4981-B985-4FA0767B77A1} = {9F79E55B-82B5-450C-AA07-6559196F8B31}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {8FD73ECA-F51C-4B18-8442-724187341EA4}
+		SolutionGuid = {18573E7B-B9A8-42B3-8ADD-0FF827D999D6}
 	EndGlobalSection
 EndGlobal

api/.gitignore

@@ -0,0 +1,5 @@
+###############
+#  temp file  #
+###############
+*.yml
+.manifest

api/index.md

@@ -0,0 +1,2 @@
+# PLACEHOLDER
+TODO: Add .NET projects to the *src* folder and run `docfx` to generate **REAL** *API Documentation*!

articles/intro.md

@@ -0,0 +1 @@
+# Add your introductions here!

articles/toc.yml

@@ -0,0 +1,2 @@
+- name: Introduction
+  href: intro.md

build-ubuntu.sh

@@ -0,0 +1,15 @@
+if [ ! -f "clingo\build\i686\bin\Release\clingo.so" ]; then
+   cmake "clingo" -B"clingo\build\i386" -DCLINGO_BUILD_SHARED=ON -DCLINGO_BUILD_WITH_PYTHON=OFF -DCLINGO_BUILD_WITH_LUA=OFF -DCLINGO_BUILD_APPS=OFF -m32
+   cmake --build "clingo\build\i368"
+fi
+
+if [ ! -f "clingo\build\x86_64\bin\Release\clingo.so" ]; then
+   cmake "clingo" -B"clingo\build\x86_64" -DCLINGO_BUILD_SHARED=ON -DCLINGO_BUILD_WITH_PYTHON=OFF -DCLINGO_BUILD_WITH_LUA=OFF -DCLINGO_BUILD_APPS=OFF -m64
+   cmake --build "clingo\build\x86_64"
+fi
+
+mkdir -p -v "tests\bin\Debug\netcoreapp3.1\lib32"
+xcopy /y "clingo\build\i368\bin\Release\clingo.so" "tests\bin\Debug\netcoreapp3.1\lib32"
+
+mkdir -p -v "tests\bin\Debug\netcoreapp3.1\lib"
+xcopy /y "clingo\build\x86_64\bin\Release\clingo.so" "tests\bin\Debug\netcoreapp3.1\lib"

build-win32.bat

@@ -0,0 +1,15 @@
+IF NOT EXIST "clingo\build\x86\bin\Release\clingo.dll" (
+   cmake "clingo" -B"clingo\build\x86" -DCLINGO_BUILD_SHARED=ON -DCLINGO_BUILD_WITH_PYTHON=OFF -DCLINGO_BUILD_WITH_LUA=OFF -DCLINGO_BUILD_APPS=OFF -G "Visual Studio 16 2019" -A Win32
+   cmake --build "clingo\build\x86" --config Release
+)
+
+IF NOT EXIST "clingo\build\x64\bin\Release\clingo.dll" (
+   cmake "clingo" -B"clingo\build\x64" -DCLINGO_BUILD_SHARED=ON -DCLINGO_BUILD_WITH_PYTHON=OFF -DCLINGO_BUILD_WITH_LUA=OFF -DCLINGO_BUILD_APPS=OFF -G "Visual Studio 16 2019" -A x64
+   cmake --build "clingo\build\x64" --config Release
+)
+
+IF NOT EXIST "tests\bin\Debug\netcoreapp3.1\lib32" mkdir "tests\bin\Debug\netcoreapp3.1\lib32"
+xcopy /y "clingo\build\x86\bin\Release\clingo.dll" "tests\bin\Debug\netcoreapp3.1\lib32"
+
+IF NOT EXIST "tests\bin\Debug\netcoreapp3.1\lib" mkdir "tests\bin\Debug\netcoreapp3.1\lib"
+xcopy /y "clingo\build\x64\bin\Release\clingo.dll" "tests\bin\Debug\netcoreapp3.1\lib"