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

[Raif S. Naffah]

hello Tom

On Tuesday 02 May 2006 11:58, Tom Tromey wrote:
> >>>>> "Raif" == Raif S Naffah <[EMAIL PROTECTED]> writes:
> ...
> Raif> +jarsigner: $(srcdir)/jarsigner.sh
> Raif> +       mkdir -p $(bindir)
> Raif> +       rm -f $(bindir)/jarsigner
> Raif> +       cat $(srcdir)/jarsigner.sh > $(bindir)/jarsigner
>
> This puts jarsigner into bindir -- but this is wrong since this rule
> is only for building the tool.  (Prematurely installing it means that
> DISTDIR won't be respected... most folks don't set this during the
> build itself.)  Instead it should just go in '.'.  Also using cat is
> a bit odd, why not just use 'cp'?

thanks for the feedback.  the attached (revised) patch fixes the issue.


cheers;
rsn

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 2 May 2006 06:57:03 -0000
@@ -21,6 +21,18 @@
 endif
 endif

+bin_SCRIPTS = jarsigner keytool
+CLEANFILES = $(bin_SCRIPTS)
+EXTRA_DIST = jarsigner.sh.in keytool.sh.in
+
+jarsigner: $(srcdir)/jarsigner.sh
+       cp -f $(srcdir)/jarsigner.sh jarsigner
+       chmod ugo+x jarsigner
+
+keytool: $(srcdir)/keytool.sh
+       cp -f $(srcdir)/keytool.sh keytool
+       chmod ugo+x keytool
+
 # All our example java source files
 TOOLS_JAVA_FILES = $(srcdir)/gnu/classpath/tools/*.java 
$(srcdir)/gnu/classpath/tools/*/*.java $(srcdir)/gnu/classpath/tools/*/*/*.java

@@ -40,8 +52,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,10 +90,14 @@
 $(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 $(RMI_HELPS) classes/gnu/classpath/tools/rmi/
        cp $(GIOP_HELPS) classes/gnu/classpath/tools/giop/
+       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; \

pgpkYAW7qrGQW.pgp
Description: PGP signature