Skip to content

Commit 2ef3ebc

Browse files
buildbuild
build
authored and
build
committed
Update build script for iOS
1 parent 28fb14a commit 2ef3ebc

File tree

7 files changed

+97
-46
lines changed

7 files changed

+97
-46
lines changed

‎build_ios.sh

+18-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,23 @@
1+
#!/bin/sh
2+
3+
export QT_DIR=/Developer/Qt4iOS/qt-everywhere-ios-5.1.0
4+
export PATH=$QT_DIR/bin:$PATH
15

26
python generate_wdversion.py
37

4-
#export GYP_DEFINES="OS=ios"
5-
#export GYP_GENERATOR_FLAGS="xcode_project_version=3.2"
8+
gyp --depth . -G output_dir=. -D platform=desktop -D mode=debug -f xcode -D OS=ios --generator-output=out/ wd.gyp
69

7-
#export GYP_DEFINES="SDK_ROOT=/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator5.0.sdk"
10+
if [ "$1" == "-all" ]
11+
then
812

9-
gyp --depth . -G output_dir=. -D platform=desktop -D mode=debug -f xcode -D OS=ios --generator-output=out/ wd.gyp
10-
#gyp --depth . -G output_dir=. -D platform=desktop -D mode=release -D OS=linux --generator-output=out/ wd.gyp
11-
#xcodebuild -project out/wd.xcodeproj -arch i386 -sdk iphonesimulator
13+
xcodebuild -project out/wd_test.xcodeproj -target test_ios_WD -arch i386 -sdk iphonesimulator clean build
14+
15+
cd ./platform/ios/wd
16+
qmake wd.pro -r -spec unsupported/macx-iossimulator-clang CONFIG+=x86
17+
make -release
18+
19+
cd ../wd_test
20+
21+
xcodebuild -project wd_test.xcodeproj -alltargets -arch i386 -sdk iphonesimulator -configuration Debug ONLY_ACTIVE_ARCH=NO VALID_ARCHS="armv7 i386" clean build
22+
23+
fi

‎platform/ios/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,5 @@ build/
2626
DerivedData/
2727
build*/
2828

29+
Makefile
2930

‎platform/ios/run_ios.sh

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/Applications/iPhone\ Simulator.app/Contents/MacOS/iPhone\ Simulator -SimulateApplication /Users/build/GIT/wd_ios/platform/ios/wd_test/build/Debug-iphonesimulator/wd_test.app/wd_test

‎platform/ios/wd/.gitignore

-2
This file was deleted.

‎platform/ios/wd/wd.pro

+9-3
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,15 @@ HEADERS += \
4545
INCLUDEPATH += ../../../inc
4646
INCLUDEPATH += ../../../mocs
4747

48-
49-
ios: include($$[QT_HOST_DATA/get]/mkspecs/common/ios/qiosapp.conf)
50-
5148
FORMS += \
5249
../../../src/Test/ElementSelectingTest.ui \
5350
../../../src/Test/ClickScrollingTest.ui
51+
52+
53+
DESTDIR = build
54+
OBJECTS_DIR = build
55+
MOC_DIR = build
56+
57+
ios: include($$[QT_HOST_DATA/get]/mkspecs/common/ios/qiosapp.conf)
58+
59+

‎platform/ios/wd_test/wd_test.xcodeproj/project.pbxproj

+62-35
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@
2929
1627472317D4743D000D26ED /* libQt5Widgets.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1627471A17D4743D000D26ED /* libQt5Widgets.a */; };
3030
1627472417D4743D000D26ED /* libQt5Xml.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1627471B17D4743D000D26ED /* libQt5Xml.a */; };
3131
1627473017D47528000D26ED /* libqios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1627472F17D47528000D26ED /* libqios.a */; };
32-
16B7307E17D5E8A000D60850 /* libwd.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 16B7307D17D5E8A000D60850 /* libwd.a */; };
33-
16E8BAD817D4A0C2005594FD /* libchromium_base.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 16E8BAD417D4A0C2005594FD /* libchromium_base.a */; };
34-
16E8BAD917D4A0C2005594FD /* libtest_widgets.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 16E8BAD517D4A0C2005594FD /* libtest_widgets.a */; };
35-
16E8BADA17D4A0C2005594FD /* libWebDriver_core.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 16E8BAD617D4A0C2005594FD /* libWebDriver_core.a */; };
36-
16E8BADB17D4A0C2005594FD /* libWebDriver_extension_qt_base.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 16E8BAD717D4A0C2005594FD /* libWebDriver_extension_qt_base.a */; };
32+
16357D4F17D60C71006234D1 /* libwd.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 16357D4E17D60C71006234D1 /* libwd.a */; };
33+
16357D5417D60C92006234D1 /* libchromium_base.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 16357D5017D60C91006234D1 /* libchromium_base.a */; };
34+
16357D5517D60C92006234D1 /* libtest_widgets.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 16357D5117D60C91006234D1 /* libtest_widgets.a */; };
35+
16357D5617D60C92006234D1 /* libWebDriver_core.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 16357D5217D60C91006234D1 /* libWebDriver_core.a */; };
36+
16357D5717D60C92006234D1 /* libWebDriver_extension_qt_base.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 16357D5317D60C91006234D1 /* libWebDriver_extension_qt_base.a */; };
3737
/* End PBXBuildFile section */
3838

3939
/* Begin PBXFileReference section */
@@ -62,23 +62,23 @@
6262
1627471A17D4743D000D26ED /* libQt5Widgets.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libQt5Widgets.a; path = "/Developer/Qt4iOS/qt-everywhere-ios-5.1.0/lib/libQt5Widgets.a"; sourceTree = "<absolute>"; };
6363
1627471B17D4743D000D26ED /* libQt5Xml.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libQt5Xml.a; path = "/Developer/Qt4iOS/qt-everywhere-ios-5.1.0/lib/libQt5Xml.a"; sourceTree = "<absolute>"; };
6464
1627472F17D47528000D26ED /* libqios.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libqios.a; path = "/Developer/Qt4iOS/qt-everywhere-ios-5.1.0/plugins/platforms/libqios.a"; sourceTree = "<absolute>"; };
65-
16B7307D17D5E8A000D60850 /* libwd.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libwd.a; path = "../build-wd-Qt4iOS2-Release/libwd.a"; sourceTree = "<group>"; };
66-
16E8BAD417D4A0C2005594FD /* libchromium_base.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libchromium_base.a; path = "../../../out/DerivedData/wd_test/Build/Products/Default-iphonesimulator/libchromium_base.a"; sourceTree = "<group>"; };
67-
16E8BAD517D4A0C2005594FD /* libtest_widgets.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libtest_widgets.a; path = "../../../out/DerivedData/wd_test/Build/Products/Default-iphonesimulator/libtest_widgets.a"; sourceTree = "<group>"; };
68-
16E8BAD617D4A0C2005594FD /* libWebDriver_core.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libWebDriver_core.a; path = "../../../out/DerivedData/wd_test/Build/Products/Default-iphonesimulator/libWebDriver_core.a"; sourceTree = "<group>"; };
69-
16E8BAD717D4A0C2005594FD /* libWebDriver_extension_qt_base.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libWebDriver_extension_qt_base.a; path = "../../../out/DerivedData/wd_test/Build/Products/Default-iphonesimulator/libWebDriver_extension_qt_base.a"; sourceTree = "<group>"; };
65+
16357D4E17D60C71006234D1 /* libwd.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libwd.a; path = ../../wd/build/libwd.a; sourceTree = "<group>"; };
66+
16357D5017D60C91006234D1 /* libchromium_base.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libchromium_base.a; path = "../../../../build/Default-iphonesimulator/libchromium_base.a"; sourceTree = "<group>"; };
67+
16357D5117D60C91006234D1 /* libtest_widgets.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libtest_widgets.a; path = "../../../../build/Default-iphonesimulator/libtest_widgets.a"; sourceTree = "<group>"; };
68+
16357D5217D60C91006234D1 /* libWebDriver_core.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libWebDriver_core.a; path = "../../../../build/Default-iphonesimulator/libWebDriver_core.a"; sourceTree = "<group>"; };
69+
16357D5317D60C91006234D1 /* libWebDriver_extension_qt_base.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libWebDriver_extension_qt_base.a; path = "../../../../build/Default-iphonesimulator/libWebDriver_extension_qt_base.a"; sourceTree = "<group>"; };
7070
/* End PBXFileReference section */
7171

7272
/* Begin PBXFrameworksBuildPhase section */
7373
162745D717D47310000D26ED /* Frameworks */ = {
7474
isa = PBXFrameworksBuildPhase;
7575
buildActionMask = 2147483647;
7676
files = (
77-
16B7307E17D5E8A000D60850 /* libwd.a in Frameworks */,
78-
16E8BAD817D4A0C2005594FD /* libchromium_base.a in Frameworks */,
79-
16E8BAD917D4A0C2005594FD /* libtest_widgets.a in Frameworks */,
80-
16E8BADA17D4A0C2005594FD /* libWebDriver_core.a in Frameworks */,
81-
16E8BADB17D4A0C2005594FD /* libWebDriver_extension_qt_base.a in Frameworks */,
77+
16357D5417D60C92006234D1 /* libchromium_base.a in Frameworks */,
78+
16357D5517D60C92006234D1 /* libtest_widgets.a in Frameworks */,
79+
16357D5617D60C92006234D1 /* libWebDriver_core.a in Frameworks */,
80+
16357D5717D60C92006234D1 /* libWebDriver_extension_qt_base.a in Frameworks */,
81+
16357D4F17D60C71006234D1 /* libwd.a in Frameworks */,
8282
1627473017D47528000D26ED /* libqios.a in Frameworks */,
8383
1627471C17D4743D000D26ED /* libQt5Core.a in Frameworks */,
8484
1627471D17D4743D000D26ED /* libQt5Gui.a in Frameworks */,
@@ -123,21 +123,6 @@
123123
162745DC17D47310000D26ED /* Frameworks */ = {
124124
isa = PBXGroup;
125125
children = (
126-
16B7307D17D5E8A000D60850 /* libwd.a */,
127-
16E8BAD417D4A0C2005594FD /* libchromium_base.a */,
128-
16E8BAD517D4A0C2005594FD /* libtest_widgets.a */,
129-
16E8BAD617D4A0C2005594FD /* libWebDriver_core.a */,
130-
16E8BAD717D4A0C2005594FD /* libWebDriver_extension_qt_base.a */,
131-
1627472F17D47528000D26ED /* libqios.a */,
132-
1627471317D4743D000D26ED /* libQt5Core.a */,
133-
1627471417D4743D000D26ED /* libQt5Gui.a */,
134-
1627471517D4743D000D26ED /* libQt5Multimedia.a */,
135-
1627471617D4743D000D26ED /* libQt5MultimediaWidgets.a */,
136-
1627471717D4743D000D26ED /* libQt5Network.a */,
137-
1627471817D4743D000D26ED /* libQt5OpenGL.a */,
138-
1627471917D4743D000D26ED /* libQt5PlatformSupport.a */,
139-
1627471A17D4743D000D26ED /* libQt5Widgets.a */,
140-
1627471B17D4743D000D26ED /* libQt5Xml.a */,
141126
162745FE17D473F0000D26ED /* libz.dylib */,
142127
162745FC17D473F0000D26ED /* AudioToolbox.framework */,
143128
162745FD17D473F0000D26ED /* CoreText.framework */,
@@ -153,6 +138,9 @@
153138
162745E317D47310000D26ED /* wd_test */ = {
154139
isa = PBXGroup;
155140
children = (
141+
16357D5A17D60D0C006234D1 /* QT_lib */,
142+
16357D5917D60CEC006234D1 /* WD_test_lib */,
143+
16357D5817D60CA6006234D1 /* WD_lib */,
156144
162745E417D47310000D26ED /* Supporting Files */,
157145
);
158146
path = wd_test;
@@ -171,6 +159,42 @@
171159
name = "Supporting Files";
172160
sourceTree = "<group>";
173161
};
162+
16357D5817D60CA6006234D1 /* WD_lib */ = {
163+
isa = PBXGroup;
164+
children = (
165+
16357D5017D60C91006234D1 /* libchromium_base.a */,
166+
16357D5117D60C91006234D1 /* libtest_widgets.a */,
167+
16357D5217D60C91006234D1 /* libWebDriver_core.a */,
168+
16357D5317D60C91006234D1 /* libWebDriver_extension_qt_base.a */,
169+
);
170+
name = WD_lib;
171+
sourceTree = "<group>";
172+
};
173+
16357D5917D60CEC006234D1 /* WD_test_lib */ = {
174+
isa = PBXGroup;
175+
children = (
176+
16357D4E17D60C71006234D1 /* libwd.a */,
177+
);
178+
name = WD_test_lib;
179+
sourceTree = "<group>";
180+
};
181+
16357D5A17D60D0C006234D1 /* QT_lib */ = {
182+
isa = PBXGroup;
183+
children = (
184+
1627472F17D47528000D26ED /* libqios.a */,
185+
1627471317D4743D000D26ED /* libQt5Core.a */,
186+
1627471417D4743D000D26ED /* libQt5Gui.a */,
187+
1627471517D4743D000D26ED /* libQt5Multimedia.a */,
188+
1627471617D4743D000D26ED /* libQt5MultimediaWidgets.a */,
189+
1627471717D4743D000D26ED /* libQt5Network.a */,
190+
1627471817D4743D000D26ED /* libQt5OpenGL.a */,
191+
1627471917D4743D000D26ED /* libQt5PlatformSupport.a */,
192+
1627471A17D4743D000D26ED /* libQt5Widgets.a */,
193+
1627471B17D4743D000D26ED /* libQt5Xml.a */,
194+
);
195+
name = QT_lib;
196+
sourceTree = "<group>";
197+
};
174198
/* End PBXGroup section */
175199

176200
/* Begin PBXNativeTarget section */
@@ -267,9 +291,10 @@
267291
GCC_WARN_UNINITIALIZED_AUTOS = YES;
268292
GCC_WARN_UNUSED_VARIABLE = YES;
269293
IPHONEOS_DEPLOYMENT_TARGET = 6.1;
270-
ONLY_ACTIVE_ARCH = YES;
294+
ONLY_ACTIVE_ARCH = NO;
271295
SDKROOT = iphoneos;
272296
TARGETED_DEVICE_FAMILY = "1,2";
297+
VALID_ARCHS = armv7;
273298
};
274299
name = Debug;
275300
};
@@ -291,10 +316,12 @@
291316
GCC_WARN_UNINITIALIZED_AUTOS = YES;
292317
GCC_WARN_UNUSED_VARIABLE = YES;
293318
IPHONEOS_DEPLOYMENT_TARGET = 6.1;
319+
ONLY_ACTIVE_ARCH = NO;
294320
OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
295321
SDKROOT = iphoneos;
296322
TARGETED_DEVICE_FAMILY = "1,2";
297323
VALIDATE_PRODUCT = YES;
324+
VALID_ARCHS = armv7;
298325
};
299326
name = Release;
300327
};
@@ -310,8 +337,8 @@
310337
"$(inherited)",
311338
"\"/Developer/Qt4iOS/qt-everywhere-ios-5.1.0/lib\"",
312339
"\"/Developer/Qt4iOS/qt-everywhere-ios-5.1.0/plugins/platforms\"",
313-
"\"$(SRCROOT)/../../../out/DerivedData/wd_test/Build/Products/Default-iphonesimulator\"",
314-
"\"$(SRCROOT)/../build-wd-Qt4iOS2-Release\"",
340+
"\"$(SRCROOT)/../wd/build\"",
341+
"\"$(SRCROOT)/../../../build/Default-iphonesimulator\"",
315342
);
316343
ONLY_ACTIVE_ARCH = NO;
317344
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -332,8 +359,8 @@
332359
"$(inherited)",
333360
"\"/Developer/Qt4iOS/qt-everywhere-ios-5.1.0/lib\"",
334361
"\"/Developer/Qt4iOS/qt-everywhere-ios-5.1.0/plugins/platforms\"",
335-
"\"$(SRCROOT)/../../../out/DerivedData/wd_test/Build/Products/Default-iphonesimulator\"",
336-
"\"$(SRCROOT)/../build-wd-Qt4iOS2-Release\"",
362+
"\"$(SRCROOT)/../wd/build\"",
363+
"\"$(SRCROOT)/../../../build/Default-iphonesimulator\"",
337364
);
338365
ONLY_ACTIVE_ARCH = NO;
339366
PRODUCT_NAME = "$(TARGET_NAME)";

‎platform/ios/wd_test/wd_test/wd_test-Info.plist

+6
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,18 @@
2222
<string>????</string>
2323
<key>CFBundleVersion</key>
2424
<string>1.0</string>
25+
<key>LSApplicationCategoryType</key>
26+
<string></string>
2527
<key>LSRequiresIPhoneOS</key>
2628
<true/>
29+
<key>UIApplicationExitsOnSuspend</key>
30+
<true/>
2731
<key>UIRequiredDeviceCapabilities</key>
2832
<array>
2933
<string>armv7</string>
3034
</array>
35+
<key>UIStatusBarHidden</key>
36+
<false/>
3137
<key>UISupportedInterfaceOrientations</key>
3238
<array>
3339
<string>UIInterfaceOrientationPortrait</string>

0 commit comments

Comments
 (0)