[pbxFile] support .framework (not just dylib)

Author: alunny

lib/pbxFile.js

@@ -3,7 +3,8 @@ var path = require('path'),
     H_EXTENSION = /[.]h$/, HEADER_FILE = 'sourcecode.c.h',
     BUNDLE_EXTENSION = /[.]bundle$/, BUNDLE = '"wrapper.plug-in"',
     XIB_EXTENSION = /[.]xib$/, XIB_FILE = 'file.xib',
-    FRAMEWORK_EXTENSION = /[.]dylib$/, FRAMEWORK = '"compiled.mach-o.dylib"',
+    DYLIB_EXTENSION = /[.]dylib$/, DYLIB = '"compiled.mach-o.dylib"',
+    FRAMEWORK_EXTENSION = /[.]framework/, FRAMEWORK = 'wrapper.framework',
     DEFAULT_SOURCE_TREE = '"<group>"',
     DEFAULT_FILE_ENCODING = 4;
 
@@ -23,6 +24,9 @@ function detectLastType(path) {
     if (FRAMEWORK_EXTENSION.test(path))
         return FRAMEWORK;
 
+    if (DYLIB_EXTENSION.test(path))
+        return DYLIB;
+
     // dunno
     return 'unknown';
 }
@@ -34,7 +38,7 @@ function fileEncoding(file) {
 }
 
 function defaultSourceTree(file) {
-    if (file.lastType == FRAMEWORK) {
+    if (file.lastType == DYLIB || file.lastType == FRAMEWORK) {
         return 'SDKROOT';
     } else {
         return DEFAULT_SOURCE_TREE;
@@ -43,6 +47,8 @@ function defaultSourceTree(file) {
 
 function correctPath(file, filepath) {
     if (file.lastType == FRAMEWORK) {
+        return 'System/Library/Frameworks/' + filepath;
+    } else if (file.lastType == DYLIB) {
         return 'usr/lib/' + filepath;
     } else {
         return filepath;
@@ -52,7 +58,7 @@ function correctPath(file, filepath) {
 function correctGroup(file) {
     if (file.lastType == SOURCE_FILE) {
         return 'Sources';
-    } else if (file.lastType == FRAMEWORK) {
+    } else if (file.lastType == DYLIB) {
         return 'Frameworks';
     } else {
         return 'Resources';

test/pbxFile.js

@@ -36,6 +36,13 @@ exports['lastType'] = {
         test.done();
     },
 
+    'should detect that a .framework path means wrapper.framework': function (test) {
+        var sourceFile = new pbxFile('MessageUI.framework');
+
+        test.equal('wrapper.framework', sourceFile.lastType);
+        test.done();
+    },
+
     'should allow lastType to be overridden': function (test) {
         var sourceFile = new pbxFile('Plugins/ChildBrowser.m',
                 { lastType: 'somestupidtype' });
@@ -85,13 +92,20 @@ exports['basename'] = {
 }
 
 exports['sourceTree'] = {
-    'should be SDKROOT for frameworks': function (test) {
+    'should be SDKROOT for dylibs': function (test) {
         var sourceFile = new pbxFile('libsqlite3.dylib');
 
         test.equal('SDKROOT', sourceFile.sourceTree);
         test.done();
     },
 
+    'should be SDKROOT for frameworks': function (test) {
+        var sourceFile = new pbxFile('MessageUI.framework');
+
+        test.equal('SDKROOT', sourceFile.sourceTree);
+        test.done();
+    },
+
     'should default to "<group>" otherwise': function (test) {
         var sourceFile = new pbxFile('Plugins/ChildBrowser.m');
 
@@ -109,13 +123,21 @@ exports['sourceTree'] = {
 }
 
 exports['path'] = {
-    'should be "usr/lib" for frameworks (relative to SDKROOT)': function (test) {
+    'should be "usr/lib" for dylibs (relative to SDKROOT)': function (test) {
         var sourceFile = new pbxFile('libsqlite3.dylib');
 
         test.equal('usr/lib/libsqlite3.dylib', sourceFile.path);
         test.done();
     },
 
+    'should be "System/Library/Frameworks" for frameworks': function (test) {
+        var sourceFile = new pbxFile('MessageUI.framework');
+
+        test.equal('System/Library/Frameworks/MessageUI.framework', sourceFile.path);
+        test.done();
+    },
+
+
     'should default to the first argument otherwise': function (test) {
         var sourceFile = new pbxFile('Plugins/ChildBrowser.m');