Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor to remove Ant from install and uninstall process #4329

Merged
merged 36 commits into from Dec 10, 2023

Conversation

jelovirt
Copy link
Member

@jelovirt jelovirt commented Nov 15, 2023

Description

Refactor to remove Ant integrator.xml from install and uninstall process and only use Java code.

Motivation and Context

Simplify install and uninstall code by removing redundant Ant layer from between. This will make future work on install and uninstall easier.

The existing code path is for install and uninstall is:

flowchart
  A[Bash] --> B[Java] --> C[Ant] --> D[Java]

and this simplifies it to

flowchart
  A[Bash] --> B[Java]

How Has This Been Tested?

Existing tests and manual testing.

Type of Changes

  • New feature (non-breaking change which adds functionality)

Documentation and Compatibility

No user facing change.

@jelovirt jelovirt added priority/medium Medium (or unknown) priority issue enhancement Changes to an existing feature labels Nov 15, 2023
@jelovirt jelovirt self-assigned this Nov 15, 2023
@jelovirt jelovirt force-pushed the feature/java-uninstall branch 2 times, most recently from 3812bfd to 73ac81b Compare November 23, 2023 19:45
Copy link
Member

@infotexture infotexture left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Refactor to remove Ant integrator.xml from install and uninstall process and only use Java code.

If that's the case, is it expected behavior to see this on dita install -v:

Searching for integrator.xml ...

@jelovirt
Copy link
Member Author

jelovirt commented Dec 2, 2023

@infotexture When I run dita install -v, I don't get anything because nothing is being reinstalled. And I don't get that Searching for integrator.xml ....

After you checked out the branch, did you build the code first?

Signed-off-by: Jarno Elovirta <jarno@elovirta.com>
Signed-off-by: Jarno Elovirta <jarno@elovirta.com>
Signed-off-by: Jarno Elovirta <jarno@elovirta.com>
Signed-off-by: Jarno Elovirta <jarno@elovirta.com>
Signed-off-by: Jarno Elovirta <jarno@elovirta.com>
Signed-off-by: Jarno Elovirta <jarno@elovirta.com>
Signed-off-by: Jarno Elovirta <jarno@elovirta.com>
Signed-off-by: Jarno Elovirta <jarno@elovirta.com>
Signed-off-by: Jarno Elovirta <jarno@elovirta.com>
Signed-off-by: Jarno Elovirta <jarno@elovirta.com>
Signed-off-by: Jarno Elovirta <jarno@elovirta.com>
Signed-off-by: Jarno Elovirta <jarno@elovirta.com>
Signed-off-by: Jarno Elovirta <jarno@elovirta.com>
Signed-off-by: Jarno Elovirta <jarno@elovirta.com>
Signed-off-by: Jarno Elovirta <jarno@elovirta.com>
Signed-off-by: Jarno Elovirta <jarno@elovirta.com>
Default to new fancy format, but allow using the old legacy format when needed

Signed-off-by: Jarno Elovirta <jarno@elovirta.com>
Signed-off-by: Jarno Elovirta <jarno@elovirta.com>
Signed-off-by: Jarno Elovirta <jarno@elovirta.com>
Signed-off-by: Jarno Elovirta <jarno@elovirta.com>
Signed-off-by: Jarno Elovirta <jarno@elovirta.com>
Signed-off-by: Jarno Elovirta <jarno@elovirta.com>
Signed-off-by: Jarno Elovirta <jarno@elovirta.com>
Signed-off-by: Jarno Elovirta <jarno@elovirta.com>
Signed-off-by: Jarno Elovirta <jarno@elovirta.com>
Signed-off-by: Jarno Elovirta <jarno@elovirta.com>
Signed-off-by: Jarno Elovirta <jarno@elovirta.com>
Signed-off-by: Jarno Elovirta <jarno@elovirta.com>
Signed-off-by: Jarno Elovirta <jarno@elovirta.com>
Signed-off-by: Jarno Elovirta <jarno@elovirta.com>
Signed-off-by: Jarno Elovirta <jarno@elovirta.com>
Signed-off-by: Jarno Elovirta <jarno@elovirta.com>
Signed-off-by: Jarno Elovirta <jarno@elovirta.com>
@raducoravu
Copy link
Member

About using ANSI colors in the console, I tested on Windows 10 by forcing colors in the logger's Java code and it does not work by default:
Screenshot 2023-12-08 at 09 56 34
There seem to be ways to set a certain registry entry to enable colors in the terminal so maybe besides "--no-color" you could also support a "-color" parameter to be able to force colors for Windows users who use a terminal which supports ANSI colors.

Signed-off-by: Jarno Elovirta <jarno@elovirta.com>
Signed-off-by: Jarno Elovirta <jarno@elovirta.com>
src/main/integrator.xml Outdated Show resolved Hide resolved
Co-authored-by: Roger Sheen <roger@infotexture.net>
Signed-off-by: Jarno Elovirta <jarno@elovirta.com>
@jelovirt jelovirt merged commit 7eeb971 into develop Dec 10, 2023
4 checks passed
@jelovirt jelovirt deleted the feature/java-uninstall branch December 10, 2023 09:38
@jelovirt jelovirt added this to the Next milestone Dec 10, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement Changes to an existing feature priority/medium Medium (or unknown) priority issue
Projects
No open projects
Status: Done
Development

Successfully merging this pull request may close these issues.

None yet

4 participants