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.&#x0D;&#x0A;if not exist &quot;$(ProjectDir)$(ProjectName)BuildCmd.cmd&quot; exit /b&#x0D;&#x0A;&#x0D;&#x0A;set CONFIGURATIONBUILDDIR=$(ConfigurationBuildDir)&#x0D;&#x0A;set CONFIGURATIONNAME=$(ConfigurationName)&#x0D;&#x0A;set INPUTDIR=$(InputDir)&#x0D;&#x0A;set INPUTFILENAME=$(InputFileName)&#x0D;&#x0A;set INPUTPATH=$(InputPath)&#x0D;&#x0A;set INTDIR=$(IntDir)&#x0D;&#x0A;set LIBRARYCONFIGSUFFIX=$(LibraryConfigSuffix)&#x0D;&#x0A;set OUTDIR=$(OutDir)&#x0D;&#x0A;set PLATFORMNAME=$(PlatformName)&#x0D;&#x0A;set PROJECTDIR=$(ProjectDir)&#x0D;&#x0A;set PROJECTFILENAME=$(ProjectFileName)&#x0D;&#x0A;set PROJECTNAME=$(ProjectName)&#x0D;&#x0A;set PROJECTPATH=$(ProjectPath)&#x0D;&#x0A;set SOLUTIONDIR=$(SolutionDir)&#x0D;&#x0A;set SOLUTIONFILENAME=$(SolutionFileName)&#x0D;&#x0A;set SOLUTIONNAME=$(SolutionName)&#x0D;&#x0A;set SOLUTIONPATH=$(SolutionPath)&#x0D;&#x0A;set TARGETDIR=$(TargetDir)&#x0D;&#x0A;set TARGETEXT=$(TargetExt)&#x0D;&#x0A;set TARGETFILENAME=$(TargetFileName)&#x0D;&#x0A;set TARGETPATH=$(TargetPath)&#x0D;&#x0A;set WEBKITCONFIGSUFFIX=$(WebKitConfigSuffix)&#x0D;&#x0A;set WEBKITDLLCONFIGSUFFIX=$(WebKitDLLConfigSuffix)&#x0D;&#x0A;&#x0D;&#x0A;REM If any of the above variables didn&apos;t exist previously and&#x0D;&#x0A;REM were set to an empty string, set will set the errorlevel to 1,&#x0D;&#x0A;REM which will cause the project-specific script to think the build&#x0D;&#x0A;REM has failed. This cmd /c call will clear the errorlevel.&#x0D;&#x0A;cmd /c&#x0D;&#x0A;&#x0D;&#x0A;&quot;$(ProjectDir)$(ProjectName)BuildCmd.cmd&quot;&#x0D;&#x0A;"
+					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.&#x0D;&#x0A;if not exist &quot;$(ProjectDir)$(ProjectName)BuildCmd.cmd&quot; exit /b&#x0D;&#x0A;&#x0D;&#x0A;set CONFIGURATIONBUILDDIR=$(ConfigurationBuildDir)&#x0D;&#x0A;set CONFIGURATIONNAME=$(ConfigurationName)&#x0D;&#x0A;set INPUTDIR=$(InputDir)&#x0D;&#x0A;set INPUTFILENAME=$(InputFileName)&#x0D;&#x0A;set INPUTPATH=$(InputPath)&#x0D;&#x0A;set INTDIR=$(IntDir)&#x0D;&#x0A;set LIBRARYCONFIGSUFFIX=$(LibraryConfigSuffix)&#x0D;&#x0A;set OUTDIR=$(OutDir)&#x0D;&#x0A;set PLATFORMNAME=$(PlatformName)&#x0D;&#x0A;set PROJECTDIR=$(ProjectDir)&#x0D;&#x0A;set PROJECTFILENAME=$(ProjectFileName)&#x0D;&#x0A;set PROJECTNAME=$(ProjectName)&#x0D;&#x0A;set PROJECTPATH=$(ProjectPath)&#x0D;&#x0A;set SOLUTIONDIR=$(SolutionDir)&#x0D;&#x0A;set SOLUTIONFILENAME=$(SolutionFileName)&#x0D;&#x0A;set SOLUTIONNAME=$(SolutionName)&#x0D;&#x0A;set SOLUTIONPATH=$(SolutionPath)&#x0D;&#x0A;set TARGETDIR=$(TargetDir)&#x0D;&#x0A;set TARGETEXT=$(TargetExt)&#x0D;&#x0A;set TARGETFILENAME=$(TargetFileName)&#x0D;&#x0A;set TARGETPATH=$(TargetPath)&#x0D;&#x0A;set WEBKITCONFIGSUFFIX=$(WebKitConfigSuffix)&#x0D;&#x0A;set WEBKITDLLCONFIGSUFFIX=$(WebKitDLLConfigSuffix)&#x0D;&#x0A;&#x0D;&#x0A;REM If any of the above variables didn&apos;t exist previously and&#x0D;&#x0A;REM were set to an empty string, set will set the errorlevel to 1,&#x0D;&#x0A;REM which will cause the project-specific script to think the build&#x0D;&#x0A;REM has failed. This cmd /c call will clear the errorlevel.&#x0D;&#x0A;cmd /c&#x0D;&#x0A;&#x0D;&#x0A;&quot;$(ProjectDir)$(ProjectName)BuildCmd.cmd&quot;&#x0D;&#x0A;"
+					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.&#x0D;&#x0A;if not exist &quot;$(ProjectDir)$(ProjectName)BuildCmd.cmd&quot; exit /b&#x0D;&#x0A;&#x0D;&#x0A;set CONFIGURATIONBUILDDIR=$(ConfigurationBuildDir)&#x0D;&#x0A;set CONFIGURATIONNAME=$(ConfigurationName)&#x0D;&#x0A;set INPUTDIR=$(InputDir)&#x0D;&#x0A;set INPUTFILENAME=$(InputFileName)&#x0D;&#x0A;set INPUTPATH=$(InputPath)&#x0D;&#x0A;set INTDIR=$(IntDir)&#x0D;&#x0A;set LIBRARYCONFIGSUFFIX=$(LibraryConfigSuffix)&#x0D;&#x0A;set OUTDIR=$(OutDir)&#x0D;&#x0A;set PLATFORMNAME=$(PlatformName)&#x0D;&#x0A;set PROJECTDIR=$(ProjectDir)&#x0D;&#x0A;set PROJECTFILENAME=$(ProjectFileName)&#x0D;&#x0A;set PROJECTNAME=$(ProjectName)&#x0D;&#x0A;set PROJECTPATH=$(ProjectPath)&#x0D;&#x0A;set SOLUTIONDIR=$(SolutionDir)&#x0D;&#x0A;set SOLUTIONFILENAME=$(SolutionFileName)&#x0D;&#x0A;set SOLUTIONNAME=$(SolutionName)&#x0D;&#x0A;set SOLUTIONPATH=$(SolutionPath)&#x0D;&#x0A;set TARGETDIR=$(TargetDir)&#x0D;&#x0A;set TARGETEXT=$(TargetExt)&#x0D;&#x0A;set TARGETFILENAME=$(TargetFileName)&#x0D;&#x0A;set TARGETPATH=$(TargetPath)&#x0D;&#x0A;set WEBKITCONFIGSUFFIX=$(WebKitConfigSuffix)&#x0D;&#x0A;set WEBKITDLLCONFIGSUFFIX=$(WebKitDLLConfigSuffix)&#x0D;&#x0A;&#x0D;&#x0A;REM If any of the above variables didn&apos;t exist previously and&#x0D;&#x0A;REM were set to an empty string, set will set the errorlevel to 1,&#x0D;&#x0A;REM which will cause the project-specific script to think the build&#x0D;&#x0A;REM has failed. This cmd /c call will clear the errorlevel.&#x0D;&#x0A;cmd /c&#x0D;&#x0A;&#x0D;&#x0A;&quot;$(ProjectDir)$(ProjectName)BuildCmd.cmd&quot;&#x0D;&#x0A;"
+					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.&#x0D;&#x0A;if not exist &quot;$(ProjectDir)$(ProjectName)BuildCmd.cmd&quot; exit /b&#x0D;&#x0A;&#x0D;&#x0A;set CONFIGURATIONBUILDDIR=$(ConfigurationBuildDir)&#x0D;&#x0A;set CONFIGURATIONNAME=$(ConfigurationName)&#x0D;&#x0A;set INPUTDIR=$(InputDir)&#x0D;&#x0A;set INPUTFILENAME=$(InputFileName)&#x0D;&#x0A;set INPUTPATH=$(InputPath)&#x0D;&#x0A;set INTDIR=$(IntDir)&#x0D;&#x0A;set LIBRARYCONFIGSUFFIX=$(LibraryConfigSuffix)&#x0D;&#x0A;set OUTDIR=$(OutDir)&#x0D;&#x0A;set PLATFORMNAME=$(PlatformName)&#x0D;&#x0A;set PROJECTDIR=$(ProjectDir)&#x0D;&#x0A;set PROJECTFILENAME=$(ProjectFileName)&#x0D;&#x0A;set PROJECTNAME=$(ProjectName)&#x0D;&#x0A;set PROJECTPATH=$(ProjectPath)&#x0D;&#x0A;set SOLUTIONDIR=$(SolutionDir)&#x0D;&#x0A;set SOLUTIONFILENAME=$(SolutionFileName)&#x0D;&#x0A;set SOLUTIONNAME=$(SolutionName)&#x0D;&#x0A;set SOLUTIONPATH=$(SolutionPath)&#x0D;&#x0A;set TARGETDIR=$(TargetDir)&#x0D;&#x0A;set TARGETEXT=$(TargetExt)&#x0D;&#x0A;set TARGETFILENAME=$(TargetFileName)&#x0D;&#x0A;set TARGETPATH=$(TargetPath)&#x0D;&#x0A;set WEBKITCONFIGSUFFIX=$(WebKitConfigSuffix)&#x0D;&#x0A;set WEBKITDLLCONFIGSUFFIX=$(WebKitDLLConfigSuffix)&#x0D;&#x0A;&#x0D;&#x0A;REM If any of the above variables didn&apos;t exist previously and&#x0D;&#x0A;REM were set to an empty string, set will set the errorlevel to 1,&#x0D;&#x0A;REM which will cause the project-specific script to think the build&#x0D;&#x0A;REM has failed. This cmd /c call will clear the errorlevel.&#x0D;&#x0A;cmd /c&#x0D;&#x0A;&#x0D;&#x0A;&quot;$(ProjectDir)$(ProjectName)BuildCmd.cmd&quot;&#x0D;&#x0A;"
+					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.&#x0D;&#x0A;if not exist &quot;$(ProjectDir)$(ProjectName)BuildCmd.cmd&quot; exit /b&#x0D;&#x0A;&#x0D;&#x0A;set CONFIGURATIONBUILDDIR=$(ConfigurationBuildDir)&#x0D;&#x0A;set CONFIGURATIONNAME=$(ConfigurationName)&#x0D;&#x0A;set INPUTDIR=$(InputDir)&#x0D;&#x0A;set INPUTFILENAME=$(InputFileName)&#x0D;&#x0A;set INPUTPATH=$(InputPath)&#x0D;&#x0A;set INTDIR=$(IntDir)&#x0D;&#x0A;set LIBRARYCONFIGSUFFIX=$(LibraryConfigSuffix)&#x0D;&#x0A;set OUTDIR=$(OutDir)&#x0D;&#x0A;set PLATFORMNAME=$(PlatformName)&#x0D;&#x0A;set PROJECTDIR=$(ProjectDir)&#x0D;&#x0A;set PROJECTFILENAME=$(ProjectFileName)&#x0D;&#x0A;set PROJECTNAME=$(ProjectName)&#x0D;&#x0A;set PROJECTPATH=$(ProjectPath)&#x0D;&#x0A;set SOLUTIONDIR=$(SolutionDir)&#x0D;&#x0A;set SOLUTIONFILENAME=$(SolutionFileName)&#x0D;&#x0A;set SOLUTIONNAME=$(SolutionName)&#x0D;&#x0A;set SOLUTIONPATH=$(SolutionPath)&#x0D;&#x0A;set TARGETDIR=$(TargetDir)&#x0D;&#x0A;set TARGETEXT=$(TargetExt)&#x0D;&#x0A;set TARGETFILENAME=$(TargetFileName)&#x0D;&#x0A;set TARGETPATH=$(TargetPath)&#x0D;&#x0A;set WEBKITCONFIGSUFFIX=$(WebKitConfigSuffix)&#x0D;&#x0A;set WEBKITDLLCONFIGSUFFIX=$(WebKitDLLConfigSuffix)&#x0D;&#x0A;&#x0D;&#x0A;REM If any of the above variables didn&apos;t exist previously and&#x0D;&#x0A;REM were set to an empty string, set will set the errorlevel to 1,&#x0D;&#x0A;REM which will cause the project-specific script to think the build&#x0D;&#x0A;REM has failed. This cmd /c call will clear the errorlevel.&#x0D;&#x0A;cmd /c&#x0D;&#x0A;&#x0D;&#x0A;&quot;$(ProjectDir)$(ProjectName)BuildCmd.cmd&quot;&#x0D;&#x0A;"
+					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.&#x0D;&#x0A;if not exist &quot;$(ProjectDir)$(ProjectName)BuildCmd.cmd&quot; exit /b&#x0D;&#x0A;&#x0D;&#x0A;set CONFIGURATIONBUILDDIR=$(ConfigurationBuildDir)&#x0D;&#x0A;set CONFIGURATIONNAME=$(ConfigurationName)&#x0D;&#x0A;set INPUTDIR=$(InputDir)&#x0D;&#x0A;set INPUTFILENAME=$(InputFileName)&#x0D;&#x0A;set INPUTPATH=$(InputPath)&#x0D;&#x0A;set INTDIR=$(IntDir)&#x0D;&#x0A;set LIBRARYCONFIGSUFFIX=$(LibraryConfigSuffix)&#x0D;&#x0A;set OUTDIR=$(OutDir)&#x0D;&#x0A;set PLATFORMNAME=$(PlatformName)&#x0D;&#x0A;set PROJECTDIR=$(ProjectDir)&#x0D;&#x0A;set PROJECTFILENAME=$(ProjectFileName)&#x0D;&#x0A;set PROJECTNAME=$(ProjectName)&#x0D;&#x0A;set PROJECTPATH=$(ProjectPath)&#x0D;&#x0A;set SOLUTIONDIR=$(SolutionDir)&#x0D;&#x0A;set SOLUTIONFILENAME=$(SolutionFileName)&#x0D;&#x0A;set SOLUTIONNAME=$(SolutionName)&#x0D;&#x0A;set SOLUTIONPATH=$(SolutionPath)&#x0D;&#x0A;set TARGETDIR=$(TargetDir)&#x0D;&#x0A;set TARGETEXT=$(TargetExt)&#x0D;&#x0A;set TARGETFILENAME=$(TargetFileName)&#x0D;&#x0A;set TARGETPATH=$(TargetPath)&#x0D;&#x0A;set WEBKITCONFIGSUFFIX=$(WebKitConfigSuffix)&#x0D;&#x0A;set WEBKITDLLCONFIGSUFFIX=$(WebKitDLLConfigSuffix)&#x0D;&#x0A;&#x0D;&#x0A;REM If any of the above variables didn&apos;t exist previously and&#x0D;&#x0A;REM were set to an empty string, set will set the errorlevel to 1,&#x0D;&#x0A;REM which will cause the project-specific script to think the build&#x0D;&#x0A;REM has failed. This cmd /c call will clear the errorlevel.&#x0D;&#x0A;cmd /c&#x0D;&#x0A;&#x0D;&#x0A;&quot;$(ProjectDir)$(ProjectName)BuildCmd.cmd&quot;&#x0D;&#x0A;"
+					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

Reply via email to