diff options
| author | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-03 14:14:17 +0000 |
|---|---|---|
| committer | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-03 14:14:17 +0000 |
| commit | c8b1a14eb7351d5b4fa7e528b26ffb1a63d8aae1 (patch) | |
| tree | 924d3babcb2f0d914a36c06332654df202f7b6ce /webkit/webkit.xcodeproj | |
| parent | 89dd579780fe211a4faaada2f37ffbd15165597c (diff) | |
| download | chromium_src-c8b1a14eb7351d5b4fa7e528b26ffb1a63d8aae1.zip chromium_src-c8b1a14eb7351d5b4fa7e528b26ffb1a63d8aae1.tar.gz chromium_src-c8b1a14eb7351d5b4fa7e528b26ffb1a63d8aae1.tar.bz2 | |
Fixes for the webcore target. Don't use another DerivedSources phase, just
rely on the DerivedSources generated by the v8 jsbindings target.
Review URL: http://codereview.chromium.org/6449
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2830 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/webkit.xcodeproj')
| -rw-r--r-- | webkit/webkit.xcodeproj/project.pbxproj | 4 | ||||
| -rwxr-xr-x | webkit/webkit.xcodeproj/webcore_prebuild.sh | 30 |
2 files changed, 5 insertions, 29 deletions
diff --git a/webkit/webkit.xcodeproj/project.pbxproj b/webkit/webkit.xcodeproj/project.pbxproj index 16be848..0ec7839 100644 --- a/webkit/webkit.xcodeproj/project.pbxproj +++ b/webkit/webkit.xcodeproj/project.pbxproj @@ -8417,6 +8417,7 @@ "$(HEADER_SEARCH_PATHS)", "$(CONFIGURATION_TEMP_DIR)/generated/include/v8", "$(CONFIGURATION_TEMP_DIR)/generated/DerivedSources/v8", + "$(CONFIGURATION_TEMP_DIR)/generated/DerivedSources/v8/bindings", "$(CONFIGURATION_TEMP_DIR)/generated/DerivedSources/v8/ForwardingHeaders/dom", "$(CONFIGURATION_TEMP_DIR)/generated/DerivedSources/v8/ForwardingHeaders/editing", "$(CONFIGURATION_TEMP_DIR)/generated/DerivedSources/v8/ForwardingHeaders/loader", @@ -8424,7 +8425,6 @@ "$(CONFIGURATION_TEMP_DIR)/generated/DerivedSources/v8/ForwardingHeaders/page_mac", "$(CONFIGURATION_TEMP_DIR)/generated/DerivedSources/v8/ForwardingHeaders/svg", "$(CONFIGURATION_TEMP_DIR)/generated/DerivedSources/v8/WebCore", - "$(CONFIGURATION_TEMP_DIR)/generated/WebCore/JavaScriptHeaders/v8", "$(CONFIGURATION_TEMP_DIR)/generated/WebCore/v8", ); PRODUCT_NAME = webcore; @@ -8440,6 +8440,7 @@ "$(HEADER_SEARCH_PATHS)", "$(CONFIGURATION_TEMP_DIR)/generated/include/v8", "$(CONFIGURATION_TEMP_DIR)/generated/DerivedSources/v8", + "$(CONFIGURATION_TEMP_DIR)/generated/DerivedSources/v8/bindings", "$(CONFIGURATION_TEMP_DIR)/generated/DerivedSources/v8/ForwardingHeaders/dom", "$(CONFIGURATION_TEMP_DIR)/generated/DerivedSources/v8/ForwardingHeaders/editing", "$(CONFIGURATION_TEMP_DIR)/generated/DerivedSources/v8/ForwardingHeaders/loader", @@ -8447,7 +8448,6 @@ "$(CONFIGURATION_TEMP_DIR)/generated/DerivedSources/v8/ForwardingHeaders/page_mac", "$(CONFIGURATION_TEMP_DIR)/generated/DerivedSources/v8/ForwardingHeaders/svg", "$(CONFIGURATION_TEMP_DIR)/generated/DerivedSources/v8/WebCore", - "$(CONFIGURATION_TEMP_DIR)/generated/WebCore/JavaScriptHeaders/v8", "$(CONFIGURATION_TEMP_DIR)/generated/WebCore/v8", ); PRODUCT_NAME = webcore; diff --git a/webkit/webkit.xcodeproj/webcore_prebuild.sh b/webkit/webkit.xcodeproj/webcore_prebuild.sh index 7d00941..861d759 100755 --- a/webkit/webkit.xcodeproj/webcore_prebuild.sh +++ b/webkit/webkit.xcodeproj/webcore_prebuild.sh @@ -27,35 +27,11 @@ fi rmdir "${GENERATED_DIR}/include/v8/new" -# TODO(mmentovai): fix this to not be so hokey - the Apple build expects -# JavaScriptCore to be in a framework This belongs in the JSConfig target, -# which already does something similar -mkdir -p "${GENERATED_DIR}/include/v8/JavaScriptCore" -cp -p "${SRCROOT}/../third_party/WebKit/JavaScriptCore/bindings/npruntime.h" \ - "${GENERATED_DIR}/include/v8/JavaScriptCore" - -export DerivedSourcesDir="${GENERATED_DIR}/DerivedSources/v8/WebCore" -mkdir -p "${GENERATED_DIR}/DerivedSources/v8/WebCore" -cd "${GENERATED_DIR}/DerivedSources/v8/WebCore" - -# export CREATE_HASH_TABLE="${SRCROOT}/../third_party/WebKit/JavaScriptCore/kjs/create_hash_table" -# TODO(mmentovai): The above is normally correct, but create_hash_table wound -# up without the svn:executable property set in our repository. See the TODO -# in jsbindings_prebuild.sh. -export CREATE_HASH_TABLE="${GENERATED_DIR}/create_hash_table" - +# TODO(mmentovai): Am I still needed? ln -sfh "${SRCROOT}/../third_party/WebKit/WebCore" WebCore -export WebCore="WebCore" -export SOURCE_ROOT="${WebCore}" -export PORTROOT="${SRCROOT}/port" - -export PUBLICDOMINTERFACES="${PORTROOT}/../pending/PublicDOMInterfaces.h" -make -f "${SRCROOT}/pending/DerivedSources.make" \ - -j $(/usr/sbin/sysctl -n hw.ncpu) -# Allow framework-style #imports of <WebCore/whatever.h> to find the right -# headers. -cd .. +# TODO(mmentovai): If I'm still needed, can I move to jsbindings_prebuild.sh? +cd "${GENERATED_DIR}/DerivedSources/v8" mkdir -p ForwardingHeaders/loader ln -sfh "${SRCROOT}/../third_party/WebKit/WebCore/loader" \ ForwardingHeaders/loader/WebCore |