Skip to content

Commit

Permalink
CB-5696 find ios project directory using the xcode project file (close …
Browse files Browse the repository at this point in the history 
…#151)

Add unit tests for future reassurance
Fix incorrect name "ChildApp" in .pbxproj files to "SampleApp"
  • Loading branch information
@agrieve
Dimitar Kerezov authored and agrieve committed Jan 29, 2015
1 parent c6255be commit 6fd8e23
Show file tree
Hide file tree
Showing 4 changed files with 83 additions and 58 deletions.
32 changes: 30 additions & 2 deletions cordova-lib/spec-plugman/platforms/ios.spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,13 +99,41 @@ describe('ios project handler', function() {
ios.parseProjectFile(temp);
}).toThrow('does not appear to be an xcode project (no xcode project file)');
});
it('should throw if project does not contain an appropriate PhoneGap/Cordova.plist file or config.xml file', function() {
it('should throw if project does not contain an appropriate config.xml file', function() {
shell.cp('-rf', ios_config_xml_project, temp);
shell.rm(path.join(temp, 'SampleApp', 'config.xml'));

expect(function() {
ios.parseProjectFile(temp);
}).toThrow('could not find PhoneGap/Cordova plist file, or config.xml file.');
}).toThrow('could not find -Info.plist file, or config.xml file.');
});
it('should throw if project does not contain an appropriate -Info.plist file', function() {
shell.cp('-rf', ios_config_xml_project, temp);
shell.rm(path.join(temp, 'SampleApp', 'SampleApp-Info.plist'));

expect(function () {
ios.parseProjectFile(temp);
}).toThrow('could not find -Info.plist file, or config.xml file.');
});
it('should return right directory when multiple .plist files are present', function() {
shell.cp('-rf', ios_config_xml_project, temp);
//Create a folder named A with config.xml and .plist files in it
var pathToFolderA = path.join(temp, 'A');
shell.mkdir(pathToFolderA);
shell.cp('-rf', path.join(temp, 'SampleApp/*'), pathToFolderA);

var parsedProjectFile = ios.parseProjectFile(temp);
var pluginsDir = parsedProjectFile.plugins_dir,
resourcesDir = parsedProjectFile.resources_dir,
xcodePath = parsedProjectFile.xcode_path;

var pluginsDirParent = path.dirname(pluginsDir),
resourcesDirParent = path.dirname(resourcesDir),
sampleAppDir = path.join(temp, 'SampleApp');

expect(pluginsDirParent).toEqual(sampleAppDir);
expect(resourcesDirParent).toEqual(sampleAppDir);
expect(xcodePath).toEqual(sampleAppDir);
});
});

Expand Down
44 changes: 22 additions & 22 deletions cordova-lib/spec-plugman/projects/ios-config-xml/SampleApp.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
571A463B14DB0A1B007FEAC7 /* ChildApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ChildApp.app; sourceTree = BUILT_PRODUCTS_DIR; };
571A463B14DB0A1B007FEAC7 /* SampleApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SampleApp.app; sourceTree = BUILT_PRODUCTS_DIR; };
571A463F14DB0A1B007FEAC7 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
571A464114DB0A1B007FEAC7 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
571A464314DB0A1B007FEAC7 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
Expand All @@ -53,10 +53,10 @@
571A465314DB0A1B007FEAC7 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
571A465514DB0A1B007FEAC7 /* MobileCoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = System/Library/Frameworks/MobileCoreServices.framework; sourceTree = SDKROOT; };
571A465714DB0A1B007FEAC7 /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; };
571A465B14DB0A1B007FEAC7 /* ChildApp-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "ChildApp-Info.plist"; sourceTree = "<group>"; };
571A465B14DB0A1B007FEAC7 /* SampleApp-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "SampleApp-Info.plist"; sourceTree = "<group>"; };
571A465D14DB0A1B007FEAC7 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
571A465F14DB0A1B007FEAC7 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
571A466114DB0A1B007FEAC7 /* ChildApp-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "ChildApp-Prefix.pch"; sourceTree = "<group>"; };
571A466114DB0A1B007FEAC7 /* SampleApp-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "SampleApp-Prefix.pch"; sourceTree = "<group>"; };
571A466214DB0A1B007FEAC7 /* PhoneGap.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = PhoneGap.framework; path = /Users/Shared/PhoneGap/Frameworks/PhoneGap.framework; sourceTree = "<absolute>"; };
571A466714DB0A1B007FEAC7 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = Resources/en.lproj/Localizable.strings; sourceTree = "<group>"; };
571A466B14DB0A1B007FEAC7 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = Resources/es.lproj/Localizable.strings; sourceTree = "<group>"; };
Expand Down Expand Up @@ -112,7 +112,7 @@
isa = PBXGroup;
children = (
577FC36514DB0B620082BA7B /* www */,
571A465914DB0A1B007FEAC7 /* ChildApp */,
571A465914DB0A1B007FEAC7 /* SampleApp */,
571A463E14DB0A1B007FEAC7 /* Frameworks */,
571A463C14DB0A1B007FEAC7 /* Products */,
);
Expand All @@ -121,7 +121,7 @@
571A463C14DB0A1B007FEAC7 /* Products */ = {
isa = PBXGroup;
children = (
571A463B14DB0A1B007FEAC7 /* ChildApp.app */,
571A463B14DB0A1B007FEAC7 /* SampleApp.app */,
);
name = Products;
sourceTree = "<group>";
Expand All @@ -146,7 +146,7 @@
name = Frameworks;
sourceTree = "<group>";
};
571A465914DB0A1B007FEAC7 /* ChildApp */ = {
571A465914DB0A1B007FEAC7 /* SampleApp */ = {
isa = PBXGroup;
children = (
571A466214DB0A1B007FEAC7 /* PhoneGap.framework */,
Expand All @@ -155,16 +155,16 @@
571A468614DB0A1B007FEAC7 /* Plugins */,
571A465A14DB0A1B007FEAC7 /* Supporting Files */,
);
path = ChildApp;
path = SampleApp;
sourceTree = "<group>";
};
571A465A14DB0A1B007FEAC7 /* Supporting Files */ = {
isa = PBXGroup;
children = (
571A465B14DB0A1B007FEAC7 /* ChildApp-Info.plist */,
571A465B14DB0A1B007FEAC7 /* SampleApp-Info.plist */,
571A465C14DB0A1B007FEAC7 /* InfoPlist.strings */,
571A465F14DB0A1B007FEAC7 /* main.m */,
571A466114DB0A1B007FEAC7 /* ChildApp-Prefix.pch */,
571A466114DB0A1B007FEAC7 /* SampleApp-Prefix.pch */,
571A467B14DB0A1B007FEAC7 /* PhoneGap.plist */,
571A468414DB0A1B007FEAC7 /* MainViewController.xib */,
);
Expand Down Expand Up @@ -240,9 +240,9 @@
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
571A463A14DB0A1B007FEAC7 /* ChildApp */ = {
571A463A14DB0A1B007FEAC7 /* SampleApp */ = {
isa = PBXNativeTarget;
buildConfigurationList = 571A468A14DB0A1B007FEAC7 /* Build configuration list for PBXNativeTarget "ChildApp" */;
buildConfigurationList = 571A468A14DB0A1B007FEAC7 /* Build configuration list for PBXNativeTarget "SampleApp" */;
buildPhases = (
571A463414DB0A1B007FEAC7 /* Sources */,
571A463514DB0A1B007FEAC7 /* Frameworks */,
Expand All @@ -255,9 +255,9 @@
);
dependencies = (
);
name = ChildApp;
productName = ChildApp;
productReference = 571A463B14DB0A1B007FEAC7 /* ChildApp.app */;
name = SampleApp;
productName = SampleApp;
productReference = 571A463B14DB0A1B007FEAC7 /* SampleApp.app */;
productType = "com.apple.product-type.application";
};
/* End PBXNativeTarget section */
Expand All @@ -268,7 +268,7 @@
attributes = {
LastUpgradeCheck = 0420;
};
buildConfigurationList = 571A463214DB0A1A007FEAC7 /* Build configuration list for PBXProject "ChildApp" */;
buildConfigurationList = 571A463214DB0A1A007FEAC7 /* Build configuration list for PBXProject "SampleApp" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
hasScannedForEncodings = 0;
Expand All @@ -281,7 +281,7 @@
projectDirPath = "";
projectRoot = "";
targets = (
571A463A14DB0A1B007FEAC7 /* ChildApp */,
571A463A14DB0A1B007FEAC7 /* SampleApp */,
);
};
/* End PBXProject section */
Expand Down Expand Up @@ -423,9 +423,9 @@
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "ChildApp/ChildApp-Prefix.pch";
GCC_PREFIX_HEADER = "SampleApp/SampleApp-Prefix.pch";
GCC_PREPROCESSOR_DEFINITIONS = "PHONEGAP_FRAMEWORK=YES";
INFOPLIST_FILE = "ChildApp/ChildApp-Info.plist";
INFOPLIST_FILE = "SampleApp/SampleApp-Info.plist";
OTHER_LDFLAGS = (
"-weak_framework",
UIKit,
Expand All @@ -449,9 +449,9 @@
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "ChildApp/ChildApp-Prefix.pch";
GCC_PREFIX_HEADER = "SampleApp/SampleApp-Prefix.pch";
GCC_PREPROCESSOR_DEFINITIONS = "PHONEGAP_FRAMEWORK=YES";
INFOPLIST_FILE = "ChildApp/ChildApp-Info.plist";
INFOPLIST_FILE = "SampleApp/SampleApp-Info.plist";
OTHER_LDFLAGS = (
"-weak_framework",
UIKit,
Expand All @@ -472,7 +472,7 @@
/* End XCBuildConfiguration section */

/* Begin XCConfigurationList section */
571A463214DB0A1A007FEAC7 /* Build configuration list for PBXProject "ChildApp" */ = {
571A463214DB0A1A007FEAC7 /* Build configuration list for PBXProject "SampleApp" */ = {
isa = XCConfigurationList;
buildConfigurations = (
571A468814DB0A1B007FEAC7 /* Debug */,
Expand All @@ -481,7 +481,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
571A468A14DB0A1B007FEAC7 /* Build configuration list for PBXNativeTarget "ChildApp" */ = {
571A468A14DB0A1B007FEAC7 /* Build configuration list for PBXNativeTarget "SampleApp" */ = {
isa = XCConfigurationList;
buildConfigurations = (
571A468B14DB0A1B007FEAC7 /* Debug */,
Expand Down
44 changes: 22 additions & 22 deletions cordova-lib/spec-plugman/projects/ios-plist/SampleApp.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
571A463B14DB0A1B007FEAC7 /* ChildApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ChildApp.app; sourceTree = BUILT_PRODUCTS_DIR; };
571A463B14DB0A1B007FEAC7 /* SampleApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SampleApp.app; sourceTree = BUILT_PRODUCTS_DIR; };
571A463F14DB0A1B007FEAC7 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
571A464114DB0A1B007FEAC7 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
571A464314DB0A1B007FEAC7 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
Expand All @@ -53,10 +53,10 @@
571A465314DB0A1B007FEAC7 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
571A465514DB0A1B007FEAC7 /* MobileCoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = System/Library/Frameworks/MobileCoreServices.framework; sourceTree = SDKROOT; };
571A465714DB0A1B007FEAC7 /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; };
571A465B14DB0A1B007FEAC7 /* ChildApp-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "ChildApp-Info.plist"; sourceTree = "<group>"; };
571A465B14DB0A1B007FEAC7 /* SampleApp-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "SampleApp-Info.plist"; sourceTree = "<group>"; };
571A465D14DB0A1B007FEAC7 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
571A465F14DB0A1B007FEAC7 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
571A466114DB0A1B007FEAC7 /* ChildApp-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "ChildApp-Prefix.pch"; sourceTree = "<group>"; };
571A466114DB0A1B007FEAC7 /* SampleApp-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "SampleApp-Prefix.pch"; sourceTree = "<group>"; };
571A466214DB0A1B007FEAC7 /* PhoneGap.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = PhoneGap.framework; path = /Users/Shared/PhoneGap/Frameworks/PhoneGap.framework; sourceTree = "<absolute>"; };
571A466714DB0A1B007FEAC7 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = Resources/en.lproj/Localizable.strings; sourceTree = "<group>"; };
571A466B14DB0A1B007FEAC7 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = Resources/es.lproj/Localizable.strings; sourceTree = "<group>"; };
Expand Down Expand Up @@ -112,7 +112,7 @@
isa = PBXGroup;
children = (
577FC36514DB0B620082BA7B /* www */,
571A465914DB0A1B007FEAC7 /* ChildApp */,
571A465914DB0A1B007FEAC7 /* SampleApp */,
571A463E14DB0A1B007FEAC7 /* Frameworks */,
571A463C14DB0A1B007FEAC7 /* Products */,
);
Expand All @@ -121,7 +121,7 @@
571A463C14DB0A1B007FEAC7 /* Products */ = {
isa = PBXGroup;
children = (
571A463B14DB0A1B007FEAC7 /* ChildApp.app */,
571A463B14DB0A1B007FEAC7 /* SampleApp.app */,
);
name = Products;
sourceTree = "<group>";
Expand All @@ -146,7 +146,7 @@
name = Frameworks;
sourceTree = "<group>";
};
571A465914DB0A1B007FEAC7 /* ChildApp */ = {
571A465914DB0A1B007FEAC7 /* SampleApp */ = {
isa = PBXGroup;
children = (
571A466214DB0A1B007FEAC7 /* PhoneGap.framework */,
Expand All @@ -155,16 +155,16 @@
571A468614DB0A1B007FEAC7 /* Plugins */,
571A465A14DB0A1B007FEAC7 /* Supporting Files */,
);
path = ChildApp;
path = SampleApp;
sourceTree = "<group>";
};
571A465A14DB0A1B007FEAC7 /* Supporting Files */ = {
isa = PBXGroup;
children = (
571A465B14DB0A1B007FEAC7 /* ChildApp-Info.plist */,
571A465B14DB0A1B007FEAC7 /* SampleApp-Info.plist */,
571A465C14DB0A1B007FEAC7 /* InfoPlist.strings */,
571A465F14DB0A1B007FEAC7 /* main.m */,
571A466114DB0A1B007FEAC7 /* ChildApp-Prefix.pch */,
571A466114DB0A1B007FEAC7 /* SampleApp-Prefix.pch */,
571A467B14DB0A1B007FEAC7 /* PhoneGap.plist */,
571A468414DB0A1B007FEAC7 /* MainViewController.xib */,
);
Expand Down Expand Up @@ -240,9 +240,9 @@
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
571A463A14DB0A1B007FEAC7 /* ChildApp */ = {
571A463A14DB0A1B007FEAC7 /* SampleApp */ = {
isa = PBXNativeTarget;
buildConfigurationList = 571A468A14DB0A1B007FEAC7 /* Build configuration list for PBXNativeTarget "ChildApp" */;
buildConfigurationList = 571A468A14DB0A1B007FEAC7 /* Build configuration list for PBXNativeTarget "SampleApp" */;
buildPhases = (
571A463414DB0A1B007FEAC7 /* Sources */,
571A463514DB0A1B007FEAC7 /* Frameworks */,
Expand All @@ -255,9 +255,9 @@
);
dependencies = (
);
name = ChildApp;
productName = ChildApp;
productReference = 571A463B14DB0A1B007FEAC7 /* ChildApp.app */;
name = SampleApp;
productName = SampleApp;
productReference = 571A463B14DB0A1B007FEAC7 /* SampleApp.app */;
productType = "com.apple.product-type.application";
};
/* End PBXNativeTarget section */
Expand All @@ -268,7 +268,7 @@
attributes = {
LastUpgradeCheck = 0420;
};
buildConfigurationList = 571A463214DB0A1A007FEAC7 /* Build configuration list for PBXProject "ChildApp" */;
buildConfigurationList = 571A463214DB0A1A007FEAC7 /* Build configuration list for PBXProject "SampleApp" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
hasScannedForEncodings = 0;
Expand All @@ -281,7 +281,7 @@
projectDirPath = "";
projectRoot = "";
targets = (
571A463A14DB0A1B007FEAC7 /* ChildApp */,
571A463A14DB0A1B007FEAC7 /* SampleApp */,
);
};
/* End PBXProject section */
Expand Down Expand Up @@ -424,9 +424,9 @@
FRAMEWORK_SEARCH_PATHS = /Users/Shared/PhoneGap/Frameworks;
GCC_DYNAMIC_NO_PIC = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "ChildApp/ChildApp-Prefix.pch";
GCC_PREFIX_HEADER = "SampleApp/SampleApp-Prefix.pch";
GCC_PREPROCESSOR_DEFINITIONS = "PHONEGAP_FRAMEWORK=YES";
INFOPLIST_FILE = "ChildApp/ChildApp-Info.plist";
INFOPLIST_FILE = "SampleApp/SampleApp-Info.plist";
OTHER_LDFLAGS = (
"-weak_framework",
UIKit,
Expand All @@ -451,9 +451,9 @@
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
FRAMEWORK_SEARCH_PATHS = /Users/Shared/PhoneGap/Frameworks;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "ChildApp/ChildApp-Prefix.pch";
GCC_PREFIX_HEADER = "SampleApp/SampleApp-Prefix.pch";
GCC_PREPROCESSOR_DEFINITIONS = "PHONEGAP_FRAMEWORK=YES";
INFOPLIST_FILE = "ChildApp/ChildApp-Info.plist";
INFOPLIST_FILE = "SampleApp/SampleApp-Info.plist";
OTHER_LDFLAGS = (
"-weak_framework",
UIKit,
Expand All @@ -474,7 +474,7 @@
/* End XCBuildConfiguration section */

/* Begin XCConfigurationList section */
571A463214DB0A1A007FEAC7 /* Build configuration list for PBXProject "ChildApp" */ = {
571A463214DB0A1A007FEAC7 /* Build configuration list for PBXProject "SampleApp" */ = {
isa = XCConfigurationList;
buildConfigurations = (
571A468814DB0A1B007FEAC7 /* Debug */,
Expand All @@ -483,7 +483,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
571A468A14DB0A1B007FEAC7 /* Build configuration list for PBXNativeTarget "ChildApp" */ = {
571A468A14DB0A1B007FEAC7 /* Build configuration list for PBXNativeTarget "SampleApp" */ = {
isa = XCConfigurationList;
buildConfigurations = (
571A468B14DB0A1B007FEAC7 /* Debug */,
Expand Down
Loading

0 comments on commit 6fd8e23

Please sign in to comment.