Merge lp:~zeller-benjamin/qtcreator-plugin-ubuntu/launcherlocations into lp:qtcreator-plugin-ubuntu

[Benjamin Zeller]

- Less launcher output, add prefix so its clear if the output is from launcher/app
- Use default application directories to create control files
- Native Backend template now automatically substitutes the correct architecture into the manifest file
- Make sure the wizards don't accept invalid characters

- Less launcher output, add prefix so its clear if the output is from launcher/app
- Use default application directories to create control files

[lp:~zeller-benjamin/qtcreator-plugin-ubuntu/launcherlocations]

279. By Benjamin Zeller on 2014-09-11

Pack debug mode

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:278
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/418/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-utopic-amd64-ci/186
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-utopic-armhf-ci/186

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtcreator-plugin-ubuntu-ci/418/rebuild

review: Approve (continuous-integration)

[lp:~zeller-benjamin/qtcreator-plugin-ubuntu/launcherlocations]

280. By Benjamin Zeller on 2014-09-11

Backend template now automatically substitutes the correct architecture
into the manifest file

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:280
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/419/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-utopic-amd64-ci/187
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-utopic-armhf-ci/187

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtcreator-plugin-ubuntu-ci/419/rebuild

review: Approve (continuous-integration)

[lp:~zeller-benjamin/qtcreator-plugin-ubuntu/launcherlocations]

281. By Benjamin Zeller on 2014-09-11

Make sure wizard does not accept invalid characters

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:281
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/420/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-utopic-amd64-ci/188
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-utopic-armhf-ci/188

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtcreator-plugin-ubuntu-ci/420/rebuild

review: Approve (continuous-integration)

[Zoltan Balogh (bzoltan)]

OK

review: Approve

[lp:~zeller-benjamin/qtcreator-plugin-ubuntu/launcherlocations]

282. By Benjamin Zeller on 2014-09-12

fix templates

283. By Benjamin Zeller on 2014-09-12

Forgot new files

=== modified file 'share/qtcreator/templates/wizards/ubuntu/backendplustabs/CMakeLists.txt'
--- share/qtcreator/templates/wizards/ubuntu/backendplustabs/CMakeLists.txt	2014-08-21 16:56:53 +0000
+++ share/qtcreator/templates/wizards/ubuntu/backendplustabs/CMakeLists.txt	2014-09-12 10:47:38 +0000
@@ -1,7 +1,8 @@
 project(%ProjectName% C CXX)
 cmake_minimum_required(VERSION 2.8.9)
 
-set (UBUNTU_PROJECT_TYPE "ClickApp" CACHE INTERNAL "Tells QtCreator this is a Click application project")
+#do not remove this line, its required for the correct functionality of the Ubuntu-SDK
+set(UBUNTU_MANIFEST_PATH "manifest.json.in" CACHE INTERNAL "Tells QtCreator location and name of the manifest file")
 set (CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
 find_package(Qt5Core)
@@ -35,7 +36,17 @@
 
 set(EXEC "qmlscene $@ ${%ProjectName:u%_DIR}/${MAIN_QML}")
 
-install(FILES manifest.json DESTINATION ${CMAKE_INSTALL_PREFIX})
+#This command figures out the target architecture and puts it into the manifest file
+execute_process(
+  COMMAND dpkg-architecture -qDEB_HOST_ARCH
+  OUTPUT_VARIABLE CLICK_ARCH
+  OUTPUT_STRIP_TRAILING_WHITESPACE
+)
+
+configure_file(manifest.json.in ${CMAKE_CURRENT_BINARY_DIR}/manifest.json)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json
+        DESTINATION ${CMAKE_INSTALL_PREFIX})
+
 install(DIRECTORY "app/graphics" DESTINATION ${DATA_DIR})
 install(FILES "%ClickHookName%.apparmor" DESTINATION ${DATA_DIR})
 
@@ -55,4 +66,5 @@
                     DEPENDS %ProjectName%backend %ProjectName%backend-qmldir
                     WORKING_DIRECTORY ./app)
 
-add_custom_target("%ProjectName:l%_ClickFiles" ALL SOURCES "%ClickHookName%.apparmor" "manifest.json")
+#no op custom target for all not compiled files, so they show up in the QtCreator project tree
+add_custom_target("%ProjectName:l%_ClickFiles" ALL SOURCES "%ClickHookName%.apparmor" "manifest.json.in")

=== added file 'share/qtcreator/templates/wizards/ubuntu/backendplustabs/manifest.json.in'
--- share/qtcreator/templates/wizards/ubuntu/backendplustabs/manifest.json.in	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/backendplustabs/manifest.json.in	2014-09-12 10:47:38 +0000
@@ -0,0 +1,15 @@
+{
+    "name": "%ClickDomain:l%.%ProjectName:l%",
+    "description": "description of %ProjectName%",
+    "architecture": "@CLICK_ARCH@",
+    "title": "%ProjectName%",
+    "hooks": {
+        "%ClickHookName%": {
+            "apparmor": "%ClickHookName%.apparmor",
+            "desktop":  "%ClickHookName%.desktop"
+        }
+    },
+    "version": "0.1",
+    "maintainer": "%ClickMaintainer%"
+}
+

=== modified file 'share/qtcreator/templates/wizards/ubuntu/backendplustabs/wizard.xml'
--- share/qtcreator/templates/wizards/ubuntu/backendplustabs/wizard.xml	2014-08-18 12:29:43 +0000
+++ share/qtcreator/templates/wizards/ubuntu/backendplustabs/wizard.xml	2014-09-12 10:47:38 +0000
@@ -39,7 +39,7 @@
         <file source="app/tests/autopilot/displayName/__init__.py"       target="app/tests/autopilot/%ProjectName%/__init__.py" openeditor="false"/>
         <file source="app/tests/autopilot/displayName/main/__init__.py"  target="app/tests/autopilot/%ProjectName%/main/__init__.py" openeditor="false"/>
         <file source="cmake/Click.cmake"                                 target="cmake/Click.cmake" openeditor="false"/>
-        <file source="../share/manifest.json"   			 target="manifest.json" openeditor="true"/>
+        <file source="manifest.json.in"   			         target="manifest.json.in" openeditor="true"/>
         <file source="../share/displayName.apparmor"   			 target="%ClickHookName%.apparmor" openeditor="false"/>
         <file source="app/displayName.qml"                     target="app/%ProjectName%.qml" openeditor="true"/>
    </files>
@@ -48,7 +48,7 @@
 		<fieldpagetitle>Click package parameters</fieldpagetitle>
 		<fields>
 			<field mandatory="true" name="ClickDomain">
-			  <fieldcontrol class="QLineEdit" validator='^[^"]+$'
+			  <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$'
 			                defaulttext="" placeholdertext="Domain"/>
 			  <fielddescription>Domain:</fielddescription>
 			</field>
@@ -58,7 +58,7 @@
 			  <fielddescription>Maintainer:</fielddescription>
 			</field>
 			<field mandatory="true" name="ClickHookName">
-			  <fieldcontrol class="QLineEdit" validator='^[^"]+$'
+			  <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$'
 			                defaulttext="myapp" placeholdertext="app hook name"/>
 			  <fielddescription>App name:</fielddescription>
 			</field>

=== modified file 'share/qtcreator/templates/wizards/ubuntu/goproject/wizard.xml'
--- share/qtcreator/templates/wizards/ubuntu/goproject/wizard.xml	2014-08-18 15:41:55 +0000
+++ share/qtcreator/templates/wizards/ubuntu/goproject/wizard.xml	2014-09-12 10:47:38 +0000
@@ -22,7 +22,7 @@
 		<fieldpagetitle>Details</fieldpagetitle>
 		<fields>
 			<field mandatory="true" name="ClickDomain">
-			  <fieldcontrol class="QLineEdit" validator='^[^"]+$'
+			  <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$'
 			                defaulttext="" placeholdertext="Domain"/>
 			  <fielddescription>Domain:</fielddescription>
 			</field>
@@ -32,7 +32,7 @@
 			  <fielddescription>Maintainer:</fielddescription>
 			</field>
 			<field mandatory="true" name="ClickHookName">
-			  <fieldcontrol class="QLineEdit" validator='^[^"]+$'
+			  <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$'
 			                defaulttext="myapp" placeholdertext="app hook name"/>
 			  <fielddescription>App name:</fielddescription>
 			</field>

=== modified file 'share/qtcreator/templates/wizards/ubuntu/scope/wizard.xml'
--- share/qtcreator/templates/wizards/ubuntu/scope/wizard.xml	2014-08-18 12:29:43 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope/wizard.xml	2014-09-12 10:47:38 +0000
@@ -30,7 +30,7 @@
 		<fieldpagetitle>Click package parameters</fieldpagetitle>
 		<fields>
 			<field mandatory="true" name="ClickDomain">
-			  <fieldcontrol class="QLineEdit" validator='^[^"]+$'
+			  <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$'
 			                defaulttext="" placeholdertext="Domain"/>
 			  <fielddescription>Domain:</fielddescription>
 			</field>
@@ -40,7 +40,7 @@
 			  <fielddescription>Maintainer:</fielddescription>
 			</field>
 			<field mandatory="true" name="ClickHookName">
-			  <fieldcontrol class="QLineEdit" validator='^[^"]+$'
+			  <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$'
 			                defaulttext="myscope" placeholdertext="scope hook name"/>
 			  <fielddescription>Scope name:</fielddescription>
 			</field>

=== modified file 'share/qtcreator/templates/wizards/ubuntu/simple/wizard.xml'
--- share/qtcreator/templates/wizards/ubuntu/simple/wizard.xml	2014-08-19 06:39:27 +0000
+++ share/qtcreator/templates/wizards/ubuntu/simple/wizard.xml	2014-09-12 10:47:38 +0000
@@ -31,7 +31,7 @@
 		<fieldpagetitle>Click package parameters</fieldpagetitle>
 		<fields>
 			<field mandatory="true" name="ClickDomain">
-			  <fieldcontrol class="QLineEdit" validator='^[^"]+$'
+			  <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$'
 			                defaulttext="" placeholdertext="Domain"/>
 			  <fielddescription>Domain:</fielddescription>
 			</field>
@@ -41,7 +41,7 @@
 			  <fielddescription>Maintainer:</fielddescription>
 			</field>
 			<field mandatory="true" name="ClickHookName">
-			  <fieldcontrol class="QLineEdit" validator='^[^"]+$'
+			  <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$'
 			                defaulttext="app" placeholdertext="app hook name"/>
 			  <fielddescription>App name:</fielddescription>
 			</field>

=== modified file 'share/qtcreator/templates/wizards/ubuntu/tabs/wizard.xml'
--- share/qtcreator/templates/wizards/ubuntu/tabs/wizard.xml	2014-08-19 06:39:27 +0000
+++ share/qtcreator/templates/wizards/ubuntu/tabs/wizard.xml	2014-09-12 10:47:38 +0000
@@ -35,7 +35,7 @@
 		<fieldpagetitle>Click package parameters</fieldpagetitle>
 		<fields>
 			<field mandatory="true" name="ClickDomain">
-			  <fieldcontrol class="QLineEdit" validator='^[^"]+$'
+			  <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$'
 			                defaulttext="" placeholdertext="Domain"/>
 			  <fielddescription>Domain:</fielddescription>
 			</field>
@@ -45,7 +45,7 @@
 			  <fielddescription>Maintainer:</fielddescription>
 			</field>
 			<field mandatory="true" name="ClickHookName">
-			  <fieldcontrol class="QLineEdit" validator='^[^"]+$'
+			  <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$'
 			                defaulttext="myapp" placeholdertext="app hook name"/>
 			  <fielddescription>App name:</fielddescription>
 			</field>

=== modified file 'share/qtcreator/templates/wizards/ubuntu/webapp/wizard.xml'
--- share/qtcreator/templates/wizards/ubuntu/webapp/wizard.xml	2014-08-19 06:39:27 +0000
+++ share/qtcreator/templates/wizards/ubuntu/webapp/wizard.xml	2014-09-12 10:47:38 +0000
@@ -17,7 +17,7 @@
     <fieldpagetitle>Click package parameters</fieldpagetitle>
     <fields>
         <field mandatory="true" name="ClickDomain">
-            <fieldcontrol class="QLineEdit" validator='^[^"]+$' defaulttext="" placeholdertext="Domain"/>
+            <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$' defaulttext="" placeholdertext="Domain"/>
             <fielddescription>Domain:</fielddescription>
         </field>
         <field mandatory="true" name="ClickMaintainer">
@@ -25,7 +25,7 @@
             <fielddescription>Maintainer:</fielddescription>
         </field>
         <field mandatory="true" name="ClickHookName">
-            <fieldcontrol class="QLineEdit" validator='^[^"]+$' defaulttext="app" placeholdertext="app hook name"/>
+            <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$' defaulttext="app" placeholdertext="app hook name"/>
             <fielddescription>App name:</fielddescription>
         </field>
     </fields>

=== modified file 'share/qtcreator/ubuntu/scripts/qtc_device_applaunch.py'
--- share/qtcreator/ubuntu/scripts/qtc_device_applaunch.py	2014-09-04 13:19:11 +0000
+++ share/qtcreator/ubuntu/scripts/qtc_device_applaunch.py	2014-09-12 10:47:38 +0000
@@ -57,11 +57,12 @@
     @dbus.service.method("com.ubuntu.SDKAppLaunch",in_signature='si', out_signature='')
     def ScopeLoaded(self, name, pid):
         if(name == self.appId):
-            print("Application started: "+str(pid),flush=True)
+            #Do NOT change this line, its interpreted by the IDE
+            print("Sdk-Launcher> Application started: "+str(pid),flush=True)
 
     @dbus.service.method("com.ubuntu.SDKAppLaunch",in_signature='s', out_signature='')
     def ScopeStopped(self, name):
-        print("Scope stopped, exiting",flush=True)
+        print("Sdk-Launcher> Scope stopped, exiting",flush=True)
         self.loop.quit()
 
     def launch(self):
@@ -72,7 +73,7 @@
                 #just make the default scope visible again
                 self._dispatchUrl("scope://clickscope")
             else:
-                print("Error: Could start the scope.",flush=True,file=sys.stderr)
+                print("Sdk-Launcher> Error: Could start the scope.",flush=True,file=sys.stderr)
                 return 1
         except KeyboardInterrupt:
             pass
@@ -84,12 +85,10 @@
             urlDispatcher = bus.get_object('com.canonical.URLDispatcher',
                                            '/com/canonical/URLDispatcher')
 
-            print("Dispatching url: "+url)
-
             urlDispatcher.DispatchURL(url,"",
                                       dbus_interface='com.canonical.URLDispatcher')
         except dbus.DBusException:
-            print("Error: Could not start the scope.",flush=True,file=sys.stderr)
+            print("Sdk-Launcher> Error: Could not start the scope.",flush=True,file=sys.stderr)
             return False
         return True
 
@@ -106,7 +105,7 @@
         self.loop = loop
 
     def on_failed(self,launched_app_id, failure_type):
-        print("Received a failed event",flush=True)
+        print("Sdk-Launcher> Received a failed event",flush=True)
         if launched_app_id == self.appid:
             if failure_type == UAL.AppFailed.CRASH:
                 self.message  = 'Application crashed.'
@@ -118,32 +117,30 @@
 
     def on_started(self,launched_app_id):
         if launched_app_id == self.appid:
-            print("Application started: "+str(UAL.get_primary_pid(self.appid)),flush=True)
+            #Do NOT change this line, its interpreted by the IDE
+            print("Sdk-Launcher> Application started: "+str(UAL.get_primary_pid(self.appid)),flush=True)
 
     def on_stopped(self,stopped_app_id):
         if stopped_app_id == self.appid:
-            print("Stopping Application",flush=True)
+            print("Sdk-Launcher> Stopping Application",flush=True)
             self.exitCode = 0
             self.loop.quit()
 
     def on_resume(self,resumed_app_id):
         if resumed_app_id == self.appid:
-            print("Application was resumed",flush=True)
+            print("Sdk-Launcher> Application was resumed",flush=True)
 
     def on_focus(self,focused_app_id):
         if focused_app_id == self.appid:
-            print("Application was focused",flush=True)
+            print("Sdk-Launcher> Application was focused",flush=True)
 
     def launch(self):
-        print ("Registering hooks",flush=True)
         UAL.observer_add_app_failed(self.on_failed)
         UAL.observer_add_app_started(self.on_started)
         UAL.observer_add_app_focus(self.on_focus)
         UAL.observer_add_app_stop(self.on_stopped)
         UAL.observer_add_app_resume(self.on_resume)
 
-        print ("Start Application",flush=True)
-
         #start up the application
         UAL.start_application(self.appid)
 
@@ -152,7 +149,7 @@
         except KeyboardInterrupt:
             pass
 
-        print ("The Application exited, cleaning up")
+        print ("Sdk-Launcher> The Application exited, cleaning up")
 
         UAL.observer_delete_app_failed(self.on_failed)
         UAL.observer_delete_app_started(self.on_started)
@@ -166,7 +163,7 @@
         UAL.stop_application(self.appid)
 
 def on_sigterm(runner):
-    print("Received exit signal, stopping application",flush=True)
+    print("Sdk-Launcher> Received exit signal, stopping application",flush=True)
     runner.stop()
 
 def create_procpipe(path,callback):
@@ -213,6 +210,31 @@
     print (output ,file=sys.stderr,end="",flush=True)
     return True
 
+def is_confined (manifest_obj, hook_name):
+    if "apparmor" not in manifest_obj['hooks'][hook_name]:
+        raise Exception("Error: Invalid Manifest file")
+    if "name" not in manifest_obj:
+        raise Exception("Error: Invalid Manifest file")
+
+    install_dir   = "/opt/click.ubuntu.com/"
+    apparmor_path = install_dir+manifest_obj['name']+"/current/"+manifest_obj['hooks'][hook_name]["apparmor"]
+
+    if (not os.path.isfile(apparmor_path)):
+        raise Exception("Error: Apparmor path is not valid: "+apparmor_path)
+
+    try:
+        json_file = open(apparmor_path,"r")
+        apparmor=json.load(json_file)
+        json_file.close()
+    except Exception as err:
+        raise Exception("Error: Could not read the apparmor file "+str(err))
+
+    if ("template" in apparmor):
+        return apparmor["template"] != "unconfined"
+
+    #without a template the app is always confined
+    return True;
+
 # register options to the argument parser
 parser = argparse.ArgumentParser(description="SDK application launcher")
 parser.add_argument('clickPck',action="store")
@@ -223,14 +245,16 @@
 
 options = parser.parse_args()
 
-print("Executing: "+options.clickPck,flush=True)
-print("Launcher PID: "+str(os.getpid()), file=sys.stderr,flush=True)
+print("Sdk-Launcher> Executing:    "+options.clickPck,flush=True)
+
+#Do NOT change this line, its interpreted by the IDE
+print("Sdk-Launcher> Launcher PID: "+str(os.getpid()), file=sys.stderr,flush=True)
 
 needs_debug_conf=False
 conf_obj={}
 
 if options.environmentList is not None:
-    print("Setting env "+", ".join(options.environmentList),flush=True)
+    print("Sdk-Launcher> Setting env "+", ".join(options.environmentList),flush=True)
     needs_debug_conf=True
     conf_obj['env'] = {}
     for env in options.environmentList:
@@ -242,12 +266,12 @@
 if options.gdbPort is not None:
     needs_debug_conf=True
     conf_obj['gdbPort'] = options.gdbPort
-    print("GDB Port"+options.gdbPort,flush=True)
+    print("Sdk-Launcher> GDB Port"+options.gdbPort,flush=True)
 
 if options.qmlDebug is not None:
     needs_debug_conf=True
     conf_obj['qmlDebug'] = options.qmlDebug
-    print("QML Debug Settings:"+options.qmlDebug,flush=True)
+    print("Sdk-Launcher> QML Debug Settings:"+options.qmlDebug,flush=True)
 
 hook_name = None
 package_name = None
@@ -256,13 +280,14 @@
 manifest = None
 app_id = None
 tmp_dir = "/tmp/"
+apparmor_path = None
 
 #get the manifest information from the click package
 try:
     manifest_json = subprocess.check_output(["click","info",options.clickPck])
     manifest=json.loads(manifest_json.decode())
 except subprocess.CalledProcessError:
-    print("Could not call click",file=sys.stderr,flush=True)
+    print("Sdk-Launcher> Could not call click",file=sys.stderr,flush=True)
     sys.exit(1)
 
 #get the hook name we want to execute
@@ -270,21 +295,22 @@
     hook_name = list(manifest['hooks'].keys())[0]
 else:
     if options.targetHook is None:
-        print("There are multiple hooks in the manifest file, please specify one",flush=True,file=sys.stderr)
+        print("Sdk-Launcher> There are multiple hooks in the manifest file, please specify one",flush=True,file=sys.stderr)
         sys.exit(1)
     else:
         if options.targetHook in manifest['hooks']:
             hook_name = options.targetHook
+            apparmor_path = manifest['hooks'][hook_name]["apparmor"]
         else:
-            print("Unknown hook selected",file=sys.stderr,flush=True)
+            print("Sdk-Launcher> Unknown hook selected",file=sys.stderr,flush=True)
             sys.exit(1)
 
 if 'version' not in manifest:
-    print("Version key is missing from the manifest file",flush=True,file=sys.stderr)
+    print("Sdk-Launcher> Version key is missing from the manifest file",flush=True,file=sys.stderr)
     sys.exit(1)
 
 if 'name' not in manifest:
-    print("Package name not in the manifest file",flush=True,file=sys.stderr)
+    print("Sdk-Launcher> Package name not in the manifest file",flush=True,file=sys.stderr)
     sys.exit(1)
 
 package_name = manifest['name']
@@ -296,7 +322,7 @@
     package_arch = subprocess.check_output(["dpkg","-f",options.clickPck,"Architecture"])
     package_arch = package_arch.decode()
 except subprocess.CalledProcessError:
-    print("Could not query architecture from the package",flush=True,file=sys.stderr)
+    print("Sdk-Launcher> Could not query architecture from the package",flush=True,file=sys.stderr)
     sys.exit(1)
 
 #check if the app is already installed on the device, so we do not break existing installations
@@ -305,93 +331,126 @@
 arr = json_array_to_python(db.get_manifests(all_versions=False))
 for installAppManifest in arr:
     if installAppManifest["name"] == package_name:
-        print("Error: This application is already installed on the device, uninstall it or temporarily change the name in the manifest.json file!",flush=True,file=sys.stderr)
+        print("Sdk-Launcher> Error: This application is already installed on the device, uninstall it or temporarily change the name in the manifest.json file!",flush=True,file=sys.stderr)
         sys.exit(1)
 
 #build the appid
 app_id   = None
 debug_file_name = None
+app_mode  = None
 
 loop = GLib.MainLoop()
 runner = None
 
 if "scope" in manifest['hooks'][hook_name]:
+    app_mode = False
     app_id   = package_name+"_"+hook_name
     runner   = ScopeRunner(app_id,loop)
-    tmp_dir  = os.path.expanduser('~')+"/.local/share/unity-scopes/leaf-net/"+package_name+"/"
     if(not os.path.exists(tmp_dir)):
         os.mkdir(tmp_dir)
 
-    print("Setting the tmp dir to: "+tmp_dir)
-
 elif "desktop" in manifest['hooks'][hook_name]:
+    app_mode = True
     app_id   = package_name+"_"+hook_name+"_"+package_version
     runner   = AppRunner(app_id,loop)
 else:
-    print("Hook is not supported, only scope and app hooks can be executed",flush=True)
-    #TODO move to uninstall
+    print("Sdk-Launcher> Hook is not supported, only scope and app hooks can be executed",flush=True)
     sys.exit(1)
 
-debug_file_name = tmp_dir+app_id+"_debug.json"
-
-print("AppId: "+app_id,flush=True)
-print("Architecture: "+package_arch,flush=True)
-
-#create the debug description file if required
-if needs_debug_conf:
-    try:
-        f = open(debug_file_name, 'w')
-        json.dump(conf_obj,f)
-        f.close()
-    except OSError:
-        print("Could not create the debug description file")
-        sys.exit(1)
-
+print("Sdk-Launcher> Installing application .....",flush=True)
 #we have all informations, now install the click package
-#@TODO check if its already installed
-
 success = subprocess.call(
-    ["pkcon","--allow-untrusted","install-local",options.clickPck,"-p"])
+    ["pkcon","--allow-untrusted","install-local",options.clickPck,"-p"],stdout=subprocess.DEVNULL)
 if success != 0:
-    print("Installing the application failed",flush=True)
+    print("Sdk-Launcher> Installing the application failed",flush=True)
     sys.exit(1)
 
-print("Application installed, executing",flush=True)
-
-#create 2 named pipes and listen for data
-stdoutPipeName = tmp_dir+app_id+".stdout"
-procStdOut = create_procpipe(stdoutPipeName,on_proc_stdout)
-
-stderrPipeName = tmp_dir+app_id+".stderr"
-procStdErr = create_procpipe(stderrPipeName,on_proc_stderr)
-
-
-if "unix_signal_add" in dir(GLib):
-    GLib.unix_signal_add(GLib.PRIORITY_HIGH, signal.SIGTERM, on_sigterm, runner)
-    GLib.unix_signal_add(GLib.PRIORITY_HIGH, signal.SIGINT, on_sigterm, runner)
-    GLib.unix_signal_add(GLib.PRIORITY_HIGH, signal.SIGHUP, on_sigterm, runner)
-else:
-    GLib.unix_signal_add_full(GLib.PRIORITY_HIGH, signal.SIGTERM, on_sigterm, runner)
-    GLib.unix_signal_add_full(GLib.PRIORITY_HIGH, signal.SIGINT, on_sigterm, runner)
-    GLib.unix_signal_add_full(GLib.PRIORITY_HIGH, signal.SIGHUP, on_sigterm, runner)
-
-#execute the hook, this will not return before the app or scope finished to run
-exitCode = runner.launch()
-
-success = subprocess.call(["pkcon","remove",package_name+";"+package_version+";"+package_arch+";local:click","-p"])
-if success != 0:
-    print("Uninstalling the application failed",flush=True)
-
+print("Sdk-Launcher> Application installed successfully",flush=True)
+
+debug_file_name = None
+stdoutPipeName  = None
+procStdOut      = None
+stderrPipeName  = None
+procStdErr      = None
+
+try:
+    confined = is_confined(manifest,hook_name)
+
+    if (app_mode is True and confined):
+        tmp_dir  = os.path.expanduser('~')+"/.local/share/"+package_name+"/"
+    elif (app_mode is True and not confined):
+        tmp_dir  = os.path.expanduser('~')+"/.local/share/"+package_name+"/"
+    elif (app_mode is False and confined):
+        tmp_dir  = os.path.expanduser('~')+"/.local/share/unity-scopes/leaf-net/"+package_name+"/"
+    elif (app_mode is False and not confined):
+        tmp_dir  = os.path.expanduser('~')+"/.local/share/unity-scopes/unconfined/"+package_name+"/"
+    else:
+        #error we need to stop
+        raise Exception("There was a error specifying the communication directory.")
+
+    debug_file_name = tmp_dir+app_id+"_debug.json"
+
+    if(not os.path.exists(tmp_dir)):
+        os.mkdir(tmp_dir)
+
+    print("Sdk-Launcher> AppId:                   "+app_id,flush=True)
+    print("Sdk-Launcher> Architecture:            "+package_arch,flush=True,end="")
+    print("Sdk-Launcher> Application confined:    "+str(confined),flush=True)
+    print("Sdk-Launcher> Communication directory: "+tmp_dir,flush=True)
+
+    #create the debug description file if required
+    if needs_debug_conf:
+        try:
+            f = open(debug_file_name, 'w')
+            json.dump(conf_obj,f)
+            f.close()
+        except OSError:
+            #error we need to stop
+            raise Exception("Could not create the debug description file")
+
+    #create 2 named pipes and listen for data
+    stdoutPipeName = tmp_dir+app_id+".stdout"
+    procStdOut = create_procpipe(stdoutPipeName,on_proc_stdout)
+
+    stderrPipeName = tmp_dir+app_id+".stderr"
+    procStdErr = create_procpipe(stderrPipeName,on_proc_stderr)
+
+    if "unix_signal_add" in dir(GLib):
+        GLib.unix_signal_add(GLib.PRIORITY_HIGH, signal.SIGTERM, on_sigterm, runner)
+        GLib.unix_signal_add(GLib.PRIORITY_HIGH, signal.SIGINT, on_sigterm, runner)
+        GLib.unix_signal_add(GLib.PRIORITY_HIGH, signal.SIGHUP, on_sigterm, runner)
+    else:
+        GLib.unix_signal_add_full(GLib.PRIORITY_HIGH, signal.SIGTERM, on_sigterm, runner)
+        GLib.unix_signal_add_full(GLib.PRIORITY_HIGH, signal.SIGINT, on_sigterm, runner)
+        GLib.unix_signal_add_full(GLib.PRIORITY_HIGH, signal.SIGHUP, on_sigterm, runner)
+
+    #execute the hook, this will not return before the app or scope finished to run
+    exitCode = runner.launch()
+
+except Exception as err:
+    print(repr(err),flush=True)
+    exitCode = 1
+
+#clean up the debug conf file if it still exists
 if needs_debug_conf:
     try:
-        if os.path.isfile(debug_file_name):
+        if (debug_file_name != None and os.path.isfile(debug_file_name)):
             os.remove(debug_file_name)
     except:
-        print("Could not remove the debug description file: "+debug_file_name+"\n Please delete it manually",flush=True,file=sys.stderr)
-
-os.close(procStdOut)
-os.unlink(stdoutPipeName)
-os.close(procStdErr)
-os.unlink(stderrPipeName)
-
+        print("Sdk-Launcher> Could not remove the debug description file: "+debug_file_name+"\n Please delete it manually",flush=True,file=sys.stderr)
+
+#close the pipes
+if (stdoutPipeName != None and os.path.exists(stdoutPipeName)):
+    os.close(procStdOut)
+    os.unlink(stdoutPipeName)
+
+if (stderrPipeName != None and os.path.exists(stderrPipeName)):
+    os.close(procStdErr)
+    os.unlink(stderrPipeName)
+
+success = subprocess.call(["pkcon","remove",package_name+";"+package_version+";"+package_arch+";local:click","-p"],stdout=subprocess.DEVNULL)
+if success != 0:
+    print("Sdk-Launcher> Uninstalling the application failed",flush=True)
+
+print("Sdk-Launcher> Finished",flush=True)
 sys.exit(exitCode)

=== modified file 'share/qtcreator/ubuntu/scripts/qtc_device_debughelper.py'
--- share/qtcreator/ubuntu/scripts/qtc_device_debughelper.py	2014-09-03 07:15:50 +0000
+++ share/qtcreator/ubuntu/scripts/qtc_device_debughelper.py	2014-09-12 10:47:38 +0000
@@ -26,26 +26,60 @@
 import subprocess
 import shlex
 import shutil
+import re
 
+def is_confined ():
+    test_dir = os.path.expanduser('~')+"/.local/share"
+    try:
+        os.listdir(test_dir)
+        #if we reach the return statement we are not in confinement
+        return False
+    except:
+        pass
+    return True
 
 app_id = None
 args   = None
 tmpdir = "/tmp/"
 
 mode = sys.argv[1]
+confined = is_confined()
 
 if  mode == "scope":
     app_id = sys.argv[2]
     args   = sys.argv[3:]
 
-    #i hope this works
-    packagename = app_id[:app_id.rfind("_")]
-    tmpdir = "/home/phablet/.local/share/unity-scopes/leaf-net/"+packagename+"/"
+    regex = re.compile("_");
+
+    try:
+        (packagename,hookname) = regex.split(app_id)
+    except ValueError as err:
+        print("Debug-helper> Invalid Application ID "+app_id+" "+repr(err),file=sys.stderr)
+        sys.exit(1)
+
+    if(confined):
+        tmpdir  = os.path.expanduser('~')+"/.local/share/unity-scopes/leaf-net/"+packagename+"/"
+    else:
+        tmpdir  = os.path.expanduser('~')+"/.local/share/unity-scopes/unconfined/"+packagename+"/"
+
 elif mode == "app":
     app_id = os.environ.get('APP_ID')
+
+    #i hope this works
+    pos = app_id.rfind("_")
+    pos = app_id.rfind("_",0,pos)
+
+    regex = re.compile("_");
+    try:
+        (packagename,hookname,version) = regex.split(app_id)
+    except ValueError as err:
+        print("Debug-helper> Invalid Application ID "+app_id+" "+repr(err),file=sys.stderr)
+        sys.exit(1)
+
     args = shlex.split(sys.argv[2])
+    tmpdir = os.path.expanduser('~')+"/.local/share/"+packagename+"/"
 else:
-    print("Unsupported script mode (scope|app)")
+    print("Debug-helper> Unsupported script mode (scope|app)")
     sys.exit(1)
 
 stdoutPipeName = tmpdir+app_id+".stdout"
@@ -58,10 +92,10 @@
     newStdErr = os.open(stderrPipeName,os.O_WRONLY | os.O_NONBLOCK)
     os.dup2(newStdErr, sys.stderr.fileno());
 
-print ("---------- Debug helper ------------")
-print ("Setting up environment")
-print ("TmpDir:  "+tmpdir)
-print ("AppId:   "+app_id)
+print ("Debug-helper> Setting up environment")
+print ("Debug-helper> TmpDir:      "+tmpdir)
+print ("Debug-helper> AppId:       "+app_id)
+print ("Debug-helper> Environment: "+("confined" if is_confined() else "unconfined"))
 
 if (args[0][0] == "/"):
     effective_cmd = command = args.pop(0)
@@ -69,7 +103,7 @@
     effective_cmd = command = shutil.which(args.pop(0))
 
 if command is None:
-    print("Executable was not found in the PATH")
+    print("Debug-helper> Executable was not found in the PATH")
     sys.exit(1)
 
 if app_id is None:
@@ -82,7 +116,7 @@
     try:
         debug_settings = json.load(f)
     except:
-        print("Could not load the settings file")
+        print("Debug-helper> Could not load the settings file")
         sys.exit(1)
 
     if "qmlDebug" in debug_settings:
@@ -91,7 +125,7 @@
     if "gdbPort" in debug_settings:
         effective_cmd = shutil.which("gdbserver")
         if effective_cmd is None:
-            print("gdbserver was not found in the PATH")
+            print("Debug-helper> gdbserver was not found in the PATH")
             sys.exit(1)
         args.insert(0,":"+debug_settings["gdbPort"])
         args.insert(1,command)
@@ -111,9 +145,8 @@
 #execv wants the command again in the arguments
 args.insert(0,effective_cmd)
 
-print ("Environment initialized, starting the application")
-print ("---------- Debug helper ------------")
-print ("Executing "+effective_cmd+str(args))
+print ("Debug-helper> Environment initialized, starting the application")
+print ("Debug-helper> Executing "+effective_cmd+str(args))
 
 #flush all descriptors
 sys.stdout.flush()

=== modified file 'src/ubuntu/ubuntulocalrunconfiguration.cpp'
--- src/ubuntu/ubuntulocalrunconfiguration.cpp	2014-09-02 15:06:34 +0000
+++ src/ubuntu/ubuntulocalrunconfiguration.cpp	2014-09-12 10:47:38 +0000
@@ -311,9 +311,7 @@
     if(!UbuntuLocalRunConfiguration::readDesktopFile(desktopFile,&command,&args,errorMessage))
         return false;
 
-    m_workingDir = target()->activeBuildConfiguration()->buildDirectory().toString()
-            + QDir::separator()
-            + QLatin1String(Constants::UBUNTU_DEPLOY_DESTDIR);
+    m_workingDir = target()->activeBuildConfiguration()->buildDirectory().toString();
 
     QFileInfo commInfo(command);
     if(commInfo.fileName().startsWith(QLatin1String("qmlscene"))) {
@@ -457,7 +455,7 @@
                         if(usedPaths.contains(path))
                             continue;
 
-                        env.appendOrSet(QLatin1String("QML2_IMPORT_PATH"),path,QString::fromLatin1(":"));
+                        env.appendOrSet(QStringLiteral("QML2_IMPORT_PATH"),path,QStringLiteral(":"));
                         usedPaths.insert(path);
                     }
                 }