Skip to content

Commit 1972c45

Browse files
Another libonly patch
1 parent 24fb070 commit 1972c45

File tree

1 file changed

+26
-6
lines changed

1 file changed

+26
-6
lines changed

build.xml

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@
2020
2121
Revision history:
2222
$Log$
23+
Revision 1.12 2005/05/23 13:54:53 dimeglio
24+
Added load of build.number file
25+
2326
Revision 1.11 2005/02/16 14:14:39 dimeglio
2427
Added patch to use globus compilation flags also in the RPMS
2528
@@ -127,15 +130,24 @@
127130
</target>
128131

129132
<target name="compile" depends="checkstyle">
133+
<if>
134+
<isset property="libonly"/>
135+
<then>
136+
<property name="buildtarget" value="build-lib"/>
137+
</then>
138+
<else>
139+
<property name="buildtarget" value="build"/>
140+
</else>
141+
</if>
130142
<if>
131143
<isset property="build.make.arguments"/>
132144
<then>
133145
<!-- Call make default compile target -->
134-
<make target="build" dir="${module.src.dir}" failonerror="${failonerror}" args="${build.make.arguments}"/>
146+
<make target="${buildtarget}" dir="${module.src.dir}" failonerror="${failonerror}" args="${build.make.arguments}"/>
135147
</then>
136148
<else>
137149
<!-- Call make default compile target -->
138-
<make target="build" dir="${module.src.dir}" failonerror="${failonerror}"/>
150+
<make target="${buildtarget}" dir="${module.src.dir}" failonerror="${failonerror}"/>
139151
</else>
140152
</if>
141153
</target>
@@ -153,15 +165,24 @@
153165
</target>
154166

155167
<target name="stage" depends="doc">
168+
<if>
169+
<isset property="libonly"/>
170+
<then>
171+
<property name="installtarget" value="install-lib"/>
172+
</then>
173+
<else>
174+
<property name="installtarget" value="install"/>
175+
</else>
176+
</if>
156177
<if>
157178
<isset property="build.make.arguments"/>
158179
<then>
159180
<!-- Call make default compile target -->
160-
<make target="install" dir="${module.src.dir}" failonerror="${failonerror}" args="${build.make.arguments}"/>
181+
<make target="${installtarget}" dir="${module.src.dir}" failonerror="${failonerror}" args="${build.make.arguments}"/>
161182
</then>
162183
<else>
163184
<!-- Call make default compile target -->
164-
<make target="install" dir="${module.src.dir}" failonerror="${failonerror}"/>
185+
<make target="${installtarget}" dir="${module.src.dir}" failonerror="${failonerror}"/>
165186
</else>
166187
</if>
167188
</target>
@@ -260,13 +281,12 @@
260281

261282
</target>
262283

263-
<!-- ===============================================
284+
<!-- ===============================================
264285
Modules proxy targets
265286
=============================================== -->
266287

267288
<!-- component targets definitions tag = do not remove = -->
268289

269-
270290
<!-- Main proxy -->
271291
<target name="buildmodules" depends="envset"/>
272292

0 commit comments

Comments
 (0)