purplecabbage closed pull request #104: generates a workspace instead of
subproject
URL: https://github.com/apache/cordova-ios/pull/104
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/bin/create b/bin/create
index b652adfa6..c85211bd6 100755
--- a/bin/create
+++ b/bin/create
@@ -110,6 +110,9 @@ else
cp -r "$PROJECT_TEMPLATE_DIR/__NON-CLI__.xcodeproj"
"$PROJECT_PATH/$PROJECT_NAME.xcodeproj"
fi
cp -r "$PROJECT_TEMPLATE_DIR/__PROJECT_NAME__" "$PROJECT_PATH/$PROJECT_NAME"
+cp -r "$PROJECT_TEMPLATE_DIR/__PROJECT_NAME__.xcworkspace"
"$PROJECT_PATH/$PROJECT_NAME.xcworkspace"
+mv
"$PROJECT_PATH/$PROJECT_NAME.xcworkspace/xcshareddata/xcschemes/__PROJECT_NAME__.xcscheme"
"$PROJECT_PATH/$PROJECT_NAME.xcworkspace/xcshareddata/xcschemes/$PROJECT_NAME.xcscheme"
+cp "$PROJECT_TEMPLATE_DIR/plugin.pbxproj" "$PROJECT_PATH/plugin.pbxproj"
R=$PROJECT_PATH/$PROJECT_NAME
mv "$R/__PROJECT_NAME__-Info.plist" "$R/$PROJECT_NAME-Info.plist"
@@ -134,13 +137,12 @@ PROJECT_NAME_ESC="${PROJECT_NAME//&/\\&}"
"$BINDIR/replaces" "$R/main.m" __PROJECT_NAME__
"$PROJECT_NAME_ESC"
"$BINDIR/replaces" "$R/$PROJECT_NAME-Info.plist" __PROJECT_NAME__
"$PROJECT_NAME_ESC"
"$BINDIR/replaces" "$R/$PROJECT_NAME-Prefix.pch" __PROJECT_NAME__
"$PROJECT_NAME_ESC"
+"$BINDIR/replaces" "$R.xcworkspace/contents.xcworkspacedata" __PROJECT_NAME__
"$PROJECT_NAME_ESC"
+"$BINDIR/replaces"
"$R.xcworkspace/xcshareddata/xcschemes/$PROJECT_NAME.xcscheme"
__PROJECT_NAME__ "$PROJECT_NAME_ESC"
"$BINDIR/replaces" "$R/$PROJECT_NAME-Info.plist" --ID-- $PACKAGE
-if [[ $USE_SHARED = 1 ]]; then
- # Make the sub-project reference to Cordova have the correct path.
- "$BINDIR/update_cordova_subproject" "$R.xcodeproj/project.pbxproj" >
/dev/null
-else
+if [[ $USE_SHARED != 1 ]]; then
# Copy in the CordovaLib directory.
mkdir -p "$PROJECT_PATH/CordovaLib/CordovaLib.xcodeproj"
cp "$R/.gitignore" "$PROJECT_PATH/"
@@ -149,8 +151,6 @@ else
cp "$BINDIR/../CordovaLib/cordova.js" "$PROJECT_PATH/CordovaLib"
cp "$BINDIR/../CordovaLib/CordovaLib_Prefix.pch" "$PROJECT_PATH/CordovaLib"
cp "$BINDIR/../CordovaLib/CordovaLib.xcodeproj/project.pbxproj"
"$PROJECT_PATH/CordovaLib/CordovaLib.xcodeproj"
- # Make the sub-project reference to Cordova have the correct path.
- "$BINDIR/update_cordova_subproject" "$R.xcodeproj/project.pbxproj"
"$PROJECT_PATH/CordovaLib/CordovaLib.xcodeproj/project.pbxproj" > /dev/null
fi
# Finally copy the scripts
diff --git a/bin/templates/project/__CLI__.xcodeproj/project.pbxproj
b/bin/templates/project/__CLI__.xcodeproj/project.pbxproj
index cf949d030..00e4fc919 100755
--- a/bin/templates/project/__CLI__.xcodeproj/project.pbxproj
+++ b/bin/templates/project/__CLI__.xcodeproj/project.pbxproj
@@ -11,7 +11,6 @@
1D60589B0D05DD56006BFB54 /* main.m in Sources */ = {isa =
PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; };
1F766FE113BBADB100FB74C0 /* Localizable.strings in Resources */
= {isa = PBXBuildFile; fileRef = 1F766FDC13BBADB100FB74C0 /*
Localizable.strings */; };
288765FD0DF74451002DB57D /* CoreGraphics.framework in
Frameworks */ = {isa = PBXBuildFile; fileRef = 288765FC0DF74451002DB57D /*
CoreGraphics.framework */; };
- 301BF552109A68D80062928A /* libCordova.a in Frameworks */ =
{isa = PBXBuildFile; fileRef = 301BF535109A57CC0062928A /* libCordova.a */; };
302D95F114D2391D003F00A1 /* MainViewController.m in Sources */
= {isa = PBXBuildFile; fileRef = 302D95EF14D2391D003F00A1 /*
MainViewController.m */; };
302D95F214D2391D003F00A1 /* MainViewController.xib in Resources
*/ = {isa = PBXBuildFile; fileRef = 302D95F014D2391D003F00A1 /*
MainViewController.xib */; };
305D5FD1115AB8F900A74A75 /* MobileCoreServices.framework in
Frameworks */ = {isa = PBXBuildFile; fileRef = 305D5FD0115AB8F900A74A75 /*
MobileCoreServices.framework */; };
@@ -38,25 +37,10 @@
7E7966E61810823500FA85AD /* icon-small.png in Resources */ =
{isa = PBXBuildFile; fileRef = 7E7966DC1810823500FA85AD /* icon-small.png */; };
7E7966E71810823500FA85AD /* icon-sm...@2x.png in Resources */ =
{isa = PBXBuildFile; fileRef = 7E7966DD1810823500FA85AD /* icon-sm...@2x.png
*/; };
D4A0D8761607E02300AEF8BB /* Default-568h@2x~iphone.png in
Resources */ = {isa = PBXBuildFile; fileRef = D4A0D8751607E02300AEF8BB /*
Default-568h@2x~iphone.png */; };
+ D955B48319C82B54003F0FB2 /* libCordova.a in Frameworks */ =
{isa = PBXBuildFile; fileRef = D955B48219C82B54003F0FB2 /* libCordova.a */; };
+ FA1A243519F56B3200BD4A33 /* UIKit.framework in Frameworks */ =
{isa = PBXBuildFile; fileRef = FA1A243419F56B3200BD4A33 /* UIKit.framework */;
};
/* End PBXBuildFile section */
-/* Begin PBXContainerItemProxy section */
- 301BF534109A57CC0062928A /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 301BF52D109A57CC0062928A /*
CordovaLib.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = D2AAC07E0554694100DB518D;
- remoteInfo = CordovaLib;
- };
- 301BF550109A68C00062928A /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 301BF52D109A57CC0062928A /*
CordovaLib.xcodeproj */;
- proxyType = 1;
- remoteGlobalIDString = D2AAC07D0554694100DB518D;
- remoteInfo = CordovaLib;
- };
-/* End PBXContainerItemProxy section */
-
/* Begin PBXFileReference section */
1D3623240D0F684500981E51 /* AppDelegate.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
AppDelegate.h; sourceTree = "<group>"; };
1D3623250D0F684500981E51 /* AppDelegate.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= AppDelegate.m; sourceTree = "<group>"; };
@@ -65,7 +49,6 @@
1F766FE013BBADB100FB74C0 /* es */ = {isa = PBXFileReference;
lastKnownFileType = text.plist.strings; name = es; path = Localizable.strings;
sourceTree = "<group>"; };
288765FC0DF74451002DB57D /* CoreGraphics.framework */ = {isa =
PBXFileReference; lastKnownFileType = wrapper.framework; name =
CoreGraphics.framework; path =
System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
29B97316FDCFA39411CA2CEA /* main.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= main.m; sourceTree = "<group>"; };
- 301BF52D109A57CC0062928A /* CordovaLib.xcodeproj */ = {isa =
PBXFileReference; lastKnownFileType = "wrapper.pb-project"; path =
CordovaLib.xcodeproj; sourceTree = CORDOVALIB; };
301BF56E109A69640062928A /* www */ = {isa = PBXFileReference;
lastKnownFileType = folder; path = www; sourceTree = SOURCE_ROOT; };
302D95EE14D2391D003F00A1 /* MainViewController.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
MainViewController.h; sourceTree = "<group>"; };
302D95EF14D2391D003F00A1 /* MainViewController.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= MainViewController.m; sourceTree = "<group>"; };
@@ -97,10 +80,12 @@
7E7966DD1810823500FA85AD /* icon-sm...@2x.png */ = {isa =
PBXFileReference; lastKnownFileType = image.png; path = "icon-sm...@2x.png";
sourceTree = "<group>"; };
8D1107310486CEB800E47090 /* __PROJECT_NAME__-Info.plist */ =
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml;
name = "__PROJECT_NAME__-Info.plist"; path = "../__PROJECT_NAME__-Info.plist";
plistStructureDefinitionIdentifier =
"com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree =
"<group>"; };
D4A0D8751607E02300AEF8BB /* Default-568h@2x~iphone.png */ =
{isa = PBXFileReference; lastKnownFileType = image.png; path =
"Default-568h@2x~iphone.png"; sourceTree = "<group>"; };
+ D955B48219C82B54003F0FB2 /* libCordova.a */ = {isa =
PBXFileReference; lastKnownFileType = archive.ar; name = libCordova.a; path =
"CordovaLib/build/Debug-iphoneos/libCordova.a"; sourceTree = "<group>"; };
EB87FDF21871DA7A0020F90C /* merges */ = {isa =
PBXFileReference; lastKnownFileType = folder; name = merges; path =
../../merges; sourceTree = "<group>"; };
EB87FDF31871DA8E0020F90C /* www */ = {isa = PBXFileReference;
lastKnownFileType = folder; name = www; path = ../../www; sourceTree =
"<group>"; };
EB87FDF41871DAF40020F90C /* config.xml */ = {isa =
PBXFileReference; lastKnownFileType = text.xml; name = config.xml; path =
../../config.xml; sourceTree = "<group>"; };
F840E1F0165FE0F500CFE078 /* config.xml */ = {isa =
PBXFileReference; lastKnownFileType = text.xml; name = config.xml; path =
"__PROJECT_NAME__/config.xml"; sourceTree = "<group>"; };
+ FA1A243419F56B3200BD4A33 /* UIKit.framework */ = {isa =
PBXFileReference; lastKnownFileType = wrapper.framework; name =
UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree =
SDKROOT; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -108,8 +93,9 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
+ FA1A243519F56B3200BD4A33 /* UIKit.framework in
Frameworks */,
+ D955B48319C82B54003F0FB2 /* libCordova.a in
Frameworks */,
5B1594DD16A7569C00FEF299 /*
AssetsLibrary.framework in Frameworks */,
- 301BF552109A68D80062928A /* libCordova.a in
Frameworks */,
288765FD0DF74451002DB57D /*
CoreGraphics.framework in Frameworks */,
305D5FD1115AB8F900A74A75 /*
MobileCoreServices.framework in Frameworks */,
);
@@ -162,7 +148,6 @@
EB87FDF31871DA8E0020F90C /* www */,
EB87FDF21871DA7A0020F90C /* merges */,
EB87FDF11871DA420020F90C /* Staging */,
- 301BF52D109A57CC0062928A /*
CordovaLib.xcodeproj */,
080E96DDFE201D6D7F000001 /* Classes */,
307C750510C5A3420062BCA9 /* Plugins */,
29B97315FDCFA39411CA2CEA /* Other Sources */,
@@ -201,6 +186,8 @@
29B97323FDCFA39411CA2CEA /* Frameworks */ = {
isa = PBXGroup;
children = (
+ FA1A243419F56B3200BD4A33 /* UIKit.framework */,
+ D955B48219C82B54003F0FB2 /* libCordova.a */,
5B1594DC16A7569C00FEF299 /*
AssetsLibrary.framework */,
288765FC0DF74451002DB57D /*
CoreGraphics.framework */,
305D5FD0115AB8F900A74A75 /*
MobileCoreServices.framework */,
@@ -208,14 +195,6 @@
name = Frameworks;
sourceTree = "<group>";
};
- 301BF52E109A57CC0062928A /* Products */ = {
- isa = PBXGroup;
- children = (
- 301BF535109A57CC0062928A /* libCordova.a */,
- );
- name = Products;
- sourceTree = "<group>";
- };
307C750510C5A3420062BCA9 /* Plugins */ = {
isa = PBXGroup;
children = (
@@ -299,7 +278,6 @@
buildRules = (
);
dependencies = (
- 301BF551109A68C00062928A /* PBXTargetDependency
*/,
);
name = "__PROJECT_NAME__";
productName = "__PROJECT_NAME__";
@@ -330,12 +308,6 @@
);
mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate
*/;
projectDirPath = "";
- projectReferences = (
- {
- ProductGroup = 301BF52E109A57CC0062928A
/* Products */;
- ProjectRef = 301BF52D109A57CC0062928A
/* CordovaLib.xcodeproj */;
- },
- );
projectRoot = "";
targets = (
1D6058900D05DD3D006BFB54 /* __PROJECT_NAME__ */,
@@ -343,16 +315,6 @@
};
/* End PBXProject section */
-/* Begin PBXReferenceProxy section */
- 301BF535109A57CC0062928A /* libCordova.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = libCordova.a;
- remoteRef = 301BF534109A57CC0062928A /*
PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
-/* End PBXReferenceProxy section */
-
/* Begin PBXResourcesBuildPhase section */
1D60588D0D05DD3D006BFB54 /* Resources */ = {
isa = PBXResourcesBuildPhase;
@@ -418,14 +380,6 @@
};
/* End PBXSourcesBuildPhase section */
-/* Begin PBXTargetDependency section */
- 301BF551109A68C00062928A /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- name = CordovaLib;
- targetProxy = 301BF550109A68C00062928A /*
PBXContainerItemProxy */;
- };
-/* End PBXTargetDependency section */
-
/* Begin PBXVariantGroup section */
1F766FDC13BBADB100FB74C0 /* Localizable.strings */ = {
isa = PBXVariantGroup;
@@ -476,20 +430,6 @@
GCC_VERSION = "";
INFOPLIST_FILE =
"__PROJECT_NAME__/__PROJECT_NAME__-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 6.0;
- OTHER_LDFLAGS = (
- "-weak_framework",
- CoreFoundation,
- "-weak_framework",
- UIKit,
- "-weak_framework",
- AVFoundation,
- "-weak_framework",
- CoreMedia,
- "-weak-lSystem",
- "-force_load",
-
"\"$(BUILT_PRODUCTS_DIR)/libCordova.a\"",
- "-ObjC",
- );
PRODUCT_NAME = "__PROJECT_NAME__";
TARGETED_DEVICE_FAMILY = "1,2";
};
@@ -507,20 +447,6 @@
GCC_VERSION = "";
INFOPLIST_FILE =
"__PROJECT_NAME__/__PROJECT_NAME__-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 6.0;
- OTHER_LDFLAGS = (
- "-weak_framework",
- CoreFoundation,
- "-weak_framework",
- UIKit,
- "-weak_framework",
- AVFoundation,
- "-weak_framework",
- CoreMedia,
- "-weak-lSystem",
- "-force_load",
-
"\"$(BUILT_PRODUCTS_DIR)/libCordova.a\"",
- "-ObjC",
- );
PRODUCT_NAME = "__PROJECT_NAME__";
TARGETED_DEVICE_FAMILY = "1,2";
};
@@ -552,20 +478,6 @@
);
IPHONEOS_DEPLOYMENT_TARGET = 6.0;
ONLY_ACTIVE_ARCH = YES;
- OTHER_LDFLAGS = (
- "-weak_framework",
- CoreFoundation,
- "-weak_framework",
- UIKit,
- "-weak_framework",
- AVFoundation,
- "-weak_framework",
- CoreMedia,
- "-weak-lSystem",
- "-force_load",
-
"\"$(BUILT_PRODUCTS_DIR)/libCordova.a\"",
- "-ObjC",
- );
SDKROOT = iphoneos;
SKIP_INSTALL = NO;
USER_HEADER_SEARCH_PATHS = "";
@@ -597,20 +509,6 @@
"\"$(BUILT_PRODUCTS_DIR)\"",
);
IPHONEOS_DEPLOYMENT_TARGET = 6.0;
- OTHER_LDFLAGS = (
- "-weak_framework",
- CoreFoundation,
- "-weak_framework",
- UIKit,
- "-weak_framework",
- AVFoundation,
- "-weak_framework",
- CoreMedia,
- "-weak-lSystem",
- "-force_load",
-
"\"$(BUILT_PRODUCTS_DIR)/libCordova.a\"",
- "-ObjC",
- );
SDKROOT = iphoneos;
SKIP_INSTALL = NO;
USER_HEADER_SEARCH_PATHS = "";
diff --git a/bin/templates/project/__NON-CLI__.xcodeproj/project.pbxproj
b/bin/templates/project/__NON-CLI__.xcodeproj/project.pbxproj
index afc446c5c..719da4825 100755
--- a/bin/templates/project/__NON-CLI__.xcodeproj/project.pbxproj
+++ b/bin/templates/project/__NON-CLI__.xcodeproj/project.pbxproj
@@ -38,6 +38,7 @@
7E7966E61810823500FA85AD /* icon-small.png in Resources */ =
{isa = PBXBuildFile; fileRef = 7E7966DC1810823500FA85AD /* icon-small.png */; };
7E7966E71810823500FA85AD /* icon-sm...@2x.png in Resources */ =
{isa = PBXBuildFile; fileRef = 7E7966DD1810823500FA85AD /* icon-sm...@2x.png
*/; };
D4A0D8761607E02300AEF8BB /* Default-568h@2x~iphone.png in
Resources */ = {isa = PBXBuildFile; fileRef = D4A0D8751607E02300AEF8BB /*
Default-568h@2x~iphone.png */; };
+ FA1A243519F56B3200BD4A33 /* UIKit.framework in Frameworks */ =
{isa = PBXBuildFile; fileRef = FA1A243419F56B3200BD4A33 /* UIKit.framework */;
};
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@@ -98,6 +99,7 @@
8D1107310486CEB800E47090 /* __PROJECT_NAME__-Info.plist */ =
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml;
name = "__PROJECT_NAME__-Info.plist"; path = "../__PROJECT_NAME__-Info.plist";
plistStructureDefinitionIdentifier =
"com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree =
"<group>"; };
D4A0D8751607E02300AEF8BB /* Default-568h@2x~iphone.png */ =
{isa = PBXFileReference; lastKnownFileType = image.png; path =
"Default-568h@2x~iphone.png"; sourceTree = "<group>"; };
F840E1F0165FE0F500CFE078 /* config.xml */ = {isa =
PBXFileReference; lastKnownFileType = text.xml; name = config.xml; path =
"__PROJECT_NAME__/config.xml"; sourceTree = "<group>"; };
+ FA1A243419F56B3200BD4A33 /* UIKit.framework */ = {isa =
PBXFileReference; lastKnownFileType = wrapper.framework; name =
UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree =
SDKROOT; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -105,6 +107,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
+ FA1A243519F56B3200BD4A33 /* UIKit.framework in
Frameworks */,
5B1594DD16A7569C00FEF299 /*
AssetsLibrary.framework in Frameworks */,
301BF552109A68D80062928A /* libCordova.a in
Frameworks */,
288765FD0DF74451002DB57D /*
CoreGraphics.framework in Frameworks */,
@@ -196,6 +199,7 @@
29B97323FDCFA39411CA2CEA /* Frameworks */ = {
isa = PBXGroup;
children = (
+ FA1A243419F56B3200BD4A33 /* UIKit.framework */,
5B1594DC16A7569C00FEF299 /*
AssetsLibrary.framework */,
288765FC0DF74451002DB57D /*
CoreGraphics.framework */,
305D5FD0115AB8F900A74A75 /*
MobileCoreServices.framework */,
@@ -387,7 +391,7 @@
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "cordova/lib/copy-www-build-step.sh";
- showEnvVarsInLog = 0;
+ showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
@@ -538,20 +542,6 @@
);
IPHONEOS_DEPLOYMENT_TARGET = 6.0;
ONLY_ACTIVE_ARCH = YES;
- OTHER_LDFLAGS = (
- "-weak_framework",
- CoreFoundation,
- "-weak_framework",
- UIKit,
- "-weak_framework",
- AVFoundation,
- "-weak_framework",
- CoreMedia,
- "-weak-lSystem",
- "-force_load",
-
"\"$(BUILT_PRODUCTS_DIR)/libCordova.a\"",
- "-ObjC",
- );
SDKROOT = iphoneos;
SKIP_INSTALL = NO;
USER_HEADER_SEARCH_PATHS = "";
@@ -583,20 +573,6 @@
"\"$(BUILT_PRODUCTS_DIR)\"",
);
IPHONEOS_DEPLOYMENT_TARGET = 6.0;
- OTHER_LDFLAGS = (
- "-weak_framework",
- CoreFoundation,
- "-weak_framework",
- UIKit,
- "-weak_framework",
- AVFoundation,
- "-weak_framework",
- CoreMedia,
- "-weak-lSystem",
- "-force_load",
-
"\"$(BUILT_PRODUCTS_DIR)/libCordova.a\"",
- "-ObjC",
- );
SDKROOT = iphoneos;
SKIP_INSTALL = NO;
USER_HEADER_SEARCH_PATHS = "";
diff --git
a/bin/templates/project/__PROJECT_NAME__.xcworkspace/contents.xcworkspacedata
b/bin/templates/project/__PROJECT_NAME__.xcworkspace/contents.xcworkspacedata
new file mode 100644
index 000000000..3d3445a9b
--- /dev/null
+++
b/bin/templates/project/__PROJECT_NAME__.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+ version = "1.0">
+ <FileRef
+ location = "group:__PROJECT_NAME__.xcodeproj">
+ </FileRef>
+ <FileRef
+ location = "group:CordovaLib/CordovaLib.xcodeproj">
+ </FileRef>
+</Workspace>
diff --git
a/bin/templates/project/__PROJECT_NAME__.xcworkspace/xcshareddata/xcschemes/__PROJECT_NAME__.xcscheme
b/bin/templates/project/__PROJECT_NAME__.xcworkspace/xcshareddata/xcschemes/__PROJECT_NAME__.xcscheme
new file mode 100644
index 000000000..b57bc4398
--- /dev/null
+++
b/bin/templates/project/__PROJECT_NAME__.xcworkspace/xcshareddata/xcschemes/__PROJECT_NAME__.xcscheme
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+ LastUpgradeVersion = "0600"
+ version = "1.3">
+ <BuildAction
+ parallelizeBuildables = "YES"
+ buildImplicitDependencies = "YES">
+ <BuildActionEntries>
+ <BuildActionEntry
+ buildForTesting = "YES"
+ buildForRunning = "YES"
+ buildForProfiling = "YES"
+ buildForArchiving = "YES"
+ buildForAnalyzing = "YES">
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "1D6058900D05DD3D006BFB54"
+ BuildableName = "__PROJECT_NAME__.app"
+ BlueprintName = "__PROJECT_NAME__"
+ ReferencedContainer = "container:__PROJECT_NAME__.xcodeproj">
+ </BuildableReference>
+ </BuildActionEntry>
+ </BuildActionEntries>
+ </BuildAction>
+ <TestAction
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+ shouldUseLaunchSchemeArgsEnv = "YES"
+ buildConfiguration = "Debug">
+ <Testables>
+ </Testables>
+ <MacroExpansion>
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "1D6058900D05DD3D006BFB54"
+ BuildableName = "__PROJECT_NAME__.app"
+ BlueprintName = "__PROJECT_NAME__"
+ ReferencedContainer = "container:__PROJECT_NAME__.xcodeproj">
+ </BuildableReference>
+ </MacroExpansion>
+ </TestAction>
+ <LaunchAction
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+ launchStyle = "0"
+ useCustomWorkingDirectory = "NO"
+ buildConfiguration = "Debug"
+ ignoresPersistentStateOnLaunch = "NO"
+ debugDocumentVersioning = "YES"
+ allowLocationSimulation = "YES">
+ <BuildableProductRunnable>
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "1D6058900D05DD3D006BFB54"
+ BuildableName = "__PROJECT_NAME__.app"
+ BlueprintName = "__PROJECT_NAME__"
+ ReferencedContainer = "container:__PROJECT_NAME__.xcodeproj">
+ </BuildableReference>
+ </BuildableProductRunnable>
+ <AdditionalOptions>
+ </AdditionalOptions>
+ </LaunchAction>
+ <ProfileAction
+ shouldUseLaunchSchemeArgsEnv = "YES"
+ savedToolIdentifier = ""
+ useCustomWorkingDirectory = "NO"
+ buildConfiguration = "Release"
+ debugDocumentVersioning = "YES">
+ <BuildableProductRunnable>
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "1D6058900D05DD3D006BFB54"
+ BuildableName = "__PROJECT_NAME__.app"
+ BlueprintName = "__PROJECT_NAME__"
+ ReferencedContainer = "container:__PROJECT_NAME__.xcodeproj">
+ </BuildableReference>
+ </BuildableProductRunnable>
+ </ProfileAction>
+ <AnalyzeAction
+ buildConfiguration = "Debug">
+ </AnalyzeAction>
+ <ArchiveAction
+ buildConfiguration = "Release"
+ revealArchiveInOrganizer = "YES">
+ </ArchiveAction>
+</Scheme>
diff --git a/bin/templates/project/plugin.pbxproj
b/bin/templates/project/plugin.pbxproj
new file mode 100644
index 000000000..6c2427721
--- /dev/null
+++ b/bin/templates/project/plugin.pbxproj
@@ -0,0 +1,268 @@
+// !$*UTF8*$!
+{
+ archiveVersion = 1;
+ classes = {
+ };
+ objectVersion = 46;
+ objects = {
+
+/* Begin PBXBuildFile section */
+ D97813FA19CB364D00F44206 /* test.m in Sources */ = {isa =
PBXBuildFile; fileRef = D97813F919CB364D00F44206 /* test.m */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXCopyFilesBuildPhase section */
+ D97813DE19CB223B00F44206 /* CopyFiles */ = {
+ isa = PBXCopyFilesBuildPhase;
+ buildActionMask = 2147483647;
+ dstPath = "include/$(PRODUCT_NAME)";
+ dstSubfolderSpec = 16;
+ files = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+/* End PBXCopyFilesBuildPhase section */
+
+/* Begin PBXFileReference section */
+ D97813E019CB223B00F44206 /* lib_target_.a */ = {isa =
PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path =
lib_target_.a; sourceTree = BUILT_PRODUCTS_DIR; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+ D97813DD19CB223B00F44206 /* Frameworks */ = {
+ isa = PBXFrameworksBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+ D97813D719CB223B00F44206 = {
+ isa = PBXGroup;
+ children = (
+ D97813F819CB229100F44206 /* Frameworks */,
+ D97813F719CB225D00F44206 /* Plugins */,
+ D97813E219CB223B00F44206 /* Resources */,
+ D97813E119CB223B00F44206 /* Products */,
+ );
+ sourceTree = "<group>";
+ };
+ D97813E119CB223B00F44206 /* Products */ = {
+ isa = PBXGroup;
+ children = (
+ D97813E019CB223B00F44206 /* lib_target_.a */,
+ );
+ name = Products;
+ sourceTree = "<group>";
+ };
+ D97813E219CB223B00F44206 /* Resources */ = {
+ isa = PBXGroup;
+ children = (
+ );
+ name = Resources;
+ path = _target_;
+ sourceTree = "<group>";
+ };
+ D97813F719CB225D00F44206 /* Plugins */ = {
+ isa = PBXGroup;
+ children = (
+ );
+ name = Plugins;
+ sourceTree = "<group>";
+ };
+ D97813F819CB229100F44206 /* Frameworks */ = {
+ isa = PBXGroup;
+ children = (
+ );
+ name = Frameworks;
+ sourceTree = "<group>";
+ };
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+ D97813DF19CB223B00F44206 /* _target_ */ = {
+ isa = PBXNativeTarget;
+ buildConfigurationList = D97813F119CB223B00F44206 /*
Build configuration list for PBXNativeTarget "_target_" */;
+ buildPhases = (
+ D97813DC19CB223B00F44206 /* Sources */,
+ D97813DD19CB223B00F44206 /* Frameworks */,
+ D97813DE19CB223B00F44206 /* CopyFiles */,
+ 571A463614DB0A1B007FEAC7 /* Resources */,
+ );
+ buildRules = (
+ );
+ dependencies = (
+ );
+ name = _target_;
+ productName = _target_;
+ productReference = D97813E019CB223B00F44206 /*
lib_target_.a */;
+ productType = "com.apple.product-type.library.static";
+ };
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+ D97813D819CB223B00F44206 /* Project object */ = {
+ isa = PBXProject;
+ attributes = {
+ LastUpgradeCheck = 0600;
+ ORGANIZATIONNAME = "Red Hat";
+ TargetAttributes = {
+ D97813DF19CB223B00F44206 = {
+ CreatedOnToolsVersion = 6.0;
+ };
+ };
+ };
+ buildConfigurationList = D97813DB19CB223B00F44206 /*
Build configuration list for PBXProject "_target_" */;
+ compatibilityVersion = "Xcode 3.2";
+ developmentRegion = English;
+ hasScannedForEncodings = 0;
+ knownRegions = (
+ en,
+ );
+ mainGroup = D97813D719CB223B00F44206;
+ productRefGroup = D97813E119CB223B00F44206 /* Products
*/;
+ projectDirPath = "";
+ projectRoot = "";
+ targets = (
+ D97813DF19CB223B00F44206 /* _target_ */,
+ );
+ };
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+ 571A463614DB0A1B007FEAC7 /* Resources */ = {
+ isa = PBXResourcesBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+ D97813DC19CB223B00F44206 /* Sources */ = {
+ isa = PBXSourcesBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+/* End PBXSourcesBuildPhase section */
+
+/* Begin XCBuildConfiguration section */
+ D97813EF19CB223B00F44206 /* Debug */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ ALWAYS_SEARCH_USER_PATHS = NO;
+ CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+ CLANG_CXX_LIBRARY = "libc++";
+ CLANG_ENABLE_MODULES = YES;
+ CLANG_ENABLE_OBJC_ARC = YES;
+ CLANG_WARN_BOOL_CONVERSION = YES;
+ CLANG_WARN_CONSTANT_CONVERSION = YES;
+ CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+ CLANG_WARN_EMPTY_BODY = YES;
+ CLANG_WARN_ENUM_CONVERSION = YES;
+ CLANG_WARN_INT_CONVERSION = YES;
+ CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+ CLANG_WARN_UNREACHABLE_CODE = YES;
+ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+ COPY_PHASE_STRIP = NO;
+ ENABLE_STRICT_OBJC_MSGSEND = YES;
+ GCC_C_LANGUAGE_STANDARD = gnu99;
+ GCC_DYNAMIC_NO_PIC = NO;
+ GCC_OPTIMIZATION_LEVEL = 0;
+ GCC_PREPROCESSOR_DEFINITIONS = (
+ "DEBUG=1",
+ "$(inherited)",
+ );
+ GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+ GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+ GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+ GCC_WARN_UNDECLARED_SELECTOR = YES;
+ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+ GCC_WARN_UNUSED_FUNCTION = YES;
+ GCC_WARN_UNUSED_VARIABLE = YES;
+ IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+ MTL_ENABLE_DEBUG_INFO = YES;
+ ONLY_ACTIVE_ARCH = YES;
+ SDKROOT = iphoneos;
+ };
+ name = Debug;
+ };
+ D97813F019CB223B00F44206 /* Release */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ ALWAYS_SEARCH_USER_PATHS = NO;
+ CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+ CLANG_CXX_LIBRARY = "libc++";
+ CLANG_ENABLE_MODULES = YES;
+ CLANG_ENABLE_OBJC_ARC = YES;
+ CLANG_WARN_BOOL_CONVERSION = YES;
+ CLANG_WARN_CONSTANT_CONVERSION = YES;
+ CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+ CLANG_WARN_EMPTY_BODY = YES;
+ CLANG_WARN_ENUM_CONVERSION = YES;
+ CLANG_WARN_INT_CONVERSION = YES;
+ CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+ CLANG_WARN_UNREACHABLE_CODE = YES;
+ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+ COPY_PHASE_STRIP = YES;
+ ENABLE_NS_ASSERTIONS = NO;
+ ENABLE_STRICT_OBJC_MSGSEND = YES;
+ GCC_C_LANGUAGE_STANDARD = gnu99;
+ GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+ GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+ GCC_WARN_UNDECLARED_SELECTOR = YES;
+ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+ GCC_WARN_UNUSED_FUNCTION = YES;
+ GCC_WARN_UNUSED_VARIABLE = YES;
+ IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+ MTL_ENABLE_DEBUG_INFO = NO;
+ SDKROOT = iphoneos;
+ VALIDATE_PRODUCT = YES;
+ };
+ name = Release;
+ };
+ D97813F219CB223B00F44206 /* Debug */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ OTHER_LDFLAGS = "-ObjC";
+ PRODUCT_NAME = "$(TARGET_NAME)";
+ SKIP_INSTALL = YES;
+ };
+ name = Debug;
+ };
+ D97813F319CB223B00F44206 /* Release */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ OTHER_LDFLAGS = "-ObjC";
+ PRODUCT_NAME = "$(TARGET_NAME)";
+ SKIP_INSTALL = YES;
+ };
+ name = Release;
+ };
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+ D97813DB19CB223B00F44206 /* Build configuration list for
PBXProject "_target_" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ D97813EF19CB223B00F44206 /* Debug */,
+ D97813F019CB223B00F44206 /* Release */,
+ );
+ defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Release;
+ };
+ D97813F119CB223B00F44206 /* Build configuration list for
PBXNativeTarget "_target_" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ D97813F219CB223B00F44206 /* Debug */,
+ D97813F319CB223B00F44206 /* Release */,
+ );
+ defaultConfigurationIsVisible = 0;
+ };
+/* End XCConfigurationList section */
+ };
+ rootObject = D97813D819CB223B00F44206 /* Project object */;
+}
diff --git a/bin/templates/scripts/cordova/build
b/bin/templates/scripts/cordova/build
index 220c3af77..9640f2e58 100755
--- a/bin/templates/scripts/cordova/build
+++ b/bin/templates/scripts/cordova/build
@@ -28,6 +28,9 @@ PROJECT_PATH="$(dirname "$CORDOVA_PATH")"
XCODEPROJ=$( ls "$PROJECT_PATH" | grep .xcodeproj )
PROJECT_NAME=$(basename "$XCODEPROJ" .xcodeproj)
+# By default, just use the project name as the scheme name
+SCHEME_NAME=$PROJECT_NAME
+
source "$CORDOVA_PATH/check_reqs"
cd "$PROJECT_PATH"
@@ -49,8 +52,7 @@ while [[ $# -gt 0 ]]; do
done
if (( $EMULATOR )); then
- exec xcodebuild -project "$PROJECT_NAME.xcodeproj" -arch i386 -target
"$PROJECT_NAME" -configuration $CONFIGURATION -sdk iphonesimulator build
VALID_ARCHS="i386" CONFIGURATION_BUILD_DIR="$PROJECT_PATH/build/emulator"
+ exec xcodebuild -xcconfig "$CORDOVA_PATH/build.xcconfig" -workspace
"$PROJECT_NAME.xcworkspace" -scheme $SCHEME_NAME -arch i386 -configuration
$CONFIGURATION -sdk iphonesimulator build VALID_ARCHS="i386"
CONFIGURATION_BUILD_DIR="$PROJECT_PATH/build/emulator"
else
- exec xcodebuild -xcconfig "$CORDOVA_PATH/build.xcconfig" -project
"$PROJECT_NAME.xcodeproj" ARCHS="armv7 armv7s arm64" -target "$PROJECT_NAME"
-configuration $CONFIGURATION -sdk iphoneos build VALID_ARCHS="armv7 armv7s
arm64" CONFIGURATION_BUILD_DIR="$PROJECT_PATH/build/device"
+ exec xcodebuild -xcconfig "$CORDOVA_PATH/build.xcconfig" -workspace
"$PROJECT_NAME.xcworkspace" -scheme $SCHEME_NAME ARCHS="armv7 armv7s arm64"
-configuration $CONFIGURATION -sdk iphoneos build VALID_ARCHS="armv7 armv7s
arm64" CONFIGURATION_BUILD_DIR="$PROJECT_PATH/build/device"
fi
-
diff --git a/bin/update_cordova_subproject b/bin/update_cordova_subproject
deleted file mode 100755
index 07b257a20..000000000
--- a/bin/update_cordova_subproject
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/usr/bin/python
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-"""
-Updates the subproject path of the CordovaLib entry to point to this script's
version of Cordova.
-
-Usage: CordovaVersion/bin/update_cordova_project path/to/your/app.xcodeproj
[path/to/CordovaLib.xcodeproj]
-"""
-
-import fileinput
-import os
-import re
-import sys
-from posixpath import curdir, sep, pardir, join, abspath, commonprefix
-
-def Usage():
- print __doc__
- sys.exit(1)
-
-def AbsParentPath(path):
- return os.path.abspath(os.path.join(path, os.path.pardir))
-
-def AbsFrameworkPath(argv0):
- script_path = argv0
- # This can happen if the script's dir is in the user's PATH
- if not os.path.exists(script_path):
- raise Exception('Could not locale framework directory.')
- return AbsParentPath(AbsParentPath(script_path))
-
-def AbsProjectPath(relative_path):
- # Do an extra abspath here to strip off trailing / if present.
- project_path = os.path.abspath(relative_path)
- if project_path.endswith('.pbxproj'):
- project_path = AbsParentPath(project_path)
- elif project_path.endswith('.xcodeproj'):
- pass
- else:
- raise Exception('The following is not a valid path to an XCode project:
%s' % project_path)
- return project_path
-
-def relpath(path, start=curdir):
- # it would be nice to use os.path.relpath,
- # but that leaves out those with python < v2.6
- if not path:
- raise ValueError("no path specified")
- start_list = abspath(start).split(sep)
- path_list = abspath(path).split(sep)
- # Work out how much of the filepath is shared by start and path.
- i = len(commonprefix([start_list, path_list]))
- rel_list = [pardir] * (len(start_list)-i) + path_list[i:]
- if not rel_list:
- return curdir
- return join(*rel_list)
-
-
-def main(argv):
- if len(argv) < 2 or len(argv) > 3:
- Usage()
-
- project_path = AbsProjectPath(argv[1])
- if len(argv) < 3:
- framework_path = AbsFrameworkPath(argv[0])
- cordova_lib_xcode_path = os.path.join(framework_path, 'CordovaLib',
'CordovaLib.xcodeproj')
- else:
- cordova_lib_xcode_path = AbsProjectPath(argv[2])
-
- parent_project_path = AbsParentPath(project_path)
- subproject_path = relpath(cordova_lib_xcode_path, parent_project_path)
-
- # /* CordovaLib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType =
"wrapper.pb-project"; path = CordovaLib.xcodeproj; sourceTree = "<group>"; };
- REGEX = re.compile(r'(.+PBXFileReference.+wrapper.pb-project.+)(path =
.+?;)(.*)(sourceTree.+;)(.+)')
-
- file_handle = fileinput.input(os.path.join(project_path, 'project.pbxproj'),
inplace=1)
- found = False
- for line in file_handle:
- if 'CordovaLib.xcodeproj' in line:
- m = REGEX.match(line)
- if m:
- found = True
- line = m.expand(r'\1path = "%s";\3sourceTree = "<group>";\5\n') %
subproject_path
- if 'name =' not in line:
- line = line.replace('path = ', 'name = CordovaLib.xcodeproj; path
= ')
- print line,
- file_handle.close()
-
- if not found:
- raise Exception('Sub-project entry not found in project file.')
- print('CordovaLib set to path: %s' % subproject_path)
-
-
-if __name__ == '__main__':
- main(sys.argv)
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org
For additional commands, e-mail: commits-h...@cordova.apache.org
