You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@cordova.apache.org by Mark Koudritsky <ka...@gmail.com> on 2013/11/07 17:48:58 UTC

Re: Review Request 15046: "Prepare" should not depend on the ~/.cordova/libs directory

-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/15046/
-----------------------------------------------------------

(Updated Nov. 7, 2013, 4:48 p.m.)


Review request for cordova.


Changes
-------

Fixed conflicts in tests with this commit https://github.com/apache/cordova-cli/commit/5c9d4ee7773ebf9c3897423425c4906ca0a5db42


Bugs: CB-5063
    https://issues.apache.org/jira/browse/CB-5063


Repository: cordova-cli


Description
-------

Currently all platform parsers (src/metadata/*_parser.js) copy
cordova.js from util.libDirectory for each run of prepare. This results
in errors when changing machines since the ~/.cordova/lib directory is
not populated.

With this change all the parsers construct the project www dir by first
copying contents of a new dir named <project_root>/platforms/<platfrom>/platform_www
(which contains cordova.js) and then the www dir from the app.

Until individual platform create scripts will be updated to create the
platform_www dir, prepare.js checks if the platform_www exists and if
not, creates it using cordova.js from ~/.cordova/lib.

Even after the platform create scripts are updated the check will be
required for projects that were created using older version and don't
yet have a platform_www dir.


Diffs (updated)
-----

  spec/metadata/android_parser.spec.js 4afb52d 
  spec/metadata/blackberry_parser.spec.js 3353eb1 
  spec/metadata/ios_parser.spec.js 17206c6 
  spec/metadata/windows8_parser.spec.js 5639317 
  spec/metadata/wp7_parser.spec.js 6b69d09 
  spec/metadata/wp8_parser.spec.js 02372cc 
  spec/prepare.spec.js 8012924 
  src/metadata/android_parser.js df446e1 
  src/metadata/blackberry10_parser.js d9f71f3 
  src/metadata/firefoxos_parser.js c3edd7b 
  src/metadata/ios_parser.js 20e985c 
  src/metadata/windows8_parser.js 68520fc 
  src/metadata/wp7_parser.js b19dc32 
  src/metadata/wp8_parser.js 3bdef16 
  src/prepare.js 4ea22c5 

Diff: https://reviews.apache.org/r/15046/diff/


Testing
-------

npm test
corodva platform add android
corodva platform add ios
corodva platform add balckberry10
cordova prepare
verified platfrom_www dir exists and contains the right file.

Did not test for win platforms.


Thanks,

Mark Koudritsky


Re: Review Request 15046: "Prepare" should not depend on the ~/.cordova/libs directory

Posted by Mark Koudritsky <ka...@gmail.com>.
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/15046/
-----------------------------------------------------------

(Updated Nov. 7, 2013, 9:29 p.m.)


Review request for cordova.


Changes
-------

And messed something again. This should be the right diff.


Bugs: CB-5063
    https://issues.apache.org/jira/browse/CB-5063


Repository: cordova-cli


Description
-------

Currently all platform parsers (src/metadata/*_parser.js) copy
cordova.js from util.libDirectory for each run of prepare. This results
in errors when changing machines since the ~/.cordova/lib directory is
not populated.

With this change all the parsers construct the project www dir by first
copying contents of a new dir named <project_root>/platforms/<platfrom>/platform_www
(which contains cordova.js) and then the www dir from the app.

Until individual platform create scripts will be updated to create the
platform_www dir, prepare.js checks if the platform_www exists and if
not, creates it using cordova.js from ~/.cordova/lib.

Even after the platform create scripts are updated the check will be
required for projects that were created using older version and don't
yet have a platform_www dir.


Diffs (updated)
-----

  spec/metadata/android_parser.spec.js 4afb52d 
  spec/metadata/blackberry_parser.spec.js 3353eb1 
  spec/metadata/ios_parser.spec.js 17206c6 
  spec/metadata/windows8_parser.spec.js 5639317 
  spec/metadata/wp7_parser.spec.js 6b69d09 
  spec/metadata/wp8_parser.spec.js 02372cc 
  spec/prepare.spec.js 8012924 
  src/metadata/android_parser.js df446e1 
  src/metadata/blackberry10_parser.js d9f71f3 
  src/metadata/firefoxos_parser.js c3edd7b 
  src/metadata/ios_parser.js 20e985c 
  src/metadata/windows8_parser.js 68520fc 
  src/metadata/wp7_parser.js b19dc32 
  src/metadata/wp8_parser.js 3bdef16 
  src/prepare.js 4ea22c5 

Diff: https://reviews.apache.org/r/15046/diff/


Testing
-------

npm test
corodva platform add android
corodva platform add ios
corodva platform add balckberry10
cordova prepare
verified platfrom_www dir exists and contains the right file.

Did not test for win platforms.


Thanks,

Mark Koudritsky


Re: Review Request 15046: "Prepare" should not depend on the ~/.cordova/libs directory

Posted by Mark Koudritsky <ka...@gmail.com>.
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/15046/
-----------------------------------------------------------

(Updated Nov. 7, 2013, 9:09 p.m.)


Review request for cordova.


Changes
-------

Missed something in the previous attempt with rebase and conflict resolution. This patch should apply ok.


Bugs: CB-5063
    https://issues.apache.org/jira/browse/CB-5063


Repository: cordova-cli


Description
-------

Currently all platform parsers (src/metadata/*_parser.js) copy
cordova.js from util.libDirectory for each run of prepare. This results
in errors when changing machines since the ~/.cordova/lib directory is
not populated.

With this change all the parsers construct the project www dir by first
copying contents of a new dir named <project_root>/platforms/<platfrom>/platform_www
(which contains cordova.js) and then the www dir from the app.

Until individual platform create scripts will be updated to create the
platform_www dir, prepare.js checks if the platform_www exists and if
not, creates it using cordova.js from ~/.cordova/lib.

Even after the platform create scripts are updated the check will be
required for projects that were created using older version and don't
yet have a platform_www dir.


Diffs (updated)
-----

  spec/build.spec.js 6e30825 
  spec/compile.spec.js 5b4682a 
  spec/emulate.spec.js ddc5a21 
  spec/info.spec.js e281829 
  spec/platform.spec.js e6925a2 
  spec/plugin.spec.js 1f4bf97 
  spec/prepare.spec.js 8012924 
  spec/run.spec.js 0a85fcb 
  src/build.js 440817c 
  src/compile.js a9a31e8 
  src/emulate.js cf5e7b9 
  src/info.js b64c58e 
  src/platform.js 8800bc1 
  src/plugin.js 0139393 
  src/prepare.js 4ea22c5 
  src/run.js 13dcb11 
  src/serve.js 0e4a475 
  src/util.js 07189df 

Diff: https://reviews.apache.org/r/15046/diff/


Testing
-------

npm test
corodva platform add android
corodva platform add ios
corodva platform add balckberry10
cordova prepare
verified platfrom_www dir exists and contains the right file.

Did not test for win platforms.


Thanks,

Mark Koudritsky