Skip to content

Commit

Permalink
merging v4.1 release
Browse files Browse the repository at this point in the history
  • Loading branch information
@jeevatkm
jeevatkm committed Oct 29, 2013
2 parents 2e6a5d7 + be825af commit d1789e4
Show file tree
Hide file tree
Showing 17 changed files with 541 additions and 2,216 deletions.
34 changes: 12 additions & 22 deletions ReplyWithHeader.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 45;
objectVersion = 46;
objects = {

/* Begin PBXBuildFile section */
Expand Down Expand Up @@ -272,7 +272,6 @@
8D11072C0486CEB800E47090 /* Sources */,
8D11072E0486CEB800E47090 /* Frameworks */,
4D5FEE9312723CCE00A945C5 /* Bundle Packing and Deploy Local */,
1325DBD2180559E5002FEE12 /* DMG Installer Creation */,
);
buildRules = (
);
Expand All @@ -290,10 +289,10 @@
29B97313FDCFA39411CA2CEA /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0460;
LastUpgradeCheck = 0500;
};
buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "ReplyWithHeader" */;
compatibilityVersion = "Xcode 3.1";
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
hasScannedForEncodings = 1;
knownRegions = (
Expand Down Expand Up @@ -343,21 +342,6 @@
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
1325DBD2180559E5002FEE12 /* DMG Installer Creation */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 8;
files = (
);
inputPaths = (
"$(BUILT_PRODUCTS_DIR)/$(WRAPPER_NAME)",
);
name = "DMG Installer Creation";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 1;
shellPath = /bin/sh;
shellScript = "# creating DMG\nPackage/create-dmg.sh";
};
4D5FEE9312723CCE00A945C5 /* Bundle Packing and Deploy Local */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 12;
Expand All @@ -371,7 +355,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "# Applying bundle icon\n/usr/local/bin/seticon -d ${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/Contents/Resources/ReplyWithHeader.icns ${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}\n\n# Package it\nSetFile -a B ${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}\n\n# Deploying to local\n/bin/rm -rf ${INSTALL_PATH}/${WRAPPER_NAME}\n/bin/cp -r ${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME} ${INSTALL_PATH}\n\n# Installer\nMH_BUILD_VERSION=$(defaults read ${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/Contents/Info CFBundleVersion)\n\n/bin/rm -rf '/tmp/MailHeader/*'\n/bin/mkdir -p '/tmp/MailHeader/pkg'\n\n/bin/cp -r ${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME} /tmp/MailHeader/pkg\n\npkgbuild --root \"/tmp/MailHeader/pkg\" \\\n--scripts \"${SRCROOT}/Package/Scripts\" \\\n--identifier \"com.myjeeva.mac.install.ReplyWithHeader\" \\\n--version \"${MH_BUILD_VERSION}\" \\\n--install-location \"${HOME}/Library/Mail/Bundles\" \\\n--ownership recommended \\\n\"${BUILT_PRODUCTS_DIR}/ReplyWithHeader.pkg\"\n\n";
shellScript = "# Applying bundle icon\n/usr/local/bin/seticon -d ${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/Contents/Resources/ReplyWithHeader.icns ${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}\n\n# Package it\nSetFile -a B ${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}\n\n# Deploying to local\n/bin/rm -rf ${INSTALL_PATH}/${WRAPPER_NAME}\n/bin/cp -r ${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME} ${INSTALL_PATH}\n\n# Installer\n#MH_BUILD_VERSION=$(defaults read ${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/Contents/Info CFBundleVersion)\n#MH_BUILD_DIR_NAME=\"${PRODUCT_NAME}-v${MH_BUILD_VERSION}\"\n\n#/bin/rm -rf /tmp/MailHeader/\n#/bin/mkdir -p \"/tmp/MailHeader/${MH_BUILD_DIR_NAME}\"\n\n#/bin/cp -r ${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME} \"/tmp/MailHeader/${MH_BUILD_DIR_NAME}\"\n#/bin/cp ${SRCROOT}/Package/Install-or-Upgrade.command /tmp/MailHeader/${MH_BUILD_DIR_NAME}\n#/bin/cp ${SRCROOT}/Package/Uninstall.command /tmp/MailHeader/${MH_BUILD_DIR_NAME}\n\n#cd /tmp/MailHeader/ && zip -r \"${MH_BUILD_DIR_NAME}.zip\" ${MH_BUILD_DIR_NAME}\n\n#/bin/cp \"/tmp/MailHeader/${MH_BUILD_DIR_NAME}.zip\" ${HOME}/Downloads/\n\n# Installer\n#MH_BUILD_VERSION=$(defaults read ${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/Contents/Info CFBundleVersion)\n\n#/bin/rm -rf '/tmp/MailHeader/*'\n#/bin/mkdir -p '/tmp/MailHeader/pkg'\n\n#/bin/cp -r ${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME} /tmp/MailHeader/pkg\n\n#pkgbuild --root \"/tmp/MailHeader/pkg\" \\\n#--scripts \"${SRCROOT}/Package/Scripts\" \\\n#--identifier \"com.myjeeva.mac.install.ReplyWithHeader\" \\\n#--version \"${MH_BUILD_VERSION}\" \\\n#--install-location \"${HOME}/Library/Mail/Bundles\" \\\n#--ownership recommended \\\n#\"${BUILT_PRODUCTS_DIR}/ReplyWithHeader.pkg\"\n\n";
};
/* End PBXShellScriptBuildPhase section */

Expand Down Expand Up @@ -458,6 +442,8 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ENABLE_OBJC_ARC = YES;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES;
GCC_DYNAMIC_NO_PIC = NO;
GCC_MODEL_TUNING = G5;
Expand All @@ -475,6 +461,7 @@
dynamic_lookup,
);
PRODUCT_NAME = ReplyWithHeader;
SDKROOT = macosx;
STRIP_STYLE = "non-global";
WRAPPER_EXTENSION = mailbundle;
ZERO_LINK = YES;
Expand All @@ -485,6 +472,8 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ENABLE_OBJC_ARC = YES;
COMBINE_HIDPI_IMAGES = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_DYNAMIC_NO_PIC = NO;
GCC_MODEL_TUNING = G5;
Expand All @@ -501,6 +490,7 @@
dynamic_lookup,
);
PRODUCT_NAME = ReplyWithHeader;
SDKROOT = macosx;
STRIP_STYLE = "non-global";
WRAPPER_EXTENSION = mailbundle;
};
Expand All @@ -509,12 +499,12 @@
C01FCF4F08A954540054247B /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
INFOPLIST_FILE = "${SRCROOT}/ReplyWithHeader/Resources/en.lproj/MailHeader-Info.plist";
MACOSX_DEPLOYMENT_TARGET = 10.7;
ONLY_ACTIVE_ARCH = YES;
PRODUCT_NAME = ReplyWithHeader;
SDKROOT = macosx10.7;
Expand All @@ -524,11 +514,11 @@
C01FCF5008A954540054247B /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
INFOPLIST_FILE = "${SRCROOT}/ReplyWithHeader/Resources/en.lproj/MailHeader-Info.plist";
MACOSX_DEPLOYMENT_TARGET = 10.7;
PRODUCT_NAME = ReplyWithHeader;
SDKROOT = macosx10.7;
};
Expand Down
1 change: 1 addition & 0 deletions ReplyWithHeader/MHConstants.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
#define MHForwardHeaderEnabled @"MHForwardHeaderEnabled"
#define MHTypographyEnabled @"MHHeaderTypographyEnabled"
#define MHHeaderOptionEnabled @"MHHeaderLabelOptionEnabled"
#define MHRemoveSignatureEnabled @"MHRemoveSignatureEnabled"
#define MHEntourage2004SupportEnabled @"MHEntourage2004SupportEnabled"
#define MHDefaulReplyHeaderBorder @"<br />---------- Original Message ----------<br />"
#define MHDefaultForwardHeaderBorder @"---------- Forwarded Message ----------<br />"
Expand Down
2 changes: 0 additions & 2 deletions ReplyWithHeader/MHHeaderString.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
NSMutableAttributedString *headerString;
int headerItemCount;
BOOL isSuppressLabelsFound;
NSFont *defaultFont;
}

@property (weak, readonly) NSString *stringValue;
Expand All @@ -52,6 +51,5 @@
- (WebArchive *)getWebArchive;
- (int)getHeaderItemCount;
- (BOOL)isSuppressLabelsFound;
- (void)dealloc;

@end
Loading

0 comments on commit d1789e4

Please sign in to comment.