Subversion Repositories DevTools

Rev

Rev 1962 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 1962 Rev 1966
Line 25... Line 25...
25
 
25
 
26
 
26
 
27
	<macrodef name="using">
27
	<macrodef name="using">
28
 
28
 
29
		<attribute name="name"/>
29
		<attribute name="name"/>
30
		<attribute name="version"/>
30
		<attribute name="version"  default="$${@{name}}"/>
31
		<attribute name="includes" default="" />
31
		<attribute name="includes" default="" />
32
		<attribute name="from"     default="${env.GBE_DPKG}"/>
32
		<attribute name="from"     default="${env.GBE_DPKG}"/>
33
		<attribute name="refid"    default="@{name}"/>
33
		<attribute name="refid"    default="@{name}"/>
34
		<attribute name="copy"     default="true"/>
34
		<attribute name="copy"     default="true"/>
35
 
35
 
Line 123... Line 123...
123
					<trycatch>
123
					<trycatch>
124
						<try>
124
						<try>
125
							<import file="${using.@{refid}.basedir}/@{name}.xml" optional="true"/>
125
							<import file="${using.@{refid}.basedir}/@{name}.xml" optional="true"/>
126
						</try>
126
						</try>
127
						<catch>
127
						<catch>
-
 
128
							<if>
-
 
129
								<isset property="force.fail.message"/>
-
 
130
								<then>
-
 
131
									<fail message="${force.fail.message}"/>
-
 
132
								</then>
-
 
133
								<else>
128
							<echo taskname="ant-using" level="warning" message="Import ignored when called within target."/>
134
									<echo taskname="ant-using" level="warning" message="Import ignored when called within target."/>
-
 
135
								</else>
-
 
136
							</if>
129
						</catch>
137
						</catch>
130
					</trycatch>
138
					</trycatch>
131
 
139
 
132
 
140
 
133
				</else>
141
				</else>