[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

kevino at webkit.org kevino at webkit.org
Wed Dec 22 12:45:23 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 35a9b25ce659fbf148b405e66be2adf898d50ccb
Author: kevino at webkit.org <kevino at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Aug 28 23:01:24 2010 +0000

    Reviewed by Kevin Ollivier.
    
    [BREWMP] Add build system
    https://bugs.webkit.org/show_bug.cgi?id=44645
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66315 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index cd50d53..5284f43 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-08-27  Kwang Yul Seo  <skyul at company100.net>
+
+        Reviewed by Kevin Ollivier.
+
+        [BREWMP] Add build system
+        https://bugs.webkit.org/show_bug.cgi?id=44645
+
+        Check wxpython option only when build_port is wx.
+
+        * wscript:
+
 2010-08-27  Lucas De Marchi  <lucas.demarchi at profusion.mobi>
 
         Unreviewed. Fix compiling dependencies on EFL port due to r65891.
diff --git a/wscript b/wscript
index 94ac739..3a9302a 100644
--- a/wscript
+++ b/wscript
@@ -181,7 +181,7 @@ def configure(conf):
     for api_file in glob.glob(os.path.join(jscore_dir, 'API/*.h')):
         shutil.copy(api_file, os.path.join(jscore_out_dir, os.path.basename(api_file)))
 
-    if Options.options.wxpython:
+    if build_port == "wx" and Options.options.wxpython:
         common_configure(conf)
         conf.check_tool('swig', tooldir='WebKit/wx/bindings/python')
         conf.check_swig_version('1.3.29')

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list