diff options
| author | Reinier Zwitserloot <r.zwitserloot@projectlombok.org> | 2022-04-02 06:12:50 +0200 |
|---|---|---|
| committer | Reinier Zwitserloot <r.zwitserloot@projectlombok.org> | 2022-04-02 06:12:50 +0200 |
| commit | c8607ba782f90ef847488f0fc5bdc365c1e83317 (patch) | |
| tree | fe8aa5ee5835b69f2f21f74a300f8efc32e52e69 /buildScripts | |
| parent | 110434ff60a14d2dfe8014459ffbea3ce7d6388b (diff) | |
| download | lombok-c8607ba782f90ef847488f0fc5bdc365c1e83317.tar.gz lombok-c8607ba782f90ef847488f0fc5bdc365c1e83317.tar.bz2 lombok-c8607ba782f90ef847488f0fc5bdc365c1e83317.zip | |
[#3143] Review and update jopatai's work on the maven/ecj agent jar
* Update copyright headers
* Update code style (tabs, not spaces, spaces around + operator - that's about it)
* Use `x.class.getResourceAsStream`, not `x.getClass().` - minor mostly irrelevant nit.
* Rename and re-locate the jar itself.
* 'ecj' as an alias for this command seems a bit too cavalier' removed it.
* The source is in its own 'root' src dir, it doesn't really fit in the eclipse agent sources - it's more a maven agent.
* Fixed a bug where a filehandle wasn't safe closed. Mostly irrelevant (JVM would quite afterwards anyway).
* Slight rewording of the ecj docs.
Diffstat (limited to 'buildScripts')
| -rw-r--r-- | buildScripts/compile.ant.xml | 13 | ||||
| -rw-r--r-- | buildScripts/create-eclipse-project.ant.xml | 3 | ||||
| -rw-r--r-- | buildScripts/create-intellij-project.ant.xml | 3 | ||||
| -rw-r--r-- | buildScripts/maven.ant.xml | 3 |
4 files changed, 12 insertions, 10 deletions
diff --git a/buildScripts/compile.ant.xml b/buildScripts/compile.ant.xml index c32ae446..e4283c29 100644 --- a/buildScripts/compile.ant.xml +++ b/buildScripts/compile.ant.xml @@ -1,5 +1,5 @@ <!-- - Copyright (C) 2020-2021 The Project Lombok Authors. + Copyright (C) 2020-2022 The Project Lombok Authors. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -74,13 +74,13 @@ This buildfile is part of projectlombok.org. It takes care of compiling and buil </jar> </target> - <target name="create.agentBootstrap" depends="-setup.build" description="Compiles the Maven ECJ bootstrap agent"> - <ivy:compile destdir="build/agentBootstrap" source="1.6" target="1.6" ecj="true"> + <target name="create.mavenEcjBootstrapAgent" depends="-setup.build" description="Compiles the Maven ECJ bootstrap agent"> + <ivy:compile destdir="build/mavenEcjBootstrapAgent" source="1.6" target="1.6" ecj="true"> <bootclasspath path="${jdk6-rt.loc}" /> - <src path="src/eclipseAgent" /> - <include name="lombok/launch/AgentBootstrap.java" /> + <src path="src/mavenEcjBootstrapAgent" /> </ivy:compile> - <jar destfile="build/lombok-main/lombok/eclipse/agent/lombok-bootstrap.jar" basedir="build/agentBootstrap" includes="lombok/launch/AgentBootstrap*.class"> + <mkdir dir="build/lombok-main/lombok/launch" /> + <jar destfile="build/lombok-main/lombok/launch/mavenEcjBootstrapAgent.jar" basedir="build/mavenEcjBootstrapAgent"> <manifest> <attribute name="Premain-Class" value="lombok.launch.AgentBootstrap" /> <attribute name="Can-Redefine-Classes" value="true" /> @@ -183,7 +183,6 @@ This buildfile is part of projectlombok.org. It takes care of compiling and buil <src path="src/eclipseAgent" /> <src path="src/delombok" /> <exclude name="**/*Transplants.java" /> - <exclude name="**/AgentBootstrap.java" /> <classpath refid="cp.build" /> <classpath refid="cp.eclipse-oxygen" /> <classpath refid="cp.javac6" /> diff --git a/buildScripts/create-eclipse-project.ant.xml b/buildScripts/create-eclipse-project.ant.xml index b0f5fcca..f9c45bc6 100644 --- a/buildScripts/create-eclipse-project.ant.xml +++ b/buildScripts/create-eclipse-project.ant.xml @@ -1,5 +1,5 @@ <!-- - Copyright (C) 2010-2021 The Project Lombok Authors. + Copyright (C) 2010-2022 The Project Lombok Authors. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -34,6 +34,7 @@ This buildfile is part of projectlombok.org. It creates the infrastructure neede <srcdir dir="src/launch" /> <srcdir dir="src/utils" /> <srcdir dir="src/eclipseAgent" /> + <srcdir dir="src/mavenEcjBootstrapAgent" /> <srcdir dir="src/installer" /> <srcdir dir="src/delombok" /> <srcdir dir="src/stubs" srcout="bin/stubs" /> diff --git a/buildScripts/create-intellij-project.ant.xml b/buildScripts/create-intellij-project.ant.xml index f0bba6e4..3a5398dd 100644 --- a/buildScripts/create-intellij-project.ant.xml +++ b/buildScripts/create-intellij-project.ant.xml @@ -1,5 +1,5 @@ <!-- - Copyright (C) 2010-2021 The Project Lombok Authors. + Copyright (C) 2010-2022 The Project Lombok Authors. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -45,6 +45,7 @@ This buildfile is part of projectlombok.org. It creates the infrastructure neede <srcdir dir="src/launch" /> <srcdir dir="src/utils" /> <srcdir dir="src/eclipseAgent" /> + <srcdir dir="src/mavenEcjBootstrapAgent" /> <srcdir dir="src/installer" /> <srcdir dir="src/delombok" /> <srcdir dir="src/stubs" /> diff --git a/buildScripts/maven.ant.xml b/buildScripts/maven.ant.xml index 57bb6b99..fe64a611 100644 --- a/buildScripts/maven.ant.xml +++ b/buildScripts/maven.ant.xml @@ -1,5 +1,5 @@ <!-- - Copyright (C) 2020 The Project Lombok Authors. + Copyright (C) 2020-2022 The Project Lombok Authors. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -43,6 +43,7 @@ This buildfile is part of projectlombok.org. It makes maven-compatible repositor <fileset dir="src/launch" /> <fileset dir="src/utils" /> <fileset dir="src/eclipseAgent" /> + <fileset dir="src/mavenEcjBootstrapAgent" /> <fileset dir="src/installer" /> <fileset dir="src/delombok" /> <fileset dir="test/transform/src" /> |