Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitda830bf

Browse files
authored
Merge pull request#6 from zayass/master
Make tests compilable on macos
2 parents3ac7b90 +b8ba354 commitda830bf

File tree

3 files changed

+149
-2
lines changed

3 files changed

+149
-2
lines changed
Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
#!/usr/bin/env python
2+
3+
from __future__importprint_function
4+
5+
importos
6+
importsubprocess
7+
importjson
8+
importglob
9+
importplatform
10+
11+
deftraverse(root_node,func):
12+
def_traverse(node,func,is_root=False):
13+
children=node["dependencies"]
14+
forsub_nodeinchildren:
15+
_traverse(sub_node,func)
16+
17+
ifnotis_root:
18+
func(node["path"])
19+
20+
_traverse(root_node,func,True)
21+
22+
defcopytree(src,dst,symlinks=False,ignore=None):
23+
print(subprocess.check_output(["rsync","-r"]+glob.glob(src)+ [dst]))
24+
25+
26+
defcopy_prebuilt(src,dst):
27+
copytree(os.path.join(src,"libs","*"),dst)
28+
copytree(os.path.join(src,"include","*"),dst)
29+
30+
31+
print(subprocess.check_output(['swift','package','resolve']))
32+
33+
json_output=subprocess.check_output(["swift","package","show-dependencies","--format","json"])
34+
root_node=json.loads(json_output)
35+
36+
root_path=root_node["path"]
37+
38+
ifplatform.system()=="Darwin":
39+
target="x86_64-apple-macosx10.10"
40+
else:
41+
target="x86_64-unknown-linux"
42+
43+
defcopy_prebuilt_task(module):
44+
dst=os.path.join(root_path,".build",target,"debug")
45+
46+
ifnotos.path.exists(dst):
47+
os.makedirs(dst)
48+
49+
copy_prebuilt(module,dst)
50+
51+
52+
traverse(root_node,copy_prebuilt_task)

‎src/main/scripts/create_scripts.sh

Lines changed: 43 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#
77

88
SWIFT_INSTALL="$(dirname"$PWD")"
9+
SRC_SCRIPTS_DIR="$PWD/$(dirname$0)"
910
UNAME=`uname`
1011

1112
SCRIPTS=~/.gradle/scripts
@@ -117,6 +118,7 @@ SWIFT_INSTALL="$SWIFT_INSTALL"
117118
export PATH="\$SWIFT_INSTALL/usr/bin:\$PATH"
118119
export SWIFT_EXEC=~/.gradle/scripts/swiftc-android.sh
119120
121+
~/.gradle/scripts/collect-dependencies.py
120122
swift build "\$@"
121123
122124
SCRIPT
@@ -127,6 +129,8 @@ cat <<SCRIPT >swiftc-android.sh &&
127129
# Substitutes in for swiftc to compile package and build Android sources
128130
#
129131
132+
PLATFORM=\$(uname)
133+
130134
SWIFT_INSTALL="$SWIFT_INSTALL"
131135
export PATH="\$SWIFT_INSTALL/usr/$UNAME:\$SWIFT_INSTALL/usr/bin:\$PATH"
132136
@@ -138,11 +142,38 @@ fi
138142
# remove whatever target SwiftPM has supplied
139143
ARGS=\$(echo "\$*" | sed -E "s@-target [^[:space:]]+ -sdk /[^[:space:]]* (-F /[^[:space:]]* )?@@")
140144
145+
if [[\$PLATFORM == "Darwin" ]]; then
146+
# xctest
147+
if [[ "\$*" =~ "-Xlinker -bundle" ]]; then
148+
xctest_bundle=\$(echo\$ARGS | grep -o\$(pwd)'[^[:space:]]*xctest')
149+
rm -rf\$xctest_bundle
150+
151+
modulemaps=\$(find .build/checkouts -name '*.modulemap' | sed 's@^@-I @' | sed 's@/module.modulemap\$@@')
152+
153+
build_dir=\$(echo "\$ARGS" | grep -o '\-L '\$(pwd)'/.build/[^[:space:]]*' | sed -E "s@-L @@")
154+
155+
ARGS=\$(echo "\$ARGS" | sed -E "s@-Xlinker -bundle@-emit-executable@")
156+
ARGS=\$(echo "\$ARGS" | sed -E "s@xctest[^[:space:]]*PackageTests@xctest@")
157+
158+
ARGS="\$ARGS\$modulemaps -I\$build_dir Tests/LinuxMain.swift"
159+
fi
160+
161+
# .dylib -> .so
162+
if [[ "\$ARGS" =~ "-emit-library" ]]; then
163+
ARGS=\$(echo "\$ARGS" | sed -E "s@\.dylib@\.so@")
164+
fi
165+
fi
166+
141167
# for compatability with V3 Package.swift for now
142168
if [[ "\$ARGS" =~ " -emit-executable " && "\$ARGS" =~ ".so " ]]; then
143169
ARGS=\$(echo "\$ARGS" | sed -E "s@ (-module-name [^[:space:]]+ )?-emit-executable @ -emit-library @")
144170
fi
145171
172+
# required since API21
173+
if [[ "\$ARGS" =~ "-emit-executable" ]]; then
174+
ARGS="\$ARGS -Xlinker -pie"
175+
fi
176+
146177
# compile using toolchain's swiftc with Android target
147178
swiftc -target armv7-none-linux-androideabi -sdk "\$SWIFT_INSTALL/ndk-android-21"\\
148179
-L "\$SWIFT_INSTALL/usr/$UNAME" -tools-directory "\$SWIFT_INSTALL/usr/$UNAME"\\
@@ -165,6 +196,16 @@ rm -f *Unittest*
165196
166197
SCRIPT
167198

168-
chmod +x {generate-swift,swift-build,swiftc-android,copy-libraries}.sh&&
169-
echo Created:$SCRIPTS/{generate-swift,swift-build,swiftc-android,copy-libraries}.sh&&
199+
cat<<SCRIPT >run-tests.sh &&
200+
#!/bin/bash
201+
202+
export SWIFT_INSTALL="$SWIFT_INSTALL"
203+
~/.gradle/scripts/run-tests.py
204+
SCRIPT
205+
206+
cp$SRC_SCRIPTS_DIR/collect-dependencies.py$SCRIPTS/&&
207+
cp$SRC_SCRIPTS_DIR/run-tests.py$SCRIPTS/&&
208+
209+
chmod +x {generate-swift,swift-build,swiftc-android,copy-libraries,run-tests}.sh&&
210+
echo Created:$SCRIPTS/{generate-swift,swift-build,swiftc-android,copy-libraries,run-tests}.sh&&
170211
echo

‎src/main/scripts/run-tests.py

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
#!/usr/bin/env python
2+
3+
from __future__importprint_function
4+
5+
importos
6+
importsys
7+
importsubprocess
8+
importjson
9+
importglob
10+
importplatform
11+
fromos.pathimportexpanduser
12+
13+
14+
SWIFT_INSTALL=os.getenv("SWIFT_INSTALL")
15+
16+
defextract_tests_package(json):
17+
returnjson["name"]+"PackageTests.xctest"
18+
19+
defpush(dst,name):
20+
adb_shell(["mkdir","-p",dst])
21+
22+
adb_push(dst,glob.glob(SWIFT_INSTALL+"/usr/lib/swift/android/*.so"))
23+
adb_push(dst,glob.glob(".build/debug/*.so"))
24+
adb_push(dst, [".build/debug/"+name])
25+
26+
defadb_push(dst,files):
27+
subprocess.call(["adb","push"]+files+ [dst])
28+
29+
defadb_shell(args):
30+
returnsubprocess.call(["adb","shell"]+args)
31+
32+
defexec_tests(folder,name):
33+
ld_path="LD_LIBRARY_PATH="+folder
34+
test_path=folder+"/"+name
35+
36+
returnadb_shell([ld_path,test_path]+sys.argv[1:])
37+
38+
39+
defrun(json):
40+
subprocess.call([expanduser("~/.gradle/scripts/swift-build.sh"),"--build-tests"])
41+
42+
name=extract_tests_package(package_json)
43+
folder="/data/local/tmp/"+name.split(".")[0]
44+
45+
push(folder,name)
46+
returnexec_tests(folder,name)
47+
48+
subprocess.call(["swift","package","resolve"])
49+
50+
package_dump=subprocess.check_output(["swift","package","dump-package"])
51+
package_json=json.loads(package_dump)
52+
53+
return_code=run(package_json)
54+
sys.exit(return_code)

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp