diff options
| author | Brent Eagles <brent@zeroc.com> | 2005-02-16 20:07:54 +0000 |
|---|---|---|
| committer | Brent Eagles <brent@zeroc.com> | 2005-02-16 20:07:54 +0000 |
| commit | 0f7b200db14ffb544c25e714f454975d80c25e03 (patch) | |
| tree | 56c3a41fc3767369e45923bb005534ff15c311d0 | |
| parent | Added .def python files (diff) | |
| download | ice-0f7b200db14ffb544c25e714f454975d80c25e03.tar.bz2 ice-0f7b200db14ffb544c25e714f454975d80c25e03.tar.xz ice-0f7b200db14ffb544c25e714f454975d80c25e03.zip | |
adding settings for bin tarball installations
| -rw-r--r-- | java/config/common.opt.xml | 38 | ||||
| -rw-r--r-- | java/config/common.xml | 9 |
2 files changed, 47 insertions, 0 deletions
diff --git a/java/config/common.opt.xml b/java/config/common.opt.xml new file mode 100644 index 00000000000..a6e43c89d25 --- /dev/null +++ b/java/config/common.opt.xml @@ -0,0 +1,38 @@ +<!-- + ********************************************************************** + + Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved. + + This copy of Ice is licensed to you under the terms described in the + ICE_LICENSE file included in this distribution. + + ********************************************************************** +--> +<project name="common_opt" basedir="." default="..."> + <property environment="env"/> + + <dirname property="common_opt.basedir" file="${ant.file.common_opt}" /> + + <fail message="ICE_HOME is not set to a valid directory"> + <condition> + <not> + <available file="${env.ICE_HOME}/lib" /> + </not> + </condition> + </fail> + + <property name="lib.dir" value="${env.ICE_HOME}/lib" /> + + + <property name="slice.dir" value="${env.ICE_HOME}/slice"/> + <taskdef name="slice2java" classpath="${env.ICE_HOME}/ant" classname="Slice2JavaTask"/> + <taskdef name="slice2freezej" classpath="${env.ICE_HOME}/ant" classname="Slice2FreezeJTask" /> + + <!-- Ice classpath --> + <path id="ice.classpath"> + <fileset dir="${lib.dir}"> + <include name="*.jar"/> + </fileset> + </path> + +</project> diff --git a/java/config/common.xml b/java/config/common.xml index 0654358be90..1e9afad4aff 100644 --- a/java/config/common.xml +++ b/java/config/common.xml @@ -36,6 +36,15 @@ </not> </and> </condition> + + <condition property="installtype" value="opt"> + <and> + <available file="${env.ICE_HOME}/slice" /> + <not> + <isset property="installtype"/> + </not> + </and> + </condition> <fail message="Unable to detect a valid Ice installtion."> <condition> |