Skip to content

Commit

Permalink
Improve Xcode project
Browse files Browse the repository at this point in the history
* Fix a number of platform and deployment target mistakes
* Sync Xcode's idea of files that exist with what's on disk
* Make a dummy target with all the files so Xcode can index their code
* Add a macOS CLI tool to test iSH. Marginally useful in and of itself,
but it keeps the build system from having broken things in it
  • Loading branch information
saagarjha committed Nov 12, 2020
1 parent 0c96740 commit b942c1c
Show file tree
Hide file tree
Showing 5 changed files with 765 additions and 317 deletions.
8 changes: 4 additions & 4 deletions deps/libarchive.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -745,7 +745,9 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
ONLY_ACTIVE_ARCH = YES;
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx";
};
name = Debug;
};
Expand Down Expand Up @@ -778,6 +780,8 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx";
};
name = Release;
};
Expand Down Expand Up @@ -813,13 +817,11 @@
GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES;
HEADER_SEARCH_PATHS = "$(SRCROOT)/libarchive";
IPHONEOS_DEPLOYMENT_TARGET = 13.5;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = archive;
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
TARGETED_DEVICE_FAMILY = "1,2";
};
Expand Down Expand Up @@ -855,12 +857,10 @@
GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES;
HEADER_SEARCH_PATHS = "$(SRCROOT)/libarchive";
IPHONEOS_DEPLOYMENT_TARGET = 13.5;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = archive;
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
Expand Down
4 changes: 4 additions & 0 deletions iSH.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ ROOT_BUNDLE_IDENTIFIER = app.ish.iSH

// Choose logging channels to enable. Separate by spaces. Try "verbose strace".
ISH_LOG =
ISH_LOGGER = $(ISH_LOGGER_$(PLATFORM_NAME))
ISH_LOGGER_iphoneos = nslog
ISH_LOGGER_iphonesimulator = nslog
ISH_LOGGER_macosx = dprintf

ROOTFS_URL = github.com/ish-app/roots/releases/download/g9ce02ec1eddbf4beee99c6aeca3c99bd4f8b5943/appstore.tar.gz

Expand Down
Loading

0 comments on commit b942c1c

Please sign in to comment.