r2054 - in trunk/eclipse-ve/debian: . patches

Stephan Michels tashiro-guest at costa.debian.org
Sun Apr 23 05:17:15 UTC 2006


Author: tashiro-guest
Date: 2006-04-23 05:17:12 +0000 (Sun, 23 Apr 2006)
New Revision: 2054

Added:
   trunk/eclipse-ve/debian/eclipse-pdebuild.mk
Modified:
   trunk/eclipse-ve/debian/patches/eclipse-ve-patch-jemutil.patch
   trunk/eclipse-ve/debian/patches/eclipse-ve-perfmsr.jar.patch
   trunk/eclipse-ve/debian/patches/eclipse-ve-swtprint.patch
   trunk/eclipse-ve/debian/rules
Log:
Using eclipse pdebuild cdbs script.
Added targets to fetch additional stuff.


Added: trunk/eclipse-ve/debian/eclipse-pdebuild.mk
===================================================================
--- trunk/eclipse-ve/debian/eclipse-pdebuild.mk	2006-04-18 22:36:52 UTC (rev 2053)
+++ trunk/eclipse-ve/debian/eclipse-pdebuild.mk	2006-04-23 05:17:12 UTC (rev 2054)
@@ -0,0 +1,322 @@
+# -*- 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
+
+fetch-clean::
+	# clean source directories
+	ls -I debian | rm -rf `xargs`
+
+common-fetch-arch:: testdir eclipse-sanity-check fetch-clean
+common-fetch-indep:: testdir eclipse-sanity-check fetch-clean
+common-fetch:: common-fetch-arch common-fetch-indep
+	# 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
+
+
+$(patsubst %,fetch/%,$(DEB_ARCH_PACKAGES)) :: fetch/% : common-fetch
+$(patsubst %,fetch/%,$(DEB_INDEP_PACKAGES)) :: fetch/% : common-fetch
+
+common-post-fetch-arch:: common-fetch-arch $(patsubst %,fetch/%,$(DEB_ARCH_PACKAGES))
+common-post-fetch-indep:: common-fetch-indep $(patsubst %,fetch/%,$(DEB_INDEP_PACKAGES))
+
+common-post-fetch:: common-post-fetch-arch common-post-fetch-indep
+	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)
+
+get-orig-source:: common-post-fetch
+
+# 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
+

Modified: trunk/eclipse-ve/debian/patches/eclipse-ve-patch-jemutil.patch
===================================================================
--- trunk/eclipse-ve/debian/patches/eclipse-ve-patch-jemutil.patch	2006-04-18 22:36:52 UTC (rev 2053)
+++ trunk/eclipse-ve/debian/patches/eclipse-ve-patch-jemutil.patch	2006-04-23 05:17:12 UTC (rev 2054)
@@ -1,5 +1,5 @@
---- source-tree/org.eclipse.ve.releng.builder/sdk/customTargets.xml.orig	2005-12-19 01:23:10.000000000 +0100
-+++ source-tree/org.eclipse.ve.releng.builder/sdk/customTargets.xml	2005-12-19 01:26:55.000000000 +0100
+--- sdk/customTargets.xml.orig	2005-12-19 01:23:10.000000000 +0100
++++ sdk/customTargets.xml	2005-12-19 01:26:55.000000000 +0100
 @@ -102,6 +102,8 @@
  <!-- Steps to do after generating the build scripts -->
  <!-- ===================================================================== -->

Modified: trunk/eclipse-ve/debian/patches/eclipse-ve-perfmsr.jar.patch
===================================================================
--- trunk/eclipse-ve/debian/patches/eclipse-ve-perfmsr.jar.patch	2006-04-18 22:36:52 UTC (rev 2053)
+++ trunk/eclipse-ve/debian/patches/eclipse-ve-perfmsr.jar.patch	2006-04-23 05:17:12 UTC (rev 2054)
@@ -1,5 +1,5 @@
---- source-tree/org.eclipse.ve.releng.builder/src/eclipse/plugins/org.eclipse.jem.util/build.xml.orig	2005-12-19 01:20:41.000000000 +0100
-+++ source-tree/org.eclipse.ve.releng.builder/src/eclipse/plugins/org.eclipse.jem.util/build.xml	2005-12-19 01:21:20.000000000 +0100
+--- src/plugins/org.eclipse.jem.util/build.xml.orig	2005-12-19 01:20:41.000000000 +0100
++++ src/plugins/org.eclipse.jem.util/build.xml	2005-12-19 01:21:20.000000000 +0100
 @@ -68,6 +68,7 @@
  				<pathelement path="../../../../../../../../../../../usr/lib/eclipse/plugins/org.eclipse.emf.ecore_2.1.0.jar"/>
  				<pathelement path="../../../../../../../../../../../usr/lib/eclipse/plugins/org.eclipse.emf.common_2.1.0.jar"/>

Modified: trunk/eclipse-ve/debian/patches/eclipse-ve-swtprint.patch
===================================================================
--- trunk/eclipse-ve/debian/patches/eclipse-ve-swtprint.patch	2006-04-18 22:36:52 UTC (rev 2053)
+++ trunk/eclipse-ve/debian/patches/eclipse-ve-swtprint.patch	2006-04-23 05:17:12 UTC (rev 2054)
@@ -1,5 +1,5 @@
---- source-tree/org.eclipse.ve.releng.builder/src/swt-gtk-print/swt-gtk-print.c.orig	2005-12-21 10:43:37.000000000 +0100
-+++ source-tree/org.eclipse.ve.releng.builder/src/swt-gtk-print/swt-gtk-print.c	2005-12-21 10:44:03.000000000 +0100
+--- src/swt-gtk-print/swt-gtk-print.c.orig	2005-12-21 10:43:37.000000000 +0100
++++ src/swt-gtk-print/swt-gtk-print.c	2005-12-21 10:44:03.000000000 +0100
 @@ -495,12 +495,12 @@
  	GdkImage* image = NULL;
  	if(pm!=NULL){

Modified: trunk/eclipse-ve/debian/rules
===================================================================
--- trunk/eclipse-ve/debian/rules	2006-04-18 22:36:52 UTC (rev 2053)
+++ trunk/eclipse-ve/debian/rules	2006-04-23 05:17:12 UTC (rev 2054)
@@ -1,218 +1,54 @@
 #!/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
 
-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 '^[^\-]*')
+PDEBUILD_BUILDERHOST=dev.eclipse.org
+PDEBUILD_BUILDERREP=/cvsroot/tools
+PDEBUILD_BUILDERTAG=R_1_1_0_1
+PDEBUILD_BUILDERPACKAGE=org.eclipse.ve.releng.builder
+#PDEBUILD_BUILDERPATCH=debian/eclipse-emf-releng.patch
 
-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=R_1_1_0_1
-PDEBUILD_PACKAGE=org.eclipse.ve.releng.builder
-
-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=-DbaseExists=true -DemfExists=true -DgefExists=true
 
-PDEBUILD_SCRIPTS=$(PDEBUILD_BASELOCATION)/plugins/org.eclipse.pde.build_3.1.0/scripts
-
-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_MAPSTAG=R_1_1_0_1
 PDEBUILD_MAPSPACKAGE=org.eclipse.ve.releng
-PDEBUILD_MAPVERSIONTAG=R_1_1_0_1
 
-PDEBUILD_BUILDTYPE=R
-PDEBUILD_BUILDID=$(UPSTREAM_VERSION)
-PDEBUILD_BUILDLABEL=$(PDEBUILD_BUILDTYPE).$(PDEBUILD_BUILDID)
 
-PATCHES = \
-	eclipse-ve-patch-jemutil \
-	eclipse-ve-swtprint
-
-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
-#	if test -e $(CURDIR)/debian/patches/$(SOURCE_PACKAGE)-releng.patch; then \
-#		cd $(SOURCE_TREE)/$(PDEBUILD_PACKAGE); \
-#		patch -p0 -u <$(CURDIR)/debian/patches/$(SOURCE_PACKAGE)-releng.patch; \
-#	fi;
-
-	# 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
-
+fetch/eclipse-ve:: 
 	# fetch the sources of libswt-gtk-print
-	cd $(SOURCE_TREE)/$(PDEBUILD_PACKAGE)/src && \
-	cvs -d $(PDEBUILD_CVSROOT) co -d native-src org.eclipse.ve.swt/native-src && \
+	cd src && \
+	cvs -d $(PDEBUILD_BUILDERROOT) co -d native-src org.eclipse.ve.swt/native-src && \
 	unzip native-src/swt-gtk-print-src.zip && \
 	rm -rf native-src swt-gtk-print/libswt-gtk-print.so swt-gtk-print/bits64/libswt-gtk-print.so
 
-	# 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="linux,gtk,$(PDEBUILD_PLATFORM)" 
-
-#		-Dbaseos=linux -Dbasews=gtk -Dbasearch=$(PDEBUILD_PLATFORM)
-
+build/eclipse-ve::
 	# build libswt-gtk-print
-	cd $(SOURCE_TREE)/$(PDEBUILD_PACKAGE)/src/swt-gtk-print && \
+	cd src/swt-gtk-print && \
 	$(MAKE)
 
-	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 -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
+
+	rm -r $(CURDIR)/debian/tmp
+
 	# Replace the libswt-gtk-print by the builded version
 	cd debian/tmp/$(PDEBUILD_BASELOCATION)/plugins/org.eclipse.ve.swt_$(UPSTREAM_VERSION)/os/linux/ && \
 	rm -rf * && \
@@ -220,41 +56,14 @@
 	cp $(CURDIR)/$(SOURCE_TREE)/$(PDEBUILD_PACKAGE)/src/swt-gtk-print/libswt-gtk-print.so $(PDEBUILD_PLATFORM)/ && \
 	mkdir -p $(CURDIR)/debian/tmp/usr/lib/jni && \
 	cp $(CURDIR)/$(SOURCE_TREE)/$(PDEBUILD_PACKAGE)/src/swt-gtk-print/libswt-gtk-print.so $(CURDIR)/debian/tmp/usr/lib/jni/
+        # TODO: Copy the 64bit version for 64bit platforms
 
-	# TODO: Copy the 64bit version for 64bit platforms
-	
-	dh_installdirs
-	dh_install
+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 $(CURDIR)/$(PDEBUILD_BUILDDIR)/R*/*.zip
 
-	touch install-stamp
-	
 
-binary-indep: install
-	# Nothing to do here.
-	
-
-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
-	
-
-binary: binary-indep binary-arch
-




More information about the pkg-java-commits mailing list