Telegram app

Merge lp:~libqtelegram-team/telegram-app/v2-fix-sdk-dirs into lp:telegram-app

  1. v2-fix-sdk-dirs
  2. Merge into telegram
Proposed by Michał Karnicki
Status: Merged
Approved by: Michał Karnicki
Approved revision: 130
Merged at revision: 131
Proposed branch: lp:~libqtelegram-team/telegram-app/v2-fix-sdk-dirs
Merge into: lp:telegram-app
Diff against target: 42 lines (+6/-6)
3 files modified
bootstrap.sh (+2/-2)
build.sh (+2/-2)
telegram/scope/build.sh (+2/-2)
To merge this branch: bzr merge lp:~libqtelegram-team/telegram-app/v2-fix-sdk-dirs
Reviewer Review Type Date Requested Status
libqtelegram team Pending
Review via email: mp+280001@code.launchpad.net

Description of the change

Fix the build scripts to match recent changes in the SDK.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bootstrap.sh'
2--- bootstrap.sh 2015-11-18 13:45:48 +0000
3+++ bootstrap.sh 2015-12-09 11:48:28 +0000
4@@ -1,8 +1,8 @@
5 #!/bin/bash
6
7 set -e
8-ARM_QMAKE=~/.config/ubuntu-sdk/ubuntu-sdk-15.04-armhf/qt5-qmake-arm-linux-gnueabihf
9-ARM_MAKE=~/.config/ubuntu-sdk/ubuntu-sdk-15.04-armhf/make
10+ARM_QMAKE=~/.config/QtProject/qtcreator/ubuntu-sdk/ubuntu-sdk-15.04-armhf/qt5-qmake-arm-linux-gnueabihf
11+ARM_MAKE=~/.config/QtProject/qtcreator/ubuntu-sdk/ubuntu-sdk-15.04-armhf/make
12
13 TG_DIR=`pwd`
14
15
16=== modified file 'build.sh'
17--- build.sh 2015-11-18 13:45:48 +0000
18+++ build.sh 2015-12-09 11:48:28 +0000
19@@ -1,7 +1,7 @@
20 #!/bin/bash
21 set -e
22-ARM_QMAKE=~/.config/ubuntu-sdk/ubuntu-sdk-15.04-armhf/qt5-qmake-arm-linux-gnueabihf
23-ARM_MAKE=~/.config/ubuntu-sdk/ubuntu-sdk-15.04-armhf/make
24+ARM_QMAKE=~/.config/QtProject/qtcreator/ubuntu-sdk/ubuntu-sdk-15.04-armhf/qt5-qmake-arm-linux-gnueabihf
25+ARM_MAKE=~/.config/QtProject/qtcreator/ubuntu-sdk/ubuntu-sdk-15.04-armhf/make
26
27 TG_DIR=`pwd`
28 TG_LIBS=$TG_DIR/usr/lib/arm-linux-gnueabihf
29
30=== modified file 'telegram/scope/build.sh'
31--- telegram/scope/build.sh 2015-09-22 09:57:07 +0000
32+++ telegram/scope/build.sh 2015-12-09 11:48:28 +0000
33@@ -1,7 +1,7 @@
34 #!/bin/bash
35 set -e
36-ARM_QMAKE=~/.config/ubuntu-sdk/ubuntu-sdk-15.04-armhf/qt5-qmake-arm-linux-gnueabihf
37-ARM_MAKE=~/.config/ubuntu-sdk/ubuntu-sdk-15.04-armhf/make
38+ARM_QMAKE=~/.config/QtProject/qtcreator/ubuntu-sdk/ubuntu-sdk-15.04-armhf/qt5-qmake-arm-linux-gnueabihf
39+ARM_MAKE=~/.config/QtProject/qtcreator/ubuntu-sdk/ubuntu-sdk-15.04-armhf/make
40
41 TG_DIR=$(echo `cd ../..; pwd`)
42 #TG_LIBS=$TG_DIR/usr/lib/arm-linux-gnueabihf

Subscribers

People subscribed via source and target branches

to all changes:
to status/vote changes: