From fe80379682173b67f32906dcdbd818a13b7f3262 Mon Sep 17 00:00:00 2001
From: con <qtc-committer@nokia.com>
Date: Tue, 24 Feb 2009 08:56:46 +0100
Subject: [PATCH] Fixes:    - Move scripts and adapt

---
 .../fix_makefile_header_dependencies.sh        |  0
 replaceVersion.sh => scripts/replaceVersion.sh | 18 +++++++++---------
 2 files changed, 9 insertions(+), 9 deletions(-)
 rename fix_makefile_header_dependencies.sh => scripts/fix_makefile_header_dependencies.sh (100%)
 rename replaceVersion.sh => scripts/replaceVersion.sh (90%)

diff --git a/fix_makefile_header_dependencies.sh b/scripts/fix_makefile_header_dependencies.sh
similarity index 100%
rename from fix_makefile_header_dependencies.sh
rename to scripts/fix_makefile_header_dependencies.sh
diff --git a/replaceVersion.sh b/scripts/replaceVersion.sh
similarity index 90%
rename from replaceVersion.sh
rename to scripts/replaceVersion.sh
index 3e1eff015bd..21bc3ade816 100755
--- a/replaceVersion.sh
+++ b/scripts/replaceVersion.sh
@@ -53,7 +53,7 @@ echo
 
 
 ## Make script safe to call from anywhere by going home first
-SCRIPT_DIR=`dirname "${PWD}/$0"`
+SCRIPT_DIR=`dirname "${PWD}/$0"`/..
 echo "Entering directory \`${SCRIPT_DIR}'"
 pushd "${SCRIPT_DIR}" &>/dev/null || exit 1
 
@@ -61,7 +61,7 @@ pushd "${SCRIPT_DIR}" &>/dev/null || exit 1
 ## Patch *.pluginspec
 while read i ; do
     echo "Patching \`$i'"
-    TMPFILE=`mktemp`
+    TMPFILE=`mktemp /tmp/versionPatch.XXXXXX`
     sed -e 's/version="'"${OLD}"'"/version="'"${NEW}"'"/' \
             -e 's/compatVersion="'"${OLD}"'"/compatVersion="'"${NEW}"'"/' \
             "${i}" > "${TMPFILE}"
@@ -70,7 +70,7 @@ done < <(find . -name '*.pluginspec')
 
 
 ## Patch coreconstants.h
-TMPFILE=`mktemp`
+TMPFILE=`mktemp /tmp/versionPatch.XXXXXX`
 CORE_CONSTANT_H="${SCRIPT_DIR}/src/plugins/coreplugin/coreconstants.h"
 echo "Patching \`${CORE_CONSTANT_H}'"
 sed \
@@ -82,8 +82,8 @@ mv -f "${TMPFILE}" "${CORE_CONSTANT_H}"
 
 
 ## Patch installer.rc
-TMPFILE=`mktemp`
-INSTALLER_RC="${SCRIPT_DIR}/../ide/nightly_builds/installer/installer.rc"
+TMPFILE=`mktemp /tmp/versionPatch.XXXXXX`
+INSTALLER_RC="${SCRIPT_DIR}/../../dev/ide/nightly_builds/installer/installer.rc"
 echo "Patching \`${INSTALLER_RC}'"
 sed \
         -e "s/"${OLD_DOT_FOUR}"/"${NEW_DOT_FOUR}"/" \
@@ -94,8 +94,8 @@ mv -f "${TMPFILE}" "${INSTALLER_RC}"
 
 
 ## Patch Info.plist
-TMPFILE=`mktemp`
-INFO_PLIST="${SCRIPT_DIR}/src/app/Info.plist"
+TMPFILE=`mktemp /tmp/versionPatch.XXXXXX`
+INFO_PLIST="${SCRIPT_DIR}/share/qtcreator/Info.plist"
 echo "Patching \`${INFO_PLIST}'"
 sed \
         -e "s/"${OLD}"/"${NEW}"/" \
@@ -104,7 +104,7 @@ mv -f "${TMPFILE}" "${INFO_PLIST}"
 
 
 ## Patch qtcreator.qdocconf
-TMPFILE=`mktemp`
+TMPFILE=`mktemp /tmp/versionPatch.XXXXXX`
 QDOCCONF="${SCRIPT_DIR}/doc/qtcreator.qdocconf"
 echo "Patching \`${QDOCCONF}'"
 sed \
@@ -115,7 +115,7 @@ mv -f "${TMPFILE}" "${QDOCCONF}"
 
 
 ## Patch qtcreator.qdoc
-TMPFILE=`mktemp`
+TMPFILE=`mktemp /tmp/versionPatch.XXXXXX`
 QDOC="${SCRIPT_DIR}/doc/qtcreator.qdoc"
 echo "Patching \`${QDOC}'"
 sed \