Changeset 195

Timestamp:

05/02/10 14:40:47 (15 years ago)

Author:

tim

Message:

removed talloc from mainline build tree, opting instead to depend upon libtalloc-dev

win32 builds depend up on modified libtalloc stored outside of trunk

miscellaneous other build fixes

Files:

• SConstruct (modified) (5 diffs)
• trunk/SConstruct (modified) (2 diffs)
• trunk/include/talloc.h (deleted)
• trunk/lib/talloc.c (deleted)
• win32/libtalloc (added)
• win32/libtalloc-2.0.1 (added)
• win32/libtalloc-2.0.1/README (added)
• win32/libtalloc-2.0.1/SConstruct (added)
• win32/libtalloc-2.0.1/bin (added)
• win32/libtalloc-2.0.1/bin/libtalloc.dll (added)
• win32/libtalloc-2.0.1/include (added)
• win32/libtalloc-2.0.1/include/talloc.h (added)
• win32/libtalloc-2.0.1/lib (added)
• win32/libtalloc-2.0.1/lib/libtalloc.dll.a (added)
• win32/libtalloc-2.0.1/src (added)
• win32/libtalloc-2.0.1/src/talloc.c (added)

SConstruct

@@ -4 +4 @@
 libpthreads_path='win32/libpthreads/'
 libpthread_name='pthreadGC2'
+libtalloc_path='win32/libtalloc/'
 
 source_targets=('reglookup-trunk.tar.gz',)
@@ -29 +30 @@
 rm -rf .release && mkdir -p .release/%s
 cp %s/src/*.exe .release/%s
-cp win32/libiconv/bin/*.dll win32/libpthreads/bin/*.dll .release/%s
+cp win32/libiconv/bin/*.dll win32/libpthreads/bin/*.dll win32/libtalloc/bin/*.dll .release/%s
 cd .release && zip -r %s.zip %s
 mv .release/%s.zip . && rm -rf .release
@@ -54 +55 @@
             env['CPPPATH']=[input_prefix+'include', 
                             libiconv_path+'include',
-                            libpthreads_path+'include']
+                            libpthreads_path+'include',
+                            libtalloc_path+'include']
             env['LIBPATH']=[input_prefix+'lib',
                             libiconv_path+'lib',
-                            libpthreads_path+'lib']
-            env['LIBS']=['m', libpthread_name, 'iconv', 'regfi']
+                            libpthreads_path+'lib',
+                            libtalloc_path+'lib']
+            env['LIBS']=['m', libpthread_name, 'iconv', 'regfi', 'talloc']
 
             
             # Libraries
             lib_src = [input_prefix+'lib/regfi.c',
-                       input_prefix+'lib/talloc.c',
                        input_prefix+'lib/winsec.c',
                        input_prefix+'lib/range_list.c',
@@ -72 +74 @@
             extra_obj=['%s/lib/lib%s.a' % (libpthreads_path, libpthread_name),
                        libiconv_path+'/lib/libiconv.dll.a',
-                       input_prefix+'lib/libregfi.a']
+                       libtalloc_path+'/lib/libtalloc.dll.a',
+                       input_prefix+'lib/libregfi.a',]
 
             # Executables
@@ -100 +103 @@
 
 
-for target in source_targets:
-    env.Release(target, Dir(version2input(target2version(target))))
-
-for target in win32_targets:
+for target in COMMAND_LINE_TARGETS:
     env.Release(target, Dir(version2input(target2version(target))))
 

trunk/SConstruct

@@ -4 +4 @@
 
 lib_src = ['lib/regfi.c',
-           'lib/talloc.c',
            'lib/winsec.c',
            'lib/range_list.c',
@@ -13 +12 @@
                   CPPPATH=['include', '/usr/local/include'],
                   LIBPATH=['lib', '/usr/local/lib'],
-                  LIBS=['m', 'pthread', 'regfi'])
+                  LIBS=['m', 'pthread', 'regfi', 'talloc'])