From 2f7eb6f06366ed80b5ef69b844af32d645c8705e Mon Sep 17 00:00:00 2001 From: SpaiR Date: Sun, 30 Aug 2020 23:11:25 +0300 Subject: [PATCH] [Build] Optimize build scripts --- ...natives-linux64-local.sh => build-natives-local.sh} | 2 +- buildSrc/scripts/build-natives-win64.sh | 7 ------- buildSrc/scripts/build-natives-win_linux.sh | 7 ------- .../{build-natives-mac64.sh => build-natives.sh} | 2 +- buildSrc/scripts/copy-natives-mac64.sh | 6 ------ buildSrc/scripts/copy-natives-win_linux.sh | 9 --------- buildSrc/scripts/copy-natives.sh | 10 ++++++++++ 7 files changed, 12 insertions(+), 31 deletions(-) rename buildSrc/scripts/{build-natives-linux64-local.sh => build-natives-local.sh} (64%) delete mode 100644 buildSrc/scripts/build-natives-win64.sh delete mode 100644 buildSrc/scripts/build-natives-win_linux.sh rename buildSrc/scripts/{build-natives-mac64.sh => build-natives.sh} (69%) delete mode 100644 buildSrc/scripts/copy-natives-mac64.sh delete mode 100644 buildSrc/scripts/copy-natives-win_linux.sh create mode 100644 buildSrc/scripts/copy-natives.sh diff --git a/buildSrc/scripts/build-natives-linux64-local.sh b/buildSrc/scripts/build-natives-local.sh similarity index 64% rename from buildSrc/scripts/build-natives-linux64-local.sh rename to buildSrc/scripts/build-natives-local.sh index 27d2286..e3753bb 100644 --- a/buildSrc/scripts/build-natives-linux64-local.sh +++ b/buildSrc/scripts/build-natives-local.sh @@ -3,5 +3,5 @@ BASEDIR=$(dirname "$0") cd $BASEDIR/../../imgui-binding || exit -../gradlew clean generateLibs -Denvs=linux64 -Dlocal +../gradlew clean generateLibs -Denvs=$* -Dlocal rm -frd libsNative diff --git a/buildSrc/scripts/build-natives-win64.sh b/buildSrc/scripts/build-natives-win64.sh deleted file mode 100644 index 08dba67..0000000 --- a/buildSrc/scripts/build-natives-win64.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -BASEDIR=$(dirname "$0") -cd $BASEDIR/../../imgui-binding || exit - -rm -frd /tmp/imgui -../gradlew clean generateLibs -Denvs=win64 diff --git a/buildSrc/scripts/build-natives-win_linux.sh b/buildSrc/scripts/build-natives-win_linux.sh deleted file mode 100644 index dcc63fd..0000000 --- a/buildSrc/scripts/build-natives-win_linux.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -BASEDIR=$(dirname "$0") -cd $BASEDIR/../../imgui-binding || exit - -rm -frd /tmp/imgui -../gradlew clean generateLibs -Denvs=win32,win64,linux32,linux64 diff --git a/buildSrc/scripts/build-natives-mac64.sh b/buildSrc/scripts/build-natives.sh similarity index 69% rename from buildSrc/scripts/build-natives-mac64.sh rename to buildSrc/scripts/build-natives.sh index e6f7888..c6f6d51 100644 --- a/buildSrc/scripts/build-natives-mac64.sh +++ b/buildSrc/scripts/build-natives.sh @@ -4,4 +4,4 @@ BASEDIR=$(dirname "$0") cd $BASEDIR/../../imgui-binding || exit rm -frd /tmp/imgui -../gradlew clean generateLibs -Denvs=mac64 +../gradlew clean generateLibs -Denvs=$* diff --git a/buildSrc/scripts/copy-natives-mac64.sh b/buildSrc/scripts/copy-natives-mac64.sh deleted file mode 100644 index 63d6cbb..0000000 --- a/buildSrc/scripts/copy-natives-mac64.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -BASEDIR=$(dirname "$0") -cd $BASEDIR/../.. || exit - -cp /tmp/imgui/libsNative/macosx64/libimgui-java64.dylib ./bin diff --git a/buildSrc/scripts/copy-natives-win_linux.sh b/buildSrc/scripts/copy-natives-win_linux.sh deleted file mode 100644 index 58807a8..0000000 --- a/buildSrc/scripts/copy-natives-win_linux.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -BASEDIR=$(dirname "$0") -cd $BASEDIR/../.. || exit - -cp /tmp/imgui/libsNative/windows32/imgui-java.dll ./bin -cp /tmp/imgui/libsNative/windows64/imgui-java64.dll ./bin -cp /tmp/imgui/libsNative/linux32/libimgui-java.so ./bin -cp /tmp/imgui/libsNative/linux64/libimgui-java64.so ./bin diff --git a/buildSrc/scripts/copy-natives.sh b/buildSrc/scripts/copy-natives.sh new file mode 100644 index 0000000..37aa427 --- /dev/null +++ b/buildSrc/scripts/copy-natives.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +BASEDIR=$(dirname "$0") +cd $BASEDIR/../.. || exit + +[ -e "/tmp/imgui/libsNative/windows32/imgui-java.dll" ] && cp /tmp/imgui/libsNative/windows32/imgui-java.dll ./bin +[ -e "/tmp/imgui/libsNative/windows64/imgui-java64.dll" ] && cp /tmp/imgui/libsNative/windows64/imgui-java64.dll ./bin +[ -e "/tmp/imgui/libsNative/linux32/libimgui-java.so" ] && cp /tmp/imgui/libsNative/linux32/libimgui-java.so ./bin +[ -e "/tmp/imgui/libsNative/linux64/libimgui-java64.so" ] && cp /tmp/imgui/libsNative/linux64/libimgui-java64.so ./bin +[ -e "/tmp/imgui/libsNative/macosx64/libimgui-java64.dylib" ] && cp /tmp/imgui/libsNative/macosx64/libimgui-java64.dylib ./bin