rpms/eclipse/devel eclipse.ini, NONE, 1.1 eclipse-add-ppc64-sparc64-s390-s390x-2.patch, 1.8, 1.9 sources, 1.74, 1.75 eclipse.spec, 1.644, 1.645 .cvsignore, 1.58, 1.59 eclipse-mv-Platform.sh, 1.4, 1.5
Alexander Kurtakov
akurtakov at fedoraproject.org
Mon Aug 3 15:29:57 UTC 2009
Author: akurtakov
Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12711/devel
Modified Files:
eclipse-add-ppc64-sparc64-s390-s390x-2.patch sources
eclipse.spec .cvsignore eclipse-mv-Platform.sh
Added Files:
eclipse.ini
Log Message:
Swith to eclipse-build for building.
--- NEW FILE eclipse.ini ---
-startup
plugins/org.eclipse.equinox.launcher_1.0.200.v20090520.jar
--launcher.library
plugins/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.200.v20090520
-showsplash
org.eclipse.platform
--launcher.XXMaxPermSize
256m
-vmargs
-Xms40m
-Xmx512m
-XX:MaxPermSize=128m
-XX:CompileCommand=exclude,org/eclipse/core/internal/dtree/DataTreeNode,forwardDeltaWith
-XX:CompileCommand=exclude,org/eclipse/jdt/internal/compiler/lookup/ParameterizedMethodBinding,<init>
-XX:CompileCommand=exclude,org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPTemplates,instantiateTemplate
-XX:CompileCommand=exclude,org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkage,addBinding
-XX:CompileCommand=exclude,org/python/pydev/editor/codecompletion/revisited/PythonPathHelper,isValidSourceFile
-XX:CompileCommand=exclude,org/python/pydev/ui/filetypes/FileTypesPreferencesPage,getDottedValidSourceFiles
-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=/usr/share/eclipse/dropins
eclipse-add-ppc64-sparc64-s390-s390x-2.patch:
feature.xml | 14 ++++++++++++++
1 file changed, 14 insertions(+)
Index: eclipse-add-ppc64-sparc64-s390-s390x-2.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse-add-ppc64-sparc64-s390-s390x-2.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- eclipse-add-ppc64-sparc64-s390-s390x-2.patch 22 Apr 2009 08:18:29 -0000 1.8
+++ eclipse-add-ppc64-sparc64-s390-s390x-2.patch 3 Aug 2009 15:29:56 -0000 1.9
@@ -1,7 +1,7 @@
diff -up ./features/org.eclipse.rcp/feature.xml.arches ./features/org.eclipse.rcp/feature.xml
--- ./features/org.eclipse.rcp/feature.xml.arches 2008-10-03 09:05:02.000000000 -0400
+++ ./features/org.eclipse.rcp/feature.xml 2008-10-03 09:06:45.000000000 -0400
-@@ -229,6 +229,50 @@
+@@ -229,6 +229,20 @@
unpack="false"/>
<plugin
@@ -15,56 +15,10 @@ diff -up ./features/org.eclipse.rcp/feat
+ fragment="true"
+ unpack="false"/>
+
-+ <plugin
-+ id="org.eclipse.swt.gtk.linux.sparc"
-+ os="linux"
-+ ws="gtk"
-+ arch="sparc"
-+ download-size="0"
-+ install-size="0"
-+ version="0.0.0"
-+ fragment="true"
-+ unpack="false"/>
+
-+ <plugin
-+ id="org.eclipse.swt.gtk.linux.sparc64"
-+ os="linux"
-+ ws="gtk"
-+ arch="sparc64"
-+ download-size="0"
-+ install-size="0"
-+ version="0.0.0"
-+ fragment="true"
-+ unpack="false"/>
+
-+ <plugin
-+ id="org.eclipse.swt.gtk.linux.alpha"
-+ os="linux"
-+ ws="gtk"
-+ arch="alpha"
-+ download-size="0"
-+ install-size="0"
-+ version="0.0.0"
-+ fragment="true"
-+ unpack="false"/>
+
+ <plugin
id="org.eclipse.swt.gtk.solaris.sparc"
os="solaris"
ws="gtk"
-diff -up ./features/org.eclipse.rcp.source/feature.xml.arches ./features/org.eclipse.rcp.source/feature.xml
---- ./features/org.eclipse.rcp.source/feature.xml.orig 2009-04-17 16:05:51.000000000 +0200
-+++ ./features/org.eclipse.rcp.source/feature.xml 2009-04-17 16:07:57.000000000 +0200
-@@ -49,7 +49,11 @@
- <plugin id="org.eclipse.swt.motif.hpux.ia64_32.source" version="3.5.0.v3541a" os="hpux" arch="ia64_32" ws="motif" unpack="false"/>
- <plugin id="org.eclipse.swt.motif.linux.x86.source" version="3.5.0.v3541a" os="linux" arch="x86" ws="motif" unpack="false"/>
- <plugin id="org.eclipse.swt.gtk.linux.ia64.source" version="3.5.0.HEAD" os="linux" arch="ia64" ws="gtk" unpack="false"/>
-- <plugin id="org.eclipse.swt.motif.solaris.sparc.source" version="3.5.0.v3541a" os="solaris" arch="sparc" ws="motif" unpack="false"/>
-+ <plugin id="org.eclipse.swt.gtk.linux.ppc64.source" version="3.5.0.v3539" os="linux" arch="ppc64" ws="gtk" unpack="false"/>
-+ <plugin id="org.eclipse.swt.gtk.linux.sparc.source" version="3.5.0.v3539" os="linux" arch="sparc" ws="gtk" unpack="false"/>
-+ <plugin id="org.eclipse.swt.gtk.linux.sparc64.source" version="3.5.0.v3539" os="linux" arch="sparc64" ws="gtk" unpack="false"/>
-+ <plugin id="org.eclipse.swt.gtk.linux.alpha.source" version="3.5.0.v3539" os="linux" arch="alpha" ws="gtk" unpack="false"/>
-+ <plugin id="org.eclipse.swt.motif.solaris.sparc.source" version="3.5.0.v3539" os="solaris" arch="sparc" ws="motif" unpack="false"/>
- <plugin id="org.eclipse.swt.photon.qnx.x86.source" version="3.5.0.v3541a" os="qnx" arch="x86" ws="photon" unpack="false"/>
- <plugin id="org.eclipse.rcp.source" version="3.4.0.v20080507" unpack="false"/>
- <plugin id="org.eclipse.core.contenttype.source" version="3.4.0.v20090302" unpack="false"/>
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/sources,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- sources 20 May 2009 19:43:48 -0000 1.74
+++ sources 3 Aug 2009 15:29:56 -0000 1.75
@@ -2,3 +2,7 @@
e1313563c7e36aa46e33789a1386b815 eclipse-fileinitializerapp.tar.bz2
3e031f11b0de3f15b00233deec2b19f3 eclipse-3.4.2-testframework.tar.bz2
1c3bb4e384cbc5f4e2b7275238a010f7 eclipse-sourceBuild-srcIncluded-I20090416-1053.zip
+72a590190a4fea7a4f8885bfe26a3e18 eclipse-I20090611-1540-fetched-src.tar.bz2
+67c8679981ee3020ec2709d85cfaf4b1 eclipse-3.5.0-testframework.tar.bz2
+047b352b07b04f7f8e96afb81e69862c eclipse-build-generatedScripts.tar.bz2
+5f22063a596f9b5aa6295d0df20d8c62 eclipse-build-R0_0_2_1.tar.gz
Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.644
retrieving revision 1.645
diff -u -p -r1.644 -r1.645
--- eclipse.spec 24 Jul 2009 20:50:32 -0000 1.644
+++ eclipse.spec 3 Aug 2009 15:29:56 -0000 1.645
@@ -10,9 +10,10 @@ Epoch: 1
%define eclipse_minor 5
%define eclipse_majmin %{eclipse_major}.%{eclipse_minor}
%define eclipse_micro 0
-%define swtver 3.5.0.v3541a
+%define swtver 3.5.0.v3550
%define initialize 1
+
# All arches line up between Eclipse and Linux kernel names except i386 -> x86
%ifarch %{ix86}
%define eclipse_arch x86
@@ -29,12 +30,14 @@ Epoch: 1
Summary: An open, extensible IDE
Name: eclipse
Version: %{eclipse_majmin}.%{eclipse_micro}
-Release: 0.3.9%{?dist}
+Release: 0.3.25%{?dist}
License: EPL
Group: Text Editors/Integrated Development Environments (IDE)
URL: http://www.eclipse.org/
-Source0: http://download.eclipse.org/eclipse/downloads/drops/I20090416-1053/eclipse-sourceBuild-srcIncluded-I20090416-1053.zip
+Source0: eclipse-build-R0_0_2_1.tar.gz
+Source1: eclipse-I20090611-1540-fetched-src.tar.bz2
Source2: %{name}.desktop
+Source3: eclipse-build-generatedScripts.tar.bz2
#Source3: eclipse.in
Source16: %{name}-copy-platform.sh
Source17: efj.sh.in
@@ -71,8 +74,9 @@ Source28: %{name}-mv-Platform.sh
# org.eclipse.ant.optional.junit
# tar cjf %{name}-%{version}-testframework.tar.bz2 \
# %{name}-%{version}-testframework
-# (generated 2008-10-03)
-Source30: %{name}-3.4.2-testframework.tar.bz2
+# (generated 2009-07-23)
+Source30: %{name}-%{version}-testframework.tar.bz2
+Source31: eclipse.ini
# Build swttools.jar before generation on 64-bit platforms.
# Build SWT native libraries
@@ -135,8 +139,6 @@ Patch42: %{name}-tests-libraryXml
Patch43: %{name}-osgi-classpath.patch
Patch44: %{name}-fix-javahome64.patch
-# TODO fix build.xml generation
-Patch46: %{name}-platform_build.patch
# TODO fix customBuildCallback
Patch47: %{name}-jdt_launch-customBuild.patch
@@ -148,10 +150,6 @@ Patch47: %{name}-jdt_launch-custo
# be replaced with the former when libxul.pc is fixed.
# https://bugs.eclipse.org/bugs/attachment.cgi?id=131060
Patch48: %{name}-swt-buildagainstxulrunner.patch
-# Work with changed interface in XULRunner 1.9.1
-# https://bugs.eclipse.org/bugs/show_bug.cgi?id=268651
-# https://bugs.eclipse.org/bugs/attachment.cgi?id=130611
-Patch49: %{name}-swt-xulrunner191.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: ant
@@ -176,6 +174,7 @@ BuildRequires: desktop-file-utils
BuildRequires: java-devel >= 1.6.0
BuildRequires: java-javadoc
BuildRequires: libXt-devel
+BuildRequires: xulrunner-devel-unstable
BuildRequires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging ant-apache-bsf ant-commons-net
BuildRequires: ant-javamail ant-jdepend ant-junit ant-nodeps ant-swing ant-trax ant-jsch
@@ -293,13 +292,18 @@ Eclipse Plugin Development Environment.
developing Eclipse plugins.
%prep
-%setup -q -c
+%setup -q -n eclipse-build-R0_0_2_1
+cp %{SOURCE1} .
+cp %{SOURCE3} .
+sed --in-place "s/<target name=\"build\" depends=\"applyPatches,bootstrap,compilelibs\">/<target name=\"build\" depends=\"bootstrap,compilelibs\">/" build.xml
+ant -DbuildId=I20090611-1540 applyPatches
+pushd build/eclipse-I20090611-1540-fetched-src
-sed --in-place "s/java5.home/java.home/" build.xml
-sed --in-place "s|JavaSE-1.6=|JavaSE-1.6=%{java_home}|" build.xml
+#sed --in-place "s/java5.home/java.home/" build.xml
+#sed --in-place "s|JavaSE-1.6=|JavaSE-1.6=%{java_home}|" build.xml
# Build swttools.jar and native libraries
-%patch4 -p0
-%patch32 -p0
+#%patch4 -p0
+#%patch32 -p0
# liblocalfile fixes
sed --in-place "s/JAVA_HOME =/#JAVA_HOME =/" plugins/org.eclipse.core.filesystem/natives/unix/linux/Makefile
@@ -339,17 +343,6 @@ pushd plugins/org.eclipse.pde.build
sed --in-place "s:/usr/share/eclipse:%{_libdir}/%{name}:" templates/package-build/build.properties
popd
-pushd features/org.eclipse.platform
-# FIXME: fixed in 3.4.1
-# Move this file around due a bug in the metadata generator/parser that
-# can't work with the compiler exclude
-# https://bugs.eclipse.org/bugs/show_bug.cgi?id=238240
-cp -p gtk/eclipse.ini{,.orig}
-%patch29
-mv gtk/eclipse.ini{,.patched}
-mv gtk/eclipse.ini{.orig,}
-popd
-
# TODO check whether it is needed
#%patch36
# TODO rebase
@@ -389,20 +382,14 @@ SWT_VERSION=$SWT_MAJ_VER$SWT_MIN_VER
swt_frag_ver=$(grep v$SWT_VERSION plugins/org.eclipse.swt.gtk.linux.x86/build.xml | sed "s:.*<.*\"\(.*\)\" />:\1:")
swt_frag_ver_s390x=$(grep "version\.suffix\" value=" plugins/org.eclipse.swt.gtk.linux.s390x/build.xml | sed "s:.*<.*\"\(.*\)\" />:\1:")
sed --in-place "s|$swt_frag_ver_s390x|$swt_frag_ver|g" plugins/org.eclipse.swt.gtk.linux.s390x/build.xml \
- plugins/org.eclipse.swt.gtk.linux.s390x/META-INF/MANIFEST.MF \
- plugins/org.eclipse.swt.gtk.linux.s390x.source_3.5.0.HEAD/META-INF/MANIFEST.MF \
- plugins/org.eclipse.swt.gtk.linux.s390x.source_3.5.0.HEAD/build.xml \
- assemble.org.eclipse.sdk.linux.gtk.s390x.xml \
- features/org.eclipse.rcp/build.xml \
- features/org.eclipse.rcp.source/build.xml
-mv plugins/org.eclipse.swt.gtk.linux.s390.source_{3.5.0.HEAD,%{swtver}}
-mv plugins/org.eclipse.swt.gtk.linux.s390x.source_{3.5.0.HEAD,%{swtver}}
-mv plugins/org.eclipse.swt.gtk.linux.ia64.source_{3.5.0.HEAD,%{swtver}}
+ plugins/org.eclipse.swt.gtk.linux.s390x/META-INF/MANIFEST.MF
# Nasty hack to get suppport for ppc64, sparc{,64} and alpha
+%ifarch ppc64
%patch24 -p1
%patch28
-%patch30
+%endif
+#%patch30
%patch31 -p1
%patch38
@@ -416,22 +403,27 @@ sed -i "s/\(rootFileslinux_gtk_\)ppc64/\
cp -rp features/org.eclipse.platform/about_files/linux.gtk.{x86,%{_arch}}
%endif
%ifarch ppc64 sparc sparcv9 sparc64 alpha
- for f in $(find -name \*s390x\*); do
+ for f in $(find -name \*s390x\* ); do
tofile=$(echo $f | sed "s/s390x/%{_arch}/")
cp -rp $f $tofile
for g in $(find $tofile -type f); do
sed -i "s/s390x/%{_arch}/g" $g
done
done
+ mv buildConfigs/eclipse-build-config/build.properties buildConfigs/eclipse-build-config/build.properties.java
OLDIFS=$IFS
IFS='
'
for f in $(find -type f ! -name \*.java -a ! -name feature.xml -a ! -name \*.gif \
-a ! -name \*.png -a ! -name \*.htm* -a ! -name \*.jar -a ! -name \
- \*.exe -a ! -name \*.pm -a ! -name \*.jpg -a ! -name \*win32\* | grep -v win32); do
+ \*.exe -a ! -name \*.pm -a ! -name \*.jpg -a ! -name \*win32\* | grep -v win32); do
sed -i -e "s/s390x/%{_arch}/g" $f
done
IFS=$OLDIFS
+
+ mv buildConfigs/eclipse-build-config/build.properties.java buildConfigs/eclipse-build-config/build.properties
+ sed -i -e "s/%{_arch}/s390x/g" plugins/org.eclipse.swt.gtk.linux.s390x/META-INF/MANIFEST.MF
+ sed -i -e "s/%{_arch}/s390x/g" plugins/org.eclipse.equinox.launcher.gtk.linux.s390x/META-INF/MANIFEST.MF
%endif
%ifarch ppc64 sparc sparcv9 sparc64 alpha ia64
@@ -439,7 +431,7 @@ IFS='
'
# Fragments for these arches
rm -rf plugins/org.eclipse.equinox.launcher.gtk.linux.%{_arch}
- mv plugins/org.eclipse.equinox.launcher.gtk.linux.{ppc,%{_arch}}
+ cp -R plugins/org.eclipse.equinox.launcher.gtk.linux.{ppc,%{_arch}}
pushd plugins/org.eclipse.equinox.launcher.gtk.linux.%{_arch}
for f in $(find -type f); do
sed -i -e "s/ppc/%{_arch}/g" $f
@@ -450,7 +442,7 @@ IFS='
done
popd
rm -rf plugins/org.eclipse.core.filesystem.linux.%{_arch}
- mv plugins/org.eclipse.core.filesystem.linux.{ppc,%{_arch}}
+ cp -R plugins/org.eclipse.core.filesystem.linux.{ppc,%{_arch}}
pushd plugins/org.eclipse.core.filesystem.linux.%{_arch}
for f in $(find -type f); do
sed -i -e "s/ppc/%{_arch}/g" $f
@@ -461,7 +453,7 @@ IFS='
done
popd
rm -rf plugins/org.eclipse.swt.gtk.linux.%{_arch}
- mv plugins/org.eclipse.swt.gtk.linux.{ppc,%{_arch}}
+ cp -R plugins/org.eclipse.swt.gtk.linux.{ppc,%{_arch}}
pushd plugins/org.eclipse.swt.gtk.linux.%{_arch}
for f in $(find -type f); do
sed -i -e "s/ppc/%{_arch}/g" $f
@@ -472,19 +464,9 @@ IFS='
done
popd
IFS=$OLDIFS
-
+
%endif
-# Don't build for non-linux,gtk,%%{_arch} targets
-pushd features
-for f in */build.xml; do
- for platform in win32 macosx carbon cocoa hpux solaris aix qnx motif; do
- sed -i "/<ant antfile=\"build.xml\" dir=.*$platform.*target=\"/,/<\/ant>/ d" $f
- sed -i "/idReplacer/ s/org.eclipse\.\([a-z0-9A-Z_]\+\.\)\+$platform\(\.[a-z0-9A-Z_]\+\)*:0.0.0,[0-9\.Ivf\-]\+,//g" $f
- done
-done
-popd
-
arches=$(grep "antfile=\"build.xml\" dir=\".*gtk\.linux\.*" \
features/org.eclipse.rcp/build.xml | awk '{ print $3 }' | awk -F . \
'{ print $NF }' | sort -u | tr -d '"' | tr "\n" " ")
@@ -502,9 +484,9 @@ done
popd
# Symlinks
-rm plugins/org.sat4j*
-ln -s %{_javadir}/org.sat4j.core* plugins/org.sat4j.core_2.1.0.v20090308.jar
-ln -s %{_javadir}/org.sat4j.pb* plugins/org.sat4j.pb_2.1.0.v20090308.jar
+#rm plugins/org.sat4j*
+#ln -s %{_javadir}/org.sat4j.core* plugins/org.sat4j.core_2.1.0.v20090520.jar
+#ln -s %{_javadir}/org.sat4j.pb* plugins/org.sat4j.pb_2.1.0.v20090520.jar
ASMPLUGINVERSION=$(ls plugins | grep org.objectweb.asm_ | \
sed 's/org.objectweb.asm_//')
@@ -560,9 +542,9 @@ rm plugins/com.jcraft.jsch_*.jar
ln -s %{_javadir}/jsch.jar plugins/com.jcraft.jsch_$JSCHVERSION
# link to the icu4j stuff
-ICUVERSION=$(ls plugins | grep com.ibm.icu_ | sed 's/com.ibm.icu_//')
-rm plugins/com.ibm.icu_*.jar
-ln -s %{_libdir}/eclipse/plugins/com.ibm.icu_*.jar plugins/com.ibm.icu_$ICUVERSION
+#ICUVERSION=$(ls plugins | grep com.ibm.icu_ | sed 's/com.ibm.icu_//')
+#rm plugins/com.ibm.icu_*.jar
+#ln -s %{_libdir}/eclipse/plugins/com.ibm.icu_*.jar plugins/com.ibm.icu_$ICUVERSION
# link to lucene
LUCENEVERSION=$(ls plugins | grep org.apache.lucene_ | \
@@ -609,11 +591,18 @@ ln -s %{_datadir}/eclipse/plugins/org.ap
plugins/org.apache.jasper_$JASPERVERSION
# link to servlet-api
-SERVLETAPIVERSION=$(ls plugins | grep javax.servlet_ | \
- sed 's/javax.servlet_//')
-rm plugins/javax.servlet_*
+SERVLETAPIVERSION=$(ls plugins | grep javax.servlet_2.4 | \
+ sed 's/javax.servlet_2.4//')
+rm plugins/javax.servlet_2.4*
ln -s %{_javadir}/tomcat6-servlet-2.5-api.jar \
- plugins/javax.servlet_$SERVLETAPIVERSION
+ plugins/javax.servlet_2.4$SERVLETAPIVERSION
+
+SERVLETAPIVERSION=$(ls plugins | grep javax.servlet_2.5 | \
+ sed 's/javax.servlet_2.5//')
+rm plugins/javax.servlet_2.5*
+ln -s %{_javadir}/tomcat6-servlet-2.5-api.jar \
+ plugins/javax.servlet_2.5$SERVLETAPIVERSION
+
#
# link to jsp-api
JSPAPIVERSION=$(ls plugins | grep javax.servlet.jsp_ | \
@@ -626,8 +615,7 @@ ln -s %{_javadir}/tomcat5-jsp-2.0-api.ja
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=170662
rm plugins/org.eclipse.swt/extra_jars/exceptions.jar \
plugins/org.eclipse.osgi/osgi/osgi.cmpn.jar \
- plugins/org.eclipse.osgi/osgi/osgi.core.jar \
- plugins/org.eclipse.osgi/supplement/osgi/osgi.jar
+ plugins/org.eclipse.osgi/osgi/osgi.core.jar
# FIXME: figure out a way to symlink to something. Alternatively,
# patch out of package.org.eclipse.sdk*.xml.
@@ -664,7 +652,7 @@ tar jxf %{SOURCE20}
tar jxf %{SOURCE30}
# TODO regenerate testframework once 3.5 is out
#pushd %{name}-%{version}-testframework
-pushd %{name}-3.4.2-testframework
+pushd %{name}-%{version}-testframework
%patch41
pushd org.eclipse.test
%patch42
@@ -672,59 +660,32 @@ popd
sed -i "s:/usr/lib/eclipse:%{_libdir}/%{name}:" org.eclipse.test/library.xml
popd
-# TODO rediff patch if needed
%patch43
%patch44
-%patch46
%patch47
-pushd "plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library"
-%patch48 -p3
-popd
-pushd plugins/org.eclipse.swt
-# TODO remove when it appears in the official build
-#%patch49
-popd
+#pushd "plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library"
+#%patch48 -p3
+#popd
sed -i -e 's|org.eclipse.ecf;bundle-version="1.2.0",|org.eclipse.ecf;bundle-version="[3.0.0,4.0.0)",|' \
-e 's|org.eclipse.ecf.filetransfer;bundle-version="2.0.0",|org.eclipse.ecf.filetransfer;bundle-version="[3.0.0,4.0.0)",|' \
plugins/org.eclipse.equinox.p2.metadata.repository/META-INF/MANIFEST.MF
+popd
%build
ORIGCLASSPATH=$CLASSPATH
-
-# Bootstrapping:
-# 1. Build ecj with javac
-ant -DcompilerArg="-encoding ISO-8859-1 -nowarn" -buildfile jdtcoresrc/compilejdtcorewithjavac.xml
-
-# 2. Use this ecj to rebuild itself
-export CLASSPATH=`pwd`/jdtcoresrc/ecj.jar:$ORIGCLASSPATH
-ant -DcompilerArg="-encoding ISO-8859-1 -nowarn" -buildfile jdtcoresrc/compilejdtcore.xml
-
-mkdir -p tmp/eclipse/plugins
-cp plugins/org.eclipse.ecf* tmp/eclipse/plugins
-cp plugins/org.apache.commons.codec* tmp/eclipse/plugins
-cp plugins/org.apache.commons.httpclient* tmp/eclipse/plugins
-# Build the rest of Eclipse
-export CLASSPATH=`pwd`/ecj.jar:$ORIGCLASSPATH
export JAVA_HOME=%{java_home}
-ant \
- -Dnobootstrap=true \
- -DinstallOs=linux -DinstallWs=gtk -DinstallArch=%{eclipse_arch} \
- -Dlibsconfig=true \
- -DJavaSE-1.6=%{_jvmdir}/java/jre/lib/rt.jar \
- -DcompilerArg="-encoding ISO-8859-1 -nowarn"
+./build.sh
# Build the FileInitializer application
-SDK=$(cd eclipse && pwd)
+SDK=$(cd build/eclipse-I20090611-1540-fetched-src/installation && pwd)
mkdir -p home
homedir=$(cd home && pwd)
LAUNCHERVERSION=$(ls $SDK/plugins | grep equinox.launcher_ | sed 's/org.eclipse.equinox.launcher_//')
PDEPLUGINVERSION=$(ls $SDK/plugins | grep pde.build_ | sed 's/org.eclipse.pde.build_//')
-cp plugins/org.eclipse.ecf* $SDK/plugins
-cp plugins/org.apache.commons.codec* $SDK/plugins
-cp plugins/org.apache.commons.httpclient* $SDK/plugins
+pushd build/eclipse-I20090611-1540-fetched-src
pushd equinox-incubator
mkdir -p build
@@ -752,6 +713,7 @@ java -cp $SDK/plugins/org.eclipse.equino
popd
popd
+#
# Build the ECF filetransfer plugins
# TODO reenable with correct ecf
#pushd org.eclipse.ecf
@@ -771,40 +733,40 @@ popd
#popd
# Build the test framework
-pushd %{name}-3.4.2-testframework
-mkdir -p build
+#pushd %{name}-%{version}-testframework
+#mkdir -p build
# The qualifier is what is in upstream's release:
# http://download.eclipse.org/eclipse/downloads/drops/R-3.4-200806172000/eclipse-test-framework-3.4.zip
-java -cp $SDK/plugins/org.eclipse.equinox.launcher_$LAUNCHERVERSION \
- -Duser.home=$homedir \
- org.eclipse.core.launcher.Main \
- -application org.eclipse.ant.core.antRunner \
- -Dtype=feature \
- -Did=org.eclipse.test \
- -DsourceDirectory=$(pwd) \
- -DbaseLocation=$SDK \
- -DforceContextQualifier=v20080507 \
- -Dbuilder=$SDK/plugins/org.eclipse.pde.build_$PDEPLUGINVERSION/templates/package-build \
- -f $SDK/plugins/org.eclipse.pde.build_$PDEPLUGINVERSION/scripts/build.xml
-popd
+#java -cp $SDK/plugins/org.eclipse.equinox.launcher_$LAUNCHERVERSION \
+# -Duser.home=$homedir \
+# org.eclipse.core.launcher.Main \
+# -application org.eclipse.ant.core.antRunner \
+# -Dtype=feature \
+# -Did=org.eclipse.test \
+# -DsourceDirectory=$(pwd) \
+# -DbaseLocation=$SDK \
+# -DforceContextQualifier=v20080507 \
+# -Dbuilder=$SDK/plugins/org.eclipse.pde.build_$PDEPLUGINVERSION/templates/package-build \
+# -f $SDK/plugins/org.eclipse.pde.build_$PDEPLUGINVERSION/scripts/build.xml
+#popd
#TODO verify this is the correct place
-pushd %{name}-3.4.2-testframework
-unzip build/rpmBuild/org.eclipse.test.zip
-# These are already in the SDK
-rm eclipse/epl-v10.html eclipse/notice.html
-rm -rf eclipse/plugins/org.junit*
-rm build/rpmBuild/org.eclipse.test.zip
-zip -r build/rpmBuild/org.eclipse.test.zip eclipse
+#pushd %{name}-%{version}-testframework
+#unzip build/rpmBuild/org.eclipse.test.zip
+## These are already in the SDK
+#rm eclipse/epl-v10.html eclipse/notice.html
+#rm -rf eclipse/plugins/org.junit*
+#rm build/rpmBuild/org.eclipse.test.zip
+#zip -r build/rpmBuild/org.eclipse.test.zip eclipse
+#popd
popd
-
%install
rm -rf $RPM_BUILD_ROOT
# Get swt version
-SWT_MAJ_VER=$(grep maj_ver plugins/org.eclipse.swt/Eclipse\ SWT/common/library/make_common.mak | cut -f 2 -d =)
-SWT_MIN_VER=$(grep min_ver plugins/org.eclipse.swt/Eclipse\ SWT/common/library/make_common.mak | cut -f 2 -d =)
+SWT_MAJ_VER=$(grep maj_ver build/eclipse-I20090611-1540-fetched-src/plugins/org.eclipse.swt/Eclipse\ SWT/common/library/make_common.mak | cut -f 2 -d =)
+SWT_MIN_VER=$(grep min_ver build/eclipse-I20090611-1540-fetched-src/plugins/org.eclipse.swt/Eclipse\ SWT/common/library/make_common.mak | cut -f 2 -d =)
SWT_VERSION=$SWT_MAJ_VER$SWT_MIN_VER
# Some directories we need
@@ -826,12 +788,8 @@ install -d -m 755 $RPM_BUILD_ROOT%{_data
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins
# Explode the resulting SDK tarball
-tar -C $RPM_BUILD_ROOT%{_libdir} -zxf result/linux-gtk-%{eclipse_arch}-sdk.tar.gz
-
-cp plugins/org.eclipse.ecf* $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins
-cp plugins/org.apache.commons.codec* $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins
-cp plugins/org.apache.commons.httpclient* $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins
-
+cp -R build/eclipse-I20090611-1540-fetched-src/installation/* $RPM_BUILD_ROOT%{_libdir}/eclipse
+rm -fr $RPM_BUILD_ROOT%{_libdir}/eclipse/p2
# ECF filetransfer plugins we built
#rm $sdkDir/plugins/org.eclipse.ecf*.jar
#unzip -d $RPM_BUILD_ROOT%{_libdir} \
@@ -841,14 +799,14 @@ cp plugins/org.apache.commons.httpclient
# $sdkDir/features/org.eclipse.ecf.filetransfer_feature_*
# Test framework
-unzip -d $RPM_BUILD_ROOT%{_libdir} \
- %{name}-3.4.2-testframework/build/rpmBuild/org.eclipse.test.zip
-mv $RPM_BUILD_ROOT%{_libdir}/eclipse/plugins/org.eclipse.test{_3.2.0,}
+#unzip -d $RPM_BUILD_ROOT%{_libdir} \
+# %{name}-%{version}-testframework/build/rpmBuild/org.eclipse.test.zip
+#mv $RPM_BUILD_ROOT%{_libdir}/eclipse/plugins/org.eclipse.test{_3.2.0,}
LAUNCHERVERSION=$(ls $sdkDir/plugins | grep equinox.launcher_ | sed 's/org.eclipse.equinox.launcher_//')
# Install the file initializer app
-cp -p equinox-incubator/org.eclipse.equinox.initializer/org.eclipse.equinox.initializer_*.jar \
+cp -p build/eclipse-I20090611-1540-fetched-src/equinox-incubator/org.eclipse.equinox.initializer/org.eclipse.equinox.initializer_*.jar \
$sdkDir/plugins
installDir=$sdkDir-Platform
@@ -911,59 +869,18 @@ for plugin in org.eclipse.jdt \
done
popd
-# Generate metadata for JDT
-java \
--cp $installDir/plugins/org.eclipse.equinox.launcher_$LAUNCHERVERSION \
-org.eclipse.core.launcher.Main \
--application \
-org.eclipse.equinox.p2.metadata.generator.EclipseGenerator \
--metadataRepository file:$jdtMetadata \
--artifactRepository file:$jdtMetadata \
--source $jdtDir \
--root "Eclipse JDT" \
--rootVersion %{version} \
--flavor tooling \
--append \
--artifactRepositoryName "Eclipse JDT" \
--metadataRepositoryName "Eclipse JDT"
-
-# SDK
-sdkMetadata=$sdkDir/metadata-SDK
-
-# Generate metadata for SDK
-java \
--cp $installDir/plugins/org.eclipse.equinox.launcher_$LAUNCHERVERSION \
-org.eclipse.core.launcher.Main \
--application \
-org.eclipse.equinox.p2.metadata.generator.EclipseGenerator \
--metadataRepository file:$sdkMetadata \
--artifactRepository file:$sdkMetadata \
--source $sdkDir \
--root "Eclipse SDK" \
--rootVersion %{version} \
--flavor tooling \
--publishArtifacts \
--append \
--artifactRepositoryName "Eclipse SDK" \
--metadataRepositoryName "Eclipse SDK"
-
-# Director config.ini
-mv $installDir/configuration/config.ini{,.bak}
-cp -p %{SOURCE22} $installDir/configuration/config.ini
-
# Debugging? Add -debug and -consolelog
# Provision with director
java \
--Declipse.p2.data.area=file://$provisionDir/p2 \
+-Declipse.p2.data.area=file:$provisionDir/p2 \
-Declipse.p2.MD5Check=false \
-cp $installDir/plugins/org.eclipse.equinox.launcher_$LAUNCHERVERSION \
org.eclipse.core.launcher.Main \
-application \
-org.eclipse.equinox.p2.director.app.application \
+org.eclipse.equinox.p2.director \
-debug -consolelog \
-flavor tooling \
-installIU "Eclipse Platform" \
--version %{version} \
-p2.os linux \
-p2.ws gtk \
-p2.arch %{eclipse_arch} \
@@ -986,14 +903,11 @@ dropins=$provisionDir/dropins
mkdir -p $dropins/jdt $dropins/sdk
mv $jdtDir/features $dropins/jdt
mv $jdtDir/plugins $dropins/jdt
-#mv $jdtMetadata/content.xml $dropins/jdt
-#mv $jdtMetadata/artifacts.xml $dropins/jdt
mv $sdkDir/features $dropins/sdk
mv $sdkDir/plugins $dropins/sdk
-#mv $sdkMetadata/content.xml $dropins/sdk
-#mv $sdkMetadata/artifacts.xml $dropins/sdk
rm -rf $metadataDir $jdtDir $sdkDir $installDir
+
mv $provisionDir $sdkDir
# Fix paths in p2 data
@@ -1006,16 +920,17 @@ pushd $profileDir
sed -i "s|$provisionDir|%{_libdir}/%{name}|g" \
PlatformProfile.profile/*
sed -i "s|$RPM_BUILD_ROOT||g" PlatformProfile.profile/*
+ sed -i "s|eclipse-Platform|eclipse|g" PlatformProfile.profile/*
popd
+sed --in-place "s|SDKProfile|PlatformProfile|" \
+ $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/config.ini
+
%ifarch ppc64 sparc sparcv9 sparc64 alpha ia64
cp -p features/org.eclipse.platform/gtk/eclipse.ini $sdkDir
%endif
-cp -p features/org.eclipse.platform/gtk/eclipse.ini.patched \
- $sdkDir/eclipse.ini
-# We have /usr/share/eclipse/dropins in eclipse.ini
-sed -i "s|/usr/share|%{_datadir}|" $sdkDir/eclipse.ini
+
# Add a compatibility symlink to startup.jar
pushd $sdkDir
@@ -1027,11 +942,6 @@ popd
rm -r $sdkDir/configuration/org.eclipse.update
%if %{initialize}
-#Find better way to fix this
-sed --in-place "s|org.eclipse.core.runtime,3.5.0.v20090316,plugins/org.eclipse.core.runtime_3.5.0.v20090316.jar,4,false|org.eclipse.core.runtime,3.5.0.v20090316,plugins/org.eclipse.core.runtime_3.5.0.v20090316.jar,4,true|" \
- $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
-sed --in-place "s|org.eclipse.equinox.ds,1.1.0.v20090413,plugins/org.eclipse.equinox.ds_1.1.0.v20090413.jar,4,false|org.eclipse.equinox.ds,1.1.0.v20090413,plugins/org.eclipse.equinox.ds_1.1.0.v20090413.jar,4,true|" \
- $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
# FIXME: investigate why it doesn't work to set this -- configuration data is
# always written to /usr/share/eclipse/configuration, even with
# -Dosgi.sharedConfiguration.area=$RPM_BUILD_ROOT%{_libdir}/%{name}/configuration
@@ -1044,10 +954,12 @@ pushd $RPM_BUILD_ROOT
mv $RPM_BUILD_ROOT%{_libdir}/eclipse/dropins $RPM_BUILD_ROOT/dropins
mkdir $RPM_BUILD_ROOT%{_libdir}/eclipse/dropins
libdir_path=$(echo %{_libdir}/%{name} | sed -e 's/^\///')
-java -Dosgi.sharedConfiguration.area=$libdir_path/configuration \
+java -Dosgi.sharedConfiguration.area=$RPM_BUILD_ROOT$libdir_path/configuration \
-cp $libdir_path/startup.jar \
org.eclipse.core.launcher.Main \
-debug -consolelog \
+ -metadataRepository file:$metadataDir \
+-artifactRepository file:$metadataDir \
-application org.eclipse.equinox.initializer.configInitializer \
-fileInitializer %{SOURCE19}
popd
@@ -1066,7 +978,6 @@ popd
# Remove the unnecessary configuration data
rm -r $sdkDir/configuration/org.eclipse.core.runtime
rm -r $sdkDir/configuration/org.eclipse.equinox.app
-#rm -r $sdkDir/configuration/.settings
rm -rf $sdkDir/configuration/*.log
dataDirs=$(find $sdkDir/configuration \
-type d -name data)
@@ -1101,6 +1012,11 @@ done
popd
%endif
+cp -p %{SOURCE31} \
+ $sdkDir/eclipse.ini
+# We have /usr/share/eclipse/dropins in eclipse.ini
+sed -i "s|/usr/share|%{_datadir}|" $sdkDir/eclipse.ini
+
sed --in-place "s/osgi.ws=gtk/osgi.ws=gtk\norg.eclipse.update.reconcile=false/" \
$RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/config.ini
sed --in-place "s|org.eclipse.core.runtime,3.5.0.v20090316,file:plugins/org.eclipse.core.runtime_3.5.0.v20090316.jar,4,false|org.eclipse.core.runtime,3.5.0.v20090316,file:plugins/org.eclipse.core.runtime_3.5.0.v20090316.jar,4,true|" \
@@ -1126,7 +1042,7 @@ echo "path:%{_datadir}" > \
chmod 755 $RPM_BUILD_ROOT/%{_libdir}/%{name}/%{name}
# Install the SWT jar symlinks in libdir
-SWTJARVERSION=$(grep v$SWT_VERSION plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}/build.xml | sed "s:.*<.*\"\(.*\)\" />:\1:")
+SWTJARVERSION=$(grep v$SWT_VERSION build/eclipse-I20090611-1540-fetched-src/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}/build.xml | sed "s:.*<.*\"\(.*\)\" />:\1:")
pushd $RPM_BUILD_ROOT%{_libdir}/%{name}
ln -s plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_$SWTJARVERSION.jar swt-gtk-%{eclipse_majmin}.%{eclipse_micro}.jar
ln -s swt-gtk-%{eclipse_majmin}.%{eclipse_micro}.jar swt-gtk-%{eclipse_majmin}.jar
@@ -1153,6 +1069,8 @@ install -p -D -m0755 %{SOURCE17} $RPM_BU
sed --in-place "s:startup.jar:%{_libdir}/%{name}/startup.jar:" \
$RPM_BUILD_ROOT%{_bindir}/efj
+rm -rf $installDir
+
# A sanity check.
desktop-file-validate %{SOURCE2}
@@ -1183,6 +1101,11 @@ for p in $(ls -d dropins/sdk/plugins/*);
done
popd
+sed --in-place "s|$RPM_BUILD_ROOT%{_libdir}/eclipse-Platform/p2/|%{_libdir}/eclipse/p2/|" \
+ $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/config.ini
+sed --in-place "s|file\\\:%{_libdir}/eclipse/p2/|@config.dir/../p2/|" \
+ $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/config.ini
+
# Install the PDE Build wrapper script.
install -p -D -m0755 %{SOURCE21} \
$RPM_BUILD_ROOT%{_libdir}/%{name}/buildscripts/pdebuild
@@ -1193,9 +1116,9 @@ sed -i "s/@PDEBUILDVERSION@/$PDEBUILDVER
$RPM_BUILD_ROOT%{_libdir}/%{name}/buildscripts/pdebuild
pushd $RPM_BUILD_ROOT%{_libdir}/%{name}
-rm plugins/org.sat4j*
-ln -s %{_javadir}/org.sat4j.core* plugins/org.sat4j.core_2.1.0.v20090308.jar
-ln -s %{_javadir}/org.sat4j.pb* plugins/org.sat4j.pb_2.1.0.v20090308.jar
+#rm plugins/org.sat4j*
+#ln -s %{_javadir}/org.sat4j.core* plugins/org.sat4j.core_2.1.0.v20090520.jar
+#ln -s %{_javadir}/org.sat4j.pb* plugins/org.sat4j.pb_2.1.0.v20090520.jar
ASMPLUGINVERSION=$(ls dropins/sdk/plugins | grep org.objectweb.asm_ | \
sed 's/org.objectweb.asm_//')
@@ -1250,8 +1173,8 @@ rm plugins/com.jcraft.jsch_$JSCHVERSION
ln -s %{_javadir}/jsch.jar plugins/com.jcraft.jsch_$JSCHVERSION
# link to the icu4j stuff
-ICUVERSION=$(ls plugins | grep com.ibm.icu_ | sed 's/com.ibm.icu_//')
-rm plugins/com.ibm.icu_*.jar
+#ICUVERSION=$(ls plugins | grep com.ibm.icu_ | sed 's/com.ibm.icu_//')
+#rm plugins/com.ibm.icu_*.jar
# link to lucene
LUCENEVERSION=$(ls plugins | grep org.apache.lucene_ | \
@@ -1376,7 +1299,7 @@ fi
%{_libdir}/%{name}/readme
%{_libdir}/%{name}/startup.jar
%{_libdir}/%{name}/features/org.eclipse.rcp_*
-#%{_libdir}/%{name}/plugins/com.ibm.icu_*
+%{_libdir}/%{name}/plugins/com.ibm.icu_*
%{_libdir}/%{name}/plugins/org.eclipse.core.commands_*
%{_libdir}/%{name}/plugins/org.eclipse.core.contenttype_*
%{_libdir}/%{name}/plugins/org.eclipse.core.databinding_*
@@ -1413,8 +1336,9 @@ fi
%defattr(-,root,root)
%attr(0755,root,root) %{_bindir}/%{name}
%config %{_libdir}/%{name}/eclipse.ini
-%{_libdir}/%{name}/.eclipseproduct
+#%{_libdir}/%{name}/.eclipseproduct
%{_libdir}/%{name}/configuration/config.ini
+%{_libdir}/%{name}/about_files
%{_datadir}/applications/*
%{_datadir}/pixmaps/*
%{_datadir}/icons/*/*/apps/*
@@ -1565,6 +1489,9 @@ fi
#%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
%changelog
+* Mon Aug 3 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.3.25
+- Swith to eclipse-build for building.
+
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:3.5.0-0.3.9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/.cvsignore,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- .cvsignore 20 May 2009 19:43:47 -0000 1.58
+++ .cvsignore 3 Aug 2009 15:29:56 -0000 1.59
@@ -8,3 +8,7 @@ eclipse-sourceBuild-srcIncluded-3.4.2.zi
eclipse-3.4.2-testframework.tar.bz2
eclipse-sourceBuild-srcIncluded-I20090401-1325.zip
eclipse-sourceBuild-srcIncluded-I20090416-1053.zip
+eclipse-I20090611-1540-fetched-src.tar.bz2
+eclipse-3.5.0-testframework.tar.bz2
+eclipse-build-generatedScripts.tar.bz2
+eclipse-build-R0_0_2_1.tar.gz
Index: eclipse-mv-Platform.sh
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse-mv-Platform.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- eclipse-mv-Platform.sh 2 Apr 2009 08:12:57 -0000 1.4
+++ eclipse-mv-Platform.sh 3 Aug 2009 15:29:56 -0000 1.5
@@ -6,7 +6,6 @@ mkdir -p features plugins
mv $baseDir/about* .
mv $baseDir/configuration/ .
mv $baseDir/eclipse{,.ini} .
-mv $baseDir/.eclipseproduct .
mv $baseDir/epl-v10.html .
mv $baseDir/notice.html .
mv $baseDir/readme/ .
@@ -19,8 +18,6 @@ mv $baseDir/plugins/org.eclipse.team.cvs
mv $baseDir/plugins/org.eclipse.team.cvs.ssh2_* plugins
mv $baseDir/plugins/org.eclipse.team.cvs.ui_* plugins
mv $baseDir/features/org.eclipse.equinox.p2.user.ui_* features
-mv $baseDir/features/org.fedoraproject* features
-mv $baseDir/plugins/org.fedoraproject* plugins
mv $baseDir/plugins/*linux* plugins
mv $baseDir/plugins/com.jcraft.jsch_* plugins
mv $baseDir/plugins/org.eclipse.compare_* plugins
More information about the fedora-extras-commits
mailing list