Ignore:
Timestamp:
Oct 25, 2007, 2:03:52 PM (18 years ago)
Author:
aroben
Message:

Fix some JavaScriptCore build issues

JavaScriptCore:

Change JavaScriptCore.vcproj to use DerivedSources.make

We were trying to emulate the logic of make in
build-generated-files.sh, but we got it wrong. We now use a
build-generated-files very much like the one that WebCore uses to
invoke make.

We also now only have a Debug configuration of dftables which we build
even when doing a Release build of JavaScriptCore. dftables also no
longer has the "_debug" name suffix.

Changes mostly made by Darin, reviewed by me.

  • DerivedSources.make: Add a variable to set the extension used for the dftables executable.
  • JavaScriptCore.vcproj/JavaScriptCore.sln: Updated to use Debug dftables in Release configurations.
  • JavaScriptCore.vcproj/JavaScriptCoreSubmit.sln: Ditto.
  • JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
    • Updated include path to point to the new location of the derived sources.
    • Modified pre-build event to pass the right arguments to build-generated-files.sh and not call dftables directly.
    • Added the derived source files to the project.
    • Removed grammarWrapper.cpp, which isn't needed now that we're compiling grammar.cpp directly.
  • JavaScriptCore.vcproj/JavaScriptCore/build-generated-files.sh: Slightly modified from the WebCore version.
  • JavaScriptCore.vcproj/JavaScriptCore/grammarWrapper.cpp: Removed.
  • JavaScriptCore.vcproj/dftables/dftables.vcproj:
    • Changed the output location to match Mac.
    • Removed the Release configuration.
    • Removed the _debug suffix.

win:

Update WebKit.sln for the removal of Release dftables

Reviewed by NOBODY.

  • WebKit.vcproj/WebKit.sln:
Location:
trunk/JavaScriptCore/JavaScriptCore.vcproj
Files:
1 deleted
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore.sln

    r26707 r27061  
    3636                {BC2981C0-67A5-4A3C-879B-784BCBDE2541}.Debug|Win32.ActiveCfg = Debug|Win32
    3737                {BC2981C0-67A5-4A3C-879B-784BCBDE2541}.Debug|Win32.Build.0 = Debug|Win32
    38                 {BC2981C0-67A5-4A3C-879B-784BCBDE2541}.Release|Win32.ActiveCfg = Release|Win32
    39                 {BC2981C0-67A5-4A3C-879B-784BCBDE2541}.Release|Win32.Build.0 = Release|Win32
     38                {BC2981C0-67A5-4A3C-879B-784BCBDE2541}.Release|Win32.ActiveCfg = Debug|Win32
     39                {BC2981C0-67A5-4A3C-879B-784BCBDE2541}.Release|Win32.Build.0 = Debug|Win32
    4040                {C59E5129-B453-49B7-A52B-1E104715F76E}.Debug_Internal|Win32.ActiveCfg = Debug_Internal|Win32
    4141                {C59E5129-B453-49B7-A52B-1E104715F76E}.Debug_Internal|Win32.Build.0 = Debug_Internal|Win32

  • trunk/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj

    r26889 r27061  
    2828                                Name="VCPreBuildEventTool"
    2929                                Description="Constructing generated files..."
    30                                 CommandLine="set PATH=%SystemDrive%\cygwin\bin;%PATH%

bash build-generated-files.sh "$(ConfigurationName)" "$(WebKitOutputDir)"

"$(WebKitOutputDir)\bin\dftables$(WebKitConfigSuffix).exe" "$(WebKitOutputDir)\obj\JavaScriptCore\$(ConfigurationName)\DerivedSources\chartables.c"

mkdir 2>NUL "$(WebKitOutputDir)\include\JavaScriptCore\JavaScriptCore"

xcopy /y /d "$(ProjectDir)\..\..\API\APICast.h" "$(WebKitOutputDir)\include\JavaScriptCore\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\API\JSBase.h" "$(WebKitOutputDir)\include\JavaScriptCore\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\API\JSContextRef.h" "$(WebKitOutputDir)\include\JavaScriptCore\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\API\JSObjectRef.h" "$(WebKitOutputDir)\include\JavaScriptCore\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\API\JSStringRef.h" "$(WebKitOutputDir)\include\JavaScriptCore\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\API\JSStringRefCF.h" "$(WebKitOutputDir)\include\JavaScriptCore\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\API\JSStringRefCF.cpp" "$(WebKitOutputDir)\include\JavaScriptCore\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\API\JSValueRef.h" "$(WebKitOutputDir)\include\JavaScriptCore\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\API\JavaScriptCore.h" "$(WebKitOutputDir)\include\JavaScriptCore\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\API\JSRetainPtr.h" "$(WebKitOutputDir)\include\JavaScriptCore\JavaScriptCore"
"
     30                                CommandLine="set PATH=%SystemDrive%\cygwin\bin;%PATH%

bash build-generated-files.sh "$(WebKitOutputDir)" "$(WebKitLibrariesDir)"

mkdir 2>NUL "$(WebKitOutputDir)\include\JavaScriptCore\JavaScriptCore"

xcopy /y /d "$(ProjectDir)\..\..\API\APICast.h" "$(WebKitOutputDir)\include\JavaScriptCore\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\API\JSBase.h" "$(WebKitOutputDir)\include\JavaScriptCore\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\API\JSContextRef.h" "$(WebKitOutputDir)\include\JavaScriptCore\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\API\JSObjectRef.h" "$(WebKitOutputDir)\include\JavaScriptCore\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\API\JSStringRef.h" "$(WebKitOutputDir)\include\JavaScriptCore\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\API\JSStringRefCF.h" "$(WebKitOutputDir)\include\JavaScriptCore\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\API\JSStringRefCF.cpp" "$(WebKitOutputDir)\include\JavaScriptCore\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\API\JSValueRef.h" "$(WebKitOutputDir)\include\JavaScriptCore\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\API\JavaScriptCore.h" "$(WebKitOutputDir)\include\JavaScriptCore\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\API\JSRetainPtr.h" "$(WebKitOutputDir)\include\JavaScriptCore\JavaScriptCore"
"
    3131                        />
    3232                        <Tool
    … …  
    4747                                Name="VCCLCompilerTool"
    4848                                Optimization="0"
    49                                 AdditionalIncludeDirectories="&quot;$(WebKitOutputDir)\obj\JavaScriptCore\$(ConfigurationName)\DerivedSources\&quot;;../../;&quot;../../os-win32/&quot;;../../pcre/;../../kjs/;../../wtf/;&quot;$(WebKitLibrariesDir)\include&quot;;&quot;$(WebKitLibrariesDir)\include\icu&quot;;../../../icu/include;../../bindings;../../bindings/c;../../bindings/jni;&quot;$(WebKitOutputDir)\include\JavaScriptCore&quot;;&quot;$(WebKitLibrariesDir)\include\pthreads&quot;"
     49                                AdditionalIncludeDirectories="&quot;$(WebKitOutputDir)\obj\JavaScriptCore\DerivedSources\&quot;;../../;&quot;../../os-win32/&quot;;../../pcre/;../../kjs/;../../wtf/;&quot;$(WebKitLibrariesDir)\include&quot;;&quot;$(WebKitLibrariesDir)\include\icu&quot;;../../../icu/include;../../bindings;../../bindings/c;../../bindings/jni;&quot;$(WebKitOutputDir)\include\JavaScriptCore&quot;;&quot;$(WebKitLibrariesDir)\include\pthreads&quot;"
    5050                                PreprocessorDefinitions="HAVE_CONFIG_H;WIN32;__STD_C;_SCL_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE"
    5151                                MinimalRebuild="true"
    … …  
    106106                                Name="VCPreBuildEventTool"
    107107                                Description="Constructing generated files..."
    108                                 CommandLine="set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;&#x0D;&#x0A;bash build-generated-files.sh &quot;$(ConfigurationName)&quot; &quot;$(WebKitOutputDir)&quot;&#x0D;&#x0A;&#x0D;&#x0A;&quot;$(WebKitOutputDir)\bin\dftables$(WebKitConfigSuffix).exe&quot; &quot;$(WebKitOutputDir)\obj\JavaScriptCore\$(ConfigurationName)\DerivedSources\chartables.c&quot;&#x0D;&#x0A;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\JavaScriptCore\JavaScriptCore&quot;&#x0D;&#x0A;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\API\APICast.h&quot; &quot;$(WebKitOutputDir)\include\JavaScriptCore\JavaScriptCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\API\JSBase.h&quot; &quot;$(WebKitOutputDir)\include\JavaScriptCore\JavaScriptCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\API\JSContextRef.h&quot; &quot;$(WebKitOutputDir)\include\JavaScriptCore\JavaScriptCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\API\JSObjectRef.h&quot; &quot;$(WebKitOutputDir)\include\JavaScriptCore\JavaScriptCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\API\JSStringRef.h&quot; &quot;$(WebKitOutputDir)\include\JavaScriptCore\JavaScriptCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\API\JSStringRefCF.h&quot; &quot;$(WebKitOutputDir)\include\JavaScriptCore\JavaScriptCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\API\JSStringRefCF.cpp&quot; &quot;$(WebKitOutputDir)\include\JavaScriptCore\JavaScriptCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\API\JSValueRef.h&quot; &quot;$(WebKitOutputDir)\include\JavaScriptCore\JavaScriptCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\API\JavaScriptCore.h&quot; &quot;$(WebKitOutputDir)\include\JavaScriptCore\JavaScriptCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\API\JSRetainPtr.h&quot; &quot;$(WebKitOutputDir)\include\JavaScriptCore\JavaScriptCore&quot;&#x0D;&#x0A;"
     108                                CommandLine="set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;&#x0D;&#x0A;bash build-generated-files.sh &quot;$(WebKitOutputDir)&quot; &quot;$(WebKitLibrariesDir)&quot;&#x0D;&#x0A;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\JavaScriptCore\JavaScriptCore&quot;&#x0D;&#x0A;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\API\APICast.h&quot; &quot;$(WebKitOutputDir)\include\JavaScriptCore\JavaScriptCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\API\JSBase.h&quot; &quot;$(WebKitOutputDir)\include\JavaScriptCore\JavaScriptCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\API\JSContextRef.h&quot; &quot;$(WebKitOutputDir)\include\JavaScriptCore\JavaScriptCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\API\JSObjectRef.h&quot; &quot;$(WebKitOutputDir)\include\JavaScriptCore\JavaScriptCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\API\JSStringRef.h&quot; &quot;$(WebKitOutputDir)\include\JavaScriptCore\JavaScriptCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\API\JSStringRefCF.h&quot; &quot;$(WebKitOutputDir)\include\JavaScriptCore\JavaScriptCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\API\JSStringRefCF.cpp&quot; &quot;$(WebKitOutputDir)\include\JavaScriptCore\JavaScriptCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\API\JSValueRef.h&quot; &quot;$(WebKitOutputDir)\include\JavaScriptCore\JavaScriptCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\API\JavaScriptCore.h&quot; &quot;$(WebKitOutputDir)\include\JavaScriptCore\JavaScriptCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\API\JSRetainPtr.h&quot; &quot;$(WebKitOutputDir)\include\JavaScriptCore\JavaScriptCore&quot;&#x0D;&#x0A;"
    109109                        />
    110110                        <Tool
    … …  
    124124                        <Tool
    125125                                Name="VCCLCompilerTool"
    126                                 AdditionalIncludeDirectories="&quot;$(WebKitOutputDir)\obj\JavaScriptCore\$(ConfigurationName)\DerivedSources\&quot;;../../;&quot;../../os-win32/&quot;;../../pcre/;../../kjs/;../../wtf/;&quot;$(WebKitLibrariesDir)\include&quot;;&quot;$(WebKitLibrariesDir)\include\icu&quot;;../../../icu/include;../../bindings;../../bindings/c;../../bindings/jni;&quot;$(WebKitOutputDir)\include\JavaScriptCore&quot;;&quot;$(WebKitLibrariesDir)\include\pthreads&quot;"
     126                                AdditionalIncludeDirectories="&quot;$(WebKitOutputDir)\obj\JavaScriptCore\DerivedSources\&quot;;../../;&quot;../../os-win32/&quot;;../../pcre/;../../kjs/;../../wtf/;&quot;$(WebKitLibrariesDir)\include&quot;;&quot;$(WebKitLibrariesDir)\include\icu&quot;;../../../icu/include;../../bindings;../../bindings/c;../../bindings/jni;&quot;$(WebKitOutputDir)\include\JavaScriptCore&quot;;&quot;$(WebKitLibrariesDir)\include\pthreads&quot;"
    127127                                PreprocessorDefinitions="HAVE_CONFIG_H;WIN32;__STD_C;NDEBUG;_SCL_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE"
    128128                                ExceptionHandling="0"
    … …  
    300300                        </File>
    301301                        <File
    302                                 RelativePath=".\grammarWrapper.cpp"
    303                                 >
    304                         </File>
    305                         <File
    306302                                RelativePath="..\..\kjs\identifier.cpp"
    307303                                >
    … …  
    527523                                >
    528524                        </File>
     525                        <Filter
     526                                Name="DerivedSources"
     527                                >
     528                                <File
     529                                        RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\array_object.lut.h"
     530                                        >
     531                                </File>
     532                                <File
     533                                        RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\date_object.lut.h"
     534                                        >
     535                                </File>
     536                                <File
     537                                        RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\grammar.cpp"
     538                                        >
     539                                </File>
     540                                <File
     541                                        RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\grammar.h"
     542                                        >
     543                                </File>
     544                                <File
     545                                        RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\lexer.lut.h"
     546                                        >
     547                                </File>
     548                                <File
     549                                        RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\math_object.lut.h"
     550                                        >
     551                                </File>
     552                                <File
     553                                        RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\number_object.lut.h"
     554                                        >
     555                                </File>
     556                                <File
     557                                        RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\regexp_object.lut.h"
     558                                        >
     559                                </File>
     560                                <File
     561                                        RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\string_object.lut.h"
     562                                        >
     563                                </File>
     564                        </Filter>
    529565                </Filter>
    530566                <Filter

  • trunk/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/build-generated-files.sh

    r16597 r27061  
    11#!/usr/bin/bash
    22
    3 # Convert the DOS WebKitOutputDir variable to a unix path.
    4 WebKitUnixDir=`cygpath -a -u "$2"`
     3NUMCPUS=`../../../WebKitTools/Scripts/num-cpus`
    54
    6 # Set up the directory that will hold all our generated files.
    7 DerivedSourcesDir="$WebKitUnixDir/obj/JavaScriptCore/$1/DerivedSources"
    8 mkdir -p "$DerivedSourcesDir"
     5XSRCROOT="`pwd`/../.."
     6XSRCROOT=`realpath "$XSRCROOT"`
     7# Do a little dance to get the path into 8.3 form to make it safe for gnu make
     8# http://bugzilla.opendarwin.org/show_bug.cgi?id=8173
     9XSRCROOT=`cygpath -m -s "$XSRCROOT"`
     10XSRCROOT=`cygpath -u "$XSRCROOT"`
     11export XSRCROOT
     12export SOURCE_ROOT=$XSRCROOT
    913
    10 # Invoke the create_hash_table perl script to create all of our lookup tables
     14XDSTROOT="$1"
     15export XDSTROOT
     16# Do a little dance to get the path into 8.3 form to make it safe for gnu make
     17# http://bugzilla.opendarwin.org/show_bug.cgi?id=8173
     18XDSTROOT=`cygpath -m -s "$XDSTROOT"`
     19XDSTROOT=`cygpath -u "$XDSTROOT"`
     20export XDSTROOT
    1121
    12 if [ ../../kjs/array_object.cpp -nt "$DerivedSourcesDir/array_object.lut.h" ]; then
    13   ../../kjs/create_hash_table ../../kjs/array_object.cpp > "$DerivedSourcesDir/array_object.lut.h" -i
    14 fi
     22SDKROOT="$2"
     23export SDKROOT
     24# Do a little dance to get the path into 8.3 form to make it safe for gnu make
     25# http://bugzilla.opendarwin.org/show_bug.cgi?id=8173
     26SDKROOT=`cygpath -m -s "$SDKROOT"`
     27SDKROOT=`cygpath -u "$SDKROOT"`
     28export SDKROOT
    1529
    16 if [ ../../kjs/bool_object.cpp -nt "$DerivedSourcesDir/bool_object.lut.h" ]; then
    17   ../../kjs/create_hash_table ../../kjs/bool_object.cpp > "$DerivedSourcesDir/bool_object.lut.h" -i
    18 fi
     30export BUILT_PRODUCTS_DIR="$XDSTROOT/obj/JavaScriptCore"
    1931
    20 if [ ../../kjs/date_object.cpp -nt "$DerivedSourcesDir/date_object.lut.h" ]; then
    21   ../../kjs/create_hash_table ../../kjs/date_object.cpp > "$DerivedSourcesDir/date_object.lut.h" -i
    22 fi
     32mkdir -p "${BUILT_PRODUCTS_DIR}/DerivedSources"
     33cd "${BUILT_PRODUCTS_DIR}/DerivedSources"
    2334
    24 if [ ../../kjs/error_object.cpp -nt "$DerivedSourcesDir/error_object.lut.h" ]; then
    25   ../../kjs/create_hash_table ../../kjs/error_object.cpp > "$DerivedSourcesDir/error_object.lut.h" -i
    26 fi
    27 
    28 if [ ../../kjs/function_object.cpp -nt "$DerivedSourcesDir/function_object.lut.h" ]; then
    29   ../../kjs/create_hash_table ../../kjs/function_object.cpp > "$DerivedSourcesDir/function_object.lut.h" -i
    30 fi
    31 
    32 if [ ../../kjs/math_object.cpp -nt "$DerivedSourcesDir/math_object.lut.h" ]; then
    33   ../../kjs/create_hash_table ../../kjs/math_object.cpp > "$DerivedSourcesDir/math_object.lut.h" -i
    34 fi
    35 
    36 if [ ../../kjs/number_object.cpp -nt "$DerivedSourcesDir/number_object.lut.h" ]; then
    37   ../../kjs/create_hash_table ../../kjs/number_object.cpp > "$DerivedSourcesDir/number_object.lut.h" -i
    38 fi
    39 
    40 if [ ../../kjs/object_object.cpp -nt "$DerivedSourcesDir/object_object.lut.h" ]; then
    41   ../../kjs/create_hash_table ../../kjs/object_object.cpp > "$DerivedSourcesDir/object_object.lut.h" -i
    42 fi
    43 
    44 if [ ../../kjs/regexp_object.cpp -nt "$DerivedSourcesDir/regexp_object.lut.h" ]; then
    45   ../../kjs/create_hash_table ../../kjs/regexp_object.cpp > "$DerivedSourcesDir/regexp_object.lut.h" -i
    46 fi
    47 
    48 if [ ../../kjs/string_object.cpp -nt "$DerivedSourcesDir/string_object.lut.h" ]; then
    49   ../../kjs/create_hash_table ../../kjs/string_object.cpp > "$DerivedSourcesDir/string_object.lut.h" -i
    50 fi
    51 
    52 if [ ../../kjs/keywords.table -nt "$DerivedSourcesDir/lexer.lut.h" ]; then
    53   ../../kjs/create_hash_table ../../kjs/keywords.table > "$DerivedSourcesDir/lexer.lut.h" -i
    54 fi
    55 
    56 # Generate the grammar using bison
    57 if [ ../../kjs/grammar.y -nt "$DerivedSourcesDir/grammar.cpp" ]; then
    58   echo "Generating the JS grammar using bison..."
    59   bison -d -p kjsyy ../../kjs/grammar.y -o "$DerivedSourcesDir/grammar.cpp"
    60   mv "$DerivedSourcesDir/grammar.hpp" "$DerivedSourcesDir/grammar.h"
    61 fi
    62 
    63 echo "Copying ICU DLLS..."
    64 WebKitOutputConfigDir="$WebKitUnixDir/$1"
    65 mkdir -p "$WebKitOutputConfigDir"
    66 
    67 if [ -e "../../../icu/bin/icudt34.dll" ]; then
    68     cp ../../../icu/bin/icudt34.dll "$WebKitOutputConfigDir" || exit 1
    69     cp ../../../icu/bin/icuuc34.dll "$WebKitOutputConfigDir" || exit 1
    70 fi
     35export JavaScriptCore="${XSRCROOT}"
     36export DFTABLES_EXTENSION=".exe"
     37make -f "$JavaScriptCore/DerivedSources.make" -j ${NUMCPUS} || exit 1

  • trunk/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCoreSubmit.sln

    r25935 r27061  
    2828                {BC2981C0-67A5-4A3C-879B-784BCBDE2541}.Debug|Win32.ActiveCfg = Debug|Win32
    2929                {BC2981C0-67A5-4A3C-879B-784BCBDE2541}.Debug|Win32.Build.0 = Debug|Win32
    30                 {BC2981C0-67A5-4A3C-879B-784BCBDE2541}.Release|Win32.ActiveCfg = Release|Win32
    31                 {BC2981C0-67A5-4A3C-879B-784BCBDE2541}.Release|Win32.Build.0 = Release|Win32
     30                {BC2981C0-67A5-4A3C-879B-784BCBDE2541}.Release|Win32.ActiveCfg = Debug|Win32
     31                {BC2981C0-67A5-4A3C-879B-784BCBDE2541}.Release|Win32.Build.0 = Debug|Win32
    3232                {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug_Internal|Win32.ActiveCfg = Debug|Win32
    3333                {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug_Internal|Win32.Build.0 = Debug|Win32

  • trunk/JavaScriptCore/JavaScriptCore.vcproj/dftables/dftables.vcproj

    r25934 r27061  
    1818                <Configuration
    1919                        Name="Debug|Win32"
    20                         OutputDirectory="$(WebKitOutputDir)\bin"
     20                        OutputDirectory="$(WebKitOutputDir)\obj\JavaScriptCore"
    2121                        IntermediateDirectory="$(WebKitOutputDir)\obj\JavaScriptCore\$(ProjectName)\$(ConfigurationName)"
    2222                        ConfigurationType="1"
    … …  
    6464                        <Tool
    6565                                Name="VCLinkerTool"
    66                                 OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).exe"
     66                                OutputFile="$(OutDir)\$(ProjectName).exe"
    6767                                LinkIncremental="2"
    6868                                GenerateDebugInformation="true"
    6969                                SubSystem="1"
    70                                 TargetMachine="1"
    71                         />
    72                         <Tool
    73                                 Name="VCALinkTool"
    74                         />
    75                         <Tool
    76                                 Name="VCManifestTool"
    77                         />
    78                         <Tool
    79                                 Name="VCXDCMakeTool"
    80                         />
    81                         <Tool
    82                                 Name="VCBscMakeTool"
    83                         />
    84                         <Tool
    85                                 Name="VCFxCopTool"
    86                         />
    87                         <Tool
    88                                 Name="VCAppVerifierTool"
    89                         />
    90                         <Tool
    91                                 Name="VCWebDeploymentTool"
    92                         />
    93                         <Tool
    94                                 Name="VCPostBuildEventTool"
    95                         />
    96                 </Configuration>
    97                 <Configuration
    98                         Name="Release|Win32"
    99                         OutputDirectory="$(WebKitOutputDir)\bin"
    100                         IntermediateDirectory="$(WebKitOutputDir)\obj\JavaScriptCore\$(ProjectName)\$(ConfigurationName)"
    101                         ConfigurationType="1"
    102                         InheritedPropertySheets="..\release.vsprops"
    103                         CharacterSet="1"
    104                         WholeProgramOptimization="1"
    105                         >
    106                         <Tool
    107                                 Name="VCPreBuildEventTool"
    108                         />
    109                         <Tool
    110                                 Name="VCCustomBuildTool"
    111                         />
    112                         <Tool
    113                                 Name="VCXMLDataGeneratorTool"
    114                         />
    115                         <Tool
    116                                 Name="VCWebServiceProxyGeneratorTool"
    117                         />
    118                         <Tool
    119                                 Name="VCMIDLTool"
    120                         />
    121                         <Tool
    122                                 Name="VCCLCompilerTool"
    123                                 AdditionalIncludeDirectories="../../wtf"
    124                                 PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"
    125                                 ExceptionHandling="0"
    126                                 RuntimeLibrary="2"
    127                                 UsePrecompiledHeader="0"
    128                                 WarningLevel="3"
    129                                 Detect64BitPortabilityProblems="true"
    130                                 DebugInformationFormat="3"
    131                         />
    132                         <Tool
    133                                 Name="VCManagedResourceCompilerTool"
    134                         />
    135                         <Tool
    136                                 Name="VCResourceCompilerTool"
    137                         />
    138                         <Tool
    139                                 Name="VCPreLinkEventTool"
    140                         />
    141                         <Tool
    142                                 Name="VCLinkerTool"
    143                                 OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).exe"
    144                                 LinkIncremental="1"
    145                                 GenerateDebugInformation="true"
    146                                 SubSystem="1"
    147                                 OptimizeReferences="2"
    148                                 EnableCOMDATFolding="2"
    14970                                TargetMachine="1"
    15071                        />
Note: See TracChangeset for help on using the changeset viewer.