Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[TIMOB-24941] Android: Fix /modules packaging on Android. #9197

Merged
merged 3 commits into from Jul 6, 2017

Conversation

ypbnv
Copy link
Contributor

@ypbnv ypbnv commented Jul 6, 2017

JIRA: https://jira.appcelerator.org/browse/TIMOB-24941

Optional Description:
Scons 'package' creates an archive without 'modules' folder.

Changed the regular expression to work with platform specific path separators.

Copy link
Contributor

@garymathews garymathews left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CR: PASS
FT: PASS

build/android.js Outdated
@@ -129,7 +129,8 @@ Android.prototype.package = function (packager, next) {
},
// Copy over module resources
function (cb) {
fs.copy(DIST_ANDROID, ANDROID_MODULES, { filter: /\/android(\/titanium\-(.+)?\.(jar|res\.zip|respackage))?$/ }, cb);
filterRegExp = new RegExp('\\' + path.sep + 'android(\\' + path.sep + 'titanium\-(.+)?\.(jar|res\.zip|respackage))?$');
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing var.

@ypbnv
Copy link
Contributor Author

ypbnv commented Jul 6, 2017

@cb1kenobi Updated.

Copy link
Contributor

@cb1kenobi cb1kenobi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CR'd and manually tested the regex. Looks good. APPROVED.

@cb1kenobi cb1kenobi merged commit b298487 into tidev:master Jul 6, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants