2006-09-12 Steve Falkenburg <sfalken@apple.com>
authorsfalken <sfalken@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 14 Sep 2006 01:59:26 +0000 (01:59 +0000)
committersfalken <sfalken@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 14 Sep 2006 01:59:26 +0000 (01:59 +0000)
        Reviewed by Ada.

        Build tweaks (doing JavaScriptCore now since it doesn't have
        dependencies).

        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
        * JavaScriptCore.vcproj/JavaScriptCore/build-generated-files.sh:
        * JavaScriptCore.vcproj/JavaScriptCore/dstroot-to-sdk.cmd: Added.
        * JavaScriptCore.vcproj/dftables/dftables.vcproj:
        * JavaScriptCore.vcproj/testkjs/testkjs.vcproj:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@16354 268f45cc-cd09-0410-ab3c-d52691b4dbfc

JavaScriptCore/ChangeLog
JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj
JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/build-generated-files.sh
JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/dstroot-to-sdk.cmd [new file with mode: 0644]
JavaScriptCore/JavaScriptCore.vcproj/dftables/dftables.vcproj
JavaScriptCore/JavaScriptCore.vcproj/testkjs/testkjs.vcproj

index 81eec54..04fdf69 100644 (file)
@@ -1,4 +1,15 @@
-=== Safari-521.26 ===
+2006-09-12  Steve Falkenburg  <sfalken@apple.com>
+
+        Reviewed by Ada.
+        
+        Build tweaks (doing JavaScriptCore now since it doesn't have
+        dependencies).
+
+        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
+        * JavaScriptCore.vcproj/JavaScriptCore/build-generated-files.sh:
+        * JavaScriptCore.vcproj/JavaScriptCore/dstroot-to-sdk.cmd: Added.
+        * JavaScriptCore.vcproj/dftables/dftables.vcproj:
+        * JavaScriptCore.vcproj/testkjs/testkjs.vcproj:
 
 2006-09-11  Brady Eidson  <beidson@apple.com>
 
index b84d131..7a135a5 100644 (file)
@@ -17,8 +17,8 @@
        <Configurations>
                <Configuration
                        Name="Debug|Win32"
-                       OutputDirectory="$(WebKitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate"
-                       IntermediateDirectory="$(WebKitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate"
+                       OutputDirectory="$(WebKitOutputDir)\lib"
+                       IntermediateDirectory="$(WebKitOutputDir)\obj\$(ProjectName)\$(ConfigurationName)"
                        ConfigurationType="4"
                        CharacterSet="1"
                        DeleteExtensionsOnClean="*.obj;*.ilk;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;$(TargetPath)"
@@ -26,7 +26,7 @@
                        <Tool
                                Name="VCPreBuildEventTool"
                                Description="Constructing generated files..."
-                               CommandLine="bash build-generated-files.sh &quot;$(ConfigurationName)&quot; &quot;$(WebKitOutputDir)&quot;&#x0D;&#x0A;&#x0D;&#x0A;&quot;$(WebkitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\dftables.intermediate\dftables.exe&quot; &quot;$(WebKitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate\DerivedSources\chartables.c&quot;&#x0D;&#x0A;"
+                               CommandLine="bash build-generated-files.sh &quot;$(ConfigurationName)&quot; &quot;$(WebKitOutputDir)&quot;&#x0D;&#x0A;&#x0D;&#x0A;&quot;$(WebkitOutputDir)\bin\dftables_debug.exe&quot; &quot;$(WebKitOutputDir)\obj\JavaScriptCore\$(ConfigurationName)\DerivedSources\chartables.c&quot;&#x0D;&#x0A;"
                        />
                        <Tool
                                Name="VCCustomBuildTool"
@@ -45,7 +45,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="&quot;$(WebKitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate\DerivedSources\&quot;;../../;&quot;../../os-win32/&quot;;../../pcre/;../../kjs/;../../wtf/;&quot;$(WebKitSDKDir)\include\icu&quot;;../../../icu/include;../../bindings;../../bindings/c;../../bindings/jni"
+                               AdditionalIncludeDirectories="&quot;$(WebKitOutputDir)\obj\JavaScriptCore\$(ConfigurationName)\DerivedSources\&quot;;../../;&quot;../../os-win32/&quot;;../../pcre/;../../kjs/;../../wtf/;&quot;$(WebKitSDKDir)\include\icu&quot;;../../../icu/include;../../bindings;../../bindings/c;../../bindings/jni"
                                PreprocessorDefinitions="HAVE_CONFIG_H;WIN32;__STD_C"
                                MinimalRebuild="true"
                                ExceptionHandling="0"
@@ -70,6 +70,7 @@
                        />
                        <Tool
                                Name="VCLibrarianTool"
+                               OutputFile="$(OutDir)\$(ProjectName)_debug.lib"
                        />
                        <Tool
                                Name="VCALinkTool"
                        />
                        <Tool
                                Name="VCPostBuildEventTool"
-                               CommandLine="mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\$(ConfigurationName)\WTF&quot;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\$(ConfigurationName)\WTF\os-win32&quot;&#x0D;&#x0A;xcopy /y &quot;$(ProjectDir)\..\..\..\JavaScriptCore\wtf\Vector.h&quot; &quot;$(WebKitOutputDir)\$(ConfigurationName)\WTF&quot;&#x0D;&#x0A;xcopy /y &quot;$(ProjectDir)\..\..\..\JavaScriptCore\wtf\Assertions.h&quot; &quot;$(WebKitOutputDir)\$(ConfigurationName)\WTF&quot;&#x0D;&#x0A;xcopy /y &quot;$(ProjectDir)\..\..\..\JavaScriptCore\wtf\VectorTraits.h&quot; &quot;$(WebKitOutputDir)\$(ConfigurationName)\WTF&quot;&#x0D;&#x0A;xcopy /y &quot;$(ProjectDir)\..\..\..\JavaScriptCore\wtf\RefPtr.h&quot; &quot;$(WebKitOutputDir)\$(ConfigurationName)\WTF&quot;&#x0D;&#x0A;xcopy /y &quot;$(ProjectDir)\..\..\..\JavaScriptCore\wtf\Platform.h&quot; &quot;$(WebKitOutputDir)\$(ConfigurationName)\WTF&quot;&#x0D;&#x0A;xcopy /y &quot;$(ProjectDir)\..\..\..\JavaScriptCore\wtf\FastMalloc.h&quot; &quot;$(WebKitOutputDir)\$(ConfigurationName)\WTF&quot;&#x0D;&#x0A;xcopy /y &quot;$(ProjectDir)\..\..\..\JavaScriptCore\wtf\MathExtras.h&quot; &quot;$(WebKitOutputDir)\$(ConfigurationName)\WTF&quot;&#x0D;&#x0A;xcopy /y &quot;$(ProjectDir)\..\..\..\JavaScriptCore\wtf\HashMap.h&quot; &quot;$(WebKitOutputDir)\$(ConfigurationName)\WTF&quot;&#x0D;&#x0A;xcopy /y &quot;$(ProjectDir)\..\..\..\JavaScriptCore\wtf\HashTable.h&quot; &quot;$(WebKitOutputDir)\$(ConfigurationName)\WTF&quot;&#x0D;&#x0A;xcopy /y &quot;$(ProjectDir)\..\..\..\JavaScriptCore\wtf\HashTraits.h&quot; &quot;$(WebKitOutputDir)\$(ConfigurationName)\WTF&quot;&#x0D;&#x0A;xcopy /y &quot;$(ProjectDir)\..\..\..\JavaScriptCore\wtf\HashFunctions.h&quot; &quot;$(WebKitOutputDir)\$(ConfigurationName)\WTF&quot;&#x0D;&#x0A;xcopy /y &quot;$(ProjectDir)\..\..\..\JavaScriptCore\os-win32\stdint.h&quot; &quot;$(WebKitOutputDir)\$(ConfigurationName)\WTF\os-win32&quot;&#x0D;&#x0A;copy /y &quot;$(TargetPath)&quot; &quot;$(WebKitOutputDir)\$(ConfigurationName)\WTF\WTF.lib&quot;&#x0D;&#x0A;"
+                               CommandLine="mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\JavaScriptCore\wtf&quot;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\JavaScriptCore\wtf\os-win32&quot;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\JavaScriptCore\kjs&quot;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\JavaScriptCore\pcre&quot;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\JavaScriptCore\bindings&quot;&#x0D;&#x0A;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\wtf\*.h&quot; &quot;$(WebKitOutputDir)\include\JavaScriptCore\wtf&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\os-win32\*.h&quot; &quot;$(WebKitOutputDir)\include\JavaScriptCore\wtf\os-win32&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\kjs\*.h&quot; &quot;$(WebKitOutputDir)\include\JavaScriptCore\kjs&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\kjs\create_hash_table&quot; &quot;$(WebKitOutputDir)\include\JavaScriptCore\kjs&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\pcre\pcre.h&quot; &quot;$(WebKitOutputDir)\include\JavaScriptCore\pcre&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\bindings\npruntime.h&quot; &quot;$(WebKitOutputDir)\include\JavaScriptCore\bindings&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\bindings\npapi.h&quot; &quot;$(WebKitOutputDir)\include\JavaScriptCore\bindings&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\bindings\npruntime_impl.h&quot; &quot;$(WebKitOutputDir)\include\JavaScriptCore\bindings&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\bindings\NP_jsobject.h&quot; &quot;$(WebKitOutputDir)\include\JavaScriptCore\bindings&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\bindings\runtime_root.h&quot; &quot;$(WebKitOutputDir)\include\JavaScriptCore\bindings&quot;&#x0D;&#x0A;&#x0D;&#x0A;dir &gt; &quot;$(TargetDir)WTF_debug.lib&quot;&#x0D;&#x0A;xcopy /y /i &quot;$(TargetPath)&quot; &quot;$(TargetDir)WTF_debug.lib&quot;&#x0D;&#x0A;&#x0D;&#x0A;dstroot-to-sdk.cmd JavaScriptCore&#x0D;&#x0A;"
                        />
                </Configuration>
                <Configuration
                        Name="Release|Win32"
-                       OutputDirectory="$(WebKitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate"
-                       IntermediateDirectory="$(WebKitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate"
+                       OutputDirectory="$(WebKitOutputDir)\lib"
+                       IntermediateDirectory="$(WebKitOutputDir)\obj\$(ProjectName)\$(ConfigurationName)"
                        ConfigurationType="4"
                        CharacterSet="1"
                        DeleteExtensionsOnClean="*.obj;*.ilk;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;$(TargetPath)"
                        <Tool
                                Name="VCPreBuildEventTool"
                                Description="Constructing generated files..."
-                               CommandLine="bash build-generated-files.sh &quot;$(ConfigurationName)&quot; &quot;$(WebKitOutputDir)&quot;&#x0D;&#x0A;&#x0D;&#x0A;&quot;$(WebkitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\dftables.intermediate\dftables.exe&quot; &quot;$(WebKitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate\DerivedSources\chartables.c&quot;&#x0D;&#x0A;"
+                               CommandLine="bash build-generated-files.sh &quot;$(ConfigurationName)&quot; &quot;$(WebKitOutputDir)&quot;&#x0D;&#x0A;&#x0D;&#x0A;&quot;$(WebkitOutputDir)\bin\dftables.exe&quot; &quot;$(WebKitOutputDir)\obj\JavaScriptCore\$(ConfigurationName)\DerivedSources\chartables.c&quot;&#x0D;&#x0A;"
                        />
                        <Tool
                                Name="VCCustomBuildTool"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="&quot;$(WebKitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate\DerivedSources\&quot;;../../;&quot;../../os-win32/&quot;;../../pcre/;../../kjs/;../../wtf/;&quot;$(WebKitSDKDir)\include\icu&quot;;../../../icu/include;../../bindings;../../bindings/c;../../bindings/jni"
+                               AdditionalIncludeDirectories="&quot;$(WebKitOutputDir)\obj\JavaScriptCore\$(ConfigurationName)\DerivedSources\&quot;;../../;&quot;../../os-win32/&quot;;../../pcre/;../../kjs/;../../wtf/;&quot;$(WebKitSDKDir)\include\icu&quot;;../../../icu/include;../../bindings;../../bindings/c;../../bindings/jni"
                                PreprocessorDefinitions="HAVE_CONFIG_H;WIN32;__STD_C;NDEBUG"
                                ExceptionHandling="0"
                                RuntimeLibrary="2"
                        />
                        <Tool
                                Name="VCPostBuildEventTool"
-                               CommandLine="mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\$(ConfigurationName)\WTF&quot;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\$(ConfigurationName)\WTF\os-win32&quot;&#x0D;&#x0A;xcopy /y &quot;$(ProjectDir)\..\..\..\JavaScriptCore\wtf\Vector.h&quot; &quot;$(WebKitOutputDir)\$(ConfigurationName)\WTF&quot;&#x0D;&#x0A;xcopy /y &quot;$(ProjectDir)\..\..\..\JavaScriptCore\wtf\Assertions.h&quot; &quot;$(WebKitOutputDir)\$(ConfigurationName)\WTF&quot;&#x0D;&#x0A;xcopy /y &quot;$(ProjectDir)\..\..\..\JavaScriptCore\wtf\VectorTraits.h&quot; &quot;$(WebKitOutputDir)\$(ConfigurationName)\WTF&quot;&#x0D;&#x0A;xcopy /y &quot;$(ProjectDir)\..\..\..\JavaScriptCore\wtf\RefPtr.h&quot; &quot;$(WebKitOutputDir)\$(ConfigurationName)\WTF&quot;&#x0D;&#x0A;xcopy /y &quot;$(ProjectDir)\..\..\..\JavaScriptCore\wtf\Platform.h&quot; &quot;$(WebKitOutputDir)\$(ConfigurationName)\WTF&quot;&#x0D;&#x0A;xcopy /y &quot;$(ProjectDir)\..\..\..\JavaScriptCore\wtf\FastMalloc.h&quot; &quot;$(WebKitOutputDir)\$(ConfigurationName)\WTF&quot;&#x0D;&#x0A;xcopy /y &quot;$(ProjectDir)\..\..\..\JavaScriptCore\wtf\MathExtras.h&quot; &quot;$(WebKitOutputDir)\$(ConfigurationName)\WTF&quot;&#x0D;&#x0A;xcopy /y &quot;$(ProjectDir)\..\..\..\JavaScriptCore\wtf\HashMap.h&quot; &quot;$(WebKitOutputDir)\$(ConfigurationName)\WTF&quot;&#x0D;&#x0A;xcopy /y &quot;$(ProjectDir)\..\..\..\JavaScriptCore\wtf\HashTable.h&quot; &quot;$(WebKitOutputDir)\$(ConfigurationName)\WTF&quot;&#x0D;&#x0A;xcopy /y &quot;$(ProjectDir)\..\..\..\JavaScriptCore\wtf\HashTraits.h&quot; &quot;$(WebKitOutputDir)\$(ConfigurationName)\WTF&quot;&#x0D;&#x0A;xcopy /y &quot;$(ProjectDir)\..\..\..\JavaScriptCore\wtf\HashFunctions.h&quot; &quot;$(WebKitOutputDir)\$(ConfigurationName)\WTF&quot;&#x0D;&#x0A;xcopy /y &quot;$(ProjectDir)\..\..\..\JavaScriptCore\os-win32\stdint.h&quot; &quot;$(WebKitOutputDir)\$(ConfigurationName)\WTF\os-win32&quot;&#x0D;&#x0A;copy /y &quot;$(TargetPath)&quot; &quot;$(WebKitOutputDir)\$(ConfigurationName)\WTF\WTF.lib&quot;&#x0D;&#x0A;"
+                               CommandLine="mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\JavaScriptCore\wtf&quot;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\JavaScriptCore\wtf\os-win32&quot;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\JavaScriptCore\kjs&quot;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\JavaScriptCore\pcre&quot;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\JavaScriptCore\bindings&quot;&#x0D;&#x0A;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\wtf\*.h&quot; &quot;$(WebKitOutputDir)\include\JavaScriptCore\wtf&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\os-win32\*.h&quot; &quot;$(WebKitOutputDir)\include\JavaScriptCore\wtf\os-win32&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\kjs\*.h&quot; &quot;$(WebKitOutputDir)\include\JavaScriptCore\kjs&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\kjs\create_hash_table&quot; &quot;$(WebKitOutputDir)\include\JavaScriptCore\kjs&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\pcre\pcre.h&quot; &quot;$(WebKitOutputDir)\include\JavaScriptCore\pcre&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\bindings\npruntime.h&quot; &quot;$(WebKitOutputDir)\include\JavaScriptCore\bindings&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\bindings\npapi.h&quot; &quot;$(WebKitOutputDir)\include\JavaScriptCore\bindings&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\bindings\npruntime_impl.h&quot; &quot;$(WebKitOutputDir)\include\JavaScriptCore\bindings&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\bindings\NP_jsobject.h&quot; &quot;$(WebKitOutputDir)\include\JavaScriptCore\bindings&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\bindings\runtime_root.h&quot; &quot;$(WebKitOutputDir)\include\JavaScriptCore\bindings&quot;&#x0D;&#x0A;&#x0D;&#x0A;dir &gt; &quot;$(TargetDir)WTF.lib&quot;&#x0D;&#x0A;xcopy /y /i &quot;$(TargetPath)&quot; &quot;$(TargetDir)WTF.lib&quot;&#x0D;&#x0A;&#x0D;&#x0A;dstroot-to-sdk.cmd JavaScriptCore&#x0D;&#x0A;"
                        />
                </Configuration>
        </Configurations>
index 1e41b00..6a45caf 100755 (executable)
@@ -4,7 +4,7 @@
 WebKitUnixDir=`cygpath -a -u "$2"`\r
 \r
 # Set up the directory that will hold all our generated files.\r
-DerivedSourcesDir="$WebKitUnixDir/JavaScriptCore.intermediate/$1/JavaScriptCore.intermediate/DerivedSources"\r
+DerivedSourcesDir="$WebKitUnixDir/obj/JavaScriptCore/$1/DerivedSources"\r
 mkdir -p "$DerivedSourcesDir"\r
 \r
 # Invoke the create_hash_table perl script to create all of our lookup tables\r
@@ -61,8 +61,10 @@ if [ ../../kjs/grammar.y -nt "$DerivedSourcesDir/grammar.cpp" ]; then
 fi\r
 \r
 echo "Copying ICU DLLS..."\r
-WebKitOutputConfigDir="$WebKitUnixDir/$1"\r
+WebKitOutputConfigDir="$WebKitUnixDir/bin/JavaScriptCore/$1"\r
 mkdir -p "$WebKitOutputConfigDir"\r
 \r
-cp ../../../icu/bin/icudt34.dll "$WebKitOutputConfigDir" || exit 1\r
-cp ../../../icu/bin/icuuc34.dll "$WebKitOutputConfigDir" || exit 1\r
+if [ -e "../../../icu/bin/icudt34.dll" ]; then\r
+    cp ../../../icu/bin/icudt34.dll "$WebKitOutputConfigDir" || exit 1\r
+    cp ../../../icu/bin/icuuc34.dll "$WebKitOutputConfigDir" || exit 1\r
+fi\r
diff --git a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/dstroot-to-sdk.cmd b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/dstroot-to-sdk.cmd
new file mode 100644 (file)
index 0000000..4c04312
--- /dev/null
@@ -0,0 +1,17 @@
+@echo off
+
+IF "%WebKitSDKDir%"=="" goto end;
+IF "%WebKitOutputDir%"=="" goto end;
+IF "%1"=="" goto end;
+
+xcopy /y /d /i "%WebKitOutputDir%\bin\dftables.exe" "%WebKitSDKDir%\bin"
+xcopy /y /d /i "%WebKitOutputDir%\bin\dftables_debug.exe" "%WebKitSDKDir%\bin"
+xcopy /y /d /i "%WebKitOutputDir%\bin\dftables.pdb" "%WebKitSDKDir%\bin"
+xcopy /y /d /i "%WebKitOutputDir%\bin\dftables_debug.pdb" "%WebKitSDKDir%\bin"
+xcopy /y /d /i "%WebKitOutputDir%\lib\JavaScriptCore.lib" "%WebKitSDKDir%\lib"
+xcopy /y /d /i "%WebKitOutputDir%\lib\JavaScriptCore_debug.lib" "%WebKitSDKDir%\lib"
+xcopy /y /d /i "%WebKitOutputDir%\lib\WTF.lib" "%WebKitSDKDir%\lib"
+xcopy /y /d /i "%WebKitOutputDir%\lib\WTF_debug.lib" "%WebKitSDKDir%\lib"
+xcopy /y /s /d /i "%WebKitOutputDir%\include\%1" "%WebKitSDKDir%\include\%1"
+
+:end
index 68811e0..7b0d218 100644 (file)
@@ -17,8 +17,8 @@
        <Configurations>
                <Configuration
                        Name="Debug|Win32"
-                       OutputDirectory="$(WebKitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\dftables.intermediate\"
-                       IntermediateDirectory="$(WebKitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\dftables.intermediate\"
+                       OutputDirectory="$(WebKitOutputDir)\bin"
+                       IntermediateDirectory="$(WebKitOutputDir)\obj\JavaScriptCore\$(ProjectName)\$(ConfigurationName)"
                        ConfigurationType="1"
                        CharacterSet="1"
                        >
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                AdditionalIncludeDirectories="../../wtf"
-                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"
                                MinimalRebuild="true"
+                               ExceptionHandling="0"
                                BasicRuntimeChecks="3"
-                               RuntimeLibrary="3"
+                               RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
                                Detect64BitPortabilityProblems="true"
@@ -61,7 +62,8 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               LinkIncremental="1"
+                               OutputFile="$(OutDir)\$(ProjectName)_debug.exe"
+                               LinkIncremental="2"
                                GenerateDebugInformation="true"
                                SubSystem="1"
                                TargetMachine="1"
@@ -93,8 +95,8 @@
                </Configuration>
                <Configuration
                        Name="Release|Win32"
-                       OutputDirectory="$(WebKitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\dftables.intermediate\"
-                       IntermediateDirectory="$(WebKitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\dftables.intermediate\"
+                       OutputDirectory="$(WebKitOutputDir)\bin"
+                       IntermediateDirectory="$(WebKitOutputDir)\obj\JavaScriptCore\$(ProjectName)\$(ConfigurationName)"
                        ConfigurationType="1"
                        CharacterSet="1"
                        WholeProgramOptimization="1"
                        <Tool
                                Name="VCCLCompilerTool"
                                AdditionalIncludeDirectories="../../wtf"
-                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"
+                               ExceptionHandling="0"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
index b53aeef..e6caba8 100644 (file)
@@ -17,8 +17,8 @@
        <Configurations>
                <Configuration
                        Name="Debug|Win32"
-                       OutputDirectory="$(WebKitOutputDir)\$(ConfigurationName)"
-                       IntermediateDirectory="$(WebKitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\testkjs.intermediate\"
+                       OutputDirectory="$(WebKitOutputDir)\bin"
+                       IntermediateDirectory="$(WebKitOutputDir)\obj\JavaScriptCore\$(ProjectName)\$(ConfigurationName)"
                        ConfigurationType="1"
                        CharacterSet="1"
                        >
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="&quot;$(WebKitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate\DerivedSources\&quot;;../../;&quot;../../os-win32/&quot;;../../pcre/;../../kjs/;../../wtf/;../../../icu/include"
+                               AdditionalIncludeDirectories="&quot;$(WebKitOutputDir)\obj\JavaScriptCore\$(ConfigurationName)\DerivedSources\&quot;;../../;&quot;../../os-win32/&quot;;../../pcre/;../../kjs/;../../wtf/;&quot;$(WebKitSDKDir)\include\icu&quot;;../../../icu/include"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE; WIN32"
                                MinimalRebuild="true"
+                               ExceptionHandling="0"
                                BasicRuntimeChecks="3"
-                               RuntimeLibrary="3"
+                               RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
                                WarningLevel="1"
                                Detect64BitPortabilityProblems="false"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalOptions="&quot;$(WebKitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate\JavaScriptCore.lib&quot; ..\..\..\icu\lib\icuuc.lib&#x0D;&#x0A;winmm.lib"
+                               LinkLibraryDependencies="false"
+                               AdditionalDependencies="JavaScriptCore_debug.lib icuuc.lib winmm.lib"
+                               OutputFile="$(OutDir)\$(ProjectName)_debug.exe"
                                LinkIncremental="2"
+                               AdditionalLibraryDirectories="&quot;$(WebKitSDKDir)\lib&quot;;..\..\..\icu\lib;&quot;$(WebKitOutputDir)\lib&quot;"
                                GenerateDebugInformation="true"
                                SubSystem="1"
                                TargetMachine="1"
@@ -95,8 +99,8 @@
                </Configuration>
                <Configuration
                        Name="Release|Win32"
-                       OutputDirectory="$(WebKitOutputDir)\$(ConfigurationName)"
-                       IntermediateDirectory="$(WebKitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\testkjs.intermediate\"
+                       OutputDirectory="$(WebKitOutputDir)\bin"
+                       IntermediateDirectory="$(WebKitOutputDir)\obj\JavaScriptCore\$(ProjectName)\$(ConfigurationName)"
                        ConfigurationType="1"
                        CharacterSet="1"
                        WholeProgramOptimization="1"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="&quot;$(WebKitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate\DerivedSources\&quot;;../../;&quot;../../os-win32/&quot;;../../pcre/;../../kjs/;../../wtf/;../../../icu/include"
+                               AdditionalIncludeDirectories="&quot;$(WebKitOutputDir)\obj\JavaScriptCore\$(ConfigurationName)\DerivedSources\&quot;;../../;&quot;../../os-win32/&quot;;../../pcre/;../../kjs/;../../wtf/;&quot;$(WebKitSDKDir)\include\icu&quot;;../../../icu/include"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE; WIN32"
+                               ExceptionHandling="0"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
                                WarningLevel="1"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalOptions="&quot;$(WebKitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate\JavaScriptCore.lib&quot; ..\..\..\icu\lib\icuuc.lib&#x0D;&#x0A;winmm.lib"
+                               LinkLibraryDependencies="false"
+                               AdditionalDependencies="JavaScriptCore.lib icuuc.lib winmm.lib"
                                LinkIncremental="1"
+                               AdditionalLibraryDirectories="&quot;$(WebKitSDKDir)\lib&quot;;..\..\..\icu\lib;&quot;$(WebKitOutputDir)\lib&quot;"
                                GenerateDebugInformation="true"
                                SubSystem="1"
                                OptimizeReferences="2"