Updated licenses and installation files (#290)

Licensing is updated to include apache apr license details, and
configuration, readme and license files are now included in all builds
by default including RPMs and windows.

The libraries used during the build are also now included in the package
to avoid the user having to install any further dependencies. It also
ensures that versions match for compile vs run time and that we can
avoid the issue where qpid proton keeps changing its shared object name
(we may remove this from RPM builds when that volatility settles down).

Documentation in the README has also been updated to refer to the new
licensing file.

Signed-off-by: Frank Quinn <fquinn.ni@gmail.com>

README.md

@@ -42,6 +42,11 @@ Documentation
 --------------------------------------------------------------------------------
 We host the latest OpenMAMA Technical documentation on [http://openmama.github.io](http://openmama.github.io)
 
+Licensing
+--------------------------------------------------------------------------------
+This software is licensed under LGPL 2.1. Full terms are included in the `LICENSE.md` file. This software also
+depends on several third party libraries, the licenses for which are listed in the `LICENSE-3RD-PARTY.txt` file.
+
 Contributing
 --------------------------------------------------------------------------------
 Information on contributing on the project can be found on our [Get Involved](http://www.openmama.org/get-involved) page.

SConstruct

@@ -144,3 +144,6 @@ if not env.GetOption('help'):
     if env.get('test',None) == True:
         Test.run( env )
 
+    Alias ('install', env.Install('$prefix', ["LICENSE-3RD-PARTY.txt", "LICENSE.md", "README.md"]))
+    Alias ('install', env.Install('$prefix/config/', "mama/c_cpp/src/examples/mama.properties"))
+

mama/c_cpp/src/c/SConscript

@@ -225,6 +225,11 @@ Alias('install', env.Install('$prefix/include/mama/conflation',
 Alias('install', env.Install('$prefix/include/mama/fieldcache',
       InstFieldCacheInclude))
 
+if env['target_arch'] == "x86_64":
+    Alias ('install', env.Install('$libdir', Glob('%s/lib64/libapr-1.so*' % env['apr_home'])))
+else:
+    Alias ('install', env.Install('$libdir', Glob('%s/lib/libapr-1.so*' % env['apr_home'])))
+
 env.SConscript('bridge/SConscript', 'env')
 env.SConscript('payload/SConscript', 'env')
 env.SConscript('entitlement/SConscript', 'env')

mama/c_cpp/src/c/bridge/qpid/SConscript

@@ -52,3 +52,12 @@ lib.append(env.SharedLibrary(target, sources))
 lib.append(env.StaticLibrary(target, [sources]))
 
 Alias('install', env.Install('$libdir', lib))
+
+# Install the qpid proton and libevent shared objects
+if env['target_arch'] == "x86_64":
+    Alias ('install', env.Install('$libdir', Glob('%s/lib64/libqpid-proton.so*' % env['qpid_home'])))
+    Alias ('install', env.Install('$libdir', Glob('%s/lib64/libevent.so*' % env['libevent_home'])))
+else:
+    Alias ('install', env.Install('$libdir', Glob('%s/lib/libqpid-proton.so*' % env['qpid_home'])))
+    Alias ('install', env.Install('$libdir', Glob('%s/lib/libevent.so*' % env['libevent_home'])))
+

release_scripts/openmama-rpm.sh

@@ -299,9 +299,7 @@ if [ $PACKAGE_RELEASE -eq 1 ] && [ $RETURN_CODE -eq 0 ]; then
     try mkdir ${BINARY_DIR}/config
     try cp -r ${MOCK_BIN_TARBALL_DIR}/data/* ${BINARY_DIR}/data/
     try cp -r ${MOCK_BIN_TARBALL_DIR}/openmama_install*/* ${BINARY_DIR}/
-    try cp    ${MOCK_BIN_TARBALL_DIR}/data/profiles/profile.openmama ${BINARY_DIR}/config/
-    try cp    ${MOCK_BIN_TARBALL_DIR}/*.md ${BINARY_DIR}/
-    try cp    ${MOCK_BIN_TARBALL_DIR}/mama/c_cpp/src/examples/mama.properties ${BINARY_DIR}/config/
+    try cp    ${MOCK_BIN_TARBALL_DIR}/data/profiles/profile.openmama ${BINARY_DIR}/
 
     try cd ${BUILD_DIR}/binary/
     try tar -zcf ${RELEASE_DIR}/openmama-${VERSION}.linux.x86_64.tar.gz openmama-${VERSION}

release_scripts/openmama.spec

@@ -42,10 +42,7 @@ mkdir %{buildroot}/opt/openmama/data
 mkdir %{buildroot}/opt/openmama/config
 cp -r %{_builddir}/%{name}-%{version}/data/* %{buildroot}/opt/openmama/data/
 cp -r %{_builddir}/%{name}-%{version}/openmama_install_*/* %{buildroot}/opt/openmama
-cp %{_builddir}/%{name}-%{version}/data/profiles/profile.openmama %{buildroot}/opt/openmama/config/
-cp %{_builddir}/%{name}-%{version}/README.md %{buildroot}/opt/openmama/
-cp %{_builddir}/%{name}-%{version}/LICENSE.md %{buildroot}/opt/openmama/
-cp %{_builddir}/%{name}-%{version}/mama/c_cpp/src/examples/mama.properties %{buildroot}/opt/openmama/config
+cp %{_builddir}/%{name}-%{version}/data/profiles/profile.openmama %{buildroot}/opt/openmama/
 
 %clean
 rm -rf %{buildroot}
@@ -67,7 +64,9 @@ rm -rf %{buildroot}
 /opt/openmama/include/wombat
 /opt/openmama/include/mama
 /opt/openmama/include/mamda
+/opt/openmama/profile.openmama
 /opt/openmama/README.md
 /opt/openmama/LICENSE.md
+/opt/openmama/LICENSE-3RD-PARTY.txt
 
 %changelog

site_scons/community/command_line.py

@@ -64,7 +64,7 @@ def get_command_line_opts( host, products, VERSIONS ):
     if host['os'] == 'Linux':
         opts.AddVariables(
             PathVariable('qpid_home','Path to QPID Proton Libraries',
-                '/usr/local/', PathVariable.PathIsDir),
+                '/usr/', PathVariable.PathIsDir),
             PathVariable('cache_dir','Path to object cache', None, PathVariable.PathIsDir),
             EnumVariable('product', 'Product to be built', 'mamda',
                          #mamda all is a windows only build