[eclipse-gef/f17] Generate documentation contents & reference API.
Krzysztof Daniel
kdaniel at fedoraproject.org
Tue Apr 17 10:36:46 UTC 2012
commit fd64acd665429c6cb1560322cc322f75177aede5
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date: Tue Apr 17 12:36:35 2012 +0200
Generate documentation contents & reference API.
.gitignore | 1 +
customBuildCallbacks.xml | 155 +++++++++++++++++++++++++++++++++++++++++++++
eclipse-gef-fix-doc.patch | 75 ++++++++++++++++++++++
eclipse-gef.spec | 12 +++-
4 files changed, 242 insertions(+), 1 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 202b5ed..3ca8931 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ gef-3.6.2.tar.gz
gef-3.7.0.tar.gz
/gef-3.8.0
/gef-3.8.0.tar.gz
+/noarch
diff --git a/customBuildCallbacks.xml b/customBuildCallbacks.xml
new file mode 100644
index 0000000..a365a8c
--- /dev/null
+++ b/customBuildCallbacks.xml
@@ -0,0 +1,155 @@
+<!-- ===================================================================== -->
+<!-- Custom targets called from a project's generated build.xml -->
+<!-- Set customBuildCallbacks=<path/to/this/file> in your build.properties.-->
+<!-- ===================================================================== -->
+<project name="Build specific targets and properties" default="noDefault">
+
+ <!-- ===================================================================== -->
+ <!-- Default target -->
+ <!-- ===================================================================== -->
+ <target name="noDefault">
+ <echo message="This file must be called with explicit targets" />
+ </target>
+
+ <!-- ===================================================================== -->
+ <!-- Steps to do before the target build.jars -->
+ <!-- Available parameters : -->
+ <!-- build.result.folder - folder to contain the build results -->
+ <!-- ===================================================================== -->
+ <target name="pre.build.jars">
+
+ </target>
+
+ <!-- ===================================================================== -->
+ <!-- Steps to do after the target build.jars -->
+ <!-- Available parameters : -->
+ <!-- build.result.folder - folder to contain the build results -->
+ <!-- ===================================================================== -->
+ <target name="post.build.jars">
+ <!-- there is no maven, so we do not copy dependencies here -->
+ <!-- TODO: fix this! -->
+ <mkdir dir="api-context-libs"/>
+ <ant antfile="buildDoc.xml" />
+ </target>
+
+ <!-- ===================================================================== -->
+ <!-- Steps to do before the target build.sources -->
+ <!-- Available parameters : -->
+ <!-- build.result.folder - folder to contain the build results -->
+ <!-- ===================================================================== -->
+ <target name="pre.build.sources">
+ </target>
+
+ <!-- ===================================================================== -->
+ <!-- Steps to do after the target build.sources -->
+ <!-- Available parameters : -->
+ <!-- build.result.folder - folder to contain the build results -->
+ <!-- ===================================================================== -->
+ <target name="post.build.sources">
+ </target>
+
+ <!-- ===================================================================== -->
+ <!-- Steps to do before the compilation target <name> -->
+ <!-- Substitute "name" with the name of the compilation target, eg @dot -->
+ <!-- Available parameters : -->
+ <!-- source.foldern : n = 1 ... N, the source folders -->
+ <!-- target.folder : where the results of the compilation go -->
+ <!-- <name>.classpath : name = name of the compilation target. A -->
+ <!-- reference to the classpath structure. -->
+ <!-- ===================================================================== -->
+ <target name="pre.activeHelpSample.jar">
+ </target>
+
+ <!-- ===================================================================== -->
+ <!-- Steps to do after compilation but before jaring -->
+ <!-- Substitute "name" with the name of the compilation target, eg @dot -->
+ <!-- Available parameters : -->
+ <!-- source.foldern : n = 1 ... N, the source folders -->
+ <!-- target.folder : where the results of the compilation go -->
+ <!-- <name>.classpath : name = name of the compilation target. A -->
+ <!-- reference to the classpath structure. -->
+ <!-- ===================================================================== -->
+ <target name="post.compile.activeHelpSample.jar">
+ </target>
+
+ <!-- ===================================================================== -->
+ <!-- Steps to do after the compilation target <name> -->
+ <!-- Substitute "name" with the name of the compilation target, eg @dot -->
+ <!-- Available parameters : -->
+ <!-- jar.location - the location of the compilation results -->
+ <!-- <name>.classpath : name = name of the compilation target. A -->
+ <!-- reference to the classpath structure. -->
+ <!-- ===================================================================== -->
+ <target name="post.activeHelpSample.jar">
+ </target>
+
+ <!-- ===================================================================== -->
+ <!-- Steps to do before the target gather.bin.parts -->
+ <!-- Available parameters : -->
+ <!-- base.dir - root of the project -->
+ <!-- build.result.folder - folder containing the build results -->
+ <!-- target.folder - destination folder -->
+ <!-- ===================================================================== -->
+ <target name="pre.gather.bin.parts">
+ </target>
+
+ <!-- ===================================================================== -->
+ <!-- Steps to do after the target gather.bin.parts -->
+ <!-- Available parameters : -->
+ <!-- base.dir - root of the project -->
+ <!-- build.result.folder - folder containing the build results -->
+ <!-- target.folder - destination folder -->
+ <!-- ===================================================================== -->
+ <target name="post.gather.bin.parts">
+ </target>
+
+ <!-- ===================================================================== -->
+ <!-- Steps to do before the target gather.sources -->
+ <!-- Available parameters : -->
+ <!-- destination.temp.folder - destination folder -->
+ <!-- ===================================================================== -->
+ <target name="pre.gather.sources">
+ </target>
+
+ <!-- ===================================================================== -->
+ <!-- Steps to do after the target gather.sources -->
+ <!-- Available parameters : -->
+ <!-- destination.temp.folder - destination folder -->
+ <!-- ===================================================================== -->
+ <target name="post.gather.sources">
+ </target>
+
+ <!-- ===================================================================== -->
+ <!-- Steps to do before the target gather.logs -->
+ <!-- Available parameters : -->
+ <!-- destination.temp.folder - destination folder -->
+ <!-- ===================================================================== -->
+ <target name="pre.gather.logs">
+ </target>
+
+ <!-- ===================================================================== -->
+ <!-- Steps to do after the target gather.logs -->
+ <!-- Available parameters : -->
+ <!-- destination.temp.folder - destination folder -->
+ <!-- ===================================================================== -->
+ <target name="post.gather.logs">
+ </target>
+
+ <!-- ===================================================================== -->
+ <!-- Steps to do before the target clean -->
+ <!-- Available parameters : -->
+ <!-- destination.temp.folder - destination folder -->
+ <!-- ===================================================================== -->
+ <target name="pre.clean">
+ </target>
+
+ <!-- ===================================================================== -->
+ <!-- Steps to do after the target clean -->
+ <!-- Available parameters : -->
+ <!-- plugin.destination - final destination of the build -->
+ <!-- build.result.folder - results of the compilation -->
+ <!-- temp.folder - temporary folder -->
+ <!-- ===================================================================== -->
+ <target name="post.clean">
+ </target>
+</project>
diff --git a/eclipse-gef-fix-doc.patch b/eclipse-gef-fix-doc.patch
index 05688ab..31aa020 100644
--- a/eclipse-gef-fix-doc.patch
+++ b/eclipse-gef-fix-doc.patch
@@ -17,3 +17,78 @@
- topics_Reference.xml
+ topics_Reference.xml,\
+ META-INF/
+--- org.eclipse.draw2d.doc.isv/build.properties.bak 2012-04-16 17:30:56.000000000 +0200
++++ org.eclipse.draw2d.doc.isv/build.properties 2012-04-16 17:43:26.682820381 +0200
+@@ -8,6 +8,8 @@
+ # Contributors:
+ # IBM Corporation - initial API and implementation
+ ###############################################################################
++customBuildCallbacks=customBuildCallbacks.xml
++customBuildCallbacks.failonerror=true
+ bin.includes = about.html,\
+ book.css,\
+ guide/,\
+--- org.eclipse.gef.doc.isv/build.properties.bak 2012-04-16 17:30:56.000000000 +0200
++++ org.eclipse.gef.doc.isv/build.properties 2012-04-16 17:43:08.519736589 +0200
+@@ -8,6 +8,8 @@
+ # Contributors:
+ # IBM Corporation - initial API and implementation
+ ###############################################################################
++customBuildCallbacks=customBuildCallbacks.xml
++customBuildCallbacks.failonerror=true
+ bin.includes = about.html,\
+ book.css,\
+ guide/,\
+--- org.eclipse.draw2d/src/org/eclipse/draw2d/PrintFigureOperation.java.bak 2012-04-02 15:18:50.000000000 +0200
++++ org.eclipse.draw2d/src/org/eclipse/draw2d/PrintFigureOperation.java 2012-04-17 11:49:20.840981838 +0200
+@@ -7,7 +7,7 @@
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+- * Sven Müller - Added tiling support
++ * Sven Muller - Added tiling support
+ *******************************************************************************/
+ package org.eclipse.draw2d;
+
+@@ -23,7 +23,7 @@
+ *
+ * @author Dan Lee
+ * @author Eric Bordeau
+- * @author Sven Müller
++ * @author Sven Muller
+ */
+ public class PrintFigureOperation extends PrintOperation {
+
+--- org.eclipse.draw2d/src/org/eclipse/draw2d/geometry/PrecisionGeometry.java.bak 2012-04-02 15:18:50.000000000 +0200
++++ org.eclipse.draw2d/src/org/eclipse/draw2d/geometry/PrecisionGeometry.java 2012-04-17 11:52:26.461943365 +0200
+@@ -6,7 +6,7 @@
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+- * Alexander Ny§en (itemis AG) - initial API and implementation
++ * Alexander Nyssen (itemis AG) - initial API and implementation
+ *******************************************************************************/
+
+ package org.eclipse.draw2d.geometry;
+--- org.eclipse.draw2d/src/org/eclipse/draw2d/geometry/Straight.java.bak 2012-04-02 15:18:50.000000000 +0200
++++ org.eclipse.draw2d/src/org/eclipse/draw2d/geometry/Straight.java 2012-04-17 11:52:41.998023848 +0200
+@@ -6,7 +6,7 @@
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+- * Alexander Ny§en (Research Group Software Contruction, RWTH Aachen University) - initial API and implementation
++ * Alexander Nyssen (Research Group Software Contruction, RWTH Aachen University) - initial API and implementation
+ *
+ *******************************************************************************/
+ package org.eclipse.draw2d.geometry;
+--- org.eclipse.draw2d/src/org/eclipse/draw2d/geometry/Vector.java.bak 2012-04-02 15:18:50.000000000 +0200
++++ org.eclipse.draw2d/src/org/eclipse/draw2d/geometry/Vector.java 2012-04-17 11:52:50.118065910 +0200
+@@ -7,7 +7,7 @@
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+- * Alexander Ny§en (Research Group Software Construction, RWTH Aachen University) - Contribution for Bugzilla 245182
++ * Alexander Nyssen (Research Group Software Construction, RWTH Aachen University) - Contribution for Bugzilla 245182
+ *
+ *******************************************************************************/
+ package org.eclipse.draw2d.geometry;
diff --git a/eclipse-gef.spec b/eclipse-gef.spec
index d9a8116..c354887 100644
--- a/eclipse-gef.spec
+++ b/eclipse-gef.spec
@@ -3,7 +3,7 @@
Name: eclipse-gef
Version: 3.8.0
#no tag in the repository, HEAD checked out
-Release: 0.2.20120402%{?dist}
+Release: 0.3.20120402%{?dist}
Summary: Graphical Editing Framework (GEF) Eclipse plugin
Group: System Environment/Libraries
License: EPL
@@ -14,6 +14,9 @@ URL: http://www.eclipse.org/gef/
# $ sh get-gef.sh
Source0: gef-%{version}.tar.gz
Source1: get-gef.sh
+# gef it built with maven, we are pdebuild like, so we must connect building documentation
+# with building plugins.
+Source2: customBuildCallbacks.xml
Patch0: %{name}-generateSourceForDraw2dFeature.patch
Patch1: %{name}-generateSourceForGefFeature.patch
@@ -60,6 +63,10 @@ to use the Eclipse Graphical Editing Framework (GEF) plugin.
%prep
%setup -q -n gef-%{version}
+
+cp %{SOURCE2} org.eclipse.gef.doc.isv/
+cp %{SOURCE2} org.eclipse.draw2d.doc.isv/
+
%patch0 -p1
%patch1 -p1
%patch2 -p1
@@ -129,6 +136,9 @@ unzip -q -n -d %{buildroot}%{eclipse_dropin}/gef-examples build/rpmBuild/org.ecl
%doc org.eclipse.gef.examples-feature/epl-v10.html
%changelog
+* Mon Apr 16 2012 Krzysztof Daniel <kdaniel at redhat.com> 3.8.0-0.3.20120402
+- Generate documentation contents & reference API.
+
* Fri Apr 13 2012 Krzysztof Daniel <kdaniel at redhat.com> 3.8.0-0.2.20120402
- Update to Eclipse 4.2
- Fix documentation build
More information about the scm-commits
mailing list