This adds a wrapper so that our javah can be invoked when something horrible (like Ant) thinks it's Sun's...
Changelog:
2007-06-21 Andrew John Hughes <[EMAIL PROTECTED]>
* tools/Makefile.am:
Compile in com.sun.tools.javah
* tools/com/sun/tools/javah/Main.java:
Javah Sun-->Classpath wrapper.
--
Andrew :-)
Escape the Java Trap with GNU Classpath!
http://www.gnu.org/philosophy/java-trap.html
public class gcj extends Freedom implements Java { ... }
Index: tools/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/tools/Makefile.am,v
retrieving revision 1.39
diff -u -3 -p -u -r1.39 Makefile.am
--- tools/Makefile.am 17 Mar 2007 00:01:47 -0000 1.39
+++ tools/Makefile.am 21 Jun 2007 21:51:28 -0000
@@ -103,6 +103,7 @@ TOOLS_JAVA_FILES = $(srcdir)/gnu/classpa
$(srcdir)/com/sun/javadoc/*.java \
$(srcdir)/com/sun/tools/doclets/*.java \
$(srcdir)/com/sun/tools/javac/*.java \
+ $(srcdir)/com/sun/tools/javah/*.java \
$(srcdir)/sun/rmi/rmic/*.java \
$(srcdir)/external/asm/org/objectweb/asm/*.java \
$(srcdir)/external/asm/org/objectweb/asm/attrs/*.java \
@@ -162,6 +163,7 @@ $(TOOLS_ZIP): $(TOOLS_JAVA_FILES)
$(srcdir)/com/sun/javadoc \
$(srcdir)/com/sun/tools/doclets \
$(srcdir)/com/sun/tools/javac \
+ $(srcdir)/com/sun/tools/javah \
$(srcdir)/sun/rmi/rmic \
-name '*.java' -print > classes.lst
$(JCOMPILER) -g -d classes @classes.lst
Index: tools/com/sun/tools/javah/Main.java
===================================================================
RCS file: tools/com/sun/tools/javah/Main.java
diff -N tools/com/sun/tools/javah/Main.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ tools/com/sun/tools/javah/Main.java 21 Jun 2007 21:51:28 -0000
@@ -0,0 +1,58 @@
+/* Main.java -- implement com.sun.tools.javah.Main
+ Copyright (C) 2007 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath 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.
+
+GNU Classpath 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 GNU Classpath; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 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.javah;
+
+import java.io.IOException;
+
+public class Main
+{
+
+ public static void main(String[] args)
+ {
+ try
+ {
+ gnu.classpath.tools.javah.Main.main(args);
+ }
+ catch (IOException e)
+ {
+ throw new IllegalArgumentException("An I/O error occurred " +
+ "in executing javah", e);
+ }
+ }
+}
signature.asc
Description: Digital signature
