From 4a2f9b07832946ae5b1c88ed8db7bcbded0a8771 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Tue, 16 Apr 2019 14:05:20 +0100 Subject: [PATCH 01/61] Add initial eclipse module --- eclipse.yaml | 197 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 197 insertions(+) create mode 100644 eclipse.yaml diff --git a/eclipse.yaml b/eclipse.yaml new file mode 100644 index 0000000..f20d346 --- /dev/null +++ b/eclipse.yaml @@ -0,0 +1,197 @@ +--- +document: modulemd +version: 2 +data: + summary: An open, extensible IDE and application platform + description: >- + The Eclipse platform is designed for building integrated development + environments (IDEs), server-side applications, desktop applications, and + everything in between. + license: + module: + - MIT + dependencies: + - buildrequires: + tycho: [1.3] + platform: [f28] + requires: + platform: [] + profiles: + default: + rpms: + - felix-scr + api: + rpms: + - apache-commons-jxpath + - batik + - felix-gogo-command + - felix-gogo-runtime + - felix-gogo-shell + - felix-scr + - glassfish-annotation-api + - glassfish-jsp-api + - glassfish-servlet-api + - icu4j + - jetty + - lucene + - sac + - sat4j + filter: + rpms: + - apache-commons-jxpath-javadoc + - batik-demo + - batik-javadoc + - batik-rasterizer + - batik-slideshow + - batik-squiggle + - batik-svgpp + - batik-ttf2svg + - felix-gogo-command-javadoc + - felix-gogo-parent + - felix-gogo-runtime-javadoc + - felix-gogo-shell-javadoc + - felix-scr-javadoc + - glassfish-annotation-api-javadoc + - glassfish-jsp-api-javadoc + - glassfish-servlet-api-javadoc + - icu4j-charset + - icu4j-javadoc + - icu4j-localespi + - kxml-javadoc + - lucene-analysis + - lucene-analyzers-icu + - lucene-analyzers-kuromoji + - lucene-analyzers-morfologik + - lucene-analyzers-nori + - lucene-analyzers-phonetic + - lucene-analyzers-smartcn + - lucene-analyzers-stempel + - lucene-backward-codecs + - lucene-benchmark + - lucene-classification + - lucene-codecs + - lucene-demo + - lucene-expressions + - lucene-facet + - lucene-grouping + - lucene-highlighter + - lucene-javadoc + - lucene-join + - lucene-memory + - lucene-misc + - lucene-parent + - lucene-queries + - lucene-queryparser + - lucene-replicator + - lucene-sandbox + - lucene-solr-grandparent + - lucene-spatial + - lucene-spatial-extras + - lucene-spatial3d + - lucene-suggest + - lucene-test-framework + - sac-javadoc + - xmlgraphics-commons-javadoc + - xpp3-javadoc + - xpp3-minimal + buildopts: + rpms: + macros: | + %_with_bootstrap 1 + %_with_jp_minimal 1 + components: + rpms: + apache-commons-jxpath: + buildorder: 10 + ref: f30 + rationale: > + Module API. + batik: + buildorder: 20 + ref: f30 + rationale: > + Module API. + felix-gogo-command: + buildorder: 30 + ref: f30 + rationale: > + Module API. + felix-gogo-parent: + buildorder: 10 + ref: f30 + rationale: > + Build dependency of felix-gogo-command, + felix-gogo-shell, felix-gogo-runtime. + felix-gogo-runtime: + buildorder: 20 + ref: f30 + rationale: > + Module API. + Runtime dependency of felix-gogo-command, + felix-gogo-shell. + felix-gogo-shell: + buildorder: 30 + ref: f30 + rationale: > + Module API. + felix-scr: + buildorder: 30 + ref: f30 + rationale: > + Module API. + glassfish-annotation-api: + buildorder: 10 + ref: f30 + rationale: > + Module API. + glassfish-jsp-api: + buildorder: 20 + ref: f30 + rationale: > + Module API. + glassfish-servlet-api: + buildorder: 10 + ref: f30 + rationale: > + Module API. + Runtime dependency of glassfish-jsp-api. + icu4j: + buildorder: 10 + ref: f30 + rationale: > + Module API. + jetty: + buildorder: 20 + ref: f30 + rationale: > + Module API. + kxml: + buildorder: 20 + ref: f30 + rationale: > + Runtime dependency of felix-scr. + lucene: + buildorder: 10 + ref: f30 + rationale: > + Module API. + sac: + buildorder: 10 + ref: f30 + rationale: > + Module API. + sat4j: + buildorder: 10 + ref: f30 + rationale: > + Module API. + xmlgraphics-commons: + buildorder: 10 + ref: f30 + rationale: > + Runtime dependency of batik. + xpp3: + buildorder: 10 + ref: f30 + rationale: > + Runtime dependency of felix-scr, kxml. From 1da7ff56a11e3d48c6791d3361a97c305efab286 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Tue, 16 Apr 2019 15:19:21 +0100 Subject: [PATCH 02/61] Add apache-sshd dependency --- eclipse.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/eclipse.yaml b/eclipse.yaml index f20d346..bd80ca5 100644 --- a/eclipse.yaml +++ b/eclipse.yaml @@ -23,6 +23,7 @@ data: api: rpms: - apache-commons-jxpath + - apache-sshd - batik - felix-gogo-command - felix-gogo-runtime @@ -106,11 +107,21 @@ data: ref: f30 rationale: > Module API. + apache-sshd: + buildorder: 20 + ref: f30 + rationale: > + Module API. batik: buildorder: 20 ref: f30 rationale: > Module API. + ed25519-java: + buildorder: 10 + ref: f30 + rationale: > + Runtime dependency of apache-sshd. felix-gogo-command: buildorder: 30 ref: f30 From 60ab66ac9e73a73171a053824ff86f20ac59a66e Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Wed, 17 Apr 2019 01:09:32 +0100 Subject: [PATCH 03/61] Add basic eclipse packages --- eclipse.yaml | 251 ++++++++++++++++++++++++++++++++++++++++++--------- koschei.cfg | 150 ++++++++++++++++++++++++++++++ 2 files changed, 359 insertions(+), 42 deletions(-) create mode 100644 koschei.cfg diff --git a/eclipse.yaml b/eclipse.yaml index bd80ca5..fa11ef6 100644 --- a/eclipse.yaml +++ b/eclipse.yaml @@ -19,27 +19,21 @@ data: profiles: default: rpms: - - felix-scr + - eclipse + - eclipse-jgit api: rpms: - - apache-commons-jxpath - - apache-sshd - - batik - - felix-gogo-command - - felix-gogo-runtime - - felix-gogo-shell - - felix-scr - - glassfish-annotation-api - - glassfish-jsp-api - - glassfish-servlet-api - - icu4j - - jetty - - lucene - - sac - - sat4j + - eclipse + - eclipse-jgit filter: rpms: + - apache-commons-compress-javadoc + - apache-commons-el-javadoc - apache-commons-jxpath-javadoc + - apache-sshd-javadoc + - args4j-javadoc + - args4j-parent + - args4j-tools - batik-demo - batik-javadoc - batik-rasterizer @@ -47,6 +41,20 @@ data: - batik-squiggle - batik-svgpp - batik-ttf2svg + - bouncycastle-javadoc + - bouncycastle-mail + - bouncycastle-tls + - eclipse-contributor-tools + - eclipse-ecf-runtime + - eclipse-ecf-sdk + - eclipse-egit-mylyn + - eclipse-emf-runtime + - eclipse-emf-sdk + - eclipse-emf-xsd + - eclipse-p2-discovery + - eclipse-pde + - eclipse-tests + - ed25519-java-javadoc - felix-gogo-command-javadoc - felix-gogo-parent - felix-gogo-runtime-javadoc @@ -54,18 +62,71 @@ data: - felix-scr-javadoc - glassfish-annotation-api-javadoc - glassfish-jsp-api-javadoc + - glassfish-jsp-javadoc - glassfish-servlet-api-javadoc + - google-gson-javadoc - icu4j-charset - icu4j-javadoc - icu4j-localespi + - javaewah-javadoc + - jetty + - jetty-alpn-client + - jetty-alpn-server + - jetty-annotations + - jetty-ant + - jetty-cdi + - jetty-client + - jetty-deploy + - jetty-fcgi-client + - jetty-fcgi-server + - jetty-http-spi + - jetty-http2-client + - jetty-http2-common + - jetty-http2-hpack + - jetty-http2-http-client-transport + - jetty-http2-server + - jetty-httpservice + - jetty-infinispan + - jetty-jaas + - jetty-jaspi + - jetty-javadoc + - jetty-javax-websocket-client-impl + - jetty-javax-websocket-server-impl + - jetty-jmx + - jetty-jndi + - jetty-jsp + - jetty-jspc-maven-plugin + - jetty-jstl + - jetty-maven-plugin + - jetty-nosql + - jetty-osgi-alpn + - jetty-osgi-boot + - jetty-osgi-boot-jsp + - jetty-osgi-boot-warurl + - jetty-plus + - jetty-project + - jetty-proxy + - jetty-quickstart + - jetty-rewrite + - jetty-servlets + - jetty-spring + - jetty-start + - jetty-unixsocket + - jetty-util-ajax + - jetty-webapp + - jetty-websocket-api + - jetty-websocket-client + - jetty-websocket-common + - jetty-websocket-server + - jetty-websocket-servlet + - jetty-xml + - jgit-javadoc - kxml-javadoc - - lucene-analysis - lucene-analyzers-icu - lucene-analyzers-kuromoji - lucene-analyzers-morfologik - lucene-analyzers-nori - lucene-analyzers-phonetic - - lucene-analyzers-smartcn - lucene-analyzers-stempel - lucene-backward-codecs - lucene-benchmark @@ -81,10 +142,7 @@ data: - lucene-memory - lucene-misc - lucene-parent - - lucene-queries - - lucene-queryparser - lucene-replicator - - lucene-sandbox - lucene-solr-grandparent - lucene-spatial - lucene-spatial-extras @@ -98,111 +156,220 @@ data: buildopts: rpms: macros: | - %_with_bootstrap 1 %_with_jp_minimal 1 + %_without_providers 1 components: rpms: + apache-commons-compress: + buildorder: 10 + ref: f30 + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse-jgit. + apache-commons-el: + buildorder: 10 + ref: f30 + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse. apache-commons-jxpath: buildorder: 10 ref: f30 + arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Module API. + Runtime dependency of eclipse. apache-sshd: buildorder: 20 ref: f30 + arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Module API. + Runtime dependency of eclipse-jgit. + args4j: + buildorder: 10 + ref: f30 + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse-jgit. batik: buildorder: 20 ref: f30 + arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Module API. + Runtime dependency of eclipse. + bouncycastle: + buildorder: 10 + ref: f30 + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse-jgit. + eclipse: + buildorder: 40 + ref: 6dd1f037f0f5845c17a0b0d099bdbe9c973df2d8 + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse-egit, eclipse-jgit. + eclipse-ecf: + buildorder: 20 + ref: c521c69a282c21f56a199d4bfd2b637bf4d3e392 + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse. + # eclipse-ecf: + # buildorder: 60 + # ref: f30 + # arches: [x86_64, ppc64le, aarch64, s390x] + # rationale: > + # Runtime dependency of eclipse. + eclipse-emf: + buildorder: 10 + ref: ab6513a9c6b9d4b26a180e4a1b22d42c5cd8139a + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse. + # eclipse-emf: + # buildorder: 50 + # ref: f30 + # arches: [x86_64, ppc64le, aarch64, s390x] + # rationale: > + # Runtime dependency of eclipse. + eclipse-jgit: + buildorder: 30 + ref: 88c751f2900c9e9b534a8661e285d9d8aeff757e + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse-egit. + # eclipse-jgit: + # buildorder: 50 + # ref: f30 + # arches: [x86_64, ppc64le, aarch64, s390x] + # rationale: > + # Runtime dependency of eclipse-egit. + eclipse-license: + buildorder: 10 + ref: f30 + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Build dependency of eclipse, eclipse-ecf, eclipse-egit. ed25519-java: buildorder: 10 ref: f30 + arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of apache-sshd. + Runtime dependency of eclipse-jgit. felix-gogo-command: buildorder: 30 ref: f30 + arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Module API. + Runtime dependency of eclipse. felix-gogo-parent: buildorder: 10 ref: f30 + arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Build dependency of felix-gogo-command, - felix-gogo-shell, felix-gogo-runtime. + felix-gogo-runtime, felix-gogo-shell. felix-gogo-runtime: buildorder: 20 ref: f30 + arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Module API. - Runtime dependency of felix-gogo-command, + Runtime dependency of eclipse, felix-gogo-command, felix-gogo-shell. felix-gogo-shell: buildorder: 30 ref: f30 + arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Module API. + Runtime dependency of eclipse. felix-scr: buildorder: 30 ref: f30 + arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Module API. + Runtime dependency of eclipse. glassfish-annotation-api: buildorder: 10 ref: f30 + arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Module API. + Runtime dependency of eclipse. + glassfish-jsp: + buildorder: 30 + ref: f30 + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse. glassfish-jsp-api: buildorder: 20 ref: f30 + arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Module API. + Runtime dependency of eclipse, glassfish-jsp. glassfish-servlet-api: buildorder: 10 ref: f30 + arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Module API. - Runtime dependency of glassfish-jsp-api. + Runtime dependency of eclipse, glassfish-jsp-api, + jetty. + google-gson: + buildorder: 10 + ref: f30 + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse-jgit. icu4j: buildorder: 10 ref: f30 + arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Module API. + Runtime dependency of eclipse. + javaewah: + buildorder: 10 + ref: f30 + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse-jgit. jetty: buildorder: 20 ref: f30 + arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Module API. + Runtime dependency of eclipse, eclipse-jgit. kxml: buildorder: 20 ref: f30 + arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of felix-scr. lucene: buildorder: 10 ref: f30 + arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Module API. + Runtime dependency of eclipse. sac: buildorder: 10 ref: f30 + arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Module API. + Runtime dependency of eclipse. sat4j: buildorder: 10 ref: f30 + arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Module API. + Runtime dependency of eclipse. xmlgraphics-commons: buildorder: 10 ref: f30 + arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of batik. + Runtime dependency of batik, eclipse. xpp3: buildorder: 10 ref: f30 + arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of felix-scr, kxml. diff --git a/koschei.cfg b/koschei.cfg new file mode 100644 index 0000000..05fcdcd --- /dev/null +++ b/koschei.cfg @@ -0,0 +1,150 @@ +# -*- python -*- +# vim: ft=python +config = { + "buildrequires": [ + "tycho", + "platform", + ], + "requires": [ + "platform", + ], + + "bootstrap": False, + "full_refs": False, + "default_ref": "f30", + "include_build_deps": False, + "closure": False, + "filter_unused": True, + "topo_sort": True, + + "api": [ + "eclipse", + "eclipse-egit", + ], + "profiles": { + "default": [ + "eclipse", + "eclipse-egit", + ], + }, + "filter": [ + ], + "includes": [ + ], + "excludes": [ + # Packages from ant module + "ant", + "antlr", + "apache-commons-logging", + "apache-commons-net", + "apiguardian", + "bcel", + "bsf", + "hamcrest", + "jakarta-oro", + "javamail", + "jdepend", + "jsch", + "junit", + "junit5", + "jzlib", + "log4j12", + "opentest4j", + "regexp", + "univocity-parsers", + "xalan-j2", + "xerces-j2", + "xml-commons-apis", + "xml-commons-resolver", + "xz-java", + # Packages from maven module + "aopalliance", + "apache-commons-cli", + "apache-commons-codec", + "apache-commons-io", + "apache-commons-lang3", + "apache-commons-logging", + "atinject", + "cdi-api", + "geronimo-annotation", + "glassfish-el", + "google-guice", + "guava20", + "hawtjni", + "httpcomponents-client", + "httpcomponents-core", + "jansi", + "jansi-native", + "jboss-interceptors-1.2-api", + "jsoup", + "maven", + "maven-resolver", + "maven-shared-utils", + "maven-wagon", + "plexus-cipher", + "plexus-classworlds", + "plexus-containers", + "plexus-interpolation", + "plexus-sec-dispatcher", + "plexus-utils", + "sisu", + "slf4j", + # Additional Runtime Exclusions + "javapackages-tools", + "osgi-core", + ], + "frozen_refs": [ + ], + "stream_override": { + "tycho": { + "2019-03": "[1.3]", + }, + "platform": { + "2019-03": "[f28]", + }, + }, + + "macros": { + "_with_bootstrap": 1, + "_with_jp_minimal": 1, + "_without_providers": 1, + }, + + "summary": "An open, extensible IDE and application platform", + "description": """\ + The Eclipse platform is designed for building integrated development + environments (IDEs), server-side applications, desktop applications, and + everything in between. + """, + + "koji_config": { + "server": "https://koji.fedoraproject.org/kojihub", + "topurl": "https://kojipkgs.fedoraproject.org/", + "multicall_chunk_size": 1000, + "tag_name": "f30-build", + }, + "dependency": { + "repo_arch": "x86_64", + "resolve_for_arch": "x86_64", + "ignore_weak_deps": True, + "cache_l2_capacity": 2, + }, + "directories": { + "cachedir": "/tmp/maven-modulemd-gen", + }, + "logging": { + "version": 1, + "loggers": { + "": { + "level": "INFO", + "handlers": ["stderr"], + }, + }, + "handlers": { + "stderr": { + "class": "logging.StreamHandler", + "stream": "ext://sys.stderr" + }, + }, + }, +} From 8ba9ee009b40cb26447a363e652417cc75f5dbec Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Fri, 10 May 2019 19:47:40 +0100 Subject: [PATCH 04/61] Skeleton bootstrap build --- eclipse.yaml | 442 ++++++++++++++++++++++++++++++++++++++------------- koschei.cfg | 136 ++++++++-------- 2 files changed, 407 insertions(+), 171 deletions(-) diff --git a/eclipse.yaml b/eclipse.yaml index fa11ef6..4ba341b 100644 --- a/eclipse.yaml +++ b/eclipse.yaml @@ -13,23 +13,46 @@ data: dependencies: - buildrequires: tycho: [1.3] - platform: [f28] + platform: [] requires: + ant: [1.10] + maven: [3.5] platform: [] profiles: default: rpms: - - eclipse - - eclipse-jgit + - eclipse-jdt + - eclipse-mpc + - eclipse-usage api: rpms: - - eclipse + - eclipse-cdt-native + - eclipse-dtp + - eclipse-egit + - eclipse-egit-mylyn + - eclipse-epp-logging + - eclipse-gef + - eclipse-jdt - eclipse-jgit + - eclipse-launchbar + - eclipse-mpc + - eclipse-pde + - eclipse-subclipse + - eclipse-tm-terminal + - eclipse-usage + - freemarker + - nekohtml + - rxtx + - swt-chart filter: rpms: + - antlr32-javadoc + - antlr32-maven-plugin + - antlr32-tool - apache-commons-compress-javadoc - apache-commons-el-javadoc - apache-commons-jxpath-javadoc + - apache-commons-lang-javadoc - apache-sshd-javadoc - args4j-javadoc - args4j-parent @@ -44,23 +67,58 @@ data: - bouncycastle-javadoc - bouncycastle-mail - bouncycastle-tls - - eclipse-contributor-tools - - eclipse-ecf-runtime - - eclipse-ecf-sdk - - eclipse-egit-mylyn - - eclipse-emf-runtime - - eclipse-emf-sdk - - eclipse-emf-xsd - - eclipse-p2-discovery - - eclipse-pde - - eclipse-tests + - eclipse-cdt + - eclipse-cdt-arduino + - eclipse-cdt-docker + - eclipse-cdt-llvm + - eclipse-cdt-parsers + - eclipse-cdt-qt + - eclipse-cdt-sdk + - eclipse-cdt-tests + - eclipse-gef-sdk + - eclipse-gef-tests + - eclipse-mylyn-builds + - eclipse-mylyn-builds-hudson + - eclipse-mylyn-context-cdt + - eclipse-mylyn-context-java + - eclipse-mylyn-context-pde + - eclipse-mylyn-docs-epub + - eclipse-mylyn-docs-wikitext + - eclipse-mylyn-sdk + - eclipse-mylyn-tasks-bugzilla + - eclipse-mylyn-tasks-trac + - eclipse-mylyn-tasks-web + - eclipse-mylyn-tests + - eclipse-mylyn-versions + - eclipse-mylyn-versions-cvs + - eclipse-mylyn-versions-git + - eclipse-mylyn-versions-subclipse + - eclipse-tm-terminal-connectors + - eclipse-tm-terminal-sdk - ed25519-java-javadoc - felix-gogo-command-javadoc - - felix-gogo-parent - felix-gogo-runtime-javadoc - felix-gogo-shell-javadoc - felix-scr-javadoc + - freemarker-javadoc - glassfish-annotation-api-javadoc + - glassfish-jaxb + - glassfish-jaxb-api-javadoc + - glassfish-jaxb-bom + - glassfish-jaxb-bom-ext + - glassfish-jaxb-codemodel + - glassfish-jaxb-codemodel-annotation-compiler + - glassfish-jaxb-codemodel-parent + - glassfish-jaxb-external-parent + - glassfish-jaxb-javadoc + - glassfish-jaxb-jxc + - glassfish-jaxb-parent + - glassfish-jaxb-rngom + - glassfish-jaxb-runtime-parent + - glassfish-jaxb-txw-parent + - glassfish-jaxb-txwc2 + - glassfish-jaxb-xjc + - glassfish-jaxb1-impl - glassfish-jsp-api-javadoc - glassfish-jsp-javadoc - glassfish-servlet-api-javadoc @@ -68,6 +126,9 @@ data: - icu4j-charset - icu4j-javadoc - icu4j-localespi + - jakarta-commons-httpclient-demo + - jakarta-commons-httpclient-javadoc + - jakarta-commons-httpclient-manual - javaewah-javadoc - jetty - jetty-alpn-client @@ -121,7 +182,13 @@ data: - jetty-websocket-servlet - jetty-xml - jgit-javadoc + - jna-javadoc + - jsch-agent-proxy-javadoc + - jsch-agent-proxy-jsch + - jsch-agent-proxy-sshj - kxml-javadoc + - lpg + - lpg-java - lucene-analyzers-icu - lucene-analyzers-kuromoji - lucene-analyzers-morfologik @@ -140,7 +207,6 @@ data: - lucene-javadoc - lucene-join - lucene-memory - - lucene-misc - lucene-parent - lucene-replicator - lucene-solr-grandparent @@ -149,227 +215,389 @@ data: - lucene-spatial3d - lucene-suggest - lucene-test-framework + - nekohtml-demo + - nekohtml-javadoc + - objectweb-asm-javadoc - sac-javadoc + - sequence-library-javadoc + - sqljet-javadoc + - stringtemplate-javadoc + - svnkit-cli + - svnkit-javadoc + - swt-chart-javadoc + - trilead-ssh2-javadoc + - ws-commons-util-javadoc + - wsdl4j-javadoc - xmlgraphics-commons-javadoc + - xmlrpc-javadoc + - xmlrpc-server - xpp3-javadoc - xpp3-minimal buildopts: rpms: macros: | + %_with_bootstrap 1 %_with_jp_minimal 1 - %_without_providers 1 + %_without_javahl 1 + %_without_contrib_tools 1 + %_without_remote 1 components: rpms: + antlr32: + buildorder: 20 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of sqljet. apache-commons-compress: buildorder: 10 - ref: f30 + ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of eclipse-jgit. apache-commons-el: buildorder: 10 - ref: f30 + ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of eclipse. apache-commons-jxpath: buildorder: 10 - ref: f30 + ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of eclipse. + apache-commons-lang: + buildorder: 10 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse-mylyn. apache-sshd: - buildorder: 20 - ref: f30 + buildorder: 10 + ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of eclipse-jgit. args4j: buildorder: 10 - ref: f30 + ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of eclipse-jgit. batik: buildorder: 20 - ref: f30 + ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of eclipse. bouncycastle: buildorder: 10 - ref: f30 + ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of eclipse-jgit. - eclipse: - buildorder: 40 - ref: 6dd1f037f0f5845c17a0b0d099bdbe9c973df2d8 + eclipse-cdt: + buildorder: 60 + ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of eclipse-egit, eclipse-jgit. - eclipse-ecf: + Module API. + Runtime dependency of eclipse-remote. + eclipse-dtp: buildorder: 20 - ref: c521c69a282c21f56a199d4bfd2b637bf4d3e392 + ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of eclipse. - # eclipse-ecf: - # buildorder: 60 - # ref: f30 - # arches: [x86_64, ppc64le, aarch64, s390x] - # rationale: > - # Runtime dependency of eclipse. - eclipse-emf: + Module API. + eclipse-egit: + buildorder: 40 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Module API. + Runtime dependency of eclipse-tm-terminal. + eclipse-epp-logging: + buildorder: 40 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Module API. + Runtime dependency of eclipse-usage. + eclipse-gef: buildorder: 10 - ref: ab6513a9c6b9d4b26a180e4a1b22d42c5cd8139a + ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of eclipse. - # eclipse-emf: - # buildorder: 50 - # ref: f30 - # arches: [x86_64, ppc64le, aarch64, s390x] - # rationale: > - # Runtime dependency of eclipse. + Module API. + Runtime dependency of eclipse-dtp, eclipse-subclipse. eclipse-jgit: buildorder: 30 - ref: 88c751f2900c9e9b534a8661e285d9d8aeff757e + ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > + Module API. Runtime dependency of eclipse-egit. - # eclipse-jgit: - # buildorder: 50 - # ref: f30 - # arches: [x86_64, ppc64le, aarch64, s390x] - # rationale: > - # Runtime dependency of eclipse-egit. - eclipse-license: + eclipse-launchbar: buildorder: 10 - ref: f30 + ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Build dependency of eclipse, eclipse-ecf, eclipse-egit. + Module API. + eclipse-mpc: + buildorder: 10 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Module API. + eclipse-mylyn: + buildorder: 30 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse-dltk, eclipse-egit, + eclipse-epp-logging, eclipse-subclipse. + eclipse-remote: + buildorder: 70 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse-launchbar. + eclipse-subclipse: + buildorder: 50 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Module API. + eclipse-tm-terminal: + buildorder: 50 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Module API. + Runtime dependency of eclipse-dltk, eclipse-remote. + eclipse-usage: + buildorder: 50 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Module API. ed25519-java: buildorder: 10 - ref: f30 + ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of eclipse-jgit. felix-gogo-command: - buildorder: 30 - ref: f30 - arches: [x86_64, ppc64le, aarch64, s390x] - rationale: > - Runtime dependency of eclipse. - felix-gogo-parent: - buildorder: 10 - ref: f30 - arches: [x86_64, ppc64le, aarch64, s390x] - rationale: > - Build dependency of felix-gogo-command, - felix-gogo-runtime, felix-gogo-shell. - felix-gogo-runtime: buildorder: 20 - ref: f30 + ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of eclipse, felix-gogo-command, + felix-gogo-runtime: + buildorder: 10 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of felix-gogo-command, felix-gogo-shell. felix-gogo-shell: - buildorder: 30 - ref: f30 + buildorder: 20 + ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of eclipse. felix-scr: buildorder: 30 - ref: f30 + ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of eclipse. + freemarker: + buildorder: 10 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Module API. glassfish-annotation-api: buildorder: 10 - ref: f30 + ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of eclipse. + glassfish-jaxb: + buildorder: 20 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse-cdt. + glassfish-jaxb-api: + buildorder: 10 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse-cdt, glassfish-jaxb. glassfish-jsp: buildorder: 30 - ref: f30 + ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of eclipse. glassfish-jsp-api: buildorder: 20 - ref: f30 + ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of eclipse, glassfish-jsp. + Runtime dependency of glassfish-jsp. glassfish-servlet-api: buildorder: 10 - ref: f30 + ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of eclipse, glassfish-jsp-api, - jetty. + Runtime dependency of glassfish-jsp-api, jetty. google-gson: buildorder: 10 - ref: f30 + ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of eclipse-jgit. + Runtime dependency of eclipse-cdt, eclipse-epp-logging, + eclipse-jgit. icu4j: buildorder: 10 - ref: f30 + ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of eclipse. + jakarta-commons-httpclient: + buildorder: 10 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse-mylyn. javaewah: buildorder: 10 - ref: f30 + ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of eclipse-jgit. jetty: buildorder: 20 - ref: f30 + ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of eclipse, eclipse-jgit. + Runtime dependency of eclipse-jgit. + jna: + buildorder: 10 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of jsch-agent-proxy, svnkit. + jsch-agent-proxy: + buildorder: 20 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of svnkit. kxml: buildorder: 20 - ref: f30 + ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of felix-scr. + lpg: + buildorder: 10 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse-cdt, eclipse-dtp. lucene: buildorder: 10 - ref: f30 + ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of eclipse. + Runtime dependency of eclipse-dltk, eclipse-dtp, + eclipse-mylyn. + nekohtml: + buildorder: 10 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Module API. + objectweb-asm: + buildorder: 10 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + rxtx: + buildorder: 10 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Module API. sac: buildorder: 10 - ref: f30 + ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of eclipse. sat4j: buildorder: 10 - ref: f30 + ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of eclipse. + sequence-library: + buildorder: 10 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of svnkit. + sqljet: + buildorder: 30 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of svnkit. + stringtemplate: + buildorder: 10 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of antlr32. + svnkit: + buildorder: 40 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse-subclipse. + swt-chart: + buildorder: 10 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Module API. + trilead-ssh2: + buildorder: 10 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of jsch-agent-proxy, svnkit. + ws-commons-util: + buildorder: 10 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of xmlrpc. + wsdl4j: + buildorder: 10 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse-dtp. xmlgraphics-commons: buildorder: 10 - ref: f30 + ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of batik, eclipse. + Runtime dependency of batik. + xmlrpc: + buildorder: 20 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse-mylyn. xpp3: buildorder: 10 - ref: f30 + ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of felix-scr, kxml. diff --git a/koschei.cfg b/koschei.cfg index 05fcdcd..3c0598a 100644 --- a/koschei.cfg +++ b/koschei.cfg @@ -6,25 +6,51 @@ config = { "platform", ], "requires": [ + "ant", + "maven", "platform", ], "bootstrap": False, "full_refs": False, - "default_ref": "f30", + "default_ref": "eclipse", "include_build_deps": False, "closure": False, "filter_unused": True, "topo_sort": True, "api": [ - "eclipse", + "eclipse-cdt-native", + "eclipse-dltk", + "eclipse-dltk-mylyn", + "eclipse-dltk-rse", + "eclipse-dltk-ruby", + "eclipse-dltk-sh", + "eclipse-dltk-tcl", + "eclipse-dtp", "eclipse-egit", + "eclipse-egit-mylyn", + "eclipse-epp-logging", + "eclipse-gef", + "eclipse-jdt", + "eclipse-jgit", + "eclipse-launchbar", + "eclipse-mpc", + "eclipse-pde", + "eclipse-subclipse", + "eclipse-tm-terminal", + "eclipse-usage", + "freemarker", + "glassfish-jaxb-runtime", + "nekohtml", + "rxtx", + "swt-chart", ], "profiles": { "default": [ - "eclipse", - "eclipse-egit", + "eclipse-jdt", + "eclipse-mpc", + "eclipse-usage", ], }, "filter": [ @@ -32,82 +58,64 @@ config = { "includes": [ ], "excludes": [ - # Packages from ant module - "ant", - "antlr", - "apache-commons-logging", - "apache-commons-net", - "apiguardian", - "bcel", - "bsf", - "hamcrest", - "jakarta-oro", - "javamail", - "jdepend", - "jsch", - "junit", - "junit5", - "jzlib", - "log4j12", - "opentest4j", - "regexp", - "univocity-parsers", - "xalan-j2", - "xerces-j2", - "xml-commons-apis", - "xml-commons-resolver", - "xz-java", - # Packages from maven module - "aopalliance", - "apache-commons-cli", - "apache-commons-codec", - "apache-commons-io", - "apache-commons-lang3", - "apache-commons-logging", - "atinject", - "cdi-api", - "geronimo-annotation", - "glassfish-el", - "google-guice", - "guava20", - "hawtjni", - "httpcomponents-client", - "httpcomponents-core", - "jansi", - "jansi-native", - "jboss-interceptors-1.2-api", - "jsoup", - "maven", - "maven-resolver", - "maven-shared-utils", - "maven-wagon", - "plexus-cipher", - "plexus-classworlds", - "plexus-containers", - "plexus-interpolation", - "plexus-sec-dispatcher", - "plexus-utils", - "sisu", - "slf4j", # Additional Runtime Exclusions - "javapackages-tools", + "apache-commons-math", + "cglib", + "dnsjava", + "easymock", + "gpars", + "groovy", + "guava", + "jmh", + "jsr-305", + "objenesis", "osgi-core", + "qdox", + # For minimal glassfish-jaxb + "bea-stax", + "glassfish-fastinfoset", + "istack-commons", + "relaxngDatatype", + "stax-ex", + "xmlstreambuffer", + "xsom", + # For minimal eclipse-subclipse + "subversion", + # For bootstrap eclipse + "eclipse", + "eclipse-ecf", + "eclipse-emf", + "eclipse-tm-terminal-connectors", + "eclipse-linuxtools-docker", ], + "module_excludes": { + ("ant", "1.10"), + ("maven", "3.5"), + ("javapackages-runtime", "201801"), + }, "frozen_refs": [ ], "stream_override": { + "ant": { + "2019-03": "[1.10]", + }, + "maven": { + "2019-03": "[3.5]", + }, "tycho": { "2019-03": "[1.3]", }, "platform": { - "2019-03": "[f28]", + "2019-03": "[]", }, }, "macros": { "_with_bootstrap": 1, "_with_jp_minimal": 1, - "_without_providers": 1, + "_without_javahl": 1, + "_without_contrib_tools": 1, + "_without_remote": 1, }, "summary": "An open, extensible IDE and application platform", From f11689e361c8989f59a28eb6e26826322ef8b6d0 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Sat, 11 May 2019 09:00:52 +0100 Subject: [PATCH 05/61] Rebuild with fixed Freemarker From b7554f2bfcdae6bbb05e60ee5333990396ba5038 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Sat, 11 May 2019 09:43:53 +0100 Subject: [PATCH 06/61] Rebuild with fixed Freemarker From ce04c3085fede3825563593912d9f3240b9d7933 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Mon, 13 May 2019 10:55:49 +0100 Subject: [PATCH 07/61] Disable javadoc for jaxb packages From 06d8562921073524e672787b3a1daf783fd58e16 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Fri, 31 May 2019 17:35:47 +0100 Subject: [PATCH 08/61] Add egit-github, pydev, abrt + deps --- eclipse.yaml | 171 +++++++++++++++++++++++++++++++++++++++++++++------ koschei.cfg | 15 +++-- 2 files changed, 161 insertions(+), 25 deletions(-) diff --git a/eclipse.yaml b/eclipse.yaml index 4ba341b..a973d8e 100644 --- a/eclipse.yaml +++ b/eclipse.yaml @@ -21,14 +21,17 @@ data: profiles: default: rpms: + - eclipse-abrt - eclipse-jdt - eclipse-mpc - eclipse-usage api: rpms: + - eclipse-abrt - eclipse-cdt-native - eclipse-dtp - eclipse-egit + - eclipse-egit-github - eclipse-egit-mylyn - eclipse-epp-logging - eclipse-gef @@ -37,10 +40,12 @@ data: - eclipse-launchbar - eclipse-mpc - eclipse-pde + - eclipse-pydev - eclipse-subclipse - eclipse-tm-terminal - eclipse-usage - freemarker + - glassfish-jaxb-runtime - nekohtml - rxtx - swt-chart @@ -57,6 +62,7 @@ data: - args4j-javadoc - args4j-parent - args4j-tools + - base64coder-javadoc - batik-demo - batik-javadoc - batik-rasterizer @@ -85,7 +91,6 @@ data: - eclipse-mylyn-docs-epub - eclipse-mylyn-docs-wikitext - eclipse-mylyn-sdk - - eclipse-mylyn-tasks-bugzilla - eclipse-mylyn-tasks-trac - eclipse-mylyn-tasks-web - eclipse-mylyn-tests @@ -93,7 +98,9 @@ data: - eclipse-mylyn-versions-cvs - eclipse-mylyn-versions-git - eclipse-mylyn-versions-subclipse + - eclipse-pydev-mylyn - eclipse-tm-terminal-connectors + - eclipse-tm-terminal-rse - eclipse-tm-terminal-sdk - ed25519-java-javadoc - felix-gogo-command-javadoc @@ -130,6 +137,10 @@ data: - jakarta-commons-httpclient-javadoc - jakarta-commons-httpclient-manual - javaewah-javadoc + - jctools-channels + - jctools-experimental + - jctools-javadoc + - jctools-parent - jetty - jetty-alpn-client - jetty-alpn-server @@ -181,11 +192,22 @@ data: - jetty-websocket-server - jetty-websocket-servlet - jetty-xml + - jffi-javadoc - jgit-javadoc + - jline-javadoc - jna-javadoc + - jnr-constants-javadoc + - jnr-enxio-javadoc + - jnr-ffi-javadoc + - jnr-netdb-javadoc + - jnr-posix-javadoc + - jnr-unixsocket-javadoc + - jnr-x86asm-javadoc - jsch-agent-proxy-javadoc - jsch-agent-proxy-jsch - jsch-agent-proxy-sshj + - jython-demo + - jython-javadoc - kxml-javadoc - lpg - lpg-java @@ -217,9 +239,11 @@ data: - lucene-test-framework - nekohtml-demo - nekohtml-javadoc + - netty-javadoc - objectweb-asm-javadoc - sac-javadoc - sequence-library-javadoc + - snakeyaml-javadoc - sqljet-javadoc - stringtemplate-javadoc - svnkit-cli @@ -230,7 +254,6 @@ data: - wsdl4j-javadoc - xmlgraphics-commons-javadoc - xmlrpc-javadoc - - xmlrpc-server - xpp3-javadoc - xpp3-minimal buildopts: @@ -239,6 +262,8 @@ data: %_with_bootstrap 1 %_with_jp_minimal 1 %_without_javahl 1 + %_without_spring 1 + %_without_mylyn_epub 1 %_without_contrib_tools 1 %_without_remote 1 components: @@ -248,13 +273,13 @@ data: ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of sqljet. + Runtime dependency of eclipse-pydev, jython, sqljet. apache-commons-compress: buildorder: 10 ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of eclipse-jgit. + Runtime dependency of eclipse-jgit, jython. apache-commons-el: buildorder: 10 ref: eclipse @@ -283,6 +308,12 @@ data: arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of eclipse-jgit. + base64coder: + buildorder: 10 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of snakeyaml. batik: buildorder: 20 ref: eclipse @@ -293,7 +324,13 @@ data: ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of eclipse-jgit. + Runtime dependency of eclipse-jgit, jython. + eclipse-abrt: + buildorder: 50 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Module API. eclipse-cdt: buildorder: 60 ref: eclipse @@ -313,14 +350,21 @@ data: arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Module API. - Runtime dependency of eclipse-tm-terminal. + Runtime dependency of eclipse-egit-github, + eclipse-tm-terminal. + eclipse-egit-github: + buildorder: 50 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Module API. eclipse-epp-logging: buildorder: 40 ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Module API. - Runtime dependency of eclipse-usage. + Runtime dependency of eclipse-abrt, eclipse-usage. eclipse-gef: buildorder: 10 ref: eclipse @@ -334,7 +378,8 @@ data: arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Module API. - Runtime dependency of eclipse-egit. + Runtime dependency of eclipse-egit, + eclipse-egit-github. eclipse-launchbar: buildorder: 10 ref: eclipse @@ -352,8 +397,15 @@ data: ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of eclipse-dltk, eclipse-egit, - eclipse-epp-logging, eclipse-subclipse. + Runtime dependency of eclipse-abrt, eclipse-egit, + eclipse-egit-github, eclipse-epp-logging, + eclipse-subclipse. + eclipse-pydev: + buildorder: 50 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Module API. eclipse-remote: buildorder: 70 ref: eclipse @@ -372,7 +424,7 @@ data: arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Module API. - Runtime dependency of eclipse-dltk, eclipse-remote. + Runtime dependency of eclipse-remote. eclipse-usage: buildorder: 50 ref: eclipse @@ -423,7 +475,7 @@ data: ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of eclipse-cdt. + Module API. glassfish-jaxb-api: buildorder: 10 ref: eclipse @@ -452,13 +504,14 @@ data: ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of eclipse-cdt, eclipse-epp-logging, - eclipse-jgit. + Runtime dependency of eclipse-cdt, eclipse-egit-github, + eclipse-epp-logging, eclipse-jgit, eclipse-mylyn. icu4j: buildorder: 10 ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > + Runtime dependency of jython. jakarta-commons-httpclient: buildorder: 10 ref: eclipse @@ -471,24 +524,92 @@ data: arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of eclipse-jgit. + jctools: + buildorder: 10 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of jython, netty. jetty: buildorder: 20 ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of eclipse-jgit. + jffi: + buildorder: 10 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of jnr-ffi, jython. + jline: + buildorder: 10 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of jython. jna: buildorder: 10 ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of jsch-agent-proxy, svnkit. + jnr-constants: + buildorder: 10 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of jnr-enxio, jnr-posix, + jnr-unixsocket, jython. + jnr-enxio: + buildorder: 30 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse-abrt, jnr-unixsocket. + jnr-ffi: + buildorder: 20 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of jnr-enxio, jnr-netdb, jnr-posix, + jnr-unixsocket, jython. + jnr-netdb: + buildorder: 30 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of jython. + jnr-posix: + buildorder: 30 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of jnr-unixsocket, jython. + jnr-unixsocket: + buildorder: 40 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse-abrt. + jnr-x86asm: + buildorder: 10 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of jnr-ffi. jsch-agent-proxy: buildorder: 20 ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of svnkit. + jython: + buildorder: 40 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse-pydev. kxml: buildorder: 20 ref: eclipse @@ -500,25 +621,31 @@ data: ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of eclipse-cdt, eclipse-dtp. + Runtime dependency of eclipse-dtp. lucene: buildorder: 10 ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of eclipse-dltk, eclipse-dtp, - eclipse-mylyn. + Runtime dependency of eclipse-dtp, eclipse-mylyn. nekohtml: buildorder: 10 ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Module API. + netty: + buildorder: 20 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of jython. objectweb-asm: buildorder: 10 ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > + Runtime dependency of jnr-ffi, jython. rxtx: buildorder: 10 ref: eclipse @@ -541,6 +668,12 @@ data: arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of svnkit. + snakeyaml: + buildorder: 20 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse-pydev. sqljet: buildorder: 30 ref: eclipse @@ -576,7 +709,7 @@ data: ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of xmlrpc. + Runtime dependency of eclipse-pydev, xmlrpc. wsdl4j: buildorder: 10 ref: eclipse @@ -594,7 +727,7 @@ data: ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of eclipse-mylyn. + Runtime dependency of eclipse-mylyn, eclipse-pydev. xpp3: buildorder: 10 ref: eclipse diff --git a/koschei.cfg b/koschei.cfg index 3c0598a..a209fd5 100644 --- a/koschei.cfg +++ b/koschei.cfg @@ -20,15 +20,11 @@ config = { "topo_sort": True, "api": [ + "eclipse-abrt", "eclipse-cdt-native", - "eclipse-dltk", - "eclipse-dltk-mylyn", - "eclipse-dltk-rse", - "eclipse-dltk-ruby", - "eclipse-dltk-sh", - "eclipse-dltk-tcl", "eclipse-dtp", "eclipse-egit", + "eclipse-egit-github", "eclipse-egit-mylyn", "eclipse-epp-logging", "eclipse-gef", @@ -37,6 +33,7 @@ config = { "eclipse-launchbar", "eclipse-mpc", "eclipse-pde", + "eclipse-pydev", "eclipse-subclipse", "eclipse-tm-terminal", "eclipse-usage", @@ -48,6 +45,7 @@ config = { ], "profiles": { "default": [ + "eclipse-abrt", "eclipse-jdt", "eclipse-mpc", "eclipse-usage", @@ -81,6 +79,9 @@ config = { "xsom", # For minimal eclipse-subclipse "subversion", + # For minimal netty + "aalto-xml", + "stax2-api", # For bootstrap eclipse "eclipse", "eclipse-ecf", @@ -114,6 +115,8 @@ config = { "_with_bootstrap": 1, "_with_jp_minimal": 1, "_without_javahl": 1, + "_without_spring": 1, + "_without_mylyn_epub": 1, "_without_contrib_tools": 1, "_without_remote": 1, }, From 4a075c1c1bbd2647863fc61049e4cf576aa277af Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Sat, 1 Jun 2019 08:19:16 +0100 Subject: [PATCH 09/61] Add javaparser dep for jctools --- eclipse.yaml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/eclipse.yaml b/eclipse.yaml index a973d8e..1d9181e 100644 --- a/eclipse.yaml +++ b/eclipse.yaml @@ -137,6 +137,8 @@ data: - jakarta-commons-httpclient-javadoc - jakarta-commons-httpclient-manual - javaewah-javadoc + - javaparser + - javaparser-javadoc - jctools-channels - jctools-experimental - jctools-javadoc @@ -524,10 +526,16 @@ data: arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of eclipse-jgit. - jctools: + javaparser: buildorder: 10 ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Build dependency of jctools. + jctools: + buildorder: 20 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of jython, netty. jetty: @@ -635,7 +643,7 @@ data: rationale: > Module API. netty: - buildorder: 20 + buildorder: 30 ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > From 284f7a22dcd570fd652f59ee8d4ea854e1e4c53f Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Sat, 1 Jun 2019 11:31:58 +0100 Subject: [PATCH 10/61] Avoid failing module build due to intermittent test failures in jctools package From 4d5c7c014c8cd94d1b3496661a4d6ec072a68582 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Sun, 2 Jun 2019 15:06:51 +0100 Subject: [PATCH 11/61] Add eclipse-ptp and build against tycho 1.4 --- clone_rpms.sh | 17 +++++++++++++++++ eclipse.yaml | 45 ++++++++++++++++++++++++++------------------- 2 files changed, 43 insertions(+), 19 deletions(-) create mode 100755 clone_rpms.sh diff --git a/clone_rpms.sh b/clone_rpms.sh new file mode 100755 index 0000000..08c839a --- /dev/null +++ b/clone_rpms.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +script_location=$( (cd $(dirname $0) && pwd) ) + +module=$(basename $script_location`) + +mkdir -p rpms +pushd rpms 2>&1 >/dev/null + +for pkg in $(grep -B1 --no-group-separator buildorder ../$module.yaml | grep -v buildorder | sed -e 's/:$//') ; do + if [ ! -d "$pkg" ] ; then + fedpkg clone $pkg + (cd $pkg ; fedpkg switch-branch master ; fedpkg switch-branch $module) + fi +done + +popd 2>&1 >/dev/null diff --git a/eclipse.yaml b/eclipse.yaml index 1d9181e..2857f93 100644 --- a/eclipse.yaml +++ b/eclipse.yaml @@ -12,7 +12,7 @@ data: - MIT dependencies: - buildrequires: - tycho: [1.3] + tycho: [1.4] platform: [] requires: ant: [1.10] @@ -44,11 +44,6 @@ data: - eclipse-subclipse - eclipse-tm-terminal - eclipse-usage - - freemarker - - glassfish-jaxb-runtime - - nekohtml - - rxtx - - swt-chart filter: rpms: - antlr32-javadoc @@ -71,8 +66,6 @@ data: - batik-svgpp - batik-ttf2svg - bouncycastle-javadoc - - bouncycastle-mail - - bouncycastle-tls - eclipse-cdt - eclipse-cdt-arduino - eclipse-cdt-docker @@ -125,7 +118,6 @@ data: - glassfish-jaxb-txw-parent - glassfish-jaxb-txwc2 - glassfish-jaxb-xjc - - glassfish-jaxb1-impl - glassfish-jsp-api-javadoc - glassfish-jsp-javadoc - glassfish-servlet-api-javadoc @@ -339,7 +331,8 @@ data: arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Module API. - Runtime dependency of eclipse-remote. + Runtime dependency of eclipse-photran, eclipse-ptp, + eclipse-remote. eclipse-dtp: buildorder: 20 ref: eclipse @@ -381,7 +374,7 @@ data: rationale: > Module API. Runtime dependency of eclipse-egit, - eclipse-egit-github. + eclipse-egit-github, eclipse-ptp. eclipse-launchbar: buildorder: 10 ref: eclipse @@ -402,6 +395,20 @@ data: Runtime dependency of eclipse-abrt, eclipse-egit, eclipse-egit-github, eclipse-epp-logging, eclipse-subclipse. + eclipse-photran: + buildorder: 70 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Module API. + Runtime dependency of eclipse-ptp. + eclipse-ptp: + buildorder: 80 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Module API. + Runtime dependency of eclipse-linuxtools. eclipse-pydev: buildorder: 50 ref: eclipse @@ -413,7 +420,7 @@ data: ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of eclipse-launchbar. + Runtime dependency of eclipse-launchbar, eclipse-ptp. eclipse-subclipse: buildorder: 50 ref: eclipse @@ -426,7 +433,7 @@ data: arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Module API. - Runtime dependency of eclipse-remote. + Runtime dependency of eclipse-ptp, eclipse-remote. eclipse-usage: buildorder: 50 ref: eclipse @@ -466,7 +473,7 @@ data: ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Module API. + Runtime dependency of eclipse-cdt. glassfish-annotation-api: buildorder: 10 ref: eclipse @@ -477,7 +484,7 @@ data: ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Module API. + Runtime dependency of eclipse-cdt, eclipse-ptp. glassfish-jaxb-api: buildorder: 10 ref: eclipse @@ -629,7 +636,7 @@ data: ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of eclipse-dtp. + Runtime dependency of eclipse-cdt, eclipse-dtp. lucene: buildorder: 10 ref: eclipse @@ -641,7 +648,7 @@ data: ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Module API. + Runtime dependency of eclipse-linuxtools. netty: buildorder: 30 ref: eclipse @@ -659,7 +666,7 @@ data: ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Module API. + Runtime dependency of eclipse-tm-terminal. sac: buildorder: 10 ref: eclipse @@ -705,7 +712,7 @@ data: ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Module API. + Runtime dependency of eclipse-linuxtools. trilead-ssh2: buildorder: 10 ref: eclipse From 8e07db140e9de081652e6e16a31961731784ff25 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Wed, 5 Jun 2019 21:17:52 +0100 Subject: [PATCH 12/61] Add linuxtools pre-reqs --- .gitignore | 2 + clone_rpms.sh | 2 +- eclipse.yaml | 125 ++++++++++++++++++++++++++++++++------- gen_build_order_graph.py | 54 +++++++++++++++++ 4 files changed, 159 insertions(+), 24 deletions(-) create mode 100644 .gitignore create mode 100755 gen_build_order_graph.py diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e4e766e --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +/*.png +/rpms/ diff --git a/clone_rpms.sh b/clone_rpms.sh index 08c839a..0558d91 100755 --- a/clone_rpms.sh +++ b/clone_rpms.sh @@ -2,7 +2,7 @@ script_location=$( (cd $(dirname $0) && pwd) ) -module=$(basename $script_location`) +module=$(basename $script_location) mkdir -p rpms pushd rpms 2>&1 >/dev/null diff --git a/eclipse.yaml b/eclipse.yaml index 2857f93..13b57f5 100644 --- a/eclipse.yaml +++ b/eclipse.yaml @@ -273,7 +273,7 @@ data: ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of eclipse-jgit, jython. + Runtime dependency of docker-client-java, eclipse-jgit, jython. apache-commons-el: buildorder: 10 ref: eclipse @@ -284,12 +284,13 @@ data: ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > + Runtime dependency of eclipse. apache-commons-lang: buildorder: 10 ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of eclipse-mylyn. + Runtime dependency of docker-client-java, eclipse-mylyn. apache-sshd: buildorder: 10 ref: eclipse @@ -313,12 +314,25 @@ data: ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > + Runtime dependency of eclipse. + bean-validation-api: + buildorder: 10 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of jersey. bouncycastle: buildorder: 10 ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of eclipse-jgit, jython. + Runtime dependency of docker-client-java, eclipse-jgit, jython. + docker-client-java: + buildorder: 50 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse-linuxtools. eclipse-abrt: buildorder: 50 ref: eclipse @@ -331,8 +345,7 @@ data: arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Module API. - Runtime dependency of eclipse-photran, eclipse-ptp, - eclipse-remote. + Runtime dependency of eclipse-ptp, eclipse-remote. eclipse-dtp: buildorder: 20 ref: eclipse @@ -395,13 +408,6 @@ data: Runtime dependency of eclipse-abrt, eclipse-egit, eclipse-egit-github, eclipse-epp-logging, eclipse-subclipse. - eclipse-photran: - buildorder: 70 - ref: eclipse - arches: [x86_64, ppc64le, aarch64, s390x] - rationale: > - Module API. - Runtime dependency of eclipse-ptp. eclipse-ptp: buildorder: 80 ref: eclipse @@ -451,23 +457,26 @@ data: ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > + Runtime dependency of eclipse. felix-gogo-runtime: buildorder: 10 ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of felix-gogo-command, + Runtime dependency of eclipse, felix-gogo-command, felix-gogo-shell. felix-gogo-shell: buildorder: 20 ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > + Runtime dependency of eclipse. felix-scr: buildorder: 30 ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > + Runtime dependency of eclipse. freemarker: buildorder: 10 ref: eclipse @@ -479,6 +488,19 @@ data: ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > + Runtime dependency of eclipse, glassfish-hk2, jersey. + glassfish-hk2: + buildorder: 20 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of docker-client-java, jersey. + glassfish-jax-rs-api: + buildorder: 10 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse-linuxtools, jersey. glassfish-jaxb: buildorder: 20 ref: eclipse @@ -490,37 +512,79 @@ data: ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of eclipse-cdt, glassfish-jaxb. + Runtime dependency of eclipse-cdt, eclipse-ptp, glassfish-jaxb. glassfish-jsp: buildorder: 30 ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > + Runtime dependency of eclipse. glassfish-jsp-api: buildorder: 20 ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of glassfish-jsp. + Runtime dependency of eclipse, glassfish-jsp. glassfish-servlet-api: buildorder: 10 ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of glassfish-jsp-api, jetty. + Runtime dependency of eclipse, glassfish-jsp-api, jetty. google-gson: buildorder: 10 ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of eclipse-cdt, eclipse-egit-github, + Runtime dependency of eclipse, eclipse-cdt, eclipse-egit-github, eclipse-epp-logging, eclipse-jgit, eclipse-mylyn. icu4j: buildorder: 10 ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of jython. + Runtime dependency of eclipse, jython. + jackson-annotations: + buildorder: 10 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse-linuxtools, + jackson-databind, jackson-modules-base, jersey. + jackson-core: + buildorder: 10 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of jackson-databind, + jackson-datatypes-collections, jackson-jaxrs-providers, + jackson-modules-base. + jackson-databind: + buildorder: 20 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of docker-client-java, + eclipse-linuxtools, jackson-datatypes-collections, + jackson-jaxrs-providers, jackson-modules-base, jersey. + jackson-datatypes-collections: + buildorder: 30 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of docker-client-java. + jackson-jaxrs-providers: + buildorder: 40 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of docker-client-java. + jackson-modules-base: + buildorder: 30 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of jackson-jaxrs-providers, jersey. jakarta-commons-httpclient: buildorder: 10 ref: eclipse @@ -539,6 +603,19 @@ data: arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Build dependency of jctools. + javassist: + buildorder: 10 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of glassfish-hk2. + jersey: + buildorder: 40 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of docker-client-java, + eclipse-linuxtools. jctools: buildorder: 20 ref: eclipse @@ -550,7 +627,7 @@ data: ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of eclipse-jgit. + Runtime dependency of eclipse, eclipse-jgit. jffi: buildorder: 10 ref: eclipse @@ -606,7 +683,7 @@ data: ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of eclipse-abrt. + Runtime dependency of docker-client-java, eclipse-abrt. jnr-x86asm: buildorder: 10 ref: eclipse @@ -636,13 +713,13 @@ data: ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of eclipse-cdt, eclipse-dtp. + Runtime dependency of eclipse-dtp. lucene: buildorder: 10 ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of eclipse-dtp, eclipse-mylyn. + Runtime dependency of eclipse, eclipse-dtp, eclipse-mylyn. nekohtml: buildorder: 10 ref: eclipse @@ -660,7 +737,7 @@ data: ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of jnr-ffi, jython. + Runtime dependency of eclipse, jersey, jnr-ffi, jython. rxtx: buildorder: 10 ref: eclipse @@ -672,11 +749,13 @@ data: ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > + Runtime dependency of eclipse. sat4j: buildorder: 10 ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > + Runtime dependency of eclipse. sequence-library: buildorder: 10 ref: eclipse diff --git a/gen_build_order_graph.py b/gen_build_order_graph.py new file mode 100755 index 0000000..44223dc --- /dev/null +++ b/gen_build_order_graph.py @@ -0,0 +1,54 @@ +#!/usr/bin/python3 + +import yaml +from pygraphviz import AGraph +from subprocess import call + +with open("eclipse.yaml", 'r') as stream: + yaml = yaml.safe_load(stream) + +rpms = yaml['data']['components']['rpms'] + +g = AGraph(directed=True, name="G", strict=False, label="Build Order Graph") +ranks = [] +for key, value in rpms.items(): + rank = value['buildorder'] + if rank not in ranks: + ranks.append(rank) + subg = g.get_subgraph(f"{rank}") + if subg is None: + subg = g.add_subgraph(name=f"{rank}", label=f"Build Order {rank}", rank="same") + subg.add_node(f"{rank}") + subg.add_node(key) + rs = value['rationale'].replace('\n', ' ').split('.') + reqs = [] + breqs = [] + for r in rs: + r = r.strip() + if not r or r == 'Module API': + continue + if r.startswith('Runtime dependency of'): + r = r[len('Runtime dependency of'):] + reqs = [x.strip() for x in r.split(',')] + if r.startswith('Build dependency of'): + r = r[len('Build dependency of'):] + breqs = [x.strip() for x in r.split(',')] + for req in reqs: + # For Rs, check if also a BR + if req not in breqs: + g.add_edge(key, req, color='blue') + else: + g.add_edge(key, req, color='purple') + for breq in breqs: + # For BRs, check if also a R + if breq not in reqs: + g.add_edge(key, breq, color='red') +ranks.sort() +for idx, rank in enumerate(ranks): + if idx+1 < len(ranks): + g.add_edge(rank, ranks[idx+1], weight=1000) + + +print(g.string()) +g.draw("build_order_graph.png", prog="dot") +call('eog build_order_graph.png &', shell=True) From d6dbd842dabe22e245704f1f9275f6c6e6ee72cd Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Thu, 6 Jun 2019 03:49:16 +0100 Subject: [PATCH 13/61] Rebuild to workaround rhbz#1717650 From 1bc17e0efc3f29a844cce0992615de2e0049f781 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Thu, 6 Jun 2019 14:42:30 +0100 Subject: [PATCH 14/61] Build without photran support --- eclipse.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/eclipse.yaml b/eclipse.yaml index 13b57f5..5637982 100644 --- a/eclipse.yaml +++ b/eclipse.yaml @@ -260,6 +260,7 @@ data: %_without_mylyn_epub 1 %_without_contrib_tools 1 %_without_remote 1 + %_without_photran_support 1 components: rpms: antlr32: From ea90efd84f374f99db0323c67d97dcaf07adc434 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Fri, 7 Jun 2019 18:52:15 +0100 Subject: [PATCH 15/61] Build with updated PTP From 0cb3f4c2e3365e35a6cf4c11bc919b9e8d9a76e6 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Sat, 8 Jun 2019 16:16:21 +0100 Subject: [PATCH 16/61] Build with improved bootstrap mode for CDT and without reflections library for JNA --- eclipse.yaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/eclipse.yaml b/eclipse.yaml index 5637982..f5894a8 100644 --- a/eclipse.yaml +++ b/eclipse.yaml @@ -261,6 +261,7 @@ data: %_without_contrib_tools 1 %_without_remote 1 %_without_photran_support 1 + %_without_reflections 1 components: rpms: antlr32: @@ -280,6 +281,7 @@ data: ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > + Runtime dependency of eclipse. apache-commons-jxpath: buildorder: 10 ref: eclipse @@ -395,6 +397,7 @@ data: arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Module API. + Runtime dependency of eclipse-cdt. eclipse-mpc: buildorder: 10 ref: eclipse @@ -427,7 +430,7 @@ data: ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of eclipse-launchbar, eclipse-ptp. + Runtime dependency of eclipse-ptp. eclipse-subclipse: buildorder: 50 ref: eclipse @@ -440,7 +443,7 @@ data: arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Module API. - Runtime dependency of eclipse-ptp, eclipse-remote. + Runtime dependency of eclipse-cdt, eclipse-ptp, eclipse-remote. eclipse-usage: buildorder: 50 ref: eclipse From ef7ef4174414a72205157501409bc31d50d00503 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Sun, 9 Jun 2019 00:00:50 +0100 Subject: [PATCH 17/61] Rebuild due to broken MBS From 2e14434dc553c3b2cf993273b726cf64179b0dd2 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Sun, 9 Jun 2019 13:04:11 +0100 Subject: [PATCH 18/61] Rebuild on 2019-06 branch From 2a981c10df960c89990773b559da2f1742a334ba Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Tue, 11 Jun 2019 00:32:54 +0100 Subject: [PATCH 19/61] Add webtools, testng and m2e deps. --- clone_rpms.sh | 3 +- eclipse.yaml | 188 +++++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 173 insertions(+), 18 deletions(-) diff --git a/clone_rpms.sh b/clone_rpms.sh index 0558d91..b21c525 100755 --- a/clone_rpms.sh +++ b/clone_rpms.sh @@ -7,10 +7,11 @@ module=$(basename $script_location) mkdir -p rpms pushd rpms 2>&1 >/dev/null +rm -f need_branch for pkg in $(grep -B1 --no-group-separator buildorder ../$module.yaml | grep -v buildorder | sed -e 's/:$//') ; do if [ ! -d "$pkg" ] ; then fedpkg clone $pkg - (cd $pkg ; fedpkg switch-branch master ; fedpkg switch-branch $module) + (cd $pkg ; if ! fedpkg switch-branch $module ; then echo $pkg >> ../need_branch ; fi) fi done diff --git a/eclipse.yaml b/eclipse.yaml index f5894a8..42981ef 100644 --- a/eclipse.yaml +++ b/eclipse.yaml @@ -262,20 +262,40 @@ data: %_without_remote 1 %_without_photran_support 1 %_without_reflections 1 + %_without_okcurl 1 components: rpms: + aether-connector-okhttp: + buildorder: 30 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse-m2e-core. antlr32: buildorder: 20 ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of eclipse-pydev, jython, sqljet. + apache-commons-collections: + buildorder: 10 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse-m2e-core, + eclipse-webtools, plexus-velocity, velocity. apache-commons-compress: buildorder: 10 ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of docker-client-java, eclipse-jgit, jython. + apache-commons-discovery: + buildorder: 10 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse-webtools. apache-commons-el: buildorder: 10 ref: eclipse @@ -293,7 +313,8 @@ data: ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of docker-client-java, eclipse-mylyn. + Runtime dependency of docker-client-java, eclipse-m2e-core, + eclipse-mylyn, eclipse-webtools, velocity. apache-sshd: buildorder: 10 ref: eclipse @@ -305,13 +326,19 @@ data: ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of eclipse-jgit. + Runtime dependency of closure-compiler, eclipse-jgit. base64coder: buildorder: 10 ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of snakeyaml. + beust-jcommander: + buildorder: 10 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of testng. batik: buildorder: 20 ref: eclipse @@ -329,7 +356,14 @@ data: ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of docker-client-java, eclipse-jgit, jython. + Runtime dependency of docker-client-java, eclipse-jgit, + jython, okhttp. + closure-compiler: + buildorder: 20 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse-webtools. docker-client-java: buildorder: 50 ref: eclipse @@ -355,6 +389,7 @@ data: arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Module API. + Runtime dependency of eclipse-webtools. eclipse-egit: buildorder: 40 ref: eclipse @@ -382,7 +417,7 @@ data: arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Module API. - Runtime dependency of eclipse-dtp, eclipse-subclipse. + Runtime dependency of eclipse-dtp, eclipse-subclipse, eclipse-webtools. eclipse-jgit: buildorder: 30 ref: eclipse @@ -398,6 +433,19 @@ data: rationale: > Module API. Runtime dependency of eclipse-cdt. + eclipse-m2e-core: + buildorder: 50 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Module API. + Runtime dependency of eclipse-testng. + eclipse-m2e-workspace: + buildorder: 10 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse-m2e-core. eclipse-mpc: buildorder: 10 ref: eclipse @@ -409,6 +457,7 @@ data: ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > + Module API. Runtime dependency of eclipse-abrt, eclipse-egit, eclipse-egit-github, eclipse-epp-logging, eclipse-subclipse. @@ -437,6 +486,12 @@ data: arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Module API. + eclipse-testng: + buildorder: 60 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Module API. eclipse-tm-terminal: buildorder: 50 ref: eclipse @@ -450,6 +505,13 @@ data: arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Module API. + eclipse-webtools: + buildorder: 30 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Module API. + Runtime dependency of eclipse-m2e-core. ed25519-java: buildorder: 10 ref: eclipse @@ -517,6 +579,12 @@ data: arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of eclipse-cdt, eclipse-ptp, glassfish-jaxb. + glassfish-jaxrpc-api: + buildorder: 10 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse-webtools. glassfish-jsp: buildorder: 30 ref: eclipse @@ -540,8 +608,9 @@ data: ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of eclipse, eclipse-cdt, eclipse-egit-github, - eclipse-epp-logging, eclipse-jgit, eclipse-mylyn. + Runtime dependency of closure-compiler, eclipse, eclipse-cdt, eclipse-egit-github, + eclipse-epp-logging, eclipse-jgit, eclipse-m2e-core, eclipse-mylyn, eclipse-testng, + eclipse-webtools, testng-remote. icu4j: buildorder: 10 ref: eclipse @@ -595,6 +664,12 @@ data: arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of eclipse-mylyn. + java_cup: + buildorder: 10 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse-webtools. javaewah: buildorder: 10 ref: eclipse @@ -613,6 +688,19 @@ data: arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of glassfish-hk2. + jchardet: + buildorder: 10 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse-m2e-core, + maven-archetype. + jctools: + buildorder: 20 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of jython, netty. jersey: buildorder: 40 ref: eclipse @@ -620,18 +708,13 @@ data: rationale: > Runtime dependency of docker-client-java, eclipse-linuxtools. - jctools: - buildorder: 20 - ref: eclipse - arches: [x86_64, ppc64le, aarch64, s390x] - rationale: > - Runtime dependency of jython, netty. jetty: buildorder: 20 ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of eclipse, eclipse-jgit. + Runtime dependency of eclipse, eclipse-jgit, + eclipse-m2e-core, eclipse-webtools. jffi: buildorder: 10 ref: eclipse @@ -700,6 +783,12 @@ data: arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of svnkit. + json_simple: + buildorder: 10 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse-webtools. jython: buildorder: 40 ref: eclipse @@ -723,7 +812,20 @@ data: ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of eclipse, eclipse-dtp, eclipse-mylyn. + Runtime dependency of eclipse, eclipse-dtp, + eclipse-m2e-core, eclipse-mylyn, maven-indexer. + maven-archetype: + buildorder: 40 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse-m2e-core. + maven-indexer: + buildorder: 20 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse-m2e-core. nekohtml: buildorder: 10 ref: eclipse @@ -741,7 +843,27 @@ data: ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of eclipse, jersey, jnr-ffi, jython. + Runtime dependency of eclipse, eclipse-m2e-core, jersey, jnr-ffi, jython. + okhttp: + buildorder: 20 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of aether-connector-okhttp, + eclipse-m2e-core. + okio: + buildorder: 10 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of aether-connector-okhttp, + eclipse-m2e-core, okhttp. + protobuf: + buildorder: 10 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of closure-compiler. rxtx: buildorder: 10 ref: eclipse @@ -771,7 +893,7 @@ data: ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of eclipse-pydev. + Runtime dependency of eclipse-pydev, eclipse-testng, testng. sqljet: buildorder: 30 ref: eclipse @@ -796,12 +918,37 @@ data: arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of eclipse-linuxtools. + testng: + buildorder: 30 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse-testng, testng-remote. + testng-remote: + buildorder: 40 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse-testng. trilead-ssh2: buildorder: 10 ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of jsch-agent-proxy, svnkit. + uddi4j: + buildorder: 10 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse-webtools, wsil4j. + velocity: + buildorder: 20 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse-m2e-core, + eclipse-webtools, maven-archetype, plexus-velocity. ws-commons-util: buildorder: 10 ref: eclipse @@ -813,7 +960,14 @@ data: ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of eclipse-dtp. + Runtime dependency of eclipse-dtp, eclipse-webtools, + wsil4j. + wsil4j: + buildorder: 20 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse-webtools. xmlgraphics-commons: buildorder: 10 ref: eclipse From 95afa297388e3059787c141aba1c66ec2a335805 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Tue, 11 Jun 2019 15:16:24 +0100 Subject: [PATCH 20/61] Try specifying platform versions again. --- eclipse.yaml | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/eclipse.yaml b/eclipse.yaml index 42981ef..aedf4c9 100644 --- a/eclipse.yaml +++ b/eclipse.yaml @@ -13,11 +13,11 @@ data: dependencies: - buildrequires: tycho: [1.4] - platform: [] + platform: [f29,f30,f31] requires: ant: [1.10] maven: [3.5] - platform: [] + platform: [f29,f30,f31] profiles: default: rpms: @@ -826,6 +826,18 @@ data: arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of eclipse-m2e-core. + maven-mapping: + buildorder: 10 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of maven-war-plugin. + maven-osgi: + buildorder: 10 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of glassfish-hk2. nekohtml: buildorder: 10 ref: eclipse From 3eb959f62e56b9f8b2b0a411051d4694c6727e23 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Tue, 11 Jun 2019 15:18:37 +0100 Subject: [PATCH 21/61] Include f28 due to https://pagure.io/fm-orchestrator/issue/1243 --- eclipse.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eclipse.yaml b/eclipse.yaml index aedf4c9..3621b88 100644 --- a/eclipse.yaml +++ b/eclipse.yaml @@ -13,11 +13,11 @@ data: dependencies: - buildrequires: tycho: [1.4] - platform: [f29,f30,f31] + platform: [f28,f29,f30,f31] requires: ant: [1.10] maven: [3.5] - platform: [f29,f30,f31] + platform: [f28,f29,f30,f31] profiles: default: rpms: From a0f020f992c36d5b9bc28e11ffd8442a951a6726 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Tue, 11 Jun 2019 18:03:30 +0100 Subject: [PATCH 22/61] Improved ordering, more deps added. --- clone_rpms.sh | 2 +- eclipse.yaml | 36 +++++++++++++++++++++++++++++++----- 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/clone_rpms.sh b/clone_rpms.sh index b21c525..4e71537 100755 --- a/clone_rpms.sh +++ b/clone_rpms.sh @@ -11,8 +11,8 @@ rm -f need_branch for pkg in $(grep -B1 --no-group-separator buildorder ../$module.yaml | grep -v buildorder | sed -e 's/:$//') ; do if [ ! -d "$pkg" ] ; then fedpkg clone $pkg - (cd $pkg ; if ! fedpkg switch-branch $module ; then echo $pkg >> ../need_branch ; fi) fi + (cd $pkg ; git pull ; if ! fedpkg switch-branch $module ; then echo $pkg >> ../need_branch ; fi) done popd 2>&1 >/dev/null diff --git a/eclipse.yaml b/eclipse.yaml index 3621b88..387fa00 100644 --- a/eclipse.yaml +++ b/eclipse.yaml @@ -263,6 +263,7 @@ data: %_without_photran_support 1 %_without_reflections 1 %_without_okcurl 1 + %_without_snappy 1 components: rpms: aether-connector-okhttp: @@ -316,7 +317,7 @@ data: Runtime dependency of docker-client-java, eclipse-m2e-core, eclipse-mylyn, eclipse-webtools, velocity. apache-sshd: - buildorder: 10 + buildorder: 20 ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > @@ -356,8 +357,8 @@ data: ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of docker-client-java, eclipse-jgit, - jython, okhttp. + Runtime dependency of apache-sshd, docker-client-java, + eclipse-jgit, jython, okhttp. closure-compiler: buildorder: 20 ref: eclipse @@ -517,7 +518,7 @@ data: ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of eclipse-jgit. + Runtime dependency of apache-sshd, eclipse-jgit. felix-gogo-command: buildorder: 20 ref: eclipse @@ -726,7 +727,7 @@ data: ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of jython. + Runtime dependency of jython, rhino. jna: buildorder: 10 ref: eclipse @@ -820,6 +821,12 @@ data: arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of eclipse-m2e-core. + maven-filtering: + buildorder: 20 + ref: master + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of maven-war-plugin. maven-indexer: buildorder: 20 ref: eclipse @@ -870,12 +877,31 @@ data: rationale: > Runtime dependency of aether-connector-okhttp, eclipse-m2e-core, okhttp. + plexus-build-api: + buildorder: 10 + ref: master + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse-m2e-core, maven-filtering. + plexus-velocity: + buildorder: 30 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse-m2e-core, + maven-archetype. protobuf: buildorder: 10 ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of closure-compiler. + rhino: + buildorder: 20 + ref: master + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse-webtools. rxtx: buildorder: 10 ref: eclipse From 4ecc47a4fadfb96159bac0a1e6d7c282f65e271f Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Wed, 12 Jun 2019 14:44:34 +0100 Subject: [PATCH 23/61] Add linuxtools, dltk and maven-war-plugin deps --- eclipse.yaml | 81 +++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 65 insertions(+), 16 deletions(-) diff --git a/eclipse.yaml b/eclipse.yaml index 387fa00..f9026f2 100644 --- a/eclipse.yaml +++ b/eclipse.yaml @@ -13,11 +13,11 @@ data: dependencies: - buildrequires: tycho: [1.4] - platform: [f28,f29,f30,f31] + platform: [] requires: ant: [1.10] maven: [3.5] - platform: [f28,f29,f30,f31] + platform: [] profiles: default: rpms: @@ -259,11 +259,12 @@ data: %_without_spring 1 %_without_mylyn_epub 1 %_without_contrib_tools 1 - %_without_remote 1 %_without_photran_support 1 %_without_reflections 1 %_without_okcurl 1 %_without_snappy 1 + %_without_hsqldb 1 + %_without_groovy 1 components: rpms: aether-connector-okhttp: @@ -290,7 +291,8 @@ data: ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of docker-client-java, eclipse-jgit, jython. + Runtime dependency of docker-client-java, eclipse-jgit, + jython, plexus-archiver. apache-commons-discovery: buildorder: 10 ref: eclipse @@ -383,7 +385,14 @@ data: arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Module API. - Runtime dependency of eclipse-ptp, eclipse-remote. + Runtime dependency of eclipse-linuxtools, + eclipse-ptp, eclipse-remote. + eclipse-dltk: + buildorder: 100 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Module API. eclipse-dtp: buildorder: 20 ref: eclipse @@ -418,7 +427,8 @@ data: arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Module API. - Runtime dependency of eclipse-dtp, eclipse-subclipse, eclipse-webtools. + Runtime dependency of eclipse-dtp, eclipse-linuxtools, + eclipse-subclipse, eclipse-webtools. eclipse-jgit: buildorder: 30 ref: eclipse @@ -434,6 +444,13 @@ data: rationale: > Module API. Runtime dependency of eclipse-cdt. + eclipse-linuxtools: + buildorder: 90 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Module API. + Runtime dependency of eclipse-dltk. eclipse-m2e-core: buildorder: 50 ref: eclipse @@ -459,9 +476,9 @@ data: arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Module API. - Runtime dependency of eclipse-abrt, eclipse-egit, + Runtime dependency of eclipse-abrt, eclipse-dltk, eclipse-egit, eclipse-egit-github, eclipse-epp-logging, - eclipse-subclipse. + eclipse-linuxtools, eclipse-subclipse. eclipse-ptp: buildorder: 80 ref: eclipse @@ -480,7 +497,7 @@ data: ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of eclipse-ptp. + Runtime dependency of eclipse-linuxtools, eclipse-ptp. eclipse-subclipse: buildorder: 50 ref: eclipse @@ -499,7 +516,8 @@ data: arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Module API. - Runtime dependency of eclipse-cdt, eclipse-ptp, eclipse-remote. + Runtime dependency of eclipse-cdt, eclipse-dltk, + eclipse-ptp, eclipse-remote. eclipse-usage: buildorder: 50 ref: eclipse @@ -573,7 +591,7 @@ data: ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of eclipse-cdt, eclipse-ptp. + Runtime dependency of eclipse-cdt, eclipse-ptp, eclipse-webtools. glassfish-jaxb-api: buildorder: 10 ref: eclipse @@ -813,8 +831,14 @@ data: ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of eclipse, eclipse-dtp, - eclipse-m2e-core, eclipse-mylyn, maven-indexer. + Runtime dependency of eclipse, eclipse-dltk, eclipse-dtp, + eclipse-epp-logging, eclipse-m2e-core, eclipse-mylyn, maven-indexer. + maven-archiver: + buildorder: 30 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of maven-war-plugin. maven-archetype: buildorder: 40 ref: eclipse @@ -823,7 +847,7 @@ data: Runtime dependency of eclipse-m2e-core. maven-filtering: buildorder: 20 - ref: master + ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of maven-war-plugin. @@ -833,6 +857,13 @@ data: arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of eclipse-m2e-core. + maven-invoker: + buildorder: 10 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse-m2e-core, + maven-archetype. maven-mapping: buildorder: 10 ref: eclipse @@ -845,6 +876,12 @@ data: arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of glassfish-hk2. + maven-war-plugin: + buildorder: 40 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse-m2e-wtp. nekohtml: buildorder: 10 ref: eclipse @@ -877,12 +914,24 @@ data: rationale: > Runtime dependency of aether-connector-okhttp, eclipse-m2e-core, okhttp. + plexus-archiver: + buildorder: 20 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of maven-archiver, maven-war-plugin. plexus-build-api: buildorder: 10 - ref: master + ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of eclipse-m2e-core, maven-filtering. + plexus-io: + buildorder: 10 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of plexus-archiver. plexus-velocity: buildorder: 30 ref: eclipse @@ -898,7 +947,7 @@ data: Runtime dependency of closure-compiler. rhino: buildorder: 20 - ref: master + ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of eclipse-webtools. From d7439b2a5737e9b0de17088717eca08fc979d1c4 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Thu, 13 Jun 2019 14:34:53 +0100 Subject: [PATCH 24/61] Rebuild with new maven-indexer From 780aa20ded87fcea078a5e23905126ddd54fdc56 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Fri, 14 Jun 2019 17:13:57 +0100 Subject: [PATCH 25/61] Rebuild with new mylyn From a9a66ee5c1bd4a41934299b630381226b590a122 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Mon, 17 Jun 2019 10:48:54 +0100 Subject: [PATCH 26/61] Rebuild with fixed Mylyn and new jetty, emf, ecf From cb82f26a01ae2bb3ed3466b2fa2ac77faf122dc6 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Mon, 17 Jun 2019 11:49:57 +0100 Subject: [PATCH 27/61] Improve build time of protobuf component From a5c700b237eb41092f8a9b4857e3a52535a4ff03 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Mon, 17 Jun 2019 15:17:54 +0100 Subject: [PATCH 28/61] Rebuild with update licenses From 42a52c251a772e7918e92e529982caef33c4a209 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Tue, 18 Jun 2019 16:42:04 +0100 Subject: [PATCH 29/61] Build with updated m2e From caee520a543ea9f6470dbaf96a25e97e080aab74 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Thu, 20 Jun 2019 17:36:13 +0100 Subject: [PATCH 30/61] Build without linuxtools tests --- eclipse.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eclipse.yaml b/eclipse.yaml index f9026f2..4feaf62 100644 --- a/eclipse.yaml +++ b/eclipse.yaml @@ -260,6 +260,7 @@ data: %_without_mylyn_epub 1 %_without_contrib_tools 1 %_without_photran_support 1 + %_without_linuxtools_tests 1 %_without_reflections 1 %_without_okcurl 1 %_without_snappy 1 @@ -388,7 +389,7 @@ data: Runtime dependency of eclipse-linuxtools, eclipse-ptp, eclipse-remote. eclipse-dltk: - buildorder: 100 + buildorder: 90 ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > @@ -445,7 +446,7 @@ data: Module API. Runtime dependency of eclipse-cdt. eclipse-linuxtools: - buildorder: 90 + buildorder: 80 ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > @@ -485,7 +486,6 @@ data: arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Module API. - Runtime dependency of eclipse-linuxtools. eclipse-pydev: buildorder: 50 ref: eclipse From 3645e59391582d16c36e7a713b792f47ee0e042b Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Fri, 21 Jun 2019 10:59:53 +0100 Subject: [PATCH 31/61] Fix FTBFS in pydev From bb08f4f1280b771ecb67acdbc10daef6d1977fa6 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Tue, 25 Jun 2019 09:38:04 +0100 Subject: [PATCH 32/61] Drop DLTK from module --- eclipse.yaml | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/eclipse.yaml b/eclipse.yaml index 4feaf62..81b3e63 100644 --- a/eclipse.yaml +++ b/eclipse.yaml @@ -388,12 +388,6 @@ data: Module API. Runtime dependency of eclipse-linuxtools, eclipse-ptp, eclipse-remote. - eclipse-dltk: - buildorder: 90 - ref: eclipse - arches: [x86_64, ppc64le, aarch64, s390x] - rationale: > - Module API. eclipse-dtp: buildorder: 20 ref: eclipse @@ -451,7 +445,6 @@ data: arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Module API. - Runtime dependency of eclipse-dltk. eclipse-m2e-core: buildorder: 50 ref: eclipse @@ -477,7 +470,7 @@ data: arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Module API. - Runtime dependency of eclipse-abrt, eclipse-dltk, eclipse-egit, + Runtime dependency of eclipse-abrt, eclipse-egit, eclipse-egit-github, eclipse-epp-logging, eclipse-linuxtools, eclipse-subclipse. eclipse-ptp: @@ -516,7 +509,7 @@ data: arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Module API. - Runtime dependency of eclipse-cdt, eclipse-dltk, + Runtime dependency of eclipse-cdt, eclipse-ptp, eclipse-remote. eclipse-usage: buildorder: 50 @@ -831,8 +824,9 @@ data: ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of eclipse, eclipse-dltk, eclipse-dtp, - eclipse-epp-logging, eclipse-m2e-core, eclipse-mylyn, maven-indexer. + Runtime dependency of eclipse, eclipse-dtp, + eclipse-epp-logging, eclipse-m2e-core, + eclipse-mylyn, maven-indexer. maven-archiver: buildorder: 30 ref: eclipse From 01b07d59db5ac79880f1e19279d5f4d8ec68ede7 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Tue, 25 Jun 2019 21:58:57 +0100 Subject: [PATCH 33/61] Add m2e extensions and eclipse pre-reqs --- eclipse.yaml | 75 ++++++++++++++++++++++++++++++++++------ gen_build_order_graph.py | 14 +++++--- 2 files changed, 74 insertions(+), 15 deletions(-) diff --git a/eclipse.yaml b/eclipse.yaml index 81b3e63..ef88d95 100644 --- a/eclipse.yaml +++ b/eclipse.yaml @@ -395,6 +395,12 @@ data: rationale: > Module API. Runtime dependency of eclipse-webtools. + eclipse-ecf: + buildorder: 20 + ref: tycho + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse. eclipse-egit: buildorder: 40 ref: eclipse @@ -402,13 +408,19 @@ data: rationale: > Module API. Runtime dependency of eclipse-egit-github, - eclipse-tm-terminal. + eclipse-m2e-egit, eclipse-tm-terminal. eclipse-egit-github: buildorder: 50 ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Module API. + eclipse-emf: + buildorder: 10 + ref: tycho + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse, eclipse-ecf. eclipse-epp-logging: buildorder: 40 ref: eclipse @@ -430,8 +442,8 @@ data: arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Module API. - Runtime dependency of eclipse-egit, - eclipse-egit-github, eclipse-ptp. + Runtime dependency of eclipse-egit, eclipse-egit-github, + eclipse-m2e-egit, eclipse-ptp. eclipse-launchbar: buildorder: 10 ref: eclipse @@ -445,19 +457,58 @@ data: arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Module API. + eclipse-m2e-apt: + buildorder: 60 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Module API. + eclipse-m2e-buildhelper: + buildorder: 60 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Module API. eclipse-m2e-core: buildorder: 50 ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Module API. - Runtime dependency of eclipse-testng. + Runtime dependency of eclipse-m2e-apt, eclipse-m2e-mavenarchiver, + eclipse-m2e-buildhelper, eclipse-m2e-egit, eclipse-m2e-tycho, + eclipse-m2e-wtp, eclipse-testng. + eclipse-m2e-egit: + buildorder: 60 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Module API. + eclipse-m2e-mavenarchiver: + buildorder: 60 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Module API. + Runtime dependency of eclipse-m2e-wtp. + eclipse-m2e-tycho: + buildorder: 60 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Module API. eclipse-m2e-workspace: buildorder: 10 ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of eclipse-m2e-core. + eclipse-m2e-wtp: + buildorder: 70 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Module API. eclipse-mpc: buildorder: 10 ref: eclipse @@ -490,6 +541,7 @@ data: ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > + Module API. Runtime dependency of eclipse-linuxtools, eclipse-ptp. eclipse-subclipse: buildorder: 50 @@ -523,7 +575,8 @@ data: arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Module API. - Runtime dependency of eclipse-m2e-core. + Runtime dependency of eclipse-m2e-apt, + eclipse-m2e-core, eclipse-m2e-wtp. ed25519-java: buildorder: 10 ref: eclipse @@ -827,18 +880,18 @@ data: Runtime dependency of eclipse, eclipse-dtp, eclipse-epp-logging, eclipse-m2e-core, eclipse-mylyn, maven-indexer. - maven-archiver: - buildorder: 30 - ref: eclipse - arches: [x86_64, ppc64le, aarch64, s390x] - rationale: > - Runtime dependency of maven-war-plugin. maven-archetype: buildorder: 40 ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of eclipse-m2e-core. + maven-archiver: + buildorder: 30 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of maven-war-plugin. maven-filtering: buildorder: 20 ref: eclipse diff --git a/gen_build_order_graph.py b/gen_build_order_graph.py index 44223dc..ac3c2b0 100755 --- a/gen_build_order_graph.py +++ b/gen_build_order_graph.py @@ -19,13 +19,15 @@ for key, value in rpms.items(): if subg is None: subg = g.add_subgraph(name=f"{rank}", label=f"Build Order {rank}", rank="same") subg.add_node(f"{rank}") - subg.add_node(key) - rs = value['rationale'].replace('\n', ' ').split('.') reqs = [] breqs = [] - for r in rs: + api = False + for r in value['rationale'].replace('\n', ' ').split('.'): r = r.strip() - if not r or r == 'Module API': + if not r: + continue + if r == 'Module API': + api = True continue if r.startswith('Runtime dependency of'): r = r[len('Runtime dependency of'):] @@ -33,6 +35,10 @@ for key, value in rpms.items(): if r.startswith('Build dependency of'): r = r[len('Build dependency of'):] breqs = [x.strip() for x in r.split(',')] + if api: + subg.add_node(key, color='green') + else: + subg.add_node(key) for req in reqs: # For Rs, check if also a BR if req not in breqs: From 171d9ffd7f3e176543ddb2cc7f01c4954a0622aa Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Thu, 27 Jun 2019 21:09:02 +0100 Subject: [PATCH 34/61] Rebuild with latest bugfixes From dda9adac755b3474e37fa2a34c41130b1a05735e Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Fri, 28 Jun 2019 20:29:32 +0100 Subject: [PATCH 35/61] Rebuild due to MBS issue, see: https://pagure.io/fm-orchestrator/pull-request/1277 From 31e466f0e4b8f3c9b3f286dcf5bf2a40f8e802d1 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Sat, 29 Jun 2019 00:48:13 +0100 Subject: [PATCH 36/61] Drop PTP and comment pre-reqs for bootstrapping --- eclipse.yaml | 43 ++++++++++++++++++------------------------- 1 file changed, 18 insertions(+), 25 deletions(-) diff --git a/eclipse.yaml b/eclipse.yaml index ef88d95..bcb2360 100644 --- a/eclipse.yaml +++ b/eclipse.yaml @@ -387,7 +387,7 @@ data: rationale: > Module API. Runtime dependency of eclipse-linuxtools, - eclipse-ptp, eclipse-remote. + eclipse-remote. eclipse-dtp: buildorder: 20 ref: eclipse @@ -395,12 +395,12 @@ data: rationale: > Module API. Runtime dependency of eclipse-webtools. - eclipse-ecf: - buildorder: 20 - ref: tycho - arches: [x86_64, ppc64le, aarch64, s390x] - rationale: > - Runtime dependency of eclipse. +# eclipse-ecf: +# buildorder: 20 +# ref: tycho +# arches: [x86_64, ppc64le, aarch64, s390x] +# rationale: > +# Runtime dependency of eclipse. eclipse-egit: buildorder: 40 ref: eclipse @@ -415,12 +415,12 @@ data: arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Module API. - eclipse-emf: - buildorder: 10 - ref: tycho - arches: [x86_64, ppc64le, aarch64, s390x] - rationale: > - Runtime dependency of eclipse, eclipse-ecf. +# eclipse-emf: +# buildorder: 10 +# ref: tycho +# arches: [x86_64, ppc64le, aarch64, s390x] +# rationale: > +# Runtime dependency of eclipse, eclipse-ecf. eclipse-epp-logging: buildorder: 40 ref: eclipse @@ -443,7 +443,7 @@ data: rationale: > Module API. Runtime dependency of eclipse-egit, eclipse-egit-github, - eclipse-m2e-egit, eclipse-ptp. + eclipse-m2e-egit. eclipse-launchbar: buildorder: 10 ref: eclipse @@ -524,12 +524,6 @@ data: Runtime dependency of eclipse-abrt, eclipse-egit, eclipse-egit-github, eclipse-epp-logging, eclipse-linuxtools, eclipse-subclipse. - eclipse-ptp: - buildorder: 80 - ref: eclipse - arches: [x86_64, ppc64le, aarch64, s390x] - rationale: > - Module API. eclipse-pydev: buildorder: 50 ref: eclipse @@ -542,7 +536,7 @@ data: arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Module API. - Runtime dependency of eclipse-linuxtools, eclipse-ptp. + Runtime dependency of eclipse-linuxtools. eclipse-subclipse: buildorder: 50 ref: eclipse @@ -561,8 +555,7 @@ data: arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Module API. - Runtime dependency of eclipse-cdt, - eclipse-ptp, eclipse-remote. + Runtime dependency of eclipse-cdt, eclipse-remote. eclipse-usage: buildorder: 50 ref: eclipse @@ -637,13 +630,13 @@ data: ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of eclipse-cdt, eclipse-ptp, eclipse-webtools. + Runtime dependency of eclipse-cdt, eclipse-webtools. glassfish-jaxb-api: buildorder: 10 ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of eclipse-cdt, eclipse-ptp, glassfish-jaxb. + Runtime dependency of eclipse-cdt, glassfish-jaxb. glassfish-jaxrpc-api: buildorder: 10 ref: eclipse From 35c76993391dbc63f1cbffd2677dd00d8f2181e7 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Sun, 30 Jun 2019 09:20:30 +0100 Subject: [PATCH 37/61] Full non-boostrap build --- eclipse.yaml | 39 ++++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/eclipse.yaml b/eclipse.yaml index bcb2360..3387628 100644 --- a/eclipse.yaml +++ b/eclipse.yaml @@ -12,6 +12,7 @@ data: - MIT dependencies: - buildrequires: + eclipse: [2019-06] tycho: [1.4] platform: [] requires: @@ -253,13 +254,11 @@ data: buildopts: rpms: macros: | - %_with_bootstrap 1 %_with_jp_minimal 1 %_without_javahl 1 %_without_spring 1 %_without_mylyn_epub 1 %_without_contrib_tools 1 - %_without_photran_support 1 %_without_linuxtools_tests 1 %_without_reflections 1 %_without_okcurl 1 @@ -374,6 +373,12 @@ data: arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of eclipse-linuxtools. + eclipse: + buildorder: 40 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Module API. eclipse-abrt: buildorder: 50 ref: eclipse @@ -395,12 +400,12 @@ data: rationale: > Module API. Runtime dependency of eclipse-webtools. -# eclipse-ecf: -# buildorder: 20 -# ref: tycho -# arches: [x86_64, ppc64le, aarch64, s390x] -# rationale: > -# Runtime dependency of eclipse. + eclipse-ecf: + buildorder: 30 + ref: tycho + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse. eclipse-egit: buildorder: 40 ref: eclipse @@ -415,12 +420,12 @@ data: arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Module API. -# eclipse-emf: -# buildorder: 10 -# ref: tycho -# arches: [x86_64, ppc64le, aarch64, s390x] -# rationale: > -# Runtime dependency of eclipse, eclipse-ecf. + eclipse-emf: + buildorder: 20 + ref: tycho + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse, eclipse-ecf. eclipse-epp-logging: buildorder: 40 ref: eclipse @@ -445,7 +450,7 @@ data: Runtime dependency of eclipse-egit, eclipse-egit-github, eclipse-m2e-egit. eclipse-launchbar: - buildorder: 10 + buildorder: 50 ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > @@ -953,7 +958,7 @@ data: arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of aether-connector-okhttp, - eclipse-m2e-core, okhttp. + okhttp. plexus-archiver: buildorder: 20 ref: eclipse @@ -1040,7 +1045,7 @@ data: rationale: > Runtime dependency of eclipse-subclipse. swt-chart: - buildorder: 10 + buildorder: 70 ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > From 6ba821c8cf879b038699e3d590540b02f2363476 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Sun, 30 Jun 2019 10:00:00 +0100 Subject: [PATCH 38/61] Revert "Full non-boostrap build" This reverts commit 35c76993391dbc63f1cbffd2677dd00d8f2181e7. --- eclipse.yaml | 39 +++++++++++++++++---------------------- 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/eclipse.yaml b/eclipse.yaml index 3387628..bcb2360 100644 --- a/eclipse.yaml +++ b/eclipse.yaml @@ -12,7 +12,6 @@ data: - MIT dependencies: - buildrequires: - eclipse: [2019-06] tycho: [1.4] platform: [] requires: @@ -254,11 +253,13 @@ data: buildopts: rpms: macros: | + %_with_bootstrap 1 %_with_jp_minimal 1 %_without_javahl 1 %_without_spring 1 %_without_mylyn_epub 1 %_without_contrib_tools 1 + %_without_photran_support 1 %_without_linuxtools_tests 1 %_without_reflections 1 %_without_okcurl 1 @@ -373,12 +374,6 @@ data: arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of eclipse-linuxtools. - eclipse: - buildorder: 40 - ref: eclipse - arches: [x86_64, ppc64le, aarch64, s390x] - rationale: > - Module API. eclipse-abrt: buildorder: 50 ref: eclipse @@ -400,12 +395,12 @@ data: rationale: > Module API. Runtime dependency of eclipse-webtools. - eclipse-ecf: - buildorder: 30 - ref: tycho - arches: [x86_64, ppc64le, aarch64, s390x] - rationale: > - Runtime dependency of eclipse. +# eclipse-ecf: +# buildorder: 20 +# ref: tycho +# arches: [x86_64, ppc64le, aarch64, s390x] +# rationale: > +# Runtime dependency of eclipse. eclipse-egit: buildorder: 40 ref: eclipse @@ -420,12 +415,12 @@ data: arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Module API. - eclipse-emf: - buildorder: 20 - ref: tycho - arches: [x86_64, ppc64le, aarch64, s390x] - rationale: > - Runtime dependency of eclipse, eclipse-ecf. +# eclipse-emf: +# buildorder: 10 +# ref: tycho +# arches: [x86_64, ppc64le, aarch64, s390x] +# rationale: > +# Runtime dependency of eclipse, eclipse-ecf. eclipse-epp-logging: buildorder: 40 ref: eclipse @@ -450,7 +445,7 @@ data: Runtime dependency of eclipse-egit, eclipse-egit-github, eclipse-m2e-egit. eclipse-launchbar: - buildorder: 50 + buildorder: 10 ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > @@ -958,7 +953,7 @@ data: arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of aether-connector-okhttp, - okhttp. + eclipse-m2e-core, okhttp. plexus-archiver: buildorder: 20 ref: eclipse @@ -1045,7 +1040,7 @@ data: rationale: > Runtime dependency of eclipse-subclipse. swt-chart: - buildorder: 70 + buildorder: 10 ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > From d8c210b3017e938ae1951dbdc091c946f8cf32b4 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Sun, 30 Jun 2019 10:01:25 +0100 Subject: [PATCH 39/61] Remove package filters for bootstrap build --- eclipse.yaml | 206 --------------------------------------------------- 1 file changed, 206 deletions(-) diff --git a/eclipse.yaml b/eclipse.yaml index bcb2360..6c150e2 100644 --- a/eclipse.yaml +++ b/eclipse.yaml @@ -44,212 +44,6 @@ data: - eclipse-subclipse - eclipse-tm-terminal - eclipse-usage - filter: - rpms: - - antlr32-javadoc - - antlr32-maven-plugin - - antlr32-tool - - apache-commons-compress-javadoc - - apache-commons-el-javadoc - - apache-commons-jxpath-javadoc - - apache-commons-lang-javadoc - - apache-sshd-javadoc - - args4j-javadoc - - args4j-parent - - args4j-tools - - base64coder-javadoc - - batik-demo - - batik-javadoc - - batik-rasterizer - - batik-slideshow - - batik-squiggle - - batik-svgpp - - batik-ttf2svg - - bouncycastle-javadoc - - eclipse-cdt - - eclipse-cdt-arduino - - eclipse-cdt-docker - - eclipse-cdt-llvm - - eclipse-cdt-parsers - - eclipse-cdt-qt - - eclipse-cdt-sdk - - eclipse-cdt-tests - - eclipse-gef-sdk - - eclipse-gef-tests - - eclipse-mylyn-builds - - eclipse-mylyn-builds-hudson - - eclipse-mylyn-context-cdt - - eclipse-mylyn-context-java - - eclipse-mylyn-context-pde - - eclipse-mylyn-docs-epub - - eclipse-mylyn-docs-wikitext - - eclipse-mylyn-sdk - - eclipse-mylyn-tasks-trac - - eclipse-mylyn-tasks-web - - eclipse-mylyn-tests - - eclipse-mylyn-versions - - eclipse-mylyn-versions-cvs - - eclipse-mylyn-versions-git - - eclipse-mylyn-versions-subclipse - - eclipse-pydev-mylyn - - eclipse-tm-terminal-connectors - - eclipse-tm-terminal-rse - - eclipse-tm-terminal-sdk - - ed25519-java-javadoc - - felix-gogo-command-javadoc - - felix-gogo-runtime-javadoc - - felix-gogo-shell-javadoc - - felix-scr-javadoc - - freemarker-javadoc - - glassfish-annotation-api-javadoc - - glassfish-jaxb - - glassfish-jaxb-api-javadoc - - glassfish-jaxb-bom - - glassfish-jaxb-bom-ext - - glassfish-jaxb-codemodel - - glassfish-jaxb-codemodel-annotation-compiler - - glassfish-jaxb-codemodel-parent - - glassfish-jaxb-external-parent - - glassfish-jaxb-javadoc - - glassfish-jaxb-jxc - - glassfish-jaxb-parent - - glassfish-jaxb-rngom - - glassfish-jaxb-runtime-parent - - glassfish-jaxb-txw-parent - - glassfish-jaxb-txwc2 - - glassfish-jaxb-xjc - - glassfish-jsp-api-javadoc - - glassfish-jsp-javadoc - - glassfish-servlet-api-javadoc - - google-gson-javadoc - - icu4j-charset - - icu4j-javadoc - - icu4j-localespi - - jakarta-commons-httpclient-demo - - jakarta-commons-httpclient-javadoc - - jakarta-commons-httpclient-manual - - javaewah-javadoc - - javaparser - - javaparser-javadoc - - jctools-channels - - jctools-experimental - - jctools-javadoc - - jctools-parent - - jetty - - jetty-alpn-client - - jetty-alpn-server - - jetty-annotations - - jetty-ant - - jetty-cdi - - jetty-client - - jetty-deploy - - jetty-fcgi-client - - jetty-fcgi-server - - jetty-http-spi - - jetty-http2-client - - jetty-http2-common - - jetty-http2-hpack - - jetty-http2-http-client-transport - - jetty-http2-server - - jetty-httpservice - - jetty-infinispan - - jetty-jaas - - jetty-jaspi - - jetty-javadoc - - jetty-javax-websocket-client-impl - - jetty-javax-websocket-server-impl - - jetty-jmx - - jetty-jndi - - jetty-jsp - - jetty-jspc-maven-plugin - - jetty-jstl - - jetty-maven-plugin - - jetty-nosql - - jetty-osgi-alpn - - jetty-osgi-boot - - jetty-osgi-boot-jsp - - jetty-osgi-boot-warurl - - jetty-plus - - jetty-project - - jetty-proxy - - jetty-quickstart - - jetty-rewrite - - jetty-servlets - - jetty-spring - - jetty-start - - jetty-unixsocket - - jetty-util-ajax - - jetty-webapp - - jetty-websocket-api - - jetty-websocket-client - - jetty-websocket-common - - jetty-websocket-server - - jetty-websocket-servlet - - jetty-xml - - jffi-javadoc - - jgit-javadoc - - jline-javadoc - - jna-javadoc - - jnr-constants-javadoc - - jnr-enxio-javadoc - - jnr-ffi-javadoc - - jnr-netdb-javadoc - - jnr-posix-javadoc - - jnr-unixsocket-javadoc - - jnr-x86asm-javadoc - - jsch-agent-proxy-javadoc - - jsch-agent-proxy-jsch - - jsch-agent-proxy-sshj - - jython-demo - - jython-javadoc - - kxml-javadoc - - lpg - - lpg-java - - lucene-analyzers-icu - - lucene-analyzers-kuromoji - - lucene-analyzers-morfologik - - lucene-analyzers-nori - - lucene-analyzers-phonetic - - lucene-analyzers-stempel - - lucene-backward-codecs - - lucene-benchmark - - lucene-classification - - lucene-codecs - - lucene-demo - - lucene-expressions - - lucene-facet - - lucene-grouping - - lucene-highlighter - - lucene-javadoc - - lucene-join - - lucene-memory - - lucene-parent - - lucene-replicator - - lucene-solr-grandparent - - lucene-spatial - - lucene-spatial-extras - - lucene-spatial3d - - lucene-suggest - - lucene-test-framework - - nekohtml-demo - - nekohtml-javadoc - - netty-javadoc - - objectweb-asm-javadoc - - sac-javadoc - - sequence-library-javadoc - - snakeyaml-javadoc - - sqljet-javadoc - - stringtemplate-javadoc - - svnkit-cli - - svnkit-javadoc - - swt-chart-javadoc - - trilead-ssh2-javadoc - - ws-commons-util-javadoc - - wsdl4j-javadoc - - xmlgraphics-commons-javadoc - - xmlrpc-javadoc - - xpp3-javadoc - - xpp3-minimal buildopts: rpms: macros: | From a97a20209b3d05914c1f2b5de8663d39558b6ef1 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Sun, 30 Jun 2019 10:15:22 +0100 Subject: [PATCH 40/61] Revert "Revert "Full non-boostrap build"" This reverts commit 6ba821c8cf879b038699e3d590540b02f2363476. --- eclipse.yaml | 39 ++++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/eclipse.yaml b/eclipse.yaml index 6c150e2..4a24c22 100644 --- a/eclipse.yaml +++ b/eclipse.yaml @@ -12,6 +12,7 @@ data: - MIT dependencies: - buildrequires: + eclipse: [2019-06] tycho: [1.4] platform: [] requires: @@ -47,13 +48,11 @@ data: buildopts: rpms: macros: | - %_with_bootstrap 1 %_with_jp_minimal 1 %_without_javahl 1 %_without_spring 1 %_without_mylyn_epub 1 %_without_contrib_tools 1 - %_without_photran_support 1 %_without_linuxtools_tests 1 %_without_reflections 1 %_without_okcurl 1 @@ -168,6 +167,12 @@ data: arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of eclipse-linuxtools. + eclipse: + buildorder: 40 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Module API. eclipse-abrt: buildorder: 50 ref: eclipse @@ -189,12 +194,12 @@ data: rationale: > Module API. Runtime dependency of eclipse-webtools. -# eclipse-ecf: -# buildorder: 20 -# ref: tycho -# arches: [x86_64, ppc64le, aarch64, s390x] -# rationale: > -# Runtime dependency of eclipse. + eclipse-ecf: + buildorder: 30 + ref: tycho + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse. eclipse-egit: buildorder: 40 ref: eclipse @@ -209,12 +214,12 @@ data: arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Module API. -# eclipse-emf: -# buildorder: 10 -# ref: tycho -# arches: [x86_64, ppc64le, aarch64, s390x] -# rationale: > -# Runtime dependency of eclipse, eclipse-ecf. + eclipse-emf: + buildorder: 20 + ref: tycho + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse, eclipse-ecf. eclipse-epp-logging: buildorder: 40 ref: eclipse @@ -239,7 +244,7 @@ data: Runtime dependency of eclipse-egit, eclipse-egit-github, eclipse-m2e-egit. eclipse-launchbar: - buildorder: 10 + buildorder: 50 ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > @@ -747,7 +752,7 @@ data: arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of aether-connector-okhttp, - eclipse-m2e-core, okhttp. + okhttp. plexus-archiver: buildorder: 20 ref: eclipse @@ -834,7 +839,7 @@ data: rationale: > Runtime dependency of eclipse-subclipse. swt-chart: - buildorder: 10 + buildorder: 70 ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > From 1a51536decd7228de2c1f44c4e692044c4ec609b Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Sun, 30 Jun 2019 15:35:42 +0100 Subject: [PATCH 41/61] Bootstrap without Requires on ant and maven modules. --- eclipse.yaml | 43 ++++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/eclipse.yaml b/eclipse.yaml index 4a24c22..a2bfb1d 100644 --- a/eclipse.yaml +++ b/eclipse.yaml @@ -12,12 +12,12 @@ data: - MIT dependencies: - buildrequires: - eclipse: [2019-06] + #eclipse: [2019-06] tycho: [1.4] platform: [] requires: - ant: [1.10] - maven: [3.5] + #ant: [1.10] + #maven: [3.5] platform: [] profiles: default: @@ -48,6 +48,7 @@ data: buildopts: rpms: macros: | + %_with_bootstrap 1 %_with_jp_minimal 1 %_without_javahl 1 %_without_spring 1 @@ -167,12 +168,12 @@ data: arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of eclipse-linuxtools. - eclipse: - buildorder: 40 - ref: eclipse - arches: [x86_64, ppc64le, aarch64, s390x] - rationale: > - Module API. +# eclipse: +# buildorder: 40 +# ref: eclipse +# arches: [x86_64, ppc64le, aarch64, s390x] +# rationale: > +# Module API. eclipse-abrt: buildorder: 50 ref: eclipse @@ -194,12 +195,12 @@ data: rationale: > Module API. Runtime dependency of eclipse-webtools. - eclipse-ecf: - buildorder: 30 - ref: tycho - arches: [x86_64, ppc64le, aarch64, s390x] - rationale: > - Runtime dependency of eclipse. +# eclipse-ecf: +# buildorder: 30 +# ref: tycho +# arches: [x86_64, ppc64le, aarch64, s390x] +# rationale: > +# Runtime dependency of eclipse. eclipse-egit: buildorder: 40 ref: eclipse @@ -214,12 +215,12 @@ data: arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Module API. - eclipse-emf: - buildorder: 20 - ref: tycho - arches: [x86_64, ppc64le, aarch64, s390x] - rationale: > - Runtime dependency of eclipse, eclipse-ecf. +# eclipse-emf: +# buildorder: 20 +# ref: tycho +# arches: [x86_64, ppc64le, aarch64, s390x] +# rationale: > +# Runtime dependency of eclipse, eclipse-ecf. eclipse-epp-logging: buildorder: 40 ref: eclipse From b044edb7b008c76a1143f25e5d45d87ebfb88b45 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Sun, 30 Jun 2019 16:13:13 +0100 Subject: [PATCH 42/61] Full non-boostrap build --- eclipse.yaml | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/eclipse.yaml b/eclipse.yaml index a2bfb1d..db78eae 100644 --- a/eclipse.yaml +++ b/eclipse.yaml @@ -12,7 +12,7 @@ data: - MIT dependencies: - buildrequires: - #eclipse: [2019-06] + eclipse: [2019-06] tycho: [1.4] platform: [] requires: @@ -48,7 +48,6 @@ data: buildopts: rpms: macros: | - %_with_bootstrap 1 %_with_jp_minimal 1 %_without_javahl 1 %_without_spring 1 @@ -168,12 +167,12 @@ data: arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of eclipse-linuxtools. -# eclipse: -# buildorder: 40 -# ref: eclipse -# arches: [x86_64, ppc64le, aarch64, s390x] -# rationale: > -# Module API. + eclipse: + buildorder: 40 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Module API. eclipse-abrt: buildorder: 50 ref: eclipse @@ -195,12 +194,12 @@ data: rationale: > Module API. Runtime dependency of eclipse-webtools. -# eclipse-ecf: -# buildorder: 30 -# ref: tycho -# arches: [x86_64, ppc64le, aarch64, s390x] -# rationale: > -# Runtime dependency of eclipse. + eclipse-ecf: + buildorder: 30 + ref: tycho + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse. eclipse-egit: buildorder: 40 ref: eclipse @@ -215,12 +214,12 @@ data: arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Module API. -# eclipse-emf: -# buildorder: 20 -# ref: tycho -# arches: [x86_64, ppc64le, aarch64, s390x] -# rationale: > -# Runtime dependency of eclipse, eclipse-ecf. + eclipse-emf: + buildorder: 20 + ref: tycho + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse, eclipse-ecf. eclipse-epp-logging: buildorder: 40 ref: eclipse From 6622538ee3c8569fe616e933731e5d5eba76d24b Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Mon, 1 Jul 2019 23:15:16 +0100 Subject: [PATCH 43/61] Rebuild with some dependency fixes --- eclipse.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclipse.yaml b/eclipse.yaml index db78eae..f103a42 100644 --- a/eclipse.yaml +++ b/eclipse.yaml @@ -297,7 +297,7 @@ data: rationale: > Module API. eclipse-m2e-workspace: - buildorder: 10 + buildorder: 40 ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > From a92e1a7dcdf30a8cafa42377c94f73b725c289b5 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Tue, 2 Jul 2019 20:57:57 +0100 Subject: [PATCH 44/61] Rebuild with new maven-archetype From 410556f1d52a38f042f04d3930d08d2d8684784b Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Thu, 1 Aug 2019 15:00:59 +0100 Subject: [PATCH 45/61] Rebuild for m2e From 33478ca2ab1ff91d135c7a9f68aa78d60dfe467b Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Thu, 1 Aug 2019 16:44:57 +0100 Subject: [PATCH 46/61] Add jgit module and re-order to avoid build failures in the first pass. --- eclipse.yaml | 49 ++++++++++++++++++++++++++++--------------------- 1 file changed, 28 insertions(+), 21 deletions(-) diff --git a/eclipse.yaml b/eclipse.yaml index f103a42..cef3264 100644 --- a/eclipse.yaml +++ b/eclipse.yaml @@ -85,7 +85,7 @@ data: ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of docker-client-java, eclipse-jgit, + Runtime dependency of docker-client-java, jgit, jython, plexus-archiver. apache-commons-discovery: buildorder: 10 @@ -117,13 +117,13 @@ data: ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of eclipse-jgit. + Runtime dependency of jgit. args4j: buildorder: 10 ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of closure-compiler, eclipse-jgit. + Runtime dependency of closure-compiler, jgit. base64coder: buildorder: 10 ref: eclipse @@ -154,7 +154,7 @@ data: arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of apache-sshd, docker-client-java, - eclipse-jgit, jython, okhttp. + jgit, jython, okhttp. closure-compiler: buildorder: 20 ref: eclipse @@ -180,7 +180,7 @@ data: rationale: > Module API. eclipse-cdt: - buildorder: 60 + buildorder: 70 ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > @@ -188,7 +188,7 @@ data: Runtime dependency of eclipse-linuxtools, eclipse-remote. eclipse-dtp: - buildorder: 20 + buildorder: 30 ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > @@ -201,7 +201,7 @@ data: rationale: > Runtime dependency of eclipse. eclipse-egit: - buildorder: 40 + buildorder: 50 ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > @@ -209,7 +209,7 @@ data: Runtime dependency of eclipse-egit-github, eclipse-m2e-egit, eclipse-tm-terminal. eclipse-egit-github: - buildorder: 50 + buildorder: 60 ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > @@ -228,7 +228,7 @@ data: Module API. Runtime dependency of eclipse-abrt, eclipse-usage. eclipse-gef: - buildorder: 10 + buildorder: 20 ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > @@ -236,7 +236,7 @@ data: Runtime dependency of eclipse-dtp, eclipse-linuxtools, eclipse-subclipse, eclipse-webtools. eclipse-jgit: - buildorder: 30 + buildorder: 40 ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > @@ -251,7 +251,7 @@ data: Module API. Runtime dependency of eclipse-cdt. eclipse-linuxtools: - buildorder: 80 + buildorder: 90 ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > @@ -309,7 +309,7 @@ data: rationale: > Module API. eclipse-mpc: - buildorder: 10 + buildorder: 90 ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > @@ -330,7 +330,7 @@ data: rationale: > Module API. eclipse-remote: - buildorder: 70 + buildorder: 80 ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > @@ -349,7 +349,7 @@ data: rationale: > Module API. eclipse-tm-terminal: - buildorder: 50 + buildorder: 60 ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > @@ -362,7 +362,7 @@ data: rationale: > Module API. eclipse-webtools: - buildorder: 30 + buildorder: 40 ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > @@ -374,7 +374,7 @@ data: ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of apache-sshd, eclipse-jgit. + Runtime dependency of apache-sshd, jgit. felix-gogo-command: buildorder: 20 ref: eclipse @@ -466,7 +466,7 @@ data: arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of closure-compiler, eclipse, eclipse-cdt, eclipse-egit-github, - eclipse-epp-logging, eclipse-jgit, eclipse-m2e-core, eclipse-mylyn, eclipse-testng, + eclipse-epp-logging, jgit, eclipse-m2e-core, eclipse-mylyn, eclipse-testng, eclipse-webtools, testng-remote. icu4j: buildorder: 10 @@ -532,7 +532,7 @@ data: ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of eclipse-jgit. + Runtime dependency of jgit. javaparser: buildorder: 10 ref: eclipse @@ -570,7 +570,7 @@ data: ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of eclipse, eclipse-jgit, + Runtime dependency of eclipse, jgit, eclipse-m2e-core, eclipse-webtools. jffi: buildorder: 10 @@ -578,6 +578,13 @@ data: arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of jnr-ffi, jython. + jgit: + buildorder: 30 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Module API. + Runtime dependency of eclipse-jgit. jline: buildorder: 10 ref: eclipse @@ -722,7 +729,7 @@ data: rationale: > Runtime dependency of eclipse-m2e-wtp. nekohtml: - buildorder: 10 + buildorder: 80 ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > @@ -839,7 +846,7 @@ data: rationale: > Runtime dependency of eclipse-subclipse. swt-chart: - buildorder: 70 + buildorder: 80 ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > From 287f8f047fbf43c83e654f0c25787ea6ea43ceae Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Thu, 1 Aug 2019 16:53:00 +0100 Subject: [PATCH 47/61] Update API list of RPMs --- eclipse.yaml | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/eclipse.yaml b/eclipse.yaml index cef3264..2da56d1 100644 --- a/eclipse.yaml +++ b/eclipse.yaml @@ -29,22 +29,80 @@ data: api: rpms: - eclipse-abrt + - eclipse-cdt + - eclipse-cdt-arduino + - eclipse-cdt-docker + - eclipse-cdt-llvm - eclipse-cdt-native + - eclipse-cdt-qt - eclipse-dtp + - eclipse-ecf-core + - eclipse-ecf-runtime - eclipse-egit - eclipse-egit-github - eclipse-egit-mylyn + - eclipse-emf-core + - eclipse-emf-runtime + - eclipse-emf-xsd - eclipse-epp-logging + - eclipse-equinox-osgi - eclipse-gef - eclipse-jdt - eclipse-jgit - eclipse-launchbar + - eclipse-linuxtools + - eclipse-linuxtools-changelog + - eclipse-linuxtools-docker + - eclipse-linuxtools-gcov + - eclipse-linuxtools-gprof + - eclipse-linuxtools-javadocs + - eclipse-linuxtools-libhover + - eclipse-linuxtools-manpage + - eclipse-linuxtools-perf + - eclipse-linuxtools-rpm-editor + - eclipse-linuxtools-systemtap + - eclipse-linuxtools-vagrant + - eclipse-linuxtools-valgrind + - eclipse-m2e-apt + - eclipse-m2e-buildhelper + - eclipse-m2e-core + - eclipse-m2e-egit + - eclipse-m2e-mavenarchiver + - eclipse-m2e-tycho + - eclipse-m2e-workspace + - eclipse-m2e-wtp - eclipse-mpc + - eclipse-mylyn + - eclipse-mylyn-builds + - eclipse-mylyn-builds-hudson + - eclipse-mylyn-context-cdt + - eclipse-mylyn-context-java + - eclipse-mylyn-context-pde + - eclipse-mylyn-docs-wikitext + - eclipse-mylyn-tasks-bugzilla + - eclipse-mylyn-tasks-trac + - eclipse-mylyn-versions + - eclipse-mylyn-versions-cvs + - eclipse-mylyn-versions-git + - eclipse-mylyn-versions-subclipse + - eclipse-p2-discovery - eclipse-pde + - eclipse-platform - eclipse-pydev + - eclipse-pydev-mylyn + - eclipse-remote - eclipse-subclipse + - eclipse-swt + - eclipse-testng - eclipse-tm-terminal + - eclipse-tm-terminal-connectors + - eclipse-tm-terminal-rse - eclipse-usage + - eclipse-webtools-common + - eclipse-webtools-dali + - eclipse-webtools-javaee + - eclipse-webtools-servertools + - eclipse-webtools-sourceediting buildopts: rpms: macros: | From f5e871f71f00e38a94c2a817bf2fd9f771797d93 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Fri, 2 Aug 2019 00:01:08 +0100 Subject: [PATCH 48/61] Fix tests conditional --- eclipse.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclipse.yaml b/eclipse.yaml index 2da56d1..4bc1459 100644 --- a/eclipse.yaml +++ b/eclipse.yaml @@ -111,7 +111,7 @@ data: %_without_spring 1 %_without_mylyn_epub 1 %_without_contrib_tools 1 - %_without_linuxtools_tests 1 + %_without_tests 1 %_without_reflections 1 %_without_okcurl 1 %_without_snappy 1 From 0ea17f13ee2e2ddf70effd9cd942dfe52c917502 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Mon, 5 Aug 2019 14:42:22 +0100 Subject: [PATCH 49/61] Add some installation profiles --- eclipse.yaml | 120 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 119 insertions(+), 1 deletion(-) diff --git a/eclipse.yaml b/eclipse.yaml index 4bc1459..47afc87 100644 --- a/eclipse.yaml +++ b/eclipse.yaml @@ -20,11 +20,129 @@ data: #maven: [3.5] platform: [] profiles: - default: + everything: rpms: - eclipse-abrt + - eclipse-cdt + - eclipse-cdt-arduino + - eclipse-cdt-docker + - eclipse-cdt-llvm + - eclipse-cdt-native + - eclipse-cdt-qt + - eclipse-dtp + - eclipse-ecf-core + - eclipse-ecf-runtime + - eclipse-egit + - eclipse-egit-github + - eclipse-egit-mylyn + - eclipse-emf-core + - eclipse-emf-runtime + - eclipse-emf-xsd + - eclipse-epp-logging + - eclipse-equinox-osgi + - eclipse-gef - eclipse-jdt + - eclipse-jgit + - eclipse-launchbar + - eclipse-linuxtools + - eclipse-linuxtools-changelog + - eclipse-linuxtools-docker + - eclipse-linuxtools-gcov + - eclipse-linuxtools-gprof + - eclipse-linuxtools-javadocs + - eclipse-linuxtools-libhover + - eclipse-linuxtools-manpage + - eclipse-linuxtools-perf + - eclipse-linuxtools-rpm-editor + - eclipse-linuxtools-systemtap + - eclipse-linuxtools-vagrant + - eclipse-linuxtools-valgrind + - eclipse-m2e-apt + - eclipse-m2e-buildhelper + - eclipse-m2e-core + - eclipse-m2e-egit + - eclipse-m2e-mavenarchiver + - eclipse-m2e-tycho + - eclipse-m2e-workspace + - eclipse-m2e-wtp - eclipse-mpc + - eclipse-mylyn + - eclipse-mylyn-builds + - eclipse-mylyn-builds-hudson + - eclipse-mylyn-context-cdt + - eclipse-mylyn-context-java + - eclipse-mylyn-context-pde + - eclipse-mylyn-docs-wikitext + - eclipse-mylyn-tasks-bugzilla + - eclipse-mylyn-tasks-trac + - eclipse-mylyn-versions + - eclipse-mylyn-versions-cvs + - eclipse-mylyn-versions-git + - eclipse-mylyn-versions-subclipse + - eclipse-p2-discovery + - eclipse-pde + - eclipse-platform + - eclipse-pydev + - eclipse-pydev-mylyn + - eclipse-remote + - eclipse-subclipse + - eclipse-swt + - eclipse-testng + - eclipse-tm-terminal + - eclipse-tm-terminal-connectors + - eclipse-tm-terminal-rse + - eclipse-usage + - eclipse-webtools-common + - eclipse-webtools-dali + - eclipse-webtools-javaee + - eclipse-webtools-servertools + - eclipse-webtools-sourceediting + java: + rpms: + - eclipse-abrt + - eclipse-egit + - eclipse-egit-github + - eclipse-egit-mylyn + - eclipse-jdt + - eclipse-jgit + - eclipse-m2e-apt + - eclipse-m2e-buildhelper + - eclipse-m2e-core + - eclipse-m2e-egit + - eclipse-m2e-mavenarchiver + - eclipse-m2e-tycho + - eclipse-m2e-workspace + - eclipse-mpc + - eclipse-mylyn-context-java + - eclipse-mylyn-versions-git + - eclipse-mylyn-versions-subclipse + - eclipse-subclipse + - eclipse-usage + c: + rpms: + - eclipse-abrt + - eclipse-cdt + - eclipse-cdt-arduino + - eclipse-cdt-docker + - eclipse-cdt-llvm + - eclipse-cdt-qt + - eclipse-egit + - eclipse-egit-github + - eclipse-egit-mylyn + - eclipse-jgit + - eclipse-launchbar + - eclipse-linuxtools-changelog + - eclipse-linuxtools-gcov + - eclipse-linuxtools-gprof + - eclipse-linuxtools-libhover + - eclipse-linuxtools-perf + - eclipse-linuxtools-systemtap + - eclipse-linuxtools-valgrind + - eclipse-mpc + - eclipse-mylyn-context-cdt + - eclipse-mylyn-versions-git + - eclipse-mylyn-versions-subclipse + - eclipse-subclipse - eclipse-usage api: rpms: From a0aeb1e974c19418dba22d0f4ae0a22911e0f698 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Wed, 7 Aug 2019 14:47:59 +0100 Subject: [PATCH 50/61] Try adding explicit deps on maven and ant modules --- eclipse.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eclipse.yaml b/eclipse.yaml index 47afc87..fa81ab9 100644 --- a/eclipse.yaml +++ b/eclipse.yaml @@ -16,8 +16,8 @@ data: tycho: [1.4] platform: [] requires: - #ant: [1.10] - #maven: [3.5] + ant: [1.10] + maven: [3.5] platform: [] profiles: everything: From bee91c0495a1acc4f8a11548e35bab597ad49a0e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 26 Aug 2019 13:57:31 +0000 Subject: [PATCH 51/61] Branching f31 from rawhide, second attempt after platform:f32 enablement Signed-off-by: Fedora Release Engineering From db80d670edf9a14f34119a048523054297d37837 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Thu, 8 Aug 2019 14:22:41 +0100 Subject: [PATCH 52/61] Scripts moved elsewhere --- .gitignore | 2 -- clone_rpms.sh | 18 ------------ gen_build_order_graph.py | 60 ---------------------------------------- 3 files changed, 80 deletions(-) delete mode 100644 .gitignore delete mode 100755 clone_rpms.sh delete mode 100755 gen_build_order_graph.py diff --git a/.gitignore b/.gitignore deleted file mode 100644 index e4e766e..0000000 --- a/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/*.png -/rpms/ diff --git a/clone_rpms.sh b/clone_rpms.sh deleted file mode 100755 index 4e71537..0000000 --- a/clone_rpms.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash - -script_location=$( (cd $(dirname $0) && pwd) ) - -module=$(basename $script_location) - -mkdir -p rpms -pushd rpms 2>&1 >/dev/null - -rm -f need_branch -for pkg in $(grep -B1 --no-group-separator buildorder ../$module.yaml | grep -v buildorder | sed -e 's/:$//') ; do - if [ ! -d "$pkg" ] ; then - fedpkg clone $pkg - fi - (cd $pkg ; git pull ; if ! fedpkg switch-branch $module ; then echo $pkg >> ../need_branch ; fi) -done - -popd 2>&1 >/dev/null diff --git a/gen_build_order_graph.py b/gen_build_order_graph.py deleted file mode 100755 index ac3c2b0..0000000 --- a/gen_build_order_graph.py +++ /dev/null @@ -1,60 +0,0 @@ -#!/usr/bin/python3 - -import yaml -from pygraphviz import AGraph -from subprocess import call - -with open("eclipse.yaml", 'r') as stream: - yaml = yaml.safe_load(stream) - -rpms = yaml['data']['components']['rpms'] - -g = AGraph(directed=True, name="G", strict=False, label="Build Order Graph") -ranks = [] -for key, value in rpms.items(): - rank = value['buildorder'] - if rank not in ranks: - ranks.append(rank) - subg = g.get_subgraph(f"{rank}") - if subg is None: - subg = g.add_subgraph(name=f"{rank}", label=f"Build Order {rank}", rank="same") - subg.add_node(f"{rank}") - reqs = [] - breqs = [] - api = False - for r in value['rationale'].replace('\n', ' ').split('.'): - r = r.strip() - if not r: - continue - if r == 'Module API': - api = True - continue - if r.startswith('Runtime dependency of'): - r = r[len('Runtime dependency of'):] - reqs = [x.strip() for x in r.split(',')] - if r.startswith('Build dependency of'): - r = r[len('Build dependency of'):] - breqs = [x.strip() for x in r.split(',')] - if api: - subg.add_node(key, color='green') - else: - subg.add_node(key) - for req in reqs: - # For Rs, check if also a BR - if req not in breqs: - g.add_edge(key, req, color='blue') - else: - g.add_edge(key, req, color='purple') - for breq in breqs: - # For BRs, check if also a R - if breq not in reqs: - g.add_edge(key, breq, color='red') -ranks.sort() -for idx, rank in enumerate(ranks): - if idx+1 < len(ranks): - g.add_edge(rank, ranks[idx+1], weight=1000) - - -print(g.string()) -g.draw("build_order_graph.png", prog="dot") -call('eog build_order_graph.png &', shell=True) From e8ef414dd5542f2496663d6782a224a8eabafba7 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Fri, 30 Aug 2019 00:38:06 +0100 Subject: [PATCH 53/61] Rebootstrap on F31 --- eclipse.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eclipse.yaml b/eclipse.yaml index fa81ab9..3fa35d0 100644 --- a/eclipse.yaml +++ b/eclipse.yaml @@ -12,13 +12,12 @@ data: - MIT dependencies: - buildrequires: - eclipse: [2019-06] tycho: [1.4] - platform: [] + platform: [-f28,-f29] requires: ant: [1.10] maven: [3.5] - platform: [] + platform: [-f28,-f29] profiles: everything: rpms: @@ -224,6 +223,7 @@ data: buildopts: rpms: macros: | + %_with_bootstrap 1 %_with_jp_minimal 1 %_without_javahl 1 %_without_spring 1 From 856c609cb11d92e11bdf4af145685ce74582d29f Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Fri, 30 Aug 2019 14:13:40 +0100 Subject: [PATCH 54/61] Fix build order for bootstrapping --- eclipse.yaml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/eclipse.yaml b/eclipse.yaml index 3fa35d0..ca47a47 100644 --- a/eclipse.yaml +++ b/eclipse.yaml @@ -364,7 +364,7 @@ data: Runtime dependency of eclipse-linuxtools, eclipse-remote. eclipse-dtp: - buildorder: 30 + buildorder: 40 ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > @@ -404,7 +404,7 @@ data: Module API. Runtime dependency of eclipse-abrt, eclipse-usage. eclipse-gef: - buildorder: 20 + buildorder: 30 ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > @@ -433,19 +433,19 @@ data: rationale: > Module API. eclipse-m2e-apt: - buildorder: 60 + buildorder: 70 ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Module API. eclipse-m2e-buildhelper: - buildorder: 60 + buildorder: 70 ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Module API. eclipse-m2e-core: - buildorder: 50 + buildorder: 60 ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > @@ -454,20 +454,20 @@ data: eclipse-m2e-buildhelper, eclipse-m2e-egit, eclipse-m2e-tycho, eclipse-m2e-wtp, eclipse-testng. eclipse-m2e-egit: - buildorder: 60 + buildorder: 70 ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Module API. eclipse-m2e-mavenarchiver: - buildorder: 60 + buildorder: 70 ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Module API. Runtime dependency of eclipse-m2e-wtp. eclipse-m2e-tycho: - buildorder: 60 + buildorder: 70 ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > @@ -479,7 +479,7 @@ data: rationale: > Runtime dependency of eclipse-m2e-core. eclipse-m2e-wtp: - buildorder: 70 + buildorder: 80 ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > @@ -538,7 +538,7 @@ data: rationale: > Module API. eclipse-webtools: - buildorder: 40 + buildorder: 50 ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > @@ -842,7 +842,7 @@ data: rationale: > Runtime dependency of felix-scr. lpg: - buildorder: 10 + buildorder: 20 ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > @@ -860,7 +860,7 @@ data: ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of eclipse-m2e-core. + Runtime dependency of eclipse-m2e-core, maven-indexer. maven-archiver: buildorder: 30 ref: eclipse @@ -874,7 +874,7 @@ data: rationale: > Runtime dependency of maven-war-plugin. maven-indexer: - buildorder: 20 + buildorder: 50 ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > From cf6e25db82d6984178256c300f63cd399f58d73e Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Fri, 30 Aug 2019 15:38:01 +0100 Subject: [PATCH 55/61] Disable some components for bootstrapping --- eclipse.yaml | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/eclipse.yaml b/eclipse.yaml index ca47a47..bcfe4e2 100644 --- a/eclipse.yaml +++ b/eclipse.yaml @@ -12,11 +12,12 @@ data: - MIT dependencies: - buildrequires: +# eclipse: [2019-06] tycho: [1.4] platform: [-f28,-f29] requires: - ant: [1.10] - maven: [3.5] +# ant: [1.10] +# maven: [3.5] platform: [-f28,-f29] profiles: everything: @@ -343,12 +344,12 @@ data: arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of eclipse-linuxtools. - eclipse: - buildorder: 40 - ref: eclipse - arches: [x86_64, ppc64le, aarch64, s390x] - rationale: > - Module API. +# eclipse: +# buildorder: 40 +# ref: eclipse +# arches: [x86_64, ppc64le, aarch64, s390x] +# rationale: > +# Module API. eclipse-abrt: buildorder: 50 ref: eclipse @@ -370,12 +371,12 @@ data: rationale: > Module API. Runtime dependency of eclipse-webtools. - eclipse-ecf: - buildorder: 30 - ref: tycho - arches: [x86_64, ppc64le, aarch64, s390x] - rationale: > - Runtime dependency of eclipse. +# eclipse-ecf: +# buildorder: 30 +# ref: tycho +# arches: [x86_64, ppc64le, aarch64, s390x] +# rationale: > +# Runtime dependency of eclipse. eclipse-egit: buildorder: 50 ref: eclipse @@ -390,12 +391,12 @@ data: arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Module API. - eclipse-emf: - buildorder: 20 - ref: tycho - arches: [x86_64, ppc64le, aarch64, s390x] - rationale: > - Runtime dependency of eclipse, eclipse-ecf. +# eclipse-emf: +# buildorder: 20 +# ref: tycho +# arches: [x86_64, ppc64le, aarch64, s390x] +# rationale: > +# Runtime dependency of eclipse, eclipse-ecf. eclipse-epp-logging: buildorder: 40 ref: eclipse From e49410d9ec674f92ec5beb48056f36b9eac1b320 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Sun, 1 Sep 2019 09:33:36 +0100 Subject: [PATCH 56/61] Fix m2e ordering. --- eclipse.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclipse.yaml b/eclipse.yaml index bcfe4e2..8d06bdd 100644 --- a/eclipse.yaml +++ b/eclipse.yaml @@ -520,7 +520,7 @@ data: rationale: > Module API. eclipse-testng: - buildorder: 60 + buildorder: 70 ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > From bd9c40a5439c125d370511f8eae8369af82b9c39 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Sun, 1 Sep 2019 16:06:43 +0100 Subject: [PATCH 57/61] Attempt to fix pydev build on F32 From 92fbbf6251c35c5b5a6b58c209cb707f36e56558 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Mon, 2 Sep 2019 14:17:26 +0100 Subject: [PATCH 58/61] Full non-bootstrap build --- eclipse.yaml | 43 +++++++++++++++++++++---------------------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/eclipse.yaml b/eclipse.yaml index 8d06bdd..4273645 100644 --- a/eclipse.yaml +++ b/eclipse.yaml @@ -12,12 +12,12 @@ data: - MIT dependencies: - buildrequires: -# eclipse: [2019-06] + eclipse: [2019-06] tycho: [1.4] platform: [-f28,-f29] requires: -# ant: [1.10] -# maven: [3.5] + ant: [1.10] + maven: [3.5] platform: [-f28,-f29] profiles: everything: @@ -224,7 +224,6 @@ data: buildopts: rpms: macros: | - %_with_bootstrap 1 %_with_jp_minimal 1 %_without_javahl 1 %_without_spring 1 @@ -344,12 +343,12 @@ data: arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of eclipse-linuxtools. -# eclipse: -# buildorder: 40 -# ref: eclipse -# arches: [x86_64, ppc64le, aarch64, s390x] -# rationale: > -# Module API. + eclipse: + buildorder: 40 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Module API. eclipse-abrt: buildorder: 50 ref: eclipse @@ -371,12 +370,12 @@ data: rationale: > Module API. Runtime dependency of eclipse-webtools. -# eclipse-ecf: -# buildorder: 30 -# ref: tycho -# arches: [x86_64, ppc64le, aarch64, s390x] -# rationale: > -# Runtime dependency of eclipse. + eclipse-ecf: + buildorder: 30 + ref: tycho + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse. eclipse-egit: buildorder: 50 ref: eclipse @@ -391,12 +390,12 @@ data: arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Module API. -# eclipse-emf: -# buildorder: 20 -# ref: tycho -# arches: [x86_64, ppc64le, aarch64, s390x] -# rationale: > -# Runtime dependency of eclipse, eclipse-ecf. + eclipse-emf: + buildorder: 20 + ref: tycho + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse, eclipse-ecf. eclipse-epp-logging: buildorder: 40 ref: eclipse From 56b25d75f62e161b92b128902a06ab46295f77fd Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Mon, 9 Sep 2019 13:53:24 +0100 Subject: [PATCH 59/61] Bootstrap for 2019-09 --- eclipse.yaml | 45 ++++++++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/eclipse.yaml b/eclipse.yaml index 4273645..df1e844 100644 --- a/eclipse.yaml +++ b/eclipse.yaml @@ -12,12 +12,12 @@ data: - MIT dependencies: - buildrequires: - eclipse: [2019-06] tycho: [1.4] +# eclipse: [2019-09] platform: [-f28,-f29] requires: - ant: [1.10] - maven: [3.5] +# ant: [1.10] +# maven: [3.5] platform: [-f28,-f29] profiles: everything: @@ -90,7 +90,6 @@ data: - eclipse-testng - eclipse-tm-terminal - eclipse-tm-terminal-connectors - - eclipse-tm-terminal-rse - eclipse-usage - eclipse-webtools-common - eclipse-webtools-dali @@ -214,7 +213,6 @@ data: - eclipse-testng - eclipse-tm-terminal - eclipse-tm-terminal-connectors - - eclipse-tm-terminal-rse - eclipse-usage - eclipse-webtools-common - eclipse-webtools-dali @@ -224,6 +222,7 @@ data: buildopts: rpms: macros: | + %_with_bootstrap 1 %_with_jp_minimal 1 %_without_javahl 1 %_without_spring 1 @@ -343,12 +342,12 @@ data: arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of eclipse-linuxtools. - eclipse: - buildorder: 40 - ref: eclipse - arches: [x86_64, ppc64le, aarch64, s390x] - rationale: > - Module API. + # eclipse: + # buildorder: 40 + # ref: eclipse + # arches: [x86_64, ppc64le, aarch64, s390x] + # rationale: > + # Module API. eclipse-abrt: buildorder: 50 ref: eclipse @@ -370,12 +369,12 @@ data: rationale: > Module API. Runtime dependency of eclipse-webtools. - eclipse-ecf: - buildorder: 30 - ref: tycho - arches: [x86_64, ppc64le, aarch64, s390x] - rationale: > - Runtime dependency of eclipse. + # eclipse-ecf: + # buildorder: 30 + # ref: eclipse + # arches: [x86_64, ppc64le, aarch64, s390x] + # rationale: > + # Runtime dependency of eclipse. eclipse-egit: buildorder: 50 ref: eclipse @@ -390,12 +389,12 @@ data: arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Module API. - eclipse-emf: - buildorder: 20 - ref: tycho - arches: [x86_64, ppc64le, aarch64, s390x] - rationale: > - Runtime dependency of eclipse, eclipse-ecf. + # eclipse-emf: + # buildorder: 20 + # ref: eclipse + # arches: [x86_64, ppc64le, aarch64, s390x] + # rationale: > + # Runtime dependency of eclipse, eclipse-ecf. eclipse-epp-logging: buildorder: 40 ref: eclipse From fd04390c8394538aa8ed7efbdfb235e81c7d4c8e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Sep 2019 18:01:22 +0000 Subject: [PATCH 60/61] Branching f31 from rawhide, fourth attempt after platform:f31 enablement due to https://pagure.io/releng/issue/8664 Signed-off-by: Fedora Release Engineering From 8f30014c8702f2eaff9765adc7921ca353205fed Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Sep 2019 23:31:41 +0000 Subject: [PATCH 61/61] Branching f31 from rawhide, fourth attempt after platform:f32 enablement due to https://pagure.io/releng/issue/8664 Signed-off-by: Fedora Release Engineering