- Redundant copies of HTML files used in AspectJ installer, which already exist as resource files in module 'build' - Null-sized AspectJ library JARs which probably were used to trigger certain build steps in the former Ant build - BridgeVersion.java.txt, which has been replaced by a regular org.aspectj.bridge.Version class which can dynamically determine versions from a properties file instead of relying on them being hard-coded into the template. Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>tags/V1_9_21_1
@@ -23,8 +23,6 @@ import java.util.Properties; | |||
/** release-specific version information */ | |||
public class Version { | |||
// generated from build/lib/BridgeVersion.java | |||
/** default version value for development version */ | |||
public static final String DEVELOPMENT = "DEVELOPMENT"; | |||
// VersionUptodate.java depends on this value | |||
@@ -115,8 +113,3 @@ public class Version { | |||
return text; | |||
} | |||
} | |||
@@ -1,89 +0,0 @@ | |||
/* ******************************************************************** | |||
* Copyright (c) 1998-2001 Xerox Corporation, | |||
* 2002 Palo Alto Research Center, Incorporated (PARC). | |||
* All rights reserved. | |||
* This program and the accompanying materials are made available | |||
* under the terms of the Eclipse Public License v 2.0 | |||
* which accompanies this distribution and is available at | |||
* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt | |||
* | |||
* Contributors: | |||
* Xerox/PARC initial implementation | |||
* *******************************************************************/ | |||
package org.aspectj.bridge; | |||
import java.text.ParsePosition; | |||
import java.text.SimpleDateFormat; | |||
import java.util.Date; | |||
/** release-specific version information */ | |||
public class Version { | |||
// generated from build/lib/BridgeVersion.java | |||
/** default version value for development version */ | |||
public static final String DEVELOPMENT = "DEVELOPMENT"; | |||
// VersionUptodate.java depends on this value | |||
/** default time value for development version */ | |||
public static final long NOTIME = 0L; | |||
/** set by build script */ | |||
public static final String text = "@build.version@"; | |||
// VersionUptodate.java scans for "static final String text = " | |||
/** | |||
* Time text set by build script using SIMPLE_DATE_FORMAT. | |||
* (if DEVELOPMENT version, invalid) | |||
*/ | |||
public static final String time_text = "@build.time@"; | |||
/** | |||
* time in seconds-since-... format, used by programmatic clients. | |||
* (if DEVELOPMENT version, NOTIME) | |||
*/ | |||
private static long time = -1; // -1 == uninitialized | |||
/** format used by build script to set time_text */ | |||
public static final String SIMPLE_DATE_FORMAT = "@build.time.format@"; | |||
public static long getTime() { | |||
if (time==-1) { | |||
long foundTime = NOTIME; | |||
// if not DEVELOPMENT version, read time text using format used to set time | |||
try { | |||
SimpleDateFormat format = new SimpleDateFormat(SIMPLE_DATE_FORMAT); | |||
ParsePosition pos = new ParsePosition(0); | |||
Date date = format.parse(time_text, pos); | |||
if (date!=null) foundTime = date.getTime(); | |||
} catch (Throwable t) { | |||
} | |||
time = foundTime; | |||
} | |||
return time; | |||
} | |||
/** | |||
* Test whether the version is as specified by any first argument. | |||
* Emit text to System.err on failure | |||
* @param args String[] with first argument equal to Version.text | |||
* @see Version#text | |||
*/ | |||
public static void main(String[] args) { | |||
if ((null != args) && (0 < args.length)) { | |||
if (!Version.text.equals(args[0])) { | |||
System.err.println("version expected: \"" | |||
+ args[0] | |||
+ "\" actual=\"" | |||
+ Version.text | |||
+ "\""); | |||
} | |||
} | |||
} | |||
} | |||
@@ -1,17 +0,0 @@ | |||
<html> | |||
<head> | |||
<title>auto configure</title> | |||
</head> | |||
<body> | |||
<p>The installer has successfully found the path to your Java home (J2SE 1.4 or greater). | |||
This path will be used as the default Java location when generating | |||
script files for launching the AspectJ compiler and core tools. Unless | |||
you know that this path is wrong, we suggest that you press | |||
<b>Next</b> to continue.</p> | |||
</body> | |||
</html> |
@@ -1,21 +0,0 @@ | |||
<html> | |||
<head> | |||
<title>configure</title> | |||
</head> | |||
<body> | |||
<p>The installer cannot find the path to your Java home (J2SE 1.4 or greater). | |||
Please try to find this directory on your path now. It will probably look | |||
something like <code>jdk1.4.1</code>. If you can't find this | |||
directory now, you may continue with the install, but you will have | |||
to either edit your launch scripts by hand or to set the JAVA_HOME | |||
environment variable to point to the right location. | |||
</p> | |||
<p>Press <b>Next</b> when ready to continue.</p> | |||
</body> | |||
</html> |
@@ -1,28 +0,0 @@ | |||
<html> | |||
<head> | |||
<title>finish</title> | |||
</head> | |||
<body> | |||
<p>The automatic installation process is complete. | |||
We recommend you complete the installation as follows:</p> | |||
<ol> | |||
<li>Add <b><code>${installer.output.aspectjrt}</code></b> | |||
to your CLASSPATH. | |||
This small .jar file contains classes required by any | |||
program compiled with the ajc compiler. | |||
</li> | |||
<li>Modify your PATH to include | |||
<code> <b>${installer.output.dir.bin}</b></code>. | |||
This will make it easier to run ajc. | |||
</li> | |||
</ol> | |||
<p>These steps are described in more detail in <code> | |||
<b>${installer.output.readme}</b></code>.</p> | |||
</body> | |||
</html> |
@@ -1,12 +0,0 @@ | |||
<html> | |||
<body> | |||
<p> </p> | |||
<p>The automatic installation process is complete. Press <b>Next </b>for | |||
some important final instructions.</p> | |||
</body> | |||
</html> |
@@ -1,13 +0,0 @@ | |||
<html> | |||
<body> | |||
<p> </p> | |||
<p>Now installing to ${installer.output.dir}...</p> | |||
<p>Press <b>Cancel</b> to interrupt the installation.</p> | |||
</body> | |||
</html> |
@@ -1,25 +0,0 @@ | |||
<html> | |||
<body> | |||
<h2 align="center">Installer for AspectJ 9 Development Kit<sup><small>TM</small></sup></h2> | |||
<p align="center">Version ${build.version.long} built on ${build.date}</p> | |||
<p>This installs the complete AspectJ 9 Development Kit (AJDK) distribution, with | |||
the compiler, aspect libraries, structure browser, ant tasks, | |||
documentation, and examples. | |||
This distribution is covered by the Eclipse Public License v 2.0 (see | |||
https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt). | |||
<p> | |||
For IDE integrations or source code, see the project home page at | |||
https://eclipse.org/aspectj</p> | |||
<p>${copyright.allRights.from1998}</p> | |||
<p></p> | |||
<p>Press <b>Next</b> to continue. At any time you may press <b>Cancel</b> | |||
to exit the installation process.</p> | |||
</body> | |||
</html> |
@@ -1,11 +0,0 @@ | |||
<html> | |||
<body> | |||
<p>Please select a directory into which to install AspectJ.</p> | |||
<p>Press <b>Install</b> to begin the installation process | |||
to this directory.</p> | |||
</body> | |||
</html> |
@@ -1,17 +0,0 @@ | |||
<html> | |||
<head> | |||
<title>auto configure</title> | |||
</head> | |||
<body> | |||
<p>The installer has successfully found the path to your Java home (J2SE 1.4 or greater). | |||
This path will be used as the default Java location when generating | |||
script files for launching the AspectJ compiler and core tools. Unless | |||
you know that this path is wrong, we suggest that you press | |||
<b>Next</b> to continue.</p> | |||
</body> | |||
</html> |
@@ -1,21 +0,0 @@ | |||
<html> | |||
<head> | |||
<title>configure</title> | |||
</head> | |||
<body> | |||
<p>The installer cannot find the path to your Java home (J2SE 1.4 or greater). | |||
Please try to find this directory on your path now. It will probably look | |||
something like <code>jdk1.4.1</code>. If you can't find this | |||
directory now, you may continue with the install, but you will have | |||
to either edit your launch scripts by hand or to set the JAVA_HOME | |||
environment variable to point to the right location. | |||
</p> | |||
<p>Press <b>Next</b> when ready to continue.</p> | |||
</body> | |||
</html> |
@@ -1,24 +0,0 @@ | |||
<html> | |||
<head> | |||
<title>finish</title> | |||
</head> | |||
<body> | |||
<p>The automatic installation process is complete. There are two more | |||
steps that we recommend you perform to complete the installation:</p> | |||
<ol> | |||
<li>Put <b><code>${installer.output.aspectjrt}</code></b> on your CLASSPATH. | |||
This small .jar file contains classes that are required by any program compiled | |||
with the ajc compiler.</li> | |||
<li>Modify your PATH to include <code> <b>${installer.output.dir.bin}</b></code>. | |||
This will make it easier to run ajc. </li> | |||
</ol> | |||
<p>These steps are described in more detail in <code> | |||
<b>${installer.output.readme}</b></code>.</p> | |||
</body> | |||
</html> |
@@ -1,20 +0,0 @@ | |||
<html> | |||
<head> | |||
<meta http-equiv="Content-Language" content="en-us"> | |||
<meta http-equiv="Content-Type" content="text/html; charset=windows-1252"> | |||
<meta name="GENERATOR" content="Microsoft FrontPage 4.0"> | |||
<meta name="ProgId" content="FrontPage.Editor.Document"> | |||
<title>New Page 1</title> | |||
</head> | |||
<body> | |||
<p> </p> | |||
<p>The automatic installation process is complete. Press <b>Next </b>for | |||
some important final instructions.</p> | |||
</body> | |||
</html> |
@@ -1,21 +0,0 @@ | |||
<html> | |||
<head> | |||
<meta http-equiv="Content-Language" content="en-us"> | |||
<meta http-equiv="Content-Type" content="text/html; charset=windows-1252"> | |||
<meta name="GENERATOR" content="Microsoft FrontPage 4.0"> | |||
<meta name="ProgId" content="FrontPage.Editor.Document"> | |||
<title>New Page 1</title> | |||
</head> | |||
<body> | |||
<p> </p> | |||
<p>Now installing to ${installer.output.dir}.</p> | |||
<p>Press <b>Cancel</b> to interrupt the installation.</p> | |||
</body> | |||
</html> |
@@ -1,29 +0,0 @@ | |||
<html> | |||
<head> | |||
<meta http-equiv="Content-Language" content="en-us"> | |||
<meta http-equiv="Content-Type" content="text/html; charset=windows-1252"> | |||
<meta name="GENERATOR" content="Microsoft FrontPage 4.0"> | |||
<meta name="ProgId" content="FrontPage.Editor.Document"> | |||
<title>New Page 1</title> | |||
</head> | |||
<body> | |||
<h2 align="center">Installer for AspectJ(TM) Compiler and Core Tools</h2> | |||
<p align="center">Version ${build.version.long} built on ${build.date}</p> | |||
<p> | |||
This is a binary only release of tools made available under | |||
the Eclipse Public License. | |||
For more information on the license or to download the source code, | |||
see https://eclipse.org/aspectj</p> | |||
<p>${copyright.allRights.from1998}</p> | |||
<p></p> | |||
<p>Press <b>Next</b> to continue. At any time you may press <b>Cancel</b> | |||
to exit the installation process.</p> | |||
</body> | |||
</html> |
@@ -1,20 +0,0 @@ | |||
<html> | |||
<head> | |||
<meta http-equiv="Content-Language" content="en-us"> | |||
<meta http-equiv="Content-Type" content="text/html; charset=windows-1252"> | |||
<meta name="GENERATOR" content="Microsoft FrontPage 4.0"> | |||
<meta name="ProgId" content="FrontPage.Editor.Document"> | |||
<title>New Page 1</title> | |||
</head> | |||
<body> | |||
<p>Please select a directory into which to install | |||
the AspectJ compiler and core tools.</p> | |||
<p>Press <b>Install</b> to begin the installation process | |||
to this directory.</p> | |||
</body> | |||
</html> |
@@ -1,20 +0,0 @@ | |||
<html> | |||
<head> | |||
<meta http-equiv="Content-Language" content="en-us"> | |||
<meta http-equiv="Content-Type" content="text/html; charset=windows-1252"> | |||
<meta name="GENERATOR" content="Microsoft FrontPage 4.0"> | |||
<meta name="ProgId" content="FrontPage.Editor.Document"> | |||
<title>New Page 1</title> | |||
</head> | |||
<body> | |||
<p>The automatic installation process is complete.</p> | |||
<p>See <b><code>${installer.output.readme}</code></b> for more information about | |||
the contents of this package.</p> | |||
</body> | |||
</html> |
@@ -1,20 +0,0 @@ | |||
<html> | |||
<head> | |||
<meta http-equiv="Content-Language" content="en-us"> | |||
<meta http-equiv="Content-Type" content="text/html; charset=windows-1252"> | |||
<meta name="GENERATOR" content="Microsoft FrontPage 4.0"> | |||
<meta name="ProgId" content="FrontPage.Editor.Document"> | |||
<title>New Page 1</title> | |||
</head> | |||
<body> | |||
<p> </p> | |||
<p>The automatic installation process is complete. Press <b>Next </b>for | |||
some final instructions.</p> | |||
</body> | |||
</html> |
@@ -1,21 +0,0 @@ | |||
<html> | |||
<head> | |||
<meta http-equiv="Content-Language" content="en-us"> | |||
<meta http-equiv="Content-Type" content="text/html; charset=windows-1252"> | |||
<meta name="GENERATOR" content="Microsoft FrontPage 4.0"> | |||
<meta name="ProgId" content="FrontPage.Editor.Document"> | |||
<title>New Page 1</title> | |||
</head> | |||
<body> | |||
<p> </p> | |||
<p>Now installing to ${installer.output.dir}.</p> | |||
<p>Press <b>Cancel</b> to interrupt the installation.</p> | |||
</body> | |||
</html> |
@@ -1,24 +0,0 @@ | |||
<html> | |||
<head> | |||
<meta http-equiv="Content-Language" content="en-us"> | |||
<meta http-equiv="Content-Type" content="text/html; charset=windows-1252"> | |||
<meta name="GENERATOR" content="Microsoft FrontPage 4.0"> | |||
<meta name="ProgId" content="FrontPage.Editor.Document"> | |||
<title>New Page 1</title> | |||
</head> | |||
<body> | |||
<h2 align="center">Installer for AspectJ(TM) 9 Development Kit</h2> | |||
<p align="center">Version ${build.version.long} built on ${build.date}</p> | |||
<p>${copyright.allRights.from1998}</p> | |||
<p></p> | |||
<p>Press <b>Next</b> to continue. At any time you may press <b>Cancel</b> | |||
to exit the installation process.</p> | |||
</body> | |||
</html> |
@@ -1,23 +0,0 @@ | |||
<html> | |||
<head> | |||
<meta http-equiv="Content-Language" content="en-us"> | |||
<meta http-equiv="Content-Type" content="text/html; charset=windows-1252"> | |||
<meta name="GENERATOR" content="Microsoft FrontPage 4.0"> | |||
<meta name="ProgId" content="FrontPage.Editor.Document"> | |||
<title>New Page 1</title> | |||
</head> | |||
<body> | |||
<p> </p> | |||
<p>Please select a directory into which to install the aspectj documentation and | |||
examples. If you've already installed the compiler and core tools, we | |||
recommend that you install the documentation and examples to the same directory | |||
for convenience.</p> | |||
<p>Press <b>Install</b> to begin the installation process to this directory.</p> | |||
</body> | |||
</html> |