Commit Graph

239 Commits

Author SHA1 Message Date
Roland Grunberg 72e8f7d01d Update fedoraproject-p2 project.
- fedoraproject-p2: Fix issues with creation of feature IUs.
- fedoraproject-p2: Fix jar corruption bug.
2014-08-27 16:11:14 -04:00
Roland Grunberg 3d584e80a1 Integrate fedoraproject-p2 into Tycho.
fedoraproject-p2 allows for treating filesystem locations as p2
repositories. As a result we may eliminate our use of the
copy-platform-all script and simply refer to system locations prepended
with the 'fedora' schema namespace.
2014-08-21 15:55:24 -04:00
Roland Grunberg ae5780c5ab Update to 0.21.0 Release. 2014-07-25 16:48:00 -04:00
Mat Booth 3acafa4922 Allow director plugin to only assemble products for the current arch
- Drop some unneeded BR/Rs on surefire (maven-local pulls these in)
2014-07-11 12:49:24 +01:00
Roland Grunberg b41d1a7646 Return non-existant expected local path when resolution fails.
- Resolves: rhbz#1114120
2014-07-02 13:06:52 -04:00
Roland Grunberg 9105146b8f Tycho should always delegate artifact resolution to Maven. 2014-06-27 12:58:39 -04:00
Alexander Kurtakov a953232a46 Non-bootstrap build now that aarch64 is done. 2014-06-25 10:00:30 +03:00
Roland Grunberg 123359b2eb Add swt aarch64 fragment to bootstrap repo. 2014-06-24 12:23:13 -04:00
Alexander Kurtakov ecbf350749 Full bootstrap build for secondary archs. 2014-06-24 10:33:45 +03:00
Mikolaj Izdebski 6f82ea9340 Restore runtime dependencies on XMvn 2014-06-12 14:16:04 +02:00
Dennis Gilmore 216abd0273 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild 2014-06-08 04:19:15 -05:00
Mikolaj Izdebski 5b4078c031 Remove unneeded XMvn bits 2014-06-03 14:46:14 +02:00
Mikolaj Izdebski 369a33d447 Skip intermediary build in non-bootstrap mode 2014-06-03 12:34:42 +02:00
Mikolaj Izdebski 2c96975f09 Fix runtime dependencies on XMvn in POMs
- Use custom Plexus config to lookup XMvn classes
- Lookup Aether WorkspaceReader using role hint "ide"
2014-05-30 15:44:43 +02:00
Mikolaj Izdebski aa821111b4 Fix changelog 2014-05-29 08:59:20 +02:00
Mikolaj Izdebski a1aeb11a01 Don'n install duplicate Maven metadata for sisu-equinox 2014-05-29 08:57:32 +02:00
Mikolaj Izdebski e7e902e410 Include tycho-bundles-external.pom in %files 2014-05-21 18:59:55 +02:00
Mikolaj Izdebski abcaff6bd8 Use .mfiles generated during build 2014-05-21 18:47:57 +02:00
Mikolaj Izdebski 88f2d95ad8 Add support for XMvn 2.0 2014-05-16 12:31:24 +02:00
Alexander Kurtakov 478f64cecf Make tycho copy licence feature to the system repo. 2014-05-13 14:39:33 +03:00
Alexander Kurtakov 32cb24e4e0 Non-bootstrap build. 2014-04-30 22:41:47 +03:00
Alexander Kurtakov 0e3e7d0c06 Organize patches. 2014-04-29 12:31:48 +03:00
Roland Grunberg 25d9638d59 Add support for compact profiles (Bug 1090003). 2014-04-22 13:51:40 -04:00
Roland Grunberg a8dbaea70a Non-bootstrap build. 2014-04-02 16:42:08 -04:00
Roland Grunberg 30d1cba15c Update to Eclipse Luna (4.4). 2014-04-02 10:17:23 -04:00
Roland Grunberg c0ed3543a1 Update to 0.20.0 Release. 2014-03-25 10:45:44 -04:00
Roland Grunberg 5bfcd54870 Respect %{eclipse_bootstrap} flag in tycho-bootstrap.sh.
- Update Eclipse bootstrap cache.
- Fix Equinox Launcher usage logic in copy-platform-all.
2014-03-12 16:50:40 -04:00
Roland Grunberg 14f9989163 Non-bootstrap build. 2014-03-06 16:20:42 -05:00
Roland Grunberg 48f7a01dca Do not check %{_libdir}/eclipse plugins/features folders twice. 2014-03-06 12:13:42 -05:00
Mikolaj Izdebski f63325d80d Improve logging and error handling fop copy-platform-all 2014-02-26 15:09:50 +01:00
Roland Grunberg 1b30f95ae0 Fix issues with bootstrap build.
- Fix bug in bootstrap building of tycho-bundles-external.
- Add BR to packages used by Eclipse bundles in bootstrap build.
- Fix ecf bundles in bootstrap repo and add emf bundles.
2014-02-24 14:28:19 -05:00
Roland Grunberg 58c0ff0476 Perform a pure bootstrap build. 2014-02-11 15:32:48 -05:00
Roland Grunberg 43e579bd3b Fix bootstrap build. 2014-01-15 16:42:26 -05:00
Mikolaj Izdebski 312839e256 Fix usage of %add_maven_depmap for zip files
- Resolves: rhbz#1004310
2014-01-06 23:26:35 +01:00
Roland Grunberg 980a042d7b Intermediary build should use 'xmvn'. 2013-12-09 12:32:58 -05:00
Alexander Kurtakov a02f050792 Switch to using %%mvn_build.
- Update BR/R names.
- Adapt to asm5.
2013-12-09 15:00:19 +02:00
Roland Grunberg 12f97c02d9 Return expected reactor cache location when XMvn resolution fails. 2013-11-21 11:32:21 -05:00
Roland Grunberg ea30eb97de Bump release for rebuild (Bug 1031769). 2013-11-20 12:52:10 -05:00
Roland Grunberg a9422dc67c Reduce length of file lock name when file is in build directory. 2013-11-18 14:27:38 -05:00
Roland Grunberg 8b7debaa61 Update to 0.19.0 Release. 2013-10-29 13:23:25 -04:00
Roland Grunberg d3195d8608 Do not use XMvn internals (Bug 1015038). 2013-10-04 11:15:34 -04:00
Krzysztof Daniel bb87890557 Adjust to latest Xmvn (workaround for 1015038). 2013-10-03 13:29:19 +02:00
Mikolaj Izdebski 8197b35098 Add workaround for rhbz#1004310 2013-09-09 17:57:58 +02:00
Roland Grunberg 7f114a0a72 Improve artifact resolution using XMvn Resolver. (Bug 986900) 2013-07-30 16:03:40 -04:00
Roland Grunberg cbbc0feb61 Fix Tycho file locking to work in Fedora.
- Skip validateConsistentTychoVersion by default. (Bug 987271)
2013-07-29 12:55:10 -04:00
Roland Grunberg 87ef54fe60 Non-bootstrap build. 2013-07-24 16:36:51 -04:00
Roland Grunberg 42c8fb1cb9 Update to use Eclipse Aether.
- Use MavenSession and Plexus to determine state.
- Fix bootstrap build.
2013-07-24 15:31:38 -04:00
Roland Grunberg 1731ca32e8 Make changes to ensure intermediary build succeeds.
- Remove %Patch6 in favour of call to sed.
2013-07-18 11:49:44 -04:00
Krzysztof Daniel cef57e7c63 Update to 0.18.1. 2013-07-18 12:08:05 +02:00
Roland Grunberg c7c8805006 Look for maven artifacts using XMvn Resolver. 2013-07-17 12:51:44 -04:00
Roland Grunberg d33efaf9f5 Update to use maven-surefire 2.15 API. 2013-07-09 12:58:53 -04:00
Alexander Kurtakov debb161fee Use _jnidir too when building local p2 repo. 2013-07-05 17:14:12 +03:00
Mikolaj Izdebski 6b397f648d Add Requires on plugins present in Maven super POM
- Resolves: rhbz#971301
2013-06-06 10:47:27 -04:00
Roland Grunberg 66215e316c Update to 0.18.0 Release. 2013-05-29 09:25:19 -04:00
Krzysztof Daniel 6b0855eb58 Update to 0.18.0 2013-05-29 14:59:39 +02:00
Roland Grunberg eed45a29d9 Fix bootstrap build for potential future use. 2013-04-12 09:36:29 -04:00
Roland Grunberg a0cacb8f5a Update to 0.17.0 Release. 2013-04-02 13:37:51 -04:00
Roland Grunberg 9ac076ba3f Non-bootstrap build. 2013-03-18 14:18:21 -04:00
Krzysztof Daniel f4c66702b8 Merge mizdebsk patch with existing custom resolver patch. 2013-03-18 12:42:27 -04:00
Krzysztof Daniel 8d0154f9bb Move the patch into better place. 2013-03-18 15:37:16 +01:00
Krzysztof Daniel acd4f1bbbc Non-bootstrap build. 2013-03-18 15:31:22 +01:00
Krzysztof Daniel 40b525ce12 Commit the patch. 2013-03-18 15:12:22 +01:00
Krzysztof Daniel 00615dca5c Use plexus to instantiate workspace reader. 2013-03-18 15:11:41 +01:00
Roland Grunberg 60fd9ead4e Non-bootstrap build. 2013-03-17 10:13:49 -04:00
Roland Grunberg 5a5bb5a860 Update to Plexus Compiler 2.2 API.
Update bootstrap build for 0.17.0-SNAPSHOT to work against 0.16.0.
2013-03-17 09:54:30 -04:00
Roland Grunberg 7b807213fc Update to using Jetty 9 API. 2013-02-28 14:02:25 -05:00
Roland Grunberg a9e1e45c3d Set the global default execution environment to JavaSE-1.6.
This has changed from JavaSE-1.6 (Tycho 0.16.0) to J2SE-1.5 in Tycho
0.17.0-SNAPSHOT. It must be JavaSE-1.6 for Fedora.
2013-02-25 16:14:16 -05:00
Krzysztof Daniel 50c3427c3e Update to 0.17-SNAPSHOT
RHBZ#915194 - API changed in maven-surefire
2013-02-25 13:24:43 +01:00
Roland Grunberg 3332f9b37d Non-bootstrap build. 2013-02-06 15:12:56 -05:00
Stanislav Ochotnicky e012ef783a - Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild
- Replace maven BuildRequires with maven-local
2013-02-06 20:47:28 +01:00
Roland Grunberg 39d8ccf4a8 Change BR/R on maven to maven-local for XMvn support.
Built bootstrapped to fix missing JavadirWorkspaceReader.
FedoraWorkspaceReader cannot be accessed so use DefaultResolver instead.
2013-02-06 13:56:04 -05:00
Roland Grunberg 874d2fdb05 Remove usage of older maven for intermediary build. 2013-01-25 10:23:11 -05:00
Roland Grunberg 94c249b7f4 Update with support for XMvn and Maven Surefire 2.13.
Use TYCHO_MVN_{LOCAL,RPMBUILD} to determine how maven was called and
update sources to reflect API changes in Maven Surefire 2.13.
2013-01-24 15:31:34 -05:00
Roland Grunberg 662dc413a5 Fix upstream Bug 361204. 2012-12-20 17:25:41 -05:00
Roland Grunberg f6fc49e1c3 Use OSGi Requires instead of package name. 2012-12-06 15:37:19 -05:00
Roland Grunberg f4258b7555 Add support for more flexible OSGi bundle paths.
Introduce environment variable ROOT_PREFIX which can define an arbitrary
prefix for the location of OSGi bundles.
2012-12-03 13:45:11 -05:00
Roland Grunberg aba2795665 Make additional changes to get Tycho building bootstrapped. 2012-11-19 11:20:20 -05:00
Roland Grunberg 627ff82552 Add capability to build without depending on Tycho or Eclipse.
When %%bootstrap flag is set, Tycho will build without a BR on Eclipse or
Tycho. This can be used to build when these packages are not yet on the
buildroot. This requires a zipped reactor cache containing the
dependencies that would have been provided by Tycho, and Eclipse.
2012-11-07 13:52:58 -05:00
Roland Grunberg 5861b983ad Package org.eclipse.osgi and org.eclipse.jdt.core.
Mavenized versions org.eclipse.osgi and org.eclipse.jdt.core were
provided by Eclipse, but since it depends on Tycho at build-time, we
cannot depend upon it at runtime. Therefore we must provide these
bundles.
2012-10-20 16:59:20 -04:00
Roland Grunberg 614ffa9044 Update to finalized 0.16.0 Release.
Upstream has made some changes to the staged version.
2012-10-19 16:11:47 -04:00
Roland Grunberg 8c01993313 Update to 0.16.0 Release. 2012-10-19 14:09:14 -04:00
Roland Grunberg bb01c16f53 Build Tycho properly in one RPM build.
When the version of Tycho being built is the same as the version of
Tycho installed on the system, two builds must be performed to avoid a
cyclic dependency. The first build is an intermediary build to change
the version to something different from the final build. Most often this
happens when only the release tag is modified.
2012-10-19 10:05:18 -04:00
Roland Grunberg 57b4448ae4 Non-bootstrap build. 2012-10-11 12:23:48 -04:00
Roland Grunberg 986d9edcf6 Remove dependence on eclipse by use of self-bundled equinox launcher.
Tycho's self-packaged Eclipse equinox launcher should be used to to
publish bundles and features as a p2 repository, rather than depending
on Eclipse itself. This will avoid the cyclic dependencies.
2012-10-11 12:02:43 -04:00
Roland Grunberg 456e392859 Make symlinked jars under %%{_javadir} unique.
When a jar under %%{_javadir} is symlinked, it may clash with other jars
of the same name (eg. multiple core.jar that are osgi bundles).

This is also a non-bootstrap build.
2012-10-10 13:36:49 -04:00
Krzysztof Daniel 00896d5091 Non-bootstrap build. 2012-10-08 13:49:40 +02:00
Krzysztof Daniel c10ae09b52 Filter out OSGi dependencies. 2012-10-08 13:28:41 +02:00
Roland Grunberg 790211c7f7 Non-bootstrap build. 2012-10-04 17:08:24 -04:00
Roland Grunberg f6d260aef7 Fix bug in overriding of BREE to JavaSE-1.6. 2012-10-04 16:06:22 -04:00
Roland Grunberg 4c216ccdec Non-bootstrap build. 2012-10-03 14:36:11 -04:00
Roland Grunberg b90c413777 Update to latest 0.16.0 SNAPSHOT. 2012-10-03 12:54:11 -04:00
Krzysztof Daniel 9fc05761f3 First attempts to build without cyclic dependency to JDT. 2012-10-03 12:30:16 +02:00
Roland Grunberg ddaeda4b2a Non-bootstrap build. 2012-08-27 13:48:53 -04:00
Roland Grunberg 9ab446899e Add BR/R on explicit dependency objectweb-asm4. 2012-08-27 11:41:37 -04:00
Roland Grunberg ff57af15db Non-bootstrap build. 2012-08-24 12:06:49 -04:00
Roland Grunberg 050d5c3c87 Remove unneeded workaround for JSR14 incompatibility of JDK 1.7.
Fedora Eclipse now compiles all JSR14 upstream bundles with a target of
1.5, allowing us to leave in place parts of Tycho code that use those
particular libraries with generics.
2012-08-24 10:37:58 -04:00
Roland Grunberg ba49332349 Set BREE to at least JavaSE-1.6 for all eclipse packaging types.
We set the BREE to JavaSE-1.6 for 'eclipse-plugin',
'eclipse-test-plugin', and 'eclipse-feature' packaging types but we
should do this for all packaging types. (eg. 'eclipse-repository',
'eclipse-application', 'eclipse-update-site')
2012-08-24 09:09:58 -04:00
Roland Grunberg 40794d5eb5 Non-bootstrap build. 2012-08-15 16:40:56 -04:00
Roland Grunberg b01c67e8cb Update spec file to honour new java packaging guidelines. 2012-08-13 09:24:14 -04:00
Roland Grunberg a687c60712 Reference objectweb-asm4 gid:aid and fix local mode resolution bug.
When in local mode, but not offline, Tycho should favour local system
dependencies over remote ones in all cases.
2012-08-13 09:23:17 -04:00
Roland Grunberg b5cd7f66cc Non-bootstrap build. 2012-08-09 13:12:33 -04:00
Roland Grunberg bc9cc12ad6 Add tycho.local.keepTarget flag to bypass ignoring environments.
By default a build in local mode should ignore the user-defined
environments and use the system's environment. In some cases it may be
necessary to bypass this functionality.
2012-08-09 12:51:39 -04:00
Krzysztof Daniel 7bb1065942 Non-bootstrap build. 2012-08-09 11:05:44 +02:00
Krzysztof Daniel 85ea818d13 Use recommended %%add_maven_depmap. 2012-08-09 11:02:10 +02:00
Krzysztof Daniel 91c7dfc007 Non-bootstrap build. 2012-08-09 09:28:01 +02:00
Krzysztof Daniel 014594ffd1 Properly change bootstrap flag & Add some git ignores. 2012-08-09 09:12:25 +02:00
Krzysztof Daniel f6bd04eb8a Installing missing tycho-standalone-p2-director.zip. 2012-08-09 08:58:11 +02:00
Roland Grunberg 702c45696f Add maven-clean-plugin to Requires. 2012-08-07 13:11:57 -04:00
Roland Grunberg 50be185d52 Update to 0.16.0 SNAPSHOT. 2012-08-07 12:01:55 -04:00
Roland Grunberg d74a54602c Non-bootstrap build. 2012-07-31 16:09:25 -04:00
Roland Grunberg 03ccfcfec4 Ignore defined environments in local mode.
When running Tycho in local mode, dependencies will be resolved for all
environments defined in target-platform-configuration. Only the running
environment should be used.
2012-07-31 15:15:40 -04:00
Roland Grunberg b335532d6b Non-bootstrap build. 2012-07-30 14:55:15 -04:00
Roland Grunberg 7431c5844e Fix copy-platform-all script to properly link %%{_datadir}/eclipse jars.
When the path to the plugins/features folder for a set of bundles is
"%%{_datadir}/eclipse/dropins/${name}" (missing the additional eclipse
folder), the linking of its jars will fail.
2012-07-30 14:48:52 -04:00
Roland Grunberg e1d99f384b Update to 0.15.0. 2012-07-27 11:23:36 -04:00
Roland Grunberg 9f4b1c0760 Non-bootstrap build. 2012-07-25 11:18:50 -04:00
Roland Grunberg 4fc2026190 Detect OSGi jars using presence of the Bundle-SymbolicName entry. 2012-07-23 14:00:34 -04:00
Dennis Gilmore 9aa33bad19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild 2012-07-21 20:09:57 -05:00
Roland Grunberg 717b54a9e3 Non-bootstrap build. 2012-06-11 15:18:19 -04:00
Roland Grunberg ed7b67b58d Allow for building SWT fragments (BZ #380934). 2012-06-11 13:21:31 -04:00
Roland Grunberg 8a282a1729 Implement automatic creation of a system p2 repository.
Automatically create a local p2 repository of all bundles on the system
so that they may be used for local dependency resolution. This is done
using a modified version of Eclipse's copy-platform script.
2012-06-11 13:21:25 -04:00
Roland Grunberg 416b074682 Fix Surfire test plugin.
When running an Eclipse bundle's tests, Tycho Surefire resolves its
runtime dependencies using a class loader, which is in fact just looking
through Bundle-ClassPath. As a result, it must copy over and include
system jars in its Bundle-ClassPath. We use Fedora system jars to
satisfy these dependencies but even these jars differ slightly in terms
of provided classes.
2012-06-11 13:12:10 -04:00
Roland Grunberg 4a3b7d4fce Non-bootstrap build. 2012-05-23 11:20:03 -04:00
Roland Grunberg 34928e3a9f Set BREE to at least JavaSE-1.6 when building OSGi bundles.
Since Fedora 17, we need an Execution Environment of at least JavaSE-1.6
for Eclipse bundles. Eclipse Juno platform bundles depend on
javax.annotation. In Fedora this is provided by geronimo-annotation, but
has a dependency on javax.lang.model (since 1.6).
2012-05-22 15:22:54 -04:00
Roland Grunberg 9ff3cfa8c5 Non-bootstrap build. 2012-05-16 16:11:13 -04:00
Roland Grunberg 733e99cdb1 Implement a custom resolver when running in local mode.
When running in local mode, dependencies should be resolved by looking
on the local system. Remote repositories should be ignored.
2012-05-04 15:34:47 -04:00
Roland Grunberg 9a36347598 Non-bootstrap build. 2012-04-04 13:26:04 -04:00
Roland Grunberg 0e1315053c Revert "Remove "BuildArch: noarch"."
This reverts commit 2f0ce7b38b.
2012-04-04 13:08:33 -04:00
Roland Grunberg 2f0ce7b38b Remove "BuildArch: noarch". 2012-04-02 16:07:41 -04:00
Roland Grunberg e162d5762a Add missing tycho-testing-harness to be packaged. 2012-04-02 12:35:49 -04:00
Roland Grunberg 6ac9cc0acf - Update to 0.14.1 upstream tag.
- Allow building against maven-surefire 2.12 (instead of 2.10).
2012-03-09 16:56:24 -05:00
Roland Grunberg 8d36c52a2f Stop symlinking o.e.osgi and o.e.jdt.core into the m2 cache. 2012-02-23 16:31:51 -05:00
Roland Grunberg be52c16622 Non-bootstrap build. 2012-02-16 14:38:20 -05:00
Roland Grunberg 387d90cf7d Update to 0.14.0 upstream release tag. 2012-02-16 13:34:39 -05:00
Roland Grunberg 14063d17d7 Non-bootstrap build. 2012-02-09 14:37:19 -05:00
Roland Grunberg a6788916c2 Build 0.14.0 2012-02-09 14:25:34 -05:00
Stanislav Ochotnicky 8ef75d40ea Scratch commit for 0.13 update 2012-01-27 16:49:11 -05:00
Dennis Gilmore 0542f46da2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild 2012-01-14 01:22:16 -06:00
Alexander Kurtakov 017d47cb0c Non-bootstrap build. 2011-05-06 17:48:32 +03:00
Stanislav Ochotnicky 55dfddf3af Initial commit 2011-05-06 12:38:49 +02:00