tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bjohn...@apache.org
Subject svn commit: r577039 - in /incubator/tuscany/cpp/sca: ./ antscripts/ tools/TuscanyDriver/ tools/ant_cpptasks/ tools/ant_cpptasks/build/ tools/ant_cpptasks/build/tuscany/ tools/ant_cpptasks/build/tuscany/antCompilers/ tools/ant_cpptasks/tuscanyAntCompilers/
Date Tue, 18 Sep 2007 20:14:35 GMT
Author: bjohnson
Date: Tue Sep 18 13:14:34 2007
New Revision: 577039

URL: http://svn.apache.org/viewvc?rev=577039&view=rev
Log:
Fixed msvc compilation issues by creating custom cctask compiler. Fixed some minor build issues
for TuscanyServiceLoader. Adding README_ANT_INSTALL

Added:
    incubator/tuscany/cpp/sca/README_ANT_INSTALL
    incubator/tuscany/cpp/sca/antscripts/TuscanyMSVC8DevStudioCCompiler.jar   (with props)
    incubator/tuscany/cpp/sca/tools/ant_cpptasks/
    incubator/tuscany/cpp/sca/tools/ant_cpptasks/build/
    incubator/tuscany/cpp/sca/tools/ant_cpptasks/build.xml
    incubator/tuscany/cpp/sca/tools/ant_cpptasks/build/tuscany/
    incubator/tuscany/cpp/sca/tools/ant_cpptasks/build/tuscany/antCompilers/
    incubator/tuscany/cpp/sca/tools/ant_cpptasks/tuscanyAntCompilers/
    incubator/tuscany/cpp/sca/tools/ant_cpptasks/tuscanyAntCompilers/TuscanyMSVC8DevStudioCCompiler.java
Modified:
    incubator/tuscany/cpp/sca/antscripts/system.xml
    incubator/tuscany/cpp/sca/tools/TuscanyDriver/TuscanyServiceLoader.cpp
    incubator/tuscany/cpp/sca/tools/TuscanyDriver/build.xml

Added: incubator/tuscany/cpp/sca/README_ANT_INSTALL
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/README_ANT_INSTALL?rev=577039&view=auto
==============================================================================
--- incubator/tuscany/cpp/sca/README_ANT_INSTALL (added)
+++ incubator/tuscany/cpp/sca/README_ANT_INSTALL Tue Sep 18 13:14:34 2007
@@ -0,0 +1,340 @@
+Using ant to build TuscanySCA Native
+
+This guide shows how to build TuscanySCA Native with apache ant. 
+Traditionally TuscanySCA was compiled with automake, but we decided
+it would be easier to maintain and more flexible if we switched to 
+ant. The ant build process is still in its beta and will be formalized
+for Release M4. Currently the only item remaining is to finish writing
+ant build files for the rest of the samples.
+
+
+Required Software to build TuscanySCA Native with ant
+=====================================================
+
+Java:
+        Most Linux, Mac, and Windows systems come with Java
+        Java 1.4.2 or later
+
+Ant:
+        Ant comes installed with almost all Linux distributions
+        version 1.6 or later
+        Download: http://ant.apache.org/
+
+antcontrib:
+        version 1.0b3 or later
+        Download: http://ant-contrib.sourceforge.net/
+
+antcontrib cpptasks.jar
+        version 1.0b4 or later
+        Download: http://ant-contrib.sourceforge.net/
+        Information: http://ant-contrib.sourceforge.net/cc.html
+
+
+Installation Instructions
+=========================
+
+Linux/Mac
+---------
+
+Make sure JAVA_HOME is set before starting.
+
+Install ant according to http://ant.apache.org/manual/index.html.
+
+Set the ANT_HOME variable to the directory where you install ant.
+export ANT_HOME="/home/your/ant"
+
+Add $ANT_HOME/bin to your path.
+export PATH="${PATH}:${ANT_HOME}/bin"
+
+The optional ant tasks included in antcontrib and cpptasks are needed to
+compile Tuscany Native with ant. Additional ant tasks (antcontrib and cpptasks)
+should be installed in $ANT_HOME/lib
+So place the antcontrib and cpptasks jars there.
+
+If you dont have write access to $ANT_HOME/lib, do the following:
+- create ${user.home}/.ant/lib
+- place the jars here
+
+Typically its a good idea to avoid adding optional ant tasks to your classpath,
+this can be problematic.
+
+Since the antcontrib compiler adaptor for microsoft msvc 8 has several bugs, we've
+written our own. Even though this compiler is for Windows, it is referenced in the
+ant build scripts and thus needs to be added to the classpath even for Linux/Mac.
+Add the TuscanyMSVC8DevStudioCCompiler jar to your classpath.
+export CLASSPATH="${CLASSPATH}:/TuscanySourceDir/antscripts/TuscanyMSVC8DevStudioCCompiler.jar"
+
+Windows
+-------
+
+Make sure JAVA_HOME is set before starting.
+
+Install ant according to http://ant.apache.org/manual/index.html.
+
+Set the ANT_HOME variable to the directory where you install ant.
+set ANT_HOME=c:\ant
+
+Add %ANT_HOME%\bin to your path.
+set PATH=%PATH%;%ANT_HOME%\bin
+
+The optional ant tasks included in antcontrib and cpptasks are needed to
+compile Tuscany Native with ant. Additional ant tasks (antcontrib and cpptasks)
+should be installed in %ANT_HOME%\lib
+So place the antcontrib and cpptasks jars there.
+
+If you dont have write access to %ANT_HOME%\lib, do the following:
+- create %user.home%\.ant\lib
+- place the jars here
+
+Typically its a good idea to avoid adding optional ant tasks to your classpath,
+this can be problematic.
+
+Since the antcontrib compiler adaptor for microsoft msvc 8 has several bugs, we've
+written our own, namely TuscanyMSVC8DevStudioCCompiler. The Tuscany MSVC8 adaptor 
+just makes sure that the correct parameters are passed to the compiler.
+Add the TuscanyMSVC8DevStudioCCompiler jar to your classpath.
+set CLASSPATH=%CLASSPATH%:c:\TuscanySourceDir\antscripts\TuscanyMSVC8DevStudioCCompiler.jar
+
+USAGE
+=====
+
+From the TuscanySCA Native root source directory, the entire application can be 
+compiled, linked, and installed by simply executing ant with no targets. This will
+execute the default "all" target.
+
+# ant
+
+The ant build system will scan your environment variables and ant configuration file
+and try to autoconfigure everything needed to build.  The environment variables can be 
+overridden by the ant configuration file: antscripts/platform.properties.  The only 
+configuration that is mandatory to build TuscanySCA Native is the location of an SDO 
+implementation, typically TuscanySDO Native.
+
+To configure the location of TuscanySDO Native, do one of the following:
+export TUSCANY_SDOCPP=/tuscany/sdo/native/deploy/dir
+  -- OR --
+edit antscripts/platform.properties
+platform.tuscanySDO.install.dir=/tuscany/sdo/native/deploy/dir
+
+The platform.properties configuration always overrides environment variables.
+See the CONFIGURATION section below for more information.
+
+To compile in debug mode, add the following define to the ant command line or
+edit the platform.properties file as seen in the CONFIGURATION section below.
+
+# ant -Ddebug=true
+
+The TuscanySCA Native ant build process is hierarchical. Currently there are 
+build scripts in the following locations, which can all be invoked from the 
+root TuscanySCA directory:
+  TUSCANY_SCA_SRC_ROOT/build.xml
+  TUSCANY_SCA_SRC_ROOT/runtime/core/build.xml
+  TUSCANY_SCA_SRC_ROOT/runtime/extensions/build.xml
+  TUSCANY_SCA_SRC_ROOT/runtime/extensions/cpp/build.xml
+  TUSCANY_SCA_SRC_ROOT/runtime/extensions/php/build.xml
+  TUSCANY_SCA_SRC_ROOT/runtime/extensions/cpp/tools/scagen/build.xml
+  TUSCANY_SCA_SRC_ROOT/runtime/extensions/python/build.xml
+  TUSCANY_SCA_SRC_ROOT/runtime/extensions/rest/build.xml
+  TUSCANY_SCA_SRC_ROOT/runtime/extensions/ruby/build.xml
+  TUSCANY_SCA_SRC_ROOT/runtime/extensions/sca/build.xml
+  TUSCANY_SCA_SRC_ROOT/runtime/extensions/wsbuild.xml
+  TUSCANY_SCA_SRC_ROOT/tools/TuscanyDriver/build.xml
+  TUSCANY_SCA_SRC_ROOT/tools/TuscanyDriver/build.xml
+  TUSCANY_SCA_SRC_ROOT/samples/CppBigBank/build.xml (the rest of the samples are coming soon)
+
+For a listing of public targets for any build.xml file, execute the following: 
+(display shown for the root src directory)
+
+# ant -p
+Buildfile: build.xml
+
+Main targets:
+
+ all      build and install all TuscanyScaNative source code
+ build    Build all TuscanyScaNative source code
+ clean    Clean all TuscanyScaNative compiled source code
+ install  Install TuscanyScaNative libraries and headers
+Default target: all
+
+Public targets are those that have descriptions and are usually the only ones needed for
+compiling, installing and cleaning. For more avanced use, the private targets can be seen

+by looking at the actual build.xml file.
+
+
+CONFIGURATION
+==============
+
+The following explains how to configure the TuscanySCA Native ant build system.
+The build system is configured either by environment variables and/or by the
+antscripts/platform.properties file. Some options can only be configured via the
+platform.properties file. If an option can be configured in both places, the option
+specified in the platform.properties file overrides the environment variable.
+
+The TuscanySCA Native ant build system is capable of automatically configuring 
+everything except the location of the Tuscany SDO Native location. All other
+configuration options can be determined. (except of course the location of the 
+optional 3rd-party packages: axis2c, python, php, ruby, and rest) 
+
+From anywhere there is a TuscanySCA Native build.xml file, the current system
+configuration can be displayed by executing the display.system ant target as 
+follows:
+
+# ant display.system
+Buildfile: build.xml
+
+check.ws:
+
+check.python:
+
+check.php:
+
+check.ruby:
+
+check.rest:
+
+display.system:
+     [echo]
+     [echo] TuscanySCA paths
+     [echo]   tuscanySCA.install.dir=      /nfs/homes/bjohnson/tuscany_svn_head/sca/deploy
+     [echo]   tuscanySCA.root.dir=         /amd/homes/bjohnson/tuscany_svn_head/sca
+     [echo]   tuscanySCA.root.src.dir=     /amd/homes/bjohnson/tuscany_svn_head/sca/runtime
+     [echo]   tuscanySCA.install.dir=      /nfs/homes/bjohnson/tuscany_svn_head/sca/deploy
+     [echo]   tuscanySCA.library.version=  '.0.0.0'
+     [echo]   tuscanySDO.install.dir=      /nfs/homes/bjohnson/tuscany_svn_head/sdo/deploy
+     [echo]
+     [echo] TuscanySCA compiler configuration
+     [echo]   compiler.name=               'g++'
+     [echo]   debug.compile=               'false'
+     [echo]   lib.ext=                     '.so'
+     [echo]   dll.ext=                     ''
+     [echo]   lib.prefix=                  'lib'
+     [echo]   object.ext=                  '.o'
+     [echo]   exe.ext=                     ''
+     [echo]   script.ext=                  '.sh'
+     [echo]   external.definitions.file=   ''
+     [echo]   sdo.impl.library.name=       'tuscany_sdo'
+     [echo]
+     [echo] TuscanySCA ws extension enabled
+     [echo]   axis2c.home.dir=          /nfs/homes/bjohnson/3rdparty/axis2c-src-0.96/deploy
+     [echo]
+     [echo] TuscanySCA php extension enabled
+     [echo]   php.lib.dir=              /nfs/homes/bjohnson/3rdparty/php-5.1.6/deploy/lib
+     [echo]   php.include.dir=          /nfs/homes/bjohnson/3rdparty/php-5.1.6/deploy/include/php
+     [echo]   php.sca.sdo.lib.dir=      /nfs/homes/bjohnson/3rdparty/sdo-1.0.3/lib
+     [echo]   php.sca.sdo.include.dir=  /nfs/homes/bjohnson/3rdparty/sdo-1.0.3
+     [echo]
+     [echo] TuscanySCA python extension enabled
+     [echo]   python.lib.dir=           /nfs/homes/bjohnson/3rdparty/Python-2.5.1/deploy/lib
+     [echo]   python.include.dir=       /nfs/homes/bjohnson/3rdparty/Python-2.5.1/deploy/include/python2.5
+     [echo]   python.version=           python2.5
+     [echo]
+     [echo] TuscanySCA rest extension enabled
+     [echo]   rest.curl.lib.dir=        /usr/lib
+     [echo]   rest.curl.include.dir=    /usr/include/curl
+     [echo]   rest.httpd.include.dir=   /nfs/homes/bjohnson/3rdparty/httpd-2.0.59/deploy/include
+     [echo]   rest.apr.include.dir=     /usr/include/apr-0
+     [echo]
+     [echo] TuscanySCA ruby extension enabled
+     [echo]   ruby.lib.dir=             /nfs/homes/bjohnson/3rdparty/ruby-1.8.6/deploy/lib
+     [echo]   ruby.include.dir=         /nfs/homes/bjohnson/3rdparty/ruby-1.8.6/deploy/include
+     [echo]
+
+BUILD SUCCESSFUL
+Total time: 0 seconds
+
+
+Compilation configuration
+-------------------------
+
+The compilation options can all be determined by the ant build system by
+examining the platform.  The values can only be overriden by editing the 
+platform.properties file. Following is a list of the options and their 
+default values:
+
+platform.lib.ext=        (Defaults to ".so" for Unix and ".lib" for Windows)
+platform.dll.ext=        (Defaults to "" for Unix and ".dll" for Windows. Not used for Unix)
+platform.exe.ext=        (Defaults to "" for Unix and ".exe" for Windows)
+platform.object.ext=     (Defaults to ".o" for Unix and ".obj" for Windows)
+platform.script.ext=     (Defaults to ".sh" for Unix and ".bat" for Windows)
+platform.compiler.name=  (Defaults to "g++" for Unix and "msvc8" for Windows)
+platform.debug.compile=  (Defaults to "false" for both Unix and Windows)
+
+To configure ant to use a compiler other than g++ or msvc, or to add your own
+ant tasks/definitions, specify a path for the platform.external.definitions.file
+and platform.compiler.name in the platform.properties configuration file. This 
+is especially useful for compiling on other platforms like AIX or Solaris.
+
+Tuscany SCA and SDO paths
+-------------------------
+
+Both the Tuscany SCA and SDO installation directories can be configured as follows:
+  export TUSCANY_SCACPP=/tuscany/sca/native/install/dir
+  export TUSCANY_SDOCPP=/tuscany/sdo/native/install/dir
+  -- OR --
+  edit antscripts/platform.properties
+  platform.tuscanySCA.install.dir=/tuscany/sca/native/install/dir
+  platform.tuscanySDO.install.dir=/tuscany/sdo/native/install/dir
+
+The Tuscany SCA installation directory defaults to:
+  TUSCANY_SCA_SRC_ROOT/deploy
+
+Extension configuration
+-----------------------
+
+AXIS2C:
+If not specified, then the values are left empty and the cpp and ws extensions will not be
compiled.
+
+  export AXIS2C_HOME=/axis2c/home/dir
+   -- OR --
+  edit antscripts/platform.properties
+  platform.axis2c.home.dir=/axis2c/home/dir
+
+PYTHON:
+If not specified, then the values are left empty and the python extension will not be compiled.
+
+  export PYTHON_LIB=/python/library/directory
+  export PYTHON_INCLUDE=/python/include/directory
+  export PYTHON_VERSION=python_library_name_with_version
+    -- OR --
+  edit antscripts/platform.properties
+  platform.python.include.dir=/python/library/directory
+  platform.python.lib.dir=/python/include/directory
+  platform.python.version=python_library_name_with_version
+
+PHP:
+If not specified, then the values are left empty and the php extension will not be compiled.
+
+  export PHP_LIB=/php/library/directory
+  export PHP_INCLUDE=/php/include/directory
+  export PHP_SCA_SDO_LIB=/php/sdo/library/directory
+  export PHP_SCA_SDO_INCLUDE=/php/sdo/include/directory
+  -- OR --
+  edit antscripts/platform.properties
+  platform.php.include.dir=/php/library/directory
+  platform.php.lib.dir=/php/include/directory
+  platform.php.sca.sdo.lib.dir=/php/sdo/library/directory
+  platform.php.sca.sdo.include.dir=/php/sdo/include/directory
+
+RUBY:
+If not specified, then the values are left empty and the ruby extension will not be compiled.
+  export RUBY_LIB=/ruby/library/directory
+  export RUBY_INCLUDE=/ruby/include/directory
+    -- OR --
+  edit antscripts/platform.properties
+  platform.ruby.lib.dir=/ruby/library/directory
+  platform.ruby.include.dir=/ruby/include/directory
+
+REST:
+If not specified, then the values are left empty and the rest extension will not be compiled.
+  export CURL_LIB=/curl/library/directory
+  export CURL_INCLUDE=/curl/include/directory
+  export HTTPD_INCLUDE=/httpd/apache/include/directory
+  export APR_INCLUDE=/apr/include/directory
+    -- OR --
+  edit antscripts/platform.properties
+  platform.rest.curl.lib.dir=/curl/library/directory
+  platform.rest.curl.include.dir=/curl/include/directory
+  platform.rest.httpd.include.dir=/httpd/apache/include/directory
+  platform.rest.apr.include.dir=/apr/include/directory
+
+

Added: incubator/tuscany/cpp/sca/antscripts/TuscanyMSVC8DevStudioCCompiler.jar
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/antscripts/TuscanyMSVC8DevStudioCCompiler.jar?rev=577039&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/tuscany/cpp/sca/antscripts/TuscanyMSVC8DevStudioCCompiler.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: incubator/tuscany/cpp/sca/antscripts/system.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/antscripts/system.xml?rev=577039&r1=577038&r2=577039&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/antscripts/system.xml (original)
+++ incubator/tuscany/cpp/sca/antscripts/system.xml Tue Sep 18 13:14:34 2007
@@ -382,10 +382,11 @@
       </condition>
 
       <condition property="compiler.name" value="g++">
-        <or>
-          <os family="unix"/>
-          <os family="mac"/>
-        </or>
+        <os family="unix"/>
+       </condition>
+
+      <condition property="compiler.name" value="mac_g++">
+        <os family="mac"/>
       </condition>
     </else>
   </if>
@@ -568,8 +569,6 @@
      Base compiler definition
     -->
   <compiler id="Tuscany-BaseCompiler" multithreaded="true" exceptions="true" rtti="true">
-    <defineset if="windows" define="WIN32,_CRT_SECURE_NO_DEPRECATE,_USRDLL,_WINDOWS"/>
-    <defineset if="mac" define="IS_DARWIN"/>
     <includepath path="${sdo.include.dir}"/>
     <includepath path="${tuscanySCA.root.src.dir}"/>
     <includepath path="${tuscanySCA.root.src.dir}/core/src"/>
@@ -577,38 +576,66 @@
 
   <!--
      Specific compiler definitions
+     The compilerarg location functionality completely omits the arg: antcontrib bug 1794857
     -->
-  <compiler id="msvc-Compiler" extends="Tuscany-BaseCompiler" name="msvc"/>
-  <compiler id="msvc8-Compiler" extends="Tuscany-BaseCompiler" name="msvc" exceptions="false">
-    <compilerarg value="/EHsc"/>
+  
+    <!-- MSVC compilers for windows -->
+  <compiler id="msvc-Compiler" extends="Tuscany-BaseCompiler" name="msvc">
+    <defineset define="WIN32,_CRT_SECURE_NO_DEPRECATE,_USRDLL,_WINDOWS"/>
+  </compiler>
+
+    <!-- The standard msvc ant contrib cc task compiler doesnt work so well,
+         so we made our own until the bugs are resolved -->
+  <!--compiler id="msvc8-Compiler" extends="Tuscany-BaseCompiler" name="msvc"-->
+  <compiler id="msvc8-Compiler"
+            extends="Tuscany-BaseCompiler"
+            classname="tuscany.antCompilers.TuscanyMSVC8DevStudioCCompiler">
+    <defineset define="WIN32,_CRT_SECURE_NO_DEPRECATE,_USRDLL,_WINDOWS"/>
   </compiler>
+
+     <!-- g++ compiler for most Unix platforms -->
   <compiler id="g++-Compiler" extends="Tuscany-BaseCompiler" name="g++"/>
  
-  <!-- Used for cross compilation with the -m32 flag -->
+    <!-- g++ 32 bit compiler for 64 bit platforms
+         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"/>
-  </linker>
+    <!-- g++ compiler for Apple mac -->
+  <compiler id="mac_g++-Compiler" extends="Tuscany-BaseCompiler" name="g++">
+    <defineset define="IS_DARWIN"/>
+  </compiler>
 
   <!--
      Specific linker definitions
+     The linker extends funcionality isnt working correctly: antcontrib bug 1794867
+     Specifically, the syslibset for dl was not working on Linux
     -->
-  <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="msvc-Linker" name="msvc">
+    <syslibset libs="kernel32,user32,ws2_32"/>
+  </linker>
+
+  <linker id="msvc8-Linker" name="msvc">
+    <syslibset libs="kernel32,user32,ws2_32"/>
+  </linker>
+
+  <linker id="g++-Linker" name="g++">
     <syslibset libs="dl"/>
   </linker>
-  <linker id="g++m32-Linker" extends="Tuscany-BaseLinker" name="g++">
+
+  <linker id="g++m32-Linker" name="g++">
     <syslibset libs="dl"/>
     <linkerarg value="-m32"/>
   </linker>
 
+  <linker id="mac_g++-Linker" name="g++">
+    <syslibset libs="dl"/>
+  </linker>
+
+  <!--
+    Setup the external definitions file, if there is one
+  -->
   <if>
     <and>
       <isset property="platform.external.definitions.file"/>

Modified: incubator/tuscany/cpp/sca/tools/TuscanyDriver/TuscanyServiceLoader.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/TuscanyDriver/TuscanyServiceLoader.cpp?rev=577039&r1=577038&r2=577039&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/tools/TuscanyDriver/TuscanyServiceLoader.cpp (original)
+++ incubator/tuscany/cpp/sca/tools/TuscanyDriver/TuscanyServiceLoader.cpp Tue Sep 18 13:14:34
2007
@@ -139,7 +139,7 @@
         {
           std::cerr << "Tuscany Runtime Exception: " << tuscanyE.getMessageText()
<< std::endl;
         }
-        catch (const SDORuntimeException &sdoE)
+        catch (const commonj::sdo::SDORuntimeException &sdoE)
         {
           std::cerr << "SDO Runtime Exception: " << sdoE.getMessageText() <<
std::endl;
         }

Modified: incubator/tuscany/cpp/sca/tools/TuscanyDriver/build.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/TuscanyDriver/build.xml?rev=577039&r1=577038&r2=577039&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/tools/TuscanyDriver/build.xml (original)
+++ incubator/tuscany/cpp/sca/tools/TuscanyDriver/build.xml Tue Sep 18 13:14:34 2007
@@ -40,7 +40,7 @@
   <target name="clean" description="Remove the TuscanyServiceLoader installation">
     <sequential>
       <delete dir="${bin.dir}"/>
-      <delete file="${install.dir}/${tuscanyServiceLoader.app}"/>
+      <delete file="${install.dir}/${tuscanyServiceLoader.app}${exe.ext}"/>
     </sequential>
   </target>
 
@@ -65,7 +65,7 @@
 
   <target name="install">
     <cpp-install-file
-        srcfile="${tuscanyServiceLoader.app}"
+        srcfile="${tuscanyServiceLoader.app}${exe.ext}"
         srcdir="${bin.dir}"
         destdir="${install.dir}"/>
   </target>

Added: incubator/tuscany/cpp/sca/tools/ant_cpptasks/build.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/ant_cpptasks/build.xml?rev=577039&view=auto
==============================================================================
--- incubator/tuscany/cpp/sca/tools/ant_cpptasks/build.xml (added)
+++ incubator/tuscany/cpp/sca/tools/ant_cpptasks/build.xml Tue Sep 18 13:14:34 2007
@@ -0,0 +1,75 @@
+<?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="org.apache.tuscany.sca.cpp.antCompilers" default="all" basedir="../..">
+
+	<import file="${basedir}/antscripts/system.xml"/>
+	<import file="${basedir}/antscripts/compile-targets.xml"/>
+	
+	<target name="init">
+		<tstamp/>
+		<property name="this.dir"        location="${basedir}/tools/ant_cpptasks"/>
+		<property name="build.dir"       location="${this.dir}/build" />
+	  <property name="java.src.dir"    location="${this.dir}/tuscanyAntCompilers" />
+	  <property name="install.dir"     location="${basedir}/antscripts" />
+		<property name="class.name"       value="TuscanyMSVC8DevStudioCCompiler" />
+	</target>
+
+	<target name="all" depends="init,build,install"/>
+
+	<target name="build" depends="init" description="Build tuscany ant msvc 8.0 compiler
task">
+		<mkdir dir="${build.dir}" />
+
+		<!-- compile the source code -->
+		<javac srcdir="${java.src.dir}"
+			     destdir="${build.dir}"
+		       failonerror="true"
+           includeAntRuntime="no">
+		  <classpath>
+		    <pathelement path="${env.ANT_HOME}/lib/cpptasks.jar"/>
+		    <pathelement path="${env.ANT_HOME}/lib/ant.jar"/>
+		  </classpath>
+		</javac>
+	</target>
+
+  <target name="make.jar" depends="init,build">
+    <jar jarfile="${build.dir}/${class.name}.jar"
+         basedir="${build.dir}"
+         includes="tuscany/antCompilers/${class.name}.class">
+      <manifest>
+        <attribute name="Main-Class" value="tuscany.antCompilers.${class.name}" />
+      </manifest>
+    </jar>
+  </target>
+
+	<target name="install" depends="init,make.jar">
+    <mkdir dir="${install.dir}"/>
+    <copy todir="${install.dir}" overwrite='true'>
+      <fileset dir="${build.dir}" includes="${class.name}.jar"/>
+    </copy>
+  </target>
+	
+	<target name="clean" depends="init" description="Clean of all the files created.">
+		<delete dir="${build.dir}" quiet="true"/>
+    <delete file="${install.dir}/${class.name}.jar" quiet="true"/>
+	</target>
+
+</project>

Added: incubator/tuscany/cpp/sca/tools/ant_cpptasks/tuscanyAntCompilers/TuscanyMSVC8DevStudioCCompiler.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/ant_cpptasks/tuscanyAntCompilers/TuscanyMSVC8DevStudioCCompiler.java?rev=577039&view=auto
==============================================================================
--- incubator/tuscany/cpp/sca/tools/ant_cpptasks/tuscanyAntCompilers/TuscanyMSVC8DevStudioCCompiler.java
(added)
+++ incubator/tuscany/cpp/sca/tools/ant_cpptasks/tuscanyAntCompilers/TuscanyMSVC8DevStudioCCompiler.java
Tue Sep 18 13:14:34 2007
@@ -0,0 +1,224 @@
+/*
+ * 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.
+ */
+
+package tuscany.antCompilers;
+
+import java.io.File;
+import java.util.Vector;
+
+import net.sf.antcontrib.cpptasks.CUtil;
+import net.sf.antcontrib.cpptasks.OptimizationEnum;
+
+import net.sf.antcontrib.cpptasks.compiler.CommandLineCompilerConfiguration;
+import net.sf.antcontrib.cpptasks.compiler.CompilerConfiguration;
+import net.sf.antcontrib.cpptasks.compiler.Linker;
+import net.sf.antcontrib.cpptasks.compiler.LinkType;
+import net.sf.antcontrib.cpptasks.compiler.PrecompilingCommandLineCCompiler;
+import net.sf.antcontrib.cpptasks.compiler.Processor;
+
+import net.sf.antcontrib.cpptasks.devstudio.DevStudioProcessor;
+import net.sf.antcontrib.cpptasks.devstudio.DevStudioLinker;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.types.Environment;
+
+
+/**
+ * An abstract base class for compilers that are basically command line
+ * compatible with Microsoft(r) C/C++ Optimizing Compiler
+ * 
+ * This class was taken from cpptasks. Its a combination of the following 2 classes:
+ *     net.sf.antcontrib.cpptasks.devstudio.DevStudioCompatibleCCompiler
+ *     net.sf.antcontrib.cpptasks.devstudio.DevStudioCCompiler
+ *
+ * To compile MSVC8.0 in debug mode, the cpptasks msvc compiler doesnt distinguish
+ * between msvc 7.1 and 8.0 and seems to actually be 7.1 centric. This implementation
+ * For the Apache Tuscany project tries to address those issues. 
+ */
+
+public final class TuscanyMSVC8DevStudioCCompiler
+        extends PrecompilingCommandLineCCompiler
+{
+    private static String[] mflags_ = 
+    	new String[] {"/ML", "/MLd", null, null, "/MT", "/MTd", "/MD", "/MDd"};
+    //   first four are single-threaded
+    //      (runtime=static,debug=false), (..,debug=true),
+    //      (runtime=dynamic,debug=true), (..,debug=false), (not supported)
+    //    next four are multi-threaded, same sequence
+
+	  // Indeces into the mflags_ array 
+	private static int MINDEX_DEBUG           =  1;
+	private static int MINDEX_STATIC_RUNTIME  =  2;
+	private static int MINDEX_MULTI_THREADED  =  4;
+
+	private static final TuscanyMSVC8DevStudioCCompiler instance_ = 
+		new TuscanyMSVC8DevStudioCCompiler( "cl", false, null);
+
+    public static TuscanyMSVC8DevStudioCCompiler getInstance()
+    {
+        return instance_;
+    }
+
+    private TuscanyMSVC8DevStudioCCompiler(
+    		String command,
+    		boolean newEnvironment,
+            Environment env)
+    {
+        super(command, 
+              "/bogus",
+              new String[]{".c", ".cc", ".cpp", ".cxx", ".c++"},
+              new String[]{".h", ".hpp", ".inl"},
+              ".obj",
+              false,
+              null,
+              newEnvironment,
+              env);
+    }
+
+    public Processor changeEnvironment(boolean newEnvironment, Environment env)
+    {
+        if (newEnvironment || env != null) {
+            return new TuscanyMSVC8DevStudioCCompiler(getCommand(), newEnvironment, env);
+        }
+        return this;
+    }
+
+    public Linker getLinker(LinkType type)
+    {
+        return DevStudioLinker.getInstance().getLinker(type);
+    }
+
+    public int getMaximumCommandLength()
+    {
+        return 32767;
+    }
+
+    protected void addImpliedArgs(
+    		final Vector args,
+            final boolean debug,
+            final boolean multithreaded,
+            final boolean exceptions,
+            final LinkType linkType,
+            final Boolean rtti,
+            final OptimizationEnum optimization)
+    {
+        args.addElement("/c");
+        args.addElement("/nologo");
+        if (exceptions) {
+            //   changed to eliminate warning on VC 2005, should support VC 6 and later
+            //   use /GX to support VC5 - 2005 (with warning)
+            args.addElement("/EHsc");
+        }
+        int mindex = 0;
+        if (multithreaded) {
+            mindex += MINDEX_MULTI_THREADED;
+        }
+        boolean staticRuntime = linkType.isStaticRuntime();
+        if (!staticRuntime) {
+            mindex += MINDEX_STATIC_RUNTIME;
+        }
+
+        if (debug) {
+            mindex += MINDEX_DEBUG;
+            args.addElement("/Zi");        // Generates complete debugging information
+            args.addElement("/Od");        // Disables optimization
+            args.addElement("/RTC1");      // Enables run-time error checking as opposed
to depracated /GZ
+            args.addElement("/Gd");        // Uses the __cdecl calling convention (x86 only)
+            args.addElement("/D_DEBUG");   // Debug mode
+        } else {
+            args.addElement("/DNDEBUG");
+            if (optimization != null) {
+                if (optimization.isSize()) {
+                    args.addElement("/O1");
+                }
+
+                if (optimization.isSpeed()) {
+                    args.addElement("/O2");
+                }
+            }
+        }
+
+        String mflag = mflags_[mindex];
+        if (mflag == null) {
+            throw new BuildException(
+                    "multithread='false' and runtime='dynamic' not supported");
+        }
+        args.addElement(mflag);
+        if (rtti != null && rtti.booleanValue()) {
+                args.addElement("/GR");
+        }
+    }
+
+    protected void addWarningSwitch(Vector args, int level)
+    {
+        DevStudioProcessor.addWarningSwitch(args, level);
+    }
+
+    protected CompilerConfiguration createPrecompileGeneratingConfig(
+            CommandLineCompilerConfiguration baseConfig,
+            File prototype,
+            String lastInclude)
+    {
+        String[] additionalArgs = new String[]{
+                "/Fp" + CUtil.getBasename(prototype) + ".pch", "/Yc"};
+        return new
+            CommandLineCompilerConfiguration(
+        		baseConfig,
+        		additionalArgs,
+                null,
+                true);
+    }    
+
+    protected CompilerConfiguration createPrecompileUsingConfig(
+            CommandLineCompilerConfiguration baseConfig,
+            File prototype,
+            String lastInclude,
+            String[] exceptFiles)
+    {
+        String[] additionalArgs = new String[]{
+                "/Fp" + CUtil.getBasename(prototype) + ".pch",
+                "/Yu" + lastInclude};
+        return new
+            CommandLineCompilerConfiguration(
+        		baseConfig,
+        		additionalArgs,
+                exceptFiles,
+                false);
+    }
+
+    protected void getDefineSwitch(StringBuffer buffer, String define, String value)
+    {
+        DevStudioProcessor.getDefineSwitch(buffer, define, value);
+    }
+
+    protected File[] getEnvironmentIncludePath()
+    {
+        return CUtil.getPathFromEnvironment("INCLUDE", ";");
+    }
+
+    protected String getIncludeDirSwitch(String includeDir)
+    {
+        return DevStudioProcessor.getIncludeDirSwitch(includeDir);
+    }
+
+    protected void getUndefineSwitch(StringBuffer buffer, String define)
+    {
+        DevStudioProcessor.getUndefineSwitch(buffer, define);
+    }
+}



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


Mime
View raw message