Merge pull request #1 from NativeScript/kddimitrov/ns-changes

Kddimitrov/ns changes

Author: KristianDD

lib/pbxFile.js

@@ -22,22 +22,35 @@ var DEFAULT_SOURCETREE = '"<group>"',
     DEFAULT_PRODUCT_SOURCETREE = 'BUILT_PRODUCTS_DIR',
     DEFAULT_FILEENCODING = 4,
     DEFAULT_GROUP = 'Resources',
-    DEFAULT_FILETYPE = 'unknown';
+    DEFAULT_FILETYPE = 'unknown',
+    HEADER_FILE_TYPE_SUFFIX = ".h",
+    SOURCE_CODE_FILE_TYPE_PREFIX = "sourcecode.";
 
 var FILETYPE_BY_EXTENSION = {
         a: 'archive.ar',
         app: 'wrapper.application',
         appex: 'wrapper.app-extension',
         bundle: 'wrapper.plug-in',
+        c: 'sourcecode.c.c',
+        cc: 'sourcecode.cpp.cpp',
+        cpp: 'sourcecode.cpp.cpp',
+        cxx: 'sourcecode.cpp.cpp',
+        'c++': 'sourcecode.cpp.cpp',
         dylib: 'compiled.mach-o.dylib',
         framework: 'wrapper.framework',
         h: 'sourcecode.c.h',
+        hh: 'sourcecode.cpp.h',
+        hpp: 'sourcecode.cpp.h',
+        hxx: 'sourcecode.cpp.h',
+        'h++': 'sourcecode.cpp.h',
         m: 'sourcecode.c.objc',
+        mm: 'sourcecode.cpp.objcpp',
         markdown: 'text',
         mdimporter: 'wrapper.cfbundle',
         octest: 'wrapper.cfbundle',
         pch: 'sourcecode.c.h',
         plist: 'text.plist.xml',
+        png: "image.png",
         sh: 'text.script.sh',
         swift: 'sourcecode.swift',
         tbd: 'sourcecode.text-based-dylib-definition',
@@ -56,8 +69,11 @@ var FILETYPE_BY_EXTENSION = {
         'wrapper.framework': 'Frameworks',
         'embedded.framework': 'Embed Frameworks',
         'sourcecode.c.h': 'Resources',
+        'sourcecode.c.c': 'Sources',
         'sourcecode.c.objc': 'Sources',
-        'sourcecode.swift': 'Sources'
+        'sourcecode.swift': 'Sources',
+        'sourcecode.cpp.cpp': 'Sources',
+        'sourcecode.cpp.objcpp': 'Sources'
     },
     PATH_BY_FILETYPE = {
         'compiled.mach-o.dylib': 'usr/lib/',
@@ -72,7 +88,11 @@ var FILETYPE_BY_EXTENSION = {
     ENCODING_BY_FILETYPE = {
         'sourcecode.c.h': 4,
         'sourcecode.c.h': 4,
+        'sourcecode.cpp.h': 4,
+        'sourcecode.c.c': 4,
         'sourcecode.c.objc': 4,
+        'sourcecode.cpp.cpp': 4,
+        'sourcecode.cpp.objcpp': 4,
         'sourcecode.swift': 4,
         'text': 4,
         'text.plist.xml': 4,
@@ -81,6 +101,13 @@ var FILETYPE_BY_EXTENSION = {
         'text.plist.strings': 4
     };
 
+function isSourceOrHeaderFileType(fileType) {
+    return fileType.startsWith(SOURCE_CODE_FILE_TYPE_PREFIX);
+}
+
+function isHeaderFileType(fileType) {
+    return fileType.endsWith(HEADER_FILE_TYPE_SUFFIX);
+}
 
 function unquoted(text){
     return text == null ? '' : text.replace (/(^")|("$)/g, '')
@@ -186,7 +213,7 @@ function defaultGroup(fileRef) {
 function pbxFile(filepath, opt) {
     var opt = opt || {};
 
-    this.basename = path.basename(filepath);
+    this.basename = opt.basename || path.basename(filepath);
     this.lastKnownFileType = opt.lastKnownFileType || detectType(filepath);
     this.group = detectGroup(this, opt);
 
@@ -230,4 +257,8 @@ function pbxFile(filepath, opt) {
     }
 }
 
-module.exports = pbxFile;
+module.exports = {
+    pbxFile: pbxFile,
+    isSourceOrHeaderFileType,
+    isHeaderFileType
+}