From 96b15962f93d7e8400a1a03d20f2bc6939c7ad8e Mon Sep 17 00:00:00 2001 From: Alexander Kriegisch Date: Sun, 7 Jan 2024 11:19:13 +0700 Subject: [PATCH] Delete obsolete files - 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 --- .../main/java/org/aspectj/bridge/Version.java | 7 -- build/lib/BridgeVersion.java.txt | 89 ------------------- .../aspectj/install/configure-auto.html | 17 ---- .../aspectj/install/configure-hand.html | 21 ----- build/products/aspectj/install/finish.html | 28 ------ .../aspectj/install/install-finish.html | 12 --- .../aspectj/install/install-start.html | 13 --- build/products/aspectj/install/intro.html | 25 ------ build/products/aspectj/install/location.html | 11 --- build/products/tools/dist/lib/aspectjrt.jar | 0 .../products/tools/dist/lib/aspectjtools.jar | 0 .../products/tools/dist/lib/aspectjweaver.jar | 0 .../tools/dist/lib/org.aspectj.matcher.jar | 0 .../tools/install/configure-auto.html | 17 ---- .../tools/install/configure-hand.html | 21 ----- build/products/tools/install/finish.html | 24 ----- .../tools/install/install-finish.html | 20 ----- .../products/tools/install/install-start.html | 21 ----- build/products/tools/install/intro.html | 29 ------ build/products/tools/install/location.html | 20 ----- docs/install/finish.html | 20 ----- docs/install/install-finish.html | 20 ----- docs/install/install-start.html | 21 ----- docs/install/intro.html | 24 ----- docs/install/location.html | 23 ----- 25 files changed, 483 deletions(-) delete mode 100644 build/lib/BridgeVersion.java.txt delete mode 100644 build/products/aspectj/install/configure-auto.html delete mode 100644 build/products/aspectj/install/configure-hand.html delete mode 100644 build/products/aspectj/install/finish.html delete mode 100644 build/products/aspectj/install/install-finish.html delete mode 100644 build/products/aspectj/install/install-start.html delete mode 100644 build/products/aspectj/install/intro.html delete mode 100644 build/products/aspectj/install/location.html delete mode 100644 build/products/tools/dist/lib/aspectjrt.jar delete mode 100644 build/products/tools/dist/lib/aspectjtools.jar delete mode 100644 build/products/tools/dist/lib/aspectjweaver.jar delete mode 100644 build/products/tools/dist/lib/org.aspectj.matcher.jar delete mode 100644 build/products/tools/install/configure-auto.html delete mode 100644 build/products/tools/install/configure-hand.html delete mode 100644 build/products/tools/install/finish.html delete mode 100644 build/products/tools/install/install-finish.html delete mode 100644 build/products/tools/install/install-start.html delete mode 100644 build/products/tools/install/intro.html delete mode 100644 build/products/tools/install/location.html delete mode 100644 docs/install/finish.html delete mode 100644 docs/install/install-finish.html delete mode 100644 docs/install/install-start.html delete mode 100644 docs/install/intro.html delete mode 100644 docs/install/location.html diff --git a/bridge/src/main/java/org/aspectj/bridge/Version.java b/bridge/src/main/java/org/aspectj/bridge/Version.java index 07139048f..939579306 100644 --- a/bridge/src/main/java/org/aspectj/bridge/Version.java +++ b/bridge/src/main/java/org/aspectj/bridge/Version.java @@ -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; } } - - - - - diff --git a/build/lib/BridgeVersion.java.txt b/build/lib/BridgeVersion.java.txt deleted file mode 100644 index 047854cc6..000000000 --- a/build/lib/BridgeVersion.java.txt +++ /dev/null @@ -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 - + "\""); - } - } - } -} - - - - - diff --git a/build/products/aspectj/install/configure-auto.html b/build/products/aspectj/install/configure-auto.html deleted file mode 100644 index 6da643ef5..000000000 --- a/build/products/aspectj/install/configure-auto.html +++ /dev/null @@ -1,17 +0,0 @@ - - - -auto configure - - - - -

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 -Next to continue.

- - - - diff --git a/build/products/aspectj/install/configure-hand.html b/build/products/aspectj/install/configure-hand.html deleted file mode 100644 index 888db63df..000000000 --- a/build/products/aspectj/install/configure-hand.html +++ /dev/null @@ -1,21 +0,0 @@ - - - -configure - - - - -

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 jdk1.4.1. 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. -

- -

Press Next when ready to continue.

- - - - diff --git a/build/products/aspectj/install/finish.html b/build/products/aspectj/install/finish.html deleted file mode 100644 index 229f3a21a..000000000 --- a/build/products/aspectj/install/finish.html +++ /dev/null @@ -1,28 +0,0 @@ - - - -finish - - - - -

The automatic installation process is complete. -We recommend you complete the installation as follows:

-
    -
  1. Add ${installer.output.aspectjrt} - to your CLASSPATH. - This small .jar file contains classes required by any - program compiled with the ajc compiler. -
    2. -
  2. Modify your PATH to include - ${installer.output.dir.bin}. - This will make it easier to run ajc. -
    3. -
- -

These steps are described in more detail in -${installer.output.readme}.

- - - - diff --git a/build/products/aspectj/install/install-finish.html b/build/products/aspectj/install/install-finish.html deleted file mode 100644 index 14281a0bf..000000000 --- a/build/products/aspectj/install/install-finish.html +++ /dev/null @@ -1,12 +0,0 @@ - - - - -

 

- -

The automatic installation process is complete.  Press Next for -some important final instructions.

- - - - diff --git a/build/products/aspectj/install/install-start.html b/build/products/aspectj/install/install-start.html deleted file mode 100644 index b375c68aa..000000000 --- a/build/products/aspectj/install/install-start.html +++ /dev/null @@ -1,13 +0,0 @@ - - - - -

 

- -

Now installing to ${installer.output.dir}...

- -

Press Cancel to interrupt the installation.

- - - - diff --git a/build/products/aspectj/install/intro.html b/build/products/aspectj/install/intro.html deleted file mode 100644 index c8992bac2..000000000 --- a/build/products/aspectj/install/intro.html +++ /dev/null @@ -1,25 +0,0 @@ - - - -

Installer for AspectJ 9 Development KitTM

- -

Version ${build.version.long} built on ${build.date}

-

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). -

-For IDE integrations or source code, see the project home page at -https://eclipse.org/aspectj

- - -

${copyright.allRights.from1998}

-

- -

Press Next to continue. At any time you may press Cancel -to exit the installation process.

- - - - diff --git a/build/products/aspectj/install/location.html b/build/products/aspectj/install/location.html deleted file mode 100644 index 0398ce4a5..000000000 --- a/build/products/aspectj/install/location.html +++ /dev/null @@ -1,11 +0,0 @@ - - - - -

Please select a directory into which to install AspectJ.

-

Press Install to begin the installation process - to this directory.

- - - - diff --git a/build/products/tools/dist/lib/aspectjrt.jar b/build/products/tools/dist/lib/aspectjrt.jar deleted file mode 100644 index e69de29bb..000000000 diff --git a/build/products/tools/dist/lib/aspectjtools.jar b/build/products/tools/dist/lib/aspectjtools.jar deleted file mode 100644 index e69de29bb..000000000 diff --git a/build/products/tools/dist/lib/aspectjweaver.jar b/build/products/tools/dist/lib/aspectjweaver.jar deleted file mode 100644 index e69de29bb..000000000 diff --git a/build/products/tools/dist/lib/org.aspectj.matcher.jar b/build/products/tools/dist/lib/org.aspectj.matcher.jar deleted file mode 100644 index e69de29bb..000000000 diff --git a/build/products/tools/install/configure-auto.html b/build/products/tools/install/configure-auto.html deleted file mode 100644 index 6da643ef5..000000000 --- a/build/products/tools/install/configure-auto.html +++ /dev/null @@ -1,17 +0,0 @@ - - - -auto configure - - - - -

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 -Next to continue.

- - - - diff --git a/build/products/tools/install/configure-hand.html b/build/products/tools/install/configure-hand.html deleted file mode 100644 index 888db63df..000000000 --- a/build/products/tools/install/configure-hand.html +++ /dev/null @@ -1,21 +0,0 @@ - - - -configure - - - - -

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 jdk1.4.1. 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. -

- -

Press Next when ready to continue.

- - - - diff --git a/build/products/tools/install/finish.html b/build/products/tools/install/finish.html deleted file mode 100644 index 81c98b212..000000000 --- a/build/products/tools/install/finish.html +++ /dev/null @@ -1,24 +0,0 @@ - - - -finish - - - - -

The automatic installation process is complete. There are two more -steps that we recommend you perform to complete the installation:

-
    -
  1. Put ${installer.output.aspectjrt} on your CLASSPATH. - This small .jar file contains classes that are required by any program compiled - with the ajc compiler.
    2. -
  2. Modify your PATH to include ${installer.output.dir.bin}. - This will make it easier to run ajc.
    3. -
- -

These steps are described in more detail in -${installer.output.readme}.

- - - - diff --git a/build/products/tools/install/install-finish.html b/build/products/tools/install/install-finish.html deleted file mode 100644 index 26aea1e5e..000000000 --- a/build/products/tools/install/install-finish.html +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - -New Page 1 - - - - -

 

- -

The automatic installation process is complete.  Press Next for -some important final instructions.

- - - - diff --git a/build/products/tools/install/install-start.html b/build/products/tools/install/install-start.html deleted file mode 100644 index 858ed8512..000000000 --- a/build/products/tools/install/install-start.html +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - -New Page 1 - - - - -

 

- -

Now installing to ${installer.output.dir}.

- -

Press Cancel to interrupt the installation.

- - - - diff --git a/build/products/tools/install/intro.html b/build/products/tools/install/intro.html deleted file mode 100644 index 2bf78d302..000000000 --- a/build/products/tools/install/intro.html +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - -New Page 1 - - - - -

Installer for AspectJ(TM) Compiler and Core Tools

- -

Version ${build.version.long} built on ${build.date}

-

-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

-

${copyright.allRights.from1998}

-

- -

Press Next to continue. At any time you may press Cancel -to exit the installation process.

- - - - diff --git a/build/products/tools/install/location.html b/build/products/tools/install/location.html deleted file mode 100644 index 1ac230abf..000000000 --- a/build/products/tools/install/location.html +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - -New Page 1 - - - - -

Please select a directory into which to install - the AspectJ compiler and core tools.

-

Press Install to begin the installation process - to this directory.

- - - - diff --git a/docs/install/finish.html b/docs/install/finish.html deleted file mode 100644 index ef1bef64e..000000000 --- a/docs/install/finish.html +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - -New Page 1 - - - - -

The automatic installation process is complete.

- -

See ${installer.output.readme} for more information about -the contents of this package.

- - - - diff --git a/docs/install/install-finish.html b/docs/install/install-finish.html deleted file mode 100644 index 811f11400..000000000 --- a/docs/install/install-finish.html +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - -New Page 1 - - - - -

 

- -

The automatic installation process is complete.  Press Next for -some final instructions.

- - - - diff --git a/docs/install/install-start.html b/docs/install/install-start.html deleted file mode 100644 index 858ed8512..000000000 --- a/docs/install/install-start.html +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - -New Page 1 - - - - -

 

- -

Now installing to ${installer.output.dir}.

- -

Press Cancel to interrupt the installation.

- - - - diff --git a/docs/install/intro.html b/docs/install/intro.html deleted file mode 100644 index 36e7f3ad3..000000000 --- a/docs/install/intro.html +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - -New Page 1 - - - - -

Installer for AspectJ(TM) 9 Development Kit

- -

Version ${build.version.long} built on ${build.date}

-

${copyright.allRights.from1998}

-

- -

Press Next to continue. At any time you may press Cancel -to exit the installation process.

- - - - diff --git a/docs/install/location.html b/docs/install/location.html deleted file mode 100644 index 5eb2c5a8c..000000000 --- a/docs/install/location.html +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - -New Page 1 - - - - -

 

- -

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.

-

Press Install to begin the installation process to this directory.

- - - - -- 2.39.5