diff options
| author | Raif S. Naffah <raif@swiftdsl.com.au> | 2006-05-06 01:05:04 +0000 |
|---|---|---|
| committer | Raif S. Naffah <raif@swiftdsl.com.au> | 2006-05-06 01:05:04 +0000 |
| commit | 0d14fed19415e914b7f6a3ed8fc6a3f42ba82e99 (patch) | |
| tree | 976a8187466e54ce4425ad21da547d864d3f4b8b /tools | |
| parent | b68ce2032a283f1a0589aca9e2ccee3db76d8168 (diff) | |
| download | classpath-0d14fed19415e914b7f6a3ed8fc6a3f42ba82e99.tar.gz | |
2006-05-06 Raif S. Naffah <raif@swiftdsl.com.au>
* tools/keytool.sh.in: Removed (renamed to keytool.in).
* tools/jarsigner.in: Removed (renamed to jarsigner.in).
* tools/Makefile.am: Include jarsigner and keytool classes in tools.zip.
Generate jarsigner and keytool scripts.
* tools/keytool.in: New file (renamed from keytool.sh.in).
* tools/jarsigner.in: New file (renamed from jarsigner.sh.in).
* tools/.cvsignore: Replaced *.sh with *
* configure.ac: Replaced tools/*.sh with tools/*.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/.cvsignore | 4 | ||||
| -rwxr-xr-x | tools/Makefile.am | 17 | ||||
| -rw-r--r-- | tools/jarsigner.in (renamed from tools/jarsigner.sh.in) | 0 | ||||
| -rw-r--r-- | tools/keytool.in (renamed from tools/keytool.sh.in) | 0 |
4 files changed, 15 insertions, 6 deletions
diff --git a/tools/.cvsignore b/tools/.cvsignore index 4bbf2266e..75730de04 100644 --- a/tools/.cvsignore +++ b/tools/.cvsignore @@ -1,5 +1,5 @@ -jarsigner.sh -keytool.sh +jarsigner +keytool Makefile.in Makefile tools.zip diff --git a/tools/Makefile.am b/tools/Makefile.am index 0358b22b0..7a8f1ce97 100755 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -21,6 +21,9 @@ endif 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 @@ TOOLS_ZIP = tools.zip 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 @@ TOOLS_TEMPLATES = $(GRMIC_TEMPLATES) $(RMIC_TEMPLATES) # 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 @@ dist-hook: $(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; \ diff --git a/tools/jarsigner.sh.in b/tools/jarsigner.in index cea95a288..cea95a288 100644 --- a/tools/jarsigner.sh.in +++ b/tools/jarsigner.in diff --git a/tools/keytool.sh.in b/tools/keytool.in index 6c11dc407..6c11dc407 100644 --- a/tools/keytool.sh.in +++ b/tools/keytool.in |