[eclipse-emf/f14/master] * Thu Aug 5 2010 Charley Wang <chwang at redhat.com> - 2.6.0-2 - Build SDK features, fix patches. - EMF
Charley Wang
chwang at fedoraproject.org
Thu Aug 5 20:57:18 UTC 2010
commit 7ff520df464be59e479ed4d83fe9d681483645e1
Author: Charley Wang <chwang at redhat.com>
Date: Thu Aug 5 16:56:01 2010 -0400
* Thu Aug 5 2010 Charley Wang <chwang at redhat.com> - 2.6.0-2
- Build SDK features, fix patches.
- EMFAntTest failing, cannot find /example in osgi bundle, other
tests run.
eclipse-emf-build-docs.patch | 20 +++++++++++++++
eclipse-emf-doc-location-emf.patch | 12 ---------
eclipse-emf-no-xsd2ecore.patch | 11 ++++++++
eclipse-emf-platform-docs-location.patch | 12 +++++++++
eclipse-emf.spec | 40 +++++++++++++++--------------
get-emf.sh | 6 ++--
sources | 2 +-
7 files changed, 68 insertions(+), 35 deletions(-)
---
diff --git a/eclipse-emf-build-docs.patch b/eclipse-emf-build-docs.patch
new file mode 100644
index 0000000..f99ff9e
--- /dev/null
+++ b/eclipse-emf-build-docs.patch
@@ -0,0 +1,20 @@
+--- emf-2.6.0/org.eclipse.emf.sdk-feature/build.properties 2010-06-01 12:00:18.000000000 -0400
++++ emf-2.6.0/org.eclipse.emf.sdk-feature/build.properties.adddocs 2010-08-03 16:30:45.000000000 -0400
+@@ -7,3 +7,4 @@
+ license.html
+ root=rootfiles
+ generate.feature at org.eclipse.emf.source=org.eclipse.emf.sdk, exclude at org.eclipse.emf.doc, exclude at org.eclipse.emf.example.installer, exclude at org.eclipse.emf.mapping.ecore, exclude at org.eclipse.emf.mapping.ecore.editor
++generate.feature at org.eclipse.emf.doc.source=org.eclipse.emf.doc
+--- emf-2.6.0/org.eclipse.xsd.sdk-feature/build.properties 2010-06-01 12:40:35.000000000 -0400
++++ emf-2.6.0/org.eclipse.xsd.sdk-feature/build.properties.build-converter 2010-08-03 17:05:57.845492781 -0400
+@@ -7,3 +7,10 @@
+ license.html
+ root=rootfiles
+ generate.feature at org.eclipse.xsd.source=org.eclipse.xsd.sdk, exclude at org.eclipse.xsd.cheatsheets, exclude at org.eclipse.xsd.doc, exclude at org.eclipse.xsd.ecore.converter, exclude at org.eclipse.xsd.example.installer, exclude at org.eclipse.xsd.mapping, exclude at org.eclipse.xsd.mapping.editor
++generate.feature at org.eclipse.xsd.ecore.converter.source=org.eclipse.xsd.ecore.converter
++generate.feature at org.eclipse.xsd.edit.source=org.eclipse.xsd.edit
++generate.feature at org.eclipse.xsd.editor.source=org.eclipse.xsd.editor
++generate.feature at org.eclipse.xsd.mapping.source=org.eclipse.xsd.mapping
++generate.feature at org.eclipse.xsd.mapping.editor.source=org.eclipse.xsd.mapping.editor
++generate.feature at org.eclipse.xsd.doc.source=org.eclipse.xsd.doc
++individualSourceBundles=true
diff --git a/eclipse-emf-no-xsd2ecore.patch b/eclipse-emf-no-xsd2ecore.patch
new file mode 100644
index 0000000..a7d2372
--- /dev/null
+++ b/eclipse-emf-no-xsd2ecore.patch
@@ -0,0 +1,11 @@
+--- emf-2.6.0/org.eclipse.xsd.sdk-feature/feature.xml 2010-05-27 14:12:20.000000000 -0400
++++ emf-2.6.0/org.eclipse.xsd.sdk-feature/feature.xml.noxsd2ecore 2010-08-04 15:06:18.479696787 -0400
+@@ -30,8 +30,6 @@
+
+ <includes id="org.eclipse.xsd" version="0.0.0"/>
+ <includes id="org.eclipse.xsd.source" version="0.0.0"/>
+- <includes id="org.eclipse.xsd.ecore.converter" version="0.0.0"/>
+- <includes id="org.eclipse.xsd.ecore.converter.source" version="0.0.0"/>
+ <includes id="org.eclipse.xsd.edit" version="0.0.0"/>
+ <includes id="org.eclipse.xsd.edit.source" version="0.0.0"/>
+ <includes id="org.eclipse.xsd.editor" version="0.0.0"/>
diff --git a/eclipse-emf-platform-docs-location.patch b/eclipse-emf-platform-docs-location.patch
index 561d42f..f881468 100644
--- a/eclipse-emf-platform-docs-location.patch
+++ b/eclipse-emf-platform-docs-location.patch
@@ -1,3 +1,14 @@
+--- emf-2.6.0/org.eclipse.emf.doc/build/javadoc.xml.template 2006-12-07 17:21:16.000000000 -0500
++++ emf-2.6.0/org.eclipse.emf.doc/build/javadoc.xml.template.changelocation 2010-07-22 11:27:26.000000000 -0400
+@@ -12,7 +12,7 @@
+ <available property="platformJavadocExists" file="${javadoc.link.location}/platform/"/>
+
+ <target name="extractPlatformJavadoc" unless="platformJavadocExists">
+- <unzip src="${eclipseDir}/plugins/org.eclipse.platform.doc.isv.jar" dest="${javadoc.link.location}/platform/"/>
++ <unzip dest="${javadoc.link.location}/platform/"><fileset dir="${eclipseDir}/SDK/pluginsasdfasdfasdfasdfasdfasdf"><include name="org.eclipse.platform.doc.isv_*.jar"/></fileset></unzip>
+ </target>
+
+ <target name="javadoc" depends="extractPlatformJavadoc">
--- emf-2.6.0/org.eclipse.xsd.doc/build/javadoc.xml.template 2007-04-04 18:29:20.000000000 -0400
+++ emf-2.6.0/org.eclipse.xsd.doc/build/javadoc.xml.template.changedir 2010-07-21 13:36:16.000000000 -0400
@@ -12,7 +12,7 @@
@@ -9,3 +20,4 @@
</target>
<target name="javadoc" depends="extractPlatformJavadoc">
+
diff --git a/eclipse-emf.spec b/eclipse-emf.spec
index 0b2af98..31b777b 100644
--- a/eclipse-emf.spec
+++ b/eclipse-emf.spec
@@ -3,7 +3,7 @@
Name: eclipse-emf
Version: 2.6.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Eclipse Modeling Framework (EMF) Eclipse plugin
Group: System Environment/Libraries
License: EPL
@@ -15,24 +15,23 @@ URL: http://www.eclipse.org/modeling/emf/
Source0: emf-%{version}.tar.gz
Source1: get-emf.sh
-# don't depend on ANT_HOME and JAVA_HOME environment vars, patch upstream
-#Patch0: %{name}-make-homeless.patch
-# look inside correct directory for platform docs -- patch upstream
-# Patch1: %{name}-platform-docs-location.patch
-# look inside all symlink'd plugin directories when building javadocs
-# this patch has been sent upstream, see eclipse.org bug #281779
-# Unnecessary for 2.6.0
-# Patch2: %{name}-symlinked-classpath.patch
# don't include hidden files in source plugins
# (mostly to shut rpmlint up, but these files aren't needed for source plugin builds; they
# are still included such that the example installer can create full sample projects in
# your workspace)
#Patch3: %{name}-build-props.patch
-# bundle examples in example-installer plugins from source in tarball instead of from cvs
+# look inside correct directory for platform docs -- patch upstream
Patch0: %{name}-platform-docs-location.patch
+# bundle examples in example-installer from source in tarball instead of from cvs
Patch1: %{name}-bundle-examples.patch
+# Remove rap components, they have added dependencies
Patch2: %{name}-norap.patch
-Patch3: %{name}-doc-location-emf.patch
+# don't depend on ANT_HOME and JAVA_HOME environment vars, patch upstream
+Patch3: %{name}-make-homeless.patch
+# Build docs correctly
+Patch4: %{name}-build-docs.patch
+# Remove xsd2ecore components from SDK, they are not in the main feature
+Patch5: %{name}-no-xsd2ecore.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -108,14 +107,12 @@ plugins.
%prep
%setup -q -n emf-%{version}
-#%patch0 -p0
-#%patch1 -p0
-#%patch2 -p0
-#%patch3 -p1
%patch0 -p1
%patch1 -p1
%patch2 -p0
-%patch3 -p1
+%patch3 -p0
+%patch4 -p1
+%patch5 -p1
rm org.eclipse.emf.doc/tutorials/jet2/jetc-task.jar
rm org.eclipse.emf.test.core/data/data.jar
@@ -141,7 +138,8 @@ fi
%build
# Note: We use forceContextQualifier because the docs plugins use custom build
# scripts and don't work otherwise.
-OPTIONS="-DjavacTarget=1.5 -DjavacSource=1.5 -DforceContextQualifier=v200906151043"
+OPTIONS="-DjavacTarget=1.5 -DjavacSource=1.5 -DforceContextQualifier=R201006141136"
+SDKOPTIONS="-DindividualSourceBundles=true $OPTIONS"
# We build the emf, xsd and examples features seperately, rather than just
# building the "all" feature, because it makes the files section easier to
@@ -149,7 +147,7 @@ OPTIONS="-DjavacTarget=1.5 -DjavacSource=1.5 -DforceContextQualifier=v2009061510
# build emf features
%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.emf -a "$OPTIONS"
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.emf.sdk -a "$OPTIONS"
+%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.emf.sdk -a "$SDKOPTIONS"
# build xsd features
%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.xsd -a "$OPTIONS"
@@ -158,7 +156,7 @@ OPTIONS="-DjavacTarget=1.5 -DjavacSource=1.5 -DforceContextQualifier=v2009061510
%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.xsd.mapping -a "$OPTIONS"
%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.xsd.mapping.editor -a "$OPTIONS"
%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.xsd.ecore.converter -a "$OPTIONS"
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.xsd.sdk -a "$OPTIONS"
+%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.xsd.sdk -a "$SDKOPTIONS"
# build examples features
%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.emf.examples -a "$OPTIONS"
@@ -212,6 +210,10 @@ rm -rf %{buildroot}
%doc org.eclipse.emf.examples-feature/rootfiles/*
%changelog
+* Thu Aug 5 2010 Charley Wang <chwang at redhat.com> - 2.6.0-2
+- Build SDK features, fix patches.
+- EMFAntTest failing, cannot find /example in osgi bundle
+
* Mon Jul 19 2010 Charley Wang <chwang at redhat.com> - 2.6.0-1
- Update to 2.6.0
diff --git a/get-emf.sh b/get-emf.sh
index c082b53..4305684 100644
--- a/get-emf.sh
+++ b/get-emf.sh
@@ -117,11 +117,11 @@ cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/modeling export -r R2_6_0 org
cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse export -r v20100118 org.eclipse.test
cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse export -r v20080717 org.eclipse.ant.optional.junit
-
-mv org.eclipse.test emf-2.6.0/
-mv org.eclipse.ant.optional.junit emf-2.6.0/
+mkdir emf-2.6.0
mv org.eclipse.emf/org.eclipse.emf/{doc,examples,features,plugins,releng,tests}/* emf-2.6.0/
mv org.eclipse.mdt/org.eclipse.xsd/{doc,examples,features,plugins}/* emf-2.6.0/
+mv org.eclipse.test emf-2.6.0/
+mv org.eclipse.ant.optional.junit emf-2.6.0/
tar cjf emf-2.6.0.tar.gz emf-2.6.0
rm -rf org.eclipse.emf
diff --git a/sources b/sources
index 50f558f..af4fd48 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-91dc6c23a4c4190f2c3a555a00735111 emf-2.6.0.tar.gz
+5fba126858ce868a02d86d10517af16d emf-2.6.0.tar.gz
More information about the scm-commits
mailing list