Move each module to their own directory (#1147)

* Move each module to its own directory.

* Update Windows projects.

* Fix Bazel file.
This commit is contained in:
Victor M. Alvarez
2019-10-17 16:45:05 +02:00
committed by GitHub
parent 658531387e
commit f57ddb3984
18 changed files with 51 additions and 52 deletions
+1
View File
@@ -112,3 +112,4 @@ x64/
windows/*/packages/
*.trs
*.log
.dirstamp
+13 -16
View File
@@ -183,19 +183,19 @@ cc_library(
"libyara/libyara.c",
"libyara/mem.c",
"libyara/modules.c",
#"libyara/modules/cuckoo.c", # TODO(cblichmann): Add Jansson JSON depenency
"libyara/modules/dex.c",
#"libyara/modules/demo.c", # Disabled
"libyara/modules/dotnet.c",
"libyara/modules/elf.c",
"libyara/modules/hash.c",
"libyara/modules/macho.c",
#"libyara/modules/magic.c", # TODO(cblichmann): Add libmagic dependency
"libyara/modules/math.c",
"libyara/modules/pe.c",
"libyara/modules/pe_utils.c",
"libyara/modules/tests.c",
"libyara/modules/time.c",
#"libyara/modules/cuckoo/cuckoo.c", # TODO(cblichmann): Add Jansson JSON depenency
"libyara/modules/dex/dex.c",
#"libyara/modules/demo/demo.c", # Disabled
"libyara/modules/dotnet/dotnet.c",
"libyara/modules/elf/elf.c",
"libyara/modules/hash/hash.c",
"libyara/modules/macho/macho.c",
#"libyara/modules/magic/magic.c", # TODO(cblichmann): Add libmagic dependency
"libyara/modules/math/math.c",
"libyara/modules/pe/pe.c",
"libyara/modules/pe/pe_utils.c",
"libyara/modules/tests/tests.c",
"libyara/modules/time/time.c",
"libyara/object.c",
"libyara/parser.c",
"libyara/proc.c",
@@ -234,10 +234,7 @@ cc_library(
textual_hdrs = [
"libyara/grammar.h",
"libyara/hex_grammar.y",
"libyara/include/yara/exefiles.h",
"libyara/include/yara/re_lexer.h",
"libyara/modules/module_list",
"libyara/modules/pe_utils.c", # Included .c file
"libyara/re_grammar.y",
],
visibility = ["//visibility:public"],
+14 -13
View File
@@ -1,35 +1,36 @@
MODULES = modules/tests/tests.c
MODULES = modules/tests.c
MODULES += modules/pe.c
MODULES += modules/elf.c
MODULES += modules/math.c
MODULES += modules/time.c
MODULES += modules/elf/elf.c
# This isn't really a module, but needs to be compiled with them.
MODULES += modules/pe_utils.c
MODULES += modules/math/math.c
MODULES += modules/time/time.c
MODULES += modules/pe/pe.c
MODULES += modules/pe/pe_utils.c
if CUCKOO_MODULE
MODULES += modules/cuckoo.c
MODULES += modules/cuckoo/cuckoo.c
endif
if MAGIC_MODULE
MODULES += modules/magic.c
MODULES += modules/magic/magic.c
endif
if HASH_MODULE
MODULES += modules/hash.c
MODULES += modules/hash/hash.c
endif
if DOTNET_MODULE
MODULES += modules/dotnet.c
MODULES += modules/dotnet/dotnet.c
endif
if MACHO_MODULE
MODULES += modules/macho.c
MODULES += modules/macho/macho.c
endif
if DEX_MODULE
MODULES += modules/dex.c
MODULES += modules/dex/dex.c
endif
#
+11 -11
View File
@@ -235,17 +235,17 @@
<ClCompile Include="..\..\..\libyara\libyara.c" />
<ClCompile Include="..\..\..\libyara\mem.c" />
<ClCompile Include="..\..\..\libyara\modules.c" />
<ClCompile Include="..\..\..\libyara\modules\cuckoo.c" />
<ClCompile Include="..\..\..\libyara\modules\dex.c" />
<ClCompile Include="..\..\..\libyara\modules\dotnet.c" />
<ClCompile Include="..\..\..\libyara\modules\elf.c" />
<ClCompile Include="..\..\..\libyara\modules\hash.c" />
<ClCompile Include="..\..\..\libyara\modules\math.c" />
<ClCompile Include="..\..\..\libyara\modules\macho.c" />
<ClCompile Include="..\..\..\libyara\modules\pe.c" />
<ClCompile Include="..\..\..\libyara\modules\pe_utils.c" />
<ClCompile Include="..\..\..\libyara\modules\tests.c" />
<ClCompile Include="..\..\..\libyara\modules\time.c" />
<ClCompile Include="..\..\..\libyara\modules\cuckoo\cuckoo.c" />
<ClCompile Include="..\..\..\libyara\modules\dex\dex.c" />
<ClCompile Include="..\..\..\libyara\modules\dotnet\dotnet.c" />
<ClCompile Include="..\..\..\libyara\modules\elf\elf.c" />
<ClCompile Include="..\..\..\libyara\modules\hash\hash.c" />
<ClCompile Include="..\..\..\libyara\modules\math\math.c" />
<ClCompile Include="..\..\..\libyara\modules\macho\macho.c" />
<ClCompile Include="..\..\..\libyara\modules\pe\pe.c" />
<ClCompile Include="..\..\..\libyara\modules\pe\pe_utils.c" />
<ClCompile Include="..\..\..\libyara\modules\tests\tests.c" />
<ClCompile Include="..\..\..\libyara\modules\time\time.c" />
<ClCompile Include="..\..\..\libyara\object.c" />
<ClCompile Include="..\..\..\libyara\parser.c" />
<ClCompile Include="..\..\..\libyara\proc.c" />
+12 -12
View File
@@ -236,17 +236,17 @@
<ClCompile Include="..\..\..\libyara\libyara.c" />
<ClCompile Include="..\..\..\libyara\mem.c" />
<ClCompile Include="..\..\..\libyara\modules.c" />
<ClCompile Include="..\..\..\libyara\modules\cuckoo.c" />
<ClCompile Include="..\..\..\libyara\modules\dex.c" />
<ClCompile Include="..\..\..\libyara\modules\dotnet.c" />
<ClCompile Include="..\..\..\libyara\modules\elf.c" />
<ClCompile Include="..\..\..\libyara\modules\hash.c" />
<ClCompile Include="..\..\..\libyara\modules\math.c" />
<ClCompile Include="..\..\..\libyara\modules\macho.c" />
<ClCompile Include="..\..\..\libyara\modules\pe.c" />
<ClCompile Include="..\..\..\libyara\modules\pe_utils.c" />
<ClCompile Include="..\..\..\libyara\modules\tests.c" />
<ClCompile Include="..\..\..\libyara\modules\time.c" />
<ClCompile Include="..\..\..\libyara\modules\cuckoo\cuckoo.c" />
<ClCompile Include="..\..\..\libyara\modules\dex\dex.c" />
<ClCompile Include="..\..\..\libyara\modules\dotnet\dotnet.c" />
<ClCompile Include="..\..\..\libyara\modules\elf\elf.c" />
<ClCompile Include="..\..\..\libyara\modules\hash\hash.c" />
<ClCompile Include="..\..\..\libyara\modules\math\math.c" />
<ClCompile Include="..\..\..\libyara\modules\macho\macho.c" />
<ClCompile Include="..\..\..\libyara\modules\pe\pe.c" />
<ClCompile Include="..\..\..\libyara\modules\pe\pe_utils.c" />
<ClCompile Include="..\..\..\libyara\modules\tests\tests.c" />
<ClCompile Include="..\..\..\libyara\modules\time\time.c" />
<ClCompile Include="..\..\..\libyara\object.c" />
<ClCompile Include="..\..\..\libyara\parser.c" />
<ClCompile Include="..\..\..\libyara\proc.c" />
@@ -269,4 +269,4 @@
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets" />
</Project>
</Project>