r1819 - in trunk/kaffe/debian: . man patches wrappers
Wolfgang Bär
wbaer-guest at costa.debian.org
Thu Jan 26 19:30:31 UTC 2006
Author: wbaer-guest
Date: 2006-01-26 19:30:30 +0000 (Thu, 26 Jan 2006)
New Revision: 1819
Added:
trunk/kaffe/debian/kaffe-jthreads.lintian
trunk/kaffe/debian/kaffe-pthreads.lintian
trunk/kaffe/debian/patches/00_ECJ_Configure.patch
trunk/kaffe/debian/patches/01_RemoveJikesBuildCompilerSetting.patch
trunk/kaffe/debian/patches/02_IncludeEcjCompilerInToolsJar.patch
trunk/kaffe/debian/patches/02_IncludeEcjCompilerInToolsJar_Makefile.patch
Removed:
trunk/kaffe/debian/man/appletviewer.kaffe.1
trunk/kaffe/debian/man/jdb.kaffe.1
trunk/kaffe/debian/patches/01_Tomcat4SecurityManager.patch
trunk/kaffe/debian/patches/02_JarCacheUse_Fix.patch
Modified:
trunk/kaffe/debian/FileActions
trunk/kaffe/debian/changelog
trunk/kaffe/debian/control
trunk/kaffe/debian/kaffe.links
trunk/kaffe/debian/kaffe.lintian
trunk/kaffe/debian/man/javah.kaffe.1
trunk/kaffe/debian/man/javap.kaffe.1
trunk/kaffe/debian/man/native2ascii.kaffe.1
trunk/kaffe/debian/man/rmic.kaffe.1
trunk/kaffe/debian/man/rmiregistry.kaffe.1
trunk/kaffe/debian/man/serialver.kaffe.1
trunk/kaffe/debian/patches/03_RegisterIconvCharsetProvider.patch
trunk/kaffe/debian/rules
trunk/kaffe/debian/wrappers/javadoc
trunk/kaffe/debian/wrappers/jikes-kaffe
Log:
Update svn to 1.1.6.91-2
Modified: trunk/kaffe/debian/FileActions
===================================================================
--- trunk/kaffe/debian/FileActions 2006-01-26 19:23:46 UTC (rev 1818)
+++ trunk/kaffe/debian/FileActions 2006-01-26 19:30:30 UTC (rev 1819)
@@ -14,11 +14,11 @@
############## runtime library ###################
-File: usr/lib/kaffe/jthreads/jre/lib/{rt.jar,gmpjavamath.jar}
+File: usr/lib/kaffe/jthreads/jre/lib/{glibj.zip,gmpjavamath.jar}
Target: usr/share/kaffe-common/lib
Action: move-link
-File: usr/lib/kaffe/pthreads/jre/lib/{rt.jar,gmpjavamath.jar}
+File: usr/lib/kaffe/pthreads/jre/lib/{glibj.zip,gmpjavamath.jar}
Target: usr/share/kaffe-common/lib
Action: link
@@ -67,4 +67,3 @@
Action: delete
#####################################################
-
Modified: trunk/kaffe/debian/changelog
===================================================================
--- trunk/kaffe/debian/changelog 2006-01-26 19:23:46 UTC (rev 1818)
+++ trunk/kaffe/debian/changelog 2006-01-26 19:30:30 UTC (rev 1819)
@@ -1,3 +1,50 @@
+kaffe (2:1.1.6.91-2) unstable; urgency=low
+
+ * Fix build-depends - I just learned that the autobuilders don't take
+ the alternatives. Use ecj-bootstrap-gcj only on available architectures.
+ * Adapt patch of charset provider patch to new upstream layout.
+
+ -- Wolfgang Baer <WBaer at gmx.de> Tue, 17 Jan 2006 17:13:49 +0100
+
+kaffe (2:1.1.6.91-1) unstable; urgency=low
+
+ * New upstream release candidate 1 (1.1.7-rc1)
+ + Dropped patches which are applied upstream
+ 01_Tomcat4SecurityManager.patch, 02_JarCacheUse_Fix.patch
+ + Updated patch 03_RegisterIconvCharsetProvider.patch
+ + Fixes gui apps assertion failure (closes: #337560, #335649)
+ + Fixes empty file handling causing a failure of rmic (closes: #335227)
+ + Fixes xml handling leading to NPE in eclipse ant code (closes: #338599)
+ * Adjusted configure options and paths for upstream changes
+ + Use --with-glibj-zip instead of --with-rt-jar configure option
+ + Update glibj.zip location for pthreads configure option
+ + debian/FileActions, debian/wrappers/jikes-kaffe
+ adjust for change of rt.jar into glibj.zip (added lintian override)
+ + debian/kaffe.links, removed link Klasses.jar
+ + Configure with --disable-fastjar - use system fastjar instead
+ * xorg build-deps transition (closes: #346714)
+ Removed xlibs-dev, added libxtst-dev, libx11-dev, libxext-dev
+ libxtst-dev and x-dev to Build-Dependencies
+ * Switch compiler to ecj by default
+ + debian/control: build-depend on ecj-bootstrap-gcj | ecj-bootstrap,
+ kaffe-pthreads, kaffe-jthreads depend on ecj-bootstrap instead of jikes
+ + Remove rules.arm, rules.mips - ecj is now default compiler
+ + debian/rules: use /usr/bin/ecj alternative, adjust glibj.zip path
+ and make ecj default compiler
+ + Removed hardcoded 'build.compiler=jikes' property in
+ VMsystemProperties.java to allow ecj usage
+ (01_RemoveJikesBuildCompilerSetting.patch).
+ + Applied patches (02_IncludeEcjCompilerInToolsJar*.patch) shamelessly
+ stolen from java-gcj-compat upstream to supply a com/sun/ entrypoint
+ to ecj for usage by ant
+ + Adjusted jikes-kaffe wrapper script, reworked dependencies
+ * Bumped debhelper version to 4
+ * Configure with --disable-rpath to fix tons of lintian warnings
+ * Rewritten and enhanced manpages - javah, javap, native2ascii, rmic,
+ rmiregistry, serialver (closes: #338628)
+
+ -- Wolfgang Baer <WBaer at gmx.de> Sun, 15 Jan 2006 14:23:52 +0100
+
kaffe (2:1.1.6-3) unstable; urgency=low
* Fix configure options for sparc build (closes: #330110)
Modified: trunk/kaffe/debian/control
===================================================================
--- trunk/kaffe/debian/control 2006-01-26 19:23:46 UTC (rev 1818)
+++ trunk/kaffe/debian/control 2006-01-26 19:30:30 UTC (rev 1819)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Ean R. Schuessler <ean at novare.net>, Arnaud Vandyck <avdyk at debian.org>, Adam Heath <doogie at brainfood.com>, Michael Koch <konqueror at gmx.de>, Jeroen van Wolffelaar <jeroen at wolffelaar.nl>, Wolfgang Baer <WBaer at gmx.de>
-Build-Depends: debhelper (>= 4.1), xlibs-dev, libpng12-dev, libjpeg62-dev, libungif4-dev, zlib1g-dev, libgmp3-dev, xutils, dbs, zip, jikes [!arm !mipsel], ecj-bootstrap [arm mipsel], libgtk2.0-dev, libart-2.0-dev, libxml2-dev, libxslt1-dev, libasound2-dev, libesd0-dev, libcairo2-dev
+Build-Depends: debhelper (>= 4.1), libpng12-dev, libjpeg62-dev, libungif4-dev, zlib1g-dev, libgmp3-dev, xutils, dbs, zip, ecj-bootstrap, ecj-bootstrap-gcj [alpha arm hppa i386 ia64 powerpc s390 sparc], libgtk2.0-dev, libart-2.0-dev, libxml2-dev, libxslt1-dev, libasound2-dev, libesd0-dev, libcairo2-dev, libxtst-dev, libx11-dev, libxext-dev, libxtst-dev, x-dev
Standards-Version: 3.6.2
Package: kaffe
@@ -25,7 +25,7 @@
Package: kaffe-jthreads
Architecture: any
Pre-Depends: kaffe-common (= ${Source-Version})
-Depends: ${shlibs:Depends}, jikes, gjdoc, fastjar
+Depends: ${shlibs:Depends}, ecj-bootstrap, gjdoc, fastjar
Provides: java-virtual-machine, java-runtime, java1-runtime, java-compiler, kaffe
Description: A green threads enabled version of the Kaffe VM
Green threads enabled compiler for the Kaffe VM for situations where native
@@ -34,7 +34,7 @@
Package: kaffe-pthreads
Architecture: any
Pre-Depends: kaffe-common (= ${Source-Version})
-Depends: ${shlibs:Depends}, jikes, gjdoc, fastjar
+Depends: ${shlibs:Depends}, ecj-bootstrap, gjdoc, fastjar
Provides: java-virtual-machine, java-runtime, java1-runtime, java-compiler, kaffe
Description: A POSIX threads enabled version of the Kaffe VM
This will allow your multithreaded Java programs take advantage of native
@@ -57,11 +57,11 @@
Package: jikes-kaffe
Architecture: all
-Depends: jikes, kaffe (= ${Source-Version}), java-common
+Depends: jikes, kaffe-common (= ${Source-Version})
Provides: java-compiler
Description: Wrapper for jikes using Kaffe classes
This package provides a jikes wrapper called jikes-kaffe that will include
- Kaffe's Klasses in the bootclasspath.
+ Kaffe's runtime library in the bootclasspath.
Package: kaffe-doc
Architecture: all
Added: trunk/kaffe/debian/kaffe-jthreads.lintian
===================================================================
--- trunk/kaffe/debian/kaffe-jthreads.lintian 2006-01-26 19:23:46 UTC (rev 1818)
+++ trunk/kaffe/debian/kaffe-jthreads.lintian 2006-01-26 19:30:30 UTC (rev 1819)
@@ -0,0 +1,2 @@
+# jar to zip is compatible
+kaffe-jthreads: compressed-symlink-with-wrong-ext
Added: trunk/kaffe/debian/kaffe-pthreads.lintian
===================================================================
--- trunk/kaffe/debian/kaffe-pthreads.lintian 2006-01-26 19:23:46 UTC (rev 1818)
+++ trunk/kaffe/debian/kaffe-pthreads.lintian 2006-01-26 19:30:30 UTC (rev 1819)
@@ -0,0 +1,2 @@
+# jar to zip is compatible
+kaffe-pthreads: compressed-symlink-with-wrong-ext
Modified: trunk/kaffe/debian/kaffe.links
===================================================================
--- trunk/kaffe/debian/kaffe.links 2006-01-26 19:23:46 UTC (rev 1818)
+++ trunk/kaffe/debian/kaffe.links 2006-01-26 19:30:30 UTC (rev 1819)
@@ -1,2 +1 @@
usr/lib/kaffe/bin/kaffe usr/bin/kaffe
-usr/share/kaffe-common/lib/rt.jar usr/share/kaffe/Klasses.jar
Modified: trunk/kaffe/debian/kaffe.lintian
===================================================================
--- trunk/kaffe/debian/kaffe.lintian 2006-01-26 19:23:46 UTC (rev 1818)
+++ trunk/kaffe/debian/kaffe.lintian 2006-01-26 19:30:30 UTC (rev 1819)
@@ -1 +1,2 @@
+# manpage in kaffe-common
kaffe: binary-without-manpage
Deleted: trunk/kaffe/debian/man/appletviewer.kaffe.1
===================================================================
--- trunk/kaffe/debian/man/appletviewer.kaffe.1 2006-01-26 19:23:46 UTC (rev 1818)
+++ trunk/kaffe/debian/man/appletviewer.kaffe.1 2006-01-26 19:30:30 UTC (rev 1819)
@@ -1,32 +0,0 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.33.
-.TH USAGE: "1" "July 2004" "Usage: appletviewer <options> url(s)" "appletviewer"
-.SH NAME
-Usage: \- appletviewer
-.SH SYNOPSIS
-.B appletviewer
-\fI<options> url(s)\fR
-.SH DESCRIPTION
-.SS "where <options> include:"
-.TP
-\fB\-debug\fR
-Start the applet viewer in the Java debugger
-.TP
-\fB\-encoding\fR <encoding>
-Specify character encoding used by HTML files
-.TP
-\fB\-J\fR<runtime flag>
-Pass argument to the java interpreter
-.PP
-The \fB\-J\fR option is non-standard and subject to change without notice.
-.SS "where <options> include:"
-.TP
-\fB\-debug\fR
-Start the applet viewer in the Java debugger
-.TP
-\fB\-encoding\fR <encoding>
-Specify character encoding used by HTML files
-.TP
-\fB\-J\fR<runtime flag>
-Pass argument to the java interpreter
-.PP
-The \fB\-J\fR option is non-standard and subject to change without notice.
Modified: trunk/kaffe/debian/man/javah.kaffe.1
===================================================================
--- trunk/kaffe/debian/man/javah.kaffe.1 2006-01-26 19:23:46 UTC (rev 1818)
+++ trunk/kaffe/debian/man/javah.kaffe.1 2006-01-26 19:30:30 UTC (rev 1819)
@@ -1,35 +1,49 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.28.
-.TH JAVAH: "1" "August 2002"
+.TH JAVAH "1" "January 2006" "javah (Kaffe)" ""
+
.SH NAME
javah \- C header and stub file generator
+
.SH SYNOPSIS
.B javah
[\fIOPTION\fR]... [\fICLASS\fR]...
+
.SH DESCRIPTION
-Generate header files for the given classes.
+\fBjavah\fR generate C header and stub files for the given classes.
+The generated files are used to implement the native methods which are called
+from the java code.
+
+.SH OPTIONS
.TP
-\fB\-classpath\fR PATH
+\fB\-help\fR
+Print this usage message
+.TP
+\fB\-version\fR
+Print version information
+.TP
+\fB\-classpath\fR \fi<path>\fR
Specify where to find user class files
.TP
-\fB\-d\fR DIR
-Specify an output directory
+\fB\-bootclasspath\fR \fi<path>\fR
+Sets the bootclasspath to given path.
.TP
-\fB\-help\fR
-Print this usage message
-.TP
\fB\-jni\fR
Generate JNI header file (default)
.TP
-\fB\-o\fR FILE
+\fB\-o\fR \fi<file>\fR
Specify an output file, cannot be used with \fB\-d\fR
.TP
-\fB\-version\fR
-Print version number
-.PP
-.RE
-.SH SEE ALSO
+\fB\-d\fR \fi<directory>\fR
+Specify an output directory
+.TP
+\fB\-Xdebug\fR \fi<opts>\fR
+Specify Kaffe debug options.
+
+.SH "SEE ALSO"
.BR java (1),
.BR javac (1),
.BR javadoc (1),
.BR javap (1),
-.BR jdb (1)
+
+.SH AUTHOR
+This manual page was written by Wolfgang Baer <WBaer at gmx.de>,
+for the Debian project (but may be used by others).
Modified: trunk/kaffe/debian/man/javap.kaffe.1
===================================================================
--- trunk/kaffe/debian/man/javap.kaffe.1 2006-01-26 19:23:46 UTC (rev 1818)
+++ trunk/kaffe/debian/man/javap.kaffe.1 2006-01-26 19:30:30 UTC (rev 1819)
@@ -1,36 +1,34 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.33.
-.TH JAVAP "1" "July 2004" "javap " "User Commands"
+.TH JAVAP: "1" "January 2006" "javap (kaffe)" ""
+
.SH NAME
-javap \- javap
+javap \- Class file disassembler.
+
.SH SYNOPSIS
.B javap
-\fI<options> <classes>\fR...
+[\fIOPTION\fR]... [\fICLASS\fR]...
+
.SH DESCRIPTION
+\fBjavap\fR disassembles class files and sends the output to stdout. The
+amount of output is controlled by the options. Without any options only
+the fields and methods with protected and public visibility are printed.
+
This utility can be used to reverse assemble code. Many program license
agreements do not permit reverse assembly. If you are not the copyright
owner of the code which you want to reverse assemble, please check the
license agreement under which you acquired such code to confirm whether
you are permitted to perform such reverse assembly.
-.SS "where options include:"
+
+.SH OPTIONS
.TP
-\fB\-b\fR
-Backward compatibility with javap in JDK 1.1
-.TP
\fB\-c\fR
Disassemble the code
.TP
-\fB\-classpath\fR <pathlist>
+\fB\-classpath\fR \fI<path>\fR
Specify where to find user class files
.TP
-\fB\-extdirs\fR <dirs>
-Override location of installed extensions
-.TP
\fB\-help\fR
Print this usage message
.TP
-\fB\-J\fR<flag>
-Pass <flag> directly to the runtime system
-.TP
\fB\-l\fR
Print line number and local variable tables
.TP
@@ -38,74 +36,17 @@
Show only public classes and members
.TP
\fB\-protected\fR
-Show protected/public classes and members
+Show public and protected classes and members
.TP
-\fB\-package\fR
-Show package/protected/public classes
-and members (default)
-.TP
\fB\-private\fR
Show all classes and members
.TP
\fB\-s\fR
Print internal type signatures
.TP
-\fB\-bootclasspath\fR <pathlist> Override location of class files loaded
-by the bootstrap class loader
-.TP
\fB\-verbose\fR
Print stack size, number of locals and args for methods
-If verifying, print reasons for failure
-.PP
-This utility can be used to reverse assemble code. Many program license
-agreements do not permit reverse assembly. If you are not the copyright
-owner of the code which you want to reverse assemble, please check the
-license agreement under which you acquired such code to confirm whether
-you are permitted to perform such reverse assembly.
-.PP
-Usage: javap <options> <classes>...
-.SS "where options include:"
-.TP
-\fB\-b\fR
-Backward compatibility with javap in JDK 1.1
-.TP
-\fB\-c\fR
-Disassemble the code
-.TP
-\fB\-classpath\fR <pathlist>
-Specify where to find user class files
-.TP
-\fB\-extdirs\fR <dirs>
-Override location of installed extensions
-.TP
-\fB\-help\fR
-Print this usage message
-.TP
-\fB\-J\fR<flag>
-Pass <flag> directly to the runtime system
-.TP
-\fB\-l\fR
-Print line number and local variable tables
-.TP
-\fB\-public\fR
-Show only public classes and members
-.TP
-\fB\-protected\fR
-Show protected/public classes and members
-.TP
-\fB\-package\fR
-Show package/protected/public classes
-and members (default)
-.TP
-\fB\-private\fR
-Show all classes and members
-.TP
-\fB\-s\fR
-Print internal type signatures
-.TP
-\fB\-bootclasspath\fR <pathlist> Override location of class files loaded
-by the bootstrap class loader
-.TP
-\fB\-verbose\fR
-Print stack size, number of locals and args for methods
-If verifying, print reasons for failure
+
+.SH AUTHOR
+This manual page was written by Wolfgang Baer <WBaer at gmx.de>,
+for the Debian project (but may be used by others).
Deleted: trunk/kaffe/debian/man/jdb.kaffe.1
===================================================================
--- trunk/kaffe/debian/man/jdb.kaffe.1 2006-01-26 19:23:46 UTC (rev 1818)
+++ trunk/kaffe/debian/man/jdb.kaffe.1 2006-01-26 19:30:30 UTC (rev 1819)
@@ -1,105 +0,0 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.33.
-.TH INVALID "1" "July 2004" "invalid option: --version" "User Commands"
-.SH NAME
-invalid \- jdb
-.SH SYNOPSIS
-.B jdb
-\fI<options> <class> <arguments>\fR
-.SH DESCRIPTION
-invalid option: \fB\-\-help\fR
-.SS "where options include:"
-.TP
-\fB\-help\fR
-print out this message and exit
-.TP
-\fB\-sourcepath\fR <directories separated by ":">
-directories in which to look for source files
-.TP
-\fB\-attach\fR <address>
-attach to a running VM at the specified address
-using standard connector
-.TP
-\fB\-listen\fR <address>
-wait for a running VM to connect at the specified
-address using standard connector
-.TP
-\fB\-listenany\fR
-wait for a running VM to connect at any available
-address using standard connector
-.TP
-\fB\-launch\fR
-launch VM immediately instead of waiting for 'run'
-command
-.TP
-\fB\-connect\fR <connector-name>:<name1>=<value1>,...
-connect to target VM using named connector with
-listed argument values
-.HP
-\fB\-dbgtrace\fR [flags] print info for debugging jdb
-.SS "options forwarded to debuggee process:"
-.TP
-\fB\-v\fR \fB\-verbose[\fR:class|gc|jni]
-turn on verbose mode
-.TP
-\fB\-D\fR<name>=<value>
-set a system property
-.TP
-\fB\-classpath\fR <directories separated by ":">
-list directories in which to look for classes
-.TP
-\fB\-X\fR<option>
-non-standard target VM option
-.PP
-<class> is the name of the class to begin debugging
-<arguments> are the arguments passed to the main() method of <class>
-.PP
-For command help type 'help' at jdb prompt
-.PP
-Usage: jdb <options> <class> <arguments>
-.SS "where options include:"
-.TP
-\fB\-help\fR
-print out this message and exit
-.TP
-\fB\-sourcepath\fR <directories separated by ":">
-directories in which to look for source files
-.TP
-\fB\-attach\fR <address>
-attach to a running VM at the specified address
-using standard connector
-.TP
-\fB\-listen\fR <address>
-wait for a running VM to connect at the specified
-address using standard connector
-.TP
-\fB\-listenany\fR
-wait for a running VM to connect at any available
-address using standard connector
-.TP
-\fB\-launch\fR
-launch VM immediately instead of waiting for 'run'
-command
-.TP
-\fB\-connect\fR <connector-name>:<name1>=<value1>,...
-connect to target VM using named connector with
-listed argument values
-.HP
-\fB\-dbgtrace\fR [flags] print info for debugging jdb
-.SS "options forwarded to debuggee process:"
-.TP
-\fB\-v\fR \fB\-verbose[\fR:class|gc|jni]
-turn on verbose mode
-.TP
-\fB\-D\fR<name>=<value>
-set a system property
-.TP
-\fB\-classpath\fR <directories separated by ":">
-list directories in which to look for classes
-.TP
-\fB\-X\fR<option>
-non-standard target VM option
-.PP
-<class> is the name of the class to begin debugging
-<arguments> are the arguments passed to the main() method of <class>
-.PP
-For command help type 'help' at jdb prompt
Modified: trunk/kaffe/debian/man/native2ascii.kaffe.1
===================================================================
--- trunk/kaffe/debian/man/native2ascii.kaffe.1 2006-01-26 19:23:46 UTC (rev 1818)
+++ trunk/kaffe/debian/man/native2ascii.kaffe.1 2006-01-26 19:30:30 UTC (rev 1819)
@@ -1,23 +1,24 @@
-.TH USAGE: "1" "April 2005" "Usage: native2ascii"
+.TH NATIVE2ASCII "1" "January 2006" "native2ascii (Kaffe)" ""
+
.SH NAME
-native2ascii \- converts a file with native-encoded to one with unicode-encoded characters
+native2ascii \- Converts a file with native-encoded to one with
+unicode-encoded characters
.SH SYNOPSIS
.B native2ascii
\fI<options> [infile] [outfile]\fR
.SH DESCRIPTION
+\fBnative2ascii\fR is a utility program which converts files containing other
+character encodings into files with Latin-1 and / or Unicode-encoded
+characters. If \fIoutfile\fR is omitted, standard output is used for output.
-.PP
-\fBnative2ascii\fR is a utility program which converts files containing other character encodings
-into files with Latin-1 and / or Unicode-encoded characters. If \fIoutfile\fR is omitted, standard output is used for output.
-
-.SS "there is only one option:"
+.SH OPTION
.TP
\fB\-encoding\fR \fIencoding\fR
-Set the encoding to be used. If not provided the system property \fIfile.encoding\fR is used instead.
+Set the encoding to be used. If not provided the system
+property \fIfile.encoding\fR is used instead.
.SH AUTHOR
-
-.PP
-This manual page was written by Wolfgang Baer <WBaer at gmx.de>, for the Debian project (but may be used by others).
+This manual page was written by Wolfgang Baer <WBaer at gmx.de>,
+for the Debian project (but may be used by others).
Modified: trunk/kaffe/debian/man/rmic.kaffe.1
===================================================================
--- trunk/kaffe/debian/man/rmic.kaffe.1 2006-01-26 19:23:46 UTC (rev 1818)
+++ trunk/kaffe/debian/man/rmic.kaffe.1 2006-01-26 19:30:30 UTC (rev 1819)
@@ -1,61 +1,74 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.33.
-.TH RMIC "1" "July 2004" "rmic 3.5.0 20040623 (experimental)" "User Commands"
+.TH RMIC "1" "January 2006" "rmic (Kaffe)" ""
+
.SH NAME
-rmic \- rmic
+rmic \- Generate stubs for Remote Method Invocation
+
.SH SYNOPSIS
-.B rmic
+.B rmic
[\fIOPTION\fR]... \fICLASS\fR...
+
.SH DESCRIPTION
+\fBrmic\fR is a program to generate stubs for remote objects to be used with
+remote method invocation (RMI) in Java(tm) programs.
+
+\fBrmic\fR is executed on the successfully compiled \fICLASS\fR which needs to be
+a remote object. Remote objects are classes implementing the interface
+java.rmi.Remote.
+
+.SH OPTIONS
.TP
-\fB\-keep\fR
+\fB\-keep\fR *
Don't delete any intermediate files
.TP
-\fB\-keepgenerated\fR
+\fB\-keepgenerated\fR *
Same as \fB\-keep\fR
.TP
\fB\-v1\fR.1
-Java 1.1 style stubs only
+Generate Java 1.1 style stubs only
.TP
\fB\-vcompat\fR
-Java 1.1 & Java 1.2 stubs
+Generate Java 1.1 & Java 1.2 stubs
.TP
\fB\-v1\fR.2
-Java 1.2 style stubs only
+Generate Java 1.2 style stubs only
.TP
\fB\-g\fR *
-Generated debugging information
+Generate debugging information
.TP
\fB\-depend\fR *
-Recompile out-of-date files
+Recompile out\-of\-date files
.TP
\fB\-nowarn\fR *
Suppress warning messages
.TP
-\fB\-nocompile\fR
+\fB\-nocompile\fR *
Don't compile the generated files
.TP
\fB\-verbose\fR
-Output what's going on
+Be verbose in what's going on
.TP
-\fB\-classpath\fR <path> *
+\fB\-classpath\fR \fI<path>\fR
Use given path as classpath
.TP
-\fB\-d\fR <directory>
-Specify where to place generated classes
+\fB\-d\fR \fI<directory>\fR
+Place generated classes into given directory
.TP
-\fB\-J\fR<flag> *
+\fB\-J\fR \fI<flag>\fR *
Pass flag to Java
.TP
\fB\-help\fR
-Print this help, then exit
+Print this help
.TP
\fB\-version\fR
-Print version number, then exit
+Print version information
.IP
* Option currently ignored
.PP
-Long options can be used with `--option' form as well.
-.PP
-Copyright 2002 Free Software Foundation, Inc.
-This is free software; see the source for copying conditions. There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+.SH "SEE ALSO"
+.B rmiregistry
+- for the remote object registry tool.
+
+.SH AUTHOR
+This manual page was written by Wolfgang Baer <WBaer at gmx.de>,
+for the Debian project (but may be used by others).
Modified: trunk/kaffe/debian/man/rmiregistry.kaffe.1
===================================================================
--- trunk/kaffe/debian/man/rmiregistry.kaffe.1 2006-01-26 19:23:46 UTC (rev 1818)
+++ trunk/kaffe/debian/man/rmiregistry.kaffe.1 2006-01-26 19:30:30 UTC (rev 1819)
@@ -1,18 +1,35 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.33.
-.TH RMIREGISTRY "1" "July 2004" "rmiregistry 3.5.0 20040623 (experimental)" "User Commands"
+.TH RMIREGISTRY "1" "January 2006" "rmiregistry (Kaffe)" ""
+
.SH NAME
-rmiregistry \- rmiregistry
+rmiregistry \- Remote object registry
+
.SH SYNOPSIS
.B rmiregistry
[\fIOPTION | PORT\fR]
+
.SH DESCRIPTION
+\fBrmiregistry\fR creates and starts the remote object registry on the specified
+\fIPORT\fR on the host where it is executed. The standard port 1099 is used
+if no port is given as argument.
+
+The command can be run in the background: \fBrmiregistry &\fR
+
+The rmi remote registry provides a naming service to be used by RMI servers
+to bind remote objects to names. Clients can then lookup the remote
+objects by their name.
+
+.SH OPTIONS
.TP
\fB\-\-help\fR
-Print this help, then exit
+Print this help
.TP
\fB\-\-version\fR
-Print version number, then exit
-.PP
-Copyright 2002 Free Software Foundation, Inc.
-This is free software; see the source for copying conditions. There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+Print version information
+
+.SH "SEE ALSO"
+.B rmic
+- for the rmi stub compiler.
+
+.SH AUTHOR
+This manual page was written by Wolfgang Baer <WBaer at gmx.de>,
+for the Debian project (but may be used by others).
Modified: trunk/kaffe/debian/man/serialver.kaffe.1
===================================================================
--- trunk/kaffe/debian/man/serialver.kaffe.1 2006-01-26 19:23:46 UTC (rev 1818)
+++ trunk/kaffe/debian/man/serialver.kaffe.1 2006-01-26 19:30:30 UTC (rev 1819)
@@ -1,20 +1,15 @@
-.TH SERIALVER "1" "July 2004" "serialver" "User Commands"
+.TH SERIALVER "1" "January 2006" "serialver (Kaffe)" ""
+
.SH NAME
-serialver \- serialver
+serialver \- Returns the serialVersionUID of a Java(tm) class.
+
.SH SYNOPSIS
.B serialver
-[\fI\-classpath CLASSPATH\fR]
-[\fI\-show\fR]
-[\fICLASSNAME...\fR]
+[\fICLASSNAME\fR] \fI...\fR
+
.SH DESCRIPTION
-Get the value of the serialVersionUID field of a class.
-.TP
-\fB\-classpath\fR
-Set the classpath
-.TP
-\fB\-show\fR
-FIXME
-.PP
-Copyright 2002 Free Software Foundation, Inc.
-This is free software; see the source for copying conditions. There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+Returns the value of the serialVersionUID field of one or more given classes.
+
+.SH AUTHOR
+This manual page was written by Wolfgang Baer <WBaer at gmx.de>,
+for the Debian project (but may be used by others).
Added: trunk/kaffe/debian/patches/00_ECJ_Configure.patch
===================================================================
--- trunk/kaffe/debian/patches/00_ECJ_Configure.patch 2006-01-26 19:23:46 UTC (rev 1818)
+++ trunk/kaffe/debian/patches/00_ECJ_Configure.patch 2006-01-26 19:30:30 UTC (rev 1819)
@@ -0,0 +1,14 @@
+--- kaffe-1.1.6.91/libraries/javalib/external/classpath/configure.orig 2006-01-14 15:51:46.000000000 +0100
++++ kaffe-1.1.6.91/libraries/javalib/external/classpath/configure 2006-01-15 13:03:06.000000000 +0100
+@@ -27069,9 +27069,9 @@
+ fi
+
+
+- if test "x${GCJ}" = x && test "x${JIKES}" = x && test "x${user_specified_javac}" != xkjc && test "x${user_specified_javac}" != xgcjx; then
++ if test "x${GCJ}" = x && test "x${JIKES}" = x && test "x${user_specified_javac}" != xkjc && test "x${user_specified_javac}" != xgcjx && test "x${user_specified_javac}" != xecj; then
+ # FIXME: use autoconf error function
+- echo "configure: cannot find javac, try --with-gcj, --with-jikes, --with-kjc, or --with-gcjx" 1>&2
++ echo "configure: cannot find javac, try --with-gcj, --with-jikes, --with-kjc, --with-ecj or --with-gcjx" 1>&2
+ exit 1
+ fi
+
Added: trunk/kaffe/debian/patches/01_RemoveJikesBuildCompilerSetting.patch
===================================================================
--- trunk/kaffe/debian/patches/01_RemoveJikesBuildCompilerSetting.patch 2006-01-26 19:23:46 UTC (rev 1818)
+++ trunk/kaffe/debian/patches/01_RemoveJikesBuildCompilerSetting.patch 2006-01-26 19:30:30 UTC (rev 1819)
@@ -0,0 +1,14 @@
+--- kaffe-1.1.6.91/libraries/javalib/vmspecific/gnu/classpath/VMSystemProperties.java.orig 2005-10-19 22:15:26.000000000 +0200
++++ kaffe-1.1.6.91/libraries/javalib/vmspecific/gnu/classpath/VMSystemProperties.java 2005-12-09 10:04:26.000000000 +0100
+@@ -111,11 +111,6 @@
+ properties.setProperty("java.runtime.name", properties.getProperty("java.vm.name"));
+ properties.setProperty("java.runtime.version", properties.getProperty("java.vm.version"));
+
+- /* Define the default java compiler - this should be configured
+- * somehow.
+- */
+- properties.setProperty("kaffe.compiler", "jikes");
+- properties.setProperty("build.compiler", "jikes");
+ properties.setProperty("build.rmic", "kaffe");
+
+ // Invoke native methods to get the values of the other properties
Deleted: trunk/kaffe/debian/patches/01_Tomcat4SecurityManager.patch
===================================================================
--- trunk/kaffe/debian/patches/01_Tomcat4SecurityManager.patch 2006-01-26 19:23:46 UTC (rev 1818)
+++ trunk/kaffe/debian/patches/01_Tomcat4SecurityManager.patch 2006-01-26 19:30:30 UTC (rev 1819)
@@ -1,11 +0,0 @@
---- kaffe-1.1.6/libraries/javalib/java/security/VMAccessController.java.orig 2005-09-20 04:07:50.000000000 +0200
-+++ kaffe-1.1.6/libraries/javalib/java/security/VMAccessController.java 2005-09-22 22:00:17.000000000 +0200
-@@ -229,7 +229,7 @@
- // to doPrivileged.
- if (context != null)
- context = new AccessControlContext(result, context,
-- IntersectingDomainCombiner.SINGLETON);
-+ context.getDomainCombiner());
- // No context was supplied. Return the derived one.
- else
- context = new AccessControlContext(result);
Added: trunk/kaffe/debian/patches/02_IncludeEcjCompilerInToolsJar.patch
===================================================================
--- trunk/kaffe/debian/patches/02_IncludeEcjCompilerInToolsJar.patch 2006-01-26 19:23:46 UTC (rev 1818)
+++ trunk/kaffe/debian/patches/02_IncludeEcjCompilerInToolsJar.patch 2006-01-26 19:30:30 UTC (rev 1819)
@@ -0,0 +1,108 @@
+--- /dev/null 2005-12-09 08:19:17.504520000 +0100
++++ kaffe-1.1.6.91/tools/javatools/javalib/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 2006-01-26 19:23:46 UTC (rev 1818)
+++ trunk/kaffe/debian/patches/02_IncludeEcjCompilerInToolsJar_Makefile.patch 2006-01-26 19:30:30 UTC (rev 1819)
@@ -0,0 +1,39 @@
+--- kaffe-1.1.6.91/tools/javatools/javalib/Makefile.am.orig 2005-12-09 10:45:27.000000000 +0100
++++ kaffe-1.1.6.91/tools/javatools/javalib/Makefile.am 2005-12-09 10:46:33.000000000 +0100
+@@ -8,11 +8,12 @@
+ # of this file.
+
+ CLASSFILE = tools.jar
+-SRCDIRS = gnu
++SRCDIRS = gnu com
+
+ toolslib_DATA = $(CLASSFILE)
+
+ tools_jar_SRCS = \
++ com/sun/tools/javac/Main.java \
+ gnu/classpath/tools/Util.java \
+ gnu/classpath/tools/javap/GnuByteCodeJavap.java \
+ gnu/classpath/tools/javap/Javap.java \
+--- kaffe-1.1.6.91/tools/javatools/javalib/Makefile.in.orig 2005-12-09 10:45:27.000000000 +0100
++++ kaffe-1.1.6.91/tools/javatools/javalib/Makefile.in 2005-12-09 10:48:21.000000000 +0100
+@@ -345,9 +345,10 @@
+ toolslibdir = @toolslibdir@
+ with_engine = @with_engine@
+ CLASSFILE = tools.jar
+-SRCDIRS = gnu
++SRCDIRS = gnu com
+ toolslib_DATA = $(CLASSFILE)
+ tools_jar_SRCS = \
++ com/sun/tools/javac/Main.java \
+ gnu/classpath/tools/Util.java \
+ gnu/classpath/tools/javap/GnuByteCodeJavap.java \
+ gnu/classpath/tools/javap/Javap.java \
+@@ -433,7 +434,7 @@
+
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/gnu/classpath/tools $(distdir)/gnu/classpath/tools/javap $(distdir)/gnu/classpath/tools/native2ascii $(distdir)/gnu/classpath/tools/rmi/rmic $(distdir)/gnu/classpath/tools/serialver
++ $(mkdir_p) $(distdir)/com/sun/tools/javac $(distdir)/gnu/classpath/tools $(distdir)/gnu/classpath/tools/javap $(distdir)/gnu/classpath/tools/native2ascii $(distdir)/gnu/classpath/tools/rmi/rmic $(distdir)/gnu/classpath/tools/serialver
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ list='$(DISTFILES)'; for file in $$list; do \
Deleted: trunk/kaffe/debian/patches/02_JarCacheUse_Fix.patch
===================================================================
--- trunk/kaffe/debian/patches/02_JarCacheUse_Fix.patch 2006-01-26 19:23:46 UTC (rev 1818)
+++ trunk/kaffe/debian/patches/02_JarCacheUse_Fix.patch 2006-01-26 19:30:30 UTC (rev 1819)
@@ -1,48 +0,0 @@
---- kaffe-1.1.6/libraries/javalib/gnu/java/net/protocol/jar/Connection.java.orig 2005/07/02 20:32:13
-+++ kaffe-1.1.6/libraries/javalib/gnu/java/net/protocol/jar/Connection.java 2005/09/20 21:01:44
-@@ -69,13 +69,17 @@
- private static Hashtable cache = new Hashtable();
- private static final int READBUFSIZE = 4*1024;
-
-- public static synchronized JarFile get (URL url) throws IOException
-+ public static synchronized JarFile get (URL url, boolean useCaches)
-+ throws IOException
- {
-- JarFile jf = (JarFile) cache.get (url);
-+ JarFile jf;
-+ if (useCaches)
-+ {
-+ jf = (JarFile) cache.get (url);
-+ if (jf != null)
-+ return jf;
-+ }
-
-- if (jf != null)
-- return jf;
--
- if ("file".equals (url.getProtocol()))
- {
- File f = new File (url.getFile());
-@@ -100,9 +104,10 @@
- jf = new JarFile (f, true,
- ZipFile.OPEN_READ | ZipFile.OPEN_DELETE);
- }
--
-- cache.put (url, jf);
--
-+
-+ if (useCaches)
-+ cache.put (url, jf);
-+
- return jf;
- }
- }
-@@ -120,7 +125,7 @@
- return;
-
- jar_url = getJarFileURL();
-- jar_file = JarFileCache.get (jar_url);
-+ jar_file = JarFileCache.get (jar_url, useCaches);
- String entry_name = getEntryName();
-
- if (entry_name != null
Modified: trunk/kaffe/debian/patches/03_RegisterIconvCharsetProvider.patch
===================================================================
--- trunk/kaffe/debian/patches/03_RegisterIconvCharsetProvider.patch 2006-01-26 19:23:46 UTC (rev 1818)
+++ trunk/kaffe/debian/patches/03_RegisterIconvCharsetProvider.patch 2006-01-26 19:30:30 UTC (rev 1819)
@@ -1,4 +1,4 @@
--- /dev/null 2005-10-02 10:30:59.122810144 +0200
-+++ kaffe-1.1.6/libraries/javalib/META-INF/services/java.nio.charset.spi.CharsetProvider 2005-10-02 19:24:06.000000000 +0200
++++ kaffe-1.1.6.91/libraries/javalib/external/classpath/resource/META-INF/services/java.nio.charset.spi.CharsetProvider 2005-10-02 19:24:06.000000000 +0200
@@ -0,0 +1 @@
+gnu.java.nio.charset.iconv.IconvProvider
Modified: trunk/kaffe/debian/rules
===================================================================
--- trunk/kaffe/debian/rules 2006-01-26 19:23:46 UTC (rev 1818)
+++ trunk/kaffe/debian/rules 2006-01-26 19:30:30 UTC (rev 1819)
@@ -16,8 +16,8 @@
# these values can be overwritten in the rules.$(DEB_BUILD_GNU_TYPE) files
-COMPILER_JIKES := 1
-COMPILER_ECJ :=
+COMPILER_JIKES :=
+COMPILER_ECJ := 1
ENABLE_SOUND := yes
SYSTEMS := jthreads pthreads
INTRP_ENGINE := yes
@@ -27,9 +27,18 @@
# Include any additional architecture specific rules
sinclude debian/rules.$(DEB_HOST_ARCH)
-CONFFLAGS := --infodir='/usr/share/info' --mandir='/usr/share/man' --with-rt-jar='no' \
- --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --with-jni-library-path='/usr/lib/jni' \
- --without-kaffe-qt-awt --without-kaffe-x-awt --disable-nls
+# common configure flags - we need enable-gtk-cairo here to get a
+# gnu.classpath.Configuration file which works also for pthreads)
+CONFFLAGS := --infodir='/usr/share/info' \
+ --mandir='/usr/share/man' \
+ --disable-fastjar \
+ --host=$(DEB_HOST_GNU_TYPE) \
+ --build=$(DEB_BUILD_GNU_TYPE) \
+ --with-jni-library-path='/usr/lib/jni' \
+ --without-kaffe-qt-awt \
+ --without-kaffe-x-awt \
+ --disable-nls \
+ --enable-gtk-cairo
prerms := $(patsubst %,debian/kaffe-%.prerm,$(SYSTEMS))
postinsts := $(patsubst %,debian/kaffe-%.postinst,$(SYSTEMS))
@@ -41,8 +50,7 @@
endif
ifneq ($(strip $(COMPILER_ECJ)),)
-CONFFLAGS += --with-jikes=/usr/bin/ecj-bootstrap
-export JAVAC_FLAGS=-source 1.4 -nowarn -bootclasspath $(CURDIR)/build/jthreads/libraries/javalib/lib/
+CONFFLAGS += --with-ecj=/usr/bin/ecj
endif
ifeq ($(strip $(ENABLE_SOUND)),yes)
@@ -70,8 +78,8 @@
#
# DBS
#
-export DH_COMPAT=3
-RELEASE = 1.1.6
+export DH_COMPAT=4
+RELEASE = 1.1.6.91
TAR_DIR = kaffe-$(RELEASE)
# the dbs rules
include /usr/share/dbs/dbs-build.mk
@@ -83,10 +91,14 @@
include /usr/share/dbs/dpkg-arch.mk
endif
-$(STAMP_DIR)/configure-jthreads: CONFFLAGS += --without-classpath-gtk-awt --disable-sound --without-alsa
+$(STAMP_DIR)/configure-jthreads: CONFFLAGS += --with-glibj-zip='no' \
+ --without-classpath-gtk-awt \
+ --disable-sound --without-alsa
+
$(STAMP_DIR)/build-pthreads: $(STAMP_DIR)/build-jthreads
-$(STAMP_DIR)/configure-pthreads: CONFFLAGS += --with-rt-jar=$(CURDIR)/build/jthreads/libraries/javalib/rt.jar --enable-gtk-cairo --enable-jvmpi
+$(STAMP_DIR)/configure-pthreads: CONFFLAGS += --with-glibj-zip=$(CURDIR)/build/jthreads/libraries/javalib/external/classpath/lib/glibj.zip --enable-jvmpi --enable-gtk-cairo
+
configure: $(patsubst %,$(STAMP_DIR)/configure-%,$(SYSTEMS))
$(patsubst %,$(STAMP_DIR)/configure-%,$(SYSTEMS)): $(STAMP_DIR)/configure-%: $(patched)
dh_testdir
@@ -133,13 +145,25 @@
perl debian/file-actions.pl -v $(CURDIR)/debian/install
# Install jikes-kaffe wrapper
install -m 755 $(CURDIR)/debian/wrappers/jikes-kaffe $(CURDIR)/debian/jikes-kaffe/usr/bin/jikes-kaffe
- # Remove javadoc and make it a symlink to gjdoc
- for i in $(SYSTEMS); do install -m 755 $(CURDIR)/debian/wrappers/javadoc $(CURDIR)/debian/install/usr/lib/kaffe/$$i/bin/javadoc; done
- # Remove jar and make it a symlink to fastjar
- for i in $(SYSTEMS); do rm $(CURDIR)/debian/install/usr/lib/kaffe/$$i/bin/jar; ln -s ../../../../bin/fastjar $(CURDIR)/debian/install/usr/lib/kaffe/$$i/bin/jar; done
+ # Various reorganization to use system provided tools
+ for i in $(SYSTEMS); do \
+ # Remove javadoc and make it a symlink to gjdoc \
+ install -m 755 $(CURDIR)/debian/wrappers/javadoc $(CURDIR)/debian/install/usr/lib/kaffe/$$i/bin/javadoc; \
+ # Remove jar/javac and make it a symlink to fastjar,ecj \
+ rm $(CURDIR)/debian/install/usr/lib/kaffe/$$i/bin/jar; \
+ ln -s ../../../../bin/fastjar $(CURDIR)/debian/install/usr/lib/kaffe/$$i/bin/jar; \
+ rm $(CURDIR)/debian/install/usr/lib/kaffe/$$i/bin/javac; \
+ ln -s ../../../../bin/ecj $(CURDIR)/debian/install/usr/lib/kaffe/$$i/bin/javac; \
+ # make a rt.jar symlink to glibj.zip \
+ ln -sf ../../../../../share/kaffe-common/lib/glibj.zip $(CURDIR)/debian/install/usr/lib/kaffe/$$i/jre/lib/rt.jar; \
+ done
# install lintian overrides
install -d $(CURDIR)/debian/kaffe/usr/share/lintian/overrides/
+ install -d $(CURDIR)/debian/kaffe-jthreads/usr/share/lintian/overrides/
+ install -d $(CURDIR)/debian/kaffe-pthreads/usr/share/lintian/overrides/
install -m 644 $(CURDIR)/debian/kaffe.lintian $(CURDIR)/debian/kaffe/usr/share/lintian/overrides/kaffe
+ install -m 644 $(CURDIR)/debian/kaffe-jthreads.lintian $(CURDIR)/debian/kaffe-jthreads/usr/share/lintian/overrides/kaffe-jthreads
+ install -m 644 $(CURDIR)/debian/kaffe-pthreads.lintian $(CURDIR)/debian/kaffe-pthreads/usr/share/lintian/overrides/kaffe-pthreads
# Build architecture-independent files here.
binary-indep: build install
@@ -184,7 +208,7 @@
.PHONY: build clean binary-indep binary-arch binary install
cvsupdate:
- cvs -q -z9 -d:pserver:readonly at cvs.kaffe.org:/cvs/kaffe co -d kaffe-$(RELEASE) kaffe
+ cvs -q -z9 -d:pserver:readonly at cvs.kaffe.org:/cvs/kaffe co -P -d kaffe-$(RELEASE) kaffe
tar zcf kaffe-$(RELEASE).tar.gz kaffe-$(RELEASE)
rm -r kaffe-$(RELEASE)
( cd .. ; tar zcvf kaffe_$(RELEASE).orig.tar.gz --exclude debian kaffe-$(RELEASE) )
Modified: trunk/kaffe/debian/wrappers/javadoc
===================================================================
--- trunk/kaffe/debian/wrappers/javadoc 2006-01-26 19:23:46 UTC (rev 1818)
+++ trunk/kaffe/debian/wrappers/javadoc 2006-01-26 19:30:30 UTC (rev 1819)
@@ -1,6 +1,5 @@
-#! /bin/sh
+#!/bin/sh
export JAVA_HOME=/usr/lib/kaffe
exec /usr/bin/gjdoc "$@"
-
Modified: trunk/kaffe/debian/wrappers/jikes-kaffe
===================================================================
--- trunk/kaffe/debian/wrappers/jikes-kaffe 2006-01-26 19:23:46 UTC (rev 1818)
+++ trunk/kaffe/debian/wrappers/jikes-kaffe 2006-01-26 19:30:30 UTC (rev 1819)
@@ -1,17 +1,4 @@
#!/bin/sh
set -e
-for jar in \
-/usr/share/kaffe/Klasses.jar \
-/usr/share/kaffe-common/lib/rt.jar \
-/usr/lib/kaffe/jre/lib/rt.jar \
- ; do
- if [ -r $jar ]; then
- exec jikes -bootclasspath $jar "$@"
- fi
-done
-echo
-echo "----------- ERROR -----------"
-echo "Cannot find/read kaffe classes. Please report."
-echo
-exit 1
+exec jikes -bootclasspath /usr/share/kaffe-common/lib/glibj.zip "$@"
More information about the pkg-java-commits
mailing list