diff options
| author | Reinier Zwitserloot <reinier@tipit.to> | 2009-11-25 07:32:49 +0100 |
|---|---|---|
| committer | Reinier Zwitserloot <reinier@tipit.to> | 2009-11-25 07:32:49 +0100 |
| commit | 1a0e611a9c5e1ee518670647ce1a44beae559b44 (patch) | |
| tree | e5ef8f671bc6688f486e874d4e2e1a7813e4f0b2 /buildScripts | |
| parent | 7fd947ea40c25dad9ee543ebc4b92de9a2e05efc (diff) | |
| download | lombok-1a0e611a9c5e1ee518670647ce1a44beae559b44.tar.gz lombok-1a0e611a9c5e1ee518670647ce1a44beae559b44.tar.bz2 lombok-1a0e611a9c5e1ee518670647ce1a44beae559b44.zip | |
Refactored the source folders.
Diffstat (limited to 'buildScripts')
| -rw-r--r-- | buildScripts/compile.ant.xml | 34 | ||||
| -rw-r--r-- | buildScripts/maven.ant.xml | 6 | ||||
| -rw-r--r-- | buildScripts/website.ant.xml | 2 |
3 files changed, 31 insertions, 11 deletions
diff --git a/buildScripts/compile.ant.xml b/buildScripts/compile.ant.xml index 880d7e16..cafc59b9 100644 --- a/buildScripts/compile.ant.xml +++ b/buildScripts/compile.ant.xml @@ -80,12 +80,19 @@ lombok code including the various agents. <findbugs home="deps/buildScripts/findBugs" output="html" outputFile="findbugsReport.html" jvmargs="-Xmx512m"> <auxClasspath path="build/lombok" /> <auxClasspath path="build/lombok_aux" /> - <sourcePath path="src" /> - <sourcePath path="src_eclipseagent" /> + <sourcePath path="src/core" /> + <sourcePath path="src/installer" /> + <sourcePath path="src/eclipseAgent" /> <class location="build/lombok/lombok" /> </findbugs> </target> + <patternset id="copyables"> + <exclude name="**/*.java" /> + <exclude name="**/*.class" /> + <exclude name="**/*.svg" /> + </patternset> + <target name="compile" description="Compiles the code"> <mkdir dir="build/lombok" /> <!-- ant includes the destination dir on the classpath (and there are good reason to do this), but that also means @@ -101,21 +108,30 @@ lombok code including the various agents. and partly because our injection mechanism (annotations) doesn't work very well on javac 1.5, hence, when using javac, we do demand you're on 1.6. --> <javac debug="on" destdir="build/lombok" target="1.5"> - <src path="src" /> - <src path="src_eclipseagent" /> + <src path="src/core" /> + <src path="src/installer" /> + <src path="src/eclipseAgent" /> <exclude name="lombok/javac/**" /> <classpath refid="deps.path" /> <classpath refid="libs.path" /> </javac> - <javac srcdir="src" debug="on" destdir="build/lombok" target="1.6" includes="lombok/javac/**"> + <javac debug="on" destdir="build/lombok" target="1.6"> + <src path="src/core" /> + <src path="src/installer" /> + <src path="src/eclipseAgent" /> + <include name="lombok/javac/**" /> <classpath refid="deps.path" /> <classpath refid="libs.path" /> </javac> <copy todir="build/lombok"> - <fileset dir="src"> - <exclude name="**/*.java" /> - <exclude name="**/*.class" /> - <exclude name="**/*.svg" /> + <fileset dir="src/installer"> + <patternset refid="copyables" /> + </fileset> + <fileset dir="src/core"> + <patternset refid="copyables" /> + </fileset> + <fileset dir="src/eclipseAgent"> + <patternset refid="copyables" /> </fileset> </copy> diff --git a/buildScripts/maven.ant.xml b/buildScripts/maven.ant.xml index 43fed149..f2495bcd 100644 --- a/buildScripts/maven.ant.xml +++ b/buildScripts/maven.ant.xml @@ -78,7 +78,11 @@ the maven repository that contains lombok's deliverables for those using maven. <checksum property="mvn.bin.sha1" file="${mvn.bin}/lombok-${lombok.version}.jar" algorithm="SHA1" /> <echo file="${mvn.bin}/lombok-${lombok.version}.jar.md5">${mvn.bin.md5}</echo> <echo file="${mvn.bin}/lombok-${lombok.version}.jar.sha1">${mvn.bin.sha1}</echo> - <jar destfile="${mvn.bin}/lombok-${lombok.version}-sources.jar" basedir="src" excludes="**/.DS_Store" /> + <jar destfile="${mvn.bin}/lombok-${lombok.version}-sources.jar" excludes="**/.DS_Store"> + <fileset dir="src/core" /> + <fileset dir="src/installer" /> + <fileset dir="src/eclipseAgent" /> + </jar> <checksum property="mvn.src.md5" file="${mvn.bin}/lombok-${lombok.version}-sources.jar" algorithm="MD5" /> <checksum property="mvn.src.sha1" file="${mvn.bin}/lombok-${lombok.version}-sources.jar" algorithm="SHA1" /> <echo file="${mvn.bin}/lombok-${lombok.version}-sources.jar.md5">${mvn.src.md5}</echo> diff --git a/buildScripts/website.ant.xml b/buildScripts/website.ant.xml index c8bdf2c2..30d0b29b 100644 --- a/buildScripts/website.ant.xml +++ b/buildScripts/website.ant.xml @@ -230,7 +230,7 @@ such as converting the changelog into HTML, and creating javadoc. check the <a href="lombok/package-summary.html">lombok</a> package. If you're trying to extend lombok or write your own plugins, the other packages are what you're looking for.</body></html> ]]></echo> - <javadoc sourcepath="src" defaultexcludes="yes" destdir="build/api" windowtitle="Lombok" Overview="${javadoc.overview.html}"> + <javadoc sourcepath="src/core" defaultexcludes="yes" destdir="build/api" windowtitle="Lombok" Overview="${javadoc.overview.html}"> <classpath refid="deps.path" /> <classpath refid="libs.path" /> <link href="http://java.sun.com/javase/6/docs/api/" offline="true" packagelistLoc="./deps/javadoc/java6"/> |