Add integrations and submodules folders

.gitlab-ci.yml

@@ -17,8 +17,7 @@ build-and-release:
     tags:
         - main
     script:
-        - flatpak run org.flatpak.Builder --gpg-sign=$GPG_SIGN --gpg-homedir=$GPG_HOMEDIR --repo=./build/flatpak-repo ./build/flatpak/ no.ntnu.jonasjso.DoubleTrouble.Menu.yaml;
-        - mv build/flatpak-repo flatpak-repos/double-trouble
+        - flatpak run org.flatpak.Builder --gpg-sign=$GPG_SIGN --gpg-homedir=$GPG_HOMEDIR --repo=./flatpak-repos/double-trouble ./build/flatpak-build integrations/flatpak/no.ntnu.jonasjso.doubleTrouble.Menu.yaml;
         - cd flatpak-repos
         - git add double-trouble
         - git commit -m "New release from CI_SERVER_NAME - $CI_SERVER_NAME, CI_PIPELINE_ID - $CI_PIPELINE_ID"

.gitmodules

 [submodule "external/sfml"]
-	path = external/sfml
+	path = submodules/sfml
 	url = https://github.com/SFML/SFML

CMakeLists.txt

@@ -6,7 +6,7 @@ set(BINDIR ${CMAKE_BINARY_DIR})
 
 # SFML
 set(BUILD_SHARED_LIBS FALSE)
-add_subdirectory("./external/sfml")
+add_subdirectory("./submodules/sfml")
 
 # make_target - Function to setup a base c++17-target linked to SFML libraries.
 function(make_target target)

Makefile

@@ -25,7 +25,7 @@ all:
 
 
 dockerhub:
-	docker build -f docker/sfml.Dockerfile .;
+	docker build -f integrations/dockerhub/sfml.Dockerfile .;
 	docker tag $$(docker images | awk '{print $$3}' | awk 'NR==2') jonasjso/sfml:latest;
 	docker login --username=jonasjso;
 	docker push jonasjso/sfml;
@@ -34,7 +34,7 @@ flatpak:
 	flatpak run org.flatpak.Builder\
 		--gpg-sign=$$GPG_SIGN\
 		--gpg-homedir=$$GPG_HOMEDIR\
-		--repo=./build/flatpak-repo\
 		--force-clean\
-		./build/flatpak/\
-		no.ntnu.jonasjso.DoubleTrouble.Menu.yaml;
+		--repo=./build/flatpak-repo\
+		./build/flatpak-build\
+		integrations/flatpak/no.ntnu.jonasjso.doubleTrouble.Menu.yaml;

docker/sfml.Dockerfile → integrations/dockerhub/sfml.Dockerfile

 FROM ubuntu:latest
 
-# Bring your own SFML
+# Bring your own SFML hosted at https://hub.docker.com/repository/docker/jonasjso/sfml
 
 ENV DEBIAN_FRONTEND noninteractive
 ENV CXX g++
@@ -27,4 +27,3 @@ RUN flatpak remote-add flathub https://flathub.org/repo/flathub.flatpakrepo\
 	org.freedesktop.Platform/x86_64/20.08\
 	org.freedesktop.Sdk/x86_64/20.08\
 	org.flatpak.Builder/x86_64/stable;
-

flatpak/no.ntnu.jonasjso.DoubleTrouble.Menu.yaml → integrations/flatpak/no.ntnu.jonasjso.doubleTrouble.Menu.yaml

-app-id: no.ntnu.jonasjso.DoubleTrouble.Menu
+app-id: no.ntnu.jonasjso.doubleTrouble.Menu
 runtime: org.freedesktop.Platform
 runtime-version: '20.08'
 sdk: org.freedesktop.Sdk
-command: Menu
+command: no.ntnu.jonasjso.doubleTrouble.Menu
 finish-args:
         - --share=ipc
         - --socket=x11
@@ -17,8 +17,8 @@ modules:
                 - mkdir build/
                 - cmake -S . -B build/
                 - make -C build/
-                - install -D ./build/03-menu /app/bin/Menu
+                - install -D ./build/03-menu /app/bin/no.ntnu.jonasjso.doubleTrouble.Menu
           sources:
-                - type: dir 
-                  path: .
+                - type: git 
+                  path: ../../