2.4.0.20210321

takuya-takeuchi · Mar 21, 2021 · 41eba43 · 41eba43
1 parent 7cb6995
commit 41eba43
Show file tree

Hide file tree

Showing 53 changed files with 5,023 additions and 856 deletions.
diff --git a/.github/workflows/docfx.yml b/.github/workflows/docfx.yml
@@ -0,0 +1,34 @@
+name: DocFX
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  build:
+    runs-on: windows-2019
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 1
+
+      - name: DocFX
+        shell: cmd
+        run: |
+          choco install docfx -y
+          docfx docfx\docfx.json
+
+      - name: Upload DocFX packages
+        uses: actions/upload-artifact@v2
+        with:
+          name: docfx_site
+          path: ${{ github.workspace }}\docfx\_site
+
+      - name: Publish Documentation on GitHub Pages
+        uses: peaceiris/actions-gh-pages@v3
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_dir: docfx/_site
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -20,29 +20,14 @@ build:win:
     paths:
       - nuget/artifacts
 
-build:cent:
-  stage: build
-  before_script:
-    - git submodule update --init --recursive
-    - export
-  script:
-    - cd nuget
-    - pwsh BuildCentOS7.ps1
-  tags:
-    - linux
-    - cuda
-  artifacts:
-    paths:
-      - nuget/artifacts
-
 build:ubuntu:
   stage: build
   before_script:
     - git submodule update --init --recursive
     - export
   script:
     - cd nuget
-    - pwsh BuildUbuntu16.ps1
+    - pwsh BuildUbuntu18.ps1
   tags:
     - linux
     - cuda
@@ -76,7 +61,6 @@ package:
   dependencies:
     - build:win
     - build:ubuntu
-    - build:cent
     - build:osx
   artifacts:
     paths:
@@ -97,25 +81,11 @@ test:win:
     paths:
       - nuget/artifacts/test
 
-test:cent:
-  stage: test
-  script:
-    - cd nuget
-    - pwsh TestPackageCentOS7.ps1
-  tags:
-    - linux
-    - cuda
-  dependencies:
-    - package
-  artifacts:
-    paths:
-      - nuget/artifacts/test
-
 test:ubuntu:
   stage: test
   script:
     - cd nuget
-    - pwsh TestPackageUbuntu16.ps1
+    - pwsh TestPackageUbuntu18.ps1
   tags:
     - linux
     - cuda

diff --git a/OpenJpegDotNet.sln b/OpenJpegDotNet.sln
@@ -14,33 +14,17 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{2892CB9C-FDFA-48B9-B330-9A4FA3AAA475}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{2892CB9C-FDFA-48B9-B330-9A4FA3AAA475}.Debug|x64.ActiveCfg = Debug|x64
-		{2892CB9C-FDFA-48B9-B330-9A4FA3AAA475}.Debug|x64.Build.0 = Debug|x64
-		{2892CB9C-FDFA-48B9-B330-9A4FA3AAA475}.Debug|x86.ActiveCfg = Debug|x86
-		{2892CB9C-FDFA-48B9-B330-9A4FA3AAA475}.Debug|x86.Build.0 = Debug|x86
-		{2892CB9C-FDFA-48B9-B330-9A4FA3AAA475}.Release|Any CPU.ActiveCfg = Release|x86
-		{2892CB9C-FDFA-48B9-B330-9A4FA3AAA475}.Release|x64.ActiveCfg = Release|x64
-		{2892CB9C-FDFA-48B9-B330-9A4FA3AAA475}.Release|x64.Build.0 = Release|x64
-		{2892CB9C-FDFA-48B9-B330-9A4FA3AAA475}.Release|x86.ActiveCfg = Release|x86
-		{2892CB9C-FDFA-48B9-B330-9A4FA3AAA475}.Release|x86.Build.0 = Release|x86
-		{282805A8-0D69-48F1-91BC-471F88B331BB}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{282805A8-0D69-48F1-91BC-471F88B331BB}.Debug|x64.ActiveCfg = Debug|x64
-		{282805A8-0D69-48F1-91BC-471F88B331BB}.Debug|x64.Build.0 = Debug|x64
-		{282805A8-0D69-48F1-91BC-471F88B331BB}.Debug|x86.ActiveCfg = Debug|x86
-		{282805A8-0D69-48F1-91BC-471F88B331BB}.Debug|x86.Build.0 = Debug|x86
-		{282805A8-0D69-48F1-91BC-471F88B331BB}.Release|Any CPU.ActiveCfg = Release|x86
-		{282805A8-0D69-48F1-91BC-471F88B331BB}.Release|x64.ActiveCfg = Release|x64
-		{282805A8-0D69-48F1-91BC-471F88B331BB}.Release|x64.Build.0 = Release|x64
-		{282805A8-0D69-48F1-91BC-471F88B331BB}.Release|x86.ActiveCfg = Release|x86
-		{282805A8-0D69-48F1-91BC-471F88B331BB}.Release|x86.Build.0 = Release|x86
+		{2892CB9C-FDFA-48B9-B330-9A4FA3AAA475}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2892CB9C-FDFA-48B9-B330-9A4FA3AAA475}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2892CB9C-FDFA-48B9-B330-9A4FA3AAA475}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2892CB9C-FDFA-48B9-B330-9A4FA3AAA475}.Release|Any CPU.Build.0 = Release|Any CPU
+		{282805A8-0D69-48F1-91BC-471F88B331BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{282805A8-0D69-48F1-91BC-471F88B331BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{282805A8-0D69-48F1-91BC-471F88B331BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{282805A8-0D69-48F1-91BC-471F88B331BB}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/docfx/.gitignore b/docfx/.gitignore
@@ -0,0 +1,9 @@
+###############
+#    folder   #
+###############
+/**/DROP/
+/**/TEMP/
+/**/packages/
+/**/bin/
+/**/obj/
+_site
diff --git a/docfx/GenerateFaceRecognitionDotNetDocmenet.ps1 b/docfx/GenerateFaceRecognitionDotNetDocmenet.ps1
@@ -0,0 +1,8 @@
+$Current = $PSScriptRoot
+
+$OpenJpegDotNetRoot = Split-Path $Current -Parent
+$SourceRoot = Join-Path $OpenJpegDotNetRoot src
+$OpenJpegDotNetProjectRoot = Join-Path $SourceRoot OpenJpegDotNet
+
+docfx init -q -o docs
+Set-Location $Current
diff --git a/docfx/RunDocumentServer.ps1 b/docfx/RunDocumentServer.ps1
@@ -0,0 +1,10 @@
+$Current = $PSScriptRoot
+
+$OpenJpegDotNetRoot = Split-Path $Current -Parent
+$SourceRoot = Join-Path $OpenJpegDotNetRoot src
+$OpenJpegDotNetProjectRoot = Join-Path $SourceRoot OpenJpegDotNet
+$DocumentDir = Join-Path $OpenJpegDotNetProjectRoot docfx
+$Json = Join-Path $Current docfx.json
+
+docfx "${Json}" --serve
+Set-Location $Current
diff --git a/docfx/docfx.json b/docfx/docfx.json
@@ -0,0 +1,69 @@
+{
+  "metadata": [
+    {
+      "src": [
+        {
+          "files": [
+            "**/OpenJpegDotNet.csproj"
+          ],
+          "src": "../src/OpenJpegDotNet"
+        }
+      ],
+      "dest": "api",
+      "disableGitFeatures": false,
+      "disableDefaultFilter": false
+    }
+  ],
+  "build": {
+    "content": [
+      {
+        "files": [
+          "api/**.yml",
+          "api/index.md"
+        ]
+      },
+      {
+        "files": [
+          "articles/**.md",
+          "articles/**/toc.yml",
+          "toc.yml",
+          "*.md"
+        ]
+      }
+    ],
+    "resource": [
+      {
+        "files": [
+          "images/**"
+        ]
+      }
+    ],
+    "overwrite": [
+      {
+        "files": [
+          "apidoc/**.md"
+        ],
+        "exclude": [
+          "obj/**",
+          "_site/**"
+        ]
+      }
+    ],
+    "dest": "_site",
+    "globalMetadataFiles": [],
+    "globalMetadata": {      
+      "_appTitle": "OpenJpegDotNet API Document",
+      "_appLogoPath": "images/logo.png"
+    },
+    "fileMetadataFiles": [],
+    "template": [
+      "default"
+    ],
+    "postProcessors": [],
+    "markdownEngineName": "markdig",
+    "noLangKeyword": false,
+    "keepFileLink": false,
+    "cleanupCacheHistory": false,
+    "disableGitFeatures": false
+  }
+}
diff --git a/docfx/images/logo.png b/docfx/images/logo.png
diff --git a/docfx/index.md b/docfx/index.md
@@ -0,0 +1,3 @@
+# OpenJpegDotNet API Document
+
+OpenJpeg wrapper written in C++ and C# for Windows, MacOS and Linux.
diff --git a/docfx/toc.yml b/docfx/toc.yml
@@ -0,0 +1,5 @@
+# - name: Articles
+#   href: articles/
+- name: Api Documentation
+  href: api/
+#  homepage: api/index.md
diff --git a/docker/runtime/ubuntu/18/Dockerfile b/docker/runtime/ubuntu/18/Dockerfile
@@ -18,5 +18,10 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     dotnet-sdk-${DOTNET_SDK_VERSION} \
  && apt-get clean && rm -rf /var/lib/apt/lists/*
 
+# Install sudo apt-get install -y libgdiplus
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    libgdiplus \
+ && apt-get clean && rm -rf /var/lib/apt/lists/*
+
 # Trigger first run experience by running arbitrary cmd to populate local package cache
 RUN dotnet help
diff --git a/nuget/BuildUtils.ps1 b/nuget/BuildUtils.ps1
@@ -384,6 +384,7 @@ class ThirdPartyBuilder
    {
       $ret = ""
       $current = Get-Location
+      $buildConfig = $this._Config.GetConfigurationName()
 
       try
       {
@@ -397,51 +398,58 @@ class ThirdPartyBuilder
          $installDir = (Join-Path $current2 install).Replace("`\", "/")
          $ret = $installDir
 
+         # OSX failed to build due to zlib
+         $BUILD_THIRDPARTY="OFF"
+
          if ($global:IsWindows)
          {
             $VS = $this._Config.GetVisualStudio()
             $VSARC = $this._Config.GetVisualStudioArchitecture()
             Write-Host "   cmake -G `"${VS}`" -A ${VSARC} -T host=x64 `
-         -D BUILD_SHARED_LIBS:bool=off `
-         -D CMAKE_BUILD_TYPE:string=Release `
-         -D CMAKE_INSTALL_PREFIX:path=`"${installDir}`" `
-         -D CMAKE_LIBRARY_PATH:path=`"${installDir}`" `
-         -D CMAKE_INCLUDE_PATH:path=`"${installDir}/include`" `
+         -D BUILD_SHARED_LIBS:BOOL=OFF `
+         -D CMAKE_BUILD_TYPE:STRING=${buildConfig} `
+         -D CMAKE_INSTALL_PREFIX:PATH=`"${installDir}`" `
+         -D CMAKE_LIBRARY_PATH:PATH=`"${installDir}`" `
+         -D CMAKE_INCLUDE_PATH:PATH=`"${installDir}/include`" `
+         -D BUILD_THIRDPARTY:BOOL=${BUILD_THIRDPARTY} `
          `"$openjpegDir`"" -ForegroundColor Yellow
             cmake -G "${VS}" -A ${VSARC} -T host=x64 `
-                  -D BUILD_SHARED_LIBS:bool=off `
-                  -D CMAKE_BUILD_TYPE:string=Release `
-                  -D CMAKE_INSTALL_PREFIX:path="${installDir}" `
-                  -D CMAKE_LIBRARY_PATH:path="${installDir}" `
-                  -D CMAKE_INCLUDE_PATH:path="${installDir}/include" `
+                  -D BUILD_SHARED_LIBS:BOOL=OFF `
+                  -D CMAKE_BUILD_TYPE:STRING=${buildConfig} `
+                  -D CMAKE_INSTALL_PREFIX:PATH="${installDir}" `
+                  -D CMAKE_LIBRARY_PATH:PATH="${installDir}" `
+                  -D CMAKE_INCLUDE_PATH:PATH="${installDir}/include" `
+                  -D BUILD_THIRDPARTY:BOOL=${BUILD_THIRDPARTY} `
                   "${openjpegDir}"
-            Write-Host "   cmake --build . --config Release" -ForegroundColor Yellow
-            cmake --build . --config Release
-            Write-Host "   cmake --install ." -ForegroundColor Yellow
-            cmake --install .
+            Write-Host "   cmake --build . --config ${buildConfig}" -ForegroundColor Yellow
+            cmake --build . --config ${buildConfig}
+            Write-Host "   cmake --install . --config ${buildConfig}" -ForegroundColor Yellow
+            cmake --install . --config ${buildConfig}
          }
          else
          {
-            Write-Host "   cmake -D CMAKE_BUILD_TYPE=Release `
-            -D BUILD_SHARED_LIBS:bool=off `
-            -D CMAKE_BUILD_TYPE:string=Release `
-            -D CMAKE_INSTALL_PREFIX:path=`"${installDir}`" `
-            -D CMAKE_LIBRARY_PATH:path=`"${installDir}`" `
-            -D CMAKE_INCLUDE_PATH:path=`"${installDir}/include`" `
-            -D CMAKE_POSITION_INDEPENDENT_CODE:BOOL=true `
+            Write-Host "   cmake -D CMAKE_BUILD_TYPE=${buildConfig} `
+            -D BUILD_SHARED_LIBS:BOOL=OFF `
+            -D CMAKE_BUILD_TYPE:STRING=${buildConfig} `
+            -D CMAKE_INSTALL_PREFIX:PATH=`"${installDir}`" `
+            -D CMAKE_LIBRARY_PATH:PATH=`"${installDir}`" `
+            -D CMAKE_INCLUDE_PATH:PATH=`"${installDir}/include`" `
+            -D CMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON `
+            -D BUILD_THIRDPARTY:BOOL=${BUILD_THIRDPARTY} `
             `"$openjpegDir`"" -ForegroundColor Yellow
-               cmake -D CMAKE_BUILD_TYPE=Release `
-                     -D BUILD_SHARED_LIBS:bool=off `
-                     -D CMAKE_BUILD_TYPE:string=Release `
-                     -D CMAKE_INSTALL_PREFIX:path="${installDir}" `
-                     -D CMAKE_LIBRARY_PATH:path="${installDir}" `
-                     -D CMAKE_INCLUDE_PATH:path="${installDir}/include" `
-                     -D CMAKE_POSITION_INDEPENDENT_CODE:BOOL=true `
+               cmake -D CMAKE_BUILD_TYPE=${buildConfig} `
+                     -D BUILD_SHARED_LIBS:BOOL=OFF `
+                     -D CMAKE_BUILD_TYPE:STRING=${buildConfig} `
+                     -D CMAKE_INSTALL_PREFIX:PATH="${installDir}" `
+                     -D CMAKE_LIBRARY_PATH:PATH="${installDir}" `
+                     -D CMAKE_INCLUDE_PATH:PATH="${installDir}/include" `
+                     -D CMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON `
+                     -D BUILD_THIRDPARTY:BOOL=${BUILD_THIRDPARTY} `
                      "${openjpegDir}"
-               Write-Host "   cmake --build . --config Release" -ForegroundColor Yellow
-               cmake --build . --config Release
-               Write-Host "   cmake --install ." -ForegroundColor Yellow
-               cmake --install .
+               Write-Host "   cmake --build . --config ${buildConfig}" -ForegroundColor Yellow
+               cmake --build . --config ${buildConfig}
+               Write-Host "   cmake --install . --config ${buildConfig}" -ForegroundColor Yellow
+               cmake --install . --config ${buildConfig}
          }
       }
       finally