Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge

  • Loading branch information...
commit 6976d2b40e0728f0e0ab639c4add668996316f94 2 parents 6a48b19 + c96bf70
@logancollins authored
Showing with 6 additions and 12 deletions.
  1. +6 −12 Mocha.xcodeproj/project.pbxproj
View
18 Mocha.xcodeproj/project.pbxproj
@@ -1014,7 +1014,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "rm -r \"${BUILT_PRODUCTS_DIR}/Mocha.framework/PrivateHeaders/\"\nrm \"${BUILT_PRODUCTS_DIR}/Mocha.framework/PrivateHeaders\"\nrm -r \"${DSTROOT}\"\nmkdir -p \"${DSTROOT}/Library/Frameworks/\"\ncp -R \"${BUILT_PRODUCTS_DIR}/Mocha.framework\" \"${DSTROOT}/Library/Frameworks/\"\nchmod -R 755 \"${SRCROOT}/InstallPackage/Scripts/\"\npkgbuild --root \"${DSTROOT}\" \"${BUILT_PRODUCTS_DIR}/Mocha.pkg\" --identifier \"com.sunflowersw.Mocha\" --version \"${CURRENT_PROJECT_VERSION}\" --scripts \"${SRCROOT}/InstallPackage/Scripts\"";
+ shellScript = "rm -r \"${BUILT_PRODUCTS_DIR}/Mocha.framework/PrivateHeaders/\"\nrm \"${BUILT_PRODUCTS_DIR}/Mocha.framework/PrivateHeaders\"\nrm -rf \"${DSTROOT}\"\nmkdir -p \"${DSTROOT}/Library/Frameworks/\"\ncp -R \"${BUILT_PRODUCTS_DIR}/Mocha.framework\" \"${DSTROOT}/Library/Frameworks/\"\nchmod -R 755 \"${SRCROOT}/InstallPackage/Scripts/\"\npkgbuild --root \"${DSTROOT}\" \"${BUILT_PRODUCTS_DIR}/Mocha.pkg\" --identifier \"com.sunflowersw.Mocha\" --scripts \"${SRCROOT}/InstallPackage/Scripts\"";
};
028D628415C064C400C12842 /* Generate Documentation */ = {
isa = PBXShellScriptBuildPhase;
@@ -1028,7 +1028,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "mkdir -p \"${BUILT_PRODUCTS_DIR}/MochaDocumentation\"\nappledoc --create-html --no-create-docset --preprocess-headerdoc --project-name \"Mocha\" --project-company \"Sunflower Softworks\" --company-id \"com.sunflowersw\" -v \"${CURRENT_PROJECT_VERSION}\" -o \"${BUILT_PRODUCTS_DIR}/MochaDocumentation\" \"${BUILT_PRODUCTS_DIR}/Mocha.framework/Headers\"";
+ shellScript = "mkdir -p \"${BUILT_PRODUCTS_DIR}/MochaDocumentation\"\nheaderdoc2html -C -g -u -o \"${BUILT_PRODUCTS_DIR}/MochaDocumentation\" \"${BUILT_PRODUCTS_DIR}/Mocha.framework/Headers\" \"${BUILT_PRODUCTS_DIR}/Mocha.framework/Resources/Mocha.hdoc\"\ngatherheaderdoc \"${BUILT_PRODUCTS_DIR}/MochaDocumentation\"";
};
028D628B15C0677000C12842 /* Generate Bridge Support Metadata */ = {
isa = PBXShellScriptBuildPhase;
@@ -1291,8 +1291,6 @@
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
DSTROOT = /tmp/libMocha__iOS_.dst;
- DYLIB_COMPATIBILITY_VERSION = 100.0;
- DYLIB_CURRENT_VERSION = "${CURRENT_PROJECT_VERSION}";
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "libMocha (iOS)/libMocha-Prefix.pch";
HEADER_SEARCH_PATHS = (
@@ -1316,8 +1314,6 @@
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
DSTROOT = /tmp/libMocha__iOS_.dst;
- DYLIB_COMPATIBILITY_VERSION = 100.0;
- DYLIB_CURRENT_VERSION = "${CURRENT_PROJECT_VERSION}";
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "libMocha (iOS)/libMocha-Prefix.pch";
HEADER_SEARCH_PATHS = (
@@ -1344,7 +1340,6 @@
ARCHS = "$(ARCHS_STANDARD_64_BIT)";
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
COPY_PHASE_STRIP = NO;
- CURRENT_PROJECT_VERSION = 100.0;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
@@ -1374,7 +1369,6 @@
ARCHS = "$(ARCHS_STANDARD_64_BIT)";
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
COPY_PHASE_STRIP = YES;
- CURRENT_PROJECT_VERSION = 100.0;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
@@ -1395,8 +1389,8 @@
buildSettings = {
CLANG_ENABLE_OBJC_ARC = YES;
COMBINE_HIDPI_IMAGES = YES;
- DYLIB_COMPATIBILITY_VERSION = 100.0;
- DYLIB_CURRENT_VERSION = "${CURRENT_PROJECT_VERSION}";
+ DYLIB_COMPATIBILITY_VERSION = 1;
+ DYLIB_CURRENT_VERSION = 1;
FRAMEWORK_VERSION = A;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "Mocha/Mocha-Prefix.pch";
@@ -1412,8 +1406,8 @@
buildSettings = {
CLANG_ENABLE_OBJC_ARC = YES;
COMBINE_HIDPI_IMAGES = YES;
- DYLIB_COMPATIBILITY_VERSION = 100.0;
- DYLIB_CURRENT_VERSION = "${CURRENT_PROJECT_VERSION}";
+ DYLIB_COMPATIBILITY_VERSION = 1;
+ DYLIB_CURRENT_VERSION = 1;
FRAMEWORK_VERSION = A;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "Mocha/Mocha-Prefix.pch";
Please sign in to comment.
Something went wrong with that request. Please try again.