diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 837cac3..e03fb1b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -36,14 +36,14 @@ jobs: env: ACTIONS_ALLOW_UNSECURE_COMMANDS: true run: | - echo ::set-env name=GODOT_CPP_COMMIT_HASH::$(git ls-tree HEAD addons/godot_xterm/native/external/godot-cpp -l | cut -d\ -f3) + echo ::set-env name=GODOT_CPP_COMMIT_HASH::$(git ls-tree HEAD addons/godot_xterm/native/thirdparty/godot-cpp -l | cut -d\ -f3) - name: Cache godot-cpp bindings uses: actions/cache@v2 id: cache env: cache-name: cache-godot-cpp with: - path: addons/godot_xterm/native/external/godot-cpp + path: addons/godot_xterm/native/thirdparty/godot-cpp key: godot-cpp-${{ matrix.platform }}-${{ matrix.target }}-${{ matrix.bits }}-${{ env.GODOT_CPP_COMMIT_HASH }} - name: Cache emscripten if: ${{ matrix.platform == 'javascript' }} @@ -82,7 +82,7 @@ jobs: - name: Build godot-cpp bindings if: steps.cache.outputs.cache-hit != 'true' run: | - cd addons/godot_xterm/native/external/godot-cpp + cd addons/godot_xterm/native/thirdparty/godot-cpp scons platform=${{ matrix.platform }} target=${{ matrix.target }} bits=${{ matrix.bits }} generate_bindings=yes -j2 - name: Build libgodot-xterm diff --git a/.gitmodules b/.gitmodules index 757759c..d1f7d7f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "addons/godot_xterm/godot-cpp"] - path = addons/godot_xterm/native/external/godot-cpp + path = addons/godot_xterm/native/thirdparty/godot-cpp url = https://github.com/lihop/godot-cpp [submodule "addons/godot_xterm/libtsm"] - path = addons/godot_xterm/native/external/libtsm + path = addons/godot_xterm/native/thirdparty/libtsm url = https://github.com/lihop/libtsm diff --git a/addons/godot_xterm/native/SConstruct b/addons/godot_xterm/native/SConstruct index 6ef6a7d..a24e697 100644 --- a/addons/godot_xterm/native/SConstruct +++ b/addons/godot_xterm/native/SConstruct @@ -28,7 +28,7 @@ else: 'platform=' ) -VariantDir('./external/libtsm/build', './external/libtsm/src', duplicate=0) +VariantDir('./thirdparty/libtsm/build', './thirdparty/libtsm/src', duplicate=0) env = Environment(ENV = os.environ) is64 = sys.maxsize > 2**32 @@ -186,24 +186,24 @@ elif env['platform'] == 'windows': # Build libtsm as a static library. Execute([ - Delete('external/libtsm/build/src'), - Delete('external/libtsm/build/external'), - Copy('external/libtsm/build/src', 'external/libtsm/src'), - Copy('external/libtsm/build/external', 'external/libtsm/external'), + Delete('thirdparty/libtsm/build/src'), + Delete('thirdparty/libtsm/build/external'), + Copy('thirdparty/libtsm/build/src', 'thirdparty/libtsm/src'), + Copy('thirdparty/libtsm/build/external', 'thirdparty/libtsm/external'), ]) env.Append(CPPPATH=[ - 'external/libtsm/src/shared', - 'external/libtsm/external', + 'thirdparty/libtsm/src/shared', + 'thirdparty/libtsm/external', ]) sources = [] -sources.append('external/libtsm/build/src/shared/shl-htable.c') -sources.append(Glob('external/libtsm/build/src/tsm/*.c')) -sources.append(Glob('external/libtsm/build/external/wcwidth/*.c')) +sources.append('thirdparty/libtsm/build/src/shared/shl-htable.c') +sources.append(Glob('thirdparty/libtsm/build/src/tsm/*.c')) +sources.append(Glob('thirdparty/libtsm/build/external/wcwidth/*.c')) libtsm = env.StaticLibrary( - target='external/libtsm/build/bin/libtsm.{}.{}.{}{}'.format( + target='thirdparty/libtsm/build/bin/libtsm.{}.{}.{}{}'.format( env['platform'], env['target'], env['bits'], @@ -217,25 +217,25 @@ Default(libtsm) env.Append(CXXFLAGS=['-std=c++14']) env.Append(CPPPATH=[ 'src/', - 'external/libtsm/build/src/tsm', - 'external/godot-cpp/include/', - 'external/godot-cpp/include/core/', - 'external/godot-cpp/include/gen/', - 'external/godot-cpp/godot-headers/' + 'thirdparty/libtsm/build/src/tsm', + 'thirdparty/godot-cpp/include/', + 'thirdparty/godot-cpp/include/core/', + 'thirdparty/godot-cpp/include/gen/', + 'thirdparty/godot-cpp/godot-headers/' ]) env.Append(LIBPATH=[ - 'external/godot-cpp/bin/', - 'external/libtsm/build/bin/', + 'thirdparty/godot-cpp/bin/', + 'thirdparty/libtsm/build/bin/', ]) env.Append(LIBS=[ - env.File('external/godot-cpp/bin/libgodot-cpp.{}.{}.{}{}'.format( + env.File('thirdparty/godot-cpp/bin/libgodot-cpp.{}.{}.{}{}'.format( env['platform'], env['target'], 'wasm' if env['platform'] == 'javascript' else env['bits'], env['LIBSUFFIX'], )), - env.File('external/libtsm/build/bin/libtsm.{}.{}.{}{}'.format( + env.File('thirdparty/libtsm/build/bin/libtsm.{}.{}.{}{}'.format( env['platform'], env['target'], env['bits'], diff --git a/addons/godot_xterm/native/build.sh b/addons/godot_xterm/native/build.sh index 81377e2..c6e393b 100755 --- a/addons/godot_xterm/native/build.sh +++ b/addons/godot_xterm/native/build.sh @@ -15,12 +15,12 @@ fi # Update git submodules. -LIBTSM_DIR=${NATIVE_DIR}/external/libtsm +LIBTSM_DIR=${NATIVE_DIR}/thirdparty/libtsm if [ ! -d "$LIBTSM_DIR" ]; then cd ${NATIVE_DIR} git submodule update --init --recursive -- $LIBTSM_DIR fi -GODOT_CPP_DIR=${NATIVE_DIR}/external/godot-cpp +GODOT_CPP_DIR=${NATIVE_DIR}/thirdparty/godot-cpp if [ ! -d "${GODOT_CPP_DIR}" ]; then cd ${NATIVE_DIR} git submodule update --init --recursive -- $GODOT_CPP_DIR diff --git a/addons/godot_xterm/native/misc/docker/build.sh b/addons/godot_xterm/native/misc/docker/build.sh index b04748d..91c7795 100644 --- a/addons/godot_xterm/native/misc/docker/build.sh +++ b/addons/godot_xterm/native/misc/docker/build.sh @@ -1,7 +1,7 @@ #!/bin/bash source /emsdk/emsdk_env.sh export EM_CACHE=/godot/.emcache -cd /godot/external/godot-cpp +cd /godot/thirdparty/godot-cpp scons platform=javascript -j$(nproc) cd /godot scons platform=javascript -j$(nproc) diff --git a/addons/godot_xterm/native/external/.gdignore b/addons/godot_xterm/native/thirdparty/.gdignore similarity index 100% rename from addons/godot_xterm/native/external/.gdignore rename to addons/godot_xterm/native/thirdparty/.gdignore diff --git a/addons/godot_xterm/native/external/godot-cpp b/addons/godot_xterm/native/thirdparty/godot-cpp similarity index 100% rename from addons/godot_xterm/native/external/godot-cpp rename to addons/godot_xterm/native/thirdparty/godot-cpp diff --git a/addons/godot_xterm/native/external/libtsm b/addons/godot_xterm/native/thirdparty/libtsm similarity index 100% rename from addons/godot_xterm/native/external/libtsm rename to addons/godot_xterm/native/thirdparty/libtsm