Phablet Tools

Merge lp:~nskaggs/phablet-tools/default-to-1404 into lp:phablet-tools

  1. default-to-1404
  2. Merge into trunk
Proposed by Nicholas Skaggs
Status: Superseded
Proposed branch: lp:~nskaggs/phablet-tools/default-to-1404
Merge into: lp:phablet-tools
Diff against target: 169 lines (+54/-54)
1 file modified
click-buddy (+54/-54)
To merge this branch: bzr merge lp:~nskaggs/phablet-tools/default-to-1404
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Ubuntu Phablet Team Pending
Review via email: mp+218153@code.launchpad.net

This proposal has been superseded by a proposal from 2014-05-03.

Commit message

Change default framework to 14.04, which is latest stable

Description of the change

Change default framework to 14.04, which is latest stable

To post a comment you must log in.
Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

Wow, that's a lot of whitespace changes. Even using vi, I get this, not sure what the deal is :-)

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:269
http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/316/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-trusty-amd64-ci/88
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-trusty-armhf-ci/88
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-trusty-i386-ci/88

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/phablet-tools-ci/316/rebuild

review: Approve (continuous-integration)
Revision history for this message
Sergio Schvezov (sergiusens) wrote :

On Fri, May 2, 2014 at 5:41 PM, Nicholas Skaggs <
<email address hidden>> wrote:

> Wow, that's a lot of whitespace changes. Even using vi, I get this, not
> sure what the deal is :-)
>

You might have an autosave hook that does s/<tab>/<spaces>/ ;-)

Unmerged revisions

269. By Nicholas Skaggs

change default sdk framework to 14.04

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'click-buddy'
--- click-buddy 2014-04-14 18:45:09 +0000
+++ click-buddy 2014-05-02 20:39:02 +0000
@@ -25,18 +25,18 @@
25Creates and runs click apps25Creates and runs click apps
2626
27OPTIONS:27OPTIONS:
28 -h Show this message28 -h Show this message
29 -s Specify the serial of the device to install (see adb $ADBOPTS devices)29 -s Specify the serial of the device to install (see adb $ADBOPTS devices)
3030
31 --bzr-source bzr sources used to backreference the package31 --bzr-source bzr sources used to backreference the package
32 --dir directory holding the package to build32 --dir directory holding the package to build
33 --provision Install resulting click and run tests33 --provision Install resulting click and run tests
34 --no-clean Don't clean temporary directories34 --no-clean Don't clean temporary directories
35 --extra-deps Packages required in the chroot which are not part of the SDK35 --extra-deps Packages required in the chroot which are not part of the SDK
36 --arch Target architecture, requires a created click chroot36 --arch Target architecture, requires a created click chroot
37 (defaults to arch all)37 (defaults to arch all)
38 --framework Target click framework, requires a created click chroot38 --framework Target click framework, requires a created click chroot
39 (defaults to ubuntu-sdk-13.10)39 (defaults to ubuntu-sdk-14.04)
40EOF40EOF
41}41}
4242
@@ -47,7 +47,7 @@
47NO_CLEAN=""47NO_CLEAN=""
48EXTRA_DEPS=""48EXTRA_DEPS=""
49ARCH="all"49ARCH="all"
50FRAMEWORK="ubuntu-sdk-13.10"50FRAMEWORK="ubuntu-sdk-14.04"
51MAINTMODE=""51MAINTMODE=""
5252
53TEST_DIR='tests/autopilot'53TEST_DIR='tests/autopilot'
@@ -89,25 +89,25 @@
89 shift89 shift
90 NO_CLEAN=190 NO_CLEAN=1
91 ;;91 ;;
92 --arch)92 --arch)
93 shift93 shift
94 ARCH="$1"94 ARCH="$1"
95 shift95 shift
96 ;;96 ;;
97 --framework)97 --framework)
98 shift98 shift
99 FRAMEWORK="$1"99 FRAMEWORK="$1"
100 shift100 shift
101 ;;101 ;;
102 --extra-deps)102 --extra-deps)
103 shift103 shift
104 EXTRA_DEPS="$1"104 EXTRA_DEPS="$1"
105 shift105 shift
106 ;;106 ;;
107 --maint-mode)107 --maint-mode)
108 shift108 shift
109 MAINTMODE=1109 MAINTMODE=1
110 ;;110 ;;
111 --)111 --)
112 shift112 shift
113 break113 break
@@ -122,7 +122,7 @@
122fi122fi
123123
124if [ -z "$SOURCE" ]; then124if [ -z "$SOURCE" ]; then
125 SOURCE="$(readlink -f $(pwd))"125 SOURCE="$(readlink -f $(pwd))"
126fi126fi
127127
128if [ ! -f $SOURCE/CMakeLists.txt ]; then128if [ ! -f $SOURCE/CMakeLists.txt ]; then
@@ -135,50 +135,50 @@
135cd $builddir135cd $builddir
136136
137CMAKE_PARAMS="-DINSTALL_TESTS=off -DCLICK_MODE=on \137CMAKE_PARAMS="-DINSTALL_TESTS=off -DCLICK_MODE=on \
138 -DBZR_REVNO=$(cd $SOURCE; bzr revno)"138 -DBZR_REVNO=$(cd $SOURCE; bzr revno)"
139139
140if [ -n "$BZR_SOURCE" ]; then140if [ -n "$BZR_SOURCE" ]; then
141 CMAKE_PARAMS="$CMAKE_PARAMS -DBZR_SOURCE=$BZR_SOURCE"141 CMAKE_PARAMS="$CMAKE_PARAMS -DBZR_SOURCE=$BZR_SOURCE"
142fi142fi
143143
144set -e144set -e
145if [ "$ARCH" = "all" ]; then145if [ "$ARCH" = "all" ]; then
146 cmake "$SOURCE" $CMAKE_PARAMS146 cmake "$SOURCE" $CMAKE_PARAMS
147 make DESTDIR=$installdir install147 make DESTDIR=$installdir install
148else148else
149 if [ -n "$EXTRA_DEPS" ] && [ -z "$MAINTMODE" ]; then149 if [ -n "$EXTRA_DEPS" ] && [ -z "$MAINTMODE" ]; then
150 echo "click chroot still doesn\'t support sessions and deps outside the"150 echo "click chroot still doesn\'t support sessions and deps outside the"
151 echo "default sdk were requested, you can optionally use click maint"151 echo "default sdk were requested, you can optionally use click maint"
152 echo "to install $EXTRA_DEPS by running"152 echo "to install $EXTRA_DEPS by running"
153 echo " click chroot -a$ARCH -f$FRAMEWORK maint apt-get update"153 echo " click chroot -a$ARCH -f$FRAMEWORK maint apt-get update"
154 echo " click chroot -a$ARCH -f$FRAMEWORK maint apt-get install $EXTRA_DEPS"154 echo " click chroot -a$ARCH -f$FRAMEWORK maint apt-get install $EXTRA_DEPS"
155 echo155 echo
156 echo "Your chroot will be unclean from then on, so if you want to"156 echo "Your chroot will be unclean from then on, so if you want to"
157 echo "guarantee clean builds the chroot would need to be recreated."157 echo "guarantee clean builds the chroot would need to be recreated."
158 echo158 echo
159 echo "Use the undocumented --maint-mode if you want this automated."159 echo "Use the undocumented --maint-mode if you want this automated."
160 exit 1160 exit 1
161 fi161 fi
162 cd "$SOURCE"162 cd "$SOURCE"
163 if [ -n "$MAINTMODE" ]; then163 if [ -n "$MAINTMODE" ]; then
164 trap 'click chroot -a$ARCH -f$FRAMEWORK maint apt-get autoremove --yes $EXTRA_DEPS' \164 trap 'click chroot -a$ARCH -f$FRAMEWORK maint apt-get autoremove --yes $EXTRA_DEPS' \
165 EXIT HUP INT TERM165 EXIT HUP INT TERM
166 click chroot -a$ARCH -f$FRAMEWORK maint apt-get update166 click chroot -a$ARCH -f$FRAMEWORK maint apt-get update
167 click chroot -a$ARCH -f$FRAMEWORK maint apt-get install --yes $EXTRA_DEPS167 click chroot -a$ARCH -f$FRAMEWORK maint apt-get install --yes $EXTRA_DEPS
168 fi168 fi
169 click chroot -a$ARCH -f$FRAMEWORK run cmake $CMAKE_PARAMS169 click chroot -a$ARCH -f$FRAMEWORK run cmake $CMAKE_PARAMS
170 click chroot -a$ARCH -f$FRAMEWORK run make170 click chroot -a$ARCH -f$FRAMEWORK run make
171 click chroot -a$ARCH -f$FRAMEWORK run make DESTDIR=$installdir install171 click chroot -a$ARCH -f$FRAMEWORK run make DESTDIR=$installdir install
172fi172fi
173173
174if [ ! -f "$installdir/manifest.json" ]; then174if [ ! -f "$installdir/manifest.json" ]; then
175 echo Building failed, check environment175 echo Building failed, check environment
176 exit 1176 exit 1
177fi177fi
178178
179click build $installdir179click build $installdir
180if [ "$workdir" != "$(pwd)" ]; then180if [ "$workdir" != "$(pwd)" ]; then
181 cp *.click $workdir181 cp *.click $workdir
182fi182fi
183183
184if [ -n "$PROVISION" ]; then184if [ -n "$PROVISION" ]; then

Subscribers

People subscribed via source and target branches