[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master, updated. a2bfbfe7842282a440206ebe94f9519337d0ec20
Niels Thykier
nthykier-guest at alioth.debian.org
Sun Feb 21 15:19:29 UTC 2010
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "eclipse - Powerful IDE written in java - Debian package.".
The branch, master has been updated
via a2bfbfe7842282a440206ebe94f9519337d0ec20 (commit)
from c1366d8ca62ea0373e94020b005511a6a3283e7b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit a2bfbfe7842282a440206ebe94f9519337d0ec20
Author: Niels Thykier <niels at thykier.net>
Date: Sun Feb 21 16:19:24 2010 +0100
Moved eclipse-helper to javatools and corrected path + name for pde-build
-----------------------------------------------------------------------
Summary of changes:
debian/control | 7 --
debian/helper/eclipse-vars.mk | 35 ---------
debian/helper/eclipse.mk | 37 ----------
debian/helper/eh_install | 156 -----------------------------------------
debian/rules | 15 +----
5 files changed, 2 insertions(+), 248 deletions(-)
diff --git a/debian/control b/debian/control
index 02b0e39..5a96fad 100644
--- a/debian/control
+++ b/debian/control
@@ -246,10 +246,3 @@ Description: Equinox OSGi framework
This package includes only the Eclipse Equinox OSGi framework, which can
be used outside Eclipse.
-Package: eclipse-helper
-Architecture: all
-Depends: eclipse-pde (= ${binary:Version}), ${misc:Depends}
-Description: Helper scripts for build eclipse plugins
- Collection of scripts and makefile snippets to aid building of eclipse
- plugins.
-
diff --git a/debian/helper/eclipse-vars.mk b/debian/helper/eclipse-vars.mk
deleted file mode 100644
index c49cd62..0000000
--- a/debian/helper/eclipse-vars.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-# Define eclipse / pdebuild related variables.
-
-
-ifndef _cdbs_class_eclipse_vars
-_cdbs_class_eclipse_vars = 1
-
-# Path to the pdebuild script.
-ECLIPSE_PDEBUILD ?= /usr/share/eclipse-helper/pdebuild
-
-# Options given to the underlying builder - to pass options to pdebuild
-# use ECLIPSE_PDEBUILD_ARGS
-ECLIPSE_PDEBUILD_OPTIONS ?= -DjavacTarget=1.5 -DjavacSource=1.5
-
-# ECLIPSE_PDEBUILD_VMARGS - JVM args
-# ECLIPSE_PDEBUILD_ARGS - arguments for pdebuild
-
-# Dir to build in
-ECLIPSE_PDEBUILD_DIR ?= $(CURDIR)/debian/.eclipse-build/
-
-# Files that should be a part of the build.
-ECLIPSE_PDEBUILD_BUILD_INCLUDE ?= org.eclipse.*
-
-# ECLIPSE_BUILD_LIST - list of things to build.
-# ECLIPSE_ORBIT_DEPS - passed to pdebuild via -o
-# ECLIPSE_PLUGIN_DEPS - passed to pdebuild via -d
-
-# Command used to invoke pdebuild.
-DEB_ECLIPSE_PDEBUILD_INVOKE ?= cd $(ECLIPSE_PDEBUILD_DIR) && $(ECLIPSE_PDEBUILD) $(ECLIPSE_PDEBUILD_ARGS) \
- $(if $(ECLIPSE_PDEBUILD_OPTIONS), -a "$(ECLIPSE_PDEBUILD_OPTIONS)",) \
- $(if $(ECLIPSE_PDEBUILD_VMARGS), -j "$(ECLIPSE_PDEBUILD_VMARGS)",) \
- $(if $(ECLIPSE_ORBIT_DEPS), -o "$(ECLIPSE_ORBIT_DEPS)",) \
- $(if $(ECLIPSE_PLUGIN_DEPS), -d "$(ECLIPSE_PLUGIN_DEPS)",)
-
-
-endif
diff --git a/debian/helper/eclipse.mk b/debian/helper/eclipse.mk
deleted file mode 100644
index 8298265..0000000
--- a/debian/helper/eclipse.mk
+++ /dev/null
@@ -1,37 +0,0 @@
- # Define eclipse / pdebuild related rules.
-
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_eclipse_vars_path ?= /usr/share/eclipse-helper
-
-ifndef _cdbs_class_eclipse
-_cdbs_class_eclipse = 1
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-include $(_eclipse_vars_path)/eclipse-vars.mk
-
-common-build-arch common-build-indep:: debian/stamp-eclipse-build
-
-# Build rule
-debian/stamp-eclipse-build:
- @if test "x" = "x$(ECLIPSE_PDEBUILD_DIR)" ; then \
- echo "You must specify something to build in ECLIPSE_PDEBUILD_DIR" >&2 ;\
- exit 1 ;\
- fi
- mkdir -p $(ECLIPSE_PDEBUILD_DIR)
- cp -a $(ECLIPSE_PDEBUILD_BUILD_INCLUDE) $(ECLIPSE_PDEBUILD_DIR)
- for tobuild in $(ECLIPSE_BUILD_LIST) ; do \
- $(DEB_ECLIPSE_PDEBUILD_INVOKE) -f $$tobuild || exit 1;\
- done
- touch debian/stamp-eclipse-build
-
-common-install-arch:: $(patsubst %,eclipse-install/%,$(DEB_ARCH_PACKAGES))
-common-install-indep:: $(patsubst %,eclipse-install/%,$(DEB_INDEP_PACKAGES))
-
-$(patsubst %,eclipse-install/%,$(DEB_ALL_PACKAGES)) ::
- eh_install -p$(cdbs_curpkg) --pdebuild-build-dir $(ECLIPSE_PDEBUILD_DIR)
-
-clean::
- rm -f debian/stamp-eclipse-build
- rm -fr $(ECLIPSE_PDEBUILD_DIR)
-
-endif
diff --git a/debian/helper/eh_install b/debian/helper/eh_install
deleted file mode 100755
index fb7d8ac..0000000
--- a/debian/helper/eh_install
+++ /dev/null
@@ -1,156 +0,0 @@
-#!/usr/bin/perl
-
-=head1 NAME
-
-eh_install - Installs eclipse features and plugins built by pdebuild into package build directories
-
-=cut
-
-use strict;
-use Debian::Debhelper::Dh_Lib;
-
-=head1 SYNOPSIS
-
-B<eh_install> [S<I<debhelper options>>] [B<--eclipse-name=>I<name>] [B<--pdebuild-build-dir=>I<dir>] [S<I<feature/plugin [...]>>]
-
-=head1 DESCRIPTION
-
-eh_install is an eclipse-helper program that handles installing eclipse
-features/plugins built by pdebuild into package build directories.
-
-eh_install uses debhelper behind the scenes and are therefore subject
-to the compat level.
-
-=head1 FILES
-
-=over 4
-
-=item debian/I<package>.eh-install
-
-List the eclipse plugins or features to install into each package and
-optionally under which name. The format is a set of lines, where each
-line lists a file or files to install, and at the end of the line
-tells the name it should be installed under. You may use wildcards in
-the names of the files to install.
-
-If name is not present, eh_install will either use the name given on
-the command line or attempt to guess it from the package name.
-
-=back
-
-=head1 OPTIONS
-
-=over 4
-
-=item B<--eclipse-name=name>
-
-Specifies the name to install under if it is not given in the file.
-
-=item B<--pdebuild-build-dir=dir>
-
-Specifies the directory from where pdebuild was run. Defauls to
-"debian/.eclipse_build".
-
-=back
-
-=cut
-
-my %archpackages;
-my $pdebdir = undef;
-my $fallback = undef;
-init(options => {
- "pdebuild-build-dir=s" => \$pdebdir,
- "eclipse-name=s" => \$fallback
-});
-inhibit_log();
-
-# Use default value if none are given.
-$pdebdir = 'debian/.eclipse-build' unless(defined($pdebdir));
-$pdebdir =~ s@/*$@@;
-# Append the actual output dir.
-$pdebdir = "$pdebdir/build/rpmBuild";
-
-foreach my $arch (getpackages("arch")){
- $archpackages{$arch} = 1;
-}
-
-foreach my $package (@{$dh{DOPACKAGES}}) {
- my $installfile = pkgfile($package, "eh-install");
- my $dropins;
- my $lineno = 0;
- my $defdname = $fallback;
- my @infiles;
- next if($installfile eq '');
- $defdname = $1 if($package =~ m/^eclipse-(.+)/o);
- $dropins = getDropinsPath($package);
- @infiles = filedoublearray($installfile);
- if (($package eq $dh{FIRSTPACKAGE} || $dh{PARAMS_ALL}) && @ARGV) {
- push @infiles, [@ARGV];
- }
- foreach my $line (@infiles) {
- my ($zipglob, $dname, $other) = @$line;
- error("Trailing text in $installfile ($other)") if(defined($other) && length($other) > 0);
- $dname = $defdname unless(defined($dname) && length($dname) > 0);
- error("Missing (and could not guess) eclipse-name for $zipglob for $package - please provide a default.") unless(defined($dname) && length($dname) > 0);
- foreach my $zip (glob("$pdebdir/$zipglob")){
- foreach my $ext (('', '.zip', '.ZIP')){
- # Guess common extensions.
- if( -e "$zip"){
- $zip = "$zip${ext}";
- last;
- }
- }
- verbose_print("mkdir -p $dropins/$dname");
- verbose_print("unzip -qq -n -d $dropins/$dname $zip");
- if (! $dh{NO_ACT}){
- doit("mkdir", "-p", "$dropins/$dname");
- doit("unzip", "-qq", "-n", "-d", "$dropins/$dname", "$zip");
- }
- }
- }
-}
-
-exit(0);
-
-sub getDropinsPath{
- my $package = shift;
- my $prefix = tmpdir($package) . "/usr/";
- $prefix .= exists($archpackages{$package})?"lib":"share";
- return "$prefix/eclipse/dropins";
-}
-
-=head1 EXAMPLE
-
-Suppose your package builds org.eclipse.emf and org.eclipse.xsd and you want
-to put org.eclipse.emf into eclipse-emf and org.eclipse.xsd into eclipse-xsd.
-Then make debian/eclipse-emf.eh-install contain:
-
- org.eclipse.emf
-
-and debian/eclipse-xsd.eh-install contain:
-
- org.eclipse.xsd
-
-eh_install will then install org.eclipse.emf into
-usr/share/eclipse/dropins/emf/ and xsd into
-usr/share/eclipse/dropins/xsd/.
-
-In case your package is not called eclipse-I<name>, or you want to install
-two different features into the same package, you will have to provide a
-name. Suppose you wanted to install both eclipse above into a single
-package called foo, then debian/foo.eh-install should contain:
-
- org.eclipse.emf emf
- org.eclipse.xsf xsd
-
-=head1 SEE ALSO
-
-L<debhelper(7)>
-
-This program is a part of eclipse-helper and uses debhelper as backend.
-
-=head1 AUTHOR
-
-Niels Thykier <niels at thykier.net>
-
-=cut
diff --git a/debian/rules b/debian/rules
index a72a276..261818d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -179,7 +179,7 @@ debian-install-stamp:
# depend on which arch it was build one.
COPY_PLATFORM:=/usr/lib/eclipse/buildscripts/copy-platform
COPY_PLATFORM_INSTALL:=debian/eclipse-pde$(COPY_PLATFORM)
-PDEBUILD_INSTALL:=debian/eclipse-helper/usr/share/eclipse-helper/pdebuild
+PDEBUILD_INSTALL:=debian/eclipse-pde/usr/lib/eclipse/buildscripts/pde-build
generate-pdebuild-scripts: debian-install-stamp
@echo "*** generate-pdebuild-scripts ***"
@@ -190,17 +190,6 @@ generate-pdebuild-scripts: debian-install-stamp
ls -d * | egrep -v '^(plugins|features|about_files|dropins|buildscripts)$$' ; \
ls -d * plugins/* features/* ; \
) | sed -e's,^\(.*\),[ ! -e \1 ] \&\& ln -s $$eclipse/\1 \1,' >> $(COPY_PLATFORM_INSTALL)
- sed -e "s/@PDEBUILDVERSION@/$(PDEBUILDVERSION)/g" -e "s/@COPY_PLATFORM@/$(COPY_PLATFORM)/g" < pdebuild/eclipse-pdebuild.sh > $(PDEBUILD_INSTALL)
+ sed -e "s/@PDEBUILDVERSION@/$(PDEBUILDVERSION)/g" -e "s:@COPY_PLATFORM@:$(COPY_PLATFORM):g" < pdebuild/eclipse-pdebuild.sh > $(PDEBUILD_INSTALL)
chmod a+x $(PDEBUILD_INSTALL)
-
-# If not given pod2man will give it the same version as perl.
-ECLISPE_HELPER_VERSION=0.0.1
-
-POD2MAN=pod2man --stderr --utf8 -c Eclipse-Helper -r "$(ECLISPE_HELPER_VERSION)" -s 1
-
-build-eclipse-helper:
- @echo "*** generate-eclipse-helper ***"
- mkdir -p debian/eclipse-helper/usr/share/man/man1/
- cd debian/helper/ && find . -maxdepth 1 -type f -name 'eh_*' \
- -exec $(POD2MAN) {} ../../debian/eclipse-helper/usr/share/man/man1/{}.1 \;
hooks/post-receive
--
eclipse - Powerful IDE written in java - Debian package.
More information about the pkg-java-commits
mailing list