workflow: fix release builds + merge both terminal and GUI app into a single tarball

Author: Toni500github

.github/workflows/release.yml

@@ -34,48 +34,29 @@ jobs:
         sudo apt-get update && sudo apt upgrade -y
         sudo apt-get install build-essential g++-11 libwayland-dev gettext libgtk-3-dev pkg-config libdconf-dev libglib2.0-dev libgtkmm-3.0-dev libarchive-tools -y
 
-    - name: Clean
-      run: make distclean
-
     - name: Compile
       run: make DEBUG=0 GUI_APP=0 CXX=x86_64-linux-gnu-g++-11
 
-    - name: Make Release
-      run: make usr-dist DEBUG=0 && mv ./customfetch-*.tar.gz ./customfetch.tar.gz
+    - name: Install to ./usr
+      run: mkdir -p ./usr && make install DESTDIR=. PREFIX=/usr
 
-    - name: Upload to github artifacts
-      uses: actions/upload-artifact@v4
-      with:
-        name: customfetch-linux
-        path: ./customfetch.tar.gz
+    - name: Compile (GUI app)
+      run: make clean && make DEBUG=0 GUI_APP=1 CXX=x86_64-linux-gnu-g++-11
 
-  build-linux-tar-gui:
-    runs-on: ubuntu-22.04
-    permissions:
-      contents: read
-
-    steps:
-    - uses: actions/checkout@v4
-
-    - name: Install Packages
+    - name: Install the GUI components
       run: |
-        sudo apt-get update && sudo apt upgrade -y
-        sudo apt-get install build-essential g++-11 libwayland-dev gettext libgtk-3-dev pkg-config libdconf-dev libglib2.0-dev libgtkmm-3.0-dev libarchive-tools  -y
-
-    - name: Clean
-      run: make clean
-
-    - name: Compile
-      run: make DEBUG=0 GUI_APP=1 CXX=x86_64-linux-gnu-g++-11
+        install ./build/release/customfetch-gui -Dm 755 -v ./usr/bin/
+        mkdir -p ./usr/share/applications
+        cp -f customfetch.desktop ./usr/share/applications/
 
     - name: Make Release
-      run: make usr-dist DEBUG=0 GUI_APP=1 && mv ./customfetch-*.tar.gz ./customfetch-gui.tar.gz
+      run: tar -zcf ./customfetch.tar.gz ./usr/
 
     - name: Upload to github artifacts
       uses: actions/upload-artifact@v4
       with:
-        name: customfetch-gui-linux
-        path: ./customfetch-gui.tar.gz
+        name: customfetch-linux
+        path: ./customfetch.tar.gz
 
   build-deb:
     runs-on: ubuntu-22.04
@@ -84,7 +65,7 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    
+
     - name: create tmp directory
       run: mkdir /tmp/customfetch-2.0.0-beta1.orig
 
@@ -121,7 +102,7 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    
+
     - name: create tmp directory
       run: mkdir /tmp/customfetch-2.0.0-beta1.orig
 
@@ -161,14 +142,11 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Install the packages
-        run: HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install --overwrite fastfetch neofetch pkg-config tree llvm@19
+        run: HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install --overwrite fastfetch neofetch pkg-config gtkmm3 tree llvm@19
 
       - name: uname -a && clang++ --version
         run: uname -a && echo "\n" && $(brew --prefix llvm@19)/bin/clang++ --version
 
-      - name: Clean
-        run: make distclean
-
       - name: Compile and install
         run: |
           export CXX=$(brew --prefix llvm@19)/bin/clang++
@@ -177,53 +155,31 @@ jobs:
           make
           make install
           cd ..
-          tar -zcf ./customfetch.tar.gz usr/
-
-      - name: Upload to github artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          if-no-files-found: error
-          name: customfetch-macos
-          path: ./customfetch.tar.gz
 
-  build-macos-tar-gui:
-    runs-on: macos-latest
-    permissions:
-      contents: read
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Install the packages
-        run: HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install --overwrite fastfetch neofetch tree pkg-config gtkmm3 llvm@19
-
-      - name: uname -a && clang++ --version
-        run: uname -a && echo "\n" && $(brew --prefix llvm@19)/bin/clang++ --version
-
-      - name: Clean
-        run: make distclean
-
-      - name: Compile and install
+      - name: Compile (GUI app)
         run: |
           export CXX=$(brew --prefix llvm@19)/bin/clang++
           export PKG_CONFIG_PATH="$(brew --prefix)/lib/pkgconfig:$(brew --prefix)/opt/gtkmm3/lib/pkgconfig:$(brew --prefix)/opt/gtk+3/lib/pkgconfig"
-          mkdir build && cd build
+          rm -rf build && mkdir build && cd build
           cmake .. -DCMAKE_BUILD_TYPE=Debug -DGUI_APP=1 -DCMAKE_INSTALL_PREFIX=../usr
           make
-          make install
-          cd ..
-          tar -zcf ./customfetch-gui.tar.gz usr/
+          mv -f customfetch-gui ../usr/bin/
+          mkdir -p ../usr/share/applications
+          mv -f ../customfetch.desktop ../usr/share/applications
+
+      - name: Make release
+        run: tar -zcf ./customfetch.tar.gz usr/
 
       - name: Upload to github artifacts
         uses: actions/upload-artifact@v4
         with:
           if-no-files-found: error
-          name: customfetch-macos-gui
-          path: ./customfetch-gui.tar.gz
+          name: customfetch-macos
+          path: ./customfetch.tar.gz
 
   release:
     name: Create GitHub Release
-    needs: [build-linux-tar, build-linux-tar-gui, build-macos-tar, build-macos-tar-gui, build-deb-gui, build-deb, get-version]
+    needs: [build-linux-tar, build-macos-tar, build-deb-gui, build-deb, get-version]
     runs-on: ubuntu-latest
     permissions:
       contents: write
@@ -262,15 +218,6 @@ jobs:
           asset_name: customfetch-linux-${{ needs.get-version.outputs.version }}.tar.gz
           asset_content_type: application/tar+gz
 
-      - uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ needs.release.outputs.release-url }}
-          asset_path: customfetch-linux-gui/customfetch-gui.tar.gz
-          asset_name: customfetch-linux-gui-${{ needs.get-version.outputs.version }}.tar.gz
-          asset_content_type: application/tar+gz
-
       - uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -280,15 +227,6 @@ jobs:
           asset_name: customfetch-macos-${{ needs.get-version.outputs.version }}.tar.gz
           asset_content_type: application/tar+gz
 
-      - uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ needs.release.outputs.release-url }}
-          asset_path: customfetch-macos-gui/customfetch-gui.tar.gz
-          asset_name: customfetch-maacos-gui-${{ needs.get-version.outputs.version }}.tar.gz
-          asset_content_type: application/tar+gz
-
       - uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

CMakeLists.txt

@@ -174,16 +174,45 @@ add_library(cufetch SHARED
 )
 
 set_target_properties(cufetch PROPERTIES
-    VERSION 2.0.0-beta1
+    VERSION 2.0.0
     SOVERSION 2
     OUTPUT_NAME "cufetch"
     POSITION_INDEPENDENT_CODE ON
 )
 
-target_link_libraries(cufetch PUBLIC tiny-process-library)
-target_link_libraries(cufetch PUBLIC fmt)
+target_link_libraries(cufetch PUBLIC tiny-process-library fmt)
 target_link_libraries(${TARGET_NAME} PUBLIC cufetch)
 
+# cufetchpm
+add_executable(cufetchpm
+    cufetchpm/src/main.cpp
+    cufetchpm/src/pluginManager.cpp
+    cufetchpm/src/manifest.cpp
+    cufetchpm/src/stateManager.cpp
+    src/util.cpp
+    src/libs/toml++/toml.cpp
+    src/libs/getopt_port/getopt.c
+)
+
+set_target_properties(cufetchpm PROPERTIES
+    OUTPUT_NAME "cufetchpm"
+)
+
+target_include_directories(cufetchpm PUBLIC
+    cufetchpm/include
+    ../include
+    ../include/libs
+)
+
+target_compile_definitions(cufetchpm PRIVATE
+    VERSION="2.0.0-beta1"
+)
+
+target_link_libraries(cufetchpm
+    fmt
+    tiny-process-library
+)
+
 # locale
 add_custom_target(locale
     COMMAND ${CMAKE_SOURCE_DIR}/scripts/make_mo.sh ${CMAKE_SOURCE_DIR}/locale/
@@ -212,6 +241,10 @@ install(TARGETS ${TARGET_NAME}
         RUNTIME DESTINATION bin
         COMPONENT runtime)
 
+install(TARGETS cufetchpm
+        RUNTIME DESTINATION bin
+        COMPONENT runtime)
+
 # Create symlink
 install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ${TARGET_NAME} \${CMAKE_INSTALL_PREFIX}/bin/cufetch)")
 
@@ -256,6 +289,7 @@ install(DIRECTORY ${CMAKE_SOURCE_DIR}/locale/
         DESTINATION share/locale
         COMPONENT runtime)
 
+if(NOT APPLE)
 install(CODE "
     execute_process(
         COMMAND ${CMAKE_COMMAND} -E create_symlink libcufetch.so.2 ${CMAKE_INSTALL_PREFIX}/lib/libcufetch.so
@@ -264,6 +298,7 @@ install(CODE "
         COMMAND ${CMAKE_COMMAND} -E create_symlink libcufetch.so.2.0.0 ${CMAKE_INSTALL_PREFIX}/lib/libcufetch.so.2
     )
 ")
+endif()
 
 install(CODE "
     execute_process(

Makefile

@@ -14,7 +14,7 @@ USE_DCONF	?= 1
 
 COMPILER := $(shell $(CXX) --version | head -n1)
 
-ifeq ($(findstring GCC,$(COMPILER)),GCC)
+ifeq ($(findstring g++,$(COMPILER)),g++)
 	export LTO_FLAGS = -flto=auto -ffat-lto-objects
 else ifeq ($(findstring clang,$(COMPILER)),clang)
 	export LTO_FLAGS = -flto=thin
@@ -143,7 +143,9 @@ install: install-common $(TARGET)
 	install $(BUILDDIR)/$(TARGET) -Dm 755 -v $(DESTDIR)$(PREFIX)/bin/$(TARGET)
 	cd $(DESTDIR)$(PREFIX)/bin/ && ln -sf $(TARGET) cufetch
 
-install-common: libcufetch locale
+install-common: genver libcufetch locale
+	$(MAKE) -C cufetchpm DEBUG=$(DEBUG) GUI_APP=$(GUI_APP) CXXSTD=$(CXXSTD)
+	install cufetchpm/$(BUILDDIR)/cufetchpm -Dm 755 -v $(DESTDIR)$(PREFIX)/bin/cufetchpm
 	mkdir -p $(DESTDIR)$(MANPREFIX)/man1/
 	sed -e "s/@VERSION@/$(VERSION)/g" -e "s/@BRANCH@/$(BRANCH)/g" < $(NAME).1 > $(DESTDIR)$(MANPREFIX)/man1/$(NAME).1
 	chmod 644 $(DESTDIR)$(MANPREFIX)/man1/$(NAME).1
@@ -154,7 +156,7 @@ install-common: libcufetch locale
 	find locale/ -type f -exec install -Dm 644 "{}" "$(DESTDIR)$(PREFIX)/share/{}" \;
 	mkdir -p $(DESTDIR)$(PREFIX)/include/libcufetch/
 	cd include/libcufetch && find . -type f -exec install -Dm 644 "{}" "$(DESTDIR)$(PREFIX)/include/libcufetch/{}" \;
-	install -Dm 755 $(BUILDDIR)/libcufetch.so $(DESTDIR)$(PREFIX)/lib/libcufetch.so.1
+	cd $(BUILDDIR) && find . -name "libcufetch*" -exec install -Dm 755 "{}" "$(DESTDIR)$(PREFIX)/lib/{}" \;
 	install -Dm 755 $(BUILDDIR)/libfmt.a $(DESTDIR)$(PREFIX)/lib/libcufetch-fmt.a
 ifeq ($(GUI_APP), 1)
 	mkdir -p $(DESTDIR)$(APPPREFIX)