Merge pull request #1404 from fastfetch-cli/dev

Release: v2.30.1
CMake: check return code of python scripts
2026-09-12 18:06:11 +02:00 · 2024-11-18 14:57:05 +08:00 · 2024-11-18 14:08:53 +08:00 · 2024-11-18 13:40:08 +08:00 · 2024-11-18 13:36:31 +08:00 · 2024-11-18 13:32:49 +08:00
4 changed files with 24 additions and 5 deletions
@@ -1,3 +1,8 @@
+# 2.30.1
+
+Bugfixes:
+* Fix the destination where `fastfetch.1` is generated (#1403)
+
 # 2.30.0

 Changes:
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.12.0) # target_link_libraries with OBJECT libs & project homepage url

 project(fastfetch
-    VERSION 2.30.0
+    VERSION 2.30.1
    LANGUAGES C
    DESCRIPTION "Fast neofetch-like system information tool"
    HOMEPAGE_URL "https://github.com/fastfetch-cli/fastfetch"
@@ -268,11 +268,15 @@ else()
    file(READ "src/data/help.json" DATATEXT_JSON_HELP)
 endif()

-if(ENABLE_EMBEDDED_PCIIDS AND NOT EXISTS "fastfetch_pciids.c.inc")
+if(ENABLE_EMBEDDED_PCIIDS AND NOT EXISTS "${PROJECT_BINARY_DIR}/fastfetch_pciids.c.inc")
    if(Python_FOUND)
        message(STATUS "Generating 'fastfetch_pciids.c.inc'")
        execute_process(COMMAND ${Python_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/scripts/gen-pciids.py"
-                        OUTPUT_FILE "fastfetch_pciids.c.inc")
+                        OUTPUT_FILE "${PROJECT_BINARY_DIR}/fastfetch_pciids.c.inc"
+                        RESULT_VARIABLE PYTHON_PCIIDS_RETCODE)
+        if(NOT PYTHON_PCIIDS_RETCODE EQUAL 0)
+            message(FATAL_ERROR "Failed to generate 'fastfetch_pciids.c.inc'")
+        endif()
    else()
        message(WARNING "Python3 is not found, 'fastfetch_pciids.c.inc' will not be generated")
        set(ENABLE_EMBEDDED_PCIIDS OFF)
@@ -282,7 +286,11 @@ endif()
 if(Python_FOUND)
    message(STATUS "Generating 'fastfetch.1'")
    execute_process(COMMAND ${Python_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/scripts/gen-man.py"
-                    OUTPUT_FILE "fastfetch.1")
+                    OUTPUT_FILE "${PROJECT_BINARY_DIR}/fastfetch.1"
+                    RESULT_VARIABLE PYTHON_MANPAGE_RETCODE)
+        if(NOT PYTHON_MANPAGE_RETCODE EQUAL 0)
+            message(FATAL_ERROR "Failed to generate 'fastfetch.1'")
+        endif()
 else()
    message(WARNING "Python3 is not found, use basic 'fastfetch.1.in' instead")
    string(TIMESTAMP FASTFETCH_BUILD_DATE "%d %B %Y" UTC)
@@ -1,3 +1,9 @@
+fastfetch (2.30.0) jammy; urgency=medium
+
+  * Update to 2.30.0
+
+ -- Carter Li <zhangsongcui@live.cn>  Mon, 18 Nov 2024 09:30:58 +0800
+
 fastfetch (2.29.0) jammy; urgency=medium

  * Update to 2.29.0
@@ -1 +1 @@
-fastfetch_2.29.0_source.buildinfo universe/utils optional
+fastfetch_2.30.0_source.buildinfo universe/utils optional
Author	SHA1	Message	Date
Carter Li	6d45fe61b5	Merge pull request #1404 from fastfetch-cli/dev Release: v2.30.1	2024-11-18 14:57:05 +08:00
李通洲	efc8504607	CMake: check return code of python scripts	2024-11-18 14:08:53 +08:00
李通洲	a9a08d8a80	Release: v2.30.1	2024-11-18 13:40:08 +08:00
李通洲	7f63ec1315	CMake: fix the destination where `fastfetch_pciids.c.inc` is generated	2024-11-18 13:36:31 +08:00
Masato TOYOSHIMA	6cbbe334b5	CMake: Fixed the destination where fastfetch.1 is generated. (#1403 ) * Fixed the destination where fastfetch.1 is generated. * Update CMakeLists.txt Reappend trailing new line --------- Co-authored-by: Carter Li <CarterLi@users.noreply.github.com>	2024-11-18 13:32:49 +08:00
Carter Li	4bde8d3fb3	Packaging: update debian stuff [ci skip]	2024-11-18 09:36:46 +08:00