Reviewed by vicki (changes by rjw)

	- make "weak" linking with Quartz work with buildit

        * WebKit.pbproj/project.pbxproj:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@7211 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 1e4cfacc2cfc23d36a54924af56a517a294875b8..a1015d3143d633dce56415d67f4f0da19561d347 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,11 @@
+2004-08-08  Vicki Murley  <vicki@apple.com>
+
+        Reviewed by vicki (changes by rjw)
+ 
+       - make "weak" linking with Quartz work with buildit
+
+        * WebKit.pbproj/project.pbxproj: 
+
 2004-08-06  Ken Kocienda  <kocienda@apple.com>
 
         Reviewed by Maciej

diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index dd0aa50365c96d2bee58b39c388db9cd31e6a909..4465146147f44acac4650896792265b153468241 100644 (file)
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -196,7 +196,7 @@
        <key>CFBundleShortVersionString</key>
        <string>2.0</string>
        <key>CFBundleVersion</key>
-       <string>156u</string>
+       <string>155</string>
 </dict>
 </plist>
 ";
@@ -1195,7 +1195,7 @@
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/sh;
-                       shellScript = "# Only link with Quartz if it is available, i.e. on Tiger or greater.\nif [ -f /System/Library/Frameworks/Quartz.framework/Quartz ]; then\n    export ADDITIONAL_LDFLAGS=\"-framework\\\" \\\"Quartz\"\nelse\n    export ADDITIONAL_LDFLAGS=\"\"\nfi\n\nunset CACHE_ROOT;export CACHE_ROOT\nunset CCHROOT;export CCHROOT\nunset CLONE_HEADERS;export CLONE_HEADERS\nunset COPY_PHASE_STRIP;export COPY_PHASE_STRIP\nunset COPY_RESOURCES_FROM_STATIC_FRAMEWORKS;export COPY_RESOURCES_FROM_STATIC_FRAMEWORKS\nunset CURRENT_PROJECT_VERSION;export CURRENT_PROJECT_VERSION\nunset DEBUGGING_SYMBOLS;export DEBUGGING_SYMBOLS\nunset DEBUG_CFLAGS;export DEBUG_CFLAGS\nunset DEPLOYMENT_LOCATION;export DEPLOYMENT_LOCATION\nunset DERIVED_PATHS;export DERIVED_PATHS\nunset GCC_DYNAMIC_NO_PIC;export GCC_DYNAMIC_NO_PIC\nunset GCC_ENABLE_FIX_AND_CONTINUE;export GCC_ENABLE_FIX_AND_CONTINUE\nunset GCC_GENERATE_DEBUGGING_SYMBOLS;export GCC_GENERATE_DEBUGGING_SYMBOLS\nunset GCC_OPTIMIZATION_LEVEL;export GCC_OPTIMIZATION_LEVEL\nunset GCC_TREAT_WARNINGS_AS_ERRORS;export GCC_TREAT_WARNINGS_AS_ERRORS\nunset GCC_VERSION;export GCC_VERSION\nunset GENERATE_PKGINFO_FILE;export GENERATE_PKGINFO_FILE\nunset GENERATE_PROFILING_CODE;export GENERATE_PROFILING_CODE\nunset GLOBAL_CFLAGS;export GLOBAL_CFLAGS\nunset HEADER_SEARCH_PATHS;export HEADER_SEARCH_PATHS\nunset LIBRARY_SEARCH_PATHS;export LIBRARY_SEARCH_PATHS\nunset LINKER_LIBRARY_FLAGS;export LINKER_LIBRARY_FLAGS\nunset LINK_FILE_LIST_normal;export LINK_FILE_LIST_normal\nunset MACOSX_DEPLOYMENT_TARGET;export MACOSX_DEPLOYMENT_TARGET\nunset MAC_OS_X_VERSION_MAX_ALLOWED;export MAC_OS_X_VERSION_MAX_ALLOWED\nunset MAC_OS_X_VERSION_MIN_REQUIRED;export MAC_OS_X_VERSION_MIN_REQUIRED\nunset MAKEFLAGS;export MAKEFLAGS\nunset MAKELEVEL;export MAKELEVEL\nunset MFLAGS;export MFLAGS\nunset NO_COMMON;export NO_COMMON\nunset OPTERR;export OPTERR\nunset OPTIMIZATION_CFLAGS;export OPTIMIZATION_CFLAGS\nunset OPTIMIZATION_LEVEL;export OPTIMIZATION_LEVEL\nunset OPTIND;export OPTIND\nunset OSAC;export OSAC\nunset OTHER_CFLAGS;export OTHER_CFLAGS\nunset OTHER_CPLUSPLUSFLAGS;export OTHER_CPLUSPLUSFLAGS\nunset OTHER_LDFLAGS;export OTHER_LDFLAGS\nunset OTHER_MIGFLAGS;export OTHER_MIGFLAGS\nunset OTHER_OSAFLAGS;export OTHER_OSAFLAGS\nunset OTHER_PRECOMP_CFLAGS;export OTHER_PRECOMP_CFLAGS\nunset OTHER_RESMERGERFLAGS;export OTHER_RESMERGERFLAGS\nunset OTHER_REZFLAGS;export OTHER_REZFLAGS\nunset PACKAGE_TYPE;export PACKAGE_TYPE\nunset PATH_PREFIXES_EXCLUDED_FROM_HEADER_DEPENDENCIES;export PATH_PREFIXES_EXCLUDED_FROM_HEADER_DEPENDENCIES\nunset PBDEVELOPMENTPLIST_PATH;export PBDEVELOPMENTPLIST_PATH\nunset PREBINDING;export PREBINDING\nunset PRIVATE_HEADERS_FOLDER_PATH;export PRIVATE_HEADERS_FOLDER_PATH\nunset PRODUCT_NAME;export PRODUCT_NAME\nunset PRODUCT_SETTINGS_PATH;export PRODUCT_SETTINGS_PATH\nunset PRODUCT_TYPE;export PRODUCT_TYPE\nunset PRODUCT_TYPE_CFLAGS;export PRODUCT_TYPE_CFLAGS\nunset PRODUCT_TYPE_CPLUSPLUSFLAGS;export PRODUCT_TYPE_CPLUSPLUSFLAGS\nunset PRODUCT_TYPE_HEADER_SEARCH_PATHS;export PRODUCT_TYPE_HEADER_SEARCH_PATHS\nunset PROJECT;export PROJECT\nunset PROJECT_DERIVED_FILE_DIR;export PROJECT_DERIVED_FILE_DIR\nunset PROJECT_NAME;export PROJECT_NAME\nunset PROJECT_TEMP_DIR;export PROJECT_TEMP_DIR\nunset PUBLIC_HEADERS_FOLDER_PATH;export PUBLIC_HEADERS_FOLDER_PATH\nunset QMAKESPEC;export QMAKESPEC\nunset REMOVE_CVS_FROM_RESOURCES;export REMOVE_CVS_FROM_RESOURCES\nunset RETAIN_RAW_BINARIES;export RETAIN_RAW_BINARIES\nunset REZ_SEARCH_PATHS;export REZ_SEARCH_PATHS\nunset SCRIPTS_FOLDER_PATH;export SCRIPTS_FOLDER_PATH\nunset SCRIPT_INPUT_FILE_COUNT;export SCRIPT_INPUT_FILE_COUNT\nunset SCRIPT_OUTPUT_FILE_COUNT;export SCRIPT_OUTPUT_FILE_COUNT\nunset SDKROOT;export SDKROOT\nunset SECTORDER_FLAGS;export SECTORDER_FLAGS\nunset SECURITYSESSIONID;export SECURITYSESSIONID\nunset SKIP_INSTALL;export SKIP_INSTALL\nunset USE_DYNAMIC_NO_PIC;export USE_DYNAMIC_NO_PIC\nunset USE_GCC3_PFE_SUPPORT;export USE_GCC3_PFE_SUPPORT\nunset USE_HEADERMAP;export USE_HEADERMAP\nunset USE_HEADER_SYMLINKS;export USE_HEADER_SYMLINKS\n\nxcodebuild -target WebKit -buildstyle ${BUILD_STYLE} OBJROOT=${OBJROOT} SYMROOT=${SYMROOT} DSTROOT=${DSTROOT}\n";
+                       shellScript = "# Only link with Quartz if it is available, i.e. on Tiger or greater.\nif [ -f /System/Library/Frameworks/Quartz.framework/Quartz ]; then\n    export ADDITIONAL_LDFLAGS=\"-framework\\\" \\\"Quartz\"\nelse\n    export ADDITIONAL_LDFLAGS=\"\"\nfi\n\nunset CACHE_ROOT;export CACHE_ROOT\nunset CCHROOT;export CCHROOT\nunset CLONE_HEADERS;export CLONE_HEADERS\nunset COPY_PHASE_STRIP;export COPY_PHASE_STRIP\nunset COPY_RESOURCES_FROM_STATIC_FRAMEWORKS;export COPY_RESOURCES_FROM_STATIC_FRAMEWORKS\nunset CURRENT_PROJECT_VERSION;export CURRENT_PROJECT_VERSION\nunset DEBUGGING_SYMBOLS;export DEBUGGING_SYMBOLS\nunset DEBUG_CFLAGS;export DEBUG_CFLAGS\nunset DEPLOYMENT_LOCATION;export DEPLOYMENT_LOCATION\nunset DERIVED_PATHS;export DERIVED_PATHS\nunset GCC_DYNAMIC_NO_PIC;export GCC_DYNAMIC_NO_PIC\nunset GCC_ENABLE_FIX_AND_CONTINUE;export GCC_ENABLE_FIX_AND_CONTINUE\nunset GCC_GENERATE_DEBUGGING_SYMBOLS;export GCC_GENERATE_DEBUGGING_SYMBOLS\nunset GCC_OPTIMIZATION_LEVEL;export GCC_OPTIMIZATION_LEVEL\nunset GCC_TREAT_WARNINGS_AS_ERRORS;export GCC_TREAT_WARNINGS_AS_ERRORS\nunset GCC_VERSION;export GCC_VERSION\nunset GENERATE_PKGINFO_FILE;export GENERATE_PKGINFO_FILE\nunset GENERATE_PROFILING_CODE;export GENERATE_PROFILING_CODE\nunset GLOBAL_CFLAGS;export GLOBAL_CFLAGS\nunset HEADER_SEARCH_PATHS;export HEADER_SEARCH_PATHS\nunset LIBRARY_SEARCH_PATHS;export LIBRARY_SEARCH_PATHS\nunset LINKER_LIBRARY_FLAGS;export LINKER_LIBRARY_FLAGS\nunset LINK_FILE_LIST_normal;export LINK_FILE_LIST_normal\nunset MACOSX_DEPLOYMENT_TARGET;export MACOSX_DEPLOYMENT_TARGET\nunset MAC_OS_X_VERSION_MAX_ALLOWED;export MAC_OS_X_VERSION_MAX_ALLOWED\nunset MAC_OS_X_VERSION_MIN_REQUIRED;export MAC_OS_X_VERSION_MIN_REQUIRED\nunset MAKEFLAGS;export MAKEFLAGS\nunset MAKELEVEL;export MAKELEVEL\nunset MFLAGS;export MFLAGS\nunset NO_COMMON;export NO_COMMON\nunset OPTERR;export OPTERR\nunset OPTIMIZATION_CFLAGS;export OPTIMIZATION_CFLAGS\nunset OPTIMIZATION_LEVEL;export OPTIMIZATION_LEVEL\nunset OPTIND;export OPTIND\nunset OSAC;export OSAC\nunset OTHER_CFLAGS;export OTHER_CFLAGS\nunset OTHER_CPLUSPLUSFLAGS;export OTHER_CPLUSPLUSFLAGS\nunset OTHER_LDFLAGS;export OTHER_LDFLAGS\nunset OTHER_MIGFLAGS;export OTHER_MIGFLAGS\nunset OTHER_OSAFLAGS;export OTHER_OSAFLAGS\nunset OTHER_PRECOMP_CFLAGS;export OTHER_PRECOMP_CFLAGS\nunset OTHER_RESMERGERFLAGS;export OTHER_RESMERGERFLAGS\nunset OTHER_REZFLAGS;export OTHER_REZFLAGS\nunset PACKAGE_TYPE;export PACKAGE_TYPE\nunset PATH_PREFIXES_EXCLUDED_FROM_HEADER_DEPENDENCIES;export PATH_PREFIXES_EXCLUDED_FROM_HEADER_DEPENDENCIES\nunset PBDEVELOPMENTPLIST_PATH;export PBDEVELOPMENTPLIST_PATH\nunset PREBINDING;export PREBINDING\nunset PRIVATE_HEADERS_FOLDER_PATH;export PRIVATE_HEADERS_FOLDER_PATH\nunset PRODUCT_NAME;export PRODUCT_NAME\nunset PRODUCT_SETTINGS_PATH;export PRODUCT_SETTINGS_PATH\nunset PRODUCT_TYPE;export PRODUCT_TYPE\nunset PRODUCT_TYPE_CFLAGS;export PRODUCT_TYPE_CFLAGS\nunset PRODUCT_TYPE_CPLUSPLUSFLAGS;export PRODUCT_TYPE_CPLUSPLUSFLAGS\nunset PRODUCT_TYPE_HEADER_SEARCH_PATHS;export PRODUCT_TYPE_HEADER_SEARCH_PATHS\nunset PROJECT;export PROJECT\nunset PROJECT_DERIVED_FILE_DIR;export PROJECT_DERIVED_FILE_DIR\nunset PROJECT_NAME;export PROJECT_NAME\nunset PROJECT_TEMP_DIR;export PROJECT_TEMP_DIR\nunset PUBLIC_HEADERS_FOLDER_PATH;export PUBLIC_HEADERS_FOLDER_PATH\nunset QMAKESPEC;export QMAKESPEC\nunset REMOVE_CVS_FROM_RESOURCES;export REMOVE_CVS_FROM_RESOURCES\nunset RETAIN_RAW_BINARIES;export RETAIN_RAW_BINARIES\nunset REZ_SEARCH_PATHS;export REZ_SEARCH_PATHS\nunset SCRIPTS_FOLDER_PATH;export SCRIPTS_FOLDER_PATH\nunset SCRIPT_INPUT_FILE_COUNT;export SCRIPT_INPUT_FILE_COUNT\nunset SCRIPT_OUTPUT_FILE_COUNT;export SCRIPT_OUTPUT_FILE_COUNT\nunset SDKROOT;export SDKROOT\nunset SECTORDER_FLAGS;export SECTORDER_FLAGS\nunset SECURITYSESSIONID;export SECURITYSESSIONID\nunset SKIP_INSTALL;export SKIP_INSTALL\nunset USE_DYNAMIC_NO_PIC;export USE_DYNAMIC_NO_PIC\nunset USE_GCC3_PFE_SUPPORT;export USE_GCC3_PFE_SUPPORT\nunset USE_HEADERMAP;export USE_HEADERMAP\nunset USE_HEADER_SYMLINKS;export USE_HEADER_SYMLINKS\n\nif [ -z \"${BUILD_STYLE}\" ]; then\n    xcodebuild ${ACTION} -target WebKit OBJROOT=${OBJROOT} SYMROOT=${SYMROOT} DSTROOT=${DSTROOT}\nelse\n    xcodebuild ${ACTION} -target WebKit -buildstyle ${BUILD_STYLE} OBJROOT=${OBJROOT} SYMROOT=${SYMROOT} DSTROOT=${DSTROOT}\nfi\n";
                };
                51443F9A0429392B00CA2D3A = {
                        fileEncoding = 30;