[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
mitz at apple.com
mitz at apple.com
Wed Dec 22 18:47:55 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 04904230e40fd2c7a4406338c70d00d9838860cc
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Dec 18 01:57:20 2010 +0000
Updated for the renaming of WebKitTools to Tools
Rubber-stamped by Mark Rowe.
JavaScriptCore:
* JavaScriptCore.vcproj/JavaScriptCore/build-generated-files.sh:
WebCore:
* WebCore.vcproj/build-generated-files.sh:
* WebCore.vcproj/migrate-scripts.sh:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74308 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 11ec1df..de28531 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,11 @@
+2010-12-17 Dan Bernstein <mitz at apple.com>
+
+ Rubber-stamped by Mark Rowe.
+
+ Updated for the renaming of WebKitTools to Tools
+
+ * JavaScriptCore.vcproj/JavaScriptCore/build-generated-files.sh:
+
2010-12-17 Ariya Hidayat <ariya at sencha.com>
Reviewed by Oliver Hunt.
diff --git a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/build-generated-files.sh b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/build-generated-files.sh
index fafe5c8..8d510de 100755
--- a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/build-generated-files.sh
+++ b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/build-generated-files.sh
@@ -10,7 +10,7 @@ then
echo "#define U_DISABLE_RENAMING $?" > "${ICUVERSION_H_PATH}"
fi
-NUMCPUS=`../../../WebKitTools/Scripts/num-cpus`
+NUMCPUS=`../../../Tools/Scripts/num-cpus`
XSRCROOT="`pwd`/../.."
XSRCROOT=`realpath "$XSRCROOT"`
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index a7c4e73..d022434 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-12-17 Dan Bernstein <mitz at apple.com>
+
+ Rubber-stamped by Mark Rowe.
+
+ Updated for the renaming of WebKitTools to Tools
+
+ * WebCore.vcproj/build-generated-files.sh:
+ * WebCore.vcproj/migrate-scripts.sh:
+
2010-12-17 Carol Szabo <carol.szabo at nokia.com>
Reviewed by Darin Adler.
diff --git a/WebCore/WebCore.vcproj/build-generated-files.sh b/WebCore/WebCore.vcproj/build-generated-files.sh
index 884dfa5..3d15ad9 100644
--- a/WebCore/WebCore.vcproj/build-generated-files.sh
+++ b/WebCore/WebCore.vcproj/build-generated-files.sh
@@ -26,7 +26,7 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-NUMCPUS=`../../WebKitTools/Scripts/num-cpus`
+NUMCPUS=`../../Tools/Scripts/num-cpus`
XSRCROOT="`pwd`/.."
XSRCROOT=`realpath "$XSRCROOT"`
diff --git a/WebCore/WebCore.vcproj/migrate-scripts.sh b/WebCore/WebCore.vcproj/migrate-scripts.sh
index ec59154..d68075a 100644
--- a/WebCore/WebCore.vcproj/migrate-scripts.sh
+++ b/WebCore/WebCore.vcproj/migrate-scripts.sh
@@ -26,7 +26,7 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-NUMCPUPATH="../../WebKitTools/Scripts/num-cpus"
+NUMCPUPATH="../../Tools/Scripts/num-cpus"
if [ -x $NUMCPUPATH ]; then
NUMCPUS=`$NUMCPUPATH`
else
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list