Changeset 766

Timestamp:

07/16/06 03:47:03 (6 years ago)

Author:

wd

Message:

More build stuff, installs now work and modules can be built with SConscript
files. Started clearing out old auto* cruft and long-dead tools.

Location:

branches/ithildin-scons

Files:

• SConstruct (modified) (5 diffs)
• build/options.default (modified) (3 diffs)
• build/tests.py (added)
• etc (moved) (moved from branches/ithildin-scons/doc/conf)
• include/Makefile.am (deleted)
• modules/echo/Makefile.am (deleted)
• modules/echo/acinclude.m4 (deleted)
• modules/echo/configure.ac (deleted)
• modules/echo/etc/echo.conf (added)
• tests (added)
• tools/build.py (deleted)
• tools/repover.sh (deleted)

branches/ithildin-scons/SConstruct

@@ -18 +18 @@
 EnsureSConsVersion(0,96,92)
 
-import os, sys
+import glob, os, sys
 # let's just stick the realpath() for ./build in there at the front.  THis
 # allows us to use our custom test code in the 'tests' module there.
@@ -46 +46 @@
     package_repository_version = int(svnrev.split()[1])
 
+# Find our availabe modules
+availabe_modules = []
+for e in os.listdir('modules'):
+    if os.path.exists('modules/%s/SConscript' % e):
+        availabe_modules.append(e)
 
 ###############################################################################
@@ -64 +69 @@
     ('fdsetsize', 'Override value of FD_SETSIZE', 0),
     BoolOption('ipv6', 'Enable IPv6 support', 1),
+    ListOption('modules', 'Modules to build', 'all', availabe_modules),
     PackageOption('openssl', 'Enable OpenSSL support', 'yes'),
     ListOption('poller', 'Socket polling method', 'auto',
@@ -217 +223 @@
 # IPv6 test:
 # We just look to see if we have getaddrinfo and if they want IPv6 support
-if 'getaddrinfo' in have_funcs and env['ipv6']:
-    print 'Enabling IPv6 support'
+if conf.CheckIPv6(have_funcs):
     env.Append(CPPDEFINES = ['INET6'])
 
@@ -272 +277 @@
 ###############################################################################
 # Build options and subsidiary code
+
+# Set our final environment parameters.
 env.Append(CPPPATH = '#/include')
 env.Append(LIBPATH = '#/lib')
-
-env.AlwaysBuild(env.Alias('update', '#/.svn', '%s update' % subversion))
-
+env.AppendUnique(RPATH = [env['libdir'], env['libdir'] + '/modules'])
+
+# Update target for subversion users.
+if subversion:
+    env.AlwaysBuild(env.Alias('update', '#/.svn', '%s update' % subversion))
+# Installation targets for documentation, config and include files
+tests.AddConfInstall(env, env['sysconfdir'], ['etc/ithildin.conf'])
+env.Install(env['datadir'], ['COPYING', 'DEVELOPERS', 'README'])
+env.Install(env['datadir'] + '/doc', glob.glob('doc/*.txt'))
+env.Install(env['includedir'] + '/ithildin',
+    glob.glob('include/ithildin/*.h'))
+
+# dummy install target with our various prefixes.
+env.Alias('install', [env['bindir'], env['sysconfdir'],
+        env['libdir'], env['includedir'], env['datadir']])
+
+# Now export useful variables
 env.Export(['env', 'package_name', 'package_version',
-    'package_repository_version'])
+    'package_repository_version', 'tests'])
+
+# and call our sub-scripts.
 env.SConscript('lib/SConscript')
 env.SConscript('source/SConscript')
 
+# Add the requested modules too!
+if str(env['modules']) == 'all':
+    modules = str.join(',', availabe_modules)
+elif str(env['modules']) == 'none':
+    modules = ''
+else:
+    modules = str(env['modules'])
+
+for m in modules.split(','):
+    env.SConscript('modules/%s/SConscript' % m)
+
 # vi:set ts=8 sts=4 sw=4 tw=76 et syntax=python:

branches/ithildin-scons/build/options.default

@@ +1 @@
+###############################################################################
+# Default options listing.  Most of these are safe to leave uncommented (see
+# below for where this isn't okay).  Please note that this is a PYTHON
+# SOURCED FILE.  If the quotes are there, leave them there!  If the quotes
+# are not there please leave them off.  Python will blow up otherwise.
+
 # Turn on debugging support in the code.  Uses lots of slow compiler options
 # and a bunch of evil on various platforms.
@@ -4 +10 @@
 # Explicitly set FD_SETSIZE for your application.  You usually do not need
 # this.
-fdsetsize = "0"
+fdsetsize = 0
 # Turn on/off IPv6 support (it is "on" if your system can support it by
 # default, you may remove the code if you wish)
@@ -20 +26 @@
 warnings = "no"
 # Specify the installation prefix for files
-prefix = /usr/local
+prefix = "/usr/local"
 # Specify the installation prefixes for binaries, config files, libraries
 # C headers and miscellaneous data respectively.  These values are generally
 # automatically generated via 'prefix' and so are commented out here with
 # their typical defaults.
-#bindir = /usr/local/bin
-#sysconfdir = /usr/local/etc/ithildin
-#libdir = /usr/local/lib/ithildin
-#includedir = /usr/local/include/ithildin
-#datadir = /usr/local/share/ithildin
+#bindir = "/usr/local/bin"
+#sysconfdir = "/usr/local/etc/ithildin"
+#libdir = "/usr/local/lib/ithildin"
+#includedir = "/usr/local/include/ithildin"
+#datadir = "/usr/local/share/ithildin"