Revision 21109 trunk/extensions/ext3Dgui/build.xml

View differences:

build.xml
14 14
	<property name="ext3Dgui-lib" value="../_fwAndami/gvSIG/extensiones/com.iver.ai2.gvsig3dgui/lib" />
15 15
	<property name="binaries" location="../binaries/" />
16 16
	<property environment="env" />
17
	<property name="depman" value="${env.HOMEPATH}/DepMan/" />
18
	<property name="depman-lin" value="${env.HOME}/.depman/" />
17
	<property name="buildman" value="${env.HOMEPATH}/DepMan/" />
18
	<property name="buildman-lin" value="${env.HOME}/.depman/" />
19 19
	<import file="../binaries/ant/utilities.xml" />
20
	<property name="depman.executable" value="depman/bin/dmn.py" />
20
	<!--property name="depman.executable" value="depman/bin/dmn.py" /-->
21

  
22

  
23
	<property name="buildman.executable" value="buildman/bin/bmn.py" />
21 24

  
22 25
	<!--property name="binaries-dir" location="../binaries" /-->
23 26

  
......
123 126
		<property name="win-binaries" value="${binaries}/w32/3D" />
124 127
		<mkdir dir="${win-binaries}" />
125 128
		<copy todir="${win-binaries}">
126
			<fileset dir="${depman}/bin/" includes="**/**" excludes="*.exe" />
129
			<fileset dir="${buildman}/bin/" includes="**/**" excludes="*.exe" />
127 130
		</copy>
128 131
	</target>
129 132

  
......
131 134
		<property name="linux-binaries" value="${binaries}/linux/3D" />
132 135
		<mkdir dir="${linux-binaries}" />
133 136
		<copy todir="${linux-binaries}">
134
			<fileset dir="${depman-lin}/lib/" includes="*.so*,**/*.so*" followsymlinks="false" />
137
			<fileset dir="${buildman-lin}/lib/" includes="*.so*,**/*.so*" followsymlinks="false" />
135 138
		</copy>
136 139
		<echo>
137 140
			OJO Falta los links
......
142 145
		<!--
143 146
	    <exec executable="bash">
144 147
			<arg value="-c"/>
145
			<arg value="find ${depman-lin}/lib/ -type l -exec ls -l {} ';' | sed 's/.*[.][/]//g' | sed 's/\(.*\) -> \(.*\)$/ln -s \2 \1/g' > ${linux-binaries}/install.sh.tmp"/>
148
			<arg value="find ${buildman-lin}/lib/ -type l -exec ls -l {} ';' | sed 's/.*[.][/]//g' | sed 's/\(.*\) -> \(.*\)$/ln -s \2 \1/g' > ${linux-binaries}/install.sh.tmp"/>
146 149
		</exec>
147 150
		<concat destfile="${linux-binaries}/install-3D.sh">#!bin/sh
148 151

  
......
153 156
		<delete file="${linux-binaries}/install.sh.tmp"/>
154 157
	    <exec executable="bash">
155 158
			<arg value="-c"/>
156
			<arg value="cd ${depman-lin}/lib/ ; (find . -type l -exec ls -l {} ';' | sed 's/.*[.][/]//g' | sed 's/\(.*\) -> \(.*\)$/\1=\2/g' > ${linux-binaries}/links.properties)"/>
159
			<arg value="cd ${buildman-lin}/lib/ ; (find . -type l -exec ls -l {} ';' | sed 's/.*[.][/]//g' | sed 's/\(.*\) -> \(.*\)$/\1=\2/g' > ${linux-binaries}/links.properties)"/>
157 160
		</exec>
158 161
		-->
159 162

  
......
163 166
	<target name="copy-linux-binaries-complete" if="isLinux" depends="update-binaries-remote">
164 167
		<property name="linux-binaries" value="${binaries}/linux/3D" />
165 168
		<delete includeemptydirs="true">
166
			<fileset dir="${linux-binaries}/.." includes="**/*" excludes="*.head"/>
169
			<fileset dir="${linux-binaries}/.." includes="**/*" excludes="*.head" />
167 170
		</delete>
168 171
		<mkdir dir="${linux-binaries}" />
169 172
		<copy todir="${linux-binaries}">
170
			<fileset dir="${depman-lin}/lib/" includes="*.so*,**/*.so*" followsymlinks="false" />
173
			<fileset dir="${buildman-lin}/lib/" includes="*.so*,**/*.so*" followsymlinks="false" />
171 174
		</copy>
172 175
		<echo>
173 176
			Generando fichero de links simbolicos
......
178 181
		<!--
179 182
	    <exec executable="bash">
180 183
			<arg value="-c"/>
181
			<arg value="find ${depman-lin}/lib/ -type l -exec ls -l {} ';' | sed 's/.*[.][/]//g' | sed 's/\(.*\) -> \(.*\)$/ln -s \2 \1/g' > ${linux-binaries}/install.sh.tmp"/>
184
			<arg value="find ${buildman-lin}/lib/ -type l -exec ls -l {} ';' | sed 's/.*[.][/]//g' | sed 's/\(.*\) -> \(.*\)$/ln -s \2 \1/g' > ${linux-binaries}/install.sh.tmp"/>
182 185
		</exec>
183 186
		<concat destfile="${linux-binaries}/install-3D.sh">#!bin/sh
184 187

  
......
189 192
		<delete file="${linux-binaries}/install.sh.tmp"/>
190 193
	    <exec executable="bash">
191 194
			<arg value="-c"/>
192
			<arg value="cd ${depman-lin}/lib/ ; (find . -type l -exec ls -l {} ';' | sed 's/.*[.][/]//g' | sed 's/\(.*\) -> \(.*\)$/\1=\2/g' > ${linux-binaries}/links.properties)"/>
195
			<arg value="cd ${buildman-lin}/lib/ ; (find . -type l -exec ls -l {} ';' | sed 's/.*[.][/]//g' | sed 's/\(.*\) -> \(.*\)$/\1=\2/g' > ${linux-binaries}/links.properties)"/>
193 196
		</exec>
194 197
		-->
195 198

  
......
198 201

  
199 202
	<target name="update-binaries-cache">
200 203
		<exec executable="python">
201
			<arg value="${depman.executable}" />
204
			<arg value="${buildman.executable}" />
202 205
			<arg value="update" />
203 206
			<arg value="--cache" />
204 207
		</exec>
......
206 209

  
207 210
	<target name="update-binaries-remote">
208 211
		<exec executable="python">
209
			<arg value="${depman.executable}" />
212
			<arg value="${buildman.executable}" />
210 213
			<arg value="update" />
211 214
			<arg value="--remote" />
212 215
		</exec>
......
214 217

  
215 218
	<target name="update-binaries-atifglrx-remote">
216 219
		<exec executable="python">
217
			<arg value="${depman.executable}" />
220
			<arg value="${buildman.executable}" />
218 221
			<arg value="update" />
222
			<arg value="--file" />
219 223
			<arg value="depman-atifglrx.xml" />
220 224
			<arg value="--remote" />
221 225
		</exec>

Also available in: Unified diff