Author: vladimir-guest
Date: 2007-06-05 21:02:45 +0000 (Tue, 05 Jun 2007)
New Revision: 3595
Modified:
trunk/eclipse-emf/debian/changelog
trunk/eclipse-emf/debian/control
trunk/eclipse-emf/debian/eclipse-emf.install
trunk/eclipse-emf/debian/rules
Log:
New version of eclipse-emf-2.2.2
Modified: trunk/eclipse-emf/debian/changelog
===================================================================
--- trunk/eclipse-emf/debian/changelog 2007-06-04 20:02:48 UTC (rev 3594)
+++ trunk/eclipse-emf/debian/changelog 2007-06-05 21:02:45 UTC (rev 3595)
@@ -1,3 +1,11 @@
+eclipse-emf (2.2.2-1) feisty; urgency=low
+
+ * Updated to new upstream 2.2.2
+ * Recreated rules to be similar to Fedora
+ * Splitted to several packages
+
+ -- Vladimír Lapáček <[EMAIL PROTECTED]> Sun, 1 Apr 2007 11:09:56 +0200
+
eclipse-emf (2.1.1-1) unstable; urgency=low
[ Stephan Michels ]
Modified: trunk/eclipse-emf/debian/control
===================================================================
--- trunk/eclipse-emf/debian/control 2007-06-04 20:02:48 UTC (rev 3594)
+++ trunk/eclipse-emf/debian/control 2007-06-05 21:02:45 UTC (rev 3595)
@@ -1,22 +1,72 @@
Source: eclipse-emf
Section: devel
-Priority: optional
-Maintainer: Debian Java Maintainers <[EMAIL PROTECTED]>
-Uploaders: Stephan Michels <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>> 4.2), eclipse (>= 3.1.1-5), cdbs
-Build-Conflicts: eclipse-emf
-Standards-Version: 3.6.2
+Priority: extra
+Maintainer: Vladimír Lapáček <[EMAIL PROTECTED]>
+Build-Depends: ant, debhelper (>= 5), eclipse-sdk (>=3.2.2),
java-gcj-compat-dev, unzip
+Standards-Version: 3.7.2
Package: eclipse-emf
-Architecture: any
-Depends: eclipse
-Description: EMF is a modeling framework and code generation facility for
Eclipse
- EMF is a modeling framework and code generation facility for building tools
- and other applications based on a structured data model. From a model
- specification described in XMI, EMF provides tools and runtime support to
- produce a set of Java classes for the model, a set of adapter classes that
- enable viewing and command-based editing of the model, and a basic editor.
- Models can be specified using annotated Java, XML documents, or modeling
- tools like Rational Rose, then imported into EMF. Most important of all,
- EMF provides the foundation for interoperability with other EMF-based
- tools and applications.
+Architecture: all
+Depends: eclipse-platform (>=3.2.2)
+Description: Eclipse Modeling Framework
+ EMF is a modeling framework and code generation facility for building tools
and
+ other applications based on a structured data model.
+
+Package: eclipse-emf-sdk
+Architecture: all
+Depends: eclipse-emf-sdo-sdk (=${Source-Version}), eclipse-emf-xsd-sdk
(=${Source-Version})
+Description: Eclipse EMF SDK
+ EMF is a modeling framework and code generation facility for building tools
and
+ other applications based on a structured data model.
+ .
+ Source for all of Eclipse EMF SDK for use within Eclipse.
+
+Package: eclipse-emf-sdo
+Architecture: all
+Depends: eclipse-emf (=${Source-Version})
+Description: Eclipse EMF SDO
+ EMF is a modeling framework and code generation facility for building tools
and
+ other applications based on a structured data model.
+ .
+ Service Data Objects (SDO) is a framework that simplifies and unifies data
+ application development in a service oriented architecture (SOA).
+
+
+Package: eclipse-emf-sdo-sdk
+Architecture: all
+Depends: eclipse-emf-sdo (=${Source-Version})
+Description: Eclipse EMF SDO SDK
+ EMF is a modeling framework and code generation facility for building tools
and
+ other applications based on a structured data model.
+ .
+ Source for Eclipse EMF SDO for use within Eclipse.
+
+Package: eclipse-emf-xsd
+Architecture: all
+Depends: eclipse-emf (=${Source-Version})
+Description: Eclipse EMF XSD
+ EMF is a modeling framework and code generation facility for building tools
and
+ other applications based on a structured data model.
+ .
+ The XML Schema Infoset Model is a reference library that provides an API for
+ use with any code that examines, creates or modifies W3C XML Schema
+ (standalone or as part of other artifacts, such as XForms or WSDL documents).
+
+Package: eclipse-emf-xsd-sdk
+Architecture: all
+Depends: eclipse-emf-xsd (=${Source-Version})
+Description: Eclipse EMF XSD SDK
+ EMF is a modeling framework and code generation facility for building tools
and
+ other applications based on a structured data model.
+ .
+ Source for Eclipse EMF XSD for use within Eclipse.
+
+Package: eclipse-emf-examples
+Architecture: all
+Depends: eclipse-emf-xsd (=${Source-Version})
+Description: Eclipse EMF SDO
+ EMF is a modeling framework and code generation facility for building tools
and
+ other applications based on a structured data model.
+ .
+ Example source code and models that demonstrates how to use Eclipse EMF.
+
Modified: trunk/eclipse-emf/debian/eclipse-emf.install
===================================================================
--- trunk/eclipse-emf/debian/eclipse-emf.install 2007-06-04 20:02:48 UTC
(rev 3594)
+++ trunk/eclipse-emf/debian/eclipse-emf.install 2007-06-05 21:02:45 UTC
(rev 3595)
@@ -1,2 +1,32 @@
-debian/tmp/usr/lib/eclipse/features usr/lib/eclipse
-debian/tmp/usr/lib/eclipse/plugins usr/lib/eclipse
+source-tree/org.eclipse.emf.releng.build/temp/eclipse/features/org.eclipse.emf.doc_*
usr/lib/eclipse/features
+source-tree/org.eclipse.emf.releng.build/temp/eclipse/plugins/org.eclipse.emf.doc_*
usr/lib/eclipse/plugins
+source-tree/org.eclipse.emf.releng.build/temp/eclipse/plugins/org.eclipse.emf.cheatsheets_*
usr/lib/eclipse/plugins
+source-tree/org.eclipse.emf.releng.build/temp/eclipse/plugins/org.eclipse.emf_*
usr/lib/eclipse/plugins
+source-tree/org.eclipse.emf.releng.build/temp/eclipse/plugins/org.eclipse.emf.ant_*
usr/lib/eclipse/plugins
+source-tree/org.eclipse.emf.releng.build/temp/eclipse/plugins/org.eclipse.emf.codegen.ecore.ui_*
usr/lib/eclipse/plugins
+source-tree/org.eclipse.emf.releng.build/temp/eclipse/plugins/org.eclipse.emf.codegen.ecore_*
usr/lib/eclipse/plugins
+source-tree/org.eclipse.emf.releng.build/temp/eclipse/plugins/org.eclipse.emf.codegen.ui_*
usr/lib/eclipse/plugins
+source-tree/org.eclipse.emf.releng.build/temp/eclipse/plugins/org.eclipse.emf.codegen_*
usr/lib/eclipse/plugins
+source-tree/org.eclipse.emf.releng.build/temp/eclipse/plugins/org.eclipse.emf.common.ui_*
usr/lib/eclipse/plugins
+source-tree/org.eclipse.emf.releng.build/temp/eclipse/plugins/org.eclipse.emf.common_*
usr/lib/eclipse/plugins
+source-tree/org.eclipse.emf.releng.build/temp/eclipse/plugins/org.eclipse.emf.ecore_*
usr/lib/eclipse/plugins
+source-tree/org.eclipse.emf.releng.build/temp/eclipse/plugins/org.eclipse.emf.ecore.edit_*
usr/lib/eclipse/plugins
+source-tree/org.eclipse.emf.releng.build/temp/eclipse/plugins/org.eclipse.emf.ecore.editor_*
usr/lib/eclipse/plugins
+source-tree/org.eclipse.emf.releng.build/temp/eclipse/plugins/org.eclipse.emf.ecore.change_*
usr/lib/eclipse/plugins
+source-tree/org.eclipse.emf.releng.build/temp/eclipse/plugins/org.eclipse.emf.ecore.change.edit_*
usr/lib/eclipse/plugins
+source-tree/org.eclipse.emf.releng.build/temp/eclipse/plugins/org.eclipse.emf.ecore.xmi_*
usr/lib/eclipse/plugins
+source-tree/org.eclipse.emf.releng.build/temp/eclipse/plugins/org.eclipse.emf.edit_*
usr/lib/eclipse/plugins
+source-tree/org.eclipse.emf.releng.build/temp/eclipse/plugins/org.eclipse.emf.edit.ui_*
usr/lib/eclipse/plugins
+source-tree/org.eclipse.emf.releng.build/temp/eclipse/plugins/org.eclipse.emf.mapping_*
usr/lib/eclipse/plugins
+source-tree/org.eclipse.emf.releng.build/temp/eclipse/plugins/org.eclipse.emf.mapping.ui_*
usr/lib/eclipse/plugins
+source-tree/org.eclipse.emf.releng.build/temp/eclipse/plugins/org.eclipse.emf.mapping.ecore2ecore_*
usr/lib/eclipse/plugins
+source-tree/org.eclipse.emf.releng.build/temp/eclipse/plugins/org.eclipse.emf.mapping.ecore2ecore.editor_*
usr/lib/eclipse/plugins
+source-tree/org.eclipse.emf.releng.build/temp/eclipse/plugins/org.eclipse.emf.mapping.ecore2xml_*
usr/lib/eclipse/plugins
+source-tree/org.eclipse.emf.releng.build/temp/eclipse/plugins/org.eclipse.emf.mapping.ecore2xml.ui_*
usr/lib/eclipse/plugins
+source-tree/org.eclipse.emf.releng.build/temp/eclipse/plugins/org.eclipse.emf.converter_*
usr/lib/eclipse/plugins
+source-tree/org.eclipse.emf.releng.build/temp/eclipse/plugins/org.eclipse.emf.importer_*
usr/lib/eclipse/plugins
+source-tree/org.eclipse.emf.releng.build/temp/eclipse/plugins/org.eclipse.emf.importer.ecore_*
usr/lib/eclipse/plugins
+source-tree/org.eclipse.emf.releng.build/temp/eclipse/plugins/org.eclipse.emf.importer.java_*
usr/lib/eclipse/plugins
+source-tree/org.eclipse.emf.releng.build/temp/eclipse/plugins/org.eclipse.emf.importer.rose_*
usr/lib/eclipse/plugins
+source-tree/org.eclipse.emf.releng.build/temp/eclipse/plugins/org.eclipse.emf.exporter_*
usr/lib/eclipse/plugins
+source-tree/org.eclipse.emf.releng.build/temp/eclipse/features/org.eclipse.emf_*
usr/lib/eclipse/features
Modified: trunk/eclipse-emf/debian/rules
===================================================================
--- trunk/eclipse-emf/debian/rules 2007-06-04 20:02:48 UTC (rev 3594)
+++ trunk/eclipse-emf/debian/rules 2007-06-05 21:02:45 UTC (rev 3595)
@@ -1,46 +1,152 @@
#!/usr/bin/make -f
-# debian/rules file using cdbs
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
-include debian/eclipse-pdebuild.mk
-#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
+export JAVA_HOME := /usr/lib/jvm/java-gcj
+JAVA := /usr/lib/jvm/java-gcj/bin/java
+ECLIPSE_ROOT := /usr/lib/eclipse
+ECLIPSE := $(ECLIPSE_ROOT)/eclipse
+PDEBUILD_ROOT :=
$(ECLIPSE_ROOT)/plugins/org.eclipse.pde.build_3.2.1.r321_v20060823
+SOURCE_TREE := $(CURDIR)/source-tree
+BUILD_DIR := $(SOURCE_TREE)/org.eclipse.emf.releng.build
+SOURCE=$(shell ls upstream/eclipse-emf*.tar.bz2)
+VERSION := 2.2.2
-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
-PDEBUILD_COMPONENT=sdk
-#PDEBUILD_BUILDDIR=$(CURDIR)/$(SOURCE_TREE)/$(PDEBUILD_PACKAGE)/src/eclipse
-PDEBUILD_OPTS=-DbuildAlias=2.1.1
-DemfBuilderDir=$(CURDIR)/$(SOURCE_TREE)/$(PDEBUILD_PACKAGE) -DbaseExists=true
+uncompress: uncompress-stamp
+uncompress-stamp:
+ dh_testdir
-PDEBUILD_MAPSTAG=build_200509281310
+ mkdir -p "$(SOURCE_TREE)"
+ (cd "$(SOURCE_TREE)" && tar xfj ../"$(SOURCE)" > /dev/null)
+ touch uncompress-stamp
-install/eclipse-emf::
- # Install the zip file into our destination directory.
- mkdir -p debian/tmp
- install -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
+patch: patch-stamp
+patch-stamp: uncompress-stamp
+ dh_testdir
- rm -r $(CURDIR)/debian/tmp
+ cd $(BUILD_DIR) && \
+ for PATCH in $(CURDIR)/debian/patches/* ; do \
+ patch -p0 < $$PATCH; \
+ done
-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
+ touch patch-stamp
+
+prepare: prepare-stamp
+prepare-stamp: patch-stamp
+ dh_testdir
+
+ cd $(BUILD_DIR) && \
+ for f in emf/doc/build.properties emf/runtime/build.properties \
+ examples/build.properties sdk/build.properties
sdo/doc/build.properties \
+ sdo/runtime/build.properties tests/build.properties \
+ xsd/doc/build.properties xsd/runtime/build.properties; \
+ do sed --in-place 's/^bootclasspath/#bootclasspath/' $$f; done
+
+ touch prepare-stamp
+
+
+build: build-java
+build-java: build-java-stamp
+build-java-stamp: prepare-stamp
+ dh_testdir
+
+ cd $(BUILD_DIR)/org.eclipse.emf.build && \
+ # FIXME: implement com.sun.tools.doclets.standard in gjdoc \
+ rm -rf src/org/eclipse/emf/build/doclet/; \
+ ant
+
+ cd $(BUILD_DIR)/org.eclipse.emf.build.ant && \
+ mkdir -p build; \
+ echo "<project default=\"main\"><target
name=\"main\"></target></project>" >
build/assemble.org.eclipse.emf.build.ant.all.xml; \
+ echo "<project default=\"main\"><target
name=\"main\"></target></project>" >
build/package.org.eclipse.emf.build.ant.all.xml; \
+ $(ECLIPSE) \
+ -application org.eclipse.ant.core.antRunner \
+ -Dtype=plugin \
+ -Did=org.eclipse.emf.build.ant \
+ -DsourceDirectory=$(BUILD_DIR)/org.eclipse.emf.build.ant
\
+ -DbaseLocation=$(ECLIPSE_ROOT) \
+ -Dbuilder=$(CURDIR)/debian/eclipse-pdebuild/package-build \
+ -f $(PDEBUILD_ROOT)/scripts/build.xml \
+ -vm $(JAVA)
+
+ cd
$(BUILD_DIR)/org.eclipse.emf.build.ant/build/plugins/org.eclipse.emf.build.ant
&& \
+ $(ECLIPSE) \
+ -vm $(JAVA) \
+ -application org.eclipse.ant.core.antRunner \
+ -f build.xml build.update.jar
+
+ cd $(BUILD_DIR)/src/eclipse; \
+ for f in /usr/lib/eclipse/* ; \
+ do cp -rL $$f .; \
+ done; \
+ ln -s
$(BUILD_DIR)/org.eclipse.emf.build.ant/org.eclipse.emf.build.ant*.jar plugins; \
+
+ cd $(BUILD_DIR); \
+ find -name customTargets.xml -exec sed -i -e '/stripVersions/d' {} \;
+
+ cd $(BUILD_DIR) && \
+ $(JAVA) -cp $(BUILD_DIR)/src/eclipse/startup.jar \
+
-Dosgi.sharedConfiguration.area=$(BUILD_DIR)/src/eclipse/configuration \
+ -Duser.home=$(HOME) \
+ org.eclipse.core.launcher.Main \
+ -application org.eclipse.ant.core.antRunner \
+ -DjavacFailOnError=true \
+ -DdontUnzip=true \
+ -DmapsLocal=true \
+ -DbaseLocation=$(BUILD_DIR)/src/eclipse \
+ -Dpde.build.scripts=$(PDEBUILD_ROOT)/scripts \
+ -DskipFetch=true \
+ -DbuildLabel=$(VERSION) \
+ -DbuildAlias=$(VERSION) \
+ -DbaseExists=true \
+ -f buildAll.xml buildRPM
+
+ touch build-java-stamp
+
+install: install-stamp
+install-stamp: build-java-stamp
+ mkdir -p $(BUILD_DIR)/temp; \
+ cd $(BUILD_DIR)/temp; \
+ for FILE in ../src/eclipse/$(VERSION)/*zip ; do \
+ unzip -o -qq $$FILE; \
+ done
+
+ touch install-stamp
+
+
+binary-indep: DH_OPTIONS=-i
+binary-indep: install-stamp
+ dh_testdir
+ dh_testroot
+
+ dh_install
+ dh_installdocs
+ dh_installexamples
+ dh_installmenu
+ dh_installman
+ dh_installinfo
+ dh_installchangelogs
+ dh_link
+ dh_fixperms
+
+ dh_makeshlibs
+ dh_shlibdeps
+ dh_compress
+ dh_installdeb
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary-arch:
+
+binary: binary-indep binary-arch
+
+clean:
+ dh_testdir
+
+ rm -rf $(SOURCE_TREE) *-stamp
+
+ dh_clean
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
