From e693672cd44ab0e648643f4b5c24b1c177ab6c84 Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Mon, 12 Jul 2010 23:48:02 +0200 Subject: Changed build system to ivy. --- buildScripts/compile.ant.xml | 173 -------------- buildScripts/deps.ant.xml | 51 ---- buildScripts/deps/eclipse-debug-target.template | 34 --- buildScripts/deps/eclipse-debugging.ant.xml | 259 --------------------- buildScripts/deps/findbugs.ant.xml | 79 ------- buildScripts/deps/lombok-patcher.ant.xml | 158 ------------- buildScripts/eclipse-debug-target.template | 34 +++ buildScripts/git.ant.xml | 73 ------ .../ivy-repo/eclipse.org-core.runtime-3.5.0.xml | 12 + buildScripts/ivy-repo/eclipse.org-ecj-3.5.2.xml | 14 ++ .../ivy-repo/eclipse.org-equinox.common-3.5.0.xml | 12 + .../ivy-repo/eclipse.org-jdt.core-3.5.0.xml | 12 + buildScripts/ivy-repo/eclipse.org-jdt.ui-3.5.1.xml | 12 + buildScripts/ivy-repo/eclipse.org-osgi-3.5.0.xml | 12 + buildScripts/ivy-repo/lombok.patcher-ivy-0.3.xml | 14 ++ .../ivy-repo/netbeans.org-boot-6.8beta.xml | 12 + .../netbeans.org-modules.java.source-6.8beta.xml | 12 + .../netbeans.org-openide.modules-6.8beta.xml | 12 + .../ivy-repo/netbeans.org-openide.util-6.8beta.xml | 12 + .../projectlombok.org-ant-googlecode-0.0.2.xml | 11 + .../ivy-repo/projectlombok.org-javac-1.6.0.18.xml | 14 ++ .../ivy-repo/projectlombok.org-juunit-4.8.1.xml | 13 ++ .../projectlombok.org-markdownj-1.02b4.xml | 11 + .../ivy-repo/projectlombok.org-spi-0.2.4.xml | 12 + .../ivy-repo/zwitserloot.com-cmdreader-1.2.xml | 15 ++ buildScripts/ivy.xml | 39 ++++ buildScripts/ivysettings.xml | 11 + buildScripts/maven.ant.xml | 148 ------------ buildScripts/publish.ant.xml | 79 ------- buildScripts/test.ant.xml | 79 ------- buildScripts/website.ant.xml | 40 +--- 31 files changed, 307 insertions(+), 1162 deletions(-) delete mode 100644 buildScripts/compile.ant.xml delete mode 100644 buildScripts/deps.ant.xml delete mode 100644 buildScripts/deps/eclipse-debug-target.template delete mode 100644 buildScripts/deps/eclipse-debugging.ant.xml delete mode 100644 buildScripts/deps/findbugs.ant.xml delete mode 100644 buildScripts/deps/lombok-patcher.ant.xml create mode 100644 buildScripts/eclipse-debug-target.template delete mode 100644 buildScripts/git.ant.xml create mode 100644 buildScripts/ivy-repo/eclipse.org-core.runtime-3.5.0.xml create mode 100644 buildScripts/ivy-repo/eclipse.org-ecj-3.5.2.xml create mode 100644 buildScripts/ivy-repo/eclipse.org-equinox.common-3.5.0.xml create mode 100644 buildScripts/ivy-repo/eclipse.org-jdt.core-3.5.0.xml create mode 100644 buildScripts/ivy-repo/eclipse.org-jdt.ui-3.5.1.xml create mode 100644 buildScripts/ivy-repo/eclipse.org-osgi-3.5.0.xml create mode 100644 buildScripts/ivy-repo/lombok.patcher-ivy-0.3.xml create mode 100644 buildScripts/ivy-repo/netbeans.org-boot-6.8beta.xml create mode 100644 buildScripts/ivy-repo/netbeans.org-modules.java.source-6.8beta.xml create mode 100644 buildScripts/ivy-repo/netbeans.org-openide.modules-6.8beta.xml create mode 100644 buildScripts/ivy-repo/netbeans.org-openide.util-6.8beta.xml create mode 100644 buildScripts/ivy-repo/projectlombok.org-ant-googlecode-0.0.2.xml create mode 100644 buildScripts/ivy-repo/projectlombok.org-javac-1.6.0.18.xml create mode 100644 buildScripts/ivy-repo/projectlombok.org-juunit-4.8.1.xml create mode 100644 buildScripts/ivy-repo/projectlombok.org-markdownj-1.02b4.xml create mode 100644 buildScripts/ivy-repo/projectlombok.org-spi-0.2.4.xml create mode 100644 buildScripts/ivy-repo/zwitserloot.com-cmdreader-1.2.xml create mode 100644 buildScripts/ivy.xml create mode 100644 buildScripts/ivysettings.xml delete mode 100644 buildScripts/maven.ant.xml delete mode 100644 buildScripts/publish.ant.xml delete mode 100644 buildScripts/test.ant.xml (limited to 'buildScripts') diff --git a/buildScripts/compile.ant.xml b/buildScripts/compile.ant.xml deleted file mode 100644 index 7f8e2ba7..00000000 --- a/buildScripts/compile.ant.xml +++ /dev/null @@ -1,173 +0,0 @@ - - - -This buildfile is part of projectlombok.org. It responsible for compiling the main -lombok code including the various agents. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - lombok.core.AnnotationProcessor - - - - - - - - - - - - - - - - - - - - diff --git a/buildScripts/deps.ant.xml b/buildScripts/deps.ant.xml deleted file mode 100644 index f3a07ec8..00000000 --- a/buildScripts/deps.ant.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - -This buildfile is part of projectlombok.org. It responsible for finding, downloading, -and building dependencies. - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/buildScripts/deps/eclipse-debug-target.template b/buildScripts/deps/eclipse-debug-target.template deleted file mode 100644 index 7a1ac635..00000000 --- a/buildScripts/deps/eclipse-debug-target.template +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/buildScripts/deps/eclipse-debugging.ant.xml b/buildScripts/deps/eclipse-debugging.ant.xml deleted file mode 100644 index dddd7f6a..00000000 --- a/buildScripts/deps/eclipse-debugging.ant.xml +++ /dev/null @@ -1,259 +0,0 @@ - - - -This buildfile is part of projectlombok.org. It responsible for downloading, updating, and setting up the eclipse modules that are useful to have when working on lombok's eclipse integration. It's optional. - - - - - - - - - - - - - - - - - -Do you want me to create an eclipse debug target so you can launch a second eclipse, lombok-ized, in the eclipse debugger? - - - - - - - - - - - - -Do you want me to grab from CVS the 3.5 version of org.eclipse.jdt.core? -Lombok integrates with this eclipse module often, and you should grab it if you're going to work on lombok's eclipse integration. - - - - - - - - - - - -Do you want me to grab from CVS the 3.5 version of org.eclipse.jdt.ui? -Lombok integrates with this eclipse module often, and you should grab it if you're going to work on lombok's eclipse integration. - - - - - - - - - - - -Do you want me to grab from CVS the 3.5 version of org.eclipse.core.runtime? -Interacting with the filer and messager (for errors and warnings) requires core.runtime, as well as interacting with modules. -You may not need it unless you're going to work on those areas. - - - - - - - - - - - - -Do you want me to grab from CVS the 3.5 version of org.eclipse.ltk.core.refactoring? -Unless you're going to work with lombok's patching of the refactor scripts, you won't need it. - - - - - - - - - - - - -Do you want me to grab from CVS the 3.5 version of org.eclipse.equinox? -Unless you're going to work on lombok.patcher's OSGi integration, you won't need this. - -WARNING: This project is enormous (350MB) and takes like an hour to check out. You should answer no unless you _really_ want it. - - - - - - - - - - - - - eclipse module checked out in a sibling directory to the lombok project directory. You may want to add the project to your eclipse workspace. - - - - - - - - - eclipse module checked out in a sibling directory to the lombok project directory. You may want to add the project to your eclipse workspace. - - - - - - - - - eclipse module checked out in a sibling directory to the lombok project directory. You may want to add the project to your eclipse workspace. - - - - - - - - - eclipse module checked out in a sibling directory to the lombok project directory. You may want to add the project to your eclipse workspace. - - - - - - - - - eclipse module checked out in a sibling directory to the lombok project directory. You may want to add the project to your eclipse workspace. - - - - - - - - - - --------------------------- - - Launch target configured; it should show up in your eclipse under the debug menu as "LombokizedEclipse". - It does NOT hot-code-replace on lombok itself - you'll need to run 'ant dist' every time you want to use it. This is an unavoidable shortcoming of java agents. You can, however, breakpoint and step through your eclipse this way. - - --------------------------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/buildScripts/deps/findbugs.ant.xml b/buildScripts/deps/findbugs.ant.xml deleted file mode 100644 index 6aeedb79..00000000 --- a/buildScripts/deps/findbugs.ant.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - -This buildfile is part of projectlombok.org. It responsible for finding, downloading, and updating findbugs. - - - - - - - - - - - - Downloading findbugs v1.3.9 from sourceforge... - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -You don't have the findbugs dependency. If you want to run the 'ant findbugs' task to run findbugs on the lombok sources, you'll need it. Otherwise, you can skip it. If you want me to do so, I will download findbugs now and unpack it in the appropriate place (deps/buildScripts/findbugs). The file will be downloaded from sourceforge. - Pick one (first letter will do): - Skip - Skips this download. This dependency is optional. - Download - Grabs findbugs, so that you can run 'ant findbugs'. - - - - - - - diff --git a/buildScripts/deps/lombok-patcher.ant.xml b/buildScripts/deps/lombok-patcher.ant.xml deleted file mode 100644 index c0dfbf77..00000000 --- a/buildScripts/deps/lombok-patcher.ant.xml +++ /dev/null @@ -1,158 +0,0 @@ - - - -This buildfile is part of projectlombok.org. It responsible for finding, downloading, and updating the lombok.patcher dependency. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - You don't have any version of lombok-patcher.jar installed. Run 'ant installDeps' to fix this. - - - - - - - - - - - - - - - - ** UPDATED: ${lombok.patcher.fileloc} - - - - - - - - - - - - - - - - - - - - - - -You don't have the lombok.patcher dependency. I can grab the lombok.patcher project form version control. If you want me to do so, I will put the project in a sibling directory next to your 'lombok' project directory. Otherwise, I can grab a copy from the internet, though it won't be as up-to-date, and may thus be insufficient to run the very latest lombok. - Pick one (first letter will do): - Skip - Skips this download. This dependency is not optional, so your lombok won't compile. - Get - Grabs the latest version of lombok.patcher from source control. - Download - Downloads the latest version from the internet, and will not be as up to date as 'get'. - - - - - - - - - - - - - -You only have the lombok.patcher dependency as a downloaded file, which won't be as cutting edge as grabbing it from version control. Do you want to grab lombok.patcher from source control? I will put the project in a sibling directory next to your 'lombok' directory. - Pick one (first letter will do): - Skip - Skips this download, and continues to rely on the occasionally updated web version. - Get - Grabs the latest version of lombok.patcher from source control. Lombok will start using this instead. - - - - - - - - - - - - - Cloning ${lombok.patcher.giturl} into ${lombok.patcher.dir} - - -Done! lombok-patcher.jar will now be resolved from this cloned repository. -You may want to import this project into your eclipse workspace as well. - - - - - - Updating existing git repository of lombok.patcher... - - - - - Downloading lombok-patcher.jar from the internet... - - - - - Updating existing lombok-patcher.jar from the internet... - - - - - - - diff --git a/buildScripts/eclipse-debug-target.template b/buildScripts/eclipse-debug-target.template new file mode 100644 index 00000000..7a1ac635 --- /dev/null +++ b/buildScripts/eclipse-debug-target.template @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/buildScripts/git.ant.xml b/buildScripts/git.ant.xml deleted file mode 100644 index 14d3e963..00000000 --- a/buildScripts/git.ant.xml +++ /dev/null @@ -1,73 +0,0 @@ - - - Useful macrodefs for using git from ant. - - - - - - - - - - - - - - - - - - -[GIT NOT FOUND] - -You don't appear to have git installed. If you're on windows, try running this in your git shell. -Otherwise, install git. git is a free and open source version control system. -You can download it from: http://git-scm.com/ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/buildScripts/ivy-repo/eclipse.org-core.runtime-3.5.0.xml b/buildScripts/ivy-repo/eclipse.org-core.runtime-3.5.0.xml new file mode 100644 index 00000000..d57eb367 --- /dev/null +++ b/buildScripts/ivy-repo/eclipse.org-core.runtime-3.5.0.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/buildScripts/ivy-repo/eclipse.org-ecj-3.5.2.xml b/buildScripts/ivy-repo/eclipse.org-ecj-3.5.2.xml new file mode 100644 index 00000000..b5d37c26 --- /dev/null +++ b/buildScripts/ivy-repo/eclipse.org-ecj-3.5.2.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/buildScripts/ivy-repo/eclipse.org-equinox.common-3.5.0.xml b/buildScripts/ivy-repo/eclipse.org-equinox.common-3.5.0.xml new file mode 100644 index 00000000..865f3455 --- /dev/null +++ b/buildScripts/ivy-repo/eclipse.org-equinox.common-3.5.0.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/buildScripts/ivy-repo/eclipse.org-jdt.core-3.5.0.xml b/buildScripts/ivy-repo/eclipse.org-jdt.core-3.5.0.xml new file mode 100644 index 00000000..22b0623f --- /dev/null +++ b/buildScripts/ivy-repo/eclipse.org-jdt.core-3.5.0.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/buildScripts/ivy-repo/eclipse.org-jdt.ui-3.5.1.xml b/buildScripts/ivy-repo/eclipse.org-jdt.ui-3.5.1.xml new file mode 100644 index 00000000..75867b4f --- /dev/null +++ b/buildScripts/ivy-repo/eclipse.org-jdt.ui-3.5.1.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/buildScripts/ivy-repo/eclipse.org-osgi-3.5.0.xml b/buildScripts/ivy-repo/eclipse.org-osgi-3.5.0.xml new file mode 100644 index 00000000..62a6d3d4 --- /dev/null +++ b/buildScripts/ivy-repo/eclipse.org-osgi-3.5.0.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/buildScripts/ivy-repo/lombok.patcher-ivy-0.3.xml b/buildScripts/ivy-repo/lombok.patcher-ivy-0.3.xml new file mode 100644 index 00000000..ea9e369e --- /dev/null +++ b/buildScripts/ivy-repo/lombok.patcher-ivy-0.3.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/buildScripts/ivy-repo/netbeans.org-boot-6.8beta.xml b/buildScripts/ivy-repo/netbeans.org-boot-6.8beta.xml new file mode 100644 index 00000000..4f6b6a86 --- /dev/null +++ b/buildScripts/ivy-repo/netbeans.org-boot-6.8beta.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/buildScripts/ivy-repo/netbeans.org-modules.java.source-6.8beta.xml b/buildScripts/ivy-repo/netbeans.org-modules.java.source-6.8beta.xml new file mode 100644 index 00000000..352b390a --- /dev/null +++ b/buildScripts/ivy-repo/netbeans.org-modules.java.source-6.8beta.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/buildScripts/ivy-repo/netbeans.org-openide.modules-6.8beta.xml b/buildScripts/ivy-repo/netbeans.org-openide.modules-6.8beta.xml new file mode 100644 index 00000000..6549869e --- /dev/null +++ b/buildScripts/ivy-repo/netbeans.org-openide.modules-6.8beta.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/buildScripts/ivy-repo/netbeans.org-openide.util-6.8beta.xml b/buildScripts/ivy-repo/netbeans.org-openide.util-6.8beta.xml new file mode 100644 index 00000000..3ef68928 --- /dev/null +++ b/buildScripts/ivy-repo/netbeans.org-openide.util-6.8beta.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/buildScripts/ivy-repo/projectlombok.org-ant-googlecode-0.0.2.xml b/buildScripts/ivy-repo/projectlombok.org-ant-googlecode-0.0.2.xml new file mode 100644 index 00000000..9f5d13ba --- /dev/null +++ b/buildScripts/ivy-repo/projectlombok.org-ant-googlecode-0.0.2.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/buildScripts/ivy-repo/projectlombok.org-javac-1.6.0.18.xml b/buildScripts/ivy-repo/projectlombok.org-javac-1.6.0.18.xml new file mode 100644 index 00000000..f2335aa1 --- /dev/null +++ b/buildScripts/ivy-repo/projectlombok.org-javac-1.6.0.18.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/buildScripts/ivy-repo/projectlombok.org-juunit-4.8.1.xml b/buildScripts/ivy-repo/projectlombok.org-juunit-4.8.1.xml new file mode 100644 index 00000000..aa31e5b0 --- /dev/null +++ b/buildScripts/ivy-repo/projectlombok.org-juunit-4.8.1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/buildScripts/ivy-repo/projectlombok.org-markdownj-1.02b4.xml b/buildScripts/ivy-repo/projectlombok.org-markdownj-1.02b4.xml new file mode 100644 index 00000000..06c581ec --- /dev/null +++ b/buildScripts/ivy-repo/projectlombok.org-markdownj-1.02b4.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/buildScripts/ivy-repo/projectlombok.org-spi-0.2.4.xml b/buildScripts/ivy-repo/projectlombok.org-spi-0.2.4.xml new file mode 100644 index 00000000..da949c50 --- /dev/null +++ b/buildScripts/ivy-repo/projectlombok.org-spi-0.2.4.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/buildScripts/ivy-repo/zwitserloot.com-cmdreader-1.2.xml b/buildScripts/ivy-repo/zwitserloot.com-cmdreader-1.2.xml new file mode 100644 index 00000000..5f7b501b --- /dev/null +++ b/buildScripts/ivy-repo/zwitserloot.com-cmdreader-1.2.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/buildScripts/ivy.xml b/buildScripts/ivy.xml new file mode 100644 index 00000000..4bcce7c8 --- /dev/null +++ b/buildScripts/ivy.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/buildScripts/ivysettings.xml b/buildScripts/ivysettings.xml new file mode 100644 index 00000000..18cb32d4 --- /dev/null +++ b/buildScripts/ivysettings.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/buildScripts/maven.ant.xml b/buildScripts/maven.ant.xml deleted file mode 100644 index f2495bcd..00000000 --- a/buildScripts/maven.ant.xml +++ /dev/null @@ -1,148 +0,0 @@ - - - -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} - - - - - - - - - - You don't have the libertad-upload.key; you'll need it to get write access to the server. - - - - - - - - diff --git a/buildScripts/publish.ant.xml b/buildScripts/publish.ant.xml deleted file mode 100644 index da24c21f..00000000 --- a/buildScripts/publish.ant.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - -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/test.ant.xml b/buildScripts/test.ant.xml deleted file mode 100644 index 5e10bbb0..00000000 --- a/buildScripts/test.ant.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - -This buildfile is part of projectlombok.org. It responsible for running unit tests. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - All tests successful. - - diff --git a/buildScripts/website.ant.xml b/buildScripts/website.ant.xml index e0861e83..b33eebf2 100644 --- a/buildScripts/website.ant.xml +++ b/buildScripts/website.ant.xml @@ -1,5 +1,5 @@