vodorod/umbrix
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases 1 Wiki Activity

Merge branch 'main' into ios

Browse Source
This commit is contained in:
GFWFighter
2023-10-24 18:38:48 +03:30
committed by GitHub
parent b83fcce310 bb5f3dfb73
commit d5b8045cfc
44 changed files with 747 additions and 1717 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@@ -2,6 +2,7 @@ include dependencies.properties
BINDIR=./libcore/bin
ANDROID_OUT=./android/app/libs
IOS_OUT=./libcore/bin
DESKTOP_OUT=./libcore/bin
GEO_ASSETS_DIR=./assets/core
@@ -79,7 +80,8 @@ macos-libs:
ios-libs: #not tested
mkdir -p $(DESKTOP_OUT)/ &&\
curl -L $(CORE_URL)/$(CORE_NAME)-ios-universal.xcframework.gz | gunzip > $(DESKTOP_OUT)/libcore.xcframework
curl -L $(CORE_URL)/$(CORE_NAME)-ios.xcframework.tar.gz | tar xz -C "$(IOS_OUT)" && \
mv $(IOS_OUT)/$(CORE_NAME)-ios.xcframework $(IOS_OUT)/libcore.xcframework
get-geo-assets:
curl -L https://github.com/SagerNet/sing-geoip/releases/latest/download/geoip.db -o $(GEO_ASSETS_DIR)/geoip.db
@@ -100,9 +102,8 @@ build-linux-libs:
build-macos-libs:
make -C libcore -f Makefile macos-universal && mv $(BINDIR)/$(CORE_NAME)-macos-universal.dylib $(DESKTOP_OUT)/libcore.dylib
build-ios-libs: #not tested
make -C libcore -f Makefile ios # && mv $(BINDIR)/$(CORE_PRODUCT_NAME).xcframework $(DESKTOP_OUT)/libcore.xcframework
build-ios-libs:
make -C libcore -f Makefile ios && mv $(BINDIR)/$(CORE_NAME)-ios.xcframework $(IOS_OUT)/libcore.xcframework
release: # Create a new tag for release.
@echo "previous version was $$(git describe --tags $$(git rev-list --tags --max-count=1))"
@@ -117,9 +118,8 @@ release: # Create a new tag for release.
echo "version: $${VERSION_STR}+$${BUILD_NUMBER}" && \
sed -i "s/version: .*/version: $${VERSION_STR}\+$${BUILD_NUMBER}/g" pubspec.yaml && \
git tag $${TAG} > /dev/null && \
gitchangelog > changelog.md || { git tag -d $${TAG}; echo "Please run pip install git gitchangelog pystache mustache markdown"; exit 2; } && \
git tag -d $${TAG} > /dev/null && \
git add pubspec.yaml changelog.md && \
git add pubspec.yaml CHANGELOG.md && \
make sync_translate && \
git add assets/translations/* && \
git commit -m "release: version $${TAG}" && \