-
Notifications
You must be signed in to change notification settings - Fork 713
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'cordova-sqlite-ext-core-common' into cordova-sqlite-ext…
…-common-core
- Loading branch information
Showing
15 changed files
with
91 additions
and
71 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,6 +3,7 @@ | |
| *.swp | ||
| *~ | ||
| node_modules | ||
| package-lock.json | ||
| spec/myplugin | ||
| spec/plugins | ||
| spec/platforms | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -36,6 +36,6 @@ | |
| "start": "node scripts/prepareSpec.js" | ||
| }, | ||
| "devDependencies": { | ||
| "shelljs": "^0.7.4" | ||
| "shelljs": "^0.8.3" | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,32 +1,26 @@ | ||
| #!/usr/bin/env node | ||
|
|
||
| // Adapted from: | ||
| // https://github.com/AllJoyn-Cordova/cordova-plugin-alljoyn/blob/master/scripts/beforePluginInstall.js | ||
|
|
||
| var path = require('path'); | ||
| var exec = require('child_process').exec; | ||
|
|
||
| // XXX TODO auto-detect: | ||
| var package_name = 'cordova-sqlite-ext-common-core'; | ||
| const path = require('path'); | ||
| const exec = require('child_process').exec; | ||
|
|
||
| module.exports = function (context) { | ||
| var Q = context.requireCordovaModule('q'); | ||
| var deferral = new Q.defer(); | ||
| const packageName = require('../package.json').name; | ||
|
|
||
| console.log('installing external dependencies via npm'); | ||
| module.exports = function () { | ||
| return new Promise(function (resolve, reject) { | ||
| console.log('installing external dependencies via npm'); | ||
| console.log('for package name: ' + packageName); | ||
|
|
||
| exec( 'npm install', {cwd: path.join('plugins', package_name)}, | ||
| exec('npm install', { cwd: path.join('plugins', packageName) }, | ||
| function (error, stdout, stderr) { | ||
| if (error !== null) { | ||
| // XXX TODO SIGNAL FAILURE HERE. | ||
| console.log('npm install of external dependencies failed: ' + error); | ||
| deferral.resolve(); | ||
| console.log('npm install of external dependencies failed with error message: ' + error.message); | ||
| reject(); | ||
| } else { | ||
| console.log('npm install of external dependencies ok'); | ||
| deferral.resolve(); | ||
| resolve(); | ||
| } | ||
| } | ||
| ); | ||
|
|
||
| return deferral.promise; | ||
| ); | ||
| }); | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.