Permalink
Browse files

Update Catalog app for Xcode 4 and clang 2.0

  • Loading branch information...
1 parent f1181ad commit 389709dc258053e8a7868c5c2416dfc7e9faef6c @davidmorford committed May 12, 2011
Showing with 2,824 additions and 691 deletions.
  1. +21 −11 Configurations/Application.xcconfig
  2. +6 −0 Configurations/CodeSignIdentity.xcconfig
  3. +10 −13 Configurations/Compiler.xcconfig
  4. +13 −0 Configurations/Debug.xcconfig
  5. +6 −0 Configurations/DeploymentTarget.xcconfig
  6. +6 −0 Configurations/DeviceUniversal.xcconfig
  7. +6 −0 Configurations/DeviceiPad.xcconfig
  8. +6 −0 Configurations/DeviceiPhone.xcconfig
  9. +16 −12 Configurations/Frameworks.xcconfig
  10. +30 −21 Configurations/Library.xcconfig
  11. +17 −0 Configurations/Paths.xcconfig
  12. +8 −2 Configurations/Platform.xcconfig
  13. +9 −0 Configurations/Profile.xcconfig
  14. +5 −10 Configurations/Project.xcconfig
  15. +9 −0 Configurations/Release.xcconfig
  16. +9 −8 Configurations/Scripts.xcconfig
  17. +6 −4 Configurations/UnitTests.xcconfig
  18. +9 −9 Projects/Catalogs/NavigatorCatalog/Configurations/Application.xcconfig
  19. +9 −0 Projects/Catalogs/NavigatorCatalog/Configurations/Debug.xcconfig
  20. +1 −0 Projects/Catalogs/NavigatorCatalog/Configurations/Project.xcconfig
  21. +9 −0 Projects/Catalogs/NavigatorCatalog/Configurations/Release.xcconfig
  22. +10 −0 Projects/Catalogs/NavigatorCatalog/Navigator.xcworkspace/contents.xcworkspacedata
  23. +90 −0 .../Catalogs/NavigatorCatalog/Navigator.xcworkspace/xcshareddata/xcschemes/NavigatorCatalog.xcscheme
  24. +58 −0 ...ects/Catalogs/NavigatorCatalog/Navigator.xcworkspace/xcshareddata/xcschemes/NavigatorKit.xcscheme
  25. +400 −580 Projects/Catalogs/NavigatorCatalog/NavigatorCatalog.xcodeproj/project.pbxproj
  26. +7 −0 ...Catalogs/NavigatorCatalog/NavigatorCatalog.xcodeproj/project.xcworkspace/contents.xcworkspacedata
  27. +76 −0 ...logs/NavigatorCatalog/NavigatorCatalog.xcodeproj/xcshareddata/xcschemes/NavigatorCatalog.xcscheme
  28. +29 −0 Projects/Catalogs/NavigatorCatalog/Source/Classes/ApplicationDelegate/NVCApplicationDelegate.h
  29. +469 −0 Projects/Catalogs/NavigatorCatalog/Source/Classes/ApplicationDelegate/NVCApplicationDelegate.m
  30. +13 −0 Projects/Catalogs/NavigatorCatalog/Source/Classes/ApplicationDelegate/NVCUserDefaults.h
  31. +8 −0 Projects/Catalogs/NavigatorCatalog/Source/Classes/ApplicationDelegate/NVCUserDefaults.m
  32. +18 −0 Projects/Catalogs/NavigatorCatalog/Source/Classes/Controllers/NVCContentTableViewController.h
  33. +225 −0 Projects/Catalogs/NavigatorCatalog/Source/Classes/Controllers/NVCContentTableViewController.m
  34. +31 −0 Projects/Catalogs/NavigatorCatalog/Source/Classes/Controllers/NVCDetailViewController.h
  35. +191 −0 Projects/Catalogs/NavigatorCatalog/Source/Classes/Controllers/NVCDetailViewController.m
  36. +21 −0 Projects/Catalogs/NavigatorCatalog/Source/Classes/Controllers/NVCDocumentsFolderViewController.h
  37. +178 −0 Projects/Catalogs/NavigatorCatalog/Source/Classes/Controllers/NVCDocumentsFolderViewController.m
  38. +20 −0 Projects/Catalogs/NavigatorCatalog/Source/Classes/Controllers/NVCHistoryViewController.h
  39. +91 −0 Projects/Catalogs/NavigatorCatalog/Source/Classes/Controllers/NVCHistoryViewController.m
  40. +20 −0 Projects/Catalogs/NavigatorCatalog/Source/Classes/Controllers/NVCMappingTableViewController.h
  41. +91 −0 Projects/Catalogs/NavigatorCatalog/Source/Classes/Controllers/NVCMappingTableViewController.m
  42. +29 −0 Projects/Catalogs/NavigatorCatalog/Source/Classes/Controllers/NVCNavigationBarViewController.h
  43. +154 −0 Projects/Catalogs/NavigatorCatalog/Source/Classes/Controllers/NVCNavigationBarViewController.m
  44. +17 −0 Projects/Catalogs/NavigatorCatalog/Source/Classes/Controllers/NVCSettingsViewController.h
  45. +110 −0 Projects/Catalogs/NavigatorCatalog/Source/Classes/Controllers/NVCSettingsViewController.m
  46. +20 −0 Projects/Catalogs/NavigatorCatalog/Source/Classes/Views/NVCBackgroundView.h
  47. +126 −0 Projects/Catalogs/NavigatorCatalog/Source/Classes/Views/NVCBackgroundView.m
  48. +1 −1 Projects/Catalogs/NavigatorCatalog/Source/Project/main.m
  49. BIN Projects/Catalogs/NavigatorCatalog/Source/Resources/Media/Icon/Icon-72.png
  50. BIN Projects/Catalogs/NavigatorCatalog/Source/Resources/Media/Icon/Icon-Small-50.png
  51. BIN Projects/Catalogs/NavigatorCatalog/Source/Resources/Media/Icon/Icon-Small.png
  52. BIN Projects/Catalogs/NavigatorCatalog/Source/Resources/Media/Icon/Icon-Small@2x.png
  53. BIN Projects/Catalogs/NavigatorCatalog/Source/Resources/Media/Icon/Icon.icns
  54. BIN Projects/Catalogs/NavigatorCatalog/Source/Resources/Media/Icon/Icon.png
  55. BIN Projects/Catalogs/NavigatorCatalog/Source/Resources/Media/Icon/Icon@2x.png
  56. BIN Projects/Catalogs/NavigatorCatalog/Source/Resources/Media/Icon/iTunesArtwork
  57. BIN Projects/Catalogs/NavigatorCatalog/Source/Resources/Media/Images/FileTypes/Large/File@2x.png
  58. BIN Projects/Catalogs/NavigatorCatalog/Source/Resources/Media/Images/FileTypes/Large/Folder@2x.png
  59. BIN Projects/Catalogs/NavigatorCatalog/Source/Resources/Media/Images/FileTypes/Large/Image@2x.png
  60. BIN Projects/Catalogs/NavigatorCatalog/Source/Resources/Media/Images/FileTypes/Large/Pdf@2x.png
  61. BIN Projects/Catalogs/NavigatorCatalog/Source/Resources/Media/Images/FileTypes/Large/RichText@2x.png
  62. BIN Projects/Catalogs/NavigatorCatalog/Source/Resources/Media/Images/FileTypes/Large/Text@2x.png
  63. BIN Projects/Catalogs/NavigatorCatalog/Source/Resources/Media/Images/FileTypes/Small/File.png
  64. BIN Projects/Catalogs/NavigatorCatalog/Source/Resources/Media/Images/FileTypes/Small/Folder.png
  65. BIN Projects/Catalogs/NavigatorCatalog/Source/Resources/Media/Images/FileTypes/Small/Image.png
  66. BIN Projects/Catalogs/NavigatorCatalog/Source/Resources/Media/Images/FileTypes/Small/Pdf.png
  67. BIN Projects/Catalogs/NavigatorCatalog/Source/Resources/Media/Images/FileTypes/Small/RichText.png
  68. BIN Projects/Catalogs/NavigatorCatalog/Source/Resources/Media/Images/FileTypes/Small/Text.png
  69. BIN Projects/Catalogs/NavigatorCatalog/Source/Resources/Media/Images/Placeholder/popup-placeholder.png
  70. BIN Projects/Catalogs/NavigatorCatalog/Source/Resources/Media/Images/Tabs/action.png
  71. BIN Projects/Catalogs/NavigatorCatalog/Source/Resources/Media/Images/Tabs/action@2x.png
  72. BIN Projects/Catalogs/NavigatorCatalog/Source/Resources/Media/Images/Tabs/at.png
  73. BIN Projects/Catalogs/NavigatorCatalog/Source/Resources/Media/Images/Tabs/at@2x.png
  74. BIN Projects/Catalogs/NavigatorCatalog/Source/Resources/Media/Images/Tabs/cog.png
  75. BIN Projects/Catalogs/NavigatorCatalog/Source/Resources/Media/Images/Tabs/cog@2x.png
  76. BIN Projects/Catalogs/NavigatorCatalog/Source/Resources/Media/Images/Tabs/documents.png
  77. BIN Projects/Catalogs/NavigatorCatalog/Source/Resources/Media/Images/Tabs/documents@2x.png
  78. BIN Projects/Catalogs/NavigatorCatalog/Source/Resources/Media/Images/Tabs/history.png
  79. BIN Projects/Catalogs/NavigatorCatalog/Source/Resources/Media/Images/Tabs/history@2x.png
  80. BIN Projects/Catalogs/NavigatorCatalog/Source/Resources/Media/Images/Tabs/map.png
  81. BIN Projects/Catalogs/NavigatorCatalog/Source/Resources/Media/Images/Tabs/map@2x.png
  82. BIN Projects/Catalogs/NavigatorCatalog/Source/Resources/Media/Images/Tabs/modal.png
  83. BIN Projects/Catalogs/NavigatorCatalog/Source/Resources/Media/Images/Tabs/modal@2x.png
  84. BIN Projects/Catalogs/NavigatorCatalog/Source/Resources/Media/Images/Tabs/popup.png
  85. BIN Projects/Catalogs/NavigatorCatalog/Source/Resources/Media/Images/Tabs/popup@2x.png
  86. BIN Projects/Catalogs/NavigatorCatalog/Source/Resources/Media/Images/Tabs/preview.png
  87. BIN Projects/Catalogs/NavigatorCatalog/Source/Resources/Media/Images/Tabs/preview@2x.png
  88. BIN Projects/Catalogs/NavigatorCatalog/Source/Resources/Media/Images/Tabs/public.png
  89. BIN Projects/Catalogs/NavigatorCatalog/Source/Resources/Media/Images/Tabs/public@2x.png
  90. BIN Projects/Catalogs/NavigatorCatalog/Source/Resources/Media/Images/Tabs/routes.png
  91. BIN Projects/Catalogs/NavigatorCatalog/Source/Resources/Media/Images/Tabs/routes@2x.png
  92. BIN Projects/Catalogs/NavigatorCatalog/Source/Resources/Media/Images/Tabs/sendto.png
  93. BIN Projects/Catalogs/NavigatorCatalog/Source/Resources/Media/Images/Tabs/sendto@2x.png
  94. BIN Projects/Catalogs/NavigatorCatalog/Source/Resources/Media/Images/Toolbar/DividerShow.png
  95. BIN Projects/Catalogs/NavigatorCatalog/Source/Resources/Media/Images/Toolbar/DividerShow@2x.png
  96. BIN Projects/Catalogs/NavigatorCatalog/Source/Resources/Media/Images/Toolbar/FullScreen.png
  97. BIN Projects/Catalogs/NavigatorCatalog/Source/Resources/Media/Images/Toolbar/FullScreen@2x.png
  98. BIN Projects/Catalogs/NavigatorCatalog/Source/Resources/Media/Images/Toolbar/MasterArrow-Bottom.png
  99. BIN Projects/Catalogs/NavigatorCatalog/Source/Resources/Media/Images/Toolbar/MasterArrow-Bottom@2x.png
  100. BIN Projects/Catalogs/NavigatorCatalog/Source/Resources/Media/Images/Toolbar/MasterArrow-Left.png
  101. BIN Projects/Catalogs/NavigatorCatalog/Source/Resources/Media/Images/Toolbar/MasterArrow-Left@2x.png
  102. BIN Projects/Catalogs/NavigatorCatalog/Source/Resources/Media/Images/Toolbar/MasterArrow-Right.png
  103. BIN Projects/Catalogs/NavigatorCatalog/Source/Resources/Media/Images/Toolbar/MasterArrow-Right@2x.png
  104. BIN Projects/Catalogs/NavigatorCatalog/Source/Resources/Media/Images/Toolbar/MasterArrow-Top.png
  105. BIN Projects/Catalogs/NavigatorCatalog/Source/Resources/Media/Images/Toolbar/MasterArrow-Top@2x.png
  106. BIN Projects/Catalogs/NavigatorCatalog/Source/Resources/Media/Launch/Default@2x~iphone.png
  107. BIN Projects/Catalogs/NavigatorCatalog/Source/Resources/Media/Launch/Default~iphone.png
  108. BIN Projects/Catalogs/NavigatorCatalog/Source/Resources/Media/Launch/LaunchPad-Landscape.png
  109. BIN Projects/Catalogs/NavigatorCatalog/Source/Resources/Media/Launch/LaunchPad-Portrait.png
  110. +90 −0 Projects/Catalogs/NavigatorCatalog/Source/Resources/PropertyLists/Info.plist
  111. +8 −0 Projects/Catalogs/NavigatorCatalog/Source/Resources/PropertyLists/UserDefaults.plist
  112. +9 −19 Scripts/Build.command
  113. +3 −1 Scripts/CreateUniversalLibrary.sh
@@ -1,17 +1,27 @@
//
// Application.xcconfig
-// (c) 2008 - 2011, Semantap
+// iOS Application Project Structure
//
-SYMROOT = Build
-PROJECT_TREE_SOURCE_PATH = Source
-PROJECT_TREE_CLASSES_PATH = $(PROJECT_TREE_SOURCE_PATH)/Classes
-PROJECT_TREE_PROJECT_PATH = $(PROJECT_TREE_SOURCE_PATH)/Project
-PROJECT_TREE_RESOURCES_PATH = $(PROJECT_TREE_SOURCE_PATH)/Resources
-PROJECT_TREE_UNITTESTS_PATH = $(PROJECT_TREE_SOURCE_PATH)/UnitTests
+SYMROOT = Build
-APPLICATIONDELEGATE_INFOPLIST_PATH = $(PROJECT_TREE_CLASSES_PATH)/ApplicationDelegate/Resources/PropertyLists
-GCC_PRECOMPILE_PREFIX_HEADER = YES
-ALWAYS_SEARCH_USER_PATHS = NO
-PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO
+PROJECT_TREE_SOURCE_PATH = $(SRCROOT)/Source
+PROJECT_TREE_CLASSES_PATH = $(PROJECT_TREE_SOURCE_PATH)/Classes
+PROJECT_TREE_PROJECT_PATH = $(PROJECT_TREE_SOURCE_PATH)/Project
+PROJECT_TREE_RESOURCES_PATH = $(PROJECT_TREE_SOURCE_PATH)/Resources
+PROJECT_TREE_UNITTESTS_PATH = $(PROJECT_TREE_SOURCE_PATH)/UnitTests
+APPLICATIONDELEGATE_INFOPLIST_PATH = $(PROJECT_TREE_RESOURCES_PATH)/PropertyLists
+
+XCODE4_PROJECT_TREE_SOURCE_PATH = $(SRCROOT)/$(PROJECT_NAME)
+XCODE4_PROJECT_TREE_CLASSES_PATH = $(XCODE4_PROJECT_TREE_SOURCE_PATH)/Classes
+XCODE4_PROJECT_TREE_PROJECT_PATH = $(XCODE4_PROJECT_TREE_SOURCE_PATH)/Project
+XCODE4_PROJECT_TREE_UNITTESTS_PATH = $(XCODE4_PROJECT_TREE_SOURCE_PATH)/UnitTests
+XCODE4_PROJECT_TREE_RESOURCES_PATH = $(XCODE4_PROJECT_TREE_SOURCE_PATH)/Resources
+XCODE4_APPLICATIONDELEGATE_INFOPLIST_PATH = $(XCODE4_PROJECT_TREE_RESOURCES_PATH)/PropertyLists
+
+ALWAYS_SEARCH_USER_PATHS = NO
+GCC_PRECOMPILE_PREFIX_HEADER = YES
+PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO
+
+WRAPPER_EXTENSION = app
@@ -0,0 +1,6 @@
+
+//
+// CodeSignIdentity.xcconfig
+//
+
+CODE_SIGN_IDENTITY = iPhone Developer
@@ -1,19 +1,16 @@
//
// Compiler.xcconfig
-// (c) 2010 - 2011, Semantap
//
-GCC_C_LANGUAGE_STANDARD = c99
-GCC_WARN_ABOUT_RETURN_TYPE = YES
-GCC_WARN_UNUSED_VARIABLE = YES
-GCC_ENABLE_OBJC_EXCEPTIONS = YES
-GCC_ENABLE_FIX_AND_CONTINUE = NO
+ALWAYS_SEARCH_USER_PATHS = NO
+DEBUG_INFORMATION_FORMAT = dwarf-with-dsym
+GCC_C_LANGUAGE_STANDARD = c99
+GCC_WARN_ABOUT_RETURN_TYPE = YES
+GCC_WARN_UNUSED_VARIABLE = YES
+GCC_ENABLE_OBJC_EXCEPTIONS = YES
+GCC_ENABLE_FIX_AND_CONTINUE = NO
+PREBINDING = NO
+ZERO_LINK = NO
-// 4.2, com.apple.compilers.llvmgcc42
-GCC_VERSION = com.apple.compilers.llvm.clang.1_0
-
-// Warning:
-// - Fails in latest Xcode 4 DP when using Clang 2.0
-// - Currently works in with iOS 4.3 Beta 1 with Clang 1.7
-//OTHER_CFLAGS = -Xclang -fobjc-nonfragile-abi2
+GCC_VERSION = com.apple.compilers.llvm.clang.1_0
@@ -0,0 +1,13 @@
+
+//
+// Debug.xcconfig
+//
+
+GCC_DYNAMIC_NO_PIC = NO
+GCC_GENERATE_DEBUGGING_SYMBOLS = YES
+GCC_OPTIMIZATION_LEVEL = 0
+GCC_SYMBOLS_PRIVATE_EXTERN = NO
+
+//GCC_PREPROCESSOR_DEFINITIONS = DEBUG
+
+COPY_PHASE_STRIP = NO
@@ -0,0 +1,6 @@
+
+//
+// DeploymentTarget.xcconfig
+//
+
+IPHONEOS_DEPLOYMENT_TARGET = 4.2 //latest_iphoneos
@@ -0,0 +1,6 @@
+
+//
+// DeviceUniversal.xcconfig
+//
+
+TARGETED_DEVICE_FAMILY = 1,2
@@ -0,0 +1,6 @@
+
+//
+// DeviceiPad.xcconfig
+//
+
+TARGETED_DEVICE_FAMILY = 2
@@ -0,0 +1,6 @@
+
+//
+// DeviceiPhone.xcconfig
+//
+
+TARGETED_DEVICE_FAMILY = 1
@@ -1,38 +1,38 @@
//
// Frameworks.xcconfig
-// (c) 2008 - 2011, Semantap
//
// ObjC Library / Runtime
-OBJC_LIBRARY = -ObjC
-OBJC_ALLLOAD = -all_load
-OBJC_LIB = -lobjc
+OBJC_LIBRARY = -ObjC
+OBJC_ALLLOAD = -all_load
+OBJC_LIB = -lobjc
// stdlib / libSystem
-STDLIB_HEADER_PATH = /usr/include
-STDLIB_LIBRARY_PATH = /usr/lib
+STDLIB_HEADER_PATH = /usr/include
+STDLIB_LIBRARY_PATH = /usr/lib
// Lib Z compression
-LIBZ_LIB = -lz
+LIBZ_LIB = -lz
// LibXML2
-LIBXML2_HEADERS = /usr/include/libxml2
-LIBXML2_LIBRARY = /usr/lib
-LIBXML2_LIB = -lxml2
+LIBXML2_HEADERS = /usr/include/libxml2
+LIBXML2_LIBRARY = /usr/lib
+LIBXML2_LIB = -lxml2
// LibXML2
LIBSQLITE3_HEADER_PATH = /usr/include
LIBSQLITE3_LIBRARY_PATH = /usr/lib
LIBSQLITE3_LIBRARY_FLAG = -lsqlite3
-
-// Frameworks - iOS 4.2
+//
+// Frameworks as iOS 4.2. (Mostly here for reference sake. Use Xcode to add frameworks to project targets
+//
ACCELERATE_FX = -framework Accelerate
ADDRESSBOOK_FX = -framework AddressBook
@@ -76,3 +76,7 @@ UIKIT_FX = -framework UIKit
// Frameworks - Testing
SENTESTINGKIT_FX = -framework SenTestingKit
+
+// Framework Search Paths
+
+//FRAMEWORK_SEARCH_PATHS = $(SDKROOT)/Developer/Library/Frameworks
@@ -1,41 +1,50 @@
//
// Library.xcconfig
-// Static Library for Objective-C and C.
-// (c) 2008 - 2011, Semantap
+// Obj-C/C iOS Static Library Layout, Deployment and Project Structure
//
-GCC_PRECOMPILE_PREFIX_HEADER = NO
+GCC_PRECOMPILE_PREFIX_HEADER = NO
+//
// Override in Library.xcconfig in Xcode Library project.
+//
-RUN_CLANG_STATIC_ANALYZER = NO
+RUN_CLANG_STATIC_ANALYZER = NO
+//
// Library Project Directories
+//
-SYMROOT = Build
-PROJECT_TREE_SOURCE_PATH = Source
-PROJECT_TREE_CLASSES_PATH = $(PROJECT_TREE_SOURCE_PATH)/Classes
-PROJECT_TREE_PROJECT_PATH = $(PROJECT_TREE_SOURCE_PATH)/Project
-PROJECT_TREE_RESOURCES_PATH = $(PROJECT_TREE_SOURCE_PATH)/Resources
-PROJECT_TREE_UNITTESTS_PATH = $(PROJECT_TREE_SOURCE_PATH)/UnitTests
+SYMROOT = Build
+PROJECT_TREE_SOURCE_PATH = $(SRCROOT)
+PROJECT_TREE_CLASSES_PATH = $(PROJECT_TREE_SOURCE_PATH)/Classes
+PROJECT_TREE_PROJECT_PATH = $(PROJECT_TREE_SOURCE_PATH)/Project
+PROJECT_TREE_RESOURCES_PATH = $(PROJECT_TREE_SOURCE_PATH)/Resources
+PROJECT_TREE_UNITTESTS_PATH = $(PROJECT_TREE_SOURCE_PATH)/UnitTests
-LIBRARY_RESOURCES_PATH = $(PROJECT_TREE_PROJECT_PATH)/Resources
-LIBRARY_RESOURCE_BUNDLE_PATH = $(PROJECT_TREE_RESOURCES_PATH)/Bundles
+LIBRARY_RESOURCES_PATH = $(PROJECT_TREE_PROJECT_PATH)/Resources
+LIBRARY_RESOURCE_BUNDLE_PATH = $(PROJECT_TREE_RESOURCES_PATH)/Bundles
-// Library
+//
+// Library Directory Structure (Following the general format of .framework's)
+//
+
+BUILD_LIBRARY_VERSION_NAME = A
+BUILD_LIBRARY_VERSION_PATH = Versions/$(BUILD_LIBRARY_VERSION_NAME)
+BUILD_LIBRARY_HEADERS_PATH = Headers
+BUILD_LIBRARY_PRIVATEHEADERS_PATH = PrivateHeaders
+BUILD_LIBRARY_RESOURCES_PATH = Resources
-BUILD_LIBRARY_VERSION_NAME = A
-BUILD_LIBRARY_VERSION_PATH = Versions/$(BUILD_LIBRARY_VERSION_NAME)
-BUILD_LIBRARY_HEADERS_PATH = Headers
-BUILD_LIBRARY_PRIVATEHEADERS_PATH = PrivateHeaders
-BUILD_LIBRARY_RESOURCES_PATH = Resources
+// Prefix with a starting '/'
-PUBLIC_HEADERS_FOLDER_PATH = /$(PRODUCT_NAME)/$(BUILD_LIBRARY_HEADERS_PATH)
-PRIVATE_HEADERS_FOLDER_PATH = /$(PRODUCT_NAME)/$(BUILD_LIBRARY_PRIVATEHEADERS_PATH)
+PUBLIC_HEADERS_FOLDER_PATH = /$(PRODUCT_NAME)/$(BUILD_LIBRARY_HEADERS_PATH)
+PRIVATE_HEADERS_FOLDER_PATH = /$(PRODUCT_NAME)/$(BUILD_LIBRARY_PRIVATEHEADERS_PATH)
+//
// Library Deployment Paths
-// – Used by Scripts/DeployLibrary.sh $(SCRIPT_DEPLOY_LIBRARY) to deploy the library to the shared build location.
+// - Used by Scripts/DeployLibrary.sh $(SCRIPT_DEPLOY_LIBRARY) to deploy the library to the shared build location.
+//
DEPLOYED_BUILD_PLATFORM_PATH = $(BUILD_PLATFORM_NAME_PATH)
DEPLOYED_BUILD_PRODUCT_NAME_PATH = $(BUILD_PLATFORM_NAME_PATH)/$(PRODUCT_NAME)
@@ -0,0 +1,17 @@
+
+//
+// Paths.xcconfig
+//
+
+#include "Scripts.xcconfig"
+
+BUILD_SHARED_ROOT_PATH = $(SRCROOT)/../../../Build
+
+BUILD_SHARED_APPS_PATH = $(BUILD_SHARED_ROOT_PATH)/Applications
+BUILD_SHARED_BUNDLES_PATH = $(BUILD_SHARED_ROOT_PATH)/Bundles
+BUILD_SHARED_DOCUMENTS_PATH = $(BUILD_SHARED_ROOT_PATH)/Documents
+BUILD_SHARED_LIBRARIES_PATH = $(BUILD_SHARED_ROOT_PATH)/Libraries
+BUILD_SHARED_TOOLS_PATH = $(BUILD_SHARED_ROOT_PATH)/Tools
+BUILD_SHARED_TESTS_PATH = $(BUILD_SHARED_ROOT_PATH)/UnitTests
+
+BUILD_PLATFORM_NAME_PATH = $(BUILD_SHARED_LIBRARIES_PATH)/$(CONFIGURATION)/$(SDK_NAME)
@@ -1,7 +1,13 @@
//
// Platform.xcconfig
-// (c) 2008 - 2011, Semanteme
//
+// • Always use latest SDK target and do proper checks for existence of symbols, classes, selectors and functions.
+// • Weak linking with frameworks that have newer symbols is also an option but comes at a performance cost.
+//
+
+#include "DeviceUniversal.xcconfig"
+#include "DeploymentTarget.xcconfig"
-#include "Platform-Latest.xcconfig"
+SDKROOT = iphoneos
+ARCHS = $(ARCHS_STANDARD_32_BIT)
@@ -0,0 +1,9 @@
+
+//
+// Profile.xcconfig
+//
+
+GCC_OPTIMIZATION_LEVEL = 2
+GCC_GENERATE_DEBUGGING_SYMBOLS = YES
+GCC_DYNAMIC_NO_PIC = NO
+COPY_PHASE_STRIP = NO
@@ -1,17 +1,12 @@
//
// Project.xcconfig
-// (c) 2008 - 2011, Semantap
//
-#include "Settings.xcconfig"
+#include "Paths.xcconfig"
#include "Compiler.xcconfig"
-SYMROOT = Build
-CODE_SIGN_IDENTITY = iPhone Developer
-
-ZERO_LINK = NO
-PREBINDING = NO
-ALWAYS_SEARCH_USER_PATHS = NO
-
-DEBUG_INFORMATION_FORMAT = dwarf-with-dsym
+SYMROOT = Build
+//SOURCE_ROOT = Source
+//SRCROOT = Source
+CODE_SIGN_IDENTITY = iPhone Developer
@@ -0,0 +1,9 @@
+
+//
+// Release.xcconfig
+//
+
+GCC_OPTIMIZATION_LEVEL = s
+GCC_GENERATE_DEBUGGING_SYMBOLS = YES
+OTHER_CFLAGS = $(OTHER_CFLAGS) -DNS_BLOCK_ASSERTIONS=1
+COPY_PHASE_STRIP = YES
@@ -1,14 +1,15 @@
//
// Scripts.xcconfig
-// (c) 2008 - 2011, Semantap
+//
+// Scripts that create the top level Build directory for a project tree
+// and deploy static libraries and resource bundles
//
-BUILD_SCRIPTS_PATH = $(SRCROOT)/../../../Scripts
-
-SCRIPT_DEPLOY_LIBRARY = $(BUILD_SCRIPTS_PATH)/DeployLibrary.sh
-SCRIPT_DEPLOY_RESOURCE_BUNDLE = $(BUILD_SCRIPTS_PATH)/DeployResourceBundle.sh
-SCRIPT_DEPLOY_MANAGED_MODEL = $(BUILD_SCRIPTS_PATH)/DeployManagedModel.sh
+BUILD_SCRIPTS_PATH = $(SRCROOT)/../../../Scripts
-SCRIPT_COPY_RESOURCE_BUNDLE = $(BUILD_SCRIPTS_PATH)/CopyResourceBundle.sh
-SCRIPT_COPY_MANAGED_MODEL = $(BUILD_SCRIPTS_PATH)/CopyManagedModel.sh
+SCRIPT_DEPLOY_LIBRARY = $(BUILD_SCRIPTS_PATH)/DeployLibrary.sh
+SCRIPT_DEPLOY_RESOURCE_BUNDLE = $(BUILD_SCRIPTS_PATH)/DeployResourceBundle.sh
+SCRIPT_DEPLOY_MANAGED_MODEL = $(BUILD_SCRIPTS_PATH)/DeployManagedModel.sh
+SCRIPT_COPY_RESOURCE_BUNDLE = $(BUILD_SCRIPTS_PATH)/CopyResourceBundle.sh
+SCRIPT_COPY_MANAGED_MODEL = $(BUILD_SCRIPTS_PATH)/CopyManagedModel.sh
@@ -1,11 +1,13 @@
//
// UnitTests.xcconfig
-// (c) 2008 - 2011, Semantap
//
-#include "Settings.xcconfig"
+#include "Paths.xcconfig"
-WRAPPER_EXTENSION = octest
-FRAMEWORK_SEARCH_PATHS = $(SDKROOT)$(DEVELOPER_FRAMEWORKS_DIR)
+WRAPPER_EXTENSION = octest
+// $(DEVELOPER_FRAMEWORKS_DIR) seems to be set to a top level value instead for the
+// that does not play well when tools are not installed in /Developer.
+
+FRAMEWORK_SEARCH_PATHS = $(FRAMEWORK_SEARCH_PATHS) $(DEVELOPER_LIBRARY_DIR)/Frameworks
Oops, something went wrong.

0 comments on commit 389709d

Please sign in to comment.