| author | Mike Sullivan <Mike.Sullivan@Oracle.COM> |
| Wed, 29 Aug 2012 11:05:56 -0700 | |
| changeset 957 | 255465c5756f |
| parent 116 | ae6a90899b42 |
| permissions | -rw-r--r-- |
|
116
ae6a90899b42
7022452 move ant to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
1 |
--- apache-ant-1.7.1/src/script/ant.orig Fri Feb 25 07:25:24 2011 |
|
ae6a90899b42
7022452 move ant to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
2 |
+++ apache-ant-1.7.1/src/script/ant Fri Feb 25 07:34:29 2011 |
|
ae6a90899b42
7022452 move ant to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
3 |
@@ -3,6 +3,9 @@ |
|
ae6a90899b42
7022452 move ant to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
4 |
# Licensed to the Apache Software Foundation (ASF) under one or more |
|
ae6a90899b42
7022452 move ant to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
5 |
# contributor license agreements. See the NOTICE file distributed with |
|
ae6a90899b42
7022452 move ant to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
6 |
# this work for additional information regarding copyright ownership. |
|
ae6a90899b42
7022452 move ant to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
7 |
+ |
|
ae6a90899b42
7022452 move ant to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
8 |
+JAVA_HOME=${JAVA_HOME:-/usr/java}
|
|
ae6a90899b42
7022452 move ant to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
9 |
+ANT_HOME=${ANT_HOME:-/usr}
|
|
ae6a90899b42
7022452 move ant to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
10 |
# The ASF licenses this file to You under the Apache License, Version 2.0 |
|
ae6a90899b42
7022452 move ant to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
11 |
# (the "License"); you may not use this file except in compliance with |
|
ae6a90899b42
7022452 move ant to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
12 |
# the License. You may obtain a copy of the License at |
|
ae6a90899b42
7022452 move ant to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
13 |
@@ -120,7 +123,11 @@ |
|
ae6a90899b42
7022452 move ant to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
14 |
fi |
|
ae6a90899b42
7022452 move ant to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
15 |
|
|
ae6a90899b42
7022452 move ant to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
16 |
# set ANT_LIB location |
|
ae6a90899b42
7022452 move ant to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
17 |
-ANT_LIB="${ANT_HOME}/lib"
|
|
ae6a90899b42
7022452 move ant to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
18 |
+if [ "$ANT_HOME" = "/usr" ] ; then |
|
ae6a90899b42
7022452 move ant to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
19 |
+ ANT_LIB="${ANT_HOME}/share/lib/ant"
|
|
ae6a90899b42
7022452 move ant to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
20 |
+else |
|
ae6a90899b42
7022452 move ant to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
21 |
+ ANT_LIB="${ANT_HOME}/lib"
|
|
ae6a90899b42
7022452 move ant to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
22 |
+fi |
|
ae6a90899b42
7022452 move ant to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
23 |
|
|
ae6a90899b42
7022452 move ant to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
24 |
if [ -z "$JAVACMD" ] ; then |
|
ae6a90899b42
7022452 move ant to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
25 |
if [ -n "$JAVA_HOME" ] ; then |