Skip to content

Commit

Permalink
node-titanium-sdk fix (#8985)
Browse files Browse the repository at this point in the history 
* Update references from titanium-sdk to node-titanium-sdk

* Include updated node-titanium-sdk with fixed self-reference
  • Loading branch information
@sgtcoolguy
sgtcoolguy committed Apr 24, 2017
1 parent 28810c9 commit bb3a3c8
Show file tree
Hide file tree
Showing 21 changed files with 67 additions and 59 deletions.
16 changes: 8 additions & 8 deletions android/cli/commands/_build.js
View file
Expand Up @@ -14,27 +14,27 @@
* Please see the LICENSE included with this distribution for details.
*/

var ADB = require('titanium-sdk/lib/adb'),
var ADB = require('node-titanium-sdk/lib/adb'),
AdmZip = require('adm-zip'),
android = require('titanium-sdk/lib/android'),
android = require('node-titanium-sdk/lib/android'),
androidDetect = require('../lib/detect').detect,
AndroidManifest = require('../lib/AndroidManifest'),
appc = require('node-appc'),
archiver = require('archiver'),
async = require('async'),
Builder = require('titanium-sdk/lib/builder'),
Builder = require('node-titanium-sdk/lib/builder'),
CleanCSS = require('clean-css'),
DOMParser = require('xmldom').DOMParser,
ejs = require('ejs'),
EmulatorManager = require('titanium-sdk/lib/emulator'),
EmulatorManager = require('node-titanium-sdk/lib/emulator'),
fields = require('fields'),
fs = require('fs'),
i18n = require('titanium-sdk/lib/i18n'),
jsanalyze = require('titanium-sdk/lib/jsanalyze'),
i18n = require('node-titanium-sdk/lib/i18n'),
jsanalyze = require('node-titanium-sdk/lib/jsanalyze'),
path = require('path'),
temp = require('temp'),
ti = require('titanium-sdk'),
tiappxml = require('titanium-sdk/lib/tiappxml'),
ti = require('node-titanium-sdk'),
tiappxml = require('node-titanium-sdk/lib/tiappxml'),
util = require('util'),
wrench = require('wrench'),

Expand Down
4 changes: 2 additions & 2 deletions android/cli/commands/_buildModule.js
View file
Expand Up @@ -16,11 +16,11 @@ var AdmZip = require('adm-zip'),
appc = require('node-appc'),
archiver = require('archiver'),
async = require('async'),
Builder = require('titanium-sdk/lib/builder'),
Builder = require('node-titanium-sdk/lib/builder'),
crypto = require('crypto'),
ejs = require('ejs'),
fs = require('fs'),
jsanalyze = require('titanium-sdk/lib/jsanalyze'),
jsanalyze = require('node-titanium-sdk/lib/jsanalyze'),
markdown = require('markdown').markdown,
path = require('path'),
temp = require('temp'),
Expand Down
4 changes: 2 additions & 2 deletions android/cli/hooks/run.js
View file
Expand Up @@ -5,10 +5,10 @@
* See the LICENSE file for more information.
*/

var ADB = require('titanium-sdk/lib/adb'),
var ADB = require('node-titanium-sdk/lib/adb'),
appc = require('node-appc'),
async = require('async'),
EmulatorManager = require('titanium-sdk/lib/emulator'),
EmulatorManager = require('node-titanium-sdk/lib/emulator'),
fs = require('fs'),
path = require('path'),
__ = appc.i18n(__dirname).__;
Expand Down
6 changes: 3 additions & 3 deletions android/cli/lib/detect.js
View file
Expand Up @@ -11,9 +11,9 @@
* Please see the LICENSE included with this distribution for details.
*/

var android = require('titanium-sdk/lib/android'),
ADB = require('titanium-sdk/lib/adb'),
EmulatorManager = require('titanium-sdk/lib/emulator'),
var android = require('node-titanium-sdk/lib/android'),
ADB = require('node-titanium-sdk/lib/adb'),
EmulatorManager = require('node-titanium-sdk/lib/emulator'),
appc = require('node-appc'),
__ = appc.i18n(__dirname).__;

Expand Down
2 changes: 1 addition & 1 deletion android/templates/module/default/hooks/android-module.js
View file
Expand Up @@ -37,7 +37,7 @@ exports.init = function (logger, config, cli, appc) {
packageJson = require(packageJsonFile),
minAndroidAPILevel = parseInt(appc.version.parseMin(packageJson.vendorDependencies['android sdk']));

var android = require('titanium-sdk/lib/android');
var android = require('node-titanium-sdk/lib/android');
logger.debug(__('Detecting Android environment...'));
android.detect(this.config, null, function (results) {
// find all targets that satisify the minimum supported Android SDK, prefer versions with Google APIs
Expand Down
2 changes: 1 addition & 1 deletion build/scons-update-node-deps.js
View file
Expand Up @@ -58,7 +58,7 @@ exec('npm -v', function (err, stdout, stderr) {

console.log('Removing old Node modules');

rm(path.join(titaniumDir, 'node_modules'), ['titanium-sdk']);
rm(path.join(titaniumDir, 'node_modules'), []);

console.log('\nRunning npm install');

Expand Down
6 changes: 3 additions & 3 deletions cli/commands/build.js
View file
Expand Up @@ -8,11 +8,11 @@
var appc = require('node-appc'),
fields = require('fields'),
fs = require('fs'),
jsanalyze = require('titanium-sdk/lib/jsanalyze'),
jsanalyze = require('node-titanium-sdk/lib/jsanalyze'),
path = require('path'),
sprintf = require('sprintf'),
ti = require('titanium-sdk'),
tiappxml = require('titanium-sdk/lib/tiappxml'),
ti = require('node-titanium-sdk'),
tiappxml = require('node-titanium-sdk/lib/tiappxml'),
wrench = require('wrench'),
__ = appc.i18n(__dirname).__;

Expand Down
2 changes: 1 addition & 1 deletion cli/commands/clean.js
View file
Expand Up @@ -9,7 +9,7 @@ var appc = require('node-appc'),
i18n = appc.i18n(__dirname),
__ = i18n.__,
__n = i18n.__n,
ti = require('titanium-sdk'),
ti = require('node-titanium-sdk'),
fs = require('fs'),
path = require('path'),
wrench = require('wrench'),
Expand Down
2 changes: 1 addition & 1 deletion cli/commands/create.js
View file
Expand Up @@ -20,7 +20,7 @@ var appc = require('node-appc'),
path = require('path'),
request = require('request'),
temp = require('temp'),
ti = require('titanium-sdk'),
ti = require('node-titanium-sdk'),
wrench = require('wrench'),
__ = i18n.__,
__n = i18n.__n;
Expand Down
2 changes: 1 addition & 1 deletion cli/commands/project.js
View file
Expand Up @@ -6,7 +6,7 @@
*/

var path = require('path'),
ti = require('titanium-sdk'),
ti = require('node-titanium-sdk'),
appc = require('node-appc'),
__ = appc.i18n(__dirname).__,
mix = appc.util.mix;
Expand Down
2 changes: 1 addition & 1 deletion cli/lib/creator.js
View file
Expand Up @@ -19,7 +19,7 @@ var appc = require('node-appc'),
fs = require('fs'),
i18n = appc.i18n(__dirname),
path = require('path'),
ti = require('titanium-sdk'),
ti = require('node-titanium-sdk'),
wrench = require('wrench'),
__ = i18n.__,
__n = i18n.__n;
Expand Down
2 changes: 1 addition & 1 deletion cli/lib/creators/app.js
View file
Expand Up @@ -14,7 +14,7 @@ var appc = require('node-appc'),
Creator = require('../creator'),
fs = require('fs'),
path = require('path'),
ti = require('titanium-sdk'),
ti = require('node-titanium-sdk'),
util = require('util'),
uuid = require('node-uuid'),
wrench = require('wrench'),
Expand Down
4 changes: 2 additions & 2 deletions cli/lib/creators/applewatch.js
View file
Expand Up @@ -20,8 +20,8 @@ var appc = require('node-appc'),
fs = require('fs'),
moment = require('moment'),
path = require('path'),
ti = require('titanium-sdk'),
tiappxml = require('titanium-sdk/lib/tiappxml'),
ti = require('node-titanium-sdk'),
tiappxml = require('node-titanium-sdk/lib/tiappxml'),
util = require('util'),
wrench = require('wrench'),
__ = appc.i18n(__dirname).__;
Expand Down
2 changes: 1 addition & 1 deletion cli/lib/creators/module.js
View file
Expand Up @@ -15,7 +15,7 @@ var appc = require('node-appc'),
Creator = require('../creator'),
fs = require('fs'),
path = require('path'),
ti = require('titanium-sdk'),
ti = require('node-titanium-sdk'),
util = require('util'),
uuid = require('node-uuid'),
wrench = require('wrench'),
Expand Down
2 changes: 1 addition & 1 deletion cli/lib/info.js
View file
Expand Up @@ -9,7 +9,7 @@ const
appc = require('node-appc'),
fs = require('fs'),
path = require('path'),
genymotion = require('titanium-sdk/lib/emulators/genymotion'),
genymotion = require('node-titanium-sdk/lib/emulators/genymotion'),
__ = appc.i18n(__dirname).__;

exports.name = 'miscinfo';
Expand Down
6 changes: 3 additions & 3 deletions iphone/cli/commands/_build.js
View file
Expand Up @@ -14,7 +14,7 @@
var appc = require('node-appc'),
async = require('async'),
bufferEqual = require('buffer-equal'),
Builder = require('titanium-sdk/lib/builder'),
Builder = require('node-titanium-sdk/lib/builder'),
CleanCSS = require('clean-css'),
crypto = require('crypto'),
cyan = require('colors').cyan,
Expand All @@ -24,13 +24,13 @@ var appc = require('node-appc'),
fs = require('fs'),
humanize = require('humanize'),
ioslib = require('ioslib'),
jsanalyze = require('titanium-sdk/lib/jsanalyze'),
jsanalyze = require('node-titanium-sdk/lib/jsanalyze'),
moment = require('moment'),
net = require('net'),
path = require('path'),
PNG = require('pngjs').PNG,
spawn = require('child_process').spawn,
ti = require('titanium-sdk'),
ti = require('node-titanium-sdk'),
util = require('util'),
uuid = require('node-uuid'),
wrench = require('wrench'),
Expand Down
6 changes: 3 additions & 3 deletions iphone/cli/commands/_buildModule.js
View file
Expand Up @@ -16,17 +16,17 @@ var appc = require('node-appc'),
archiver = require('archiver'),
async = require('async'),
crypto = require('crypto'),
Builder = require('titanium-sdk/lib/builder'),
Builder = require('node-titanium-sdk/lib/builder'),
ioslib = require('ioslib'),
iosPackageJson = appc.pkginfo.package(module),
jsanalyze = require('titanium-sdk/lib/jsanalyze'),
jsanalyze = require('node-titanium-sdk/lib/jsanalyze'),
ejs = require('ejs'),
fs = require('fs'),
markdown = require('markdown').markdown,
path = require('path'),
spawn = require('child_process').spawn,
temp = require('temp'),
ti = require('titanium-sdk'),
ti = require('node-titanium-sdk'),
util = require('util'),
wrench = require('wrench'),
__ = appc.i18n(__dirname).__,
Expand Down
6 changes: 3 additions & 3 deletions mobileweb/cli/commands/_build.js
View file
Expand Up @@ -8,16 +8,16 @@
const
appc = require('node-appc'),
async = require('async'),
Builder = require('titanium-sdk/lib/builder'),
Builder = require('node-titanium-sdk/lib/builder'),
CleanCSS = require('clean-css'),
ejs = require('ejs'),
fields = require('fields'),
fs = require('fs'),
i18n = appc.i18n(__dirname),
jsanalyze = require('titanium-sdk/lib/jsanalyze'),
jsanalyze = require('node-titanium-sdk/lib/jsanalyze'),
mobilewebPackageJson = appc.pkginfo.package(module),
path = require('path'),
ti = require('titanium-sdk'),
ti = require('node-titanium-sdk'),
util = require('util'),
wrench = require('wrench'),
__ = i18n.__,
Expand Down
2 changes: 1 addition & 1 deletion node_modules/node-titanium-sdk/lib/builder.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

46 changes: 27 additions & 19 deletions node_modules/node-titanium-sdk/package.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Expand Up @@ -39,7 +39,7 @@
"markdown": "0.5.0",
"moment": "2.18.1",
"node-appc": "0.2.43",
"node-titanium-sdk": "0.1.0",
"node-titanium-sdk": "0.1.1",
"node-uuid": "1.4.8",
"pngjs": "3.0.1",
"request": "2.81.0",
Expand Down

0 comments on commit bb3a3c8

Please sign in to comment.