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 2007/03/15 09:04:36 UTC
svn commit: r518505 - in /incubator/tuscany/cpp/sdo: GettingStarted.html
Makefile.am build_sdocpp.sh builddist.sh samples/GettingStarted.html
samples/Makefile.am samples/build.sh samples/misc/Makefile.am
Author: robbinspg
Date: Thu Mar 15 01:04:35 2007
New Revision: 518505
URL: http://svn.apache.org/viewvc?view=rev&rev=518505
Log:
Fix doc + deploy location of samples
Added:
incubator/tuscany/cpp/sdo/build_sdocpp.sh (with props)
Modified:
incubator/tuscany/cpp/sdo/GettingStarted.html
incubator/tuscany/cpp/sdo/Makefile.am
incubator/tuscany/cpp/sdo/builddist.sh
incubator/tuscany/cpp/sdo/samples/GettingStarted.html
incubator/tuscany/cpp/sdo/samples/Makefile.am
incubator/tuscany/cpp/sdo/samples/build.sh
incubator/tuscany/cpp/sdo/samples/misc/Makefile.am
Modified: incubator/tuscany/cpp/sdo/GettingStarted.html
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/GettingStarted.html?view=diff&rev=518505&r1=518504&r2=518505
==============================================================================
--- incubator/tuscany/cpp/sdo/GettingStarted.html (original)
+++ incubator/tuscany/cpp/sdo/GettingStarted.html Thu Mar 15 01:04:35 2007
@@ -42,7 +42,7 @@
<A HREF="http://www.osoa.org/display/Main/SDO+-+Previously+Published+Specifications">Service Data Objects
for C++ 2.01 specification</A>.
This page describes what is needed to install Tuscany SDO for C++.<BR/>If you haven't already done so, the first
- step is to download the SDO C++ Milestone release 2 of Apache Tuscany from our
+ step is to download the SDO C++ Milestone 3 release of Apache Tuscany from our
<A HREF="http://incubator.apache.org/tuscany/downloads.html" target='_blank'>download page</A>.<BR/>
</P>
</DIV>
@@ -150,12 +150,16 @@
</UL>
NOTE: If you don't provide a --prefix configure option, it will by default install into
/usr/local/tuscany/sdo. Use ./configure --help to see all the available options.<br>
- To build the sdo_axiom utility library you must specify the --with-axis2c=yes option on the configure command</LI>
+ To build the sdo_axiom utility library you must specify the --with-axis2c=yes option on the configure command<p>
+ A script, <b>build_sdocpp.sh</b>, is provided that will build and install SDO for C++. This script will install to the
+ location specified by the TUSCANY_SDOCPP environment variable if set or into a deploy directory at<tuscany_sdo_install_dir>/deploy<br>
+ This script will check for the correct environment variable settings and will only build the sdo_axiom utility
+ library if AXIS2C_HOME is set.</LI>
<LI>Run the test:
<UL>
<LI>./sdotest.sh</LI>
</UL>The output will indicate the number of tests passed:
-<xmp>Using SDO installed at /home/tuscany/workspace/cpp/sdo/deploy
+<xmp>Using SDO installed at /usr/local/tuscany/sdo
I/O warning : failed to load external entity "not_present.xsd"
I/O warning : failed to load external entity "not-present.xml"
I/O warning : failed to load external entity "sca-policy.xsd"
@@ -252,11 +256,11 @@
<A NAME="help"><H2>Getting Help</H2></A>
<P>First place to look is at the Tuscany FAQ at
- <A HREF="http://incubator.apache.org/tuscany/faq.html"
- TARGET="_blank">http://incubator.apache.org/tuscany/faq.html</A> </P>
+ <A HREF="http://cwiki.apache.org/TUSCANY/tuscany-sdo-faq.html"
+ TARGET="_blank">http://cwiki.apache.org/TUSCANY/tuscany-sdo-faq.html</A> </P>
<P>Any problem with this release can be reported to the Tuscany
- <A HREF="http://incubator.apache.org/tuscany/mail-lists.html"
+ <A HREF="http://cwiki.apache.org/TUSCANY/mailing-lists.html"
TARGET="_blank">mailing lists</A> or create a JIRA issue at <A HREF="http://issues.apache.org/jira/browse/Tuscany"
TARGET="_blank">http://issues.apache.org/jira/browse/Tuscany</A>.</P>
Modified: incubator/tuscany/cpp/sdo/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/Makefile.am?view=diff&rev=518505&r1=518504&r2=518505
==============================================================================
--- incubator/tuscany/cpp/sdo/Makefile.am (original)
+++ incubator/tuscany/cpp/sdo/Makefile.am Thu Mar 15 01:04:35 2007
@@ -20,7 +20,7 @@
datadir=$(prefix)
data_DATA = INSTALL README LICENSE COPYING NOTICE GettingStarted.html
-EXTRA_DIST = LICENSE COPYING INSTALL README NOTICE sdotest.sh GettingStarted.html doc
+EXTRA_DIST = LICENSE COPYING INSTALL README NOTICE build_sdocpp.sh sdotest.sh GettingStarted.html doc
dist-hook:
rm -rf `find $(distdir)/ -type d -name .svn`
rm -rf `find $(distdir)/ -type d -name .deps`
Added: incubator/tuscany/cpp/sdo/build_sdocpp.sh
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/build_sdocpp.sh?view=auto&rev=518505
==============================================================================
--- incubator/tuscany/cpp/sdo/build_sdocpp.sh (added)
+++ incubator/tuscany/cpp/sdo/build_sdocpp.sh Thu Mar 15 01:04:35 2007
@@ -0,0 +1,44 @@
+#!/bin/sh
+
+# 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.
+
+
+if [ x$LIBXML2_INCLUDE = x ]; then
+echo "LIBXML2_INCLUDE not set"
+exit;
+fi
+if [ x$LIBXML2_LIB = x ]; then
+echo "LIBXML2_LIB not set"
+exit;
+fi
+
+if [ x$AXIS2C_HOME = x ]; then
+echo "AXIS2C_HOME not set. not building SDO Axiom utility"
+
+else
+echo "Using Axis2C installed at $AXIS2C_HOME"
+WITH_AXIS2C=--with-axis2c
+fi
+
+if [ x$TUSCANY_SDOCPP = x ]; then
+export TUSCANY_SDOCPP=`pwd`/deploy
+fi
+
+./configure --prefix=${TUSCANY_SDOCPP} ${WITH_AXIS2C} --enable-static=no
+make
+make install
Propchange: incubator/tuscany/cpp/sdo/build_sdocpp.sh
------------------------------------------------------------------------------
svn:executable = *
Modified: incubator/tuscany/cpp/sdo/builddist.sh
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/builddist.sh?view=diff&rev=518505&r1=518504&r2=518505
==============================================================================
--- incubator/tuscany/cpp/sdo/builddist.sh (original)
+++ incubator/tuscany/cpp/sdo/builddist.sh Thu Mar 15 01:04:35 2007
@@ -38,7 +38,7 @@
cd ${TUSCANY_SDOCPP_HOME}/samples
./autogen.sh
-./configure --prefix=${TUSCANY_SDOCPP_HOME}/deploy --enable-static=no
+./configure --prefix=${TUSCANY_SDOCPP_HOME}/deploy/samples --enable-static=no
cd $TUSCANY_SDOCPP_HOME
./autogen.sh
Modified: incubator/tuscany/cpp/sdo/samples/GettingStarted.html
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/samples/GettingStarted.html?view=diff&rev=518505&r1=518504&r2=518505
==============================================================================
--- incubator/tuscany/cpp/sdo/samples/GettingStarted.html (original)
+++ incubator/tuscany/cpp/sdo/samples/GettingStarted.html Thu Mar 15 01:04:35 2007
@@ -95,7 +95,10 @@
</UL>
NOTE: If you don't provide a --prefix configure option, it will by default install into
/usr/local/tuscany/sdo/samples/misc</LI>
- </OL>
+ </OL>
+ <p>
+ A script, <b>build.sh</b>, is provided that will build and deploy the SDO for C++ samples to $TUSCANY_SCACPP/samples.
+
</DIV>
<!--DIV CLASS="section">
@@ -200,11 +203,11 @@
<A NAME="help"><H2>Getting Help</H2></A>
<P>First place to look is at the Tuscany FAQ at
- <A HREF="http://incubator.apache.org/tuscany/faq.html"
- TARGET="_blank">http://incubator.apache.org/tuscany/faq.html</A> </P>
+ <A HREF="http://cwiki.apache.org/TUSCANY/tuscany-sdo-faq.html"
+ TARGET="_blank">http://cwiki.apache.org/TUSCANY/tuscany-sdo-faq.html</A> </P>
<P>Any problem with this release can be reported to the Tuscany
- <A HREF="http://incubator.apache.org/tuscany/mail-lists.html"
+ <A HREF="http://cwiki.apache.org/TUSCANY/mailing-lists.html"
TARGET="_blank">mailing lists</A> or create a JIRA issue at <A HREF="http://issues.apache.org/jira/browse/Tuscany"
TARGET="_blank">http://issues.apache.org/jira/browse/Tuscany</A>.</P>
Modified: incubator/tuscany/cpp/sdo/samples/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/samples/Makefile.am?view=diff&rev=518505&r1=518504&r2=518505
==============================================================================
--- incubator/tuscany/cpp/sdo/samples/Makefile.am (original)
+++ incubator/tuscany/cpp/sdo/samples/Makefile.am Thu Mar 15 01:04:35 2007
@@ -17,4 +17,4 @@
SUBDIRS = misc
-EXTRA_DIST = GettingStarted.html
+EXTRA_DIST = GettingStarted.html build.sh
Modified: incubator/tuscany/cpp/sdo/samples/build.sh
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/samples/build.sh?view=diff&rev=518505&r1=518504&r2=518505
==============================================================================
--- incubator/tuscany/cpp/sdo/samples/build.sh (original)
+++ incubator/tuscany/cpp/sdo/samples/build.sh Thu Mar 15 01:04:35 2007
@@ -23,7 +23,7 @@
fi
echo "Using SDO installed at $TUSCANY_SDOCPP"
-./configure --prefix=${TUSCANY_SDOCPP} --enable-static=no
+./configure --prefix=${TUSCANY_SDOCPP}/samples --enable-static=no
make
make install
Modified: incubator/tuscany/cpp/sdo/samples/misc/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/samples/misc/Makefile.am?view=diff&rev=518505&r1=518504&r2=518505
==============================================================================
--- incubator/tuscany/cpp/sdo/samples/misc/Makefile.am (original)
+++ incubator/tuscany/cpp/sdo/samples/misc/Makefile.am Thu Mar 15 01:04:35 2007
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-deploydir=$(prefix)/samples/misc/deploy/
+deploydir=$(prefix)/misc/deploy/
prgbindir=$(deploydir)/bin
prgbin_PROGRAMS = sdo_misc
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org