Author: tashiro-guest Date: 2006-04-17 12:19:00 +0000 (Mon, 17 Apr 2006) New Revision: 2046
Added: 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 Removed: trunk/eclipse-emf/debian/patches/eclipse-emf-bootclasspath.patch trunk/eclipse-emf/debian/patches/eclipse-emf-buildemf.patch trunk/eclipse-emf/debian/patches/eclipse-emf-copyplatformdocs.patch trunk/eclipse-emf/debian/patches/eclipse-emf-releng.patch Modified: trunk/eclipse-emf/debian/control trunk/eclipse-emf/debian/rules Log: Using a modified cdbs script from the eclipse-pdebuild project. Modified: trunk/eclipse-emf/debian/control =================================================================== --- trunk/eclipse-emf/debian/control 2006-04-03 20:41:53 UTC (rev 2045) +++ trunk/eclipse-emf/debian/control 2006-04-17 12:19:00 UTC (rev 2046) @@ -3,7 +3,7 @@ Priority: optional Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> Uploaders: Stephan Michels <[EMAIL PROTECTED]> -Build-Depends: debhelper (>> 4.2), eclipse (>= 3.1.1-5) +Build-Depends: debhelper (>> 4.2), eclipse (>= 3.1.1-5), cdbs Build-Conflicts: eclipse-emf Standards-Version: 3.6.2 Added: trunk/eclipse-emf/debian/eclipse-emf-releng.patch =================================================================== --- trunk/eclipse-emf/debian/eclipse-emf-releng.patch 2006-04-03 20:41:53 UTC (rev 2045) +++ trunk/eclipse-emf/debian/eclipse-emf-releng.patch 2006-04-17 12:19:00 UTC (rev 2046) @@ -0,0 +1,32 @@ +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-pdebuild.mk =================================================================== --- trunk/eclipse-emf/debian/eclipse-pdebuild.mk 2006-04-03 20:41:53 UTC (rev 2045) +++ trunk/eclipse-emf/debian/eclipse-pdebuild.mk 2006-04-17 12:19:00 UTC (rev 2046) @@ -0,0 +1,312 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2005 Ivan Dubrov <[EMAIL PROTECTED]> +# 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<[EMAIL PROTECTED]> + + +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 + Added: trunk/eclipse-emf/debian/patches/01-eclipse-emf-bootclasspath.patch =================================================================== --- trunk/eclipse-emf/debian/patches/01-eclipse-emf-bootclasspath.patch 2006-04-03 20:41:53 UTC (rev 2045) +++ trunk/eclipse-emf/debian/patches/01-eclipse-emf-bootclasspath.patch 2006-04-17 12:19:00 UTC (rev 2046) @@ -0,0 +1,19 @@ +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 Added: trunk/eclipse-emf/debian/patches/02-eclipse-emf-copyplatformdocs.patch =================================================================== --- trunk/eclipse-emf/debian/patches/02-eclipse-emf-copyplatformdocs.patch 2006-04-03 20:41:53 UTC (rev 2045) +++ trunk/eclipse-emf/debian/patches/02-eclipse-emf-copyplatformdocs.patch 2006-04-17 12:19:00 UTC (rev 2046) @@ -0,0 +1,23 @@ +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"> Added: trunk/eclipse-emf/debian/patches/03-eclipse-emf-buildemf.patch =================================================================== --- trunk/eclipse-emf/debian/patches/03-eclipse-emf-buildemf.patch 2006-04-03 20:41:53 UTC (rev 2045) +++ trunk/eclipse-emf/debian/patches/03-eclipse-emf-buildemf.patch 2006-04-17 12:19:00 UTC (rev 2046) @@ -0,0 +1,12 @@ +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"> Deleted: trunk/eclipse-emf/debian/patches/eclipse-emf-bootclasspath.patch =================================================================== --- trunk/eclipse-emf/debian/patches/eclipse-emf-bootclasspath.patch 2006-04-03 20:41:53 UTC (rev 2045) +++ trunk/eclipse-emf/debian/patches/eclipse-emf-bootclasspath.patch 2006-04-17 12:19:00 UTC (rev 2046) @@ -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/eclipse-emf-buildemf.patch =================================================================== --- trunk/eclipse-emf/debian/patches/eclipse-emf-buildemf.patch 2006-04-03 20:41:53 UTC (rev 2045) +++ trunk/eclipse-emf/debian/patches/eclipse-emf-buildemf.patch 2006-04-17 12:19:00 UTC (rev 2046) @@ -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"> Deleted: trunk/eclipse-emf/debian/patches/eclipse-emf-copyplatformdocs.patch =================================================================== --- trunk/eclipse-emf/debian/patches/eclipse-emf-copyplatformdocs.patch 2006-04-03 20:41:53 UTC (rev 2045) +++ trunk/eclipse-emf/debian/patches/eclipse-emf-copyplatformdocs.patch 2006-04-17 12:19:00 UTC (rev 2046) @@ -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.1/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/eclipse-emf-releng.patch =================================================================== --- trunk/eclipse-emf/debian/patches/eclipse-emf-releng.patch 2006-04-03 20:41:53 UTC (rev 2045) +++ trunk/eclipse-emf/debian/patches/eclipse-emf-releng.patch 2006-04-17 12:19:00 UTC (rev 2046) @@ -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 --> Modified: trunk/eclipse-emf/debian/rules =================================================================== --- trunk/eclipse-emf/debian/rules 2006-04-03 20:41:53 UTC (rev 2045) +++ trunk/eclipse-emf/debian/rules 2006-04-17 12:19:00 UTC (rev 2046) @@ -1,245 +1,46 @@ #!/usr/bin/make -f +# debian/rules file using cdbs -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include debian/eclipse-pdebuild.mk -export LC_ALL=C -CURDIR=$(shell pwd) +#JAVA_HOME := /usr/lib/jvm/java-gcj +#JAVA_HOME := /usr/lib/kaffe +JAVA_HOME := /usr/lib/jvm/cacao +JAVACMD := JAVA_HOME=$(JAVA_HOME) /usr/bin/cacao -Xmx256m +ANT_HOME := /usr/share/ant +DEB_ANT_ARGS := -Dcompiler=javac1.5 +PDEBUILD_BUILDERHOST=dev.eclipse.org +PDEBUILD_BUILDERREP=/cvsroot/tools +PDEBUILD_BUILDERTAG=build_200509281310 +PDEBUILD_BUILDERPACKAGE=org.eclipse.emf.releng.build +PDEBUILD_BUILDERPATCH=debian/eclipse-emf-releng.patch -SOURCE_PACKAGE=$(shell head -1 debian/changelog | grep -o '^[^\ ]*') -SOURCE_VERSION=$(shell head -1 debian/changelog | sed -e 's/^.*(\(.*\)).*$$/\1/') -UPSTREAM_VERSION=$(shell echo $(SOURCE_VERSION) | grep -o '^[^\-]*') - -SOURCE=upstream/$(SOURCE_PACKAGE)-$(UPSTREAM_VERSION).tar.gz -SOURCE_TREE=source-tree -JAVA_HOME=/usr/lib/jvm/java-gcj -JAVA_RUN=$(JAVA_HOME)/bin/java -Dgnu.gcj.precompiled.db.path=/var/lib/gcj-4.0/classmap.db -ANT_RUN=ant -homedir=$(CURDIR)/home - -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 - - -PDEBUILD_CVSREADPROTOCOL=pserver -PDEBUILD_CVSREADUSER=anonymous -PDEBUILD_CVSHOST=dev.eclipse.org -PDEBUILD_CVSREP=/cvsroot/tools -PDEBUILD_CVSROOT=:$(PDEBUILD_CVSREADPROTOCOL):$(PDEBUILD_CVSREADUSER)@$(PDEBUILD_CVSHOST):$(PDEBUILD_CVSREP) -PDEBUILD_CVSTAG=build_200509281310 -PDEBUILD_PACKAGE=org.eclipse.emf.releng.build - -PDEBUILD_BASELOCATION=/usr/lib/eclipse PDEBUILD_COMPONENT=sdk -PDEBUILD_BUILDER=$(CURDIR)/$(SOURCE_TREE)/$(PDEBUILD_PACKAGE)/$(PDEBUILD_COMPONENT) -PDEBUILD_CONFIG=../../debian/tmp/configure -PDEBUILD_DATA=../../debian/tmp/workspace -PDEBUILD_BUILDDIR=$(CURDIR)/$(SOURCE_TREE)/$(PDEBUILD_PACKAGE)/src/eclipse +#PDEBUILD_BUILDDIR=$(CURDIR)/$(SOURCE_TREE)/$(PDEBUILD_PACKAGE)/src/eclipse PDEBUILD_OPTS=-DbuildAlias=2.1.1 -DemfBuilderDir=$(CURDIR)/$(SOURCE_TREE)/$(PDEBUILD_PACKAGE) -DbaseExists=true -PDEBUILD_SCRIPTS=$(PDEBUILD_BASELOCATION)/plugins/org.eclipse.pde.build_3.1.0/scripts +PDEBUILD_MAPSTAG=build_200509281310 -PDEBUILD_MAPSREADPROTOCOL=$(PDEBUILD_CVSREADPROTOCOL) -PDEBUILD_MAPSREADUSER=$(PDEBUILD_CVSREADUSER) -PDEBUILD_MAPSHOST=$(PDEBUILD_CVSHOST) -PDEBUILD_MAPSREP=$(PDEBUILD_CVSREP) -PDEBUILD_MAPSROOT=:$(PDEBUILD_MAPSREADPROTOCOL):$(PDEBUILD_MAPSREADUSER)@$(PDEBUILD_MAPSHOST):$(PDEBUILD_MAPSREP) -PDEBUILD_MAPSPACKAGE=$(PDEBUILD_PACKAGE) -PDEBUILD_MAPVERSIONTAG=build_200509281310 -PDEBUILD_BUILDTYPE=R -PDEBUILD_BUILDID=$(UPSTREAM_VERSION) -PDEBUILD_BUILDLABEL=$(PDEBUILD_BUILDTYPE).$(PDEBUILD_BUILDID) - - -PATCHES = \ - eclipse-emf-bootclasspath \ - eclipse-emf-copyplatformdocs \ - eclipse-emf-buildemf - -get-orig-source: clean - dh_testdir - - # create source directory - mkdir -p $(SOURCE_TREE) - - # checkout releng package - cd $(SOURCE_TREE) && \ - cvs -d $(PDEBUILD_CVSROOT) co -r $(PDEBUILD_CVSTAG) $(PDEBUILD_PACKAGE) - - # Patch releng plugin - test -e $(CURDIR)/debian/patches/$(SOURCE_PACKAGE)-releng.patch && \ - cd $(SOURCE_TREE)/$(PDEBUILD_PACKAGE) && \ - patch -p0 -u <$(CURDIR)/debian/patches/$(SOURCE_PACKAGE)-releng.patch - - #exit 1 - - # fetch plugins and features - cd $(SOURCE_TREE)/$(PDEBUILD_PACKAGE) && \ - $(JAVA_RUN) -jar $(PDEBUILD_BASELOCATION)/startup.jar \ - -application org.eclipse.ant.core.antRunner \ - -DbaseLocation=$(PDEBUILD_BASELOCATION) \ - -Dpde.build.scripts=$(PDEBUILD_SCRIPTS) \ - -Dcomponent=$(PDEBUILD_COMPONENT) \ - -Dbuilder=$(PDEBUILD_BUILDER) \ - -DbuildDirectory=$(PDEBUILD_BUILDDIR) \ - -DmapCvsRoot=$(PDEBUILD_MAPSROOT) \ - -DmapVersionTag=$(PDEBUILD_MAPVERSIONTAG) \ - -DbuildType=$(PDEBUILD_BUILDTYPE) \ - -DbuildId=$(PDEBUILD_BUILDID) \ - -DbuildLabel=$(PDEBUILD_BUILDLABEL) \ - $(PDEBUILD_OPTS) \ - -f $(PDEBUILD_SCRIPTS)/build.xml \ - preBuild fetch - - # pack sources in upstream - mkdir -p upstream - cd $(SOURCE_TREE) && \ - tar cfz ../$(SOURCE) $(PDEBUILD_PACKAGE) - - # create orig tarball - cd .. && \ - tar cfz $(SOURCE_PACKAGE)_$(UPSTREAM_VERSION).orig.tar.gz $(SOURCE_PACKAGE)-$(UPSTREAM_VERSION)/$(SOURCE) - -clean: - dh_testdir - - rm -rf $(SOURCE_TREE) $(homedir) debian/tmp debian/$(SOURCE_PACKAGE) - rm -f *-stamp - dh_clean - -uncompress: uncompress-stamp -uncompress-stamp: debian/control - dh_testdir - - # The building happens inside the source-tree directory. This makes - # cleanup much easier. - mkdir -p $(SOURCE_TREE) - cd $(SOURCE_TREE) && \ - tar xzf ../$(SOURCE) > /dev/null - - touch uncompress-stamp - -patch: patch-stamp -patch-stamp: uncompress-stamp - dh_testdir - - # This patch system was orginally copied off of the one found in cdbs. - @cd $(SOURCE_TREE)/$(PDEBUILD_PACKAGE); \ - test $$(find $(CURDIR)/debian/patches/ -maxdepth 1 -name '*.patch' | wc -l) -eq 0 && exit 0; \ - for patchname in $(PATCHES); do \ - patch=$(CURDIR)/debian/patches/$$patchname.patch; \ - success=""; \ - echo -n "trying patch $$patchname at level "; \ - for level in 0 1 2 3; do \ - if test -z "$$success"; then \ - echo -n "$$level..."; \ - if patch -f -p$$level -E --dry-run < $$patch > /dev/null 2>&1; then \ - if patch -f -p$$level -E -V never < $$patch > /dev/null 2>&1; then \ - success=yes; \ - echo "success."; \ - fi; \ - fi; \ - fi; \ - done; \ - if test -z "$$success"; then \ - echo "failure."; \ - exit 1; \ - fi; \ - done - - touch patch-stamp - - -build: build-stamp -build-stamp: patch-stamp - dh_testdir - - # Create home. - mkdir home - - # Call eclipse headless to process releng build scripts - cd $(SOURCE_TREE)/$(PDEBUILD_PACKAGE) && \ - $(JAVA_RUN) -jar $(PDEBUILD_BASELOCATION)/startup.jar \ - -application org.eclipse.ant.core.antRunner \ - -DbaseLocation=$(PDEBUILD_BASELOCATION) \ - -Dpde.build.scripts=$(PDEBUILD_SCRIPTS) \ - -Dcomponent=$(PDEBUILD_COMPONENT) \ - -Dbuilder=$(PDEBUILD_BUILDER) \ - -DbuildDirectory=$(PDEBUILD_BUILDDIR) \ - -DmapCvsRoot=$(PDEBUILD_MAPSROOT) \ - -DmapVersionTag=$(PDEBUILD_MAPVERSIONTAG) \ - -DbuildType=$(PDEBUILD_BUILDTYPE) \ - -DbuildId=$(PDEBUILD_BUILDID) \ - -DbuildLabel=$(PDEBUILD_BUILDLABEL) \ - $(PDEBUILD_OPTS) \ - -DskipFetch=true \ - -DskipBuildSourceDrop=true \ - -Djavacfailonerror=true \ - -DbuildingOSGi=true - -# -Dconfigs="*,*,*" \ - -# -Dconfigs="linux,gtk,$(ECLIPSE_PLATFORM)" \ -# -Dbaseos=linux -Dbasews=gtk -Dbasearch=$(ECLIPSE_PLATFORM) - - touch build-stamp - - -install: install-stamp -install-stamp: build - dh_testdir - dh_testroot - +install/eclipse-emf:: # Install the zip file into our destination directory. + mkdir -p debian/tmp install -d debian/tmp/$(PDEBUILD_BASELOCATION) - unzip $(PDEBUILD_BUILDDIR)/R*/*.zip -d debian/tmp/$(PDEBUILD_BASELOCATION)/.. + unzip $(CURDIR)/$(PDEBUILD_BUILDDIR)/R*/*.zip -d debian/tmp/$(PDEBUILD_BASELOCATION)/.. - dh_installdirs - dh_install - - touch install-stamp - + dh_installdirs -p$(cdbs_curpkg) usr/share/eclipse/features usr/share/eclipse/plugins + dh_install -p$(cdbs_curpkg) debian/tmp/usr/share/eclipse/features/* usr/share/eclipse/features + dh_install -p$(cdbs_curpkg) debian/tmp/usr/share/eclipse/plugins/* usr/share/eclipse/plugins -binary-indep: install - # Nothing to do here. - + rm -r $(CURDIR)/debian/tmp -binary-arch: install - dh_testdir -a - dh_testroot -a - - dh_installdocs -a - dh_installexamples -a - dh_installmenu -a - dh_installman -a - dh_installinfo -a - dh_installchangelogs -a - dh_link -a - dh_fixperms -a - - dh_strip -a - dh_compress -a - dh_shlibdeps -a - dh_makeshlibs -a - dh_installdeb -a - dh_gencontrol -a - dh_md5sums -a - dh_builddeb -a - +clean:: + -rm -rf src/javadoc + -find src/plugins/* -name "*src.zip" -exec rm {} ";" + -find src/plugins/* -name "doc.zip" -exec rm {} ";" + -find src/plugins/* -name "index" -exec rm -rf {} ";" + -find src/plugins/* -name "doc-files" -exec rm -rf {} ";" + -rm src/R.2.1.1/emf-sdo-xsd-SDK-2.1.1.zip -binary: binary-indep binary-arch _______________________________________________ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits