You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by ro...@apache.org on 2007/07/18 17:26:28 UTC

svn commit: r557293 - in /incubator/tuscany/cpp/sca: antscripts/ antscripts/compile-targets.xml antscripts/compilers.xml antscripts/platform.properties build.xml platform-properties.xml runtime/core/src/build.xml tools/TuscanyDriver/build.xml

Author: robbinspg
Date: Wed Jul 18 08:26:27 2007
New Revision: 557293

URL: http://svn.apache.org/viewvc?view=rev&rev=557293
Log:
TUSCANY-1438 Add initial ant build

Added:
    incubator/tuscany/cpp/sca/antscripts/
    incubator/tuscany/cpp/sca/antscripts/compile-targets.xml   (with props)
    incubator/tuscany/cpp/sca/antscripts/compilers.xml   (with props)
    incubator/tuscany/cpp/sca/antscripts/platform.properties   (with props)
    incubator/tuscany/cpp/sca/build.xml   (with props)
    incubator/tuscany/cpp/sca/platform-properties.xml   (with props)
    incubator/tuscany/cpp/sca/runtime/core/src/build.xml   (with props)
Modified:
    incubator/tuscany/cpp/sca/tools/TuscanyDriver/build.xml

Added: incubator/tuscany/cpp/sca/antscripts/compile-targets.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/antscripts/compile-targets.xml?view=auto&rev=557293
==============================================================================
--- incubator/tuscany/cpp/sca/antscripts/compile-targets.xml (added)
+++ incubator/tuscany/cpp/sca/antscripts/compile-targets.xml Wed Jul 18 08:26:27 2007
@@ -0,0 +1,121 @@
+<?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='compiler-targets'>
+
+  <property file="./platform.properties"/>
+  <import file="./compilers.xml"/>
+
+  <!--
+    Do a cpp compilation.
+    Inherits from "Tuscany-BaseCompiler", which has an include path of:
+        ${sdo.include.dir}
+        ${tuscanySCA.root.dir}
+        ${tuscanySCA.root.src.dir}
+        ${tuscanySCA.root.src.dir}/core/src
+    @param objdir - directory where the object files will be written
+    @param srcdir - directory where the source files are located.
+    @param infiles - a space seperated list of the files to compile
+    @param custom-cc-elements - any extra cpp elements, may also be extra <includepath> elements
+  -->
+  <macrodef name="cpp-compile">
+    <attribute name="objdir" default="."/>
+    <attribute name="srcdir" default="."/>
+    <attribute name="infiles" default="*.cpp"/>
+    <element name="custom-cc-elements" optional="true"/>
+    <sequential>
+      <mkdir dir='@{objdir}'/>
+      <cc subsystem='console'
+          objdir='@{objdir}'>
+            <compiler refid='${compiler.name}-Compiler'/>
+            <fileset dir='@{srcdir}' includes='@{infiles}'/>
+            <custom-cc-elements/>
+      </cc>
+
+    </sequential>
+  </macrodef>
+
+  <!--
+    Do a cpp link which results in either a library (linktype of plugin, shared, or static)
+    or an executable (linktype of executable).
+    Inherits from "Tuscany-BaseLinker"
+    @param outfile - name of the library to create, OS prefixes and suffixes will be added
+    @param destdir - directory where the library will be written
+    @param infiles - a space seperated list of the object files to link
+    @param linktype - executable, plugin, shared, static
+    @param custom-ld-elements - any extra cpp elements, may also be extra <libset> elements
+  -->
+  <macrodef name="cpp-link">
+    <attribute name="outfile" default="out"/>
+    <attribute name="outdir" default="."/>
+    <attribute name="indir" default="."/>
+    <attribute name="infiles" default="*${object_ext}"/>
+    <attribute name="linktype" default="shared"/>
+    <element name="custom-ld-elements" optional="true"/>
+    <sequential>
+      <mkdir dir='@{outdir}'/>
+      <cc link='@{linktype}'
+          subsystem='console'
+          outfile='@{outdir}/@{outfile}'>
+            <linker refid='${compiler.name}-Linker'/>
+            <fileset dir='@{indir}' includes='@{infiles}'/>
+            <custom-ld-elements/>
+      </cc>
+
+    </sequential>
+  </macrodef>
+
+  <!--
+    Install cpp library
+    @param libs - library files to install
+    @param srclibdir - location of library files to install
+    @param destlibdir - Where to install library files
+  -->
+  <macrodef name="cpp-install-lib">
+    <attribute name="libs" default="${lib.prefix}*${lib.ext}"/>
+    <attribute name="srclibdir" default="."/>
+    <attribute name="destlibdir" default="."/>
+    <sequential>
+      <mkdir dir="@{destlibdir}"/>
+      <copy todir="@{destlibdir}" overwrite='true'>
+        <fileset dir="@{srclibdir}" includes="@{libs}"/>
+      </copy>
+      <chmod file="@{destlibdir}/@{libs}" perm="755"/>
+    </sequential>
+  </macrodef>
+
+  <!--
+    Install cpp headers
+    @param files - header files to install
+    @param srcdir - location of header files to install
+    @param destdir - Where to install header files
+  -->
+  <macrodef name="cpp-install-headers">
+    <attribute name="files" default="*.h"/>
+    <attribute name="srcdir" default="."/>
+    <attribute name="destdir" default="."/>
+    <sequential>
+      <mkdir dir="@{destdir}"/>
+      <copy todir="@{destdir}" overwrite='true'>
+        <fileset dir="@{srcdir}" includes="@{files}"/>
+      </copy>
+    </sequential>
+  </macrodef>
+
+</project>

Propchange: incubator/tuscany/cpp/sca/antscripts/compile-targets.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/cpp/sca/antscripts/compile-targets.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/cpp/sca/antscripts/compilers.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/antscripts/compilers.xml?view=auto&rev=557293
==============================================================================
--- incubator/tuscany/cpp/sca/antscripts/compilers.xml (added)
+++ incubator/tuscany/cpp/sca/antscripts/compilers.xml Wed Jul 18 08:26:27 2007
@@ -0,0 +1,112 @@
+<?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='compiler-import'>
+
+  <property file="./platform.properties"/>
+  <property environment="env"/>
+  <property name="TUSCANY_SDOCPP"  value="${env.TUSCANY_SDOCPP}"/>
+  <property name="sdo.include.dir" location="${env.TUSCANY_SDOCPP}/include"/>
+  <property name="sdo.lib.dir"     location="${env.TUSCANY_SDOCPP}/lib"/>
+
+  <taskdef resource='net/sf/antcontrib/antlib.xml'/>
+  <taskdef resource='cpptasks.tasks'/>
+  <typedef resource='cpptasks.types'/>
+
+  <if>
+    <isset property="platform.compiler-definition"/>
+    <then>
+      <property name='compiler.name' value='${platform.compiler-definition}'/>
+    </then>
+    <else>
+      <condition property='compiler.name' value='msvc'>
+        <os family='windows'/>
+      </condition>
+
+      <condition property='compiler.name' value='g++'>
+        <os name='linux'/>
+      </condition>
+
+      <condition property='compiler.name' value='g++'>
+        <os name='SunOS'/>
+      </condition>
+  
+      <condition property='compiler.name' value='g++'>
+        <os name='HP-UX'/>
+      </condition>
+
+    </else>
+  </if>
+
+  <!-- Just in case it isn't set (should be set in platform properties file -->
+  <property name="lib.ext" value=""/>
+
+  <condition property="lib.prefix" value="">
+    <os family="windows"/>
+  </condition>
+  <property name="lib.prefix" value="lib"/>
+
+  <condition property='windows' value='true'>
+    <os family='windows'/>
+  </condition>
+
+  <!--
+     Base compiler definition
+    -->
+  <compiler id='Tuscany-BaseCompiler' multithreaded='true' exceptions='true' rtti='true'>
+    <defineset if="windows" define="WIN32,_CRT_SECURE_NO_DEPRECATE,SCA_EXPORTS"/>
+    <includepath path="${sdo.include.dir}"/>
+    <includepath path="${tuscanySCA.root.dir}"/> <!-- tuscany_sca_config.h -->
+    <includepath path="${tuscanySCA.root.src.dir}"/>
+    <includepath path="${tuscanySCA.root.src.dir}/core/src"/>
+  </compiler>
+
+  <!--
+     Specific compiler definitions
+    -->
+  <compiler id='msvc-Compiler' extends='Tuscany-BaseCompiler' name='msvc'/>
+  <compiler id='msvc8-Compiler' extends='Tuscany-BaseCompiler' name='msvc' exceptions='false'>
+    <compilerarg value='/EHsc'/>
+  </compiler>
+  <compiler id='g++-Compiler' extends='Tuscany-BaseCompiler' name='g++'/>
+ 
+  <!-- Used for cross compilation with the -m32 flag -->
+  <compiler id='g++m32-Compiler' extends='Tuscany-BaseCompiler' name='g++'>
+    <compilerarg value='-m32'/>
+  </compiler>
+
+  <!--
+     Base linker definition
+    -->
+  <linker id='Tuscany-BaseLinker'>
+    <syslibset if='windows' libs='kernel32,user32,ws2_32'/>
+    <libset dir="${sdo.lib.dir}" libs="tuscany_sdo"/>
+  </linker>
+
+  <!--
+     Specific linker definitions
+    -->
+  <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++m32-Linker' extends='Tuscany-BaseLinker' name='g++'>
+    <linkerarg value='-m32'/>
+  </linker>
+
+</project>

Propchange: incubator/tuscany/cpp/sca/antscripts/compilers.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/cpp/sca/antscripts/compilers.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/cpp/sca/antscripts/platform.properties
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/antscripts/platform.properties?view=auto&rev=557293
==============================================================================
--- incubator/tuscany/cpp/sca/antscripts/platform.properties (added)
+++ incubator/tuscany/cpp/sca/antscripts/platform.properties Wed Jul 18 08:26:27 2007
@@ -0,0 +1,23 @@
+#  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.
+
+#platform.compiler-definition=g++-m32
+#platform=rhas4u4_gcc346
+script.ext=
+#lib.ext=.so
+exe.ext=
+#object.ext=.o

Propchange: incubator/tuscany/cpp/sca/antscripts/platform.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/cpp/sca/antscripts/platform.properties
------------------------------------------------------------------------------
    svn:executable = *

Added: incubator/tuscany/cpp/sca/build.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/build.xml?view=auto&rev=557293
==============================================================================
--- incubator/tuscany/cpp/sca/build.xml (added)
+++ incubator/tuscany/cpp/sca/build.xml Wed Jul 18 08:26:27 2007
@@ -0,0 +1,102 @@
+<?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="TuscanyScaNative" default="all" basedir=".">
+
+  <!--
+    This is the root level ant build.xml file for TuscanySCA 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="platform-properties.xml"/>
+
+  <property name="src.dir" value="runtime/core/src"/>
+  <property name="extensions.dir" value="runtime/extensions"/>
+ 	
+  <!--
+    Public targets
+  -->
+
+  <target name="all" description="compile, link, and install all TuscanyScaNative source code">
+    <antcall target="compile"/>
+    <antcall target="link"/>
+    <antcall target="install"/>
+  </target>
+
+  <target name="compile" description="Compile all TuscanyScaNative source code">
+    <antcall target="compile.core"/>
+    <antcall target="compile.extensions"/>
+  </target>
+
+  <target name="link" description="Link all TuscanyScaNative source code">
+    <antcall target="link.core"/>
+    <antcall target="link.extensions"/>
+  </target>
+
+  <target name="install" description="Install TuscanyScaNative libraries and headers">
+    <antcall target="install.core"/>
+    <antcall target="install.extensions"/>
+  </target>
+
+  <target name="clean" description="Clean all TuscanyScaNative compiled source code">
+    <antcall target="clean.core"/>
+    <antcall target="clean.extensions"/>
+  </target>
+
+  <!--
+    Internal targets
+    They can still be called, they're just not described, so wont show up in "ant -p"
+  -->
+
+  <target name="compile.core">
+    <ant target="compile" dir="${src.dir}"/>
+  </target>
+
+  <target name="compile.extensions">
+    <!-- TODO finish this -->
+  </target>
+
+  <target name="link.core">
+    <ant target="link" dir="${src.dir}"/>
+  </target>
+
+  <target name="link.extensions">
+    <!-- TODO finish this -->
+  </target>
+
+  <target name="install.core">
+    <ant target="install" dir="${src.dir}"/>
+  </target>
+
+  <target name="install.extensions">
+    <!-- TODO finish this -->
+  </target>
+
+  <target name="clean.core">
+    <ant target="clean" dir="${src.dir}"/>
+  </target>
+
+  <target name="clean.extensions">
+    <!-- TODO finish this -->
+  </target>
+
+</project>

Propchange: incubator/tuscany/cpp/sca/build.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/cpp/sca/build.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/cpp/sca/platform-properties.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/platform-properties.xml?view=auto&rev=557293
==============================================================================
--- incubator/tuscany/cpp/sca/platform-properties.xml (added)
+++ incubator/tuscany/cpp/sca/platform-properties.xml Wed Jul 18 08:26:27 2007
@@ -0,0 +1,47 @@
+<?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='platform-properties'>
+
+  <property file="./platform.properties"/>
+
+
+  <dirname property="tuscanySCA.root.dir" file="${ant.file.platform-properties}/"/>
+  <property name="tuscanySCA.antscripts.dir" value="${tuscanySCA.root.dir}/antscripts" />
+  <property name="tuscanySCA.root.src.dir" value="${tuscanySCA.root.dir}/runtime/" />
+  <property name="tuscanySCA.install.dir" value="${tuscanySCA.root.dir}/deploy/" />
+
+  <condition property='lib.ext' value='.dll'>
+    <os family='windows'/>
+  </condition>
+  <property name='lib.ext' value='.so'/>
+
+  <condition property="lib.prefix" value="">
+    <os family="windows"/>
+  </condition>
+  <property name="lib.prefix" value="lib"/>
+
+  <condition property='windows' value='true'>
+    <os family='windows'/>
+  </condition>
+
+  <property name='objext.ext' value='.o'/>
+
+
+</project>

Propchange: incubator/tuscany/cpp/sca/platform-properties.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/cpp/sca/platform-properties.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/cpp/sca/runtime/core/src/build.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/build.xml?view=auto&rev=557293
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/build.xml (added)
+++ incubator/tuscany/cpp/sca/runtime/core/src/build.xml Wed Jul 18 08:26:27 2007
@@ -0,0 +1,195 @@
+<?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="TuscanyScaNative_core" default="all" basedir=".">
+  <import file="../../../platform-properties.xml"/>
+  <import file="${tuscanySCA.antscripts.dir}/compile-targets.xml"/>
+
+  <property name="core.dir"          value="tuscany/sca/core"/>
+  <property name="extension.dir"     value="tuscany/sca/extension"/>
+  <property name="model.dir"         value="tuscany/sca/model"/>
+  <property name="util.dir"          value="tuscany/sca/util"/>
+  <property name="lib.dir"           value="./.libs"/>
+  <property name="tuscany.core.lib"  value="tuscany_sca"/>
+
+  <!--
+    All the cpp and header files per subdirectory
+    New classes should be added to these properties
+  -->
+
+  <property
+    name="core.cpp.files"
+    value="Exceptions.cpp Operation.cpp SCARuntime.cpp ServiceProxy.cpp ServiceWrapper.cpp"/>
+  <property
+    name="core.h.files"
+    value="Exceptions.h Operation.h SCARuntime.h ServiceProxy.h ServiceWrapper.h"/>
+
+  <property
+    name="extension.cpp.files"
+    value="ImplementationExtension.cpp InterfaceExtension.cpp ReferenceBindingExtension.cpp ServiceBindingExtension.cpp"/>
+  <property
+    name="extension.h.files"
+    value="ImplementationExtension.h InterfaceExtension.h ReferenceBindingExtension.h ServiceBindingExtension.h"/>
+
+  <property
+    name="model.cpp.files"
+    value="Binding.cpp Component.cpp ComponentType.cpp Composite.cpp CompositeReferenceBinding.cpp CompositeReference.cpp CompositeService.cpp Contract.cpp Interface.cpp ModelLoader.cpp ReferenceBinding.cpp Reference.cpp ReferenceType.cpp ServiceBinding.cpp Service.cpp ServiceType.cpp Wire.cpp WSDLDefinition.cpp WSDLInterface.cpp WSDLMessagePart.cpp WSDLOperation.cpp"/>
+  <property
+    name="model.h.files"
+    value="Binding.h Component.h ComponentType.h Composite.h CompositeReferenceBinding.h CompositeReference.h CompositeService.h Contract.h Interface.h ModelLoader.h ReferenceBinding.h Reference.h ReferenceType.h ServiceBinding.h Service.h ServiceType.h Wire.h WSDLDefinition.h WSDLInterface.h WSDLMessagePart.h WSDLOperation.h"/>
+
+  <property
+    name="util.cpp.files"
+    value="DefaultLogWriter.cpp File.cpp FileLogWriter.cpp Library.cpp Logger.cpp LogWriter.cpp Mutex.cpp Queue.cpp SDOUtils.cpp Thread.cpp ThreadLocal.cpp Utils.cpp"/>
+  <property
+    name="util.h.files"
+    value="DefaultLogWriter.h File.h FileLogWriter.h Library.h Logger.h Logging.h LogWriter.h Mutex.h Queue.h SDOUtils.h Thread.h ThreadLocal.h Utils.h"/>
+
+  <!--
+    Public targets
+  -->
+  <target name="all" description="compile, link, and install all TuscanyScaNative core source code">
+    <antcall target="compile"/>
+    <antcall target="link"/>
+    <antcall target="install"/>
+  </target>
+
+  <target name="compile" description="Compile all TuscanyScaNative core source code">
+    <antcall target="compile.core"/>
+    <antcall target="compile.extension"/>
+    <antcall target="compile.model"/>
+    <antcall target="compile.util"/>
+  </target>
+
+  <target name="link" description="Link all TuscanyScaNative core source code">
+    <cpp-link
+        outfile="${tuscany.core.lib}"
+        outdir="${lib.dir}"
+        indir="${lib.dir}"
+        infiles="*${object.ext}"/>
+  </target>
+
+  <target name="install" description="Install TuscanyScaNative core libraries and headers">
+    <antcall target="install.core"/>
+    <antcall target="install.extension"/>
+    <antcall target="install.model"/>
+    <antcall target="install.util"/>
+    <cpp-install-headers
+        srcdir="tuscany/sca"
+        files="export.h"
+        destdir="${tuscanySCA.install.dir}/include/tuscany/sca"/>
+    <cpp-install-lib
+        libs="${lib.prefix}${tuscany.core.lib}${lib.ext}"
+        srclibdir="${lib.dir}"
+        destlibdir="${tuscanySCA.install.dir}/lib"/>
+  </target>
+
+  <target name="clean" description="Clean all TuscanyScaNative core compiled source code">
+    <delete dir="${lib.dir}"/>
+    <!-- delete installed lib and dir -->
+    <antcall target="clean.core"/>
+    <antcall target="clean.extension"/>
+    <antcall target="clean.model"/>
+    <antcall target="clean.util"/>
+  </target>
+
+  <!--
+    Internal targets
+    They can still be called, they're just not described, so wont show up in "ant -p"
+  -->
+
+    <!-- compile -->
+
+  <target name="compile.core">
+    <cpp-compile
+        srcdir="${core.dir}"
+        objdir="${lib.dir}"
+        infiles="${core.cpp.files}"/>
+  </target>
+
+  <target name="compile.extension">
+    <cpp-compile
+        srcdir="${extension.dir}"
+        objdir="${lib.dir}"
+        infiles="${extension.cpp.files}"/>
+  </target>
+
+  <target name="compile.model">
+    <cpp-compile
+        srcdir="${model.dir}"
+        objdir="${lib.dir}"
+        infiles="${model.cpp.files}"/>
+  </target>
+
+  <target name="compile.util">
+    <cpp-compile
+        srcdir="${util.dir}"
+        objdir="${lib.dir}"
+        infiles="${util.cpp.files}"/>
+  </target>
+
+    <!-- install -->
+
+  <target name="install.core">
+    <cpp-install-headers
+        srcdir="${core.dir}"
+        files="${core.h.files}"
+        destdir="${tuscanySCA.install.dir}/include/${core.dir}"/>
+  </target>
+
+  <target name="install.extension">
+    <cpp-install-headers
+        srcdir="${extension.dir}"
+        files="${extension.h.files}"
+        destdir="${tuscanySCA.install.dir}/include/${extension.dir}"/>
+  </target>
+
+  <target name="install.model">
+    <cpp-install-headers
+        srcdir="${model.dir}"
+        files="${model.h.files}"
+        destdir="${tuscanySCA.install.dir}/include/${model.dir}"/>
+  </target>
+
+  <target name="install.util">
+    <cpp-install-headers
+        srcdir="${util.dir}"
+        files="${util.h.files}"
+        destdir="${tuscanySCA.install.dir}/include/${util.dir}"/>
+  </target>
+
+    <!-- clean -->
+
+  <target name="clean.core">
+    <!-- delete installed headers -->
+  </target>
+
+  <target name="clean.extension">
+    <!-- delete installed headers -->
+  </target>
+
+  <target name="clean.model">
+    <!-- delete installed headers -->
+  </target>
+
+  <target name="clean.util">
+    <!-- delete installed headers -->
+  </target>
+
+</project>

Propchange: incubator/tuscany/cpp/sca/runtime/core/src/build.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/cpp/sca/runtime/core/src/build.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/tuscany/cpp/sca/tools/TuscanyDriver/build.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/TuscanyDriver/build.xml?view=diff&rev=557293&r1=557292&r2=557293
==============================================================================
--- incubator/tuscany/cpp/sca/tools/TuscanyDriver/build.xml (original)
+++ incubator/tuscany/cpp/sca/tools/TuscanyDriver/build.xml Wed Jul 18 08:26:27 2007
@@ -27,6 +27,10 @@
   <property name="TUSCANY_SCACPP" value="${env.TUSCANY_SCACPP}"/>
   <property name="TUSCANY_SDOCPP" value="${env.TUSCANY_SDOCPP}"/>
 
+  	<condition property="windows">
+		<os family="windows"/>
+  	</condition>
+
   <condition property='compiler-name' value='msvc'>
     <os family='windows'/>
   </condition>
@@ -62,6 +66,11 @@
           <includepath path='.'/>
           <includepath path='${TUSCANY_SDOCPP}/include/'/>
           <includepath path='${TUSCANY_SCACPP}/include/'/>
+		<defineset>
+			<define name="WIN32" if="windows"/>
+			<define name="_WINDOWS" if="windows"/>
+                        <define name="LINUX" if="linux"/>
+		</defineset>
           <fileset dir='.' includes='*.cpp'/>
       </cc>
     </sequential>



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org