Mercurial Mercurial > oss > FCL > sf > mw > qt / comparison
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
util/webkit/mkdist-webkit
changeset 30 5dc02b23752f
parent 3 41300fa6a67c
equal deleted inserted replaced
29:b72c6db6890b 30:5dc02b23752f 
    18 repository=`git config qtwebkit.url`
 
    18 repository=`git config qtwebkit.url`
 
    19 if [ -z "$repository" ]; then
 
    19 if [ -z "$repository" ]; then
 
    20     die "error: cannot locate webkit git repository. please run git config --global qtwebkit.url /path-or-url/to/webkit/repo"
 
    20     die "error: cannot locate webkit git repository. please run git config --global qtwebkit.url /path-or-url/to/webkit/repo"
 
    21 fi
 
    21 fi
 
    22 
    22 
    23 excluded_directories="LayoutTests JavaScriptGlue WebKitLibraries WebKitSite WebKitTools WebCore/platform/cf WebCore/platform/gtk WebCore/platform/chromium"
 
    23 excluded_directories="LayoutTests JavaScriptGlue WebKitLibraries WebKitSite WebKitTools WebCore/platform/gtk WebCore/platform/chromium"
 
    24 excluded_directories="$excluded_directories PageLoadTests"
 
    24 excluded_directories="$excluded_directories PageLoadTests"
 
    25 excluded_directories="$excluded_directories BugsSite"
 
    25 excluded_directories="$excluded_directories BugsSite"
 
    26 excluded_directories="$excluded_directories PlanetWebKit"
 
    26 excluded_directories="$excluded_directories PlanetWebKit"
 
    27 excluded_directories="$excluded_directories SunSpider"
 
    27 excluded_directories="$excluded_directories SunSpider"
 
    28 excluded_directories="$excluded_directories WebKitExamplePlugins"
 
    28 excluded_directories="$excluded_directories WebKitExamplePlugins"
 
    47 excluded_directories="$excluded_directories JavaScriptCore/wtf/gtk"
 
    47 excluded_directories="$excluded_directories JavaScriptCore/wtf/gtk"
 
    48 excluded_directories="$excluded_directories JavaScriptCore/wtf/mac"
 
    48 excluded_directories="$excluded_directories JavaScriptCore/wtf/mac"
 
    49 excluded_directories="$excluded_directories JavaScriptCore/wtf/win"
 
    49 excluded_directories="$excluded_directories JavaScriptCore/wtf/win"
 
    50 excluded_directories="$excluded_directories JavaScriptCore/wtf/chromium"
 
    50 excluded_directories="$excluded_directories JavaScriptCore/wtf/chromium"
 
    51 excluded_directories="$excluded_directories JavaScriptCore/wtf/haiku"
 
    51 excluded_directories="$excluded_directories JavaScriptCore/wtf/haiku"
 
       
    52 excluded_directories="$excluded_directories JavaScriptCore/wtf/android"
 
       
    53 excluded_directories="$excluded_directories JavaScriptCore/wtf/brew"
 
    52 
    54 
    53 excluded_directories="$excluded_directories WebCore/WebCore.vcproj"
 
    55 excluded_directories="$excluded_directories WebCore/WebCore.vcproj"
 
    54 excluded_directories="$excluded_directories WebCore/WebCore.gyp"
 
    56 excluded_directories="$excluded_directories WebCore/WebCore.gyp"
 
    55 excluded_directories="$excluded_directories WebCore/DerivedSources.make"
 
    57 excluded_directories="$excluded_directories WebCore/DerivedSources.make"
 
    56 excluded_directories="$excluded_directories WebCore/GNUmakefile.am"
 
    58 excluded_directories="$excluded_directories WebCore/GNUmakefile.am"
 
    79 excluded_directories="$excluded_directories WebCore/page/mac"
 
    81 excluded_directories="$excluded_directories WebCore/page/mac"
 
    80 excluded_directories="$excluded_directories WebCore/page/wx"
 
    82 excluded_directories="$excluded_directories WebCore/page/wx"
 
    81 excluded_directories="$excluded_directories WebCore/page/chromium"
 
    83 excluded_directories="$excluded_directories WebCore/page/chromium"
 
    82 excluded_directories="$excluded_directories WebCore/page/haiku"
 
    84 excluded_directories="$excluded_directories WebCore/page/haiku"
 
    83 excluded_directories="$excluded_directories WebCore/page/wince"
 
    85 excluded_directories="$excluded_directories WebCore/page/wince"
 
       
    86 excluded_directories="$excluded_directories WebCore/page/android"
 
       
    87 excluded_directories="$excluded_directories WebCore/page/brew"
 
    84 
    88 
    85 excluded_directories="$excluded_directories WebCore/history/mac"
 
    89 excluded_directories="$excluded_directories WebCore/history/mac"
 
       
    90 excluded_directories="$excluded_directories WebCore/history/android"
 
    86 
    91 
    87 excluded_directories="$excluded_directories WebCore/editing/mac"
 
    92 excluded_directories="$excluded_directories WebCore/editing/mac"
 
    88 excluded_directories="$excluded_directories WebCore/editing/wx"
 
    93 excluded_directories="$excluded_directories WebCore/editing/wx"
 
    89 excluded_directories="$excluded_directories WebCore/editing/haiku"
 
    94 excluded_directories="$excluded_directories WebCore/editing/haiku"
 
       
    95 excluded_directories="$excluded_directories WebCore/editing/android"
 
       
    96 excluded_directories="$excluded_directories WebCore/editing/chromium"
 
       
    97 excluded_directories="$excluded_directories WebCore/editing/gtk"
 
    90 
    98 
    91 excluded_directories="$excluded_directories WebCore/platform/haiku"
 
    99 excluded_directories="$excluded_directories WebCore/platform/haiku"
 
       
   100 excluded_directories="$excluded_directories WebCore/platform/android"
 
       
   101 excluded_directories="$excluded_directories WebCore/platform/brew"
 
    92 
   102 
    93 excluded_directories="$excluded_directories WebCore/platform/text/wx"
 
   103 excluded_directories="$excluded_directories WebCore/platform/text/wx"
 
    94 excluded_directories="$excluded_directories WebCore/platform/text/gtk"
 
   104 excluded_directories="$excluded_directories WebCore/platform/text/gtk"
 
    95 excluded_directories="$excluded_directories WebCore/platform/text/chromium"
 
   105 excluded_directories="$excluded_directories WebCore/platform/text/chromium"
 
    96 excluded_directories="$excluded_directories WebCore/platform/text/haiku"
 
   106 excluded_directories="$excluded_directories WebCore/platform/text/haiku"
 
       
   107 excluded_directories="$excluded_directories WebCore/platform/text/android"
 
       
   108 excluded_directories="$excluded_directories WebCore/platform/text/brew"
 
    97 
   109 
    98 excluded_directories="$excluded_directories WebCore/platform/sql/chromium"
 
   110 excluded_directories="$excluded_directories WebCore/platform/sql/chromium"
 
    99 
   111 
   100 excluded_directories="$excluded_directories WebCore/manual-tests"
 
   112 excluded_directories="$excluded_directories WebCore/manual-tests"
 
   101 
   113 
   102 excluded_directories="$excluded_directories WebCore/platform/network/cf"
 
       
   103 excluded_directories="$excluded_directories WebCore/platform/network/curl"
 
   114 excluded_directories="$excluded_directories WebCore/platform/network/curl"
 
   104 excluded_directories="$excluded_directories WebCore/platform/network/mac"
 
   115 excluded_directories="$excluded_directories WebCore/platform/network/mac"
 
   105 excluded_directories="$excluded_directories WebCore/platform/network/win"
 
   116 excluded_directories="$excluded_directories WebCore/platform/network/win"
 
   106 excluded_directories="$excluded_directories WebCore/platform/network/soup"
 
   117 excluded_directories="$excluded_directories WebCore/platform/network/soup"
 
   107 excluded_directories="$excluded_directories WebCore/platform/network/chromium"
 
   118 excluded_directories="$excluded_directories WebCore/platform/network/chromium"
 
       
   119 excluded_directories="$excluded_directories WebCore/platform/network/android"
 
       
   120 excluded_directories="$excluded_directories WebCore/platform/network/brew"
 
   108 
   121 
   109 excluded_directories="$excluded_directories WebCore/platform/graphics/cg"
 
   122 excluded_directories="$excluded_directories WebCore/platform/graphics/cg"
 
   110 excluded_directories="$excluded_directories WebCore/platform/graphics/cairo"
 
   123 excluded_directories="$excluded_directories WebCore/platform/graphics/cairo"
 
   111 excluded_directories="$excluded_directories WebCore/platform/graphics/gtk"
 
   124 excluded_directories="$excluded_directories WebCore/platform/graphics/gtk"
 
   112 excluded_directories="$excluded_directories WebCore/platform/graphics/wx"
 
   125 excluded_directories="$excluded_directories WebCore/platform/graphics/wx"
 
   113 excluded_directories="$excluded_directories WebCore/platform/graphics/mac"
 
   126 excluded_directories="$excluded_directories WebCore/platform/graphics/mac"
 
   114 excluded_directories="$excluded_directories WebCore/platform/graphics/win"
 
       
   115 excluded_directories="$excluded_directories WebCore/platform/graphics/skia"
 
   127 excluded_directories="$excluded_directories WebCore/platform/graphics/skia"
 
   116 excluded_directories="$excluded_directories WebCore/platform/graphics/chromium"
 
   128 excluded_directories="$excluded_directories WebCore/platform/graphics/chromium"
 
   117 excluded_directories="$excluded_directories WebCore/platform/graphics/wince"
 
   129 excluded_directories="$excluded_directories WebCore/platform/graphics/wince"
 
   118 excluded_directories="$excluded_directories WebCore/platform/graphics/haiku"
 
   130 excluded_directories="$excluded_directories WebCore/platform/graphics/haiku"
 
       
   131 excluded_directories="$excluded_directories WebCore/platform/graphics/brew"
 
   119 
   132 
   120 excluded_directories="$excluded_directories WebCore/platform/image-decoders/bmp"
 
   133 excluded_directories="$excluded_directories WebCore/platform/image-decoders/bmp"
 
   121 excluded_directories="$excluded_directories WebCore/platform/image-decoders/gif"
 
   134 excluded_directories="$excluded_directories WebCore/platform/image-decoders/gif"
 
   122 excluded_directories="$excluded_directories WebCore/platform/image-decoders/zlib"
 
   135 excluded_directories="$excluded_directories WebCore/platform/image-decoders/zlib"
 
   123 excluded_directories="$excluded_directories WebCore/platform/image-decoders/png"
 
   136 excluded_directories="$excluded_directories WebCore/platform/image-decoders/png"
 
   124 excluded_directories="$excluded_directories WebCore/platform/image-decoders/ico"
 
   137 excluded_directories="$excluded_directories WebCore/platform/image-decoders/ico"
 
   125 excluded_directories="$excluded_directories WebCore/platform/image-decoders/jpeg"
 
   138 excluded_directories="$excluded_directories WebCore/platform/image-decoders/jpeg"
 
   126 excluded_directories="$excluded_directories WebCore/platform/image-decoders/xbm"
 
   139 excluded_directories="$excluded_directories WebCore/platform/image-decoders/xbm"
 
   127 excluded_directories="$excluded_directories WebCore/platform/image-decoders/skia"
 
   140 excluded_directories="$excluded_directories WebCore/platform/image-decoders/skia"
 
   128 excluded_directories="$excluded_directories WebCore/platform/image-decoders/haiku"
 
   141 excluded_directories="$excluded_directories WebCore/platform/image-decoders/haiku"
 
       
   142 excluded_directories="$excluded_directories WebCore/platform/image-decoders/wx"
 
   129 
   143 
   130 excluded_directories="$excluded_directories WebCore/platform/image-encoders/skia"
 
   144 excluded_directories="$excluded_directories WebCore/platform/image-encoders/skia"
 
   131 
   145 
   132 excluded_directories="$excluded_directories WebCore/plugins/gtk"
 
   146 excluded_directories="$excluded_directories WebCore/plugins/gtk"
 
   133 excluded_directories="$excluded_directories WebCore/plugins/chromium"
 
   147 excluded_directories="$excluded_directories WebCore/plugins/chromium"
 
       
   148 excluded_directories="$excluded_directories WebCore/plugins/wx"
 
   134 
   149 
   135 excluded_directories="$excluded_directories WebCore/accessibility/chromium"
 
   150 excluded_directories="$excluded_directories WebCore/accessibility/chromium"
 
   136 excluded_directories="$excluded_directories WebCore/accessibility/gtk"
 
   151 excluded_directories="$excluded_directories WebCore/accessibility/gtk"
 
   137 excluded_directories="$excluded_directories WebCore/accessibility/mac"
 
   152 excluded_directories="$excluded_directories WebCore/accessibility/mac"
 
   138 excluded_directories="$excluded_directories WebCore/accessibility/win"
 
   153 excluded_directories="$excluded_directories WebCore/accessibility/win"
 
   139 excluded_directories="$excluded_directories WebCore/accessibility/wx"
 
   154 excluded_directories="$excluded_directories WebCore/accessibility/wx"
 
   140 
   155 
   141 excluded_directories="$excluded_directories WebCore/storage/wince"
 
   156 excluded_directories="$excluded_directories WebCore/storage/wince"
 
       
   157 excluded_directories="$excluded_directories WebCore/storage/chromium"
 
   142 
   158 
   143 excluded_directories="$excluded_directories WebCore/platform/wx"
 
   159 excluded_directories="$excluded_directories WebCore/platform/wx"
 
   144 excluded_directories="$excluded_directories WebCore/platform/wince"
 
   160 excluded_directories="$excluded_directories WebCore/platform/wince"
 
   145 
   161 
   146 excluded_directories="$excluded_directories WebKit/qt/Plugins"
 
   162 excluded_directories="$excluded_directories WebKit/qt/Plugins"
 
   194 files_to_remove="$files_to_remove WebCore/rendering/RenderThemeMac.mm"
 
   210 files_to_remove="$files_to_remove WebCore/rendering/RenderThemeMac.mm"
 
   195 files_to_remove="$files_to_remove autogen.sh"
 
   211 files_to_remove="$files_to_remove autogen.sh"
 
   196 files_to_remove="$files_to_remove configure.ac"
 
   212 files_to_remove="$files_to_remove configure.ac"
 
   197 
   213 
   198 files_to_remove="$files_to_remove WebKit.pro"
 
   214 files_to_remove="$files_to_remove WebKit.pro"
 
       
   215 files_to_remove="$files_to_remove DerivedSources.pro"
 
   199 
   216 
   200 files_to_remove="$files_to_remove WebKit/qt/QtLauncher/QtLauncher.pro"
 
   217 files_to_remove="$files_to_remove WebKit/qt/QtLauncher/QtLauncher.pro"
 
   201 files_to_remove="$files_to_remove WebKit/qt/QtLauncher/main.cpp"
 
   218 files_to_remove="$files_to_remove WebKit/qt/QtLauncher/main.cpp"
 
   202 
   219 
   203 files_to_remove="$files_to_remove WebKit/qt/QGVLauncher/QGVLauncher.pro"
 
   220 files_to_remove="$files_to_remove WebKit/qt/QGVLauncher/QGVLauncher.pro"
 
   309 
   326 
   310 echo "generating extra sources"
 
   327 echo "generating extra sources"
 
   311 (
 
   328 (
 
   312   for proj in JavaScriptCore WebCore; do
 
   329   for proj in JavaScriptCore WebCore; do
 
   313       cd $absSrcDir/$proj &&
 
   330       cd $absSrcDir/$proj &&
 
   314       rm -rf tmp &&
 
   331       qmake -o Makefile DerivedSources.pro &&
 
   315       mkdir tmp &&
 
       
   316       cd tmp &&
 
       
   317       mkdir -p ../generated &&
 
       
   318       qmake -o Makefile CONFIG-=QTDIR_build QT_CONFIG+=phonon GENERATED_SOURCES_DIR=`pwd`/../generated  OUTPUT_DIR=`pwd` ../$proj.pro &&
 
       
   319       make generated_files &&
 
   332       make generated_files &&
 
   320       perl -pi -e "s,$absSrcDir/,,g" ../generated/*.cpp ../generated/*.h &&
 
   333       perl -pi -e "s,$absSrcDir/,,g" generated/*.cpp generated/*.h &&
 
   321       git add ../generated &&
 
   334       git add generated &&
 
   322       cd .. &&
 
   335       rm DerivedSources.pro Makefile &&
 
   323       rm -rf tmp &&
 
       
   324       cd ..
 
   336       cd ..
 
   325   done
 
   337   done
 
   326 )
 
   338 )
 
   327 rm -rf $srcdir/WebKitBuild
 
   339 rm -rf $srcdir/WebKitBuild
 
   328 
   340
FCL/sf/mw/qt