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/06/24 01:14:20 UTC

svn commit: r416832 - in /incubator/tuscany/cpp/sdo: runtime/core/sdo_axiom_test/Makefile.am runtime/core/src/commonj/sdo/Makefile.am runtime/core/test/Makefile.am sdotest.sh

Author: robbinspg
Date: Fri Jun 23 16:14:19 2006
New Revision: 416832

URL: http://svn.apache.org/viewvc?rev=416832&view=rev
Log:
TUSCANY-458 Linux SDO bin dist build

Modified:
    incubator/tuscany/cpp/sdo/runtime/core/sdo_axiom_test/Makefile.am
    incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/Makefile.am
    incubator/tuscany/cpp/sdo/runtime/core/test/Makefile.am
    incubator/tuscany/cpp/sdo/sdotest.sh

Modified: incubator/tuscany/cpp/sdo/runtime/core/sdo_axiom_test/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/sdo_axiom_test/Makefile.am?rev=416832&r1=416831&r2=416832&view=diff
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/sdo_axiom_test/Makefile.am (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/sdo_axiom_test/Makefile.am Fri Jun 23 16:14:19 2006
@@ -6,9 +6,10 @@
 
 noinst_HEADERS=*.h
 
-tuscany_sdo_axiom_test_LDADD   =  -ltuscany_sdo \
+tuscany_sdo_axiom_test_LDADD   = \
+	-L$(top_builddir)/runtime/core/src/commonj/sdo -ltuscany_sdo \
 	-L$(top_builddir)/runtime/core/sdo_axiom -ltuscany_sdo_axiom \
-	-L$(top_builddir)/runtime/core/src/commonj/sdo -lxml2 -lstdc++ \
+	-L${LIBXML2_LIB} -lxml2 \
 	-L$(AXIS2C_HOME)/lib \
 					-laxis2_util \
                     -laxis2_axiom \

Modified: incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/Makefile.am?rev=416832&r1=416831&r2=416832&view=diff
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/Makefile.am (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/Makefile.am Fri Jun 23 16:14:19 2006
@@ -80,7 +80,7 @@
 	XSDPropertyInfo.cpp \
 	XSDTypeInfo.cpp
 
-libtuscany_sdo_la_LIBADD = -lstdc++
+libtuscany_sdo_la_LIBADD =
 
 INCLUDES = -I$(top_builddir)/runtime/core/src \
            -I${LIBXML2_INCLUDE}

Modified: incubator/tuscany/cpp/sdo/runtime/core/test/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/test/Makefile.am?rev=416832&r1=416831&r2=416832&view=diff
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/Makefile.am (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/Makefile.am Fri Jun 23 16:14:19 2006
@@ -7,8 +7,10 @@
 EXTRA_DIST = *.xsd *.xml *.txt *.wsdl test/*.* test2/*.* t2/*.* g/*.* bugs/1/*.*
 noinst_HEADERS=sdotest.h
 
-tuscany_sdo_test_LDADD   =  -ltuscany_sdo \
-	-L$(top_builddir)/runtime/core/src/commonj/sdo -lxml2 -lstdc++
+tuscany_sdo_test_LDADD  =  \
+    -L$(top_builddir)/runtime/core/src/commonj/sdo -ltuscany_sdo \
+    -L${LIBXML2_LIB} -lxml2
+	
 
 INCLUDES = -I$(top_builddir)/runtime/core/test \
             -I$(top_builddir)/runtime/core/src

Modified: incubator/tuscany/cpp/sdo/sdotest.sh
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/sdotest.sh?rev=416832&r1=416831&r2=416832&view=diff
==============================================================================
--- incubator/tuscany/cpp/sdo/sdotest.sh (original)
+++ incubator/tuscany/cpp/sdo/sdotest.sh Fri Jun 23 16:14:19 2006
@@ -16,12 +16,12 @@
 
 APFULLDIR=`pwd`
 export SDO4CPP_HOME="$APFULLDIR"
-if [ x$SDO4CPP = x ]; then
-export SDO4CPP="$SDO4CPP_HOME"
+if [ x$TUSCANY_SDOCPP = x ]; then
+export TUSCANY_SDOCPP="$SDO4CPP_HOME"
 fi
 
-echo "Using SDO installed at $SDO4CPP"
+echo "Using SDO installed at $TUSCANY_SDOCPP"
 
-export LD_LIBRARY_PATH=$SDO4CPP/lib:$LD_LIBRARY_PATH
-cd $SDO4CPP_HOME/runtime/core/test
+export LD_LIBRARY_PATH=$TUSCANY_SDOCPP/lib:$LD_LIBRARY_PATH
+cd runtime/core/test
 ./tuscany_sdo_test



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