diff -Nru qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/debian/changelog qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/debian/changelog --- qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/debian/changelog 2015-04-21 08:08:30.000000000 +0000 +++ qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/debian/changelog 2015-05-08 08:39:17.000000000 +0000 @@ -1,8 +1,47 @@ -qtcreator-plugin-ubuntu (3.1.1+15.04.20150421-0ubuntu1~0trusty1) trusty; urgency=medium +qtcreator-plugin-ubuntu (3.1.1+15.10.20150507-0ubuntu1~0trusty1) trusty; urgency=medium - * Fixes LP: #1446062, RSync failes if translation dir is not created + [ Alexandre Abreu ] + * Add autopilot and unit tests templates for HTML5 simple application - -- Zoltán Balogh Tue, 21 Apr 2015 10:05:36 +0200 + [ Benjamin Zeller ] + * Fix Bug lp:1402484 "A typo in the scope template readme file" Fix + bug lp:1427138 and lp:1404672, add schroot to the deps Fix Bug + lp:1450477 "Typo in initial startup wizard" (LP: #1404672, #1427138, + #1402484, #1450477) + * Remove either unused or dangerous functions and scripts. (LP: + #1324008, #1366785, #1388655) + * Show Desktop Kit in chroot setup page ( lp:1366934 lp:1369828) Fix + Bug lp:1400842 "devices panel: text says refresh but button is + redetect" (LP: #1400842, #1369828, #1366934) + + [ CI Train Bot ] + * New rebuild forced. + + [ Zoltán Balogh ] + * Set the title of the tamplate apps to the app name. Fixes LP: + #1365309 (LP: #1365309) + * removed obsolate patch + * removed obsolate patch removed: debian/patches/ + debian/patches/series debian/patches/u-d-f_syntax.diff + + -- Zoltán Balogh Fri, 08 May 2015 11:37:27 +0300 + +qtcreator-plugin-ubuntu (3.1.1+15.04.20150420.1-0ubuntu2) vivid-proposed; urgency=medium + + * Updating to use new u-d-f syntax (LP: #1447569) + + -- Sergio Schvezov Thu, 23 Apr 2015 08:37:13 -0300 + +qtcreator-plugin-ubuntu (3.1.1+15.04.20150420.1-0ubuntu1) vivid; urgency=medium + + [ Benjamin Zeller ] + * Fix bug lp:1446062, RSync failes if translation dir is not created + (LP: #1446062) + + [ CI Train Bot ] + * New rebuild forced. + + -- CI Train Bot Mon, 20 Apr 2015 21:31:37 +0000 qtcreator-plugin-ubuntu (3.1.1+15.04.20150417-0ubuntu1) vivid; urgency=medium diff -Nru qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/debian/control qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/debian/control --- qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/debian/control 2015-04-21 08:08:09.000000000 +0000 +++ qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/debian/control 2015-05-08 08:39:43.000000000 +0000 @@ -51,6 +51,7 @@ click-reviewers-tools, phablet-tools, python-dbus, + schroot, ${shlibs:Depends}, ${misc:Depends}, Recommends: ubuntu-sdk, diff -Nru qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/debian/copyright qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/debian/copyright --- qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/debian/copyright 2015-04-21 08:04:31.000000000 +0000 +++ qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/debian/copyright 2015-05-08 08:37:05.000000000 +0000 @@ -22,3 +22,24 @@ On Debian systems, the complete text of the GNU Lesser General Public License version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1'. +Files: share/qtcreator/templates/wizards/ubuntu/html5-simple/tests/unit/third_party/jasmine/lib/jasmine-2.2.0/* +Copyright: 2008-2015 Pivotal Labs +License: MIT + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + . + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff -Nru qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/templates/wizards/ubuntu/backend-app-cmake/app/displayName.qml qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/templates/wizards/ubuntu/backend-app-cmake/app/displayName.qml --- qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/templates/wizards/ubuntu/backend-app-cmake/app/displayName.qml 2015-04-21 08:04:31.000000000 +0000 +++ qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/templates/wizards/ubuntu/backend-app-cmake/app/displayName.qml 2015-05-08 08:37:05.000000000 +0000 @@ -28,7 +28,7 @@ height: units.gu(76) Page { - title: i18n.tr("App with backend") + title: i18n.tr("%ClickHookName%") MyType { id: myType diff -Nru qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/templates/wizards/ubuntu/backend-app-qmake/appName/Main.qml qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/templates/wizards/ubuntu/backend-app-qmake/appName/Main.qml --- qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/templates/wizards/ubuntu/backend-app-qmake/appName/Main.qml 2015-04-21 08:04:31.000000000 +0000 +++ qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/templates/wizards/ubuntu/backend-app-qmake/appName/Main.qml 2015-05-08 08:37:05.000000000 +0000 @@ -25,7 +25,7 @@ height: units.gu(75) Page { - title: i18n.tr("App with backend") + title: i18n.tr("%ClickHookName%") MyType { id: myType diff -Nru qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/templates/wizards/ubuntu/goproject/share/displayName/Main.qml qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/templates/wizards/ubuntu/goproject/share/displayName/Main.qml --- qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/templates/wizards/ubuntu/goproject/share/displayName/Main.qml 2015-04-21 08:04:31.000000000 +0000 +++ qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/templates/wizards/ubuntu/goproject/share/displayName/Main.qml 2015-05-08 08:37:05.000000000 +0000 @@ -25,7 +25,7 @@ height: units.gu(75) Page { - title: i18n.tr("Simple") + title: i18n.tr("%ClickHookName%") Column { spacing: units.gu(1) diff -Nru qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/templates/wizards/ubuntu/html5-simple/Gruntfile.js qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/templates/wizards/ubuntu/html5-simple/Gruntfile.js --- qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/templates/wizards/ubuntu/html5-simple/Gruntfile.js 1970-01-01 00:00:00.000000000 +0000 +++ qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/templates/wizards/ubuntu/html5-simple/Gruntfile.js 2015-05-08 08:37:05.000000000 +0000 @@ -0,0 +1,12 @@ +module.exports = function(grunt) { + grunt.initConfig({ + jasmine : { + src : 'www/js/application.js', + options: { + specs : 'tests/unit/specs/*specs.js' + } + } + }); + grunt.loadNpmTasks('grunt-contrib-jasmine'); + grunt.registerTask('default', 'jasmine'); +}; diff -Nru qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/templates/wizards/ubuntu/html5-simple/package.json qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/templates/wizards/ubuntu/html5-simple/package.json --- qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/templates/wizards/ubuntu/html5-simple/package.json 1970-01-01 00:00:00.000000000 +0000 +++ qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/templates/wizards/ubuntu/html5-simple/package.json 2015-05-08 08:37:05.000000000 +0000 @@ -0,0 +1,13 @@ +{ + "name": "my-app", + "version": "0.1.0", + "devDependencies": { + "grunt": "^0.4.5", + "grunt-contrib-jasmine": "^0.8.2", + "grunt-contrib-jshint": "~0.10.0", + "grunt-contrib-uglify": "~0.5.0" + }, + "scripts": { + "test": "node -e \"require('grunt').tasks(['jasmine']);\"" + } +} diff -Nru qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/templates/wizards/ubuntu/html5-simple/README qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/templates/wizards/ubuntu/html5-simple/README --- qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/templates/wizards/ubuntu/html5-simple/README 1970-01-01 00:00:00.000000000 +0000 +++ qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/templates/wizards/ubuntu/html5-simple/README 2015-05-08 08:37:05.000000000 +0000 @@ -0,0 +1,43 @@ +HTML5 Application Template +-------------------------- + + +www/ : the source files of the template application, +tests/ : the application functional and unit tests +package.json : grunt package file used to install dependencies +Gruntfile.js : grunt file for the jasmine unit tests + + +Unit Tests: +----------- + +To run the unit tests, from the project folder: + +- Have nodejs and grunt installed on your system, + +sudo apt-get install nodejs + +- Install the node dependencies: + +npm install + +- Run the tests: + +npm test + + +Autopilot (functional) tests +---------------------------- + +- Make sure that you have oxide-chromedriver and selenium installed: + +sudo apt-get install oxideqt-chromedriver +sudo apt-add-repository ppa:canonical-platform-qa/selenium +sudo apt-get update +sudo apt-get install python3-selenium + +- Run the tests: + +cd tests/autopilot +autopilot3 list application_tests +autopilot3 run application_tests diff -Nru qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/templates/wizards/ubuntu/html5-simple/tests/autopilot/application_tests/__init__.py qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/templates/wizards/ubuntu/html5-simple/tests/autopilot/application_tests/__init__.py --- qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/templates/wizards/ubuntu/html5-simple/tests/autopilot/application_tests/__init__.py 1970-01-01 00:00:00.000000000 +0000 +++ qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/templates/wizards/ubuntu/html5-simple/tests/autopilot/application_tests/__init__.py 2015-05-08 08:37:05.000000000 +0000 @@ -0,0 +1,3 @@ +# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*- + +""" autopilot tests """ diff -Nru qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/templates/wizards/ubuntu/html5-simple/tests/autopilot/application_tests/tests/__init__.py qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/templates/wizards/ubuntu/html5-simple/tests/autopilot/application_tests/tests/__init__.py --- qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/templates/wizards/ubuntu/html5-simple/tests/autopilot/application_tests/tests/__init__.py 1970-01-01 00:00:00.000000000 +0000 +++ qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/templates/wizards/ubuntu/html5-simple/tests/autopilot/application_tests/tests/__init__.py 2015-05-08 08:37:05.000000000 +0000 @@ -0,0 +1,104 @@ +# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*- + +""" Autopilot tests """ + +import os +import subprocess + +from selenium import webdriver +from selenium.webdriver.chrome.options import Options + +import ubuntuuitoolkit as uitk +from ubuntuuitoolkit import fixture_setup + +from autopilot import platform + +from testtools.matchers import NotEquals, EndsWith +from autopilot.matchers import Eventually + +from autopilot.testcase import AutopilotTestCase + +CURRENT_ARCHITECTURE = subprocess.check_output( + ["dpkg-architecture", "-qDEB_HOST_MULTIARCH"]).strip() +CHROMEDRIVER_EXEC_PATH = \ + "/usr/lib/{}/oxide-qt/chromedriver".format( + CURRENT_ARCHITECTURE.decode("utf-8")) +DEFAULT_WEBVIEW_INSPECTOR_IP = '127.0.0.1' +DEFAULT_WEBVIEW_INSPECTOR_PORT = 9221 + + +class HTML5TestCaseBase(AutopilotTestCase): + def setUp(self): + self.driver = None + self.app_proxy = None + super().setUp() + if platform.model() == 'Desktop': + self.patch_environment( + 'UBUNTU_WEBVIEW_DEVTOOLS_HOST', + DEFAULT_WEBVIEW_INSPECTOR_IP) + self.patch_environment( + 'UBUNTU_WEBVIEW_DEVTOOLS_PORT', + str(DEFAULT_WEBVIEW_INSPECTOR_PORT)) + else: + self.useFixture(fixture_setup.InitctlEnvironmentVariable( + global_=True, + UBUNTU_WEBVIEW_DEVTOOLS_HOST=DEFAULT_WEBVIEW_INSPECTOR_IP, + UBUNTU_WEBVIEW_DEVTOOLS_PORT=str( + DEFAULT_WEBVIEW_INSPECTOR_PORT) + )) + + def tearDown(self): + if self.driver: + self.page.close() + self.page.quit() + # XXX: This should not be there but AP hangs + # if we dont extra force the process to be killed + # (although AP already tries to kill part of its teardown) + if platform.model() == 'Desktop' \ + and self.app_proxy \ + and self.app_proxy.process: + self.app_proxy.process.kill() + super(HTML5TestCaseBase, self).tearDown() + + def get_webview(self): + return self.app_proxy.select_single('UbuntuWebView02') + + def launch_webdriver(self): + options = Options() + options.binary_location = '' + options.debugger_address = '{}:{}'.format( + DEFAULT_WEBVIEW_INSPECTOR_IP, + DEFAULT_WEBVIEW_INSPECTOR_PORT) + + self.driver = webdriver.Chrome( + executable_path=CHROMEDRIVER_EXEC_PATH, + chrome_options=options) + + self.assertThat(self.driver, NotEquals(None)) + + @property + def page(self): + return self.driver + + def launch_html5_app_inline(self, args): + return self.launch_test_application( + 'ubuntu-html5-app-launcher', + *args, + emulator_base=uitk.UbuntuUIToolkitCustomProxyObjectBase) + + def launch_html5_app(self): + self.app_proxy = self.launch_html5_app_inline( + ['--www={}/{}'.format( + os.path.dirname( + os.path.realpath(__file__)), + '../../../../www')]) + self.wait_for_app() + + self.launch_webdriver() + + def wait_for_app(self): + self.assertThat(self.app_proxy, NotEquals(None)) + webview = self.get_webview() + self.assertThat( + lambda: webview.url, + Eventually(EndsWith("/index.html"))) diff -Nru qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/templates/wizards/ubuntu/html5-simple/tests/autopilot/application_tests/tests/test_app_launch.py qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/templates/wizards/ubuntu/html5-simple/tests/autopilot/application_tests/tests/test_app_launch.py --- qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/templates/wizards/ubuntu/html5-simple/tests/autopilot/application_tests/tests/test_app_launch.py 1970-01-01 00:00:00.000000000 +0000 +++ qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/templates/wizards/ubuntu/html5-simple/tests/autopilot/application_tests/tests/test_app_launch.py 2015-05-08 08:37:05.000000000 +0000 @@ -0,0 +1,19 @@ +# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*- + +from application_tests.tests import HTML5TestCaseBase + +from testtools.matchers import NotEquals, Equals + + +class LaunchTestCaseBase(HTML5TestCaseBase): + def setUp(self): + super(LaunchTestCaseBase, self).setUp() + + def test_basic_launch(self): + self.launch_html5_app() + + html5_doc_buttons = self.page.find_elements_by_css_selector( + "#hello-page a") + + self.assertThat(html5_doc_buttons, NotEquals(None)) + self.assertThat(len(html5_doc_buttons), Equals(2)) diff -Nru qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/templates/wizards/ubuntu/html5-simple/tests/unit/specs/app-specs.js qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/templates/wizards/ubuntu/html5-simple/tests/unit/specs/app-specs.js --- qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/templates/wizards/ubuntu/html5-simple/tests/unit/specs/app-specs.js 1970-01-01 00:00:00.000000000 +0000 +++ qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/templates/wizards/ubuntu/html5-simple/tests/unit/specs/app-specs.js 2015-05-08 08:37:05.000000000 +0000 @@ -0,0 +1,15 @@ +describe("App", function() { + var application; + + var MockedUIContext = function() {} + MockedUIContext.prototype.init = function() { } + + beforeEach(function() { + application = new Application(MockedUIContext); + }); + + it("should have a proper initialized flag", function() { + application.init(); + expect(application.initialized()).toBeTruthy(); + }); +}); diff -Nru qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/templates/wizards/ubuntu/html5-simple/tests/unit/third_party/jasmine/lib/jasmine-2.2.0/boot.js qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/templates/wizards/ubuntu/html5-simple/tests/unit/third_party/jasmine/lib/jasmine-2.2.0/boot.js --- qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/templates/wizards/ubuntu/html5-simple/tests/unit/third_party/jasmine/lib/jasmine-2.2.0/boot.js 1970-01-01 00:00:00.000000000 +0000 +++ qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/templates/wizards/ubuntu/html5-simple/tests/unit/third_party/jasmine/lib/jasmine-2.2.0/boot.js 2015-05-08 08:37:05.000000000 +0000 @@ -0,0 +1,121 @@ +/** + Starting with version 2.0, this file "boots" Jasmine, performing all of the necessary initialization before executing the loaded environment and all of a project's specs. This file should be loaded after `jasmine.js` and `jasmine_html.js`, but before any project source files or spec files are loaded. Thus this file can also be used to customize Jasmine for a project. + + If a project is using Jasmine via the standalone distribution, this file can be customized directly. If a project is using Jasmine via the [Ruby gem][jasmine-gem], this file can be copied into the support directory via `jasmine copy_boot_js`. Other environments (e.g., Python) will have different mechanisms. + + The location of `boot.js` can be specified and/or overridden in `jasmine.yml`. + + [jasmine-gem]: http://github.com/pivotal/jasmine-gem + */ + +(function() { + + /** + * ## Require & Instantiate + * + * Require Jasmine's core files. Specifically, this requires and attaches all of Jasmine's code to the `jasmine` reference. + */ + window.jasmine = jasmineRequire.core(jasmineRequire); + + /** + * Since this is being run in a browser and the results should populate to an HTML page, require the HTML-specific Jasmine code, injecting the same reference. + */ + jasmineRequire.html(jasmine); + + /** + * Create the Jasmine environment. This is used to run all specs in a project. + */ + var env = jasmine.getEnv(); + + /** + * ## The Global Interface + * + * Build up the functions that will be exposed as the Jasmine public interface. A project can customize, rename or alias any of these functions as desired, provided the implementation remains unchanged. + */ + var jasmineInterface = jasmineRequire.interface(jasmine, env); + + /** + * Add all of the Jasmine global/public interface to the proper global, so a project can use the public interface directly. For example, calling `describe` in specs instead of `jasmine.getEnv().describe`. + */ + if (typeof window == "undefined" && typeof exports == "object") { + extend(exports, jasmineInterface); + } else { + extend(window, jasmineInterface); + } + + /** + * ## Runner Parameters + * + * More browser specific code - wrap the query string in an object and to allow for getting/setting parameters from the runner user interface. + */ + + var queryString = new jasmine.QueryString({ + getWindowLocation: function() { return window.location; } + }); + + var catchingExceptions = queryString.getParam("catch"); + env.catchExceptions(typeof catchingExceptions === "undefined" ? true : catchingExceptions); + + /** + * ## Reporters + * The `HtmlReporter` builds all of the HTML UI for the runner page. This reporter paints the dots, stars, and x's for specs, as well as all spec names and all failures (if any). + */ + var htmlReporter = new jasmine.HtmlReporter({ + env: env, + onRaiseExceptionsClick: function() { queryString.navigateWithNewParam("catch", !env.catchingExceptions()); }, + addToExistingQueryString: function(key, value) { return queryString.fullStringWithNewParam(key, value); }, + getContainer: function() { return document.body; }, + createElement: function() { return document.createElement.apply(document, arguments); }, + createTextNode: function() { return document.createTextNode.apply(document, arguments); }, + timer: new jasmine.Timer() + }); + + /** + * The `jsApiReporter` also receives spec results, and is used by any environment that needs to extract the results from JavaScript. + */ + env.addReporter(jasmineInterface.jsApiReporter); + env.addReporter(htmlReporter); + + /** + * Filter which specs will be run by matching the start of the full name against the `spec` query param. + */ + var specFilter = new jasmine.HtmlSpecFilter({ + filterString: function() { return queryString.getParam("spec"); } + }); + + env.specFilter = function(spec) { + return specFilter.matches(spec.getFullName()); + }; + + /** + * Setting up timing functions to be able to be overridden. Certain browsers (Safari, IE 8, phantomjs) require this hack. + */ + window.setTimeout = window.setTimeout; + window.setInterval = window.setInterval; + window.clearTimeout = window.clearTimeout; + window.clearInterval = window.clearInterval; + + /** + * ## Execution + * + * Replace the browser window's `onload`, ensure it's called, and then run all of the loaded specs. This includes initializing the `HtmlReporter` instance and then executing the loaded Jasmine environment. All of this will happen after all of the specs are loaded. + */ + var currentWindowOnload = window.onload; + + window.onload = function() { + if (currentWindowOnload) { + currentWindowOnload(); + } + htmlReporter.initialize(); + env.execute(); + }; + + /** + * Helper function for readability above. + */ + function extend(destination, source) { + for (var property in source) destination[property] = source[property]; + return destination; + } + +}()); diff -Nru qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/templates/wizards/ubuntu/html5-simple/tests/unit/third_party/jasmine/lib/jasmine-2.2.0/console.js qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/templates/wizards/ubuntu/html5-simple/tests/unit/third_party/jasmine/lib/jasmine-2.2.0/console.js --- qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/templates/wizards/ubuntu/html5-simple/tests/unit/third_party/jasmine/lib/jasmine-2.2.0/console.js 1970-01-01 00:00:00.000000000 +0000 +++ qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/templates/wizards/ubuntu/html5-simple/tests/unit/third_party/jasmine/lib/jasmine-2.2.0/console.js 2015-05-08 08:37:05.000000000 +0000 @@ -0,0 +1,190 @@ +/* +Copyright (c) 2008-2015 Pivotal Labs + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +*/ +function getJasmineRequireObj() { + if (typeof module !== 'undefined' && module.exports) { + return exports; + } else { + window.jasmineRequire = window.jasmineRequire || {}; + return window.jasmineRequire; + } +} + +getJasmineRequireObj().console = function(jRequire, j$) { + j$.ConsoleReporter = jRequire.ConsoleReporter(); +}; + +getJasmineRequireObj().ConsoleReporter = function() { + + var noopTimer = { + start: function(){}, + elapsed: function(){ return 0; } + }; + + function ConsoleReporter(options) { + var print = options.print, + showColors = options.showColors || false, + onComplete = options.onComplete || function() {}, + timer = options.timer || noopTimer, + specCount, + failureCount, + failedSpecs = [], + pendingCount, + ansi = { + green: '\x1B[32m', + red: '\x1B[31m', + yellow: '\x1B[33m', + none: '\x1B[0m' + }, + failedSuites = []; + + print('ConsoleReporter is deprecated and will be removed in a future version.'); + + this.jasmineStarted = function() { + specCount = 0; + failureCount = 0; + pendingCount = 0; + print('Started'); + printNewline(); + timer.start(); + }; + + this.jasmineDone = function() { + printNewline(); + for (var i = 0; i < failedSpecs.length; i++) { + specFailureDetails(failedSpecs[i]); + } + + if(specCount > 0) { + printNewline(); + + var specCounts = specCount + ' ' + plural('spec', specCount) + ', ' + + failureCount + ' ' + plural('failure', failureCount); + + if (pendingCount) { + specCounts += ', ' + pendingCount + ' pending ' + plural('spec', pendingCount); + } + + print(specCounts); + } else { + print('No specs found'); + } + + printNewline(); + var seconds = timer.elapsed() / 1000; + print('Finished in ' + seconds + ' ' + plural('second', seconds)); + printNewline(); + + for(i = 0; i < failedSuites.length; i++) { + suiteFailureDetails(failedSuites[i]); + } + + onComplete(failureCount === 0); + }; + + this.specDone = function(result) { + specCount++; + + if (result.status == 'pending') { + pendingCount++; + print(colored('yellow', '*')); + return; + } + + if (result.status == 'passed') { + print(colored('green', '.')); + return; + } + + if (result.status == 'failed') { + failureCount++; + failedSpecs.push(result); + print(colored('red', 'F')); + } + }; + + this.suiteDone = function(result) { + if (result.failedExpectations && result.failedExpectations.length > 0) { + failureCount++; + failedSuites.push(result); + } + }; + + return this; + + function printNewline() { + print('\n'); + } + + function colored(color, str) { + return showColors ? (ansi[color] + str + ansi.none) : str; + } + + function plural(str, count) { + return count == 1 ? str : str + 's'; + } + + function repeat(thing, times) { + var arr = []; + for (var i = 0; i < times; i++) { + arr.push(thing); + } + return arr; + } + + function indent(str, spaces) { + var lines = (str || '').split('\n'); + var newArr = []; + for (var i = 0; i < lines.length; i++) { + newArr.push(repeat(' ', spaces).join('') + lines[i]); + } + return newArr.join('\n'); + } + + function specFailureDetails(result) { + printNewline(); + print(result.fullName); + + for (var i = 0; i < result.failedExpectations.length; i++) { + var failedExpectation = result.failedExpectations[i]; + printNewline(); + print(indent(failedExpectation.message, 2)); + print(indent(failedExpectation.stack, 2)); + } + + printNewline(); + } + + function suiteFailureDetails(result) { + for (var i = 0; i < result.failedExpectations.length; i++) { + printNewline(); + print(colored('red', 'An error was thrown in an afterAll')); + printNewline(); + print(colored('red', 'AfterAll ' + result.failedExpectations[i].message)); + + } + printNewline(); + } + } + + return ConsoleReporter; +}; diff -Nru qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/templates/wizards/ubuntu/html5-simple/tests/unit/third_party/jasmine/lib/jasmine-2.2.0/jasmine.css qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/templates/wizards/ubuntu/html5-simple/tests/unit/third_party/jasmine/lib/jasmine-2.2.0/jasmine.css --- qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/templates/wizards/ubuntu/html5-simple/tests/unit/third_party/jasmine/lib/jasmine-2.2.0/jasmine.css 1970-01-01 00:00:00.000000000 +0000 +++ qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/templates/wizards/ubuntu/html5-simple/tests/unit/third_party/jasmine/lib/jasmine-2.2.0/jasmine.css 2015-05-08 08:37:05.000000000 +0000 @@ -0,0 +1,62 @@ +body { overflow-y: scroll; } + +.jasmine_html-reporter { background-color: #eee; padding: 5px; margin: -8px; font-size: 11px; font-family: Monaco, "Lucida Console", monospace; line-height: 14px; color: #333; } +.jasmine_html-reporter a { text-decoration: none; } +.jasmine_html-reporter a:hover { text-decoration: underline; } +.jasmine_html-reporter p, .jasmine_html-reporter h1, .jasmine_html-reporter h2, .jasmine_html-reporter h3, .jasmine_html-reporter h4, .jasmine_html-reporter h5, .jasmine_html-reporter h6 { margin: 0; line-height: 14px; } +.jasmine_html-reporter .banner, .jasmine_html-reporter .symbol-summary, .jasmine_html-reporter .summary, .jasmine_html-reporter .result-message, .jasmine_html-reporter .spec .description, .jasmine_html-reporter .spec-detail .description, .jasmine_html-reporter .alert .bar, .jasmine_html-reporter .stack-trace { padding-left: 9px; padding-right: 9px; } +.jasmine_html-reporter .banner { position: relative; } +.jasmine_html-reporter .banner .title { background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFoAAAAZCAMAAACGusnyAAACdlBMVEX/////AP+AgICqVaqAQICZM5mAVYCSSZKAQICOOY6ATYCLRouAQICJO4mSSYCIRIiPQICHPIeOR4CGQ4aMQICGPYaLRoCFQ4WKQICPPYWJRYCOQoSJQICNPoSIRICMQoSHQICHRICKQoOHQICKPoOJO4OJQYOMQICMQ4CIQYKLQICIPoKLQ4CKQICNPoKJQISMQ4KJQoSLQYKJQISLQ4KIQoSKQYKIQICIQISMQoSKQYKLQIOLQoOJQYGLQIOKQIOMQoGKQYOLQYGKQIOLQoGJQYOJQIOKQYGJQIOKQoGKQIGLQIKLQ4KKQoGLQYKJQIGKQYKJQIGKQIKJQoGKQYKLQIGKQYKLQIOJQoKKQoOJQYKKQIOJQoKKQoOKQIOLQoKKQYOLQYKJQIOKQoKKQYKKQoKJQYOKQYKLQIOKQoKLQYOKQYKLQIOJQoGKQYKJQYGJQoGKQYKLQoGLQYGKQoGJQYKKQYGJQIKKQoGJQYKLQIKKQYGLQYKKQYGKQYGKQYKJQYOKQoKJQYOKQYKLQYOLQYOKQYKLQYOKQoKKQYKKQYOKQYOJQYKKQYKLQYKKQIKKQoKKQYKKQYKKQoKJQIKKQYKLQYKKQYKKQIKKQYKKQYKKQYKKQIKKQYKJQYGLQYGKQYKKQYKKQYGKQIKKQYGKQYOJQoKKQYOLQYKKQYOKQoKKQYKKQoKKQYKKQYKJQYKLQYKKQYKKQYKKQYKKQYKKQYKKQYKKQYKKQYKJQYKKQYKKQYKKQYKKQYKKQYKKQYKKQYKKQYKKQYKKQYKKQYKLQYKKQYKKQYKKQYKKQYKKQYKKQYKKQYKKQYKKQYKKQYKKQYKKQYKmIDpEAAAA0XRSTlMAAQIDBAUGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eHyAiIyQlJycoKissLS4wMTQ1Njc4OTo7PDw+P0BCQ0RISUpLTE1OUFNUVVdYWFlaW15fYGFiY2ZnaGlqa2xtb3BxcnN0dnh5ent8fX5/gIGChIWIioyNjo+QkZOUlZaYmZqbnJ2eoKGio6WmqKmsra6vsLGztre4ubq7vL2+wMHDxMjJysvNzs/Q0dLU1tfY2dvc3t/g4eLj5ebn6Onq6+zt7u/w8vP09fb3+Pn6+/z9/vkVQXAAAAMaSURBVHhe5dXxV1N1GMfxz2ABbDgIAm5VDJOyVDIJLUMaVpBWUZUaGbmqoGpZRSiGiRWp6KoZ5AB0ZY50RImZQIlahKkMYXv/R90dBvET/rJfOr3Ouc8v99zPec59zvf56j+vYKlViSf7250X4Mr3O29Tgq08BdGB4DhcekEJ5YkQKFsgWZdtj9JpV+I8xPjLFqkrsEIqO8PHSpis36jWazcqjEsfJjkvRssVU37SdIOu4XCf5vEJPsnwJpnRNU9JmxhMk8l1gehIrq7hTFjzOD+Vf88629qKMJVNltInFeRexRQyJlNeqd1iGDlSzrIUIyXbyFfm3RYprcQRe7lqtWyGYbfc6dT0R2vmdOOkX3u55C1rP37ftiH+tDby4r/RBT0w8TyEkr+epB9XgPDmSYYWbrhCuFYaIyw3fDQAXTnSkh+ANofiHmWf9l+FY1I90FdQTetstO00o23novzVsJ7uB3/C5TkbjRwZ5JerwV4iRWq9HFbFMaK/d0TYqayRiQPuIxxS3Bu8JWU90/60tKi7vkhaznez0a/TbVOKj5CaOZh6fWG6/Lyv9B/ZLR1gw/S/fpbeVD3MCW1li6SvWDOn65tr99/uvWtBS0XDm4s1t+sOHpG0kpBKx/l77wOSnxLpcx6TXmXLTPQOKYOf9Q1dfr8/SJ2mFdCvl1Yl93DiHUZvXeLJbGSzYu5gVJ2slbSakOR8dxCq5adQ2oFLqsE9Ex3L4qQO0eOPeU5x56bypXp4onSEb5OkICX6lDat55TeoztNKQcJaakrz9KCb95oD69IKq+yKW4XPjknaS52V0TZqE2cTtXjcHSCRmUO88e+85hj3EP74i9p8pylw7lxgMDyyl6OV7ZejnjNMfatu87LxRbH0IS35gt2a4ZjmGpVBdKK3Wr6INk8jWWSGqbA55CKgjBRC6E9w78ydTg3ABS3AFV1QN0Y4Aa2pgEjWnQURj9L0ayK6R2ysEqxHUKzYnLvvyU+i9KM2JHJzE4vyZOyDcOwOsySajeLPc8sNvPJkFlyJd20wpqAzZeAfZ3oWybxd+P/3j+SG3uSBdf2VQAAAABJRU5ErkJggg==') no-repeat; background: url('data:image/svg+xml;base64,<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->

<svg
   xmlns:dc="http://purl.org/dc/elements/1.1/"
   xmlns:cc="http://creativecommons.org/ns#"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:svg="http://www.w3.org/2000/svg"
   xmlns="http://www.w3.org/2000/svg"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   version="1.1"
   width="681.96252"
   height="187.5"
   id="svg2"
   xml:space="preserve"><metadata
     id="metadata8"><rdf:RDF><cc:Work
         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
     id="defs6"><clipPath
       id="clipPath18"><path
         d="M 0,1500 0,0 l 5455.74,0 0,1500 L 0,1500 z"
         inkscape:connector-curvature="0"
         id="path20" /></clipPath></defs><g
     transform="matrix(1.25,0,0,-1.25,0,187.5)"
     id="g10"><g
       transform="scale(0.1,0.1)"
       id="g12"><g
         id="g14"><g
           clip-path="url(#clipPath18)"
           id="g16"><path
             d="m 1544,599.434 c 0.92,-40.352 25.68,-81.602 71.53,-81.602 27.51,0 47.68,12.832 61.44,35.754 12.83,22.93 12.83,56.852 12.83,82.527 l 0,329.184 -71.52,0 0,104.543 266.83,0 0,-104.543 -70.6,0 0,-344.77 c 0,-58.691 -3.68,-104.531 -44.93,-152.218 -36.68,-42.18 -96.28,-66.02 -153.14,-66.02 -117.37,0 -207.24,77.941 -202.64,197.145 l 130.2,0"
             inkscape:connector-curvature="0"
             id="path22"
             style="fill:#8a4182;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path
             d="m 2301.4,662.695 c 0,80.703 -66.94,145.813 -147.63,145.813 -83.44,0 -147.63,-68.781 -147.63,-151.301 0,-79.785 66.94,-145.801 145.8,-145.801 84.35,0 149.46,67.852 149.46,151.289 z m -1.83,-181.547 c -35.77,-54.097 -93.53,-78.859 -157.72,-78.859 -140.3,0 -251.24,116.449 -251.24,254.918 0,142.129 113.7,260.41 256.74,260.41 63.27,0 118.29,-29.336 152.22,-82.523 l 0,69.687 175.14,0 0,-104.527 -61.44,0 0,-280.598 61.44,0 0,-104.527 -175.14,0 0,66.019"
             inkscape:connector-curvature="0"
             id="path24"
             style="fill:#8a4182;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path
             d="m 2622.33,557.258 c 3.67,-44.016 33.01,-73.348 78.86,-73.348 33.93,0 66.93,23.824 66.93,60.504 0,48.606 -45.84,56.856 -83.44,66.941 -85.28,22.004 -178.81,48.606 -178.81,155.879 0,93.536 78.86,147.633 165.98,147.633 44,0 83.43,-9.176 110.94,-44.008 l 0,33.922 82.53,0 0,-132.965 -108.21,0 c -1.83,34.856 -28.42,57.774 -63.26,57.774 -30.26,0 -62.35,-17.422 -62.35,-51.348 0,-45.847 44.93,-55.93 80.69,-64.18 88.02,-20.175 182.47,-47.695 182.47,-157.734 0,-99.027 -83.44,-154.039 -175.13,-154.039 -49.53,0 -94.46,15.582 -126.55,53.18 l 0,-40.34 -85.27,0 0,142.129 114.62,0"
             inkscape:connector-curvature="0"
             id="path26"
             style="fill:#8a4182;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path
             d="m 2988.18,800.254 -63.26,0 0,104.527 165.05,0 0,-73.355 c 31.18,51.347 78.86,85.277 141.21,85.277 67.85,0 124.71,-41.258 152.21,-102.699 26.6,62.351 92.62,102.699 160.47,102.699 53.19,0 105.46,-22 141.21,-62.351 38.52,-44.938 38.52,-93.532 38.52,-149.457 l 0,-185.239 63.27,0 0,-104.527 -238.42,0 0,104.527 63.28,0 0,157.715 c 0,32.102 0,60.527 -14.67,88.957 -18.34,26.582 -48.61,40.344 -79.77,40.344 -30.26,0 -63.28,-12.844 -82.53,-36.672 -22.93,-29.355 -22.93,-56.863 -22.93,-92.629 l 0,-157.715 63.27,0 0,-104.527 -238.41,0 0,104.527 63.28,0 0,150.383 c 0,29.348 0,66.023 -14.67,91.699 -15.59,29.336 -47.69,44.934 -80.7,44.934 -31.18,0 -57.77,-11.008 -77.94,-35.774 -24.77,-30.253 -26.6,-62.343 -26.6,-99.941 l 0,-151.301 63.27,0 0,-104.527 -238.4,0 0,104.527 63.26,0 0,280.598"
             inkscape:connector-curvature="0"
             id="path28"
             style="fill:#8a4182;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path
             d="m 3998.66,951.547 -111.87,0 0,118.293 111.87,0 0,-118.293 z m 0,-431.891 63.27,0 0,-104.527 -239.33,0 0,104.527 64.19,0 0,280.598 -63.27,0 0,104.527 175.14,0 0,-385.125"
             inkscape:connector-curvature="0"
             id="path30"
             style="fill:#8a4182;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path
             d="m 4159.12,800.254 -63.27,0 0,104.527 175.14,0 0,-69.687 c 29.35,54.101 84.36,80.699 144.87,80.699 53.19,0 105.45,-22.016 141.22,-60.527 40.34,-44.934 41.26,-88.032 41.26,-143.957 l 0,-191.653 63.27,0 0,-104.527 -238.4,0 0,104.527 63.26,0 0,158.637 c 0,30.262 0,61.434 -19.26,88.035 -20.17,26.582 -53.18,39.414 -86.19,39.414 -33.93,0 -68.77,-13.75 -88.94,-41.25 -21.09,-27.5 -21.09,-69.687 -21.09,-102.707 l 0,-142.129 63.26,0 0,-104.527 -238.4,0 0,104.527 63.27,0 0,280.598"
             inkscape:connector-curvature="0"
             id="path32"
             style="fill:#8a4182;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path
             d="m 5082.48,703.965 c -19.24,70.605 -81.6,115.547 -154.04,115.547 -66.04,0 -129.3,-51.348 -143.05,-115.547 l 297.09,0 z m 85.27,-144.883 c -38.51,-93.523 -129.27,-156.793 -231.05,-156.793 -143.07,0 -257.68,111.871 -257.68,255.836 0,144.883 109.12,261.328 254.91,261.328 67.87,0 135.72,-30.258 183.39,-78.863 48.62,-51.344 68.79,-113.695 68.79,-183.383 l -3.67,-39.434 -396.13,0 c 14.67,-67.863 77.03,-117.363 146.72,-117.363 48.59,0 90.76,18.328 118.28,58.672 l 116.44,0"
             inkscape:connector-curvature="0"
             id="path34"
             style="fill:#8a4182;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path
             d="m 690.895,850.703 90.75,0 22.543,31.035 0,243.122 -135.829,0 0,-243.141 22.536,-31.016"
             inkscape:connector-curvature="0"
             id="path36"
             style="fill:#8a4182;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path
             d="m 632.395,742.258 28.039,86.304 -22.551,31.04 -231.223,75.128 -41.976,-129.183 231.257,-75.137 36.454,11.848"
             inkscape:connector-curvature="0"
             id="path38"
             style="fill:#8a4182;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path
             d="m 717.449,653.105 -73.41,53.36 -36.488,-11.875 -142.903,-196.692 109.883,-79.828 142.918,196.703 0,38.332"
             inkscape:connector-curvature="0"
             id="path40"
             style="fill:#8a4182;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path
             d="m 828.52,706.465 -73.426,-53.34 0.011,-38.359 L 898.004,418.07 1007.9,497.898 864.973,694.609 828.52,706.465"
             inkscape:connector-curvature="0"
             id="path42"
             style="fill:#8a4182;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path
             d="m 812.086,828.586 28.055,-86.32 36.484,-11.836 231.225,75.117 -41.97,129.183 -231.239,-75.14 -22.555,-31.004"
             inkscape:connector-curvature="0"
             id="path44"
             style="fill:#8a4182;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path
             d="m 736.301,1335.88 c -323.047,0 -585.875,-262.78 -585.875,-585.782 0,-323.118 262.828,-585.977 585.875,-585.977 323.019,0 585.809,262.859 585.809,585.977 0,323.002 -262.79,585.782 -585.809,585.782 l 0,0 z m 0,-118.61 c 257.972,0 467.189,-209.13 467.189,-467.172 0,-258.129 -209.217,-467.348 -467.189,-467.348 -258.074,0 -467.254,209.219 -467.254,467.348 0,258.042 209.18,467.172 467.254,467.172"
             inkscape:connector-curvature="0"
             id="path46"
             style="fill:#8a4182;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path
             d="m 1091.13,619.883 -175.771,57.121 11.629,35.808 175.762,-57.121 -11.62,-35.808"
             inkscape:connector-curvature="0"
             id="path48"
             style="fill:#8a4182;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path
             d="M 866.957,902.074 836.5,924.199 945.121,1073.73 975.586,1051.61 866.957,902.074"
             inkscape:connector-curvature="0"
             id="path50"
             style="fill:#8a4182;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path
             d="M 607.465,903.445 498.855,1052.97 529.32,1075.1 637.93,925.566 607.465,903.445"
             inkscape:connector-curvature="0"
             id="path52"
             style="fill:#8a4182;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path
             d="m 380.688,622.129 -11.626,35.801 175.758,57.09 11.621,-35.801 -175.753,-57.09"
             inkscape:connector-curvature="0"
             id="path54"
             style="fill:#8a4182;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path
             d="m 716.289,376.59 37.6406,0 0,184.816 -37.6406,0 0,-184.816 z"
             inkscape:connector-curvature="0"
             id="path56"
             style="fill:#8a4182;fill-opacity:1;fill-rule:nonzero;stroke:none" /></g></g></g></g></svg>') no-repeat, none; -moz-background-size: 100%; -o-background-size: 100%; -webkit-background-size: 100%; background-size: 100%; display: block; float: left; width: 90px; height: 25px; } +.jasmine_html-reporter .banner .version { margin-left: 14px; position: relative; top: 6px; } +.jasmine_html-reporter .banner .duration { position: absolute; right: 14px; top: 6px; } +.jasmine_html-reporter #jasmine_content { position: fixed; right: 100%; } +.jasmine_html-reporter .version { color: #aaa; } +.jasmine_html-reporter .banner { margin-top: 14px; } +.jasmine_html-reporter .duration { color: #aaa; float: right; } +.jasmine_html-reporter .symbol-summary { overflow: hidden; *zoom: 1; margin: 14px 0; } +.jasmine_html-reporter .symbol-summary li { display: inline-block; height: 8px; width: 14px; font-size: 16px; } +.jasmine_html-reporter .symbol-summary li.passed { font-size: 14px; } +.jasmine_html-reporter .symbol-summary li.passed:before { color: #007069; content: "\02022"; } +.jasmine_html-reporter .symbol-summary li.failed { line-height: 9px; } +.jasmine_html-reporter .symbol-summary li.failed:before { color: #ca3a11; content: "\d7"; font-weight: bold; margin-left: -1px; } +.jasmine_html-reporter .symbol-summary li.disabled { font-size: 14px; } +.jasmine_html-reporter .symbol-summary li.disabled:before { color: #bababa; content: "\02022"; } +.jasmine_html-reporter .symbol-summary li.pending { line-height: 17px; } +.jasmine_html-reporter .symbol-summary li.pending:before { color: #ba9d37; content: "*"; } +.jasmine_html-reporter .symbol-summary li.empty { font-size: 14px; } +.jasmine_html-reporter .symbol-summary li.empty:before { color: #ba9d37; content: "\02022"; } +.jasmine_html-reporter .exceptions { color: #fff; float: right; margin-top: 5px; margin-right: 5px; } +.jasmine_html-reporter .bar { line-height: 28px; font-size: 14px; display: block; color: #eee; } +.jasmine_html-reporter .bar.failed { background-color: #ca3a11; } +.jasmine_html-reporter .bar.passed { background-color: #007069; } +.jasmine_html-reporter .bar.skipped { background-color: #bababa; } +.jasmine_html-reporter .bar.errored { background-color: #ca3a11; } +.jasmine_html-reporter .bar.menu { background-color: #fff; color: #aaa; } +.jasmine_html-reporter .bar.menu a { color: #333; } +.jasmine_html-reporter .bar a { color: white; } +.jasmine_html-reporter.spec-list .bar.menu.failure-list, .jasmine_html-reporter.spec-list .results .failures { display: none; } +.jasmine_html-reporter.failure-list .bar.menu.spec-list, .jasmine_html-reporter.failure-list .summary { display: none; } +.jasmine_html-reporter .running-alert { background-color: #666; } +.jasmine_html-reporter .results { margin-top: 14px; } +.jasmine_html-reporter.showDetails .summaryMenuItem { font-weight: normal; text-decoration: inherit; } +.jasmine_html-reporter.showDetails .summaryMenuItem:hover { text-decoration: underline; } +.jasmine_html-reporter.showDetails .detailsMenuItem { font-weight: bold; text-decoration: underline; } +.jasmine_html-reporter.showDetails .summary { display: none; } +.jasmine_html-reporter.showDetails #details { display: block; } +.jasmine_html-reporter .summaryMenuItem { font-weight: bold; text-decoration: underline; } +.jasmine_html-reporter .summary { margin-top: 14px; } +.jasmine_html-reporter .summary ul { list-style-type: none; margin-left: 14px; padding-top: 0; padding-left: 0; } +.jasmine_html-reporter .summary ul.suite { margin-top: 7px; margin-bottom: 7px; } +.jasmine_html-reporter .summary li.passed a { color: #007069; } +.jasmine_html-reporter .summary li.failed a { color: #ca3a11; } +.jasmine_html-reporter .summary li.empty a { color: #ba9d37; } +.jasmine_html-reporter .summary li.pending a { color: #ba9d37; } +.jasmine_html-reporter .description + .suite { margin-top: 0; } +.jasmine_html-reporter .suite { margin-top: 14px; } +.jasmine_html-reporter .suite a { color: #333; } +.jasmine_html-reporter .failures .spec-detail { margin-bottom: 28px; } +.jasmine_html-reporter .failures .spec-detail .description { background-color: #ca3a11; } +.jasmine_html-reporter .failures .spec-detail .description a { color: white; } +.jasmine_html-reporter .result-message { padding-top: 14px; color: #333; white-space: pre; } +.jasmine_html-reporter .result-message span.result { display: block; } +.jasmine_html-reporter .stack-trace { margin: 5px 0 0 0; max-height: 224px; overflow: auto; line-height: 18px; color: #666; border: 1px solid #ddd; background: white; white-space: pre; } Binary files /tmp/_YI7U5wCJI/qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/templates/wizards/ubuntu/html5-simple/tests/unit/third_party/jasmine/lib/jasmine-2.2.0/jasmine_favicon.png and /tmp/CL5Ra3qTQL/qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/templates/wizards/ubuntu/html5-simple/tests/unit/third_party/jasmine/lib/jasmine-2.2.0/jasmine_favicon.png differ diff -Nru qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/templates/wizards/ubuntu/html5-simple/tests/unit/third_party/jasmine/lib/jasmine-2.2.0/jasmine-html.js qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/templates/wizards/ubuntu/html5-simple/tests/unit/third_party/jasmine/lib/jasmine-2.2.0/jasmine-html.js --- qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/templates/wizards/ubuntu/html5-simple/tests/unit/third_party/jasmine/lib/jasmine-2.2.0/jasmine-html.js 1970-01-01 00:00:00.000000000 +0000 +++ qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/templates/wizards/ubuntu/html5-simple/tests/unit/third_party/jasmine/lib/jasmine-2.2.0/jasmine-html.js 2015-05-08 08:37:05.000000000 +0000 @@ -0,0 +1,416 @@ +/* +Copyright (c) 2008-2015 Pivotal Labs + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +*/ +jasmineRequire.html = function(j$) { + j$.ResultsNode = jasmineRequire.ResultsNode(); + j$.HtmlReporter = jasmineRequire.HtmlReporter(j$); + j$.QueryString = jasmineRequire.QueryString(); + j$.HtmlSpecFilter = jasmineRequire.HtmlSpecFilter(); +}; + +jasmineRequire.HtmlReporter = function(j$) { + + var noopTimer = { + start: function() {}, + elapsed: function() { return 0; } + }; + + function HtmlReporter(options) { + var env = options.env || {}, + getContainer = options.getContainer, + createElement = options.createElement, + createTextNode = options.createTextNode, + onRaiseExceptionsClick = options.onRaiseExceptionsClick || function() {}, + addToExistingQueryString = options.addToExistingQueryString || defaultQueryString, + timer = options.timer || noopTimer, + results = [], + specsExecuted = 0, + failureCount = 0, + pendingSpecCount = 0, + htmlReporterMain, + symbols, + failedSuites = []; + + this.initialize = function() { + clearPrior(); + htmlReporterMain = createDom('div', {className: 'jasmine_html-reporter'}, + createDom('div', {className: 'banner'}, + createDom('a', {className: 'title', href: 'http://jasmine.github.io/', target: '_blank'}), + createDom('span', {className: 'version'}, j$.version) + ), + createDom('ul', {className: 'symbol-summary'}), + createDom('div', {className: 'alert'}), + createDom('div', {className: 'results'}, + createDom('div', {className: 'failures'}) + ) + ); + getContainer().appendChild(htmlReporterMain); + + symbols = find('.symbol-summary'); + }; + + var totalSpecsDefined; + this.jasmineStarted = function(options) { + totalSpecsDefined = options.totalSpecsDefined || 0; + timer.start(); + }; + + var summary = createDom('div', {className: 'summary'}); + + var topResults = new j$.ResultsNode({}, '', null), + currentParent = topResults; + + this.suiteStarted = function(result) { + currentParent.addChild(result, 'suite'); + currentParent = currentParent.last(); + }; + + this.suiteDone = function(result) { + if (result.status == 'failed') { + failedSuites.push(result); + } + + if (currentParent == topResults) { + return; + } + + currentParent = currentParent.parent; + }; + + this.specStarted = function(result) { + currentParent.addChild(result, 'spec'); + }; + + var failures = []; + this.specDone = function(result) { + if(noExpectations(result) && typeof console !== 'undefined' && typeof console.error !== 'undefined') { + console.error('Spec \'' + result.fullName + '\' has no expectations.'); + } + + if (result.status != 'disabled') { + specsExecuted++; + } + + symbols.appendChild(createDom('li', { + className: noExpectations(result) ? 'empty' : result.status, + id: 'spec_' + result.id, + title: result.fullName + } + )); + + if (result.status == 'failed') { + failureCount++; + + var failure = + createDom('div', {className: 'spec-detail failed'}, + createDom('div', {className: 'description'}, + createDom('a', {title: result.fullName, href: specHref(result)}, result.fullName) + ), + createDom('div', {className: 'messages'}) + ); + var messages = failure.childNodes[1]; + + for (var i = 0; i < result.failedExpectations.length; i++) { + var expectation = result.failedExpectations[i]; + messages.appendChild(createDom('div', {className: 'result-message'}, expectation.message)); + messages.appendChild(createDom('div', {className: 'stack-trace'}, expectation.stack)); + } + + failures.push(failure); + } + + if (result.status == 'pending') { + pendingSpecCount++; + } + }; + + this.jasmineDone = function() { + var banner = find('.banner'); + banner.appendChild(createDom('span', {className: 'duration'}, 'finished in ' + timer.elapsed() / 1000 + 's')); + + var alert = find('.alert'); + + alert.appendChild(createDom('span', { className: 'exceptions' }, + createDom('label', { className: 'label', 'for': 'raise-exceptions' }, 'raise exceptions'), + createDom('input', { + className: 'raise', + id: 'raise-exceptions', + type: 'checkbox' + }) + )); + var checkbox = find('#raise-exceptions'); + + checkbox.checked = !env.catchingExceptions(); + checkbox.onclick = onRaiseExceptionsClick; + + if (specsExecuted < totalSpecsDefined) { + var skippedMessage = 'Ran ' + specsExecuted + ' of ' + totalSpecsDefined + ' specs - run all'; + alert.appendChild( + createDom('span', {className: 'bar skipped'}, + createDom('a', {href: '?', title: 'Run all specs'}, skippedMessage) + ) + ); + } + var statusBarMessage = ''; + var statusBarClassName = 'bar '; + + if (totalSpecsDefined > 0) { + statusBarMessage += pluralize('spec', specsExecuted) + ', ' + pluralize('failure', failureCount); + if (pendingSpecCount) { statusBarMessage += ', ' + pluralize('pending spec', pendingSpecCount); } + statusBarClassName += (failureCount > 0) ? 'failed' : 'passed'; + } else { + statusBarClassName += 'skipped'; + statusBarMessage += 'No specs found'; + } + + alert.appendChild(createDom('span', {className: statusBarClassName}, statusBarMessage)); + + for(i = 0; i < failedSuites.length; i++) { + var failedSuite = failedSuites[i]; + for(var j = 0; j < failedSuite.failedExpectations.length; j++) { + var errorBarMessage = 'AfterAll ' + failedSuite.failedExpectations[j].message; + var errorBarClassName = 'bar errored'; + alert.appendChild(createDom('span', {className: errorBarClassName}, errorBarMessage)); + } + } + + var results = find('.results'); + results.appendChild(summary); + + summaryList(topResults, summary); + + function summaryList(resultsTree, domParent) { + var specListNode; + for (var i = 0; i < resultsTree.children.length; i++) { + var resultNode = resultsTree.children[i]; + if (resultNode.type == 'suite') { + var suiteListNode = createDom('ul', {className: 'suite', id: 'suite-' + resultNode.result.id}, + createDom('li', {className: 'suite-detail'}, + createDom('a', {href: specHref(resultNode.result)}, resultNode.result.description) + ) + ); + + summaryList(resultNode, suiteListNode); + domParent.appendChild(suiteListNode); + } + if (resultNode.type == 'spec') { + if (domParent.getAttribute('class') != 'specs') { + specListNode = createDom('ul', {className: 'specs'}); + domParent.appendChild(specListNode); + } + var specDescription = resultNode.result.description; + if(noExpectations(resultNode.result)) { + specDescription = 'SPEC HAS NO EXPECTATIONS ' + specDescription; + } + if(resultNode.result.status === 'pending' && resultNode.result.pendingReason !== '') { + specDescription = specDescription + ' PENDING WITH MESSAGE: ' + resultNode.result.pendingReason; + } + specListNode.appendChild( + createDom('li', { + className: resultNode.result.status, + id: 'spec-' + resultNode.result.id + }, + createDom('a', {href: specHref(resultNode.result)}, specDescription) + ) + ); + } + } + } + + if (failures.length) { + alert.appendChild( + createDom('span', {className: 'menu bar spec-list'}, + createDom('span', {}, 'Spec List | '), + createDom('a', {className: 'failures-menu', href: '#'}, 'Failures'))); + alert.appendChild( + createDom('span', {className: 'menu bar failure-list'}, + createDom('a', {className: 'spec-list-menu', href: '#'}, 'Spec List'), + createDom('span', {}, ' | Failures '))); + + find('.failures-menu').onclick = function() { + setMenuModeTo('failure-list'); + }; + find('.spec-list-menu').onclick = function() { + setMenuModeTo('spec-list'); + }; + + setMenuModeTo('failure-list'); + + var failureNode = find('.failures'); + for (var i = 0; i < failures.length; i++) { + failureNode.appendChild(failures[i]); + } + } + }; + + return this; + + function find(selector) { + return getContainer().querySelector('.jasmine_html-reporter ' + selector); + } + + function clearPrior() { + // return the reporter + var oldReporter = find(''); + + if(oldReporter) { + getContainer().removeChild(oldReporter); + } + } + + function createDom(type, attrs, childrenVarArgs) { + var el = createElement(type); + + for (var i = 2; i < arguments.length; i++) { + var child = arguments[i]; + + if (typeof child === 'string') { + el.appendChild(createTextNode(child)); + } else { + if (child) { + el.appendChild(child); + } + } + } + + for (var attr in attrs) { + if (attr == 'className') { + el[attr] = attrs[attr]; + } else { + el.setAttribute(attr, attrs[attr]); + } + } + + return el; + } + + function pluralize(singular, count) { + var word = (count == 1 ? singular : singular + 's'); + + return '' + count + ' ' + word; + } + + function specHref(result) { + return addToExistingQueryString('spec', result.fullName); + } + + function defaultQueryString(key, value) { + return '?' + key + '=' + value; + } + + function setMenuModeTo(mode) { + htmlReporterMain.setAttribute('class', 'jasmine_html-reporter ' + mode); + } + + function noExpectations(result) { + return (result.failedExpectations.length + result.passedExpectations.length) === 0 && + result.status === 'passed'; + } + } + + return HtmlReporter; +}; + +jasmineRequire.HtmlSpecFilter = function() { + function HtmlSpecFilter(options) { + var filterString = options && options.filterString() && options.filterString().replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&'); + var filterPattern = new RegExp(filterString); + + this.matches = function(specName) { + return filterPattern.test(specName); + }; + } + + return HtmlSpecFilter; +}; + +jasmineRequire.ResultsNode = function() { + function ResultsNode(result, type, parent) { + this.result = result; + this.type = type; + this.parent = parent; + + this.children = []; + + this.addChild = function(result, type) { + this.children.push(new ResultsNode(result, type, this)); + }; + + this.last = function() { + return this.children[this.children.length - 1]; + }; + } + + return ResultsNode; +}; + +jasmineRequire.QueryString = function() { + function QueryString(options) { + + this.navigateWithNewParam = function(key, value) { + options.getWindowLocation().search = this.fullStringWithNewParam(key, value); + }; + + this.fullStringWithNewParam = function(key, value) { + var paramMap = queryStringToParamMap(); + paramMap[key] = value; + return toQueryString(paramMap); + }; + + this.getParam = function(key) { + return queryStringToParamMap()[key]; + }; + + return this; + + function toQueryString(paramMap) { + var qStrPairs = []; + for (var prop in paramMap) { + qStrPairs.push(encodeURIComponent(prop) + '=' + encodeURIComponent(paramMap[prop])); + } + return '?' + qStrPairs.join('&'); + } + + function queryStringToParamMap() { + var paramStr = options.getWindowLocation().search.substring(1), + params = [], + paramMap = {}; + + if (paramStr.length > 0) { + params = paramStr.split('&'); + for (var i = 0; i < params.length; i++) { + var p = params[i].split('='); + var value = decodeURIComponent(p[1]); + if (value === 'true' || value === 'false') { + value = JSON.parse(value); + } + paramMap[decodeURIComponent(p[0])] = value; + } + } + + return paramMap; + } + + } + + return QueryString; +}; diff -Nru qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/templates/wizards/ubuntu/html5-simple/tests/unit/third_party/jasmine/lib/jasmine-2.2.0/jasmine.js qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/templates/wizards/ubuntu/html5-simple/tests/unit/third_party/jasmine/lib/jasmine-2.2.0/jasmine.js --- qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/templates/wizards/ubuntu/html5-simple/tests/unit/third_party/jasmine/lib/jasmine-2.2.0/jasmine.js 1970-01-01 00:00:00.000000000 +0000 +++ qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/templates/wizards/ubuntu/html5-simple/tests/unit/third_party/jasmine/lib/jasmine-2.2.0/jasmine.js 2015-05-08 08:37:05.000000000 +0000 @@ -0,0 +1,3048 @@ +/* +Copyright (c) 2008-2015 Pivotal Labs + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +*/ +var getJasmineRequireObj = (function (jasmineGlobal) { + var jasmineRequire; + + if (typeof module !== 'undefined' && module.exports) { + jasmineGlobal = global; + jasmineRequire = exports; + } else { + if (typeof window !== 'undefined' && typeof window.toString === 'function' && window.toString() === '[object GjsGlobal]') { + jasmineGlobal = window; + } + jasmineRequire = jasmineGlobal.jasmineRequire = jasmineGlobal.jasmineRequire || {}; + } + + function getJasmineRequire() { + return jasmineRequire; + } + + getJasmineRequire().core = function(jRequire) { + var j$ = {}; + + jRequire.base(j$, jasmineGlobal); + j$.util = jRequire.util(); + j$.Any = jRequire.Any(); + j$.Anything = jRequire.Anything(j$); + j$.CallTracker = jRequire.CallTracker(); + j$.MockDate = jRequire.MockDate(); + j$.Clock = jRequire.Clock(); + j$.DelayedFunctionScheduler = jRequire.DelayedFunctionScheduler(); + j$.Env = jRequire.Env(j$); + j$.ExceptionFormatter = jRequire.ExceptionFormatter(); + j$.Expectation = jRequire.Expectation(); + j$.buildExpectationResult = jRequire.buildExpectationResult(); + j$.JsApiReporter = jRequire.JsApiReporter(); + j$.matchersUtil = jRequire.matchersUtil(j$); + j$.ObjectContaining = jRequire.ObjectContaining(j$); + j$.ArrayContaining = jRequire.ArrayContaining(j$); + j$.pp = jRequire.pp(j$); + j$.QueueRunner = jRequire.QueueRunner(j$); + j$.ReportDispatcher = jRequire.ReportDispatcher(); + j$.Spec = jRequire.Spec(j$); + j$.SpyRegistry = jRequire.SpyRegistry(j$); + j$.SpyStrategy = jRequire.SpyStrategy(); + j$.StringMatching = jRequire.StringMatching(j$); + j$.Suite = jRequire.Suite(); + j$.Timer = jRequire.Timer(); + j$.version = jRequire.version(); + + j$.matchers = jRequire.requireMatchers(jRequire, j$); + + return j$; + }; + + return getJasmineRequire; +})(this); + +getJasmineRequireObj().requireMatchers = function(jRequire, j$) { + var availableMatchers = [ + 'toBe', + 'toBeCloseTo', + 'toBeDefined', + 'toBeFalsy', + 'toBeGreaterThan', + 'toBeLessThan', + 'toBeNaN', + 'toBeNull', + 'toBeTruthy', + 'toBeUndefined', + 'toContain', + 'toEqual', + 'toHaveBeenCalled', + 'toHaveBeenCalledWith', + 'toMatch', + 'toThrow', + 'toThrowError' + ], + matchers = {}; + + for (var i = 0; i < availableMatchers.length; i++) { + var name = availableMatchers[i]; + matchers[name] = jRequire[name](j$); + } + + return matchers; +}; + +getJasmineRequireObj().base = function(j$, jasmineGlobal) { + j$.unimplementedMethod_ = function() { + throw new Error('unimplemented method'); + }; + + j$.MAX_PRETTY_PRINT_DEPTH = 40; + j$.MAX_PRETTY_PRINT_ARRAY_LENGTH = 100; + j$.DEFAULT_TIMEOUT_INTERVAL = 5000; + + j$.getGlobal = function() { + return jasmineGlobal; + }; + + j$.getEnv = function(options) { + var env = j$.currentEnv_ = j$.currentEnv_ || new j$.Env(options); + //jasmine. singletons in here (setTimeout blah blah). + return env; + }; + + j$.isArray_ = function(value) { + return j$.isA_('Array', value); + }; + + j$.isString_ = function(value) { + return j$.isA_('String', value); + }; + + j$.isNumber_ = function(value) { + return j$.isA_('Number', value); + }; + + j$.isA_ = function(typeName, value) { + return Object.prototype.toString.apply(value) === '[object ' + typeName + ']'; + }; + + j$.isDomNode = function(obj) { + return obj.nodeType > 0; + }; + + j$.fnNameFor = function(func) { + return func.name || func.toString().match(/^\s*function\s*(\w*)\s*\(/)[1]; + }; + + j$.any = function(clazz) { + return new j$.Any(clazz); + }; + + j$.anything = function() { + return new j$.Anything(); + }; + + j$.objectContaining = function(sample) { + return new j$.ObjectContaining(sample); + }; + + j$.stringMatching = function(expected) { + return new j$.StringMatching(expected); + }; + + j$.arrayContaining = function(sample) { + return new j$.ArrayContaining(sample); + }; + + j$.createSpy = function(name, originalFn) { + + var spyStrategy = new j$.SpyStrategy({ + name: name, + fn: originalFn, + getSpy: function() { return spy; } + }), + callTracker = new j$.CallTracker(), + spy = function() { + var callData = { + object: this, + args: Array.prototype.slice.apply(arguments) + }; + + callTracker.track(callData); + var returnValue = spyStrategy.exec.apply(this, arguments); + callData.returnValue = returnValue; + + return returnValue; + }; + + for (var prop in originalFn) { + if (prop === 'and' || prop === 'calls') { + throw new Error('Jasmine spies would overwrite the \'and\' and \'calls\' properties on the object being spied upon'); + } + + spy[prop] = originalFn[prop]; + } + + spy.and = spyStrategy; + spy.calls = callTracker; + + return spy; + }; + + j$.isSpy = function(putativeSpy) { + if (!putativeSpy) { + return false; + } + return putativeSpy.and instanceof j$.SpyStrategy && + putativeSpy.calls instanceof j$.CallTracker; + }; + + j$.createSpyObj = function(baseName, methodNames) { + if (j$.isArray_(baseName) && j$.util.isUndefined(methodNames)) { + methodNames = baseName; + baseName = 'unknown'; + } + + if (!j$.isArray_(methodNames) || methodNames.length === 0) { + throw 'createSpyObj requires a non-empty array of method names to create spies for'; + } + var obj = {}; + for (var i = 0; i < methodNames.length; i++) { + obj[methodNames[i]] = j$.createSpy(baseName + '.' + methodNames[i]); + } + return obj; + }; +}; + +getJasmineRequireObj().util = function() { + + var util = {}; + + util.inherit = function(childClass, parentClass) { + var Subclass = function() { + }; + Subclass.prototype = parentClass.prototype; + childClass.prototype = new Subclass(); + }; + + util.htmlEscape = function(str) { + if (!str) { + return str; + } + return str.replace(/&/g, '&') + .replace(//g, '>'); + }; + + util.argsToArray = function(args) { + var arrayOfArgs = []; + for (var i = 0; i < args.length; i++) { + arrayOfArgs.push(args[i]); + } + return arrayOfArgs; + }; + + util.isUndefined = function(obj) { + return obj === void 0; + }; + + util.arrayContains = function(array, search) { + var i = array.length; + while (i--) { + if (array[i] === search) { + return true; + } + } + return false; + }; + + util.clone = function(obj) { + if (Object.prototype.toString.apply(obj) === '[object Array]') { + return obj.slice(); + } + + var cloned = {}; + for (var prop in obj) { + if (obj.hasOwnProperty(prop)) { + cloned[prop] = obj[prop]; + } + } + + return cloned; + }; + + return util; +}; + +getJasmineRequireObj().Spec = function(j$) { + function Spec(attrs) { + this.expectationFactory = attrs.expectationFactory; + this.resultCallback = attrs.resultCallback || function() {}; + this.id = attrs.id; + this.description = attrs.description || ''; + this.queueableFn = attrs.queueableFn; + this.beforeAndAfterFns = attrs.beforeAndAfterFns || function() { return {befores: [], afters: []}; }; + this.userContext = attrs.userContext || function() { return {}; }; + this.onStart = attrs.onStart || function() {}; + this.getSpecName = attrs.getSpecName || function() { return ''; }; + this.expectationResultFactory = attrs.expectationResultFactory || function() { }; + this.queueRunnerFactory = attrs.queueRunnerFactory || function() {}; + this.catchingExceptions = attrs.catchingExceptions || function() { return true; }; + + if (!this.queueableFn.fn) { + this.pend(); + } + + this.result = { + id: this.id, + description: this.description, + fullName: this.getFullName(), + failedExpectations: [], + passedExpectations: [], + pendingReason: '' + }; + } + + Spec.prototype.addExpectationResult = function(passed, data) { + var expectationResult = this.expectationResultFactory(data); + if (passed) { + this.result.passedExpectations.push(expectationResult); + } else { + this.result.failedExpectations.push(expectationResult); + } + }; + + Spec.prototype.expect = function(actual) { + return this.expectationFactory(actual, this); + }; + + Spec.prototype.execute = function(onComplete) { + var self = this; + + this.onStart(this); + + if (this.markedPending || this.disabled) { + complete(); + return; + } + + var fns = this.beforeAndAfterFns(); + var allFns = fns.befores.concat(this.queueableFn).concat(fns.afters); + + this.queueRunnerFactory({ + queueableFns: allFns, + onException: function() { self.onException.apply(self, arguments); }, + onComplete: complete, + userContext: this.userContext() + }); + + function complete() { + self.result.status = self.status(); + self.resultCallback(self.result); + + if (onComplete) { + onComplete(); + } + } + }; + + Spec.prototype.onException = function onException(e) { + if (Spec.isPendingSpecException(e)) { + this.pend(extractCustomPendingMessage(e)); + return; + } + + this.addExpectationResult(false, { + matcherName: '', + passed: false, + expected: '', + actual: '', + error: e + }); + }; + + Spec.prototype.disable = function() { + this.disabled = true; + }; + + Spec.prototype.pend = function(message) { + this.markedPending = true; + if (message) { + this.result.pendingReason = message; + } + }; + + Spec.prototype.status = function() { + if (this.disabled) { + return 'disabled'; + } + + if (this.markedPending) { + return 'pending'; + } + + if (this.result.failedExpectations.length > 0) { + return 'failed'; + } else { + return 'passed'; + } + }; + + Spec.prototype.isExecutable = function() { + return !this.disabled && !this.markedPending; + }; + + Spec.prototype.getFullName = function() { + return this.getSpecName(this); + }; + + var extractCustomPendingMessage = function(e) { + var fullMessage = e.toString(), + boilerplateStart = fullMessage.indexOf(Spec.pendingSpecExceptionMessage), + boilerplateEnd = boilerplateStart + Spec.pendingSpecExceptionMessage.length; + + return fullMessage.substr(boilerplateEnd); + }; + + Spec.pendingSpecExceptionMessage = '=> marked Pending'; + + Spec.isPendingSpecException = function(e) { + return !!(e && e.toString && e.toString().indexOf(Spec.pendingSpecExceptionMessage) !== -1); + }; + + return Spec; +}; + +if (typeof window == void 0 && typeof exports == 'object') { + exports.Spec = jasmineRequire.Spec; +} + +getJasmineRequireObj().Env = function(j$) { + function Env(options) { + options = options || {}; + + var self = this; + var global = options.global || j$.getGlobal(); + + var totalSpecsDefined = 0; + + var catchExceptions = true; + + var realSetTimeout = j$.getGlobal().setTimeout; + var realClearTimeout = j$.getGlobal().clearTimeout; + this.clock = new j$.Clock(global, new j$.DelayedFunctionScheduler(), new j$.MockDate(global)); + + var runnableLookupTable = {}; + var runnableResources = {}; + + var currentSpec = null; + var currentlyExecutingSuites = []; + var currentDeclarationSuite = null; + + var currentSuite = function() { + return currentlyExecutingSuites[currentlyExecutingSuites.length - 1]; + }; + + var currentRunnable = function() { + return currentSpec || currentSuite(); + }; + + var reporter = new j$.ReportDispatcher([ + 'jasmineStarted', + 'jasmineDone', + 'suiteStarted', + 'suiteDone', + 'specStarted', + 'specDone' + ]); + + this.specFilter = function() { + return true; + }; + + this.addCustomEqualityTester = function(tester) { + if(!currentRunnable()) { + throw new Error('Custom Equalities must be added in a before function or a spec'); + } + runnableResources[currentRunnable().id].customEqualityTesters.push(tester); + }; + + this.addMatchers = function(matchersToAdd) { + if(!currentRunnable()) { + throw new Error('Matchers must be added in a before function or a spec'); + } + var customMatchers = runnableResources[currentRunnable().id].customMatchers; + for (var matcherName in matchersToAdd) { + customMatchers[matcherName] = matchersToAdd[matcherName]; + } + }; + + j$.Expectation.addCoreMatchers(j$.matchers); + + var nextSpecId = 0; + var getNextSpecId = function() { + return 'spec' + nextSpecId++; + }; + + var nextSuiteId = 0; + var getNextSuiteId = function() { + return 'suite' + nextSuiteId++; + }; + + var expectationFactory = function(actual, spec) { + return j$.Expectation.Factory({ + util: j$.matchersUtil, + customEqualityTesters: runnableResources[spec.id].customEqualityTesters, + customMatchers: runnableResources[spec.id].customMatchers, + actual: actual, + addExpectationResult: addExpectationResult + }); + + function addExpectationResult(passed, result) { + return spec.addExpectationResult(passed, result); + } + }; + + var defaultResourcesForRunnable = function(id, parentRunnableId) { + var resources = {spies: [], customEqualityTesters: [], customMatchers: {}}; + + if(runnableResources[parentRunnableId]){ + resources.customEqualityTesters = j$.util.clone(runnableResources[parentRunnableId].customEqualityTesters); + resources.customMatchers = j$.util.clone(runnableResources[parentRunnableId].customMatchers); + } + + runnableResources[id] = resources; + }; + + var clearResourcesForRunnable = function(id) { + spyRegistry.clearSpies(); + delete runnableResources[id]; + }; + + var beforeAndAfterFns = function(suite, runnablesExplictlySet) { + return function() { + var befores = [], + afters = [], + beforeAlls = [], + afterAlls = []; + + while(suite) { + befores = befores.concat(suite.beforeFns); + afters = afters.concat(suite.afterFns); + + if (runnablesExplictlySet()) { + beforeAlls = beforeAlls.concat(suite.beforeAllFns); + afterAlls = afterAlls.concat(suite.afterAllFns); + } + + suite = suite.parentSuite; + } + return { + befores: beforeAlls.reverse().concat(befores.reverse()), + afters: afters.concat(afterAlls) + }; + }; + }; + + var getSpecName = function(spec, suite) { + return suite.getFullName() + ' ' + spec.description; + }; + + // TODO: we may just be able to pass in the fn instead of wrapping here + var buildExpectationResult = j$.buildExpectationResult, + exceptionFormatter = new j$.ExceptionFormatter(), + expectationResultFactory = function(attrs) { + attrs.messageFormatter = exceptionFormatter.message; + attrs.stackFormatter = exceptionFormatter.stack; + + return buildExpectationResult(attrs); + }; + + // TODO: fix this naming, and here's where the value comes in + this.catchExceptions = function(value) { + catchExceptions = !!value; + return catchExceptions; + }; + + this.catchingExceptions = function() { + return catchExceptions; + }; + + var maximumSpecCallbackDepth = 20; + var currentSpecCallbackDepth = 0; + + function clearStack(fn) { + currentSpecCallbackDepth++; + if (currentSpecCallbackDepth >= maximumSpecCallbackDepth) { + currentSpecCallbackDepth = 0; + realSetTimeout(fn, 0); + } else { + fn(); + } + } + + var catchException = function(e) { + return j$.Spec.isPendingSpecException(e) || catchExceptions; + }; + + var queueRunnerFactory = function(options) { + options.catchException = catchException; + options.clearStack = options.clearStack || clearStack; + options.timer = {setTimeout: realSetTimeout, clearTimeout: realClearTimeout}; + options.fail = self.fail; + + new j$.QueueRunner(options).execute(); + }; + + var topSuite = new j$.Suite({ + env: this, + id: getNextSuiteId(), + description: 'Jasmine__TopLevel__Suite', + queueRunner: queueRunnerFactory + }); + runnableLookupTable[topSuite.id] = topSuite; + defaultResourcesForRunnable(topSuite.id); + currentDeclarationSuite = topSuite; + + this.topSuite = function() { + return topSuite; + }; + + this.execute = function(runnablesToRun) { + if(runnablesToRun) { + runnablesExplictlySet = true; + } else if (focusedRunnables.length) { + runnablesExplictlySet = true; + runnablesToRun = focusedRunnables; + } else { + runnablesToRun = [topSuite.id]; + } + + var allFns = []; + for(var i = 0; i < runnablesToRun.length; i++) { + var runnable = runnableLookupTable[runnablesToRun[i]]; + allFns.push((function(runnable) { return { fn: function(done) { runnable.execute(done); } }; })(runnable)); + } + + reporter.jasmineStarted({ + totalSpecsDefined: totalSpecsDefined + }); + + queueRunnerFactory({queueableFns: allFns, onComplete: reporter.jasmineDone}); + }; + + this.addReporter = function(reporterToAdd) { + reporter.addReporter(reporterToAdd); + }; + + var spyRegistry = new j$.SpyRegistry({currentSpies: function() { + if(!currentRunnable()) { + throw new Error('Spies must be created in a before function or a spec'); + } + return runnableResources[currentRunnable().id].spies; + }}); + + this.spyOn = function() { + return spyRegistry.spyOn.apply(spyRegistry, arguments); + }; + + var suiteFactory = function(description) { + var suite = new j$.Suite({ + env: self, + id: getNextSuiteId(), + description: description, + parentSuite: currentDeclarationSuite, + queueRunner: queueRunnerFactory, + onStart: suiteStarted, + expectationFactory: expectationFactory, + expectationResultFactory: expectationResultFactory, + runnablesExplictlySetGetter: runnablesExplictlySetGetter, + resultCallback: function(attrs) { + if (!suite.disabled) { + clearResourcesForRunnable(suite.id); + } + currentlyExecutingSuites.pop(); + reporter.suiteDone(attrs); + } + }); + + runnableLookupTable[suite.id] = suite; + return suite; + + function suiteStarted(suite) { + currentlyExecutingSuites.push(suite); + defaultResourcesForRunnable(suite.id, suite.parentSuite.id); + reporter.suiteStarted(suite.result); + } + }; + + this.describe = function(description, specDefinitions) { + var suite = suiteFactory(description); + addSpecsToSuite(suite, specDefinitions); + return suite; + }; + + this.xdescribe = function(description, specDefinitions) { + var suite = this.describe(description, specDefinitions); + suite.disable(); + return suite; + }; + + var focusedRunnables = []; + + this.fdescribe = function(description, specDefinitions) { + var suite = suiteFactory(description); + suite.isFocused = true; + + focusedRunnables.push(suite.id); + unfocusAncestor(); + addSpecsToSuite(suite, specDefinitions); + + return suite; + }; + + function addSpecsToSuite(suite, specDefinitions) { + var parentSuite = currentDeclarationSuite; + parentSuite.addChild(suite); + currentDeclarationSuite = suite; + + var declarationError = null; + try { + specDefinitions.call(suite); + } catch (e) { + declarationError = e; + } + + if (declarationError) { + self.it('encountered a declaration exception', function() { + throw declarationError; + }); + } + + currentDeclarationSuite = parentSuite; + } + + function findFocusedAncestor(suite) { + while (suite) { + if (suite.isFocused) { + return suite.id; + } + suite = suite.parentSuite; + } + + return null; + } + + function unfocusAncestor() { + var focusedAncestor = findFocusedAncestor(currentDeclarationSuite); + if (focusedAncestor) { + for (var i = 0; i < focusedRunnables.length; i++) { + if (focusedRunnables[i] === focusedAncestor) { + focusedRunnables.splice(i, 1); + break; + } + } + } + } + + var runnablesExplictlySet = false; + + var runnablesExplictlySetGetter = function(){ + return runnablesExplictlySet; + }; + + var specFactory = function(description, fn, suite, timeout) { + totalSpecsDefined++; + var spec = new j$.Spec({ + id: getNextSpecId(), + beforeAndAfterFns: beforeAndAfterFns(suite, runnablesExplictlySetGetter), + expectationFactory: expectationFactory, + resultCallback: specResultCallback, + getSpecName: function(spec) { + return getSpecName(spec, suite); + }, + onStart: specStarted, + description: description, + expectationResultFactory: expectationResultFactory, + queueRunnerFactory: queueRunnerFactory, + userContext: function() { return suite.clonedSharedUserContext(); }, + queueableFn: { + fn: fn, + timeout: function() { return timeout || j$.DEFAULT_TIMEOUT_INTERVAL; } + } + }); + + runnableLookupTable[spec.id] = spec; + + if (!self.specFilter(spec)) { + spec.disable(); + } + + return spec; + + function specResultCallback(result) { + clearResourcesForRunnable(spec.id); + currentSpec = null; + reporter.specDone(result); + } + + function specStarted(spec) { + currentSpec = spec; + defaultResourcesForRunnable(spec.id, suite.id); + reporter.specStarted(spec.result); + } + }; + + this.it = function(description, fn, timeout) { + var spec = specFactory(description, fn, currentDeclarationSuite, timeout); + currentDeclarationSuite.addChild(spec); + return spec; + }; + + this.xit = function() { + var spec = this.it.apply(this, arguments); + spec.pend(); + return spec; + }; + + this.fit = function(){ + var spec = this.it.apply(this, arguments); + + focusedRunnables.push(spec.id); + unfocusAncestor(); + return spec; + }; + + this.expect = function(actual) { + if (!currentRunnable()) { + throw new Error('\'expect\' was used when there was no current spec, this could be because an asynchronous test timed out'); + } + + return currentRunnable().expect(actual); + }; + + this.beforeEach = function(beforeEachFunction, timeout) { + currentDeclarationSuite.beforeEach({ + fn: beforeEachFunction, + timeout: function() { return timeout || j$.DEFAULT_TIMEOUT_INTERVAL; } + }); + }; + + this.beforeAll = function(beforeAllFunction, timeout) { + currentDeclarationSuite.beforeAll({ + fn: beforeAllFunction, + timeout: function() { return timeout || j$.DEFAULT_TIMEOUT_INTERVAL; } + }); + }; + + this.afterEach = function(afterEachFunction, timeout) { + currentDeclarationSuite.afterEach({ + fn: afterEachFunction, + timeout: function() { return timeout || j$.DEFAULT_TIMEOUT_INTERVAL; } + }); + }; + + this.afterAll = function(afterAllFunction, timeout) { + currentDeclarationSuite.afterAll({ + fn: afterAllFunction, + timeout: function() { return timeout || j$.DEFAULT_TIMEOUT_INTERVAL; } + }); + }; + + this.pending = function(message) { + var fullMessage = j$.Spec.pendingSpecExceptionMessage; + if(message) { + fullMessage += message; + } + throw fullMessage; + }; + + this.fail = function(error) { + var message = 'Failed'; + if (error) { + message += ': '; + message += error.message || error; + } + + currentRunnable().addExpectationResult(false, { + matcherName: '', + passed: false, + expected: '', + actual: '', + message: message, + error: error && error.message ? error : null + }); + }; + } + + return Env; +}; + +getJasmineRequireObj().JsApiReporter = function() { + + var noopTimer = { + start: function(){}, + elapsed: function(){ return 0; } + }; + + function JsApiReporter(options) { + var timer = options.timer || noopTimer, + status = 'loaded'; + + this.started = false; + this.finished = false; + + this.jasmineStarted = function() { + this.started = true; + status = 'started'; + timer.start(); + }; + + var executionTime; + + this.jasmineDone = function() { + this.finished = true; + executionTime = timer.elapsed(); + status = 'done'; + }; + + this.status = function() { + return status; + }; + + var suites = [], + suites_hash = {}; + + this.suiteStarted = function(result) { + suites_hash[result.id] = result; + }; + + this.suiteDone = function(result) { + storeSuite(result); + }; + + this.suiteResults = function(index, length) { + return suites.slice(index, index + length); + }; + + function storeSuite(result) { + suites.push(result); + suites_hash[result.id] = result; + } + + this.suites = function() { + return suites_hash; + }; + + var specs = []; + + this.specDone = function(result) { + specs.push(result); + }; + + this.specResults = function(index, length) { + return specs.slice(index, index + length); + }; + + this.specs = function() { + return specs; + }; + + this.executionTime = function() { + return executionTime; + }; + + } + + return JsApiReporter; +}; + +getJasmineRequireObj().CallTracker = function() { + + function CallTracker() { + var calls = []; + + this.track = function(context) { + calls.push(context); + }; + + this.any = function() { + return !!calls.length; + }; + + this.count = function() { + return calls.length; + }; + + this.argsFor = function(index) { + var call = calls[index]; + return call ? call.args : []; + }; + + this.all = function() { + return calls; + }; + + this.allArgs = function() { + var callArgs = []; + for(var i = 0; i < calls.length; i++){ + callArgs.push(calls[i].args); + } + + return callArgs; + }; + + this.first = function() { + return calls[0]; + }; + + this.mostRecent = function() { + return calls[calls.length - 1]; + }; + + this.reset = function() { + calls = []; + }; + } + + return CallTracker; +}; + +getJasmineRequireObj().Clock = function() { + function Clock(global, delayedFunctionScheduler, mockDate) { + var self = this, + realTimingFunctions = { + setTimeout: global.setTimeout, + clearTimeout: global.clearTimeout, + setInterval: global.setInterval, + clearInterval: global.clearInterval + }, + fakeTimingFunctions = { + setTimeout: setTimeout, + clearTimeout: clearTimeout, + setInterval: setInterval, + clearInterval: clearInterval + }, + installed = false, + timer; + + + self.install = function() { + replace(global, fakeTimingFunctions); + timer = fakeTimingFunctions; + installed = true; + + return self; + }; + + self.uninstall = function() { + delayedFunctionScheduler.reset(); + mockDate.uninstall(); + replace(global, realTimingFunctions); + + timer = realTimingFunctions; + installed = false; + }; + + self.mockDate = function(initialDate) { + mockDate.install(initialDate); + }; + + self.setTimeout = function(fn, delay, params) { + if (legacyIE()) { + if (arguments.length > 2) { + throw new Error('IE < 9 cannot support extra params to setTimeout without a polyfill'); + } + return timer.setTimeout(fn, delay); + } + return Function.prototype.apply.apply(timer.setTimeout, [global, arguments]); + }; + + self.setInterval = function(fn, delay, params) { + if (legacyIE()) { + if (arguments.length > 2) { + throw new Error('IE < 9 cannot support extra params to setInterval without a polyfill'); + } + return timer.setInterval(fn, delay); + } + return Function.prototype.apply.apply(timer.setInterval, [global, arguments]); + }; + + self.clearTimeout = function(id) { + return Function.prototype.call.apply(timer.clearTimeout, [global, id]); + }; + + self.clearInterval = function(id) { + return Function.prototype.call.apply(timer.clearInterval, [global, id]); + }; + + self.tick = function(millis) { + if (installed) { + mockDate.tick(millis); + delayedFunctionScheduler.tick(millis); + } else { + throw new Error('Mock clock is not installed, use jasmine.clock().install()'); + } + }; + + return self; + + function legacyIE() { + //if these methods are polyfilled, apply will be present + return !(realTimingFunctions.setTimeout || realTimingFunctions.setInterval).apply; + } + + function replace(dest, source) { + for (var prop in source) { + dest[prop] = source[prop]; + } + } + + function setTimeout(fn, delay) { + return delayedFunctionScheduler.scheduleFunction(fn, delay, argSlice(arguments, 2)); + } + + function clearTimeout(id) { + return delayedFunctionScheduler.removeFunctionWithId(id); + } + + function setInterval(fn, interval) { + return delayedFunctionScheduler.scheduleFunction(fn, interval, argSlice(arguments, 2), true); + } + + function clearInterval(id) { + return delayedFunctionScheduler.removeFunctionWithId(id); + } + + function argSlice(argsObj, n) { + return Array.prototype.slice.call(argsObj, n); + } + } + + return Clock; +}; + +getJasmineRequireObj().DelayedFunctionScheduler = function() { + function DelayedFunctionScheduler() { + var self = this; + var scheduledLookup = []; + var scheduledFunctions = {}; + var currentTime = 0; + var delayedFnCount = 0; + + self.tick = function(millis) { + millis = millis || 0; + var endTime = currentTime + millis; + + runScheduledFunctions(endTime); + currentTime = endTime; + }; + + self.scheduleFunction = function(funcToCall, millis, params, recurring, timeoutKey, runAtMillis) { + var f; + if (typeof(funcToCall) === 'string') { + /* jshint evil: true */ + f = function() { return eval(funcToCall); }; + /* jshint evil: false */ + } else { + f = funcToCall; + } + + millis = millis || 0; + timeoutKey = timeoutKey || ++delayedFnCount; + runAtMillis = runAtMillis || (currentTime + millis); + + var funcToSchedule = { + runAtMillis: runAtMillis, + funcToCall: f, + recurring: recurring, + params: params, + timeoutKey: timeoutKey, + millis: millis + }; + + if (runAtMillis in scheduledFunctions) { + scheduledFunctions[runAtMillis].push(funcToSchedule); + } else { + scheduledFunctions[runAtMillis] = [funcToSchedule]; + scheduledLookup.push(runAtMillis); + scheduledLookup.sort(function (a, b) { + return a - b; + }); + } + + return timeoutKey; + }; + + self.removeFunctionWithId = function(timeoutKey) { + for (var runAtMillis in scheduledFunctions) { + var funcs = scheduledFunctions[runAtMillis]; + var i = indexOfFirstToPass(funcs, function (func) { + return func.timeoutKey === timeoutKey; + }); + + if (i > -1) { + if (funcs.length === 1) { + delete scheduledFunctions[runAtMillis]; + deleteFromLookup(runAtMillis); + } else { + funcs.splice(i, 1); + } + + // intervals get rescheduled when executed, so there's never more + // than a single scheduled function with a given timeoutKey + break; + } + } + }; + + self.reset = function() { + currentTime = 0; + scheduledLookup = []; + scheduledFunctions = {}; + delayedFnCount = 0; + }; + + return self; + + function indexOfFirstToPass(array, testFn) { + var index = -1; + + for (var i = 0; i < array.length; ++i) { + if (testFn(array[i])) { + index = i; + break; + } + } + + return index; + } + + function deleteFromLookup(key) { + var value = Number(key); + var i = indexOfFirstToPass(scheduledLookup, function (millis) { + return millis === value; + }); + + if (i > -1) { + scheduledLookup.splice(i, 1); + } + } + + function reschedule(scheduledFn) { + self.scheduleFunction(scheduledFn.funcToCall, + scheduledFn.millis, + scheduledFn.params, + true, + scheduledFn.timeoutKey, + scheduledFn.runAtMillis + scheduledFn.millis); + } + + function forEachFunction(funcsToRun, callback) { + for (var i = 0; i < funcsToRun.length; ++i) { + callback(funcsToRun[i]); + } + } + + function runScheduledFunctions(endTime) { + if (scheduledLookup.length === 0 || scheduledLookup[0] > endTime) { + return; + } + + do { + currentTime = scheduledLookup.shift(); + + var funcsToRun = scheduledFunctions[currentTime]; + delete scheduledFunctions[currentTime]; + + forEachFunction(funcsToRun, function(funcToRun) { + if (funcToRun.recurring) { + reschedule(funcToRun); + } + }); + + forEachFunction(funcsToRun, function(funcToRun) { + funcToRun.funcToCall.apply(null, funcToRun.params || []); + }); + } while (scheduledLookup.length > 0 && + // checking first if we're out of time prevents setTimeout(0) + // scheduled in a funcToRun from forcing an extra iteration + currentTime !== endTime && + scheduledLookup[0] <= endTime); + } + } + + return DelayedFunctionScheduler; +}; + +getJasmineRequireObj().ExceptionFormatter = function() { + function ExceptionFormatter() { + this.message = function(error) { + var message = ''; + + if (error.name && error.message) { + message += error.name + ': ' + error.message; + } else { + message += error.toString() + ' thrown'; + } + + if (error.fileName || error.sourceURL) { + message += ' in ' + (error.fileName || error.sourceURL); + } + + if (error.line || error.lineNumber) { + message += ' (line ' + (error.line || error.lineNumber) + ')'; + } + + return message; + }; + + this.stack = function(error) { + return error ? error.stack : null; + }; + } + + return ExceptionFormatter; +}; + +getJasmineRequireObj().Expectation = function() { + + function Expectation(options) { + this.util = options.util || { buildFailureMessage: function() {} }; + this.customEqualityTesters = options.customEqualityTesters || []; + this.actual = options.actual; + this.addExpectationResult = options.addExpectationResult || function(){}; + this.isNot = options.isNot; + + var customMatchers = options.customMatchers || {}; + for (var matcherName in customMatchers) { + this[matcherName] = Expectation.prototype.wrapCompare(matcherName, customMatchers[matcherName]); + } + } + + Expectation.prototype.wrapCompare = function(name, matcherFactory) { + return function() { + var args = Array.prototype.slice.call(arguments, 0), + expected = args.slice(0), + message = ''; + + args.unshift(this.actual); + + var matcher = matcherFactory(this.util, this.customEqualityTesters), + matcherCompare = matcher.compare; + + function defaultNegativeCompare() { + var result = matcher.compare.apply(null, args); + result.pass = !result.pass; + return result; + } + + if (this.isNot) { + matcherCompare = matcher.negativeCompare || defaultNegativeCompare; + } + + var result = matcherCompare.apply(null, args); + + if (!result.pass) { + if (!result.message) { + args.unshift(this.isNot); + args.unshift(name); + message = this.util.buildFailureMessage.apply(null, args); + } else { + if (Object.prototype.toString.apply(result.message) === '[object Function]') { + message = result.message(); + } else { + message = result.message; + } + } + } + + if (expected.length == 1) { + expected = expected[0]; + } + + // TODO: how many of these params are needed? + this.addExpectationResult( + result.pass, + { + matcherName: name, + passed: result.pass, + message: message, + actual: this.actual, + expected: expected // TODO: this may need to be arrayified/sliced + } + ); + }; + }; + + Expectation.addCoreMatchers = function(matchers) { + var prototype = Expectation.prototype; + for (var matcherName in matchers) { + var matcher = matchers[matcherName]; + prototype[matcherName] = prototype.wrapCompare(matcherName, matcher); + } + }; + + Expectation.Factory = function(options) { + options = options || {}; + + var expect = new Expectation(options); + + // TODO: this would be nice as its own Object - NegativeExpectation + // TODO: copy instead of mutate options + options.isNot = true; + expect.not = new Expectation(options); + + return expect; + }; + + return Expectation; +}; + +//TODO: expectation result may make more sense as a presentation of an expectation. +getJasmineRequireObj().buildExpectationResult = function() { + function buildExpectationResult(options) { + var messageFormatter = options.messageFormatter || function() {}, + stackFormatter = options.stackFormatter || function() {}; + + var result = { + matcherName: options.matcherName, + message: message(), + stack: stack(), + passed: options.passed + }; + + if(!result.passed) { + result.expected = options.expected; + result.actual = options.actual; + } + + return result; + + function message() { + if (options.passed) { + return 'Passed.'; + } else if (options.message) { + return options.message; + } else if (options.error) { + return messageFormatter(options.error); + } + return ''; + } + + function stack() { + if (options.passed) { + return ''; + } + + var error = options.error; + if (!error) { + try { + throw new Error(message()); + } catch (e) { + error = e; + } + } + return stackFormatter(error); + } + } + + return buildExpectationResult; +}; + +getJasmineRequireObj().MockDate = function() { + function MockDate(global) { + var self = this; + var currentTime = 0; + + if (!global || !global.Date) { + self.install = function() {}; + self.tick = function() {}; + self.uninstall = function() {}; + return self; + } + + var GlobalDate = global.Date; + + self.install = function(mockDate) { + if (mockDate instanceof GlobalDate) { + currentTime = mockDate.getTime(); + } else { + currentTime = new GlobalDate().getTime(); + } + + global.Date = FakeDate; + }; + + self.tick = function(millis) { + millis = millis || 0; + currentTime = currentTime + millis; + }; + + self.uninstall = function() { + currentTime = 0; + global.Date = GlobalDate; + }; + + createDateProperties(); + + return self; + + function FakeDate() { + switch(arguments.length) { + case 0: + return new GlobalDate(currentTime); + case 1: + return new GlobalDate(arguments[0]); + case 2: + return new GlobalDate(arguments[0], arguments[1]); + case 3: + return new GlobalDate(arguments[0], arguments[1], arguments[2]); + case 4: + return new GlobalDate(arguments[0], arguments[1], arguments[2], arguments[3]); + case 5: + return new GlobalDate(arguments[0], arguments[1], arguments[2], arguments[3], + arguments[4]); + case 6: + return new GlobalDate(arguments[0], arguments[1], arguments[2], arguments[3], + arguments[4], arguments[5]); + default: + return new GlobalDate(arguments[0], arguments[1], arguments[2], arguments[3], + arguments[4], arguments[5], arguments[6]); + } + } + + function createDateProperties() { + FakeDate.prototype = GlobalDate.prototype; + + FakeDate.now = function() { + if (GlobalDate.now) { + return currentTime; + } else { + throw new Error('Browser does not support Date.now()'); + } + }; + + FakeDate.toSource = GlobalDate.toSource; + FakeDate.toString = GlobalDate.toString; + FakeDate.parse = GlobalDate.parse; + FakeDate.UTC = GlobalDate.UTC; + } + } + + return MockDate; +}; + +getJasmineRequireObj().pp = function(j$) { + + function PrettyPrinter() { + this.ppNestLevel_ = 0; + this.seen = []; + } + + PrettyPrinter.prototype.format = function(value) { + this.ppNestLevel_++; + try { + if (j$.util.isUndefined(value)) { + this.emitScalar('undefined'); + } else if (value === null) { + this.emitScalar('null'); + } else if (value === 0 && 1/value === -Infinity) { + this.emitScalar('-0'); + } else if (value === j$.getGlobal()) { + this.emitScalar(''); + } else if (value.jasmineToString) { + this.emitScalar(value.jasmineToString()); + } else if (typeof value === 'string') { + this.emitString(value); + } else if (j$.isSpy(value)) { + this.emitScalar('spy on ' + value.and.identity()); + } else if (value instanceof RegExp) { + this.emitScalar(value.toString()); + } else if (typeof value === 'function') { + this.emitScalar('Function'); + } else if (typeof value.nodeType === 'number') { + this.emitScalar('HTMLNode'); + } else if (value instanceof Date) { + this.emitScalar('Date(' + value + ')'); + } else if (j$.util.arrayContains(this.seen, value)) { + this.emitScalar(''); + } else if (j$.isArray_(value) || j$.isA_('Object', value)) { + this.seen.push(value); + if (j$.isArray_(value)) { + this.emitArray(value); + } else { + this.emitObject(value); + } + this.seen.pop(); + } else { + this.emitScalar(value.toString()); + } + } finally { + this.ppNestLevel_--; + } + }; + + PrettyPrinter.prototype.iterateObject = function(obj, fn) { + for (var property in obj) { + if (!Object.prototype.hasOwnProperty.call(obj, property)) { continue; } + fn(property, obj.__lookupGetter__ ? (!j$.util.isUndefined(obj.__lookupGetter__(property)) && + obj.__lookupGetter__(property) !== null) : false); + } + }; + + PrettyPrinter.prototype.emitArray = j$.unimplementedMethod_; + PrettyPrinter.prototype.emitObject = j$.unimplementedMethod_; + PrettyPrinter.prototype.emitScalar = j$.unimplementedMethod_; + PrettyPrinter.prototype.emitString = j$.unimplementedMethod_; + + function StringPrettyPrinter() { + PrettyPrinter.call(this); + + this.string = ''; + } + + j$.util.inherit(StringPrettyPrinter, PrettyPrinter); + + StringPrettyPrinter.prototype.emitScalar = function(value) { + this.append(value); + }; + + StringPrettyPrinter.prototype.emitString = function(value) { + this.append('\'' + value + '\''); + }; + + StringPrettyPrinter.prototype.emitArray = function(array) { + if (this.ppNestLevel_ > j$.MAX_PRETTY_PRINT_DEPTH) { + this.append('Array'); + return; + } + var length = Math.min(array.length, j$.MAX_PRETTY_PRINT_ARRAY_LENGTH); + this.append('[ '); + for (var i = 0; i < length; i++) { + if (i > 0) { + this.append(', '); + } + this.format(array[i]); + } + if(array.length > length){ + this.append(', ...'); + } + this.append(' ]'); + }; + + StringPrettyPrinter.prototype.emitObject = function(obj) { + var constructorName = obj.constructor ? j$.fnNameFor(obj.constructor) : 'null'; + this.append(constructorName); + + if (this.ppNestLevel_ > j$.MAX_PRETTY_PRINT_DEPTH) { + return; + } + + var self = this; + this.append('({ '); + var first = true; + + this.iterateObject(obj, function(property, isGetter) { + if (first) { + first = false; + } else { + self.append(', '); + } + + self.append(property); + self.append(': '); + if (isGetter) { + self.append(''); + } else { + self.format(obj[property]); + } + }); + + this.append(' })'); + }; + + StringPrettyPrinter.prototype.append = function(value) { + this.string += value; + }; + + return function(value) { + var stringPrettyPrinter = new StringPrettyPrinter(); + stringPrettyPrinter.format(value); + return stringPrettyPrinter.string; + }; +}; + +getJasmineRequireObj().QueueRunner = function(j$) { + + function once(fn) { + var called = false; + return function() { + if (!called) { + called = true; + fn(); + } + }; + } + + function QueueRunner(attrs) { + this.queueableFns = attrs.queueableFns || []; + this.onComplete = attrs.onComplete || function() {}; + this.clearStack = attrs.clearStack || function(fn) {fn();}; + this.onException = attrs.onException || function() {}; + this.catchException = attrs.catchException || function() { return true; }; + this.userContext = attrs.userContext || {}; + this.timer = attrs.timeout || {setTimeout: setTimeout, clearTimeout: clearTimeout}; + this.fail = attrs.fail || function() {}; + } + + QueueRunner.prototype.execute = function() { + this.run(this.queueableFns, 0); + }; + + QueueRunner.prototype.run = function(queueableFns, recursiveIndex) { + var length = queueableFns.length, + self = this, + iterativeIndex; + + + for(iterativeIndex = recursiveIndex; iterativeIndex < length; iterativeIndex++) { + var queueableFn = queueableFns[iterativeIndex]; + if (queueableFn.fn.length > 0) { + attemptAsync(queueableFn); + return; + } else { + attemptSync(queueableFn); + } + } + + var runnerDone = iterativeIndex >= length; + + if (runnerDone) { + this.clearStack(this.onComplete); + } + + function attemptSync(queueableFn) { + try { + queueableFn.fn.call(self.userContext); + } catch (e) { + handleException(e, queueableFn); + } + } + + function attemptAsync(queueableFn) { + var clearTimeout = function () { + Function.prototype.apply.apply(self.timer.clearTimeout, [j$.getGlobal(), [timeoutId]]); + }, + next = once(function () { + clearTimeout(timeoutId); + self.run(queueableFns, iterativeIndex + 1); + }), + timeoutId; + + next.fail = function() { + self.fail.apply(null, arguments); + next(); + }; + + if (queueableFn.timeout) { + timeoutId = Function.prototype.apply.apply(self.timer.setTimeout, [j$.getGlobal(), [function() { + var error = new Error('Timeout - Async callback was not invoked within timeout specified by jasmine.DEFAULT_TIMEOUT_INTERVAL.'); + onException(error, queueableFn); + next(); + }, queueableFn.timeout()]]); + } + + try { + queueableFn.fn.call(self.userContext, next); + } catch (e) { + handleException(e, queueableFn); + next(); + } + } + + function onException(e, queueableFn) { + self.onException(e); + } + + function handleException(e, queueableFn) { + onException(e, queueableFn); + if (!self.catchException(e)) { + //TODO: set a var when we catch an exception and + //use a finally block to close the loop in a nice way.. + throw e; + } + } + }; + + return QueueRunner; +}; + +getJasmineRequireObj().ReportDispatcher = function() { + function ReportDispatcher(methods) { + + var dispatchedMethods = methods || []; + + for (var i = 0; i < dispatchedMethods.length; i++) { + var method = dispatchedMethods[i]; + this[method] = (function(m) { + return function() { + dispatch(m, arguments); + }; + }(method)); + } + + var reporters = []; + + this.addReporter = function(reporter) { + reporters.push(reporter); + }; + + return this; + + function dispatch(method, args) { + for (var i = 0; i < reporters.length; i++) { + var reporter = reporters[i]; + if (reporter[method]) { + reporter[method].apply(reporter, args); + } + } + } + } + + return ReportDispatcher; +}; + + +getJasmineRequireObj().SpyRegistry = function(j$) { + + function SpyRegistry(options) { + options = options || {}; + var currentSpies = options.currentSpies || function() { return []; }; + + this.spyOn = function(obj, methodName) { + if (j$.util.isUndefined(obj)) { + throw new Error('spyOn could not find an object to spy upon for ' + methodName + '()'); + } + + if (j$.util.isUndefined(methodName)) { + throw new Error('No method name supplied'); + } + + if (j$.util.isUndefined(obj[methodName])) { + throw new Error(methodName + '() method does not exist'); + } + + if (obj[methodName] && j$.isSpy(obj[methodName])) { + //TODO?: should this return the current spy? Downside: may cause user confusion about spy state + throw new Error(methodName + ' has already been spied upon'); + } + + var spy = j$.createSpy(methodName, obj[methodName]); + + currentSpies().push({ + spy: spy, + baseObj: obj, + methodName: methodName, + originalValue: obj[methodName] + }); + + obj[methodName] = spy; + + return spy; + }; + + this.clearSpies = function() { + var spies = currentSpies(); + for (var i = 0; i < spies.length; i++) { + var spyEntry = spies[i]; + spyEntry.baseObj[spyEntry.methodName] = spyEntry.originalValue; + } + }; + } + + return SpyRegistry; +}; + +getJasmineRequireObj().SpyStrategy = function() { + + function SpyStrategy(options) { + options = options || {}; + + var identity = options.name || 'unknown', + originalFn = options.fn || function() {}, + getSpy = options.getSpy || function() {}, + plan = function() {}; + + this.identity = function() { + return identity; + }; + + this.exec = function() { + return plan.apply(this, arguments); + }; + + this.callThrough = function() { + plan = originalFn; + return getSpy(); + }; + + this.returnValue = function(value) { + plan = function() { + return value; + }; + return getSpy(); + }; + + this.returnValues = function() { + var values = Array.prototype.slice.call(arguments); + plan = function () { + return values.shift(); + }; + return getSpy(); + }; + + this.throwError = function(something) { + var error = (something instanceof Error) ? something : new Error(something); + plan = function() { + throw error; + }; + return getSpy(); + }; + + this.callFake = function(fn) { + plan = fn; + return getSpy(); + }; + + this.stub = function(fn) { + plan = function() {}; + return getSpy(); + }; + } + + return SpyStrategy; +}; + +getJasmineRequireObj().Suite = function() { + function Suite(attrs) { + this.env = attrs.env; + this.id = attrs.id; + this.parentSuite = attrs.parentSuite; + this.description = attrs.description; + this.onStart = attrs.onStart || function() {}; + this.resultCallback = attrs.resultCallback || function() {}; + this.clearStack = attrs.clearStack || function(fn) {fn();}; + this.expectationFactory = attrs.expectationFactory; + this.expectationResultFactory = attrs.expectationResultFactory; + this.runnablesExplictlySetGetter = attrs.runnablesExplictlySetGetter || function() {}; + + this.beforeFns = []; + this.afterFns = []; + this.beforeAllFns = []; + this.afterAllFns = []; + this.queueRunner = attrs.queueRunner || function() {}; + this.disabled = false; + + this.children = []; + + this.result = { + id: this.id, + description: this.description, + fullName: this.getFullName(), + failedExpectations: [] + }; + } + + Suite.prototype.expect = function(actual) { + return this.expectationFactory(actual, this); + }; + + Suite.prototype.getFullName = function() { + var fullName = this.description; + for (var parentSuite = this.parentSuite; parentSuite; parentSuite = parentSuite.parentSuite) { + if (parentSuite.parentSuite) { + fullName = parentSuite.description + ' ' + fullName; + } + } + return fullName; + }; + + Suite.prototype.disable = function() { + this.disabled = true; + }; + + Suite.prototype.beforeEach = function(fn) { + this.beforeFns.unshift(fn); + }; + + Suite.prototype.beforeAll = function(fn) { + this.beforeAllFns.push(fn); + }; + + Suite.prototype.afterEach = function(fn) { + this.afterFns.unshift(fn); + }; + + Suite.prototype.afterAll = function(fn) { + this.afterAllFns.push(fn); + }; + + Suite.prototype.addChild = function(child) { + this.children.push(child); + }; + + Suite.prototype.status = function() { + if (this.disabled) { + return 'disabled'; + } + + if (this.result.failedExpectations.length > 0) { + return 'failed'; + } else { + return 'finished'; + } + }; + + Suite.prototype.execute = function(onComplete) { + var self = this; + + this.onStart(this); + + if (this.disabled) { + complete(); + return; + } + + var allFns = []; + + for (var i = 0; i < this.children.length; i++) { + allFns.push(wrapChildAsAsync(this.children[i])); + } + + if (this.isExecutable()) { + allFns = this.beforeAllFns.concat(allFns); + allFns = allFns.concat(this.afterAllFns); + } + + this.queueRunner({ + queueableFns: allFns, + onComplete: complete, + userContext: this.sharedUserContext(), + onException: function() { self.onException.apply(self, arguments); } + }); + + function complete() { + self.result.status = self.status(); + self.resultCallback(self.result); + + if (onComplete) { + onComplete(); + } + } + + function wrapChildAsAsync(child) { + return { fn: function(done) { child.execute(done); } }; + } + }; + + Suite.prototype.isExecutable = function() { + var runnablesExplicitlySet = this.runnablesExplictlySetGetter(); + return !runnablesExplicitlySet && hasExecutableChild(this.children); + }; + + Suite.prototype.sharedUserContext = function() { + if (!this.sharedContext) { + this.sharedContext = this.parentSuite ? clone(this.parentSuite.sharedUserContext()) : {}; + } + + return this.sharedContext; + }; + + Suite.prototype.clonedSharedUserContext = function() { + return clone(this.sharedUserContext()); + }; + + Suite.prototype.onException = function() { + if(isAfterAll(this.children)) { + var data = { + matcherName: '', + passed: false, + expected: '', + actual: '', + error: arguments[0] + }; + this.result.failedExpectations.push(this.expectationResultFactory(data)); + } else { + for (var i = 0; i < this.children.length; i++) { + var child = this.children[i]; + child.onException.apply(child, arguments); + } + } + }; + + Suite.prototype.addExpectationResult = function () { + if(isAfterAll(this.children) && isFailure(arguments)){ + var data = arguments[1]; + this.result.failedExpectations.push(this.expectationResultFactory(data)); + } else { + for (var i = 0; i < this.children.length; i++) { + var child = this.children[i]; + child.addExpectationResult.apply(child, arguments); + } + } + }; + + function isAfterAll(children) { + return children && children[0].result.status; + } + + function isFailure(args) { + return !args[0]; + } + + function hasExecutableChild(children) { + var foundActive = false; + for (var i = 0; i < children.length; i++) { + if (children[i].isExecutable()) { + foundActive = true; + break; + } + } + return foundActive; + } + + function clone(obj) { + var clonedObj = {}; + for (var prop in obj) { + if (obj.hasOwnProperty(prop)) { + clonedObj[prop] = obj[prop]; + } + } + + return clonedObj; + } + + return Suite; +}; + +if (typeof window == void 0 && typeof exports == 'object') { + exports.Suite = jasmineRequire.Suite; +} + +getJasmineRequireObj().Timer = function() { + var defaultNow = (function(Date) { + return function() { return new Date().getTime(); }; + })(Date); + + function Timer(options) { + options = options || {}; + + var now = options.now || defaultNow, + startTime; + + this.start = function() { + startTime = now(); + }; + + this.elapsed = function() { + return now() - startTime; + }; + } + + return Timer; +}; + +getJasmineRequireObj().Any = function() { + + function Any(expectedObject) { + this.expectedObject = expectedObject; + } + + Any.prototype.asymmetricMatch = function(other) { + if (this.expectedObject == String) { + return typeof other == 'string' || other instanceof String; + } + + if (this.expectedObject == Number) { + return typeof other == 'number' || other instanceof Number; + } + + if (this.expectedObject == Function) { + return typeof other == 'function' || other instanceof Function; + } + + if (this.expectedObject == Object) { + return typeof other == 'object'; + } + + if (this.expectedObject == Boolean) { + return typeof other == 'boolean'; + } + + return other instanceof this.expectedObject; + }; + + Any.prototype.jasmineToString = function() { + return ''; + }; + + return Any; +}; + +getJasmineRequireObj().Anything = function(j$) { + + function Anything() {} + + Anything.prototype.asymmetricMatch = function(other) { + return !j$.util.isUndefined(other) && other !== null; + }; + + Anything.prototype.jasmineToString = function() { + return ''; + }; + + return Anything; +}; + +getJasmineRequireObj().ArrayContaining = function(j$) { + function ArrayContaining(sample) { + this.sample = sample; + } + + ArrayContaining.prototype.asymmetricMatch = function(other) { + var className = Object.prototype.toString.call(this.sample); + if (className !== '[object Array]') { throw new Error('You must provide an array to arrayContaining, not \'' + this.sample + '\'.'); } + + for (var i = 0; i < this.sample.length; i++) { + var item = this.sample[i]; + if (!j$.matchersUtil.contains(other, item)) { + return false; + } + } + + return true; + }; + + ArrayContaining.prototype.jasmineToString = function () { + return ''; + }; + + return ArrayContaining; +}; + +getJasmineRequireObj().ObjectContaining = function(j$) { + + function ObjectContaining(sample) { + this.sample = sample; + } + + ObjectContaining.prototype.asymmetricMatch = function(other) { + if (typeof(this.sample) !== 'object') { throw new Error('You must provide an object to objectContaining, not \''+this.sample+'\'.'); } + + for (var property in this.sample) { + if (!Object.prototype.hasOwnProperty.call(other, property) || + !j$.matchersUtil.equals(this.sample[property], other[property])) { + return false; + } + } + + return true; + }; + + ObjectContaining.prototype.jasmineToString = function() { + return ''; + }; + + return ObjectContaining; +}; + +getJasmineRequireObj().StringMatching = function(j$) { + + function StringMatching(expected) { + if (!j$.isString_(expected) && !j$.isA_('RegExp', expected)) { + throw new Error('Expected is not a String or a RegExp'); + } + + this.regexp = new RegExp(expected); + } + + StringMatching.prototype.asymmetricMatch = function(other) { + return this.regexp.test(other); + }; + + StringMatching.prototype.jasmineToString = function() { + return ''; + }; + + return StringMatching; +}; + +getJasmineRequireObj().matchersUtil = function(j$) { + // TODO: what to do about jasmine.pp not being inject? move to JSON.stringify? gut PrettyPrinter? + + return { + equals: function(a, b, customTesters) { + customTesters = customTesters || []; + + return eq(a, b, [], [], customTesters); + }, + + contains: function(haystack, needle, customTesters) { + customTesters = customTesters || []; + + if ((Object.prototype.toString.apply(haystack) === '[object Array]') || + (!!haystack && !haystack.indexOf)) + { + for (var i = 0; i < haystack.length; i++) { + if (eq(haystack[i], needle, [], [], customTesters)) { + return true; + } + } + return false; + } + + return !!haystack && haystack.indexOf(needle) >= 0; + }, + + buildFailureMessage: function() { + var args = Array.prototype.slice.call(arguments, 0), + matcherName = args[0], + isNot = args[1], + actual = args[2], + expected = args.slice(3), + englishyPredicate = matcherName.replace(/[A-Z]/g, function(s) { return ' ' + s.toLowerCase(); }); + + var message = 'Expected ' + + j$.pp(actual) + + (isNot ? ' not ' : ' ') + + englishyPredicate; + + if (expected.length > 0) { + for (var i = 0; i < expected.length; i++) { + if (i > 0) { + message += ','; + } + message += ' ' + j$.pp(expected[i]); + } + } + + return message + '.'; + } + }; + + function isAsymmetric(obj) { + return obj && j$.isA_('Function', obj.asymmetricMatch); + } + + function asymmetricMatch(a, b) { + var asymmetricA = isAsymmetric(a), + asymmetricB = isAsymmetric(b); + + if (asymmetricA && asymmetricB) { + return undefined; + } + + if (asymmetricA) { + return a.asymmetricMatch(b); + } + + if (asymmetricB) { + return b.asymmetricMatch(a); + } + } + + // Equality function lovingly adapted from isEqual in + // [Underscore](http://underscorejs.org) + function eq(a, b, aStack, bStack, customTesters) { + var result = true; + + var asymmetricResult = asymmetricMatch(a, b); + if (!j$.util.isUndefined(asymmetricResult)) { + return asymmetricResult; + } + + for (var i = 0; i < customTesters.length; i++) { + var customTesterResult = customTesters[i](a, b); + if (!j$.util.isUndefined(customTesterResult)) { + return customTesterResult; + } + } + + if (a instanceof Error && b instanceof Error) { + return a.message == b.message; + } + + // Identical objects are equal. `0 === -0`, but they aren't identical. + // See the [Harmony `egal` proposal](http://wiki.ecmascript.org/doku.php?id=harmony:egal). + if (a === b) { return a !== 0 || 1 / a == 1 / b; } + // A strict comparison is necessary because `null == undefined`. + if (a === null || b === null) { return a === b; } + var className = Object.prototype.toString.call(a); + if (className != Object.prototype.toString.call(b)) { return false; } + switch (className) { + // Strings, numbers, dates, and booleans are compared by value. + case '[object String]': + // Primitives and their corresponding object wrappers are equivalent; thus, `"5"` is + // equivalent to `new String("5")`. + return a == String(b); + case '[object Number]': + // `NaN`s are equivalent, but non-reflexive. An `egal` comparison is performed for + // other numeric values. + return a != +a ? b != +b : (a === 0 ? 1 / a == 1 / b : a == +b); + case '[object Date]': + case '[object Boolean]': + // Coerce dates and booleans to numeric primitive values. Dates are compared by their + // millisecond representations. Note that invalid dates with millisecond representations + // of `NaN` are not equivalent. + return +a == +b; + // RegExps are compared by their source patterns and flags. + case '[object RegExp]': + return a.source == b.source && + a.global == b.global && + a.multiline == b.multiline && + a.ignoreCase == b.ignoreCase; + } + if (typeof a != 'object' || typeof b != 'object') { return false; } + + var aIsDomNode = j$.isDomNode(a); + var bIsDomNode = j$.isDomNode(b); + if (aIsDomNode && bIsDomNode) { + // At first try to use DOM3 method isEqualNode + if (a.isEqualNode) { + return a.isEqualNode(b); + } + // IE8 doesn't support isEqualNode, try to use outerHTML && innerText + var aIsElement = a instanceof Element; + var bIsElement = b instanceof Element; + if (aIsElement && bIsElement) { + return a.outerHTML == b.outerHTML; + } + if (aIsElement || bIsElement) { + return false; + } + return a.innerText == b.innerText && a.textContent == b.textContent; + } + if (aIsDomNode || bIsDomNode) { + return false; + } + + // Assume equality for cyclic structures. The algorithm for detecting cyclic + // structures is adapted from ES 5.1 section 15.12.3, abstract operation `JO`. + var length = aStack.length; + while (length--) { + // Linear search. Performance is inversely proportional to the number of + // unique nested structures. + if (aStack[length] == a) { return bStack[length] == b; } + } + // Add the first object to the stack of traversed objects. + aStack.push(a); + bStack.push(b); + var size = 0; + // Recursively compare objects and arrays. + // Compare array lengths to determine if a deep comparison is necessary. + if (className == '[object Array]' && a.length !== b.length) { + result = false; + } + + if (result) { + // Objects with different constructors are not equivalent, but `Object`s + // from different frames are. + var aCtor = a.constructor, bCtor = b.constructor; + if (aCtor !== bCtor && !(isFunction(aCtor) && (aCtor instanceof aCtor) && + isFunction(bCtor) && (bCtor instanceof bCtor))) { + return false; + } + // Deep compare objects. + for (var key in a) { + if (has(a, key)) { + // Count the expected number of properties. + size++; + // Deep compare each member. + if (!(result = has(b, key) && eq(a[key], b[key], aStack, bStack, customTesters))) { break; } + } + } + // Ensure that both objects contain the same number of properties. + if (result) { + for (key in b) { + if (has(b, key) && !(size--)) { break; } + } + result = !size; + } + } + // Remove the first object from the stack of traversed objects. + aStack.pop(); + bStack.pop(); + + return result; + + function has(obj, key) { + return Object.prototype.hasOwnProperty.call(obj, key); + } + + function isFunction(obj) { + return typeof obj === 'function'; + } + } +}; + +getJasmineRequireObj().toBe = function() { + function toBe() { + return { + compare: function(actual, expected) { + return { + pass: actual === expected + }; + } + }; + } + + return toBe; +}; + +getJasmineRequireObj().toBeCloseTo = function() { + + function toBeCloseTo() { + return { + compare: function(actual, expected, precision) { + if (precision !== 0) { + precision = precision || 2; + } + + return { + pass: Math.abs(expected - actual) < (Math.pow(10, -precision) / 2) + }; + } + }; + } + + return toBeCloseTo; +}; + +getJasmineRequireObj().toBeDefined = function() { + function toBeDefined() { + return { + compare: function(actual) { + return { + pass: (void 0 !== actual) + }; + } + }; + } + + return toBeDefined; +}; + +getJasmineRequireObj().toBeFalsy = function() { + function toBeFalsy() { + return { + compare: function(actual) { + return { + pass: !!!actual + }; + } + }; + } + + return toBeFalsy; +}; + +getJasmineRequireObj().toBeGreaterThan = function() { + + function toBeGreaterThan() { + return { + compare: function(actual, expected) { + return { + pass: actual > expected + }; + } + }; + } + + return toBeGreaterThan; +}; + + +getJasmineRequireObj().toBeLessThan = function() { + function toBeLessThan() { + return { + + compare: function(actual, expected) { + return { + pass: actual < expected + }; + } + }; + } + + return toBeLessThan; +}; +getJasmineRequireObj().toBeNaN = function(j$) { + + function toBeNaN() { + return { + compare: function(actual) { + var result = { + pass: (actual !== actual) + }; + + if (result.pass) { + result.message = 'Expected actual not to be NaN.'; + } else { + result.message = function() { return 'Expected ' + j$.pp(actual) + ' to be NaN.'; }; + } + + return result; + } + }; + } + + return toBeNaN; +}; + +getJasmineRequireObj().toBeNull = function() { + + function toBeNull() { + return { + compare: function(actual) { + return { + pass: actual === null + }; + } + }; + } + + return toBeNull; +}; + +getJasmineRequireObj().toBeTruthy = function() { + + function toBeTruthy() { + return { + compare: function(actual) { + return { + pass: !!actual + }; + } + }; + } + + return toBeTruthy; +}; + +getJasmineRequireObj().toBeUndefined = function() { + + function toBeUndefined() { + return { + compare: function(actual) { + return { + pass: void 0 === actual + }; + } + }; + } + + return toBeUndefined; +}; + +getJasmineRequireObj().toContain = function() { + function toContain(util, customEqualityTesters) { + customEqualityTesters = customEqualityTesters || []; + + return { + compare: function(actual, expected) { + + return { + pass: util.contains(actual, expected, customEqualityTesters) + }; + } + }; + } + + return toContain; +}; + +getJasmineRequireObj().toEqual = function() { + + function toEqual(util, customEqualityTesters) { + customEqualityTesters = customEqualityTesters || []; + + return { + compare: function(actual, expected) { + var result = { + pass: false + }; + + result.pass = util.equals(actual, expected, customEqualityTesters); + + return result; + } + }; + } + + return toEqual; +}; + +getJasmineRequireObj().toHaveBeenCalled = function(j$) { + + function toHaveBeenCalled() { + return { + compare: function(actual) { + var result = {}; + + if (!j$.isSpy(actual)) { + throw new Error('Expected a spy, but got ' + j$.pp(actual) + '.'); + } + + if (arguments.length > 1) { + throw new Error('toHaveBeenCalled does not take arguments, use toHaveBeenCalledWith'); + } + + result.pass = actual.calls.any(); + + result.message = result.pass ? + 'Expected spy ' + actual.and.identity() + ' not to have been called.' : + 'Expected spy ' + actual.and.identity() + ' to have been called.'; + + return result; + } + }; + } + + return toHaveBeenCalled; +}; + +getJasmineRequireObj().toHaveBeenCalledWith = function(j$) { + + function toHaveBeenCalledWith(util, customEqualityTesters) { + return { + compare: function() { + var args = Array.prototype.slice.call(arguments, 0), + actual = args[0], + expectedArgs = args.slice(1), + result = { pass: false }; + + if (!j$.isSpy(actual)) { + throw new Error('Expected a spy, but got ' + j$.pp(actual) + '.'); + } + + if (!actual.calls.any()) { + result.message = function() { return 'Expected spy ' + actual.and.identity() + ' to have been called with ' + j$.pp(expectedArgs) + ' but it was never called.'; }; + return result; + } + + if (util.contains(actual.calls.allArgs(), expectedArgs, customEqualityTesters)) { + result.pass = true; + result.message = function() { return 'Expected spy ' + actual.and.identity() + ' not to have been called with ' + j$.pp(expectedArgs) + ' but it was.'; }; + } else { + result.message = function() { return 'Expected spy ' + actual.and.identity() + ' to have been called with ' + j$.pp(expectedArgs) + ' but actual calls were ' + j$.pp(actual.calls.allArgs()).replace(/^\[ | \]$/g, '') + '.'; }; + } + + return result; + } + }; + } + + return toHaveBeenCalledWith; +}; + +getJasmineRequireObj().toMatch = function(j$) { + + function toMatch() { + return { + compare: function(actual, expected) { + if (!j$.isString_(expected) && !j$.isA_('RegExp', expected)) { + throw new Error('Expected is not a String or a RegExp'); + } + + var regexp = new RegExp(expected); + + return { + pass: regexp.test(actual) + }; + } + }; + } + + return toMatch; +}; + +getJasmineRequireObj().toThrow = function(j$) { + + function toThrow(util) { + return { + compare: function(actual, expected) { + var result = { pass: false }, + threw = false, + thrown; + + if (typeof actual != 'function') { + throw new Error('Actual is not a Function'); + } + + try { + actual(); + } catch (e) { + threw = true; + thrown = e; + } + + if (!threw) { + result.message = 'Expected function to throw an exception.'; + return result; + } + + if (arguments.length == 1) { + result.pass = true; + result.message = function() { return 'Expected function not to throw, but it threw ' + j$.pp(thrown) + '.'; }; + + return result; + } + + if (util.equals(thrown, expected)) { + result.pass = true; + result.message = function() { return 'Expected function not to throw ' + j$.pp(expected) + '.'; }; + } else { + result.message = function() { return 'Expected function to throw ' + j$.pp(expected) + ', but it threw ' + j$.pp(thrown) + '.'; }; + } + + return result; + } + }; + } + + return toThrow; +}; + +getJasmineRequireObj().toThrowError = function(j$) { + function toThrowError (util) { + return { + compare: function(actual) { + var threw = false, + pass = {pass: true}, + fail = {pass: false}, + thrown; + + if (typeof actual != 'function') { + throw new Error('Actual is not a Function'); + } + + var errorMatcher = getMatcher.apply(null, arguments); + + try { + actual(); + } catch (e) { + threw = true; + thrown = e; + } + + if (!threw) { + fail.message = 'Expected function to throw an Error.'; + return fail; + } + + if (!(thrown instanceof Error)) { + fail.message = function() { return 'Expected function to throw an Error, but it threw ' + j$.pp(thrown) + '.'; }; + return fail; + } + + if (errorMatcher.hasNoSpecifics()) { + pass.message = 'Expected function not to throw an Error, but it threw ' + j$.fnNameFor(thrown) + '.'; + return pass; + } + + if (errorMatcher.matches(thrown)) { + pass.message = function() { + return 'Expected function not to throw ' + errorMatcher.errorTypeDescription + errorMatcher.messageDescription() + '.'; + }; + return pass; + } else { + fail.message = function() { + return 'Expected function to throw ' + errorMatcher.errorTypeDescription + errorMatcher.messageDescription() + + ', but it threw ' + errorMatcher.thrownDescription(thrown) + '.'; + }; + return fail; + } + } + }; + + function getMatcher() { + var expected = null, + errorType = null; + + if (arguments.length == 2) { + expected = arguments[1]; + if (isAnErrorType(expected)) { + errorType = expected; + expected = null; + } + } else if (arguments.length > 2) { + errorType = arguments[1]; + expected = arguments[2]; + if (!isAnErrorType(errorType)) { + throw new Error('Expected error type is not an Error.'); + } + } + + if (expected && !isStringOrRegExp(expected)) { + if (errorType) { + throw new Error('Expected error message is not a string or RegExp.'); + } else { + throw new Error('Expected is not an Error, string, or RegExp.'); + } + } + + function messageMatch(message) { + if (typeof expected == 'string') { + return expected == message; + } else { + return expected.test(message); + } + } + + return { + errorTypeDescription: errorType ? j$.fnNameFor(errorType) : 'an exception', + thrownDescription: function(thrown) { + var thrownName = errorType ? j$.fnNameFor(thrown.constructor) : 'an exception', + thrownMessage = ''; + + if (expected) { + thrownMessage = ' with message ' + j$.pp(thrown.message); + } + + return thrownName + thrownMessage; + }, + messageDescription: function() { + if (expected === null) { + return ''; + } else if (expected instanceof RegExp) { + return ' with a message matching ' + j$.pp(expected); + } else { + return ' with message ' + j$.pp(expected); + } + }, + hasNoSpecifics: function() { + return expected === null && errorType === null; + }, + matches: function(error) { + return (errorType === null || error.constructor === errorType) && + (expected === null || messageMatch(error.message)); + } + }; + } + + function isStringOrRegExp(potential) { + return potential instanceof RegExp || (typeof potential == 'string'); + } + + function isAnErrorType(type) { + if (typeof type !== 'function') { + return false; + } + + var Surrogate = function() {}; + Surrogate.prototype = type.prototype; + return (new Surrogate()) instanceof Error; + } + } + + return toThrowError; +}; + +getJasmineRequireObj().interface = function(jasmine, env) { + var jasmineInterface = { + describe: function(description, specDefinitions) { + return env.describe(description, specDefinitions); + }, + + xdescribe: function(description, specDefinitions) { + return env.xdescribe(description, specDefinitions); + }, + + fdescribe: function(description, specDefinitions) { + return env.fdescribe(description, specDefinitions); + }, + + it: function() { + return env.it.apply(env, arguments); + }, + + xit: function() { + return env.xit.apply(env, arguments); + }, + + fit: function() { + return env.fit.apply(env, arguments); + }, + + beforeEach: function() { + return env.beforeEach.apply(env, arguments); + }, + + afterEach: function() { + return env.afterEach.apply(env, arguments); + }, + + beforeAll: function() { + return env.beforeAll.apply(env, arguments); + }, + + afterAll: function() { + return env.afterAll.apply(env, arguments); + }, + + expect: function(actual) { + return env.expect(actual); + }, + + pending: function() { + return env.pending.apply(env, arguments); + }, + + fail: function() { + return env.fail.apply(env, arguments); + }, + + spyOn: function(obj, methodName) { + return env.spyOn(obj, methodName); + }, + + jsApiReporter: new jasmine.JsApiReporter({ + timer: new jasmine.Timer() + }), + + jasmine: jasmine + }; + + jasmine.addCustomEqualityTester = function(tester) { + env.addCustomEqualityTester(tester); + }; + + jasmine.addMatchers = function(matchers) { + return env.addMatchers(matchers); + }; + + jasmine.clock = function() { + return env.clock; + }; + + return jasmineInterface; +}; + +getJasmineRequireObj().version = function() { + return '2.2.0'; +}; diff -Nru qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/templates/wizards/ubuntu/html5-simple/tests/unit/third_party/jasmine/MIT.LICENSE qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/templates/wizards/ubuntu/html5-simple/tests/unit/third_party/jasmine/MIT.LICENSE --- qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/templates/wizards/ubuntu/html5-simple/tests/unit/third_party/jasmine/MIT.LICENSE 1970-01-01 00:00:00.000000000 +0000 +++ qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/templates/wizards/ubuntu/html5-simple/tests/unit/third_party/jasmine/MIT.LICENSE 2015-05-08 08:37:05.000000000 +0000 @@ -0,0 +1,20 @@ +Copyright (c) 2008-2014 Pivotal Labs + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff -Nru qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/templates/wizards/ubuntu/html5-simple/wizard.xml qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/templates/wizards/ubuntu/html5-simple/wizard.xml --- qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/templates/wizards/ubuntu/html5-simple/wizard.xml 2015-04-21 08:04:31.000000000 +0000 +++ qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/templates/wizards/ubuntu/html5-simple/wizard.xml 2015-05-08 08:37:05.000000000 +0000 @@ -13,16 +13,34 @@ HTML5 App Ubuntu - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/templates/wizards/ubuntu/html5-simple/www/index.html qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/templates/wizards/ubuntu/html5-simple/www/index.html --- qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/templates/wizards/ubuntu/html5-simple/www/index.html 2015-04-21 08:04:31.000000000 +0000 +++ qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/templates/wizards/ubuntu/html5-simple/www/index.html 2015-05-08 08:37:05.000000000 +0000 @@ -69,6 +69,7 @@ - + + diff -Nru qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/templates/wizards/ubuntu/html5-simple/www/js/app.js qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/templates/wizards/ubuntu/html5-simple/www/js/app.js --- qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/templates/wizards/ubuntu/html5-simple/www/js/app.js 2015-04-21 08:04:31.000000000 +0000 +++ qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/templates/wizards/ubuntu/html5-simple/www/js/app.js 1970-01-01 00:00:00.000000000 +0000 @@ -1,43 +0,0 @@ -/** - * Wait before the DOM has been loaded before initializing the Ubuntu UI layer - */ -window.onload = function () { - function addClass(elem, className) { - elem.className += ' ' + className; - }; - - function removeClass(elem, className) { - elem.className = elem.className.replace(className, ''); - }; - - - var UI = new UbuntuUI(); - UI.init(); - - // Detect if Cordova script is uncommented or not and show the appropriate status. - var hasCordovaScript = false; - var scripts = [].slice.call(document.querySelectorAll('script')); - scripts.forEach(function (element) { - var attributes = element.attributes; - if (attributes && attributes.src && attributes.src.value.indexOf('cordova.js') !== -1) { - hasCordovaScript = true; - } - }); - - var cordovaLoadingIndicator = document.querySelector('.load-cordova'); - if (!hasCordovaScript) { - removeClass(document.querySelector('.ko-cordova'), 'is-hidden'); - addClass(cordovaLoadingIndicator, 'is-hidden'); - } - - // Add an event listener that is pending on the initialization - // of the platform layer API, if it is being used. - document.addEventListener("deviceready", function() { - if (console && console.log) { - console.log('Platform layer API ready'); - } - removeClass(document.querySelector('.ok-cordova'), 'is-hidden'); - addClass(cordovaLoadingIndicator, 'is-hidden'); - }, false); -}; - diff -Nru qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/templates/wizards/ubuntu/html5-simple/www/js/application.js qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/templates/wizards/ubuntu/html5-simple/www/js/application.js --- qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/templates/wizards/ubuntu/html5-simple/www/js/application.js 1970-01-01 00:00:00.000000000 +0000 +++ qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/templates/wizards/ubuntu/html5-simple/www/js/application.js 2015-05-08 08:37:05.000000000 +0000 @@ -0,0 +1,14 @@ +function Application(UIContext) { + this._uiContextClass = UIContext; + this._initialized = false; +}; +Application.prototype.init = function() { + if (this._uiContextClass && !this._initialized) { + this._initialized = true; + var UI = new this._uiContextClass(); + UI.init(); + } +}; +Application.prototype.initialized = function() { + return this._initialized; +}; diff -Nru qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/templates/wizards/ubuntu/html5-simple/www/js/ui.js qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/templates/wizards/ubuntu/html5-simple/www/js/ui.js --- qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/templates/wizards/ubuntu/html5-simple/www/js/ui.js 1970-01-01 00:00:00.000000000 +0000 +++ qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/templates/wizards/ubuntu/html5-simple/www/js/ui.js 2015-05-08 08:37:05.000000000 +0000 @@ -0,0 +1,47 @@ +/** + * Wait before the DOM has been loaded before initializing the Ubuntu UI layer + */ + +window.onload = function () { + function addClass(elem, className) { + if (elem) { + elem.className += ' ' + className; + } + }; + + function removeClass(elem, className) { + if (elem) { + elem.className = elem.className.replace(className, ''); + } + }; + + var app = new Application(UbuntuUI); + app.init(); + + // Detect if Cordova script is uncommented or not and show the appropriate status. + var hasCordovaScript = false; + var scripts = [].slice.call(document.querySelectorAll('script')); + scripts.forEach(function (element) { + var attributes = element.attributes; + if (attributes && attributes.src && attributes.src.value.indexOf('cordova.js') !== -1) { + hasCordovaScript = true; + } + }); + + var cordovaLoadingIndicator = document.querySelector('.load-cordova'); + if (!hasCordovaScript) { + removeClass(document.querySelector('.ko-cordova'), 'is-hidden'); + addClass(cordovaLoadingIndicator, 'is-hidden'); + } + + // Add an event listener that is pending on the initialization + // of the platform layer API, if it is being used. + document.addEventListener("deviceready", function() { + if (console && console.log) { + console.log('Platform layer API ready'); + } + removeClass(document.querySelector('.ok-cordova'), 'is-hidden'); + addClass(cordovaLoadingIndicator, 'is-hidden'); + }, false); +}; + diff -Nru qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/templates/wizards/ubuntu/qtquick-app-qmake/appName/Main.qml qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/templates/wizards/ubuntu/qtquick-app-qmake/appName/Main.qml --- qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/templates/wizards/ubuntu/qtquick-app-qmake/appName/Main.qml 2015-04-21 08:04:31.000000000 +0000 +++ qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/templates/wizards/ubuntu/qtquick-app-qmake/appName/Main.qml 2015-05-08 08:37:05.000000000 +0000 @@ -25,7 +25,7 @@ height: units.gu(75) Page { - title: i18n.tr("Simple") + title: i18n.tr("%ClickHookName%") Column { spacing: units.gu(1) diff -Nru qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/templates/wizards/ubuntu/scope/readme.txt qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/templates/wizards/ubuntu/scope/readme.txt --- qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/templates/wizards/ubuntu/scope/readme.txt 2015-04-21 08:04:31.000000000 +0000 +++ qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/templates/wizards/ubuntu/scope/readme.txt 2015-05-08 08:37:05.000000000 +0000 @@ -13,7 +13,8 @@ When you want to add a new language to the translation catalogue: - * Copy the .pot file from the "po" directory and rename it to e.g. "zh_CH.po". + * Copy the .pot file from the "po" directory and rename it to e.g. "zh_CN.po", + where "zh_CN" is the language code for China. * Enter the language code in "Language:". * Enter the "UTF-8" as the "Content-Type:". * Enter the translations in the msgstr tags. diff -Nru qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/templates/wizards/ubuntu/simple-app-qmake/appName/Main.qml qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/templates/wizards/ubuntu/simple-app-qmake/appName/Main.qml --- qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/templates/wizards/ubuntu/simple-app-qmake/appName/Main.qml 2015-04-21 08:04:31.000000000 +0000 +++ qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/templates/wizards/ubuntu/simple-app-qmake/appName/Main.qml 2015-05-08 08:37:05.000000000 +0000 @@ -25,7 +25,7 @@ height: units.gu(75) Page { - title: i18n.tr("Simple") + title: i18n.tr("%ClickHookName%") Column { spacing: units.gu(1) diff -Nru qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/templates/wizards/ubuntu/simple-app-qmlproject/Main.qml qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/templates/wizards/ubuntu/simple-app-qmlproject/Main.qml --- qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/templates/wizards/ubuntu/simple-app-qmlproject/Main.qml 2015-04-21 08:04:31.000000000 +0000 +++ qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/templates/wizards/ubuntu/simple-app-qmlproject/Main.qml 2015-05-08 08:37:05.000000000 +0000 @@ -25,7 +25,7 @@ height: units.gu(75) Page { - title: i18n.tr("Simple") + title: i18n.tr("%ClickHookName%") Column { spacing: units.gu(1) diff -Nru qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/templates/wizards/ubuntu/simple-i18n-cmake/app/displayName.qml qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/templates/wizards/ubuntu/simple-i18n-cmake/app/displayName.qml --- qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/templates/wizards/ubuntu/simple-i18n-cmake/app/displayName.qml 2015-04-21 08:04:31.000000000 +0000 +++ qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/templates/wizards/ubuntu/simple-i18n-cmake/app/displayName.qml 2015-05-08 08:37:05.000000000 +0000 @@ -27,7 +27,7 @@ height: units.gu(75) Page { - title: i18n.tr("Simple") + title: i18n.tr("%ClickHookName%") Column { spacing: units.gu(1) diff -Nru qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/ubuntu/menu.json qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/ubuntu/menu.json --- qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/ubuntu/menu.json 2015-04-21 08:04:31.000000000 +0000 +++ qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/ubuntu/menu.json 2015-05-08 08:37:05.000000000 +0000 @@ -313,122 +313,6 @@ ] } ] - }, - { - "name": "Device Control", - "id": "Ubuntu.Menu.Device", - "submenu": [ - { - "name": "SSH to Device", - "id": "Ubuntu.Menu.Device.SSH", - "keysequence": "Ctrl+F10", - "deviceRequired": true, - "actions": [ - "x-terminal-emulator -e \"ssh -i ~/.ssh/ubuntudevice_%SERIALNUMBER%_id_rsa -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null %USERNAME%@%IP% -p%PORT%\"" - ] - }, - { - "name": "Close All Applications on Device", - "id": "Ubuntu.Menu.Device.CloseAllApps", - "deviceRequired": true, - "actions": [ - "%SCRIPTDIRECTORY%/qtc_device_close_all_apps %SERIALNUMBER%" - ] - }, - { - "name": "Flash daily image on device", - "id": "Ubuntu.Menu.Device.FlashDaily", - "deviceRequired": true, - "actions": [ - "%SCRIPTDIRECTORY%/device_flashdaily %SERIALNUMBER%" - ] - }, - { - "name": "Flash daily image on device (with bootstrap)", - "id": "Ubuntu.Menu.Device.FlashDailyBootstrap", - "deviceRequired": true, - "actions": [ - "%SCRIPTDIRECTORY%/device_flashdaily_bootstrap %SERIALNUMBER%" - ] - } - ] - }, - { - "name": "Device Package Management", - "id": "Ubuntu.Menu.Device.AptGet", - "submenu": [ - { - "name": "Install Package", - "id": "Ubuntu.Menu.Device.AptGet.Install", - "deviceRequired": true, - "actions": [ - { - "queryDialog": { - "title": "Install Package", - "message": "Package Name:", - "value": "" - } - }, - "adb -s %SERIALNUMBER% root", - "adb -s %SERIALNUMBER% wait-for-device", - "adb -s %SERIALNUMBER% shell apt-get -y install %0" - ] - }, - { - "name": "Install Package Build Dependencies", - "id": "Ubuntu.Menu.Device.AptGet.BuildDep", - "deviceRequired": true, - "actions": [ - "adb -s %SERIALNUMBER% root", - "adb -s %SERIALNUMBER% wait-for-device", - { - "queryDialog": { - "title": "Install Package Build Dependencies", - "message": "Package Name:", - "value": "" - } - }, - "adb -s %SERIALNUMBER% shell apt-get -y build-dep %0" - ] - } - ] - }, - { - "name": "Android Debugging", - "id": "Ubuntu.Menu.Device.ADB", - "submenu": [ - { - "name": "adb shell", - "id": "Ubuntu.Menu.Device.ADB.shell", - "deviceRequired": true, - "actions": [ - "x-terminal-emulator -e \"adb -s %SERIALNUMBER% shell\"" - ] - }, - { - "name": "adb root", - "id": "Ubuntu.Menu.Device.ADB.root", - "deviceRequired": true, - "actions": [ - "adb -s %SERIALNUMBER% root" - ] - }, - { - "name": "adb devices", - "id": "Ubuntu.Menu.Device.ADB.devices", - "actions": [ - "adb devices" - ] - }, - { - "name": "adb shell setprop persist.sys.usb.config ptp,adb", - "id": "Ubuntu.Menu.Device.ADB.setUsbConfigPtpAdb", - "deviceRequired": true, - "actions": [ - "%SCRIPTDIRECTORY%/device_set_persist-sys-usb-config %SERIALNUMBER%" - ] - } - ] } ] } diff -Nru qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/ubuntu/qml/DevicesPage/DevicePage.qml qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/ubuntu/qml/DevicesPage/DevicePage.qml --- qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/ubuntu/qml/DevicesPage/DevicePage.qml 2015-04-21 08:04:31.000000000 +0000 +++ qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/ubuntu/qml/DevicesPage/DevicePage.qml 2015-05-08 08:37:05.000000000 +0000 @@ -307,7 +307,7 @@ } Button { id: deviceRedetectButton - text: "Redetect" + text: "Refresh" onClicked: devicesModel.triggerRedetect(deviceId) } } @@ -332,7 +332,7 @@ Layout.fillWidth: true } Button { - text: "Redetect" + text: "Refresh" onClicked: devicesModel.triggerRedetect(deviceId) } } @@ -506,14 +506,6 @@ anchors.right: parent.right ListItem.Standard { - text:"Clone time config from Host to Device" - control: Button{ - text: "Execute" - enabled: !deviceItemView.deviceBusy && !deviceItemView.detectionError - onClicked: devicesModel.triggerCloneTimeConfig(deviceId) - } - } - ListItem.Standard { text:"Enable port forwarding" control: Button{ text: "Execute" @@ -537,38 +529,6 @@ onClicked: devicesModel.triggerSSHConnection(deviceId) } } - ListItem.Standard { - text:"Restart" - control: Button{ - text: "Execute" - enabled: !deviceItemView.deviceBusy && !deviceItemView.detectionError - onClicked: devicesModel.triggerReboot(deviceId) - } - } - ListItem.Standard { - text:"Restart to bootloader" - control: Button{ - text: "Execute" - enabled: !deviceItemView.deviceBusy && !deviceItemView.detectionError - onClicked: devicesModel.triggerRebootBootloader(deviceId) - } - } - ListItem.Standard { - text:"Restart to recovery" - control: Button{ - text: "Execute" - enabled: !deviceItemView.deviceBusy && !deviceItemView.detectionError - onClicked: devicesModel.triggerRebootRecovery(deviceId) - } - } - ListItem.Standard { - text:"Shut down" - control: Button{ - text: "Execute" - enabled: !deviceItemView.deviceBusy && !deviceItemView.detectionError - onClicked: devicesModel.triggerShutdown(deviceId) - } - } } } diff -Nru qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/ubuntu/scripts/device_flashdaily qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/ubuntu/scripts/device_flashdaily --- qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/ubuntu/scripts/device_flashdaily 2015-04-21 08:04:31.000000000 +0000 +++ qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/ubuntu/scripts/device_flashdaily 1970-01-01 00:00:00.000000000 +0000 @@ -1,37 +0,0 @@ -#!/bin/bash -# Copyright 2013 Canonical Ltd. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; version 2.1. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program. If not, see . -# -# Author: Juhapekka Piiroinen - -. `dirname $0`/functions.inc - -if [[ `does_device_hw_match_image_hw` != "1" ]]; then - IMAGE_HARDWARE=`device_image_hardware` - DEVICE_HARDWARE=`device_hardware` - echo - echo " WARNING! Device image hardware version" - echo " does not match the detected device hardware." - echo - echo -n " Device Image Version: " - echo ${IMAGE_HARDWARE} - echo -n " Device Version: " - echo ${DEVICE_HARDWARE} - echo - echo " In order to flash your device, you must do it manually:" - echo " ubuntu-device-flash --channel=devel-proposed --serial=${SERIALNUMBER}" - echo -else - x-terminal-emulator -e "bash -ic 'ubuntu-device-flash --channel=devel-proposed --serial=${SERIALNUMBER}'" -fi diff -Nru qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/ubuntu/scripts/device_flashdaily_bootstrap qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/ubuntu/scripts/device_flashdaily_bootstrap --- qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/ubuntu/scripts/device_flashdaily_bootstrap 2015-04-21 08:04:31.000000000 +0000 +++ qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/ubuntu/scripts/device_flashdaily_bootstrap 1970-01-01 00:00:00.000000000 +0000 @@ -1,37 +0,0 @@ -#!/bin/bash -# Copyright 2013 Canonical Ltd. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; version 2.1. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program. If not, see . -# -# Author: Juhapekka Piiroinen - -. `dirname $0`/functions.inc - -if [[ `does_device_hw_match_image_hw` != "1" ]]; then - IMAGE_HARDWARE=`device_image_hardware` - DEVICE_HARDWARE=`device_hardware` - echo - echo " WARNING! Device image hardware version" - echo " does not match the detected device hardware." - echo - echo -n " Device Image Version: " - echo \"${IMAGE_HARDWARE}\" - echo -n " Device Version: " - echo \"${DEVICE_HARDWARE}\" - echo - echo " In order to flash your device, you must do it manually:" - echo " ubuntu-device-flash --channel=devel-proposed --serial=${SERIALNUMBER} --bootstrap" - echo -else - x-terminal-emulator -e "bash -ic 'ubuntu-device-flash --channel=devel-proposed --serial=${SERIALNUMBER} --bootstrap'" -fi diff -Nru qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/ubuntu/scripts/device_reboot qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/ubuntu/scripts/device_reboot --- qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/ubuntu/scripts/device_reboot 2015-04-21 08:04:31.000000000 +0000 +++ qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/ubuntu/scripts/device_reboot 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -#!/bin/bash -# Copyright 2013 Canonical Ltd. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; version 2.1. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program. If not, see . -# -# Author: Juhapekka Piiroinen - -. `dirname $0`/functions.inc - -device_reboot diff -Nru qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/ubuntu/scripts/device_reboot2bootloader qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/ubuntu/scripts/device_reboot2bootloader --- qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/ubuntu/scripts/device_reboot2bootloader 2015-04-21 08:04:31.000000000 +0000 +++ qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/ubuntu/scripts/device_reboot2bootloader 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ -#!/bin/bash -# Copyright 2013 Canonical Ltd. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; version 2.1. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program. If not, see . -# -# Author: Juhapekka Piiroinen - -. `dirname $0`/functions.inc - -device_reboot_bootloader - diff -Nru qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/ubuntu/scripts/device_reboot2recovery qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/ubuntu/scripts/device_reboot2recovery --- qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/ubuntu/scripts/device_reboot2recovery 2015-04-21 08:04:31.000000000 +0000 +++ qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/ubuntu/scripts/device_reboot2recovery 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -#!/bin/bash -# Copyright 2013 Canonical Ltd. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; version 2.1. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program. If not, see . -# -# Author: Juhapekka Piiroinen - -. `dirname $0`/functions.inc - -device_reboot_recovery diff -Nru qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/ubuntu/scripts/device_rootshell qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/ubuntu/scripts/device_rootshell --- qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/ubuntu/scripts/device_rootshell 2015-04-21 08:04:31.000000000 +0000 +++ qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/ubuntu/scripts/device_rootshell 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -#!/bin/bash -# Copyright 2013 Canonical Ltd. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; version 2.1. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program. If not, see . -# -# Author: Juhapekka Piiroinen - -. `dirname $0`/functions.inc - -adb_shell diff -Nru qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/ubuntu/scripts/device_set_persist-sys-usb-config qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/ubuntu/scripts/device_set_persist-sys-usb-config --- qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/ubuntu/scripts/device_set_persist-sys-usb-config 2015-04-21 08:04:31.000000000 +0000 +++ qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/ubuntu/scripts/device_set_persist-sys-usb-config 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -#!/bin/bash -# Copyright 2013 Canonical Ltd. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; version 2.1. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program. If not, see . -# -# Author: Juhapekka Piiroinen - -. `dirname $0`/functions.inc - -adb_shell setprop persist.sys.usb.config ptp,adb diff -Nru qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/ubuntu/scripts/device_shutdown qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/ubuntu/scripts/device_shutdown --- qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/ubuntu/scripts/device_shutdown 2015-04-21 08:04:31.000000000 +0000 +++ qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/ubuntu/scripts/device_shutdown 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -#!/bin/bash -# Copyright 2013 Canonical Ltd. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; version 2.1. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program. If not, see . -# -# Author: Juhapekka Piiroinen - -. `dirname $0`/functions.inc - -device_shutdown diff -Nru qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/ubuntu/scripts/device_time_clone qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/ubuntu/scripts/device_time_clone --- qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/ubuntu/scripts/device_time_clone 2015-04-21 08:04:31.000000000 +0000 +++ qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/ubuntu/scripts/device_time_clone 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -#!/bin/bash -# Copyright 2013 Canonical Ltd. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; version 2.1. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program. If not, see . -# -# Author: Zoltán Balogh -# Juhapekka Piiroinen - -. `dirname $0`/functions.inc - -LOCAL_DATE=`date +%Y%m%d` -LOCAL_TIME=`date +%T` -TIMEZONE=`cat /etc/timezone` - -adb_shell sed -i "s#.*/.*#${TIMEZONE=}#" /etc/timezone -adb_shell dpkg-reconfigure --frontend noninteractive tzdata > /dev/null -adb_shell date +%Y%m%d -s "${LOCAL_DATE}" > /dev/null -adb_shell date +%T -s "${LOCAL_TIME}" > /dev/null - diff -Nru qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/ubuntu/scripts/functions.inc qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/ubuntu/scripts/functions.inc --- qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/ubuntu/scripts/functions.inc 2015-04-21 08:04:31.000000000 +0000 +++ qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/ubuntu/scripts/functions.inc 2015-05-08 08:37:05.000000000 +0000 @@ -108,22 +108,6 @@ fi } -function device_reboot { - adb_shell reboot -} - -function device_reboot_bootloader { - adb -s ${SERIALNUMBER} reboot-bootloader -} - -function device_reboot_recovery { - adb -s ${SERIALNUMBER} reboot recovery -} - -function device_shutdown { - adb_shell shutdown -h now -} - function wait_for_network_state_switch_on { local RESULT=`device_network_state_connected` while [[ "$RESULT" -eq "0" ]]; do diff -Nru qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/ubuntu/scripts/qtc_cmakeproject_click_create qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/ubuntu/scripts/qtc_cmakeproject_click_create --- qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/ubuntu/scripts/qtc_cmakeproject_click_create 2015-04-21 08:04:31.000000000 +0000 +++ qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/ubuntu/scripts/qtc_cmakeproject_click_create 1970-01-01 00:00:00.000000000 +0000 @@ -1,102 +0,0 @@ -#!/bin/bash -# Copyright 2014 Canonical Ltd. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; version 2.1. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program. If not, see . -# -# Author: Benjamin Zeller - -USAGE="Usage: $0 targetArch targetFramework targetSeries projectDir projectName" - -if [ $# -lt 3 ]; then - echo "$USAGE" - exit 1 -fi - -ARCH=$1 -shift -FRAMEWORK=$1 -shift -SERIES=$1 -shift -PROJECTDIR=$1 -shift -PROJECTNAME=$1 -shift - -echo "Building package for ${PROJECTNAME}" - -SCRIPTPATH=$(dirname $0) -BUILDDIR="${FRAMEWORK}-${ARCH}" -INSTALLDIR="click_package" - -#make sure the project was already built, if not build it -if [ ! -d ${BUILDDIR} ] -then - mkdir ${BUILDDIR} -fi - -cd ${BUILDDIR} - -#make sure the binaries are up to date and installed in our click directory -set -e -${SCRIPTPATH}/qtc_chroot_cmake ${ARCH} ${FRAMEWORK} ${SERIES} ${PROJECTDIR} -${SCRIPTPATH}/qtc_fixmoc ${ARCH} ${FRAMEWORK} ${SERIES} -${SCRIPTPATH}/qtc_chroot_make ${ARCH} ${FRAMEWORK} ${SERIES} - -#cleanup the install dir -rm -rf ${INSTALLDIR} - -#install the click package tree -${SCRIPTPATH}/qtc_chroot_make ${ARCH} ${FRAMEWORK} ${SERIES} DESTDIR=${INSTALLDIR} install - -#make sure the manifest file contains our arch -sed -i 's/"architecture".*,/"architecture": "'${ARCH}'",/g' ${INSTALLDIR}/manifest.json -set +e - -pushd . -cd ${INSTALLDIR} - -DESKTOPFILE=$(${SCRIPTPATH}/qtc_find_desktopfile ${PROJECTNAME}) -if [[ ! $? -eq 0 ]] -then -echo " /!\\ no desktop file found /!\\" -echo " You will have to create one." -exit 1 -fi - -echo "Found a desktopfile: ${DESKTOPFILE}" - -${SCRIPTPATH}/qtc_fix_desktop_comment ${DESKTOPFILE} -popd - -#create the package -click build ${INSTALLDIR} > /tmp/click.log 2> /tmp/click.err - -# lets check the results -if [[ ${?} -eq 0 ]]; then - echo - echo "Package has been created to" - PACKAGENAME=`cat /tmp/click.log|sed "s/.*\('.*'\).*/\1/" | sed "s/'//g" | sed "s/.\///" | xargs -ICLICKPACKAGE echo $(pwd)/CLICKPACKAGE` - echo "$PACKAGENAME" -else - echo - echo "There was some failure when creating the package." - echo "See /tmp/click.err for details." - echo - - cd .. - exit 1 -fi - -#back into working dir -cd .. diff -Nru qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/ubuntu/scripts/qtc_cmakeproject_click_createanddeploy qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/ubuntu/scripts/qtc_cmakeproject_click_createanddeploy --- qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/ubuntu/scripts/qtc_cmakeproject_click_createanddeploy 2015-04-21 08:04:31.000000000 +0000 +++ qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/ubuntu/scripts/qtc_cmakeproject_click_createanddeploy 1970-01-01 00:00:00.000000000 +0000 @@ -1,48 +0,0 @@ -#!/bin/bash -# Copyright 2013 Canonical Ltd. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; version 2.1. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program. If not, see . -# -# Author: Juhapekka Piiroinen - -. `dirname $0`/functions.inc -shift - -FOLDERNAME=$1 -shift -TARGET_DEVICE=$1 -shift -TARGET_DEVICE_PORT=$1 -shift -TARGET_DEVICE_HOME=$1 -shift -TARGET_DEVICE_USERNAME=$1 -shift - - -set +e -echo "Lets create the click package for the project using cmake." -echo "${@}" -${SCRIPTPATH}/qtc_cmakeproject_click_create $@ > /tmp/qtc_click_create.log - -if [[ $? -eq 0 ]]; then - set -e - PACKAGENAME=`cat /tmp/qtc_click_create.log|tail -n1` - echo "$PACKAGENAME has been created." -else - cat /tmp/qtc_click_create.log - exit -1 -fi - -${SCRIPTPATH}/qtc_project_click_deploy ${SERIALNUMBER} ${PACKAGENAME} ${TARGET_DEVICE} ${TARGET_DEVICE_PORT} ${TARGET_DEVICE_HOME} ${TARGET_DEVICE_USERNAME} - diff -Nru qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/ubuntu/scripts/qtc_device_close_all_apps qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/ubuntu/scripts/qtc_device_close_all_apps --- qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/ubuntu/scripts/qtc_device_close_all_apps 2015-04-21 08:04:31.000000000 +0000 +++ qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/ubuntu/scripts/qtc_device_close_all_apps 1970-01-01 00:00:00.000000000 +0000 @@ -1,48 +0,0 @@ -#!/bin/bash -# Copyright 2013 Canonical Ltd. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; version 2.1. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program. If not, see . -# -# Author: Juhapekka Piiroinen - -. `dirname $0`/functions.inc - -APPLICATION=$2 - -if [[ -z ${APPLICATION} ]]; then - echo "Close all instances of running applications." - adb_shell kill -s 9 \`pidof qmlscene\` -else - echo "Close the ${APPLICATION}." - set +e - IS_MOUNTED=`adb_shell mount | grep proc` - set -e - if [[ -z ${IS_MOUNTED} ]]; then - adb_shell mount -t proc proc /proc - fi - - PID_OF_APP=`adb_shell COLUMNS=1000 ps -ef|grep qmlscene|grep ${APPLICATION}|awk '{print $2}'` - if [[ -z $PID_OF_APP ]]; then - echo " *no running instances of application*" - exit 1 - fi - - echo " * application pid(s) is ${PID_OF_APP}." - - adb_shell kill -s 9 ${PID_OF_APP} - - if [[ -z ${IS_MOUNTED} ]]; then - adb_shell umount /proc - fi - echo "Application has been closed." -fi diff -Nru qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/ubuntu/scripts/qtc_device_deploy_package qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/ubuntu/scripts/qtc_device_deploy_package --- qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/ubuntu/scripts/qtc_device_deploy_package 2015-04-21 08:04:31.000000000 +0000 +++ qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/ubuntu/scripts/qtc_device_deploy_package 1970-01-01 00:00:00.000000000 +0000 @@ -1,68 +0,0 @@ -#!/bin/bash -# Copyright 2013 Canonical Ltd. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; version 2.1. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program. If not, see . -# -# Author: Juhapekka Piiroinen - -. `dirname $0`/functions.inc - -PACKAGE=$2 -TARGET_DEVICE=$3 -TARGET_DEVICE_PORT=$4 -TARGET_DEVICE_HOME=$5 - -echo -echo "Deploying package to device with serial number of ${SERIALNUMBER}." -echo "Using SSH identity from ${SSHIDENTITY}." -echo - -USAGE="$0 [serialnumber] [package] [target_device] [target_device_port] [target_device_home]" - -if [[ -z $PACKAGE || -z $TARGET_DEVICE || -z $TARGET_DEVICE_PORT || -z $TARGET_DEVICE_HOME ]]; then - echo ${USAGE} - exit -fi - -# lets make the ssh port forwarding back on, as the developer might have rebooted the device -echo "do port forwarding" -set +e -${SCRIPTPATH}/device_portforward ${TARGET_DEVICE_PORT} 3768 -set -e -echo "done" -# check if we have .pro files or cpp/h files, if we do lets exit, as this deployment method is for QML projects -H_FILES=`find . -name *.h` -CPP_FILES=`find . -name *.cpp` - -if [[ -z ${H_FILES} && -z ${CPP_FILES} ]]; then - echo "Detected: QML project" -else - echo "Detected: Hybrid project" - echo " -> This deployment method is meant for QML projects only." - echo " Use Tools > Ubuntu Touch > C++" - exit 1 -fi - -# Case lowered due to bug #1213902 -PLAIN_PACKAGE=`basename ${PACKAGE,,}` -SCRIPTPATH=`dirname $0` - -SCP="scp -i ${SSHIDENTITY} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -P${TARGET_DEVICE_PORT}" -SSH="ssh -i ${SSHIDENTITY} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -p${TARGET_DEVICE_PORT} ${TARGET_DEVICE}" - -# -- actions -- -$SCP ${PACKAGE} ${TARGET_DEVICE}:${TARGET_DEVICE_HOME} -adb_shell gdebi --n ${TARGET_DEVICE_HOME}/${PLAIN_PACKAGE} - -# Commented out due to bug #1213902 -#$SCRIPTPATH/qtc_device_restart_appslense ${SERIALNUMBER} diff -Nru qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/ubuntu/scripts/qtc_device_restart_appslense qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/ubuntu/scripts/qtc_device_restart_appslense --- qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/ubuntu/scripts/qtc_device_restart_appslense 2015-04-21 08:04:31.000000000 +0000 +++ qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/ubuntu/scripts/qtc_device_restart_appslense 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ -#!/bin/bash -# Copyright 2013 Canonical Ltd. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; version 2.1. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program. If not, see . -# -# Author: Juhapekka Piiroinen - -. `dirname $0`/functions.inc - -# -- actions -- -adb_shell kill -s 9 \`pidof unity-applications-daemon\` -adb_shell bash -c "/usr/lib/arm-linux-gnueabihf/unity-lens-applications/unity-applications-daemon > /dev/null &" diff -Nru qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/ubuntu/scripts/qtc_device_run_app qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/ubuntu/scripts/qtc_device_run_app --- qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/ubuntu/scripts/qtc_device_run_app 2015-04-21 08:04:31.000000000 +0000 +++ qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/ubuntu/scripts/qtc_device_run_app 1970-01-01 00:00:00.000000000 +0000 @@ -1,124 +0,0 @@ -#!/bin/bash -# Copyright 2013 Canonical Ltd. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; version 2.1. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program. If not, see . -# -# Author: Juhapekka Piiroinen - -. `dirname $0`/functions.inc - -APP_LAUNCHER=$2 -FOLDERNAME=$3 -DESKTOP_FILENAME=$4 -MAIN_QML=$5 -TARGET_DEVICE_HOME=$6 -TARGET_DEVICE=$7 -TARGET_DEVICE_PORT=$8 -# potential prefix that should be prepended to the target app path -shift -APP_LAUNCH_PREFIX=$8 -shift -EXTRA_COMMAND_LINE_ARGS=$8 - -APP_ID=$(echo ${DESKTOP_FILENAME}|sed "s/\.desktop//") - -USAGE="$0 [serialnumber] [app_launcher] [foldername] [desktop_filename] [main_qml] [target_device_home] [target_device] [target_device_port] [optional_app_launch_prefix] [optional_extra_command_line_args]" - - -if [[ -z ${FOLDERNAME} ]]; then - echo ${USAGE} - exit -fi - -if [[ ! -e "${FOLDERNAME}/${DESKTOP_FILENAME}" ]]; then - echo "Reading desktop file from manifest" - DESKTOP_FILENAME=$(grep desktop ${FOLDERNAME}/manifest.json | cut -d: -f2 | sed "s/\"//g" | tr -d ' ') - echo "Trying ${PWD}/${FOLDERNAME}/${DESKTOP_FILENAME}" - - if [[ ! -e "${FOLDERNAME}/${DESKTOP_FILENAME}" ]]; then - echo "No desktop file found"; - exit 1; - fi -fi - -if [[ -z ${APP_LAUNCHER} ]]; then - APP_LAUNCHER=qmlscene -fi - -if [[ -z ${MAIN_QML} ]]; then - MAIN_QML=main.qml -fi - -if [[ -z ${TARGET_DEVICE_PORT} ]]; then - TARGET_DEVICE_PORT=2222 -fi - -if [[ -z ${TARGET_DEVICE} ]]; then - TARGET_DEVICE=phablet@127.0.0.1 -fi - -if [[ -z ${TARGET_DEVICE_HOME} ]]; then - TARGET_DEVICE_HOME=/home/phablet/dev_tmp -fi - -SSH_CRED="ssh -i ${SSHIDENTITY} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -p${TARGET_DEVICE_PORT}" -SCP="scp -i ${SSHIDENTITY} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -P${TARGET_DEVICE_PORT}" -SSH="ssh -i ${SSHIDENTITY} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -p${TARGET_DEVICE_PORT} ${TARGET_DEVICE}" -RSYNC="rsync --delete -avzP -e" - -# get dbus session addrss from the device -DBUS_SESSION_BUS_ADDRESS=`$SSH "cat ~/.cache/upstart/dbus-session|grep DBUS_SESSION_BUS_ADDRESS"` - -#read additional arguments from the desktop file -echo "Trying to read additional arguments from ${FOLDERNAME}/${DESKTOP_FILENAME}" -ARGS_FROM_DESKTOP= -IFS=', ' read -a ARGUMENTS <<< $(cat "${FOLDERNAME}/${DESKTOP_FILENAME}" | grep Exec | cut -d = -f 2) -LIMIT=${#ARGUMENTS[@]} -for ((a=1; a <= LIMIT ; a++)) # Double parentheses, and naked "LIMIT" -do - #if we have a relative path, prefix it with the target home path - if [[ ${ARGUMENTS[$a]} == "-I" ]] - then - IMPORT_PATH=${ARGUMENTS[$a+1]} - if [[ "${IMPORT_PATH}" != /* ]] - then - IMPORT_PATH=$(echo "${IMPORT_PATH}" | sed "s;\./;;" | sed "s;^;${TARGET_DEVICE_HOME}\/${APP_ID}\/;") - else - echo "Please use only relative paths for imports in the desktop file" - exit 1 - fi - ARGS_FROM_DESKTOP="-I ${IMPORT_PATH} ${ARGS_FROM_DESKTOP}" - fi -done -echo "IMPORT: ${ARGS_FROM_DESKTOP}" - -DESKTOP_FILE_TARGET="${TARGET_DEVICE_HOME}/../.local/share/applications/$(basename ${DESKTOP_FILENAME})" - -COMMAND="cp ${TARGET_DEVICE_HOME}/${FOLDERNAME}/${DESKTOP_FILENAME} ${DESKTOP_FILE_TARGET} && test -f /etc/ubuntu-touch-session.d/\$(getprop ro.product.device).conf && for myenv in \$(cat /etc/ubuntu-touch-session.d/\$(getprop ro.product.device).conf); do `echo \"export\" \\\$myenv`; done ; export ${DBUS_SESSION_BUS_ADDRESS=}; APP_ID=${APP_ID} ${APP_LAUNCHER} ${ARGS_FROM_DESKTOP} ${APP_LAUNCH_PREFIX}${TARGET_DEVICE_HOME}/${APP_ID}/${MAIN_QML} --desktop_file_hint=${DESKTOP_FILE_TARGET} ${EXTRA_COMMAND_LINE_ARGS}" -echo "Going to execute: ${COMMAND}" - -# make sure that the device has the target directory -$SSH mkdir -p ${TARGET_DEVICE_HOME} -$SSH mkdir -p ${TARGET_DEVICE_HOME}/${APP_ID} - -# transfer the package to the device -$RSYNC "${SSH_CRED}" ${FOLDERNAME}/ ${TARGET_DEVICE}:${TARGET_DEVICE_HOME}/${APP_ID} - -echo "Starting the application .... " - -# fix the desktopfile Exec path -$SSH sed -i "s/^Exec=.*//g" ${TARGET_DEVICE_HOME}/${APP_ID}/${DESKTOP_FILENAME} -$SSH "echo 'Exec=/usr/bin/${COMMAND}' >> ${TARGET_DEVICE_HOME}/${APP_ID}/${DESKTOP_FILENAME}" - -# run the application on the device -$SSH "bash -ic 'source /etc/profile; ${COMMAND}'" diff -Nru qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/ubuntu/scripts/qtc_device_run_app_click qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/ubuntu/scripts/qtc_device_run_app_click --- qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/ubuntu/scripts/qtc_device_run_app_click 2015-04-21 08:04:31.000000000 +0000 +++ qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/ubuntu/scripts/qtc_device_run_app_click 1970-01-01 00:00:00.000000000 +0000 @@ -1,47 +0,0 @@ -#!/bin/bash -# Copyright 2014 Canonical Ltd. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; version 2.1. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program. If not, see . -# -# Author: Benjamin Zeller - -. `dirname $0`/functions.inc - -FOLDERNAME=$2 -TARGET_DEVICE=$3 -TARGET_DEVICE_PORT=$4 -TARGET_DEVICE_HOME=$5 - -USAGE="$0 [serialnumber] [foldername] [target_device] [target_device_port] [target_device_home]" - -set +e - -#first build on the device -${SCRIPTPATH}/qtc_project_click_create ${FOLDERNAME} > /tmp/qtc_click_create.log - -if [[ $? -eq 0 ]]; then - set -e - PACKAGENAME=$(cat /tmp/qtc_click_create.log | tail -n1) - echo "$PACKAGENAME has been created." -else - cat /tmp/qtc_click_create.log - exit -1 -fi - -SCP="scp -i ${SSHIDENTITY} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -P${TARGET_DEVICE_PORT}" -SSH="ssh -i ${SSHIDENTITY} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -p${TARGET_DEVICE_PORT} ${TARGET_DEVICE}" - -adb -s ${SERIALNUMBER} push "${SCRIPTPATH}/qtc_device_applaunch.py" /tmp -adb -s ${SERIALNUMBER} push "${PACKAGENAME}" /tmp -$SSH "bash -ic 'source /etc/profile; /tmp/qtc_device_applaunch.py /tmp/$(basename ${PACKAGENAME})'" - diff -Nru qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/ubuntu/scripts/qtc_project_click_create qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/ubuntu/scripts/qtc_project_click_create --- qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/ubuntu/scripts/qtc_project_click_create 2015-04-21 08:04:31.000000000 +0000 +++ qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/ubuntu/scripts/qtc_project_click_create 1970-01-01 00:00:00.000000000 +0000 @@ -1,116 +0,0 @@ -#!/bin/bash -# Copyright 2013 Canonical Ltd. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; version 2.1. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program. If not, see . -# -# Author: Juhapekka Piiroinen - -SCRIPTPATH=`dirname $0` - -PROJECTPATH=$1 - -if [[ -z ${PROJECTPATH} ]]; then - PROJECTPATH=`pwd` -fi - -echo -echo "Click packaging project in ${PROJECTPATH}." -echo - -pushd ${PROJECTPATH} >> /dev/null - echo - echo "Searching for desktop file.." - QMLPROJECT=`ls *.qmlproject|sed "s/\.qmlproject//"` - - DESKTOPFILE=$( ${SCRIPTPATH}/qtc_find_desktopfile ${QMLPROJECT} ) - if [[ ! $? -eq 0 ]] - then - echo " /!\\ no desktop file found /!\\" - echo " You will have to create one." - exit 1 - fi - - echo "Found a desktopfile: ${DESKTOPFILE}" - - # lets check if the manifest.json exists - if [[ -f manifest.json ]]; then - echo - echo "Found manifest.json." - else - echo - echo " /!\\ manifest.json does not exist /!\\" - echo " You will have to create one using the Packaging tab." - exit -1 - fi - - # determine MAINQML - - MAINQML=`cat ${QMLPROJECT}.qmlproject|grep mainFile|sed "s/.*\(\".*\"\).*/\1/"|sed "s/\"//g"` - echo "Main file is ${MAINQML}" - - #------------------ - - # lets copy the original desktop file - cp ${DESKTOPFILE} /tmp/${DESKTOPFILE} - - #fix the comment in desktop file - ${SCRIPTPATH}/qtc_fix_desktop_comment ${DESKTOPFILE} - - # read the arguments to qmlscene - QMLSCENE_ARGS=`cat ${DESKTOPFILE} | grep -o "qmlscene.*\$\@" | sed "s/\(qmlscene\|\$\@\)//g"` - - # lets replace the Exec line - sed -i "s/^Exec=[ a-z0-9A-Z\/]*qmlscene.*/Exec=qmlscene ${QMLSCENE_ARGS} \$@ ${MAINQML}/g" ${DESKTOPFILE} - - # lets build the package - cd .. - - # copy project files to build directory - - RESULTPATH=`pwd` - BUILDPATH=${PROJECTPATH}_build - rm -Rf ${BUILDPATH} - mkdir -p ${BUILDPATH} - - # read .excludes file from the projectpath - PROJECT_EXCLUDES="--exclude .bzr --exclude .git --exclude .hg --exclude .svn --exclude *.qmlproject --exclude *.user --exclude tests --exclude Makefile --exclude .excludes" - if [[ -f ${PROJECTPATH}/.excludes ]]; then - for EXCLUDE in `cat ${PROJECTPATH}/.excludes`; do - PROJECT_EXCLUDES+=" --exclude ${EXCLUDE}" - done - fi - - # we are printing also a filelist to the stdout which files are going to be inside the package - echo - rsync -avh ${PROJECT_EXCLUDES} ${PROJECTPATH}/* ${BUILDPATH}/ - - # build the build path - click build ${BUILDPATH} > /tmp/click.log 2> /tmp/click.err - - # lets check the results - if [[ ${?} -eq 0 ]]; then - echo - echo "Package has been created to" - PACKAGENAME=`cat /tmp/click.log|sed "s/.*\('.*'\).*/\1/" | sed "s/'//g" | sed "s/.\///" | xargs -ICLICKPACKAGE echo ${RESULTPATH}/CLICKPACKAGE` - echo "$PACKAGENAME" - else - echo - echo "There was some failure when creating the package." - echo "See /tmp/click.err for details." - echo - fi - cd - > /dev/null - - # restore the original desktop file - mv /tmp/${DESKTOPFILE} ${DESKTOPFILE} -popd > /dev/null diff -Nru qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/ubuntu/scripts/qtc_project_click_createanddeploy qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/ubuntu/scripts/qtc_project_click_createanddeploy --- qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/ubuntu/scripts/qtc_project_click_createanddeploy 2015-04-21 08:04:31.000000000 +0000 +++ qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/ubuntu/scripts/qtc_project_click_createanddeploy 1970-01-01 00:00:00.000000000 +0000 @@ -1,39 +0,0 @@ -#!/bin/bash -# Copyright 2013 Canonical Ltd. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; version 2.1. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program. If not, see . -# -# Author: Juhapekka Piiroinen - -. `dirname $0`/functions.inc - -FOLDERNAME=$2 - -set +e -echo "Lets create the click package for the project." -${SCRIPTPATH}/qtc_project_click_create ${FOLDERNAME} > /tmp/qtc_click_create.log - -if [[ $? -eq 0 ]]; then - set -e - PACKAGENAME=`cat /tmp/qtc_click_create.log|tail -n1` - echo "$PACKAGENAME has been created." -else - cat /tmp/qtc_click_create.log - exit -1 -fi - -echo "${SCRIPTPATH}/qtc_project_click_deploy" -${SCRIPTPATH}/qtc_project_click_deploy $1 ${PACKAGENAME} $3 $4 $5 $6 - - - diff -Nru qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/ubuntu/scripts/qtc_project_create_package qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/ubuntu/scripts/qtc_project_create_package --- qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/ubuntu/scripts/qtc_project_create_package 2015-04-21 08:04:31.000000000 +0000 +++ qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/ubuntu/scripts/qtc_project_create_package 1970-01-01 00:00:00.000000000 +0000 @@ -1,51 +0,0 @@ -#!/bin/bash -# Copyright 2013 Canonical Ltd. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; version 2.1. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program. If not, see . -# -# Author: Juhapekka Piiroinen -set -e - -SCRIPTPATH=`dirname $0` -# -- actions -- -if [[ ! -d debian ]]; then - ${SCRIPTPATH}/qtc_project_packaging . -fi - -${SCRIPTPATH}/qtc_project_debuild - -QMLDEPS=`${SCRIPTPATH}/qtc_project_detect_qmldeps` - -if [[ -d debian ]]; then - awk "NR < `egrep "^Depends:" -in debian/control|sed "s/:.*//g"|head -1`+1" debian/control|sed "s/^Depends:.*/${QMLDEPS}qmlscene/g" > debian/control.new - awk "NR >= `egrep "^Description:" -in debian/control|sed "s/:.*//g"|head -1`" debian/control >> debian/control.new - mv debian/control.new debian/control -fi -#sed -i "s/^Depends:.*/${QMLDEPS}qmlscene/g" debian/control - - -# Detect if we have QML project only -set +e -H_FILES=`find . -type f |grep .h$` -CPP_FILES=`find . -type f |grep .cpp$` -PRO_FILES=`find . -type f |grep .pro$` -set -e - -if [[ -z ${H_FILES} && -z ${CPP_FILES} && -z ${PRO_FILES} ]]; then - echo "Detected: QML project" - sed -i "s/^Architecture: any$/Architecture: all/g" debian/control -else - echo "Detected: CPP project" -fi - -dpkg-buildpackage -us -uc -nc diff -Nru qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/ubuntu/scripts/qtc_project_debuild qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/ubuntu/scripts/qtc_project_debuild --- qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/ubuntu/scripts/qtc_project_debuild 2015-04-21 08:04:31.000000000 +0000 +++ qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/ubuntu/scripts/qtc_project_debuild 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -#!/bin/bash -# Copyright 2013 Canonical Ltd. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; version 2.1. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program. If not, see . -# -# Author: Juhapekka Piiroinen -set -e; - -# -- actions -- -debuild -i -I -S -sa -us -uc -nc \ No newline at end of file diff -Nru qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/ubuntu/scripts/qtc_project_detect_qmldeps qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/ubuntu/scripts/qtc_project_detect_qmldeps --- qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/ubuntu/scripts/qtc_project_detect_qmldeps 2015-04-21 08:04:31.000000000 +0000 +++ qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/ubuntu/scripts/qtc_project_detect_qmldeps 1970-01-01 00:00:00.000000000 +0000 @@ -1,34 +0,0 @@ -#!/bin/bash -# Copyright 2013 Canonical Ltd. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; version 2.1. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program. If not, see . -# -# Author: Zoltán Balogh -# Juhapekka Piiroinen - -PROJECT_PATH=$1 -if [[ -z ${PROJECT_PATH=} ]]; then - PROJECT_PATH=./ -fi - -if [[ -d debian ]]; then - OLD_DEPENDS=`grep -m 1 "^Depends:" debian/control -A\`echo \\\`cat debian/control |egrep "^Description:|^Depends:" -in|sed "s/:.*//g"|sort -r|tail -2|tr '\n' '-'\\\`1|bc\`|sed "s/[ ]*//g;s/,/\n/g;s/Depends://g"|sed "/^$/d"|egrep -v "qmlscene|qt-components-ubuntu|misc:Depends"` -fi - -QT_INSTALL_QML=`qmake -query QT_INSTALL_QML` -REGEXP_FOR_QML_MODULES=`find $PROJECT_PATH -name "*.qml"|xargs egrep "^[ \t]*import"|egrep -v "\""|sed -e 's/[ \t]*import/import/'|awk '{print $2 "\.*[0-9]*\/*[qmldir]*$|"}'|sort|uniq|tr -d '\n'|sed "s/|$//"` -DEPS_BY_PLUGINS=`find $QT_INSTALL_QML -name "qmldir"|xargs egrep -l "$REGEXP_FOR_QML_MODULES"|xargs dpkg -S|awk '{print $1}'| sort|uniq |sed "s/:.*[:,]//g"` -DEPS_BY_QML_MODULES=`find $QT_INSTALL_QML -name "qmldir"|egrep "$REGEXP_FOR_QML_MODULES"|xargs dpkg -S|grep $QT_INSTALL_QML|awk '{print $1}'| sort|uniq |sed "s/:.*[:,]//g"` -echo -n Depends: \${misc:Depends}, -echo -n $DEPS_BY_PLUGINS $DEPS_BY_QML_MODULES $OLD_DEPENDS|tr ' ' '\n'|sort|uniq|tr '\n' ','|sed "s/qtdeclarative5-ubuntu-ui-toolkit-plugin/qtdeclarative5-ubuntu-ui-toolkit-plugin|qt-components-ubuntu/"|sed "s/:,/,/g" - diff -Nru qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/ubuntu/scripts/qtc_project_packaging qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/ubuntu/scripts/qtc_project_packaging --- qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/ubuntu/scripts/qtc_project_packaging 2015-04-21 08:04:31.000000000 +0000 +++ qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/ubuntu/scripts/qtc_project_packaging 1970-01-01 00:00:00.000000000 +0000 @@ -1,118 +0,0 @@ -#!/bin/bash -# Copyright 2013 Canonical Ltd. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; version 2.1. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program. If not, see . -# -# Author: Juhapekka Piiroinen - -DEBEMAIL=`grep -G "^DEBEMAIL" ~/.bashrc` -DEBFULLNAME=`grep -G "^DEBFULLNAME" ~/.bashrc` - -if [[ ! -z "$DEBEMAIL" ]]; then - export $DEBEMAIL -else - CMD=`grep -G "export DEBEMAIL=" ~/.bashrc|sed "s/\"//g"` - if [[ ! -z $CMD ]]; then - $CMD - fi -fi -if [[ ! -z $DEBFULLNAME ]]; then - export $DEBFULLNAME -else - CMD=`grep -G "export DEBFULLNAME=" ~/.bashrc|sed "s/\"//g"|sed "s/export DEBFULLNAME=//g"` - if [[ ! -z $CMD ]]; then - export DEBFULLNAME="$CMD" - fi -fi - -set -e - -PROJECT=$1 - -if [[ ! -d "$PROJECT" ]]; then - echo "Project not found ($PROJECT)." - exit 123 -fi - -cd $PROJECT -if [[ -d debian ]]; then - echo "Packaging already exists for project. Skipping.." - exit -fi - -PACKAGENAME=`basename $PWD|tr '[A-Z]' '[a-z]'` - -set +e -#detect project type -H_FILES=`find . -type f |grep .h$` -CPP_FILES=`find . -type f |grep .cpp$` -PRO_FILES=`find . -type f |grep .pro$` - -PROJECTTYPE="" -PACKAGETYPE="" -if [[ -z ${H_FILES} && -z ${CPP_FILES} && -z ${PRO_FILES} ]]; then - echo "Detected: QML project" - PROJECTTYPE="QML" - PACKAGETYPE="-s" -else - echo "Detected CPP project" - PROJECTTYPE="CPP" - IS_LIB=`echo ${PRO_FILES}|xargs cat |grep "TEMPLATE"|grep "lib"` - if [[ -z ${IS_LIB} ]]; then - echo " - Application" - PACKAGETYPE="-s" - else - echo " - QML Extension Library" - PACKAGETYPE="-s" - fi -fi - -set -e - -# create packaging - -echo "\n" | dh_make -n -p ${PACKAGENAME}_0.1 ${PACKAGETYPE} --createorig - -if [[ ! -d debian ]]; then - echo "Debian folder was not created!" - exit 2 -fi - -pushd debian -# remove unfilled files -rm *.ex *.EX README* docs -popd - -# add installable files -INSTALL_PATH=/usr/share/${PACKAGENAME} -DESKTOPFILE=/usr/share/applications -find . -mindepth 1 -maxdepth 3 -printf "%p ${INSTALL_PATH}\n"|grep -v ".user\|debian\|.desktop" | sed "s/^\.\///g" > debian/install - -if [[ -z ${IS_LIB} ]]; then -find *.desktop -printf "%p ${DESKTOPFILE}\n" >> debian/install -fi - -# check if we have .pro files or cpp/h files, if not then change architecture to any -if [[ "$PROJECTTYPE" == QML ]]; then - echo "Detected: QML project" - sed -i "s/^Architecture: any$/Architecture: all/g" debian/control - # update package dependencies - SCRIPTPATH=`dirname $0` - QMLDEPS=`${SCRIPTPATH}/qtc_project_detect_qmldeps` - sed -i "s/^Depends:.*/${QMLDEPS}qmlscene/g" debian/control -else - echo "Detected: CPP project" -fi - -UBUNTU_RELEASE=`cat /etc/lsb-release|grep DISTRIB_CODENAME|sed 's/DISTRIB_CODENAME=//'` -sed -i "s/unstable; urgency=low/{$UBUNTU_RELEASE}; urgency=low/g" debian/changelog diff -Nru qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/ubuntu/scripts/qtc_read_bazaar_settings qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/ubuntu/scripts/qtc_read_bazaar_settings --- qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/share/qtcreator/ubuntu/scripts/qtc_read_bazaar_settings 2015-04-21 08:04:31.000000000 +0000 +++ qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/share/qtcreator/ubuntu/scripts/qtc_read_bazaar_settings 1970-01-01 00:00:00.000000000 +0000 @@ -1,39 +0,0 @@ -#!/bin/bash -# Copyright 2013 Canonical Ltd. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; version 2.1. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program. If not, see . -# -# Author: Juhapekka Piiroinen - -DEBEMAIL=`grep -G "^DEBEMAIL" ~/.bashrc` -DEBFULLNAME=`grep -G "^DEBFULLNAME" ~/.bashrc` - -if [[ ! -z "$DEBEMAIL" ]]; then - export $DEBEMAIL -else - CMD=`grep -G "export DEBEMAIL=" ~/.bashrc|sed "s/\"//g"` - if [[ ! -z $CMD ]]; then - $CMD - fi -fi -if [[ ! -z $DEBFULLNAME ]]; then - export $DEBFULLNAME -else - CMD=`grep -G "export DEBFULLNAME=" ~/.bashrc|sed "s/\"//g"|sed "s/export DEBFULLNAME=//g"` - if [[ ! -z $CMD ]]; then - export DEBFULLNAME="$CMD" - fi -fi - -echo $DEBFULLNAME -echo $DEBEMAIL diff -Nru qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/src/ubuntu/ubuntuconstants.h qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/src/ubuntu/ubuntuconstants.h --- qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/src/ubuntu/ubuntuconstants.h 2015-04-21 08:04:31.000000000 +0000 +++ qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/src/ubuntu/ubuntuconstants.h 2015-05-08 08:37:05.000000000 +0000 @@ -173,8 +173,6 @@ const char UBUNTU_INITIAL_EMULATOR_NAME[] = ""; const char UBUNTUBZR_INITIALIZE[] ="%0/qtc_bzr_info"; -const char UBUNTUPACKAGINGWIDGET_ONFINISHED_ACTION_CLICK_CREATE[] = "%0/qtc_project_click_create"; -const char UBUNTUPACKAGINGWIDGET_ONFINISHED_ACTION_CLICK_CMAKECREATE[] = "%0/qtc_cmakeproject_click_create"; const char UBUNTUPACKAGINGWIDGET_OPENMANIFEST[] ="%0/manifest.json"; const char UBUNTUPACKAGINGWIDGET_APPARMOR[] ="%0/%1.json"; const char UBUNTUPACKAGINGWIDGET_EXCLUDES[] ="%0/.excludes"; @@ -207,18 +205,6 @@ const char ERROR_MSG_EMULATOR_EXISTS[] = "The emulator already exists."; const char MSG_EMULATOR_IS_CREATED[] = "Check the logs for details."; - - - - -const char UBUNTUDEVICESWIDGET_REBOOT[] = "Reboot device.."; -const char UBUNTUDEVICESWIDGET_REBOOT_SCRIPT[] = "%0/device_reboot"; -const char UBUNTUDEVICESWIDGET_SHUTDOWN[] = "Shutdown device.."; -const char UBUNTUDEVICESWIDGET_SHUTDOWN_SCRIPT[] = "%0/device_shutdown"; -const char UBUNTUDEVICESWIDGET_REBOOT_TO_BOOTLOADER[] = "Reboot to bootloader.."; -const char UBUNTUDEVICESWIDGET_REBOOT_TO_BOOTLOADER_SCRIPT[] = "%0/device_reboot2bootloader"; -const char UBUNTUDEVICESWIDGET_REBOOT_TO_RECOVERY[] = "Reboot to recovery.."; -const char UBUNTUDEVICESWIDGET_REBOOT_TO_RECOVERY_SCRIPT[] = "%0/device_reboot2recovery"; const char UBUNTUWIDGETS_LOCAL_PACKAGE_INSTALLED_SCRIPT[] = "%0/local_package_installed %1"; const char UBUNTUDEVICESWIDGET_LOCAL_INSTALL_EMULATOR[] = "%0/local_install_emulator %1"; const char UBUNTUDEVICESWIDGET_DETECTOPENSSH[] = "Detecting if openssh-server is installed.."; @@ -244,8 +230,6 @@ const char UBUNTUDEVICESWIDGET_DETECTDEVICEVERSION_SCRIPT[] = "%0/device_version %1"; const char UBUNTUDEVICESWIDGET_SSH_INSTALL[] = "Installing openssh-server.."; const char UBUNTUDEVICESWIDGET_SSH_INSTALL_SCRIPT[] = "%0/openssh_install %1"; -const char UBUNTUDEVICESWIDGET_CLONETIME[] = "Cloning time configuration from host to device.."; -const char UBUNTUDEVICESWIDGET_CLONETIME_SCRIPT[] = "%0/device_time_clone %1"; const char UBUNTUDEVICESWIDGET_SSH_REMOVE[] = "Removing openssh-server.."; const char UBUNTUDEVICESWIDGET_SSH_REMOVE_SCRIPT[] = "%0/openssh_remove %1"; diff -Nru qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/src/ubuntu/ubuntudevice.cpp qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/src/ubuntu/ubuntudevice.cpp --- qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/src/ubuntu/ubuntudevice.cpp 2015-04-21 08:04:31.000000000 +0000 +++ qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/src/ubuntu/ubuntudevice.cpp 2015-05-08 08:37:05.000000000 +0000 @@ -384,10 +384,6 @@ emit featureDetected(); break; } - case UbuntuDevice::CloneTimeConfig: - endAction(QString::fromLatin1(Constants::UBUNTUDEVICESWIDGET_ONFINISHED_TIME_CONF_COPIED)); - setProcessState(UbuntuDevice::Done); - break; case UbuntuDevice::EnableRWImage: endAction(QString::fromLatin1(Constants::UBUNTUDEVICESWIDGET_ONFINISHED_WRITABLE_ENABLED)); detectDeviceWritableImage(); @@ -657,20 +653,6 @@ emit featureDetected(); } -void UbuntuDeviceHelper::cloneTimeConfig() -{ - if(m_dev->m_processState < UbuntuDevice::FirstNonCriticalTask && m_dev->m_processState != UbuntuDevice::NotStarted) - return; - - setProcessState(UbuntuDevice::CloneTimeConfig); - beginAction(QString::fromLatin1(Constants::UBUNTUDEVICESWIDGET_CLONETIME)); - stopProcess(); - - startProcess(QString::fromLatin1(Constants::UBUNTUDEVICESWIDGET_CLONETIME_SCRIPT) - .arg(Ubuntu::Constants::UBUNTU_SCRIPTPATH) - .arg(m_dev->serialNumber())); -} - void UbuntuDeviceHelper::enableRWImage() { if(m_dev->m_processState < UbuntuDevice::FirstNonCriticalTask && m_dev->m_processState != UbuntuDevice::NotStarted) @@ -1026,72 +1008,11 @@ } -void UbuntuDevice::cloneTimeConfig() -{ - m_helper->cloneTimeConfig(); -} - void UbuntuDevice::enablePortForward() { m_helper->enablePortForward(); } -void UbuntuDevice::shutdown() -{ - QProcess p; - QStringList args = QStringList() - << serialNumber(); - - //no need to redetect this should happen automagically - p.startDetached(QString::fromLatin1(Constants::UBUNTUDEVICESWIDGET_SHUTDOWN_SCRIPT).arg(Ubuntu::Constants::UBUNTU_SCRIPTPATH) - , args - , QCoreApplication::applicationDirPath()); -} - -void UbuntuDevice::reboot() -{ - QProcess p; - QStringList args = QStringList() - << serialNumber(); - - //no need to redetect this should happen automagically - bool started = p.startDetached(QString::fromLatin1(Constants::UBUNTUDEVICESWIDGET_REBOOT_SCRIPT).arg(Ubuntu::Constants::UBUNTU_SCRIPTPATH) - , args - , QCoreApplication::applicationDirPath()); - - if(!started && debug) { - qDebug()<<"Could not start process " - <deployPublicKey(); @@ -1264,8 +1185,6 @@ return tr("Detecting if developer tools are installed"); case FirstNonCriticalTask: return tr(""); - case CloneTimeConfig: - return tr("Cloning time configuration"); case EnableRWImage: return tr("Enabling writeable image"); case DisableRWImage: diff -Nru qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/src/ubuntu/ubuntudevice.h qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/src/ubuntu/ubuntudevice.h --- qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/src/ubuntu/ubuntudevice.h 2015-04-21 08:04:31.000000000 +0000 +++ qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/src/ubuntu/ubuntudevice.h 2015-05-08 08:37:05.000000000 +0000 @@ -72,7 +72,6 @@ void beginAction(QString msg); void endAction(QString msg); void resetToDefaults(); - void cloneTimeConfig (); void enableRWImage (); void disableRWImage (); void enablePortForward (); @@ -141,7 +140,6 @@ DetectDeviceWriteableImage, DetectDeveloperTools, FirstNonCriticalTask, - CloneTimeConfig, EnableRWImage, DisableRWImage, InstallDevTools, @@ -164,12 +162,7 @@ void cloneNetwork (); void openTerminal (); - void cloneTimeConfig (); void enablePortForward (); - void shutdown (); - void reboot (); - void rebootToRecovery (); - void rebootToBootloader (); void deployPublicKey (); void setDeveloperModeEnabled ( const bool enabled = true ); void setWriteableImageEnabled ( const bool enabled = true ); diff -Nru qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/src/ubuntu/ubuntudevicesmodel.cpp qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/src/ubuntu/ubuntudevicesmodel.cpp --- qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/src/ubuntu/ubuntudevicesmodel.cpp 2015-04-21 08:04:31.000000000 +0000 +++ qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/src/ubuntu/ubuntudevicesmodel.cpp 2015-05-08 08:37:05.000000000 +0000 @@ -294,14 +294,6 @@ return QAbstractListModel::flags(index) | Qt::ItemIsEditable; } -void UbuntuDevicesModel::triggerCloneTimeConfig(const int devId) -{ - int row = findDevice(devId); - if(row < 0) - return; - m_knownDevices[row]->device()->cloneTimeConfig(); -} - void UbuntuDevicesModel::triggerPortForwarding(const int devId) { int row = findDevice(devId); @@ -326,38 +318,6 @@ m_knownDevices[row]->device()->openTerminal(); } -void UbuntuDevicesModel::triggerReboot(const int devId) -{ - int row = findDevice(devId); - if(row < 0) - return; - m_knownDevices[row]->device()->reboot(); -} - -void UbuntuDevicesModel::triggerRebootBootloader(const int devId) -{ - int row = findDevice(devId); - if(row < 0) - return; - m_knownDevices[row]->device()->rebootToBootloader(); -} - -void UbuntuDevicesModel::triggerRebootRecovery(const int devId) -{ - int row = findDevice(devId); - if(row < 0) - return; - m_knownDevices[row]->device()->rebootToRecovery(); -} - -void UbuntuDevicesModel::triggerShutdown(const int devId) -{ - int row = findDevice(devId); - if(row < 0) - return; - m_knownDevices[row]->device()->shutdown(); -} - void UbuntuDevicesModel::triggerKitAutocreate(const int devId) { int row = findDevice(devId); diff -Nru qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/src/ubuntu/ubuntudevicesmodel.h qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/src/ubuntu/ubuntudevicesmodel.h --- qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/src/ubuntu/ubuntudevicesmodel.h 2015-04-21 08:04:31.000000000 +0000 +++ qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/src/ubuntu/ubuntudevicesmodel.h 2015-05-08 08:37:05.000000000 +0000 @@ -115,14 +115,9 @@ void stateChanged(QString arg); public slots: - void triggerCloneTimeConfig ( const int devId ); void triggerPortForwarding ( const int devId ); void triggerSSHSetup ( const int devId ); void triggerSSHConnection ( const int devId ); - void triggerReboot ( const int devId ); - void triggerRebootBootloader( const int devId ); - void triggerRebootRecovery ( const int devId ); - void triggerShutdown ( const int devId ); void triggerKitAutocreate ( const int devId ); void triggerKitRemove ( const int devId, const QVariant &kitid ); void triggerRedetect ( const int devId ); diff -Nru qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/src/ubuntu/wizards/ubuntufirstrunwizard.cpp qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/src/ubuntu/wizards/ubuntufirstrunwizard.cpp --- qtcreator-plugin-ubuntu-3.1.1+15.04.20150421/src/ubuntu/wizards/ubuntufirstrunwizard.cpp 2015-04-21 08:04:31.000000000 +0000 +++ qtcreator-plugin-ubuntu-3.1.1+15.10.20150507/src/ubuntu/wizards/ubuntufirstrunwizard.cpp 2015-05-08 08:37:05.000000000 +0000 @@ -10,6 +10,7 @@ #include #include #include +#include #include #include @@ -90,7 +91,7 @@ setTitle(tr("Build targets")); QLabel *label = new QLabel(tr("

In order to create Apps for the Ubuntu platform, it is required to create Kits. Kits enable cross-platform and cross-configuration development. Kits consist of a set of values that define one environment, such as a target device, sysroot to build against, toolchain to build with, platform specific API set, and some metadata.

" - "

Note: It is recommended to create Kits for each possible traget architecture (i386, armhf). When developing with the emulator, the best experience is provided by using a i386 emulator and Kit

")); + "

Note: It is recommended to create Kits for each possible target architecture (i386, armhf). When developing with the emulator, the best experience is provided by using a i386 emulator and Kit

")); label->setWordWrap(true); m_kitExistsLabel = new QLabel(tr("These Kits are already available on the machine, but it is also possible to create new ones.")); @@ -129,7 +130,10 @@ bool found = false; foreach(ProjectExplorer::Kit *curr, allKits) { ProjectExplorer::ToolChain *tc = ProjectExplorer::ToolChainKitInformation::toolChain(curr); - if (tc->type() == QLatin1String(Constants::UBUNTU_CLICK_TOOLCHAIN_ID)) { + const Core::Id devId = ProjectExplorer::DeviceKitInformation::deviceId(curr); + + if (tc->type() == QLatin1String(Constants::UBUNTU_CLICK_TOOLCHAIN_ID) || + devId == ProjectExplorer::Constants::DESKTOP_DEVICE_ID) { found = true; QTreeWidgetItem* kitItem = new QTreeWidgetItem;