rpms/eclipse-emf/devel eclipse-emf-addforceContextQualiferproperty.patch, NONE, 1.1 eclipse-emf-buildAll.patch, NONE, 1.1 eclipse-emf-customTargets.xml.patch, NONE, 1.1 eclipse-emf-examples-dontChangeBundleClasspath.patch, NONE, 1.1 eclipse-emf-javadoc.patch, NONE, 1.1 eclipse-emf-nobootclasspath.patch, NONE, 1.1 eclipse-emf-platformjavadocname.patch, NONE, 1.1 eclipse-emf.spec, NONE, 1.1 fetch-eclipse-emf.sh, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Andrew Overholt (overholt)
fedora-extras-commits at redhat.com
Mon Oct 30 16:53:18 UTC 2006
Author: overholt
Update of /cvs/extras/rpms/eclipse-emf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12606/devel
Modified Files:
.cvsignore sources
Added Files:
eclipse-emf-addforceContextQualiferproperty.patch
eclipse-emf-buildAll.patch eclipse-emf-customTargets.xml.patch
eclipse-emf-examples-dontChangeBundleClasspath.patch
eclipse-emf-javadoc.patch eclipse-emf-nobootclasspath.patch
eclipse-emf-platformjavadocname.patch eclipse-emf.spec
fetch-eclipse-emf.sh
Log Message:
auto-import eclipse-emf-2.2.1-1 on branch devel from eclipse-emf-2.2.1-1.src.rpm
eclipse-emf-addforceContextQualiferproperty.patch:
--- NEW FILE eclipse-emf-addforceContextQualiferproperty.patch ---
Index: build.xml
===================================================================
RCS file: /home/tools/org.eclipse.emf.releng.build/build.xml,v
retrieving revision 1.14
diff -u -p -r1.14 build.xml
--- build.xml 7 Nov 2005 20:37:26 -0000 1.14
+++ build.xml 27 Jul 2006 19:42:36 -0000
@@ -12,6 +12,7 @@
<property name="buildType" value="I" />
<property name="buildId" value="build" />
<property name="buildid" value="build" />
+ <property name="forceContextQualifier" value="v${DSTAMP}${TSTAMP}" />
<!-- Verify buildDirectory ends in eclipse. -->
<property name="fullBuild" location="${buildDirectory}"/>
eclipse-emf-buildAll.patch:
--- NEW FILE eclipse-emf-buildAll.patch ---
Index: buildAll.xml
===================================================================
RCS file: /home/tools/org.eclipse.emf.releng.build/buildAll.xml,v
retrieving revision 1.58
diff -u -p -r1.58 buildAll.xml
--- buildAll.xml 19 Jun 2006 16:53:35 -0000 1.58
+++ buildAll.xml 1 Aug 2006 23:07:02 -0000
@@ -20,7 +20,7 @@
<!-- Reduce the amount of info in the build log -->
<property name="javacVerbose" value="false"/>
- <property name="buildDirectory" location="${basedir}/../src/eclipse"/>
+ <property name="buildDirectory" location="${basedir}/src/eclipse"/>
<property file="${basedir}/repoInfo.properties"/>
<property name="testBase" location="${buildDirectory}/../testing"/>
<available file="${buildDirectory}/label.properties" property="label.properties.exists"/>
@@ -43,7 +43,9 @@
</condition>
<!-- build emf.build.jar -->
- <property name="emfBuilderDir" location="${buildDirectory}/../org.eclipse.emf.releng.build" />
+ <property name="emfBuilderDir" location="${buildDirectory}/../.." />
+ <echo message="buildDirectory: ${buildDirectory}"/>
+ <echo message="emfBuilderDir: ${emfBuilderDir}"/>
<ant antfile="${emfBuilderDir}/org.eclipse.emf.build/build.xml"
inheritall="false" dir="${emfBuilderDir}/org.eclipse.emf.build"/>
</target>
@@ -136,6 +138,17 @@
<antcall target="cleanUp"/>
</target>
+ <target name="buildRPM" depends="init">
+ <ant antfile="build.xml" target="main">
+ <property name="component" value="sdk"/>
+ </ant>
+ <ant antfile="build.xml" target="main">
+ <property name="component" value="examples"/>
+ </ant>
+ <!-- extra zips -->
+ <ant antfile="${emfBuilderDir}/zips/build.xml"/>
+ </target>
+
<target name="buildAll" depends="init">
<ant antfile="build.xml" target="main">
<property name="component" value="sdk"/>
eclipse-emf-customTargets.xml.patch:
--- NEW FILE eclipse-emf-customTargets.xml.patch ---
Index: sdk/customTargets.xml
===================================================================
RCS file: /home/tools/org.eclipse.emf.releng.build/sdk/customTargets.xml,v
retrieving revision 1.36
diff -u -p -r1.36 customTargets.xml
--- sdk/customTargets.xml 17 Jul 2006 00:02:48 -0000 1.36
+++ sdk/customTargets.xml 24 Oct 2006 17:27:48 -0000
@@ -88,13 +88,15 @@
<!-- Steps to do before generating build scripts -->
<!-- ===================================================================== -->
<target name="preGenerate">
- <property name="emfBuilderDir" location="${buildDirectory}/../org.eclipse.emf.releng.build" />
+ <property name="emfBuilderDir" location="${buildDirectory}/../../org.eclipse.emf.releng.build" />
+ <echo message="buildDirectory: ${buildDirectory}" />
<echo message="emfBuilderDir: ${emfBuilderDir}" />
-
+ <echo message="bundlesDirectory: ${buildDirectory}/plugins" />
+
<java classname="org.eclipse.emf.build.ChangeBundleClasspath"
classpath="${emfBuilderDir}/org.eclipse.emf.build/emf.build.jar">
<arg line="-bundlesDirectory ${buildDirectory}/plugins"/>
- <arg line="-bundleDirectoryExcludeRegex org\.eclipse\.(emf|xsd)\.cheatsheets"/>
+ <arg line="-bundleDirectoryExcludeRegex org\.eclipse\.(emf|xsd)\.(cheatsheets|example)"/>
<arg line="-verbose"/>
</java>
@@ -140,7 +142,7 @@
<!-- Steps to do after generating the build scripts -->
<!-- ===================================================================== -->
<target name="postGenerate">
- <antcall target="clean" />
+<!-- <antcall target="clean" />-->
<property name="emfBuilderDir" location="${buildDirectory}/../org.eclipse.emf.releng.build" />
<echo message="emfBuilderDir: ${emfBuilderDir}" />
eclipse-emf-examples-dontChangeBundleClasspath.patch:
--- NEW FILE eclipse-emf-examples-dontChangeBundleClasspath.patch ---
Index: examples/customTargets.xml
===================================================================
RCS file: /home/tools/org.eclipse.emf.releng.build/examples/customTargets.xml,v
retrieving revision 1.16
diff -u -p -r1.16 customTargets.xml
--- examples/customTargets.xml 24 Aug 2006 14:47:17 -0000 1.16
+++ examples/customTargets.xml 20 Oct 2006 16:05:43 -0000
@@ -86,13 +86,6 @@
<!-- Steps to do before generating build scripts -->
<!-- ===================================================================== -->
<target name="preGenerate">
- <java classname="org.eclipse.emf.build.ChangeBundleClasspath"
- classpath="${emfBuilderDir}/org.eclipse.emf.build/emf.build.jar">
- <arg line="-bundlesDirectory ${buildDirectory}/plugins" />
- <arg line="-bundleDirectoryMatchRegex org\.eclipse\.emf\.(java|examples|library|exporter\.html).*\.*" />
- <arg line="-verbose" />
- </java>
-
<property name="eclipse.plugins" value="${buildDirectory}/plugins"/>
<emf.build.SetRequiredBundleVersionRanges verbose="true">
<manifestSet dir="${eclipse.plugins}">
eclipse-emf-javadoc.patch:
--- NEW FILE eclipse-emf-javadoc.patch ---
diff -uNr org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.doc/build/antJavadoc.sh org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.doc/build/antJavadoc.sh
--- org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.doc/build/antJavadoc.sh 2006-07-13 13:57:55.000000000 -0400
+++ org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.doc/build/antJavadoc.sh 2006-07-13 13:57:08.000000000 -0400
@@ -87,5 +87,5 @@
ant -f javadoc.xml \
-DdestDir="$destDir" \
-Dclasspath="$classpath" \
- -DeclipseDir="$eclipseDir" \
+ -DeclipseDir="../../../../../../SDK" \
-Doverview="$eclipseDir/plugins/org.eclipse.emf.doc/build/overview.html"
diff -uNr org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.doc/build/javadoc.xml.template org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.doc/build/javadoc.xml.template
--- org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.doc/build/javadoc.xml.template 2006-07-13 13:57:08.000000000 -0400
+++ org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.doc/build/javadoc.xml.template 2006-07-13 15:09:47.000000000 -0400
@@ -8,11 +8,11 @@
<property environment="env"/>
<property name="javaHome" value="${env.JAVA_HOME}"/>
- <property name="javadoc.link.location" value="${eclipseDir}/javadoc"/>
+ <property name="javadoc.link.location" value="../../../javadoc"/>
<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 src="${eclipseDir}/plugins/org.eclipse.platform.doc.isv_3.2.0.v20060612-0900.jar" dest="${javadoc.link.location}/platform/"/>
</target>
<target name="javadoc" depends="extractPlatformJavadoc">
diff -uNr org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.ecore.sdo.doc/build/antJavadoc.sh org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.ecore.sdo.doc/build/antJavadoc.sh
--- org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.ecore.sdo.doc/build/antJavadoc.sh 2006-07-13 15:07:44.000000000 -0400
+++ org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.ecore.sdo.doc/build/antJavadoc.sh 2006-07-13 15:07:13.000000000 -0400
@@ -63,5 +63,5 @@
ant -f javadoc.xml \
-DdestDir="$destDir" \
-Dclasspath="$classpath" \
- -DeclipseDir="$eclipseDir" \
+ -DeclipseDir="../../../../../../SDK" \
-Doverview="$eclipseDir/plugins/org.eclipse.emf.ecore.sdo.doc/build/overview.html"
diff -uNr org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.ecore.sdo.doc/build/javadoc.xml.template org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.ecore.sdo.doc/build/javadoc.xml.template
--- org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.ecore.sdo.doc/build/javadoc.xml.template 2006-07-13 13:57:08.000000000 -0400
+++ org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.ecore.sdo.doc/build/javadoc.xml.template 2006-07-13 15:08:28.000000000 -0400
@@ -8,11 +8,11 @@
<property environment="env"/>
<property name="javaHome" value="${env.JAVA_HOME}"/>
- <property name="javadoc.link.location" value="${eclipseDir}/javadoc"/>
+ <property name="javadoc.link.location" value="../../../javadoc"/>
<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 src="${eclipseDir}/plugins/org.eclipse.platform.doc.isv_3.2.0.v20060612-0900.jar" dest="${javadoc.link.location}/platform/"/>
</target>
<target name="javadoc" depends="extractPlatformJavadoc">
diff -uNr org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.xsd.doc/build/antJavadoc.sh org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.xsd.doc/build/antJavadoc.sh
--- org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.xsd.doc/build/antJavadoc.sh 2006-07-13 15:09:00.000000000 -0400
+++ org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.xsd.doc/build/antJavadoc.sh 2006-07-13 13:57:08.000000000 -0400
@@ -69,5 +69,5 @@
ant -f javadoc.xml \
-DdestDir="$destDir" \
-Dclasspath="$classpath" \
- -DeclipseDir="$eclipseDir" \
+ -DeclipseDir="../../../../../../SDK" \
-Doverview="$eclipseDir/plugins/org.eclipse.xsd.doc/build/overview.html"
diff -uNr org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.xsd.doc/build/javadoc.xml.template org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.xsd.doc/build/javadoc.xml.template
--- org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.xsd.doc/build/javadoc.xml.template 2006-07-13 13:57:08.000000000 -0400
+++ org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.xsd.doc/build/javadoc.xml.template 2006-07-13 15:09:42.000000000 -0400
@@ -8,11 +8,11 @@
<property environment="env"/>
<property name="javaHome" value="${env.JAVA_HOME}"/>
- <property name="javadoc.link.location" value="${eclipseDir}/javadoc"/>
+ <property name="javadoc.link.location" value="../../../javadoc"/>
<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 src="${eclipseDir}/plugins/org.eclipse.platform.doc.isv_3.2.0.v20060612-0900.jar" dest="${javadoc.link.location}/platform/"/>
</target>
<target name="javadoc" depends="extractPlatformJavadoc">
eclipse-emf-nobootclasspath.patch:
--- NEW FILE eclipse-emf-nobootclasspath.patch ---
diff -uNr src/eclipse/plugins/org.eclipse.emf.doc/build.xml src/eclipse/plugins/org.eclipse.emf.doc/build.xml
--- src/eclipse/plugins/org.eclipse.emf.doc/build.xml 2006-07-12 22:42:24.000000000 -0400
+++ src/eclipse/plugins/org.eclipse.emf.doc/build.xml 2006-07-12 22:43:00.000000000 -0400
@@ -16,15 +16,8 @@
<property name="compilerArg" value=""/>
<property name="javacSource" value="1.3"/>
<property name="javacTarget" value="1.2"/>
- <path id="path_bootclasspath">
- <fileset dir="${java.home}/lib">
- <include name="*.jar"/>
- </fileset>
- </path>
- <property name="bootclasspath" refid="path_bootclasspath"/>
<property name="bundleJavacSource" value="${javacSource}"/>
<property name="bundleJavacTarget" value="${javacTarget}"/>
- <property name="bundleBootClasspath" value="${bootclasspath}"/>
<target name="init" depends="properties">
<condition property="pluginTemp" value="${buildTempFolder}/plugins">
diff -uNr src/eclipse/plugins/org.eclipse.emf.ecore.sdo.doc/build.xml src/eclipse/plugins/org.eclipse.emf.ecore.sdo.doc/build.xml
--- src/eclipse/plugins/org.eclipse.emf.ecore.sdo.doc/build.xml 2006-07-12 22:42:25.000000000 -0400
+++ src/eclipse/plugins/org.eclipse.emf.ecore.sdo.doc/build.xml 2006-07-12 22:43:10.000000000 -0400
@@ -16,15 +16,8 @@
<property name="compilerArg" value=""/>
<property name="javacSource" value="1.3"/>
<property name="javacTarget" value="1.2"/>
- <path id="path_bootclasspath">
- <fileset dir="${java.home}/lib">
- <include name="*.jar"/>
- </fileset>
- </path>
- <property name="bootclasspath" refid="path_bootclasspath"/>
<property name="bundleJavacSource" value="${javacSource}"/>
<property name="bundleJavacTarget" value="${javacTarget}"/>
- <property name="bundleBootClasspath" value="${bootclasspath}"/>
<target name="init" depends="properties">
<condition property="pluginTemp" value="${buildTempFolder}/plugins">
diff -uNr src/eclipse/plugins/org.eclipse.xsd.doc/build.xml src/eclipse/plugins/org.eclipse.xsd.doc/build.xml
--- src/eclipse/plugins/org.eclipse.xsd.doc/build.xml 2006-07-12 22:42:25.000000000 -0400
+++ src/eclipse/plugins/org.eclipse.xsd.doc/build.xml 2006-07-12 22:43:06.000000000 -0400
@@ -16,15 +16,8 @@
<property name="compilerArg" value=""/>
<property name="javacSource" value="1.3"/>
<property name="javacTarget" value="1.2"/>
- <path id="path_bootclasspath">
- <fileset dir="${java.home}/lib">
- <include name="*.jar"/>
- </fileset>
- </path>
- <property name="bootclasspath" refid="path_bootclasspath"/>
<property name="bundleJavacSource" value="${javacSource}"/>
<property name="bundleJavacTarget" value="${javacTarget}"/>
- <property name="bundleBootClasspath" value="${bootclasspath}"/>
<target name="init" depends="properties">
<condition property="pluginTemp" value="${buildTempFolder}/plugins">
eclipse-emf-platformjavadocname.patch:
--- NEW FILE eclipse-emf-platformjavadocname.patch ---
--- src/eclipse/plugins/org.eclipse.xsd.doc/build/javadoc.xml.template 2006-10-20 14:11:08.000000000 -0400
+++ src/eclipse/plugins/org.eclipse.xsd.doc/build/javadoc.xml.template 2006-10-20 14:11:45.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_3.2.0.v20060612-0900.jar" dest="${javadoc.link.location}/platform/"/>
+ <unzip src="${eclipseDir}/plugins/org.eclipse.platform.doc.isv_3.2.1.r321_v2006030.jar" dest="${javadoc.link.location}/platform/"/>
</target>
<target name="javadoc" depends="extractPlatformJavadoc">
--- src/eclipse/plugins/org.eclipse.emf.doc/build/javadoc.xml.template 2006-10-20 14:10:49.000000000 -0400
+++ src/eclipse/plugins/org.eclipse.emf.doc/build/javadoc.xml.template 2006-10-20 14:11:52.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_3.2.0.v20060612-0900.jar" dest="${javadoc.link.location}/platform/"/>
+ <unzip src="${eclipseDir}/plugins/org.eclipse.platform.doc.isv_3.2.1.r321_v2006030.jar" dest="${javadoc.link.location}/platform/"/>
</target>
<target name="javadoc" depends="extractPlatformJavadoc">
--- NEW FILE eclipse-emf.spec ---
%define gcj_support 1
%define major 2
%define minor 2
%define micro 1
%define build_id build_200609210005
%define eclipse_base %{_datadir}/eclipse
Summary: Eclipse Modeling Framework (EMF)
Name: eclipse-emf
Version: %{major}.%{minor}.%{micro}
Release: 1%{?dist}
License: Eclipse Public License
Group: System Environment/Libraries
URL: http://www.eclipse.org/emf/
Requires: eclipse-platform >= 1:3.2.1
Requires: eclipse-platform < 1:3.2.2
# EMF's download page links to their map file for 2.2.1:
# http://download.eclipse.org/tools/emf/downloads/drops/2.2.1/R200609210005/directory.txt
# and this tells us the CVS tag for 2.2.1.
#
# Use the enclosed script to generate the source drop for EMF 2.2.1:
#
# sh fetch-eclipse-emf.sh emf :pserver:anonymous at dev.eclipse.org:/home/tools \
# build_200609210005 org.eclipse.emf.releng.build
Source0: %{name}-fetched-src-%{build_id}.tar.bz2
Source1: fetch-%{name}.sh
Patch0: %{name}-customTargets.xml.patch
Patch1: %{name}-nobootclasspath.patch
# Note, this patch includes the Eclipse SDK version number
Patch2: %{name}-javadoc.patch
Patch3: %{name}-addforceContextQualiferproperty.patch
Patch4: %{name}-buildAll.patch
Patch5: %{name}-examples-dontChangeBundleClasspath.patch
Patch6: %{name}-platformjavadocname.patch
BuildRequires: eclipse-pde
%if %{gcj_support}
BuildRequires: gcc-java >= 4.0.2
BuildRequires: java-gcj-compat-devel >= 1.0.64
Requires(post): java-gcj-compat >= 1.0.64
Requires(postun): java-gcj-compat >= 1.0.64
%else
BuildRequires: java-devel >= 1.4.2
%endif
%if %{gcj_support}
%else
BuildArch: noarch
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%package sdk
Summary: Eclipse EMF SDK
Group: System Environment/Libraries
Requires: %{name}-sdo-sdk = %{version}-%{release}
Requires: %{name}-xsd-sdk = %{version}-%{release}
%package sdo
Summary: Eclipse EMF SDO
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}
%package sdo-sdk
Summary: Eclipse EMF SDO Source (SDK)
Group: System Environment/Libraries
Requires: %{name}-sdo = %{version}-%{release}
%package xsd
Summary: Eclipse EMF XSD
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}
%package xsd-sdk
Summary: Eclipse EMF XSD Source (SDK)
Group: System Environment/Libraries
Requires: %{name}-xsd = %{version}-%{release}
%package examples
Summary: Eclipse EMF examples
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}
Requires: %{name}-xsd = %{version}-%{release}
%package standalone
Summary: Eclipse EMF Standalone
Group: System Environment/Libraries
Requires: java-devel >= 1.4.2
%description
EMF is a modeling framework and code generation facility for building tools and
other applications based on a structured data model.
%description sdk
Source for all of Eclipse EMF SDK for use within Eclipse.
%description sdo
Service Data Objects (SDO) is a framework that simplifies and unifies data
application development in a service oriented architecture (SOA).
%description sdo-sdk
Source for Eclipse EMF SDO for use within Eclipse.
%description xsd
The XML Schema Infoset Model is a reference library that provides an API for
use with any code that examines, creates or modifies W3C XML Schema
(standalone or as part of other artifacts, such as XForms or WSDL documents).
%description xsd-sdk
Source for Eclipse EMF XSD for use within Eclipse.
%description examples
Example source code and models that demonstrates how to use Eclipse EMF.
%description standalone
An standalone (ie. independent of the Eclipse runtime) implementation of EMF.
%prep
%setup -q -c
pushd org.eclipse.emf.releng.build
%patch0 -p0
%patch1 -p0
%patch2 -p1
%patch3 -p0
%patch4 -p0
%patch5 -p0
%patch6 -p0
# Don't ever use bootclasspath
# FIXME: why can't we use bootclasspath? It gives the infamous
# "java.lang.Object cannot be found" error.
for f in emf/doc/build.properties emf/runtime/build.properties \
examples/build.properties sdk/build.properties sdo/doc/build.properties \
sdo/runtime/build.properties tests/build.properties \
xsd/doc/build.properties xsd/runtime/build.properties; \
do sed --in-place 's/^bootclasspath/#bootclasspath/' $f; done
popd
%build
mkdir home
homedir=$(cd home > /dev/null && pwd)
# See comments in the script to understand this.
/bin/sh -x %{eclipse_base}/buildscripts/copy-platform SDK %{eclipse_base}
SDK=$(cd SDK > /dev/null && pwd)
# Build the EMF builder helper jars
# for ChangeBundleClasspath
pushd org.eclipse.emf.releng.build/org.eclipse.emf.build
# FIXME: implement com.sun.tools.doclets.standard in gjdoc
rm -rf src/org/eclipse/emf/build/doclet/
ant
popd
# for SetRequiredBundleVersionRanges
pushd org.eclipse.emf.releng.build/org.eclipse.emf.build.ant
mkdir -p build
echo "<project default=\"main\"><target name=\"main\"></target></project>" > build/assemble.org.eclipse.emf.build.ant.all.xml
echo "<project default=\"main\"><target name=\"main\"></target></project>" > build/package.org.eclipse.emf.build.ant.all.xml
java -cp %{eclipse_base}/startup.jar \
-Duser.home=$homedir \
org.eclipse.core.launcher.Main \
-application org.eclipse.ant.core.antRunner \
-Dtype=plugin \
-Did=org.eclipse.emf.build.ant \
-DsourceDirectory=$(pwd) \
-DbaseLocation=$SDK \
-Dbuilder=%{eclipse_base}/plugins/org.eclipse.pde.build/templates/package-build \
-f %{eclipse_base}/plugins/org.eclipse.pde.build/scripts/build.xml
pushd build/plugins/org.eclipse.emf.build.ant
java -cp /usr/share/eclipse/startup.jar \
org.eclipse.core.launcher.Main \
-application org.eclipse.ant.core.antRunner \
-f build.xml build.update.jar
popd
# FIXME: the SDK symlinks that point to /usr/share/eclipse end up causing the
# antRunner process below to not see anything in $SDK that *isn't* in
# /usr/share/eclipse. As such, I've hacked this up to temporarily duplicate
# everything in /usr/share/eclipse and copy the emf.build.ant jar there for
# building. Lame, yes, but it works and it only results in a bloated buildroot
# which is just temporary disk space. Also, the task itself expects to have
# all of the plugins (including the SDK plugins themselves) in
# org.eclipse.emf.releng.build/src/eclipse/plugins so we symlink the SDK ones there.
# -- overholt 2006-07-27
pushd ../..
rm SDK/plugins/org.eclipse.pde.build
# Remove the bits of the SDK that we don't need
rm SDK/features/org.eclipse.pde.source*
rm SDK/features/org.eclipse.jdt.source*
rm SDK/features/org.eclipse.sdk*
rm SDK/plugins/org.eclipse.pde.source*
rm SDK/plugins/org.eclipse.jdt.source*
rm SDK/plugins/org.eclipse.jdt.doc*
rm SDK/plugins/org.eclipse.sdk*
# This tomcat chicanery will be fixed in a future Eclipse SDK RPM
mkdir SDK2
pushd SDK
for f in `find -mindepth 1 -maxdepth 1 -not -name plugins`; do cp -rL $f ../SDK2; done
mkdir ../SDK2/plugins
pushd plugins
for f in `find -mindepth 1 -not -name "org.eclipse.tomcat*"`; do cp -rL $f ../../SDK2/plugins; done
cp -r org.eclipse.tomcat* ../../SDK2/plugins
popd
popd
pushd SDK2/plugins
ln -s org.eclipse.pde.build* org.eclipse.pde.build
popd
rm -rf SDK
mv SDK2 SDK
SDK=$(cd SDK && pwd)
popd
pushd ../src/eclipse/plugins
for f in `ls $SDK/plugins`; do ln -s $SDK/plugins/$f .; done
popd
# Make EMF ant task available to main EMF build
mv build/plugins/org.eclipse.emf.build.ant/*.jar $SDK/plugins
popd
# End build of EMF builder helper jar
cd org.eclipse.emf.releng.build
# some notes about what we're doing here:
#
# -Duser.home=$homedir: override java.home in the vm so that eclipse only adds files in the buildroot
# -Dcomponent=sdk: the component of EMF we want to build
# -DjavacFailOnError=true: fail if there is an error
# -DdontUnzip=true: don't unzip the result, we will do it manually
# -DbaseLocation=$SDK: $SDK is a mirror of the system SDK dir that is writable by the process
# running the build. This let's the build "see" the jars and have a place to
# put the plugins that have just been built
# -DskipFetch=true: don't fetch the sources
# -DbaseExists=true: don't download the SDK, we want to use the one in $SDK
java -cp $SDK/startup.jar \
-Duser.home=$homedir \
org.eclipse.core.launcher.Main \
-application org.eclipse.ant.core.antRunner \
-DjavacFailOnError=true \
-DdontUnzip=true \
-DmapsLocal=true \
-DbaseLocation=$SDK \
-Dpde.build.scripts=$SDK/plugins/org.eclipse.pde.build/scripts \
-DskipFetch=true \
-DbuildLabel=%{version} \
-DbuildAlias=%{version} \
-DbaseExists=true \
-f buildAll.xml buildRPM
%install
rm -rf ${RPM_BUILD_ROOT}
install -d -m755 ${RPM_BUILD_ROOT}/%{eclipse_base}
# EMF SDK and Examples
for file in $(pwd)/org.eclipse.emf.releng.build/src/eclipse/%{version}/*SDK-%{version}.zip; do
case $file in
*eclipse*)
# The ".." is needed since the zip files contain "eclipse/foo".
(cd $RPM_BUILD_ROOT/%{eclipse_base}/.. && unzip -qq -o $file)
;;
esac
done
for file in $(pwd)/org.eclipse.emf.releng.build/src/eclipse/%{version}/*Examples-%{version}.zip; do
case $file in
*eclipse*)
# The ".." is needed since the zip files contain "eclipse/foo".
(cd $RPM_BUILD_ROOT/%{eclipse_base}/.. && unzip -qq -o $file)
;;
esac
done
# EMF Models
for file in $(pwd)/org.eclipse.emf.releng.build/src/eclipse/%{version}/*Models-%{version}.zip; do
(cd $RPM_BUILD_ROOT/%{eclipse_base} && unzip -qq -o $file)
done
mv $RPM_BUILD_ROOT/%{eclipse_base}/readme_models.html \
$RPM_BUILD_ROOT/%{eclipse_base}/emf/models
install -d -m755 ${RPM_BUILD_ROOT}/%{_datadir}/java/emf
# Standalone EMF
for file in $(pwd)/org.eclipse.emf.releng.build/src/eclipse/%{version}/*Standalone-%{version}.zip; do
(cd $RPM_BUILD_ROOT/%{_datadir}/java && unzip -qq -o $file)
done
mv $RPM_BUILD_ROOT/%{_datadir}/java/emf/bin/* \
$RPM_BUILD_ROOT/%{_datadir}/java/emf
rmdir $RPM_BUILD_ROOT/%{_datadir}/java/emf/bin
mv $RPM_BUILD_ROOT/%{_datadir}/java/images/* \
$RPM_BUILD_ROOT/%{_datadir}/java/emf
rmdir $RPM_BUILD_ROOT/%{_datadir}/java/images
mv $RPM_BUILD_ROOT/%{_datadir}/java/readme_standalone.html \
$RPM_BUILD_ROOT/%{_datadir}/java/emf
# These are already included in the Eclipse SDK but the packaging guidelines
# would like them in a directory owned by this package
mv $RPM_BUILD_ROOT/%{eclipse_base}/epl-v10.html \
$RPM_BUILD_ROOT/%{eclipse_base}/features/org.eclipse.emf_*
mv $RPM_BUILD_ROOT/%{eclipse_base}/notice.html \
$RPM_BUILD_ROOT/%{eclipse_base}/features/org.eclipse.emf_*
%if %{gcj_support}
doc_zip=`ls $RPM_BUILD_ROOT/%{eclipse_base}/plugins | grep org.eclipse.emf.doc`;
aot-compile-rpm --exclude %{eclipse_base}/plugins/$doc_zip/doc.zip
%endif
%clean
rm -rf ${RPM_BUILD_ROOT}
%if %{gcj_support}
%post sdo
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%postun sdo
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%post xsd
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%postun xsd
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif
%files
%defattr(-,root,root)
%{eclipse_base}/features/org.eclipse.emf.doc_*
%{eclipse_base}/plugins/org.eclipse.emf.doc_*
%{eclipse_base}/plugins/org.eclipse.emf.cheatsheets_*
%{eclipse_base}/plugins/org.eclipse.emf_*
%{eclipse_base}/plugins/org.eclipse.emf.ant_*
%{eclipse_base}/plugins/org.eclipse.emf.codegen.ecore.ui_*
%{eclipse_base}/plugins/org.eclipse.emf.codegen.ecore_*
%{eclipse_base}/plugins/org.eclipse.emf.codegen.ui_*
%{eclipse_base}/plugins/org.eclipse.emf.codegen_*
%{eclipse_base}/plugins/org.eclipse.emf.common.ui_*
%{eclipse_base}/plugins/org.eclipse.emf.common_*
%{eclipse_base}/plugins/org.eclipse.emf.ecore_*
%{eclipse_base}/plugins/org.eclipse.emf.ecore.edit_*
%{eclipse_base}/plugins/org.eclipse.emf.ecore.editor_*
%{eclipse_base}/plugins/org.eclipse.emf.ecore.change_*
%{eclipse_base}/plugins/org.eclipse.emf.ecore.change.edit_*
%{eclipse_base}/plugins/org.eclipse.emf.ecore.xmi_*
%{eclipse_base}/plugins/org.eclipse.emf.edit_*
%{eclipse_base}/plugins/org.eclipse.emf.edit.ui_*
%{eclipse_base}/plugins/org.eclipse.emf.mapping_*
%{eclipse_base}/plugins/org.eclipse.emf.mapping.ui_*
%{eclipse_base}/plugins/org.eclipse.emf.mapping.ecore2ecore_*
%{eclipse_base}/plugins/org.eclipse.emf.mapping.ecore2ecore.editor_*
%{eclipse_base}/plugins/org.eclipse.emf.mapping.ecore2xml_*
%{eclipse_base}/plugins/org.eclipse.emf.mapping.ecore2xml.ui_*
%{eclipse_base}/plugins/org.eclipse.emf.converter_*
%{eclipse_base}/plugins/org.eclipse.emf.importer_*
%{eclipse_base}/plugins/org.eclipse.emf.importer.ecore_*
%{eclipse_base}/plugins/org.eclipse.emf.importer.java_*
%{eclipse_base}/plugins/org.eclipse.emf.importer.rose_*
%{eclipse_base}/plugins/org.eclipse.emf.exporter_*
%{eclipse_base}/features/org.eclipse.emf_*/*.jpg
%{eclipse_base}/features/org.eclipse.emf_*/feature*
%doc %{eclipse_base}/features/org.eclipse.emf_*/license.html
%doc %{eclipse_base}/features/org.eclipse.emf_*/notice.html
%doc %{eclipse_base}/features/org.eclipse.emf_*/epl-v10.html
%if %{gcj_support}
%{_libdir}/gcj/%{name}/cheatsheets*
%{_libdir}/gcj/%{name}/org.eclipse.emf.ant_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.codegen.ecore.ui_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.codegen.ecore_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.codegen.ui_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.codegen_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.common.ui_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.common_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.converter_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.ecore.change.edit_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.ecore.change_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.ecore.edit_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.ecore.editor_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.ecore.xmi_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.ecore_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.edit.ui_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.edit_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.exporter_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.importer.ecore_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.importer.java_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.importer.rose_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.importer_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.mapping.ecore2ecore.editor_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.mapping.ecore2ecore_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.mapping.ecore2xml.ui_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.mapping.ecore2xml_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.mapping.ui_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.mapping_*
%endif
%files sdk
%defattr(-,root,root)
%{eclipse_base}/features/org.eclipse.emf.source_*
%{eclipse_base}/plugins/org.eclipse.emf.source_*
%{eclipse_base}/features/org.eclipse.emf.sdk_*
%files sdo
%defattr(-,root,root)
%{eclipse_base}/features/org.eclipse.emf.ecore.sdo_*
%{eclipse_base}/plugins/org.eclipse.emf.commonj.sdo_*
%{eclipse_base}/plugins/org.eclipse.emf.ecore.sdo_*
%{eclipse_base}/plugins/org.eclipse.emf.ecore.sdo.edit_*
%{eclipse_base}/plugins/org.eclipse.emf.ecore.sdo.editor_*
%{eclipse_base}/features/org.eclipse.emf.ecore.sdo.doc_*
%{eclipse_base}/plugins/org.eclipse.emf.ecore.sdo.doc_*
%if %{gcj_support}
%{_libdir}/gcj/%{name}/org.eclipse.emf.commonj.sdo_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.ecore.sdo.edit_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.ecore.sdo.editor_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.ecore.sdo_*
%endif
%files sdo-sdk
%defattr(-,root,root)
%{eclipse_base}/features/org.eclipse.emf.ecore.sdo.source_*
%{eclipse_base}/plugins/org.eclipse.emf.ecore.sdo.source_*
%files xsd
%defattr(-,root,root)
%{eclipse_base}/features/org.eclipse.xsd_*
%{eclipse_base}/features/org.eclipse.xsd.doc_*
%{eclipse_base}/plugins/org.eclipse.emf.mapping.xsd2ecore.editor_*
%{eclipse_base}/plugins/org.eclipse.emf.mapping.xsd2ecore_*
%{eclipse_base}/plugins/org.eclipse.xsd.cheatsheets_*
%{eclipse_base}/plugins/org.eclipse.xsd.doc_*
%{eclipse_base}/plugins/org.eclipse.xsd.ecore.importer_*
%{eclipse_base}/plugins/org.eclipse.xsd.ecore.exporter_*
%{eclipse_base}/plugins/org.eclipse.xsd.edit_*
%{eclipse_base}/plugins/org.eclipse.xsd.editor_*
%{eclipse_base}/plugins/org.eclipse.xsd_*
%if %{gcj_support}
%{_libdir}/gcj/%{name}/org.eclipse.emf.mapping.xsd2ecore.editor_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.mapping.xsd2ecore_*
%{_libdir}/gcj/%{name}/org.eclipse.xsd.ecore.importer_*
%{_libdir}/gcj/%{name}/org.eclipse.xsd.ecore.exporter_*
%{_libdir}/gcj/%{name}/org.eclipse.xsd.edit_*
%{_libdir}/gcj/%{name}/org.eclipse.xsd.editor_*
%endif
%files xsd-sdk
%defattr(-,root,root)
%{eclipse_base}/features/org.eclipse.xsd.source_*
%{eclipse_base}/plugins/org.eclipse.xsd.source_*
%files examples
%defattr(-,root,root)
%{eclipse_base}/features/org.eclipse.emf.examples_*
%{eclipse_base}/plugins/org.eclipse.emf.examples_*
%{eclipse_base}/plugins/org.eclipse.emf.activities_*
%{eclipse_base}/plugins/org.eclipse.emf.examples.library_*
%{eclipse_base}/plugins/org.eclipse.emf.examples.library.edit_*
%{eclipse_base}/plugins/org.eclipse.emf.examples.library.editor_*
%{eclipse_base}/plugins/org.eclipse.emf.exporter.html_*
%{eclipse_base}/plugins/org.eclipse.emf.java.edit_*
%{eclipse_base}/plugins/org.eclipse.emf.java.editor_*
%{eclipse_base}/plugins/org.eclipse.emf.java_*
%{eclipse_base}/plugins/org.eclipse.xsd.example_*
%{eclipse_base}/emf/models/*_%{major}*
%doc %{eclipse_base}/emf/models/readme_models.html
%if %{gcj_support}
%{_libdir}/gcj/%{name}/org.eclipse.emf.examples.library_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.examples.library.edit_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.examples.library.editor_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.exporter.html_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.java_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.java.edit_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.java.editor_*
%{_libdir}/gcj/%{name}/org.eclipse.xsd_*
%{_libdir}/gcj/%{name}/xsd.example*
%endif
%files standalone
%defattr(-,root,root)
%{_datadir}/java/emf/*.jar
%doc %{_datadir}/java/emf/jars.gif
%doc %{_datadir}/java/emf/readme_standalone.html
%changelog
* Thu Oct 19 2006 Andrew Overholt <overholt at redhat.com> 2.2.1-1
- 2.2.1.
- Add sdk package, fix up inter-dependencies to match upstream.
- Don't natively-compile doc.zip (the included jar is just an example).
- Add fetching script with proper permissions.
- Add guards in %%post{,un}s for rebuild-gcj-db's presence.
* Fri Sep 08 2006 Andrew Overholt <overholt at redhat.com> 2.2.0-2
- Remove custom doclet references as gjdoc doesn't implement the necessary
classes.
- Add examples.
* Tue Aug 01 2006 Andrew Overholt <overholt at redhat.com> 2.2.0-1jpp_1rh
- 2.2.0
- Build using buildAll.xml
* Fri Apr 07 2006 Andrew Overholt <overholt at redhat.com> 2.1.2-1jpp_1rh
- 2.1.2
- Specfile cleanup.
* Thu Mar 17 2005 Jeff Pound <jpound at redhat.com> 2.0.1-4
- Change pde build script location to 3.0.1.
* Wed Mar 16 2005 Phil Muldoon <pmuldoon at redhat.com> 2.0.1-3
- Fixed description
* Fri Oct 29 2004 Phil Muldoon <pmuldoon at redhat.com> 2.0.1-2
- Modified tar-ball to reflect version
* Wed Oct 27 2004 Phil Muldoon <pmuldoon at redhat.com> 2.0.1-1
- Initial Import
--- NEW FILE fetch-eclipse-emf.sh ---
#!/bin/sh
# Generate a source drop for an eclipse.org project (tailored a bit for EMF)
# Usage message
usage="usage: $0 <project_name> <cvs_root> <cvs_tag> <cvs_directory>"
project_name=$1
cvs_root=$2
cvs_tag=$3
cvs_directory=$4
# Ensure we got all of the variables
if [ "x$project_name"x = "xx" ]
then
echo >&2 "$usage"
exit 1
fi
if [ "x$cvs_root"x = "xx" ]
then
echo >&2 "$usage"
exit 1
fi
if [ "x$cvs_tag"x = "xx" ]
then
echo >&2 "$usage"
exit 1
fi
if [ "x$cvs_directory"x = "xx" ]
then
echo >&2 "$usage"
exit 1
fi
mkdir -p temp/home && cd temp
touch home/.cvspass
cvs -d $cvs_root co -r $cvs_tag $cvs_directory
pushd $cvs_directory
# These patches do the following:
# 1. add a fetch target to grab the source
# 2. make it so that we don't have to strip the version at source grab time
# (and thus depend upon org.eclipse.releng
patch -p0 << _EOF_
Index: build.xml
===================================================================
RCS file: /home/tools/org.eclipse.emf.releng.build/build.xml,v
retrieving revision 1.14
diff -u -p -r1.14 build.xml
--- build.xml 7 Nov 2005 20:37:26 -0000 1.14
+++ build.xml 25 Oct 2006 18:07:28 -0000
@@ -44,4 +44,16 @@
<property name="builder" value="\${basedir}/\${component}" />
</ant>
</target>
-</project>
\ No newline at end of file
+
+ <target name="fetch" depends="init">
+ <ant antfile="build.xml" dir="\${pde.build.scripts}"
+ target="preBuild">
+ <property name="builder" value="\${basedir}/\${component}" />
+ </ant>
+ <ant antfile="build.xml" dir="\${pde.build.scripts}"
+ target="fetch">
+ <property name="builder" value="\${basedir}/\${component}" />
+ </ant>
+ </target>
+
+</project>
Index: sdk/customTargets.xml
===================================================================
RCS file: /home/tools/org.eclipse.emf.releng.build/sdk/customTargets.xml,v
retrieving revision 1.36
diff -u -p -r1.36 customTargets.xml
--- sdk/customTargets.xml 17 Jul 2006 00:02:48 -0000 1.36
+++ sdk/customTargets.xml 25 Oct 2006 17:59:33 -0000
@@ -28,7 +28,6 @@
<!-- Replace values for cvsRoot, package and mapVersionTag as desired. -->
<!-- ===================================================================== -->
<target name="checkLocal">
- <available property="mapsLocal" file="\${buildDirectory}/maps/org.eclipse.emf" />
</target>
<target name="getMapFiles" depends="checkLocal" unless="mapsLocal">
@@ -206,11 +205,11 @@
</target>
<target name="getBaseInit">
- <taskdef name="stripVersions" classname="org.eclipse.releng.VersionNumberStripper" />
<property file="\${buildDirectory}/maps/org.eclipse.emf/build.cfg" />
</target>
<target name="getBaseEclipse" unless="baseExists" depends="getBaseInit">
+ <taskdef name="stripVersions" classname="org.eclipse.releng.VersionNumberStripper" />
<!-- if there's already an existing eclipse zip by the same name in the dest folder, don't download it again! -->
<available file="\${downloadsDir}/\${eclipseFile}" property="baseZipExists" />
<antcall target="downloadBaseEclipse" />
Index: examples/customTargets.xml
===================================================================
RCS file: /home/tools/org.eclipse.emf.releng.build/examples/customTargets.xml,v
retrieving revision 1.16
diff -u -p -r1.16 customTargets.xml
--- examples/customTargets.xml 24 Aug 2006 14:47:17 -0000 1.16
+++ examples/customTargets.xml 25 Oct 2006 17:59:33 -0000
@@ -27,7 +27,6 @@
<!-- Replace values for cvsRoot, package and mapVersionTag as desired. -->
<!-- ===================================================================== -->
<target name="checkLocal">
- <available property="mapsLocal" file="\${buildDirectory}/maps/org.eclipse.emf" />
</target>
<target name="getMapFiles" depends="checkLocal" unless="mapsLocal">
@@ -179,11 +178,11 @@
</target>
<target name="getBaseInit">
- <taskdef name="stripVersions" classname="org.eclipse.releng.VersionNumberStripper" />
<property file="\${buildDirectory}/maps/org.eclipse.emf/build.cfg" />
</target>
<target name="getBaseEclipse" unless="baseExists" depends="getBaseInit">
+ <taskdef name="stripVersions" classname="org.eclipse.releng.VersionNumberStripper" />
<!-- if there's already an existing eclipse zip by the same name in the dest folder, don't download it again! -->
<available file="\${downloadsDir}/\${eclipseFile}" property="baseZipExists" />
<antcall target="downloadBaseEclipse" />
_EOF_
# Fetch the actual source
java -cp /usr/share/eclipse/startup.jar \
-Duser.home=../home org.eclipse.core.launcher.Main \
-application org.eclipse.ant.core.antRunner \
-buildfile build.xml \
-DbaseLocation=/usr/share/eclipse \
-Dpde.build.scripts=/usr/share/eclipse/plugins/org.eclipse.pde.build/scripts \
-Dcomponent=sdk \
-DbaseExists=true \
-DbuildLabel=$cvs_tag \
-DfetchTag=$cvs_tag \
-DmapCvsRoot="$cvs_root" \
-DmapVersionTag=$cvs_tag \
fetch
# Fetch examples
java -cp /usr/share/eclipse/startup.jar \
-Duser.home=../../home \
org.eclipse.core.launcher.Main \
-application org.eclipse.ant.core.antRunner \
-buildfile build.xml \
-DbaseLocation=/usr/share/eclipse \
-Dpde.build.scripts=/usr/share/eclipse/plugins/org.eclipse.pde.build/scripts \
-Dcomponent=examples \
-DbaseExists=true \
-DbuildLabel=$cvs_tag \
-DfetchTag=$cvs_tag \
-DmapCvsRoot="$cvs_root" \
-DmapVersionTag=$cvs_tag \
fetch
popd
# Make the source tarball
tar jcf eclipse-$project_name-fetched-src-$cvs_tag.tar.bz2 $cvs_directory
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eclipse-emf/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 30 Oct 2006 16:51:23 -0000 1.1
+++ .cvsignore 30 Oct 2006 16:52:48 -0000 1.2
@@ -0,0 +1 @@
+eclipse-emf-fetched-src-build_200609210005.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eclipse-emf/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 30 Oct 2006 16:51:23 -0000 1.1
+++ sources 30 Oct 2006 16:52:48 -0000 1.2
@@ -0,0 +1 @@
+1269e4e5c40ab6f733a44c816f8e2eac eclipse-emf-fetched-src-build_200609210005.tar.bz2
More information about the scm-commits
mailing list