[pkg-java] r4435 - in trunk/kaffe/debian: . patches
mkoch at alioth.debian.org
mkoch at alioth.debian.org
Fri Oct 19 04:56:00 UTC 2007
Author: mkoch
Date: 2007-10-19 04:56:00 +0000 (Fri, 19 Oct 2007)
New Revision: 4435
Added:
trunk/kaffe/debian/kaffe-jthreads.links
trunk/kaffe/debian/kaffe-pthreads.links
trunk/kaffe/debian/patches/02_IncludeEcjCompilerInToolsJar.patch
trunk/kaffe/debian/patches/02_IncludeEcjCompilerInToolsJar_Makefile.patch
Modified:
trunk/kaffe/debian/changelog
Log:
kaffe (2:1.1.8-3) unstable; urgency=low
* Reincluded debian/patches/02_IncludeEcjCompilerInToolsJar_Makefile.patch
and debian/patches/02_IncludeEcjCompilerInToolsJar.patch. Closes: #446053.
* Add tools.jar link.
-- Michael Koch <konqueror at gmx.de> Fri, 12 Oct 2007 20:29:48 +0200
Modified: trunk/kaffe/debian/changelog
===================================================================
--- trunk/kaffe/debian/changelog 2007-10-18 05:46:37 UTC (rev 4434)
+++ trunk/kaffe/debian/changelog 2007-10-19 04:56:00 UTC (rev 4435)
@@ -1,3 +1,11 @@
+kaffe (2:1.1.8-3) unstable; urgency=low
+
+ * Reincluded debian/patches/02_IncludeEcjCompilerInToolsJar_Makefile.patch
+ and debian/patches/02_IncludeEcjCompilerInToolsJar.patch. Closes: #446053.
+ * Add tools.jar link.
+
+ -- Michael Koch <konqueror at gmx.de> Fri, 12 Oct 2007 20:29:48 +0200
+
kaffe (2:1.1.8-2) unstable; urgency=low
* Fix glibj.zip link for pthreads. Closes: #445469.
Added: trunk/kaffe/debian/kaffe-jthreads.links
===================================================================
--- trunk/kaffe/debian/kaffe-jthreads.links (rev 0)
+++ trunk/kaffe/debian/kaffe-jthreads.links 2007-10-19 04:56:00 UTC (rev 4435)
@@ -0,0 +1 @@
+usr/lib/kaffe/jthreads/lib/kaffe-classpath-tools.jar usr/lib/kaffe/jthreads/lib/tools.jar
Added: trunk/kaffe/debian/kaffe-pthreads.links
===================================================================
--- trunk/kaffe/debian/kaffe-pthreads.links (rev 0)
+++ trunk/kaffe/debian/kaffe-pthreads.links 2007-10-19 04:56:00 UTC (rev 4435)
@@ -0,0 +1 @@
+usr/lib/kaffe/pthreads/lib/kaffe-classpath-tools.jar usr/lib/kaffe/pthreads/lib/tools.jar
Added: trunk/kaffe/debian/patches/02_IncludeEcjCompilerInToolsJar.patch
===================================================================
--- trunk/kaffe/debian/patches/02_IncludeEcjCompilerInToolsJar.patch (rev 0)
+++ trunk/kaffe/debian/patches/02_IncludeEcjCompilerInToolsJar.patch 2007-10-19 04:56:00 UTC (rev 4435)
@@ -0,0 +1,108 @@
+--- /dev/null 2005-12-09 08:19:17.504520000 +0100
++++ kaffe-1.1.8/tools/javatools/com/sun/tools/javac/Main.java 2005-12-09 10:06:43.000000000 +0100
+@@ -0,0 +1,105 @@
++/* Main.java -- implement com.sun.tools.javac.Main
++ Copyright (C) 2004 Red Hat
++
++This file is part of java-gcj-compat.
++
++java-gcj-compat 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.
++
++java-gcj-compat 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 java-gcj-compat; see the file COPYING. If not, write to the
++Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
++02111-1307 USA.
++
++Linking this library statically or dynamically with other modules is
++making a combined work based on this library. Thus, the terms and
++conditions of the GNU General Public License cover the whole
++combination.
++
++As a special exception, the copyright holders of this library give you
++permission to link this library with independent modules to produce an
++executable, regardless of the license terms of these independent
++modules, and to copy and distribute the resulting executable under
++terms of your choice, provided that you also meet, for each linked
++independent module, the terms and conditions of the license of that
++module. An independent module is a module which is not derived from
++or based on this library. If you modify this library, you may extend
++this exception to your version of the library, but you are not
++obligated to do so. If you do not wish to do so, delete this
++exception statement from your version. */
++
++package com.sun.tools.javac;
++
++import java.io.*;
++import java.net.*;
++import java.lang.reflect.*;
++
++public class Main
++{
++ Constructor ecjConstructor = null;
++ Method ecjMethod = null;
++
++ public Main () throws Exception
++ {
++ String classname = "org.eclipse.jdt.internal.compiler.batch.Main";
++ Class klass = null;
++ try
++ {
++ klass = Class.forName (classname);
++ }
++ catch (ClassNotFoundException e)
++ {
++ File jar = new File ("/usr/share/java/eclipse-ecj.jar");
++ if (!jar.exists () || !jar.canRead ())
++ jar = new File ("/usr/share/java/ecj.jar");
++ if (!jar.exists () || !jar.canRead ())
++ throw e;
++
++ ClassLoader loader = new URLClassLoader(new URL[] {jar.toURL ()});
++ try
++ {
++ klass = loader.loadClass (classname);
++ }
++ catch (ClassNotFoundException f)
++ {
++ throw e;
++ }
++ }
++
++ ecjConstructor = klass.getConstructor (new Class[] {
++ PrintWriter.class, PrintWriter.class, Boolean.TYPE});
++ ecjMethod = klass.getMethod ("compile", new Class[] {String[].class});
++ }
++
++ public int compile (String[] args) throws Exception
++ {
++ /*
++ * This code depends on the patch in Comment #10 in this bug
++ * report:
++ *
++ * https://bugs.eclipse.org/bugs/show_bug.cgi?id=88364
++ */
++ Object ecjInstance = ecjConstructor.newInstance (new Object[] {
++ new PrintWriter (System.out),
++ new PrintWriter (System.err),
++ Boolean.FALSE});
++ return ((Boolean) ecjMethod.invoke (ecjInstance, new Object[] {
++ args})).booleanValue() ? 0 : -1;
++ }
++
++ public static void main (String[] args) throws Exception
++ {
++ Main javac = new Main ();
++
++ int result = javac.compile (args);
++
++ Runtime.getRuntime ().exit (result);
++ }
++}
Added: trunk/kaffe/debian/patches/02_IncludeEcjCompilerInToolsJar_Makefile.patch
===================================================================
--- trunk/kaffe/debian/patches/02_IncludeEcjCompilerInToolsJar_Makefile.patch (rev 0)
+++ trunk/kaffe/debian/patches/02_IncludeEcjCompilerInToolsJar_Makefile.patch 2007-10-19 04:56:00 UTC (rev 4435)
@@ -0,0 +1,44 @@
+--- kaffe-1.1.8/tools/javatools/Makefile.am.orig 2007-10-19 00:07:36.000000000 +0200
++++ kaffe-1.1.8/tools/javatools/Makefile.am 2007-10-19 00:09:50.000000000 +0200
+@@ -1,8 +1,8 @@
+ CLASSFILE = kaffe-classpath-tools.jar
+-SRCDIRS = gnu
++SRCDIRS = gnu com
+ toolslib_DATA = $(CLASSFILE)
+ LIBDIR = lib
+-JAR_CMD1 = ($(FASTJAR) cf $(CLASSFILE) -C $(LIBDIR) $(SRCDIRS))
++JAR_CMD1 = ($(FASTJAR) cf $(CLASSFILE) -C $(LIBDIR) gnu; $(FASTJAR) uf $(CLASSFILE) -C $(LIBDIR) com)
+
+ CPATH = .:$(LIBDIR):$(GLIBJ_ZIP)
+ AM_JAVACFLAGS = -classpath $(CPATH)
+@@ -25,6 +25,7 @@
+ toolsdir = $(FAKE)
+
+ dist_tools_JAVA = \
++ com/sun/tools/javac/Main.java \
+ gnu/classpath/tools/javap/GnuByteCodeJavap.java \
+ gnu/classpath/tools/javap/Javap.java \
+ gnu/classpath/tools/javap/JavapMain.java \
+--- kaffe-1.1.8/tools/javatools/Makefile.in.orig 2007-10-19 00:07:49.000000000 +0200
++++ kaffe-1.1.8/tools/javatools/Makefile.in 2007-10-19 00:11:55.000000000 +0200
+@@ -286,10 +286,10 @@
+ top_srcdir = @top_srcdir@
+ with_engine = @with_engine@
+ CLASSFILE = kaffe-classpath-tools.jar
+-SRCDIRS = gnu
++SRCDIRS = gnu com
+ toolslib_DATA = $(CLASSFILE)
+ LIBDIR = lib
+-JAR_CMD1 = ($(FASTJAR) cf $(CLASSFILE) -C $(LIBDIR) $(SRCDIRS))
++JAR_CMD1 = ($(FASTJAR) cf $(CLASSFILE) -C $(LIBDIR) gnu; $(FASTJAR) uf $(CLASSFILE) -C $(LIBDIR) com)
+ CPATH = .:$(LIBDIR):$(GLIBJ_ZIP)
+ AM_JAVACFLAGS = -classpath $(CPATH)
+ JAVAC = $(JAVA_COMPILER)
+@@ -299,6 +299,7 @@
+ FAKE = fakeinstall
+ toolsdir = $(FAKE)
+ dist_tools_JAVA = \
++ com/sun/tools/javac/Main.java \
+ gnu/classpath/tools/javap/GnuByteCodeJavap.java \
+ gnu/classpath/tools/javap/Javap.java \
+ gnu/classpath/tools/javap/JavapMain.java \
More information about the pkg-java-commits
mailing list