Merge branch 'develop'

intelligide · Feb 4, 2023 · 4c8a705 · 4c8a705
2 parents 0c7f75b + 6dce6d7
commit 4c8a705
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 3 deletions.
diff --git a/.github/workflows/package_generation.yml b/.github/workflows/package_generation.yml
@@ -68,6 +68,11 @@ jobs:
           name: AssimpNet
           path: assimpnet/AssimpNet/bin/Release
 
+      - uses: actions/upload-artifact@v3
+        with:
+          name: AssimpNet
+          path: assimpnet/License.txt
+
   build_assimp_win:
     name: Build Assimp for Windows
     if: inputs.buildWindows
@@ -109,6 +114,11 @@ jobs:
           name: Assimp-Win-${{ matrix.BuildArch }}
           path: ${{ runner.temp }}/bin/assimp.dll
 
+      - uses: actions/upload-artifact@v3
+        with:
+          name: Assimp-Win-${{ matrix.BuildArch }}
+          path: assimp-${{ inputs.AssimpVersion }}/LICENSE
+
   build_assimp_linux:
     name: Build Assimp for Linux
     if: inputs.buildLinux
@@ -149,6 +159,11 @@ jobs:
           name: Assimp-Linux-${{ matrix.BuildArch }}
           path: ${{ runner.temp }}/lib/libassimp.so
 
+      - uses: actions/upload-artifact@v3
+        with:
+          name: Assimp-Linux-${{ matrix.BuildArch }}
+          path:  assimp-${{ inputs.AssimpVersion }}/LICENSE
+
   build_assimp_android:
     name: Build Assimp for Android
     if: inputs.buildAndroid
@@ -191,6 +206,11 @@ jobs:
           name: Assimp-Android-${{ matrix.AndroidABI }}
           path: ${{ runner.temp }}/lib/libassimp.so
 
+      - uses: actions/upload-artifact@v3
+        with:
+          name: Assimp-Android-${{ matrix.AndroidABI }}
+          path: assimp-${{ inputs.AssimpVersion }}/LICENSE
+
   build_assimp_macos:
     name: Build Assimp for Mac OS X
     if: inputs.buildmacOS
@@ -228,6 +248,11 @@ jobs:
           name: Assimp-macOS-${{ matrix.BuildArch }}
           path: ${{ runner.temp }}/lib/libassimp.dylib
 
+      - uses: actions/upload-artifact@v3
+        with:
+          name: Assimp-macOS-${{ matrix.BuildArch }}
+          path: assimp-${{ inputs.AssimpVersion }}/LICENSE
+
   build_assimp_ios:
     name: Build Assimp for iOS
     if: inputs.buildiOS
@@ -260,6 +285,11 @@ jobs:
           name: Assimp-iOS-${{ matrix.BuildArch }}
           path: assimp-${{ inputs.AssimpVersion }}/lib/iOS
 
+      - uses: actions/upload-artifact@v3
+        with:
+          name: Assimp-iOS-${{ matrix.BuildArch }}
+          path: assimp-${{ inputs.AssimpVersion }}/LICENSE
+
   build_docs:
     name: Build Docs
     runs-on: 'ubuntu-latest'
@@ -350,8 +380,11 @@ jobs:
       - name: Copy README
         run: cp -f README.md ${{ env.PackageFolder }}/README.md
 
-      - name: Copy License
-        run: cp -f LICENSE.md ${{ env.PackageFolder }}/LICENSE.md
+      - name: Copy Assimp License
+        run: cp -f ${{ env.ArtifactTemporaryDir }}/Assimp-Win-x64/LICENSE ${{ env.PackageFolder }}/AssimpLicense.txt
+
+      - name: Copy AssimpNet License
+        run: cp -f ${{ env.ArtifactTemporaryDir }}/AssimpNet/License.txt ${{ env.PackageFolder }}/AssimpNetLicense.txt
 
       - name: Delete gitkeep files
         run: find ${{ env.PackageFolder }} -name '.gitkeep' -delete

diff --git a/packages/com.arsenstudio.assimp/AssimpLicense.txt b/packages/com.arsenstudio.assimp/AssimpLicense.txt
@@ -0,0 +1 @@
+placeholder
diff --git a/...es/com.arsenstudio.assimp/LICENSE.md.meta → ...arsenstudio.assimp/AssimpLicense.txt.meta b/...es/com.arsenstudio.assimp/LICENSE.md.meta → ...arsenstudio.assimp/AssimpLicense.txt.meta
diff --git a/packages/com.arsenstudio.assimp/AssimpNetLicense.txt b/packages/com.arsenstudio.assimp/AssimpNetLicense.txt
@@ -0,0 +1 @@
+placeholder
diff --git a/packages/com.arsenstudio.assimp/AssimpNetLicense.txt.meta b/packages/com.arsenstudio.assimp/AssimpNetLicense.txt.meta
diff --git a/packages/com.arsenstudio.assimp/LICENSE.md b/packages/com.arsenstudio.assimp/LICENSE.md