Changeset 764 for branches

Timestamp:

07/15/06 09:49:51 (6 years ago)

Author:

wd

Message:

Base build now works. We have a default options file. We also have some
added options for installation and a dummy 'update' target.

Location:

branches/ithildin-scons

Files:

• SConstruct (modified) (5 diffs)
• build/options.default (added)
• source/main.c (modified) (4 diffs)

branches/ithildin-scons/SConstruct

@@ -11 +11 @@
 ###############################################################################
 # Initial setup (Python path tweaks etc)
-import os, sys
-sys.path.insert(0, os.path.realpath(os.path.dirname(sys.argv[0])))
+
+package_name = "ithildin"
+package_version = "1.2.0"
 
 EnsurePythonVersion(2,2)
 EnsureSConsVersion(0,96,92)
+
+import 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.
+sys.path.insert(0, os.path.realpath('./build'))
+import tests
 
 ###############################################################################
@@ -23 +30 @@
 })
 
+# Perform some magic to get the repository version.  If we have svn and we
+# can use xml.dom.minidom let's go for it
+try:
+    subversion = WhereIs('svn')
+    import xml.dom.minidom
+    if subversion:
+        dom = xml.dom.minidom.parseString(
+            os.popen('%s info --xml .' % subversion).read())
+        e = dom.getElementsByTagName('entry')[0]
+        package_repository_version = int(e.getAttribute('revision'))
+        dom.unlink()
+except:
+    # no luck eh, let's cheat
+    svnrev = "$Rev: 1 $"
+    package_repository_version = int(svnrev.split()[1])
+
+
 ###############################################################################
 # Options
+
+# Collect the list of modules we have shipped with
+
+if not os.path.exists('build/options'):
+    env.Help("""
+You may save your build options in the file build/options with the format:
+optionname = "optionvalue"
+A sample options file is provided in build/options.default.
+""")
+
 opts = Options('build/options', ARGUMENTS)
 opts.AddOptions(
@@ -34 +68 @@
         ['kqueue', 'poll', 'select', 'auto']),
     BoolOption('warnings', 'Compile with very aggressive warning settings', 0),
+# Other path options are handled below 
+    PathOption('prefix', 'Installation prefix', '/usr/local',
+        tests.PathIsDirCreateAccess),
 )
-
 opts.Update(env)
 
+# Now take a look in prefix for the stuff we care about: bin, etc, lib,
+# include, share.  If these already exist we make our defaults
+# $prefix/etc/ithildin etc.  Otherwise we make them $prefix/etc (assuming
+# this is a lone installation location).  This is an automated version of
+# the old  --disable-dir-suffix autoconf macro from 1.1 and lower.
+#
+# XXX: this is all dumb in Windows where installations will be totally
+# different.
+
+# Okay, let's make some dumb guesses:  If the name already contains
+# 'package' in it let's go ahead and not add that again.  If the name is
+# standard (/usr, /usr/local, /opt) let's add it there.  Other than that we
+# aren't too smart. :)
+if env['prefix'] == '/usr' or env['prefix'] == '/opt':
+    # /usr and /opt need special handling to stuff things in /etc
+    sysconfdir = '/etc'
+else:
+    sysconfdir = env['prefix'] + '/etc'
+
+dir_suffix = ''
+if not package_name in env['prefix']:
+    dir_suffix = '/' + package_name
+# let's add one more, if it's in $HOME/<something> let's guess that they
+# don't want that nasty dir_suffix.  This could be so wrong as to be absurd,
+# but I believe it is what most will want.
+if (os.environ.has_key('HOME') and os.environ['HOME'] in env['prefix']):
+    dir_suffix = ''
+
+opts.AddOptions(
+    PathOption('bindir', "Binary installation directory",
+        env['prefix'] + '/bin', tests.PathIsDirCreateAccess),
+    PathOption('sysconfdir', "Configuration file installation directory",
+        sysconfdir + dir_suffix, tests.PathIsDirCreateAccess),
+    PathOption('libdir', "Library installation directory",
+        env['prefix'] + '/lib' + dir_suffix, tests.PathIsDirCreateAccess),
+    PathOption('includedir', 'C header installation directory',
+        env['prefix'] + '/include', tests.PathIsDirCreateAccess),
+    PathOption('datadir', "Miscellaneous file installation directory",
+        env['prefix'] + '/share' + dir_suffix, tests.PathIsDirCreateAccess),
+)
+opts.Update(env)
+
 env.Help(opts.GenerateHelpText(env))
 
@@ -43 +121 @@
 # Feature tests
 
-import tests
 conf = env.Configure(config_h = 'include/ithildin/config.h',
     custom_tests = tests.tests)
@@ -198 +275 @@
 env.Append(LIBPATH = '#/lib')
 
-env.Export('env')
+env.AlwaysBuild(env.Alias('update', '#/.svn', '%s update' % subversion))
+
+env.Export(['env', 'package_name', 'package_version',
+    'package_repository_version'])
 env.SConscript('lib/SConscript')
 env.SConscript('source/SConscript')

branches/ithildin-scons/source/main.c

@@ -83 +83 @@
 
     me.started = me.now = time(NULL);
-    /*
     strncpy(me.conf_path, PACKAGE_PATH_SYSCONF, PATH_MAX);
     strncpy(me.lib_path, PACKAGE_PATH_LIB "/modules", PATH_MAX);
@@ -90 +89 @@
     sprintf(me.version, "%s-%s", PACKAGE_NAME, PACKAGE_VERSION);
     me.revision = PACKAGE_REPOSITORY_VERSION;
-    */
     me.fork = 1; /* by default we fork */
 
@@ -303 +301 @@
                 strncpy(me.conf_path, optarg, PATH_MAX);
                 break;
-                /*
             case 'v':
                 printf("%s (r%d)\n", me.version, me.revision);
@@ -318 +315 @@
 
                 exit(0);
-                */
             case '?':
                 printf(usage, me.execname);