Skip to content

Commit 9f6b415

Browse files
shazronshazron
committed
Merge branch '135-xcode-project'
2 parents bf58b61 + 5d2166f commit 9f6b415

File tree

14 files changed

+318
-60
lines changed

14 files changed

+318
-60
lines changed

‎.gitignore

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
demo
2-
demo.app
3-
ios-deploy
4-
ios-deploy.dSYM
1+
build/*
52
/.DS_Store
63
*~

‎Makefile

Lines changed: 0 additions & 35 deletions
This file was deleted.

‎demo/.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
demo
2+
demo.app
3+
demo.dSYM
4+
/.DS_Store
5+
*~

‎Entitlements.plist renamed to ‎demo/Entitlements.plist

File renamed without changes.

‎Info.plist renamed to ‎demo/Info.plist

File renamed without changes.

‎demo/Makefile

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
IOS_SDK_VERSION = 9.0
2+
3+
IOS_CC = gcc -ObjC
4+
IOS_SDK = $(shell xcode-select --print-path)/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS$(IOS_SDK_VERSION).sdk
5+
6+
all: clean demo.app
7+
8+
demo.app: demo Info.plist
9+
mkdir -p demo.app
10+
cp demo demo.app/
11+
cp Info.plist ResourceRules.plist demo.app/
12+
codesign -f -s "iPhone Developer" --entitlements Entitlements.plist demo.app
13+
14+
demo: demo.c
15+
$(IOS_CC) -g -arch armv7 -isysroot $(IOS_SDK) -framework CoreFoundation -o demo demo.c
16+
17+
debug: all ios-deploy
18+
@../build/Release/ios-deploy --debug --bundle demo.app
19+
20+
clean:
21+
@rm -rf *.app demo demo.dSYM
22+
23+
ios-deploy:
24+
@xcodebuild -project ../ios-deploy.xcodeproj

‎ResourceRules.plist renamed to ‎demo/ResourceRules.plist

File renamed without changes.

‎demo.c renamed to ‎demo/demo.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ int main(int argc, const char* argv[]) {
66
printf("argv[%d] = %s\n", i, argv[i]);
77
}
88
return 0;
9-
}
9+
}

‎ios-deploy.xcodeproj/project.pbxproj

Lines changed: 275 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,275 @@
1+
// !$*UTF8*$!
2+
{
3+
archiveVersion = 1;
4+
classes = {
5+
};
6+
objectVersion = 46;
7+
objects = {
8+
9+
/* Begin PBXBuildFile section */
10+
7E70899C1B587DE4004D23AA /* ios-deploy.c in Sources */ = {isa = PBXBuildFile; fileRef = 7E7089991B587DE4004D23AA /* ios-deploy.c */; settings = {COMPILER_FLAGS = "-x objective-c -fno-objc-arc"; }; };
11+
7E70899E1B587F29004D23AA /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7E70899D1B587F29004D23AA /* CoreFoundation.framework */; };
12+
7E7089A01B58801E004D23AA /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7E70899F1B58801E004D23AA /* Foundation.framework */; };
13+
/* End PBXBuildFile section */
14+
15+
/* Begin PBXCopyFilesBuildPhase section */
16+
7E70898C1B587BF3004D23AA /* CopyFiles */ = {
17+
isa = PBXCopyFilesBuildPhase;
18+
buildActionMask = 2147483647;
19+
dstPath = /usr/share/man/man1/;
20+
dstSubfolderSpec = 0;
21+
files = (
22+
);
23+
runOnlyForDeploymentPostprocessing = 1;
24+
};
25+
/* End PBXCopyFilesBuildPhase section */
26+
27+
/* Begin PBXFileReference section */
28+
7E70898E1B587BF3004D23AA /* ios-deploy */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "ios-deploy"; sourceTree = BUILT_PRODUCTS_DIR; };
29+
7E7089991B587DE4004D23AA /* ios-deploy.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = "ios-deploy.c"; path = "src/ios-deploy.c"; sourceTree = SOURCE_ROOT; };
30+
7E70899A1B587DE4004D23AA /* errors.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = errors.h; path = src/errors.h; sourceTree = SOURCE_ROOT; };
31+
7E70899B1B587DE4004D23AA /* MobileDevice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MobileDevice.h; path = src/MobileDevice.h; sourceTree = SOURCE_ROOT; };
32+
7E70899D1B587F29004D23AA /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; };
33+
7E70899F1B58801E004D23AA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
34+
/* End PBXFileReference section */
35+
36+
/* Begin PBXFrameworksBuildPhase section */
37+
7E70898B1B587BF3004D23AA /* Frameworks */ = {
38+
isa = PBXFrameworksBuildPhase;
39+
buildActionMask = 2147483647;
40+
files = (
41+
7E7089A01B58801E004D23AA /* Foundation.framework in Frameworks */,
42+
7E70899E1B587F29004D23AA /* CoreFoundation.framework in Frameworks */,
43+
);
44+
runOnlyForDeploymentPostprocessing = 0;
45+
};
46+
/* End PBXFrameworksBuildPhase section */
47+
48+
/* Begin PBXGroup section */
49+
7E7089851B587BF3004D23AA = {
50+
isa = PBXGroup;
51+
children = (
52+
7E7089901B587BF3004D23AA /* ios-deploy */,
53+
7E7089A21B588219004D23AA /* Frameworks */,
54+
7E70898F1B587BF3004D23AA /* Products */,
55+
);
56+
sourceTree = "<group>";
57+
};
58+
7E70898F1B587BF3004D23AA /* Products */ = {
59+
isa = PBXGroup;
60+
children = (
61+
7E70898E1B587BF3004D23AA /* ios-deploy */,
62+
);
63+
name = Products;
64+
sourceTree = "<group>";
65+
};
66+
7E7089901B587BF3004D23AA /* ios-deploy */ = {
67+
isa = PBXGroup;
68+
children = (
69+
7E7089991B587DE4004D23AA /* ios-deploy.c */,
70+
7E70899A1B587DE4004D23AA /* errors.h */,
71+
7E70899B1B587DE4004D23AA /* MobileDevice.h */,
72+
);
73+
path = "ios-deploy";
74+
sourceTree = "<group>";
75+
};
76+
7E7089A21B588219004D23AA /* Frameworks */ = {
77+
isa = PBXGroup;
78+
children = (
79+
7E70899F1B58801E004D23AA /* Foundation.framework */,
80+
7E70899D1B587F29004D23AA /* CoreFoundation.framework */,
81+
);
82+
name = Frameworks;
83+
sourceTree = "<group>";
84+
};
85+
/* End PBXGroup section */
86+
87+
/* Begin PBXNativeTarget section */
88+
7E70898D1B587BF3004D23AA /* ios-deploy */ = {
89+
isa = PBXNativeTarget;
90+
buildConfigurationList = 7E7089951B587BF3004D23AA /* Build configuration list for PBXNativeTarget "ios-deploy" */;
91+
buildPhases = (
92+
7E70898A1B587BF3004D23AA /* Sources */,
93+
7E70898B1B587BF3004D23AA /* Frameworks */,
94+
7E70898C1B587BF3004D23AA /* CopyFiles */,
95+
);
96+
buildRules = (
97+
);
98+
dependencies = (
99+
);
100+
name = "ios-deploy";
101+
productName = "ios-deploy";
102+
productReference = 7E70898E1B587BF3004D23AA /* ios-deploy */;
103+
productType = "com.apple.product-type.tool";
104+
};
105+
/* End PBXNativeTarget section */
106+
107+
/* Begin PBXProject section */
108+
7E7089861B587BF3004D23AA /* Project object */ = {
109+
isa = PBXProject;
110+
attributes = {
111+
LastUpgradeCheck = 0710;
112+
ORGANIZATIONNAME = PhoneGap;
113+
TargetAttributes = {
114+
7E70898D1B587BF3004D23AA = {
115+
CreatedOnToolsVersion = 6.4;
116+
};
117+
};
118+
};
119+
buildConfigurationList = 7E7089891B587BF3004D23AA /* Build configuration list for PBXProject "ios-deploy" */;
120+
compatibilityVersion = "Xcode 3.2";
121+
developmentRegion = English;
122+
hasScannedForEncodings = 0;
123+
knownRegions = (
124+
en,
125+
Base,
126+
);
127+
mainGroup = 7E7089851B587BF3004D23AA;
128+
productRefGroup = 7E70898F1B587BF3004D23AA /* Products */;
129+
projectDirPath = "";
130+
projectRoot = "";
131+
targets = (
132+
7E70898D1B587BF3004D23AA /* ios-deploy */,
133+
);
134+
};
135+
/* End PBXProject section */
136+
137+
/* Begin PBXSourcesBuildPhase section */
138+
7E70898A1B587BF3004D23AA /* Sources */ = {
139+
isa = PBXSourcesBuildPhase;
140+
buildActionMask = 2147483647;
141+
files = (
142+
7E70899C1B587DE4004D23AA /* ios-deploy.c in Sources */,
143+
);
144+
runOnlyForDeploymentPostprocessing = 0;
145+
};
146+
/* End PBXSourcesBuildPhase section */
147+
148+
/* Begin XCBuildConfiguration section */
149+
7E7089931B587BF3004D23AA /* Debug */ = {
150+
isa = XCBuildConfiguration;
151+
buildSettings = {
152+
ALWAYS_SEARCH_USER_PATHS = NO;
153+
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
154+
CLANG_CXX_LIBRARY = "libc++";
155+
CLANG_ENABLE_MODULES = YES;
156+
CLANG_ENABLE_OBJC_ARC = YES;
157+
CLANG_WARN_BOOL_CONVERSION = YES;
158+
CLANG_WARN_CONSTANT_CONVERSION = YES;
159+
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
160+
CLANG_WARN_EMPTY_BODY = YES;
161+
CLANG_WARN_ENUM_CONVERSION = YES;
162+
CLANG_WARN_INT_CONVERSION = YES;
163+
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
164+
CLANG_WARN_UNREACHABLE_CODE = YES;
165+
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
166+
COPY_PHASE_STRIP = NO;
167+
DEBUG_INFORMATION_FORMAT = dwarf;
168+
ENABLE_STRICT_OBJC_MSGSEND = YES;
169+
ENABLE_TESTABILITY = YES;
170+
GCC_C_LANGUAGE_STANDARD = gnu99;
171+
GCC_DYNAMIC_NO_PIC = NO;
172+
GCC_NO_COMMON_BLOCKS = YES;
173+
GCC_OPTIMIZATION_LEVEL = 0;
174+
GCC_PREPROCESSOR_DEFINITIONS = (
175+
"DEBUG=1",
176+
"$(inherited)",
177+
);
178+
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
179+
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
180+
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
181+
GCC_WARN_UNDECLARED_SELECTOR = YES;
182+
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
183+
GCC_WARN_UNUSED_FUNCTION = YES;
184+
GCC_WARN_UNUSED_VARIABLE = YES;
185+
MACOSX_DEPLOYMENT_TARGET = 10.8;
186+
MTL_ENABLE_DEBUG_INFO = YES;
187+
ONLY_ACTIVE_ARCH = YES;
188+
OTHER_LDFLAGS = (
189+
"-framework",
190+
MobileDevice,
191+
"-F/System/Library/PrivateFrameworks",
192+
);
193+
SDKROOT = macosx;
194+
};
195+
name = Debug;
196+
};
197+
7E7089941B587BF3004D23AA /* Release */ = {
198+
isa = XCBuildConfiguration;
199+
buildSettings = {
200+
ALWAYS_SEARCH_USER_PATHS = NO;
201+
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
202+
CLANG_CXX_LIBRARY = "libc++";
203+
CLANG_ENABLE_MODULES = YES;
204+
CLANG_ENABLE_OBJC_ARC = YES;
205+
CLANG_WARN_BOOL_CONVERSION = YES;
206+
CLANG_WARN_CONSTANT_CONVERSION = YES;
207+
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
208+
CLANG_WARN_EMPTY_BODY = YES;
209+
CLANG_WARN_ENUM_CONVERSION = YES;
210+
CLANG_WARN_INT_CONVERSION = YES;
211+
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
212+
CLANG_WARN_UNREACHABLE_CODE = YES;
213+
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
214+
COPY_PHASE_STRIP = NO;
215+
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
216+
ENABLE_NS_ASSERTIONS = NO;
217+
ENABLE_STRICT_OBJC_MSGSEND = YES;
218+
GCC_C_LANGUAGE_STANDARD = gnu99;
219+
GCC_NO_COMMON_BLOCKS = YES;
220+
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
221+
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
222+
GCC_WARN_UNDECLARED_SELECTOR = YES;
223+
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
224+
GCC_WARN_UNUSED_FUNCTION = YES;
225+
GCC_WARN_UNUSED_VARIABLE = YES;
226+
MACOSX_DEPLOYMENT_TARGET = 10.8;
227+
MTL_ENABLE_DEBUG_INFO = NO;
228+
OTHER_LDFLAGS = (
229+
"-framework",
230+
MobileDevice,
231+
"-F/System/Library/PrivateFrameworks",
232+
);
233+
SDKROOT = macosx;
234+
};
235+
name = Release;
236+
};
237+
7E7089961B587BF3004D23AA /* Debug */ = {
238+
isa = XCBuildConfiguration;
239+
buildSettings = {
240+
PRODUCT_NAME = "$(TARGET_NAME)";
241+
};
242+
name = Debug;
243+
};
244+
7E7089971B587BF3004D23AA /* Release */ = {
245+
isa = XCBuildConfiguration;
246+
buildSettings = {
247+
PRODUCT_NAME = "$(TARGET_NAME)";
248+
};
249+
name = Release;
250+
};
251+
/* End XCBuildConfiguration section */
252+
253+
/* Begin XCConfigurationList section */
254+
7E7089891B587BF3004D23AA /* Build configuration list for PBXProject "ios-deploy" */ = {
255+
isa = XCConfigurationList;
256+
buildConfigurations = (
257+
7E7089931B587BF3004D23AA /* Debug */,
258+
7E7089941B587BF3004D23AA /* Release */,
259+
);
260+
defaultConfigurationIsVisible = 0;
261+
defaultConfigurationName = Release;
262+
};
263+
7E7089951B587BF3004D23AA /* Build configuration list for PBXNativeTarget "ios-deploy" */ = {
264+
isa = XCConfigurationList;
265+
buildConfigurations = (
266+
7E7089961B587BF3004D23AA /* Debug */,
267+
7E7089971B587BF3004D23AA /* Release */,
268+
);
269+
defaultConfigurationIsVisible = 0;
270+
defaultConfigurationName = Release;
271+
};
272+
/* End XCConfigurationList section */
273+
};
274+
rootObject = 7E7089861B587BF3004D23AA /* Project object */;
275+
}

‎package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
"description": "launch iOS apps iOS devices from the command line (Xcode 7)",
88
"main": "ios-deploy",
99
"scripts": {
10-
"preinstall": "./check_reqs.js && make ios-deploy"
10+
"preinstall": "./check_reqs.js && xcodebuild"
1111
},
12-
"bin": "./ios-deploy",
12+
"bin": "./build/Release/ios-deploy",
1313
"repository": {
1414
"type": "git",
1515
"url": "https://github.com/phonegap/ios-deploy"

‎resources/buildbox/build.sh

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎MobileDevice.h renamed to ‎src/MobileDevice.h

File renamed without changes.

‎errors.h renamed to ‎src/errors.h

File renamed without changes.

0 commit comments

Comments
 (0)