Ubuntu SDK IDE

Merge lp:~kalikiana/ubuntu-sdk-ide/usrbin into lp:ubuntu-sdk-ide

  1. usrbin
  2. Merge into trunk
Proposed by Cris Dywan
Status: Merged
Approved by: Benjamin Zeller
Approved revision: 170
Merged at revision: 170
Proposed branch: lp:~kalikiana/ubuntu-sdk-ide/usrbin
Merge into: lp:ubuntu-sdk-ide
Diff against target: 35 lines (+5/-5)
1 file modified
dist/qtcreator/src/plugins/ubuntu/src/ubuntu/ubuntuconstants.h (+5/-5)
To merge this branch: bzr merge lp:~kalikiana/ubuntu-sdk-ide/usrbin
Reviewer Review Type Date Requested Status
ubuntu-sdk-build-bot continuous-integration Approve
Benjamin Zeller Approve
Review via email: mp+312509@code.launchpad.net

Commit message

Remove hard-coded /usr/bin/ prefix from ubuntuconstants

To post a comment you must log in.
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:169
https://jenkins.ubuntu.com/ubuntu-sdk/job/qtcreator-ide-ci-amd64/369/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7302/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/qtcreator-ide-ci-amd64/369/rebuild

review: Approve (continuous-integration)
lp:~kalikiana/ubuntu-sdk-ide/usrbin updated
170. By Cris Dywan

Revert UBUNTUHTML_PROJECT_LAUNCHER_EXE for now

Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:170
https://jenkins.ubuntu.com/ubuntu-sdk/job/qtcreator-ide-ci-amd64/370/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7307/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/qtcreator-ide-ci-amd64/370/rebuild

review: Approve (continuous-integration)
Revision history for this message
Benjamin Zeller (zeller-benjamin) wrote :

LGTM

review: Approve
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:170
https://jenkins.ubuntu.com/ubuntu-sdk/job/qtcreator-ide-ci-amd64/373/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7310/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/qtcreator-ide-ci-amd64/373/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'dist/qtcreator/src/plugins/ubuntu/src/ubuntu/ubuntuconstants.h'
2--- dist/qtcreator/src/plugins/ubuntu/src/ubuntu/ubuntuconstants.h 2016-11-07 10:48:52 +0000
3+++ dist/qtcreator/src/plugins/ubuntu/src/ubuntu/ubuntuconstants.h 2016-12-16 10:58:26 +0000
4@@ -118,7 +118,7 @@
5 const char UBUNTUPROJECT_REMOTE_RUNCONTROL_APP_ID[] = "UbuntuProjectManager.RemoteRunConfiguration.App";
6
7 const char UBUNTUHTML_PROJECT_LAUNCHER_EXE[] = "/usr/bin/ubuntu-html5-app-launcher";
8-const char UBUNTUWEBAPP_PROJECT_LAUNCHER_EXE[] = "/usr/bin/webapp-container";
9+const char UBUNTUWEBAPP_PROJECT_LAUNCHER_EXE[] = "webapp-container";
10 const char UBUNTUSCOPES_PROJECT_LAUNCHER_EXE[] = "qtc_desktop_scoperunner.py";
11
12 const char UBUNTUBZR_INITIALIZE[] ="%0/qtc_bzr_info";
13@@ -280,9 +280,9 @@
14 const char UBUNTU_SETTINGS_ICON[] = ":/ubuntu/images/ubuntu-32.png";
15
16 //review tools
17-const char CLICK_REVIEWERSTOOLS_BINARY[] = "/usr/bin/click-review";
18+const char CLICK_REVIEWERSTOOLS_BINARY[] = "click-review";
19 const char CLICK_REVIEWERSTOOLS_ARGS[] = "--sdk \"%0\"";
20-const char CLICK_REVIEWERSTOOLS_LOCATION[] = "/usr/bin/click-review --sdk \"%0\"";
21+const char CLICK_REVIEWERSTOOLS_LOCATION[] = "click-review --sdk \"%0\"";
22
23 //build configuration
24 const char UBUNTU_CLICK_OPEN_TERMINAL_ERROR[] = "Error when starting terminal";
25@@ -294,8 +294,8 @@
26
27 const char UBUNTU_CLICK_CHROOT_SUFFIX_ENV_VAR[] = "CLICK_CHROOT_SUFFIX";
28 const char UBUNTU_CLICK_CHROOT_DEFAULT_NAME[] = "click";
29-const char UBUNTU_CLICK_BINARY[] = "/usr/bin/click";
30-const char UBUNTU_SUDO_BINARY[] = "/usr/bin/pkexec";
31+const char UBUNTU_CLICK_BINARY[] = "click";
32+const char UBUNTU_SUDO_BINARY[] = "pkexec";
33
34 const QString UBUNTU_TARGET_TOOL = QStandardPaths::findExecutable(QStringLiteral("usdk-target"));
35 const char UBUNTU_CREATE_CLICK_TARGET_ARGS[] = "env USDK_TEST_REMOTE=\"%0\" %1 create -n %2 -p %3";

Subscribers

People subscribed via source and target branches

to all changes: