Author: jsdelfino
Date: Mon Nov 23 05:48:11 2009
New Revision: 883254
URL: http://svn.apache.org/viewvc?rev=883254&view=rev
Log:
Simplified the automake build using configure options instead of environment
variables and cleaned up some of the makefile.am files. Adjusted build
instructions. Moved directories that don't yet build or work out of the main
build dir and obsolete docs to a contrib dir.
Added:
tuscany/sca-cpp/trunk/contrib/
tuscany/sca-cpp/trunk/contrib/doc/
tuscany/sca-cpp/trunk/contrib/doc/Axis2CWSExtension.html (props changed)
- copied unchanged from r883248,
tuscany/sca-cpp/trunk/doc/Axis2CWSExtension.html
tuscany/sca-cpp/trunk/contrib/doc/CPPGeneratorTool.txt (props changed)
- copied unchanged from r883248,
tuscany/sca-cpp/trunk/doc/CPPGeneratorTool.txt
tuscany/sca-cpp/trunk/contrib/doc/CppExtension.html (props changed)
- copied unchanged from r883248,
tuscany/sca-cpp/trunk/doc/CppExtension.html
tuscany/sca-cpp/trunk/contrib/doc/PythonExtension.html (props changed)
- copied unchanged from r883248,
tuscany/sca-cpp/trunk/doc/PythonExtension.html
tuscany/sca-cpp/trunk/contrib/doc/RESTExtension.html (props changed)
- copied unchanged from r883248,
tuscany/sca-cpp/trunk/doc/RESTExtension.html
tuscany/sca-cpp/trunk/contrib/doc/RubyExtension.html (props changed)
- copied unchanged from r883248,
tuscany/sca-cpp/trunk/doc/RubyExtension.html
tuscany/sca-cpp/trunk/contrib/doc/SCAExtension.html (props changed)
- copied unchanged from r883248,
tuscany/sca-cpp/trunk/doc/SCAExtension.html
tuscany/sca-cpp/trunk/contrib/doc/css/
tuscany/sca-cpp/trunk/contrib/doc/css/maven-base.css (props changed)
- copied unchanged from r883248,
tuscany/sca-cpp/trunk/doc/css/maven-base.css
tuscany/sca-cpp/trunk/contrib/doc/css/maven-theme.css (props changed)
- copied unchanged from r883248,
tuscany/sca-cpp/trunk/doc/css/maven-theme.css
tuscany/sca-cpp/trunk/contrib/runtime/ (props changed)
- copied from r883248, tuscany/sca-cpp/trunk/runtime/
tuscany/sca-cpp/trunk/contrib/samples/ (props changed)
- copied from r883248, tuscany/sca-cpp/trunk/samples/
Removed:
tuscany/sca-cpp/trunk/GettingStarted.html
tuscany/sca-cpp/trunk/build.sh
tuscany/sca-cpp/trunk/builddist.sh
tuscany/sca-cpp/trunk/configure.sh
tuscany/sca-cpp/trunk/doc/Axis2CWSExtension.html
tuscany/sca-cpp/trunk/doc/CPPGeneratorTool.txt
tuscany/sca-cpp/trunk/doc/CppExtension.html
tuscany/sca-cpp/trunk/doc/Doxyfile.w32
tuscany/sca-cpp/trunk/doc/PythonExtension.html
tuscany/sca-cpp/trunk/doc/RESTExtension.html
tuscany/sca-cpp/trunk/doc/RubyExtension.html
tuscany/sca-cpp/trunk/doc/SCAExtension.html
tuscany/sca-cpp/trunk/doc/css/maven-base.css
tuscany/sca-cpp/trunk/doc/css/maven-theme.css
tuscany/sca-cpp/trunk/makebindist.sh
tuscany/sca-cpp/trunk/runtime/
tuscany/sca-cpp/trunk/samples/
Modified:
tuscany/sca-cpp/trunk/AUTHORS
tuscany/sca-cpp/trunk/INSTALL
tuscany/sca-cpp/trunk/Makefile.am
tuscany/sca-cpp/trunk/NOTICE
tuscany/sca-cpp/trunk/README
tuscany/sca-cpp/trunk/configure.ac
tuscany/sca-cpp/trunk/doc/Doxyfile.in
tuscany/sca-cpp/trunk/doc/Makefile.am
tuscany/sca-cpp/trunk/etc/git-exclude
tuscany/sca-cpp/trunk/modules/Makefile.am
tuscany/sca-cpp/trunk/modules/atom/Makefile.am
tuscany/sca-cpp/trunk/modules/eval/Makefile.am
tuscany/sca-cpp/trunk/modules/http/Makefile.am
tuscany/sca-cpp/trunk/modules/json/Makefile.am
tuscany/sca-cpp/trunk/modules/scdl/Makefile.am
tuscany/sca-cpp/trunk/test/store-function/Makefile.am
tuscany/sca-cpp/trunk/test/store-object/Makefile.am
tuscany/sca-cpp/trunk/test/store-script/Makefile.am
Modified: tuscany/sca-cpp/trunk/AUTHORS
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/AUTHORS?rev=883254&r1=883253&r2=883254&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/AUTHORS (original)
+++ tuscany/sca-cpp/trunk/AUTHORS Mon Nov 23 05:48:11 2009
@@ -0,0 +1,2 @@
+The Apache Software Foundation (http://www.apache.org/)
+
Modified: tuscany/sca-cpp/trunk/INSTALL
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/INSTALL?rev=883254&r1=883253&r2=883254&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/INSTALL (original)
+++ tuscany/sca-cpp/trunk/INSTALL Mon Nov 23 05:48:11 2009
@@ -1,2 +1,50 @@
-Please read the GettingStarted.html document for information on
-building and installing Tuscany SCA Native
+Apache Tuscany SCA Runtime
+==========================
+
+Building
+========
+
+First get the following dependencies:
+
+HTTP server and APR
+httpd-2.2-13
+libapr-1-0.3.8
+libaprutil-1-0.3.9
+(the easiest is to build httpd using configure --with-included-apr)
+
+XML
+libxml2-2.7.5
+
+JSON
+SpiderMonkey libmozjs
+(included in xulrunner-1.9.1.5)
+
+To configure the build do this:
+./autogen.sh
+./configure --prefix=<install dir>
+
+To configure where to find dependencies, see:
+./configure --help
+
+To build the runtime, do this:
+make
+
+To run the tests, do this:
+make check
+
+To build doxygen documentation, do this:
+./configure --prefix=<install dir> --enable-doxygen
+make
+
+To build ctags for the source, do this:
+make ctags
+
+To build a source distribution, do this:
+make dist
+
+To build a binary distribution, do this:
+make bindist
+
+Layout
+======
+
Modified: tuscany/sca-cpp/trunk/Makefile.am
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/Makefile.am?rev=883254&r1=883253&r2=883254&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/Makefile.am Mon Nov 23 05:48:11 2009
@@ -15,16 +15,16 @@
# specific language governing permissions and limitations
# under the License.
-SUBDIRS = kernel modules test doc runtime
-DIST_SUBDIRS = doc runtime samples
+ACLOCAL_AMFLAGS = -I m4
+
+SUBDIRS = kernel modules components test doc
+
datadir=$(prefix)
-data_DATA = INSTALL README LICENSE COPYING NOTICE GettingStarted.html
+data_DATA = INSTALL README LICENSE COPYING NOTICE
nobase_data_DATA = xsd/*.*
-EXTRA_DIST = LICENSE COPYING INSTALL README NOTICE autogen.sh build.sh
builddist.sh configure.sh makebindist.sh GettingStarted.html xsd
-dist-hook:
- rm -rf `find $(distdir)/ -type d -name .svn`
- rm -rf `find $(distdir)/ -type d -name .deps`
+DIST_SUBDIRS = kernel modules components test doc samples
+EXTRA_DIST = LICENSE COPYING INSTALL README NOTICE autogen.sh xsd
install-data-hook:
rm -rf $(prefix)/doc
@@ -38,17 +38,15 @@
rm -rf `find $(prefix)/samples -type d -name .svn`
rm -rf `find $(prefix)/samples -type d -name .deps`
-bindist: dist
- rm -rf ${PACKAGE}-${PACKAGE_VERSION}
- rm -rf ${PACKAGE}-${PACKAGE_VERSION}-src
+dist-hook:
+ rm -rf `find $(distdir)/ -type d -name .svn`
+ rm -rf `find $(distdir)/ -type d -name .deps`
+
+bindist: install
rm -rf ${PACKAGE}-${PACKAGE_VERSION}-bin
- gunzip -f ${PACKAGE}-${PACKAGE_VERSION}.tar.gz
- tar -xf ${PACKAGE}-${PACKAGE_VERSION}.tar
- mv ${PACKAGE}-${PACKAGE_VERSION} ${PACKAGE}-${PACKAGE_VERSION}-src
- tar -cf - ${PACKAGE}-${PACKAGE_VERSION}-src | gzip -c >
${PACKAGE}-${PACKAGE_VERSION}-src.tar.gz
- cd ${PACKAGE}-${PACKAGE_VERSION}-src \
- && sh ../makebindist.sh
mkdir ${PACKAGE}-${PACKAGE_VERSION}-bin
- cp -r ${PACKAGE}-${PACKAGE_VERSION}-src/deploy/*
${PACKAGE}-${PACKAGE_VERSION}-bin
+ cp -r $(prefix)/* ${PACKAGE}-${PACKAGE_VERSION}-bin
+ rm -rf ${PACKAGE}-${PACKAGE_VERSION}-bin/test
tar -cf - ${PACKAGE}-${PACKAGE_VERSION}-bin | gzip -c >
${PACKAGE}-${PACKAGE_VERSION}-bin.tar.gz
+ rm -rf ${PACKAGE}-${PACKAGE_VERSION}-bin
Modified: tuscany/sca-cpp/trunk/NOTICE
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/NOTICE?rev=883254&r1=883253&r2=883254&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/NOTICE (original)
+++ tuscany/sca-cpp/trunk/NOTICE Mon Nov 23 05:48:11 2009
@@ -1,5 +1,6 @@
-Apache Tuscany SCA Native
-Copyright 2005, 2007 The Apache Software Foundation
+Apache Tuscany SCA
+Copyright 2005, 2009 The Apache Software Foundation
This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/)
\ No newline at end of file
+The Apache Software Foundation (http://www.apache.org/)
+
Modified: tuscany/sca-cpp/trunk/README
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/README?rev=883254&r1=883253&r2=883254&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/README (original)
+++ tuscany/sca-cpp/trunk/README Mon Nov 23 05:48:11 2009
@@ -1,83 +1,34 @@
-Apache Tuscany SCA Native M3 build (March, 2007)
-================================================
+Apache Tuscany SCA Runtime
+==========================
-http://incubator.apache.org/tuscany
+Getting the code
+================
-Tuscany is an effort undergoing incubation at the Apache Software Foundation
-(ASF), sponsored by the Web Services PMC.
+To checkout the source code with commit access, do this:
+git svn init -s https://svn.apache.org/repos/asf/tuscany/sca-cpp
tuscany-sca-cpp
+cd tuscany-sca-cpp
+wget -P .git http://git.apache.org/authors.txt
+git config svn.authorsfile .git/authors.txt
+git config user.email <you>@apache.org
+git config svn.rmdir true
+git svn fetch --log-window-size 10000
+
+To checkout the source without commit access, do this:
+git clone git://git.apache.org/tuscany-sca-cpp
+or
+svn checkout http://svn.apache.org/repos/asf/tuscany/sca-cpp tuscany-sca-cpp
+
+
+Contributing to the project
+===========================
+
+To contribute to the project or report issues see the mailing list:
[email protected]
+
+Archives:
+http://www.mail-archive.com/[email protected]
+http://marc.info/?l=tuscany-dev
-Incubation is required of all newly accepted projects until a further review
-indicates that the infrastructure, communications, and decision making process
-have stabilized in a manner consistent with other successful ASF projects.
-
-While incubation status is not necessarily a reflection of the completeness or
-stability of the code, it does indicate that the project has yet to be fully
-endorsed by the ASF.
-
-
-Getting Started
-===============
-
-Documentation describing the system requirements and the steps to install
-Tuscany SCA C++ and run the samples can be found in the GettingStarted.html
-file.
-
-
-About Tuscany SCA C++
-=====================
-
-Tuscany SCA C++ provides a runtime implementation for the for the Service
-Component Architecture 0.96 Assembly specification and the 0.95 C++ Client
-& Implementation Model specification, written in C++ and will currently
-support C++, Python and Ruby component implementation types.
-
-The specifications can be found at
-http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
-
-It is possible to interoperate with Tuscany SCA Java via the Web Service
-bindings for services and references but restrictions apply. This is not yet a
-complete implementation and known restrictions are described below.
-
-Supported SCA Assembly Model features
- * All features are supported unless listed under the known restrictions
- below. See SCA Assembly Model specification.
-
-Supported language bindings
- * Component implementations written in C++. See the SCA C++ Client and
- Implementation Model specification.
- * Component implementations written in Python. See the
- doc/PythonExtension.html documentation.
- * Component implementations written in Ruby. See the doc/RubyExtension.html
- documentation.
- * Component interfaces described by C++ classes. See SCA Client and
- Implementation Model specification.
-
-Supported service and reference bindings
- * The web service binding is supported. This implementation will support
- web services which using document literal SOAP bindings conforming to the
- WS-I basic profile (rpc/encoded is not yet supported).
- * A REST binding is supported. This implementation supports HTTP calls using
- a resource or RPC pattern depending on the use of a REST interface. See the
- doc/RESTExtension.html documentation.
- * A SCA binding is supported. This implementation uses the web services
- binding to provide the "default" binding.
-
-Known restrictions
- * Local service interfaces cannot use overloaded operations (the SCA
- specification limits remote service interfaces to not using overloaded
- operations).
- * Each WSDL definition for a web service binding must be in a single WSDL
- document.
- * No load time validation of the deployed SCA application (run time
- validation only).
- * No metadata API.
- * Components implemented in Python and Ruby are restricted to passing
- simple types and language-specific XML objects as parameters and return
- values.
- * Composites that use the Web Services, REST and SCA bindings are restricted
- to transporting simple types and XML.
+To subscribe:
[email protected]
-
-Thank you for using Tuscany!
-
-The Tuscany Team.
Modified: tuscany/sca-cpp/trunk/configure.ac
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/configure.ac?rev=883254&r1=883253&r2=883254&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/configure.ac (original)
+++ tuscany/sca-cpp/trunk/configure.ac Mon Nov 23 05:48:11 2009
@@ -18,14 +18,17 @@
dnl run autogen.sh to generate the configure script.
AC_PREREQ(2.59)
-AC_INIT(tuscany-sca, 1.0-M3)
+AC_INIT(tuscany-sca, 1.0, [email protected])
+AC_CONFIG_MACRO_DIR([m4])
AC_CANONICAL_SYSTEM
AM_CONFIG_HEADER(config.h)
AM_INIT_AUTOMAKE([tar-ustar])
AC_PREFIX_DEFAULT(/usr/local/tuscany/sca)
# Checks for programs.
+AC_MSG_NOTICE([checking for programs])
AC_PROG_CXX
+AC_PROG_AWK
AC_PROG_CC
AC_PROG_CPP
AC_PROG_INSTALL
@@ -34,7 +37,7 @@
AC_PROG_LIBTOOL
# Check for running on Darwin
-AC_MSG_CHECKING([Checking if running on Darwin])
+AC_MSG_CHECKING([if running on Darwin])
UNAME=`uname -s`
if test "x$UNAME" = "xDarwin"; then
AC_DEFINE([IS_DARWIN], [1], [Set to 1 when running on Darwin - Mac OSX])
@@ -48,274 +51,163 @@
fi
AM_CONDITIONAL([DARWIN], [test x$is_darmin = xtrue])
+# Configure CURL_INCLUDE and CURL_LIB
+AC_MSG_CHECKING([for curl])
+AC_ARG_WITH([curl], [AC_HELP_STRING([--with-curl=PATH], [path to installed
curl [default=/usr]])], [
+ CURL_INCLUDE="$withval/include"
+ CURL_LIB="$withval/lib"
+ AC_MSG_RESULT("$withval")
+], [
+ CURL_INCLUDE="/usr/include"
+ CURL_LIB="/usr/lib"
+ AC_MSG_RESULT(/usr)
+])
+AC_SUBST(CURL_INCLUDE)
+AC_SUBST(CURL_LIB)
+
+# Configure LIBXML2_INCLUDE and LIBXML2_LIB
+AC_MSG_CHECKING([for libxml2])
+AC_ARG_WITH([libxml2], [AC_HELP_STRING([--with-libxml2=PATH], [path to
installed libxml2 [default=/usr]])], [
+ LIBXML2_INCLUDE="$withval/include/libxml2"
+ LIBXML2_LIB="$withval/lib"
+ AC_MSG_RESULT("$withval")
+], [
+ LIBXML2_INCLUDE="/usr/include/libxml2"
+ LIBXML2_LIB="/usr/lib"
+ AC_MSG_RESULT(/usr)
+])
+AC_SUBST(LIBXML2_INCLUDE)
+AC_SUBST(LIBXML2_LIB)
+
+# Configure LIBMOZJS_INCLUDE and LIBMOZJS_LIB
+AC_MSG_CHECKING([for js-include])
+AC_ARG_WITH([js-include], [AC_HELP_STRING([--with-js-include=PATH], [path to
installed SpiderMonkey include dir
+ [default=/usr/include/xulrunner-1.9.1.5/unstable]])], [
+ JS_INCLUDE="$withval"
+ AC_MSG_RESULT("$withval")
+], [
+ JS_INCLUDE="/usr/include/xulrunner-1.9.1.5/unstable"
+ AC_MSG_RESULT(/usr/include/xulrunner-1.9.1.5/unstable)
+])
+AC_MSG_CHECKING([for js-lib])
+AC_ARG_WITH([js-lib], [AC_HELP_STRING([--with-js-lib=PATH], [path to installed
SpiderMonkey lib dir [default=/usr/lib/xulrunner-1.9.1.5]])], [
+ JS_LIB="$withval"
+ AC_MSG_RESULT("$withval")
+], [
+ JS_LIB="/usr/lib/xulrunner-1.9.1.5"
+ AC_MSG_RESULT(/usr/lib/xulrunner-1.9.1.5)
+])
+AC_SUBST(JS_INCLUDE)
+AC_SUBST(JS_LIB)
+
+# Configure APR and HTTPD
+AC_MSG_CHECKING([for apr])
+AC_ARG_WITH([apr], [AC_HELP_STRING([--with-apr=PATH], [path to installed apr
[default=/usr/local/apache2]])], [
+ APR_INCLUDE="$withval/include"
+ APR_LIB="$withval/lib"
+ AC_MSG_RESULT("$withval")
+], [
+ APR_INCLUDE="/usr/local/apache2/include"
+ APR_LIB="/usr/local/apache2/lib"
+ AC_MSG_RESULT(/usr/local/apache2/lib)
+])
+AC_SUBST(APR_INCLUDE)
+AC_SUBST(APR_LIB)
+
+AC_MSG_CHECKING([for httpd])
+AC_ARG_WITH([httpd], [AC_HELP_STRING([--with-httpd=PATH], [path to installed
httpd [default=/usr/local/apache2]])], [
+ HTTPD_INCLUDE="$withval/include"
+ AC_MSG_RESULT("$withval")
+], [
+ HTTPD_INCLUDE="/usr/local/apache2/include"
+ AC_MSG_RESULT(/usr/local/apache2/lib)
+])
+AC_SUBST(HTTPD_INCLUDE)
+
# Checks for libraries.
+original_LIBS="$LIBS"
+AC_MSG_NOTICE([checking for libraries])
+LIBS="-L$CURL_LIB $original_LIBS"
+AC_CHECK_LIB([curl], [curl_global_init], [], [AC_MSG_ERROR([couldn't find a
suitable libcurl, use --with-curl=PATH])])
+LIBS="-L$JS_LIB $original_LIBS"
+AC_CHECK_LIB([mozjs], [JS_NewContext], [], [AC_MSG_ERROR([couldn't find a
suitable libmozjs, use --with-js-lib=PATH])])
+LIBS="$original_LIBS"
+AC_CHECK_LIB([pthread], [pthread_create], [], [AC_MSG_ERROR([couldn't find a
suitable libpthread])])
+LIBS="-L$LIBXML2_LIB $original_LIBS"
+AC_CHECK_LIB([xml2], [xmlInitParser], [], [AC_MSG_ERROR([couldn't find a
suitable libxml2, use --with-libxml2=PATH])])
+LIBS="-L$APR_LIB $original_LIBS"
+AC_CHECK_LIB([apr-1], [apr_pool_initialize], [], [AC_MSG_ERROR([couldn't find
a suitable libapr-1, use --with-apr=PATH])])
+AC_CHECK_LIB([aprutil-1], [apr_memcache_replace], [], [AC_MSG_ERROR([couldn't
find a suitable libaprutil-1, use --with-apr=PATH])])
+LIBS="$original_LIBS"
# Checks for header files.
+AC_MSG_NOTICE([checking for header files])
AC_HEADER_DIRENT
AC_HEADER_STDC
-AC_CHECK_HEADERS([inttypes.h stdlib.h string.h sys/time.h unistd.h])
+AC_CHECK_HEADERS([string.h sys/time.h])
# Checks for typedefs, structures, and compiler characteristics.
+AC_MSG_NOTICE([checking for typedefs, structures, and compiler
characteristics])
AC_HEADER_STDBOOL
AC_C_CONST
AC_C_INLINE
+AC_TYPE_SIZE_T
# Checks for library functions.
-AC_FUNC_CLOSEDIR_VOID
-AC_FUNC_STAT
-AC_FUNC_VPRINTF
-AC_CHECK_FUNCS([getcwd putenv strdup])
-# AC_CONFIG_SUBDIRS([samples])
+AC_MSG_NOTICE([checking for library functions])
+AC_CHECK_FUNCS([gettimeofday select])
+
+# Configure GCC C++ compile options
+AC_SUBST([CXXFLAGS], ["${CXXFLAGS} -D_DEBUG -O0 -g3 -Wall -std=c++0x
-fmessage-length=0"])
-# Configure TUSCANY_SCACPP and TUSCANY_SDOCPP
+# Configure exuberant ctags
+TAGSFILE="`pwd`/tags"
+AC_SUBST([CTAGSFLAGS], ["${CTAGSFLAGS} --c++-kinds=+p --fields=+iaS --extra=+q
--append --tag-relative=yes -f $TAGSFILE"])
+
+# Configure TUSCANY_SCACPP
TUSCANY_SCACPP=`echo "$TUSCANY_SCACPP"`
if test "x$TUSCANY_SCACPP" = "x"; then
SCAPWD=`pwd`
AC_SUBST([TUSCANY_SCACPP], ["$SCAPWD"])
fi
-TUSCANY_SDOCPP=`echo "$TUSCANY_SDOCPP"`
-if test "x$TUSCANY_SDOCPP" = "x"; then
- SCAPWD=`pwd`
- AC_SUBST([TUSCANY_SDOCPP], ["$SCAPWD/../sdo/deploy"])
-fi
-
-# Configure LIBXML2_INCLUDE and LIBXML2_LIB
-LIBXML2_INCLUDE=`echo "$LIBXML2_INCLUDE"`
-if test "x$LIBXML2_INCLUDE" = "x"; then
- AC_SUBST([LIBXML2_INCLUDE], ["/usr/include/libxml2"])
-fi
-LIBXML2_LIB=`echo "$LIBXML2_LIB"`
-if test "x$LIBXML2_LIB" = "x"; then
- AC_SUBST([LIBXML2_LIB], ["/usr/lib"])
-fi
-
-# Configure LIBMOZJS_INCLUDE and LIBMOZJS_LIB
-LIBMOZJS_INCLUDE=`echo "$LIBMOZJS_INCLUDE"`
-if test "x$LIBMOZJS_INCLUDE" = "x"; then
- AC_SUBST([LIBMOZJS_INCLUDE], ["/usr/include/xulrunner-1.9.1.5/unstable"])
-fi
-LIBMOZJS_LIB=`echo "$LIBMOZJS_LIB"`
-if test "x$LIBMOZJS_LIB" = "x"; then
- AC_SUBST([LIBMOZJS_LIB], ["/usr/lib/xulrunner-1.9.1.5"])
-fi
-
-# Configure GCC C++ compile options
-AC_SUBST([CXXFLAGS], ["$(CXXFLAGS) -D_DEBUG -O0 -g3 -Wall -std=c++0x
-fmessage-length=0"])
-
-AC_MSG_CHECKING(whether to build all component type and binding extensions)
-AC_ARG_ENABLE(all-extensions, [AS_HELP_STRING([--enable-all-extensions],[build
all runtime extensions [default=no]])],
-[ case "${enableval}" in
- no)
- AC_MSG_RESULT(no)
- want_all=false
- ;;
- *)
- AC_MSG_RESULT(yes)
- want_all=true
- ;;
- esac ],
-[ AC_MSG_RESULT(no)
- want_all=false ]
-)
-AM_CONDITIONAL([WANT_ALL], [test x$want_all = xtrue])
-
-AC_MSG_CHECKING(whether to build C++ component type extension)
-AC_ARG_ENABLE(cpp, [AS_HELP_STRING([--enable-cpp],[build C++ component type
extension [default=yes]])],
-[ case "${enableval}" in
- no)
- AC_MSG_RESULT(no)
- want_cpp=false
- ;;
- *)
- AC_MSG_RESULT(yes)
- want_cpp=true
- ;;
- esac ],
-[ AC_MSG_RESULT(yes)
- want_cpp=true ]
-)
-AM_CONDITIONAL([WANT_CPP], [test x$want_cpp = xtrue])
-
-AC_MSG_CHECKING(whether to build Web Service binding extension)
-AC_ARG_ENABLE(wsbinding, [AS_HELP_STRING([--enable-wsbinding],[build Web
Service binding extension [default=no]])],
-[ case "${enableval}" in
- no)
- AC_MSG_RESULT(no)
- want_wsbinding=false
- ;;
- *)
- AC_MSG_RESULT(yes)
- want_wsbinding=true
- ;;
- esac ],
-[ AC_MSG_RESULT(no)
- want_wsbinding=false ]
-)
-AM_CONDITIONAL([WANT_WSBINDING], [test x$want_wsbinding = xtrue])
-
-AC_MSG_CHECKING(whether to build SCA default binding extension)
-AC_ARG_ENABLE(scabinding, [AS_HELP_STRING([--enable-scabinding],[build SCA
default binding extension [default=no]])],
+# Configure Doxygen build
+AC_MSG_CHECKING([whether to build Doxygen documentation])
+AC_ARG_ENABLE(doxygen, [AS_HELP_STRING([--enable-doxygen], [build Doxygen
documentation [default=no]])],
[ case "${enableval}" in
no)
AC_MSG_RESULT(no)
- want_scabinding=false
- ;;
- *)
- AC_MSG_RESULT(yes)
- want_scabinding=true
- ;;
- esac ],
-[ AC_MSG_RESULT(no)
- want_scabinding=false ]
-)
-AM_CONDITIONAL([WANT_SCABINDING], [test x$want_scabinding = xtrue])
-
-AC_MSG_CHECKING(whether to build REST binding extension)
-AC_ARG_ENABLE(restbinding, [AS_HELP_STRING([--enable-restbinding],[build REST
binding extension [default=no]])],
-[ case "${enableval}" in
- no)
- AC_MSG_RESULT(no)
- want_restbinding=false
- ;;
- *)
- AC_MSG_RESULT(yes)
- want_restbinding=true
- ;;
- esac ],
-[ AC_MSG_RESULT(no)
- want_restbinding=false ]
-)
-AM_CONDITIONAL([WANT_RESTBINDING], [test x$want_restbinding = xtrue])
-
-AC_MSG_CHECKING(whether to build Python component type extension)
-AC_ARG_ENABLE(python, [AS_HELP_STRING([--enable-python],[build Python
component type extension [default=no]])],
-[ case "${enableval}" in
- no)
- AC_MSG_RESULT(no)
- want_python=false
- ;;
- *)
- AC_MSG_RESULT(yes)
- want_python=true
- ;;
- esac ],
-[ AC_MSG_RESULT(no)
- want_python=false ]
-)
-AM_CONDITIONAL([WANT_PYTHON], [test x$want_python = xtrue])
-
-AC_MSG_CHECKING(whether to build Ruby component type extension)
-AC_ARG_ENABLE(ruby, [AS_HELP_STRING([--enable-ruby],[build Ruby component type
extension [default=no]])],
-[ case "${enableval}" in
- no)
- AC_MSG_RESULT(no)
- want_ruby=false
- ;;
- *)
- AC_MSG_RESULT(yes)
- want_ruby=true
- ;;
- esac ],
-[ AC_MSG_RESULT(no)
- want_ruby=false ]
-)
-AM_CONDITIONAL([WANT_RUBY], [test x$want_ruby = xtrue])
-
-AC_MSG_CHECKING(whether to build PHP component type extension)
-AC_ARG_ENABLE(php, [AS_HELP_STRING([--enable-php],[build PHP component type
extension [default=no]])],
-[ case "${enableval}" in
- no)
- AC_MSG_RESULT(no)
- want_php=false
- ;;
- *)
- AC_MSG_RESULT(yes)
- want_php=true
- ;;
- esac ],
-[ AC_MSG_RESULT(no)
- want_php=false ]
-)
-AM_CONDITIONAL([WANT_PHP], [test x$want_php = xtrue])
-
-AC_MSG_CHECKING(whether to build Doxygen documentation)
-AC_ARG_ENABLE(doxygen, [AS_HELP_STRING([--enable-doxygen],[build Doxygen
documentation [default=no]])],
-[ case "${enableval}" in
- no)
- AC_MSG_RESULT(no)
- want_doxygen=false
;;
*)
AC_MSG_RESULT(yes)
+ AC_PATH_PROG(DOXYGEN, doxygen, , $PATH)
+ if test x$DOXYGEN = x; then
+ AC_MSG_ERROR([could not find doxygen])
+ fi
want_doxygen=true
;;
esac ],
-[ AC_MSG_RESULT(no)
- want_doxygen=false ]
-)
-if test x$want_doxygen = xyes; then
- AC_PATH_PROG(DOXYGEN, doxygen, , $PATH)
- if test x$DOXYGEN = x; then
- AC_MSG_ERROR([could not find doxygen])
- want_doxygen=no
- fi
-fi
+[ AC_MSG_RESULT(no)])
AM_CONDITIONAL([WANT_DOXYGEN], [test x$want_doxygen = xtrue])
-# Configure exuberant ctags
-TAGSFILE="`pwd`/tags"
-AC_SUBST([CTAGSFLAGS], ["$(CTAGSFLAGS) --c++-kinds=+p --fields=+iaS --extra=+q
--append --tag-relative=yes -f $TAGSFILE"])
-
AC_CONFIG_FILES([Makefile
kernel/Makefile
modules/Makefile
modules/atom/Makefile
- modules/cache/Makefile
modules/eval/Makefile
modules/http/Makefile
modules/json/Makefile
modules/scdl/Makefile
+ modules/server/Makefile
+ components/Makefile
+ components/cache/Makefile
+ components/store/Makefile
test/Makefile
test/store-object/Makefile
test/store-function/Makefile
test/store-script/Makefile
doc/Makefile
doc/Doxyfile
- runtime/Makefile
- runtime/core/Makefile
- runtime/core/src/Makefile
- runtime/core/test/Makefile
- runtime/extensions/Makefile
- runtime/extensions/cpp/Makefile
- runtime/extensions/cpp/src/Makefile
- runtime/extensions/cpp/tools/Makefile
- runtime/extensions/cpp/tools/scagen/Makefile
- runtime/extensions/ws/Makefile
- runtime/extensions/ws/reference/Makefile
- runtime/extensions/ws/reference/axis2c/Makefile
- runtime/extensions/ws/reference/axis2c/src/Makefile
- runtime/extensions/ws/service/Makefile
- runtime/extensions/ws/service/axis2c/Makefile
- runtime/extensions/ws/service/axis2c/src/Makefile
- runtime/extensions/sca/Makefile
- runtime/extensions/sca/reference/Makefile
- runtime/extensions/sca/reference/src/Makefile
- runtime/extensions/sca/service/Makefile
- runtime/extensions/sca/service/src/Makefile
- runtime/extensions/rest/Makefile
- runtime/extensions/rest/interface/Makefile
- runtime/extensions/rest/interface/src/Makefile
- runtime/extensions/rest/reference/Makefile
- runtime/extensions/rest/reference/curl/Makefile
- runtime/extensions/rest/reference/curl/src/Makefile
- runtime/extensions/rest/service/Makefile
- runtime/extensions/rest/service/httpd/Makefile
- runtime/extensions/rest/service/httpd/src/Makefile
- runtime/extensions/python/Makefile
- runtime/extensions/python/src/Makefile
- runtime/extensions/ruby/Makefile
- runtime/extensions/ruby/src/Makefile
- runtime/extensions/ruby/extension/Makefile
])
AC_OUTPUT
+
Propchange: tuscany/sca-cpp/trunk/contrib/doc/Axis2CWSExtension.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/sca-cpp/trunk/contrib/doc/Axis2CWSExtension.html
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/sca-cpp/trunk/contrib/doc/Axis2CWSExtension.html
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: tuscany/sca-cpp/trunk/contrib/doc/CPPGeneratorTool.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/sca-cpp/trunk/contrib/doc/CPPGeneratorTool.txt
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/sca-cpp/trunk/contrib/doc/CPPGeneratorTool.txt
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: tuscany/sca-cpp/trunk/contrib/doc/CppExtension.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/sca-cpp/trunk/contrib/doc/CppExtension.html
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/sca-cpp/trunk/contrib/doc/CppExtension.html
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: tuscany/sca-cpp/trunk/contrib/doc/PythonExtension.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/sca-cpp/trunk/contrib/doc/PythonExtension.html
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/sca-cpp/trunk/contrib/doc/PythonExtension.html
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: tuscany/sca-cpp/trunk/contrib/doc/RESTExtension.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/sca-cpp/trunk/contrib/doc/RESTExtension.html
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/sca-cpp/trunk/contrib/doc/RESTExtension.html
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: tuscany/sca-cpp/trunk/contrib/doc/RESTExtension.html
------------------------------------------------------------------------------
svn:mime-type = text/html
Propchange: tuscany/sca-cpp/trunk/contrib/doc/RubyExtension.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/sca-cpp/trunk/contrib/doc/RubyExtension.html
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/sca-cpp/trunk/contrib/doc/RubyExtension.html
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: tuscany/sca-cpp/trunk/contrib/doc/SCAExtension.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/sca-cpp/trunk/contrib/doc/SCAExtension.html
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/sca-cpp/trunk/contrib/doc/SCAExtension.html
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: tuscany/sca-cpp/trunk/contrib/doc/SCAExtension.html
------------------------------------------------------------------------------
svn:mime-type = text/html
Propchange: tuscany/sca-cpp/trunk/contrib/doc/css/maven-base.css
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/sca-cpp/trunk/contrib/doc/css/maven-base.css
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/sca-cpp/trunk/contrib/doc/css/maven-base.css
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: tuscany/sca-cpp/trunk/contrib/doc/css/maven-theme.css
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/sca-cpp/trunk/contrib/doc/css/maven-theme.css
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/sca-cpp/trunk/contrib/doc/css/maven-theme.css
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: tuscany/sca-cpp/trunk/contrib/runtime/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Nov 23 05:48:11 2009
@@ -0,0 +1,24 @@
+configure
+Makefile.in
+config.log
+depcomp
+config.guess
+config.h
+config.sub
+ltmain.sh
+Makefile
+config.status
+stamp-h1
+config.h.in
+libtool
+autom4te.cache
+missing
+aclocal.m4
+install-sh
+.deps
+*.dat
+.libs
+deploy
+tmp
+bld
+scagen_build
Propchange: tuscany/sca-cpp/trunk/contrib/runtime/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: tuscany/sca-cpp/trunk/contrib/samples/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Nov 23 05:48:11 2009
@@ -0,0 +1,30 @@
+configure
+Makefile.in
+config.log
+depcomp
+config.guess
+config.h
+config.sub
+ltmain.sh
+Makefile
+config.status
+stamp-h1
+config.h.in
+libtool
+autom4te.cache
+missing
+aclocal.m4
+install-sh
+.deps
+*.dat
+.libs
+tmp
+bld
+.project
+.cdtproject
+.settings
+*_Proxy.cpp
+*_Proxy.h
+*_Wrapper.cpp
+*_Wrapper.h
+.pydevproject
Propchange: tuscany/sca-cpp/trunk/contrib/samples/
------------------------------------------------------------------------------
svn:mergeinfo =