66#
77
88SWIFT_INSTALL=" $( dirname" $PWD " ) "
9- SRC_SCRIPTS_DIR=" $( realpath$( dirname$0 ) ) "
109UNAME=` uname`
1110
1211SCRIPTS=~ /.gradle/scripts
@@ -118,7 +117,6 @@ SWIFT_INSTALL="$SWIFT_INSTALL"
118117export PATH="\$ SWIFT_INSTALL/usr/bin:\$ PATH"
119118export SWIFT_EXEC=~/.gradle/scripts/swiftc-android.sh
120119
121- ~/.gradle/scripts/collect-dependencies.py
122120swift build "\$ @"
123121
124122SCRIPT
@@ -129,8 +127,6 @@ cat <<SCRIPT >swiftc-android.sh &&
129127# Substitutes in for swiftc to compile package and build Android sources
130128#
131129
132- PLATFORM=\$ (uname)
133-
134130SWIFT_INSTALL="$SWIFT_INSTALL "
135131export PATH="\$ SWIFT_INSTALL/usr/$UNAME :\$ SWIFT_INSTALL/usr/bin:\$ PATH"
136132
142138# remove whatever target SwiftPM has supplied
143139ARGS=\$ (echo "\$ *" | sed -E "s@-target [^[:space:]]+ -sdk /[^[:space:]]* (-F /[^[:space:]]* )?@@")
144140
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-
167- # required since API21
168- if [[ "\$ ARGS" =~ "-emit-executable" ]]; then
169- LINKER_ARGS="-Xlinker -pie"
170- fi
171-
141+ # for compatability with V3 Package.swift for now
172142if [[ "\$ ARGS" =~ " -emit-executable " && "\$ ARGS" =~ ".so " ]]; then
173143 ARGS=\$ (echo "\$ ARGS" | sed -E "s@ (-module-name [^[:space:]]+ )?-emit-executable @ -emit-library @")
174144fi
@@ -195,16 +165,6 @@ rm -f *Unittest*
195165
196166SCRIPT
197167
198- cat<< SCRIPT >run-tests.sh &&
199- #!/bin/bash
200-
201- export SWIFT_INSTALL="$SWIFT_INSTALL "
202- ~/.gradle/scripts/run-tests.py
203- SCRIPT
204-
205- cp$SRC_SCRIPTS_DIR /collect-dependencies.py$SCRIPTS /&&
206- cp$SRC_SCRIPTS_DIR /run-tests.py$SCRIPTS /&&
207-
208- chmod +x {generate-swift,swift-build,swiftc-android,copy-libraries,run-tests}.sh&&
209- echo Created:$SCRIPTS /{generate-swift,swift-build,swiftc-android,copy-libraries,run-tests}.sh&&
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&&
210170echo