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 2006/02/15 15:57:34 UTC

svn commit: r378013 - in /incubator/tuscany/cpp/sca: ./ runtime/core/ runtime/core/test/ runtime/core/test/CustomerInfo/ runtime/core/test/CustomerInfo/Debug/ runtime/core/test/CustomerInfo/Release/ runtime/core/test/MyValue/ runtime/core/test/MyValue/...

Author: robbinspg
Date: Wed Feb 15 06:57:32 2006
New Revision: 378013

URL: http://svn.apache.org/viewcvs?rev=378013&view=rev
Log:
SCA test build

Added:
    incubator/tuscany/cpp/sca/runtime/core/test/CustomerInfo/Makefile.am   (with props)
    incubator/tuscany/cpp/sca/runtime/core/test/Makefile.am   (with props)
    incubator/tuscany/cpp/sca/runtime/core/test/MyValue/Makefile.am   (with props)
    incubator/tuscany/cpp/sca/runtime/core/test/src/Makefile.am   (with props)
Removed:
    incubator/tuscany/cpp/sca/runtime/core/test/CustomerInfo/Debug/
    incubator/tuscany/cpp/sca/runtime/core/test/CustomerInfo/Release/
    incubator/tuscany/cpp/sca/runtime/core/test/MyValue/Debug/
    incubator/tuscany/cpp/sca/runtime/core/test/MyValue/Release/
    incubator/tuscany/cpp/sca/runtime/core/test/src/Debug/
    incubator/tuscany/cpp/sca/runtime/core/test/src/Release/
Modified:
    incubator/tuscany/cpp/sca/build.sh
    incubator/tuscany/cpp/sca/configure.ac
    incubator/tuscany/cpp/sca/runtime/core/Makefile.am
    incubator/tuscany/cpp/sca/scatest.sh

Modified: incubator/tuscany/cpp/sca/build.sh
URL: http://svn.apache.org/viewcvs/incubator/tuscany/cpp/sca/build.sh?rev=378013&r1=378012&r2=378013&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/build.sh (original)
+++ incubator/tuscany/cpp/sca/build.sh Wed Feb 15 06:57:32 2006
@@ -14,12 +14,15 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-./autogen.sh
 TUSCANY_SCACPP_HOME=`pwd`
-./configure --prefix=${TUSCANY_SCACPP_HOME}
-make
-make install
 
+# 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/bin/scagen.sh
+
+cd $TUSCANY_SCACPP_HOME
+./autogen.sh
+./configure --prefix=${TUSCANY_SCACPP_HOME}
+make
+make install

Modified: incubator/tuscany/cpp/sca/configure.ac
URL: http://svn.apache.org/viewcvs/incubator/tuscany/cpp/sca/configure.ac?rev=378013&r1=378012&r2=378013&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/configure.ac (original)
+++ incubator/tuscany/cpp/sca/configure.ac Wed Feb 15 06:57:32 2006
@@ -42,6 +42,10 @@
                  runtime/axis_binding/handler/src/Makefile
                  runtime/axis_binding/wrapper/Makefile
                  runtime/axis_binding/wrapper/src/Makefile
+                 runtime/core/test/Makefile
+                 runtime/core/test/CustomerInfo/Makefile
+                 runtime/core/test/MyValue/Makefile
+                 runtime/core/test/src/Makefile
                  ])
 AC_OUTPUT
 

Modified: incubator/tuscany/cpp/sca/runtime/core/Makefile.am
URL: http://svn.apache.org/viewcvs/incubator/tuscany/cpp/sca/runtime/core/Makefile.am?rev=378013&r1=378012&r2=378013&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/Makefile.am (original)
+++ incubator/tuscany/cpp/sca/runtime/core/Makefile.am Wed Feb 15 06:57:32 2006
@@ -1 +1 @@
-SUBDIRS = src
+SUBDIRS = src test

Added: incubator/tuscany/cpp/sca/runtime/core/test/CustomerInfo/Makefile.am
URL: http://svn.apache.org/viewcvs/incubator/tuscany/cpp/sca/runtime/core/test/CustomerInfo/Makefile.am?rev=378013&view=auto
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/test/CustomerInfo/Makefile.am (added)
+++ incubator/tuscany/cpp/sca/runtime/core/test/CustomerInfo/Makefile.am Wed Feb 15 06:57:32 2006
@@ -0,0 +1,14 @@
+lib_LTLIBRARIES = libCustomerInfo.la
+
+libCustomerInfo_la_SOURCES = \
+CustomerInfoImpl.cpp \
+CustomerInfoImpl_CustomerInfoService_Proxy.cpp \
+CustomerInfoImpl_CustomerInfoService_Wrapper.cpp
+
+libCustomerInfo_la_LIBADD =
+
+INCLUDES = -I$(top_builddir)/runtime/core/src \
+           -I${TUSCANY_SDOCPP}/include \
+           -I${AXISCPP_DEPLOY}/include
+                      
+install:
\ No newline at end of file

Propchange: incubator/tuscany/cpp/sca/runtime/core/test/CustomerInfo/Makefile.am
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/tuscany/cpp/sca/runtime/core/test/Makefile.am
URL: http://svn.apache.org/viewcvs/incubator/tuscany/cpp/sca/runtime/core/test/Makefile.am?rev=378013&view=auto
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/test/Makefile.am (added)
+++ incubator/tuscany/cpp/sca/runtime/core/test/Makefile.am Wed Feb 15 06:57:32 2006
@@ -0,0 +1,20 @@
+SUBDIRS = CustomerInfo MyValue src
+
+BUILT_SOURCES = scagen
+
+scagen:
+	cp ./MyValue/MyValue.h ./testSCASystem/modules/MyValueServiceModule
+	cp ./MyValue/MyValueImpl.h ./testSCASystem/modules/MyValueServiceModule
+	cp ./MyValue/StockQuoteService.h ./testSCASystem/modules/MyValueServiceModule
+	cp ./CustomerInfo/CustomerInfo.h ./testSCASystem/modules/MyValueServiceModule
+	cp ./CustomerInfo/CustomerInfoImpl.h ./testSCASystem/modules/MyValueServiceModule
+	cd $(top_builddir)/bin && \
+	./scagen.sh -dir ../runtime/core/test/testSCASystem/modules/MyValueServiceModule -output ../runtime/core/test/tmp
+	cp tmp/CustomerInfoImpl*.* CustomerInfo
+	cp tmp/MyValueImpl*.* MyValue
+	
+                   
+install-exec-local:
+	cp CustomerInfo/.libs/libCustomerInfo.so testSCASystem/modules/MyValueServiceModule
+	cp MyValue/.libs/libMyValue.so testSCASystem/modules/MyValueServiceModule
+	
\ No newline at end of file

Propchange: incubator/tuscany/cpp/sca/runtime/core/test/Makefile.am
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/tuscany/cpp/sca/runtime/core/test/MyValue/Makefile.am
URL: http://svn.apache.org/viewcvs/incubator/tuscany/cpp/sca/runtime/core/test/MyValue/Makefile.am?rev=378013&view=auto
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/test/MyValue/Makefile.am (added)
+++ incubator/tuscany/cpp/sca/runtime/core/test/MyValue/Makefile.am Wed Feb 15 06:57:32 2006
@@ -0,0 +1,17 @@
+lib_LTLIBRARIES = libMyValue.la
+
+libMyValue_la_SOURCES = \
+MyValueImpl.cpp \
+MyValueImpl_customerInfo_Proxy.cpp \
+MyValueImpl_MyValueService_Proxy.cpp \
+MyValueImpl_MyValueService_Wrapper.cpp \
+MyValueImpl_stockQuote_Proxy.cpp
+
+libMyValue_la_LIBADD =
+
+INCLUDES = -I$(top_builddir)/runtime/core/src \
+           -I${TUSCANY_SDOCPP}/include \
+           -I${AXISCPP_DEPLOY}/include \
+           -I../CustomerInfo
+                   
+install:
\ No newline at end of file

Propchange: incubator/tuscany/cpp/sca/runtime/core/test/MyValue/Makefile.am
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/tuscany/cpp/sca/runtime/core/test/src/Makefile.am
URL: http://svn.apache.org/viewcvs/incubator/tuscany/cpp/sca/runtime/core/test/src/Makefile.am?rev=378013&view=auto
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/test/src/Makefile.am (added)
+++ incubator/tuscany/cpp/sca/runtime/core/test/src/Makefile.am Wed Feb 15 06:57:32 2006
@@ -0,0 +1,13 @@
+prgbindir=$(prefix)/bin/test
+prgbin_PROGRAMS = tuscany_sca_test
+SUBDIRS =
+AM_CPPFLAGS = $(CPPFLAGS)
+tuscany_sca_test_SOURCES = TestSCA.cpp
+
+tuscany_sca_test_LDADD   =  -L$(top_builddir)/runtime/core/src -ltuscany_sca \
+	-L${TUSCANY_SDOCPP}/lib -ltuscany_sca -lxml2 -lstdc++ \
+	-L${AXISCPP_DEPLOY}/lib -laxis_client -laxis_clientC
+
+INCLUDES = -I$(top_builddir)/runtime/core/test/MyValue \
+            -I$(top_builddir)/runtime/core/src \
+            -I${TUSCANY_SDOCPP}/include

Propchange: incubator/tuscany/cpp/sca/runtime/core/test/src/Makefile.am
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/tuscany/cpp/sca/scatest.sh
URL: http://svn.apache.org/viewcvs/incubator/tuscany/cpp/sca/scatest.sh?rev=378013&r1=378012&r2=378013&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/scatest.sh (original)
+++ incubator/tuscany/cpp/sca/scatest.sh Wed Feb 15 06:57:32 2006
@@ -43,34 +43,10 @@
 
 TEST_ROOT=$SCA4CPP_HOME/runtime/core/test
 
-cp $TEST_ROOT/MyValue/MyValue.h $TEST_ROOT/testSCASystem/modules/MyValueServiceModule
-cp $TEST_ROOT/MyValue/MyValueImpl.h $TEST_ROOT/testSCASystem/modules/MyValueServiceModule
-cp $TEST_ROOT/MyValue/StockQuoteService.h $TEST_ROOT/testSCASystem/modules/MyValueServiceModule
-cp $TEST_ROOT/CustomerInfo/CustomerInfo.h $TEST_ROOT/testSCASystem/modules/MyValueServiceModule
-cp $TEST_ROOT/CustomerInfo/CustomerInfoImpl.h $TEST_ROOT/testSCASystem/modules/MyValueServiceModule
-
-cd $SCA4CPP/bin
-./scagen.sh -dir $TEST_ROOT/testSCASystem/modules/MyValueServiceModule -output $TEST_ROOT/tmp
-cp $TEST_ROOT/tmp/MyValueImpl*.* $TEST_ROOT/MyValue
-cp $TEST_ROOT/tmp/CustomerInfoImpl*.* $TEST_ROOT/CustomerInfo
-
-cd $TEST_ROOT/CustomerInfo/Debug
-make clean
-make
-cd $TEST_ROOT/MyValue/Debug
-make clean
-make
-cd $TEST_ROOT/src/Debug
-make clean
-make
-
-cp $TEST_ROOT/MyValue/Debug/libMyValue.so $TEST_ROOT/testSCASystem/modules/MyValueServiceModule
-cp $TEST_ROOT/CustomerInfo/Debug/libCustomerInfo.so $TEST_ROOT/testSCASystem/modules/MyValueServiceModule
-
 export LD_LIBRARY_PATH=$SCA4CPP/lib:$SDO4CPP/lib:$LD_LIBRARY_PATH:$AXISCPP_DEPLOY/lib:$XERCES_DEPLOY/lib
 
 export SCA4CPP_SYSTEM_ROOT=$SCA4CPP_HOME/runtime/core/test/testSCASystem
 export SCA4CPP_DEFAULT_MODULE=SubSystem1
 
 cd $TEST_ROOT/src
-Debug/tuscany_sca_test
+./tuscany_sca_test