From 5b4a11feecd323690549d40ce381f703fac73ffa Mon Sep 17 00:00:00 2001 From: problematicconsumer Date: Fri, 21 Jul 2023 18:55:29 +0330 Subject: [PATCH] Update build setup --- Makefile | 33 ++++++++++----------------------- core | 2 +- pubspec.yaml | 2 +- windows/CMakeLists.txt | 2 +- 4 files changed, 13 insertions(+), 26 deletions(-) diff --git a/Makefile b/Makefile index 3b4a7dac..65bae8d4 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,5 @@ ANDROID_OUT=./android/app/src/main/jniLibs +DESKTOP_OUT=./core/bin NDK_BIN=$(ANDROID_HOME)/ndk/25.2.9519653/toolchains/llvm/prebuilt/linux-x86_64/bin GOBUILD=CGO_ENABLED=1 go build -trimpath -tags with_gvisor,with_lwip -ldflags="-w -s" -buildmode=c-shared @@ -32,31 +33,17 @@ linux-release: fi && \ flutter_distributor package --platform linux --targets appimage -macos-release: - dart pub global activate flutter_distributor && \ - npm install -g appdmg && \ - flutter_distributor package --platform macos --targets dmg - -ios-release: - flutter_distributor package --platform ios --targets ipa --build-export-options-plist ios/exportOptions.plist - android-libs: - mkdir -p $(ANDROID_OUT)/x86_64 $(ANDROID_OUT)/arm64-v8a/ armeabi-v7a/ &&\ - curl -L https://github.com/hiddify/hiddify-libclash/releases/latest/download/hiddify_clashlib-android-amd64-cgo.so.gz | gunzip > $(ANDROID_OUT)/x86_64/libclash.so &&\ - curl -L https://github.com/hiddify/hiddify-libclash/releases/latest/download/hiddify_clashlib-android-arm64-cgo.so.gz | gunzip >$(ANDROID_OUT)/arm64-v8a/libclash.so &&\ - curl -L https://github.com/hiddify/hiddify-libclash/releases/latest/download/hiddify_clashlib-android-arm7-cgo.so.gz | gunzip >$(ANDROID_OUT)/armeabi-v7a/libclash.so + mkdir -p $(ANDROID_OUT)/x86_64 $(ANDROID_OUT)/arm64-v8a/ $(ANDROID_OUT)/armeabi-v7a/ &&\ + curl -L https://github.com/hiddify/hiddify-libclash/releases/latest/download/hiddify_clashlib-android-amd64-cgo.so.gz | gunzip > $(ANDROID_OUT)/x86_64/libclash.so &&\ + curl -L https://github.com/hiddify/hiddify-libclash/releases/latest/download/hiddify_clashlib-android-arm64-cgo.so.gz | gunzip > $(ANDROID_OUT)/arm64-v8a/libclash.so &&\ + curl -L https://github.com/hiddify/hiddify-libclash/releases/latest/download/hiddify_clashlib-android-arm7-cgo.so.gz | gunzip > $(ANDROID_OUT)/armeabi-v7a/libclash.so windows-libs: - mkdir -p ./core/dist/&&\ - curl -L https://github.com/hiddify/hiddify-libclash/releases/latest/download/hiddify_clashlib-windows-amd64-cgo.dll.gz | gunzip >./core/dist/hiddify_libclash_x64.dll &&\ - curl -L https://github.com/hiddify/hiddify-libclash/releases/latest/download/hiddify_clashlib-windows-386-cgo.dll.gz | gunzip >./core/dist/hiddify_libclash_x86.dll + mkdir -p $(DESKTOP_OUT)/ &&\ + curl -L https://github.com/hiddify/hiddify-libclash/releases/latest/download/hiddify_clashlib-windows-amd64-cgo.dll.gz | gunzip > $(DESKTOP_OUT)/libclash.dll linux-libs: - mkdir -p ./core/dist/&&\ - curl -L https://github.com/hiddify/hiddify-libclash/releases/latest/download/hiddify_clashlib-linux-amd64-cgo.so.gz | gunzip > ./core/dist/hiddify_libclash_x64.so &&\ - curl -L https://github.com/hiddify/hiddify-libclash/releases/latest/download/hiddify_clashlib-linux-386-cgo.so.gz | gunzip > ./core/dist/hiddify_libclash_x86.so - -macos-libs: - mkdir -p ./macos/Frameworks &&\ - curl -L https://github.com/hiddify/hiddify-libclash/releases/latest/download/hiddify_clashlib-darwin-amd64-cgo.dylib.gz | gunzip > ./macos/Frameworks/hiddify_libclash_x64.dylib &&\ - curl -L https://github.com/hiddify/hiddify-libclash/releases/latest/download/hiddify_clashlib-darwin-arm64-cgo.dylib.gz | gunzip > ./macos/Frameworks/hiddify_libclash_arm64.dylib + mkdir -p $(DESKTOP_OUT)/ &&\ + curl -L https://github.com/hiddify/hiddify-libclash/releases/latest/download/hiddify_clashlib-linux-amd64-cgo.so.gz | gunzip > $(DESKTOP_OUT)/libclash.so &&\ + curl -L https://github.com/hiddify/hiddify-libclash/releases/latest/download/hiddify_clashlib-linux-386-cgo.so.gz | gunzip > $(DESKTOP_OUT)/libclash.so diff --git a/core b/core index f42d1cee..f799ffdc 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit f42d1ceec0c2f877c1fe76bf641aaaf2ec2b29fe +Subproject commit f799ffdc9203391642436755be9cc58b0959bb69 diff --git a/pubspec.yaml b/pubspec.yaml index df7d21ff..c5db5cf3 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -135,4 +135,4 @@ ffigen: output: 'lib/gen/clash_generated_bindings.dart' headers: entry-points: - - 'core/dist/libclash.h' \ No newline at end of file + - 'core/bin/libclash.h' \ No newline at end of file diff --git a/windows/CMakeLists.txt b/windows/CMakeLists.txt index f3d30a28..2a02c5dd 100644 --- a/windows/CMakeLists.txt +++ b/windows/CMakeLists.txt @@ -81,7 +81,7 @@ install(FILES "${FLUTTER_ICU_DATA_FILE}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR} install(FILES "${FLUTTER_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" COMPONENT Runtime) -install(FILES "../core/dist/libclash.dll" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" +install(FILES "../core/bin/libclash.dll" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" COMPONENT Runtime) if(PLUGIN_BUNDLED_LIBRARIES)