1
0
mirror of synced 2024-11-14 11:07:43 +01:00

build: Try fix building issues with web build and Fedora

This commit is contained in:
WerWolv 2024-03-12 19:09:01 +01:00
parent fbfc319ac1
commit 2988561f01
5 changed files with 22 additions and 16 deletions

View File

@ -627,11 +627,11 @@ jobs:
- name: ✒️ Modify spec file - name: ✒️ Modify spec file
run: | run: |
sed -i \ sed -i \
-e 's/Version: [0-9]*\.[0-9]*\.[0-9]*$/Version: ${{env.IMHEX_VERSION}}/g' \ -e 's/Version: VERSION$/Version: ${{env.IMHEX_VERSION}}/g' \
-e 's/IMHEX_OFFLINE_BUILD=ON/IMHEX_OFFLINE_BUILD=OFF/g' \ -e 's/IMHEX_OFFLINE_BUILD=ON/IMHEX_OFFLINE_BUILD=OFF/g' \
-e '/IMHEX_OFFLINE_BUILD=OFF/a -D IMHEX_PATTERNS_PULL_MASTER=ON \\' \ -e '/IMHEX_OFFLINE_BUILD=OFF/a -D IMHEX_PATTERNS_PULL_MASTER=ON \\' \
-e '/BuildRequires: cmake/a BuildRequires: git-core' \ -e '/BuildRequires: cmake/a BuildRequires: git-core' \
-e '/%files/a %{_datadir}/%{name}/' \ -e '/%files/a %{_datadir}/%{name}/' \
$GITHUB_WORKSPACE/ImHex/dist/rpm/imhex.spec $GITHUB_WORKSPACE/ImHex/dist/rpm/imhex.spec
- name: 📜 Fix ccache on EL9 - name: 📜 Fix ccache on EL9

View File

@ -60,8 +60,8 @@ setUninstallTarget()
addBundledLibraries() addBundledLibraries()
add_subdirectory(lib/libimhex) add_subdirectory(lib/libimhex)
addPluginDirectories()
add_subdirectory(main) add_subdirectory(main)
addPluginDirectories()
# Add unit tests # Add unit tests
if (IMHEX_ENABLE_UNIT_TESTS) if (IMHEX_ENABLE_UNIT_TESTS)

View File

@ -18,11 +18,11 @@ docker buildx build . -f <DOCKERFILE_PATH> --progress plain --build-arg 'JOBS=4'
where `<DOCKERFILE_PATH>` should be replaced by the wanted Dockerfile base d on the build you want to do: where `<DOCKERFILE_PATH>` should be replaced by the wanted Dockerfile base d on the build you want to do:
| Wanted build | Dockerfile path | | Wanted build | Dockerfile path | Target |
|--------------|-----------------------------| |--------------|-----------------------------|--------|
| MacOS M1 | dist/macOS/arm64.Dockerfile | | MacOS M1 | dist/macOS/arm64.Dockerfile | - |
| AppImage | dist/appimage/Dockerfile | | AppImage | dist/appimage/Dockerfile | - |
| Web version | dist/web/Dockerfile | | Web version | dist/web/Dockerfile | raw |
We'll explain this command in the next section We'll explain this command in the next section
@ -43,6 +43,7 @@ In the command saw earlier:
- `.` is the base folder that the Dockerfile will be allowed to see - `.` is the base folder that the Dockerfile will be allowed to see
- `-f <path>` is to specify the Dockerfile path - `-f <path>` is to specify the Dockerfile path
- `--progress plain` is to allow you to see the output of instructions - `--progress plain` is to allow you to see the output of instructions
- `--build-arg <key>=<value>` is to allow to to specify arguments to the build (like -DKEY=VALUE in CMake) - `--build-arg <key>=<value>` is to allow to specify arguments to the build (like -DKEY=VALUE in CMake)
- `--build-context key=<folder>` is to specify folders other than the base folder that the Dockerfile is allowed to see - `--build-context key=<folder>` is to specify folders other than the base folder that the Dockerfile is allowed to see
- `--output <path>` is the path to write the output package to. If not specified, Docker will create an image as the output (probably not what you want) - `--output <path>` is the path to write the output package to. If not specified, Docker will create an image as the output (probably not what you want)
- `--target <target>` specifies which docker target to build

2
dist/rpm/imhex.spec vendored
View File

@ -1,5 +1,5 @@
Name: imhex Name: imhex
Version: 1.26.2 Version: VERSION
Release: 0%{?dist} Release: 0%{?dist}
Summary: A hex editor for reverse engineers and programmers Summary: A hex editor for reverse engineers and programmers

View File

@ -4,8 +4,12 @@ project(imgui_cimgui)
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 17)
if (IMHEX_STATIC_LINK_PLUGINS)
return()
endif()
if (NOT IMHEX_EXTERNAL_PLUGIN_BUILD) if (NOT IMHEX_EXTERNAL_PLUGIN_BUILD)
add_library(imgui_cimgui SHARED add_library(imgui_cimgui ${LIBRARY_TYPE}
source/cimgui.cpp source/cimgui.cpp
) )
@ -18,7 +22,8 @@ if (NOT IMHEX_EXTERNAL_PLUGIN_BUILD)
set_target_properties(imgui_cimgui PROPERTIES OUTPUT_NAME "cimgui") set_target_properties(imgui_cimgui PROPERTIES OUTPUT_NAME "cimgui")
set_target_properties(imgui_cimgui PROPERTIES PREFIX "") set_target_properties(imgui_cimgui PROPERTIES PREFIX "")
add_dependencies(imhex_all imgui_cimgui) add_dependencies(imhex_all imgui_cimgui)
install(FILES "$<TARGET_FILE:imgui_cimgui>" DESTINATION "${CMAKE_INSTALL_LIBDIR}" PERMISSIONS ${LIBRARY_PERMISSIONS})
set_target_properties(imgui_cimgui PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
endif() endif()
install(FILES "$<TARGET_FILE:imgui_cimgui>" DESTINATION "${CMAKE_INSTALL_LIBDIR}" PERMISSIONS ${LIBRARY_PERMISSIONS})
set_target_properties(imgui_cimgui PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})