Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

LEP-4914

git-svn-id: svn://svn.liferay.com/repos/public/portal/trunk@13268 05bdf26c-840f-0410-9ced-eb539d925f36
  • Loading branch information...
commit a1dfa70ed857ba448d0b38e894534766804d1091 1 parent ef1c551
@brianchandotcom brianchandotcom authored
View
36 build-common-java.xml
@@ -22,15 +22,33 @@
<fileset dir="src" includes="**/service.xml" />
</copy>
- <javac
- classpathref="project.classpath"
- compiler="${javac.compiler}"
- debug="${javac.debug}"
- deprecation="${javac.deprecation}"
- destdir="classes"
- nowarn="${javac.nowarn}"
- srcdir="src"
- />
+ <if>
+ <equals arg1="${javac.compiler}" arg2="modern" />
+ <then>
+ <javac
+ classpathref="project.classpath"
+ compiler="${javac.compiler}"
+ debug="${javac.debug}"
+ deprecation="${javac.deprecation}"
+ destdir="classes"
+ fork="${javac.fork}"
+ memoryMaximumSize="${javac.memoryMaximumSize}"
+ nowarn="${javac.nowarn}"
+ srcdir="src"
+ />
+ </then>
+ <else>
+ <javac
+ classpathref="project.classpath"
+ compiler="${javac.compiler}"
+ debug="${javac.debug}"
+ deprecation="${javac.deprecation}"
+ destdir="classes"
+ nowarn="${javac.nowarn}"
+ srcdir="src"
+ />
+ </else>
+ </if>
</target>
<target name="jar" depends="compile">
View
2  build.properties
@@ -14,6 +14,8 @@ javac.compiler=modern
javac.debug=on
javac.deprecation=off
+javac.fork=true
+javac.memoryMaximumSize=256m
javac.nowarn=on
jsp.precompile=off
View
36 portal-impl/build.xml
@@ -163,15 +163,33 @@ ${exception.message}
<antelope:endswith string="${app.server.portal.dir}" with="/portal-web/docroot" />
</and>
<then>
- <javac
- classpathref="project.classpath"
- compiler="${javac.compiler}"
- debug="${javac.debug}"
- deprecation="${javac.deprecation}"
- destdir="${app.server.classes.portal.dir}"
- nowarn="${javac.nowarn}"
- srcdir="src"
- />
+ <if>
+ <equals arg1="${javac.compiler}" arg2="modern" />
+ <then>
+ <javac
+ classpathref="project.classpath"
+ compiler="${javac.compiler}"
+ debug="${javac.debug}"
+ deprecation="${javac.deprecation}"
+ destdir="${app.server.classes.portal.dir}"
+ fork="${javac.fork}"
+ memoryMaximumSize="${javac.memoryMaximumSize}"
+ nowarn="${javac.nowarn}"
+ srcdir="src"
+ />
+ </then>
+ <else>
+ <javac
+ classpathref="project.classpath"
+ compiler="${javac.compiler}"
+ debug="${javac.debug}"
+ deprecation="${javac.deprecation}"
+ destdir="${app.server.classes.portal.dir}"
+ nowarn="${javac.nowarn}"
+ srcdir="src"
+ />
+ </else>
+ </if>
</then>
</if>
</target>
View
6 tools/ext_tmpl/build.properties
@@ -9,9 +9,13 @@
## Compiler
##
-javac.compiler=org.eclipse.jdt.core.JDTCompilerAdapter
+javac.compiler=modern
+#javac.compiler=org.eclipse.jdt.core.JDTCompilerAdapter
+
javac.debug=on
javac.deprecation=off
+javac.fork=true
+javac.memoryMaximumSize=256m
javac.nowarn=on
jsp.precompile=off
View
36 tools/ext_tmpl/ext-impl/build-parent.xml
@@ -19,15 +19,33 @@
<trycatch property="exception.message">
<try>
- <javac
- classpathref="project.classpath"
- compiler="${javac.compiler}"
- debug="${javac.debug}"
- deprecation="${javac.deprecation}"
- destdir="classes"
- nowarn="${javac.nowarn}"
- srcdir="src"
- />
+ <if>
+ <equals arg1="${javac.compiler}" arg2="modern" />
+ <then>
+ <javac
+ classpathref="project.classpath"
+ compiler="${javac.compiler}"
+ debug="${javac.debug}"
+ deprecation="${javac.deprecation}"
+ destdir="classes"
+ fork="${javac.fork}"
+ memoryMaximumSize="${javac.memoryMaximumSize}"
+ nowarn="${javac.nowarn}"
+ srcdir="src"
+ />
+ </then>
+ <else>
+ <javac
+ classpathref="project.classpath"
+ compiler="${javac.compiler}"
+ debug="${javac.debug}"
+ deprecation="${javac.deprecation}"
+ destdir="classes"
+ nowarn="${javac.nowarn}"
+ srcdir="src"
+ />
+ </else>
+ </if>
</try>
<catch>
<antelope:stringutil string="${exception.message}" property="exception.message.index">
Please sign in to comment.
Something went wrong with that request. Please try again.