diff options
author | joaijala <johanna.aijala@digia.com> | 2012-06-27 13:48:43 +0300 |
---|---|---|
committer | Simo Fält <simo.falt@nokia.com> | 2012-07-03 07:13:07 +0200 |
commit | 2a7f2b6ae2688e2fa2ed4a0a26f66661a7972699 (patch) | |
tree | d6a56e33261c2d3403c1bdfd22a71da9bbf732b1 | |
parent | 9dd077e2adf6a786472bbdcb2bacdca863443f2f (diff) |
Uninstall and ReadMe shortcuts added
Added uninstall shortcut and readme.
On windows there is a shortcut to readme,
readme can be launched from the final
page of the installer.
Change-Id: I9c88f5dffb7d4550c81496d0d47c09bb5855e8c2
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Reviewed-by: Simo Fält <simo.falt@nokia.com>
15 files changed, 244 insertions, 63 deletions
diff --git a/release-tools/configurations/linux_x86_32_beta b/release-tools/configurations/linux_x86_32_beta index 07cfd73..1b34c67 100644 --- a/release-tools/configurations/linux_x86_32_beta +++ b/release-tools/configurations/linux_x86_32_beta @@ -45,6 +45,19 @@ version: 1.2.0 [qt.sdk] root_component: yes +[qt.sdk.readme] +archives: sdk.readme +target_install_base: / +version: 5.0.0 +version_tag: %QT_VERSION% +package_default: true +[sdk.readme] +archive_uri: https://qt.gitorious.org/qt/qt5/blobs/raw/master/README +package_strip_dirs: 0 +target_install_dir: / +rpath_target: +archive_name: readme.7z + [qt.sdk.src] [qt.sdk.src.qt.500_beta] diff --git a/release-tools/configurations/linux_x86_64_beta b/release-tools/configurations/linux_x86_64_beta index 8cd9caf..a0fe8f5 100644 --- a/release-tools/configurations/linux_x86_64_beta +++ b/release-tools/configurations/linux_x86_64_beta @@ -44,6 +44,19 @@ version: 1.2.0 [qt.sdk] root_component: yes +[qt.sdk.readme] +archives: sdk.readme +target_install_base: / +version: 5.0.0 +version_tag: %QT_VERSION% +package_default: true +[sdk.readme] +archive_uri: https://qt.gitorious.org/qt/qt5/blobs/raw/master/README +package_strip_dirs: 0 +target_install_dir: / +rpath_target: +archive_name: readme.7z + [qt.sdk.src] [qt.sdk.src.qt.500_beta] diff --git a/release-tools/configurations/mac_x86_64_beta b/release-tools/configurations/mac_x86_64_beta index 1cc01f7..cc7541f 100644 --- a/release-tools/configurations/mac_x86_64_beta +++ b/release-tools/configurations/mac_x86_64_beta @@ -49,6 +49,19 @@ version: 1.2.0 [qt.sdk] root_component: yes +[qt.sdk.readme] +archives: sdk.readme +target_install_base: / +version: 5.0.0 +version_tag: %QT_VERSION% +package_default: true +[sdk.readme] +archive_uri: https://qt.gitorious.org/qt/qt5/blobs/raw/master/README +package_strip_dirs: 0 +target_install_dir: / +rpath_target: +archive_name: readme.7z + [qt.sdk.src] [qt.sdk.src.qt.500_beta] diff --git a/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.gcc/meta/installscript.qs b/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.gcc/meta/installscript.qs index db8acd4..61c9ba4 100644 --- a/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.gcc/meta/installscript.qs +++ b/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.gcc/meta/installscript.qs @@ -5,11 +5,9 @@ // constructor function Component() { - if (installer.value("os") == "win") - { - } if (component.fromOnlineRepository) { + // Commented line below used by the packaging scripts //%IFW_DOWNLOADABLE_ARCHIVE_NAMES% } } @@ -53,8 +51,5 @@ Component.prototype.createOperations = function() Component.prototype.installationFinished = function() { - if (installer.isInstaller() && component.selected) - { - } } diff --git a/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.gcc_64/meta/installscript.qs b/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.gcc_64/meta/installscript.qs index db8acd4..61c9ba4 100644 --- a/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.gcc_64/meta/installscript.qs +++ b/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.gcc_64/meta/installscript.qs @@ -5,11 +5,9 @@ // constructor function Component() { - if (installer.value("os") == "win") - { - } if (component.fromOnlineRepository) { + // Commented line below used by the packaging scripts //%IFW_DOWNLOADABLE_ARCHIVE_NAMES% } } @@ -53,8 +51,5 @@ Component.prototype.createOperations = function() Component.prototype.installationFinished = function() { - if (installer.isInstaller() && component.selected) - { - } } diff --git a/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.mingw/meta/installscript.qs b/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.mingw/meta/installscript.qs index db8acd4..61c9ba4 100644 --- a/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.mingw/meta/installscript.qs +++ b/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.mingw/meta/installscript.qs @@ -5,11 +5,9 @@ // constructor function Component() { - if (installer.value("os") == "win") - { - } if (component.fromOnlineRepository) { + // Commented line below used by the packaging scripts //%IFW_DOWNLOADABLE_ARCHIVE_NAMES% } } @@ -53,8 +51,5 @@ Component.prototype.createOperations = function() Component.prototype.installationFinished = function() { - if (installer.isInstaller() && component.selected) - { - } } diff --git a/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.msvc2008/meta/installscript.qs b/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.msvc2008/meta/installscript.qs index db8acd4..61c9ba4 100644 --- a/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.msvc2008/meta/installscript.qs +++ b/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.msvc2008/meta/installscript.qs @@ -5,11 +5,9 @@ // constructor function Component() { - if (installer.value("os") == "win") - { - } if (component.fromOnlineRepository) { + // Commented line below used by the packaging scripts //%IFW_DOWNLOADABLE_ARCHIVE_NAMES% } } @@ -53,8 +51,5 @@ Component.prototype.createOperations = function() Component.prototype.installationFinished = function() { - if (installer.isInstaller() && component.selected) - { - } } diff --git a/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.msvc2010/meta/installscript.qs b/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.msvc2010/meta/installscript.qs index 5c67c93..7cf8eae 100644 --- a/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.msvc2010/meta/installscript.qs +++ b/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.msvc2010/meta/installscript.qs @@ -5,16 +5,23 @@ // constructor function Component() { - if (installer.value("os") == "win") - { - } if (component.fromOnlineRepository) { + // Commented line below used by the packaging scripts //%IFW_DOWNLOADABLE_ARCHIVE_NAMES% } } +Component.prototype.isDefault = function() +{ + if (installer.environmentVariable("VS100COMNTOOLS")) { + return true; + } + return false; +} + + checkWhetherStopProcessIsNeeded = function() { } @@ -23,6 +30,7 @@ createShortcuts = function() { var qtStringVersion = "%QT_VERSION%"; // Create a batch file with the development environment + var component_root_path = installer.value("TargetDir") + "%TARGET_INSTALL_DIR%"; var batchFileName = component_root_path + "/" + "bin" + "/" + "qtenv2.bat"; var contentString = "echo off\r\n"; contentString += "echo Setting up environment for Qt usage...\r\n"; @@ -58,17 +66,6 @@ createShortcuts = function() component.addOperation( "CreateShortcut", component_root_path + "/bin/linguist.exe", "@StartMenuDir@/%QT_VERSION%/MSVC 2010/Linguist.lnk"); - - // README - //var notePadLocation = windir + "\\notepad.exe"; - //component.addOperation( "CreateShortcut", - // notePadLocation, - // "@StartMenuDir@/%QT_VERSION%/MSVC 2010/Linguist.lnk"); - - // Examples & Demos - //component.addOperation( "CreateShortcut", - // component_root_path + "/bin/qtdemo.exe", - // "@StartMenuDir@/%QT_VERSION%/MSVC 2010/Examples & Demos.lnk"); } Component.prototype.createOperations = function() @@ -107,8 +104,5 @@ Component.prototype.createOperations = function() Component.prototype.installationFinished = function() { - if (installer.isInstaller() && component.selected) - { - } } diff --git a/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.msvc2010_64/meta/installscript.qs b/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.msvc2010_64/meta/installscript.qs index dd6e70e..b5fb757 100644 --- a/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.msvc2010_64/meta/installscript.qs +++ b/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.msvc2010_64/meta/installscript.qs @@ -5,16 +5,23 @@ // constructor function Component() { - if (installer.value("os") == "win") - { - } if (component.fromOnlineRepository) { + // Commented line below used by the packaging scripts //%IFW_DOWNLOADABLE_ARCHIVE_NAMES% } } +Component.prototype.isDefault = function() +{ + if (installer.environmentVariable("VS100COMNTOOLS")) { + return true; + } + return false; +} + + checkWhetherStopProcessIsNeeded = function() { } @@ -23,7 +30,7 @@ createShortcuts = function() { var qtStringVersion = "%QT_VERSION%"; // Create a batch file with the development environment - component_root_path = installer.value("TargetDir") + "%TARGET_INSTALL_DIR%"; + var component_root_path = installer.value("TargetDir") + "%TARGET_INSTALL_DIR%"; var batchFileName = component_root_path + "/" + "bin" + "/" + "qtenv2.bat"; var contentString = "echo off\r\n"; contentString += "echo Setting up environment for Qt usage...\r\n"; @@ -59,18 +66,6 @@ createShortcuts = function() component.addOperation( "CreateShortcut", component_root_path + "/bin/linguist.exe", "@StartMenuDir@/%QT_VERSION%/MSVC 2010 (64-bit)/Linguist.lnk"); - - // README - //var notePadLocation = windir + "\\notepad.exe"; - //component.addOperation( "CreateShortcut", - // notePadLocation, - // "@StartMenuDir@/%QT_VERSION%/MSVC 2010 (64-bit)/Linguist.lnk"); - - // Examples & Demos - //component.addOperation( "CreateShortcut", - // component_root_path + "/bin/qtdemo.exe", - // "@StartMenuDir@/%QT_VERSION%/MSVC 2010 (64-bit)/Examples & Demos.lnk"); - } Component.prototype.createOperations = function() @@ -109,8 +104,5 @@ Component.prototype.createOperations = function() Component.prototype.installationFinished = function() { - if (installer.isInstaller() && component.selected) - { - } } diff --git a/release-tools/configurations/pkg_beta/qt.sdk.readme/meta/installscript.qs b/release-tools/configurations/pkg_beta/qt.sdk.readme/meta/installscript.qs new file mode 100644 index 0000000..b2acc6f --- /dev/null +++ b/release-tools/configurations/pkg_beta/qt.sdk.readme/meta/installscript.qs @@ -0,0 +1,72 @@ +/* This file is part of the Qt SDK + +*/ + +// constructor +function Component() +{ + if (component.fromOnlineRepository) + { + // Commented line below used by the packaging scripts + //%IFW_DOWNLOADABLE_ARCHIVE_NAMES% + } + + installer.installationFinished.connect(this, Component.prototype.installationFinishedPageIsShown); + installer.finishButtonClicked.connect(this, Component.prototype.installationFinished); +} + + +checkWhetherStopProcessIsNeeded = function() +{ +} + + +Component.prototype.createOperations = function() +{ + component.createOperations(); + var component_root_path = installer.value("TargetDir") + "%TARGET_INSTALL_DIR%"; + + if (installer.value("os") == "win") + { + var windir = installer.environmentVariable("WINDIR"); + if (windir == "") { + QMessageBox["warning"]( "Error" , "Error", "Could not find windows installation directory"); + return; + } + + // README Qt Readme - C:\Windows\notepad.exe <installdir>\README + var notePadLocation = windir + "\\notepad.exe"; + component.addOperation( "CreateShortcut", + notePadLocation, + "@StartMenuDir@/README.lnk", + component_root_path + "/README"); + } +} + + + +Component.prototype.installationFinishedPageIsShown = function() +{ + try { + if (installer.isInstaller() && installer.status == QInstaller.Success) { + installer.addWizardPageItem( component, "ReadMeCheckBoxForm", QInstaller.InstallationFinished ); + } + } catch(e) { + print(e); + } +} + +Component.prototype.installationFinished = function() +{ + try { + if (installer.isInstaller() && installer.status == QInstaller.Success) { + var isReadMeCheckBoxChecked = component.userInterface( "ReadMeCheckBoxForm" ).readMeCheckBox.checked; + if (isReadMeCheckBoxChecked) { + QDesktopServices.openUrl("file:///" + installer.value("TargetDir") + "/README"); + } + } + } catch(e) { + print(e); + } +} + diff --git a/release-tools/configurations/pkg_beta/qt.sdk.readme/meta/package.xml b/release-tools/configurations/pkg_beta/qt.sdk.readme/meta/package.xml new file mode 100644 index 0000000..7e00982 --- /dev/null +++ b/release-tools/configurations/pkg_beta/qt.sdk.readme/meta/package.xml @@ -0,0 +1,22 @@ +<?xml version="1.0"?> +<Package> + <DisplayName>Qt 5.0.0 Beta Readme</DisplayName> + <Description>Qt 5.0.0 Beta Readme</Description> + <Version>%QT_VERSION%</Version> + <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate> + <Name>qt.sdk.readme</Name> + <!--<Dependencies></Dependencies>--> <!-- Comma-separated list of dependencies - optional --> + <Default>%PACKAGE_DEFAULT_TAG%</Default> + <!--<AutoSelectOn></AutoSelectOn>--> + <Script>installscript.qs</Script> <!-- File name of a script being loaded - optional. --> + <UserInterfaces> + <UserInterface>readmecheckboxform.ui</UserInterface> + </UserInterfaces> + <!--<Forced></Forced>--> + <Virtual>true</Virtual> <!-- Set to true if this is a virtual component not showing up in the installer --> + <!--<Important></Important>--> <!-- The package is marked as important. This is relevant for updates found with UpdateAgent. --> + <!--<SortingPriority>0</SortingPriority>--> <!-- Priority of this component when visible in the tree. Lowest priority number is on top. --> + <!--<InstallPriority></InstallPriority>--> <!-- Priority of this component when getting installed. Lowest priority number is first. --> +</Package> + + diff --git a/release-tools/configurations/pkg_beta/qt.sdk.readme/meta/readmecheckboxform.ui b/release-tools/configurations/pkg_beta/qt.sdk.readme/meta/readmecheckboxform.ui new file mode 100644 index 0000000..8824349 --- /dev/null +++ b/release-tools/configurations/pkg_beta/qt.sdk.readme/meta/readmecheckboxform.ui @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>ReadMeCheckBoxForm</class> + <widget class="QWidget" name="ReadMeCheckBoxForm"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>412</width> + <height>179</height> + </rect> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <property name="margin"> + <number>0</number> + </property> + <item> + <widget class="QCheckBox" name="readMeCheckBox"> + <property name="text"> + <string>Open Qt 5.0.0 beta ReadMe</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + <property name="tristate"> + <bool>false</bool> + </property> + </widget> + </item> + </layout> + </widget> + <resources/> + <connections/> +</ui> diff --git a/release-tools/configurations/pkg_beta/qt.sdk.src.qt.500_beta/meta/installscript.qs b/release-tools/configurations/pkg_beta/qt.sdk.src.qt.500_beta/meta/installscript.qs index 3a6e523..c8d9c1b 100644 --- a/release-tools/configurations/pkg_beta/qt.sdk.src.qt.500_beta/meta/installscript.qs +++ b/release-tools/configurations/pkg_beta/qt.sdk.src.qt.500_beta/meta/installscript.qs @@ -5,11 +5,9 @@ // constructor function Component() { - if (installer.value("os") == "win") - { - } if (component.fromOnlineRepository) { + // Commented line below used by the packaging scripts //%IFW_DOWNLOADABLE_ARCHIVE_NAMES% } } diff --git a/release-tools/configurations/pkg_beta/qt.sdk/meta/installscript.qs b/release-tools/configurations/pkg_beta/qt.sdk/meta/installscript.qs new file mode 100644 index 0000000..b56c0d7 --- /dev/null +++ b/release-tools/configurations/pkg_beta/qt.sdk/meta/installscript.qs @@ -0,0 +1,37 @@ +/* This file is part of the Qt SDK + +*/ + +// constructor +function Component() +{ + if (component.fromOnlineRepository) + { + // Commented line below used by the packaging scripts + //%IFW_DOWNLOADABLE_ARCHIVE_NAMES% + } +} + +Component.prototype.createOperations = function() +{ + component.createOperations(); + + if (installer.value("os") == "win") { + try { + var win_application = installer.value("TargetDir") + "/MaintenanceTool.exe"; + + component.addOperation( "CreateShortcut", + win_application, + "@StartMenuDir@/Uninstall Qt 5.0.0 Beta.lnk", + " --uninstall"); + } catch( e ) { + print( e ); + } + } +} + + +Component.prototype.installationFinished = function() +{ +} + diff --git a/release-tools/configurations/win_x86_beta b/release-tools/configurations/win_x86_beta index 5f4ab41..15e9800 100644 --- a/release-tools/configurations/win_x86_beta +++ b/release-tools/configurations/win_x86_beta @@ -46,6 +46,19 @@ version: 1.2.0 [qt.sdk] root_component: yes +[qt.sdk.readme] +archives: sdk.readme +target_install_base: / +version: 5.0.0 +version_tag: %QT_VERSION% +package_default: true +[sdk.readme] +archive_uri: https://qt.gitorious.org/qt/qt5/blobs/raw/master/README +package_strip_dirs: 0 +target_install_dir: / +rpath_target: +archive_name: readme.7z + [qt.sdk.src] [qt.sdk.src.qt.500_beta] |