Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

LPS-15240 Streamline it

git-svn-id: svn://svn.liferay.com/repos/public/portal/trunk@72557 05bdf26c-840f-0410-9ced-eb539d925f36
  • Loading branch information...
commit d25457b574057fe003317408469e0aefb9c8d4da 1 parent f77093c
@brianchandotcom brianchandotcom authored
Showing with 22 additions and 6 deletions.
  1. +12 −0 build-common.xml
  2. +1 −2  build.properties
  3. +9 −4 portal-web/build.xml
View
12 build-common.xml
@@ -261,6 +261,18 @@ Please set the environment variable ANT_OPTS to the recommended value of
</then>
</if>
+ <if>
+ <and>
+ <not>
+ <isset property="jdk.6.home" />
+ </not>
+ <equals arg1="${java.specification.version}" arg2="1.6" />
+ </and>
+ <then>
+ <property name="jdk.6.home" value="${env.JAVA_HOME}" />
+ </then>
+ </if>
+
<target name="compile">
</target>
View
3  build.properties
@@ -23,8 +23,7 @@
jsp.precompile=off
jsp.precompile.dir=docroot
- jdk.5.home=
- jdk.6.home=
+ #jdk.6.home=
##
## Classpath
View
13 portal-web/build.xml
@@ -680,11 +680,16 @@
</target>
<target name="compile-resin">
-
<if>
- <equals arg1="${jdk.6.home}" arg2="" />
- <then>
- <fail>Property 'jdk.6.home' required!</fail>
+ <not>
+ <isset property="jdk.6.home" />
+ </not>
+ <then>
+ <fail>
+.
+
+Please set the property "jdk.6.home" in build.properties.
+ </fail>
</then>
</if>
Please sign in to comment.
Something went wrong with that request. Please try again.