Mercurial > octave-buildbot

comparison master.cfg @ 26:a333253a8d2e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
25:180e9db46fa3 26:a333253a8d2e
757 ## factory.addStep (mk_mxe_octave_test_step (nice = nice)) 757 ## factory.addStep (mk_mxe_octave_test_step (nice = nice))
758 758
759 return factory 759 return factory
760 760
761 761
762 def mk_w32_factory (nice, jobs, branch, compile_opts): 762 def mk_w32_factory (nice, jobs, branch, configure_opts, compile_opts):
763 return mk_mxe_octave_factory (nice, jobs, branch, 763 return mk_mxe_octave_factory (nice, jobs, branch,
764 configure_opts +
764 ["--enable-qt5", 765 ["--enable-qt5",
765 "--enable-devel-tools", 766 "--enable-devel-tools",
766 "--disable-windows-64", 767 "--disable-windows-64",
767 "--disable-64", 768 "--disable-64",
768 "--disable-fortran-int64", 769 "--disable-fortran-int64",
769 "--disable-system-opengl"], 770 "--disable-system-opengl"],
770 compile_opts) 771 compile_opts)
771 772
772 773
773 def mk_w64_32_factory (nice, jobs, branch, compile_opts): 774 def mk_w64_32_factory (nice, jobs, branch, configure_opts, compile_opts):
774 return mk_mxe_octave_factory (nice, jobs, branch, 775 return mk_mxe_octave_factory (nice, jobs, branch,
776 configure_opts +
775 ["--enable-qt5", 777 ["--enable-qt5",
776 "--enable-devel-tools", 778 "--enable-devel-tools",
777 "--enable-windows-64", 779 "--enable-windows-64",
778 "--enable-64", 780 "--enable-64",
779 "--disable-fortran-int64", 781 "--disable-fortran-int64",
780 "--disable-system-opengl"], 782 "--disable-system-opengl"],
781 compile_opts) 783 compile_opts)
782 784
783 785
784 def mk_w64_64_factory (nice, jobs, branch, compile_opts): 786 def mk_w64_64_factory (nice, jobs, branch, configure_opts, compile_opts):
785 return mk_mxe_octave_factory (nice, jobs, branch, 787 return mk_mxe_octave_factory (nice, jobs, branch,
788 configure_opts +
786 ["--enable-qt5", 789 ["--enable-qt5",
787 "--enable-devel-tools", 790 "--enable-devel-tools",
788 "--enable-windows-64", 791 "--enable-windows-64",
789 "--enable-64", 792 "--enable-64",
790 "--enable-fortran-int64", 793 "--enable-fortran-int64",
821 compile_opts) 824 compile_opts)
822 825
823 826
824 c["builders"].append (BuilderConfig (name = "w32-on-debian", 827 c["builders"].append (BuilderConfig (name = "w32-on-debian",
825 workernames = ["jwe-debian-x86_64-0"], 828 workernames = ["jwe-debian-x86_64-0"],
826 factory = mk_w32_factory (19, 6, "default", 829 factory = mk_w32_factory (19, 8, "default",
827 ["nsis-installer", "7z-dist"]))) 830 ["--enable-system-octave"],
831 ["nsis-installer", "7z-dist"])))
828 832
829 c["builders"].append (BuilderConfig (name = "w64-32-on-debian", 833 c["builders"].append (BuilderConfig (name = "w64-32-on-debian",
830 workernames = ["jwe-debian-x86_64-1"], 834 workernames = ["jwe-debian-x86_64-1"],
831 factory = mk_w64_32_factory (19, 8, "default", 835 factory = mk_w64_32_factory (19, 8, "default",
836 ["--enable-system-octave"],
832 ["nsis-installer", "7z-dist"]))) 837 ["nsis-installer", "7z-dist"])))
833 838
834 c["builders"].append (BuilderConfig (name = "w64-64-on-debian", 839 c["builders"].append (BuilderConfig (name = "w64-64-on-debian",
835 workernames = ["jwe-debian-x86_64-2"], 840 workernames = ["jwe-debian-x86_64-2"],
836 factory = mk_w64_64_factory (19, 8, "default", 841 factory = mk_w64_64_factory (19, 8, "default",
842 ["--enable-system-octave"],
837 ["nsis-installer", "7z-dist"]))) 843 ["nsis-installer", "7z-dist"])))
838 844
839 c["builders"].append (BuilderConfig (name = "w32-release-on-debian", 845 c["builders"].append (BuilderConfig (name = "w32-release-on-debian",
840 workernames = ["jwe-debian-x86_64-0"], 846 workernames = ["jwe-debian-x86_64-0"],
841 factory = mk_w32_factory (19, 6, "release", 847 factory = mk_w32_factory (19, 8, "release",
842 ["nsis-installer", "7z-dist"]))) 848 ["--disable-system-octave"],
849 ["nsis-installer", "7z-dist"])))
843 850
844 c["builders"].append (BuilderConfig (name = "w64-32-release-on-debian", 851 c["builders"].append (BuilderConfig (name = "w64-32-release-on-debian",
845 workernames = ["jwe-debian-x86_64-1"], 852 workernames = ["jwe-debian-x86_64-1"],
846 factory = mk_w64_32_factory (19, 8, "release", 853 factory = mk_w64_32_factory (19, 8, "release",
854 ["--disable-system-octave"],
847 ["nsis-installer", "7z-dist"]))) 855 ["nsis-installer", "7z-dist"])))
848 856
849 c["builders"].append (BuilderConfig (name = "w64-64-release-on-debian", 857 c["builders"].append (BuilderConfig (name = "w64-64-release-on-debian",
850 workernames = ["jwe-debian-x86_64-2"], 858 workernames = ["jwe-debian-x86_64-2"],
851 factory = mk_w64_64_factory (19, 8, "release", 859 factory = mk_w64_64_factory (19, 8, "release",
860 ["--disable-system-octave"],
852 ["nsis-installer", "7z-dist"]))) 861 ["nsis-installer", "7z-dist"])))
853 862
854 863
855 c["builders"].append (BuilderConfig (name = "w32-stable-on-debian", 864 c["builders"].append (BuilderConfig (name = "w32-stable-on-debian",
856 workernames = ["jwe-debian-x86_64-0"], 865 workernames = ["jwe-debian-x86_64-0"],
857 factory = mk_w32_factory (19, 6, "stable", 866 factory = mk_w32_factory (19, 8, "stable",
858 ["nsis-installer", "7z-dist"]))) 867 ["--enable-system-octave"],
868 ["nsis-installer", "7z-dist"])))
859 869
860 c["builders"].append (BuilderConfig (name = "w64-32-stable-on-debian", 870 c["builders"].append (BuilderConfig (name = "w64-32-stable-on-debian",
861 workernames = ["jwe-debian-x86_64-1"], 871 workernames = ["jwe-debian-x86_64-1"],
862 factory = mk_w64_32_factory (19, 8, "stable", 872 factory = mk_w64_32_factory (19, 8, "stable",
873 ["--enable-system-octave"],
863 ["nsis-installer", "7z-dist"]))) 874 ["nsis-installer", "7z-dist"])))
864 875
865 c["builders"].append (BuilderConfig (name = "w64-64-stable-on-debian", 876 c["builders"].append (BuilderConfig (name = "w64-64-stable-on-debian",
866 workernames = ["jwe-debian-x86_64-2"], 877 workernames = ["jwe-debian-x86_64-2"],
867 factory = mk_w64_64_factory (19, 8, "stable", 878 factory = mk_w64_64_factory (19, 8, "stable",
879 ["--enable-system-octave"],
868 ["nsis-installer", "7z-dist"]))) 880 ["nsis-installer", "7z-dist"])))
869 881
870 c["builders"].append (BuilderConfig (name = "mxe-native-on-debian", 882 c["builders"].append (BuilderConfig (name = "mxe-native-on-debian",
871 workernames = ["jwe-debian-x86_64-1"], 883 workernames = ["jwe-debian-x86_64-1"],
872 factory = mk_native_factory (19, 8, "default", "tar-dist"))) 884 factory = mk_native_factory (19, 8, "default", "tar-dist")))