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

[Nicholas Skaggs]

Change default framework to 14.04, which is latest stable

Change default framework to 14.04, which is latest stable

[Nicholas Skaggs (nskaggs)]

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

[PS Jenkins bot (ps-jenkins)]

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)

[Sergio Schvezov (sergiusens)]

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 on 2014-05-02

change default sdk framework to 14.04

=== 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 @@
 Creates and runs click apps
 
 OPTIONS:
-  -h	Show this message
+  -h    Show this message
   -s    Specify the serial of the device to install (see adb $ADBOPTS devices)
 
-  --bzr-source 	bzr sources used to backreference the package
-  --dir      	directory holding the package to build
+  --bzr-source  bzr sources used to backreference the package
+  --dir         directory holding the package to build
   --provision   Install resulting click and run tests
   --no-clean    Don't clean temporary directories
   --extra-deps  Packages required in the chroot which are not part of the SDK
   --arch        Target architecture, requires a created click chroot
                 (defaults to arch all)
   --framework   Target click framework, requires a created click chroot
-                (defaults to ubuntu-sdk-13.10)
+                (defaults to ubuntu-sdk-14.04)
 EOF
 }
 
@@ -47,7 +47,7 @@
 NO_CLEAN=""
 EXTRA_DEPS=""
 ARCH="all"
-FRAMEWORK="ubuntu-sdk-13.10"
+FRAMEWORK="ubuntu-sdk-14.04"
 MAINTMODE=""
 
 TEST_DIR='tests/autopilot'
@@ -89,25 +89,25 @@
             shift
             NO_CLEAN=1
             ;;
-		--arch)
-			shift
-			ARCH="$1"
-			shift
-			;;
-		--framework)
-			shift
-			FRAMEWORK="$1"
-			shift
-			;;
-		--extra-deps)
-			shift
-			EXTRA_DEPS="$1"
-			shift
-			;;
-		--maint-mode)
-			shift
-			MAINTMODE=1
-			;;
+        --arch)
+            shift
+            ARCH="$1"
+            shift
+            ;;
+        --framework)
+            shift
+            FRAMEWORK="$1"
+            shift
+            ;;
+        --extra-deps)
+            shift
+            EXTRA_DEPS="$1"
+            shift
+            ;;
+        --maint-mode)
+            shift
+            MAINTMODE=1
+            ;;
         --)
             shift
             break
@@ -122,7 +122,7 @@
 fi
 
 if [ -z "$SOURCE" ]; then
-	SOURCE="$(readlink -f $(pwd))"
+    SOURCE="$(readlink -f $(pwd))"
 fi
 
 if [ ! -f $SOURCE/CMakeLists.txt ]; then
@@ -135,50 +135,50 @@
 cd $builddir
 
 CMAKE_PARAMS="-DINSTALL_TESTS=off -DCLICK_MODE=on \
-	-DBZR_REVNO=$(cd $SOURCE; bzr revno)"
+    -DBZR_REVNO=$(cd $SOURCE; bzr revno)"
 
 if [ -n "$BZR_SOURCE" ]; then
-	CMAKE_PARAMS="$CMAKE_PARAMS -DBZR_SOURCE=$BZR_SOURCE"
+    CMAKE_PARAMS="$CMAKE_PARAMS -DBZR_SOURCE=$BZR_SOURCE"
 fi
 
 set -e
 if [ "$ARCH" = "all" ]; then
-	cmake "$SOURCE" $CMAKE_PARAMS
-	make DESTDIR=$installdir install
+    cmake "$SOURCE" $CMAKE_PARAMS
+    make DESTDIR=$installdir install
 else
-	if [ -n "$EXTRA_DEPS" ] && [ -z "$MAINTMODE" ]; then
-		echo "click chroot still doesn\'t support sessions and deps outside the"
-		echo "default sdk were requested, you can optionally use click maint"
-		echo "to install $EXTRA_DEPS by running"
-		echo "    click chroot -a$ARCH -f$FRAMEWORK maint apt-get update"
-		echo "    click chroot -a$ARCH -f$FRAMEWORK maint apt-get install $EXTRA_DEPS"
-		echo
-		echo "Your chroot will be unclean from then on, so if you want to"
-		echo "guarantee clean builds the chroot would need to be recreated."
-		echo
-		echo "Use the undocumented --maint-mode if you want this automated."
-		exit 1
-	fi
-	cd "$SOURCE"
-	if [ -n "$MAINTMODE" ]; then
-		trap 'click chroot -a$ARCH -f$FRAMEWORK maint apt-get autoremove --yes $EXTRA_DEPS' \
-		   	EXIT HUP INT TERM
-		click chroot -a$ARCH -f$FRAMEWORK maint apt-get update
-		click chroot -a$ARCH -f$FRAMEWORK maint apt-get install --yes $EXTRA_DEPS
-	fi
-	click chroot -a$ARCH -f$FRAMEWORK run cmake $CMAKE_PARAMS
-	click chroot -a$ARCH -f$FRAMEWORK run make
+    if [ -n "$EXTRA_DEPS" ] && [ -z "$MAINTMODE" ]; then
+        echo "click chroot still doesn\'t support sessions and deps outside the"
+        echo "default sdk were requested, you can optionally use click maint"
+        echo "to install $EXTRA_DEPS by running"
+        echo "    click chroot -a$ARCH -f$FRAMEWORK maint apt-get update"
+        echo "    click chroot -a$ARCH -f$FRAMEWORK maint apt-get install $EXTRA_DEPS"
+        echo
+        echo "Your chroot will be unclean from then on, so if you want to"
+        echo "guarantee clean builds the chroot would need to be recreated."
+        echo
+        echo "Use the undocumented --maint-mode if you want this automated."
+        exit 1
+    fi
+    cd "$SOURCE"
+    if [ -n "$MAINTMODE" ]; then
+        trap 'click chroot -a$ARCH -f$FRAMEWORK maint apt-get autoremove --yes $EXTRA_DEPS' \
+            EXIT HUP INT TERM
+        click chroot -a$ARCH -f$FRAMEWORK maint apt-get update
+        click chroot -a$ARCH -f$FRAMEWORK maint apt-get install --yes $EXTRA_DEPS
+    fi
+    click chroot -a$ARCH -f$FRAMEWORK run cmake $CMAKE_PARAMS
+    click chroot -a$ARCH -f$FRAMEWORK run make
     click chroot -a$ARCH -f$FRAMEWORK run make DESTDIR=$installdir install
 fi
 
 if [ ! -f "$installdir/manifest.json" ]; then
-	echo Building failed, check environment
-	exit 1
+    echo Building failed, check environment
+    exit 1
 fi
 
 click build $installdir
 if [ "$workdir" != "$(pwd)" ]; then
-	cp *.click $workdir
+    cp *.click $workdir
 fi
 
 if [ -n "$PROVISION" ]; then