Skip to content
Snippets Groups Projects
Commit 38b37ab6 authored by George Nachman's avatar George Nachman
Browse files

Add a beta build configuration, and use it for betas. Change beta, debug, and... 

Add a beta build configuration, and use it for betas. Change beta, debug, and nightly build configurations to set the preprocessor BETA=1. Add ITBetaAssert, which crashes only in those build configurations. Add some ITBetaAsserts to find why we sometimes try to get negative line numbers.
parent 68faf1c9
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
iTerm2.xcodeproj/project.pbxproj
+ 490
− 1
View file @ 38b37ab6
@@ -9050,6 +9050,7 @@
"\"$(SRCROOT)/ThirdParty/Growl.framework\"",
);
MACOSX_DEPLOYMENT_TARGET = 10.10;
OTHER_CFLAGS = "-DBETA=1";
OTHER_CODE_SIGN_FLAGS = "--deep";
OTHER_LDFLAGS = (
"-laprutil-1",
@@ -9598,6 +9599,472 @@
};
name = Nightly;
};
A656E9881F970C7200158128 /* Beta */ = {
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = iTerm2;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ENABLE_CODE_COVERAGE = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
ENABLE_STRICT_OBJC_MSGSEND = YES;
FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)";
GCC_C_LANGUAGE_STANDARD = c99;
GCC_NO_COMMON_BLOCKS = YES;
GCC_VERSION = "";
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_PROTOTYPE_CONVERSION = NO;
GCC_WARN_SIGN_COMPARE = NO;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
MACOSX_DEPLOYMENT_TARGET = 10.10;
SDKROOT = macosx;
VALID_ARCHS = "x86_64 i386";
WARNING_CFLAGS = "-Wall";
};
name = Beta;
};
A656E9891F970C7200158128 /* Beta */ = {
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_WARN_INT_CONVERSION = YES;
CODE_SIGN_IDENTITY = "Developer ID Application: GEORGE NACHMAN (H7V7XYVQ7D)";
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES;
DEVELOPMENT_TEAM = "";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(SRCROOT)",
"$(PROJECT_DIR)",
"$(PROJECT_DIR)/ThirdParty",
"$(PROJECT_DIR)/ColorPicker",
);
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_OPTIMIZATION_LEVEL = 3;
GCC_VERSION = "";
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
GCC_WARN_MISSING_PARENTHESES = YES;
GCC_WARN_SHADOW = YES;
GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES;
GCC_WARN_UNINITIALIZED_AUTOS = NO;
GCC_WARN_UNKNOWN_PRAGMAS = NO;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_LABEL = YES;
GCC_WARN_UNUSED_PARAMETER = NO;
GCC_WARN_UNUSED_VALUE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = (
.,
ThirdParty,
);
INFOPLIST_FILE = plists/iTerm2.plist;
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)/ThirdParty/Growl.framework\"",
);
MACOSX_DEPLOYMENT_TARGET = 10.10;
"OTHER_CFLAGS[arch=*]" = "-DBETA=1";
OTHER_CODE_SIGN_FLAGS = "--deep";
OTHER_LDFLAGS = (
"-laprutil-1",
"-licucore",
"-ObjC",
);
PRODUCT_BUNDLE_IDENTIFIER = com.googlecode.iterm2;
PRODUCT_NAME = iTerm2;
PROVISIONING_PROFILE_SPECIFIER = "";
SDKROOT = macosx;
VALID_ARCHS = x86_64;
WARNING_CFLAGS = (
"-Wextra",
"-Wall",
"-Wno-unused-parameter",
"-Wno-sign-compare",
"-Wno-missing-field-initializers",
"-Wundeclared-selector",
);
WRAPPER_EXTENSION = app;
ZERO_LINK = NO;
};
name = Beta;
};
A656E98A1F970C7200158128 /* Beta */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_OBJC_ARC = NO;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "Mac Developer";
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = H7V7XYVQ7D;
ENABLE_NS_ASSERTIONS = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
/Users/gnachman/iTerm2,
"$(PROJECT_DIR)/ThirdParty",
"$(PROJECT_DIR)/ColorPicker",
);
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "sources/iTermTests/iTermTests-Prefix.pch";
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = (
"$(inherited)",
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
ThirdParty,
);
INFOPLIST_FILE = "plists/iTermTests-Info.plist";
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)/ThirdParty/Growl.framework\"",
);
MACOSX_DEPLOYMENT_TARGET = 10.10;
OTHER_CODE_SIGN_FLAGS = "--deep";
OTHER_LDFLAGS = (
"-laprutil-1",
"-licucore",
"-ObjC",
);
PRODUCT_BUNDLE_IDENTIFIER = "com.google.${PRODUCT_NAME:rfc1034identifier}";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
VALID_ARCHS = x86_64;
WARNING_CFLAGS = (
"-Wall",
"-Wno-shorten-64-to-32",
);
WRAPPER_EXTENSION = app;
};
name = Beta;
};
A656E98B1F970C7200158128 /* Beta */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "Mac Developer";
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = H7V7XYVQ7D;
ENABLE_NS_ASSERTIONS = NO;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "ThirdParty/SSKeychain/SSKeychain-Prefix.pch";
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.10;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
};
name = Beta;
};
A656E98C1F970C7200158128 /* Beta */ = {
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "Mac Developer";
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES;
DEVELOPMENT_TEAM = H7V7XYVQ7D;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(SRCROOT)",
"$(PROJECT_DIR)",
"$(PROJECT_DIR)/ThirdParty",
"$(PROJECT_DIR)/ColorPicker",
);
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_OPTIMIZATION_LEVEL = 3;
GCC_VERSION = "";
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
GCC_WARN_MISSING_PARENTHESES = YES;
GCC_WARN_SHADOW = YES;
GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES;
GCC_WARN_UNINITIALIZED_AUTOS = NO;
GCC_WARN_UNKNOWN_PRAGMAS = NO;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_LABEL = YES;
GCC_WARN_UNUSED_PARAMETER = NO;
GCC_WARN_UNUSED_VALUE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = (
.,
ThirdParty,
);
INFOPLIST_FILE = "plists/iTerm2ForApplescriptTesting-Info.plist";
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)/ThirdParty/Growl.framework\"",
);
MACOSX_DEPLOYMENT_TARGET = 10.10;
"OTHER_CFLAGS[arch=*]" = "";
OTHER_CODE_SIGN_FLAGS = "--deep";
OTHER_LDFLAGS = (
"-laprutil-1",
"-licucore",
"-ObjC",
);
PRODUCT_BUNDLE_IDENTIFIER = com.googlecode.iterm2.applescript;
PRODUCT_NAME = iTerm2ForApplescriptTesting;
SDKROOT = macosx;
VALID_ARCHS = x86_64;
WARNING_CFLAGS = (
"-Wextra",
"-Wall",
"-Wno-unused-parameter",
"-Wno-sign-compare",
"-Wno-missing-field-initializers",
);
WRAPPER_EXTENSION = app;
ZERO_LINK = NO;
};
name = Beta;
};
A656E98D1F970C7200158128 /* Beta */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = NO;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "Mac Developer";
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = H7V7XYVQ7D;
ENABLE_NS_ASSERTIONS = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/ColorPicker",
"$(PROJECT_DIR)/ThirdParty",
);
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
GCC_OPTIMIZATION_LEVEL = s;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = sources/iTerm2.pch;
GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = ThirdParty;
MACOSX_DEPLOYMENT_TARGET = 10.10;
"OTHER_CFLAGS[arch=*]" = "-DBETA=1";
OTHER_LDFLAGS = "";
PRODUCT_NAME = iTerm2Shared;
SDKROOT = macosx;
WARNING_CFLAGS = (
"-Wall",
"-Wpartial-availability",
);
WARNING_LDFLAGS = "";
};
name = Beta;
};
A656E98E1F970C7200158128 /* Beta */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
BUNDLE_LOADER = "$(TEST_HOST)";
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = NO;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "";
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = H7V7XYVQ7D;
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(DEVELOPER_FRAMEWORKS_DIR)",
"$(inherited)",
);
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = (
ThirdParty,
.,
);
INFOPLIST_FILE = iTerm2XCTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.11;
MTL_ENABLE_DEBUG_INFO = NO;
PRODUCT_BUNDLE_IDENTIFIER = "com.iterm2.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/iTerm2.app/Contents/MacOS/iTerm2";
};
name = Beta;
};
A656E98F1F970C7200158128 /* Beta */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_NONNULL = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "-";
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.10;
MTL_ENABLE_DEBUG_INFO = NO;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
};
name = Beta;
};
A656E9901F970C7200158128 /* Beta */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "Mac Developer";
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = H7V7XYVQ7D;
ENABLE_NS_ASSERTIONS = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/ColorPicker",
"$(PROJECT_DIR)/ThirdParty",
);
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
GCC_OPTIMIZATION_LEVEL = s;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = sources/iTerm2.pch;
GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = ThirdParty;
MACOSX_DEPLOYMENT_TARGET = 10.10;
OTHER_CFLAGS = "-DBETA=1";
OTHER_LDFLAGS = "";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
};
name = Beta;
};
A66719581DCE36C3000CE608 /* Development */ = {
isa = XCBuildConfiguration;
buildSettings = {
@@ -9643,6 +10110,10 @@
HEADER_SEARCH_PATHS = ThirdParty;
MACOSX_DEPLOYMENT_TARGET = 10.10;
ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = (
"-DBETA=1",
"-DITERM_DEBUG=1",
);
OTHER_LDFLAGS = "";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
@@ -9734,6 +10205,7 @@
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = ThirdParty;
MACOSX_DEPLOYMENT_TARGET = 10.10;
OTHER_CFLAGS = "-DBETA=1";
OTHER_LDFLAGS = "";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
@@ -9912,6 +10384,10 @@
HEADER_SEARCH_PATHS = ThirdParty;
MACOSX_DEPLOYMENT_TARGET = 10.10;
ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = (
"-DBETA=1",
"-DITERM_DEBUG=1",
);
OTHER_LDFLAGS = "";
PRODUCT_NAME = iTerm2Shared;
SDKROOT = macosx;
@@ -10013,6 +10489,7 @@
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = ThirdParty;
MACOSX_DEPLOYMENT_TARGET = 10.10;
OTHER_CFLAGS = "-DBETA=1";
OTHER_LDFLAGS = "";
PRODUCT_NAME = iTerm2Shared;
SDKROOT = macosx;
@@ -10233,7 +10710,10 @@
);
LINK_WITH_STANDARD_LIBRARIES = YES;
MACOSX_DEPLOYMENT_TARGET = 10.10;
"OTHER_CFLAGS[arch=*]" = "-DITERM_DEBUG=1";
"OTHER_CFLAGS[arch=*]" = (
"-DITERM_DEBUG=1",
"-DBETA=1",
);
OTHER_CODE_SIGN_FLAGS = "--deep";
OTHER_LDFLAGS = (
"-laprutil-1",
@@ -10422,6 +10902,7 @@
buildConfigurations = (
1D6EDB0619AEA20D005A7799 /* Development */,
1D6EDB0719AEA20D005A7799 /* Deployment */,
A656E98C1F970C7200158128 /* Beta */,
1D6EDB0819AEA20D005A7799 /* Nightly */,
);
defaultConfigurationIsVisible = 0;
@@ -10432,6 +10913,7 @@
buildConfigurations = (
1DD39B03180B812D004E56D5 /* Development */,
1DD39B04180B812D004E56D5 /* Deployment */,
A656E98A1F970C7200158128 /* Beta */,
1DD39B06180B812D004E56D5 /* Nightly */,
);
defaultConfigurationIsVisible = 0;
@@ -10442,6 +10924,7 @@
buildConfigurations = (
1DFA7C821923E83700DF1410 /* Development */,
1DFA7C831923E83700DF1410 /* Deployment */,
A656E98B1F970C7200158128 /* Beta */,
1DFA7C841923E83700DF1410 /* Nightly */,
);
defaultConfigurationIsVisible = 0;
@@ -10452,6 +10935,7 @@
buildConfigurations = (
A66719581DCE36C3000CE608 /* Development */,
A66719591DCE36C3000CE608 /* Deployment */,
A656E9901F970C7200158128 /* Beta */,
A667195A1DCE36C3000CE608 /* Nightly */,
);
defaultConfigurationIsVisible = 0;
@@ -10462,6 +10946,7 @@
buildConfigurations = (
A6755F4E1D729A0500F3726C /* Development */,
A6755F4F1D729A0500F3726C /* Deployment */,
A656E98F1F970C7200158128 /* Beta */,
A6755F501D729A0500F3726C /* Nightly */,
);
defaultConfigurationIsVisible = 0;
@@ -10472,6 +10957,7 @@
buildConfigurations = (
A6C7604C1B45C4CF00E3C992 /* Development */,
A6C7604D1B45C4CF00E3C992 /* Deployment */,
A656E98D1F970C7200158128 /* Beta */,
A6C7604E1B45C4CF00E3C992 /* Nightly */,
);
defaultConfigurationIsVisible = 0;
@@ -10482,6 +10968,7 @@
buildConfigurations = (
A6C764251B45CB2800E3C992 /* Development */,
A6C764261B45CB2800E3C992 /* Deployment */,
A656E98E1F970C7200158128 /* Beta */,
A6C764271B45CB2800E3C992 /* Nightly */,
);
defaultConfigurationIsVisible = 0;
@@ -10492,6 +10979,7 @@
buildConfigurations = (
BB024D36096EE4080021E793 /* Development */,
BB024D37096EE4080021E793 /* Deployment */,
A656E9891F970C7200158128 /* Beta */,
1809E7B11665E2CB0069C439 /* Nightly */,
);
defaultConfigurationIsVisible = 0;
@@ -10502,6 +10990,7 @@
buildConfigurations = (
BB024D3A096EE4080021E793 /* Development */,
BB024D3B096EE4080021E793 /* Deployment */,
A656E9881F970C7200158128 /* Beta */,
1809E7B01665E2CB0069C439 /* Nightly */,
);
defaultConfigurationIsVisible = 0;
sources/DebugLogging.h
+ 21
− 0
View file @ 38b37ab6
@@ -107,6 +107,27 @@ extern BOOL gDebugLogging;
} \
} while (0)
 
#define IT_STRINGIFY(x) #x
#if BETA
#define ITBetaAssert(condition, args...) \
do { \
if (!(condition)) { \
DLog(@"Crashing because %s from:\n%@", #condition, [NSThread callStackSymbols]); \
ELog(args); \
assert(NO); \
} \
} while (0)
#else // BETA
#define ITBetaAssert(condition, args...) \
do { \
if (!(condition)) { \
ELog(@"BETA ASSERT: Failed beta assert because %s from:\n%@", #condition, [NSThread callStackSymbols]); \
ELog(args); \
} \
} while (0)
#endif
void ToggleDebugLogging(void);
int DebugLogImpl(const char *file, int line, const char *function, NSString* value);
void LogForNextCrash(const char *file, int line, const char *function, NSString* value);
sources/LineBlock.m
+ 4
− 1
View file @ 38b37ab6
@@ -455,6 +455,7 @@ int NumberOfFullLines(screen_char_t* buffer, int length, int width,
width:(int)width
metadata:(LineBlockMetadata *)metadata {
assert(gEnableDoubleWidthCharacterLineCache);
ITBetaAssert(n >= 0, @"Negative lines to offsetOfWrappedLineInBuffer");
if (_mayHaveDoubleWidthCharacter) {
if (!metadata->double_width_characters ||
metadata->width_for_double_width_characters_cache != width) {
@@ -464,7 +465,7 @@ int NumberOfFullLines(screen_char_t* buffer, int length, int width,
__block int lines = 0;
__block int i = 0;
__block NSUInteger lastIndex = 0;
[metadata->double_width_characters enumerateIndexesInRange:NSMakeRange(0, n + 1)
[metadata->double_width_characters enumerateIndexesInRange:NSMakeRange(0, MAX(0, n + 1))
options:0
usingBlock:^(NSUInteger indexOfLineThatWouldStartWithRightHalf, BOOL * _Nonnull stop) {
int numberOfLines = indexOfLineThatWouldStartWithRightHalf - lastIndex;
@@ -550,6 +551,7 @@ int OffsetOfWrappedLine(screen_char_t* p, int n, int length, int width, BOOL may
yOffset:(int*)yOffsetPtr
continuation:(screen_char_t *)continuationPtr
{
ITBetaAssert(*lineNum >= 0, @"Negative lines to getWrappedLineWithWrapWidth");
int prev = 0;
int numEmptyLines = 0;
for (int i = first_entry; i < cll_entries; ++i) {
@@ -586,6 +588,7 @@ int OffsetOfWrappedLine(screen_char_t* p, int n, int length, int width, BOOL may
// Consume the entire raw line and keep looking for more.
int consume = spans + 1;
*lineNum -= consume;
ITBetaAssert(*lineNum >= 0, @"Negative lines after consuming spans");
} else { // *lineNum <= spans
// We found the raw line that inclues the wrapped line we're searching for.
// eat up *lineNum many width-sized wrapped lines from this start of the current full line
sources/LineBuffer.m
+ 4
− 0
View file @ 38b37ab6
@@ -30,6 +30,7 @@
#import "LineBuffer.h"
 
#import "BackgroundThread.h"
#import "DebugLogging.h"
#import "LineBlock.h"
#import "RegexKitLite.h"
 
@@ -421,11 +422,13 @@ static int RawNumLines(LineBuffer* buffer, int width) {
lineNum:(int)lineNum
continuation:(screen_char_t *)continuationPtr
{
ITBetaAssert(lineNum >= 0, @"Negative lineNum to copyLineToBuffer");
int line = lineNum;
int i;
for (i = 0; i < [blocks count]; ++i) {
LineBlock* block = [blocks objectAtIndex: i];
NSAssert(block, @"Null block");
ITBetaAssert(line >= 0, @"Negative lineNum BEFORE consuming block_lines");
 
// getNumLinesWithWrapWidth caches its result for the last-used width so
// this is usually faster than calling getWrappedLineWithWrapWidth since
@@ -435,6 +438,7 @@ static int RawNumLines(LineBuffer* buffer, int width) {
line -= block_lines;
continue;
}
ITBetaAssert(line >= 0, @"Negative lineNum after consuming block_lines");
 
int length;
int eol;
sources/VT100Screen.m
+ 2
− 0
View file @ 38b37ab6
@@ -1468,6 +1468,7 @@ static NSString *const kInilineFileInset = @"inset"; // NSValue of NSEdgeInsets
// grid.
- (screen_char_t *)getLineAtIndex:(int)theIndex withBuffer:(screen_char_t*)buffer
{
ITBetaAssert(theIndex >= 0, @"Negative index to getLineAtIndex");
int numLinesInLineBuffer = [linebuffer_ numLinesWithWidth:currentGrid_.size.width];
if (theIndex >= numLinesInLineBuffer) {
// Get a line from the circular screen buffer
@@ -4239,6 +4240,7 @@ static void SwapInt(int *a, int *b) {
VT100GridRun result = run;
int x = result.origin.x;
int y = result.origin.y;
ITBetaAssert(y >= 0, @"Negative y to runByTrimmingNullsFromRun");
screen_char_t *line = [self getLineAtIndex:y];
int numberOfLines = [self numberOfLines];
int width = [self width];
tools/release_beta.sh
+ 2
− 2
View file @ 38b37ab6
@@ -29,7 +29,7 @@ function SparkleSign {
cp iTerm2-${NAME}.zip ~/iterm2-website/downloads/beta/
}
 
# First arg is build directory name (e.g., Deployment)
# First arg is build directory name (e.g., Beta)
# Second arg is suffix for name that goes before .zip.
# Third arg describes system requirements
# Fourth arg is the default description for the build and can be longer.
@@ -90,7 +90,7 @@ echo "Build deployment release"
make clean
make release
 
BUILDTYPE=Deployment
BUILDTYPE=Beta
 
Build $BUILDTYPE "" "OS 10.10+" "This is the recommended beta build for most users." "" "--deep"
 
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment