diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml deleted file mode 100644 index da04c30..0000000 --- a/.github/workflows/android.yml +++ /dev/null @@ -1,45 +0,0 @@ -name: Android Build - -on: - push: - branches: [ main ] - pull_request: - -jobs: - build: - runs-on: windows-latest - - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Cache Android NDK r14b - id: ndk-cache - uses: actions/cache@v4 - with: - path: C:\android-ndk-r14b - key: android-ndk-r14b - - - name: Download Android NDK r14b - if: steps.ndk-cache.outputs.cache-hit != 'true' - shell: powershell - run: | - Invoke-WebRequest ` - -Uri "http://dl.google.com/android/repository/android-ndk-r14b-windows-x86_64.zip" ` - -OutFile "ndk.zip" - - - name: Extract Android NDK - if: steps.ndk-cache.outputs.cache-hit != 'true' - shell: powershell - run: | - Expand-Archive ndk.zip C:\ - - - name: Verify NDK path - shell: powershell - run: | - Test-Path "C:\android-ndk-r14b" - - - name: Run build script - shell: powershell - run: | - ./build.ps1 \ No newline at end of file diff --git a/.github/workflows/cmake-multiplatform.yml b/.github/workflows/cmake-multiplatform.yml deleted file mode 100644 index 15adb50..0000000 --- a/.github/workflows/cmake-multiplatform.yml +++ /dev/null @@ -1,75 +0,0 @@ -name: CMake multiplatform - -on: - push: - branches: [ "main" ] - pull_request: - branches: [ "main" ] - -permissions: - contents: write - -jobs: - build: - runs-on: ${{ matrix.os }} - - strategy: - matrix: - os: [ubuntu-latest, windows-latest] - build_type: [Release] - include: - - os: windows-latest - c_compiler: clang - cpp_compiler: clang++ - - os: ubuntu-latest - c_compiler: clang - cpp_compiler: clang++ - - steps: - - uses: actions/checkout@v4 - - name: Set reusable strings - # Turn repeated input strings (such as the build output directory) into step outputs. These step outputs can be used throughout the workflow file. - id: strings - shell: bash - run: | - echo "build-output-dir=${{ github.workspace }}/build" >> "$GITHUB_OUTPUT" - - - name: Setup Environment - if: ${{ matrix.os == 'ubuntu-latest' }} - run: | - sudo apt-get update -qq - sudo apt-get install gcc-multilib - sudo apt-get install -y --no-install-recommends build-essential libgl-dev libwayland-dev xorg-dev libxkbcommon-dev - - - name: Configure CMake - run: > - cmake -B ${{ steps.strings.outputs.build-output-dir }} - -DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }} - -DCMAKE_C_COMPILER=${{ matrix.c_compiler }} - -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} - -S ${{ github.workspace }} - - - name: Build - run: cmake --build ${{ steps.strings.outputs.build-output-dir }} --config ${{ matrix.build_type }} - - - name: Install - run: cmake --install ${{ steps.strings.outputs.build-output-dir }} --config ${{ matrix.build_type }} - - - name: Pack - run: | - cd ${{ steps.strings.outputs.build-output-dir }} - cpack -C ${{ matrix.build_type }} - - - name: Create or Update Development Release - uses: softprops/action-gh-release@v1 - with: - name: Development Build - tag_name: dev - body: | - ${{ github.event.head_commit.timestamp }} - draft: false - prerelease: true - generate_release_notes: false - files: 'build/package/*.zip' - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index a88ca61..fc69311 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -381,60 +381,4 @@ else() POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_SOURCE_DIR}/misc/web/index.html" $ ) -endif() - -# Installing and packing - -find_package(Git REQUIRED) - -execute_process( - COMMAND ${GIT_EXECUTABLE} log -1 --format=%h - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} - OUTPUT_VARIABLE GIT_SHORTSHA - OUTPUT_STRIP_TRAILING_WHITESPACE -) -string(TOLOWER ${CMAKE_SYSTEM_NAME} SYSTEM_NAME) -set(CPACK_PACKAGE_NAME "MCPE-0.6.1-for-all") -set(CPACK_PACKAGE_FILE_NAME ${CPACK_PACKAGE_NAME}-${SYSTEM_NAME}) -set(CPACK_PACKAGE_VENDOR "MCPE-0.6.1-for-all") -set(CPACK_PACKAGE_VERSION "${PROJECT_VERSION}") -set(CPACK_PACKAGE_DIRECTORY "${CMAKE_BINARY_DIR}/package") -set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/install") -set(CPACK_GENERATOR "ZIP") - -set(GIT_REPO "https://gitea.sffempire.ru/Kolyah35/minecraft-pe-0.6.1") - -install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION .) - -if(NOT UNIX) -install(FILES - $ - DESTINATION . -) -endif() - -install(DIRECTORY "${CMAKE_SOURCE_DIR}/data" DESTINATION .) - -string(TIMESTAMP CURRENT_DATE "%Y-%m-%d") -string(TIMESTAMP CURRENT_TIME "%H:%M:%S") - -set(VERSION_STR "${PROJECT_VERSION}") - -if(CMAKE_BUILD_TYPE STREQUAL "Debug") - set(VERSION_STR "${VERSION_STR} - Development Build") -endif() - -file(WRITE "${CMAKE_BINARY_DIR}/version.txt" -"Minecraft PE 0.6.1 - -Autogenerated file by cmake-${CMAKE_VERSION} -Report issues ${GIT_REPO}/issues - -Build date: ${CURRENT_DATE} ${CURRENT_TIME} -Build configuration: ${CMAKE_BUILD_TYPE} -Git commit: ${GIT_SHORTSHA} -Platform: ${CMAKE_SYSTEM_NAME}") - -install(FILES "${CMAKE_BINARY_DIR}/version.txt" DESTINATION .) - -include(CPack) \ No newline at end of file +endif() \ No newline at end of file