[
https://issues.apache.org/jira/browse/CB-12804?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16054530#comment-16054530
]
ASF GitHub Bot commented on CB-12804:
-------------------------------------
Github user macdonst commented on a diff in the pull request:
https://github.com/apache/cordova-browser/pull/32#discussion_r122782108
--- Diff: bin/template/cordova/Api.js ---
@@ -113,52 +110,135 @@ Api.prototype.getPlatformInfo = function () {
"locations":this.locations,
"root": this.root,
"name": this.platform,
- "version": { "version" : "1.0.0" },
+ "version": { "version" : "1.0.0" }, // um, todo!
"projectConfig": this.config
};
};
Api.prototype.prepare = function (cordovaProject,options) {
// First cleanup current config and merge project's one into own
- var defaultConfig = path.join(this.locations.platformRootDir,'cordova',
+ var defaultConfigPath =
path.join(this.locations.platformRootDir,'cordova',
'defaults.xml');
-
- var ownConfig = this.locations.configXml;
-
+ var ownConfigPath = this.locations.configXml;
var sourceCfg = cordovaProject.projectConfig;
+
// If defaults.xml is present, overwrite platform config.xml with it.
// Otherwise save whatever is there as defaults so it can be
// restored or copy project config into platform if none exists.
- if (fs.existsSync(defaultConfig)) {
+ if (fs.existsSync(defaultConfigPath)) {
this.events.emit('verbose', 'Generating config.xml from defaults
for platform "' + this.platform + '"');
- shell.cp('-f', defaultConfig, ownConfig);
- } else if (fs.existsSync(ownConfig)) {
- shell.cp('-f', ownConfig, defaultConfig);
- } else {
- shell.cp('-f', sourceCfg.path, ownConfig);
+ shell.cp('-f', defaultConfigPath, ownConfigPath);
+ }
+ else if (fs.existsSync(ownConfigPath)) {
+ this.events.emit('verbose', 'Generating defaults.xml from own
config.xml for platform "' + this.platform + '"');
+ shell.cp('-f', ownConfigPath, defaultConfigPath);
+ }
+ else {
+ this.events.emit('verbose', 'case 3"' + this.platform + '"');
+ shell.cp('-f', sourceCfg.path, ownConfigPath);
}
- // this._munger.reapply_global_munge().save_all();
-
- this.config = new ConfigParser(ownConfig);
+ // merge our configs
+ this.config = new ConfigParser(ownConfigPath);
xmlHelpers.mergeXml(cordovaProject.projectConfig.doc.getroot(),
- this.config.doc.getroot(), this.platform, true);
+ this.config.doc.getroot(),
+ this.platform, true);
this.config.write();
- /*
- "browser": {
- "parser_file": "../cordova/metadata/browser_parser",
- "handler_file": "../plugman/platforms/browser",
- "url":
"https://git-wip-us.apache.org/repos/asf?p=cordova-browser.git";,
- "version": "~4.1.0",
- "deprecated": false
- }
- */
-
// Update own www dir with project's www assets and plugins' assets
and js-files
this.parser.update_www(cordovaProject.locations.www);
+ // Copy or Create manifest.json
+ // todo: move this to a manifest helper module
+ // output path
+ var manifestPath = path.join(this.locations.www,'manifest.json');
+ var srcManifestPath
=path.join(cordovaProject.locations.www,'manifest.json');
+ if(fs.existsSync(srcManifestPath)) {
+ // just blindly copy it to our output/www
+ // todo: validate it? ensure all properties we expect exist?
+ this.events.emit('verbose','copying ' + srcManifestPath + ' => ' +
manifestPath);
+ shell.cp('-f',srcManifestPath,manifestPath);
+ }
+ else {
+ var manifestJson = {
+ "background_color": "#000",
+ "display": "standalone"
+ };
+ if(this.config){
+ if(this.config.name()) {
+ manifestJson.name = this.config.name();
+ }
+ if(this.config.shortName()) {
+ manifestJson.short_name = this.config.shortName();
+ }
+ if(this.config.packageName()) {
+ manifestJson.version = this.config.packageName();
+ }
+ if(this.config.description()) {
+ manifestJson.description = this.config.description();
+ }
+ if(this.config.author()) {
+ manifestJson.author = this.config.author();
+ }
+ // icons
+ var icons = this.config.getStaticResources('browser','icon');
+ var manifestIcons = icons.map(function(icon) {
+ // given a tag like this :
+ // <icon src="res/ios/icon.png" width="57" height="57"
density="mdpi" />
+ /* configParser returns icons that look like this :
+ { src: 'res/ios/icon.png',
+ target: undefined,
+ density: 'mdpi',
+ platform: null,
+ width: 57,
+ height: 57
+ } ******/
+ /* manifest expects them to be like this :
+ { "src": "images/touch/icon-128x128.png",
+ "type": "image/png",
+ "sizes": "128x128"
+ } ******/
+ // ?Is it worth looking at file extentions?
--- End diff --
Yeah, I think it makes sense to look at the file extension to figure out
the mimeType. Some folks might use jpg for their icons. In that case we should
warn folks that png is the preferred format (that is based on something I
remember reading from Google).
> Cordova-browser PWA needs a manifest file
> -----------------------------------------
>
> Key: CB-12804
> URL: https://issues.apache.org/jira/browse/CB-12804
> Project: Apache Cordova
> Issue Type: Improvement
> Components: cordova-browser
> Reporter: Audrey So
> Assignee: Audrey So
> Fix For: cordova7
>
>
> Cordova-browser PWA needs a manifest file.
> This manifest.json file should get created during cordova platform add
> browser and use values from config.xml to build.
--
This message was sent by Atlassian JIRA
(v6.4.14#64029)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
