Fix version, kraken run paths, prep msdos development.

wabiverse · Jul 23, 2024 · 6ec138e · 6ec138e
1 parent d92ad07
commit 6ec138e
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 78 deletions.
diff --git a/Package.resolved b/Package.resolved
@@ -1,5 +1,5 @@
 {
-  "originHash" : "e786d580815d634c789f07dfa2930a1d775f5bc9b8a148ca62197594cc383569",
+  "originHash" : "b5c41ecafe2bba971ba777399bfa246022d949ec1523346d9c63bb089437c382",
   "pins" : [
     {
       "identity" : "mainoffender",
@@ -15,35 +15,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/wabiverse/MetaverseKit.git",
       "state" : {
-        "revision" : "736a3abc651e298576bc3574849b55c500128b16",
-        "version" : "1.7.2"
-      }
-    },
-    {
-      "identity" : "metaversepythonframework",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/wabiverse/MetaversePythonFramework",
-      "state" : {
-        "revision" : "fc6d15f768b0a675207aecea248bd4f63f4c4133",
-        "version" : "3.11.6"
-      }
-    },
-    {
-      "identity" : "metaversevulkanframework",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/wabiverse/MetaverseVulkanFramework",
-      "state" : {
-        "revision" : "13c7061599c61a4959c558d8ec1836e5b32b640b",
-        "version" : "1.26.2"
-      }
-    },
-    {
-      "identity" : "pythonkit",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/pvieito/PythonKit.git",
-      "state" : {
-        "revision" : "6fd4817e33c31a57760e285228ef8f81cd359062",
-        "version" : "0.4.2"
+        "revision" : "1532e878d0b27d756d06432586d577cb2351a268",
+        "version" : "1.7.5"
       }
     },
     {
@@ -64,6 +37,15 @@
         "version" : "1.8.1"
       }
     },
+    {
+      "identity" : "swift-argument-parser",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/apple/swift-argument-parser",
+      "state" : {
+        "revision" : "41982a3656a71c768319979febd796c6fd111d5c",
+        "version" : "1.5.0"
+      }
+    },
     {
       "identity" : "swift-collections",
       "kind" : "remoteSourceControl",
@@ -105,8 +87,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/wabiverse/SwiftUSD",
       "state" : {
-        "revision" : "6428fb0a80191de799fdfeb3b0891f906502031e",
-        "version" : "23.11.36"
+        "revision" : "187488950e215af85ca3ae21e38651c5d48eb3c4",
+        "version" : "23.11.42"
       }
     },
     {
@@ -135,7 +117,16 @@
         "revision" : "98be227227af10cc7a269cb3ffb23686c0610b17",
         "version" : "0.20.9"
       }
+    },
+    {
+      "identity" : "version",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/mxcl/Version.git",
+      "state" : {
+        "revision" : "1fe824b80d89201652e7eca7c9252269a1d85e25",
+        "version" : "2.0.1"
+      }
     }
   ],
   "version" : 3
-}
+}
diff --git a/Package.swift b/Package.swift
@@ -39,7 +39,7 @@ let package = Package(
   // --- 🦄 Package Dependencies. ---
   dependencies: [
     // .package(url: "https://github.com/stackotter/swift-cross-ui", revision: "f57f7ab"),
-    .package(url: "https://github.com/wabiverse/SwiftUSD.git", from: "23.11.36"),
+    .package(url: "https://github.com/wabiverse/SwiftUSD.git", from: "23.11.42"),
     .package(url: "https://github.com/ChimeHQ/SwiftTreeSitter", revision: "96ad58b"),
     .package(url: "https://github.com/ChimeHQ/TextFormation.git", from: "0.8.2"),
     .package(url: "https://github.com/ChimeHQ/TextStory.git", from: "0.8.0"),

diff --git a/build_files/build_environment/KrakenDeveloperProfile.ps1 b/build_files/build_environment/KrakenDeveloperProfile.ps1
@@ -3,11 +3,10 @@
 
 # ----------------------------------------------- Versioning. -----
 
-$KRAKEN_BUILDING_VERSION_MAJOR = 1
-$KRAKEN_BUILDING_VERSION_MINOR = 50
+$KRAKEN_BUILDING_VERSION = 1.09
 $KRAKEN_BUILDING_VERSION_CYCLE = "a"
-$KRAKEN_DEVELOPMENT_MILESTONE = "Initial Release Sprint"
-$PIXAR_BUILDING_VERSION = 22.05
+$KRAKEN_DEVELOPMENT_MILESTONE = "Open Metaverse"
+$PIXAR_BUILDING_VERSION = 23.11
 
 # ---------------------------------------------- Environment. -----
 
@@ -112,14 +111,14 @@ function HopIntoRootDir
 # Using Blender's script for this...
 function AppleBundleAndNotarize
 {
-  $KRAKEN_DMG_NAME = "kraken-$KRAKEN_BUILDING_VERSION_MAJOR.$KRAKEN_BUILDING_VERSION_MINOR$KRAKEN_BUILDING_VERSION_CYCLE-macos-arm64.dmg"
-  zsh $KrakenGlobalView/release/darwin/bundle.sh `
-  --source /Users/furby/actions-runner/_work/Kraken/build_darwin_release/bin/Release `
-  --dmg /Users/furby/actions-runner/_work/Kraken/build_darwin_release/$KRAKEN_DMG_NAME `
-  --bundle-id $env:N_BUNDLE_ID `
-  --username $env:N_USERNAME `
-  --password $env:N_PASSWORD `
-  --codesign $env:C_CERT
+  # $KRAKEN_DMG_NAME = "kraken-$KRAKEN_BUILDING_VERSION-macos-arm64.dmg"
+  # zsh $KrakenGlobalView/release/darwin/bundle.sh `
+  # --source /Users/furby/actions-runner/_work/Kraken/build_darwin_release/bin/Release `
+  # --dmg /Users/furby/actions-runner/_work/Kraken/build_darwin_release/$KRAKEN_DMG_NAME `
+  # --bundle-id $env:N_BUNDLE_ID `
+  # --username $env:N_USERNAME `
+  # --password $env:N_PASSWORD `
+  # --codesign $env:C_CERT
 }
 
 function RunUnrealEngine5WithDebugger
@@ -506,22 +505,15 @@ function InstallKrakenPackage {
 }
 
 function RunKraken {
-  # import-module AppX -usewindowspowershell
-  Remove-AppXPackage Kraken_1.50.0.0_x64__k8b6ffsk23gvw
-  Add-AppXPackage $env:USERPROFILE/dev/build_KRAKEN_Release/bin/Release/kraken_1.50.0.0_x64.msix
-  & "kraken"
+  # # import-module AppX -usewindowspowershell
+  # Remove-AppXPackage Kraken_1.50.0.0_x64__k8b6ffsk23gvw
+  # Add-AppXPackage $env:USERPROFILE/dev/build_KRAKEN_Release/bin/Release/kraken_1.50.0.0_x64.msix
+  # & "kraken"
+  & swift run -c release Kraken
 }
 
 function RunDevelopmentDebugKraken {
-  if($IsWindows) {
-    & "$env:USERPROFILE\dev\build_KRAKEN_Debug\bin\Debug\kraken.exe" $args
-  }
-  if($IsMacOS) {
-    Write-Color -Text "KrakenDeveloperProfile: Please configure paths for your platform." -Color Red
-  }
-  if($IsLinux) {
-    Write-Color -Text "KrakenDeveloperProfile: Please configure paths for your platform." -Color Red
-  }
+  & swift run -c debug Kraken
 }
 
 # Build kraken app icons, eventually cross platoform, currently just macOS.
@@ -604,27 +596,11 @@ function RunKrakenPythonOfficialRelease {
 }
 
 function RunKrakenPythonRelease {
-  if($IsWindows) {
-    & "$env:USERPROFILE/dev/build_KRAKEN_Release/bin/Release/$KRAKEN_BUILDING_VERSION_MAJOR.$KRAKEN_BUILDING_VERSION_MINOR/python/bin/python.exe" $args
-  }
-  if($IsMacOS) {
-    Write-Color -Text "KrakenDeveloperProfile: Please configure paths for your platform." -Color Red
-  }
-  if($IsLinux) {
-    Write-Color -Text "KrakenDeveloperProfile: Please configure paths for your platform." -Color Red    
-  }
+  & swift run -c release Kraken
 }
 
 function RunKrakenPythonDebug {
-  if($IsWindows) {
-    & "$env:USERPROFILE/dev/build_KRAKEN_Debug/bin/Debug/$KRAKEN_BUILDING_VERSION_MAJOR.$KRAKEN_BUILDING_VERSION_MINOR/python/bin/python_d.exe" $args
-  }
-  if($IsMacOS) {
-    Write-Color -Text "KrakenDeveloperProfile: Please configure paths for your platform." -Color Red
-  }
-  if($IsLinux) {
-    Write-Color -Text "KrakenDeveloperProfile: Please configure paths for your platform." -Color Red    
-  }
+  & swift run -c debug Kraken
 }
 
 function ConnectKraken {
@@ -896,7 +872,7 @@ function ShowBanner {
     Write-Output " "
     Write-Color -Text $KRAKEN_BANNER -Color Yellow, DarkMagenta, Cyan, DarkBlue
     Write-Output " "
-    Write-Color -Text "Kraken ", "v$KRAKEN_BUILDING_VERSION_MAJOR.$KRAKEN_BUILDING_VERSION_MINOR ", "| ", "Pixar ", "v$PIXAR_BUILDING_VERSION ", "| ", "$KRAKEN_DEVELOPMENT_MILESTONE" -Color DarkMagenta, Cyan, Yellow, Green, Blue, Yellow, DarkMagenta
+    Write-Color -Text "Kraken ", "v$KRAKEN_BUILDING_VERSION ", "| ", "Pixar ", "v$PIXAR_BUILDING_VERSION ", "| ", "$KRAKEN_DEVELOPMENT_MILESTONE" -Color DarkMagenta, Cyan, Yellow, Green, Blue, Yellow, DarkMagenta
     ShowPrettyGitRevision
   }
 }