Merge lp:~gary-wzl77/news-scope/fat_click_package into lp:news-scope

[Gary.Wang]

generate fat click package when building.

generate fat click package when building.

[Kyle Nitzsche (knitzsche)]

Hey Gary,

I think that because you are doing this same type of "fat package" change to all branches and because you are testing them and you are the expert in this area, you should go ahead commit to trunks with merge proposals (unless there is a special case you want to bring to attention).

Also, I wonder what the overall plan is:
* is a single click package intended to contain the .so files for all architectures?
* or will there be a click package differentiated by file name including the arch for each arch?

Can you please explain this.

Cheers

[Kyle Nitzsche (knitzsche)]

I meant to say "commit to trunk WITHOUT merge proposals" (oops ;)

[Gary.Wang (gary-wzl77)]

Hi Kyle
Thanks for your question.

* is a single click package intended to contain the .so files for all architectures?
A: Yes, you're right, there's a single click package generated in following name convention after running make_click.sh
   ${PKG}_${SCOPE_NAME}_${VER_NUM}_multi.click
   the trailing string "_multi" indicates this click package contains binary files for all architectures which are declared in manifest.json.in
   ...
   "architecture": ["armhf", "arm64", "i386", "amd64"],
   ...

   As you can see, I added aggregator library(arm64) into a new folder(click-src/aggregator/aarch64-linux-gnu) and moved original armhf binary file into arm-linux-gnueabihf. That allows scope shell to load right binary file according to host architecture.
End user is able to install a single click package to all platform as long as the corresponding binary file can be found for each architecture.
This's how we support multi-architectures for all aggregator scope.

For each stand-alone scope, it's a little bit different.
I deploy a new script(build_fat_click.sh) for each scope.
https://bazaar.launchpad.net/~hanloon-team/hanloon/timeout/revision/52
you can use this script to generate fat click package as long as the declared architectures are created in your chroot.

P.S. You can still use previous way to generate armhf click. It's fine.
     Question: which kind of click we need to create and release on the store in the future, armhf or multi? Personally, I'd tend to the latter. Let's discuss with team members on this.

Unmerged revisions

59. By Gary.Wang on 2016-07-26

generate fat click package when building.

=== added directory 'click-src/aggregator/aarch64-linux-gnu'
=== added file 'click-src/aggregator/aarch64-linux-gnu/libcom.canonical.scopes.aggregator_aggregator.so'
Binary files click-src/aggregator/aarch64-linux-gnu/libcom.canonical.scopes.aggregator_aggregator.so	1970-01-01 00:00:00 +0000 and click-src/aggregator/aarch64-linux-gnu/libcom.canonical.scopes.aggregator_aggregator.so	2016-07-26 09:34:45 +0000 differ
=== added directory 'click-src/aggregator/arm-linux-gnueabihf'
=== added file 'click-src/aggregator/arm-linux-gnueabihf/libcom.canonical.scopes.aggregator_aggregator.so'
Binary files click-src/aggregator/arm-linux-gnueabihf/libcom.canonical.scopes.aggregator_aggregator.so	1970-01-01 00:00:00 +0000 and click-src/aggregator/arm-linux-gnueabihf/libcom.canonical.scopes.aggregator_aggregator.so	2016-07-26 09:34:45 +0000 differ
=== removed file 'click-src/aggregator/libcom.canonical.scopes.aggregator_aggregator.so'
Binary files click-src/aggregator/libcom.canonical.scopes.aggregator_aggregator.so	2016-07-13 15:20:38 +0000 and click-src/aggregator/libcom.canonical.scopes.aggregator_aggregator.so	1970-01-01 00:00:00 +0000 differ
=== modified file 'make-click.sh'
--- make-click.sh	2016-07-13 15:20:38 +0000
+++ make-click.sh	2016-07-26 09:34:45 +0000
@@ -12,6 +12,7 @@
 APP="unity-scope-news"
 TITLE="News"
 DESC="News from many sources"
+FRAMEWORK="ubuntu-sdk-15.04.4"
 VERSION="4.9.0"
 
 # definition for test
@@ -49,7 +50,7 @@
 TEST_PREVIEWBUTTONCOLOR="False"
 GETTEXT_DOMAIN="aggregator"
 # pkg name
-CLICK_PKG="${PKG}_${VERSION}_armhf.click"
+CLICK_PKG="${PKG}_${VERSION}_multi.click"
 
 # scope ini
 DISPLAY_NAME="News"
@@ -88,6 +89,7 @@
 sed -i 's_TITLE_'"${TITLE}"'_g' $TARGET/manifest.json
 sed -i 's_DESC_'"${DESC}"'_g' $TARGET/manifest.json
 sed -i 's_VERSION_'"${VERSION}"'_g' $TARGET/manifest.json
+sed -i 's_FRAMEWORK_'"${FRAMEWORK}"'_g' $TARGET/manifest.json
 
 #test
 sed 's/@PKG_PREFIX@/'"${PREFIX}"'/g' $TEST/test_generic.py.in > $TEST/test_generic.py
@@ -138,7 +140,14 @@
 cp $SOURCE/aggregator/settings.ini $TARGET/$APP/${PKG}_${APP}-settings.ini
 
 # binary
-cp $SOURCE/aggregator/libcom.canonical.scopes.aggregator_aggregator.so $TARGET/$APP/lib${PKG}_${APP}.so
+for ARCH in aarch64-linux-gnu arm-linux-gnueabihf i386-linux-gnu x86_64-linux-gnu
+do
+    if [ -d "${SOURCE}/aggregator/${ARCH}" ]; then
+        mkdir ${TARGET}/${APP}/${ARCH}
+        cp $SOURCE/aggregator/${ARCH}/libcom.canonical.scopes.aggregator_aggregator.so $TARGET/$APP/${ARCH}/lib${PKG}_${APP}.so
+    fi
+done
+
 
 #child_scoess.json
 cp $SOURCE/aggregator/child_scopes.json $TARGET/$APP/child_scopes.json

=== modified file 'manifest.json'
--- manifest.json	2015-07-01 13:22:01 +0000
+++ manifest.json	2016-07-26 09:34:45 +0000
@@ -1,8 +1,8 @@
 {
     "name": "PKG",
     "description": "DESC",
-    "framework": "ubuntu-sdk-15.04",
-    "architecture": "armhf",
+    "framework": "FRAMEWORK",
+    "architecture": ["armhf", "arm64", "i386", "amd64"],
     "title": "TITLE",
     "hooks": {
         "APP": {