Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fix DSTROOT references, to make installs work

Change-Id: Ida501b9ba8b8776eb48ad01750329105b4ce49a8
Reviewed-on: http://review.couchbase.org/9247
Reviewed-by: Chris Anderson <jchris@couchbase.com>
Tested-by: Jens Alfke <jens@couchbase.com>
  • Loading branch information...
commit f459d43a9d148e0f82646a705655f08632ab710f 1 parent bd461f7
@snej snej authored
View
6 EmptyApp/Empty App.xcodeproj/project.pbxproj
@@ -335,7 +335,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "# The 'CouchbaseResources' subfolder of the framework contains Erlang code and other resources needed at runtime. Copy it into the app bundle:\nrm -rf \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CouchbaseResources\"\nrsync -a \"${TARGET_BUILD_DIR}/../${CONFIGURATION}-universal/Couchbase.framework/CouchbaseResources\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}\"";
+ shellScript = "# The 'CouchbaseResources' subfolder of the framework contains Erlang code and other resources needed at runtime. Copy it into the app bundle:\nrm -rf \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CouchbaseResources\"\nrsync -a \"${BUILT_PRODUCTS_DIR}/../${CONFIGURATION}-universal/Couchbase.framework/CouchbaseResources\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}\"";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
@@ -429,7 +429,7 @@
COPY_PHASE_STRIP = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
- "\"$(TARGET_BUILD_DIR)/../$(CONFIGURATION)-universal\"",
+ "\"$(BUILT_PRODUCTS_DIR)/../$(CONFIGURATION)-universal/Couchbase.framework/..\"",
);
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO;
@@ -462,7 +462,7 @@
COPY_PHASE_STRIP = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
- "\"$(TARGET_BUILD_DIR)/../$(CONFIGURATION)-universal\"",
+ "\"$(BUILT_PRODUCTS_DIR)/../$(CONFIGURATION)-universal/Couchbase.framework/..\"",
);
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
View
18 Framework/Couchbase.xcodeproj/project.pbxproj
@@ -215,6 +215,7 @@
273A733513BD471A0078870D /* Copy Header(s) */,
273A733F13BD4DDC0078870D /* Copy into CouchbaseResources */,
D9B664DE13D48BE1008CD673 /* Compile Erlang Libraries */,
+ 275C2CF21406F85A002CDB72 /* Make symlinks */,
);
buildRules = (
);
@@ -286,6 +287,21 @@
shellScript = "cp \"${CONFIGURATION_BUILD_DIR}/libCouchbase.a\" \"${CONFIGURATION_BUILD_DIR}/${EXECUTABLE_PATH}\"";
showEnvVarsInLog = 0;
};
+ 275C2CF21406F85A002CDB72 /* Make symlinks */ = {
+ isa = PBXShellScriptBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ inputPaths = (
+ );
+ name = "Make symlinks";
+ outputPaths = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ shellPath = /bin/sh;
+ shellScript = "ln -sf \"${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}\" \"${BUILD_DIR}/${CONFIGURATION}${EFFECTIVE_PLATFORM_NAME}/${WRAPPER_NAME}\"";
+ showEnvVarsInLog = 0;
+ };
D9B664DE13D48BE1008CD673 /* Compile Erlang Libraries */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
@@ -340,6 +356,7 @@
armv7,
);
COPY_PHASE_STRIP = NO;
+ DSTROOT = "/tmp/$(PROJECT_NAME)$(EFFECTIVE_PLATFORM_NAME).dst";
GCC_DYNAMIC_NO_PIC = NO;
GCC_OPTIMIZATION_LEVEL = 0;
GENERATE_MASTER_OBJECT_FILE = YES;
@@ -361,6 +378,7 @@
armv7,
);
COPY_PHASE_STRIP = YES;
+ DSTROOT = "/tmp/$(PROJECT_NAME)$(EFFECTIVE_PLATFORM_NAME).dst";
GENERATE_MASTER_OBJECT_FILE = YES;
LIBRARY_SEARCH_PATHS = (
"$(inherited)",

0 comments on commit f459d43

Please sign in to comment.
Something went wrong with that request. Please try again.