Context Navigation

Changeset 1505

Timestamp:

Apr 22, 2010 10:57:00 PM (11 years ago)

Author:

tkr

Message:

Fixing conflict with changes Stefan made to allow version info to be set

Location:

trunk

Files:

Property svn:mergeinfo changed

/releases/0.5.29 (added)	merged: 1368
/stable/0.5 (added)	merged: 131-133,146,179,185,187,215,242,264,266,290,299,310,352,373,406,410,415,417,420,423,451,533,562,586,799,833,861-862,905,927,938,962,964-965,997,1002,1018,1024,1112,1189,1236,1239,1272,1302,1331,1400

r1504	r1505
324	324
325	325	# Check if a library version is set for libtool
326		m4_ifvaln([$~~1],[coin_libversion=$1~~],[])
	326	m4_ifvaln([$2],[coin_libversion=$2],[])
327	327	]) # AC_COIN_PROJECTDIR_INIT
328	328

r1366	r1505
504	504	sed -e "s\|AC_INIT$.$\[[0-9A-Za-z\.]\],$.*$\|AC_INIT\1[$new_ver],\2\|" $i > bla
505	505	mv bla $i
506		sed -e "s\|AC_COIN_PROJECTDIR_INIT$.*$\|AC_COIN_PROJECTDIR_INIT$$new_current:$new_revision:$new_age$\|" $i > bla
	506	sed -e "s\|AC_COIN_PROJECTDIR_INIT$.*$\|AC_COIN_PROJECTDIR_INIT$$stableProj, $new_current:$new_revision:$new_age$\|" $i > bla
507	507	mv bla $i
508	508	svn di $i

Note: See TracChangeset for help on using the changeset viewer.

r1366	r1505
504	504	sed -e "s\|AC_INIT\(.\)\[[0-9A-Za-z\.]\],\(.*\)\|AC_INIT\1[$new_ver],\2\|" $i > bla
505	505	mv bla $i
506		sed -e "s\|AC_COIN_PROJECTDIR_INIT\(.*\)\|AC_COIN_PROJECTDIR_INIT\($new_current:$new_revision:$new_age\)\|" $i > bla
	506	sed -e "s\|AC_COIN_PROJECTDIR_INIT\(.*\)\|AC_COIN_PROJECTDIR_INIT\($stableProj, $new_current:$new_revision:$new_age\)\|" $i > bla
507	507	mv bla $i
508	508	svn di $i