Changeset 191

Timestamp:

04/25/10 17:52:37 (15 years ago)

Author:

tim

Message:

updated scons build scripts to handle MinGW
added binaries for MinGW build dependencies

Files:

• SConstruct (modified) (3 diffs)
• trunk/SConstruct (modified) (3 diffs)
• win32 (added)
• win32/libiconv (added)
• win32/libiconv-1.13 (added)
• win32/libiconv-1.13/COPYING (added)
• win32/libiconv-1.13/COPYING.LIB (added)
• win32/libiconv-1.13/README (added)
• win32/libiconv-1.13/bin (added)
• win32/libiconv-1.13/bin/libcharset-1.dll (added)
• win32/libiconv-1.13/bin/libiconv-2.dll (added)
• win32/libiconv-1.13/include (added)
• win32/libiconv-1.13/include/iconv.h (added)
• win32/libiconv-1.13/include/libcharset.h (added)
• win32/libiconv-1.13/include/localcharset.h (added)
• win32/libiconv-1.13/lib (added)
• win32/libiconv-1.13/lib/charset.alias (added)
• win32/libpthreads (added)
• win32/libpthreads-w32-2.8.0 (added)
• win32/libpthreads-w32-2.8.0/COPYING (added)
• win32/libpthreads-w32-2.8.0/COPYING.LIB (added)
• win32/libpthreads-w32-2.8.0/README (added)
• win32/libpthreads-w32-2.8.0/bin (added)
• win32/libpthreads-w32-2.8.0/bin/pthreadGC2.dll (added)
• win32/libpthreads-w32-2.8.0/include (added)
• win32/libpthreads-w32-2.8.0/include/config.h (added)
• win32/libpthreads-w32-2.8.0/include/implement.h (added)
• win32/libpthreads-w32-2.8.0/include/need_errno.h (added)
• win32/libpthreads-w32-2.8.0/include/pthread.h (added)
• win32/libpthreads-w32-2.8.0/include/sched.h (added)
• win32/libpthreads-w32-2.8.0/include/semaphore.h (added)
• win32/libpthreads-w32-2.8.0/lib (added)

SConstruct

@@ +1 @@
+cflags = '-std=gnu99 -pedantic -Wall'
 
-build_cmds='''
+libiconv_path='win32/libiconv/'
+libpthreads_path='win32/libpthreads/'
+libpthread_name='pthreadGC2'
+
+source_targets=('reglookup-trunk.tar.gz',)
+win32_targets=('reglookup-trunk-win32.zip',)
+
+def target2version(target):
+    return target.split('-')[1].split('.')[0]
+
+def version2input(version):
+    if version == 'trunk':
+        return 'trunk/'
+    else:
+        return 'releases/%s/' % version
+
+
+source_cmds='''
 rm -rf .release;
 svn export svn+ssh://sentinelchicken.org/home/projects/subversion/reglookup/$SOURCE .release/%s;
-#XXX: Can this be less of a hack?
 cd .release/%s && scons doc
 cd .release && tar cf %s.tar %s && gzip -9 %s.tar;
@@ -9 +26 @@
 '''
 
-buildable_files=('reglookup-trunk.tar.gz',)
+win32_cmds='''
+rm -rf .release && mkdir -p .release/%s
+cp %s/src/*.exe .release/%s
+cp win32/libiconv/bin/*.dll win32/libpthreads/bin/*.dll .release/%s
+cd .release && zip -r %s.zip %s
+mv .release/%s.zip . && rm -rf .release
+'''
 
 def generate_cmds(source, target, env, for_signature):
     ret_val = ''
     for t in target:
-        if str(t) in buildable_files:
-            t_base = str(t).split('.')[0]
-            ret_val += build_cmds % (t_base,t_base,t_base,
-                                     t_base,t_base,t_base)
+        t = str(t)
+        t_base = t.split('.tar.gz')[0].split('.zip')[0]
+        if t in source_targets:
+            ret_val += source_cmds % (t_base,t_base,t_base,
+                                      t_base,t_base,t_base)
+        elif t in win32_targets:
+            version = target2version(t)
+            input_prefix = version2input(version)
+
+            env['platform']='cygwin'
+            env['CC']='i586-mingw32msvc-cc'
+            env['AR']='i586-mingw32msvc-ar'
+            env['RANLIB']='i586-mingw32msvc-ranlib'
+            
+            env['CFLAGS']=cflags
+            env['CPPPATH']=[input_prefix+'include', 
+                            libiconv_path+'include',
+                            libpthreads_path+'include']
+            env['LIBPATH']=[input_prefix+'lib',
+                            libiconv_path+'lib',
+                            libpthreads_path+'lib']
+            env['LIBS']=['m', libpthread_name, 'iconv', 'regfi']
+
+            
+            # Libraries
+            lib_src = [input_prefix+'lib/regfi.c',
+                       input_prefix+'lib/talloc.c',
+                       input_prefix+'lib/winsec.c',
+                       input_prefix+'lib/range_list.c',
+                       input_prefix+'lib/lru_cache.c',
+                       input_prefix+'lib/void_stack.c']
+            libregfi_static = env.Library(lib_src)
+
+            extra_obj=['%s/lib/lib%s.a' % (libpthreads_path, libpthread_name),
+                       libiconv_path+'/lib/libiconv.dll.a',
+                       input_prefix+'lib/libregfi.a']
+
+            # Executables
+            reglookup = env.Program(input_prefix+'src/reglookup.exe',
+                                    [input_prefix+'src/reglookup.c']+extra_obj)
+            reglookup_recover = env.Program(input_prefix+'src/reglookup-recover.exe',
+                                            [input_prefix+'src/reglookup-recover.c']+extra_obj)
+
+            ret_val += win32_cmds % (t_base,input_prefix,
+                                     t_base,t_base,t_base,t_base,t_base)
+
         else:
             return '#ERROR: cannot build "%s".  Acceptable targets: %s' % (t, repr(buildable_files))
+        
+    return ret_val
 
-    return ret_val
 
 
@@ -29 +95 @@
                           prefix='reglookup-')
 
+
 env = Environment()
 env['BUILDERS']['Release'] = release_builder
 
 
-env.Release(Dir('trunk'))
-#env.Release('reglookup-0.13.0.tar.gz', Dir('releases/0.13.0'))
+for target in source_targets:
+    env.Release(target, Dir(version2input(target2version(target))))
+
+for target in win32_targets:
+    env.Release(target, Dir(version2input(target2version(target))))
+
 
 Default(None)

trunk/SConstruct

@@ -2 +2 @@
 cflags = '-std=gnu99 -pedantic -Wall -ggdb'
 
-if False:
-    # XXX: get mingw build working again with pthreads
-    libiconv_path='/usr/local/src/libiconv-1.13-mingw32-dev'
-    env = Environment(CC='i586-mingw32msvc-cc',
-                      CFLAGS=cflags,
-                      CPPPATH=['include', '/usr/local/include',
-                               libiconv_path+'/include'],
-                      LIBPATH=['lib', '/usr/local/lib',
-                               libiconv_path+'/lib'],
-                      LIBS=['m', 'pthread', 'regfi'])
-else:
-    env = Environment(CFLAGS=cflags,
-                      CPPPATH=['include', '/usr/local/include'],
-                      LIBPATH=['lib', '/usr/local/lib'],
-                      LIBS=['m', 'pthread', 'regfi'])
-    
 
 lib_src = ['lib/regfi.c',
@@ -26 +10 @@
            'lib/void_stack.c']
 
+env = Environment(CFLAGS=cflags,
+                  CPPPATH=['include', '/usr/local/include'],
+                  LIBPATH=['lib', '/usr/local/lib'],
+                  LIBS=['m', 'pthread', 'regfi'])
+    
+
 # Libraries
 libregfi_static = env.Library(lib_src)
@@ -32 +22 @@
 
 # Executables
-reglookup = env.Program('src/reglookup.c')
-reglookup_recover = env.Program('src/reglookup-recover.c')
+reglookup = env.Program(['src/reglookup.c'])
+reglookup_recover = env.Program(['src/reglookup-recover.c'])