Minor build fixes. Create missing .so links in sample. Unpack httpd-2.3.8-deps.tar.gz. Update EC2 build scripts to use Ubuntu 10.10 64-bit images.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1035553 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
9af713a9bd
commit
40d310c40e
3 changed files with 21 additions and 17 deletions
|
|
@ -22,12 +22,19 @@ sampledir = $(prefix)/samples/store-cpp
|
|||
nobase_dist_sample_DATA = currency-converter.cpp fruits-catalog.cpp shopping-cart.cpp store.composite htdocs/*.html
|
||||
|
||||
sample_LTLIBRARIES = libcurrency-converter.la libfruits-catalog.la libshopping-cart.la
|
||||
noinst_DATA = libcurrency-converter.so libfruits-catalog.so libshopping-cart.so
|
||||
|
||||
libcurrency_converter_la_SOURCES = currency-converter.cpp
|
||||
libcurrency-converter.so:
|
||||
ln -s .libs/libcurrency-converter.so
|
||||
|
||||
libfruits_catalog_la_SOURCES = fruits-catalog.cpp
|
||||
libfruits-catalog.so:
|
||||
ln -s .libs/libfruits-catalog.so
|
||||
|
||||
libshopping_cart_la_SOURCES = shopping-cart.cpp
|
||||
libshopping-cart.so:
|
||||
ln -s .libs/libshopping-cart.so
|
||||
|
||||
dist_noinst_SCRIPTS = server-test
|
||||
TESTS = server-test
|
||||
|
|
|
|||
|
|
@ -51,6 +51,8 @@ if [ "$?" != "0" ]; then
|
|||
fi
|
||||
wget http://archive.apache.org/dist/httpd/httpd-2.3.8.tar.gz
|
||||
tar xzf httpd-2.3.8.tar.gz
|
||||
wget http://archive.apache.org/dist/httpd/httpd-2.3.8-deps.tar.gz
|
||||
tar xzf httpd-2.3.8-deps.tar.gz
|
||||
cd httpd-2.3.8
|
||||
./configure --enable-ssl --enable-proxy --enable-usertrack --enable-mods-shared=most --with-included-apr --with-expat=$build/expat-2.0.1-bin --with-mpm=prefork --prefix=$build/httpd-2.3.8-bin
|
||||
make
|
||||
|
|
|
|||
|
|
@ -15,29 +15,24 @@
|
|||
# specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
# Start an Ubuntu 9.10 EC2 instance for use with Tuscany
|
||||
# Start an Ubuntu 10.10 64-bit EC2 instance for use with Tuscany
|
||||
|
||||
here=`readlink -f $0`; here=`dirname $here`
|
||||
$here/uec2-setenv
|
||||
|
||||
# Here are the AMIs you can use in the different EC2 regions:
|
||||
# Ubuntu 9.10 (instance storage)
|
||||
# US east 1 - ami-bb709dd2
|
||||
# US west 1 - ami-c32e7f86
|
||||
# EU west 1 - ami-2fc2e95b
|
||||
#
|
||||
# Ubuntu 10.04 (elastic block storage)
|
||||
# US east 1 - ami-1234de7b
|
||||
# US west 1 - ami-10f3a255
|
||||
# EU west 1 - ami-38bf954c
|
||||
# AP s.east - ami-2c354b7e
|
||||
# Here are the AMI IDs you can use in the different EC2 regions:
|
||||
# Ubuntu 10.10 64-bit (elastic block storage)
|
||||
# US east 1 - ami-548c783d
|
||||
# US west 1 - ami-ca1f4f8f
|
||||
# EU west 1 - ami-405c6934
|
||||
# AP s.east - ami-68136d3a
|
||||
# More AMI IDs at http://uec-images.ubuntu.com
|
||||
|
||||
# Here are some of the instance types you can use:
|
||||
# t1.micro (elastic block storage only)
|
||||
# m1.small (default)
|
||||
# t1.micro
|
||||
# m1.large
|
||||
|
||||
#ec2-run-instances "ami-c32e7f86" -k ec2-tuscany-keypair --region us-west-1
|
||||
#ec2-run-instances "ami-10f3a255" -t t1.micro -k ec2-tuscany-keypair --region us-west-1
|
||||
ec2-run-instances "ami-10f3a255" -k ec2-tuscany-keypair --region us-west-1
|
||||
#ec2-run-instances "ami-ca1f4f8f" -t m1.large -k ec2-tuscany-keypair --region us-west-1
|
||||
#ec2-run-instances "ami-ca1f4f8f" -t t1.micro -k ec2-tuscany-keypair --region us-west-1
|
||||
ec2-run-instances "ami-ca1f4f8f" -t t1.micro -k ec2-tuscany-keypair --region us-west-1
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue