Title: [136792] trunk/Source/WebKit2
- Revision
- 136792
- Author
- [email protected]
- Date
- 2012-12-05 19:44:08 -0800 (Wed, 05 Dec 2012)
Log Message
[Windows, WinCairo] Regenerate .def files on changes
https://bugs.webkit.org/show_bug.cgi?id=104136
Reviewed by Tim Horton.
The new .def file generator is not regenerating the link
export definitions once it creates the definition file
the first time. You must clean the build directory for
new symbols to be added (or removed).
* win/WebKit2.vcproj: Change the WebKit2.def file reference to
point to the generated version of the file.
* win/WebKit2ExportGenerator.vcproj: Add WebKit2.def.in as a source
file that participates in the build so that Visual Studio knows
to build the project when the file changes.
* win/WebKit2ExportGeneratorBuildCmd.cmd: Added. Refactor build
command into its own shell script.
* win/WebKit2ExportGeneratorPostBuild.cmd: Call new BuildCmd script.
* win/WebKit2ExportGeneratorPreBuild.cmd: Delete the old generator
and definition files to ensure a clean build.
Modified Paths
Added Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (136791 => 136792)
--- trunk/Source/WebKit2/ChangeLog 2012-12-06 03:37:52 UTC (rev 136791)
+++ trunk/Source/WebKit2/ChangeLog 2012-12-06 03:44:08 UTC (rev 136792)
@@ -1,3 +1,26 @@
+2012-12-05 Brent Fulgham <[email protected]>
+
+ [Windows, WinCairo] Regenerate .def files on changes
+ https://bugs.webkit.org/show_bug.cgi?id=104136
+
+ Reviewed by Tim Horton.
+
+ The new .def file generator is not regenerating the link
+ export definitions once it creates the definition file
+ the first time. You must clean the build directory for
+ new symbols to be added (or removed).
+
+ * win/WebKit2.vcproj: Change the WebKit2.def file reference to
+ point to the generated version of the file.
+ * win/WebKit2ExportGenerator.vcproj: Add WebKit2.def.in as a source
+ file that participates in the build so that Visual Studio knows
+ to build the project when the file changes.
+ * win/WebKit2ExportGeneratorBuildCmd.cmd: Added. Refactor build
+ command into its own shell script.
+ * win/WebKit2ExportGeneratorPostBuild.cmd: Call new BuildCmd script.
+ * win/WebKit2ExportGeneratorPreBuild.cmd: Delete the old generator
+ and definition files to ensure a clean build.
+
2012-12-05 Halton Huo <[email protected]>
[CMake] Unify coding style for CMake files
Modified: trunk/Source/WebKit2/win/WebKit2.vcproj (136791 => 136792)
--- trunk/Source/WebKit2/win/WebKit2.vcproj 2012-12-06 03:37:52 UTC (rev 136791)
+++ trunk/Source/WebKit2/win/WebKit2.vcproj 2012-12-06 03:44:08 UTC (rev 136792)
@@ -4588,7 +4588,7 @@
>
</File>
<File
- RelativePath=".\WebKit2.def"
+ RelativePath="$(ConfigurationBuildDir)\obj\WebKit2ExportGenerator\WebKit2.def"
>
</File>
<File
Modified: trunk/Source/WebKit2/win/WebKit2ExportGenerator.vcproj (136791 => 136792)
--- trunk/Source/WebKit2/win/WebKit2ExportGenerator.vcproj 2012-12-06 03:37:52 UTC (rev 136791)
+++ trunk/Source/WebKit2/win/WebKit2ExportGenerator.vcproj 2012-12-06 03:44:08 UTC (rev 136792)
@@ -390,50 +390,56 @@
>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"
>
<Tool
Name="VCCustomBuildTool"
+ CommandLine="REM Do not edit from the Visual Studio IDE! Customize via a $(ProjectName)BuildCmd.cmd file.
if not exist "$(ProjectDir)$(ProjectName)BuildCmd.cmd" exit /b

set CONFIGURATIONBUILDDIR=$(ConfigurationBuildDir)
set CONFIGURATIONNAME=$(ConfigurationName)
set INPUTDIR=$(InputDir)
set INPUTFILENAME=$(InputFileName)
set INPUTPATH=$(InputPath)
set INTDIR=$(IntDir)
set LIBRARYCONFIGSUFFIX=$(LibraryConfigSuffix)
set OUTDIR=$(OutDir)
set PLATFORMNAME=$(PlatformName)
set PROJECTDIR=$(ProjectDir)
set PROJECTFILENAME=$(ProjectFileName)
set PROJECTNAME=$(ProjectName)
set PROJECTPATH=$(ProjectPath)
set SOLUTIONDIR=$(SolutionDir)
set SOLUTIONFILENAME=$(SolutionFileName)
set SOLUTIONNAME=$(SolutionName)
set SOLUTIONPATH=$(SolutionPath)
set TARGETDIR=$(TargetDir)
set TARGETEXT=$(TargetExt)
set TARGETFILENAME=$(TargetFileName)
set TARGETPATH=$(TargetPath)
set WEBKITCONFIGSUFFIX=$(WebKitConfigSuffix)
set WEBKITDLLCONFIGSUFFIX=$(WebKitDLLConfigSuffix)

REM If any of the above variables didn't exist previously and
REM were set to an empty string, set will set the errorlevel to 1,
REM which will cause the project-specific script to think the build
REM has failed. This cmd /c call will clear the errorlevel.
cmd /c

"$(ProjectDir)$(ProjectName)BuildCmd.cmd"
"
+ Outputs="$(IntDir)\DerivedSources\WebKit2ExportGenerator.cpp"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"
>
<Tool
Name="VCCustomBuildTool"
+ CommandLine="REM Do not edit from the Visual Studio IDE! Customize via a $(ProjectName)BuildCmd.cmd file.
if not exist "$(ProjectDir)$(ProjectName)BuildCmd.cmd" exit /b

set CONFIGURATIONBUILDDIR=$(ConfigurationBuildDir)
set CONFIGURATIONNAME=$(ConfigurationName)
set INPUTDIR=$(InputDir)
set INPUTFILENAME=$(InputFileName)
set INPUTPATH=$(InputPath)
set INTDIR=$(IntDir)
set LIBRARYCONFIGSUFFIX=$(LibraryConfigSuffix)
set OUTDIR=$(OutDir)
set PLATFORMNAME=$(PlatformName)
set PROJECTDIR=$(ProjectDir)
set PROJECTFILENAME=$(ProjectFileName)
set PROJECTNAME=$(ProjectName)
set PROJECTPATH=$(ProjectPath)
set SOLUTIONDIR=$(SolutionDir)
set SOLUTIONFILENAME=$(SolutionFileName)
set SOLUTIONNAME=$(SolutionName)
set SOLUTIONPATH=$(SolutionPath)
set TARGETDIR=$(TargetDir)
set TARGETEXT=$(TargetExt)
set TARGETFILENAME=$(TargetFileName)
set TARGETPATH=$(TargetPath)
set WEBKITCONFIGSUFFIX=$(WebKitConfigSuffix)
set WEBKITDLLCONFIGSUFFIX=$(WebKitDLLConfigSuffix)

REM If any of the above variables didn't exist previously and
REM were set to an empty string, set will set the errorlevel to 1,
REM which will cause the project-specific script to think the build
REM has failed. This cmd /c call will clear the errorlevel.
cmd /c

"$(ProjectDir)$(ProjectName)BuildCmd.cmd"
"
+ Outputs="$(IntDir)\DerivedSources\WebKit2ExportGenerator.cpp"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug_All|Win32"
- ExcludedFromBuild="true"
>
<Tool
Name="VCCustomBuildTool"
+ CommandLine="REM Do not edit from the Visual Studio IDE! Customize via a $(ProjectName)BuildCmd.cmd file.
if not exist "$(ProjectDir)$(ProjectName)BuildCmd.cmd" exit /b

set CONFIGURATIONBUILDDIR=$(ConfigurationBuildDir)
set CONFIGURATIONNAME=$(ConfigurationName)
set INPUTDIR=$(InputDir)
set INPUTFILENAME=$(InputFileName)
set INPUTPATH=$(InputPath)
set INTDIR=$(IntDir)
set LIBRARYCONFIGSUFFIX=$(LibraryConfigSuffix)
set OUTDIR=$(OutDir)
set PLATFORMNAME=$(PlatformName)
set PROJECTDIR=$(ProjectDir)
set PROJECTFILENAME=$(ProjectFileName)
set PROJECTNAME=$(ProjectName)
set PROJECTPATH=$(ProjectPath)
set SOLUTIONDIR=$(SolutionDir)
set SOLUTIONFILENAME=$(SolutionFileName)
set SOLUTIONNAME=$(SolutionName)
set SOLUTIONPATH=$(SolutionPath)
set TARGETDIR=$(TargetDir)
set TARGETEXT=$(TargetExt)
set TARGETFILENAME=$(TargetFileName)
set TARGETPATH=$(TargetPath)
set WEBKITCONFIGSUFFIX=$(WebKitConfigSuffix)
set WEBKITDLLCONFIGSUFFIX=$(WebKitDLLConfigSuffix)

REM If any of the above variables didn't exist previously and
REM were set to an empty string, set will set the errorlevel to 1,
REM which will cause the project-specific script to think the build
REM has failed. This cmd /c call will clear the errorlevel.
cmd /c

"$(ProjectDir)$(ProjectName)BuildCmd.cmd"
"
+ Outputs="$(IntDir)\DerivedSources\WebKit2ExportGenerator.cpp"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug_Cairo_CFLite|Win32"
- ExcludedFromBuild="true"
>
<Tool
Name="VCCustomBuildTool"
+ CommandLine="REM Do not edit from the Visual Studio IDE! Customize via a $(ProjectName)BuildCmd.cmd file.
if not exist "$(ProjectDir)$(ProjectName)BuildCmd.cmd" exit /b

set CONFIGURATIONBUILDDIR=$(ConfigurationBuildDir)
set CONFIGURATIONNAME=$(ConfigurationName)
set INPUTDIR=$(InputDir)
set INPUTFILENAME=$(InputFileName)
set INPUTPATH=$(InputPath)
set INTDIR=$(IntDir)
set LIBRARYCONFIGSUFFIX=$(LibraryConfigSuffix)
set OUTDIR=$(OutDir)
set PLATFORMNAME=$(PlatformName)
set PROJECTDIR=$(ProjectDir)
set PROJECTFILENAME=$(ProjectFileName)
set PROJECTNAME=$(ProjectName)
set PROJECTPATH=$(ProjectPath)
set SOLUTIONDIR=$(SolutionDir)
set SOLUTIONFILENAME=$(SolutionFileName)
set SOLUTIONNAME=$(SolutionName)
set SOLUTIONPATH=$(SolutionPath)
set TARGETDIR=$(TargetDir)
set TARGETEXT=$(TargetExt)
set TARGETFILENAME=$(TargetFileName)
set TARGETPATH=$(TargetPath)
set WEBKITCONFIGSUFFIX=$(WebKitConfigSuffix)
set WEBKITDLLCONFIGSUFFIX=$(WebKitDLLConfigSuffix)

REM If any of the above variables didn't exist previously and
REM were set to an empty string, set will set the errorlevel to 1,
REM which will cause the project-specific script to think the build
REM has failed. This cmd /c call will clear the errorlevel.
cmd /c

"$(ProjectDir)$(ProjectName)BuildCmd.cmd"
"
+ Outputs="$(IntDir)\DerivedSources\WebKit2ExportGenerator.cpp"
/>
</FileConfiguration>
<FileConfiguration
Name="Production|Win32"
- ExcludedFromBuild="true"
>
<Tool
Name="VCCustomBuildTool"
+ CommandLine="REM Do not edit from the Visual Studio IDE! Customize via a $(ProjectName)BuildCmd.cmd file.
if not exist "$(ProjectDir)$(ProjectName)BuildCmd.cmd" exit /b

set CONFIGURATIONBUILDDIR=$(ConfigurationBuildDir)
set CONFIGURATIONNAME=$(ConfigurationName)
set INPUTDIR=$(InputDir)
set INPUTFILENAME=$(InputFileName)
set INPUTPATH=$(InputPath)
set INTDIR=$(IntDir)
set LIBRARYCONFIGSUFFIX=$(LibraryConfigSuffix)
set OUTDIR=$(OutDir)
set PLATFORMNAME=$(PlatformName)
set PROJECTDIR=$(ProjectDir)
set PROJECTFILENAME=$(ProjectFileName)
set PROJECTNAME=$(ProjectName)
set PROJECTPATH=$(ProjectPath)
set SOLUTIONDIR=$(SolutionDir)
set SOLUTIONFILENAME=$(SolutionFileName)
set SOLUTIONNAME=$(SolutionName)
set SOLUTIONPATH=$(SolutionPath)
set TARGETDIR=$(TargetDir)
set TARGETEXT=$(TargetExt)
set TARGETFILENAME=$(TargetFileName)
set TARGETPATH=$(TargetPath)
set WEBKITCONFIGSUFFIX=$(WebKitConfigSuffix)
set WEBKITDLLCONFIGSUFFIX=$(WebKitDLLConfigSuffix)

REM If any of the above variables didn't exist previously and
REM were set to an empty string, set will set the errorlevel to 1,
REM which will cause the project-specific script to think the build
REM has failed. This cmd /c call will clear the errorlevel.
cmd /c

"$(ProjectDir)$(ProjectName)BuildCmd.cmd"
"
+ Outputs="$(IntDir)\DerivedSources\WebKit2ExportGenerator.cpp"
/>
</FileConfiguration>
<FileConfiguration
Name="Release_Cairo_CFLite|Win32"
- ExcludedFromBuild="true"
>
<Tool
Name="VCCustomBuildTool"
+ CommandLine="REM Do not edit from the Visual Studio IDE! Customize via a $(ProjectName)BuildCmd.cmd file.
if not exist "$(ProjectDir)$(ProjectName)BuildCmd.cmd" exit /b

set CONFIGURATIONBUILDDIR=$(ConfigurationBuildDir)
set CONFIGURATIONNAME=$(ConfigurationName)
set INPUTDIR=$(InputDir)
set INPUTFILENAME=$(InputFileName)
set INPUTPATH=$(InputPath)
set INTDIR=$(IntDir)
set LIBRARYCONFIGSUFFIX=$(LibraryConfigSuffix)
set OUTDIR=$(OutDir)
set PLATFORMNAME=$(PlatformName)
set PROJECTDIR=$(ProjectDir)
set PROJECTFILENAME=$(ProjectFileName)
set PROJECTNAME=$(ProjectName)
set PROJECTPATH=$(ProjectPath)
set SOLUTIONDIR=$(SolutionDir)
set SOLUTIONFILENAME=$(SolutionFileName)
set SOLUTIONNAME=$(SolutionName)
set SOLUTIONPATH=$(SolutionPath)
set TARGETDIR=$(TargetDir)
set TARGETEXT=$(TargetExt)
set TARGETFILENAME=$(TargetFileName)
set TARGETPATH=$(TargetPath)
set WEBKITCONFIGSUFFIX=$(WebKitConfigSuffix)
set WEBKITDLLCONFIGSUFFIX=$(WebKitDLLConfigSuffix)

REM If any of the above variables didn't exist previously and
REM were set to an empty string, set will set the errorlevel to 1,
REM which will cause the project-specific script to think the build
REM has failed. This cmd /c call will clear the errorlevel.
cmd /c

"$(ProjectDir)$(ProjectName)BuildCmd.cmd"
"
+ Outputs="$(IntDir)\DerivedSources\WebKit2ExportGenerator.cpp"
/>
</FileConfiguration>
</File>
Copied: trunk/Source/WebKit2/win/WebKit2ExportGeneratorBuildCmd.cmd (from rev 136791, trunk/Source/WebKit2/win/WebKit2ExportGeneratorPreBuild.cmd) (0 => 136792)
--- trunk/Source/WebKit2/win/WebKit2ExportGeneratorBuildCmd.cmd (rev 0)
+++ trunk/Source/WebKit2/win/WebKit2ExportGeneratorBuildCmd.cmd 2012-12-06 03:44:08 UTC (rev 136792)
@@ -0,0 +1,9 @@
+%SystemDrive%\cygwin\bin\which.exe bash
+if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
+cmd /c
+
+set GeneratorDirectory=%CONFIGURATIONBUILDDIR%/obj/WebKit2ExportGenerator
+
+echo Generating export definitions
+del /F /Q "%GeneratorDirectory%/DerivedSources/WebKit2ExportGenerator.cpp"
+bash -c "../../WebCore/make-export-file-generator ./WebKit2.def.in '%GeneratorDirectory%/DerivedSources/WebKit2ExportGenerator.cpp'"
Modified: trunk/Source/WebKit2/win/WebKit2ExportGeneratorPostBuild.cmd (136791 => 136792)
--- trunk/Source/WebKit2/win/WebKit2ExportGeneratorPostBuild.cmd 2012-12-06 03:37:52 UTC (rev 136791)
+++ trunk/Source/WebKit2/win/WebKit2ExportGeneratorPostBuild.cmd 2012-12-06 03:44:08 UTC (rev 136792)
@@ -1,4 +1,5 @@
set GeneratorDirectory=%CONFIGURATIONBUILDDIR%/obj/WebKit2ExportGenerator
-if exist "%OUTDIR%\..\bin\WebKit2ExportGenerator.exe" "%OUTDIR%\..\bin\WebKit2ExportGenerator.exe" > "%GeneratorDirectory%\WebKit2.def"
+echo Exporting link definition output (%GeneratorDirectory%\WebKit2.def)
+if exist "%OUTDIR%\WebKit2ExportGenerator.exe" "%OUTDIR%\WebKit2ExportGenerator.exe" > "%GeneratorDirectory%\WebKit2.def"
if exist "%CONFIGURATIONBUILDDIR%\buildfailed" del "%CONFIGURATIONBUILDDIR%\buildfailed"
Modified: trunk/Source/WebKit2/win/WebKit2ExportGeneratorPreBuild.cmd (136791 => 136792)
--- trunk/Source/WebKit2/win/WebKit2ExportGeneratorPreBuild.cmd 2012-12-06 03:37:52 UTC (rev 136791)
+++ trunk/Source/WebKit2/win/WebKit2ExportGeneratorPreBuild.cmd 2012-12-06 03:44:08 UTC (rev 136792)
@@ -1,13 +1,19 @@
%SystemDrive%\cygwin\bin\which.exe bash
if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
+
+echo Preparing generator output directory...
+set GeneratorDirectory=%CONFIGURATIONBUILDDIR%/obj/WebKit2ExportGenerator
+mkdir "%GeneratorDirectory%" 2>NUL
+mkdir "%GeneratorDirectory%\DerivedSources" 2>NUL
+
+echo Clearing old definition file...
+del /F /Q "%GeneratorDirectory%\WebKit2.def"
+del /F /Q "%GeneratorDirectory%\DerivedSources\WebKit2ExportGenerator.cpp"
+del /F /Q "%OUTDIR%\WebKit2ExportGenerator.exe"
+
cmd /c
if exist "%CONFIGURATIONBUILDDIR%\buildfailed" grep XX%PROJECTNAME%XX "%CONFIGURATIONBUILDDIR%\buildfailed"
if errorlevel 1 exit 1
echo XX%PROJECTNAME%XX > "%CONFIGURATIONBUILDDIR%\buildfailed"
-set GeneratorDirectory=%CONFIGURATIONBUILDDIR%/obj/WebKit2ExportGenerator
-mkdir "%GeneratorDirectory%" 2>NUL
-mkdir "%GeneratorDirectory%\DerivedSources" 2>NUL
-
-echo Generating export definitions
-bash -c "../../WebCore/make-export-file-generator ./WebKit2.def.in '%GeneratorDirectory%/DerivedSources/WebKit2ExportGenerator.cpp'"
\ No newline at end of file
+"%PROJECTDIR%\%PROJECTNAME%BuildCmd.cmd"
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes