From 0aec2f123d4fa332bbdc865468416f404eff8bab Mon Sep 17 00:00:00 2001 From: Nick Chan Date: Wed, 15 Feb 2023 12:33:56 +0800 Subject: [PATCH] fix pythonplayer moments --- .github/workflows/build.yml | 34 +--- CMakeLists.txt | 22 --- docs/CMakeLists.txt | 4 - src/CMakeLists.txt | 344 ------------------------------------ 4 files changed, 7 insertions(+), 397 deletions(-) delete mode 100644 CMakeLists.txt delete mode 100644 docs/CMakeLists.txt delete mode 100644 src/CMakeLists.txt diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2a221c1..536d360 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -297,20 +297,9 @@ jobs: cp -a sysroot/${{ env.PREFIX }}/{include,lib} dep_root find dep_root -name '*.dylib' -delete find dep_root -name '*.la' -delete - mkdir build - cd build - cmake .. -DSTATIC=1 -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_CROSSCOMPILING=true \ - -DCMAKE_SYSTEM_NAME=Darwin \ - -DCMAKE_C_COMPILER="${{ env.CC }}" \ - -DCMAKE_C_FLAGS='${{ env.CFLAGS }}' \ - -DCMAKE_FIND_ROOT_PATH="${{ env.DESTDIR }}" \ - -DCMAKE_INSTALL_PREFIX="${{ env.PREFIX }}" \ - -DSTATIC=1 - make -j$(sysctl -n hw.ncpu) - cd .. + gmake -j$(sysctl -n hw.ncpu) mkdir -p ready - mv build/src/palera1n palera1n-${{ matrix.os }}-${{ matrix.arch }} + mv src/palera1n palera1n-${{ matrix.os }}-${{ matrix.arch }} dsymutil palera1n-${{ matrix.os }}-${{ matrix.arch }} strip palera1n-${{ matrix.os }}-${{ matrix.arch }} if [ "${{ matrix.os }}" == "macosx" ]; then @@ -640,29 +629,20 @@ jobs: cp -a sysroot/${{ env.PREFIX }}/{include,lib} dep_root find dep_root -name '*.so' -delete find dep_root -name '*.la' -delete - mkdir build - cd build - CC="${{ matrix.triple }}-gcc" cmake .. -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=${{ env.PREFIX }} \ - -DCMAKE_FIND_ROOT_PATH=${{ env.DESTDIR }}${{ env.PREFIX }} \ - -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY \ - -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY -DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ONLY \ - -DCMAKE_C_FLAGS="-I${{ env.DESTDIR }}${{ env.PREFIX }}/include \ - -L${{ env.DESTDIR }}${{ env.PREFIX }}/lib -Wl,-rpath,${{ env.PREFIX }}/lib" -DSTATIC=1 - make -j$(nproc) CC="${{ matrix.triple }}-gcc" + CC="${{ matrix.triple }}-gcc" make -j$(nproc) - name: Seperate debug symbols run: | - ${{ matrix.triple }}-objcopy --only-keep-debug build/src/palera1n palera1n.debug - ${{ matrix.triple }}-strip --strip-debug --strip-unneeded build/src/palera1n - ${{ matrix.triple }}-objcopy --add-gnu-debuglink=palera1n.debug build/src/palera1n + ${{ matrix.triple }}-objcopy --only-keep-debug src/palera1n palera1n.debug + ${{ matrix.triple }}-strip --strip-debug --strip-unneeded src/palera1n + ${{ matrix.triple }}-objcopy --add-gnu-debuglink=palera1n.debug src/palera1n chmod -x palera1n.debug - name: Prepare artifact run: | mkdir ready mv palera1n.debug ready/palera1n-${{ env.CHECKRA1N_NAME }}.debug - mv build/src/palera1n ready/palera1n-${{ env.CHECKRA1N_NAME }} + mv src/palera1n ready/palera1n-${{ env.CHECKRA1N_NAME }} tar -zcf ready/dep_root_${{ matrix.triple }}.tgz dep_root - name: Upload artifact diff --git a/CMakeLists.txt b/CMakeLists.txt deleted file mode 100644 index ef6d8b0..0000000 --- a/CMakeLists.txt +++ /dev/null @@ -1,22 +0,0 @@ -cmake_minimum_required(VERSION 3.14) -project(palera1n) -set(CMAKE_TRY_COMPILE_TARGET_TYPE "STATIC_LIBRARY") -set(CMAKE_CXX_STANDARD 99) -set(SRC ${CMAKE_CURRENT_SOURCE_DIR}) -set(DEP ${SRC}/dep_root) -set(CMAKE_C_STANDARD 99) -set(STATIC 0) -set(CMAKE_SUPPRESS_REGENERATION ON) - -set(CMAKE_BUILD_TYPE BUILD_TYPE) - - -add_custom_target(distclean - COMMAND sh -c "find src -name '*.o' -type f -delete" - COMMAND sh -c "find src -perm -u+x -type f -delete" - ) -#add_custom_target(distclean -# COMMAND sh -c "rm -rf *" -# ) -add_subdirectory(src) -add_subdirectory(docs) diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt deleted file mode 100644 index 31802ca..0000000 --- a/docs/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -add_custom_target( - docs - COMMAND sh -c "mandoc -T html -O style=mandoc.css palera1n.1 > palera1n.1.html" -) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt deleted file mode 100644 index 9e90c97..0000000 --- a/src/CMakeLists.txt +++ /dev/null @@ -1,344 +0,0 @@ -#execute_process(COMMAND sh -c "cd ../dep_root && sh ../download_deps.sh") -set(CMAKE_TRY_COMPILE_TARGET_TYPE "STATIC_LIBRARY") - - -#set(SRC ${CMAKE_CURRENT_SOURCE_DIR}) -#set(DEP ${SRC}/../dep_root) - -cmake_parse_arguments(palera1n "" "" "-arch" ${ARGN}) - -set(CHECKRA1N_VERSION 0.1337.1) -if( ${LDID}) - set(LDID ldid) -endif() -if( ${LIPO}) - set(LIPO lipo) -endif() - -if(APPLE) - set(CHECKRA1N_FILE_NAME checkra1n-macos) -else() - set(CHECKRA1N_FILE_NAME checkra1n-linux-${CMAKE_SYSTEM_PROCESSOR}) -endif() - -add_executable(palera1n - binpack.dmg.c - checkra1n-kpf-pongo.c - checkra1n.c - devhelper.c - dfuhelper.c - exec_checkra1n.c - lock_vars.c - lockdown_helper.c - log.c - main.c - optparse.c - override_file.c - pongo_helper.c - credits.c - ramdisk.dmg.c - ../include/kerninfo.h - ../include/palerain.h - ../include/ANSI-color-codes.h - ../include/tui.h - ../include/xxd-embedded.h - ) - -add_compile_options(-Wall -Wextra -Wno-unused-parameter -pedantic-errors -g) - -# adds dev mode files -if(CMAKE_BUILD_TYPE STREQUAL "Debug") - get_property(MY_TARGET_SOURCES TARGET palera1n PROPERTY SOURCES) - list(APPEND MY_TARGET_SOURCES tui_main.c - tui_screen_enter_dfu.c - tui_screen_enter_recovery.c - tui_screen_jailbreak.c - tui_screen_main.c - tui_screen_options.c) - set_property(TARGET palera1n PROPERTY SOURCES ${MY_TARGET_SOURCES}) - - -elseif(CMAKE_BUILD_TYPE STREQUAL "ASAN") - get_property(MY_TARGET_SOURCES TARGET palera1n PROPERTY SOURCES) - list(APPEND MY_TARGET_SOURCES tui_main.c - tui_screen_enter_dfu.c - tui_screen_enter_recovery.c - tui_screen_jailbreak.c - tui_screen_main.c - tui_screen_options.c) - set_property(TARGET palera1n PROPERTY SOURCES ${MY_TARGET_SOURCES}) - add_compile_options(-fsanitize=address,undefined -fsanitize-address-use-after-return=runtime) -elseif(CMAKE_BUILD_TYPE STREQUAL "TSAN") - get_property(MY_TARGET_SOURCES TARGET palera1n PROPERTY SOURCES) - list(APPEND MY_TARGET_SOURCES tui_main.c - tui_screen_enter_dfu.c - tui_screen_enter_recovery.c - tui_screen_jailbreak.c - tui_screen_main.c - tui_screen_options.c) - set_property(TARGET palera1n PROPERTY SOURCES ${MY_TARGET_SOURCES}) - add_compile_options(-fsanitize=thread,undefined) -else() - set(CMAKE_BUILD_TYPE "Release") -endif() - -#message("Testing for Clang/LLVM") -#string(TOLOWER CMAKE_C_COMPILER_ID COMPILER) - -#if(CMAKE_C_COMPILER_ID MATCHES "AppleClang" OR CMAKE_C_COMPILER_ID MATCHES "Clang") -# message("Using clang/llvm! Enabling -flto=full! Please make sure clang is up to date, or else compile will fail") -# add_compile_options(-flto=full) -#else() -# message("Not using clang/llvm! Using normal lto/no lto!") -# add_compile_options(-flto) -#endif() - - - -#add_custom_command(TARGET palera1n -# COMMAND sh -c "curl -LO https://assets.checkra.in/downloads/preview/${CHECKRA1N_VERSION}/${CHECKRA1N_FILE_NAME} && chmod 755 ${CHECKRA1N_FILE_NAME}" -# ) -# -#if(APPLE) -# add_custom_command(TARGET palera1n -# COMMAND sh -c "ldid -Scheckra1n.plist checkra1n" -# ) -# add_custom_command(TARGET palera1n -# COMMAND lipo -thin ${CMAKE_SYSTEM_PROCESSOR} -output checkra1n checkra1n-macos -# ) -# if(CFLAGS MATCHES "version-min=") -# add_custom_command(TARGET palera1n -# COMMAND sh -c "vtool -remove-build-version 1 -replace -output checkra1n checkra1n && vtool -set-build-version $(FAKE_PLATFORM) $(FAKE_MINOS) $(FAKE_SDK) -replace -output checkra1n checkra1n && install_name_tool -change /System/Library/Frameworks/IOKit.framework/Versions/A/IOKit /System/Library/Frameworks/IOKit.framework/IOKit checkra1n && install_name_tool -change /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation /System/Library/Frameworks/CoreFoundation.framework/CoreFoundation checkra1n && ${LDID} -Susb.xml checkra1n" -# ) -# endif() -#else() -# execute_process( -# COMMAND cp ${CHECKRA1N_FILE_NAME} ../src/checkra1n -# ) -#endif() - -#ifneq (,$(findstring arm64, $(CFLAGS))) -#$(LIPO) -thin arm64 -output checkra1n checkra1n-macos -#else ifneq (,$(findstring x86_64, $(CFLAGS))) -#$(LIPO) -thin x86_64 -output checkra1n checkra1n-macos -#else ifeq ($(shell arch),i386) -#$(LIPO) -thin x86_64 -output checkra1n checkra1n-macos -#else -#$(LIPO) -thin $(shell arch) -output checkra1n checkra1n- - -if(APPLE) - if(${LIBUSB}) - target_compile_definitions(palera1n PRIVATE -DUSE_LIBUSB) - get_property(MY_TARGET_SOURCES TARGET palera1n PROPERTY SOURCES) - list(APPEND MY_TARGET_SOURCES - usb_libusb.c) - set_property(TARGET palera1n PROPERTY SOURCES ${MY_TARGET_SOURCES}) - target_link_libraries(palera1n - ${DEP}/lib/libusb-1.0.a - ) - else() - get_property(MY_TARGET_SOURCES TARGET palera1n PROPERTY SOURCES) - list(APPEND MY_TARGET_SOURCES - usb_iokit.c) - set_property(TARGET palera1n PROPERTY SOURCES ${MY_TARGET_SOURCES}) - endif() - - - - if(IOS AND CMAKE_C_FLAGS MATCHES "arm64") - add_custom_command( - COMMAND sh -c "curl -Lo checkra1n-macos https://assets.checkra.in/downloads/preview/0.1337.1/${CHECKRA1N_FILE_NAME} " - COMMAND lipo -thin arm64 -output checkra1n checkra1n-macos - COMMAND sh -c "vtool -remove-build-version 1 -replace -output checkra1n checkra1n && vtool -set-build-version $(FAKE_PLATFORM) $(FAKE_MINOS) $(FAKE_SDK) -replace -output checkra1n checkra1n && install_name_tool -change /System/Library/Frameworks/IOKit.framework/Versions/A/IOKit /System/Library/Frameworks/IOKit.framework/IOKit checkra1n && install_name_tool -change /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation /System/Library/Frameworks/CoreFoundation.framework/CoreFoundation checkra1n && ${LDID} -Susb.xml checkra1n" - COMMAND sh -c "curl -Lo binpack.dmg https://cdn.nickchan.lol/palera1n/c-rewrite/deps/binpack.dmg" - COMMAND sh -c "curl -Lo ramdisk.dmg https://cdn.nickchan.lol/palera1n/c-rewrite/deps/ramdisk.dmg" - COMMAND sh -c "curl -Lo checkra1n-kpf-pongo https://cdn.nickchan.lol/palera1n/artifacts/kpf/checkra1n-kpf-pongo" - COMMAND pwd - COMMAND xxd -iC checkra1n checkra1n.c - COMMAND xxd -iC binpack.dmg binpack.dmg.c - COMMAND xxd -iC ramdisk.dmg ramdisk.dmg.c - COMMAND xxd -iC checkra1n-kpf-pongo checkra1n-kpf-pongo.c - OUTPUT checkra1n.c checkra1n-kpf-pongo.c ramdisk.dmg.c binpack.dmg.c binpack.dmg ramdisk.dmg checkra1n-kpf-pongo - ) - elseif(CMAKE_C_FLAGS MATCHES "arm64") - add_custom_command( - COMMAND sh -c "curl -Lo checkra1n-macos https://assets.checkra.in/downloads/preview/0.1337.1/${CHECKRA1N_FILE_NAME} " - COMMAND lipo -thin arm64 -output checkra1n checkra1n-macos - COMMAND sh -c "curl -Lo binpack.dmg https://cdn.nickchan.lol/palera1n/c-rewrite/deps/binpack.dmg" - COMMAND sh -c "curl -Lo ramdisk.dmg https://cdn.nickchan.lol/palera1n/c-rewrite/deps/ramdisk.dmg" - COMMAND sh -c "curl -Lo checkra1n-kpf-pongo https://cdn.nickchan.lol/palera1n/artifacts/kpf/checkra1n-kpf-pongo" - COMMAND pwd - COMMAND xxd -iC checkra1n checkra1n.c - COMMAND xxd -iC binpack.dmg binpack.dmg.c - COMMAND xxd -iC ramdisk.dmg ramdisk.dmg.c - COMMAND xxd -iC checkra1n-kpf-pongo checkra1n-kpf-pongo.c - OUTPUT checkra1n.c checkra1n-kpf-pongo.c ramdisk.dmg.c binpack.dmg.c binpack.dmg ramdisk.dmg checkra1n-kpf-pongo - ) - else() - add_custom_command( - COMMAND sh -c "curl -Lo checkra1n-macos https://assets.checkra.in/downloads/preview/0.1337.1/${CHECKRA1N_FILE_NAME} " - COMMAND lipo -thin x86_64 -output checkra1n checkra1n-macos - COMMAND sh -c "curl -Lo binpack.dmg https://cdn.nickchan.lol/palera1n/c-rewrite/deps/binpack.dmg" - COMMAND sh -c "curl -Lo ramdisk.dmg https://cdn.nickchan.lol/palera1n/c-rewrite/deps/ramdisk.dmg" - COMMAND sh -c "curl -Lo checkra1n-kpf-pongo https://cdn.nickchan.lol/palera1n/artifacts/kpf/checkra1n-kpf-pongo" - COMMAND pwd - COMMAND xxd -iC checkra1n checkra1n.c - COMMAND xxd -iC binpack.dmg binpack.dmg.c - COMMAND xxd -iC ramdisk.dmg ramdisk.dmg.c - COMMAND xxd -iC checkra1n-kpf-pongo checkra1n-kpf-pongo.c - OUTPUT checkra1n.c checkra1n-kpf-pongo.c ramdisk.dmg.c binpack.dmg.c binpack.dmg ramdisk.dmg checkra1n-kpf-pongo - ) - endif() -else() - add_custom_command( - COMMAND sh -c "curl -Lo checkra1n https://assets.checkra.in/downloads/preview/0.1337.1/${CHECKRA1N_FILE_NAME} " - COMMAND sh -c "curl -Lo binpack.dmg https://cdn.nickchan.lol/palera1n/c-rewrite/deps/binpack.dmg" - COMMAND sh -c "curl -Lo ramdisk.dmg https://cdn.nickchan.lol/palera1n/c-rewrite/deps/ramdisk.dmg" - COMMAND sh -c "curl -Lo checkra1n-kpf-pongo https://cdn.nickchan.lol/palera1n/artifacts/kpf/checkra1n-kpf-pongo" - COMMAND pwd - COMMAND xxd -iC checkra1n checkra1n.c - COMMAND xxd -iC binpack.dmg binpack.dmg.c - COMMAND xxd -iC ramdisk.dmg ramdisk.dmg.c - COMMAND xxd -iC checkra1n-kpf-pongo checkra1n-kpf-pongo.c - OUTPUT checkra1n.c checkra1n-kpf-pongo.c ramdisk.dmg.c binpack.dmg.c binpack.dmg ramdisk.dmg checkra1n-kpf-pongo - ) - target_compile_definitions(palera1n PRIVATE -DUSE_LIBUSB) - get_property(MY_TARGET_SOURCES TARGET palera1n PROPERTY SOURCES) - list(APPEND MY_TARGET_SOURCES - usb_libusb.c) - set_property(TARGET palera1n PROPERTY SOURCES ${MY_TARGET_SOURCES}) - target_link_libraries(palera1n - ${DEP}/lib/libusb-1.0.a - ) - target_compile_definitions(palera1n PRIVATE -DUSE_LIBUSB) -endif() - -include_directories( - ../include - ${SRC} -) - - -target_compile_definitions(palera1n PRIVATE -DPALERAIN_VERSION=\"2.0.0\") - -target_include_directories(palera1n PRIVATE - ${SRC}/include - ${SRC} - ${DEP}/include - ) - -#if(${STATIC}) -target_link_libraries(palera1n - ${DEP}/lib/libimobiledevice-1.0.a - ${DEP}/lib/libirecovery-1.0.a - ${DEP}/lib/libusbmuxd-2.0.a - ${DEP}/lib/libimobiledevice-glue-1.0.a - ${DEP}/lib/libplist-2.0.a - ${DEP}/lib/libmbedtls.a - ${DEP}/lib/libmbedcrypto.a - ${DEP}/lib/libmbedx509.a - ${DEP}/lib/libreadline.a - ) - -set(CMAKE_FIND_LIBRARY_SUFFIXES ".a") -set(BUILD_SHARED_LIBS OFF) -if(NOT APPLE) - set(CMAKE_EXE_LINKER_FLAGS "-static") -endif() -#else() -# find_library(LIBIMOBILEDEVICE libimobiledevice) -# if (NOT CORE_FOUNDATION) -# message(FATAL_ERROR "libimobiledevice not found") -# endif() -# target_link_libraries(palera1n ${LIBIMOBILEDEVICE}) -# -# find_library(LIR libirecovery) -# if (NOT SYSCONF) -# message(FATAL_ERROR "libirecovery not found") -# endif() -# target_link_libraries(palera1n ${LIR}) -# -# find_library(USBMUXD usbmuxd) -# if (NOT SEC) -# message(FATAL_ERROR "usbmuxd not found") -# endif() -# target_link_libraries(palera1n ${USBMUXD}) -# -# find_library(GLUE libimobiledevice-glue) -# if (NOT IOKIT) -# message(FATAL_ERROR "libimobiledevice-glue not found") -# endif() -# target_link_libraries(palera1n ${GLUE}) -# -## target_link_libraries(palera1n -## imobiledevice-1.0 -## irecovery-1.0 -## usbmuxd-2.0 -## imobiledevice-glue-1.0 -## plist-2.0 -## mbedtls -## mbedcrypto -## mbedx509 -## readline -## usb-1.0 -## ) -#endif() -#if(APPLE) -# add_compile_options(palera1n -# -framework CoreFoundation -# -framework SystemConfiguration -# -framework IOKit -# -framework Security -# ) -#endif() - -if(APPLE) - find_library(CORE_FOUNDATION CoreFoundation) - if (NOT CORE_FOUNDATION) - message(FATAL_ERROR "CoreFoundation not found") - endif() - target_link_libraries(palera1n ${CORE_FOUNDATION}) - - find_library(SYSCONF SystemConfiguration) - if (NOT SYSCONF) - message(FATAL_ERROR "SystemConfiguration not found") - endif() - target_link_libraries(palera1n ${SYSCONF}) - - find_library(SEC Security) - if (NOT SEC) - message(FATAL_ERROR "Security not found") - endif() - target_link_libraries(palera1n ${SEC}) - - find_library(IOKIT IOKit) - if (NOT IOKIT) - message(FATAL_ERROR "IOKit not found") - endif() - target_link_libraries(palera1n ${IOKIT}) -endif() -add_compile_options(palera1n - -static -no-pie -Wl,--gc-sections - ) - - -if(!BUILD_DATE) - execute_process(COMMAND date OUTPUT_VARIABLE BUILD_DATE) -endif() -if(!BUILD_TAG) - execute_process(COMMAND git describe --dirty --tags --abbrev=7 OUTPUT_VARIABLE BUILD_TAG) -endif() -if(!BUILD_WHOAMI) - execute_process(COMMAND whoami OUTPUT_VARIABLE BUILD_WHOAMI) -endif () - -set(INCLUDE_DIR /usr/local/include) -include_directories (${INCLUDE_DIR}) - - -add_compile_definitions( - BUILD_DATE="${BUILD_DATE}" - BUILD_TAG="${BUILD_TAG}" - BUILD_WHOAMI="${BUILD_WHOAMI}" - BUILD_STYLE="${CMAKE_BUILD_TYPE}" -)