Merge lp:~larryprice/phablet-tools/click-buddy-use-build-dir into lp:phablet-tools

Proposed by Larry Price on 2016-06-28
Status: Needs review
Proposed branch: lp:~larryprice/phablet-tools/click-buddy-use-build-dir
Merge into: lp:phablet-tools
Diff against target: 42 lines (+4/-7)
1 file modified
click-buddy (+4/-7)
To merge this branch: bzr merge lp:~larryprice/phablet-tools/click-buddy-use-build-dir
Reviewer Review Type Date Requested Status
Ubuntu Phablet Team 2016-06-28 Pending
Review via email: mp+298576@code.launchpad.net

Commit message

Use existing temporary build directory to build source for any architecture.

Description of the change

Temporary build directory should be used when running cmake. This was already working when running a click build for all architectures.

To post a comment you must log in.

Unmerged revisions

359. By Larry Price on 2016-06-28

Use existing temporary build directory to build source for any architecture

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'click-buddy'
2--- click-buddy 2014-09-09 14:46:55 +0000
3+++ click-buddy 2016-06-28 21:15:55 +0000
4@@ -131,7 +131,7 @@
5 exit 1
6 fi
7
8-workdir=$(pwd)
9+outputdir=$(pwd)
10 cd $builddir
11
12 CMAKE_PARAMS="-DINSTALL_TESTS=off -DCLICK_MODE=on \
13@@ -159,16 +159,15 @@
14 echo "Use the undocumented --maint-mode if you want this automated."
15 exit 1
16 fi
17- cd "$SOURCE"
18 if [ -n "$MAINTMODE" ]; then
19 trap 'click chroot -a$ARCH -f$FRAMEWORK maint apt-get autoremove --yes $EXTRA_DEPS' \
20 EXIT HUP INT TERM
21 click chroot -a$ARCH -f$FRAMEWORK maint apt-get update
22 click chroot -a$ARCH -f$FRAMEWORK maint apt-get install --yes $EXTRA_DEPS
23 fi
24- click chroot -a$ARCH -f$FRAMEWORK run cmake $CMAKE_PARAMS
25+ click chroot -a$ARCH -f$FRAMEWORK run cmake $CMAKE_PARAMS "$SOURCE"
26 click chroot -a$ARCH -f$FRAMEWORK run make
27- click chroot -a$ARCH -f$FRAMEWORK run make DESTDIR=$installdir install
28+ click chroot -a$ARCH -f$FRAMEWORK run make DESTDIR=$installdir install
29 fi
30
31 if [ ! -f "$installdir/manifest.json" ]; then
32@@ -177,9 +176,7 @@
33 fi
34
35 click build $installdir
36-if [ "$workdir" != "$(pwd)" ]; then
37- cp *.click $workdir
38-fi
39+cp *.click $outputdir
40
41 if [ -n "$PROVISION" ]; then
42 set -e

Subscribers

People subscribed via source and target branches