Mercurial > octave-buildbot
comparison master.cfg @ 37:f42084477c28
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).
author | Markus Mützel <markus.muetzel@gmx.de> |
---|---|
date | Wed, 24 Feb 2021 16:31:00 +0100 |
parents | 2e1359850798 |
children | 6d7c3a59c1e7 |
comparison
equal
deleted
inserted
replaced
36:2e1359850798 | 37:f42084477c28 |
---|---|
626 c["builders"].append (BuilderConfig (name = "stable-clang-osx", | 626 c["builders"].append (BuilderConfig (name = "stable-clang-osx", |
627 workernames = ["epfl-elcapitan-x86_64"], | 627 workernames = ["epfl-elcapitan-x86_64"], |
628 factory = mk_clang_osx_factory (0, "-j4", "stable"))) | 628 factory = mk_clang_osx_factory (0, "-j4", "stable"))) |
629 | 629 |
630 | 630 |
631 def mk_mxe_octave_hg_update_step (repo): | 631 def mk_mxe_octave_hg_update_step (repo, mxe_branch): |
632 return Mercurial (repourl = repo, | 632 return Mercurial (repourl = repo, |
633 defaultBranch = "default", branchType = "inrepo", | 633 defaultBranch = mxe_branch, branchType = "inrepo", |
634 workdir = "src", mode = "full", method = "fresh", | 634 workdir = "src", mode = "full", method = "fresh", |
635 haltOnFailure = True) | 635 haltOnFailure = True) |
636 | 636 |
637 | 637 |
638 def mk_mxe_octave_bootstrap_step (nice = 0): | 638 def mk_mxe_octave_bootstrap_step (nice = 0): |
677 nice = nice, opts = opts) | 677 nice = nice, opts = opts) |
678 return Compile (command = make_cmd, workdir = "src", env = build_env, | 678 return Compile (command = make_cmd, workdir = "src", env = build_env, |
679 timeout = 14400) | 679 timeout = 14400) |
680 | 680 |
681 | 681 |
682 def mk_mxe_octave_factory (nice, jobs, branch, configure_opts, compile_opts): | 682 def mk_mxe_octave_factory (nice, jobs, branch, mxe_branch, configure_opts, compile_opts): |
683 factory = BuildFactory () | 683 factory = BuildFactory () |
684 | 684 |
685 factory.addStep (mk_mxe_octave_hg_update_step (mxe_octave_hg_repo)) | 685 factory.addStep (mk_mxe_octave_hg_update_step (mxe_octave_hg_repo, mxe_branch)) |
686 factory.addStep (mk_mxe_octave_bootstrap_step (nice = nice)) | 686 factory.addStep (mk_mxe_octave_bootstrap_step (nice = nice)) |
687 ## Must run configure to ensure clean target will work, then must | 687 ## Must run configure to ensure clean target will work, then must |
688 ## run configure again to recreate makefile. | 688 ## run configure again to recreate makefile. |
689 factory.addStep (mk_mxe_octave_configure_step (nice = nice, branch = branch, | 689 factory.addStep (mk_mxe_octave_configure_step (nice = nice, branch = branch, |
690 opts = configure_opts)) | 690 opts = configure_opts)) |
710 ## factory.addStep (mk_mxe_octave_test_step (nice = nice)) | 710 ## factory.addStep (mk_mxe_octave_test_step (nice = nice)) |
711 | 711 |
712 return factory | 712 return factory |
713 | 713 |
714 | 714 |
715 def mk_w32_factory (nice, jobs, branch, configure_opts, compile_opts): | 715 def mk_w32_factory (nice, jobs, branch, mxe_branch, configure_opts, compile_opts): |
716 return mk_mxe_octave_factory (nice, jobs, branch, | 716 return mk_mxe_octave_factory (nice, jobs, branch, mxe_branch, |
717 configure_opts + | 717 configure_opts + |
718 ["--enable-qt5", | 718 ["--enable-qt5", |
719 "--enable-devel-tools", | 719 "--enable-devel-tools", |
720 "--disable-windows-64", | 720 "--disable-windows-64", |
721 "--disable-64", | 721 "--disable-64", |
722 "--disable-fortran-int64", | 722 "--disable-fortran-int64", |
723 "--disable-system-opengl"], | 723 "--disable-system-opengl"], |
724 compile_opts) | 724 compile_opts) |
725 | 725 |
726 | 726 |
727 def mk_w64_32_factory (nice, jobs, branch, configure_opts, compile_opts): | 727 def mk_w64_32_factory (nice, jobs, branch, mxe_branch, configure_opts, compile_opts): |
728 return mk_mxe_octave_factory (nice, jobs, branch, | 728 return mk_mxe_octave_factory (nice, jobs, branch, mxe_branch, |
729 configure_opts + | 729 configure_opts + |
730 ["--enable-qt5", | 730 ["--enable-qt5", |
731 "--enable-devel-tools", | 731 "--enable-devel-tools", |
732 "--enable-windows-64", | 732 "--enable-windows-64", |
733 "--enable-64", | 733 "--enable-64", |
734 "--disable-fortran-int64", | 734 "--disable-fortran-int64", |
735 "--disable-system-opengl"], | 735 "--disable-system-opengl"], |
736 compile_opts) | 736 compile_opts) |
737 | 737 |
738 | 738 |
739 def mk_w64_64_factory (nice, jobs, branch, configure_opts, compile_opts): | 739 def mk_w64_64_factory (nice, jobs, branch, mxe_branch, configure_opts, compile_opts): |
740 return mk_mxe_octave_factory (nice, jobs, branch, | 740 return mk_mxe_octave_factory (nice, jobs, branch, mxe_branch, |
741 configure_opts + | 741 configure_opts + |
742 ["--enable-qt5", | 742 ["--enable-qt5", |
743 "--enable-devel-tools", | 743 "--enable-devel-tools", |
744 "--enable-windows-64", | 744 "--enable-windows-64", |
745 "--enable-64", | 745 "--enable-64", |
747 "--disable-system-opengl"], | 747 "--disable-system-opengl"], |
748 compile_opts) | 748 compile_opts) |
749 | 749 |
750 | 750 |
751 def mk_native_factory (nice, jobs, branch, compile_opts): | 751 def mk_native_factory (nice, jobs, branch, compile_opts): |
752 return mk_mxe_octave_factory (nice, jobs, branch, | 752 return mk_mxe_octave_factory (nice, jobs, branch, "default", |
753 ["--enable-native-build", | 753 ["--enable-native-build", |
754 "--enable-qt5", | 754 "--enable-qt5", |
755 "--enable-lib64-directory", | 755 "--enable-lib64-directory", |
756 "--enable-pic-flag", | 756 "--enable-pic-flag", |
757 "--disable-devel-tools", | 757 "--disable-devel-tools", |
761 "gnu-linux"], | 761 "gnu-linux"], |
762 compile_opts) | 762 compile_opts) |
763 | 763 |
764 | 764 |
765 def mk_native_all_factory (nice, jobs, branch, compile_opts): | 765 def mk_native_all_factory (nice, jobs, branch, compile_opts): |
766 return mk_mxe_octave_factory (nice, jobs, branch, | 766 return mk_mxe_octave_factory (nice, jobs, branch, "default", |
767 ["--enable-native-build", | 767 ["--enable-native-build", |
768 "--enable-qt5", | 768 "--enable-qt5", |
769 "--enable-lib64-directory", | 769 "--enable-lib64-directory", |
770 "--enable-pic-flag", | 770 "--enable-pic-flag", |
771 "--disable-devel-tools", | 771 "--disable-devel-tools", |
777 compile_opts) | 777 compile_opts) |
778 | 778 |
779 | 779 |
780 c["builders"].append (BuilderConfig (name = "w32-on-debian", | 780 c["builders"].append (BuilderConfig (name = "w32-on-debian", |
781 workernames = ["jwe-debian-x86_64-5"], | 781 workernames = ["jwe-debian-x86_64-5"], |
782 factory = mk_w32_factory (19, 16, "default", | 782 factory = mk_w32_factory (19, 16, "default", "default", |
783 ["--enable-system-octave"], | 783 ["--enable-system-octave"], |
784 ["nsis-installer", "7z-dist"]))) | 784 ["nsis-installer", "7z-dist"]))) |
785 | 785 |
786 c["builders"].append (BuilderConfig (name = "w64-32-on-debian", | 786 c["builders"].append (BuilderConfig (name = "w64-32-on-debian", |
787 workernames = ["jwe-debian-x86_64-5"], | 787 workernames = ["jwe-debian-x86_64-5"], |
788 factory = mk_w64_32_factory (19, 16, "default", | 788 factory = mk_w64_32_factory (19, 16, "default", "default", |
789 ["--enable-system-octave"], | 789 ["--enable-system-octave"], |
790 ["nsis-installer", "7z-dist"]))) | 790 ["nsis-installer", "7z-dist"]))) |
791 | 791 |
792 c["builders"].append (BuilderConfig (name = "w64-64-on-debian", | 792 c["builders"].append (BuilderConfig (name = "w64-64-on-debian", |
793 workernames = ["jwe-debian-x86_64-4"], | 793 workernames = ["jwe-debian-x86_64-4"], |
794 factory = mk_w64_64_factory (19, 16, "default", | 794 factory = mk_w64_64_factory (19, 16, "default", "default", |
795 ["--enable-system-octave"], | 795 ["--enable-system-octave"], |
796 ["nsis-installer", "7z-dist"]))) | 796 ["nsis-installer", "7z-dist"]))) |
797 | 797 |
798 c["builders"].append (BuilderConfig (name = "w32-release-on-debian", | 798 c["builders"].append (BuilderConfig (name = "w32-release-on-debian", |
799 workernames = ["jwe-debian-x86_64-5"], | 799 workernames = ["jwe-debian-x86_64-5"], |
800 factory = mk_w32_factory (19, 16, "release", | 800 factory = mk_w32_factory (19, 16, "release", "release", |
801 ["--disable-system-octave"], | 801 ["--disable-system-octave"], |
802 ["nsis-installer", "7z-dist"]))) | 802 ["nsis-installer", "7z-dist"]))) |
803 | 803 |
804 c["builders"].append (BuilderConfig (name = "w64-32-release-on-debian", | 804 c["builders"].append (BuilderConfig (name = "w64-32-release-on-debian", |
805 workernames = ["jwe-debian-x86_64-5"], | 805 workernames = ["jwe-debian-x86_64-5"], |
806 factory = mk_w64_32_factory (19, 16, "release", | 806 factory = mk_w64_32_factory (19, 16, "release", "release", |
807 ["--disable-system-octave"], | 807 ["--disable-system-octave"], |
808 ["nsis-installer", "7z-dist"]))) | 808 ["nsis-installer", "7z-dist"]))) |
809 | 809 |
810 c["builders"].append (BuilderConfig (name = "w64-64-release-on-debian", | 810 c["builders"].append (BuilderConfig (name = "w64-64-release-on-debian", |
811 workernames = ["jwe-debian-x86_64-4"], | 811 workernames = ["jwe-debian-x86_64-4"], |
812 factory = mk_w64_64_factory (19, 16, "release", | 812 factory = mk_w64_64_factory (19, 16, "release", "release", |
813 ["--disable-system-octave"], | 813 ["--disable-system-octave"], |
814 ["nsis-installer", "7z-dist"]))) | 814 ["nsis-installer", "7z-dist"]))) |
815 | 815 |
816 | 816 |
817 c["builders"].append (BuilderConfig (name = "w32-stable-on-debian", | 817 c["builders"].append (BuilderConfig (name = "w32-stable-on-debian", |
818 workernames = ["jwe-debian-x86_64-5"], | 818 workernames = ["jwe-debian-x86_64-5"], |
819 factory = mk_w32_factory (19, 16, "stable", | 819 factory = mk_w32_factory (19, 16, "stable", "release", |
820 ["--enable-system-octave"], | 820 ["--enable-system-octave"], |
821 ["nsis-installer", "7z-dist"]))) | 821 ["nsis-installer", "7z-dist"]))) |
822 | 822 |
823 c["builders"].append (BuilderConfig (name = "w64-32-stable-on-debian", | 823 c["builders"].append (BuilderConfig (name = "w64-32-stable-on-debian", |
824 workernames = ["jwe-debian-x86_64-5"], | 824 workernames = ["jwe-debian-x86_64-5"], |
825 factory = mk_w64_32_factory (19, 16, "stable", | 825 factory = mk_w64_32_factory (19, 16, "stable", "release", |
826 ["--enable-system-octave"], | 826 ["--enable-system-octave"], |
827 ["nsis-installer", "7z-dist"]))) | 827 ["nsis-installer", "7z-dist"]))) |
828 | 828 |
829 c["builders"].append (BuilderConfig (name = "w64-64-stable-on-debian", | 829 c["builders"].append (BuilderConfig (name = "w64-64-stable-on-debian", |
830 workernames = ["jwe-debian-x86_64-4"], | 830 workernames = ["jwe-debian-x86_64-4"], |
831 factory = mk_w64_64_factory (19, 16, "stable", | 831 factory = mk_w64_64_factory (19, 16, "stable", "release", |
832 ["--enable-system-octave"], | 832 ["--enable-system-octave"], |
833 ["nsis-installer", "7z-dist"]))) | 833 ["nsis-installer", "7z-dist"]))) |
834 | 834 |
835 c["builders"].append (BuilderConfig (name = "mxe-native-on-debian", | 835 c["builders"].append (BuilderConfig (name = "mxe-native-on-debian", |
836 workernames = ["jwe-debian-x86_64-1"], | 836 workernames = ["jwe-debian-x86_64-1"], |