rpms/eclipse/devel sources, 1.84, 1.85 eclipse.spec, 1.676, 1.677 eclipse-copy-platform.sh, 1.9, NONE ecf-filetransfer-build.properties, 1.1, NONE eclipse-pdebuild.sh, 1.13, NONE ecf-filetransfer-feature.xml, 1.3, NONE

Mon Oct 12 14:15:59 UTC 2009

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24612/devel

Modified Files:
	sources eclipse.spec 
Removed Files:
	eclipse-copy-platform.sh ecf-filetransfer-build.properties 
	eclipse-pdebuild.sh ecf-filetransfer-feature.xml 
Log Message:
New eclipse-build snapshot. Pdebuild and ecf compilation are part of it.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/sources,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85

--- sources	8 Oct 2009 10:07:44 -0000	1.84
+++ sources	12 Oct 2009 14:15:58 -0000	1.85
@@ -1,2 +1,2 @@
 3ed7a1c9c13a73f6d7abc0b0305631e3  eclipse-R3_5_1-fetched-src.tar.bz2
-c02651bd19acc5bddec2e53dbc3e8820  eclipse-build-0.4.0RC0.tar.gz
+4b283c975b7c7b2894ef4de040f6b9c4  eclipse-build-0.4.0RC0.tar.gz


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.676
retrieving revision 1.677
diff -u -p -r1.676 -r1.677
--- eclipse.spec	8 Oct 2009 11:00:54 -0000	1.676
+++ eclipse.spec	12 Oct 2009 14:15:58 -0000	1.677
@@ -10,7 +10,6 @@ Epoch:  1
 %define eclipse_minor   5
 %define eclipse_majmin  %{eclipse_major}.%{eclipse_minor}
 %define eclipse_micro   1
-%define swtver          3.5.1.v3555a
 %define initialize      1
 %global download_url    http://download.eclipse.org/technology/linuxtools/eclipse-build/
 
@@ -30,22 +29,16 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        5%{?dist}
+Release:        6%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
 Source0:        %{download_url}eclipse-build-0.4.0RC0.tar.gz
 Source1:        %{download_url}eclipse-R3_5_1-fetched-src.tar.bz2
-Source16:       %{name}-copy-platform.sh
 Source17:       efj.sh.in
 # This file contains the types of files we'd like to extract from the jars
 # when using the FileInitializer
 Source19:       %{name}-filenamepatterns.txt
-# Script to wrap PDE Build calls for bundle builds
-Source21:       %{name}-pdebuild.sh
-# Create a simple feature for building ECF's filetransfer plugins
-Source26:       ecf-filetransfer-feature.xml
-Source27:       ecf-filetransfer-build.properties
 # This script copies the platform sub-set of the SDK for generating metadata
 Source28:       %{name}-mv-Platform.sh
 
@@ -128,9 +121,6 @@ SWT Library for GTK+-2.0.
 Summary:        Eclipse Rich Client Platform
 Group:          Development/Languages
 Requires:       %{name}-swt = %{epoch}:%{version}-%{release}
-# FIXME:  investigate.  Can we just add a %{arch} to the above?
-## This file-level requirement is for the bi-arch multilib case
-#Requires: %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_%{swtver}.jar
 Requires:       icu4j-eclipse >= 1:4.0.1-3
 Requires:       java >= 1.6.0
 
@@ -141,9 +131,6 @@ Eclipse Rich Client Platform
 Summary:        Eclipse platform common files
 Group:          Text Editors/Integrated Development Environments (IDE)
 Requires:   %{name}-rcp = %{epoch}:%{version}-%{release}
-# FIXME:  investigate.  Can we just add a %{arch} to the above?
-## This file-level requirement is for the bi-arch multilib case
-#Requires: %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_%{swtver}.jar
 Requires: 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
 Requires: ant-javamail ant-jdepend ant-junit ant-nodeps ant-swing ant-trax ant-jsch
 Requires: jakarta-commons-beanutils jakarta-commons-collections jakarta-commons-digester jakarta-commons-dbcp jakarta-commons-fileupload jakarta-commons-launcher jakarta-commons-modeler jakarta-commons-pool
@@ -477,56 +464,13 @@ if [ ! -z "$JARS" ]; then
    #FIXME: enable  exit 1
 fi
 
-# ECF filetransfer plugins
-pushd ecf-src
-mkdir -p plugins
-mv org.eclipse* plugins
-mkdir -p features/org.eclipse.ecf.filetransfer-feature
-pushd features/org.eclipse.ecf.filetransfer-feature
-cp -p %{SOURCE26} feature.xml
-cp -p %{SOURCE27} build.properties
-popd
-popd
-
 # target platform template patch
 %patch3 -p0
 popd
 
 %build
-ORIGCLASSPATH=$CLASSPATH
-export JAVA_HOME=%{java_home}
 ./build.sh
 
-SDK=$(cd build/eclipse-R3_5_1-fetched-src/installation && 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_//')
-pushd build/eclipse-R3_5_1-fetched-src/plugins/org.eclipse.equinox.initializer
-java -cp $SDK/plugins/org.eclipse.equinox.launcher_$LAUNCHERVERSION \
-      org.eclipse.core.launcher.Main \
-     -application org.eclipse.ant.core.antRunner       \
-     -f build.xml build.update.jar
-cp org.eclipse.equinox.initializer*.jar $SDK/plugins
-popd
-
-# Build the ECF filetransfer plugins
-pushd build/eclipse-R3_5_1-fetched-src/ecf-src
-mkdir -p build
-homedir=$(mkdir home| cd home|pwd)
-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.ecf.filetransfer_feature                   \
-     -DsourceDirectory=$(pwd)                          \
-     -DbaseLocation=$SDK \
-     -DforceContextQualifier=v20090831-1906 \
-     -Dbuilder=$SDK/plugins/org.eclipse.pde.build_$PDEPLUGINVERSION/templates/package-build  \
-     -debug -consolelog \
-     -f $SDK/plugins/org.eclipse.pde.build_$PDEPLUGINVERSION/scripts/build.xml
-
-popd
-
 %install
 rm -rf $RPM_BUILD_ROOT
 # Get swt version
@@ -550,16 +494,7 @@ install -d -m 755 $RPM_BUILD_ROOT%{_libd
 install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/features
 install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins
 
-# Explode the resulting SDK tarball
-cp -R build/eclipse-R3_5_1-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} \
-  build/eclipse-R3_5_1-fetched-src/ecf-src/build/rpmBuild/org.eclipse.ecf.filetransfer_feature.zip
-# Remove the feature we used for building
-rm -rf \
-  $sdkDir/features/org.eclipse.ecf.filetransfer_feature_*
 
 LAUNCHERVERSION=$(ls $sdkDir/plugins | grep equinox.launcher_ | sed 's/org.eclipse.equinox.launcher_//')
 
@@ -809,7 +744,7 @@ desktop-file-install --vendor="fedora" \
 
 # Create a script that can be used to make a symlink tree of the
 # eclipse platform.
-cp -p %{SOURCE16} copy-platform
+cp -p pdebuild/eclipse-copy-platform.sh copy-platform
 (
   cd $RPM_BUILD_ROOT%{_libdir}/%{name}
   ls -d * | egrep -v '^(plugins|features|about_files|dropins)$'
@@ -836,7 +771,7 @@ sed --in-place "s|file\\\:%{_libdir}/ecl
   $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/config.ini
 
 # Install the PDE Build wrapper script.
-install -p -D -m0755 %{SOURCE21} \
+install -p -D -m0755 pdebuild/eclipse-pdebuild.sh \
   $RPM_BUILD_ROOT%{_libdir}/%{name}/buildscripts/pdebuild
 PDEBUILDVERSION=$(ls $RPM_BUILD_ROOT%{_libdir}/%{name}/dropins/sdk/plugins \
   | grep org.eclipse.pde.build_ | \
@@ -1228,6 +1163,9 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Mon Oct 12 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.1-6
+- New eclipse-build snapshot. Pdebuild and ecf compilation are part of it.
+
 * Thu Oct 8 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.1-5
 - Fix install call.
 


--- eclipse-copy-platform.sh DELETED ---


--- ecf-filetransfer-build.properties DELETED ---


--- eclipse-pdebuild.sh DELETED ---


--- ecf-filetransfer-feature.xml DELETED ---


