Non-bootstrap build
This commit is contained in:
parent
74c26cc00a
commit
e12344b17b
@ -273,3 +273,19 @@ index bc8963d..fbe4da3 100644
|
||||
+ </plugins>
|
||||
+ </build>
|
||||
</project>
|
||||
--- eclipse.pde.build/org.eclipse.pde.build.tests/test.xml.orig 2017-04-28 11:49:47.046123546 +0100
|
||||
+++ eclipse.pde.build/org.eclipse.pde.build.tests/test.xml 2017-04-28 12:05:11.947521737 +0100
|
||||
@@ -157,13 +157,6 @@
|
||||
id="org.eclipse.jdt.source.feature.group"
|
||||
version="" />
|
||||
<iu
|
||||
- id="org.eclipse.rcp.configuration.feature.group"
|
||||
- version="" />
|
||||
-
|
||||
- <iu
|
||||
- id="org.eclipse.equinox.executable"
|
||||
- version="" />
|
||||
- <iu
|
||||
id="org.eclipse.e4.rcp.feature.group"
|
||||
version="" />
|
||||
<iu
|
||||
|
@ -103,6 +103,24 @@
|
||||
<exec
|
||||
dir="${platformLocation}"
|
||||
executable="tar">
|
||||
@@ -561,7 +534,7 @@
|
||||
unless="currentUpdateSite">
|
||||
<property
|
||||
name="currentUpdateSite"
|
||||
- value="http://${DOWNLOAD_HOST}/eclipse/updates/${updateSiteSegment}-${buildType}-builds/${buildId}" />
|
||||
+ value="file:${repoLocation}" />
|
||||
</target>
|
||||
<target
|
||||
name="initStreamSpecificProperties"
|
||||
@@ -808,7 +781,7 @@
|
||||
|
||||
<target
|
||||
name="init"
|
||||
- depends="initWorkspace,initProductionProperties,initBuildId, initBuildType, initDownloadHosts, initStreamVariables, initCurrentUpdateSite, initBasicDirectories,initOSes, initPlatformArhiveName, setRuntimeArchive"
|
||||
+ depends="initWorkspace,initProductionProperties,initBuildId, initBuildType, initDownloadHosts, initStreamVariables, initBasicDirectories, initCurrentUpdateSite, initOSes, initPlatformArhiveName, setRuntimeArchive"
|
||||
unless="testingIsInitialized">
|
||||
|
||||
<property environment="env" />
|
||||
@@ -823,7 +796,7 @@
|
||||
|
||||
<property
|
||||
|
10
eclipse.spec
10
eclipse.spec
@ -1,7 +1,7 @@
|
||||
# Set to 1 to build Eclipse without circular dependency to eclipse-pde, API
|
||||
# generation and docs will not be built and a second run will be required, but
|
||||
# this is a way to bootstrap Eclipse on secondary archs.
|
||||
%global bootstrap 1
|
||||
%global bootstrap 0
|
||||
|
||||
Epoch: 1
|
||||
|
||||
@ -38,7 +38,7 @@ Epoch: 1
|
||||
Summary: An open, extensible IDE
|
||||
Name: eclipse
|
||||
Version: 4.7.0
|
||||
Release: 0.5%{?dist}
|
||||
Release: 0.6%{?dist}
|
||||
License: EPL
|
||||
URL: http://www.eclipse.org/
|
||||
|
||||
@ -544,8 +544,7 @@ sed -i -e '/<\/excludes>/i<plugin id="org.eclipse.jdt.core.compiler.batch"/>' \
|
||||
%pom_xpath_set "pom:plugin[pom:artifactId = 'tycho-packaging-plugin']/pom:configuration/pom:archive/pom:addMavenDescriptor" "true" eclipse-platform-parent
|
||||
|
||||
# Don't set perms on files for platforms that aren't linux
|
||||
for f in \
|
||||
rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties; do
|
||||
for f in rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties; do
|
||||
grep '^root\.linux\.gtk\.%{eclipse_arch}[.=]' $f > tmp
|
||||
sed -i -e '/^root\./d' $f && cat tmp >> $f
|
||||
done
|
||||
@ -1031,6 +1030,9 @@ fi
|
||||
%{_eclipsedir}/plugins/org.eclipse.osgi.util_*
|
||||
|
||||
%changelog
|
||||
* Fri Apr 28 2017 Mat Booth <mat.booth@redhat.com> - 1:4.7.0-0.6
|
||||
- Non-bootstrap build
|
||||
|
||||
* Tue Apr 25 2017 Mat Booth <mat.booth@redhat.com> - 1:4.7.0-0.5
|
||||
- Update to latest I-build
|
||||
- Update generated ant bundle to 1.10.1
|
||||
|
Loading…
Reference in New Issue
Block a user