WIP - migrate to VPM package

Author: jacklul

.github/legacy.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+
+PACKAGE_DIR="$1"
+{ [ -z "$PACKAGE_DIR" ] || [ ! -f "$PACKAGE_DIR/package.json" ] ; } && { echo "Package dir was not provided or is invalid"; exit 1; }
+
+# Remove assembly definition files, including UdonSharp ones
+find "$PACKAGE_DIR" -name "*.asmdef" -exec sh -c 'rm -v "$1" "$1.meta" "${1%.asmdef}.asset" "${1%.asmdef}.asset.meta"' _ {} \;
+
+# Replace references to package assembly names with standard Assembly-CSharp
+replace="Assembly-CSharp"
+
+find=" Jacklul.USharpVideoSubtitles.Editor"
+grep -rlF "$find" "$PACKAGE_DIR" | while IFS= read -r file; do
+    sed "s|$find|$replace|g" -i "$file"
+done
+
+find=" Jacklul.USharpVideoSubtitles"
+grep -rlF "$find" "$PACKAGE_DIR" | while IFS= read -r file; do
+    sed "s|$find|$replace|g" -i "$file"
+done
+
+find=" USharpVideo"
+grep -rlF "$find" "$PACKAGE_DIR" | while IFS= read -r file; do
+    sed "s|$find|$replace|g" -i "$file"
+done

.github/workflows/release.yml

@@ -9,7 +9,7 @@ on:
   workflow_dispatch:
 
 env:
-  PACKAGE_NAME: USharpVideoSubtitles
+  PACKAGE_NAME: io.github.jacklul.usharpvideosubtitles
 
 jobs:
   release:
@@ -18,10 +18,6 @@ jobs:
     permissions:
       contents: write
 
-    outputs:
-      version: ${{ steps.variables.outputs.version }}
-      unitypackage_file: ${{ steps.variables.outputs.unitypackage_file }}
-
     steps:
       - name: Checkout local repository
         uses: actions/checkout@v4
@@ -37,35 +33,58 @@ jobs:
               version="$(git describe --tags --always)"
           fi
           echo "version=$(echo "$version" | sed 's/^v//')" >> $GITHUB_OUTPUT
-          echo "unitypackage_file=${{ env.PACKAGE_NAME }}-${version}.unitypackage" >> $GITHUB_OUTPUT
+          echo "unitypackage=${{ env.PACKAGE_NAME }}-${version}.unitypackage" >> $GITHUB_OUTPUT
+          echo "unitypackage_legacy=${{ env.PACKAGE_NAME }}-${version}_legacy.unitypackage" >> $GITHUB_OUTPUT
+          echo "zip_archive=${{ env.PACKAGE_NAME }}-${version}.zip" >> $GITHUB_OUTPUT
           cat "$GITHUB_OUTPUT"
 
       - name: Insert version string to files
         run: |
           placeholder="0.0.0-dev"
           version="${{ steps.variables.outputs.version }}"
-          grep -rlF "$placeholder" "Assets/${{ env.PACKAGE_NAME }}/" | while IFS= read -r file; do
+          grep -rlF "$placeholder" "Packages/${{ env.PACKAGE_NAME }}/" | while IFS= read -r file; do
               echo "$file"
               sed "s|$placeholder|$version|g" -i "$file"
           done
 
-      - name: Generate list of meta files
+      - name: Prepare for packaging
         run: |
-          echo "Assets/${{ env.PACKAGE_NAME }}.meta" > metaList
-          find "Assets/${{ env.PACKAGE_NAME }}/" -name \*.meta >> metaList
+          cp -f LICENSE "Packages/${{ env.PACKAGE_NAME }}/LICENSE.txt"
+          find "Packages/${{ env.PACKAGE_NAME }}/" -name "*.meta" >> metaList
+
+      - name: Create Zip
+        working-directory: "Packages/${{ env.PACKAGE_NAME }}"
+        run: zip -r "${{ github.workspace }}/${{ steps.variables.outputs.zip_archive }}" .
 
       - name: Create UnityPackage
         uses: pCYSl5EDgo/create-unitypackage@v1
         with:
-          package-path: ${{ steps.variables.outputs.unitypackage_file }}
+          package-path: ${{ steps.variables.outputs.unitypackage }}
+          include-files: metaList
+
+      - name: Prepare legacy variant
+        if: ${{ steps.variables.outputs.unitypackage_legacy != '' }}
+        run: |
+          bash ./.github/legacy.sh "${{ github.workspace }}/Packages/${{ env.PACKAGE_NAME }}"
+          rm metaList
+          find "Packages/${{ env.PACKAGE_NAME }}/" -name "*.meta" >> metaList
+
+      - name: Create UnityPackage (legacy)
+        uses: pCYSl5EDgo/create-unitypackage@v1
+        if: ${{ steps.variables.outputs.unitypackage_legacy != '' }}
+        with:
+          package-path: ${{ steps.variables.outputs.unitypackage_legacy }}
           include-files: metaList
 
       - name: Create release
         uses: softprops/action-gh-release@v2
         if: startsWith(github.ref, 'refs/tags/')
         with:
           files: |
-            ${{ needs.build.outputs.unitypackage_file }}
+            ${{ needs.build.outputs.zip_archive }}
+            ${{ needs.build.outputs.unitypackage }}
+            ${{ needs.build.outputs.unitypackage_legacy != '' && needs.build.outputs.unitypackage_legacy || '' }}
+            Packages/${{ env.PACKAGE_NAME }}/package.json
           generate_release_notes: true
           draft: true
 
@@ -75,4 +94,7 @@ jobs:
         with:
           name: build
           path: |
-            ${{ steps.variables.outputs.unitypackage_file }}
+            ${{ steps.variables.outputs.zip_archive }}
+            ${{ steps.variables.outputs.unitypackage }}
+            ${{ needs.build.outputs.unitypackage_legacy != '' && needs.build.outputs.unitypackage_legacy || '' }}
+            Packages/${{ env.PACKAGE_NAME }}/package.json

Assets/.gitignore

@@ -5,5 +5,3 @@
 # Stuff to track
 !/Dev/
 !/Dev.meta
-!/USharpVideoSubtitles/
-!/USharpVideoSubtitles.meta

Assets/Dev/Scripts/Testing.asset

@@ -62,7 +62,7 @@ MonoBehaviour:
       Data: 3|System.RuntimeType, mscorlib
     - Name: 
       Entry: 1
-      Data: UdonSharp.Video.USharpVideoPlayer, Assembly-CSharp
+      Data: UdonSharp.Video.USharpVideoPlayer, USharpVideo
     - Name: 
       Entry: 8
       Data: 
@@ -131,7 +131,7 @@ MonoBehaviour:
       Data: 8|System.RuntimeType, mscorlib
     - Name: 
       Entry: 1
-      Data: UdonSharp.Video.Subtitles.SubtitleManager, Assembly-CSharp
+      Data: UdonSharp.Video.Subtitles.SubtitleManager, Jacklul.USharpVideoSubtitless
     - Name: 
       Entry: 8
       Data: 
@@ -356,7 +356,7 @@ MonoBehaviour:
       Data: 21|System.RuntimeType, mscorlib
     - Name: 
       Entry: 1
-      Data: UdonSharp.Video.Subtitles.SubtitleOverlayHandler, Assembly-CSharp
+      Data: UdonSharp.Video.Subtitles.SubtitleOverlayHandler, Jacklul.USharpVideoSubtitles
     - Name: 
       Entry: 8
       Data: 

Assets/USharpVideoSubtitles/version.txt

@@ -5,3 +5,4 @@
 !com.vrchat.core.*/
 com.vrchat.core.*/
 !/com.vrchat.core.bootstrap/
+!/io.github.jacklul.usharpvideosubtitles/

Packages/.gitignore

@@ -0,0 +1,23 @@
+{
+    "name": "Jacklul.USharpVideoSubtitles.Editor",
+    "rootNamespace": "",
+    "references": [
+        "UdonSharp.Runtime",
+        "UdonSharp.Editor",
+        "Jacklul.USharpVideoSubtitles",
+        "USharpVideo",
+        "xyz.drblackrat.usharpvideomodernui",
+        "com.arcanescripts.usharpvideo"
+    ],
+    "includePlatforms": [
+        "Editor"
+    ],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
+}