diff --git a/.github/workflows/launcher.yml b/.github/workflows/launcher.yml index 7d4d44cc..40f88344 100644 --- a/.github/workflows/launcher.yml +++ b/.github/workflows/launcher.yml @@ -54,6 +54,9 @@ jobs: [ -d build/src/files/ ] && mv build/src/files/* build/files/ [ -d build/src/build/ ] && mv build/src/build/* build/build/ rm -rf build/src/{bin,files,build} + + find build/ + exit 0 - name: Make package.json @@ -64,6 +67,8 @@ jobs: cd .. node ./repo-folder/build/make_package_json.js build/package.json repo-folder/dist_cfg/config.json Spring-SpringBoard/SpringBoard-Core $PACKAGE_VERSION + cat build/package.json + - name: Build run: | cd build diff --git a/dist_cfg/bin/mapcompile b/dist_cfg/bin/linux/mapcompile old mode 100755 new mode 100644 similarity index 100% rename from dist_cfg/bin/mapcompile rename to dist_cfg/bin/linux/mapcompile diff --git a/dist_cfg/bin/libIL.dll b/dist_cfg/bin/windows/libIL.dll similarity index 100% rename from dist_cfg/bin/libIL.dll rename to dist_cfg/bin/windows/libIL.dll diff --git a/dist_cfg/bin/libILU.dll b/dist_cfg/bin/windows/libILU.dll similarity index 100% rename from dist_cfg/bin/libILU.dll rename to dist_cfg/bin/windows/libILU.dll diff --git a/dist_cfg/bin/mapcompile.exe b/dist_cfg/bin/windows/mapcompile.exe similarity index 100% rename from dist_cfg/bin/mapcompile.exe rename to dist_cfg/bin/windows/mapcompile.exe diff --git a/dist_cfg/bin/springMapConvNG.exe b/dist_cfg/bin/windows/springMapConvNG.exe similarity index 100% rename from dist_cfg/bin/springMapConvNG.exe rename to dist_cfg/bin/windows/springMapConvNG.exe diff --git a/dist_cfg/exts/compiler.js b/dist_cfg/exts/compiler.js index 290d4f11..4dea79a3 100644 --- a/dist_cfg/exts/compiler.js +++ b/dist_cfg/exts/compiler.js @@ -16,9 +16,9 @@ class Compiler extends EventEmitter { let executableBin; if (process.platform === 'win32') { - executableBin = 'springMapConvNG.exe'; + executableBin = 'windows/springMapConvNG.exe'; } else if (process.platform === 'linux') { - executableBin = 'mapcompile'; + executableBin = 'linux/mapcompile'; } else { const errMsg = `Unsupported platform: ${process.platform}, cannot compile`; log.error(errMsg);