CVS eclipse-ve/debian

Stephan Michels tashiro-guest at haydn.debian.org
Sat Dec 17 20:55:32 UTC 2005 

Update of /cvsroot/pkg-java/eclipse-ve/debian
In directory haydn:/tmp/cvs-serv25608/debian

Modified Files:
	control rules 
Log Message:
Synchronization of the rules with gef and emf


--- /cvsroot/pkg-java/eclipse-ve/debian/control	2005/12/17 16:52:09	1.1
+++ /cvsroot/pkg-java/eclipse-ve/debian/control	2005/12/17 20:55:32	1.2
@@ -3,12 +3,13 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Stephan Michels <stephan at apache.org>
-Build-Depends: debhelper (>> 4.2), eclipse (>= 3.1.1-5)
+Build-Depends: debhelper (>> 4.2), eclipse (>= 3.1.1-5), eclipse-emf, eclipse-gef
+Build-Conflicts: eclipse-ve
 Standards-Version: 3.6.2
 
 Package: eclipse-ve
 Architecture: any
-Depends: eclipse-pde, eclipse-emf, eclipse-gef
+Depends: eclipse, eclipse-emf, eclipse-gef
 Description: The Eclipse Visual Editor
  The Eclipse Visual Editor project is a vendor-neutral, open development 
  platform supplying frameworks for creating GUI builders, and exemplary, 
--- /cvsroot/pkg-java/eclipse-ve/debian/rules	2005/12/17 16:52:09	1.1
+++ /cvsroot/pkg-java/eclipse-ve/debian/rules	2005/12/17 20:55:32	1.2
@@ -16,23 +16,37 @@
 JAVA_RUN=$(JAVA_HOME)/bin/java -Dgnu.gcj.precompiled.db.path=/var/lib/gcj-4.0/classmap.db
 ANT_RUN=ant
 homedir=$(CURDIR)/home
-ECLIPSE_BASE=/usr/lib/eclipse
-ECLIPSE_PLATFORM=$(shell dpkg-architecture -qDEB_HOST_ARCH)
 
+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=/home/tools
-PDEBUILD_CVSROOT=":$(PDEBUILD_CVSREADPROTOCOL):$(PDEBUILD_CVSREADUSER)@$(PDEBUILD_CVSHOST):$(PDEBUILD_CVSREP)"
+PDEBUILD_CVSREP=/cvsroot/tools
+PDEBUILD_CVSROOT=:$(PDEBUILD_CVSREADPROTOCOL):$(PDEBUILD_CVSREADUSER)@$(PDEBUILD_CVSHOST):$(PDEBUILD_CVSREP)
 PDEBUILD_CVSTAG=HEAD
-PDEBUILD_CVSPACKAGE=org.eclipse.ve.releng.builder
+PDEBUILD_PACKAGE=org.eclipse.ve.releng.builder
 
 PDEBUILD_BASELOCATION=/usr/lib/eclipse
-PDEBUILD_BUILDER=$(CURDIR)/$(SOURCE_TREE)/$(PDEBUILD_CVSPACKAGE)/sdk
+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_CVSPACKAGE)/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
@@ -49,48 +63,33 @@
 PDEBUILD_BUILDID=$(UPSTREAM_VERSION)
 PDEBUILD_BUILDLABEL=$(PDEBUILD_BUILDTYPE).$(PDEBUILD_BUILDID)
 
-RELENG_PLUGIN=$(PDEBUILD_CVSPACKAGE)
-
-ifeq ($(DEB_HOST_ARCH),i386)
-    ECLIPSE_PLATFORM=x86
-endif
-ifeq ($(DEB_HOST_ARCH),ia64)
-    ECLIPSE_PLATFORM=ia64
-endif
-ifeq ($(DEB_HOST_ARCH),amd64)
-    ECLIPSE_PLATFORM=x86_64
-endif
-ifeq ($(DEB_HOST_ARCH),powerpc)
-    ECLIPSE_PLATFORM=ppc
-endif
-ifeq ($(DEB_HOST_ARCH),s390)
-    ECLIPSE_PLATFORM=s390
-endif
-
 PATCHES = \
 
 
+
 get-orig-source: clean
 	dh_testdir
 
-	echo source_package=$(SOURCE_PACKAGE)
-	echo source_version=$(SOURCE_VERSION)
-	echo upstream_version=$(UPSTREAM_VERSION)
-	# exit 1
-
 	# create source directory
-	mkdir -p "$(SOURCE_TREE)"
+	mkdir -p $(SOURCE_TREE)
 
 	# checkout releng package
 	cd $(SOURCE_TREE) && \
-	cvs -d $(PDEBUILD_CVSROOT) co -r $(PDEBUILD_CVSTAG) $(PDEBUILD_CVSPACKAGE)
+	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)/$(RELENG_PLUGIN) && \
+	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) \
@@ -103,13 +102,13 @@
 		preBuild fetch
 
 	# pack sources in upstream
-	mkdir upstream
+	mkdir -p upstream
 	cd $(SOURCE_TREE) && \
-	tar cfvz ../$(SOURCE) $(PDEBUILD_CVSPACKAGE)
+	tar cfz ../$(SOURCE) $(PDEBUILD_PACKAGE)
 
 	# create orig tarball
 	cd .. && \
-	tar cfvz $(SOURCE_PACKAGE)_$(UPSTREAM_VERSION).orig.tar.gz $(SOURCE_PACKAGE)-$(UPSTREAM_VERSION)/$(SOURCE)
+	tar cfz $(SOURCE_PACKAGE)_$(UPSTREAM_VERSION).orig.tar.gz $(SOURCE_PACKAGE)-$(UPSTREAM_VERSION)/$(SOURCE)
 
 clean:
 	dh_testdir
@@ -134,7 +133,7 @@
 	dh_testdir
 	
 	# This patch system was orginally copied off of the one found in cdbs.
-	@cd $(SOURCE_TREE)/$(RELENG_PLUGIN); \
+	@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; \
@@ -167,22 +166,26 @@
 	# Create home.
 	mkdir home
 
-	# Call eclipse headless to process EMF releng build scripts
-	cd $(SOURCE_TREE)/$(RELENG_PLUGIN) && \
+	# 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) \
-                -Dbuilder=$(PDEBUILD_BUILDER) \
-                -DbuildDirectory=$(PDEBUILD_BUILDDIR) \
-                -DmapCvsRoot=$(PDEBUILD_MAPSROOT) \
-                -DmapVersionTag=$(PDEBUILD_MAPVERSIONTAG) \
-                -DbuildType=$(PDEBUILD_BUILDTYPE) \
-                -DbuildId=$(PDEBUILD_BUILDID) \
-                -DbuildLabel=$(PDEBUILD_BUILDLABEL) \
+		-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 \
-		-Dconfigs="*,*,*" -v
+		-Djavacfailonerror=true \
+		-Dconfigs="linux,gtk,$(ECLIPSE_PLATFORM)" \
+		-Dbaseos=linux -Dbasews=gtk -Dbasearch=$(ECLIPSE_PLATFORM)
 
 	touch build-stamp
 
@@ -192,9 +195,9 @@
 	dh_testdir
 	dh_testroot
 	
-	# Install the tar file into our destination directory.
-	install -d debian/tmp/$(ECLIPSE_BASE)
-	unzip $(PDEBUILD_BUILDDIR)/R*/*.zip -d debian/tmp/$(ECLIPSE_BASE)/..
+	# Install the zip file into our destination directory.
+	install -d debian/tmp/$(PDEBUILD_BASELOCATION)
+	unzip $(PDEBUILD_BUILDDIR)/R*/*.zip -d debian/tmp/$(PDEBUILD_BASELOCATION)/..
 	
 	dh_installdirs
 	dh_install
@@ -210,23 +213,24 @@
 	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_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