tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From robbin...@apache.org
Subject svn commit: r414841 - in /incubator/tuscany/cpp/sca: Makefile.am build.sh configure.ac runtime/core/test/Makefile.am tools/scagen/build.xml
Date Fri, 16 Jun 2006 14:41:43 GMT
Author: robbinspg
Date: Fri Jun 16 07:41:43 2006
New Revision: 414841

URL: http://svn.apache.org/viewvc?rev=414841&view=rev
Log:
TUSCANY-458 Call scagen ant build from Makefile

Modified:
    incubator/tuscany/cpp/sca/Makefile.am
    incubator/tuscany/cpp/sca/build.sh
    incubator/tuscany/cpp/sca/configure.ac
    incubator/tuscany/cpp/sca/runtime/core/test/Makefile.am
    incubator/tuscany/cpp/sca/tools/scagen/build.xml

Modified: incubator/tuscany/cpp/sca/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/Makefile.am?rev=414841&r1=414840&r2=414841&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/Makefile.am (original)
+++ incubator/tuscany/cpp/sca/Makefile.am Fri Jun 16 07:41:43 2006
@@ -1,4 +1,4 @@
-SUBDIRS = runtime samples
+SUBDIRS = tools runtime samples
 datadir=$(prefix)
 
 data_DATA = INSTALL README LICENSE COPYING

Modified: incubator/tuscany/cpp/sca/build.sh
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/build.sh?rev=414841&r1=414840&r2=414841&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/build.sh (original)
+++ incubator/tuscany/cpp/sca/build.sh Fri Jun 16 07:41:43 2006
@@ -28,9 +28,6 @@
 fi
 echo "Using SDO installed at $TUSCANY_SDOCPP"
 
-# Build tools first as they will be used to generate cpp code
-cd $TUSCANY_SCACPP_HOME/tools/scagen
-ant
 chmod a+x $TUSCANY_SCACPP_HOME/deploy/bin/scagen.sh
 
 cd $TUSCANY_SCACPP_HOME

Modified: incubator/tuscany/cpp/sca/configure.ac
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/configure.ac?rev=414841&r1=414840&r2=414841&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/configure.ac (original)
+++ incubator/tuscany/cpp/sca/configure.ac Fri Jun 16 07:41:43 2006
@@ -35,6 +35,8 @@
 AC_CHECK_FUNCS([getcwd putenv strdup])
 
 AC_CONFIG_FILES([Makefile
+                 tools/Makefile
+                 tools/scagen/Makefile
                  runtime/Makefile
                  runtime/ws_reference/Makefile
                  runtime/ws_reference/axis2c/Makefile

Modified: incubator/tuscany/cpp/sca/runtime/core/test/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/test/Makefile.am?rev=414841&r1=414840&r2=414841&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/test/Makefile.am (original)
+++ incubator/tuscany/cpp/sca/runtime/core/test/Makefile.am Fri Jun 16 07:41:43 2006
@@ -8,7 +8,7 @@
 	cp ./MyValue/StockQuoteService.h ./testSCASystem/modules/MyValueServiceModule
 	cp ./CustomerInfo/CustomerInfo.h ./testSCASystem/modules/MyValueServiceModule
 	cp ./CustomerInfo/CustomerInfoImpl.h ./testSCASystem/modules/MyValueServiceModule
-	java -jar $(prefix)/bin/scagen.jar -dir testSCASystem/modules/MyValueServiceModule -output
tmp
+	java -jar $(top_builddir)/tools/scagen/bld/scagen.jar -dir testSCASystem/modules/MyValueServiceModule
-output tmp
 	cp tmp/CustomerInfoImpl*.* CustomerInfo
 	cp tmp/MyValueImpl*.* MyValue
 	

Modified: incubator/tuscany/cpp/sca/tools/scagen/build.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/scagen/build.xml?rev=414841&r1=414840&r2=414841&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/tools/scagen/build.xml (original)
+++ incubator/tuscany/cpp/sca/tools/scagen/build.xml Fri Jun 16 07:41:43 2006
@@ -11,7 +11,7 @@
 
     <!-- Add "test" to the depends list below to add auto-testing to the build -->
     <!-- a junit.jar is needed at ${junit.jar.folder}/junit.jar though         -->
-    <target name="all" depends="init,jars,doc,scripts,zip.all,tobin">
+    <target name="all" depends="init,jars,doc,scripts,zip.all">
     </target>
 
     <target name="test" depends="init,jars,test.jar">
@@ -105,7 +105,7 @@
 <delete dir="${temp.folder}/scagen.jar.bin" />
 </target>
 
-<target name="tobin" depends="jars" description="move the desired stuff to bin">
+<target name="tobin" depends="jars, scripts" description="move the desired stuff to bin">
     <move file="${build.result.folder}/scagen.cmd" todir="${bin.dir}" />
     <move file="${build.result.folder}/scagen.sh" todir="${bin.dir}" />
     <move file="${build.result.folder}/scagen.jar" todir="${bin.dir}" />



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