You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2010/05/30 05:32:38 UTC
svn commit: r949466 - in /tuscany/sca-cpp/trunk: ./ components/cache/
components/chat/ components/log/ components/nosqldb/ components/queue/
components/sqldb/ components/webservice/ etc/ modules/http/ modules/java/
modules/python/ modules/scdl/ modules...
Author: jsdelfino
Date: Sun May 30 03:32:37 2010
New Revision: 949466
URL: http://svn.apache.org/viewvc?rev=949466&view=rev
Log:
Fix source distribution build scripts, add missing files to the dist targets.
Added:
tuscany/sca-cpp/trunk/etc/Makefile.am
- copied, changed from r949435, tuscany/sca-cpp/trunk/modules/scdl/Makefile.am
tuscany/sca-cpp/trunk/ubuntu/Makefile.am
- copied, changed from r949435, tuscany/sca-cpp/trunk/modules/scdl/Makefile.am
Modified:
tuscany/sca-cpp/trunk/Makefile.am
tuscany/sca-cpp/trunk/components/cache/Makefile.am
tuscany/sca-cpp/trunk/components/chat/Makefile.am
tuscany/sca-cpp/trunk/components/log/Makefile.am
tuscany/sca-cpp/trunk/components/nosqldb/Makefile.am
tuscany/sca-cpp/trunk/components/queue/Makefile.am
tuscany/sca-cpp/trunk/components/sqldb/Makefile.am
tuscany/sca-cpp/trunk/components/webservice/Makefile.am
tuscany/sca-cpp/trunk/configure.ac
tuscany/sca-cpp/trunk/modules/http/Makefile.am
tuscany/sca-cpp/trunk/modules/java/Makefile.am
tuscany/sca-cpp/trunk/modules/python/Makefile.am
tuscany/sca-cpp/trunk/modules/scdl/Makefile.am
tuscany/sca-cpp/trunk/modules/scheme/Makefile.am
tuscany/sca-cpp/trunk/modules/server/Makefile.am
tuscany/sca-cpp/trunk/modules/wsgi/Makefile.am
tuscany/sca-cpp/trunk/samples/store-cpp/Makefile.am
tuscany/sca-cpp/trunk/samples/store-gae/Makefile.am
tuscany/sca-cpp/trunk/samples/store-java/Makefile.am
tuscany/sca-cpp/trunk/samples/store-nosql/Makefile.am
tuscany/sca-cpp/trunk/samples/store-python/Makefile.am
tuscany/sca-cpp/trunk/samples/store-scheme/Makefile.am
tuscany/sca-cpp/trunk/samples/store-sql/Makefile.am
Modified: tuscany/sca-cpp/trunk/Makefile.am
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/Makefile.am?rev=949466&r1=949465&r2=949466&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/Makefile.am Sun May 30 03:32:37 2010
@@ -17,15 +17,17 @@
ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = kernel modules components doc samples
+SUBDIRS = etc kernel modules components samples doc ubuntu
datadir=$(prefix)
-data_DATA = README LICENSE COPYING NOTICE
-nobase_data_DATA = xsd/*.xsd xsd/external/*.xsd xsd/external/*.dtd
+dist_data_DATA = README LICENSE COPYING NOTICE
+nobase_dist_data_DATA = xsd/*.xsd xsd/external/*.xsd xsd/external/*.dtd
+EXTRA_DIST = INSTALL bootstrap
dist-hook:
rm -rf `find $(distdir)/ -type d -name .svn`
rm -rf `find $(distdir)/ -type d -name .deps`
+ rm -rf $(distdir)/.git
bindist: install
rm -rf ${PACKAGE}-${PACKAGE_VERSION}-bin
Modified: tuscany/sca-cpp/trunk/components/cache/Makefile.am
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/cache/Makefile.am?rev=949466&r1=949465&r2=949466&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/components/cache/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/components/cache/Makefile.am Sun May 30 03:32:37 2010
@@ -15,13 +15,15 @@
# specific language governing permissions and limitations
# under the License.
-comp_SCRIPTS = memcached-start memcached-stop
+dist_comp_SCRIPTS = memcached-start memcached-stop
compdir=$(prefix)/components/cache
comp_DATA = memcached.prefix
memcached.prefix: $(top_builddir)/config.status
echo ${MEMCACHED_PREFIX} >memcached.prefix
+EXTRA_DIST = memcache.composite
+
comp_LTLIBRARIES = libmemcache.la
libmemcache_la_SOURCES = memcache.cpp
noinst_DATA = libmemcache.so
@@ -34,5 +36,6 @@ memcache_test_LDFLAGS = -lxml2
client_test_SOURCES = client-test.cpp
client_test_LDFLAGS = -lxml2 -lcurl -lmozjs
+dist_noinst_SCRIPTS = memcached-test server-test
noinst_PROGRAMS = memcache-test client-test
TESTS = memcached-test server-test
Modified: tuscany/sca-cpp/trunk/components/chat/Makefile.am
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/chat/Makefile.am?rev=949466&r1=949465&r2=949466&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/components/chat/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/components/chat/Makefile.am Sun May 30 03:32:37 2010
@@ -21,13 +21,15 @@ if WANT_CHAT
INCLUDES = -I${LIBSTROPHE_INCLUDE}
-comp_SCRIPTS = vysper-start vysper-stop vysper-classpath
+dist_comp_SCRIPTS = vysper-start vysper-stop vysper-classpath
compdir=$(prefix)/components/chat
comp_DATA = vysper.prefix
vysper.prefix: $(top_builddir)/config.status
echo ${VYSPER_PREFIX} >vysper.prefix
+EXTRA_DIST = chat.composite *.scm
+
comp_LTLIBRARIES = libchatter.la
libchatter_la_SOURCES = chatter.cpp
libchatter_la_LDFLAGS = -L${LIBSTROPHE_LIB} -R${LIBSTROPHE_LIB} -lstrophe -lexpat -lssl -lresolv
@@ -42,13 +44,15 @@ client_test_SOURCES = client-test.cpp
client_test_LDFLAGS = -lxml2 -lcurl -lmozjs -L${LIBSTROPHE_LIB} -R${LIBSTROPHE_LIB} -lstrophe -lexpat -lssl -lresolv
noinst_PROGRAMS = xmpp-test client-test
+dist_noinst_SCRIPTS = server-test
if WANT_VYSPER
AM_JAVACFLAGS = -cp `${top_builddir}/components/chat/vysper-classpath ${VYSPER_PREFIX}`${JAVAROOT}
-noinst_JAVA = test/*.java
+dist_noinst_JAVA = test/*.java
CLEANFILES = test/*.class
+dist_noinst_SCRIPTS += echo-test
TESTS = echo-test
endif
Modified: tuscany/sca-cpp/trunk/components/log/Makefile.am
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/log/Makefile.am?rev=949466&r1=949465&r2=949466&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/components/log/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/components/log/Makefile.am Sun May 30 03:32:37 2010
@@ -19,7 +19,7 @@ if WANT_LOG
INCLUDES = -I${THRIFT_INCLUDE} -I${FB303_INCLUDE}
-comp_SCRIPTS = scribed-central-conf scribed-client-conf scribed-central-start scribed-central-stop scribed-client-start scribed-client-stop scribe-cat
+dist_comp_SCRIPTS = scribed-central-conf scribed-client-conf scribed-central-start scribed-central-stop scribed-client-start scribed-client-stop scribe-cat
compdir=$(prefix)/components/log
comp_DATA = scribe.prefix thrift.prefix scribecat.py
@@ -29,6 +29,8 @@ scribe.prefix: $(top_builddir)/config.st
thrift.prefix: $(top_builddir)/config.status
echo ${THRIFT_PREFIX} >thrift.prefix
+EXTRA_DIST = log.composite *.py *.scm *.thrift
+
BUILT_SOURCES=gen-cpp/fb303_constants.cpp gen-cpp/fb303_types.cpp gen-cpp/scribe_constants.cpp gen-cpp/scribe.cpp gen-cpp/scribe_types.cpp gen-cpp/FacebookService.cpp gen-cpp/scribe.h
gen-cpp/fb303_constants.cpp gen-cpp/fb303_types.cpp gen-cpp/scribe_constants.cpp gen-cpp/scribe.cpp gen-cpp/scribe_types.cpp gen-cpp/FacebookService.cpp gen-cpp/scribe.h: scribe.thrift
${THRIFT_PREFIX}/bin/thrift -r --gen cpp scribe.thrift
@@ -55,6 +57,7 @@ liblogger.so:
client_test_SOURCES = client-test.cpp
client_test_LDFLAGS = -lxml2 -lcurl -lmozjs
+dist_noinst_SCRIPTS = scribe-test server-test
noinst_PROGRAMS = client-test
TESTS = scribe-test server-test
Modified: tuscany/sca-cpp/trunk/components/nosqldb/Makefile.am
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/nosqldb/Makefile.am?rev=949466&r1=949465&r2=949466&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/components/nosqldb/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/components/nosqldb/Makefile.am Sun May 30 03:32:37 2010
@@ -19,13 +19,15 @@ if WANT_NOSQLDB
INCLUDES = -I${TINYCDB_INCLUDE}
-comp_SCRIPTS = tinycdb
+dist_comp_SCRIPTS = tinycdb
compdir=$(prefix)/components/nosqldb
comp_DATA = tinycdb.prefix
tinycdb.prefix: $(top_builddir)/config.status
echo ${TINYCDB_PREFIX} >tinycdb.prefix
+EXTRA_DIST = nosqldb.composite
+
comp_LTLIBRARIES = libnosqldb.la
noinst_DATA = libnosqldb.so
@@ -40,6 +42,7 @@ tinycdb_test_LDFLAGS = -L${TINYCDB_LIB}
client_test_SOURCES = client-test.cpp
client_test_LDFLAGS = -lxml2 -lcurl -lmozjs
+dist_noinst_SCRIPTS = nosqldb-test server-test
noinst_PROGRAMS = tinycdb-test client-test
TESTS = nosqldb-test server-test
Modified: tuscany/sca-cpp/trunk/components/queue/Makefile.am
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/queue/Makefile.am?rev=949466&r1=949465&r2=949466&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/components/queue/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/components/queue/Makefile.am Sun May 30 03:32:37 2010
@@ -19,13 +19,15 @@ if WANT_QUEUE
INCLUDES = -I${QPIDC_INCLUDE}
-comp_SCRIPTS = qpidd-start qpidd-stop
+dist_comp_SCRIPTS = qpidd-start qpidd-stop
compdir=$(prefix)/components/queue
comp_DATA = qpidc.prefix
qpidc.prefix: $(top_builddir)/config.status
echo ${QPIDC_PREFIX} >qpidc.prefix
+EXTRA_DIST = queue.composite *.scm
+
comp_LTLIBRARIES = libqueue-sender.la libqueue-listener.la
noinst_DATA = libqueue-sender.so libqueue-listener.so
@@ -45,6 +47,7 @@ qpid_test_LDFLAGS = -L${QPIDC_LIB} -R${Q
client_test_SOURCES = client-test.cpp
client_test_LDFLAGS = -lxml2 -lcurl -lmozjs -L${QPIDC_LIB} -R${QPIDC_LIB} -lqpidclient -lqpidcommon
+dist_noinst_SCRIPTS = send-test server-test
noinst_PROGRAMS = qpid-test client-test
TESTS = send-test server-test
Modified: tuscany/sca-cpp/trunk/components/sqldb/Makefile.am
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/sqldb/Makefile.am?rev=949466&r1=949465&r2=949466&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/components/sqldb/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/components/sqldb/Makefile.am Sun May 30 03:32:37 2010
@@ -19,13 +19,15 @@ if WANT_SQLDB
INCLUDES = -I${PGSQL_INCLUDE}
-comp_SCRIPTS = pgsql-start pgsql-stop pgsql
+dist_comp_SCRIPTS = pgsql-start pgsql-stop pgsql
compdir=$(prefix)/components/sqldb
comp_DATA = pgsql.prefix
pgsql.prefix: $(top_builddir)/config.status
echo ${PGSQL_PREFIX} >pgsql.prefix
+EXTRA_DIST = sqldb.composite
+
comp_LTLIBRARIES = libsqldb.la
noinst_DATA = libsqldb.so
@@ -40,6 +42,7 @@ pgsql_test_LDFLAGS = -L${PGSQL_LIB} -R${
client_test_SOURCES = client-test.cpp
client_test_LDFLAGS = -lxml2 -lcurl -lmozjs
+dist_noinst_SCRIPTS = sqldb-test server-test
noinst_PROGRAMS = pgsql-test client-test
TESTS = sqldb-test server-test
Modified: tuscany/sca-cpp/trunk/components/webservice/Makefile.am
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/webservice/Makefile.am?rev=949466&r1=949465&r2=949466&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/components/webservice/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/components/webservice/Makefile.am Sun May 30 03:32:37 2010
@@ -19,11 +19,13 @@ if WANT_WEBSERVICE
INCLUDES = -I${AXIS2C_INCLUDE}
-comp_SCRIPTS = axis2-conf
+dist_comp_SCRIPTS = axis2-conf
compdir=$(prefix)/components/webservice
comp_DATA = axis2c.prefix axis2.xml services.xml module.xml
+EXTRA_DIST = webservice.composite axis2.xml services.xml module.xml *.scm
+
axis2c.prefix: $(top_builddir)/config.status
echo ${AXIS2C_PREFIX} >axis2c.prefix
@@ -59,6 +61,7 @@ axis2_test_LDFLAGS = -lxml2 -L${AXIS2C_L
client_test_SOURCES = client-test.cpp
client_test_LDFLAGS = -lxml2 -lcurl -lmozjs -L${AXIS2C_LIB} -R${AXIS2C_LIB} -laxis2_engine -laxis2_axiom -laxutil
+dist_noinst_SCRIPTS = echo-test server-test
noinst_PROGRAMS = axiom-test axis2-test client-test
TESTS = axiom-test echo-test server-test
Modified: tuscany/sca-cpp/trunk/configure.ac
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/configure.ac?rev=949466&r1=949465&r2=949466&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/configure.ac (original)
+++ tuscany/sca-cpp/trunk/configure.ac Sun May 30 03:32:37 2010
@@ -760,6 +760,7 @@ AC_SUBST([LDFLAGS], ["${ldflags}"])
LIBS="${defaultlibs}"
AC_CONFIG_FILES([Makefile
+ etc/Makefile
kernel/Makefile
modules/Makefile
modules/scheme/Makefile
@@ -789,6 +790,7 @@ AC_CONFIG_FILES([Makefile
samples/store-nosql/Makefile
doc/Makefile
doc/Doxyfile
+ ubuntu/Makefile
])
AC_OUTPUT
Copied: tuscany/sca-cpp/trunk/etc/Makefile.am (from r949435, tuscany/sca-cpp/trunk/modules/scdl/Makefile.am)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/etc/Makefile.am?p2=tuscany/sca-cpp/trunk/etc/Makefile.am&p1=tuscany/sca-cpp/trunk/modules/scdl/Makefile.am&r1=949435&r2=949466&rev=949466&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/scdl/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/etc/Makefile.am Sun May 30 03:32:37 2010
@@ -15,8 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-scdl_test_SOURCES = scdl-test.cpp
-scdl_test_LDFLAGS = -lxml2
+EXTRA_DIST = git-exclude svn-config svn-ignore
+
+dist_noinst_SCRIPTS = httpd-ipcrm memgrind
-noinst_PROGRAMS = scdl-test
-TESTS = scdl-test
Modified: tuscany/sca-cpp/trunk/modules/http/Makefile.am
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/http/Makefile.am?rev=949466&r1=949465&r2=949466&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/http/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/modules/http/Makefile.am Sun May 30 03:32:37 2010
@@ -17,19 +17,22 @@
INCLUDES = -I${HTTPD_INCLUDE}
-mod_SCRIPTS = httpd-conf httpd-start httpd-stop httpd-restart httpd-ca-conf httpd-cert-conf httpd-ssl-conf
+dist_mod_SCRIPTS = httpd-conf httpd-start httpd-stop httpd-restart httpd-ca-conf httpd-cert-conf httpd-ssl-conf
moddir=$(prefix)/modules/http
curl_test_SOURCES = curl-test.cpp
curl_test_LDFLAGS = -lxml2 -lcurl -lmozjs
mod_DATA = httpd.prefix curl.prefix
-nobase_mod_DATA = conf/*
+nobase_dist_mod_DATA = conf/*
+
+EXTRA_DIST = htdocs/index.html
httpd.prefix: $(top_builddir)/config.status
echo ${HTTPD_PREFIX} >httpd.prefix
curl.prefix: $(top_builddir)/config.status
echo ${CURL_PREFIX} >curl.prefix
+dist_noinst_SCRIPTS = httpd-test http-test
noinst_PROGRAMS = curl-test
TESTS = httpd-test http-test
Modified: tuscany/sca-cpp/trunk/modules/java/Makefile.am
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/java/Makefile.am?rev=949466&r1=949465&r2=949466&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/java/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/modules/java/Makefile.am Sun May 30 03:32:37 2010
@@ -22,7 +22,7 @@ if WANT_JAVA
INCLUDES = -I${JAVA_INCLUDE}
-mod_SCRIPTS = java-conf
+dist_mod_SCRIPTS = java-conf
moddir = $(prefix)/modules/java
prefix_DATA = java.prefix
@@ -30,6 +30,8 @@ prefixdir = $(prefix)/modules/java
java.prefix: $(top_builddir)/config.status
echo ${JAVA_PREFIX} >java.prefix
+EXTRA_DIST = domain-test.composite
+
lib_LTLIBRARIES = libmod_tuscany_java.la
libmod_tuscany_java_la_SOURCES = mod-java.cpp
libmod_tuscany_java_la_LDFLAGS = -lxml2 -lcurl -lmozjs ${JAVA_LDFLAGS}
@@ -46,7 +48,7 @@ java_test_LDFLAGS = ${JAVA_LDFLAGS}
java_shell_SOURCES = java-shell.cpp
java_shell_LDFLAGS = ${JAVA_LDFLAGS}
-noinst_JAVA = org/apache/tuscany/*.java test/*.java
+dist_noinst_JAVA = org/apache/tuscany/*.java test/*.java
jardir = ${prefix}/modules/java
jarfile = libmod-tuscany-java-${PACKAGE_VERSION}.jar
jar_DATA = ${jarfile}
@@ -58,6 +60,7 @@ CLEANFILES = classnoinst.stamp ${jarfile
client_test_SOURCES = client-test.cpp
client_test_LDFLAGS = -lxml2 -lcurl -lmozjs
+dist_noinst_SCRIPTS = server-test wiring-test
noinst_PROGRAMS = jni-test java-test java-shell client-test
TESTS = jni-test java-test server-test
Modified: tuscany/sca-cpp/trunk/modules/python/Makefile.am
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/python/Makefile.am?rev=949466&r1=949465&r2=949466&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/python/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/modules/python/Makefile.am Sun May 30 03:32:37 2010
@@ -21,10 +21,10 @@ if WANT_PYTHON
INCLUDES = -I${PYTHON_INCLUDE}
-mod_SCRIPTS = python-conf
+dist_mod_SCRIPTS = python-conf
moddir = $(prefix)/modules/python
-nobase_xsd_DATA = *.xsd
+nobase_dist_xsd_DATA = *.xsd
xsddir = $(prefix)/xsd
prefix_DATA = python.prefix
@@ -32,6 +32,8 @@ prefixdir = $(prefix)/modules/python
python.prefix: $(top_builddir)/config.status
echo ${PYTHON_PREFIX} >python.prefix
+EXTRA_DIST = domain-test.composite client-test.py server-test.py
+
lib_LTLIBRARIES = libmod_tuscany_python.la
libmod_tuscany_python_la_SOURCES = mod-python.cpp
libmod_tuscany_python_la_LDFLAGS = -lxml2 -lcurl -lmozjs -L${PYTHON_LIB} -R${PYTHON_LIB} -lpython2.6
@@ -48,6 +50,7 @@ python_shell_LDFLAGS = -L${PYTHON_LIB} -
client_test_SOURCES = client-test.cpp
client_test_LDFLAGS = -lxml2 -lcurl -lmozjs
+dist_noinst_SCRIPTS = server-test wiring-test
noinst_PROGRAMS = python-test python-shell client-test
TESTS = python-test server-test
Modified: tuscany/sca-cpp/trunk/modules/scdl/Makefile.am
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/scdl/Makefile.am?rev=949466&r1=949465&r2=949466&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/scdl/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/modules/scdl/Makefile.am Sun May 30 03:32:37 2010
@@ -18,5 +18,7 @@
scdl_test_SOURCES = scdl-test.cpp
scdl_test_LDFLAGS = -lxml2
+EXTRA_DIST = test.composite
+
noinst_PROGRAMS = scdl-test
TESTS = scdl-test
Modified: tuscany/sca-cpp/trunk/modules/scheme/Makefile.am
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/scheme/Makefile.am?rev=949466&r1=949465&r2=949466&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/scheme/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/modules/scheme/Makefile.am Sun May 30 03:32:37 2010
@@ -16,7 +16,7 @@
# under the License.
xsddir=$(prefix)/xsd
-nobase_xsd_DATA = *.xsd
+nobase_dist_xsd_DATA = *.xsd
eval_test_SOURCES = eval-test.cpp
Modified: tuscany/sca-cpp/trunk/modules/server/Makefile.am
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/server/Makefile.am?rev=949466&r1=949465&r2=949466&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/server/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/modules/server/Makefile.am Sun May 30 03:32:37 2010
@@ -17,9 +17,11 @@
INCLUDES = -I${HTTPD_INCLUDE}
-mod_SCRIPTS = cpp-conf scheme-conf server-conf
+dist_mod_SCRIPTS = cpp-conf scheme-conf server-conf
moddir = $(prefix)/modules/server
+EXTRA_DIST = domain-test.composite client-test.scm server-test.scm htdocs/*.xml htdocs/*.txt htdocs/*.html
+
lib_LTLIBRARIES = libmod_tuscany_eval.la libmod_tuscany_wiring.la
libdir = $(prefix)/modules/server
noinst_DATA = libmod_tuscany_eval.so libmod_tuscany_wiring.so
@@ -45,6 +47,7 @@ libimpl-test.so:
client_test_SOURCES = client-test.cpp
client_test_LDFLAGS = -lxml2 -lcurl -lmozjs
+dist_noinst_SCRIPTS = httpd-test server-test wiring-test
noinst_PROGRAMS = client-test
TESTS = httpd-test server-test wiring-test
Modified: tuscany/sca-cpp/trunk/modules/wsgi/Makefile.am
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/wsgi/Makefile.am?rev=949466&r1=949465&r2=949466&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/wsgi/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/modules/wsgi/Makefile.am Sun May 30 03:32:37 2010
@@ -19,10 +19,10 @@ if WANT_PYTHON
INCLUDES = -I${PYTHON_INCLUDE}
-mod_SCRIPTS = composite.py wsgi-start wsgi-stop gae-start gae-stop
+dist_mod_SCRIPTS = composite.py wsgi-start wsgi-stop gae-start gae-stop
moddir = $(prefix)/modules/wsgi
-mod_DATA = app.yaml scdl.py util.py elemutil.py xmlutil.py atomutil.py jsonutil.py
+dist_mod_DATA = app.yaml scdl.py util.py elemutil.py xmlutil.py atomutil.py jsonutil.py
noinst_DATA = target.stamp
@@ -40,15 +40,19 @@ prefixdir=$(prefix)/modules/wsgi
gae.prefix: $(top_builddir)/config.status
echo ${GAE_PREFIX} >gae.prefix
+EXTRA_DIST = domain-test.composite *.py htdocs/*.xml htdocs/*.txt htdocs/*.html
+
client_test_SOURCES = client-test.cpp
client_test_LDFLAGS = -lxml2 -lcurl -lmozjs
noinst_PROGRAMS = client-test
-if WANT_GAE
-TESTS = util-test wsgi-test wiring-test http-test server-test gae-test
-else
+dist_noinst_SCRIPTS = util-test wsgi-test wiring-test http-test server-test
TESTS = util-test wsgi-test wiring-test http-test server-test
+
+if WANT_GAE
+dist_noinst_SCRIPTS += gae-test
+TESTS += gae-test
endif
endif
Modified: tuscany/sca-cpp/trunk/samples/store-cpp/Makefile.am
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-cpp/Makefile.am?rev=949466&r1=949465&r2=949466&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-cpp/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/samples/store-cpp/Makefile.am Sun May 30 03:32:37 2010
@@ -16,10 +16,10 @@
# under the License.
-sample_SCRIPTS = start stop ssl-start
+dist_sample_SCRIPTS = start stop ssl-start
sampledir = $(prefix)/samples/store-cpp
-nobase_sample_DATA = currency-converter.cpp fruits-catalog.cpp shopping-cart.cpp store.composite htdocs/*
+nobase_dist_sample_DATA = currency-converter.cpp fruits-catalog.cpp shopping-cart.cpp store.composite htdocs/.htaccess htdocs/*.html htdocs/*.js
sample_LTLIBRARIES = libcurrency-converter.la libfruits-catalog.la libshopping-cart.la
@@ -29,4 +29,5 @@ libfruits_catalog_la_SOURCES = fruits-ca
libshopping_cart_la_SOURCES = shopping-cart.cpp
+dist_noinst_SCRIPTS = server-test
TESTS = server-test
Modified: tuscany/sca-cpp/trunk/samples/store-gae/Makefile.am
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-gae/Makefile.am?rev=949466&r1=949465&r2=949466&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-gae/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/samples/store-gae/Makefile.am Sun May 30 03:32:37 2010
@@ -18,7 +18,7 @@
if WANT_PYTHON
if WANT_GAE
-sample_SCRIPTS = start stop
+dist_sample_SCRIPTS = start stop
sampledir = $(prefix)/samples/store-gae
BUILT_SOURCES = target.stamp
@@ -31,8 +31,11 @@ target.stamp: app.yaml *.py *.composite
clean-local:
rm -rf target.stamp target
-nobase_sample_DATA = target/app.yaml target/*.py target/*.composite target/htdocs/*
+nobase_sample_DATA = target/app.yaml target/*.py target/*.composite target/htdocs/*.html target/htdocs/*.js
+EXTRA_DIST = app.yaml *.composite *.py htdocs/*.html htdocs/*.js
+
+dist_noinst_SCRIPTS = server-test
TESTS = server-test
endif
Modified: tuscany/sca-cpp/trunk/samples/store-java/Makefile.am
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-java/Makefile.am?rev=949466&r1=949465&r2=949466&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-java/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/samples/store-java/Makefile.am Sun May 30 03:32:37 2010
@@ -19,15 +19,16 @@ JAVAROOT = ${top_builddir}/samples/store
if WANT_JAVA
-sample_SCRIPTS = start stop ssl-start
+dist_sample_SCRIPTS = start stop ssl-start
sampledir=$(prefix)/samples/store-java
AM_JAVACFLAGS = -cp ${top_builddir}/modules/java/libmod-tuscany-java-${PACKAGE_VERSION}.jar:${JAVAROOT}
-noinst_JAVA = store/*.java
+dist_noinst_JAVA = store/*.java
CLEANFILES = classnoinst.stamp store/*.class
-nobase_sample_DATA = store.composite htdocs/* store/*
+nobase_dist_sample_DATA = store.composite htdocs/.htaccess htdocs/*.html htdocs/*.js store/*.class store/*.java
+dist_noinst_SCRIPTS = server-test
TESTS = server-test
endif
Modified: tuscany/sca-cpp/trunk/samples/store-nosql/Makefile.am
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-nosql/Makefile.am?rev=949466&r1=949465&r2=949466&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-nosql/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/samples/store-nosql/Makefile.am Sun May 30 03:32:37 2010
@@ -17,11 +17,12 @@
if WANT_NOSQLDB
-sample_SCRIPTS = start stop ssl-start
+dist_sample_SCRIPTS = start stop ssl-start
sampledir = $(prefix)/samples/store-nosql
-nobase_sample_DATA = currency-converter.scm fruits-catalog.scm shopping-cart.scm store.scm store.composite htdocs/*
+nobase_dist_sample_DATA = currency-converter.scm fruits-catalog.scm shopping-cart.scm store.scm store.composite htdocs/.htaccess htdocs/*.html htdocs/*.js
+dist_noinst_SCRIPTS = server-test
TESTS = server-test
endif
Modified: tuscany/sca-cpp/trunk/samples/store-python/Makefile.am
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-python/Makefile.am?rev=949466&r1=949465&r2=949466&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-python/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/samples/store-python/Makefile.am Sun May 30 03:32:37 2010
@@ -17,11 +17,12 @@
if WANT_PYTHON
-sample_SCRIPTS = start stop ssl-start
+dist_sample_SCRIPTS = start stop ssl-start
sampledir = $(prefix)/samples/store-python
-nobase_sample_DATA = currency-converter.py fruits-catalog.py shopping-cart.py store.py store.composite htdocs/*
+nobase_dist_sample_DATA = currency-converter.py fruits-catalog.py shopping-cart.py store.py store.composite htdocs/.htaccess htdocs/*.html htdocs/*.js
+dist_noinst_SCRIPTS = server-test
TESTS = server-test
endif
Modified: tuscany/sca-cpp/trunk/samples/store-scheme/Makefile.am
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-scheme/Makefile.am?rev=949466&r1=949465&r2=949466&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-scheme/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/samples/store-scheme/Makefile.am Sun May 30 03:32:37 2010
@@ -15,11 +15,14 @@
# specific language governing permissions and limitations
# under the License.
-sample_SCRIPTS = start stop ssl-start
+dist_sample_SCRIPTS = start stop ssl-start
sampledir = $(prefix)/samples/store-scheme
-nobase_sample_DATA = currency-converter.scm fruits-catalog.scm shopping-cart.scm store.scm store.composite htdocs/*
+nobase_dist_sample_DATA = currency-converter.scm fruits-catalog.scm shopping-cart.scm store.scm store.composite htdocs/.htaccess htdocs/*.html htdocs/*.js
+EXTRA_DIST = script-test.scm
+
+dist_noinst_SCRIPTS = server-test
noinst_PROGRAMS = script-test
script_test_SOURCES = script-test.cpp
script_test_LDFLAGS = -lxml2 -lmozjs
Modified: tuscany/sca-cpp/trunk/samples/store-sql/Makefile.am
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-sql/Makefile.am?rev=949466&r1=949465&r2=949466&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-sql/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/samples/store-sql/Makefile.am Sun May 30 03:32:37 2010
@@ -17,11 +17,12 @@
if WANT_SQLDB
-sample_SCRIPTS = start stop ssl-start
+dist_sample_SCRIPTS = start stop ssl-start
sampledir = $(prefix)/samples/store-sql
-nobase_sample_DATA = currency-converter.scm fruits-catalog.scm shopping-cart.scm store.scm store.composite htdocs/*
+nobase_dist_sample_DATA = currency-converter.scm fruits-catalog.scm shopping-cart.scm store.scm store.composite htdocs/.htaccess htdocs/*.html htdocs/*.js
+dist_noinst_SCRIPTS = server-test
TESTS = server-test
endif
Copied: tuscany/sca-cpp/trunk/ubuntu/Makefile.am (from r949435, tuscany/sca-cpp/trunk/modules/scdl/Makefile.am)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/ubuntu/Makefile.am?p2=tuscany/sca-cpp/trunk/ubuntu/Makefile.am&p1=tuscany/sca-cpp/trunk/modules/scdl/Makefile.am&r1=949435&r2=949466&rev=949466&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/scdl/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/ubuntu/Makefile.am Sun May 30 03:32:37 2010
@@ -15,8 +15,5 @@
# specific language governing permissions and limitations
# under the License.
-scdl_test_SOURCES = scdl-test.cpp
-scdl_test_LDFLAGS = -lxml2
+dist_noinst_SCRIPTS = ubuntu-bin-image ubuntu-dev-image ubuntu-gcc-4.5 ubuntu-install uec2-bin-image uec2-conf uec2-setenv uec2-start uec2-status uec2-stop
-noinst_PROGRAMS = scdl-test
-TESTS = scdl-test