rpms/eclipse/devel fetch-ecf.sh, 1.1, 1.2 sources, 1.79, 1.80 eclipse.spec, 1.665, 1.666 .cvsignore, 1.61, 1.62

Alexander Kurtakov akurtakov at fedoraproject.org
Fri Sep 18 13:41:44 UTC 2009


Author: akurtakov

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

Modified Files:
	fetch-ecf.sh sources eclipse.spec .cvsignore 
Log Message:
Update ecf-filetransfer and build it.


Index: fetch-ecf.sh
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/fetch-ecf.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- fetch-ecf.sh	14 Jul 2008 21:40:30 -0000	1.1
+++ fetch-ecf.sh	18 Sep 2009 13:41:44 -0000	1.2
@@ -2,14 +2,29 @@
 
 for f in \
     org.eclipse.ecf \
-    org.eclipse.ecf.core.identity \
     org.eclipse.ecf.filetransfer \
+    org.eclipse.ecf.identity \
+    org.eclipse.ecf.ssl \
+; do
+cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/rt \
+export -r v20090604-1131 org.eclipse.ecf/framework/bundles/$f;
+done
+
+mkdir org.eclipse.ecf/plugins
+mv org.eclipse.ecf/framework/bundles/* org.eclipse.ecf/plugins
+rm -fr org.eclipse.ecf/framework
+
+for f in \
     org.eclipse.ecf.provider.filetransfer \
+    org.eclipse.ecf.provider.filetransfer.httpclient \
+    org.eclipse.ecf.provider.filetransfer.httpclient.ssl \
     org.eclipse.ecf.provider.filetransfer.ssl \
-    org.eclipse.ecf.ssl \
 ; do
-cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/technology \
-export -r v20080611-1715 org.eclipse.ecf/plugins/$f;
+cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/rt \
+export -r v20090604-1131 org.eclipse.ecf/providers/bundles/$f;
 done
 
-tar cjf ecf-filetransfer-v20080611-1715.tar.bz2 org.eclipse.ecf
+mv org.eclipse.ecf/providers/bundles/* org.eclipse.ecf/plugins
+rm -fr org.eclipse.ecf/providers
+
+tar cjf ecf-filetransfer-v20090604-1131.tar.bz2 org.eclipse.ecf


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/sources,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- sources	31 Aug 2009 10:43:32 -0000	1.79
+++ sources	18 Sep 2009 13:41:44 -0000	1.80
@@ -1,3 +1,3 @@
-611d3dc63e9e4246e325848d32773132  ecf-filetransfer-v20080611-1715.tar.bz2
 72a590190a4fea7a4f8885bfe26a3e18  eclipse-I20090611-1540-fetched-src.tar.bz2
 a3504fedff088a6e58a39d43fff4d47e  eclipse-build-R0_3_0.tar.gz
+4e76e7a49f8af3eff4f457f285323d2c  ecf-filetransfer-v20090604-1131.tar.bz2


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.665
retrieving revision 1.666
diff -u -p -r1.665 -r1.666
--- eclipse.spec	15 Sep 2009 16:19:48 -0000	1.665
+++ eclipse.spec	18 Sep 2009 13:41:44 -0000	1.666
@@ -30,7 +30,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        0.12%{?dist}
+Release:        0.13%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -52,7 +52,7 @@ Source24:       fetch-ecf.sh
 # filetransfer bits that are part of the SDK actually require the SDK >=
 # 3.4 to build, I'm going to build them here and have them be owned by
 # the SDK packages for now. -- overholt, 2008-07-07
-Source25:       ecf-filetransfer-v20080611-1715.tar.bz2
+Source25:       ecf-filetransfer-v20090604-1131.tar.bz2
 # Create a simple feature for building ECF's filetransfer plugins
 Source26:       ecf-filetransfer-feature.xml
 Source27:       ecf-filetransfer-build.properties
@@ -633,16 +633,14 @@ if [ ! -z "$JARS" ]; then
 fi
 
 # ECF filetransfer plugins
-# TODO Enable with correct ecf
-#tar jxf %{SOURCE25}
-#pushd org.eclipse.ecf
-#%patch35
-#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
+tar jxf %{SOURCE25}
+pushd org.eclipse.ecf
+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
 
 %patch43
 %patch44
@@ -655,10 +653,6 @@ fi
 # target platform template patch
 %patch50 -p0
 
-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
@@ -668,6 +662,7 @@ export JAVA_HOME=%{java_home}
 
 SDK=$(cd build/eclipse-I20090611-1540-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-I20090611-1540-fetched-src/plugins/org.eclipse.equinox.initializer
 java -cp $SDK/plugins/org.eclipse.equinox.launcher_$LAUNCHERVERSION \
       org.eclipse.core.launcher.Main \
@@ -678,22 +673,23 @@ popd
 
 #
 # Build the ECF filetransfer plugins
-# TODO reenable with correct ecf
-#pushd org.eclipse.ecf
-#mkdir -p build
-#
-#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 \
-#     -Dbuilder=$SDK/plugins/org.eclipse.pde.build_$PDEPLUGINVERSION/templates/package-build  \
-#     -f $SDK/plugins/org.eclipse.pde.build_$PDEPLUGINVERSION/scripts/build.xml
-#
-#popd
+pushd build/eclipse-I20090611-1540-fetched-src/org.eclipse.ecf
+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=v20090604-1131 \
+     -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
@@ -724,12 +720,12 @@ install -d -m 755 $RPM_BUILD_ROOT%{_data
 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} \
-#  org.eclipse.ecf/build/rpmBuild/org.eclipse.ecf.filetransfer_feature.zip
+rm $sdkDir/plugins/org.eclipse.ecf*.jar
+unzip -d $RPM_BUILD_ROOT%{_libdir} \
+  build/eclipse-I20090611-1540-fetched-src/org.eclipse.ecf/build/rpmBuild/org.eclipse.ecf.filetransfer_feature.zip
 # Remove the feature we used for building
-#rm -rf \
-#  $sdkDir/features/org.eclipse.ecf.filetransfer_feature_*
+rm -rf \
+  $sdkDir/features/org.eclipse.ecf.filetransfer_feature_*
 
 LAUNCHERVERSION=$(ls $sdkDir/plugins | grep equinox.launcher_ | sed 's/org.eclipse.equinox.launcher_//')
 
@@ -1427,7 +1423,10 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
-* Tue Sep 15 2009 Alexander Kurtakov <akurtako at redhat.com> 1:%{eclipse_majmin}.%{eclipse_micro}-0.12
+* Fri Sep 18 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.13
+- Update ecf-filetransfer and build it.
+
+* Tue Sep 15 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.12
 - Build with system jetty.
 
 * Mon Sep 14 2009 Andrew Overholt <overholt at redhat.com> 1:3.5.0-0.11


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/.cvsignore,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- .cvsignore	31 Aug 2009 10:43:33 -0000	1.61
+++ .cvsignore	18 Sep 2009 13:41:44 -0000	1.62
@@ -2,3 +2,4 @@ ecf-filetransfer-v20080611-1715.tar.bz2
 eclipse-ecj-gcj.tar.bz2
 eclipse-I20090611-1540-fetched-src.tar.bz2
 eclipse-build-R0_3_0.tar.gz
+ecf-filetransfer-v20090604-1131.tar.bz2




More information about the fedora-extras-commits mailing list