[Bf-blender-cvs] [f7093b961ac] blender-v2.93-release: Build: update 2.93 LTS snap files to match 3.3 LTS and later

[Brecht Van Lommel]

Commit: f7093b961ac24581e2836febbc7d77d8d79e6047
Author: Brecht Van Lommel
Date:   Tue Nov 29 16:39:24 2022 +0100
Branches: blender-v2.93-release
https://developer.blender.org/rBf7093b961ac24581e2836febbc7d77d8d79e6047

Build: update 2.93 LTS snap files to match 3.3 LTS and later

So the buildbot doesn't need special exceptions for this track.

===================================================================

A	release/freedesktop/snap/README.md
D	release/freedesktop/snap/README.txt
R079	release/freedesktop/snap/snapcraft.yaml.in	release/freedesktop/snap/blender-snapcraft-template.yaml
D	release/freedesktop/snap/bundle.py

===================================================================

diff --git a/release/freedesktop/snap/README.md b/release/freedesktop/snap/README.md
new file mode 100644
index 00000000000..f6c662e9f1e
--- /dev/null
+++ b/release/freedesktop/snap/README.md
@@ -0,0 +1,17 @@
+Snap Configuration
+===================
+
+Files used by Buildbot's `package-code-store-snap` and `deliver-code-store-snap` steps.
+
+Build pipeline snap tracks and channels
+
+```
+    <track>/stable            
+        - Latest stable release for the specified track
+    <track>/candidate         
+        - Test builds for the upcoming stable release - *not used for now*
+    <track>/beta              
+        - Nightly automated builds provided by a release branch
+    <track>/edge/<branch>
+        - Nightly or on demand builds - will also make use of branch
+```
diff --git a/release/freedesktop/snap/README.txt b/release/freedesktop/snap/README.txt
deleted file mode 100644
index 2e8822f32dc..00000000000
--- a/release/freedesktop/snap/README.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-
-Snap Package Instructions
-=========================
-
-This folder contains the scripts for creating and uploading the snap on:
-https://snapcraft.io/blender
-
-
-Setup
------
-
-This has only been tested to work on Ubuntu.
-
-# Install required packages
-sudo apt install snapd snapcraft
-
-
-Steps
------
-
-# Build the snap file
-python3 bundle.py --version 2.XX --url https://download.blender.org/release/Blender2.XX/blender-2.XX-x86_64.tar.bz2
-
-# Install snap to test
-# --dangerous is needed since the snap has not been signed yet
-# --classic is required for installing Blender in general
-sudo snap install --dangerous --classic blender_2.XX_amd64.snap
-
-# Upload
-snapcraft push --release=stable blender_2.XX_amd64.snap
-
-
-Release Values
---------------
-
-stable: final release
-candidate: release candidates
-
diff --git a/release/freedesktop/snap/snapcraft.yaml.in b/release/freedesktop/snap/blender-snapcraft-template.yaml
similarity index 79%
rename from release/freedesktop/snap/snapcraft.yaml.in
rename to release/freedesktop/snap/blender-snapcraft-template.yaml
index eb3ef97eba8..882f9081c09 100644
--- a/release/freedesktop/snap/snapcraft.yaml.in
+++ b/release/freedesktop/snap/blender-snapcraft-template.yaml
@@ -10,12 +10,7 @@ description: |
     scientists, students, VFX experts, animators, game artists, modders, and
     the list goes on.
 
-    The standard snap channels are used in the following way:
-
-           stable - Latest stable release.
-        candidate - Test builds for the upcoming stable release.
-
-icon: ../icons/scalable/apps/blender.svg
+icon: @ICON_PATH@
 
 passthrough:
     license: GPL-3.0
@@ -27,13 +22,14 @@ apps:
         command: ./blender-wrapper
         desktop: ./blender.desktop
 
+base: core18
 version: '@VERSION@'
 grade: @GRADE@
 
 parts:
     blender:
         plugin: dump
-        source: @URL@
+        source: @PACKAGE_PATH@
         build-attributes: [keep-execstack, no-patchelf]
         override-build: |
             snapcraftctl build
@@ -47,7 +43,7 @@ parts:
             - libxrender1
             - libxxf86vm1
     wrapper:
-        plugin: copy
+        plugin: dump
         source: .
-        files:
-            blender-wrapper: blender-wrapper
+        stage:
+            - ./blender-wrapper
diff --git a/release/freedesktop/snap/bundle.py b/release/freedesktop/snap/bundle.py
deleted file mode 100755
index c3ecc5af561..00000000000
--- a/release/freedesktop/snap/bundle.py
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/env python3
-
-import argparse
-import os
-import pathlib
-import subprocess
-
-parser = argparse.ArgumentParser()
-parser.add_argument("--version", required=True)
-parser.add_argument("--url", required=True)
-parser.add_argument("--grade", default="stable", choices=["stable", "devel"])
-args = parser.parse_args()
-
-yaml_text = pathlib.Path("snapcraft.yaml.in").read_text()
-yaml_text = yaml_text.replace("@VERSION@", args.version)
-yaml_text = yaml_text.replace("@URL@", args.url)
-yaml_text = yaml_text.replace("@GRADE@", args.grade)
-pathlib.Path("snapcraft.yaml").write_text(yaml_text)
-
-subprocess.call(["snapcraft", "clean"])
-subprocess.call(["snapcraft", "snap"])