Skip to content
This repository has been archived by the owner on Jan 13, 2022. It is now read-only.

adjust header locations #776

Closed
wants to merge 1 commit into from
Closed

adjust header locations #776

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/common/Configurations/Library.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
// limitations under the License.
//

HEADERS_FOLDER_PATH = /../three20/
PRIVATE_HEADERS_FOLDER_PATH = $(HEADERS_FOLDER_PATH)$(BASE_PRODUCT_NAME)/private
PUBLIC_HEADERS_FOLDER_PATH = $(HEADERS_FOLDER_PATH)$(BASE_PRODUCT_NAME)
PUBLIC_HEADERS_FOLDER_PATH = include/$(BASE_PRODUCT_NAME)
PRIVATE_HEADERS_FOLDER_PATH = $(PUBLIC_HEADERS_FOLDER_PATH)/private


GCC_PRECOMPILE_PREFIX_HEADER = YES
GCC_PREFIX_HEADER = $(SRCROOT)/Headers/$(BASE_PRODUCT_NAME)_Prefix.pch
Expand Down
21 changes: 3 additions & 18 deletions src/common/Configurations/Paths.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,25 +17,10 @@
REPO_ROOT_PATH = $(SRCROOT)/../..
ROOT_SOURCE_PATH = $(REPO_ROOT_PATH)/src

OBJROOT = $(REPO_ROOT_PATH)/Build
SYMROOT = $(OBJROOT)/Products

// Search Paths

LIBRARY_SEARCH_PATHS = $(STDLIB_LIBRARY)

// Header search paths: why we have three
//
// CONFIGURATION_BUILD_DIR is for when the headers are copied to Three20's Build folder.
// Applies to:
// - Xcode 3.2.#
// - Xcode 4 with the Build Location preference set to "Place build products in locations
// specified by targets"
//
// BUILT_PRODUCTS_DIR is for Xcode 4 support only. We need two copies of a BUILT_PRODUCTS_DIR path
// because on Archive builds, there is one extra folder placed between the
// product and the public header path.
// Applies to:
// - Xcode 4 only

HEADER_SEARCH_PATHS = $(STDLIB_HEADERS) "$(BUILT_PRODUCTS_DIR)/../three20" "$(BUILT_PRODUCTS_DIR)/../../three20" "$(CONFIGURATION_BUILD_DIR)/../../three20"
//add $(UninstalledProducts)/include to make archive-builds work
// (which don't have it added by default)
HEADER_SEARCH_PATHS = $(STDLIB_HEADERS) "$(OBJROOT)/UninstalledProducts/include"
3 changes: 0 additions & 3 deletions src/extThree20CSSStyle/Configurations/Library.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,3 @@
BASE_PRODUCT_NAME = extThree20CSSStyle
PRODUCT_NAME = $(BASE_PRODUCT_NAME)
BUILD_LIBRARY_VERSION = 1.0

PRIVATE_HEADERS_FOLDER_PATH = /../three20/$(BASE_PRODUCT_NAME)/private
PUBLIC_HEADERS_FOLDER_PATH = /../three20/$(BASE_PRODUCT_NAME)
5 changes: 0 additions & 5 deletions src/extThree20JSON/Configurations/Library+SBJSON.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,4 @@ BASE_PRODUCT_NAME = extThree20JSON
PRODUCT_NAME = $(BASE_PRODUCT_NAME)+SBJSON
BUILD_LIBRARY_VERSION = 1.0

// We override these paths in order to copy the headers to the same directory,
// regardless of target.
PRIVATE_HEADERS_FOLDER_PATH = /../three20/$(BASE_PRODUCT_NAME)/private
PUBLIC_HEADERS_FOLDER_PATH = /../three20/$(BASE_PRODUCT_NAME)

GCC_PREFIX_HEADER = $(SRCROOT)/Headers/$(BASE_PRODUCT_NAME)+SBJSON_Prefix.pch
5 changes: 0 additions & 5 deletions src/extThree20JSON/Configurations/Library+YAJL.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,4 @@ BASE_PRODUCT_NAME = extThree20JSON
PRODUCT_NAME = $(BASE_PRODUCT_NAME)+YAJL
BUILD_LIBRARY_VERSION = 1.0

// We override these paths in order to copy the headers to the same directory,
// regardless of target.
PRIVATE_HEADERS_FOLDER_PATH = /../three20/$(BASE_PRODUCT_NAME)/private
PUBLIC_HEADERS_FOLDER_PATH = /../three20/$(BASE_PRODUCT_NAME)

GCC_PREFIX_HEADER = $(SRCROOT)/Headers/$(BASE_PRODUCT_NAME)+YAJL_Prefix.pch
5 changes: 3 additions & 2 deletions src/scripts/Protect.command
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,10 @@ IFS=$'\n'
# In Xcode 4 Archive builds, there is one extra folder placed between the configuration build
# dir and the public headers path titled "ArchiveIntermediates".
if [[ "$DEPLOYMENT_LOCATION" == "YES" && "$XCODE_VERSION_MAJOR" -ge "0400" ]]; then
cd ${CONFIGURATION_BUILD_DIR}/..${PUBLIC_HEADERS_FOLDER_PATH}
echo ${TARGET_BUILD_DIR}/${PUBLIC_HEADERS_FOLDER_PATH}
cd ${TARGET_BUILD_DIR}/${PUBLIC_HEADERS_FOLDER_PATH}
else
cd ${CONFIGURATION_BUILD_DIR}${PUBLIC_HEADERS_FOLDER_PATH}
cd ${CONFIGURATION_BUILD_DIR}/${PUBLIC_HEADERS_FOLDER_PATH}
fi

chmod a-w *.h 2>> /dev/null
Expand Down