Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline

scripts/shipping/prepare-linux-qt-for-shipping.sh

@@ -76,20 +76,6 @@ build() {
 	ret=$?; [ ${ret} = 0 ] || exit ${ret}
 }
 
-fix_rpath() {
-	folder=$1
-	pattern=$2
-	rpath=$3
-	(
-		cd "${destdir}" || die "cd failed"
-		while read file ; do
-			echo "Fixing ${file}"
-			chrpath -r "${rpath}" "${file}" 2>&1 | sed 's/^/\t/'
-		done < <(find "${folder}" -type f -name "${pattern}")
-	)
-	ret=$?; [ ${ret} = 0 ] || exit ${ret}
-}
-
 inst() {
 	(
 		cd "${dir}" || die "cd failed"
@@ -98,22 +84,13 @@ inst() {
 			env -i "${MAKE}" install || die "make install failed"
 		fi
 
+		# Fix rpath's
 		cd "${destdir}" || die "cd failed"
-
-		# Fix files bin/*
-		fix_rpath bin '*' '$ORIGIN/../lib'
-
-		# Fix files lib/*.so
-		fix_rpath lib '*.so.?.?.?' '$ORIGIN'
-		fix_rpath lib '*.so.?.?.?.debug' '$ORIGIN'
-
-		# Fix files examples/tools/*/*/*.so
-		fix_rpath examples/tools '*.so' '$ORIGIN/../../../lib'
-		fix_rpath examples/tools '*.so.debug' '$ORIGIN/../../../lib'
-
-		# Fix files plugins/*/*.so
-		fix_rpath plugins '*.so' '$ORIGIN/../../lib'
-		fix_rpath plugins '*.so.debug' '$ORIGIN/../../lib'
+		find bin -mindepth 1 -maxdepth 1 -type f -perm -100 | xargs -n 1 chrpath -r '$ORIGIN/../lib'
+		find lib -mindepth 1 -maxdepth 1 -type f -perm -100 | xargs -n 1 chrpath -r '$ORIGIN'
+		find . -mindepth 3 -maxdepth 3 -type f -perm -100 | xargs -n 1 chrpath -r '$ORIGIN/../../lib'
+		find . -mindepth 4 -maxdepth 4 -type f -perm -100 | xargs -n 1 chrpath -r '$ORIGIN/../../../lib'
+		find . -mindepth 5 -maxdepth 5 -type f -perm -100 | xargs -n 1 chrpath -r '$ORIGIN/../../../../lib'
 	)
 	ret=$?; [ ${ret} = 0 ] || exit ${ret}
 }

src/tools/qtlibspatcher/binpatch.cpp

+/***************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact:  Qt Software Information (qt-info@nokia.com)
+**
+**
+** Non-Open Source Usage
+**
+** Licensees may use this file in accordance with the Qt Beta Version
+** License Agreement, Agreement version 2.2 provided with the Software or,
+** alternatively, in accordance with the terms contained in a written
+** agreement between you and Nokia.
+**
+** GNU General Public License Usage
+**
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License versions 2.0 or 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the packaging
+** of this file.  Please review the following information to ensure GNU
+** General Public Licensing requirements will be met:
+**
+** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt GPL Exception
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
+**
+***************************************************************************/
+
+#include <cstdio>
+#include <cstring>
+#include <locale>
+
+#include "binpatch.h"
+
+// returns positive value if it finds a null termination inside the buffer
+long BinPatch::getBufferStringLength(char *data, char *end)
+{
+    long size = 0;
+    while (data < end) {
+        if (*data == '\0')
+            return size;
+        ++data;
+        ++size;
+    }
+
+    return -1;
+}
+
+// returns true if data ends with one of the tokens. (Sep. with ;)
+bool BinPatch::endsWithTokens(const char *data)
+{
+    if(strlen(endTokens) > 0) {
+        char endstmp[1024];
+        ulong tlen = ulong(strlen(data));
+
+        if(strlen(endTokens) >= sizeof(endstmp))
+            return false;
+
+        strcpy(endstmp, endTokens);
+
+        char *token = strtok(endstmp, ";");
+
+        while(token != NULL) {
+            // check if it ends with the token
+            if ((tlen >= strlen(token)) 
+                && (strcasecmp((data+tlen)-strlen(token), token) == 0))
+                return true;
+            token = strtok(NULL, ";");
+        }
+    } else {
+        return true; //true if no tokens
+    }
+
+    return false; //no matching tokens
+}
+
+bool BinPatch::patchHelper(char *inbuffer, const char *oldstr, const char *newstr, size_t len, long *rw)
+{
+    char nc1 = *oldstr;
+    char nc2 = 0;
+    char *inend = inbuffer + len;
+    size_t oldlen = strlen(oldstr);
+    size_t newlen = strlen(newstr);
+    char *instart = inbuffer;
+    *rw = 0;
+    bool write = true;
+
+    isupper(nc1) ? nc2 = tolower(nc1) : nc2 = toupper(nc1);
+
+    while(inbuffer < inend) {
+        if ((*inbuffer == nc1) || (*inbuffer == nc2)) {
+            if (inbuffer > (inend-oldlen) || inbuffer > (inend-newlen)) {
+                *rw = (long)(inend-inbuffer); //rewind, not enough to make a compare
+                break;
+            }
+
+            if (strncasecmp(inbuffer, oldstr, oldlen) == 0) {
+                if (useLength && (instart == inbuffer)) {
+                    *rw = (long)(len+1); //we don't have access to the length byte, rewind all + 1!
+                    write = false;
+                    break;
+                }
+                
+                long oldsize = -1;
+                if (useLength) { //VC60
+                    oldsize = (unsigned char)(*(inbuffer-1));
+
+                    // vc60 pdb files sometimes uses 0A, then it should be null terminated
+                    if (oldsize < (long)oldlen) {
+                        if (oldsize != 0x0A) { //strange case... skip
+                            inbuffer+=oldlen;
+                            continue;
+                        }
+
+                        oldsize = getBufferStringLength(inbuffer, inend);
+                        
+                        if (oldsize < 0) {
+                            *rw = (long)(inend-inbuffer); //rewind, entire string not in buffer
+                            break;
+                        }
+                    }
+
+                    if (inbuffer > (inend-oldsize)) {
+                        *rw = (long)(inend-inbuffer); //rewind, entire string not in buffer
+                        break;
+                    }
+                } else { //VC7x
+                    oldsize = getBufferStringLength(inbuffer, inend);
+                    if (oldsize < 0) {
+                        *rw = (long)(inend-inbuffer); //rewind, entire string not in buffer
+                        break;
+                    }
+                }
+
+                char oldPath[1024];
+                if (oldsize > (long)sizeof(oldPath)) {
+                    //at least don't crash
+                    inbuffer+=oldsize;
+                    continue;
+                }
+                memset(oldPath, '\0', sizeof(oldPath));
+                strncpy(oldPath, newstr, newlen);
+
+                if (insertReplace)
+                    strncat(oldPath, inbuffer+oldlen, oldsize-oldlen);
+
+                // just replace if it ends with a token in endTokens
+                if (endsWithTokens(oldPath)) {
+                    if (oldsize < (long)strlen(oldPath))
+                        oldsize = (long)strlen(oldPath);
+
+                    memcpy(inbuffer, oldPath, oldsize);
+                }
+
+                inbuffer+=oldsize;
+                continue;
+            }
+        }
+        ++inbuffer;
+    }
+
+    return write;
+}
+
+bool BinPatch::patch(const char *oldstr, const char *newstr)
+{
+    size_t oldlen = strlen(oldstr);
+    size_t newlen = strlen(newstr);
+
+    if ((!fileName || strlen(fileName) < 1)
+        || (!oldstr || oldlen < 1)
+        || (!newstr || newlen < 1))
+        return false;
+
+    FILE *input;
+
+    if (!(input = fopen(fileName, "r+b")))
+    {
+        fprintf(stderr, "Cannot open file %s!\n", fileName);
+        return false;
+    }
+
+    char data[60000];
+    long rw = 0;
+    long offset = 0;
+
+    size_t len;
+    len = fread(data, sizeof(char), sizeof(data), input);
+
+    do {
+        if (patchHelper(data, oldstr, newstr, len, &rw)) {
+            fseek(input, offset, SEEK_SET); //overwrite
+            fwrite(data, sizeof(char), len, input);
+        }
+
+        offset += (long)((-rw) + len);
+        if (fseek(input, offset, SEEK_SET) != 0)
+            break;
+        len = fread(data, sizeof(char), sizeof(data), input);
+    } while(!(feof(input) && (len <= oldlen || len <= newlen)));
+    
+    fclose(input);
+    
+    return true;
+}

src/tools/qtlibspatcher/binpatch.h

+/***************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact:  Qt Software Information (qt-info@nokia.com)
+**
+**
+** Non-Open Source Usage
+**
+** Licensees may use this file in accordance with the Qt Beta Version
+** License Agreement, Agreement version 2.2 provided with the Software or,
+** alternatively, in accordance with the terms contained in a written
+** agreement between you and Nokia.
+**
+** GNU General Public License Usage
+**
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License versions 2.0 or 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the packaging
+** of this file.  Please review the following information to ensure GNU
+** General Public Licensing requirements will be met:
+**
+** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt GPL Exception
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
+**
+***************************************************************************/
+
+#ifndef BINPATCH_H
+#define BINPATCH_H
+
+#include <string.h>
+
+typedef unsigned long ulong;
+typedef unsigned int uint;
+
+class BinPatch
+{
+public:
+    BinPatch(const char *file)
+        : useLength(false), insertReplace(false)
+    {
+        strcpy(endTokens, "");
+        strcpy(fileName, file);
+    }
+
+    void enableUseLength(bool enabled)
+    { useLength = enabled; }
+    void enableInsertReplace(bool enabled)
+    { insertReplace = enabled; }
+    void setEndTokens(const char *tokens)
+    { strcpy(endTokens, tokens); }
+
+    bool patch(const char *oldstr, const char *newstr);
+
+private:
+    long getBufferStringLength(char *data, char *end);
+    bool endsWithTokens(const char *data);
+
+    bool patchHelper(char *inbuffer, const char *oldstr, 
+        const char *newstr, size_t len, long *rw);
+
+    bool useLength;
+    bool insertReplace;
+    char endTokens[1024];
+    char fileName[1024];
+};
+
+#endif

src/tools/qtlibspatcher/qtlibspatcher.pro

+######################################################################
+# Automatically generated by qmake (2.01a) Di 8. Jul 15:08:13 2008
+######################################################################
+
+CONFIG += console
+QT -= gui
+TEMPLATE = app
+TARGET = 
+DEPENDPATH += .
+INCLUDEPATH += .
+DESTDIR = ./
+
+# Input
+HEADERS += binpatch.h
+SOURCES += binpatch.cpp qtlibspatchermain.cpp