Author: bjohnson
Date: Fri Aug 31 15:32:13 2007
New Revision: 571627
URL: http://svn.apache.org/viewvc?rev=571627&view=rev
Log:
Changes to be able to compile against a different SDO impl
Modified:
incubator/tuscany/cpp/sca/antscripts/compile-targets.xml
incubator/tuscany/cpp/sca/antscripts/platform.properties
incubator/tuscany/cpp/sca/antscripts/system.xml
Modified: incubator/tuscany/cpp/sca/antscripts/compile-targets.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/antscripts/compile-targets.xml?rev=571627&r1=571626&r2=571627&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/antscripts/compile-targets.xml (original)
+++ incubator/tuscany/cpp/sca/antscripts/compile-targets.xml Fri Aug 31
15:32:13 2007
@@ -77,6 +77,7 @@
debug='${debug.compile}'>
<linker refid='${compiler.name}-Linker'/>
<fileset dir='@{indir}' includes='@{infiles}'/>
+ <libset dir="${sdo.lib.dir}" libs="${sdo.impl.library.name}"/>
<custom-ld-elements/>
</cc>
</sequential>
@@ -98,6 +99,7 @@
<linker refid='${compiler.name}-Linker'/>
<fileset dir='@{indir}' includes='@{infiles}'/>
<libset dir="${tuscanySCA.install.dir}/lib" libs="tuscany_sca"/>
+ <libset dir="${sdo.lib.dir}" libs="${sdo.impl.library.name}"/>
<custom-ld-elements/>
</cc>
</sequential>
@@ -132,6 +134,8 @@
<compiler refid='${compiler.name}-Compiler'/>
<linker refid='${compiler.name}-Linker'/>
<fileset dir='@{srcdir}' includes='@{infiles}'/>
+ <libset dir="${tuscanySCA.install.dir}/lib" libs="tuscany_sca"/>
+ <libset dir="${sdo.lib.dir}" libs="${sdo.impl.library.name}"/>
<custom-build-elements/>
</cc>
@@ -290,6 +294,7 @@
<attribute name="quiet" default="true"/>
<attribute name="version" default="${tuscanySCA.library.version}"/>
<sequential>
+ <delete quiet="@{quiet}" file="@{librootdir}/lib/[EMAIL PROTECTED]"/>
<delete quiet="@{quiet}" file="@{librootdir}/lib/[EMAIL
PROTECTED]@{version}"/>
<if>
<os family="windows"/>
Modified: incubator/tuscany/cpp/sca/antscripts/platform.properties
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/antscripts/platform.properties?rev=571627&r1=571626&r2=571627&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/antscripts/platform.properties (original)
+++ incubator/tuscany/cpp/sca/antscripts/platform.properties Fri Aug 31
15:32:13 2007
@@ -23,6 +23,7 @@
platform.compiler.name=
platform.debug.compile=
platform.external.definitions.file=
+platform.sdo.impl.library.name=
platform.tuscanySCA.root.dir=
platform.tuscanySCA.install.dir=
Modified: incubator/tuscany/cpp/sca/antscripts/system.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/antscripts/system.xml?rev=571627&r1=571626&r2=571627&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/antscripts/system.xml (original)
+++ incubator/tuscany/cpp/sca/antscripts/system.xml Fri Aug 31 15:32:13 2007
@@ -55,6 +55,23 @@
<property name="sdo.lib.dir" location="${tuscanySDO.install.dir}/lib"/>
<!--
+ Configure the SDO impl library name which allows for sdo impls other than
tuscanySDO
+ Take the override value from platform.properties if set
+ -->
+ <if>
+ <and>
+ <isset property="platform.sdo.impl.library.name"/>
+ <length string="${platform.sdo.impl.library.name}" when="greater"
length="0" trim="true"/>
+ </and>
+ <then>
+ <property name="sdo.impl.library.name"
value="${platform.sdo.impl.library.name}"/>
+ </then>
+ <else>
+ <property name="sdo.impl.library.name" value="tuscany_sdo"/>
+ </else>
+ </if>
+
+ <!--
Configure the tuscanySCA.root.dir
Take the override value from platform.properties if set
-->
@@ -577,8 +594,6 @@
-->
<linker id="Tuscany-BaseLinker">
<syslibset if="windows" libs="kernel32,user32,ws2_32"/>
- <syslibset if="unix" libs="dl"/>
- <libset dir="${sdo.lib.dir}" libs="tuscany_sdo"/>
</linker>
<!--
@@ -586,8 +601,11 @@
-->
<linker id="msvc-Linker" extends="Tuscany-BaseLinker" name="msvc"/>
<linker id="msvc8-Linker" extends="Tuscany-BaseLinker" name="msvc"/>
- <linker id="g++-Linker" extends="Tuscany-BaseLinker" name="g++"/>
+ <linker id="g++-Linker" extends="Tuscany-BaseLinker" name="g++">
+ <syslibset libs="dl"/>
+ </linker>
<linker id="g++m32-Linker" extends="Tuscany-BaseLinker" name="g++">
+ <syslibset libs="dl"/>
<linkerarg value="-m32"/>
</linker>
@@ -613,6 +631,7 @@
<echo message=" tuscanySCA.root.src.dir= ${tuscanySCA.root.src.dir}"/>
<echo message=" tuscanySCA.install.dir= ${tuscanySCA.install.dir}"/>
<echo message=" tuscanySCA.library.version=
'${tuscanySCA.library.version}'"/>
+ <echo message=" tuscanySDO.install.dir= ${tuscanySDO.install.dir}"/>
<!-- compilers, libs, etc -->
<echo message=" "/>
@@ -626,6 +645,7 @@
<echo message=" exe.ext= '${exe.ext}'"/>
<echo message=" script.ext= '${script.ext}'"/>
<echo message=" external.definitions.file=
'${external.definitions.file}'"/>
+ <echo message=" sdo.impl.library.name= '${sdo.impl.library.name}'"/>
<!-- ws extention -->
<if>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
