From b85cb8520578e7c3cd9ddb407b1eb3b85194f507 Mon Sep 17 00:00:00 2001
From: Oscar Bailey <oscarbailey@xmos.com>
Date: Tue, 27 Oct 2020 11:28:55 +0000
Subject: [PATCH] xmosdfu now compiles to bin/; Add more compile tests to
 Jenkinsfile

---
 Jenkinsfile                           | 36 +++++++++++++++++++++++++++
 lib_xua/host/xmosdfu/Makefile.Linux32 |  3 ++-
 lib_xua/host/xmosdfu/Makefile.Linux64 |  3 ++-
 lib_xua/host/xmosdfu/Makefile.OSX32   |  3 ++-
 lib_xua/host/xmosdfu/Makefile.OSX64   |  3 ++-
 lib_xua/host/xmosdfu/Makefile.Pi      |  3 ++-
 6 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 7be26239..dc391fa8 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -84,6 +84,42 @@ pipeline {
             }
           }
         }
+        stage('Build Pi host app') {
+          agent {
+            label 'pi'
+          }
+          steps {
+            dir("${REPO}") {
+              checkout scm
+              dir("${REPO}/host/xmosdfu") {
+                sh 'make -f Makefile.Pi'
+              }
+            }
+          }
+          post {
+            cleanup {
+              xcoreCleanSandbox()
+            }
+          }
+        }
+        stage('Build Windows host app') {
+          agent {
+            label 'x86_64&&windows'
+          }
+          steps {
+            dir("${REPO}") {
+              checkout scm
+              dir("${REPO}/host/xmosdfu") {
+                runVS('nmake /f Makefile.Win32')
+              }
+            }
+          }
+          post {
+            cleanup {
+              xcoreCleanSandbox()
+            }
+          }
+        }
       }
     }
     stage('Update') {
diff --git a/lib_xua/host/xmosdfu/Makefile.Linux32 b/lib_xua/host/xmosdfu/Makefile.Linux32
index 3800d4ab..891d1a57 100644
--- a/lib_xua/host/xmosdfu/Makefile.Linux32
+++ b/lib_xua/host/xmosdfu/Makefile.Linux32
@@ -1,2 +1,3 @@
 all:
-	g++ -m32 -Wall -g -o xmosdfu xmosdfu.cpp -Ilibusb/Linux32 -lusb-1.0
+	mkdir -p bin
+	g++ -m32 -Wall -g -o bin/xmosdfu xmosdfu.cpp -Ilibusb/Linux32 -lusb-1.0
diff --git a/lib_xua/host/xmosdfu/Makefile.Linux64 b/lib_xua/host/xmosdfu/Makefile.Linux64
index dad6c9d8..e9ce426a 100644
--- a/lib_xua/host/xmosdfu/Makefile.Linux64
+++ b/lib_xua/host/xmosdfu/Makefile.Linux64
@@ -1,2 +1,3 @@
 all:
-	g++ -Wall -g -o xmosdfu xmosdfu.cpp -Ilibusb/Linux32 -lusb-1.0
+	mkdir -p bin
+	g++ -Wall -g -o bin/xmosdfu xmosdfu.cpp -Ilibusb/Linux32 -lusb-1.0
diff --git a/lib_xua/host/xmosdfu/Makefile.OSX32 b/lib_xua/host/xmosdfu/Makefile.OSX32
index a9c738a6..0ad48b0d 100644
--- a/lib_xua/host/xmosdfu/Makefile.OSX32
+++ b/lib_xua/host/xmosdfu/Makefile.OSX32
@@ -1,2 +1,3 @@
 all:
-	g++ -g -o xmosdfu xmosdfu.cpp -Ilibusb/OSX32 libusb/OSX32/libusb-1.0.0.dylib -m32 -Wall
+	mkdir -p bin
+	g++ -g -o bin/xmosdfu xmosdfu.cpp -Ilibusb/OSX32 libusb/OSX32/libusb-1.0.0.dylib -m32 -Wall
diff --git a/lib_xua/host/xmosdfu/Makefile.OSX64 b/lib_xua/host/xmosdfu/Makefile.OSX64
index 07966069..54860178 100644
--- a/lib_xua/host/xmosdfu/Makefile.OSX64
+++ b/lib_xua/host/xmosdfu/Makefile.OSX64
@@ -1,2 +1,3 @@
 all:
-	g++ -g -o xmosdfu xmosdfu.cpp -Ilibusb/OSX64 libusb/OSX64/libusb-1.0.0.dylib -Wall
+	mkdir -p bin
+	g++ -g -o bin/xmosdfu xmosdfu.cpp -Ilibusb/OSX64 libusb/OSX64/libusb-1.0.0.dylib -Wall
diff --git a/lib_xua/host/xmosdfu/Makefile.Pi b/lib_xua/host/xmosdfu/Makefile.Pi
index 6141746e..6996caa0 100644
--- a/lib_xua/host/xmosdfu/Makefile.Pi
+++ b/lib_xua/host/xmosdfu/Makefile.Pi
@@ -5,4 +5,5 @@
 # vendor and product IDs
 
 xmosdfu: xmosdfu.cpp
-	g++ -D_GNU_SOURCE -Wall -g -o xmosdfu -Ilibusb/Rasp -lusb-1.0 -x c xmosdfu.cpp -std=c99
+	mkdir -p bin
+	g++ -D_GNU_SOURCE -Wall -g -o bin/xmosdfu -Ilibusb/Rasp -lusb-1.0 -x c xmosdfu.cpp -std=c99