- Revision
- 238639
- Author
- [email protected]
- Date
- 2018-11-28 14:09:52 -0800 (Wed, 28 Nov 2018)
Log Message
Update generate-{derived,unified}-sources scripts to support generating .xcfilelist files
https://bugs.webkit.org/show_bug.cgi?id=192031
<rdar://problem/46286816>
Reviewed by Alex Christensen.
The Generate Derived Sources and Generate Unified Sources build phases
in Xcode need to have their inputs and outputs specified. This
specification will come in the form of .xcfilelist files that will be
attached to these build phases. There is one .xcfilelist file that
lists the input file and one that lists the output files. As part of
this work, the various generate-{derived,unified}-sources scripts that
are executed in these Generate build phases are modified to help in
the creation of these .xcfilelist files. In particular, they can now
be invoked with command-line parameters. These parameters are then
used to alter the normal execution of these scripts, causing them to
produce the .xcfilelist files as opposed to actually generating the
files that are listed in those files.
Source/_javascript_Core:
* Scripts/generate-derived-sources.sh:
* Scripts/generate-unified-sources.sh:
Source/WebCore:
No new tests -- no changed functionality.
* Scripts/generate-derived-sources.sh:
* Scripts/generate-unified-sources.sh:
Source/WebKit:
* Scripts/generate-derived-sources.sh:
* Scripts/generate-unified-sources.sh:
Tools:
* DumpRenderTree/Scripts/generate-derived-sources.sh:
* WebKitTestRunner/Scripts/generate-derived-sources.sh:
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (238638 => 238639)
--- trunk/Source/_javascript_Core/ChangeLog 2018-11-28 22:07:45 UTC (rev 238638)
+++ trunk/Source/_javascript_Core/ChangeLog 2018-11-28 22:09:52 UTC (rev 238639)
@@ -1,5 +1,29 @@
2018-11-28 Keith Rollin <[email protected]>
+ Update generate-{derived,unified}-sources scripts to support generating .xcfilelist files
+ https://bugs.webkit.org/show_bug.cgi?id=192031
+ <rdar://problem/46286816>
+
+ Reviewed by Alex Christensen.
+
+ The Generate Derived Sources and Generate Unified Sources build phases
+ in Xcode need to have their inputs and outputs specified. This
+ specification will come in the form of .xcfilelist files that will be
+ attached to these build phases. There is one .xcfilelist file that
+ lists the input file and one that lists the output files. As part of
+ this work, the various generate-{derived,unified}-sources scripts that
+ are executed in these Generate build phases are modified to help in
+ the creation of these .xcfilelist files. In particular, they can now
+ be invoked with command-line parameters. These parameters are then
+ used to alter the normal execution of these scripts, causing them to
+ produce the .xcfilelist files as opposed to actually generating the
+ files that are listed in those files.
+
+ * Scripts/generate-derived-sources.sh:
+ * Scripts/generate-unified-sources.sh:
+
+2018-11-28 Keith Rollin <[email protected]>
+
Revert print_all_generated_files work in r238008; tighten up target specifications
https://bugs.webkit.org/show_bug.cgi?id=192025
<rdar://problem/46284301>
Modified: trunk/Source/_javascript_Core/Scripts/generate-derived-sources.sh (238638 => 238639)
--- trunk/Source/_javascript_Core/Scripts/generate-derived-sources.sh 2018-11-28 22:07:45 UTC (rev 238638)
+++ trunk/Source/_javascript_Core/Scripts/generate-derived-sources.sh 2018-11-28 22:09:52 UTC (rev 238639)
@@ -2,6 +2,8 @@
set -e
+ARGS=("$@")
+
mkdir -p "${BUILT_PRODUCTS_DIR}/DerivedSources/_javascript_Core"
cd "${BUILT_PRODUCTS_DIR}/DerivedSources/_javascript_Core"
@@ -9,4 +11,4 @@
export _javascript_Core="_javascript_Core"
export BUILT_PRODUCTS_DIR="../.."
-make --no-builtin-rules -f "_javascript_Core/DerivedSources.make" -j `/usr/sbin/sysctl -n hw.ncpu`
+make --no-builtin-rules -f "_javascript_Core/DerivedSources.make" -j `/usr/sbin/sysctl -n hw.ncpu` "${ARGS[@]}"
Modified: trunk/Source/_javascript_Core/Scripts/generate-unified-sources.sh (238638 => 238639)
--- trunk/Source/_javascript_Core/Scripts/generate-unified-sources.sh 2018-11-28 22:07:45 UTC (rev 238638)
+++ trunk/Source/_javascript_Core/Scripts/generate-unified-sources.sh 2018-11-28 22:09:52 UTC (rev 238639)
@@ -2,15 +2,23 @@
set -e
+ARGS=("$@")
+
cd $SRCROOT
-if [ "${DEPLOYMENT_LOCATION}" == "YES" ]; then
- BUILD_SCRIPTS_DIR="${SDKROOT}${WK_ALTERNATE_WEBKIT_SDK_PATH}/usr/local/include/wtf/Scripts"
-else
- BUILD_SCRIPTS_DIR="${BUILT_PRODUCTS_DIR}/usr/local/include/wtf/Scripts"
+if [ -z "${BUILD_SCRIPTS_DIR}" ]; then
+ if [ "${DEPLOYMENT_LOCATION}" == "YES" ]; then
+ BUILD_SCRIPTS_DIR="${SDKROOT}${WK_ALTERNATE_WEBKIT_SDK_PATH}/usr/local/include/wtf/Scripts"
+ else
+ BUILD_SCRIPTS_DIR="${BUILT_PRODUCTS_DIR}/usr/local/include/wtf/Scripts"
+ fi
fi
UnifiedSourceCppFileCount=145
UnifiedSourceMmFileCount=5
-/usr/bin/env ruby "${BUILD_SCRIPTS_DIR}/generate-unified-source-bundles.rb" "--derived-sources-path" "${BUILT_PRODUCTS_DIR}/DerivedSources/_javascript_Core" "--source-tree-path" "${SRCROOT}" "--max-cpp-bundle-count" "${UnifiedSourceCppFileCount}" "--max-obj-c-bundle-count" "${UnifiedSourceMmFileCount}" "Sources.txt" "SourcesCocoa.txt" > /dev/null
+if [ $# -eq 0 ]; then
+ echo "Using unified source list files: Sources.txt, SourcesCocoa.txt"
+fi
+
+/usr/bin/env ruby "${BUILD_SCRIPTS_DIR}/generate-unified-source-bundles.rb" "--derived-sources-path" "${BUILT_PRODUCTS_DIR}/DerivedSources/_javascript_Core" "--source-tree-path" "${SRCROOT}" "--max-cpp-bundle-count" "${UnifiedSourceCppFileCount}" "--max-obj-c-bundle-count" "${UnifiedSourceMmFileCount}" "Sources.txt" "SourcesCocoa.txt" "${ARGS[@]}" > /dev/null
Modified: trunk/Source/WebCore/ChangeLog (238638 => 238639)
--- trunk/Source/WebCore/ChangeLog 2018-11-28 22:07:45 UTC (rev 238638)
+++ trunk/Source/WebCore/ChangeLog 2018-11-28 22:09:52 UTC (rev 238639)
@@ -1,5 +1,31 @@
2018-11-28 Keith Rollin <[email protected]>
+ Update generate-{derived,unified}-sources scripts to support generating .xcfilelist files
+ https://bugs.webkit.org/show_bug.cgi?id=192031
+ <rdar://problem/46286816>
+
+ Reviewed by Alex Christensen.
+
+ The Generate Derived Sources and Generate Unified Sources build phases
+ in Xcode need to have their inputs and outputs specified. This
+ specification will come in the form of .xcfilelist files that will be
+ attached to these build phases. There is one .xcfilelist file that
+ lists the input file and one that lists the output files. As part of
+ this work, the various generate-{derived,unified}-sources scripts that
+ are executed in these Generate build phases are modified to help in
+ the creation of these .xcfilelist files. In particular, they can now
+ be invoked with command-line parameters. These parameters are then
+ used to alter the normal execution of these scripts, causing them to
+ produce the .xcfilelist files as opposed to actually generating the
+ files that are listed in those files.
+
+ No new tests -- no changed functionality.
+
+ * Scripts/generate-derived-sources.sh:
+ * Scripts/generate-unified-sources.sh:
+
+2018-11-28 Keith Rollin <[email protected]>
+
Revert print_all_generated_files work in r238008; tighten up target specifications
https://bugs.webkit.org/show_bug.cgi?id=192025
<rdar://problem/46284301>
Modified: trunk/Source/WebCore/Scripts/generate-derived-sources.sh (238638 => 238639)
--- trunk/Source/WebCore/Scripts/generate-derived-sources.sh 2018-11-28 22:07:45 UTC (rev 238638)
+++ trunk/Source/WebCore/Scripts/generate-derived-sources.sh 2018-11-28 22:09:52 UTC (rev 238639)
@@ -2,6 +2,8 @@
set -e
+ARGS=("$@")
+
mkdir -p "${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore"
cd "${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore"
@@ -21,5 +23,5 @@
MAKEFILE_INCLUDE_FLAGS=$(echo "${WEBKITADDITIONS_HEADER_SEARCH_PATHS}" | perl -e 'print "-I" . join(" -I", split(" ", <>));')
if [ "${ACTION}" = "build" -o "${ACTION}" = "install" -o "${ACTION}" = "installhdrs" -o "${ACTION}" = "installapi" ]; then
- make --no-builtin-rules ${MAKEFILE_INCLUDE_FLAGS} -f "WebCore/DerivedSources.make" -j `/usr/sbin/sysctl -n hw.activecpu` SDKROOT="${SDKROOT}"
+ make --no-builtin-rules ${MAKEFILE_INCLUDE_FLAGS} -f "WebCore/DerivedSources.make" -j `/usr/sbin/sysctl -n hw.activecpu` SDKROOT="${SDKROOT}" "${ARGS[@]}"
fi
Modified: trunk/Source/WebCore/Scripts/generate-unified-sources.sh (238638 => 238639)
--- trunk/Source/WebCore/Scripts/generate-unified-sources.sh 2018-11-28 22:07:45 UTC (rev 238638)
+++ trunk/Source/WebCore/Scripts/generate-unified-sources.sh 2018-11-28 22:09:52 UTC (rev 238639)
@@ -2,17 +2,23 @@
set -e
+ARGS=("$@")
+
cd $SRCROOT
-if [ "${DEPLOYMENT_LOCATION}" == "YES" ]; then
- BUILD_SCRIPTS_DIR="${SDKROOT}${WK_ALTERNATE_WEBKIT_SDK_PATH}/usr/local/include/wtf/Scripts"
-else
- BUILD_SCRIPTS_DIR="${BUILT_PRODUCTS_DIR}/usr/local/include/wtf/Scripts"
+if [ -z "${BUILD_SCRIPTS_DIR}" ]; then
+ if [ "${DEPLOYMENT_LOCATION}" == "YES" ]; then
+ BUILD_SCRIPTS_DIR="${SDKROOT}${WK_ALTERNATE_WEBKIT_SDK_PATH}/usr/local/include/wtf/Scripts"
+ else
+ BUILD_SCRIPTS_DIR="${BUILT_PRODUCTS_DIR}/usr/local/include/wtf/Scripts"
+ fi
fi
UnifiedSourceCppFileCount=530
UnifiedSourceMmFileCount=62
-echo "Using unified source list files: Sources.txt, SourcesCocoa.txt"
+if [ $# -eq 0 ]; then
+ echo "Using unified source list files: Sources.txt, SourcesCocoa.txt"
+fi
-/usr/bin/env ruby "${BUILD_SCRIPTS_DIR}/generate-unified-source-bundles.rb" "--derived-sources-path" "${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore" "--source-tree-path" "${SRCROOT}" "--feature-flags" "${FEATURE_DEFINES}" "--max-cpp-bundle-count" "${UnifiedSourceCppFileCount}" "--max-obj-c-bundle-count" "${UnifiedSourceMmFileCount}" "Sources.txt" "SourcesCocoa.txt" > /dev/null
+/usr/bin/env ruby "${BUILD_SCRIPTS_DIR}/generate-unified-source-bundles.rb" "--derived-sources-path" "${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore" "--source-tree-path" "${SRCROOT}" "--feature-flags" "${FEATURE_DEFINES}" "--max-cpp-bundle-count" "${UnifiedSourceCppFileCount}" "--max-obj-c-bundle-count" "${UnifiedSourceMmFileCount}" "Sources.txt" "SourcesCocoa.txt" "${ARGS[@]}" > /dev/null
Modified: trunk/Source/WebKit/ChangeLog (238638 => 238639)
--- trunk/Source/WebKit/ChangeLog 2018-11-28 22:07:45 UTC (rev 238638)
+++ trunk/Source/WebKit/ChangeLog 2018-11-28 22:09:52 UTC (rev 238639)
@@ -1,5 +1,29 @@
2018-11-28 Keith Rollin <[email protected]>
+ Update generate-{derived,unified}-sources scripts to support generating .xcfilelist files
+ https://bugs.webkit.org/show_bug.cgi?id=192031
+ <rdar://problem/46286816>
+
+ Reviewed by Alex Christensen.
+
+ The Generate Derived Sources and Generate Unified Sources build phases
+ in Xcode need to have their inputs and outputs specified. This
+ specification will come in the form of .xcfilelist files that will be
+ attached to these build phases. There is one .xcfilelist file that
+ lists the input file and one that lists the output files. As part of
+ this work, the various generate-{derived,unified}-sources scripts that
+ are executed in these Generate build phases are modified to help in
+ the creation of these .xcfilelist files. In particular, they can now
+ be invoked with command-line parameters. These parameters are then
+ used to alter the normal execution of these scripts, causing them to
+ produce the .xcfilelist files as opposed to actually generating the
+ files that are listed in those files.
+
+ * Scripts/generate-derived-sources.sh:
+ * Scripts/generate-unified-sources.sh:
+
+2018-11-28 Keith Rollin <[email protected]>
+
Revert print_all_generated_files work in r238008; tighten up target specifications
https://bugs.webkit.org/show_bug.cgi?id=192025
<rdar://problem/46284301>
Modified: trunk/Source/WebKit/Scripts/generate-derived-sources.sh (238638 => 238639)
--- trunk/Source/WebKit/Scripts/generate-derived-sources.sh 2018-11-28 22:07:45 UTC (rev 238638)
+++ trunk/Source/WebKit/Scripts/generate-derived-sources.sh 2018-11-28 22:09:52 UTC (rev 238639)
@@ -2,6 +2,8 @@
set -e
+ARGS=("$@")
+
mkdir -p "${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit2"
cd "${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit2"
@@ -17,5 +19,5 @@
MAKEFILE_INCLUDE_FLAGS=$(echo "${WEBKITADDITIONS_HEADER_SEARCH_PATHS}" | perl -e 'print "-I" . join(" -I", split(" ", <>));')
if [ "${ACTION}" = "build" -o "${ACTION}" = "install" -o "${ACTION}" = "installhdrs" -o "${ACTION}" = "installapi" ]; then
- make --no-builtin-rules ${MAKEFILE_INCLUDE_FLAGS} -f "${WebKit2}/DerivedSources.make" -j `/usr/sbin/sysctl -n hw.activecpu` SDKROOT=${SDKROOT}
+ make --no-builtin-rules ${MAKEFILE_INCLUDE_FLAGS} -f "${WebKit2}/DerivedSources.make" -j `/usr/sbin/sysctl -n hw.activecpu` SDKROOT=${SDKROOT} "${ARGS[@]}"
fi
Modified: trunk/Source/WebKit/Scripts/generate-unified-sources.sh (238638 => 238639)
--- trunk/Source/WebKit/Scripts/generate-unified-sources.sh 2018-11-28 22:07:45 UTC (rev 238638)
+++ trunk/Source/WebKit/Scripts/generate-unified-sources.sh 2018-11-28 22:09:52 UTC (rev 238639)
@@ -2,17 +2,23 @@
set -e
+ARGS=("$@")
+
cd $SRCROOT
-if [ "${DEPLOYMENT_LOCATION}" == "YES" ]; then
- BUILD_SCRIPTS_DIR="${SDKROOT}${WK_ALTERNATE_WEBKIT_SDK_PATH}/usr/local/include/wtf/Scripts"
-else
- BUILD_SCRIPTS_DIR="${BUILT_PRODUCTS_DIR}/usr/local/include/wtf/Scripts"
+if [ -z "${BUILD_SCRIPTS_DIR}" ]; then
+ if [ "${DEPLOYMENT_LOCATION}" == "YES" ]; then
+ BUILD_SCRIPTS_DIR="${SDKROOT}${WK_ALTERNATE_WEBKIT_SDK_PATH}/usr/local/include/wtf/Scripts"
+ else
+ BUILD_SCRIPTS_DIR="${BUILT_PRODUCTS_DIR}/usr/local/include/wtf/Scripts"
+ fi
fi
UnifiedSourceCppFileCount=100
UnifiedSourceMmFileCount=80
-echo "Using unified source list files: Sources.txt, SourcesCocoa.txt"
+if [ $# -eq 0 ]; then
+ echo "Using unified source list files: Sources.txt, SourcesCocoa.txt"
+fi
-/usr/bin/env ruby "${BUILD_SCRIPTS_DIR}/generate-unified-source-bundles.rb" "--derived-sources-path" "${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit2" "--source-tree-path" "${SRCROOT}" "--feature-flags" "${FEATURE_DEFINES}" "--max-cpp-bundle-count" "${UnifiedSourceCppFileCount}" "--max-obj-c-bundle-count" "${UnifiedSourceMmFileCount}" "Sources.txt" "SourcesCocoa.txt" > /dev/null
+/usr/bin/env ruby "${BUILD_SCRIPTS_DIR}/generate-unified-source-bundles.rb" "--derived-sources-path" "${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit2" "--source-tree-path" "${SRCROOT}" "--feature-flags" "${FEATURE_DEFINES}" "--max-cpp-bundle-count" "${UnifiedSourceCppFileCount}" "--max-obj-c-bundle-count" "${UnifiedSourceMmFileCount}" "Sources.txt" "SourcesCocoa.txt" "${ARGS[@]}" > /dev/null
Modified: trunk/Tools/ChangeLog (238638 => 238639)
--- trunk/Tools/ChangeLog 2018-11-28 22:07:45 UTC (rev 238638)
+++ trunk/Tools/ChangeLog 2018-11-28 22:09:52 UTC (rev 238639)
@@ -1,5 +1,29 @@
2018-11-28 Keith Rollin <[email protected]>
+ Update generate-{derived,unified}-sources scripts to support generating .xcfilelist files
+ https://bugs.webkit.org/show_bug.cgi?id=192031
+ <rdar://problem/46286816>
+
+ Reviewed by Alex Christensen.
+
+ The Generate Derived Sources and Generate Unified Sources build phases
+ in Xcode need to have their inputs and outputs specified. This
+ specification will come in the form of .xcfilelist files that will be
+ attached to these build phases. There is one .xcfilelist file that
+ lists the input file and one that lists the output files. As part of
+ this work, the various generate-{derived,unified}-sources scripts that
+ are executed in these Generate build phases are modified to help in
+ the creation of these .xcfilelist files. In particular, they can now
+ be invoked with command-line parameters. These parameters are then
+ used to alter the normal execution of these scripts, causing them to
+ produce the .xcfilelist files as opposed to actually generating the
+ files that are listed in those files.
+
+ * DumpRenderTree/Scripts/generate-derived-sources.sh:
+ * WebKitTestRunner/Scripts/generate-derived-sources.sh:
+
+2018-11-28 Keith Rollin <[email protected]>
+
Revert print_all_generated_files work in r238008; tighten up target specifications
https://bugs.webkit.org/show_bug.cgi?id=192025
<rdar://problem/46284301>
Modified: trunk/Tools/DumpRenderTree/Scripts/generate-derived-sources.sh (238638 => 238639)
--- trunk/Tools/DumpRenderTree/Scripts/generate-derived-sources.sh 2018-11-28 22:07:45 UTC (rev 238638)
+++ trunk/Tools/DumpRenderTree/Scripts/generate-derived-sources.sh 2018-11-28 22:09:52 UTC (rev 238639)
@@ -2,6 +2,8 @@
set -e
+ARGS=("$@")
+
mkdir -p "${BUILT_PRODUCTS_DIR}/DerivedSources/DumpRenderTree"
cd "${BUILT_PRODUCTS_DIR}/DerivedSources/DumpRenderTree"
@@ -13,5 +15,5 @@
fi
if [ "${ACTION}" = "build" -o "${ACTION}" = "install" -o "${ACTION}" = "installhdrs" ]; then
- make -f "${DumpRenderTree}/DerivedSources.make" -j `/usr/sbin/sysctl -n hw.activecpu`
+ make -f "${DumpRenderTree}/DerivedSources.make" -j `/usr/sbin/sysctl -n hw.activecpu` "${ARGS[@]}"
fi
Modified: trunk/Tools/WebKitTestRunner/Scripts/generate-derived-sources.sh (238638 => 238639)
--- trunk/Tools/WebKitTestRunner/Scripts/generate-derived-sources.sh 2018-11-28 22:07:45 UTC (rev 238638)
+++ trunk/Tools/WebKitTestRunner/Scripts/generate-derived-sources.sh 2018-11-28 22:09:52 UTC (rev 238639)
@@ -2,6 +2,8 @@
set -e
+ARGS=("$@")
+
mkdir -p "${BUILT_PRODUCTS_DIR}/DerivedSources/WebKitTestRunner"
cd "${BUILT_PRODUCTS_DIR}/DerivedSources/WebKitTestRunner"
@@ -13,5 +15,5 @@
fi
if [ "${ACTION}" = "build" -o "${ACTION}" = "install" -o "${ACTION}" = "installhdrs" ]; then
- make -f "${WebKitTestRunner}/DerivedSources.make" -j `/usr/sbin/sysctl -n hw.activecpu`
+ make -f "${WebKitTestRunner}/DerivedSources.make" -j `/usr/sbin/sysctl -n hw.activecpu` "${ARGS[@]}"
fi
