Unreviewed. Some AppleWin VS2010 house cleaning.
authorroger_fong@apple.com <roger_fong@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 4 Jun 2013 01:44:52 +0000 (01:44 +0000)
committerroger_fong@apple.com <roger_fong@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 4 Jun 2013 01:44:52 +0000 (01:44 +0000)
* WebKit.vcxproj/Interfaces/InterfacesPreBuild.cmd:
* WebKit.vcxproj/WebKit/WebKitPreBuild.cmd:
* win/tools32/scripts/auto-version.sh: Replaced with win/tools32/scripts/auto-version2010.sh.
* win/tools32/scripts/auto-version2010.sh: Removed.
* win/tools32/scripts/feature-defines.sh: Replaced with win/tools32/scripts/feature-defines2010.sh.
* win/tools32/scripts/feature-defines2010.sh: Removed.
* WebCore.vcxproj/build-generated-files.sh:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@151147 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/WebCore.vcxproj/build-generated-files.sh
Source/WebKit/ChangeLog
Source/WebKit/WebKit.vcxproj/Interfaces/InterfacesPreBuild.cmd
Source/WebKit/WebKit.vcxproj/WebKit/WebKitPreBuild.cmd
WebKitLibraries/ChangeLog
WebKitLibraries/win/tools32/scripts/auto-version.sh
WebKitLibraries/win/tools32/scripts/auto-version2010.sh [deleted file]
WebKitLibraries/win/tools32/scripts/feature-defines.sh
WebKitLibraries/win/tools32/scripts/feature-defines2010.sh [deleted file]

index e7c525bf202c2dc450940eed7b94ed6e84ac779c..79844483ea163cae9cd959c8ddc3a884ccc2ac42 100644 (file)
@@ -1,3 +1,9 @@
+2013-06-03  Roger Fong  <roger_fong@apple.com>
+
+        Unreviewed. Some AppleWin VS2010 house cleaning.
+
+        * WebCore.vcxproj/build-generated-files.sh:
+
 2013-06-03  Roger Fong  <roger_fong@apple.com>
 
         clearLayoutOverflow should never be called before calling layer()->updateScrollInfoAfterLayout().
index 05226e849f0b754bfa0f99bef44be67ecaa11a7f..891baa58f675b509f0b6953ce1ef4365e8e9cc32 100644 (file)
@@ -59,5 +59,5 @@ mkdir -p "${BUILT_PRODUCTS_DIR}/DerivedSources"
 cd "${BUILT_PRODUCTS_DIR}/DerivedSources"
 
 export WebCore="${XSRCROOT}"
-export FEATURE_DEFINES=`$SDKROOT/tools32/scripts/feature-defines2010.sh $SDKROOT $3`
+export FEATURE_DEFINES=`$SDKROOT/tools32/scripts/feature-defines.sh $SDKROOT $3`
 make -f "$WebCore/DerivedSources.make" -j ${NUMCPUS} || exit 1
index c9829d51254bb04c9703df0a64424e5a2b0e9a08..1682d2385c4f6d1691eaecfaeb3d297f2483adf5 100644 (file)
@@ -1,3 +1,10 @@
+2013-06-03  Roger Fong  <roger_fong@apple.com>
+
+        Unreviewed. Some AppleWin VS2010 house cleaning.
+
+        * WebKit.vcxproj/Interfaces/InterfacesPreBuild.cmd:
+        * WebKit.vcxproj/WebKit/WebKitPreBuild.cmd:
+
 2013-05-31  Roger Fong  <roger_fong@apple.com>
 
         Unreviewed. Add AssembleBuildLogs project to WebKit solution in preparation for moving buildbots to VCExpress 2010.
index 31238d27d1cc675f7946e9db6b073b412d11c804..58d8d8c72adf034b970755c016e6874e1706ffcd 100644 (file)
@@ -6,4 +6,4 @@ if errorlevel 1 exit 1
 echo XX%PROJECTNAME%XX > "%CONFIGURATIONBUILDDIR%\buildfailed"
 
 mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\obj32\WebKit\%PROJECTNAME%"
-bash "%WEBKIT_LIBRARIES%\tools32\scripts\auto-version2010.sh" "%INTDIR%"
+bash "%WEBKIT_LIBRARIES%\tools32\scripts\auto-version.sh" "%INTDIR%"
index 9a7b8476c70d501422d7826e905dbafaff98b013..1dce9071b98e54dadb695589e3e9c0e21369485e 100644 (file)
@@ -8,4 +8,4 @@ echo XX%PROJECTNAME%XX > "%CONFIGURATIONBUILDDIR%\buildfailed"
 mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\include\JavaScriptCore"
 xcopy /y /d "%WEBKIT_LIBRARIES%\include\JavaScriptCore\*" "%CONFIGURATIONBUILDDIR%\include\JavaScriptCore"
 
-bash "%WEBKIT_LIBRARIES%\tools32\scripts\auto-version2010.sh" "%INTDIR%"
+bash "%WEBKIT_LIBRARIES%\tools32\scripts\auto-version.sh" "%INTDIR%"
index 37b40d6bad6d7d03af11cfa989c2445a2a5096d0..e083b0c5977fc267254a22571a4dfd38af7f9b98 100644 (file)
@@ -1,3 +1,12 @@
+2013-06-03  Roger Fong  <roger_fong@apple.com>
+
+        Unreviewed. Some AppleWin VS2010 house cleaning.
+
+        * win/tools32/scripts/auto-version.sh: Replaced with win/tools32/scripts/auto-version2010.sh.
+        * win/tools32/scripts/auto-version2010.sh: Removed.
+        * win/tools32/scripts/feature-defines.sh: Replaced with win/tools32/scripts/feature-defines2010.sh.
+        * win/tools32/scripts/feature-defines2010.sh: Removed.
+
 2013-06-03  Roger Fong  <roger_fong@apple.com>
 
         Nuke VS2005 files from the tree.
index acb1c61252ded7d79b18de3fe465f9304d8aeeec..0fe98073c4b80c5802f628e370b2749126a544ca 100755 (executable)
@@ -32,11 +32,11 @@ chomp()
     eval $1=\$value;
 }
 
-if [[ -n "$WEBKITLIBRARIESDIR" ]]; then
-    FALLBACK_VERSION_PATH=`cygpath -u "$WEBKITLIBRARIESDIR\\tools\\scripts\\VERSION"`
+if [[ -n "$WEBKIT_LIBRARIES" ]]; then
+    FALLBACK_VERSION_PATH=`cygpath -u "$WEBKIT_LIBRARIES\\tools32\\scripts\\VERSION"`
     FALLBACK_VERSION=$(cat "$FALLBACK_VERSION_PATH");
 
-    COPYRIGHT_END_YEAR_PATH=`cygpath -u "$WEBKITLIBRARIESDIR\\tools\\scripts\\COPYRIGHT-END-YEAR"`
+    COPYRIGHT_END_YEAR_PATH=`cygpath -u "$WEBKIT_LIBRARIES\\tools32\\scripts\\COPYRIGHT-END-YEAR"`
     COPYRIGHT_END_YEAR=$(cat "$COPYRIGHT_END_YEAR_PATH");
     chomp COPYRIGHT_END_YEAR
 fi
diff --git a/WebKitLibraries/win/tools32/scripts/auto-version2010.sh b/WebKitLibraries/win/tools32/scripts/auto-version2010.sh
deleted file mode 100755 (executable)
index 0fe9807..0000000
+++ /dev/null
@@ -1,115 +0,0 @@
-#!/usr/bin/bash
-
-# Copyright (C) 2007, 2009 Apple Inc.  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.
-#
-# THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``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 COMPUTER, INC. OR
-# 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. 
-
-
-# Trim any trailing \r or \n from the given variable.
-chomp()
-{
-    local old_value=$(eval echo "\$$1");
-    local value=$(echo "$old_value" | sed 's/[\r\n]*$//')
-    eval $1=\$value;
-}
-
-if [[ -n "$WEBKIT_LIBRARIES" ]]; then
-    FALLBACK_VERSION_PATH=`cygpath -u "$WEBKIT_LIBRARIES\\tools32\\scripts\\VERSION"`
-    FALLBACK_VERSION=$(cat "$FALLBACK_VERSION_PATH");
-
-    COPYRIGHT_END_YEAR_PATH=`cygpath -u "$WEBKIT_LIBRARIES\\tools32\\scripts\\COPYRIGHT-END-YEAR"`
-    COPYRIGHT_END_YEAR=$(cat "$COPYRIGHT_END_YEAR_PATH");
-    chomp COPYRIGHT_END_YEAR
-fi
-
-OUTPUT_FILE=$(cygpath -u "$1")/include/autoversion.h
-mkdir -p "$(dirname "$OUTPUT_FILE")"
-
-# Take the initial version number from RC_PROJECTSOURCEVERSION if it
-# exists, otherwise fall back to the version number stored in the source.
-ENVIRONMENT_VERSION="$RC_PROJECTSOURCEVERSION";
-PROPOSED_VERSION=${ENVIRONMENT_VERSION:-$FALLBACK_VERSION}
-chomp PROPOSED_VERSION
-
-# Split out the three components of the dotted version number.  We pad
-# the input with trailing dots to handle the case where the input version
-# has fewer components than we expect.
-BUILD_MAJOR_VERSION=$(echo "$PROPOSED_VERSION.." | cut -d '.' -f 1)
-BUILD_MINOR_VERSION=$(echo "$PROPOSED_VERSION.." | cut -d '.' -f 2)
-BUILD_TINY_VERSION=$(echo "$PROPOSED_VERSION.." | cut -d '.' -f 3)
-
-# Cut the major component down to three characters by dropping any
-# extra leading digits, then adjust the major version portion of the
-# version string to match.
-CHARACTERS_TO_DROP=$(( ${#BUILD_MAJOR_VERSION} > 3 ? ${#BUILD_MAJOR_VERSION} - 3 : 0 ))
-BUILD_MAJOR_VERSION=${BUILD_MAJOR_VERSION:$CHARACTERS_TO_DROP}
-PROPOSED_VERSION=${PROPOSED_VERSION:$CHARACTERS_TO_DROP}
-
-# Have the minor and tiny components default to zero if not present.
-BUILD_MINOR_VERSION=${BUILD_MINOR_VERSION:-0}
-BUILD_TINY_VERSION=${BUILD_TINY_VERSION:-0}
-
-# Split the first component further by using the first digit for the
-# major version and the remaining two characters as the minor version.
-# The minor version is shifted down to the tiny version, with the tiny
-# version becoming the variant version.
-MAJOR_VERSION=${BUILD_MAJOR_VERSION:0:1}
-MINOR_VERSION=${BUILD_MAJOR_VERSION:1}
-TINY_VERSION=${BUILD_MINOR_VERSION}
-VARIANT_VERSION=${BUILD_TINY_VERSION}
-
-VERSION_TEXT=${PROPOSED_VERSION}
-VERSION_TEXT_SHORT=${VERSION_TEXT}
-
-if [ -z ${ENVIRONMENT_VERSION} ]; then
-    # If we didn't pull the version number from the environment then we're doing
-    # an engineering build and we'll stamp the build with some more information.
-
-    BUILD_DATE=$(date)
-    SVN_REVISION=$(svn info | grep '^Revision' | sed 's/^Revision: //')
-
-    chomp BUILD_DATE
-    chomp SVN_REVISION
-
-    VERSION_TEXT_SHORT="${VERSION_TEXT_SHORT}+"
-    VERSION_TEXT="${VERSION_TEXT_SHORT} ${USER} - ${BUILD_DATE} - r${SVN_REVISION}"
-fi
-
-cat > "$OUTPUT_FILE" <<EOF
-#define __VERSION_TEXT__ "${VERSION_TEXT}"
-#define __BUILD_NUMBER__ "${VERSION_TEXT}"
-#define __BUILD_NUMBER_SHORT__ "${VERSION_TEXT_SHORT}"
-#define __VERSION_MAJOR__ ${MAJOR_VERSION}
-#define __VERSION_MINOR__ ${MINOR_VERSION}
-#define __VERSION_TINY__ ${TINY_VERSION}
-#define __VERSION_BUILD__ ${VARIANT_VERSION}
-#define __BUILD_NUMBER_MAJOR__ ${BUILD_MAJOR_VERSION}
-#define __BUILD_NUMBER_MINOR__ ${BUILD_MINOR_VERSION}
-#define __BUILD_NUMBER_VARIANT__ ${BUILD_TINY_VERSION}
-#define __SVN_REVISION__ ${SVN_REVISION}
-EOF
-
-if [[ -n "${COPYRIGHT_END_YEAR}" ]]; then
-cat >> "$OUTPUT_FILE" <<EOF
-#define __COPYRIGHT_YEAR_END_TEXT__ "${COPYRIGHT_END_YEAR}"
-EOF
-fi
index 71c3a9b227f5c0ec617c3af9c926754031673e9a..23c78f4ba85658ecf519ab9cf24d3b5eec8c4835 100755 (executable)
@@ -1,6 +1,6 @@
 #!/usr/bin/bash
 
-# Copyright (C) 2010 Apple Inc. All rights reserved.
+# Copyright (C) 2013 Apple Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 if [ "$2" = "cairo" ]; then
-    FeatureDefines=$1/tools/vsprops/FeatureDefinesCairo.vsprops
+    FeatureDefines=$1/tools32/vsprops/FeatureDefinesCairo.props
 else
-    FeatureDefines=$1/tools/vsprops/FeatureDefines.vsprops
+    FeatureDefines=$1/tools32/vsprops/FeatureDefines.props
 fi
 
-grep Value=\"ENABLE_ $FeatureDefines | sed 's/^.*Value\=\"/ /' | sed 's/\"//' | tr -d '\n'
+grep "<ENABLE_" $FeatureDefines | sed '/\/>/d' | sed 's/<\/.*>//' | sed 's/<.*>//' | tr -d '\n'
+
diff --git a/WebKitLibraries/win/tools32/scripts/feature-defines2010.sh b/WebKitLibraries/win/tools32/scripts/feature-defines2010.sh
deleted file mode 100755 (executable)
index 23c78f4..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/usr/bin/bash
-
-# Copyright (C) 2013 Apple Inc. 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.
-# 
-# THIS SOFTWARE IS PROVIDED BY APPLE INC. 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 INC. 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.
-
-if [ "$2" = "cairo" ]; then
-    FeatureDefines=$1/tools32/vsprops/FeatureDefinesCairo.props
-else
-    FeatureDefines=$1/tools32/vsprops/FeatureDefines.props
-fi
-
-grep "<ENABLE_" $FeatureDefines | sed '/\/>/d' | sed 's/<\/.*>//' | sed 's/<.*>//' | tr -d '\n'
-