diff options
| author | Mykola Nikishov | 2019-03-30 13:53:41 +0000 |
|---|---|---|
| committer | Mykola Nikishov | 2019-04-09 11:36:55 +0000 |
| commit | 91506d67f40c38baa1897b8f0cc174146f85361e (patch) | |
| tree | e2719df5639783fd7c82d40fabb6b9c8c6fca1ec | |
| parent | 8dcd176ab4016b61c821f392a37f004544ecefbc (diff) | |
| download | rt.equinox.framework-91506d67f40c38baa1897b8f0cc174146f85361e.tar.gz rt.equinox.framework-91506d67f40c38baa1897b8f0cc174146f85361e.tar.xz rt.equinox.framework-91506d67f40c38baa1897b8f0cc174146f85361e.zip | |
Bug 544061 - [releng] Reuse rt.equinox.binaries.loc in launcher-binary-parentI20190412-0520
launcher-binary-parent, a parent for all
org.eclipse.equinox.launcher.* submodules, also uses a location of
rt.equinox.binaries project to copy-launcher-natives.
Move rt.equinox.binaries.loc property from
org.eclipse.equinox.feature:org.eclipse.equinox.executable to
org.eclipse.equinox.framework:rt.equinox.framework which is the parent
for both org.eclipse.equinox.feature:org.eclipse.equinox.executable
and org.eclipse.equinox.framework:launcher-binary-parent.
Hard-coded relative path dependency from framework to binaries
repository has been present for a few years [1]. This is the last
change in a series [2], [3] that remains backward-compatible but also
allows to use arbitrary locations for both projects by defining the
system property rt.equinox.binaries.loc:
cd /home/user/src/rt.equinox.framework
mvn -Drt.equinox.binaries.loc=/src/equinox/binaries/ <goals>
[1] 12c991ab837e7927c3a30ce408f42cde420197ea
[2] a77f4a30d1824d75c87079b944c67be2291feccb
[3] 8dcd176ab4016b61c821f392a37f004544ecefbc
Change-Id: I4f7f078f0e15dd346405cc2add4b2f8dc57d8eaa
Signed-off-by: Mykola Nikishov <mn@mn.com.ua>
| -rw-r--r-- | features/org.eclipse.equinox.executable.feature/pom.xml | 4 | ||||
| -rw-r--r-- | launcher-binary-parent/pom.xml | 2 | ||||
| -rw-r--r-- | pom.xml | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/features/org.eclipse.equinox.executable.feature/pom.xml b/features/org.eclipse.equinox.executable.feature/pom.xml index b656796f6..93ccf9e3d 100644 --- a/features/org.eclipse.equinox.executable.feature/pom.xml +++ b/features/org.eclipse.equinox.executable.feature/pom.xml @@ -106,10 +106,6 @@ <name>!longnotexistingproperty</name> </property> </activation> - <properties> - <!-- location of rt.equinox.binaries project --> - <rt.equinox.binaries.loc>../../../rt.equinox.binaries</rt.equinox.binaries.loc> - </properties> <build> <plugins> <plugin> diff --git a/launcher-binary-parent/pom.xml b/launcher-binary-parent/pom.xml index cc77a8437..5ed47086b 100644 --- a/launcher-binary-parent/pom.xml +++ b/launcher-binary-parent/pom.xml @@ -47,7 +47,7 @@ <property name="feature.base" value="."/> <target> <copy todir="${project.build.directory}" overwrite="true"> - <fileset dir="../../../rt.equinox.binaries/${project.artifactId}/"> + <fileset dir="${rt.equinox.binaries.loc}/${project.artifactId}"> <include name="*.so"/> <include name="*.dll"/> </fileset> @@ -26,6 +26,10 @@ <properties> <tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/equinox/rt.equinox.framework.git</tycho.scmUrl> + <!-- location of rt.equinox.binaries project --> + <!-- required by: org.eclipse.equinox.feature:org.eclipse.equinox.executable --> + <!-- required by: org.eclipse.equinox.framework:launcher-binary-parent --> + <rt.equinox.binaries.loc>../../../rt.equinox.binaries</rt.equinox.binaries.loc> </properties> <!-- |