Merge lp:~gary-wzl77/nearby-scope/generate_fat_click_package into lp:nearby-scope

Proposed by Gary.Wang on 2016-07-26
Status: Needs review
Proposed branch: lp:~gary-wzl77/nearby-scope/generate_fat_click_package
Merge into: lp:nearby-scope
Diff against target: 48 lines (+9/-3)
2 files modified
make-click.sh (+8/-2)
manifest.json (+1/-1)
To merge this branch: bzr merge lp:~gary-wzl77/nearby-scope/generate_fat_click_package
Reviewer Review Type Date Requested Status
NearBy Scope Team 2016-07-26 Pending
Review via email: mp+301142@code.launchpad.net

Commit message

generate fat click package when building.

Description of the change

generate fat click package when building.

To post a comment you must log in.

Unmerged revisions

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

add missing aggregator library for each arch.

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

generate fat click package.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory 'click-src/aggregator/aarch64-linux-gnu'
2=== added file 'click-src/aggregator/aarch64-linux-gnu/libcom.canonical.scopes.aggregator_aggregator.so'
3Binary 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 08:42:21 +0000 differ
4=== added directory 'click-src/aggregator/arm-linux-gnueabihf'
5=== added file 'click-src/aggregator/arm-linux-gnueabihf/libcom.canonical.scopes.aggregator_aggregator.so'
6Binary 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 08:42:21 +0000 differ
7=== removed file 'click-src/aggregator/libcom.canonical.scopes.aggregator_aggregator.so'
8Binary files click-src/aggregator/libcom.canonical.scopes.aggregator_aggregator.so 2016-07-13 15:33:23 +0000 and click-src/aggregator/libcom.canonical.scopes.aggregator_aggregator.so 1970-01-01 00:00:00 +0000 differ
9=== modified file 'make-click.sh'
10--- make-click.sh 2016-07-13 15:33:23 +0000
11+++ make-click.sh 2016-07-26 08:42:21 +0000
12@@ -131,7 +131,7 @@
13 # localize
14 intltool-merge -d -u -q ./po/ ${SOURCE}/aggregator/scope.ini.in $SOURCE/aggregator/scope.ini
15
16-cp $SOURCE/aggregator/scope.ini $TARGET/$APP/${APP}.ini
17+cp $SOURCE/aggregator/scope.ini $TARGET/$APP/${PKG}_${APP}.ini
18
19 # settings.ini
20 # localize
21@@ -139,7 +139,13 @@
22 #cp $SOURCE/aggregator/settings.ini $TARGET/$APP/${PKG}_${APP}-settings.ini
23
24 # binary
25-cp $SOURCE/aggregator/libcom.canonical.scopes.aggregator_aggregator.so $TARGET/$APP/${APP}.so
26+for ARCH in aarch64-linux-gnu arm-linux-gnueabihf i386-linux-gnu x86_64-linux-gnu
27+do
28+ if [ -d "${SOURCE}/aggregator/${ARCH}" ]; then
29+ mkdir ${TARGET}/${APP}/${ARCH}
30+ cp $SOURCE/aggregator/${ARCH}/libcom.canonical.scopes.aggregator_aggregator.so $TARGET/$APP/${ARCH}/lib${PKG}_${APP}.so
31+ fi
32+done
33
34 #child_scoess.json
35 cp $SOURCE/aggregator/child_scopes.json $TARGET/$APP/child_scopes.json
36
37=== modified file 'manifest.json'
38--- manifest.json 2015-08-05 19:18:35 +0000
39+++ manifest.json 2016-07-26 08:42:21 +0000
40@@ -2,7 +2,7 @@
41 "name": "PKG",
42 "description": "DESC",
43 "framework": "FRAMEWORK",
44- "architecture": "armhf",
45+ "architecture": ["armhf", "arm64", "i386", "amd64"],
46 "title": "TITLE",
47 "hooks": {
48 "APP": {

Subscribers

People subscribed via source and target branches

to all changes: