[pkg-java] r3596 - in trunk/eclipse-emf/debian: . eclipse-pdebuild eclipse-pdebuild/package-build patches
vladimir-guest at alioth.debian.org
vladimir-guest at alioth.debian.org
Tue Jun 5 21:04:50 UTC 2007
Author: vladimir-guest
Date: 2007-06-05 21:04:50 +0000 (Tue, 05 Jun 2007)
New Revision: 3596
Added:
trunk/eclipse-emf/debian/eclipse-emf-examples.dirs
trunk/eclipse-emf/debian/eclipse-emf-examples.docs
trunk/eclipse-emf/debian/eclipse-emf-examples.install
trunk/eclipse-emf/debian/eclipse-emf-sdk.install
trunk/eclipse-emf/debian/eclipse-emf-sdo-sdk.install
trunk/eclipse-emf/debian/eclipse-emf-sdo.install
trunk/eclipse-emf/debian/eclipse-emf-xsd-sdk.install
trunk/eclipse-emf/debian/eclipse-emf-xsd.install
trunk/eclipse-emf/debian/eclipse-pdebuild/
trunk/eclipse-emf/debian/eclipse-pdebuild/package-build/
trunk/eclipse-emf/debian/eclipse-pdebuild/package-build/build.properties
trunk/eclipse-emf/debian/eclipse-pdebuild/package-build/customTargets-assemble-target.xml
trunk/eclipse-emf/debian/eclipse-pdebuild/package-build/customTargets.xml
trunk/eclipse-emf/debian/eclipse-pdebuild/package-build/prepare-build-dir.sh
trunk/eclipse-emf/debian/patches/eclipse-emf-addforceContextQualiferproperty.patch
trunk/eclipse-emf/debian/patches/eclipse-emf-buildAll.patch
trunk/eclipse-emf/debian/patches/eclipse-emf-customTargets.xml.patch
trunk/eclipse-emf/debian/patches/eclipse-emf-examples-dontChangeBundleClasspath.patch
trunk/eclipse-emf/debian/patches/eclipse-emf-javadoc.patch
trunk/eclipse-emf/debian/patches/eclipse-emf-nobootclasspath.patch
Removed:
trunk/eclipse-emf/debian/.cvsignore
trunk/eclipse-emf/debian/eclipse-emf-releng.patch
trunk/eclipse-emf/debian/eclipse-pdebuild.mk
trunk/eclipse-emf/debian/patches/01-eclipse-emf-bootclasspath.patch
trunk/eclipse-emf/debian/patches/02-eclipse-emf-copyplatformdocs.patch
trunk/eclipse-emf/debian/patches/03-eclipse-emf-buildemf.patch
Log:
New version of eclipse-emf-2.2.2
Deleted: trunk/eclipse-emf/debian/.cvsignore
===================================================================
--- trunk/eclipse-emf/debian/.cvsignore 2007-06-05 21:02:45 UTC (rev 3595)
+++ trunk/eclipse-emf/debian/.cvsignore 2007-06-05 21:04:50 UTC (rev 3596)
@@ -1,4 +0,0 @@
-*.substvars
-eclipse-emf
-files
-tmp
Added: trunk/eclipse-emf/debian/eclipse-emf-examples.dirs
===================================================================
--- trunk/eclipse-emf/debian/eclipse-emf-examples.dirs (rev 0)
+++ trunk/eclipse-emf/debian/eclipse-emf-examples.dirs 2007-06-05 21:04:50 UTC (rev 3596)
@@ -0,0 +1 @@
+/usr/lib/eclipse/emf
Added: trunk/eclipse-emf/debian/eclipse-emf-examples.docs
===================================================================
--- trunk/eclipse-emf/debian/eclipse-emf-examples.docs (rev 0)
+++ trunk/eclipse-emf/debian/eclipse-emf-examples.docs 2007-06-05 21:04:50 UTC (rev 3596)
@@ -0,0 +1 @@
+source-tree/org.eclipse.emf.releng.build/temp/readme_models.html
Added: trunk/eclipse-emf/debian/eclipse-emf-examples.install
===================================================================
--- trunk/eclipse-emf/debian/eclipse-emf-examples.install (rev 0)
+++ trunk/eclipse-emf/debian/eclipse-emf-examples.install 2007-06-05 21:04:50 UTC (rev 3596)
@@ -0,0 +1,12 @@
+source-tree/org.eclipse.emf.releng.build/temp/eclipse/features/org.eclipse.emf.examples_* usr/lib/eclipse/features
+source-tree/org.eclipse.emf.releng.build/temp/eclipse/plugins/org.eclipse.emf.examples_* usr/lib/eclipse/plugins
+source-tree/org.eclipse.emf.releng.build/temp/eclipse/plugins/org.eclipse.emf.activities_* usr/lib/eclipse/plugins
+source-tree/org.eclipse.emf.releng.build/temp/eclipse/plugins/org.eclipse.emf.examples.library_* usr/lib/eclipse/plugins
+source-tree/org.eclipse.emf.releng.build/temp/eclipse/plugins/org.eclipse.emf.examples.library.edit_* usr/lib/eclipse/plugins
+source-tree/org.eclipse.emf.releng.build/temp/eclipse/plugins/org.eclipse.emf.examples.library.editor_* usr/lib/eclipse/plugins
+source-tree/org.eclipse.emf.releng.build/temp/eclipse/plugins/org.eclipse.emf.exporter.html_* usr/lib/eclipse/plugins
+source-tree/org.eclipse.emf.releng.build/temp/eclipse/plugins/org.eclipse.emf.java.edit_* usr/lib/eclipse/plugins
+source-tree/org.eclipse.emf.releng.build/temp/eclipse/plugins/org.eclipse.emf.java.editor_* usr/lib/eclipse/plugins
+source-tree/org.eclipse.emf.releng.build/temp/eclipse/plugins/org.eclipse.emf.java_* usr/lib/eclipse/plugins
+source-tree/org.eclipse.emf.releng.build/temp/eclipse/plugins/org.eclipse.xsd.example_* usr/lib/eclipse/plugins
+source-tree/org.eclipse.emf.releng.build/temp/emf/models usr/lib/eclipse/emf
Deleted: trunk/eclipse-emf/debian/eclipse-emf-releng.patch
===================================================================
--- trunk/eclipse-emf/debian/eclipse-emf-releng.patch 2007-06-05 21:02:45 UTC (rev 3595)
+++ trunk/eclipse-emf/debian/eclipse-emf-releng.patch 2007-06-05 21:04:50 UTC (rev 3596)
@@ -1,32 +0,0 @@
-Index: sdk/customTargets.xml
-===================================================================
-RCS file: /cvsroot/tools/org.eclipse.emf.releng.build/sdk/customTargets.xml,v
-retrieving revision 1.24
-diff -u -r1.24 customTargets.xml
---- sdk/customTargets.xml 10 Jun 2005 18:12:52 -0000 1.24
-+++ sdk/customTargets.xml 17 Dec 2005 01:22:10 -0000
-@@ -49,6 +49,8 @@
-
- <!--tag the map files project-->
- <antcall target="tagMapFiles" />
-+
-+ <replace file="${buildDirectory}/maps/org.eclipse.emf/emf.map" token=":ext:marcelop" value=":pserver:anonymous"/>
- </target>
-
- <target name="tagMapFiles" if="tagMaps">
-@@ -168,7 +170,6 @@
- </target>
-
- <target name="getBaseInit">
-- <taskdef name="stripVersions" classname="org.eclipse.releng.VersionNumberStripper" />
- <property file="${buildDirectory}/maps/org.eclipse.emf/build.cfg" />
- </target>
-
-@@ -188,6 +189,7 @@
- <antcall target="eclipseFileUnZip" />
- <antcall target="eclipseFileUnTarGz" />
-
-+ <taskdef name="stripVersions" classname="org.eclipse.releng.VersionNumberStripper" />
- <stripVersions directory="${buildDirectory}/plugins" />
-
- <!-- Extract doc.zip so we can create links in the java doc -->
Added: trunk/eclipse-emf/debian/eclipse-emf-sdk.install
===================================================================
--- trunk/eclipse-emf/debian/eclipse-emf-sdk.install (rev 0)
+++ trunk/eclipse-emf/debian/eclipse-emf-sdk.install 2007-06-05 21:04:50 UTC (rev 3596)
@@ -0,0 +1,4 @@
+source-tree/org.eclipse.emf.releng.build/temp/eclipse/features/org.eclipse.emf.source_* usr/lib/eclipse/features
+source-tree/org.eclipse.emf.releng.build/temp/eclipse/plugins/org.eclipse.emf.source_* usr/lib/eclipse/plugins
+source-tree/org.eclipse.emf.releng.build/temp/eclipse/features/org.eclipse.emf.sdk_* usr/lib/eclipse/features
+
Added: trunk/eclipse-emf/debian/eclipse-emf-sdo-sdk.install
===================================================================
--- trunk/eclipse-emf/debian/eclipse-emf-sdo-sdk.install (rev 0)
+++ trunk/eclipse-emf/debian/eclipse-emf-sdo-sdk.install 2007-06-05 21:04:50 UTC (rev 3596)
@@ -0,0 +1,2 @@
+source-tree/org.eclipse.emf.releng.build/temp/eclipse/features/org.eclipse.emf.ecore.sdo.source_* usr/lib/eclipse/features
+source-tree/org.eclipse.emf.releng.build/temp/eclipse/plugins/org.eclipse.emf.ecore.sdo.source_* usr/lib/eclipse/plugins
Added: trunk/eclipse-emf/debian/eclipse-emf-sdo.install
===================================================================
--- trunk/eclipse-emf/debian/eclipse-emf-sdo.install (rev 0)
+++ trunk/eclipse-emf/debian/eclipse-emf-sdo.install 2007-06-05 21:04:50 UTC (rev 3596)
@@ -0,0 +1,7 @@
+source-tree/org.eclipse.emf.releng.build/temp/eclipse/features/org.eclipse.emf.ecore.sdo_* usr/lib/eclipse/features
+source-tree/org.eclipse.emf.releng.build/temp/eclipse/plugins/org.eclipse.emf.commonj.sdo_* usr/lib/eclipse/plugins
+source-tree/org.eclipse.emf.releng.build/temp/eclipse/plugins/org.eclipse.emf.ecore.sdo_* usr/lib/eclipse/plugins
+source-tree/org.eclipse.emf.releng.build/temp/eclipse/plugins/org.eclipse.emf.ecore.sdo.edit_* usr/lib/eclipse/plugins
+source-tree/org.eclipse.emf.releng.build/temp/eclipse/plugins/org.eclipse.emf.ecore.sdo.editor_* usr/lib/eclipse/plugins
+source-tree/org.eclipse.emf.releng.build/temp/eclipse/features/org.eclipse.emf.ecore.sdo.doc_* usr/lib/eclipse/features
+source-tree/org.eclipse.emf.releng.build/temp/eclipse/plugins/org.eclipse.emf.ecore.sdo.doc_* usr/lib/eclipse/plugins
Added: trunk/eclipse-emf/debian/eclipse-emf-xsd-sdk.install
===================================================================
--- trunk/eclipse-emf/debian/eclipse-emf-xsd-sdk.install (rev 0)
+++ trunk/eclipse-emf/debian/eclipse-emf-xsd-sdk.install 2007-06-05 21:04:50 UTC (rev 3596)
@@ -0,0 +1,2 @@
+source-tree/org.eclipse.emf.releng.build/temp/eclipse/features/org.eclipse.xsd.source_* usr/lib/eclipse/features
+source-tree/org.eclipse.emf.releng.build/temp/eclipse/plugins/org.eclipse.xsd.source_* usr/lib/eclipse/plugins
Added: trunk/eclipse-emf/debian/eclipse-emf-xsd.install
===================================================================
--- trunk/eclipse-emf/debian/eclipse-emf-xsd.install (rev 0)
+++ trunk/eclipse-emf/debian/eclipse-emf-xsd.install 2007-06-05 21:04:50 UTC (rev 3596)
@@ -0,0 +1,12 @@
+source-tree/org.eclipse.emf.releng.build/temp/eclipse/features/org.eclipse.xsd_* usr/lib/eclipse/features
+source-tree/org.eclipse.emf.releng.build/temp/eclipse/features/org.eclipse.xsd.doc_* usr/lib/eclipse/features
+source-tree/org.eclipse.emf.releng.build/temp/eclipse/plugins/org.eclipse.emf.mapping.xsd2ecore.editor_* usr/lib/eclipse/plugins
+source-tree/org.eclipse.emf.releng.build/temp/eclipse/plugins/org.eclipse.emf.mapping.xsd2ecore_* usr/lib/eclipse/plugins
+source-tree/org.eclipse.emf.releng.build/temp/eclipse/plugins/org.eclipse.xsd.cheatsheets_* usr/lib/eclipse/plugins
+source-tree/org.eclipse.emf.releng.build/temp/eclipse/plugins/org.eclipse.xsd.doc_* usr/lib/eclipse/plugins
+source-tree/org.eclipse.emf.releng.build/temp/eclipse/plugins/org.eclipse.xsd.ecore.importer_* usr/lib/eclipse/plugins
+source-tree/org.eclipse.emf.releng.build/temp/eclipse/plugins/org.eclipse.xsd.ecore.exporter_* usr/lib/eclipse/plugins
+source-tree/org.eclipse.emf.releng.build/temp/eclipse/plugins/org.eclipse.xsd.edit_* usr/lib/eclipse/plugins
+source-tree/org.eclipse.emf.releng.build/temp/eclipse/plugins/org.eclipse.xsd.editor_* usr/lib/eclipse/plugins
+source-tree/org.eclipse.emf.releng.build/temp/eclipse/plugins/org.eclipse.xsd_* usr/lib/eclipse/plugins
+
Added: trunk/eclipse-emf/debian/eclipse-pdebuild/package-build/build.properties
===================================================================
--- trunk/eclipse-emf/debian/eclipse-pdebuild/package-build/build.properties (rev 0)
+++ trunk/eclipse-emf/debian/eclipse-pdebuild/package-build/build.properties 2007-06-05 21:04:50 UTC (rev 3596)
@@ -0,0 +1,12 @@
+buildDirectory=${sourceDirectory}/build
+buildLabel=rpmBuild
+archivePrefix=eclipse
+skipFetch=true
+javacFailOnError=true
+collectingFolder=eclipse
+archivesFormat=*,*,*-zip
+zipargs=-y
+javacDebugInfo=true
+archiveName=${id}.zip
+runPackager=false
+baseLocation=/usr/share/eclipse
Added: trunk/eclipse-emf/debian/eclipse-pdebuild/package-build/customTargets-assemble-target.xml
===================================================================
--- trunk/eclipse-emf/debian/eclipse-pdebuild/package-build/customTargets-assemble-target.xml (rev 0)
+++ trunk/eclipse-emf/debian/eclipse-pdebuild/package-build/customTargets-assemble-target.xml 2007-06-05 21:04:50 UTC (rev 3596)
@@ -0,0 +1,12 @@
+<project>
+ <!-- ===================================================================== -->
+ <!-- Targets to assemble the built elements for particular configurations -->
+ <!-- These generally call the generated assemble scripts (named in -->
+ <!-- ${assembleScriptName}) but may also add pre and post processing -->
+ <!-- Add one target for each root element and each configuration -->
+ <!-- ===================================================================== -->
+
+ <target name="assemble. at id@">
+ <ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
+ </target>
+</project>
Added: trunk/eclipse-emf/debian/eclipse-pdebuild/package-build/customTargets.xml
===================================================================
--- trunk/eclipse-emf/debian/eclipse-pdebuild/package-build/customTargets.xml (rev 0)
+++ trunk/eclipse-emf/debian/eclipse-pdebuild/package-build/customTargets.xml 2007-06-05 21:04:50 UTC (rev 3596)
@@ -0,0 +1,144 @@
+<project name="Build specific targets and properties" default="noDefault">
+
+ <fail unless="type" message="Please set the ${type} property to 'feature', 'plugin' or 'fragment'." />
+ <fail unless="id" message="Please set the ${id} property to the feature, plugin or fragment id of the plugin you are building." />
+ <fail unless="sourceDirectory" message="Please set the ${sourceDirectory} property to the directory that has the source plugins." />
+
+ <!-- we need to do this because you can't expand variables in target names -->
+ <copy file="${builder}/customTargets-assemble-target.xml" tofile="${buildDirectory}/customTargets-${id}-assemble-target.xml" />
+ <replace file="${buildDirectory}/customTargets-${id}-assemble-target.xml" token="@id@" value="${id}" />
+ <import file="${buildDirectory}/customTargets-${id}-assemble-target.xml" />
+
+ <!-- ===================================================================== -->
+ <!-- Run a given ${target} on all elements being built -->
+ <!-- Add on <ant> task for each top level element being built. -->
+ <!-- ===================================================================== -->
+ <target name="allElements">
+ <ant antfile="${genericTargets}" target="${target}">
+ <property name="type" value="${type}" />
+ <property name="id" value="${id}" />
+ </ant>
+ </target>
+
+
+ <!-- ===================================================================== -->
+ <!-- Check out map files from correct repository -->
+ <!-- ===================================================================== -->
+ <target name="getMapFiles">
+ </target>
+
+ <!-- ===================================================================== -->
+
+ <target name="clean" unless="noclean">
+ <antcall target="allElements">
+ <param name="target" value="cleanElement" />
+ </antcall>
+ </target>
+
+ <!-- ===================================================================== -->
+ <!-- Steps to do before setup -->
+ <!-- ===================================================================== -->
+ <target name="preSetup">
+ </target>
+
+ <!-- ===================================================================== -->
+ <!-- Steps to do after setup but before starting the build proper -->
+ <!-- ===================================================================== -->
+ <target name="postSetup">
+ </target>
+
+ <!-- ===================================================================== -->
+ <!-- Steps to do before fetching the build elements -->
+ <!-- ===================================================================== -->
+ <target name="preFetch">
+ </target>
+
+ <!-- ===================================================================== -->
+ <!-- Steps to do after fetching the build elements -->
+ <!-- ===================================================================== -->
+ <target name="postFetch">
+ </target>
+
+ <!-- ===================================================================== -->
+ <!-- Steps to do before generating the build scripts. -->
+ <!-- ===================================================================== -->
+ <target name="preGenerate">
+ <!-- Eclipse expects the feature projects to be in the 'features' directory and
+ plugin projects to be in the 'plugins' directory. The build infrastructure
+ normally arranges the projects during the fetch stage. Since we aren't doing
+ the fetch stage, we have to manually arrange the files -->
+ <exec dir="${builder}" executable="/bin/sh">
+ <arg line="prepare-build-dir.sh ${sourceDirectory} ${buildDirectory}" />
+ </exec>
+
+ </target>
+
+ <!-- ===================================================================== -->
+ <!-- Steps to do after generating the build scripts. -->
+ <!-- ===================================================================== -->
+ <target name="postGenerate">
+ <antcall target="clean" />
+ </target>
+
+ <!-- ===================================================================== -->
+ <!-- Steps to do before running the build.xmls for the elements being built. -->
+ <!-- ===================================================================== -->
+ <target name="preProcess">
+ </target>
+
+ <!-- ===================================================================== -->
+ <!-- Steps to do after running the build.xmls for the elements being built. -->
+ <!-- ===================================================================== -->
+ <target name="postProcess">
+ </target>
+
+ <!-- ===================================================================== -->
+ <!-- Steps to do before running assemble. -->
+ <!-- ===================================================================== -->
+ <target name="preAssemble">
+ </target>
+
+ <!-- ===================================================================== -->
+ <!-- Steps to do after running assemble. -->
+ <!-- ===================================================================== -->
+ <target name="postAssemble">
+ </target>
+
+ <!-- ===================================================================== -->
+ <!-- Steps to do before running package. -->
+ <!-- ===================================================================== -->
+ <target name="prePackage">
+ </target>
+
+ <!-- ===================================================================== -->
+ <!-- Steps to do after running package. -->
+ <!-- ===================================================================== -->
+ <target name="postPackage">
+ </target>
+
+ <!-- ===================================================================== -->
+ <!-- Steps to do after the build is done. -->
+ <!-- ===================================================================== -->
+ <target name="postBuild">
+ </target>
+
+ <!-- ===================================================================== -->
+ <!-- Steps to do to test the build results -->
+ <!-- ===================================================================== -->
+ <target name="test">
+ </target>
+
+ <!-- ===================================================================== -->
+ <!-- Steps to do to publish the build results -->
+ <!-- ===================================================================== -->
+ <target name="publish">
+ </target>
+
+ <!-- ===================================================================== -->
+ <!-- Default target -->
+ <!-- ===================================================================== -->
+ <target name="noDefault">
+ <echo message="You must specify a target when invoking this file" />
+ </target>
+
+</project>
Added: trunk/eclipse-emf/debian/eclipse-pdebuild/package-build/prepare-build-dir.sh
===================================================================
--- trunk/eclipse-emf/debian/eclipse-pdebuild/package-build/prepare-build-dir.sh (rev 0)
+++ trunk/eclipse-emf/debian/eclipse-pdebuild/package-build/prepare-build-dir.sh 2007-06-05 21:04:50 UTC (rev 3596)
@@ -0,0 +1,83 @@
+#!/bin/sh
+
+
+make_links()
+{
+ TYPE=$1
+ TYPEDIR=$2
+ shift; shift;
+ XMLFILES=$@
+
+ CURBUILDFILE=$BUILDDIR/tmp/$TYPE-build.xml
+ cat $BUILDFILE | sed "s|@type@|$TYPE|" > $CURBUILDFILE
+
+ for f in $XMLFILES; do
+ PROJECTDIR=$(dirname $f)
+ PROJECTNAME=$(ant -Dbasedir=$PROJECTDIR -f $CURBUILDFILE 2>&1 | grep echo | cut --delimiter=' ' -f 7)
+ if [ -z $PROJECTNAME ]; then
+ if [ ! -e $PROJECTDIR/META-INF/MANIFEST.MF ]; then
+ echo "ERROR: could not determine the feature id for $PROJECTDIR"
+ exit 1
+ fi
+ PROJECTNAME=$(grep Bundle-SymbolicName $PROJECTDIR/META-INF/MANIFEST.MF | cut --delimiter=';' -f 1 | cut --delimiter=' ' -f 2)
+ if [ -z $PROJECTNAME ]; then
+ echo "ERROR: could not determine the feature id for $PROJECTDIR"
+ exit 1
+ fi
+ fi
+
+ echo " making symlink: $BUILDDIR/$TYPEDIR/$PROJECTNAME -> $PROJECTDIR"
+ ln -sf $PROJECTDIR $BUILDDIR/$TYPEDIR/$PROJECTNAME
+
+ done
+}
+
+
+if [ $# -ne 2 ]; then
+ echo "usage: $0 <path to source dir> <path to build dir>"
+ exit 1
+fi
+
+if [ ! -d $1 ]; then
+ echo "usage: $0 <path to source dir> <path to build dir>"
+ exit 1
+fi
+
+SOURCEDIR=$1
+BUILDDIR=$2
+
+echo "preparing files in $1 for buildfile generation ..."
+mkdir -p $BUILDDIR
+
+# make some ant build files to extract the id from the feature.xml, plugin.xml or the fragment.xml
+mkdir -p $BUILDDIR/tmp
+BUILDFILE=$BUILDDIR/tmp/build.xml
+
+echo "<project default=\"main\">
+ <target name=\"main\">
+ <xmlproperty file=\"@type at .xml\" collapseAttributes=\"true\"/>
+ <fail unless=\"@type at .id\" message=\"feature.id not set\"/>
+ <echo message=\"\${@type at .id}\" />
+ </target>
+</project>" > $BUILDFILE
+
+# find the feature.xml, plugin.xml and fragment.xml files
+FEATURES=$(find $SOURCEDIR -name feature.xml)
+PLUGINS=$(find $SOURCEDIR -name plugin.xml)
+FRAGMENTS=$(find $SOURCEDIR -name fragment.xml)
+
+# make the directories eclipse is expecting
+echo " making the 'features' and 'plugins' directories"
+mkdir -p $BUILDDIR/features $BUILDDIR/plugins
+
+# make symlinks for the features
+make_links feature features $FEATURES
+
+# make the symlinks for plugins
+make_links plugin plugins $PLUGINS
+
+# make the symlinks for fragments - they go in the plugins directory as well
+make_links fragment plugins $FRAGMENTS
+
+rm -rf $BUILDDIR/tmp
+echo done
Deleted: trunk/eclipse-emf/debian/eclipse-pdebuild.mk
===================================================================
--- trunk/eclipse-emf/debian/eclipse-pdebuild.mk 2007-06-05 21:02:45 UTC (rev 3595)
+++ trunk/eclipse-emf/debian/eclipse-pdebuild.mk 2007-06-05 21:04:50 UTC (rev 3596)
@@ -1,312 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2005 Ivan Dubrov <wfragg at gmail.com>
-# Description: Builds and cleans packages which use an Eclipse PDE Build
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-#
-# The file is modified by Stephan Michels<stephan.michels at gmail.com>
-
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_eclipse_pde
-_cdbs_class_eclipse_pde := 1
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-include $(_cdbs_rules_path)/debhelper.mk$(_cdbs_makefile_suffix)
-
-# Version of the upstream package
-DEB_UPSTREAM_VERSION=$(shell echo $(DEB_NOEPOCH_VERSION) | grep -o '^[^\-]*')
-
-
-# The home directory of the Java Runtime Environment (JRE) or Java Development
-# Kit (JDK). You can either directly set JAVA_HOME in debian/rules or set
-# JAVA_HOME_DIRS to multiple possible home directories. The first existing
-# directory from this list is used for JAVA_HOME. You can also override
-# JAVACMD in case you don't want to use the default JAVA_HOME/bin/java.
-JAVA_HOME = $(shell for jh in $(JAVA_HOME_DIRS); do if [ -d "$$jh" ]; then \
- echo $${jh}; exit 0; fi; done)
-JAVACMD = $(JAVA_HOME)/bin/java
-
-
-# Directory that contains additional plugins to be used during the build
-PDEBUILD_BASELOCATION ?= /usr/share/eclipse
-
-# Component of the package, which should be builded (required)
-PDEBUILD_COMPONENT ?=
-
-# PDE Build release engineering directory, with build.properties and
-# customTargets.xml
-PDEBUILD_BUILDER ?= $(PDEBUILD_COMPONENT)
-
-# Determine the most recent PDE Build scripts plugin version
-ifndef PDE_VERSION
-PDEBUILD_VERSION := $(shell ls $(PDEBUILD_BASELOCATION)/plugins/ | \
- grep "^org\.eclipse\.pde\.build_[[:digit:]]*\.[[:digit:]]*\.[[:digit:]]*$$" | \
- sed "s%org\.eclipse\.pde\.build_\(.*\)%\1%" | \
- sort -t. -k1,1 -k2,2 -k3,3 -n -r | head -n 1)
-endif
-
-# PDE Build scrips
-PDEBUILD_SCRIPTS ?= $(PDEBUILD_BASELOCATION)/plugins/org.eclipse.pde.build_$(PDEBUILD_VERSION)/scripts
-
-# PDE Build Ant script
-PDEBUILD_BUILDFILE ?= $(PDEBUILD_SCRIPTS)/build.xml
-
-# Eclipse temporary configuration store
-PDEBUILD_CONFIG ?= debian/tmp/configure
-
-# Eclipse temporary workspace
-PDEBUILD_DATA ?= debian/tmp/workspace
-
-# Directory where plugins are built. Should contain two subdirectories,
-# plugins and features. Each of these contains plugins and features that
-# are built.
-PDEBUILD_BUILDDIR ?= src
-
-#
-PDEBUILD_OPTS ?=
-
-#
-PDEBUILD_VMARGS ?=
-
-
-# Current plaform, which should be used to build the plugins
-ifeq ($(DEB_HOST_ARCH),i386)
- PDEBUILD_PLATFORM ?= x86
-endif
-ifeq ($(DEB_HOST_ARCH),ia64)
- PDEBUILD_PLATFORM ?= ia64
-endif
-ifeq ($(DEB_HOST_ARCH),amd64)
- PDEBUILD_PLATFORM ?= x86_64
-endif
-ifeq ($(DEB_HOST_ARCH),powerpc)
- PDEBUILD_PLATFORM ?= ppc
-endif
-ifeq ($(DEB_HOST_ARCH),s390)
- PDEBUILD_PLATFORM ?= s390
-endif
-
-
-# Protocol for the cvs repository of the releng package
-PDEBUILD_BUILDERPROTOCOL ?= pserver
-
-# Username for the cvs repository of the releng package
-PDEBUILD_BUILDERUSER ?= anonymous
-
-# Host of the cvs repository of the releng package
-PDEBUILD_BUILDERHOST ?= dev.eclipse.org
-
-# Repository path for the cvs repository of the releng package
-PDEBUILD_BUILDERREP ?= /cvsroot/tools
-
-# CVS root for the cvs repository of the releng package
-PDEBUILD_BUILDERROOT ?= :$(PDEBUILD_BUILDERPROTOCOL):$(PDEBUILD_BUILDERUSER)@$(PDEBUILD_BUILDERHOST):$(PDEBUILD_BUILDERREP)
-
-# CVS tag of the releng package
-PDEBUILD_BUILDERTAG ?= HEAD
-
-# Module name of the releng package (required)
-PDEBUILD_BUILDERPACKAGE ?=
-
-# Patch for the builder package
-PDEBUILD_BUILDERPATCH ?=
-
-
-# Protocol for the cvs repository of the maps package
-PDEBUILD_MAPSPROTOCOL ?= $(PDEBUILD_BUILDERPROTOCOL)
-
-# Username for the cvs repository of the maps package
-PDEBUILD_MAPSUSER ?= $(PDEBUILD_BUILDERUSER)
-
-# Host of the cvs repository of the maps package
-PDEBUILD_MAPSHOST ?= $(PDEBUILD_BUILDERHOST)
-
-# Repository path for the cvs repository of the maps package
-PDEBUILD_MAPSREP ?= $(PDEBUILD_BUILDERREP)
-
-# CVS root for the cvs repository of the maps package
-PDEBUILD_MAPSROOT ?= :$(PDEBUILD_MAPSPROTOCOL):$(PDEBUILD_MAPSUSER)@$(PDEBUILD_MAPSHOST):$(PDEBUILD_MAPSREP)
-
-# CVS tag of the releng package
-PDEBUILD_MAPSTAG ?= $(PDEBUILD_BUILDERTAG)
-
-# Module name of the maps package
-PDEBUILD_MAPSPACKAGE ?= $(PDEBUILD_BUILDERPACKAGE)
-
-
-# Build type of the release
-PDEBUILD_BUILDTYPE=R
-
-# Build identifier of the relase
-PDEBUILD_BUILDID=$(DEB_UPSTREAM_VERSION)
-
-# Build label of the release
-PDEBUILD_BUILDLABEL=$(PDEBUILD_BUILDTYPE).$(PDEBUILD_BUILDID)
-
-# Ant build script, which is used to build the plugins
-# Normally it is enough to use the standard build script, which comes
-# with the org.eclipse.pde.build plugin
-PDEBUILD_BUILDFILE ?= $(PDEBUILD_SCRIPTS)/build.xml
-
-# Property file for Ant, defaults to debian/ant.properties if it exists.
-# You may define additional properties that are referenced from build.xml so
-# you don't have to modify upstream's build.xml. Please note that command-line
-# arguments in ANT_ARGS (see below) override the settings in build.xml and
-# the property file.
-PDEBUILD_PROPERTYFILE = $(shell test -f $(CURDIR)/debian/ant.properties && echo $(CURDIR)/debian/ant.properties)
-
-PDEBUILD_ANT_COMPILER ?= org.eclipse.jdt.core.JDTCompilerAdapter
-
-# You can specify additional JVM arguments in ANT_OPTS and Ant command-line
-# arguments in ANT_ARGS, like for the Ant wrapper script and sepcified in
-# Ant's documentation ("Running Ant"). You can additionally define
-# ANT_ARGS_<package> for each individual package, e.g. to override the default
-# settings for compile.optimize.
-PDEBUILD_ECLIPSE_INVOKE = cd $(DEB_BUILDDIR) && \
- $(JAVACMD) $(PDEBUILD_VMARGS) \
- -Dgnu.gcj.precompiled.db.path=/var/lib/gcj-4.0/classmap.db \
- -jar $(PDEBUILD_BASELOCATION)/startup.jar \
- -launcher $(PDEBUILD_BASELOCATION)/eclipse \
- -install $(PDEBUILD_BASELOCATION) \
- -consoleLog \
- -data $(CURDIR)/$(PDEBUILD_DATA) \
- -configuration $(CURDIR)/$(PDEBUILD_CONFIG) \
- -application org.eclipse.ant.core.antRunner \
- -buildfile $(PDEBUILD_BUILDFILE) \
- -Dpde.build.scripts=$(PDEBUILD_SCRIPTS) \
- -Dcomponent=$(PDEBUILD_COMPONENT) \
- -Dbuilder=$(CURDIR)/$(PDEBUILD_BUILDER) \
- -DbuildDirectory=$(CURDIR)/$(PDEBUILD_BUILDDIR) \
- -DbaseLocation=$(PDEBUILD_BASELOCATION) \
- -DmapCvsRoot=$(PDEBUILD_MAPSROOT) \
- -DmapVersionTag=$(PDEBUILD_MAPSTAG) \
- -DbuildType=$(PDEBUILD_BUILDTYPE) \
- -DbuildId=$(PDEBUILD_BUILDID) \
- -DbuildLabel=$(PDEBUILD_BUILDLABEL) \
- -Dbuild.compiler=$(PDEBUILD_ANT_COMPILER) \
- -Djavacfailonerror=true \
- -DbuildingOSGi=true \
- $(if $(PDEBUILD_PROPERTYFILE),-propertyfile $(PDEBUILD_PROPERTYFILE),) \
- $(PDEBUILD_OPTS)
-
-# Targets to invoke for building, installing, testing and cleaning up.
-# Building uses the default target from build.xml, installing and testing is
-# only called if the corresponding variable is set. You can also specify
-# multiple targets for each step.
-PDEBUILD_FETCH_TARGET = preBuild fetch generate
-PDEBUILD_BUILD_TARGET = process assemble package postBuild
-PDEBUILD_CLEAN_TARGET = clean
-
-
-
-# Check JAVA_HOME and Eclipe SDK
-
-DEB_PHONY_RULES += eclipse-sanity-check
-eclipse-sanity-check:
- @if ! test -r "$(JAVA_HOME)"; then \
- echo "You must specify a valid JAVA_HOME or JAVACMD!"; \
- exit 1; \
- fi
- @if ! test -r "$(PDEBUILD_BASELOCATION)/plugins/org.eclipse.pde.build_$(PDEBUILD_VERSION)"; then \
- echo "You must specify a valid Eclipse SDK directory!"; \
- exit 1; \
- fi
-
-
-# Rule to fetch feature and plugins
-
-get-orig-source-clean::
- # clean source directories
- ls -I debian | rm -rf `xargs`
-
-get-orig-source-fetch:: eclipse-sanity-check get-orig-source-clean
- # checkout the builder package
- cvs -d $(PDEBUILD_BUILDERROOT) export -r $(PDEBUILD_BUILDERTAG) $(PDEBUILD_BUILDERPACKAGE)
- mv $(CURDIR)/$(PDEBUILD_BUILDERPACKAGE)/* $(CURDIR)
- rm -r $(CURDIR)/$(PDEBUILD_BUILDERPACKAGE)
-
- # Patch the builder package
- @if test -n "$(PDEBUILD_BUILDERPATCH)"; then \
- echo Patching builder with $(PDEBUILD_BUILDERPATCH); \
- patch -p0 -u <$(CURDIR)/$(PDEBUILD_BUILDERPATCH); \
- else \
- echo "PDEBUILD_BUILDERPATCH unset, skipping"; \
- fi
-
- # fetch plugins and features
- $(PDEBUILD_ECLIPSE_INVOKE) $(PDEBUILD_FETCH_TARGET)
- rm -r $(CURDIR)/debian/tmp
-
-get-orig-source:: get-orig-source-fetch
- dh_testdir
-
- # create orig tarball
- cd .. && \
- tar cfz $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz \
- --exclude=CVS --exclude=.svn --exclude=debian \
- $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)
-
-
-# Invoke PDE Build
-
-common-build-arch common-build-indep:: debian/stamp-pde-build eclipse-sanity-check
-
-debian/stamp-pde-build:
- dh_testdir
-
- # build features and plugins
- $(PDEBUILD_ECLIPSE_INVOKE) -DskipFetch=true $(PDEBUILD_BUILD_TARGET)
- rm -r $(CURDIR)/debian/tmp
-
- touch $@
-
-
-#common-install-arch common-install-indep:: debian/stamp-pde-install
-#
-#debian/stamp-pde-install: debian/stamp-pde-build
-# dh_testdir
-# dh_testroot
-#
-# # Install the zip file into our destination directory.
-# mkdir -p $(CURDIR)/debian/tmp
-# install -d debian/tmp/$(PDEBUILD_BASELOCATION)
-# unzip $(CURDIR)/$(PDEBUILD_BUILDDIR)/R*/*.zip -d debian/tmp/$(PDEBUILD_BASELOCATION)/..
-#
-# #dh_installdirs
-# #dh_install
-#
-# #rm -r $(CURDIR)/debian/tmp
-#
-# touch $@
-
-
-clean:: eclipse-sanity-check
- dh_testdir
-
- # invoke the clean target
- $(PDEBUILD_ECLIPSE_INVOKE) -DskipFetch=true $(PDEBUILD_CLEAN_TARGET)
- rm -r $(CURDIR)/debian/tmp
-
- rm -f debian/stamp-pde-build
-
-endif
-
Deleted: trunk/eclipse-emf/debian/patches/01-eclipse-emf-bootclasspath.patch
===================================================================
--- trunk/eclipse-emf/debian/patches/01-eclipse-emf-bootclasspath.patch 2007-06-05 21:02:45 UTC (rev 3595)
+++ trunk/eclipse-emf/debian/patches/01-eclipse-emf-bootclasspath.patch 2007-06-05 21:04:50 UTC (rev 3596)
@@ -1,19 +0,0 @@
-diff -r -u source-tree.orig/org.eclipse.emf.releng.build/sdk/build.properties source-tree/org.eclipse.emf.releng.build/sdk/build.properties
---- source-tree.orig/org.eclipse.emf.releng.build/sdk/build.properties 2005-12-17 01:59:07.000000000 +0100
-+++ source-tree/org.eclipse.emf.releng.build/sdk/build.properties 2005-12-17 01:59:26.000000000 +0100
-@@ -14,7 +14,7 @@
- basearch=x86
-
- # The wildcard is required so we can use different JDKs
--bootclasspath=${java.home}/lib/*.jar
-+#bootclasspath=${java.home}/lib/*.jar
-
- javacfailonerror=false
- javacVerbose=true
-@@ -24,4 +24,4 @@
- zipargs=
-
- collectingFolder=eclipse
--archivePrefix=eclipse
-\ Kein Zeilenumbruch am Dateiende.
-+archivePrefix=eclipse
Deleted: trunk/eclipse-emf/debian/patches/02-eclipse-emf-copyplatformdocs.patch
===================================================================
--- trunk/eclipse-emf/debian/patches/02-eclipse-emf-copyplatformdocs.patch 2007-06-05 21:02:45 UTC (rev 3595)
+++ trunk/eclipse-emf/debian/patches/02-eclipse-emf-copyplatformdocs.patch 2007-06-05 21:04:50 UTC (rev 3596)
@@ -1,23 +0,0 @@
-diff -u -r source-tree.orig/org.eclipse.emf.releng.build/sdk/customTargets.xml source-tree/org.eclipse.emf.releng.build/sdk/customTargets.xml
---- source-tree.orig/org.eclipse.emf.releng.build/sdk/customTargets.xml 2005-12-17 02:06:21.000000000 +0100
-+++ source-tree/org.eclipse.emf.releng.build/sdk/customTargets.xml 2005-12-17 02:11:29.000000000 +0100
-@@ -132,6 +132,9 @@
- <replace dir="${buildDirectory}/plugins" value="${timestamp}" token="@build@">
- <include name="**/about.mappings" />
- </replace>
-+
-+ <!-- Extract doc.zip so we can create links in the java doc -->
-+ <unzip overwrite="true" src="${baseLocation}/plugins/org.eclipse.platform.doc.isv_3.1.2/doc.zip" dest="${buildDirectory}/javadoc/platform" />
- </target>
-
- <!-- ===================================================================== -->
-@@ -191,9 +194,6 @@
- <antcall target="eclipseFileUnTarGz" />
-
- <stripVersions directory="${buildDirectory}/plugins" />
--
-- <!-- Extract doc.zip so we can create links in the java doc -->
-- <unzip overwrite="true" src="${buildDirectory}/plugins/org.eclipse.platform.doc.isv/doc.zip" dest="${buildDirectory}/plugins/org.eclipse.platform.doc.isv" />
- </target>
-
- <target name="eclipseFileUnTarGz" if="isEclipseFileTarGz">
Deleted: trunk/eclipse-emf/debian/patches/03-eclipse-emf-buildemf.patch
===================================================================
--- trunk/eclipse-emf/debian/patches/03-eclipse-emf-buildemf.patch 2007-06-05 21:02:45 UTC (rev 3595)
+++ trunk/eclipse-emf/debian/patches/03-eclipse-emf-buildemf.patch 2007-06-05 21:04:50 UTC (rev 3596)
@@ -1,12 +0,0 @@
-diff -u -r source-tree.orig/org.eclipse.emf.releng.build/sdk/customTargets.xml source-tree/org.eclipse.emf.releng.build/sdk/customTargets.xml
---- source-tree.orig/org.eclipse.emf.releng.build/sdk/customTargets.xml 2005-12-17 02:14:22.000000000 +0100
-+++ source-tree/org.eclipse.emf.releng.build/sdk/customTargets.xml 2005-12-17 02:15:51.000000000 +0100
-@@ -92,6 +92,8 @@
- <target name="preGenerate">
- <property name="emfBuilderDir" location="${buildDirectory}/../org.eclipse.emf.releng.build" />
- <echo message="emfBuilderDir: ${emfBuilderDir}" />
-+
-+ <ant dir="${emfBuilderDir}/org.eclipse.emf.build"/>
-
- <java classname="org.eclipse.emf.build.ChangeBundleClasspath"
- classpath="${emfBuilderDir}/org.eclipse.emf.build/emf.build.jar">
Added: trunk/eclipse-emf/debian/patches/eclipse-emf-addforceContextQualiferproperty.patch
===================================================================
--- trunk/eclipse-emf/debian/patches/eclipse-emf-addforceContextQualiferproperty.patch (rev 0)
+++ trunk/eclipse-emf/debian/patches/eclipse-emf-addforceContextQualiferproperty.patch 2007-06-05 21:04:50 UTC (rev 3596)
@@ -0,0 +1,15 @@
+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}"/>
Added: trunk/eclipse-emf/debian/patches/eclipse-emf-buildAll.patch
===================================================================
--- trunk/eclipse-emf/debian/patches/eclipse-emf-buildAll.patch (rev 0)
+++ trunk/eclipse-emf/debian/patches/eclipse-emf-buildAll.patch 2007-06-05 21:04:50 UTC (rev 3596)
@@ -0,0 +1,38 @@
+--- buildAll.xml 2007-02-23 17:16:28.000000000 -0500
++++ buildAll.xml 2007-02-23 17:17:32.000000000 -0500
+@@ -19,7 +19,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"/>
+@@ -38,7 +38,7 @@
+ <equals arg1="${baseos}.${basews}" arg2="linux.motif" />
+ </condition>
+
+- <property name="emfBuilderDir" location="${buildDirectory}/../org.eclipse.emf.releng.build" />
++ <property name="emfBuilderDir" location="${buildDirectory}/../.." />
+ </target>
+
+ <target name="create.label.properties" unless="label.properties.exists">
+@@ -119,6 +119,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"/>
Added: trunk/eclipse-emf/debian/patches/eclipse-emf-customTargets.xml.patch
===================================================================
--- trunk/eclipse-emf/debian/patches/eclipse-emf-customTargets.xml.patch (rev 0)
+++ trunk/eclipse-emf/debian/patches/eclipse-emf-customTargets.xml.patch 2007-06-05 21:04:50 UTC (rev 3596)
@@ -0,0 +1,29 @@
+diff -ur sdk/customTargets.xml sdk/customTargets.xml
+--- sdk/customTargets.xml 2007-02-23 17:01:56.000000000 -0500
++++ sdk/customTargets.xml 2007-02-23 17:02:52.000000000 -0500
+@@ -87,13 +87,14 @@
+ <!-- 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="emfBuilderDir: ${emfBuilderDir}" />
++ <echo message="bundlesDirectory: ${buildDirectory}/plugins" />
+
+ <java classname="org.eclipse.emf.build.ChangeBundleClasspath"
+ classpath="${emfBuilderDir}/org.eclipse.emf.build/emf.build_jdk14.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>
+
+@@ -139,7 +140,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}" />
Added: trunk/eclipse-emf/debian/patches/eclipse-emf-examples-dontChangeBundleClasspath.patch
===================================================================
--- trunk/eclipse-emf/debian/patches/eclipse-emf-examples-dontChangeBundleClasspath.patch (rev 0)
+++ trunk/eclipse-emf/debian/patches/eclipse-emf-examples-dontChangeBundleClasspath.patch 2007-06-05 21:04:50 UTC (rev 3596)
@@ -0,0 +1,15 @@
+--- examples/customTargets.xml 2007-02-23 17:18:15.000000000 -0500
++++ examples/customTargets.xml 2007-02-23 17:18:32.000000000 -0500
+@@ -85,12 +85,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_jdk14.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">
Added: trunk/eclipse-emf/debian/patches/eclipse-emf-javadoc.patch
===================================================================
--- trunk/eclipse-emf/debian/patches/eclipse-emf-javadoc.patch (rev 0)
+++ trunk/eclipse-emf/debian/patches/eclipse-emf-javadoc.patch 2007-06-05 21:04:50 UTC (rev 3596)
@@ -0,0 +1,83 @@
+diff -ur 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
+--- src/eclipse/plugins/org.eclipse.emf.doc/build/antJavadoc.sh 2007-02-23 16:50:08.000000000 -0500
++++ src/eclipse/plugins/org.eclipse.emf.doc/build/antJavadoc.sh 2007-02-23 16:52:24.000000000 -0500
+@@ -104,7 +104,7 @@
+ ant -f javadoc.xml \
+ -DdestDir="$destDir" \
+ -Dclasspath="$classpath" \
+- -DeclipseDir="$eclipseDir" \
++ -DeclipseDir="../../../../../../SDK" \
+ -Doverview="$eclipseDir/plugins/org.eclipse.emf.doc/build/overview.html"
+ # Generate topics_Reference.xml (replacement for doclet).
+ trXML=$currentPath"/../topics_Reference.xml";
+diff -ur 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
+--- src/eclipse/plugins/org.eclipse.emf.doc/build/javadoc.xml.template 2007-02-23 16:50:08.000000000 -0500
++++ src/eclipse/plugins/org.eclipse.emf.doc/build/javadoc.xml.template 2007-02-23 16:56:21.000000000 -0500
+@@ -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.2.R32x_v20070115.jar" dest="${javadoc.link.location}/platform/"/>
+ </target>
+
+ <target name="javadoc" depends="extractPlatformJavadoc">
+diff -ur 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
+--- src/eclipse/plugins/org.eclipse.emf.ecore.sdo.doc/build/antJavadoc.sh 2007-02-23 16:50:08.000000000 -0500
++++ src/eclipse/plugins/org.eclipse.emf.ecore.sdo.doc/build/antJavadoc.sh 2007-02-23 16:56:39.000000000 -0500
+@@ -73,5 +73,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 -ur 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
+--- src/eclipse/plugins/org.eclipse.emf.ecore.sdo.doc/build/javadoc.xml.template 2007-02-23 16:50:08.000000000 -0500
++++ src/eclipse/plugins/org.eclipse.emf.ecore.sdo.doc/build/javadoc.xml.template 2007-02-23 16:57:22.000000000 -0500
+@@ -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.2.R32x_v20070115.jar" dest="${javadoc.link.location}/platform/"/>
+ </target>
+
+ <target name="javadoc" depends="extractPlatformJavadoc">
+diff -ur 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
+--- src/eclipse/plugins/org.eclipse.xsd.doc/build/antJavadoc.sh 2007-02-23 16:50:08.000000000 -0500
++++ src/eclipse/plugins/org.eclipse.xsd.doc/build/antJavadoc.sh 2007-02-23 16:57:40.000000000 -0500
+@@ -79,5 +79,5 @@
+ ant -f javadoc.xml \
+ -DdestDir="$destDir" \
+ -Dclasspath="$classpath" \
+- -DeclipseDir="$eclipseDir" \
++ -DeclipseDir="../../../../../../SDK" \
+ -Doverview="$eclipseDir/plugins/org.eclipse.xsd.doc/build/overview.html"
+diff -ur 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
+--- src/eclipse/plugins/org.eclipse.xsd.doc/build/javadoc.xml.template 2007-02-23 16:50:08.000000000 -0500
++++ src/eclipse/plugins/org.eclipse.xsd.doc/build/javadoc.xml.template 2007-02-23 16:58:21.000000000 -0500
+@@ -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.2.R32x_v20070115.jar" dest="${javadoc.link.location}/platform/"/>
+ </target>
+
+ <target name="javadoc" depends="extractPlatformJavadoc">
Added: trunk/eclipse-emf/debian/patches/eclipse-emf-nobootclasspath.patch
===================================================================
--- trunk/eclipse-emf/debian/patches/eclipse-emf-nobootclasspath.patch (rev 0)
+++ trunk/eclipse-emf/debian/patches/eclipse-emf-nobootclasspath.patch 2007-06-05 21:04:50 UTC (rev 3596)
@@ -0,0 +1,57 @@
+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">
More information about the pkg-java-commits
mailing list