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.

Sign up for GitHub

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

Jump to bottom

[TIMOB-20537] Revert reverting platform-dir and i18n-dir build flags #7821

Closed
wants to merge 1 commit into from
Closed

[TIMOB-20537] Revert reverting platform-dir and i18n-dir build flags #7821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions android/cli/commands/_build.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -999,7 +999,7 @@ AndroidBuilder.prototype.validate = function validate(logger, config, cli) {
}

// check that the proguard config exists
var proguardConfigFile = path.join(cli.argv['project-dir'], 'platform', 'android', 'proguard.cfg');
var proguardConfigFile = path.join(cli.argv['project-dir'], cli.argv['platform-dir'] || 'platform', 'android', 'proguard.cfg');
if (this.proguard && !fs.existsSync(proguardConfigFile)) {
logger.error(__('Missing ProGuard configuration file'));
logger.error(__('ProGuard settings must go in the file "%s"', proguardConfigFile));
Expand All @@ -1024,7 +1024,7 @@ AndroidBuilder.prototype.validate = function validate(logger, config, cli) {
}

try {
var customAndroidManifestFile = path.join(cli.argv['project-dir'], 'platform', 'android', 'AndroidManifest.xml');
var customAndroidManifestFile = path.join(cli.argv['project-dir'], cli.argv['platform-dir'] || 'platform', 'android', 'AndroidManifest.xml');
this.customAndroidManifest = fs.existsSync(customAndroidManifestFile) && (new AndroidManifest(customAndroidManifestFile));
} catch (ex) {
logger.error(__('Malformed custom AndroidManifest.xml file: %s', customAndroidManifestFile) + '\n');
Expand Down Expand Up @@ -2498,7 +2498,7 @@ AndroidBuilder.prototype.copyResources = function copyResources(next) {
this.modules.forEach(function (module) {
platformPaths.push(path.join(module.modulePath, 'platform', 'android'));
});
platformPaths.push(path.join(this.projectDir, 'platform', 'android'));
platformPaths.push(path.join(this.projectDir, this.cli.argv['platform-dir'] || 'platform', 'android'));
platformPaths.forEach(function (dir) {
if (fs.existsSync(dir)) {
tasks.push(function (cb) {
Expand Down
4 changes: 2 additions & 2 deletions iphone/cli/commands/_build.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4287,8 +4287,8 @@ iOSBuilder.prototype.copyResources = function copyResources(next) {
});

this.logger.info(__('Analyzing platform files'));
walk(path.join(this.projectDir, 'platform', 'iphone'), this.buildDir);
walk(path.join(this.projectDir, 'platform', 'ios'), this.buildDir);
walk(path.join(this.projectDir, this.cli.argv['platform-dir'] || 'platform', 'iphone'), this.buildDir);
walk(path.join(this.projectDir, this.cli.argv['platform-dir'] || 'platform', 'ios'), this.buildDir);

this.logger.info(__('Analyzing module files'));
this.modules.forEach(function (module) {
Expand Down