diff --git a/client/scripts/apple_compile.sh b/client/scripts/apple_compile.sh index ab7c3004..235c89c6 100755 --- a/client/scripts/apple_compile.sh +++ b/client/scripts/apple_compile.sh @@ -33,9 +33,6 @@ helpFunction() { print N "This script compiles AmneziaVPN for MacOS/iOS" print N "" -#export QT_IOS_BIN="$HOME/Qt/5.15.2/ios/bin" -#export PATH=$QT_IOS_BIN:$PATH - while [[ $# -gt 0 ]]; do key="$1" @@ -132,16 +129,7 @@ printn Y "Cleaning the existing project... " rm -rf AmneziaVPN.xcodeproj/ || die "Failed to remove things" print G "done." -#print Y "Importing translation files..." -#git submodule update --remote --depth 1 i18n || die "Failed to fetch newest translation files" -#python scripts/importLanguages.py $([[ "$OS" = "macos" ]] && echo "-m" || echo "") || die "Failed to import languages" -# -#print Y "Generating glean samples..." -#python scripts/generate_glean.py || die "Failed to generate glean samples" - printn Y "Extract the project version... " -#SHORTVERSION=$(cat version.pri | grep VERSION | grep defined | cut -d= -f2 | tr -d \ ) -#FULLVERSION=$(echo $SHORTVERSION | cut -d. -f1).$(date +"%Y%m%d%H%M") SHORTVERSION=$(cat version.pri | grep VERSION | grep defined | cut -d= -f2 | tr -d \ ) FULLVERSION=$(cat versionfull.pri | grep BUILDVERSION | grep defined | cut -d= -f2 | tr -d \ ) print G "$SHORTVERSION - $FULLVERSION" @@ -249,15 +237,6 @@ else print Y "No Tun2Socks will be built" fi -#if [ "$OS" = "ios" ]; then -# print Y "Prepare to build CocoaLamberjack..." -# prepare_to_build_cl -# print Y "Building CocoaLamberjack Framework..." -# compile_cocoalamberjack -#else -# print Y "No CocoaLamberjack will be built" -#fi - print Y "Creating the xcode project via qmake..." $QMAKE \ VERSION=$SHORTVERSION \ diff --git a/client/scripts/commons.sh b/client/scripts/commons.sh index d46b7318..040fd10e 100644 --- a/client/scripts/commons.sh +++ b/client/scripts/commons.sh @@ -74,16 +74,6 @@ EOF patch_ss() { cd 3rd/ShadowSocks - -# $PATCH -p1 -N --dry-run --silent < ../../scripts/ss_patch.diff 2>/dev/null - #If the patch has not been applied then the $? which is the exit status - #for last command would have a success status code = 0 -# if [ $? -eq 0 ]; -# then -# #apply the patch -# $PATCH -p1 < ../../scripts/ss_patch.diff -# fi - } compile_ss_frameworks() { @@ -95,21 +85,6 @@ compile_ss_frameworks() { cd ../../ } -#prepare_to_build_pp() { -# cat $WORKINGDIR/scripts/pp_ios.xcconfig > $WORKINGDIR/3rd/PacketProcessor/pp_ios.xcconfig -# cat << EOF >> $WORKINGDIR/3rd/PacketProcessor/pp_ios.xcconfig -#PROJECT_TEMP_DIR = $WORKINGDIR/3rd/PacketProcessor/build/OpenVPNAdapter.build -#CONFIGURATION_BUILD_DIR = $WORKINGDIR/3rd/PacketProcessor/build/Release-iphoneos -#BUILT_PRODUCTS_DIR = $WORKINGDIR/3rd/PacketProcessor/build/Release-iphoneos -#EOF -#} -# -#compile_packet_processor() { -# cd 3rd/PacketProcessor -# $XCODEBUILD -scheme PacketProcessor -configuration Release -xcconfig pp_ios.xcconfig -sdk iphoneos -destination 'generic/platform=iOS' -project PacketProcessor.xcodeproj -# cd ../../ -#} - prepare_to_build_cas() { cat $WORKINGDIR/scripts/cas_ios.xcconfig > $WORKINGDIR/3rd/CocoaAsyncSocket/cas_ios.xcconfig cat << EOF >> $WORKINGDIR/3rd/CocoaAsyncSocket/cas_ios.xcconfig