hello Tom, On Thursday 04 May 2006 04:35, Tom Tromey wrote: > >>>>> "Raif" == Raif S Naffah <[EMAIL PROTECTED]> writes: > [...] > Raif> AC_CONFIG_COMMANDS([gen-classlist],[chmod 755 > lib/gen-classlist.sh]) > > I would add an AC_CONFIG_COMMANDS, like this one, for each of the new > tools. That way they will be executable in builddir. > > Raif> +CLEANFILES = $(bin_SCRIPTS) > > Don't do this. configure outputs are really only supposed to be > removed by 'make distclean', and this will be handled automatically > by automake.
thanks again for the feedback. i attached a revised version of the patch that does what you suggested after testing it locally. again, unless others have no corrections or improvements to add, i will check this in during the weekend. cheers; rsn
Index: configure.ac
===================================================================
RCS file: /cvsroot/classpath/classpath/configure.ac,v
retrieving revision 1.146
diff -u -r1.146 configure.ac
--- configure.ac 3 May 2006 20:42:27 -0000 1.146
+++ configure.ac 3 May 2006 23:00:41 -0000
@@ -675,10 +675,12 @@
lib/gen-classlist.sh
lib/copy-vmresources.sh
tools/Makefile
-tools/jarsigner.sh
-tools/keytool.sh
+tools/jarsigner
+tools/keytool
examples/Makefile
examples/Makefile.jawt])
AC_CONFIG_COMMANDS([gen-classlist],[chmod 755 lib/gen-classlist.sh])
AC_CONFIG_COMMANDS([copy-vmresources],[chmod 755 lib/copy-vmresources.sh])
+AC_CONFIG_COMMANDS([jarsigner],[chmod 755 tools/jarsigner])
+AC_CONFIG_COMMANDS([keytool],[chmod 755 tools/keytool])
AC_OUTPUT
Index: Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/tools/Makefile.am,v
retrieving revision 1.11
diff -u -r1.11 Makefile.am
--- Makefile.am 2 Apr 2006 20:55:33 -0000 1.11
+++ Makefile.am 3 May 2006 23:01:40 -0000
@@ -21,6 +21,9 @@
endif
endif
+bin_SCRIPTS = jarsigner keytool
+EXTRA_DIST = jarsigner.in keytool.in
+
# All our example java source files
TOOLS_JAVA_FILES = $(srcdir)/gnu/classpath/tools/*.java
$(srcdir)/gnu/classpath/tools/*/*.java $(srcdir)/gnu/classpath/tools/*/*/*.java
@@ -32,7 +35,7 @@
BUILT_SOURCES = $(TOOLS_ZIP)
# The templates that must be included into the generated zip file.
-GRMIC_TEMPLATES = $(srcdir)/gnu/classpath/tools/giop/grmic/templates/*.jav
+GRMIC_TEMPLATES = $(srcdir)/gnu/classpath/tools/giop/grmic/templates/*.jav
RMIC_TEMPLATES = $(srcdir)/gnu/classpath/tools/rmi/rmic/templates/*.jav
TOOLS_TEMPLATES = $(GRMIC_TEMPLATES) $(RMIC_TEMPLATES)
@@ -40,8 +43,10 @@
# This covers the built-in help texts, both for giop and rmic subpackages.
GIOP_HELPS = $(srcdir)/gnu/classpath/tools/giop/*.txt
RMI_HELPS = $(srcdir)/gnu/classpath/tools/rmi/*.txt
+JARSIGNER_HELPS = $(srcdir)/gnu/classpath/tools/jarsigner/*.txt
+KEYTOOL_HELPS = $(srcdir)/gnu/classpath/tools/keytool/*.txt
-TOOLS_HELPS = $(GIOP_HELPS) $(RMI_HELPS)
+TOOLS_HELPS = $(GIOP_HELPS) $(RMI_HELPS) $(JARSIGNER_HELPS) $(KEYTOOL_HELPS)
# The tool specific README files.
READMES = $(srcdir)/gnu/classpath/tools/giop/README
@@ -76,11 +81,15 @@
$(TOOLS_ZIP): $(TOOLS_JAVA_FILES)
mkdir -p classes/gnu/classpath/tools/giop/grmic/templates
mkdir -p classes/gnu/classpath/tools/rmi/rmic/templates
+ mkdir -p classes/gnu/classpath/tools/jarsigner
+ mkdir -p classes/gnu/classpath/tools/keytool
cp $(RMIC_TEMPLATES) classes/gnu/classpath/tools/rmi/rmic/templates
- cp $(GRMIC_TEMPLATES) classes/gnu/classpath/tools/giop/grmic/templates
+ cp $(GRMIC_TEMPLATES) classes/gnu/classpath/tools/giop/grmic/templates
cp $(RMI_HELPS) classes/gnu/classpath/tools/rmi/
cp $(GIOP_HELPS) classes/gnu/classpath/tools/giop/
- $(JCOMPILER) -d classes $(TOOLS_JAVA_FILES)
+ cp $(JARSIGNER_HELPS) classes/gnu/classpath/tools/jarsigner/
+ cp $(KEYTOOL_HELPS) classes/gnu/classpath/tools/keytool/
+ $(JCOMPILER) -d classes $(TOOLS_JAVA_FILES)
(cd classes; \
if test "$(ZIP)" != ""; then $(ZIP) -r ../$(TOOLS_ZIP) .; fi; \
if test "$(FASTJAR)" != ""; then $(FASTJAR) cf ../$(TOOLS_ZIP) .; fi; \
Index: .cvsignore
===================================================================
RCS file: /cvsroot/classpath/classpath/tools/.cvsignore,v
retrieving revision 1.5
diff -u -r1.5 .cvsignore
--- .cvsignore 2 May 2006 01:47:15 -0000 1.5
+++ .cvsignore 3 May 2006 23:02:52 -0000
@@ -1,5 +1,5 @@
-jarsigner.sh
-keytool.sh
+jarsigner
+keytool
Makefile.in
Makefile
tools.zip
pgp8WQkDyZzZ1.pgp
Description: PGP signature
