746121 - Updating the DirectoryProvider to look for user.js in /data/local on B2G phones

Status: RESOLVED FIXED

(Firefox OS Graveyard :: General, defect)

Description

[Etienne Segonzac (:etienne)]

We're already doing this of the OfflineCache and webapps dir.

This allows us to put everything in place when doing a make install-gaia even if the profile dir isn't created yet (on a first install).

The user.js is generated by the Gaia makefile based on the various app manifests.

Comment 1

[Etienne Segonzac (:etienne)]

Attachment: Patch proposal

Comment 2

[Vivien Nicolas (:vingtetun) (:21) - (NOT reading bugmails, needinfo? please)]

Can you rename OFFLINE_PROFILE_DIR to LOCAL_DIR. It seems like everybody use it and it does not make sense to keep the name as if.

Can you test your change with |GAIA_DOMAIN=localhost.org make && GAIA_DOMAIN=locahost.org make install-gaia| on the device and see if it works?

Comment 3

[Etienne Segonzac (:etienne)]

Attachment: Patch v2

Comment 4

[Etienne Segonzac (:etienne)]

(In reply to Vivien Nicolas (:vingtetun) from comment #2)
> Can you test your change with |GAIA_DOMAIN=localhost.org make &&
> GAIA_DOMAIN=locahost.org make install-gaia| on the device and see if it
> works?

Yes it works!

Comment 5

[Vivien Nicolas (:vingtetun) (:21) - (NOT reading bugmails, needinfo? please)]

Comment on attachment 615721 [details] [diff] [review]
Patch v2

Nice, thanks.

Comment 6

[Chris Jones [:cjones] inactive; ni?/f?/r? if you need me]

Good idea!

Comment 7

[Philipp von Weitershausen [:philikon]]

Comment on attachment 615721 [details] [diff] [review]
Patch v2

Review of attachment 615721 [details] [diff] [review]:
-----------------------------------------------------------------

::: b2g/components/DirectoryProvider.js
@@ +21,5 @@
>    QueryInterface: XPCOMUtils.generateQI([Ci.nsIDirectoryServiceProvider]),
>  
>    getFile: function dp_getFile(prop, persistent) {
>  #ifdef MOZ_WIDGET_GONK
> +    let localProps = ["cachePDir", "webappsDir", "PrefD"];

Did you mean "ProfD"?

Comment 8

[Etienne Segonzac (:etienne)]

(In reply to Philipp von Weitershausen [:philikon] from comment #7)
> Comment on attachment 615721 [details] [diff] [review]
> Patch v2
> 
> Review of attachment 615721 [details] [diff] [review]:
> -----------------------------------------------------------------
> 
> ::: b2g/components/DirectoryProvider.js
> @@ +21,5 @@
> >    QueryInterface: XPCOMUtils.generateQI([Ci.nsIDirectoryServiceProvider]),
> >  
> >    getFile: function dp_getFile(prop, persistent) {
> >  #ifdef MOZ_WIDGET_GONK
> > +    let localProps = ["cachePDir", "webappsDir", "PrefD"];
> 
> Did you mean "ProfD"?

Don't think so:
http://mxr.mozilla.org/mozilla-central/source/xpcom/io/nsAppDirectoryServiceDefs.h#96

Comment 9

[Vivien Nicolas (:vingtetun) (:21) - (NOT reading bugmails, needinfo? please)]

https://hg.mozilla.org/integration/mozilla-inbound/rev/70689bad7156

Comment 10

[Ed Morley [:emorley]]

https://hg.mozilla.org/mozilla-central/rev/70689bad7156