[Clam-devel] Windows platform: cpppath and qt3 dependencies patch

[Pau Arumi]

Thanks for the patch Pol,
but i get the attachment as html with broken lines. Do you have 
any other ways to format the mail or its attachments?

pau


En/na Pol Pros ha escrit:
> Windows platform:
> 
> - SConstruct cpppath fixed
> - Qt3 dependencies fixed
> 
> Pol
> 
> _________________________________________________________________
> Descubre la descarga digital con MSN Music. Más de un millón de 
> canciones. http://music.msn.es/
> Index: scons/libs/clam_build_helpers.py
> ===================================================================
> --- scons/libs/clam_build_helpers.py    (revision 10064)
> +++ scons/libs/clam_build_helpers.py    (working copy)
> @@ -293,15 +293,15 @@
>         libnames = [self.name] + self.extra
>         # extract libs from env
>         libnames += edict['LIBS']
> -        libnames.remove( '$QT_LIB' )
> -        if len( env['QT_LIB'] ) > 0 :
> -            libnames.append( env['QT_LIB'] )
> +        # libnames.remove( '$QT_LIB' )
> +        # if len( env['QT_LIB'] ) > 0 :
> +        #    libnames.append( env['QT_LIB'] )
>         libnames = [ '%s.lib'%name for name in libnames ]
>         libnames_str = " ".join( libnames )
>         libpaths = [ '%s\\lib'%env['prefix'] ]
>         libpaths += edict['LIBPATH']
>         #print libpaths
> -        libpaths = [ path.replace( "$QTDIR", env['ENV']['QTDIR'] ) for 
> path in libpaths ]
> +        #libpaths = [ path.replace( "$QTDIR", env['ENV']['QTDIR'] ) for 
> path in libpaths ]
>         #print libpaths
>         libpaths = [ '/LIBPATH:%s'%libpath for libpath in libpaths ]
>         libpaths_str = ' '.join( libpaths )
> Index: SConstruct
> ===================================================================
> --- SConstruct    (revision 10064)
> +++ SConstruct    (working copy)
> @@ -52,14 +52,14 @@
>             print( 'include path: ' + include_path )
>             lib_path =  os.path.join(clam_env['sandbox_path'], basename, 
> 'lib')
>             print( 'lib path: ' + lib_path)
> -            clam_env.Append( CPPPATH= include_path )
> -            clam_env.Append( LIBPATH = lib_path )
> +            clam_env.Append( CPPPATH= [include_path] )
> +            clam_env.Append( LIBPATH = [lib_path] )
>             # if flags is not defined it will crash while loading 
> flags.conf
>         environmentIncludes = os.environ['INCLUDE']
>         environmentIncludesList = environmentIncludes.split(';')
>         for include in environmentIncludesList :
>             print( 'adding include dir from windows config: ' + include )
> -            clam_env.Append( CPPPATH = include)
> +            clam_env.Append( CPPPATH = [include])
>     if sys.platform == 'linux2':
>         clam_env.Append( CPPPATH= ['/usr/local/include'] )
>     if sys.platform == 'darwin' :
> 
> 
> ------------------------------------------------------------------------
> 
> _______________________________________________
> Clam-devel mailing list
> Clam-devel at llistes.projectes.lafarga.org
> https://llistes.projectes.lafarga.org/cgi-bin/mailman/listinfo/clam-devel