hello all, the attached patch proposes the addition of the two security tools (jarsigner and keytool) to the tools.zip plus the generation of two convenience scripts to launch them.
bar strong objections, i shall commit this during the weekend. 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 01:50:26 -0000
@@ -21,6 +21,22 @@
endif
endif
+bin_SCRIPTS = jarsigner keytool
+CLEANFILES = $(bin_SCRIPTS)
+EXTRA_DIST = jarsigner.sh.in keytool.sh.in
+
+jarsigner: $(srcdir)/jarsigner.sh
+ mkdir -p $(bindir)
+ rm -f $(bindir)/jarsigner
+ cat $(srcdir)/jarsigner.sh > $(bindir)/jarsigner
+ chmod ugo+x $(bindir)/jarsigner
+
+keytool: $(srcdir)/keytool.sh
+ mkdir -p $(bindir)
+ rm -f $(bindir)/keytool
+ cat $(srcdir)/keytool.sh > $(bindir)/keytool
+ chmod ugo+x $(bindir)/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 +56,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 +94,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; \
pgpwu0hSVRKlJ.pgp
Description: PGP signature
