Merge 6008bd7923 into c43582e917

Fix AppImage version naming
The version should match what Conky itself outputs.
2024-05-01 19:03:35 +00:00 · 2024-05-01 15:03:31 -04:00 · 2024-05-01 15:03:14 -04:00 · 2024-05-01 15:02:58 -04:00 · 2024-05-01 15:02:58 -04:00 · 2024-05-01 14:44:28 -04:00
7 changed files with 41 additions and 32 deletions
--- a/.github/workflows/publish-appimage.yml
+++ b/.github/workflows/publish-appimage.yml
@ -77,9 +77,6 @@ jobs:
        uses: actions/checkout@v4
        with:
          fetch-depth: 0
-      - name: Get git version
-        id: git-version
-        run: echo "GIT_VERSION=$(git describe --tags --always --debug)" | tee -a $GITHUB_ENV
      - name: Import GPG Deploy Key
        # only run on main branch
        if: github.ref == 'refs/heads/main'
@ -106,19 +103,21 @@ jobs:
        env:
          RELEASE: "${{ startsWith(github.ref, 'refs/tags/') && 'ON' || 'OFF' }}"
      - run: ./conky-x86_64.AppImage --version # print version
-      - run: mv conky-x86_64.AppImage conky-${{ matrix.os }}-${{ matrix.arch }}-${{ env.GIT_VERSION }}.AppImage
-      - run: mv conky-x86_64.AppImage.sha256 conky-${{ matrix.os }}-${{ matrix.arch }}-${{ env.GIT_VERSION }}.AppImage.sha256
+      - name: Set CONKY_VERSION
+        run: echo "CONKY_VERSION=$(./conky-x86_64.AppImage --short-version)" | tee -a $GITHUB_ENV
+      - run: mv conky-x86_64.AppImage conky-${{ matrix.os }}-${{ matrix.arch }}-v${{ env.CONKY_VERSION }}.AppImage
+      - run: mv conky-x86_64.AppImage.sha256 conky-${{ matrix.os }}-${{ matrix.arch }}-v${{ env.CONKY_VERSION }}.AppImage.sha256
      - name: Upload AppImage artifact
        uses: actions/upload-artifact@v4
        with:
-          path: 'conky-${{ matrix.os }}-${{ matrix.arch }}-${{ env.GIT_VERSION }}.AppImage'
-          name: 'conky-${{ matrix.os }}-${{ matrix.arch }}-${{ env.GIT_VERSION }}.AppImage'
+          path: 'conky-${{ matrix.os }}-${{ matrix.arch }}-v${{ env.CONKY_VERSION }}.AppImage'
+          name: 'conky-${{ matrix.os }}-${{ matrix.arch }}-v${{ env.CONKY_VERSION }}.AppImage'
          if-no-files-found: error
      - name: Upload AppImage checksum artifact
        uses: actions/upload-artifact@v4
        with:
-          path: 'conky-${{ matrix.os }}-${{ matrix.arch }}-${{ env.GIT_VERSION }}.AppImage.sha256'
-          name: 'conky-${{ matrix.os }}-${{ matrix.arch }}-${{ env.GIT_VERSION }}.AppImage.sha256'
+          path: 'conky-${{ matrix.os }}-${{ matrix.arch }}-v${{ env.CONKY_VERSION }}.AppImage.sha256'
+          name: 'conky-${{ matrix.os }}-${{ matrix.arch }}-v${{ env.CONKY_VERSION }}.AppImage.sha256'
          if-no-files-found: error
      - name: Upload man page artifact
        uses: actions/upload-artifact@v4
--- a/cmake/Conky.cmake
+++ b/cmake/Conky.cmake
@ -176,11 +176,17 @@ execute_process(COMMAND ${APP_UNAME} -sm
  OUTPUT_VARIABLE BUILD_ARCH
  OUTPUT_STRIP_TRAILING_WHITESPACE)

+execute_process(COMMAND ${APP_GIT} rev-parse --short HEAD
+  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+  RESULT_VARIABLE RETVAL
+  OUTPUT_VARIABLE GIT_SHORT_SHA
+  OUTPUT_STRIP_TRAILING_WHITESPACE)
+
 if(RELEASE)
  set(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 else(RELEASE)
  set(VERSION
-    "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}_pre${COMMIT_COUNT}")
+    "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}-pre-${GIT_SHORT_SHA}")
 endif(RELEASE)

 set(COPYRIGHT "Copyright Brenden Matthews, et al, 2005-2024")
--- a/flake.lock
+++ b/flake.lock
@ -5,11 +5,11 @@
        "systems": "systems"
      },
      "locked": {
-        "lastModified": 1709126324,
-        "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=",
+        "lastModified": 1710146030,
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "d465f4819400de7c8d874d50b982301f28a84605",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
        "type": "github"
      },
      "original": {
@ -20,11 +20,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1709703039,
-        "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=",
+        "lastModified": 1714253743,
+        "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d",
+        "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@ -53,20 +53,21 @@
            name = "conky";
            src = ./.;
            cmakeFlags = [
+              "-DBUILD_CURL=ON"
+              "-DBUILD_LUA_CAIRO_XLIB=ON"
              "-DBUILD_LUA_CAIRO=ON"
              "-DBUILD_LUA_IMLIB2=ON"
              "-DBUILD_LUA_RSVG=ON"
              "-DBUILD_RSS=ON"
-              "-DBUILD_CURL=ON"
            ];
            nativeBuildInputs = [
-              clang_16
+              clang_18
              cmake
              git
-              llvmPackages_16.clang-unwrapped
+              gperf
+              llvmPackages_18.clang-unwrapped
              ninja
              pkg-config
-              gperf
            ];
            buildInputs =
              [
@ -77,8 +78,7 @@
                imlib2
                librsvg
                libxml2
-                llvmPackages_16.libcxx
-                llvmPackages_16.libcxxabi
+                llvmPackages_18.libcxx
                lua5_4
                ncurses
                xorg.libICE
--- a/lua/CMakeLists.txt
+++ b/lua/CMakeLists.txt
@ -24,7 +24,6 @@ add_definitions(-DTOLUA_RELEASE)

 # NOTE: Don't chain options in IFs here, their dependency is already handled by
 # ConkyBuildOptions.cmake
-
 if(BUILD_LUA_CAIRO)
  include_directories(${luacairo_includes} ${CMAKE_CURRENT_SOURCE_DIR})

@ -32,7 +31,7 @@ if(BUILD_LUA_CAIRO)
  # better solution, please let me know
  wrap_tolua(luacairo_src cairo.pkg libcairo.patch)

-  add_library(conky-cairo SHARED ${luacairo_src})
+  add_library(conky-cairo MODULE ${luacairo_src})
  set_target_properties(conky-cairo PROPERTIES OUTPUT_NAME "cairo")

  target_link_libraries(conky-cairo ${luacairo_libs} toluapp_lib_static)
@ -70,7 +69,7 @@ if(BUILD_LUA_IMLIB2)
    wrap_tolua(luaimlib2_src imlib2_old.pkg)
  endif(IMLIB2_VERSION VERSION_GREATER_EQUAL "1.10.0")

-  add_library(conky-imlib2 SHARED ${luaimlib2_src})
+  add_library(conky-imlib2 MODULE ${luaimlib2_src})
  set_target_properties(conky-imlib2 PROPERTIES OUTPUT_NAME "imlib2")

  target_link_libraries(conky-imlib2 ${luaimlib2_libs} toluapp_lib_static)
@ -84,7 +83,7 @@ if(BUILD_LUA_CAIRO AND BUILD_LUA_IMLIB2)
    ${CMAKE_CURRENT_SOURCE_DIR})
  wrap_tolua(luacairo_imlib2_helper_src cairo_imlib2_helper.pkg)

-  add_library(conky-cairo_imlib2_helper SHARED ${luacairo_imlib2_helper_src})
+  add_library(conky-cairo_imlib2_helper MODULE ${luacairo_imlib2_helper_src})
  set_target_properties(conky-cairo_imlib2_helper
    PROPERTIES OUTPUT_NAME "cairo_imlib2_helper")

@ -99,7 +98,7 @@ if(BUILD_LUA_RSVG)
  include_directories(${luarsvg_includes} ${CMAKE_CURRENT_SOURCE_DIR})
  wrap_tolua(luarsvg_src rsvg.pkg)

-  add_library(conky-rsvg SHARED ${luarsvg_src})
+  add_library(conky-rsvg MODULE ${luarsvg_src})
  set_target_properties(conky-rsvg PROPERTIES OUTPUT_NAME "rsvg")

  target_link_libraries(conky-rsvg ${luarsvg_libs} toluapp_lib_static)
--- a/src/conky.cc
+++ b/src/conky.cc
@ -2101,9 +2101,9 @@ const char *getopt_string =
    ;

 const struct option longopts[] = {
-    {"help", 0, nullptr, 'h'},          {"version", 0, nullptr, 'V'},
-    {"quiet", 0, nullptr, 'q'},         {"debug", 0, nullptr, 'D'},
-    {"config", 1, nullptr, 'c'},
+    {"help", 0, nullptr, 'h'},          {"version", 0, nullptr, 'v'},
+    {"short-version", 0, nullptr, 'V'}, {"quiet", 0, nullptr, 'q'},
+    {"debug", 0, nullptr, 'D'},         {"config", 1, nullptr, 'c'},
 #ifdef BUILD_BUILTIN_CONFIG
    {"print-config", 0, nullptr, 'C'},
 #endif
--- a/src/main.cc
+++ b/src/main.cc
@ -56,6 +56,8 @@
 #endif /* BUILD_OLD_CONFIG */
 #endif /* BUILD_BUILTIN_CONFIG */

+static void print_short_version() { std::cout << VERSION << std::endl; }
+
 static void print_version() {
  std::cout << _(PACKAGE_NAME " " VERSION " compiled for " BUILD_ARCH
                              "\n"
@ -232,7 +234,8 @@ static void print_help(const char *prog_name) {
         "window. Command line options will override configurations defined in "
         "config\n"
         "file.\n"
-         "   -v, --version             version\n"
+         "   -v, --version             version with build details\n"
+         "   -V, --short-version       short version\n"
         "   -q, --quiet               quiet mode\n"
         "   -D, --debug               increase debugging output, ie. -DD for "
         "more debugging\n"
@ -320,9 +323,11 @@ int main(int argc, char **argv) {
        global_debug_level++;
        break;
      case 'v':
-      case 'V':
        print_version();
        return EXIT_SUCCESS;
+      case 'V':
+        print_short_version();
+        return EXIT_SUCCESS;
      case 'c':
        current_config = optarg;
        break;
Author	SHA1	Message	Date
pull[bot]	305c75c183	Merge `6008bd7923` into `c43582e917`	2024-05-01 19:03:35 +00:00
Brenden Matthews	6008bd7923	Fix AppImage version naming The version should match what Conky itself outputs.	2024-05-01 15:03:31 -04:00
Brenden Matthews	fe5552f3a8	Use `MODULE` library type for Lua libs Per the docs at https://cmake.org/cmake/help/latest/command/add_library.html, we should use `MODULE` rather than `SHARED` for the Lua libraries. This mostly affects macOS, where the libraries are compiled as MH_DYLIB (`.dylib`) rather than MH_BUNDLE (`.so`).	2024-05-01 15:03:14 -04:00
Brenden Matthews	8aa7116e5f	Make sure the git command is run from the source dir	2024-05-01 15:02:58 -04:00
Brenden Matthews	e8fd689b92	Make version string semver compliant, add git sha Per https://semver.org/, use `-pre` rather than `_pre` version postfix, and include the git short commit hash in the version string.	2024-05-01 15:02:58 -04:00
Brenden Matthews	d8c8fd3de5	CLI: -V now displays a short version string * -v shows the full version output with build details * -V (capital V) shows only the short version string	2024-05-01 14:44:28 -04:00
Brenden Matthews	17bc14f5fb	Update nix flake w/ LLVM 18	2024-05-01 14:11:49 -04:00