[eclipse-rse] Update rse to 3.5M6 which is what was shipped for Kepler M6.
Jeff Johnston
jjohnstn at fedoraproject.org
Fri Apr 5 20:13:55 UTC 2013
commit 5a52384eb6cf24ad894d47aeef9c15b93a4a654e
Author: Jeff Johnston <jjohnstn at redhat.com>
Date: Fri Apr 5 16:13:39 2013 -0400
Update rse to 3.5M6 which is what was shipped for Kepler M6.
- Need to use full git tree and tycho to build.
.gitignore | 1 +
eclipse-rse-commons-net-source.patch | 84 +++++++++++++++++++++++++++
eclipse-rse-junit.patch | 12 ++++
eclipse-rse-tm-repo.patch | 19 ++++++
eclipse-rse-top-pom.patch | 102 +++++++++++++++++++++++++++++++++
eclipse-rse.spec | 104 ++++++++++++++++++++--------------
fetch-rse.sh | 72 ++---------------------
sources | 2 +-
8 files changed, 287 insertions(+), 109 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5a69aee..4e4e4e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ rse-fetched-src-R3_2.tar.gz
/rse-fetched-src-R3_3.tar.gz
/rse-fetched-src-R3_3_1.tar.gz
/rse-fetched-src-R3_4.tar.gz
+/eclipse-rse-3.5M6.tar.gz
diff --git a/eclipse-rse-commons-net-source.patch b/eclipse-rse-commons-net-source.patch
new file mode 100644
index 0000000..1585a2d
--- /dev/null
+++ b/eclipse-rse-commons-net-source.patch
@@ -0,0 +1,84 @@
+diff -up ./releng/org.eclipse.tm.releng.master-feature/feature.xml.fix2 ./releng/org.eclipse.tm.releng.master-feature/feature.xml
+--- ./releng/org.eclipse.tm.releng.master-feature/feature.xml.fix2 2013-04-04 14:40:09.000000000 -0400
++++ ./releng/org.eclipse.tm.releng.master-feature/feature.xml 2013-04-04 14:40:32.000000000 -0400
+@@ -83,12 +83,6 @@
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+- <plugin
+- id="org.apache.commons.net.source"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+ <!--
+ <plugin
+ id="org.eclipse.tm.tcf.agent"
+diff -up ./rse/features/org.eclipse.rse.ftp-feature/sourceTemplateFeature/feature.xml.fix2 ./rse/features/org.eclipse.rse.ftp-feature/sourceTemplateFeature/feature.xml
+--- ./rse/features/org.eclipse.rse.ftp-feature/sourceTemplateFeature/feature.xml.fix2 2013-04-04 14:46:54.000000000 -0400
++++ ./rse/features/org.eclipse.rse.ftp-feature/sourceTemplateFeature/feature.xml 2013-04-04 14:47:03.000000000 -0400
+@@ -34,13 +34,6 @@
+ </url>
+
+ <plugin
+- id="org.apache.commons.net.source"
+- download-size="207"
+- install-size="348"
+- version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
+ id="org.eclipse.rse.services.files.ftp.source"
+ download-size="0"
+ install-size="0"
+diff -up ./rse/features/org.eclipse.rse.ftp.source/feature.xml.fix2 ./rse/features/org.eclipse.rse.ftp.source/feature.xml
+--- ./rse/features/org.eclipse.rse.ftp.source/feature.xml.fix2 2013-04-04 14:43:57.000000000 -0400
++++ ./rse/features/org.eclipse.rse.ftp.source/feature.xml 2013-04-04 14:44:11.000000000 -0400
+@@ -34,13 +34,6 @@
+ </url>
+
+ <plugin
+- id="org.apache.commons.net.source"
+- download-size="207"
+- install-size="348"
+- version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
+ id="org.eclipse.rse.services.files.ftp.source"
+ download-size="0"
+ install-size="0"
+diff -up ./rse/features/org.eclipse.rse.telnet-feature/sourceTemplateFeature/feature.xml.fix2 ./rse/features/org.eclipse.rse.telnet-feature/sourceTemplateFeature/feature.xml
+--- ./rse/features/org.eclipse.rse.telnet-feature/sourceTemplateFeature/feature.xml.fix2 2013-04-04 14:45:51.000000000 -0400
++++ ./rse/features/org.eclipse.rse.telnet-feature/sourceTemplateFeature/feature.xml 2013-04-04 14:46:10.000000000 -0400
+@@ -34,13 +34,6 @@
+ </url>
+
+ <plugin
+- id="org.apache.commons.net.source"
+- download-size="207"
+- install-size="348"
+- version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
+ id="org.eclipse.rse.connectorservice.telnet.source"
+ download-size="0"
+ install-size="0"
+diff -up ./rse/features/org.eclipse.rse.telnet.source/feature.xml.fix2 ./rse/features/org.eclipse.rse.telnet.source/feature.xml
+--- ./rse/features/org.eclipse.rse.telnet.source/feature.xml.fix2 2013-04-04 14:44:50.000000000 -0400
++++ ./rse/features/org.eclipse.rse.telnet.source/feature.xml 2013-04-04 14:45:00.000000000 -0400
+@@ -34,13 +34,6 @@
+ </url>
+
+ <plugin
+- id="org.apache.commons.net.source"
+- download-size="207"
+- install-size="348"
+- version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
+ id="org.eclipse.rse.connectorservice.telnet.source"
+ download-size="0"
+ install-size="0"
diff --git a/eclipse-rse-junit.patch b/eclipse-rse-junit.patch
new file mode 100644
index 0000000..3b8dfe6
--- /dev/null
+++ b/eclipse-rse-junit.patch
@@ -0,0 +1,12 @@
+diff -up ./rse/tests/org.eclipse.rse.tests-feature/feature.xml.fix3 ./rse/tests/org.eclipse.rse.tests-feature/feature.xml
+--- ./rse/tests/org.eclipse.rse.tests-feature/feature.xml.fix3 2013-04-04 15:09:58.000000000 -0400
++++ ./rse/tests/org.eclipse.rse.tests-feature/feature.xml 2013-04-04 15:10:20.000000000 -0400
+@@ -47,7 +47,7 @@
+ <import plugin="org.eclipse.rse.subsystems.files.ftp" version="2.1.0" match="compatible"/>
+ <import plugin="org.eclipse.jface.text"/>
+ <import plugin="org.eclipse.help"/>
+- <import plugin="org.junit" version="3.8.1" match="compatible"/>
++ <import plugin="org.junit"/>
+ <import plugin="org.apache.ant"/>
+ </requires>
+
diff --git a/eclipse-rse-tm-repo.patch b/eclipse-rse-tm-repo.patch
new file mode 100644
index 0000000..72e3b8a
--- /dev/null
+++ b/eclipse-rse-tm-repo.patch
@@ -0,0 +1,19 @@
+diff -up ./releng/org.eclipse.tm.repo/category.xml.fix ./releng/org.eclipse.tm.repo/category.xml
+--- ./releng/org.eclipse.tm.repo/category.xml.fix 2013-04-05 11:58:11.000000000 -0400
++++ ./releng/org.eclipse.tm.repo/category.xml 2013-04-05 13:34:23.000000000 -0400
+@@ -15,6 +15,7 @@
+ <feature url="features/org.eclipse.rse.scp_0.2.0.qualifier.jar" id="org.eclipse.rse.scp" version="0.2.0.qualifier">
+ <category name="tm_35_optional"/>
+ </feature>
++<!--
+ <feature url="features/org.eclipse.rse.tests_3.4.1.qualifier.jar" id="org.eclipse.rse.tests" version="3.4.1.qualifier">
+ <category name="tm_35_optional"/>
+ </feature>
+@@ -25,6 +26,7 @@
+ <category name="tm_35_main"/>
+ </feature>
+ <feature url="features/org.eclipse.tm.terminal.core.sdk_3.3.2.qualifier.jar" id="org.eclipse.tm.terminal.core.sdk" version="3.3.2.qualifier"/>
++-->
+ <category-def name="tm_35_main" label="TM and RSE 3.5 Main Features">
+ <description>
+ TM and RSE Main Features
diff --git a/eclipse-rse-top-pom.patch b/eclipse-rse-top-pom.patch
new file mode 100644
index 0000000..fbe7d2e
--- /dev/null
+++ b/eclipse-rse-top-pom.patch
@@ -0,0 +1,102 @@
+diff -up ./pom.xml.fix5 ./pom.xml
+--- ./pom.xml.fix5 2013-04-04 18:15:14.000000000 -0400
++++ ./pom.xml 2013-04-04 18:56:47.000000000 -0400
+@@ -14,11 +14,11 @@
+ <prerequisites>
+ <maven>3.0</maven>
+ </prerequisites>
+- <parent>
++ <!-- <parent>
+ <groupId>org.eclipse</groupId>
+ <artifactId>eclipse-parent</artifactId>
+ <version>3</version>
+- </parent>
++ </parent> -->
+ <groupId>org.eclipse.tm</groupId>
+ <artifactId>tm-parent</artifactId>
+ <version>3.8.0-SNAPSHOT</version>
+@@ -263,13 +263,16 @@
+ <!-- <module>rse/plugins/org.eclipse.rse.useractions.sdk</module> -->
+ <module>releng/org.eclipse.tm.repo</module>
+ <module>terminal/plugins/org.eclipse.tm.terminal</module>
++ <!--
+ <module>terminal/plugins/org.eclipse.tm.terminal.serial</module>
+ <module>terminal/plugins/org.eclipse.tm.terminal.ssh</module>
+ <module>terminal/plugins/org.eclipse.tm.terminal.telnet</module>
+ <module>terminal/plugins/org.eclipse.tm.terminal.view</module>
+ <module>terminal/plugins/org.eclipse.tm.terminal.local</module>
+- <module>terminal/plugins/org.eclipse.tm.terminal.test</module>
++ -->
++ <!-- <module>terminal/plugins/org.eclipse.tm.terminal.test</module> -->
+ <module>terminal/features/org.eclipse.tm.terminal-feature</module>
++ <!--
+ <module>terminal/features/org.eclipse.tm.terminal.serial-feature</module>
+ <module>terminal/features/org.eclipse.tm.terminal.ssh-feature</module>
+ <module>terminal/features/org.eclipse.tm.terminal.telnet-feature</module>
+@@ -286,6 +289,7 @@
+ <module>wince/org.eclipse.rse.wince-feature</module>
+ <module>wince/org.eclipse.rse.subsystems.wince</module>
+ <module>wince/org.eclipse.tm.rapi</module>
++ -->
+ </modules>
+ <build>
+ <plugins>
+@@ -323,41 +327,6 @@
+ <ws>gtk</ws>
+ <arch>x86_64</arch>
+ </environment>
+- <environment>
+- <os>linux</os>
+- <ws>gtk</ws>
+- <arch>x86_64</arch>
+- </environment>
+- <environment>
+- <os>linux</os>
+- <ws>gtk</ws>
+- <arch>ppc64</arch>
+- </environment>
+- <environment>
+- <os>win32</os>
+- <ws>win32</ws>
+- <arch>x86_64</arch>
+- </environment>
+- <environment>
+- <os>win32</os>
+- <ws>win32</ws>
+- <arch>x86_64</arch>
+- </environment>
+- <environment>
+- <os>macosx</os>
+- <ws>cocoa</ws>
+- <arch>x86_64</arch>
+- </environment>
+- <environment>
+- <os>macosx</os>
+- <ws>cocoa</ws>
+- <arch>x86_64</arch>
+- </environment>
+- <environment>
+- <os>aix</os>
+- <ws>gtk</ws>
+- <arch>ppc</arch>
+- </environment>
+ </environments>
+ <resolver>p2</resolver>
+ <ignoreTychoRepositories>true</ignoreTychoRepositories>
+@@ -368,14 +337,14 @@
+ <type>eclipse-plugin</type>
+ <id>org.apache.commons.net</id>
+ <restrictTo>
+- <versionRange>[2.2,3.0)</versionRange>
++ <versionRange>[2.2,4.0)</versionRange>
+ </restrictTo>
+ </filter>
+ <filter>
+ <type>eclipse-plugin</type>
+ <id>org.apache.commons.net.source</id>
+ <restrictTo>
+- <versionRange>[2.2,3.0)</versionRange>
++ <versionRange>[2.2,4.0)</versionRange>
+ </restrictTo>
+ </filter>
+ </filters>
diff --git a/eclipse-rse.spec b/eclipse-rse.spec
index 015b058..43b4ffa 100644
--- a/eclipse-rse.spec
+++ b/eclipse-rse.spec
@@ -5,21 +5,21 @@
%global rseserver_install %{_datadir}/eclipse-rse-server
%global rseserver_java %{_datadir}/java/eclipse-rse-server
%global rseserver_config %{_sysconfdir}/sysconfig/rseserver
-%global qualifier 201205300905
+%global rse_snapshot org.eclipse.tm
Name: eclipse-rse
Summary: Eclipse Remote System Explorer
-Version: 3.4
-Release: 5%{?dist}
+Version: 3.5
+Release: 0.1.m6%{?dist}
License: EPL
URL: http://www.eclipse.org/dsdp/tm/
-# Following tarball generated by running fetch-rse.sh.
-Source0: rse-fetched-src-R3_4.tar.gz
+# Following tarball fetched by using the fetch.sh script to clone
+# and tar the repository. This is needed because the timestamp qualifiers
+# are generated by tycho-extras using the last update time of various
+# plug-ins and features
+Source0: eclipse-rse-3.5M6.tar.gz
Source1: fetch-rse.sh
-# Following property files are generated by fetch-rse.sh.
-Source2: featureVersions.properties
-Source3: pluginVersions.properties
Source4: notice.html
Source5: epl-v10.html
@@ -28,15 +28,40 @@ Patch1: eclipse-rse-server-auth-pl.patch
# Fix classpath in daemon and server scripts to point
# to install locations
Patch2: eclipse-rse-server-scripts.patch
+# Patch to remove eclipse-parent pom reference and multiple environments
+Patch3: eclipse-rse-top-pom.patch
+# Patch to remove dependency on org.apache.commons.net.source
+Patch4: eclipse-rse-commons-net-source.patch
+# Patch to allow junit4 to be used for building tests
+Patch5: eclipse-rse-junit.patch
+# Patch to remove tests from tm repo
+Patch6: eclipse-rse-tm-repo.patch
+
BuildRequires: java-devel >= 1.5.0
+# All arches line up except i386 -> x86
+%ifarch %{ix86}
+%define eclipse_arch x86
+%else
+%ifarch %{arm}
+%define eclipse_arch arm
+%else
+%define eclipse_arch %{_arch}
+%endif
+%endif
+
%if 0%{?rhel} >= 6
ExclusiveArch: i686 x86_64
%else
BuildArch: noarch
%endif
+BuildRequires: tycho
+BuildRequires: tycho-extras
+BuildRequires: maven >= 3.0.3
+BuildRequires: junit
+
BuildRequires: eclipse-pde >= 1:3.8.0-0.21
BuildRequires: eclipse-emf >= 0:2.4.1
BuildRequires: apache-commons-net >= 0:1.4.1-5.4
@@ -63,53 +88,44 @@ The Remote System Explorer (RSE) framework server that can be used so clients ca
%prep
%setup -q -c
-cp %{SOURCE4} .
-cp %{SOURCE5} .
+pushd %{rse_snapshot}
+
+sed -i -e 's/<arch>x86<\/arch>/<arch>%{eclipse_arch}<\/arch>/g' pom.xml
+
+%patch3
+%patch4
+%patch5
+%patch6
-pushd org.eclipse.rse.services.dstore
+pushd rse/plugins/org.eclipse.rse.services.dstore
%patch1
%patch2
popd
-%build
-
-rm -rf orbitdeps
-mkdir orbitdeps
-pushd orbitdeps
-ln -s %{_javadir}/commons-net.jar org.apache.commons.net_2.0.jar
popd
-mkdir -p build
-
-pushd build
-cp %{SOURCE2} .
-cp %{SOURCE3} .
-popd
+%build
-%{_bindir}/eclipse-pdebuild -f org.eclipse.tm.terminal -d "emf" \
--a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier} -DgenerateFeatureVersionSuffix=true" -j -DJ2SE_1.5=%{_jvmdir}/java/jre/lib/rt.jar -o `pwd`/orbitdeps
+pushd %{rse_snapshot}
-%{_bindir}/eclipse-pdebuild -f org.eclipse.rse.sdk \
--a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier} -DgenerateFeatureVersionSuffix=true" -j -DJ2SE_1.5=%{_jvmdir}/java/jre/lib/rt.jar -o `pwd`/orbitdeps
+mvn-rpmbuild -o -DskipTychoVersionCheck -Dmaven.test.skip=true -Dtycho.local.keepTarget -fae clean install
-%{_bindir}/eclipse-pdebuild -f org.eclipse.rse.useractions \
--a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier} -DgenerateFeatureVersionSuffix=true" -j -DJ2SE_1.5=%{_jvmdir}/java/jre/lib/rt.jar -o `pwd`/orbitdeps
+cp %{SOURCE4} .
+cp %{SOURCE5} .
%install
+
install -d -m 755 %{buildroot}%{_datadir}/eclipse
-install -d -m 755 %{buildroot}%{install_loc}/rse
+install -d -m 755 %{buildroot}%{install_loc}/rse/eclipse
install -d -m 755 %{buildroot}%{rseserver_install}
install -d -m 755 %{buildroot}%{rseserver_java}
install -d -m 755 %{buildroot}%{rseserver_config}
-unzip -q -o -d %{buildroot}%{install_loc}/rse \
- build/rpmBuild/org.eclipse.tm.terminal.zip
+cp -R org.eclipse.tm/releng/org.eclipse.tm.repo/target/repository/features \
+ %{buildroot}%{install_loc}/rse/eclipse \
-unzip -q -o -d %{buildroot}%{install_loc}/rse \
- build/rpmBuild/org.eclipse.rse.sdk.zip
-
-unzip -q -o -d %{buildroot}%{install_loc}/rse \
- build/rpmBuild/org.eclipse.rse.useractions.zip
+cp -R org.eclipse.tm/releng/org.eclipse.tm.repo/target/repository/plugins \
+ %{buildroot}%{install_loc}/rse/eclipse \
pushd %{buildroot}%{install_loc}/rse/eclipse/plugins
rm org.apache.commons.net_*.jar
@@ -132,7 +148,7 @@ jarname=`ls org.eclipse.rse.services_*.jar`
zip -d $jarname clientserver.jar
popd
-pushd org.eclipse.rse.services.dstore
+pushd org.eclipse.tm/rse/plugins/org.eclipse.rse.services.dstore
pushd serverruntime/scripts/linux
cp *.pl %{buildroot}%{rseserver_install}
popd
@@ -144,8 +160,8 @@ popd
%files
%{install_loc}/rse
-%doc org.eclipse.rse.sdk-feature/epl-v10.html
-%doc org.eclipse.rse.sdk-feature/license.html
+%doc org.eclipse.tm/rse/features/org.eclipse.rse.sdk-feature/epl-v10.html
+%doc org.eclipse.tm/rse/features/org.eclipse.rse.sdk-feature/license.html
%files server
%{rseserver_install}
@@ -153,10 +169,14 @@ popd
%{rseserver_config}
%config(noreplace) %{rseserver_config}/ssl.properties
%config(noreplace) %{rseserver_config}/rsecomm.properties
-%doc notice.html
-%doc epl-v10.html
+%doc org.eclipse.tm/notice.html
+%doc org.eclipse.tm/epl-v10.html
%changelog
+* Fri Apr 05 2013 Jeff Johnston <jjohnstn at redhat.com> 3.5-0.1.m6
+- Update rse to 3.5M6 which is what was shipped for Kepler M6.
+- Need to use full git tree and tycho to build.
+
* Thu Feb 21 2013 Alexander Kurtakov <akurtako at redhat.com> 3.4-5
- Strip version from commons-net symlink.
diff --git a/fetch-rse.sh b/fetch-rse.sh
index 679396a..f105b28 100644
--- a/fetch-rse.sh
+++ b/fetch-rse.sh
@@ -1,75 +1,15 @@
#!/bin/sh
-NAME=rse
-TM_TAG=R3_4_0
-RSE_TAG=R3_4
+RSE_TAG=R3_5M6
rm -rf temp
mkdir temp
pushd temp
-flat=rse-${RSE_TAG}
-mkdir ${flat}
+git clone git://git.eclipse.org/gitroot/tm/org.eclipse.tm.git
+cd org.eclipse.tm
+git reset --hard S3_5M6
-VERSION="3.4"
-TAG=201205300905
+cd ..
+tar -czvf eclipse-rse-3.5M6.tar.gz org.eclipse.tm
-echo "Exporting from Eclipse.org..."
-
-MAPFILE=$NAME.map
-TEMPMAPFILE=temp.map
-wget "http://download.eclipse.org/dsdp/tm/downloads/drops/R-$VERSION-$TAG/directory.txt" -O $MAPFILE
-dos2unix $MAPFILE
-grep ^[a-z] $MAPFILE > $TEMPMAPFILE
-
-echo "# `date`" > featureVersions.properties
-echo "# `date`" > pluginVersions.properties
-
-gawk 'BEGIN {
- FS=","
-}
-{
-if (NF < 4) {
-
- split($1, version, "=");
- split(version[1], directory, "@");
- cvsdir=split($2, dirName, ":");
- printf("cvs -d %s%s %s %s %s %s %s\n", ":pserver:anonymous at dev.eclipse.org:", dirName[cvsdir], "-q export -r", version[2], "-d", directory[2], directory[2]);
- printf("cvs -d %s%s %s %s %s %s %s\n", ":pserver:anonymous at dev.eclipse.org:", dirName[cvsdir], "-q export -r", version[2], "-d", directory[2], directory[2]) | "/bin/bash";
- if (length(version[2]) > 0) {
- if (version[1] ~ /feature/) {
- printf("%s,0.0.0=%s\n", directory[2], version[2]) >> "featureVersions.properties";
- }
- else {
- printf("%s,0.0.0=%s\n", directory[2], version[2]) >> "pluginVersions.properties";
- }
- }
-}
-else {
-
- split($1, version, "=");
- split(version[1], featureName, "@");
- total=split($4, directory, "/");
- cvsdir=split($2, dirName, ":");
- printf("cvs -d %s%s %s %s %s %s %s\n", ":pserver:anonymous at dev.eclipse.org:", dirName[cvsdir], "-q export -r", version[2], "-d", directory[total], $4);
- printf("cvs -d %s%s %s %s %s %s %s\n", ":pserver:anonymous at dev.eclipse.org:", dirName[cvsdir], "-q export -r", version[2], "-d", directory[total], $4) | "/bin/bash";
- if (length(version[2]) > 0) {
- if (version[1] ~ /feature/) {
- printf("%s,0.0.0=%s\n", featureName[2], version[2]) >> "featureVersions.properties";
- }
- else {
- printf("%s,0.0.0=%s\n", directory[total], version[2]) >> "pluginVersions.properties";
- }
- }
-}
-
-}' $TEMPMAPFILE
-
-#rm $TEMPMAPFILE $MAPFILE
-
-# Remove following feature.xml files which cause problems as pdebuild
-# wants to generate them itself.
-rm org.eclipse.rse.telnet-feature/sourceTemplateFeature/feature.xml
-rm org.eclipse.rse.ftp-feature/sourceTemplateFeature/feature.xml
-
-tar -czvf rse-fetched-src-$RSE_TAG.tar.gz org.*
diff --git a/sources b/sources
index 2a992ae..6598aa1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2dc0a1261721961119927f6f5657f894 rse-fetched-src-R3_4.tar.gz
+6519416d73f010ff0dc7d2897e17c409 eclipse-rse-3.5M6.tar.gz
More information about the scm-commits
mailing list