Author: adrianocrestani Date: Sun Nov 11 21:00:33 2007 New Revision: 594022
URL: http://svn.apache.org/viewvc?rev=594022&view=rev Log: -deleted the deprecated deploy.bat file -added test target on ant build system -added distribution target on ant build system -added pack.distribution on ant build system that packs the distribution files structure -updated README_ANT_INSTALL with the new ant build system functionalities Removed: incubator/tuscany/cpp/das/runtime/core/src/deploy.bat Modified: incubator/tuscany/cpp/das/README_ANT_INSTALL incubator/tuscany/cpp/das/VSExpress/tuscany_das/tuscany_das.suo incubator/tuscany/cpp/das/antscripts/TuscanyMSVC8DevStudioCCompiler.jar incubator/tuscany/cpp/das/antscripts/platform.properties incubator/tuscany/cpp/das/antscripts/system.xml incubator/tuscany/cpp/das/build.xml incubator/tuscany/cpp/das/runtime/test/build.xml incubator/tuscany/cpp/das/runtime/test/src/main.cpp incubator/tuscany/cpp/das/samples/CompanySample/VSExpress/CompanySample.suo incubator/tuscany/cpp/das/samples/CompanySample/build.xml incubator/tuscany/cpp/das/samples/CompanySample/src/main.cpp incubator/tuscany/cpp/das/samples/build.xml Modified: incubator/tuscany/cpp/das/README_ANT_INSTALL URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/das/README_ANT_INSTALL?rev=594022&r1=594021&r2=594022&view=diff ============================================================================== --- incubator/tuscany/cpp/das/README_ANT_INSTALL (original) +++ incubator/tuscany/cpp/das/README_ANT_INSTALL Sun Nov 11 21:00:33 2007 @@ -162,11 +162,14 @@ Main targets: - all build and install all TuscanyDASNative source code and documentation - build Build all TuscanyDASNative source code and documentation - clean Clean all TuscanyDASNative compiled source code - install Install TuscanyDASNative libraries and headers - test Run DAS tests, not implemented yet + all build and install all TuscanyDASNative source code and documentation + build Build all TuscanyDASNative source code and documentation + clean Clean all TuscanyDASNative compiled source code + samples Build and install all TuscanyDASNative samples + install Install TuscanyDASNative libraries and headers + test Build and run all tests + distribution Create a source and bin distribution structure + pack.distribution Pack the bin and source distribution into .zip and .tar.gz files. Also generates the .asc and .md5 files Default target: all @@ -197,16 +200,15 @@ check.sdo: -check.ws: - [echo] TuscanyDAS ws extension is not enabled - display.system: [echo] [echo] TuscanyDAS paths - [echo] tuscanyDAS.root.dir= C:\Adriano\College\Tuscany\cpp\DAS - [echo] tuscanyDAS.root.src.dir= ${tuscanyDAs.root.src.dir} - [echo] tuscanyDAS.install.dir= C:\Adriano\College\Tuscany\CPP\DAS\deploy - [echo] tuscanyDAS.library.version= '' + [echo] tuscanyDAS.root.dir= /home/Adriano/Tuscany/cpp/das + [echo] tuscanyDAS.root.src.dir= /home/Adriano/Tuscany/cpp/das/runtime + [echo] tuscanyDAS.install.dir= /home/Adriano/Tuscany/cpp/das/deploy + [echo] tuscanyDAS.library.version= '' + [echo] tuscanyDAS.release.file.name= 'tuscany_das_cpp-1.0-incubator-M4-' + [echo] [echo] TuscanyDAS compiler configuration [echo] compiler.name= 'msvc8' @@ -220,7 +222,7 @@ [echo] external.definitions.file= '' [echo] [echo] sdo location - [echo] tuscany.sdo.home.dir= C:\Adriano\College\Tuscany\CPP\SDO\deploy + [echo] tuscany.sdo.home.dir= /home/Adriano/Tuscany/cpp/sdo/deploy [echo] BUILD SUCCESSFUL Modified: incubator/tuscany/cpp/das/VSExpress/tuscany_das/tuscany_das.suo URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/das/VSExpress/tuscany_das/tuscany_das.suo?rev=594022&r1=594021&r2=594022&view=diff ============================================================================== Binary files - no diff available. Modified: incubator/tuscany/cpp/das/antscripts/TuscanyMSVC8DevStudioCCompiler.jar URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/das/antscripts/TuscanyMSVC8DevStudioCCompiler.jar?rev=594022&r1=594021&r2=594022&view=diff ============================================================================== Binary files - no diff available. Modified: incubator/tuscany/cpp/das/antscripts/platform.properties URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/das/antscripts/platform.properties?rev=594022&r1=594021&r2=594022&view=diff ============================================================================== --- incubator/tuscany/cpp/das/antscripts/platform.properties (original) +++ incubator/tuscany/cpp/das/antscripts/platform.properties Sun Nov 11 21:00:33 2007 @@ -26,6 +26,7 @@ platform.tuscanyDAS.root.dir= platform.tuscanyDAS.install.dir= +platform.tuscanyDAS.release.file.name= platform.axis2c.home.dir= platform.libxml2.lib.dir= Modified: incubator/tuscany/cpp/das/antscripts/system.xml URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/das/antscripts/system.xml?rev=594022&r1=594021&r2=594022&view=diff ============================================================================== --- incubator/tuscany/cpp/das/antscripts/system.xml (original) +++ incubator/tuscany/cpp/das/antscripts/system.xml Sun Nov 11 21:00:33 2007 @@ -96,33 +96,25 @@ </else> </if> - <!-- - Configure ${enable_ws} and ${axis2c.home.dir}, which is needed to compile the ws extension +<!-- + Configure tuscanyDAS.release.file.name that defines the generated packed file used on releases Take the override value from platform.properties if set - Else take it from the env var AXIS2C_HOME + Else use as default "tuscany_das_cpp" name --> - <target name="check.ws" depends="check.sdo"> - <if> - <and> - <isset property="platform.axis2c.home.dir"/> - <length string="${platform.axis2c.home.dir}" when="greater" length="0" trim="true"/> + <if> + <and> + <isset property="platform.tuscanyDAS.release.file.name"/> + <length string="${platform.tuscanyDAS.release.file.name}" when="greater" length="0" trim="true"/> </and> <then> - <property name="enable_ws" value="true"/> - <property name="axis2c.home.dir" location="${platform.axis2c.home.dir}"/> + <property name="tuscanyDAS.release.file.name" value="${platform.tuscanyDAS.release.file.name}"/> </then> - <elseif> - <isset property="env.AXIS2C_HOME"/> - <then> - <property name="enable_ws" value="true"/> - <property name="axis2c.home.dir" location="${env.AXIS2C_HOME}"/> - </then> - </elseif> - <else> - <echo message="TuscanyDAS ws extension is not enabled" level="warning"/> - </else> - </if> - </target> + <else> + <property name="tuscanyDAS.release.file.name" value="tuscany_das_cpp"/> + </else> + </if> + + <!-- Configure ${enable_sdo} and ${axis2c.home.dir}, which is needed to compile the ws extension @@ -471,15 +463,16 @@ </if> <property name="external.definitions.file" value=""/> - <target name="display.system" depends="check.ws,check.sdo"> + <target name="display.system" depends="check.sdo"> <!-- Tuscany paths, etc --> <echo message=" "/> <echo message="TuscanyDAS paths"/> - <echo message=" tuscanyDAS.root.dir= ${tuscanyDAS.root.dir}"/> - <echo message=" tuscanyDAS.root.src.dir= ${tuscanyDAs.root.src.dir}"/> - <echo message=" tuscanyDAS.install.dir= ${tuscanyDAS.install.dir}"/> - <echo message=" tuscanyDAS.library.version= '${tuscanyDAS.library.version}'"/> + <echo message=" tuscanyDAS.root.dir= ${tuscanyDAS.root.dir}"/> + <echo message=" tuscanyDAS.root.src.dir= ${tuscanyDAS.root.src.dir}"/> + <echo message=" tuscanyDAS.install.dir= ${tuscanyDAS.install.dir}"/> + <echo message=" tuscanyDAS.library.version= '${tuscanyDAS.library.version}'"/> + <echo message=" tuscanyDAS.release.file.name= '${tuscanyDAS.release.file.name}'"/> <!-- compilers, libs, etc --> <echo message=" "/> Modified: incubator/tuscany/cpp/das/build.xml URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/das/build.xml?rev=594022&r1=594021&r2=594022&view=diff ============================================================================== --- incubator/tuscany/cpp/das/build.xml (original) +++ incubator/tuscany/cpp/das/build.xml Sun Nov 11 21:00:33 2007 @@ -19,9 +19,13 @@ --> <project name="TuscanyDASNative" default="all" basedir="."> -<property name="test.dir" location="runtime/test"/> -<property name="samples.dir" location="samples"/> -<property name="tools.dir" location="tools"/> +<property name="test.dir" location="runtime/test"/> +<property name="distribution.dir" location="distribution"/> +<property name="pack.dir" location="${distribution.dir}"/> +<property name="distribution.bin.dir" location="${distribution.dir}/bin"/> +<property name="distribution.src.dir" location="${distribution.dir}/src"/> +<property name="samples.dir" location="samples"/> +<property name="tools.dir" location="tools"/> <!-- This is the root level ant build.xml file for TuscanyDAS Native @@ -47,6 +51,75 @@ <antcall target="build.das"/> </target> + <target name="pack.distribution" description="Build all TuscanyDASNative source code and documentation"> + <delete quiet="true" file="${pack.dir}/${tuscanyDAS.release.file.name}bin.zip"/> + <delete quiet="true" file="${pack.dir}/${tuscanyDAS.release.file.name}src.zip"/> + <delete quiet="true" file="${pack.dir}/${tuscanyDAS.release.file.name}bin.tar.gz"/> + <delete quiet="true" file="${pack.dir}/${tuscanyDAS.release.file.name}src.tar.gz"/> + <delete quiet="true" file="${pack.dir}/${tuscanyDAS.release.file.name}bin.zip.md5"/> + <delete quiet="true" file="${pack.dir}/${tuscanyDAS.release.file.name}src.zip.md5"/> + <delete quiet="true" file="${pack.dir}/${tuscanyDAS.release.file.name}bin.tar.gz.md5"/> + <delete quiet="true" file="${pack.dir}/${tuscanyDAS.release.file.name}src.tar.gz.md5"/> + <delete quiet="true" file="${pack.dir}/${tuscanyDAS.release.file.name}bin.zip.asc"/> + <delete quiet="true" file="${pack.dir}/${tuscanyDAS.release.file.name}src.zip.asc"/> + <delete quiet="true" file="${pack.dir}/${tuscanyDAS.release.file.name}bin.tar.gz.asc"/> + <delete quiet="true" file="${pack.dir}/${tuscanyDAS.release.file.name}src.tar.gz.asc"/> + <delete quiet="true" dir="${pack.dir}/${tuscanyDAS.release.file.name}bin"/> + <delete quiet="true" dir="${pack.dir}/${tuscanyDAS.release.file.name}src"/> + + <!--Packs the bin distribution--> + <mkdir dir="${pack.dir}/${tuscanyDAS.release.file.name}bin"/> + <copy todir="${pack.dir}/${tuscanyDAS.release.file.name}bin"> + <fileset dir="${distribution.bin.dir}" includes="**"/> + </copy> + + <zip destfile="${pack.dir}/${tuscanyDAS.release.file.name}bin.zip" level="9"> + <fileset dir="${pack.dir}" includes="${tuscanyDAS.release.file.name}bin/"/> + </zip> + + <tar destfile="${pack.dir}/${tuscanyDAS.release.file.name}bin.tar.gz" compression="gzip" longfile="gnu"> + <fileset dir="${pack.dir}" includes="${tuscanyDAS.release.file.name}bin/"/> + </tar> + + <delete quiet="true" dir="${pack.dir}/${tuscanyDAS.release.file.name}bin"/> + + <!--Packs the src distribution--> + <mkdir dir="${pack.dir}/${tuscanyDAS.release.file.name}src"/> + <copy todir="${pack.dir}/${tuscanyDAS.release.file.name}src"> + <fileset dir="${distribution.src.dir}" includes="**"/> + </copy> + + <zip destfile="${pack.dir}/${tuscanyDAS.release.file.name}src.zip" level="9"> + <fileset dir="${pack.dir}" includes="${tuscanyDAS.release.file.name}src/"/> + </zip> + + <tar destfile="${pack.dir}/${tuscanyDAS.release.file.name}src.tar.gz" compression="gzip" longfile="gnu"> + <fileset dir="${pack.dir}" includes="${tuscanyDAS.release.file.name}src/"/> + </tar> + + <delete quiet="true" dir="${pack.dir}/${tuscanyDAS.release.file.name}src"/> + + <!--Generate the checksum files--> + <checksum file="${pack.dir}/${tuscanyDAS.release.file.name}bin.zip" fileext=".md5"/> + <checksum file="${pack.dir}/${tuscanyDAS.release.file.name}src.zip" fileext=".md5"/> + <checksum file="${pack.dir}/${tuscanyDAS.release.file.name}bin.tar.gz" fileext=".md5"/> + <checksum file="${pack.dir}/${tuscanyDAS.release.file.name}src.tar.gz" fileext=".md5"/> + <checksum file="${pack.dir}/${tuscanyDAS.release.file.name}bin.zip" algorithm="SHA" fileext=".asc"/> + <checksum file="${pack.dir}/${tuscanyDAS.release.file.name}src.zip" algorithm="SHA" fileext=".asc"/> + <checksum file="${pack.dir}/${tuscanyDAS.release.file.name}bin.tar.gz" algorithm="SHA" fileext=".asc"/> + <checksum file="${pack.dir}/${tuscanyDAS.release.file.name}src.tar.gz" algorithm="SHA" fileext=".asc"/> + + + </target> + + <target name="test" description="Run DAS tests"> + <ant target="all" antfile="${test.dir}/build.xml" inheritAll="false"/> + </target> + + <target name="distribution" description="Generate all TuscanyDASNative distribution structure"> + <antcall target="distribution.das"/> + </target> + <target name="install" description="Install TuscanyDASNative libraries and headers"> <antcall target="install.das"/> <!--antcall target="install.docs"/--> @@ -54,7 +127,9 @@ <target name="clean" description="Clean all TuscanyDASNative compiled source code"> <antcall target="clean.das"/> - <antcall target="clean.tests"/> + <antcall target="clean.test"/> + <antcall target="clean.samples"/> + <delete dir="deploy" quiet="true"/> </target> <target name="tools" description="Build and Install all TuscanyDASNative tools"> @@ -92,6 +167,40 @@ <ant target="install" antfile="${runtime.das.dir}/build.xml" inheritAll="false"/> </target> + <target name="distribution.das"> + <delete dir="${distribution.dir}" quiet="true"/> + <antcall target="clean"/> + + <!-- Create source distribution --> + <copy + overwrite="true" + todir="${distribution.src.dir}"> + <fileset dir="." excludes="deploy/ distribution/ **/VSExpress/"/> + </copy> + + <antcall target="tools"/> + <antcall target="all"/> + <antcall target="samples"/> + + <!-- Create bin distribution --> + <copy + overwrite="true" + todir="${distribution.bin.dir}"> + <fileset dir="${tuscanyDAS.install.dir}"/> + </copy> + <copy + overwrite="true" + todir="${distribution.dir}/bin/antscripts"> + <fileset dir="antscripts"/> + </copy> + + <ant target="distribution" antfile="${samples.dir}/build.xml"/> + + <delete includeemptydirs="true"> + <fileset dir="${distribution.dir}" includes="**/VSExpress"/> + </delete> + + </target> <target name="clean.das"> <ant target="clean" antfile="${runtime.das.dir}/build.xml" inheritAll="false"/> @@ -101,7 +210,7 @@ <ant target="clean" antfile="${tools.dir}/build.xml" inheritAll="false"/> </target> -<target name="clean.tests"> +<target name="clean.test"> <ant target="clean" antfile="${test.dir}/build.xml" inheritAll="false"/> </target> Modified: incubator/tuscany/cpp/das/runtime/test/build.xml URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/das/runtime/test/build.xml?rev=594022&r1=594021&r2=594022&view=diff ============================================================================== --- incubator/tuscany/cpp/das/runtime/test/build.xml (original) +++ incubator/tuscany/cpp/das/runtime/test/build.xml Sun Nov 11 21:00:33 2007 @@ -17,7 +17,7 @@ specific language governing permissions and limitations under the License. --> -<project name="TuscanyDASNative_tests" default="all" basedir="../.."> +<project name="TuscanyDASNative_test" default="all" basedir="../.."> <import file="${basedir}/antscripts/system.xml"/> <import file="${basedir}/antscripts/compile-targets.xml"/> @@ -27,63 +27,28 @@ This makes path setting in system.xml much simpler, but we'll just have to set a property here to this directory. --> - - <target name="init"> - <tstamp/> - <property name="this.dir" location="${basedir}/runtime/test"/> - <property name="test.dir" location="${this.dir}/build"/> - <property name="test.src.dir" location="${this.dir}/src/"/> - <property name="test.build.dir" location="${test.dir}/build"/> - <property name="test.install.dir" - location="${tuscanyDAS.install.dir}/test"/> - </target> + <property name="this.dir" location="${basedir}/runtime/test"/> + <property name="das.test.src.dir" location="${this.dir}/src"/> + <property name="das.test.build.dir" location="${this.dir}/build"/> + <property name="das.test.app" value="das_test"/> <!-- Public targets --> - <target name="all" - description="build and install the TuscanyDASNative test"> + <target name="all" description="compile, link, and run TuscanyDASNative test suite"> <antcall target="build"/> - <antcall target="install"/> + <antcall target="run"/> </target> - <target name="build" - description="build the TuscanyDASNative test"> - <antcall target="build.test"/> - </target> - - <target name="install" - description="Install the TuscanyDASNative test"> - <antcall target="install.test"/> - </target> - - <target name="clean" - description="Clean the TuscanyDASNative test"> - <antcall target="clean.test"/> - <delete dir="${test.install.dir}" quiet="true"/> - </target> - - <!-- - Internal targets - They can still be called, they're just not described, so wont show up in "ant -p" - --> - - <!-- build --> - - <target name="build.test" depends="init,check.sdo"> - <mkdir dir="${test.build.dir}"/> - - <copy todir="${test.build.dir}"> - <fileset dir="${test.dir}" includes="*.cpp"/> - </copy> - <!-- build the library --> + <target name="build" description="compile and link TuscanyDASNative test suite" depends="check.sdo"> <cpp-build - srcdir="${test.src.dir}" + srcdir="${das.test.src.dir}" infiles="*.cpp" - outdir="${test.build.dir}/.libs" - outtype="executable" - outfile="das_test"> + outdir="${das.test.build.dir}" + outfile="${das.test.app}" + outtype="executable"> <custom-build-elements> + <includepath path="${tuscanyDAS.install.dir}/include"/> <includepath path="${tuscany.sdo.home.dir}/include"/> @@ -93,32 +58,16 @@ </custom-build-elements> </cpp-build> + + </target> + + <target name="run" depends="build" description="Run TuscanyDASNative test suite"> + <exec executable="${das.test.build.dir}/${das.test.app}${exe.ext}" dir="${das.test.build.dir}"/> </target> - - <!-- install --> + <target name="clean" description="Clean TuscanyDASNative test suite"> + <delete dir="${das.test.build.dir}" quiet="@{quiet}"/> - <target name="install.test" depends="init"> - <cpp-install-files - files="*.exe*" - srcdir="${test.dir}/build/.libs/" - destdir="${test.install.dir}"/> - - <cpp-install-files - files="*.xml" - srcdir="${this.dir}/rsc" - destdir="${test.install.dir}/rsc"/> - - - - - </target> - - <!-- clean --> - - <target name="clean.test" depends="init"> - <delete dir="${test.build.dir}" quiet="true"/> - <delete dir="${test.install.dir}/test" quiet="true"/> </target> </project> Modified: incubator/tuscany/cpp/das/runtime/test/src/main.cpp URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/das/runtime/test/src/main.cpp?rev=594022&r1=594021&r2=594022&view=diff ============================================================================== --- incubator/tuscany/cpp/das/runtime/test/src/main.cpp (original) +++ incubator/tuscany/cpp/das/runtime/test/src/main.cpp Sun Nov 11 21:00:33 2007 @@ -34,7 +34,7 @@ #include <commonj/sdo/SDORuntimeException.h> #include <commonj/sdo/DataFactory.h> -#define TEST_RESOURCE_PATH "rsc/" +#define TEST_RESOURCE_PATH "../rsc/" using namespace std; using namespace apache::das; @@ -70,15 +70,6 @@ }; Connection* getConnection() { - char* tuscanyDASCPPPath = getenv("TUSCANY_DASCPP"); - - if (tuscanyDASCPPPath == 0) { - cout << "environment variable TUSCANY_DASCPP not set!" << endl; - system("PAUSE"); - exit(1); - - } - Connection* conn; try { Modified: incubator/tuscany/cpp/das/samples/CompanySample/VSExpress/CompanySample.suo URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/das/samples/CompanySample/VSExpress/CompanySample.suo?rev=594022&r1=594021&r2=594022&view=diff ============================================================================== Binary files - no diff available. Modified: incubator/tuscany/cpp/das/samples/CompanySample/build.xml URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/das/samples/CompanySample/build.xml?rev=594022&r1=594021&r2=594022&view=diff ============================================================================== --- incubator/tuscany/cpp/das/samples/CompanySample/build.xml (original) +++ incubator/tuscany/cpp/das/samples/CompanySample/build.xml Sun Nov 11 21:00:33 2007 @@ -35,7 +35,9 @@ <property name="sample.CompanySample.src.dir" location="${this.dir}/src/"/> <property name="sample.CompanySample.build.dir" location="${sample.CompanySample.dir}/build"/> <property name="CompanySample.install.dir" - location="${tuscanyDAS.install.dir}/samples/CompanySample"/> + location="${tuscanyDAS.install.dir}/samples/CompanySample/bin"/> + + </target> <!-- @@ -60,7 +62,12 @@ <target name="clean" description="Clean the TuscanyDASNative CompanySample sample"> <antcall target="clean.sample.CompanySample"/> - <delete dir="${CompanySample.install.dir}" quiet="true"/> + + </target> + + <target name="distribution" description="Generate the necessary distribution files of Company +Sample and copy it to the distribution dir"> + <antcall target="sample.CompanySample.distribution"/> </target> <!-- @@ -100,23 +107,28 @@ <!-- install --> <target name="install.sample.CompanySample" depends="init"> -<echo message="sample.dir = ${sample.CompanySample.dir}"/> <cpp-install-files files="*.exe*" srcdir="${sample.CompanySample.dir}/build/.libs/" destdir="${CompanySample.install.dir}"/> - - - + <copy todir="${CompanySample.install.dir}/../rsc" overwrite="true"> + <fileset dir="${this.dir}/rsc/"/> + </copy> </target> <!-- clean --> <target name="clean.sample.CompanySample" depends="init"> - <delete dir="${sample.CompanySample.build.dir}" quiet="true"/> - <delete dir="${CompanySample.install.dir}/sample.CompanySample" quiet="true"/> + <delete dir="${sample.CompanySample.dir}" quiet="true"/> </target> + <target name="sample.CompanySample.distribution"> + <copy todir="${distribution.bin.dir}/samples/CompanySample" overwrite="true"> + <fileset dir="${this.dir}/CompanySample" excludes="build/ rsc/ VSExpress/"/> + </copy> + + + </target> </project> Modified: incubator/tuscany/cpp/das/samples/CompanySample/src/main.cpp URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/das/samples/CompanySample/src/main.cpp?rev=594022&r1=594021&r2=594022&view=diff ============================================================================== --- incubator/tuscany/cpp/das/samples/CompanySample/src/main.cpp (original) +++ incubator/tuscany/cpp/das/samples/CompanySample/src/main.cpp Sun Nov 11 21:00:33 2007 @@ -19,6 +19,7 @@ #include <string> #include <iostream> +#include <direct.h> // including DAS headers #include <apache/das/rdb/Connection.h> @@ -109,19 +110,8 @@ } void main() { + ConfigImpl config("../rsc/sampleConfig.xml"); - // Get the value of environment variable TUSCANY_DASCPP that must define the DAS deploy path - char* tuscanyDASCPPPath = getenv("TUSCANY_DASCPP"); - - if (tuscanyDASCPPPath == 0) { - cout << "environment variable TUSCANY_DASCPP not set!" << endl; - system("PAUSE"); - exit(1); - - } - - ConfigImpl config((std::string) tuscanyDASCPPPath + "/../samples/CompanySample/rsc/sampleConfig.xml"); - // Get a connection Connection* connection = getConnection(); Modified: incubator/tuscany/cpp/das/samples/build.xml URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/das/samples/build.xml?rev=594022&r1=594021&r2=594022&view=diff ============================================================================== --- incubator/tuscany/cpp/das/samples/build.xml (original) +++ incubator/tuscany/cpp/das/samples/build.xml Sun Nov 11 21:00:33 2007 @@ -61,4 +61,8 @@ <ant target="clean" antfile="${CompanySample.dir}/build.xml" inheritAll="false"/> </target> + <target name="distribution" description="Generate the necessary distribution files of all samples and copy it to the distribution dir"> + <ant target="distribution" antfile="${CompanySample.dir}/build.xml"/> + </target> + </project> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
