diff options
| author | Roel Spilker <r.spilker@gmail.com> | 2012-01-30 19:48:12 +0100 |
|---|---|---|
| committer | Roel Spilker <r.spilker@gmail.com> | 2012-01-30 19:48:12 +0100 |
| commit | 55384884d380fba1a5fe024e1d82329d71c36f02 (patch) | |
| tree | a19f69b9a4da56b58abb96e0a79d852eeb659bb0 /buildScripts | |
| parent | 98875218ea3f6ba68f7f83d3e0458c9901db00f3 (diff) | |
| parent | fc7ca61aeb3ee06c426573b5059e97532b601172 (diff) | |
| download | lombok-55384884d380fba1a5fe024e1d82329d71c36f02.tar.gz lombok-55384884d380fba1a5fe024e1d82329d71c36f02.tar.bz2 lombok-55384884d380fba1a5fe024e1d82329d71c36f02.zip | |
Merge branch 'master' of github.com:rzwitserloot/lombok
Diffstat (limited to 'buildScripts')
| -rw-r--r-- | buildScripts/eclipse-debug-target.template | 2 | ||||
| -rw-r--r-- | buildScripts/ivy.xml | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/buildScripts/eclipse-debug-target.template b/buildScripts/eclipse-debug-target.template index 99e4237c..033f8197 100644 --- a/buildScripts/eclipse-debug-target.template +++ b/buildScripts/eclipse-debug-target.template @@ -21,7 +21,7 @@ <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}"/> <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> -<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx512m @START_ON_FIRST_THREAD@ -Dorg.eclipse.swt.internal.carbon.smallFonts -javaagent:${project_loc:lombok}/dist/lombok.jar -Xbootclasspath/a:${project_loc:lombok}/dist/lombok.jar -Dlombok.patcher.patchDebugDir=${project_loc:lombok}/debug/patchedClasses"/> +<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx512m -XX:MaxPermSize=256m @START_ON_FIRST_THREAD@ -Dorg.eclipse.swt.internal.carbon.smallFonts -javaagent:${project_loc:lombok}/dist/lombok.jar -Xbootclasspath/a:${project_loc:lombok}/dist/lombok.jar -Dlombok.patcher.patchDebugDir=${project_loc:lombok}/debug/patchedClasses"/> <stringAttribute key="pde.version" value="3.3"/> <stringAttribute key="product" value="org.eclipse.sdk.ide"/> <booleanAttribute key="show_selected_only" value="false"/> diff --git a/buildScripts/ivy.xml b/buildScripts/ivy.xml index 4fa4787b..334a38d9 100644 --- a/buildScripts/ivy.xml +++ b/buildScripts/ivy.xml @@ -3,11 +3,12 @@ <configurations> <conf name="eclipseBuild" /> <conf name="netbeansBuild" /> - <conf name="build" extends="eclipseBuild, netbeansBuild" /> + <conf name="build" extends="eclipseBuild, netbeansBuild, javac6" /> <conf name="runtime" /> - <conf name="test" extends="build, runtime" /> + <conf name="test" extends="runtime" /> <conf name="contrib" /> <conf name="ecj" /> + <conf name="javac6" /> <conf name="javac7" /> </configurations> <dependencies> @@ -28,7 +29,7 @@ <dependency org="projectlombok.org" name="markdownj" rev="1.02b4" conf="build" /> <dependency org="de.java2html" name="java2html" rev="5.0" conf="build->default" /> - <dependency org="net.java.openjdk.custom" name="javac6" rev="1.6.0.18" conf="build->runtime; contrib->sources" /> + <dependency org="net.java.openjdk.custom" name="javac6" rev="1.6.0.18" conf="javac6->runtime; contrib->sources" /> <dependency org="net.java.openjdk.custom" name="javac7" rev="1.7.0" conf="javac7->runtime; contrib->sources" /> <dependency org="org.eclipse.custom" name="ecj" rev="3.6.2" conf="ecj->default; contrib->sources" /> |