summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--java/config/common.cvs.xml37
-rw-r--r--java/config/common.opt.xml38
-rw-r--r--java/config/common.rpm.xml28
-rw-r--r--java/config/common.src.xml28
-rw-r--r--java/config/common.xml112
-rw-r--r--java/demo/Freeze/bench/build.xml14
-rw-r--r--java/demo/Freeze/library/build.xml13
-rw-r--r--java/demo/Freeze/phonebook/build.xml14
-rw-r--r--java/demo/Glacier2/callback/build.xml11
-rwxr-xr-xjava/demo/Ice/bidir/build.xml12
-rw-r--r--java/demo/Ice/callback/build.xml11
-rw-r--r--java/demo/Ice/hello/build.xml13
-rw-r--r--java/demo/Ice/invoke/build.xml11
-rw-r--r--java/demo/Ice/latency/build.xml11
-rw-r--r--java/demo/Ice/nested/build.xml11
-rw-r--r--java/demo/Ice/throughput/build.xml11
-rw-r--r--java/demo/Ice/value/build.xml11
-rw-r--r--java/demo/IceBox/hello/build.xml11
-rw-r--r--java/demo/IcePack/hello/build.xml11
-rw-r--r--java/demo/IcePack/simple/build.xml11
-rwxr-xr-xjava/demo/book/printer/build.xml11
-rwxr-xr-xjava/demo/book/simple_filesystem/build.xml11
22 files changed, 254 insertions, 187 deletions
diff --git a/java/config/common.cvs.xml b/java/config/common.cvs.xml
deleted file mode 100644
index fd115f74bd3..00000000000
--- a/java/config/common.cvs.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<!--
- **********************************************************************
-
- 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_cvs" basedir="." default="...">
- <property environment="env"/>
-
- <dirname property="common_cvs.basedir" file="${ant.file.common_cvs}" />
-
- <property name="lib.dir" value="${common_cvs.basedir}/../lib" />
-
- <fail message="ICE_HOME is not set to a valid directory">
- <condition>
- <not>
- <available file="${env.ICE_HOME}/slice" />
- </not>
- </condition>
- </fail>
-
- <property name="slice.dir" value="${env.ICE_HOME}/slice"/>
- <taskdef name="slice2java" classpath="${common_cvs.basedir}/../ant" classname="Slice2JavaTask"/>
- <taskdef name="slice2freezej" classpath="${common_cvs.basedir}/../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.opt.xml b/java/config/common.opt.xml
deleted file mode 100644
index a6e43c89d25..00000000000
--- a/java/config/common.opt.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<!--
- **********************************************************************
-
- 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.rpm.xml b/java/config/common.rpm.xml
deleted file mode 100644
index c4ef6a4624d..00000000000
--- a/java/config/common.rpm.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<!--
- **********************************************************************
-
- 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_rpm" basedir="." default="...">
- <property environment="env"/>
-
- <dirname property="common_rpm.basedir" file="${ant.file.common_rpm}" />
-
- <property name="lib.dir" value="/usr/lib/Ice-ICE_VERSION" />
- <property name="slice.dir" value="/usr/share/slice"/>
- <taskdef name="slice2java" classpath="${lib.dir}/ant" classname="Slice2JavaTask"/>
- <taskdef name="slice2freezej" classpath="${lib.dir}/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.src.xml b/java/config/common.src.xml
deleted file mode 100644
index 86efe7d9a33..00000000000
--- a/java/config/common.src.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<!--
- **********************************************************************
-
- 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_src" basedir="." default="...">
- <property environment="env"/>
-
- <dirname property="common_src.basedir" file="${ant.file.common_src}" />
-
- <property name="lib.dir" value="${common_src.basedir}/../lib" />
- <property name="slice.dir" value="${common_src.basedir}/../slice"/>
- <taskdef name="slice2java" classpath="${common_src.basedir}/../ant" classname="Slice2JavaTask"/>
- <taskdef name="slice2freezej" classpath="${common_src.basedir}/../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 3c1c143a1bc..a27fd009982 100644
--- a/java/config/common.xml
+++ b/java/config/common.xml
@@ -8,12 +8,8 @@
**********************************************************************
-->
-<project name="common" basedir="." default="...">
- <property environment="env"/>
- <dirname property="common.basedir" file="${ant.file.common}"/>
-
- <property name="top.dir" value="${common.basedir}/.."/>
+ <property environment="env"/>
<!-- Figure out install type -->
@@ -54,7 +50,107 @@
</condition>
</fail>
- <import file="${common.basedir}/common.${installtype}.xml"/>
- <property file="${common.basedir}/build.properties"/>
+ <condition property="is-cvs">
+ <and>
+ <isset property="installtype"/>
+ <equals arg1="cvs" arg2="${installtype}"/>
+ </and>
+ </condition>
+
+ <condition property="is-opt">
+ <and>
+ <isset property="installtype"/>
+ <equals arg1="opt" arg2="${installtype}"/>
+ </and>
+ </condition>
+
+ <condition property="is-rpm">
+ <and>
+ <isset property="installtype"/>
+ <equals arg1="rpm" arg2="${installtype}"/>
+ </and>
+ </condition>
+
+ <condition property="is-src">
+ <and>
+ <isset property="installtype"/>
+ <equals arg1="src" arg2="${installtype}"/>
+ </and>
+ </condition>
+
+ <target name="properties-cvs" if="is-cvs">
+ <fail message="ICE_HOME is not set to a valid directory">
+ <condition>
+ <not>
+ <available file="${env.ICE_HOME}/slice" />
+ </not>
+ </condition>
+ </fail>
+ <property name="slice.dir" value="${env.ICE_HOME}/slice"/>
+ <property name="lib.dir" value="${top.dir}/lib" />
+ <taskdef name="slice2java" classpath="${top.dir}/ant" classname="Slice2JavaTask"/>
+ <taskdef name="slice2freezej" classpath="${top.dir}/ant" classname="Slice2FreezeJTask" />
+
+ <!-- Ice classpath -->
+ <path id="ice.classpath">
+ <fileset dir="${lib.dir}">
+ <include name="*.jar"/>
+ </fileset>
+ </path>
+ </target>
+
+ <target name="properties-opt" if="is-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" />
-</project>
+ <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>
+ </target>
+
+ <target name="properties-src" if="is-src">
+ <property name="lib.dir" value="${top.dir}/lib" />
+ <property name="slice.dir" value="${top.dir}/slice"/>
+ <taskdef name="slice2java" classpath="${top.dir}/ant" classname="Slice2JavaTask"/>
+ <taskdef name="slice2freezej" classpath="${top.dir}/ant" classname="Slice2FreezeJTask"/>
+
+ <!-- Ice classpath -->
+ <path id="ice.classpath">
+ <fileset dir="${lib.dir}">
+ <include name="*.jar"/>
+ </fileset>
+ </path>
+ </target>
+
+ <target name="properties-rpm" if="is-rpm">
+ <property name="lib.dir" value="/usr/lib/Ice-ICE_VERSION" />
+ <property name="slice.dir" value="/usr/share/slice"/>
+ <taskdef name="slice2java" classpath="${lib.dir}/ant" classname="Slice2JavaTask"/>
+ <taskdef name="slice2freezej" classpath="${lib.dir}/ant" classname="Slice2FreezeJTask"/>
+
+ <!-- Ice classpath -->
+ <path id="ice.classpath">
+ <fileset dir="${lib.dir}">
+ <include name="*.jar"/>
+ </fileset>
+ </path>
+ </target>
+
+ <target name="config-init" depends="properties-cvs,properties-opt,properties-src,properties-rpm">
+ </target>
+
+ <property file="${common.basedir}/build.properties"/>
diff --git a/java/demo/Freeze/bench/build.xml b/java/demo/Freeze/bench/build.xml
index 4e90de82694..ca8be41755c 100644
--- a/java/demo/Freeze/bench/build.xml
+++ b/java/demo/Freeze/bench/build.xml
@@ -9,22 +9,22 @@
**********************************************************************
-->
-<project name="demo_Freeze_bench" default="all" basedir=".">
-
- <!-- get access to env variables globally -->
- <property environment="env" />
+<!DOCTYPE project [
+<!ENTITY common SYSTEM "file:../../../config/common.xml">
+]>
- <!-- set global properties for this build -->
+<project name="demo_Freeze_bench" default="all" basedir=".">
<!-- Check if we are building in CVS -->
<property name="top.dir" value= "../../.." />
- <import file="${top.dir}/config/common.xml" />
+ <!-- Include common definitions -->
+ &common;
<property name="class.dir" value="classes"/>
<property name="generated.dir" value="generated"/>
- <target name="init">
+ <target name="init" depends="config-init">
<!-- Create the time stamp -->
<tstamp/>
</target>
diff --git a/java/demo/Freeze/library/build.xml b/java/demo/Freeze/library/build.xml
index e1207980536..90b2a4a755b 100644
--- a/java/demo/Freeze/library/build.xml
+++ b/java/demo/Freeze/library/build.xml
@@ -9,18 +9,23 @@
**********************************************************************
-->
+<!DOCTYPE project [
+<!ENTITY common SYSTEM "file:../../../config/common.xml">
+]>
+
<project name="demo_Freeze_library" default="all" basedir=".">
- <!-- get access to env variables globally -->
- <property environment="env" />
<!-- set global properties for this build -->
<property name="top.dir" value="../../.."/>
- <import file="${top.dir}/config/common.xml"/>
+
+ <!-- Include common definitions -->
+ &common;
+
<property name="class.dir" value="classes"/>
<property name="generated.dir" value="generated"/>
- <target name="init">
+ <target name="init" depends="config-init">
<!-- Create the time stamp -->
<tstamp/>
</target>
diff --git a/java/demo/Freeze/phonebook/build.xml b/java/demo/Freeze/phonebook/build.xml
index 2659b70ab18..bd9e4a3a934 100644
--- a/java/demo/Freeze/phonebook/build.xml
+++ b/java/demo/Freeze/phonebook/build.xml
@@ -9,18 +9,22 @@
**********************************************************************
-->
-<project name="demo_Freeze_phonebook" default="all" basedir=".">
+<!DOCTYPE project [
+<!ENTITY common SYSTEM "file:../../../config/common.xml">
+]>
- <!-- get access to env variables globally -->
- <property environment="env" />
+<project name="demo_Freeze_phonebook" default="all" basedir=".">
<!-- set global properties for this build -->
<property name="top.dir" value="../../.."/>
- <import file="${top.dir}/config/common.xml"/>
+
+ <!-- Include common definitions -->
+ &common;
+
<property name="class.dir" value="classes"/>
<property name="generated.dir" value="generated"/>
- <target name="init">
+ <target name="init" depends="config-init">
<!-- Create the time stamp -->
<tstamp/>
</target>
diff --git a/java/demo/Glacier2/callback/build.xml b/java/demo/Glacier2/callback/build.xml
index 9e97dfe4615..a2a81443693 100644
--- a/java/demo/Glacier2/callback/build.xml
+++ b/java/demo/Glacier2/callback/build.xml
@@ -9,15 +9,22 @@
**********************************************************************
-->
+<!DOCTYPE project [
+<!ENTITY common SYSTEM "file:../../../config/common.xml">
+]>
+
<project name="demo_Glacier2_callback" default="all" basedir=".">
<!-- set global properties for this build -->
<property name="top.dir" value="../../.."/>
- <import file="${top.dir}/config/common.xml"/>
+
+ <!-- Include common definitions -->
+ &common;
+
<property name="class.dir" value="classes"/>
<property name="generated.dir" value="generated"/>
- <target name="init">
+ <target name="init" depends="config-init">
<!-- Create the time stamp -->
<tstamp/>
</target>
diff --git a/java/demo/Ice/bidir/build.xml b/java/demo/Ice/bidir/build.xml
index 5071d5c9b25..e1c122fc613 100755
--- a/java/demo/Ice/bidir/build.xml
+++ b/java/demo/Ice/bidir/build.xml
@@ -9,20 +9,22 @@
**********************************************************************
-->
-<project name="demo_Ice_bidir" default="all" basedir=".">
+<!DOCTYPE project [
+<!ENTITY common SYSTEM "file:../../../config/common.xml">
+]>
- <!-- get access to env variables globally -->
- <property environment="env" />
+<project name="demo_Ice_bidir" default="all" basedir=".">
<!-- set global properties for this build -->
<property name="top.dir" value="../../.."/>
- <import file="${top.dir}/config/common.xml"/>
+ <!-- Include common definitions -->
+ &common;
<property name="class.dir" value="classes"/>
<property name="generated.dir" value="generated"/>
- <target name="init">
+ <target name="init" depends="config-init">
<!-- Create the time stamp -->
<tstamp/>
</target>
diff --git a/java/demo/Ice/callback/build.xml b/java/demo/Ice/callback/build.xml
index 72a8c113a6b..42924dc18a9 100644
--- a/java/demo/Ice/callback/build.xml
+++ b/java/demo/Ice/callback/build.xml
@@ -9,15 +9,22 @@
**********************************************************************
-->
+<!DOCTYPE project [
+<!ENTITY common SYSTEM "file:../../../config/common.xml">
+]>
+
<project name="demo_Ice_callback" default="all" basedir=".">
<!-- set global properties for this build -->
<property name="top.dir" value="../../.."/>
- <import file="${top.dir}/config/common.xml"/>
+
+ <!-- Include common definitions -->
+ &common;
+
<property name="class.dir" value="classes"/>
<property name="generated.dir" value="generated"/>
- <target name="init">
+ <target name="init" depends="config-init">
<!-- Create the time stamp -->
<tstamp/>
</target>
diff --git a/java/demo/Ice/hello/build.xml b/java/demo/Ice/hello/build.xml
index ab47292a358..72577b1a890 100644
--- a/java/demo/Ice/hello/build.xml
+++ b/java/demo/Ice/hello/build.xml
@@ -7,17 +7,24 @@
ICE_LICENSE file included in this distribution.
**********************************************************************
--->
+ -->
+
+<!DOCTYPE project [
+<!ENTITY common SYSTEM "file:../../../config/common.xml">
+]>
<project name="demo_Ice_hello" default="all" basedir=".">
<!-- set global properties for this build -->
<property name="top.dir" value="../../.."/>
- <import file="${top.dir}/config/common.xml"/>
+
+ <!-- Include common definitions -->
+ &common;
+
<property name="class.dir" value="classes"/>
<property name="generated.dir" value="generated"/>
- <target name="init">
+ <target name="init" depends="config-init">
<!-- Create the time stamp -->
<tstamp/>
</target>
diff --git a/java/demo/Ice/invoke/build.xml b/java/demo/Ice/invoke/build.xml
index c3030ae0f19..a50352df15f 100644
--- a/java/demo/Ice/invoke/build.xml
+++ b/java/demo/Ice/invoke/build.xml
@@ -9,15 +9,22 @@
**********************************************************************
-->
+<!DOCTYPE project [
+<!ENTITY common SYSTEM "file:../../../config/common.xml">
+]>
+
<project name="demo_Ice_hello" default="all" basedir=".">
<!-- set global properties for this build -->
<property name="top.dir" value="../../.."/>
- <import file="${top.dir}/config/common.xml"/>
+
+ <!-- Include common definitions -->
+ &common;
+
<property name="class.dir" value="classes"/>
<property name="generated.dir" value="generated"/>
- <target name="init">
+ <target name="init" depends="config-init">
<!-- Create the time stamp -->
<tstamp/>
</target>
diff --git a/java/demo/Ice/latency/build.xml b/java/demo/Ice/latency/build.xml
index d2a37997f44..305400a13a5 100644
--- a/java/demo/Ice/latency/build.xml
+++ b/java/demo/Ice/latency/build.xml
@@ -9,15 +9,22 @@
**********************************************************************
-->
+<!DOCTYPE project [
+<!ENTITY common SYSTEM "file:../../../config/common.xml">
+]>
+
<project name="demo_Ice_latency" default="all" basedir=".">
<!-- set global properties for this build -->
<property name="top.dir" value="../../.."/>
- <import file="${top.dir}/config/common.xml"/>
+
+ <!-- Include common definitions -->
+ &common;
+
<property name="class.dir" value="classes"/>
<property name="generated.dir" value="generated"/>
- <target name="init">
+ <target name="init" depends="config-init">
<!-- Create the time stamp -->
<tstamp/>
</target>
diff --git a/java/demo/Ice/nested/build.xml b/java/demo/Ice/nested/build.xml
index 82e0a045370..102c1cbd006 100644
--- a/java/demo/Ice/nested/build.xml
+++ b/java/demo/Ice/nested/build.xml
@@ -9,15 +9,22 @@
**********************************************************************
-->
+<!DOCTYPE project [
+<!ENTITY common SYSTEM "file:../../../config/common.xml">
+]>
+
<project name="demo_Ice_value" default="all" basedir=".">
<!-- set global properties for this build -->
<property name="top.dir" value="../../.."/>
- <import file="${top.dir}/config/common.xml"/>
+
+ <!-- Include common definitions -->
+ &common;
+
<property name="class.dir" value="classes"/>
<property name="generated.dir" value="generated"/>
- <target name="init">
+ <target name="init" depends="config-init">
<!-- Create the time stamp -->
<tstamp/>
</target>
diff --git a/java/demo/Ice/throughput/build.xml b/java/demo/Ice/throughput/build.xml
index 8b88e2f7e6c..6f18b783082 100644
--- a/java/demo/Ice/throughput/build.xml
+++ b/java/demo/Ice/throughput/build.xml
@@ -9,15 +9,22 @@
**********************************************************************
-->
+<!DOCTYPE project [
+<!ENTITY common SYSTEM "file:../../../config/common.xml">
+]>
+
<project name="demo_Ice_throughput" default="all" basedir=".">
<!-- set global properties for this build -->
<property name="top.dir" value="../../.."/>
- <import file="${top.dir}/config/common.xml"/>
+
+ <!-- Include common definitions -->
+ &common;
+
<property name="class.dir" value="classes"/>
<property name="generated.dir" value="generated"/>
- <target name="init">
+ <target name="init" depends="config-init">
<!-- Create the time stamp -->
<tstamp/>
</target>
diff --git a/java/demo/Ice/value/build.xml b/java/demo/Ice/value/build.xml
index 61acda076fe..b9303e12d9d 100644
--- a/java/demo/Ice/value/build.xml
+++ b/java/demo/Ice/value/build.xml
@@ -9,15 +9,22 @@
**********************************************************************
-->
+<!DOCTYPE project [
+<!ENTITY common SYSTEM "file:../../../config/common.xml">
+]>
+
<project name="demo_Ice_value" default="all" basedir=".">
<!-- set global properties for this build -->
<property name="top.dir" value="../../.."/>
- <import file="${top.dir}/config/common.xml"/>
+
+ <!-- Include common definitions -->
+ &common;
+
<property name="class.dir" value="classes"/>
<property name="generated.dir" value="generated"/>
- <target name="init">
+ <target name="init" depends="config-init">
<!-- Create the time stamp -->
<tstamp/>
</target>
diff --git a/java/demo/IceBox/hello/build.xml b/java/demo/IceBox/hello/build.xml
index d43d113f234..94dd1596a1f 100644
--- a/java/demo/IceBox/hello/build.xml
+++ b/java/demo/IceBox/hello/build.xml
@@ -9,15 +9,22 @@
**********************************************************************
-->
+<!DOCTYPE project [
+<!ENTITY common SYSTEM "file:../../../config/common.xml">
+]>
+
<project name="demo_IceBox_hello" default="all" basedir=".">
<!-- set global properties for this build -->
<property name="top.dir" value="../../.."/>
- <import file="${top.dir}/config/common.xml"/>
+
+ <!-- Include common definitions -->
+ &common;
+
<property name="class.dir" value="classes"/>
<property name="generated.dir" value="generated"/>
- <target name="init">
+ <target name="init" depends="config-init">
<!-- Create the time stamp -->
<tstamp/>
</target>
diff --git a/java/demo/IcePack/hello/build.xml b/java/demo/IcePack/hello/build.xml
index c7967179414..8cde133c21e 100644
--- a/java/demo/IcePack/hello/build.xml
+++ b/java/demo/IcePack/hello/build.xml
@@ -9,15 +9,22 @@
**********************************************************************
-->
+<!DOCTYPE project [
+<!ENTITY common SYSTEM "file:../../../config/common.xml">
+]>
+
<project name="demo_IcePack_hello" default="all" basedir=".">
<!-- set global properties for this build -->
<property name="top.dir" value="../../.."/>
- <import file="${top.dir}/config/common.xml"/>
+
+ <!-- Include common definitions -->
+ &common;
+
<property name="class.dir" value="classes"/>
<property name="generated.dir" value="generated"/>
- <target name="init">
+ <target name="init" depends="config-init">
<!-- Create the time stamp -->
<tstamp/>
</target>
diff --git a/java/demo/IcePack/simple/build.xml b/java/demo/IcePack/simple/build.xml
index 85e62422771..6764f4262bf 100644
--- a/java/demo/IcePack/simple/build.xml
+++ b/java/demo/IcePack/simple/build.xml
@@ -9,15 +9,22 @@
**********************************************************************
-->
+<!DOCTYPE project [
+<!ENTITY common SYSTEM "file:../../../config/common.xml">
+]>
+
<project name="demo_IcePack_simple" default="all" basedir=".">
<!-- set global properties for this build -->
<property name="top.dir" value="../../.."/>
- <import file="${top.dir}/config/common.xml"/>
+
+ <!-- Include common definitions -->
+ &common;
+
<property name="class.dir" value="classes"/>
<property name="generated.dir" value="generated"/>
- <target name="init">
+ <target name="init" depends="config-init">
<!-- Create the time stamp -->
<tstamp/>
</target>
diff --git a/java/demo/book/printer/build.xml b/java/demo/book/printer/build.xml
index 07f5a906991..ae397f45436 100755
--- a/java/demo/book/printer/build.xml
+++ b/java/demo/book/printer/build.xml
@@ -9,15 +9,22 @@
**********************************************************************
-->
+<!DOCTYPE project [
+<!ENTITY common SYSTEM "file:../../../config/common.xml">
+]>
+
<project name="demo_Ice_hello" default="all" basedir=".">
<!-- set global properties for this build -->
<property name="top.dir" value="../../.."/>
- <import file="${top.dir}/config/common.xml"/>
+
+ <!-- Include common definitions -->
+ &common;
+
<property name="class.dir" value="classes"/>
<property name="generated.dir" value="generated"/>
- <target name="init">
+ <target name="init" depends="config-init">
<!-- Create the time stamp -->
<tstamp/>
</target>
diff --git a/java/demo/book/simple_filesystem/build.xml b/java/demo/book/simple_filesystem/build.xml
index cfe76346769..f2a284016ed 100755
--- a/java/demo/book/simple_filesystem/build.xml
+++ b/java/demo/book/simple_filesystem/build.xml
@@ -9,15 +9,22 @@
**********************************************************************
-->
+<!DOCTYPE project [
+<!ENTITY common SYSTEM "file:../../../config/common.xml">
+]>
+
<project name="demo_Ice_hello" default="all" basedir=".">
<!-- set global properties for this build -->
<property name="top.dir" value="../../.."/>
- <import file="${top.dir}/config/common.xml"/>
+
+ <!-- Include common definitions -->
+ &common;
+
<property name="class.dir" value="classes"/>
<property name="generated.dir" value="generated"/>
- <target name="init">
+ <target name="init" depends="config-init">
<!-- Create the time stamp -->
<tstamp/>
</target>
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-05 13:23:23 +0000