[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master, updated. 684640d5928d4c36a63f51918c49f7607fcbaf25
Niels Thykier
nthykier-guest at alioth.debian.org
Mon Feb 22 20:45:16 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 684640d5928d4c36a63f51918c49f7607fcbaf25 (commit)
from 409f028635ecf993f5f14570c7f05f3028d12cc6 (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 684640d5928d4c36a63f51918c49f7607fcbaf25
Author: Niels Thykier <niels at thykier.net>
Date: Mon Feb 22 21:45:02 2010 +0100
Removed unjar-jar; re-introducing it after rewrite.
-----------------------------------------------------------------------
Summary of changes:
build.xml | 5 -
debian/patches/eclipse-manpage.patch | 12 +-
debian/patches/series | 1 -
replacements | 17 ---
unjar-jar | 180 ----------------------------------
5 files changed, 6 insertions(+), 209 deletions(-)
diff --git a/build.xml b/build.xml
index 1e5405d..bebe2e7 100644
--- a/build.xml
+++ b/build.xml
@@ -286,11 +286,6 @@
<arg line="-c" />
<arg line="${buildDirectory}" />
</exec>
- <chmod perm="+x" file="unjar-jar" />
- <exec executable="./unjar-jar" failonerror="true">
- <arg line="-c" />
- <arg line="${buildDirectory}/plugins" />
- </exec>
<echo file="symlink-stamp" />
</target>
diff --git a/debian/patches/eclipse-manpage.patch b/debian/patches/eclipse-manpage.patch
index 41c2aec..4ae6a4a 100644
--- a/debian/patches/eclipse-manpage.patch
+++ b/debian/patches/eclipse-manpage.patch
@@ -3,10 +3,10 @@ Author: Pablo Duboue <pablo.duboue at gmail.com>
Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=30107
Bug-Ubuntu: https://launchpad.net/bugs/494065
-Index: debian.git/eclipse.1.xml
+Index: eclipse/eclipse.1.xml
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ debian.git/eclipse.1.xml 2010-02-18 22:41:15.988417339 +0100
++++ eclipse/eclipse.1.xml 2010-02-22 20:42:56.465663355 +0100
@@ -0,0 +1,616 @@
+<?xml version="1.0" encoding="UTF-8"?>
+ <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
@@ -624,11 +624,11 @@ Index: debian.git/eclipse.1.xml
+
+</refsect1>
+</refentry>
-Index: debian.git/build.xml
+Index: eclipse/build.xml
===================================================================
---- debian.git.orig/build.xml 2010-02-18 22:41:09.908418214 +0100
-+++ debian.git/build.xml 2010-02-18 22:41:15.988417339 +0100
-@@ -769,6 +769,12 @@
+--- eclipse.orig/build.xml 2010-02-22 20:42:55.262649957 +0100
++++ eclipse/build.xml 2010-02-22 20:42:56.493666601 +0100
+@@ -764,6 +764,12 @@
<!-- eclipse binary -->
<mkdir dir="${destDir}${prefix}/bin" />
<symlink link="${destDir}${prefix}/bin/eclipse" resource="../${libDir}/eclipse/eclipse" />
diff --git a/debian/patches/series b/debian/patches/series
index 2641dfd..184b1c4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,7 +3,6 @@ codec.patch
lucene.patch
install-icu4j-bundles.patch
system-jars.patch
-source-jars.patch
eclipse-manpage.patch
pdebuild-script.patch
pdebuild-path-copy-platform.patch
diff --git a/replacements b/replacements
deleted file mode 100644
index 41be130..0000000
--- a/replacements
+++ /dev/null
@@ -1,17 +0,0 @@
-com.ibm.icu.base.source_*.jar
-com.ibm.icu.source_*.jar
-com.jcraft.jsch.source_*.jar
-javax.servlet.jsp.source_*.jar
-javax.servlet.source_*.jar
-org.apache.ant.source_*.jar
-org.apache.commons.codec.source_*.jar
-org.apache.commons.el.source_*.jar
-org.apache.commons.httpclient.source_*.jar
-org.apache.commons.logging.source_*.jar
-org.apache.jasper.source_*.jar
-org.apache.lucene.analysis.source_*.jar
-org.hamcrest.core.source_*.jar
-org.junit.source_*.jar
-org.mortbay.jetty.server.source_*.jar
-org.mortbay.jetty.util.source_*.jar
-org.objectweb.asm.source_*.jar
diff --git a/unjar-jar b/unjar-jar
deleted file mode 100755
index 2bc85ce..0000000
--- a/unjar-jar
+++ /dev/null
@@ -1,180 +0,0 @@
-#!/usr/bin/perl
-
-use strict;
-use warnings;
-
-my $tmp = undef;
-my $linkdir = ".";
-my $prefix = "link-";
-my @jarpath = (".", "/usr/share/java");
-my $wdir;
-my $rfile = `pwd`;
-my $linkonly = 0;
-my $embed = 0;
-my $ignore = 0;
-chomp($rfile);
-$rfile.="/replacements";
-
-while(defined(my $arg = shift(@ARGV))){
- my $param;
- if($arg eq '-c'){
- $param = shift(@ARGV);
- choke("Missing argument for $arg") if(!defined($param));
- chdir($param) or choke("E: Could not cd to $param: $!");
- } elsif($arg eq '-d'){
- $linkdir = shift(@ARGV);
- choke("Missing argument for $arg") if(!defined($linkdir));
- } elsif($arg eq "-p"){
- $prefix = shift(@ARGV);
- } elsif($arg eq "-I"){
- $param = shift(@ARGV);
- push(@jarpath, $param);
- } elsif($arg eq '-l'){
- $linkonly = 1;
- $embed = 0;
- } elsif($arg eq '-e'){
- $embed = 1;
- $linkonly = 0;
- } elsif($arg eq '-i'){
- $ignore = 1;
- } else {
- choke("Unknown argument $arg");
- }
-}
-
--d $linkdir or system("mkdir -p \"$linkdir\"") == 0 or choke("Could not create $linkdir");
-
-$SIG{'INT'} = \&cleanup;
-$SIG{'TERM'} = \&cleanup;
-$tmp = `mktemp -d`;
-$wdir = `pwd`;
-chomp($wdir);
-chomp($tmp);
-
-replace($rfile);
-cleanup();
-exit 0;
-
-sub base{
- my $name = shift;
- $name =~ s@[^/]*+/@@go;
- return $name;
-}
-
-sub dolink {
- my @jars = @_;
- foreach my $jar (@jars){
- my $base = base($jar);
- info("Linking $jar -> $linkdir/$prefix$base");
- system("ln -sf \"$jar\" \"$linkdir/$prefix$base\"") == 0 or choke("Could not create link $jar -> $linkdir/$prefix$base");
- }
-}
-
-sub embed {
- my $file = shift;
- my @cp = @_;
- choke("$file does not exist") if( ! -e $file);
- choke("$file has no classpath") if(scalar(@cp) < 1);
-
- system("mkdir -p \"$tmp/old\" \"$tmp/new\" && cd \"$tmp/old\" && jar xf \"$wdir/$file\"" .
- " && mv -f \"$tmp/old/META-INF/MANIFEST.MF\" \"$tmp/manifest\"") == 0 or choke("Could not unjar $file");
- unlink($file) or choke("Unlinking $file: $!");
- foreach my $jar (@cp){
- system("unzip \"$jar\" -d \"$tmp/new\" && rm -fr \"$tmp/new/META-INF/\"") == 0 or choke("Could not unzip $jar");
- }
- system("rm -fr \"$tmp/new/META-INF\" && cd \"$tmp/new\" && zip -r \"$wdir/$file\" *");
- system("jar umf \"$tmp/manifest\" $wdir/$file && rm -fr \"$tmp/\"*") == 0 or choke("Could not create replacement jar.");
- info("Embedded $file");
- return 1;
-}
-
-sub repack {
- my $file = shift;
- my @cp = map { $_ = "$linkdir/$prefix" . base($_); } @_;
- choke("$file does not exist") if( ! -e $file);
-
- system("cd \"$tmp\" && jar xf \"$wdir/$file\"") == 0 or choke("Could not unjar $file");
-
- unlink($file) or choke("Unlinking $file: $!");
-
- open(MANIFEST_ORIG, "<", "$tmp/META-INF/MANIFEST.MF") or choke("Opening $tmp/META-INF/MANIFEST.MF");
- open(MANIFEST, ">", "$tmp/manifest") or choke("Opening $tmp/manifest: $!");
- while( my $line = <MANIFEST_ORIG> ) {
- chomp($line);
- last if($line =~ m/^\s*$/o);
- print MANIFEST "$line\n";
- }
- close(MANIFEST) or choke("Writing $tmp/manifest: $!");
- close(MANIFEST_ORIG);
-# system("rm -fr \"$tmp/META-INF/\" && find \"$tmp\" -name '*.class' -o -name '*.java' -delete") == 0 or choke("Could not clean $file");
-# system("cd \"$tmp\" && zip -r \"$wdir/$file\" * && jar umf \"$tmp/manifest\" \"$wdir/$file\" && rm -fr \"$tmp/\"*") == 0 or choke("Could not create replacement jar.");
- system("cd \"$tmp\" && jar cmf \"$tmp/manifest\" \"$wdir/$file\" && rm -fr \"$tmp/\"*") == 0 or choke("Could not create replacement jar.");
- info("Replaced $file");
- return 1;
-}
-
-sub findJars{
- my @result = ();
- foreach my $jar (@_) {
- my $jarfname = undef;
- next if($jar eq "");
- foreach my $path (@jarpath) {
- if( -e "$path/$jar" ) {
- $jarfname = "$path/$jar";
- last;
- }
- }
- choke("Cannot find $jar in " . join(" ", @jarpath)) unless(defined($jarfname));
- push(@result, $jarfname),
- }
- return @result;
-}
-
-sub replace {
- my $fname = shift;
- open(REPLACEMENTS, "<", $fname) or choke("$fname: $!");
- while( my $line = <REPLACEMENTS> ){
- my $toReplace;
- my $rest;
- my @jars;
- chomp($line);
- next if($line =~ m/^#/o);
- ($toReplace, $rest) = split(/\s*;\s*/o, $line);
- @jars = findJars(split(/\s*,\s*/o, $rest//''));
- # Make the shell expand wildcards
- $toReplace = `echo $toReplace`;
- chomp($toReplace);
- next if( ! -e $toReplace && $ignore);
- if($embed) {
- embed($toReplace, @jars);
- next;
- }
- if( -e $toReplace) {
- dolink(@jars);
- repack($toReplace, @jars) unless($linkonly);
- } elsif(!$linkonly){
- choke("Cannot find $toReplace");
- }
- }
- close(REPLACEMENTS);
-}
-
-sub choke{
- my $msg = shift;
- print STDERR "E: $msg\n";
- cleanup();
- exit 1;
-}
-
-sub info{
- my $msg = shift;
- print "I: $msg\n";
-}
-
-sub cleanup{
- if(defined($tmp) && -d $tmp){
- info("Removing $tmp");
- system("rm -fr \"$tmp\"");
- }
-}
-
hooks/post-receive
--
eclipse - Powerful IDE written in java - Debian package.
More information about the pkg-java-commits
mailing list