installer was misreporting README file name for AspectJ distribution.

(The installer could be refactored for simpilcity if/since we're not supporting multiple distributions any more.)

diff --git a/build/src/$installer$/org/aspectj/Main.java b/build/src/$installer$/org/aspectj/Main.java
index ec2b122803291762d3ad7714138b7062ae8f30f9..19af53b1df927e3122b3dc34403f2a8c020c5f4d 100644 (file)
--- a/build/src/$installer$/org/aspectj/Main.java
+++ b/build/src/$installer$/org/aspectj/Main.java
@@ -189,11 +189,16 @@ class Options {
     }
 }
 
+/** tools installer installs the entire 1.1+ distribution */
 class ToolsInstaller extends Installer {
     public String getTitle() { return "Installer for AspectJ(TM)"; }
 
     public String getPrefix() { return "tools"; }
 
+    public String getReadmeFilename() {
+        return "README-AspectJ.html";
+    }
+
     public ToolsInstaller() {
         InstallPane installPane = new InstallPane(true);
         setInstallPane(installPane);
@@ -404,6 +409,10 @@ abstract class Installer {
 
     public abstract String getPrefix();
 
+    public String getReadmeFilename() {
+        return "README-" + getPrefix().toUpperCase()+".html";
+    }
+
     public void setContext(InstallContext context) {
         this.context = context;
         context.installer = this;
@@ -591,7 +600,7 @@ class InstallContext {
         properties.put("installer.output.dir.bin", new File(outputDir, "bin").getAbsolutePath());
         properties.put("installer.output.dir.doc", new File(outputDir, "doc").getAbsolutePath());
         properties.put("installer.output.aspectjrt", new File(new File(outputDir, "lib"), "aspectjrt.jar").getAbsolutePath());
-        properties.put("installer.output.readme", new File(outputDir, "README-" + installer.getPrefix().toUpperCase()+".html").getAbsolutePath());
+        properties.put("installer.output.readme", new File(outputDir, installer.getReadmeFilename()).getAbsolutePath());
     }
 
     public File getOutputDir() {

diff --git a/lib/build/build.jar b/lib/build/build.jar
index b828d2346c9abb63f0f6ed4b8d1cad468fd47112..2779968e41a54289427a01f320bc3af8032652a8 100644 (file)
Binary files a/lib/build/build.jar and b/lib/build/build.jar differ