[cp-patches] Re: include security tools in tools.zip and convenience scipts

[Raif S. Naffah]

hello Tom,

On Wednesday 03 May 2006 00:03, Tom Tromey wrote:
> >>>>> "Raif" == Raif S Naffah <[EMAIL PROTECTED]> writes:
>
> Raif> +bin_SCRIPTS = jarsigner keytool
>
> Hmm... now I see that jarsigner.sh and keytool.sh are made by
> configure.
>
> Raif> +jarsigner: $(srcdir)/jarsigner.sh
>
> ... so using srcdir here is incorrect.

...and that's because the user may be configuring in a different 
location than $(srcdir) but AC_CONFIG_FILES will be generating the 
target .sh files in that location.  in this situation the 'cp' command 
will fail.

if the above interpretation is correct, then the 'jarsigner' and 
'keytool' targets in the Makefile.am will only serve to copy them from 
their *.sh equivalent; assuming that the install script chmods the 
scripts correctly --which it seems to be doing.

if that's the case then i think renaming jarsigner.sh.in to jarsigner.in 
and keytool.sh.in to keytool.in, plus the attached patch is a good, and 
correct, alternative.

agreed?


cheers;
rsn

Index: configure.ac
===================================================================
RCS file: /cvsroot/classpath/classpath/configure.ac,v
retrieving revision 1.145
diff -u -r1.145 configure.ac
--- configure.ac        2 May 2006 01:47:15 -0000       1.145
+++ configure.ac        3 May 2006 04:26:00 -0000
@@ -675,8 +675,8 @@
 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])
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 04:26:37 -0000
@@ -21,6 +21,10 @@
 endif
 endif

+bin_SCRIPTS = jarsigner keytool
+CLEANFILES = $(bin_SCRIPTS)
+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 +36,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 +44,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 +82,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 04:28:16 -0000
@@ -1,5 +1,5 @@
-jarsigner.sh
-keytool.sh
+jarsigner
+keytool
 Makefile.in
 Makefile
 tools.zip

pgp2EOgUrhQG5.pgp
Description: PGP signature