Age | Commit message (Collapse) | Author |
|
Conflicts:
build.xml
src/core/lombok/eclipse/HandlerLibrary.java
src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java
src/core/lombok/javac/HandlerLibrary.java
src/core/lombok/javac/handlers/JavacHandlerUtil.java
|
|
|
|
|
|
* Conflict due to adding topic() feature to logger in master, and 'field name' feature in config branch.
* master has since updated to shiny new eclipse dep versions and the 'ant eclipseForDebugging' feature, but this branch added deps. Addressed that.
* Renamed 'loggerCategory' to 'loggerTopic'. I know, that wasn't exactly right to do in a merge, but, there you have it.
* Test infrastructure changed in configuration branch, and tests had been added in master branch.
Conflicts:
build.xml
buildScripts/ivy.xml
src/core/lombok/eclipse/handlers/HandleLog.java
src/core/lombok/extern/apachecommons/CommonsLog.java
src/core/lombok/extern/java/Log.java
src/core/lombok/extern/log4j/Log4j.java
src/core/lombok/extern/log4j/Log4j2.java
src/core/lombok/javac/handlers/HandleLog.java
test/transform/resource/after-ecj/ValInTryWithResources.java
|
|
lombok.patcher.
|
|
alternative you want in the face of multiple plugin versions.
|
|
|
|
to backslashes in paths getting eliminated when using a path in a regexp replace string.
|
|
from your eclipse so that line numbers etc line up with your eclipse.
|
|
For now, it fails.
|
|
it has major refactorings to make JDK6-8 support
possibly with much prettier code.
|
|
Conflicts:
src/core/lombok/javac/handlers/JavacHandlerUtil.java
src/utils/lombok/javac/CommentCatcher.java
src/utils/lombok/javac/Javac.java
|
|
This caused a bunch of weirdness because eclipse changes a bunch of warnings and quickfixes based on this (such as complaining about lack of @SafeVarargs, a 1.7-only feature).
|
|
where _ANY_ mention of com.sun.tools.javac.tree.TreeMaker,
anywhere in a source file, would disable pretty much every
intelligent part of what makes the 'I' in IDE in eclipse:
No auto-complete, no 'go to declaration', etcetera, but only
since Eclipse Juno (not fixed in Kepler either). It's the
presence of src/stubs/com/sun/tools/javac/util/Context.java.
I've moved Context to a special stubs directory that's only used
for javac (so that we still get the benefit of getting some
warnings and such when making command line builds), and removed
the @Override annotations for where the stubbing is relevant
(for methods that exist in javac7 but not in javac6 on interfaces
we create implementations of). Furthermore, I did some extremely
tricky work in making our version actuall compatible with the
exact class signatures of both javac6- and javac7+'s versions;
generation of synthetic methods for reified type parameters was
causing havoc.
A big stack of 'here be voodoo' comments unfortunately added to
explain it all; necessary evil.
|
|
|
|
|
|
to be organization-name.jar instead of just name.jar, in order to account for
the ever lovely and wonderful apache's crazy decision to call the entirely
separate log4j v2.0 also 'log4j'. This does mean you'll have to 'ant clean'.
|
|
|
|
Only Oracle provides builds for JDK8 atm, and there is no OpenJDK
build, so the setup is slightly different. Files have to be copied
manually from an installed JDK. For comparison purposes, an Oracle JDK7
option has been added too. This should be removed before merging to master.
|
|
eclipse launch targets IF the project has been treated as eclipse project ('.project' is present).
|
|
|
|
in our tests, the tests are in the unfortunate scenario where we always compile against a given javac (lib/build/javac6.jar), and always run the tests against a given javac, but that javac tries to use the bootclasspath of the host JRE, and if that is JRE7, you get all sorts of errors.
I fixed it by still compiling against a given javac (we can only ship one lombok.jar after all), but having the test task run with a given bootclasspath and a given javac.jar.
There are 2 tasks that download both rt.jar and javac.jar for either OpenJDK6 or OpenJDK7, and it writes a properties file with those locations. The test task will use this property file, and explain what you need to do if it is not there.
Incidentally, this brought to light issue 422: Delombok in java7 produces VerifyErrors.
|
|
|
|
|
|
|
|
|
|
running on a 1.6 VM.
The test run now has more fine-grained dependency control, in preparation for running tests against multiple different platform versions (javac1.6, old eclipse, new eclipse, etc)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
is) separately compilable, i.e. has no deps on any of the others.
This is preparation work for being able to access some of these from lombok.ast without creating a cyclic dependency nightmare.
|
|
|
|
|
|
platforms.
|
|
creative stubbing to ensure both the javac7 and the javac6 source file can be loaded in the same project in eclipse without dependency warnings.
|
|
contrib purposes (we still compile against javac6, but having javac7 around for testing and such is nice).
|
|
For now PrettyCommentsPrinter is not able to print new features like JCTypeUnion,
but first tests indicate that besides this it works just fine.
|
|
launch config that adds the appropriate -javaagent VM param to ensure the runWithEclipse tests work.
|
|
build times.
|
|
anymore, but could be handy for automated testing and definitely handy for manual experimenting / testing.
|
|
fired up with lombok as agent. Fixed that in the build script.
|
|
also excluded jna which broke ecj apt support.
|
|
using lombok.
|
|
maven
|