Updating qt-project.org specific servers into beta configs.

- 32 and 64 bit linux beta configs defaults to qt-project's
  Jenkins 11.10 Ubuntu nodea
- mac and win beta configs defaults to qt-project's
  Jenkins mac and win nodes
- linux installer-frmaework was changed to use https
  instead of gitrotocol, while https has been more reliable
  from that node

Change-Id: Id8abc0619e93e46cdf37e2e5feed93cad114c9de
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

5 files changed, 20 insertions, 20 deletions

diff --git a/release-tools/configurations/linux/installer-framework b/release-tools/configurations/linux/installer-framework
index d9de370..3e03d3d 100644
--- a/release-tools/configurations/linux/installer-framework
+++ b/release-tools/configurations/linux/installer-framework
@@ -9,7 +9,7 @@ qt_build_dir:                           qt-everywhere-build
 qt_installerfw_qt_configure_line:       -static -release -opensource -confirm-license -silent -nomake examples -nomake demos -nomake tests -nomake docs -nomake plugins -nomake translations -qt-zlib -qt-libtiff -qt-libpng -qt-libmng -qt-libjpeg -no-webkit -no-phonon -no-dbus -no-opengl -no-qt3support -no-xmlpatterns -no-svg -no-nis -no-cups -no-multimedia -no-audio-backend -no-phonon -no-phonon-backend -no-webkit -no-declarative -no-declarative-debug -no-accessibility --prefix=
 
 [InstallerFramework]
-installer_framework_url:                git://gitorious.org/installer-framework/installer-framework.git
+installer_framework_url:                https://git.gitorious.org/installer-framework/installer-framework.git
 installer_framework_source_dir:         installer-framework-source
 installer_framework_build_dir:          installer-framework-build
 installer_framework_version_tag:        remotes/origin/qt5
diff --git a/release-tools/configurations/linux_x86_32_beta b/release-tools/configurations/linux_x86_32_beta
index d69cc3d..07cfd73 100644
--- a/release-tools/configurations/linux_x86_32_beta
+++ b/release-tools/configurations/linux_x86_32_beta
@@ -5,7 +5,7 @@ name:                   qt.sdk
 identifier:             linux
 
 [ArchiveRemoteLocation.some_server_nickname_here]
-base_url:               http://<server_address_here>/packages/
+base_url:               http://origin.releases.qt-project.org
 base_path:
 
 # for testing purposes
@@ -54,7 +54,7 @@ version:                5.0.0
 version_tag:            %QT_VERSION%
 package_default:        true
 [src.qt.500_beta]
-archive_uri:            /qt/5.0.0/src/qt-everywhere-opensource-src-5.0.0.tar.gz
+archive_uri:            /qt5.0-beta-snapshots/src_snapshot/qt-everywhere-opensource-src-5.0.0-beta.tar.gz
 package_strip_dirs:     1
 target_install_dir:     /
 rpath_target:
@@ -69,7 +69,7 @@ version:                5.0.0
 version_tag:            %QT_VERSION%
 package_default:        true
 [desktop.500_beta.gcc]
-archive_uri:            /qt/5.0.0/linux_gcc_32/qt5_all.7z
+archive_uri:            /qt5.0-beta-snapshots/linux_32_release/qt5_desktop_bin_linux32_1110.7z
 package_strip_dirs:     4
 target_install_dir:     /
 rpath_target:           /lib
diff --git a/release-tools/configurations/linux_x86_64_beta b/release-tools/configurations/linux_x86_64_beta
index 779c9be..8cd9caf 100644
--- a/release-tools/configurations/linux_x86_64_beta
+++ b/release-tools/configurations/linux_x86_64_beta
@@ -5,7 +5,7 @@ name:                   qt.sdk
 identifier:             linux
 
 [ArchiveRemoteLocation.some_server_nickname_here]
-base_url:               http://<server_address_here>/packages/
+base_url:               http://origin.releases.qt-project.org
 base_path:
 
 # for testing purposes
@@ -53,7 +53,7 @@ version:                5.0.0
 version_tag:            %QT_VERSION%
 package_default:        true
 [src.qt.500_beta]
-archive_uri:            /qt/5.0.0/src/qt-everywhere-opensource-src-5.0.0.tar.gz
+archive_uri:            /qt5.0-beta-snapshots/src_snapshot/qt-everywhere-opensource-src-5.0.0-beta.tar.gz
 package_strip_dirs:     1
 target_install_dir:     /
 rpath_target:
@@ -68,7 +68,7 @@ version:                5.0.0
 version_tag:            %QT_VERSION%
 package_default:        true
 [desktop.500_beta.gcc_64]
-archive_uri:            /qt/5.0.0/linux_gcc_64/qt5_all.7z
+archive_uri:            /qt5.0-beta-snapshots/linux_64_release/qt5_desktop_bin_linux64_1110.7z
 package_strip_dirs:     4
 target_install_dir:     /
 rpath_target:           /lib
diff --git a/release-tools/configurations/mac_x86_64_beta b/release-tools/configurations/mac_x86_64_beta
index f85dbba..1cc01f7 100644
--- a/release-tools/configurations/mac_x86_64_beta
+++ b/release-tools/configurations/mac_x86_64_beta
@@ -5,7 +5,7 @@ name:                   qt.sdk
 identifier:             mac
 
 [ArchiveRemoteLocation.some_server_nickname_here]
-base_url:               http://<server_address_here>/packages/
+base_url:               http://origin.releases.qt-project.org
 base_path:
 
 # for testing purposes
@@ -19,7 +19,7 @@ file_list:
 package_list:
 
 [qtmenunib]
-package_url:            http://<server_address_here>/packages/.../ifw/qt_menu.nib.7z
+package_url:            http://origin.releases.qt-project.org/utils/bin_tools/qt_menu.nib.7z
 
 [SdkUpdateRepository]
 repository_url_release: http://../qt5repository/macx/x64/online_qt5sdk_repo
@@ -39,7 +39,7 @@ packages_dir:           pkg_beta
 
 [InstallerFrameworkTools]
 name:                   ifwt
-package_url:            http://<server_address_here>/.../ifw/1.2.0/installer-framework-build-mac.7z
+package_url:            http://origin.releases.qt-project.org/utils/bin_tools/pre_sdk_ifw/installer-framework-build-mac.7z
 version:                1.2.0
 
 
@@ -58,7 +58,7 @@ version:                5.0.0
 version_tag:            %QT_VERSION%
 package_default:        true
 [src.qt.500_beta]
-archive_uri:            /qt/5.0.0/src/qt-everywhere-opensource-src-5.0.0.tar.gz
+archive_uri:            /qt5.0-beta-snapshots/src_snapshot/qt-everywhere-opensource-src-5.0.0-beta.tar.gz
 package_strip_dirs:     1
 target_install_dir:     /
 rpath_target:
@@ -73,8 +73,8 @@ version:                5.0.0
 version_tag:            %QT_VERSION%
 package_default:        true
 [desktop.500_beta.gcc_64]
-archive_uri:            /qt/5.0.0/mac_cocoa_10.7/qt5_all.7z
-package_strip_dirs:     4
+archive_uri:            /qt5.0-beta-snapshots/mac_64_release/qt-5.0.0-desktop-mac-cocoa-64bit.7z
+package_strip_dirs:     1
 target_install_dir:     /
 rpath_target:
 archive_name:           gcc_64_mac_qt5_all.7z
diff --git a/release-tools/configurations/win_x86_beta b/release-tools/configurations/win_x86_beta
index 0eb2650..5f4ab41 100644
--- a/release-tools/configurations/win_x86_beta
+++ b/release-tools/configurations/win_x86_beta
@@ -5,7 +5,7 @@ name:                   qt.sdk
 identifier:             windows
 
 [ArchiveRemoteLocation.some_server_nickname_here]
-base_url:               http://<server_address_here>/packages/
+base_url:               http://origin.releases.qt-project.org
 base_path:
 
 # for testing purposes
@@ -36,7 +36,7 @@ packages_dir:           pkg_beta
 
 [InstallerFrameworkTools]
 name:                   ifwt
-package_url:            http://<server_address_here>/packages/.../installer-framework-build-win.7z
+package_url:            http://origin.releases.qt-project.org/utils/bin_tools/pre_sdk_ifw/installer-framework-build-win.7z
 version:                1.2.0
 
 
@@ -55,7 +55,7 @@ version:                5.0.0
 version_tag:            %QT_VERSION%
 package_default:        true
 [src.qt.500_beta]
-archive_uri:            /qt/5.0.0/src/qt-everywhere-opensource-src-5.0.0.zip
+archive_uri:            /qt5.0-beta-snapshots/src_snapshot/qt-everywhere-opensource-src-5.0.0-beta.zip
 package_strip_dirs:     1
 target_install_dir:     /
 rpath_target:
@@ -70,8 +70,8 @@ version:                5.0.0
 version_tag:            %QT_VERSION%
 package_default:        true
 [desktop.500_beta.msvc2010_64]
-archive_uri:            /qt/5.0.0/windows_vs2010_64/qt5_all.7z
-package_strip_dirs:     5
+archive_uri:            /qt5.0-beta-snapshots/win_release/qt5_desktop_bin_win7.7z
+package_strip_dirs:     1
 target_install_dir:     /
 rpath_target:
 archive_name:           msvc2010_64_all.7z
@@ -83,8 +83,8 @@ version:                5.0.0
 version_tag:            %QT_VERSION%
 package_default:        true
 [desktop.500_beta.msvc2010]
-archive_uri:            /qt/5.0.0/windows_vs2010_32/qt5_all.7z
-package_strip_dirs:     5
+archive_uri:            /qt5.0-beta-snapshots/win_release/qt5_desktop_bin_win7.7z
+package_strip_dirs:     1
 target_install_dir:     /
 rpath_target:
 archive_name:           msvc2010_all.7z