Skip to content

Commit

Permalink
Merge pull request #248 from hansemannn/TIMOB-25436-2_2_X
Browse files Browse the repository at this point in the history
[TIMOB-25436] iOS: Guard against "Headers/" existence (2_2_X)
  • Loading branch information
janvennemann committed Oct 24, 2017
2 parents f3dad17 + d045a8c commit dfdd778
Showing 1 changed file with 13 additions and 0 deletions.
13 changes: 13 additions & 0 deletions metabase/ios/lib/metabase.js
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,12 @@ function extractImplementationsFromFramework(frameworkName, frameworkPath, inclu
*/
function collectFrameworkHeaders(frameworkPath) {
var frameworkHeadersPath = path.join(frameworkPath, 'Headers');

// Skip frameworks that do not have public headers set (like FirebaseNanoPB)
if (!fs.existsSync(frameworkHeadersPath)) {
return [];
}

var headerFiles = getAllHeaderFiles([frameworkHeadersPath]);
var nestedFrameworksPath = path.join(frameworkPath, 'Frameworks');
if (fs.existsSync(nestedFrameworksPath)) {
Expand Down Expand Up @@ -498,6 +504,13 @@ function generateFrameworkIncludeMap (frameworkMetadata, includes, callback) {
var frameworkName = frameworkMetadata.name;
var frameworkPath = frameworkMetadata.path;
var frameworkHeadersPath = path.join(frameworkPath, 'Headers');

// There are some rare frameworks (like FirebaseNanoPB) that do not have a Headers/ directory
if (!fs.existsSync(frameworkHeadersPath)) {
includes[frameworkName] = {};
return callback();
}

util.logger.trace('Generating includes for ' + frameworkMetadata.type + ' framework ' + frameworkName.green + ' (' + frameworkPath + ')');
if (frameworkMetadata.type === 'dynamic') {
var modulesPath = path.join(frameworkPath, 'Modules');
Expand Down

0 comments on commit dfdd778

Please sign in to comment.