Commit 3bf5d710 by Victor M. Alvarez

Build with the appropriate process memory scanning logic according to the platform.

parent 34f858db
...@@ -159,17 +159,15 @@ class BuildExtCommand(build_ext): ...@@ -159,17 +159,15 @@ class BuildExtCommand(build_ext):
for library in self.libraries or []: for library in self.libraries or []:
module.libraries.append(library) module.libraries.append(library)
if self.plat_name in ('win32','win-amd64'): building_for_windows = self.plat_name in ('win32','win-amd64')
building_for_windows = True building_for_osx = 'macosx' in self.plat_name
else: building_for_linux = 'linux' in self.plat_name
building_for_windows = False
if 'macosx' in self.plat_name: if building_for_linux:
building_for_osx = True module.sources.append('yara/libyara/proc/linux.c')
else:
building_for_osx = False
if building_for_windows: if building_for_windows:
module.sources.append('yara/libyara/proc/windows.c')
module.define_macros.append(('_CRT_SECURE_NO_WARNINGS', '1')) module.define_macros.append(('_CRT_SECURE_NO_WARNINGS', '1'))
module.libraries.append('kernel32') module.libraries.append('kernel32')
module.libraries.append('advapi32') module.libraries.append('advapi32')
...@@ -178,6 +176,7 @@ class BuildExtCommand(build_ext): ...@@ -178,6 +176,7 @@ class BuildExtCommand(build_ext):
module.libraries.append('ws2_32') module.libraries.append('ws2_32')
if building_for_osx: if building_for_osx:
module.sources.append('yara/libyara/proc/mach.c')
module.include_dirs.append('/usr/local/opt/openssl/include') module.include_dirs.append('/usr/local/opt/openssl/include')
module.include_dirs.append('/opt/local/include') module.include_dirs.append('/opt/local/include')
module.library_dirs.append('/opt/local/lib') module.library_dirs.append('/opt/local/lib')
...@@ -226,6 +225,7 @@ class BuildExtCommand(build_ext): ...@@ -226,6 +225,7 @@ class BuildExtCommand(build_ext):
exclusions = [os.path.normpath(x) for x in exclusions] exclusions = [os.path.normpath(x) for x in exclusions]
for directory, _, files in os.walk('yara/libyara/'): for directory, _, files in os.walk('yara/libyara/'):
if directory != 'yara/libyara/proc':
for x in files: for x in files:
x = os.path.normpath(os.path.join(directory, x)) x = os.path.normpath(os.path.join(directory, x))
if x.endswith('.c') and x not in exclusions: if x.endswith('.c') and x not in exclusions:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment