# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1531749949 0
# Node ID c8ce098ecc08e9c736806faa484d6f1fd3a2ca0f
# Parent  0b956eea0df337dc2648b2403deac9616d357cbd
mxe-octave: update build rules

explicitly execute make prerequisites before normal build

build both nsis-installer and 7z-dist

diff -r 0b956eea0df3 -r c8ce098ecc08 master.cfg
--- a/master.cfg	Fri Jul 13 04:44:03 2018 +0000
+++ b/master.cfg	Mon Jul 16 14:05:49 2018 +0000
@@ -672,6 +672,9 @@
   factory.addStep (mk_mxe_octave_configure_step (nice = nice, branch = branch,
                                                  opts = configure_opts))
 
+  factory.addStep (mk_mxe_octave_compile_step (nice = nice, jobs = jobs,
+                                               opts = "prerequisites"))
+
   if branch != "release":
     ## Create a tarball file from an hg checkout, then build from that.
     ## This also builds all dependencies for Octave, so it can take a
@@ -753,42 +756,49 @@
 
 c["builders"].append (BuilderConfig (name = "w32-on-debian",
                                      workernames = ["jwe-debian-x86_64-3"],
-                                     factory = mk_w32_factory (19, 8, "default", "nsis-installer")))
+                                     factory = mk_w32_factory (19, 8, "default",
+                                                                  ["nsis-installer", "7z-dist"])))
 
 c["builders"].append (BuilderConfig (name = "w64-32-on-debian",
                                      workernames = ["jwe-debian-x86_64-0"],
-                                     factory = mk_w64_32_factory (19, 8, "default", "nsis-installer")))
+                                     factory = mk_w64_32_factory (19, 8, "default",
+                                                                  ["nsis-installer", "7z-dist"])))
 
 c["builders"].append (BuilderConfig (name = "w64-64-on-debian",
                                      workernames = ["jwe-debian-x86_64-2"],
-                                     factory = mk_w64_64_factory (19, 8, "default", "nsis-installer")))
-
+                                     factory = mk_w64_64_factory (19, 8, "default",
+                                                                  ["nsis-installer", "7z-dist"])))
 
 c["builders"].append (BuilderConfig (name = "w32-release-on-debian",
                                      workernames = ["jwe-debian-x86_64-3"],
-                                     factory = mk_w32_factory (19, 8, "release", "nsis-installer")))
+                                     factory = mk_w32_factory (19, 8, "release",
+                                                                  ["nsis-installer", "7z-dist"])))
 
 c["builders"].append (BuilderConfig (name = "w64-32-release-on-debian",
                                      workernames = ["jwe-debian-x86_64-0"],
-                                     factory = mk_w64_32_factory (19, 8, "release", "nsis-installer")))
+                                     factory = mk_w64_32_factory (19, 8, "release",
+                                                                  ["nsis-installer", "7z-dist"])))
 
 c["builders"].append (BuilderConfig (name = "w64-64-release-on-debian",
                                      workernames = ["jwe-debian-x86_64-2"],
-                                     factory = mk_w64_64_factory (19, 8, "release", "nsis-installer")))
+                                     factory = mk_w64_64_factory (19, 8, "release",
+                                                                  ["nsis-installer", "7z-dist"])))
 
 
 c["builders"].append (BuilderConfig (name = "w32-stable-on-debian",
                                      workernames = ["jwe-debian-x86_64-3"],
-                                     factory = mk_w32_factory (19, 8, "stable", "nsis-installer")))
+                                     factory = mk_w32_factory (19, 8, "stable",
+                                                                  ["nsis-installer", "7z-dist"])))
 
 c["builders"].append (BuilderConfig (name = "w64-32-stable-on-debian",
                                      workernames = ["jwe-debian-x86_64-0"],
-                                     factory = mk_w64_32_factory (19, 8, "stable", "nsis-installer")))
+                                     factory = mk_w64_32_factory (19, 8, "stable",
+                                                                  ["nsis-installer", "7z-dist"])))
 
 c["builders"].append (BuilderConfig (name = "w64-64-stable-on-debian",
                                      workernames = ["jwe-debian-x86_64-2"],
-                                     factory = mk_w64_64_factory (19, 8, "stable", "nsis-installer")))
-
+                                     factory = mk_w64_64_factory (19, 8, "stable",
+                                                                  ["nsis-installer", "7z-dist"])))
 
 c["builders"].append (BuilderConfig (name = "mxe-native-on-debian",
                                      workernames = ["jwe-debian-x86_64-0"],