Review flatpak manifests and its build logic.

Clearly demarcate the WebKitGTK and Electron ports by their app-ids.

Update to SBCL 2.4.10.

Clearly demarcate both ports for flatpak generation in the makefile.

engineer.atlas.Nyxt.yaml → engineer.atlas.Nyxt-WebKitGTK.yaml

@@ -1,5 +1,5 @@
 # Keep in sync with https://github.com/flathub/engineer.atlas.Nyxt/.
-app-id: engineer.atlas.Nyxt
+app-id: engineer.atlas.Nyxt-WebKitGTK
 runtime: org.gnome.Platform
 runtime-version: '46'
 sdk: org.gnome.Sdk
@@ -27,8 +27,8 @@ modules:
     buildsystem: simple
     sources:
       - type: archive
-        url: http://prdownloads.sourceforge.net/sbcl/sbcl-2.4.7-x86-64-linux-binary.tar.bz2
-        sha256: 1f900cf99f2617f613fe0a6d3490d3e00aa5e9740c88a8c88022a0ac766b0457
+        url: http://prdownloads.sourceforge.net/sbcl/sbcl-2.4.10-x86-64-linux-binary.tar.bz2
+        sha256: 99cc019120172bb4317f3c79cfc3afffe51e314091e07e8c0ba1d94759767777
         only-arches: [x86_64]
     build-commands:
       - INSTALL_ROOT=${FLATPAK_DEST} sh install.sh

makefile

@@ -84,45 +84,47 @@ clean: clean-submodules
 
 FLATPAK_COMMAND = flatpak
 FLATPAK_BUILDER = flatpak-builder
-FLATPAK_APP_ID = engineer.atlas.Nyxt
-FLATPAK_MANIFEST := $(FLATPAK_APP_ID).yaml
-FLATPAK_EXPORT_REPOSITORY = _build/nyxt-flatpak-repository
 
-.PHONY: flatpak-build
-flatpak-build:
+FLATPAK_WEBKITGTK_ID = engineer.atlas.Nyxt-WebKitGTK
+FLATPAK_WEBKITGTK_MANIFEST := $(FLATPAK_WEBKITGTK_ID).yaml
+FLATPAK_WEBKITGTK_EXPORT_REPOSITORY = build/nyxt-webkitgtk-flatpak-repository
+
+.PHONY: flatpak-webkitgtk-build
+flatpak-webkitgtk-build:
 # To start a shell before building add --build-shell=nyxt.
-	@$(FLATPAK_BUILDER) --force-clean --user --install --default-branch=local build $(FLATPAK_MANIFEST)
+	@$(FLATPAK_BUILDER) --force-clean --user --install --default-branch=local build $(FLATPAK_WEBKITGTK_MANIFEST)
 
-.PHONY: flatpak-run
-flatpak-run:
-	@$(FLATPAK_COMMAND) run --branch=local $(FLATPAK_APP_ID)
+.PHONY: flatpak-webkitgtk-run
+flatpak-webkitgtk-run:
+	@$(FLATPAK_COMMAND) run --branch=local $(FLATPAK_WEBKITGTK_ID)
 
-.PHONY: flatpak-repository
-flatpak-repository:
-	mkdir -p $(FLATPAK_EXPORT_REPOSITORY)
-	@$(FLATPAK_BUILDER) --force-clean --repo=$(FLATPAK_EXPORT_REPOSITORY) build $(FLATPAK_MANIFEST)
+.PHONY: flatpak-webkitgtk-repository
+flatpak-webkitgtk-repository:
+	mkdir -p $(FLATPAK_WEBKITGTK_EXPORT_REPOSITORY)
+	@$(FLATPAK_BUILDER) --force-clean --repo=$(FLATPAK_WEBKITGTK_EXPORT_REPOSITORY) build $(FLATPAK_WEBKITGTK_MANIFEST)
 
-.PHONY: flatpak-bundle
-flatpak-bundle:
-	@$(FLATPAK_COMMAND) build-bundle $(FLATPAK_EXPORT_REPOSITORY) nyxt.flatpak $(FLATPAK_APP_ID)
+.PHONY: flatpak-webkitgtk-bundle
+flatpak-webkitgtk-bundle:
+	@$(FLATPAK_COMMAND) build-bundle $(FLATPAK_WEBKITGTK_EXPORT_REPOSITORY) nyxt-webkitgtk.flatpak $(FLATPAK_WEBKITGTK_ID)
 
-FLATPAK_APP_ID_ELECTRON = engineer.atlas.Nyxt-Electron
-FLATPAK_MANIFEST_ELECTRON := $(FLATPAK_APP_ID_ELECTRON).yaml
+FLATPAK_ELECTRON_ID = engineer.atlas.Nyxt-Electron
+FLATPAK_ELECTRON_MANIFEST := $(FLATPAK_ELECTRON_ID).yaml
+FLATPAK_ELECTRON_EXPORT_REPOSITORY = build/nyxt-electron-flatpak-repository
 
 .PHONY: flatpak-electron-build
 flatpak-electron-build:
 # To start a shell before building add --build-shell=nyxt.
-	@$(FLATPAK_BUILDER) --force-clean --user --install --default-branch=local build $(FLATPAK_MANIFEST_ELECTRON)
+	@$(FLATPAK_BUILDER) --force-clean --user --install --default-branch=local build $(FLATPAK_ELECTRON_MANIFEST)
 
 .PHONY: flatpak-electron-run
 flatpak-electron-run:
-	@$(FLATPAK_COMMAND) run --branch=local $(FLATPAK_APP_ID_ELECTRON)
+	@$(FLATPAK_COMMAND) run --branch=local $(FLATPAK_ELECTRON_ID)
 
 .PHONY: flatpak-electron-repository
 flatpak-electron-repository:
-	mkdir -p $(FLATPAK_EXPORT_REPOSITORY)
-	@$(FLATPAK_BUILDER) --force-clean --repo=$(FLATPAK_EXPORT_REPOSITORY) build $(FLATPAK_MANIFEST_ELECTRON)
+	mkdir -p $(FLATPAK_ELECTRON_EXPORT_REPOSITORY)
+	@$(FLATPAK_BUILDER) --force-clean --repo=$(FLATPAK_ELECTRON_EXPORT_REPOSITORY) build $(FLATPAK_ELECTRON_MANIFEST)
 
 .PHONY: flatpak-electron-bundle
 flatpak-electron-bundle:
-	@$(FLATPAK_COMMAND) build-bundle $(FLATPAK_EXPORT_REPOSITORY) nyxt.flatpak $(FLATPAK_APP_ID_ELECTRON)
+	@$(FLATPAK_COMMAND) build-bundle $(FLATPAK_ELECTRON_EXPORT_REPOSITORY) nyxt-electron.flatpak $(FLATPAK_ELECTRON_ID)