Skip to content

Use more C++ #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 12 commits into
base: main
Choose a base branch
from
Draft

Use more C++ #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
7adf683
step 1
TheAssassin Jul 8, 2023
5993960
step 2
TheAssassin Jul 8, 2023
acc783f
step 3
TheAssassin Jul 8, 2023
3895dbf
step 4
TheAssassin Jul 8, 2023
536e7be
step 5
TheAssassin Jul 8, 2023
4097ea1
step 6
TheAssassin Jul 8, 2023
6c576d4
step 7
TheAssassin Jul 8, 2023
1381188
step 8
TheAssassin Jul 8, 2023
42f22e2
step 9
TheAssassin Jul 8, 2023
82b3258
Begin to use c++ in appimagetool.cpp
probonopd Jul 9, 2023
f385247
More c++
probonopd Jul 9, 2023
21ca1c0
More c++, fewer gchar*
probonopd Jul 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ cmake-build-*/
*.*swp*
*.bak
*.AppImage*
.vscode/
5 changes: 3 additions & 2 deletions ci/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ cp "$(which mksquashfs)" AppDir/usr/bin
cp "$repo_root"/resources/AppRun.sh AppDir/AppRun
chmod +x AppDir/AppRun

wget https://github.com/AppImage/type2-runtime/releases/download/continuous/runtime-"$ARCH"
# wget https://github.com/AppImage/type2-runtime/releases/download/continuous/runtime-"$ARCH"

pushd AppDir
ln -s usr/share/applications/appimagetool.desktop .
Expand All @@ -52,6 +52,7 @@ popd
find AppDir
cat AppDir/appimagetool.desktop

AppDir/AppRun --runtime-file runtime-"$ARCH" AppDir
# AppDir/AppRun --runtime-file runtime-"$ARCH" AppDir --verbose
AppDir/AppRun AppDir --verbose

mv appimagetool-*.AppImage "$old_cwd"
20 changes: 16 additions & 4 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,23 @@
add_executable(appimagetool
appimagetool.c
appimagetool.cpp
appimagetool_fetch_runtime.cpp
appimagetool_fetch_runtime.h
appimagetool_sign.c
appimagetool_fetch_runtime.c
hexlify.c
elf.c
appimagetool_sign.h
digest.c
elf.c
hexlify.c
light_byteswap.h
light_elf.h
md5.c
md5.h
util.h
)

# Ensure that the C compiler, not the C++ compiler, is used for compiling C files
set_source_files_properties(digest.c elf.c hexlify.c md5.c appimagetool_sign.c PROPERTIES LANGUAGE C)
set(CMAKE_C_COMPILER gcc)

# trick: list libraries on which imported static ones depend on in the PUBLIC section
# CMake then adds them after the PRIVATE ones in the linker command
target_link_libraries(appimagetool
Expand All @@ -19,6 +29,7 @@ target_link_libraries(appimagetool
PkgConfig::libcurl
)


target_compile_definitions(appimagetool
PRIVATE -D_FILE_OFFSET_BITS=64
PRIVATE -DGIT_VERSION="${GIT_VERSION}"
Expand Down Expand Up @@ -49,3 +60,4 @@ install(
FILES "${PROJECT_SOURCE_DIR}/resources/appimagetool.appdata.xml"
DESTINATION share/metainfo
)

Loading