Mercurial > octave-buildbot
changeset 26:a333253a8d2e
Build native Octave for MXE cross-builds that don't create a tarball (bug #49503).
* master.cfg: Cross-building from the current default or stable hg branch
requires creating a tarball which in turn requires building a version of Octave
that executes natively on the build system ("hg-octave-dist" target). Building
from the release tarball, some Octave Forge packages might still need a native
Octave as a build tool. So set the configure flags for the "build-octave"
package accordingly.
| author | Markus Mützel <markus.muetzel@gmx.de> |
|---|---|
| date | Sun, 13 Sep 2020 12:54:44 +0200 |
| parents | 180e9db46fa3 |
| children | 6e6cec148a95 |
| files | master.cfg |
| diffstat | 1 files changed, 21 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/master.cfg Mon Aug 31 14:18:47 2020 +0000 +++ b/master.cfg Sun Sep 13 12:54:44 2020 +0200 @@ -759,8 +759,9 @@ return factory -def mk_w32_factory (nice, jobs, branch, compile_opts): +def mk_w32_factory (nice, jobs, branch, configure_opts, compile_opts): return mk_mxe_octave_factory (nice, jobs, branch, + configure_opts + ["--enable-qt5", "--enable-devel-tools", "--disable-windows-64", @@ -770,8 +771,9 @@ compile_opts) -def mk_w64_32_factory (nice, jobs, branch, compile_opts): +def mk_w64_32_factory (nice, jobs, branch, configure_opts, compile_opts): return mk_mxe_octave_factory (nice, jobs, branch, + configure_opts + ["--enable-qt5", "--enable-devel-tools", "--enable-windows-64", @@ -781,8 +783,9 @@ compile_opts) -def mk_w64_64_factory (nice, jobs, branch, compile_opts): +def mk_w64_64_factory (nice, jobs, branch, configure_opts, compile_opts): return mk_mxe_octave_factory (nice, jobs, branch, + configure_opts + ["--enable-qt5", "--enable-devel-tools", "--enable-windows-64", @@ -823,48 +826,57 @@ c["builders"].append (BuilderConfig (name = "w32-on-debian", workernames = ["jwe-debian-x86_64-0"], - factory = mk_w32_factory (19, 6, "default", - ["nsis-installer", "7z-dist"]))) + factory = mk_w32_factory (19, 8, "default", + ["--enable-system-octave"], + ["nsis-installer", "7z-dist"]))) c["builders"].append (BuilderConfig (name = "w64-32-on-debian", workernames = ["jwe-debian-x86_64-1"], factory = mk_w64_32_factory (19, 8, "default", + ["--enable-system-octave"], ["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", + ["--enable-system-octave"], ["nsis-installer", "7z-dist"]))) c["builders"].append (BuilderConfig (name = "w32-release-on-debian", workernames = ["jwe-debian-x86_64-0"], - factory = mk_w32_factory (19, 6, "release", - ["nsis-installer", "7z-dist"]))) + factory = mk_w32_factory (19, 8, "release", + ["--disable-system-octave"], + ["nsis-installer", "7z-dist"]))) c["builders"].append (BuilderConfig (name = "w64-32-release-on-debian", workernames = ["jwe-debian-x86_64-1"], factory = mk_w64_32_factory (19, 8, "release", + ["--disable-system-octave"], ["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", + ["--disable-system-octave"], ["nsis-installer", "7z-dist"]))) c["builders"].append (BuilderConfig (name = "w32-stable-on-debian", workernames = ["jwe-debian-x86_64-0"], - factory = mk_w32_factory (19, 6, "stable", - ["nsis-installer", "7z-dist"]))) + factory = mk_w32_factory (19, 8, "stable", + ["--enable-system-octave"], + ["nsis-installer", "7z-dist"]))) c["builders"].append (BuilderConfig (name = "w64-32-stable-on-debian", workernames = ["jwe-debian-x86_64-1"], factory = mk_w64_32_factory (19, 8, "stable", + ["--enable-system-octave"], ["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", + ["--enable-system-octave"], ["nsis-installer", "7z-dist"]))) c["builders"].append (BuilderConfig (name = "mxe-native-on-debian",