[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

abarth at webkit.org abarth at webkit.org
Fri Jan 21 14:49:36 UTC 2011


The following commit has been merged in the debian/experimental branch:
commit 37a1ceff7c7729b28d881361c8dd70fed66d3a62
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 31 16:11:05 2010 +0000

    2010-12-31  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Ariya Hidayat.
    
            Remove Tools/Scripts/wkstyle
            https://bugs.webkit.org/show_bug.cgi?id=51774
    
            This script appears to not have been touched in a while and seems to
            have been replaced by check-webkit-style.
    
            * Scripts/wkstyle: Removed.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74831 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index a6f3ebf..16fb8e8 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,15 @@
+2010-12-31  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Ariya Hidayat.
+
+        Remove Tools/Scripts/wkstyle
+        https://bugs.webkit.org/show_bug.cgi?id=51774
+
+        This script appears to not have been touched in a while and seems to
+        have been replaced by check-webkit-style.
+
+        * Scripts/wkstyle: Removed.
+
 2010-12-31  Ilya Tikhonovsky  <loislo at chromium.org>
 
         Unreviewed. Coding style fix.
diff --git a/Tools/Scripts/wkstyle b/Tools/Scripts/wkstyle
deleted file mode 100755
index 4b3447f..0000000
--- a/Tools/Scripts/wkstyle
+++ /dev/null
@@ -1,89 +0,0 @@
-
-# Copyright (C) 2006 Michael Emmel<mike.emmel at gmail.com>  All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1.  Redistributions of source code must retain the above copyright
-#     notice, this list of conditions and the following disclaimer.
-# 2.  Redistributions in binary form must reproduce the above copyright
-#     notice, this list of conditions and the following disclaimer in the
-#     documentation and/or other materials provided with the distribution.
-# 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
-#     its contributors may be used to endorse or promote products derived
-#     from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
-# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-cmdcpp="astyle \
---unpad=paren \
---style=linux \
---brackets=linux \
---indent=spaces=4 \
---indent-switches \
---convert-tabs" 
-
-cmdh="astyle \
---unpad=paren \
---style=linux \
---brackets=break \
---indent=spaces=4 \
---convert-tabs" 
-
-#astyle does not support unpadding so we use sed
-for i in $@
-do
-echo $i
-
-ext=`echo $i|awk -F . '{print $NF}'`
-
-cmd=$cmdcpp
-
-if [ $ext == "h" ] ; then
-    cmd=$cmdh
-fi
-
-$cmd $i
-
-#first print the changes we are making
-sed  -n -e '
-/( .*/p  
-s/( /(/gp   
-/*. )/p
-s/ )/)/gp   
-#supress printing this
-#/^namespace WebCore/{
-#N
-#s/\n{/ {/p
-#}
-' $i 
-
-#do it for real
-sed -e '
-#unpad leading spaces
-s/( /(/g
-#unpad traling spaces
-s/ )/)/g
-#fixup the namspec decl
-/^namespace WebCore/{
-N
-s/\n{/ {/
-}
-#fixup extra tab in constructor initalizer
-/^ \+,/{s/^    //}
-/^ \+:/{s/^    //}
-' $i > $i.sed
-mv $i.sed $i
-done
-
-

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list