Title: [164870] branches/safari-537.75-branch
- Revision
- 164870
- Author
- [email protected]
- Date
- 2014-02-28 10:36:03 -0800 (Fri, 28 Feb 2014)
Log Message
Source/WTF: Unreviewed build fix: Pass build environment to sub-processes via command line.
<rdar://problem/16197002>
* WTF.vcxproj/build-generated-files.sh: Pass WEBKIT_LIBRARIES via argument, rather than
relying on global environment.
WebKitLibraries: Unreviewed build fix: Pass WEBKIT_LIBRARIES as argument to sub-process build steps.
<rdar://problem/16197002>
* win/tools/vsprops/common.props: Pass WEBKIT_LIBRARIES directly to sub-processes, rather
than relying on global environment already having these values set.
Modified Paths
Diff
Modified: branches/safari-537.75-branch/Source/WTF/ChangeLog (164869 => 164870)
--- branches/safari-537.75-branch/Source/WTF/ChangeLog 2014-02-28 18:34:48 UTC (rev 164869)
+++ branches/safari-537.75-branch/Source/WTF/ChangeLog 2014-02-28 18:36:03 UTC (rev 164870)
@@ -1,3 +1,11 @@
+2014-02-28 Brent Fulgham <[email protected]>
+
+ Unreviewed build fix: Pass build environment to sub-processes via command line.
+ <rdar://problem/16197002>
+
+ * WTF.vcxproj/build-generated-files.sh: Pass WEBKIT_LIBRARIES via argument, rather than
+ relying on global environment.
+
2014-02-25 Brent Fulgham <[email protected]>
Unreviewed build fix.
Modified: branches/safari-537.75-branch/Source/WTF/WTF.vcxproj/build-generated-files.sh (164869 => 164870)
--- branches/safari-537.75-branch/Source/WTF/WTF.vcxproj/build-generated-files.sh 2014-02-28 18:34:48 UTC (rev 164869)
+++ branches/safari-537.75-branch/Source/WTF/WTF.vcxproj/build-generated-files.sh 2014-02-28 18:36:03 UTC (rev 164870)
@@ -1,8 +1,8 @@
#!/usr/bin/bash
# Determine whether we have the versioned ICU 4.0 or the unversioned ICU 4.4
-UNVERSIONED_ICU_LIB_PATH=$(cygpath -u "${WEBKIT_LIBRARIES}/lib${4}/libicuuc${3}.lib")
-ICUVERSION_H_PATH=$(cygpath -u "${CONFIGURATIONBUILDDIR}/include/private/ICUVersion.h")
+UNVERSIONED_ICU_LIB_PATH=$(cygpath -u "${2}/lib${4}/libicuuc${3}.lib")
+ICUVERSION_H_PATH=$(cygpath -u "${1}/include/private/ICUVersion.h")
if test \( ! -f "${ICUVERSION_H_PATH}" \) -o \( -f "${UNVERSIONED_ICU_LIB_PATH}" -a \( "${UNVERSIONED_ICU_LIB_PATH}" -nt "${ICUVERSION_H_PATH}" \) \)
then
mkdir -p "$(dirname "${ICUVERSION_H_PATH}")"
Modified: branches/safari-537.75-branch/WebKitLibraries/ChangeLog (164869 => 164870)
--- branches/safari-537.75-branch/WebKitLibraries/ChangeLog 2014-02-28 18:34:48 UTC (rev 164869)
+++ branches/safari-537.75-branch/WebKitLibraries/ChangeLog 2014-02-28 18:36:03 UTC (rev 164870)
@@ -1,3 +1,11 @@
+2014-02-28 Brent Fulgham <[email protected]>
+
+ Unreviewed build fix: Pass WEBKIT_LIBRARIES as argument to sub-process build steps.
+ <rdar://problem/16197002>
+
+ * win/tools/vsprops/common.props: Pass WEBKIT_LIBRARIES directly to sub-processes, rather
+ than relying on global environment already having these values set.
+
2014-02-25 Brent Fulgham <[email protected]>
Unreviewed build fix.
Modified: branches/safari-537.75-branch/WebKitLibraries/win/tools/vsprops/common.props (164869 => 164870)
--- branches/safari-537.75-branch/WebKitLibraries/win/tools/vsprops/common.props 2014-02-28 18:34:48 UTC (rev 164869)
+++ branches/safari-537.75-branch/WebKitLibraries/win/tools/vsprops/common.props 2014-02-28 18:36:03 UTC (rev 164870)
@@ -12,11 +12,15 @@
<LinkIncremental>false</LinkIncremental>
<NMakeBuildCommandLine>%SystemDrive%\cygwin\bin\which.exe bash
if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
+set CONFIGURATIONBUILDDIR=$(ConfigurationBuildDir)
set PLATFORMARCHITECTURE=$(PlatformArchitecture)
+set WEBKIT_LIBRARIES=$(WEBKIT_LIBRARIES)
nmake /nologo -f $(ProjectName).make</NMakeBuildCommandLine>
<NMakeReBuildCommandLine>%SystemDrive%\cygwin\bin\which.exe bash
if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
+set CONFIGURATIONBUILDDIR=$(ConfigurationBuildDir)
set PLATFORMARCHITECTURE=$(PlatformArchitecture)
+set WEBKIT_LIBRARIES=$(WEBKIT_LIBRARIES)
nmake /nologo -f $(ProjectName).make clean
nmake /nologo -f $(ProjectName).make</NMakeReBuildCommandLine>
<NMakeCleanCommandLine>%SystemDrive%\cygwin\bin\which.exe bash
@@ -27,6 +31,7 @@
REM VS2010 has a known bug where the clean command does not recognize environment variables properly unless explicitly set here
set CONFIGURATIONBUILDDIR=$(ConfigurationBuildDir)
set PLATFORMARCHITECTURE=$(PlatformArchitecture)
+set WEBKIT_LIBRARIES=$(WEBKIT_LIBRARIES)
nmake /nologo -f $(ProjectName).make clean</NMakeCleanCommandLine>
<TargetName>$(ProjectName)$(DebugSuffix)</TargetName>
</PropertyGroup>
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
