Cleaning up SVN structure, moving das trunk to das-cpp/trunk.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@880626 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 397 insertions, 0 deletions

diff --git a/das-cpp/trunk/tools/ant_cpptasks/build.xml b/das-cpp/trunk/tools/ant_cpptasks/build.xml
new file mode 100644
index 0000000000..3810f056b6
--- /dev/null
+++ b/das-cpp/trunk/tools/ant_cpptasks/build.xml
@@ -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.das.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/das/${class.name}.class">

+      <manifest>

+        <attribute name="Main-Class" value="tuscany.antCompilers.das.${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>

diff --git a/das-cpp/trunk/tools/ant_cpptasks/tuscanyAntCompilers/TuscanyMSVC8DevStudioCCompiler.java b/das-cpp/trunk/tools/ant_cpptasks/tuscanyAntCompilers/TuscanyMSVC8DevStudioCCompiler.java
new file mode 100644
index 0000000000..61d2120237
--- /dev/null
+++ b/das-cpp/trunk/tools/ant_cpptasks/tuscanyAntCompilers/TuscanyMSVC8DevStudioCCompiler.java
@@ -0,0 +1,227 @@
+/*

+ * 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.das;

+

+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

+            

+		// Native DAS gets corrupted stack memory when /RTC1 argument is added

+		//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);

+    }

+}

diff --git a/das-cpp/trunk/tools/build.xml b/das-cpp/trunk/tools/build.xml
new file mode 100644
index 0000000000..2fd2064a2e
--- /dev/null
+++ b/das-cpp/trunk/tools/build.xml
@@ -0,0 +1,95 @@
+<?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="TuscanyDASNative_tools" default="all" basedir="..">

+

+  <!--

+    This is the root level ant build.xml file for TuscanyDAS Native tools

+    Nothing is actually performed here, it just delegates to subdirectory

+    build.xml files.

+  --> 

+    

+  <import file="${basedir}/antscripts/system.xml"/>

+  <import file="${basedir}/antscripts/compile-targets.xml"/>

+

+  <!--

+    Notice that the basedir for this project is set to the TuscanyDAS root dir

+    This makes path setting in system.xml much simpler, but we'll just have to

+    set a property here to this directory.

+  -->

+

+  <property name="this.dir"           location="${basedir}/tools"/>

+  <property name="ant_cpptasks.dir"   location="${this.dir}/ant_cpptasks"/>

+

+  <!--

+    Public targets

+  -->

+

+  <target name="all" description="Build and install all TuscanyDASNative tools">

+    <antcall target="build"/>

+    <antcall target="install"/>

+  </target>

+

+     <!--

+       Notice the ant_cpptasks tool is not included in the "all" target.

+       This is because its not something that should be built that often.

+       The resulting jar is included in TUSCANY_DAS_SRC_ROOT/antscripts svn

+     -->

+

+  <target name="build" description="Build all TuscanyDASNative tools">

+    <antcall target="build.ant_cpptasks"/>

+  </target>

+

+<target name="install" description="Install TuscanyDASNative tools">

+    <antcall target="install.ant_cpptasks"/>

+  </target>

+

+

+  <target name="clean" description="Clean all TuscanyDASNative tools">

+      <antcall target="clean.ant_cpptasks"/>

+  </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

+  -->

+

+    <!-- build -->

+

+  <target name="build.ant_cpptasks">

+    <ant target="build" antfile="${ant_cpptasks.dir}/build.xml" inheritAll="false"/>

+  </target>

+

+     <!-- install -->

+

+  <target name="install.ant_cpptasks">

+    <ant target="install" antfile="${ant_cpptasks.dir}/build.xml" inheritAll="false"/>

+  </target>

+

+ 

+    <!-- clean -->

+

+  <target name="clean.ant_cpptasks">

+    <ant target="clean" antfile="${ant_cpptasks.dir}/build.xml" inheritAll="false"/>

+  </target>

+

+

+</project>