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

Commitcb1b294

Browse files
committed
Merge branch 'incoming'
2 parentse691733 +cdd4489 commitcb1b294

File tree

3 files changed

+158
-10
lines changed

3 files changed

+158
-10
lines changed
Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
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+
src_files=glob.glob(src)
24+
25+
iflen(src_files)==0:
26+
return
27+
28+
subprocess.call(["rsync","-r"]+src_files+ [dst])
29+
30+
31+
defcopy_prebuilt(src,dst):
32+
copytree(os.path.join(src,"libs","*"),dst)
33+
copytree(os.path.join(src,"include","*"),dst)
34+
35+
36+
print(subprocess.check_output(['swift','package','resolve']))
37+
38+
json_output=subprocess.check_output(["swift","package","show-dependencies","--format","json"])
39+
root_node=json.loads(json_output)
40+
41+
root_path=root_node["path"]
42+
43+
ifplatform.system()=="Darwin":
44+
target="x86_64-apple-macosx10.10"
45+
else:
46+
target="x86_64-unknown-linux"
47+
48+
defcopy_prebuilt_task(module):
49+
dst=os.path.join(root_path,".build",target,"debug")
50+
51+
ifnotos.path.exists(dst):
52+
os.makedirs(dst)
53+
54+
copy_prebuilt(module,dst)
55+
56+
57+
traverse(root_node,copy_prebuilt_task)

‎src/main/scripts/create_scripts.sh

Lines changed: 46 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@
55
# gradle/src/main/groovy/net/zhuoweizhang/swiftandroid/SwiftAndroidPlugin.groovy
66
#
77

8+
export ANDROID_HOME="${ANDROID_HOME?-Please export ANDROID_HOME}"
9+
export JAVA_HOME="${JAVA_HOME?-Please export JAVA_HOME}"
10+
811
SWIFT_INSTALL="$(dirname"$PWD")"
9-
UNAME=`uname`
12+
UNAME="$(uname)"
1013

1114
SCRIPTS=~/.gradle/scripts
1215

13-
export JAVA_HOME="${JAVA_HOME?-Please export JAVA_HOME}"
14-
1516
cat<<DOC &&
1617
1718
Running:$SWIFT_INSTALL/swift-android-gradle/$0
@@ -117,6 +118,9 @@ SWIFT_INSTALL="$SWIFT_INSTALL"
117118
export PATH="\$SWIFT_INSTALL/usr/bin:\$PATH"
118119
export SWIFT_EXEC=~/.gradle/scripts/swiftc-android.sh
119120
121+
# Uncomment if you would like to work with packages containing prebuilt binaries
122+
#"\$SWIFT_INSTALL"/swift-android-gradle/src/main/scripts/collect-dependencies.py
123+
120124
swift build "\$@"
121125
122126
SCRIPT
@@ -138,11 +142,33 @@ fi
138142
# remove whatever target SwiftPM has supplied
139143
ARGS=\$(echo "\$*" | sed -E "s@-target [^[:space:]]+ -sdk /[^[:space:]]* (-F /[^[:space:]]* )?@@")
140144
141-
# for compatability with V3 Package.swift for now
142-
if [[ "\$ARGS" =~ " -emit-executable " && "\$ARGS" =~ ".so " ]]; then
143-
ARGS=\$(echo "\$ARGS" | sed -E "s@ (-module-name [^[:space:]]+ )?-emit-executable @ -emit-library @")
145+
if [[ "$UNAME" == "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
144165
fi
145166
167+
# for compatability with V3 Package.swift for now
168+
#if [[ "\$ARGS" =~ " -emit-executable " && "\$ARGS" =~ ".so " ]]; then
169+
# ARGS=\$(echo "\$ARGS" | sed -E "s@ (-module-name [^[:space:]]+ )?-emit-executable @ -emit-library @")
170+
#fi
171+
146172
# compile using toolchain's swiftc with Android target
147173
swiftc -target armv7-none-linux-androideabi -sdk "\$SWIFT_INSTALL/ndk-android-21"\\
148174
-L "\$SWIFT_INSTALL/usr/$UNAME" -tools-directory "\$SWIFT_INSTALL/usr/$UNAME"\\
@@ -160,11 +186,21 @@ DESTINATION="\$1"
160186
SWIFT_INSTALL="$SWIFT_INSTALL"
161187
162188
mkdir -p "\$DESTINATION" && cd "\$DESTINATION" &&
163-
rsync -u "\$SWIFT_INSTALL"/usr/lib/swift/android/*.so . &&
164-
rm -f *Unittest*
189+
rsync -u "\$SWIFT_INSTALL"/usr/lib/swift/android/*.so .
190+
191+
SCRIPT
192+
193+
cat<<SCRIPT >run-tests.sh &&
194+
#!/bin/bash
195+
#
196+
# Builds test bundles and pushes them to the device and runs them
197+
#
198+
199+
export SWIFT_INSTALL="$SWIFT_INSTALL"
200+
"\$SWIFT_INSTALL"/swift-android-gradle/src/main/scripts/run-tests.py
165201
166202
SCRIPT
167203

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&&
204+
chmod +x {generate-swift,swift-build,swiftc-android,copy-libraries,run-tests}.sh&&
205+
echo Created:$SCRIPTS/{generate-swift,swift-build,swiftc-android,copy-libraries,run-tests}.sh&&
170206
echo

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

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
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+
forfinfiles:
28+
subprocess.call(["adb","push",f,dst])
29+
30+
defadb_shell(args):
31+
returnsubprocess.call(["adb","shell"]+args)
32+
33+
defexec_tests(folder,name):
34+
ld_path="LD_LIBRARY_PATH="+folder
35+
test_path=folder+"/"+name
36+
37+
returnadb_shell([ld_path,test_path]+sys.argv[1:])
38+
39+
40+
defrun(json):
41+
subprocess.call([expanduser("~/.gradle/scripts/swift-build.sh"),"--build-tests"])
42+
43+
name=extract_tests_package(package_json)
44+
folder="/data/local/tmp/"+name.split(".")[0]
45+
46+
push(folder,name)
47+
returnexec_tests(folder,name)
48+
49+
subprocess.call(["swift","package","resolve"])
50+
51+
package_dump=subprocess.check_output(["swift","package","dump-package"])
52+
package_json=json.loads(package_dump)
53+
54+
return_code=run(package_json)
55+
sys.exit(return_code)

0 commit comments

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