builds godot
| -rw-r--r-- | .github/actions/build-godot/action.yml | 9 | ||||
| -rw-r--r-- | .github/actions/build-upload-image/action.yml | 8 | ||||
| -rw-r--r-- | .github/actions/get-version/action.yml | 9 | ||||
| -rw-r--r-- | .github/actions/release/action.yml | 12 | ||||
| -rw-r--r-- | .github/workflows/manual-build-2d.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/manual-build-normal.yml | 7 | ||||
| -rw-r--r-- | .github/workflows/reusable-build.yml | 128 | ||||
| -rwxr-xr-x | README.md | 8 | ||||
| -rw-r--r-- | patches/no-arg-handling.patch | 175 |
9 files changed, 218 insertions, 140 deletions
diff --git a/.github/actions/build-godot/action.yml b/.github/actions/build-godot/action.yml index d3c5302..e30436e 100644 --- a/.github/actions/build-godot/action.yml +++ b/.github/actions/build-godot/action.yml @@ -16,7 +16,7 @@ runs: using: "composite" steps: - name: Setup - uses: bend-n/godot-builds/.github/actions/setup@main + uses: bend-n/godot-builds/.github/actions/[email protected] with: ref: ${{ env.ref }} @@ -35,7 +35,7 @@ runs: shell: bash - name: Setup scons - run: pip install scons + run: pip install --force-reinstall -v "scons==4.4.0" shell: bash - name: Download more ram @@ -51,8 +51,9 @@ runs: scons_flags=${{ env.flags }} cores=$(nproc) || cores=$(sysctl -n hw.ncpu) [[ -n "${{ inputs.flags }}" ]] && scons_flags="${{ inputs.flags }}" - [[ ${{ inputs.target }} == "editor" ]] && scons_flags="${scons_flags//disable_3d=yes/}" # remove disable_3d=yes if editor - scons -j$((cores+2)) p=${{ inputs.platform }} target=${{ inputs.target }} use_lto=yes udev=yes $scons_flags + [[ ${{ env.tools }} == "yes" ]] && scons_flags="${scons_flags//disable_3d=yes/}" # remove disable_3d=yes if editor + echo "Running `scons -j$((cores+2)) p=${{ inputs.platform }} target=${{ inputs.target }} use_lto=yes udev=yes tools=${{ env.tools }} $scons_flags`" + scons -j$((cores+2)) p=${{ inputs.platform }} target=${{ inputs.target }} use_lto=yes udev=yes "tools=${{ env.tools }}" $scons_flags strip bin/* || true ls bin echo ::endgroup:: diff --git a/.github/actions/build-upload-image/action.yml b/.github/actions/build-upload-image/action.yml index 4fbf2c5..172a05e 100644 --- a/.github/actions/build-upload-image/action.yml +++ b/.github/actions/build-upload-image/action.yml @@ -16,19 +16,19 @@ runs: - uses: actions/checkout@v3 - name: Get version - uses: bend-n/godot-builds/.github/actions/get-version@main + uses: bend-n/godot-builds/.github/actions/[email protected] - name: Get templates uses: actions/download-artifact@v3 with: name: templates - - name: Get editor + - name: Get headless editor uses: actions/download-artifact@v3 with: - name: linuxbsd-editor-release + name: server-editor-release - - run: mv godot.linuxbsd.editor.x86_64 godot && chmod -v +x godot + - run: mv godot_server.x11.opt.tools.64 godot && chmod -v +x godot shell: bash - name: Login to GitHub Container Registry diff --git a/.github/actions/get-version/action.yml b/.github/actions/get-version/action.yml index ba8682e..fe72950 100644 --- a/.github/actions/get-version/action.yml +++ b/.github/actions/get-version/action.yml @@ -5,14 +5,19 @@ runs: using: "composite" steps: - name: Setup - uses: bend-n/godot-builds/.github/actions/setup@main + uses: bend-n/godot-builds/.github/actions/[email protected] with: ref: ${{ env.ref }} - name: Get version run: | cd godot - echo 'print(f"{major}.{minor}")' >> version.py + # i could not get heredocs to work here + echo 'if patch:' >> version.py + echo ' print(f"{major}.{minor}.{patch}")' >> version.py + echo 'else:' >> version.py + echo ' print(f"{major}.{minor}")' >> version.py + echo "version-name=$(python version.py)" >> $GITHUB_ENV version=$(python version.py) diff --git a/.github/actions/release/action.yml b/.github/actions/release/action.yml index ad49765..1c42329 100644 --- a/.github/actions/release/action.yml +++ b/.github/actions/release/action.yml @@ -14,7 +14,7 @@ runs: using: "composite" steps: - name: Get version - uses: bend-n/godot-builds/.github/actions/get-version@main + uses: bend-n/godot-builds/.github/actions/[email protected] - name: Get templates uses: actions/download-artifact@v3 @@ -26,9 +26,15 @@ runs: with: name: linuxbsd-editor-release + - name: Get headless + uses: actions/download-artifact@v3 + with: + name: server-editor-release + - name: Compress run: | - mv godot.linuxbsd.editor.x86_64 ${{ env.fstart }}_linux.x86_64 + mv godot.x11.opt.tools.64 ${{ env.fstart }}_linux.x86_64 + mv godot_server.x11.opt.tools.64 ${{ env.fstart }}_linux_headless.64 mv templates.tpz ${{ env.fstart }}_export_templates.tpz shell: bash env: @@ -42,7 +48,9 @@ runs: files: | ${{ env.fstart }}_export_templates.tpz ${{ env.fstart }}_linux.x86_64 + ${{ env.fstart }}_linux_headless.64 token: ${{ inputs.github-token }} prerelease: ${{ env.prerelease }} + fail_on_unmatched_files: true env: fstart: ${{ inputs.name }}_v${{ env.version-name }} diff --git a/.github/workflows/manual-build-2d.yml b/.github/workflows/manual-build-2d.yml index a9d63cc..77bbc9a 100644 --- a/.github/workflows/manual-build-2d.yml +++ b/.github/workflows/manual-build-2d.yml @@ -11,7 +11,7 @@ on: jobs: two-dimensions: name: Build ${{ inputs.ref }} - uses: bend-n/godot-builds/.github/workflows/reusable-build.yml@main + uses: bend-n/godot-builds/.github/workflows/[email protected] with: ref: ${{ inputs.ref }} name: godot-2d diff --git a/.github/workflows/manual-build-normal.yml b/.github/workflows/manual-build-normal.yml index f1516f5..f58e373 100644 --- a/.github/workflows/manual-build-normal.yml +++ b/.github/workflows/manual-build-normal.yml @@ -7,13 +7,14 @@ on: type: string description: which ref to build required: true - schedule: - - cron: '30 20 * * *' + # turn on when the godot5 is in dev + # schedule: + # - cron: '30 20 * * *' jobs: all-dimensions: name: Build ${{ inputs.ref }} - uses: bend-n/godot-builds/.github/workflows/reusable-build.yml@main + uses: bend-n/godot-builds/.github/workflows/[email protected] with: ref: ${{ inputs.ref }} name: godot diff --git a/.github/workflows/reusable-build.yml b/.github/workflows/reusable-build.yml index 96796e8..0b6f9f7 100644 --- a/.github/workflows/reusable-build.yml +++ b/.github/workflows/reusable-build.yml @@ -29,6 +29,7 @@ env: ref: ${{ inputs.ref }} flags: ${{ inputs.flags }} modules: ${{ inputs.modules-path }} + tools: no jobs: linux: @@ -36,38 +37,38 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - target: [template_release, template_debug] + target: [release, release_debug] bits: [64] steps: - name: Compilation - uses: bend-n/godot-builds/.github/actions/build-godot@main + uses: bend-n/godot-builds/.github/actions/[email protected] with: target: ${{ matrix.target }} flags: bits=${{ matrix.bits }} ${{ env.flags }} platform: linuxbsd - name: Upload artifact - uses: bend-n/godot-builds/.github/actions/upload-artifact@main + uses: bend-n/godot-builds/.github/actions/[email protected] with: - path: godot/bin/*.x86_64 + path: godot/bin/*.64 windows: strategy: matrix: - target: [template_release, template_debug] + target: [release, release_debug] bits: [64] name: Win temps runs-on: windows-latest steps: - name: Compilation - uses: bend-n/godot-builds/.github/actions/build-godot@main + uses: bend-n/godot-builds/.github/actions/[email protected] with: target: ${{ matrix.target }} flags: bits=${{ matrix.bits }} ${{ env.flags }} platform: windows - name: Upload artifact - uses: bend-n/godot-builds/.github/actions/upload-artifact@main + uses: bend-n/godot-builds/.github/actions/[email protected] with: path: godot/bin/*.exe @@ -76,7 +77,7 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - target: [template_release, template_debug] + target: [release, release_debug] steps: - name: Set up Java 11 uses: actions/setup-java@v3 @@ -85,14 +86,14 @@ jobs: distribution: temurin - name: Compilation (armv7) - uses: bend-n/godot-builds/.github/actions/build-godot@main + uses: bend-n/godot-builds/.github/actions/[email protected] with: target: ${{ matrix.target }} flags: android_arch=armv7 ${{ env.flags }} platform: android - name: Compilation (arm64v8) - uses: bend-n/godot-builds/.github/actions/build-godot@main + uses: bend-n/godot-builds/.github/actions/[email protected] with: target: ${{ matrix.target }} flags: android_arch=arm64v8 ${{ env.flags }} @@ -104,14 +105,14 @@ jobs: (cd platform/android/java && ./gradlew generateGodotTemplates) - name: Upload artifact - uses: bend-n/godot-builds/.github/actions/upload-artifact@main + uses: bend-n/godot-builds/.github/actions/[email protected] with: path: godot/bin/*.apk macos: strategy: matrix: - target: [template_release, template_debug] + target: [release, release_debug] name: macOS temps runs-on: macos-latest @@ -136,14 +137,14 @@ jobs: echo 'Vulkan SDK installed successfully! You can now build Godot by running "scons".' - name: Compilation(x86_64) - uses: bend-n/godot-builds/.github/actions/build-godot@main + uses: bend-n/godot-builds/.github/actions/[email protected] with: flags: arch=x86_64 ${{ env.flags }} target: ${{ matrix.target }} platform: macos - name: Compilation(arm64) - uses: bend-n/godot-builds/.github/actions/build-godot@main + uses: bend-n/godot-builds/.github/actions/[email protected] with: flags: arch=arm64 ${{ env.flags }} target: ${{ matrix.target }} @@ -153,27 +154,27 @@ jobs: run: | [[ "${{ matrix.target }}" == *"debug"* ]] && target='.debug' cd godot - intel=bin/godot.macos.*.x86_64 - arm=bin/godot.macos.*.arm64 - lipo -create $intel $arm -output "bin/godot.macos.opt$target.universal" - strip "bin/godot.macos.opt$target.universal" + intel=bin/godot.osx.*.x86_64 + arm=bin/godot.osx.*.arm64 + lipo -create $intel $arm -output "bin/godot.osx.opt$target.universal" + strip "bin/godot.osx.opt$target.universal" - name: Upload artifact - uses: bend-n/godot-builds/.github/actions/upload-artifact@main + uses: bend-n/godot-builds/.github/actions/[email protected] with: path: godot/bin/*.universal - web: + javascript: strategy: matrix: - target: [template_release, template_debug] - flags: [dlink_enabled=yes, ""] + target: [release, release_debug] + flags: [gdnative_enabled=yes, threads_enabled=yes, ""] name: JS temps runs-on: ubuntu-20.04 steps: - name: Set up Emscripten 3.1.18 - uses: mymindstorm/setup-emsdk@v11 + uses: mymindstorm/setup-emsdk@v12 with: version: 3.1.18 @@ -181,19 +182,19 @@ jobs: run: emcc -v - name: Compilation - uses: bend-n/godot-builds/.github/actions/build-godot@main + uses: bend-n/godot-builds/.github/actions/[email protected] with: target: ${{ matrix.target }} flags: ${{ env.flags }} ${{ matrix.flags }} - platform: web + platform: javascript - name: Upload artifact - uses: bend-n/godot-builds/.github/actions/upload-artifact@main + uses: bend-n/godot-builds/.github/actions/[email protected] with: path: godot/bin/*.zip templates: - needs: [web, macos, windows, linux, android] + needs: [javascript, macos, windows, linux, android] name: Bundle all templates runs-on: ubuntu-latest env: @@ -214,64 +215,61 @@ jobs: - name: Prepare files run: | - rel="template_release" - bug="template_debug" - mkdir -vp "$tmps" + mkdir -vp ${tmps} echo "Preparing linux" - linux="godot.linuxbsd" - mv "linux/$linux.$bug.x86_64" "$tmps/linux_debug.x86_64" - mv "linux/$linux.$rel.x86_64" "$tmps/linux_release.x86_64" - + mv linux/godot.x11.opt.64 ${tmps}/linux_x11_64_release + mv linux/godot.x11.opt.debug.64 ${tmps}/linux_x11_64_debug echo "Preparing windows" - windows="godot.windows" - mv "windows/$windows.$bug.x86_64.console.exe" "$tmps/windows_debug_x86_64_console.exe" - mv "windows/$windows.$bug.x86_64.exe" "$tmps/windows_debug_x86_64.exe" - mv "windows/$windows.$rel.x86_64.console.exe" "$tmps/windows_release_x86_64_console.exe" - mv "windows/$windows.$rel.x86_64.exe" "$tmps/windows_release_x86_64.exe" - + mv windows/godot.windows.opt.64.exe ${tmps}/windows_64_release.exe + mv windows/godot.windows.opt.debug.64.exe ${tmps}/windows_64_debug.exe echo "Preparing android" - mv "android/android_debug.apk" "$tmps/android_debug.apk" - mv "android/android_release.apk" "$tmps/android_release.apk" - + mv android/android_debug.apk ${tmps}/android_debug.apk + mv android/android_release.apk ${tmps}/android_release.apk echo "Preparing macos" - mac="godot.macos.opt" - cp -r "godot-repo/misc/dist/macos_template.app" "." - mkdir -p "macos_template.app/Contents/MacOS" - cp "macos/$mac.universal" "macos_template.app/Contents/MacOS/godot_macos_release.universal" - cp "macos/$mac.debug.universal" "macos_template.app/Contents/MacOS/godot_macos_debug.universal" - chmod +x macos_template.app/Contents/MacOS/godot_macos_*.universal - zip -q -9 -r "$tmps/macos.zip" "macos_template.app" - + cp -r godot-repo/misc/dist/osx_template.app . + mkdir -p osx_template.app/Contents/MacOS + cp macos/godot.osx.opt.universal osx_template.app/Contents/MacOS/godot_osx_release.64 + cp macos/godot.osx.opt.debug.universal osx_template.app/Contents/MacOS/godot_osx_debug.64 + chmod +x osx_template.app/Contents/MacOS/godot_osx_*.64 + zip -q -9 -r ${tmps}/osx.zip osx_template.app echo "Preparing web" - web="godot.web" - mv "web/$web.$rel.wasm32.zip" "$tmps/web_release.zip" - mv "web/$web.$bug.wasm32.zip" "$tmps/web_debug.zip" - mv "web/$web.$rel.wasm32.dlink.zip" "$tmps/web_dlink_release.zip" - mv "web/$web.$bug.wasm32.dlink.zip" "$tmps/web_dlink_debug.zip" + mv javascript/godot.javascript.opt.zip ${tmps}/webassembly_release.zip + mv javascript/godot.javascript.opt.debug.zip ${tmps}/webassembly_debug.zip + mv javascript/godot.javascript.opt.threads.zip ${tmps}/webassembly_threads_release.zip + mv javascript/godot.javascript.opt.debug.threads.zip ${tmps}/webassembly_threads_debug.zip + mv javascript/godot.javascript.opt.gdnative.zip ${tmps}/webassembly_gdnative_release.zip + mv javascript/godot.javascript.opt.debug.gdnative.zip ${tmps}/webassembly_gdnative_debug.zip - name: Prepare bundle run: cd "${tmps}" && zip -qr9 templates.tpz ./* - name: Upload artifact - uses: bend-n/godot-builds/.github/actions/upload-artifact@main + uses: bend-n/godot-builds/.github/actions/[email protected] with: path: ${{ env.tmps }}/templates.tpz editor: + strategy: + matrix: + platform: [server, linuxbsd] + name: Linux editor runs-on: ubuntu-20.04 steps: - name: Compilation - uses: bend-n/godot-builds/.github/actions/build-godot@main + uses: bend-n/godot-builds/.github/actions/[email protected] with: - platform: linuxbsd - target: editor + platform: ${{ matrix.platform }} + target: release_debug + env: + tools: yes + flags: "" # override flags - name: Upload artifact - uses: bend-n/godot-builds/.github/actions/upload-artifact@main + uses: bend-n/godot-builds/.github/actions/[email protected] with: - name: linuxbsd-editor-release - path: godot/bin/*.x86_64 + name: ${{ matrix.platform }}-editor-release + path: godot/bin/*.64 image: permissions: write-all @@ -279,7 +277,7 @@ jobs: runs-on: ubuntu-latest needs: [editor, templates] steps: - - uses: bend-n/godot-builds/.github/actions/build-upload-image@main + - uses: bend-n/godot-builds/.github/actions/[email protected] with: github-token: ${{ secrets.GITHUB_TOKEN }} name: ${{ inputs.name }} @@ -289,7 +287,7 @@ jobs: runs-on: ubuntu-latest needs: [editor, templates] steps: - - uses: bend-n/godot-builds/.github/actions/release@main + - uses: bend-n/godot-builds/.github/actions/[email protected] with: github-token: ${{ secrets.GITHUB_TOKEN }} name: ${{ inputs.name }} @@ -1,6 +1,6 @@ # godot builds -[](https://godotengine.org) +[](https://godotengine.org) [](https://aur.archlinux.org/packages/godot2d "Aur package") <a href='https://ko-fi.com/bendn' title='Buy me a coffee' target='_blank'><img height='28' src='https://ko-fi.com/img/githubbutton_sm.svg' alt='Buy me a coffee'> </a> @@ -21,7 +21,7 @@ For a full example, see this [template](https://github.com/bend-n/godot-template build-windows: runs-on: ubuntu-latest container: - image: ghcr.io/bend-n/godot-2d:4.0.rc + image: ghcr.io/bend-n/godot-2d:3.5 name: Build windows steps: - name: Build (Windows) @@ -42,7 +42,7 @@ build-windows: build-windows: runs-on: ubuntu-latest container: - image: ghcr.io/bend-n/godot-2d:4.0.rc + image: ghcr.io/bend-n/godot-2d:3.5 name: Build windows steps: - name: Checkout @@ -50,7 +50,7 @@ build-windows: - name: Setup godot run: | - RELEASE=stable; GODOT_VERSION=4.0.rc; + RELEASE=stable; GODOT_VERSION=3.5.stable; mkdir -v -p ~/.local/share/godot/templates mv /root/.local/share/godot/templates/${GODOT_VERSION}.${RELEASE} ~/.local/share/godot/templates/${GODOT_VERSION}.${RELEASE} diff --git a/patches/no-arg-handling.patch b/patches/no-arg-handling.patch index 692fe34..1323545 100644 --- a/patches/no-arg-handling.patch +++ b/patches/no-arg-handling.patch @@ -1,20 +1,18 @@ diff --git a/main/main.cpp b/main/main.cpp -index 2326e519bf..dddcae0be2 100644 +index 37ef4332..ecc30d7e 100644 --- a/main/main.cpp +++ b/main/main.cpp -@@ -156,10 +156,10 @@ static bool editor = false; +@@ -128,7 +128,9 @@ static int audio_driver_idx = -1; + static bool editor = false; static bool project_manager = false; - static bool cmdline_tool = false; static String locale; --static bool show_help = false; ++#ifdef TOOLS_ENABLED + static bool show_help = false; ++#endif static bool auto_quit = false; - static OS::ProcessID editor_pid = 0; - #ifdef TOOLS_ENABLED -+static bool show_help = false; - static bool found_project = false; - static bool auto_build_solutions = false; - static String debug_server_uri; -@@ -302,6 +302,7 @@ void finalize_theme_db() { + static OS::ProcessID allow_focus_steal_pid = 0; + static bool delta_sync_after_draw = false; +@@ -239,6 +241,7 @@ void finalize_navigation_server() { #define MAIN_PRINT(m_txt) #endif @@ -22,30 +20,40 @@ index 2326e519bf..dddcae0be2 100644 void Main::print_help(const char *p_binary) { print_line(String(VERSION_NAME) + " v" + get_full_version_string() + " - " + String(VERSION_WEBSITE)); OS::get_singleton()->print("Free and open source software under the terms of the MIT license.\n"); -@@ -435,6 +436,7 @@ void Main::print_help(const char *p_binary) { - #endif +@@ -256,11 +259,9 @@ void Main::print_help(const char *p_binary) { OS::get_singleton()->print("\n"); - } -+#endif - #ifdef TESTS_ENABLED - // The order is the same as in `Main::setup()`, only core and some editor types -@@ -679,7 +681,9 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph - List<String> args; - List<String> main_args; - List<String> user_args; -+#ifdef TOOLS_ENABLED - bool adding_user_args = false; + OS::get_singleton()->print("Run options:\n"); +-#ifdef TOOLS_ENABLED + OS::get_singleton()->print(" -e, --editor Start the editor instead of running the scene.\n"); + OS::get_singleton()->print(" -p, --project-manager Start the project manager, even if a project is auto-detected.\n"); + OS::get_singleton()->print(" --debug-server <address> Start the editor debug server (<IP>:<port>, e.g. 127.0.0.1:6007)\n"); +-#endif + OS::get_singleton()->print(" -q, --quit Quit after the first iteration.\n"); + OS::get_singleton()->print(" -l, --language <locale> Use a specific locale (<locale> being a two-letter code).\n"); + OS::get_singleton()->print(" --path <directory> Path to a project (<directory> must contain a 'project.godot' file).\n"); +@@ -355,6 +356,7 @@ void Main::print_help(const char *p_binary) { + OS::get_singleton()->print(").\n"); + #endif + } +#endif - List<String> platform_args = OS::get_singleton()->get_cmdline_platform_args(); - // Add command line arguments. -@@ -774,6 +778,19 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph - } + /* Engine initialization + * +@@ -493,13 +495,22 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph #endif -+#ifndef TOOLS_ENABLED -+ if (I->get() == "--main-pack") { + List<String>::Element *N = I->next(); +- ++#ifdef TOOLS_ENABLED + if (I->get() == "-h" || I->get() == "--help" || I->get() == "/?") { // display help +- + show_help = true; + exit_code = ERR_HELP; // Hack to force an early exit in `main()` with a success code. + goto error; +- ++#else ++ if (I->get() == "--main-pack") { // needed for JS bindings + if (I->next()) { + main_pack = I->next()->get(); + N = I->next()->next(); @@ -53,34 +61,70 @@ index 2326e519bf..dddcae0be2 100644 + OS::get_singleton()->print("Missing path to main pack file, aborting.\n"); + goto error; + }; -+ } else { -+ user_args.push_back(I->get()); -+ } -+#else - if (adding_user_args) { - user_args.push_back(I->get()); - } else if (I->get() == "-h" || I->get() == "--help" || I->get() == "/?") { // display help -@@ -1315,18 +1328,15 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph - } else { ++#endif ++#ifdef TOOLS_ENABLED + } else if (I->get() == "--version") { + print_line(get_full_version_string()); + exit_code = ERR_HELP; // Hack to force an early exit in `main()` with a success code. +@@ -737,7 +748,6 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph + OS::get_singleton()->print("Missing render thread mode argument, aborting.\n"); + goto error; + } +-#ifdef TOOLS_ENABLED + } else if (I->get() == "-e" || I->get() == "--editor") { // starts editor + + editor = true; +@@ -773,7 +783,6 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph + + editor = true; main_args.push_back(I->get()); - } +-#endif + } else if (I->get() == "--path") { // set path of project to start or edit + + if (I->next()) { +@@ -806,9 +815,7 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph + } else { + project_path = path; + } +-#ifdef TOOLS_ENABLED + editor = true; +-#endif + } else if (I->get() == "-b" || I->get() == "--breakpoints") { // add breakpoints + + if (I->next()) { +@@ -840,15 +847,6 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph + goto error; + } + +- } else if (I->get() == "--main-pack") { +- if (I->next()) { +- main_pack = I->next()->get(); +- N = I->next()->next(); +- } else { +- OS::get_singleton()->print("Missing path to main pack file, aborting.\n"); +- goto error; +- }; - + } else if (I->get() == "-d" || I->get() == "--debug") { + debug_mode = "local"; + OS::get_singleton()->_debug_stdout = true; +@@ -897,6 +895,7 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph + OS::get_singleton()->disable_crash_handler(); + } else if (I->get() == "--skip-breakpoints") { + skip_breakpoints = true; +#endif - I = N; - } -- - #ifdef TOOLS_ENABLED - if (editor && project_manager) { - OS::get_singleton()->print( - "Error: Command line arguments implied opening both editor and project manager, which is not possible. Aborting.\n"); + } else { + main_args.push_back(I->get()); + } +@@ -909,7 +908,6 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph + OS::get_singleton()->print("Error: Command line arguments implied opening both editor and project manager, which is not possible. Aborting.\n"); goto error; } -#endif -- + // Network file system needs to be configured before globals, since globals are based on the // 'project.godot' file which will only be available through the network if this is enabled - FileAccessNetwork::configure(); -@@ -1348,7 +1358,7 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph +@@ -932,7 +930,7 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph FileAccess::make_default<FileAccessNetwork>(FileAccess::ACCESS_RESOURCES); } @@ -89,7 +133,28 @@ index 2326e519bf..dddcae0be2 100644 if (globals->setup(project_path, main_pack, upwards, editor) == OK) { #ifdef TOOLS_ENABLED found_project = true; -@@ -1848,9 +1858,11 @@ error: +@@ -1001,12 +999,6 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph + if (editor) { + packed_data->set_disabled(true); + globals->set_disable_feature_overrides(true); +- } +- +-#endif +- +-#ifdef TOOLS_ENABLED +- if (editor) { + Engine::get_singleton()->set_editor_hint(true); + main_args.push_back("--editor"); + if (!init_windowed) { +@@ -1281,7 +1273,6 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph + return OK; + + error: +- + video_driver = ""; + audio_driver = ""; + tablet_driver = ""; +@@ -1290,9 +1281,11 @@ error: args.clear(); main_args.clear(); @@ -99,14 +164,14 @@ index 2326e519bf..dddcae0be2 100644 } +#endif - EngineDebugger::deinitialize(); - -@@ -1897,7 +1909,7 @@ error: + if (performance) { + memdelete(performance); +@@ -1338,7 +1331,7 @@ error: Error Main::setup2(Thread::ID p_main_tid_override) { // Print engine name and version - print_line(String(VERSION_NAME) + " v" + get_full_version_string() + " - " + String(VERSION_WEBSITE)); + print_line("v" + get_full_version_string()); - engine->startup_benchmark_begin_measure("servers"); - + #if !defined(NO_THREADS) + if (p_main_tid_override) { |