1013611 - [Single Variant] Build process for the operator variant resources is incorrect

Status: VERIFIED FIXED

(Firefox OS Graveyard :: Gaia::Build, defect)

Description

[Carmen Jimenez Cabezas]

Currently, the per-operator resources are specified on the file variant.json as local paths:
...
"ringtone": {
  "path": "resources/Movistar_Mid_ABR_128kbps.ogg",
  "name": "Tono Movistar"
},
"wallpaper": "resources/customize.jpg",
"power": {
  "poweron": {
    "video": "resources/Power_on_test.mp4"
  },
  "poweroff": {
    "image": "resources/Power_off_test.png"
  }
...

Those resources are then, at build time, copied into the operatorvariant app, and the values are set at a configuration json which will be processed at runtime.

This process is incorrect on two counts:

1. There is already a specific app that is used to include operator specific resource files. This app should also include the videos, animations, ringtones...

2. The generated configuration files has local paths (resources/Power_on_test.mp4) but they're loaded from the system app and as such they should be absolute paths.

The way it should work is:

* Allow to specify either an absolute path or a local path as URL on the variant.json file:

...
"wallpaper": "resources/customize.jpg",
"power": {
  "poweron": {
    "video": "app://operatorresources/<whateverpath>/<whateverfile>"
  },
  "poweroff": {
    "image": "resources/Power_off_test.png"
  }
}
...

* If the value of the path specified is absolute (starts with "app://", the build procces doesn't search for the file on the local directory, and only puts this url as value on the corresponding json file for the operatorvariant app.

* If the value of the path specified is relative, then it behaves almost like now (copy the resources files), except that on the corresponding json for the operatorvariant app it must specify an absolute URL:

app://operatorvariant/resources/Power_off_test.png

Comment 1

[Albert [:albert]]

Attachment: Patch

Comment 2

[Albert [:albert]]

Waiting for 1013293 in order to request review.

Comment 3

[Carmen Jimenez Cabezas]

s%app://operatorvariant/resources/Power_off_test.png%app://operatorresources/resources/Power_off_test.png

Comment 4

[Yuren [:yurenju] (AFK ~ Oct. 12) (volunteer mode)]

Comment on attachment 8426084 [details]
Patch

Albert, please fix lint and build error on travis and see the comments on github.

Comment 5

[Carmen Jimenez Cabezas]

please ignore comment 3, that's a mistake

(In reply to Carmen Jimenez Cabezas from comment #3)
> s%app://operatorvariant/resources/Power_off_test.png%app://operatorresources/
> resources/Power_off_test.png

Comment 6

[Albert [:albert]]

Comment on attachment 8426084 [details]
Patch

Changes from comment 4 and fixed lint errors. I forgot to install gjslint after upgrade ubuntu :)

Comment 7

[Yuren [:yurenju] (AFK ~ Oct. 12) (volunteer mode)]

Comment on attachment 8426084 [details]
Patch

Albert, we still got some error on build test error, you can use |make build-test-integration| to run it locally.

Comment 8

[Albert [:albert]]

Comment on attachment 8426084 [details]
Patch

Sorry, I forgot to update the expected power json. Now it is fixed and test is ok in my laptop.

Comment 9

[Yuren [:yurenju] (AFK ~ Oct. 12) (volunteer mode)]

Comment on attachment 8426084 [details]
Patch

looks good, thanks!

Comment 10

[Albert [:albert]]

Master: https://github.com/mozilla-b2g/gaia/commit/9b69d0d0c94baf5a6277727625c5682696dac219

Comment 11

[rafael.marquez]

Verified in master (2.0) branch