Hi, On Sun, 2006-04-02 at 12:34 +1100, Raif S. Naffah wrote: > 2006-04-02 Raif S. Naffah <[EMAIL PROTECTED]> > > * configure.ac: Added tools/jarsigner.sh to AC_CONFIG_FILES. > * tools/Makefile.am: Generate jarsigner shell script. > * tools/jarsigner.sh.in: New template. > * tools/.cvsignore: Added jarsigner.sh.
It seems the work in tools/Makefile.am is a little redundant since that
will be done already by the configure script and the normal automake
install rules since you do have a bin_SCRIPTS defined.
+jarsigner: $(srcdir)/jarsigner.sh
+ rm -f $(bindir)/jarsigner
+ cat $(srcdir)/jarsigner.sh > $(bindir)/jarsigner
+ chmod ugo+x $(bindir)/jarsigner
Also this unfortunately breaks the build/install (see
classpath-testresults) since at this time the bindir might not actually
exist yet. Attached is the simplest way I saw to fix this for now. It
does mean that the resulting script is called jarsigner.sh, not
jarsigner. But it would probably be nice to have jarsigner compiled to a
native executable when gcj is found so no script is necessary in that
case.
2006-04-02 Mark Wielaard <[EMAIL PROTECTED]>
* tools/Makefile.am (bin_SCRIPTS): Renamed to jarsigner.sh.
(jarsigner): Removed.
Committed,
Mark
Index: tools/Makefile.am =================================================================== RCS file: /cvsroot/classpath/classpath/tools/Makefile.am,v retrieving revision 1.9 diff -u -r1.9 Makefile.am --- tools/Makefile.am 2 Apr 2006 01:17:59 -0000 1.9 +++ tools/Makefile.am 2 Apr 2006 16:56:52 -0000 @@ -19,15 +19,9 @@ endif endif -bin_SCRIPTS = jarsigner -CLEANFILES = $(bin_SCRIPTS) +bin_SCRIPTS = jarsigner.sh EXTRA_DIST = jarsigner.sh.in -jarsigner: $(srcdir)/jarsigner.sh - rm -f $(bindir)/jarsigner - cat $(srcdir)/jarsigner.sh > $(bindir)/jarsigner - chmod ugo+x $(bindir)/jarsigner - # All our example java source files TOOLS_JAVA_FILES = $(srcdir)/gnu/classpath/tools/*.java $(srcdir)/gnu/classpath/tools/*/*.java $(srcdir)/gnu/classpath/tools/*/*/*.java
signature.asc
Description: This is a digitally signed message part
