diff --git a/.classpath b/.classpath index 95ce615b..f1f8e5fa 100644 --- a/.classpath +++ b/.classpath @@ -3,7 +3,6 @@ - @@ -17,7 +16,7 @@ - + diff --git a/build.xml b/build.xml index 3cfa376c..54f1266b 100644 --- a/build.xml +++ b/build.xml @@ -20,208 +20,14 @@ THE SOFTWARE. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + This buildfile is part of projectlombok.org. It is the main entry point that contains +the common tasks and can be called on to run the main aspects of all the sub-scripts. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Now upload dist/website.tar.bz2 to the webserver. - If you want to host projectlombok.org on github, run the website/publish script, but this is not where the site is currently hosted. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - lombok.javac.apt.Processor - - - - - - - - - - - - - - - - - - - - - - - - + Lombok version: ${lombok.version} - - - - - - - Welcome to the lombok javadoc. If you're just looking to learn more about using lombok - You probably want to look at the feature documentation. Otherwise, - check the lombok package. If you're trying to extend lombok or - write your own plugins, the other packages are what you're looking for. - ]]> - - - - -
Lombok - ]]>v${lombok.version}
- Copyright © 2009 Reinier Zwitserloot and Roel Spilker, licensed under the MIT licence.]]> - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - + + + + + - - - - - + + + + - - #username=[your google account name without @gmail.com] -#password=[your googlecode password, is NOT your gmail password] - + + + + - - - - - + + + + - - - - - - - - - - - - - - - + + + + - - - - - - - - - - <version>${lombok.version}</version> - - - - - - - - - - - - - - - - - - - - ${mvn.bin.md5} - ${mvn.bin.sha1} - - - - ${mvn.src.md5} - ${mvn.src.sha1} - - - - - - - - - - ${mvn.pom.md5} - ${mvn.pom.sha1} - - - org.projectlombok - lombok - ${lombok.version} - - - ${lombok.version} -${mvn.oldversions} - - ${now.millis} - - -]]> - - - ${mvn.manifest.md5} - ${mvn.manifest.sha1} - - - - Now copy maven.tar.bz2 to the website and unpack it in the mavenrepo directory, overwriting whatever's there. + + + + diff --git a/buildScripts/compile.ant.xml b/buildScripts/compile.ant.xml new file mode 100644 index 00000000..82ee07f7 --- /dev/null +++ b/buildScripts/compile.ant.xml @@ -0,0 +1,131 @@ + + + This buildfile is part of projectlombok.org. It responsible for compiling the main +lombok code including the various agents. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + lombok.javac.apt.Processor + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/buildScripts/deps.ant.xml b/buildScripts/deps.ant.xml new file mode 100644 index 00000000..648685dc --- /dev/null +++ b/buildScripts/deps.ant.xml @@ -0,0 +1,46 @@ + + + This buildfile is part of projectlombok.org. It responsible for finding, downloading, +and building dependencies. + + + + + + + + + + + + + + + + + + ** UPDATED: lib/eclipse.agent/lombok-patcher.jar + + diff --git a/buildScripts/maven.ant.xml b/buildScripts/maven.ant.xml new file mode 100644 index 00000000..783303f2 --- /dev/null +++ b/buildScripts/maven.ant.xml @@ -0,0 +1,111 @@ + + + This buildfile is part of projectlombok.org. It is responsible for creating and maintaining +the maven repository that contains lombok's deliverables for those using maven. + + + + + + + + + + + + + + + + + + + + + + + + + + <version>${lombok.version}</version> + + + + + + + + + + + + + + + + + + + + ${mvn.bin.md5} + ${mvn.bin.sha1} + + + + ${mvn.src.md5} + ${mvn.src.sha1} + + + + + + + + + + ${mvn.pom.md5} + ${mvn.pom.sha1} + + + org.projectlombok + lombok + ${lombok.version} + + + ${lombok.version} + ${mvn.oldversions} + + ${now.millis} + + +]]> + + + ${mvn.manifest.md5} + ${mvn.manifest.sha1} + + + + Now copy maven.tar.bz2 to the website and unpack it in the mavenrepo directory. Let it overwrite files. + + diff --git a/buildScripts/publish.ant.xml b/buildScripts/publish.ant.xml new file mode 100644 index 00000000..6c31b42b --- /dev/null +++ b/buildScripts/publish.ant.xml @@ -0,0 +1,75 @@ + + + This buildfile is part of projectlombok.org. It is responsible for turning the build results +into the actual deliverable form, and uploading it to the distribution websites. + + + + + + + + + + + + + + + + + + + + + + + + #username=[your google account name without @gmail.com] +#password=[your googlecode password, is NOT your gmail password] + + + + + + + + + + diff --git a/buildScripts/website.ant.xml b/buildScripts/website.ant.xml new file mode 100644 index 00000000..d4b0605d --- /dev/null +++ b/buildScripts/website.ant.xml @@ -0,0 +1,224 @@ + + + +This buildfile is part of projectlombok.org. It is responsible for building the website and all website-related aspects, +such as converting the changelog into HTML, and creating javadoc. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Now upload dist/website.tar.bz2 to the webserver. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Welcome to the lombok javadoc. If you're just looking to learn more about using lombok + You probably want to look at the feature documentation. Otherwise, + check the lombok package. If you're trying to extend lombok or + write your own plugins, the other packages are what you're looking for. + ]]> + + + + +
Lombok - ]]>v${lombok.version}
+ Copyright © 2009 Reinier Zwitserloot and Roel Spilker, licensed under the MIT licence.]]> + + + + + + + + + + + + + + + diff --git a/deps/README b/deps/README index cda42040..3a260349 100644 --- a/deps/README +++ b/deps/README @@ -1,5 +1,4 @@ 'deps' are defined as those things which are required to compile or develop lombok, but which aren't required when -actually running lombok. The main lombok code is dependent on all libraries in the 'lombok' directory, whilst the agents -are dependent on both the contents of the 'agent' directory and the agent's specific directory (e.g. 'eclipse.agent'). +actually running lombok. For dependencies which need to be available at runtime, see the 'lib' directory. diff --git a/deps/eclipse.agent/spi-0.2.3-pre.jar b/deps/eclipse.agent/spi-0.2.3-pre.jar deleted file mode 100644 index ecd70464..00000000 Binary files a/deps/eclipse.agent/spi-0.2.3-pre.jar and /dev/null differ diff --git a/deps/tools.jar b/deps/lombok/tools.jar similarity index 100% rename from deps/tools.jar rename to deps/lombok/tools.jar diff --git a/website/publish b/website/publish deleted file mode 100755 index 412c71f6..00000000 --- a/website/publish +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash - -if [ ! -e src/lombok/core/Version.java ]; then - echo Run this script from the lombok project home directory. - exit -fi - -if [ ! -e dist/website.tar.bz2 ]; then - echo There is no dist/website.tar.bz2 file! Run: - echo ant website - echo then restart this script - exit -fi - -mkdir -p build/temp || exit -cd build/temp || exit -git clone -l -n ../.. websitegit || exit -cd websitegit || exit -BRANCHOK="foo" -git branch gh-pages origin/gh-pages || BRANCHOK="bar" -if [ $BRANCHOK == "bar" ]; then -echo If you get error fatal: Not a valid object name: origin/gh-pages. -echo then run: git branch gh-pages origin/gh-pages -echo first before running this script - exit -fi -git checkout gh-pages || exit -rm -r * || exit -tar xfj ../../../dist/website.tar.bz2 || exit -git add . || exit -git commit -a -m website || exit -git push origin gh-pages || exit -cd .. || exit -rm -rf websitegit || exit - -echo Your gh-pages branch has been updated. Do not forget to run: -echo git push origin gh-pages