diff options
author | Matthew Vogt <matthew.vogt@nokia.com> | 2012-03-12 16:53:24 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-12 23:05:02 +0100 |
commit | 6d9b52b12e83cbb52683bea89fe160c1bd8e9541 (patch) | |
tree | ebe4c172e25405d655d2ee087f3292c986fc568c /bin/rename-qtdeclarative-symbols.sh | |
parent | cf3a32ff28c8004b39658ec181b0c7d9ca27aaa8 (diff) |
Prefer \b word boundary markers
/usr/bin/sed on mac does not process '\<' and '\>' boundary markers
correctly.
Change-Id: I750f7c69579ddcbe39a6246a3d3321cab714fc27
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'bin/rename-qtdeclarative-symbols.sh')
-rwxr-xr-x | bin/rename-qtdeclarative-symbols.sh | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/bin/rename-qtdeclarative-symbols.sh b/bin/rename-qtdeclarative-symbols.sh index 0d521dd5a8..96633af2d8 100755 --- a/bin/rename-qtdeclarative-symbols.sh +++ b/bin/rename-qtdeclarative-symbols.sh @@ -598,42 +598,43 @@ replaceMatch() for QML_SYMBOL in $QML_SYMBOLS do QML_REPLACEMENT="QQml${QML_SYMBOL#QDeclarative}" - replaceMatch "\<QtDeclarative/$QML_SYMBOL\>" "QtQml/$QML_REPLACEMENT" - replaceMatch "\<$QML_SYMBOL\>" "$QML_REPLACEMENT" + replaceMatch "\bQtDeclarative/$QML_SYMBOL\b" "QtQml/$QML_REPLACEMENT" + replaceMatch "\b$QML_SYMBOL\b" "$QML_REPLACEMENT" done for QUICK_SYMBOL in $QUICK_SYMBOLS do QUICK_REPLACEMENT="QQuick${QUICK_SYMBOL#QDeclarative}" - replaceMatch "\<QtDeclarative/$QUICK_SYMBOL\>" "QtQuick/$QUICK_REPLACEMENT" - replaceMatch "\<$QUICK_SYMBOL\>" "$QUICK_REPLACEMENT" + replaceMatch "\bQtDeclarative/$QUICK_SYMBOL\b" "QtQuick/$QUICK_REPLACEMENT" + replaceMatch "\b$QUICK_SYMBOL\b" "$QUICK_REPLACEMENT" done for QML_INCLUDE_FILE in $QML_INCLUDE_FILES do QML_INCLUDE_REPLACEMENT="qqml${QML_INCLUDE_FILE#qdeclarative}" - replaceMatch "\<$QML_INCLUDE_FILE\>" "$QML_INCLUDE_REPLACEMENT" + replaceMatch "\b$QML_INCLUDE_FILE\b" "$QML_INCLUDE_REPLACEMENT" done for QUICK_INCLUDE_FILE in $QUICK_INCLUDE_FILES do QUICK_INCLUDE_REPLACEMENT="qquick${QUICK_INCLUDE_FILE#qdeclarative}" - replaceMatch "\<$QUICK_INCLUDE_FILE\>" "$QUICK_INCLUDE_REPLACEMENT" + replaceMatch "\b$QUICK_INCLUDE_FILE\b" "$QUICK_INCLUDE_REPLACEMENT" done # Various one-off replacements -replaceMatch "\<QtDeclarative\>" "QtQml" -replaceMatch "\<asQDeclarativeContext" "asQQmlContext" +replaceMatch "\bQtDeclarative\b" "QtQml" +replaceMatch "\basQDeclarativeContext\b" "asQQmlContext" +replaceMatch "\basQDeclarativeContextPrivate\b" "asQQmlContextPrivate" # Replace any references to the 'declarative' module with 'qml' echo "Replacing module declarative with qml:" -CONTAINERS=$(find "$MODIFY_DIR" \( -name \*\.pro -o -name \*\.pri \) | xargs grep -l -I "\<declarative\>") +CONTAINERS=$(find "$MODIFY_DIR" \( -name \*\.pro -o -name \*\.pri \) | xargs grep -l -I "\bdeclarative\b") for CONTAINER in $CONTAINERS do echo " $CONTAINER" TMP_FILE="$CONTAINER.tmp" - sed 's|\<declarative\>|qml|g' <"$CONTAINER" >"$TMP_FILE" + sed 's|\bdeclarative\b|qml|g' <"$CONTAINER" >"$TMP_FILE" mv "$TMP_FILE" "$CONTAINER" done echo |