Changeset 277


Ignore:
Timestamp:
12/03/11 20:02:33 (12 years ago)
Author:
tim
Message:

incorporated a version of Adam Golebiowski's build patches
reworked REGFI_VERSION and began using it in pyregfi installation

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • SConstruct

    r276 r277  
    99libtalloc_path='.export/win32/libtalloc/'
    1010
     11latest_release='1.0.1'
    1112source_targets=('src-trunk', 'src-0.99.0', 'src-1.0.0', 'src-1.0.1')
    1213win32_targets=('win32-trunk', 'win32-0.99.0', 'win32-1.0.0', 'win32-1.0.1')
     
    4142svn info svn+ssh://%(user)s@sentinelchicken.org/home/projects/subversion/reglookup\
    4243  | grep "Last Changed Rev:" | cut -d' ' -f 4 \
    43   | sed 's/^/REGFI_VERSION="svn-/' | sed 's/$/"/' > .export/%(path)s/regfi_version.py
     44  | sed 's/^/REGFI_VERSION="%(latest_release)s./' | sed 's/$/"/' > .export/%(path)s/regfi_version.py
    4445'''
    4546
     
    168169    params = {'user':os.environ['USER'],
    169170              'path':version2input(version),
    170               'version':version}
     171              'version':version,
     172              'latest_release':latest_release}
    171173    env.Execute(export_cmds % params)
    172174    if version == 'trunk':
  • trunk/SConstruct

    r273 r277  
    2424# Libraries
    2525libregfi_static = env.Library(lib_src)
    26 libregfi = env.SharedLibrary(lib_src, LIBS=['m','pthread', 'talloc'])
     26libregfi = env.SharedLibrary(lib_src, LIBS=['m','pthread', 'talloc'],
     27                             LINKFLAGS="-shared -fPIC -Wl,-soname,libregfi.so.%s" % REGFI_VERSION)
    2728
    2829
     
    4647
    4748# Installation
    48 prefix='/usr/local/'
    49 if 'PREFIX' in os.environ:
    50    prefix = os.environ['PREFIX']+'/'
     49prefix     = os.environ.get('PREFIX','/usr/local')+'/'
     50destdir    = os.environ.get('DESTDIR','')
     51bindir     = os.environ.get('BINDIR', prefix + 'bin')
     52libdir     = os.environ.get('LIBDIR', prefix + 'lib')
     53includedir = os.environ.get('INCLUDEDIR', prefix + 'include')
     54mandir     = os.environ.get('MANDIR', prefix + 'man')
    5155
    52 install_items = [prefix+'bin',
    53                  prefix+'lib',
    54                  prefix+'include/regfi',
    55                  prefix+'man']
     56install_items = [destdir + bindir,
     57                 destdir + libdir,
     58                 destdir + includedir + '/regfi',
     59                 destdir + mandir]
    5660
    57 env.Install(prefix+'bin', [reglookup, reglookup_recover, 'bin/reglookup-timeline'])
    58 libinstall = env.Install(prefix+'lib', [libregfi, libregfi_static])
    59 env.Install(prefix+'include/regfi', Glob('include/*.h'))
    60 env.Install(prefix+'man/man1', [man_reglookup, man_reglookup_recover,
    61                                 man_reglookup_timeline])
    62 env.AddPostAction(libinstall, 'ldconfig')
     61
     62env.Install(destdir+bindir, [reglookup, reglookup_recover, 'bin/reglookup-timeline'])
     63libinstall = env.Install(destdir+libdir, [libregfi, libregfi_static])
     64env.Install(destdir+includedir+'/regfi', Glob('include/*.h'))
     65env.Install(destdir+mandir+'/man1', [man_reglookup, man_reglookup_recover,
     66                                     man_reglookup_timeline])
     67if os.getuid() == 0:
     68   env.AddPostAction(libinstall, 'ldconfig')
    6369
    6470if sys.version_info[0] == 2:
     
    6773                                        'python/pyregfi/structures.py',
    6874                                        'python/pyregfi/winsec.py'],
    69                "python pyregfi-distutils.py install | tee pyregfi2-install.log")
     75               "python pyregfi-distutils.py install --root=%s | tee pyregfi2-install.log" % destdir)
    7076
    7177python_path = os.popen('which python3').read()
     
    7581                                        'python/pyregfi/structures.py',
    7682                                        'python/pyregfi/winsec.py'],
    77                "python3 pyregfi-distutils.py install | tee pyregfi3-install.log")
     83               "python3 pyregfi-distutils.py install --root=%s | tee pyregfi3-install.log" % destdir)
    7884
    7985# API documentation
  • trunk/pyregfi-distutils.py

    r256 r277  
    11# Called from scons with appropriate python version
     2import sys
     3from distutils.core import setup
     4sys.dont_write_bytecode = True
     5from regfi_version import REGFI_VERSION
     6sys.dont_write_bytecode = False
    27
    3 from distutils.core import setup
    4 setup(name='pyregfi', version='1.0', package_dir={'':'python'}, packages=['pyregfi'])
     8setup(name='pyregfi', version=REGFI_VERSION, package_dir={'':'python'}, packages=['pyregfi'])
  • trunk/regfi_version.py

    r232 r277  
    11SVN_REV = "$Rev$"
    2 REGFI_VERSION = "svn-%s" % SVN_REV.split(' ')[1]
     2REGFI_VERSION = "99.99.99.%s" % SVN_REV.split(' ')[1]
Note: See TracChangeset for help on using the changeset viewer.