Merge branch 'windows_fixes' into 'master'

Disable windows swift generation See merge request vato007/picar!2
2020-05-19 09:16:28 +00:00
parent e7977d47eb a7fdbf3f6e
commit 7777d1b73f
3 changed files with 16 additions and 10 deletions
--- a/car/build.gradle
+++ b/car/build.gradle
@@ -16,7 +16,8 @@ task copyPythonCode(type: Copy, dependsOn: configurations.python){
 }

 task build(type: Exec, dependsOn: copyPythonCode) {
-    commandLine 'python3', 'setup.py', 'bdist_wheel'
+    executable 'python3'
+    args 'setup.py', 'bdist_wheel'
 }

 task clean {
--- a/car/requirements.txt
+++ b/car/requirements.txt
@@ -5,4 +5,5 @@ paho-mqtt
 u-msgpack-python
 grpcio-tools
 rplidar
-pyzmq
+pyzmq
+wheel