# HG changeset patch # User Markus Mützel # Date 1614180660 -3600 # Node ID f42084477c282770bc373a7fa284dab3eeff7741 # Parent 2e1359850798fb674d6a80320fefb84100f04681 Use different branches for building MXE Octave release and stable or default. * master.cfg: Use the "release" branch of the MXE Octave repository to build Octave release or stable. Use the "default" branch of the MXE Octave repository to build Octave default (or native builds). diff -r 2e1359850798 -r f42084477c28 master.cfg --- a/master.cfg Thu Aug 26 15:57:15 2021 -0400 +++ b/master.cfg Wed Feb 24 16:31:00 2021 +0100 @@ -628,9 +628,9 @@ factory = mk_clang_osx_factory (0, "-j4", "stable"))) -def mk_mxe_octave_hg_update_step (repo): +def mk_mxe_octave_hg_update_step (repo, mxe_branch): return Mercurial (repourl = repo, - defaultBranch = "default", branchType = "inrepo", + defaultBranch = mxe_branch, branchType = "inrepo", workdir = "src", mode = "full", method = "fresh", haltOnFailure = True) @@ -679,10 +679,10 @@ timeout = 14400) -def mk_mxe_octave_factory (nice, jobs, branch, configure_opts, compile_opts): +def mk_mxe_octave_factory (nice, jobs, branch, mxe_branch, configure_opts, compile_opts): factory = BuildFactory () - factory.addStep (mk_mxe_octave_hg_update_step (mxe_octave_hg_repo)) + factory.addStep (mk_mxe_octave_hg_update_step (mxe_octave_hg_repo, mxe_branch)) factory.addStep (mk_mxe_octave_bootstrap_step (nice = nice)) ## Must run configure to ensure clean target will work, then must ## run configure again to recreate makefile. @@ -712,8 +712,8 @@ return factory -def mk_w32_factory (nice, jobs, branch, configure_opts, compile_opts): - return mk_mxe_octave_factory (nice, jobs, branch, +def mk_w32_factory (nice, jobs, branch, mxe_branch, configure_opts, compile_opts): + return mk_mxe_octave_factory (nice, jobs, branch, mxe_branch, configure_opts + ["--enable-qt5", "--enable-devel-tools", @@ -724,8 +724,8 @@ compile_opts) -def mk_w64_32_factory (nice, jobs, branch, configure_opts, compile_opts): - return mk_mxe_octave_factory (nice, jobs, branch, +def mk_w64_32_factory (nice, jobs, branch, mxe_branch, configure_opts, compile_opts): + return mk_mxe_octave_factory (nice, jobs, branch, mxe_branch, configure_opts + ["--enable-qt5", "--enable-devel-tools", @@ -736,8 +736,8 @@ compile_opts) -def mk_w64_64_factory (nice, jobs, branch, configure_opts, compile_opts): - return mk_mxe_octave_factory (nice, jobs, branch, +def mk_w64_64_factory (nice, jobs, branch, mxe_branch, configure_opts, compile_opts): + return mk_mxe_octave_factory (nice, jobs, branch, mxe_branch, configure_opts + ["--enable-qt5", "--enable-devel-tools", @@ -749,7 +749,7 @@ def mk_native_factory (nice, jobs, branch, compile_opts): - return mk_mxe_octave_factory (nice, jobs, branch, + return mk_mxe_octave_factory (nice, jobs, branch, "default", ["--enable-native-build", "--enable-qt5", "--enable-lib64-directory", @@ -763,7 +763,7 @@ def mk_native_all_factory (nice, jobs, branch, compile_opts): - return mk_mxe_octave_factory (nice, jobs, branch, + return mk_mxe_octave_factory (nice, jobs, branch, "default", ["--enable-native-build", "--enable-qt5", "--enable-lib64-directory", @@ -779,56 +779,56 @@ c["builders"].append (BuilderConfig (name = "w32-on-debian", workernames = ["jwe-debian-x86_64-5"], - factory = mk_w32_factory (19, 16, "default", + factory = mk_w32_factory (19, 16, "default", "default", ["--enable-system-octave"], ["nsis-installer", "7z-dist"]))) c["builders"].append (BuilderConfig (name = "w64-32-on-debian", workernames = ["jwe-debian-x86_64-5"], - factory = mk_w64_32_factory (19, 16, "default", + factory = mk_w64_32_factory (19, 16, "default", "default", ["--enable-system-octave"], ["nsis-installer", "7z-dist"]))) c["builders"].append (BuilderConfig (name = "w64-64-on-debian", workernames = ["jwe-debian-x86_64-4"], - factory = mk_w64_64_factory (19, 16, "default", + factory = mk_w64_64_factory (19, 16, "default", "default", ["--enable-system-octave"], ["nsis-installer", "7z-dist"]))) c["builders"].append (BuilderConfig (name = "w32-release-on-debian", workernames = ["jwe-debian-x86_64-5"], - factory = mk_w32_factory (19, 16, "release", + factory = mk_w32_factory (19, 16, "release", "release", ["--disable-system-octave"], ["nsis-installer", "7z-dist"]))) c["builders"].append (BuilderConfig (name = "w64-32-release-on-debian", workernames = ["jwe-debian-x86_64-5"], - factory = mk_w64_32_factory (19, 16, "release", + factory = mk_w64_32_factory (19, 16, "release", "release", ["--disable-system-octave"], ["nsis-installer", "7z-dist"]))) c["builders"].append (BuilderConfig (name = "w64-64-release-on-debian", workernames = ["jwe-debian-x86_64-4"], - factory = mk_w64_64_factory (19, 16, "release", + factory = mk_w64_64_factory (19, 16, "release", "release", ["--disable-system-octave"], ["nsis-installer", "7z-dist"]))) c["builders"].append (BuilderConfig (name = "w32-stable-on-debian", workernames = ["jwe-debian-x86_64-5"], - factory = mk_w32_factory (19, 16, "stable", + factory = mk_w32_factory (19, 16, "stable", "release", ["--enable-system-octave"], ["nsis-installer", "7z-dist"]))) c["builders"].append (BuilderConfig (name = "w64-32-stable-on-debian", workernames = ["jwe-debian-x86_64-5"], - factory = mk_w64_32_factory (19, 16, "stable", + factory = mk_w64_32_factory (19, 16, "stable", "release", ["--enable-system-octave"], ["nsis-installer", "7z-dist"]))) c["builders"].append (BuilderConfig (name = "w64-64-stable-on-debian", workernames = ["jwe-debian-x86_64-4"], - factory = mk_w64_64_factory (19, 16, "stable", + factory = mk_w64_64_factory (19, 16, "stable", "release", ["--enable-system-octave"], ["nsis-installer", "7z-dist"])))