dblsaiko/nix-plugin-pijul - Change N2RTQC4PEXZEGZPWHYJHIXS6LOI3EFYDYATNG4HMCR6JGDI3NZ6QC

Build with Meson instead of CMake

Created by dblsaiko on November 30, 2024

N2RTQC4PEXZEGZPWHYJHIXS6LOI3EFYDYATNG4HMCR6JGDI3NZ6QC

Dependencies

In channels

main

Change contents

File deletion: CMakeLists.txt

BF:BFD[4.1] → [5.13775:13813]

BF:BFD[5.13813] → [5.13814:13814]

B:BD[5.13814] → [5.13815:13906]

∅:D[6.62] → [5.13946:14161]

∅:D[7.62] → [5.13946:14161]

∅:D[8.166] → [5.13946:14161]

B:BD[5.13946] → [5.13946:14161]

∅:D[9.10005] → [5.14161:14276]

B:BD[5.14161] → [5.14161:14276]

∅:D[10.140] → [5.14276:14277]

B:BD[5.14276] → [5.14276:14277]

∅:D[2.193] → [5.14334:14335]

B:BD[5.14334] → [5.14334:14335]

∅:D[11.678] → [5.14335:14357]

∅:D[9.10071] → [5.14335:14357]

B:BD[5.14335] → [5.14335:14357]

B:BD[5.14335] → [2.194:235]

∅:D[2.235] → [11.168:562]

B:BD[5.14335] → [11.168:562]

∅:D[12.66] → [11.677:678]

∅:D[13.212] → [11.677:678]

∅:D[9.10042] → [11.677:678]

B:BD[11.677] → [11.677:678]

B:BD[11.678] → [9.10043:10071]

B:BD[11.562] → [13.0:188]

B:BD[13.188] → [12.1:66]

B:BD[12.66] → [9.10006:10042]

B:BD[5.14277] → [2.0:193]

B:BD[5.14276] → [10.103:140]

B:BD[5.14161] → [9.9990:10005]

B:BD[5.13906] → [8.89:166]

cmake_minimum_required(VERSION 3.23)
set(CMAKE_CXX_STANDARD 20)
set(CMAKE_C_STANDARD 17)
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
set(CMAKE_SHARED_MODULE_PREFIX)
include(GNUInstallDirs)
find_package(PkgConfig REQUIRED)
find_package(Boost REQUIRED)
find_package(date REQUIRED)
add_subdirectory(src)
set(Nix_VERSION ${Nix_nix-main_VERSION})
string(REPLACE "." ";" VERSION_LIST ${Nix_VERSION})
list(GET VERSION_LIST 0 Nix_MAJOR_VERSION)
list(GET VERSION_LIST 1 Nix_MINOR_VERSION)
list(GET VERSION_LIST 2 Nix_PATCH_VERSION)
target_compile_definitions(PkgConfig::Nix
        INTERFACE
        "NIX_MAJOR_VERSION=(${Nix_MAJOR_VERSION})"
        "NIX_MINOR_VERSION=(${Nix_MINOR_VERSION})"
        "NIX_PATCH_VERSION=(${Nix_PATCH_VERSION})"
add_subdirectory(autotests)
        "NIX_VERSION=(((0x${Nix_MAJOR_VERSION})<<16) | ((0x${Nix_MINOR_VERSION})<<8) | (0x${Nix_PATCH_VERSION}))"
        SYSTEM="")
target_link_libraries(PkgConfig::Nix
        INTERFACE
        Boost::headers
        date::date
        nlohmann_json)
add_compile_options(-Wall -Werror)
pkg_check_modules(Nix REQUIRED IMPORTED_TARGET nix-main nix-store)
find_library(nixfetchers_LIBRARY nixfetchers REQUIRED)
target_link_libraries(PkgConfig::Nix INTERFACE ${nixfetchers_LIBRARY})
find_package(nlohmann_json REQUIRED)
include(CTest)
file(STRINGS VERSION _version)
project(nix-plugin-pijul VERSION ${_version})

File deletion: CMakeLists.txt
BF:BFD[5.15] → [5.12980:13018]
BF:BFD[5.13018] → [5.13019:13019]
B:BD[5.13019] → [5.13020:13046]
∅:D[9.7590] → [5.13046:13047]
B:BD[5.13046] → [5.13046:13047]
∅:D[14.3642] → [5.13097:13098]
B:BD[5.13097] → [5.13097:13098]
∅:D[12.0] → [5.13180:13181]
∅:D[10.65] → [5.13180:13181]
∅:D[13.280] → [5.13180:13181]
B:BD[5.13180] → [5.13180:13181]
B:BD[5.13234] → [5.13234:13305]
B:BD[5.13098] → [9.7636:7674]
B:BD[9.7674] → [9.7674:7846]
∅:D[15.96] → [9.7846:7847]
B:BD[9.7846] → [9.7846:7847]
B:BD[9.7846] → [15.41:96]
∅:D[9.7847] → [13.213:280]
B:BD[5.13098] → [13.213:280]
B:BD[13.280] → [12.0:0]
∅:D[9.7635] → [14.3589:3642]
B:BD[5.13076] → [14.3589:3642]
B:BD[5.13047] → [9.7591:7635]
B:BD[5.13046] → [9.7557:7590]
```
add_library(pijul MODULE)
install(TARGETS pijul DESTINATION ${CMAKE_INSTALL_LIBDIR}/nix/plugins)
target_sources(pijul PRIVATE ${SRC})
target_sources(PijulTesting PRIVATE ${SRC})
target_include_directories(PijulTesting PUBLIC ${CMAKE_CURRENT_LIST_DIR})
target_compile_options(PijulTesting PUBLIC -O1 -ggdb)
target_link_libraries(PijulTesting PRIVATE date::date)
target_link_libraries(pijul
        PUBLIC
        PkgConfig::Nix)
        fetcher.cpp
        repo.cpp
        repo.h)
set(SRC
        compat.cpp
        compat.h
add_library(PijulTesting STATIC)
```

File addition: meson.build (----------)

[5.15]

lib_src = files(
    'compat.cpp',
    'fetcher.cpp',
    'repo.cpp',
)
lib_inc = include_directories('.')
# Nix uses these macros that are only defined in its own build
lib_extra_cppflags = ['-DSYSTEM=""']
if nix_main_dep.version().version_compare('<=2.22')
    lib_extra_cppflags += ['-DHAVE_STRUCT_DIRENT_D_TYPE']
endif
lib = shared_module(
    'pijul',
    lib_src,
    dependencies: [
        nix_main_dep,
        nix_store_dep,
    ],
    cpp_args: [
        f'-DNIX_MAJOR_VERSION=(@nix_major_version@)',
        f'-DNIX_MINOR_VERSION=(@nix_minor_version@)',
        f'-DNIX_PATCH_VERSION=(@nix_patch_version@)',
        f'-DNIX_VERSION=(((0x@nix_major_version@)<<16) | ((0x@nix_minor_version@)<<8) | (0x@nix_patch_version@))',
    ] + lib_extra_cppflags,
    include_directories: lib_inc,
    install: true,
    install_dir: get_option('libdir') / 'nix/plugins',
    name_prefix: '',
)
test_lib = static_library(
    'testsupport',
    lib_src,
    include_directories: lib_inc,
)

Replacement in package.nix at line 4 [5.13342]
∅:D[15.114] → [5.13355:13364]
B:BD[5.13355] → [5.13355:13364]
```
  cmake,
```
[5.13355]
[5.13364]
```
  meson,
  ninja,
```
Replacement in package.nix at line 18 [5.13342]
B:BD[3.134] → [3.134:144]
```
    cmake
```
[3.134]
[3.144]
```
    meson
    ninja
```

File addition: meson.build (----------)

[4.1]

project(
    'nix-plugin-pijul',
    'cpp',
    license: 'LGPL-3.0',
    license_files: ['LICENSE'],
    version: configure_file(input: 'VERSION', output: 'VERSION', copy: true),
    default_options: {
        'cpp_std': 'c++20',
        'werror': true,
    }
)
nix_main_dep = dependency('nix-main', required: true)
nix_store_dep = dependency('nix-store', required: true)
nix_version_components = nix_main_dep.version().split('.')
nix_major_version = nix_version_components[0]
nix_minor_version = nix_version_components[1]
nix_patch_version = nix_version_components[2]
if nix_patch_version.contains('_')
    nix_patch_version = '99'
endif
subdir('src')
subdir('autotests')

File deletion: CMakeLists.txt

BF:BFD[9.7869] → [9.9654:9692]

BF:BFD[9.9692] → [9.9693:9693]

B:BD[9.9693] → [9.9694:9989]

add_compile_options(-O1 -ggdb)
add_executable(DateTest datetest.cpp)
target_link_libraries(DateTest PUBLIC PijulTesting)
add_test(NAME DateTest COMMAND DateTest)
add_executable(RepoTest repotest.cpp)
target_link_libraries(RepoTest PUBLIC PijulTesting)
add_test(NAME RepoTest COMMAND RepoTest)

File addition: meson.build (----------)

[9.7869]

datetest_exe = executable(
    'datetest',
    ['datetest.cpp'],
    link_with: [test_lib],
    include_directories: [lib_inc],
)
test('date', datetest_exe)
repotest_exe = executable(
    'repotest',
    ['repotest.cpp'],
    link_with: [test_lib],
    include_directories: [lib_inc],
)
test('repo', repotest_exe)

Build with Meson instead of CMake

Dependencies

In channels

Change contents

File deletion: CMakeLists.txt

File deletion: CMakeLists.txt

File addition: meson.build (----------)

Replacement in package.nix at line 4 [5.13342]

Replacement in package.nix at line 18 [5.13342]

File addition: meson.build (----------)

File deletion: CMakeLists.txt

File addition: meson.build (----------)