Changeset 21449 in webkit

Timestamp:

May 13, 2007, 10:13:20 PM (18 years ago)

Author:

kevino

Message:

Restore the Windows build after WEBKITOUTPUTDIR changes, and also copy over dependency dlls to product dir so that testkjs and the sample app won't complain about missing dlls.

Location:

branches/wx-port-alpha/trunk

Files:

• Bakefiles/presets.bkl (modified) (1 diff)
• JavaScriptCore/Makefile.vc (modified) (4 diffs)
• JavaScriptCore/jscore.bkl (modified) (1 diff)
• WebKitTools/Scripts/build-wxwebkit (modified) (3 diffs)
• WebKitTools/Scripts/webkitdirs.pm (modified) (1 diff)

branches/wx-port-alpha/trunk/Bakefiles/presets.bkl

@@ -64 +64 @@
                 <if cond="FORMAT in ['msvc','msvs2005prj']">
                         <sys-lib>jscore</sys-lib>
+                        <sys-lib>winmm</sys-lib> <!-- for timeGetTime -->
                         <lib-path>$(WKOUTPUTDIR)</lib-path>
                 </if>

branches/wx-port-alpha/trunk/JavaScriptCore/Makefile.vc

@@ -1 +1 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.2 (http://www.bakefile.org)
+#     Bakefile 0.2.2 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
@@ -44 +44 @@
 
 TESTKJS_CXXFLAGS = /MDd /DWIN32 /I$(WK_ROOT)\icu\include \
-        /I$(WK_ROOT)\JavaScriptCore /I$(WK_ROOT)\JavaScriptCore\os-win32 /Zi \
-        /D_DEBUG /Fd$(WKOUTPUTDIR)\testkjs.pdb /I. $(CPPFLAGS) $(CXXFLAGS)
+        /I$(WK_ROOT)\JavaScriptCore /I$(WK_ROOT)\JavaScriptCore\os-win32 \
+        /I.\..\pthreads\include /Zi /D_DEBUG /Fd$(WKOUTPUTDIR)\testkjs.pdb /I. \
+        $(CPPFLAGS) $(CXXFLAGS)
 TESTKJS_OBJECTS =  \
         obj-msvc\testkjs_testkjs.obj
-TESTKJS_ODEP =  $(WKOUTPUTDIR)\jscore.lib
 DFTABLES_CFLAGS =  /MD /DWIN32 /I.\wtf  $(CPPFLAGS) $(CFLAGS)
 DFTABLES_OBJECTS =  \
@@ -162 +162 @@
         -if exist $(WKOUTPUTDIR)\jscore.lib del $(WKOUTPUTDIR)\jscore.lib
 
-$(WKOUTPUTDIR)\testkjs.exe: $(TESTKJS_OBJECTS)
-        link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WK_ROOT)\icu\lib /LIBPATH:$(WKOUTPUTDIR) /DEBUG @<<
-        $(TESTKJS_OBJECTS)  icuuc.lib icuin.lib jscore.lib
+$(WKOUTPUTDIR)\testkjs.exe: $(TESTKJS_OBJECTS) $(WKOUTPUTDIR)\jscore.lib
+        link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WK_ROOT)\icu\lib /LIBPATH:$(WKOUTPUTDIR) /LIBPATH:$(WK_ROOT)\pthreads\lib /DEBUG @<<
+        $(TESTKJS_OBJECTS)  icuuc.lib icuin.lib jscore.lib winmm.lib pthreadVC2.lib
 <<
 
@@ -181 +181 @@
 <<
 
-obj-msvc\testkjs_testkjs.obj: .\.\kjs\testkjs.cpp $(TESTKJS_ODEP)
+obj-msvc\testkjs_testkjs.obj: .\.\kjs\testkjs.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(TESTKJS_CXXFLAGS) $**
 

branches/wx-port-alpha/trunk/JavaScriptCore/jscore.bkl

@@ -97 +97 @@
     </template>
     
-    <exe id="testkjs" template="icu,jscore">
+    <exe id="testkjs" template="icu,jscore,pthreads">
         <cxx-rtti>off</cxx-rtti>
         <cxx-exceptions>off</cxx-exceptions>
         <debug-info>on</debug-info>
-        <objects-depend>jscore</objects-depend>
+        <depends>jscore</depends>
         <include>$(SRCDIR)</include>
         <dirname>$(WKOUTPUTDIR)</dirname>

branches/wx-port-alpha/trunk/WebKitTools/Scripts/build-wxwebkit

@@ -10 +10 @@
 WK_ROOTDIR=$WK_ROOT
 export WXWEBKIT=1
-export WEBKITOUTPUTDIR=`perl -e "use webkitdirs; print baseProductDir()"`
+WEBKITOUTPUTDIR=`perl -e "use webkitdirs; print baseProductDir()"`
+WINDEPS="pthreads/lib/pthreadVC2.dll icu/bin/icuuc34.dll icu/bin/icudt34.dll libcurl/*.dll sqlite3/sqlite3.dll"
+WINDEPS="$WINDEPS $WXWIN/lib/vc_dll/wxmsw28ud_core_vc.dll $WXWIN/lib/vc_dll/wxbase28ud_vc.dll"
 # TODO: check that we are running from the root of the source tree...
 
+# cygpath will bork if the dir doesn't exist...
+mkdir -p $WEBKITOUTPUTDIR
 
 if [ $OSTYPE == cygwin ]; then
     EXE=.exe
-    WK_ROOTDIR=`cygpath -m $WK_ROOT`
+    WK_ROOTDIR=`cygpath -d $WK_ROOT`
+    WEBKITOUTPUTDIR=`cygpath -d $WEBKITOUTPUTDIR`
+    export WEBKITOUTPUTDIR
     if [ -z $WXWIN ]; then
         echo "Error, you must set WXWIN to your wxWidgets root directory."
@@ -24 +30 @@
         export BAKEFILE_PATHS=$WXWIN/build/bakefiles/wxpresets
     fi
+    LINKER=`which link`
+    if [ "$LINKER" = "/usr/bin/link" ]; then
+        echo "WARNING: wxWebKit builds using MSVC on Windows, but it looks like"
+        echo "you have the GCC linker on your path. If /usr/bin/link does NOT point"
+        echo "to the MSVC linker, you need to move it or change your path to pick up"
+        echo "Microsoft's link.exe program first."
+    fi
+
 else
+    export WEBKITOUTPUTDIR
     WX_PREFIX=`wx-config --prefix`
     if [ ! -d "$WX_PREFIX" ]; then
@@ -173 +188 @@
         fi
     fi
+
+    if [ "$OSTYPE" = "cygwin" ]; then
+        echo "Copying necessary DLLs to run test and sample applications..."
+        cd $WK_ROOT
+        cp $WINDEPS $WEBKITOUTPUTDIR
+    fi
 fi
 

branches/wx-port-alpha/trunk/WebKitTools/Scripts/webkitdirs.pm

@@ -140 +140 @@
     return if defined $configurationProductDir;
     determineBaseProductDir();
-    if(isCygwin()) {
+    if (isWx()){
+        $configurationProductDir = "$baseProductDir";
+    } elsif(isCygwin()) {
         $configurationProductDir = "$baseProductDir/bin";
-    }
-    elsif (isWx()){
-        $configurationProductDir = "$baseProductDir";
     } else {
         determineConfiguration();