You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by bj...@apache.org on 2007/09/01 00:28:23 UTC
svn commit: r571623 - in /incubator/tuscany/cpp/sdo:
antscripts/platform.properties antscripts/system.xml build.xml
runtime/core/build.xml
Author: bjohnson
Date: Fri Aug 31 15:28:17 2007
New Revision: 571623
URL: http://svn.apache.org/viewvc?rev=571623&view=rev
Log:
Changes to be able to compile sdo axiom against different SDO implementations
Modified:
incubator/tuscany/cpp/sdo/antscripts/platform.properties
incubator/tuscany/cpp/sdo/antscripts/system.xml
incubator/tuscany/cpp/sdo/build.xml
incubator/tuscany/cpp/sdo/runtime/core/build.xml
Modified: incubator/tuscany/cpp/sdo/antscripts/platform.properties
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/antscripts/platform.properties?rev=571623&r1=571622&r2=571623&view=diff
==============================================================================
--- incubator/tuscany/cpp/sdo/antscripts/platform.properties (original)
+++ incubator/tuscany/cpp/sdo/antscripts/platform.properties Fri Aug 31 15:28:17 2007
@@ -27,6 +27,10 @@
platform.tuscanySDO.root.dir=
platform.tuscanySDO.install.dir=
+platform.sdo.impl.library.name=
+platform.sdo.impl.library.path=
+platform.sdo.impl.include.path=
+
platform.axis2c.home.dir=
platform.libxml2.lib.dir=
platform.libxml2.include.dir=
Modified: incubator/tuscany/cpp/sdo/antscripts/system.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/antscripts/system.xml?rev=571623&r1=571622&r2=571623&view=diff
==============================================================================
--- incubator/tuscany/cpp/sdo/antscripts/system.xml (original)
+++ incubator/tuscany/cpp/sdo/antscripts/system.xml Fri Aug 31 15:28:17 2007
@@ -72,7 +72,7 @@
</if>
<!--
- Configure the version for all tuscanySDO libraries
+ Configure the version for all tuscanySDO library generation
If on windows, set it to empty
Else take the override value from platform.properties if set
Else default it to "0.0.0"
@@ -384,6 +384,37 @@
</else>
</if>
+ <!--
+ Configure the SDO implementation library and include path, which
+ will be used for sdo axiom compilation. By default, sdo axiom will
+ include and link the TuscanySDO implementation, but this allows for
+ compiling with other SDO implementations
+ Set the following:
+ sdo.impl.library.name
+ sdo.impl.library.path
+ sdo.impl.include.path
+ -->
+ <if>
+ <and>
+ <isset property="platform.sdo.impl.library.name"/>
+ <isset property="platform.sdo.impl.library.path"/>
+ <isset property="platform.sdo.impl.include.path"/>
+ <length string="${platform.sdo.impl.library.name}" when="greater" length="0" trim="true"/>
+ <length string="${platform.sdo.impl.library.path}" when="greater" length="0" trim="true"/>
+ <length string="${platform.sdo.impl.include.path}" when="greater" length="0" trim="true"/>
+ </and>
+ <then>
+ <property name="sdo.impl.library.name" value="${platform.sdo.impl.library.name}"/>
+ <property name="sdo.impl.library.path" location="${platform.sdo.impl.library.path}"/>
+ <property name="sdo.impl.include.path" location="${platform.sdo.impl.include.path}"/>
+ </then>
+ <else>
+ <property name="sdo.impl.library.name" value="tuscany_sdo"/>
+ <property name="sdo.impl.library.path" location="${tuscanySDO.install.dir}/lib"/>
+ <property name="sdo.impl.include.path" location="${tuscanySDO.root.src.dir}/core/src"/>
+ </else>
+ </if>
+
<condition property="windows" value="true">
<os family="windows"/>
@@ -399,7 +430,6 @@
<compiler id="Tuscany-BaseCompiler" multithreaded="true" exceptions="true" rtti="true">
<defineset if="windows" define="WIN32,_CRT_SECURE_NO_DEPRECATE,_CRT_NON_CONFORMING_SWPRINTFS"/>
<defineset if="mac" define="IS_DARWIN"/>
- <includepath path="${tuscanySDO.root.src.dir}/core/src"/>
</compiler>
<!--
@@ -453,6 +483,9 @@
<echo message=" tuscanySDO.root.dir= ${tuscanySDO.root.dir}"/>
<echo message=" tuscanySDO.root.src.dir= ${tuscanySDO.root.src.dir}"/>
<echo message=" tuscanySDO.install.dir= ${tuscanySDO.install.dir}"/>
+ <echo message=" sdo.impl.library.name= ${sdo.impl.library.name}"/>
+ <echo message=" sdo.impl.library.path= ${sdo.impl.library.path}"/>
+ <echo message=" sdo.impl.include.path= ${sdo.impl.include.path}"/>
<echo message=" tuscanySDO.library.version= '${tuscanySDO.library.version}'"/>
<!-- compilers, libs, etc -->
Modified: incubator/tuscany/cpp/sdo/build.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/build.xml?rev=571623&r1=571622&r2=571623&view=diff
==============================================================================
--- incubator/tuscany/cpp/sdo/build.xml (original)
+++ incubator/tuscany/cpp/sdo/build.xml Fri Aug 31 15:28:17 2007
@@ -1,93 +1,93 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<project name="TuscanySdoNative" default="all" basedir=".">
-
- <!--
- This is the root level ant build.xml file for TuscanySDO Native
- Nothing is actually performed here, it just delegates to subdirectory
- build.xml files. Common scripts used by all ant build files can be
- found in the ant subdirectory.
- -->
-
- <import file="antscripts/system.xml"/>
-
- <property name="runtime.sdo.dir" value="runtime/core"/>
-
- <!--
- Public targets
- -->
-
- <target name="all" description="build and install all TuscanySdoNative source code and documentation">
- <antcall target="build"/>
- <antcall target="install"/>
- </target>
-
- <target name="build" description="Build all TuscanySdoNative source code and documentation">
- <antcall target="build.sdo"/>
- <!--antcall target="generate.docs"/-->
- </target>
-
- <target name="install" description="Install TuscanySdoNative libraries and headers">
- <antcall target="install.sdo"/>
- <!--antcall target="install.docs"/-->
- </target>
-
- <target name="clean" description="Clean all TuscanySdoNative compiled source code">
- <antcall target="clean.sdo"/>
- <!--antcall target="clean.docs"/-->
- </target>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<project name="TuscanySdoNative" default="all" basedir=".">
+
+ <!--
+ This is the root level ant build.xml file for TuscanySDO Native
+ Nothing is actually performed here, it just delegates to subdirectory
+ build.xml files. Common scripts used by all ant build files can be
+ found in the ant subdirectory.
+ -->
+
+ <import file="antscripts/system.xml"/>
+
+ <property name="runtime.sdo.dir" value="runtime/core"/>
+
+ <!--
+ Public targets
+ -->
+
+ <target name="all" description="build and install all TuscanySdoNative source code and documentation">
+ <antcall target="build"/>
+ <antcall target="install"/>
+ </target>
+
+ <target name="build" description="Build all TuscanySdoNative source code and documentation">
+ <antcall target="build.sdo"/>
+ <!--antcall target="generate.docs"/-->
+ </target>
+
+ <target name="install" description="Install TuscanySdoNative libraries and headers">
+ <antcall target="install.sdo"/>
+ <!--antcall target="install.docs"/-->
+ </target>
+
+ <target name="clean" description="Clean all TuscanySdoNative compiled source code">
+ <antcall target="clean.sdo"/>
+ <!--antcall target="clean.docs"/-->
+ </target>
+
<target name="test" description="Run SDO tests, not implemented yet">
<!-- TODO finish this -->
</target>
-
- <!--
- Internal targets
- They can still be called, they're just not described, so wont show up in "ant -p"
- Using antfile and inheritAll="false" to maintain the subdir build.xml basedir settings
- -->
-
- <target name="build.sdo">
- <ant target="build" antfile="${runtime.sdo.dir}/build.xml" inheritAll="false"/>
- </target>
-
- <target name="generate.docs">
- <!--ant target="generate.docs" antfile="${runtime.sdo.dir}/build.xml" inheritAll="false"/-->
- </target>
-
- <target name="install.sdo">
- <ant target="install" antfile="${runtime.sdo.dir}/build.xml" inheritAll="false"/>
- </target>
-
- <target name="install.docs">
- <!--ant target="install.docs" antfile="${runtime.sdo.dir}/build.xml" inheritAll="false"/-->
- </target>
-
- <target name="clean.sdo">
- <ant target="clean" antfile="${runtime.sdo.dir}/build.xml" inheritAll="false"/>
- </target>
-
- <target name="clean.docs">
- <!--ant target="clean.docs" antfile="${runtime.sdo.dir}/build.xml" inheritAll="false"/-->
- </target>
-
-</project>
+
+ <!--
+ Internal targets
+ They can still be called, they're just not described, so wont show up in "ant -p"
+ Using antfile and inheritAll="false" to maintain the subdir build.xml basedir settings
+ -->
+
+ <target name="build.sdo">
+ <ant target="build" antfile="${runtime.sdo.dir}/build.xml" inheritAll="false"/>
+ </target>
+
+ <target name="generate.docs">
+ <!--ant target="generate.docs" antfile="${runtime.sdo.dir}/build.xml" inheritAll="false"/-->
+ </target>
+
+ <target name="install.sdo">
+ <ant target="install" antfile="${runtime.sdo.dir}/build.xml" inheritAll="false"/>
+ </target>
+
+ <target name="install.docs">
+ <!--ant target="install.docs" antfile="${runtime.sdo.dir}/build.xml" inheritAll="false"/-->
+ </target>
+
+ <target name="clean.sdo">
+ <ant target="clean" antfile="${runtime.sdo.dir}/build.xml" inheritAll="false"/>
+ </target>
+
+ <target name="clean.docs">
+ <!--ant target="clean.docs" antfile="${runtime.sdo.dir}/build.xml" inheritAll="false"/-->
+ </target>
+
+</project>
Modified: incubator/tuscany/cpp/sdo/runtime/core/build.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/build.xml?rev=571623&r1=571622&r2=571623&view=diff
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/build.xml (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/build.xml Fri Aug 31 15:28:17 2007
@@ -79,6 +79,7 @@
outfile="${tuscany.sdo.lib}">
<custom-build-elements>
<defineset if="windows" define="SDO_EXPORTS"/>
+ <includepath path="${tuscanySDO.root.src.dir}/core/src"/>
<includepath path="${libxml2.include.dir}"/>
<includepath if="windows" path="${iconv.home.dir}/include"/>
<libset if="windows" dir="${libxml2.lib.dir}" libs="libxml2"/>
@@ -94,13 +95,14 @@
outfile="${tuscany.sdo_axiom.lib}">
<custom-build-elements>
<defineset if="windows" define="SDO_AXIOM_EXPORTS"/>
+ <includepath path="${sdo.impl.include.path}"/>
<includepath path="${axis2c.home.dir}/include"/>
+ <libset dir="${sdo.impl.library.path}" libs="${sdo.impl.library.name}"/>
<libset dir="${axis2c.home.dir}/lib" libs="axis2_util"/>
<libset dir="${axis2c.home.dir}/lib" libs="axis2_axiom"/>
<libset dir="${axis2c.home.dir}/lib" libs="axis2_parser"/>
<libset if="windows" dir="${axis2c.home.dir}/lib" libs="axiom"/>
<libset unless="windows" dir="${axis2c.home.dir}/lib" libs="axis2_axiom"/>
- <libset dir="${tuscanySDO.install.dir}/lib" libs="${tuscany.sdo.lib}"/>
</custom-build-elements>
</cpp-build>
</target>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org