Changeset 3750

Timestamp:

10/03/11 11:44:07 (20 months ago)

Author:

vtchill

Message:

Added option --lib-dir to scons build system to specify a shared library install location. The shared library generated will now contain an soname that will be libfife.so.major. Also changed the generated shared library name to be libfife.so.major.minor.release. Added a version.h file to engine/core that will contain the current fife major, minor, and subminor versions and should be updated for each fife release. [t:575]

Location:

branches/active/0.3.3dev

Files:

• SConstruct (modified) (4 diffs)
• build/linux2-config.py (modified) (1 diff)
• engine/SConscript (modified) (2 diffs)
• engine/core/version.h (added)
• utils/scons/scons_utils.py (modified) (2 diffs)

branches/active/0.3.3dev/SConstruct

@@ -106 +106 @@
                 help='Forces fife to use the local version of tinyxml that ships with fife',
                 default=False)
+
+AddOption('--lib-dir',
+                dest='lib-dir',
+                nargs=1, type='string',
+                action='store',
+                metavar='DIR',
+                help='Shared Library install location') 
                 
 #**************************************************************************
@@ -174 +181 @@
         prefix = env['DESTDIR'] + prefix
         pythonprefix = env['DESTDIR'] + pythonprefix
+
+libdir = GetOption('lib-dir')
+if libdir is None:
+        libdir = os.path.join(prefix, 'lib')
+else:
+        libdir = os.path.join(prefix, libdir)
+        
+env['LIBDIR'] = libdir
 
 #**************************************************************************
@@ -339 +354 @@
                 'DEBUG' : debug,
                 'PREFIX' : prefix,
+                'LIBDIR' : libdir,
                 'TESTLIBS' : ['fife', 'UnitTest++'],
                 'PYTHON_PREFIX' : pythonprefix,
@@ -344 +360 @@
                 'PYLIB_COPY_DEST' : os.path.join('#engine', 'python', 'fife')}
 
+opts['FIFE_VERSION'] = utils.get_fife_version(os.path.join(opts['SRC'], 'core'));
+
 if debug:
         opts['LIBPATH'] = os.path.join(os.getcwd(), 'build', 'engine', 'debug')

branches/active/0.3.3dev/build/linux2-config.py

@@ -41 +41 @@
 
         env.Append(LIBPATH = [os.path.join('/', 'opt', 'lib'),
-                                                  extlibpath])
+                                                  extlibpath,
+                                                  env.subst('$LIBDIR')])
         
         env.AppendENVPath('LD_RUN_PATH', os.path.join('..', '..', '..', extlibpath))

branches/active/0.3.3dev/engine/SConscript

@@ -127 +127 @@
                                                                   OBJPREFIX='shared_',
                                                                   SHLIBEMITTER = '')
-else:
+elif sys.platform == 'darwin':
         sharedlib = env.SharedLibrary(target = fife_tgt,
                                                                   source = compilefiles)
+else:
+        # soname will be libfife.so.major
+        majorVersion = opts['FIFE_VERSION'].split('.')[0]       
+        soname = env.subst('$SHLIBPREFIX') + fife_tgt + env.subst('$SHLIBSUFFIX') + '.' + majorVersion
+        sharedlib = env.SharedLibrary(target = fife_tgt,
+                                                                  source = compilefiles,
+                                                                  SHLIBSUFFIX = env.subst('$SHLIBSUFFIX') + '.' + opts['FIFE_VERSION'],
+                                                                  LINKFLAGS=['-Wl,-soname,' + str(soname)])
 
 #**************************************************************************
@@ -180 +188 @@
 #TODO: This is not complete.  Because of the current linux rpath issue this
 #will not work as expected.
-install_static = env.Install(os.path.join(opts['PREFIX'], 'lib'), staticlib)
-install_shared = env.Install(os.path.join(opts['PREFIX'], 'lib'), sharedlib)
+install_static = env.Install(opts['LIBDIR'], staticlib)
+install_shared = env.Install(opts['LIBDIR'], sharedlib)
 
 headerdestlist = utils.gen_dest_files(os.path.join(opts['PREFIX'], 'include', 'fife'), headerfiles)

branches/active/0.3.3dev/utils/scons/scons_utils.py

@@ -23 +23 @@
 
 import os, sys
+import re
 from string import Template
 
@@ -108 +109 @@
         interfacefile = os.path.join(outdir, 'fife.i')
         open(interfacefile, 'w').write(template.substitute(inclusions=inclusions))
+
+def get_fife_version(srcpath):
+    MAJOR_VERSION_PATTERN = re.compile(r"#define\s+FIFE_MAJOR_VERSION\s+(.*)")
+    MINOR_VERSION_PATTERN = re.compile(r"#define\s+FIFE_MINOR_VERSION\s+(.*)")
+    SUBMINOR_VERSION_PATTERN = re.compile(r"#define\s+FIFE_SUBMINOR_VERSION\s+(.*)")
+    
+    patterns = [MAJOR_VERSION_PATTERN,
+                MINOR_VERSION_PATTERN,
+                SUBMINOR_VERSION_PATTERN]
+        
+    source = open(os.path.join(srcpath, 'version.h'), 'r').read()
+    versionInfo = []
+    for pattern in patterns:
+        match = pattern.search(source)
+        if match:
+                        versionInfo.append(match.group(1).strip())
+            
+    return '.'.join(versionInfo)